From 8cf9407c0e001b937b920c8de3f0c9ef8ee39c7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20Qu=C3=A8ze?= <florian@queze.net>
Date: Tue, 5 May 2015 12:24:11 +0200
Subject: [PATCH] Bug 1155519 - Add "View Pocket Items" menuitem to the
 bookmarks menu, r=dolske.

---
 browser/base/content/browser-menubar.inc      |   4 ++++
 browser/base/content/browser-places.js        |   7 +++++++
 browser/base/content/browser-pocket.dtd       |   1 +
 browser/base/content/browser.xul              |   6 ++++++
 .../customizableui/content/panelUI.inc.xul    |   4 ++++
 browser/components/pocket/Pocket.jsm          |   2 ++
 browser/components/pocket/jar.mn              |   2 ++
 .../pocket/panels/img/pocketmenuitem16.png    | Bin 0 -> 278 bytes
 .../pocket/panels/img/pocketmenuitem16@2x.png | Bin 0 -> 422 bytes
 browser/themes/linux/browser.css              |   6 ++++++
 browser/themes/osx/browser.css                |  18 ++++++++++++++++++
 browser/themes/windows/browser.css            |   6 ++++++
 12 files changed, 56 insertions(+)
 create mode 100644 browser/components/pocket/panels/img/pocketmenuitem16.png
 create mode 100644 browser/components/pocket/panels/img/pocketmenuitem16@2x.png

diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
index 18b37e636d0d..0eaeba4acde3 100644
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -387,6 +387,7 @@
                oncommand="BookmarksEventHandler.onCommand(event, this.parentNode._placesView);"
                onclick="BookmarksEventHandler.onClick(event, this.parentNode._placesView);"
                onpopupshowing="BookmarkingUI.onMainMenuPopupShowing(event);
+                               BookmarkingUI.updatePocketItemVisibility('menu_');
                                if (!this.parentNode._placesView)
                                  new PlacesMenu(event, 'place:folder=BOOKMARKS_MENU');"
                tooltip="bhTooltip" popupsinherittooltip="true">
@@ -460,6 +461,9 @@
         </menupopup>
       </menu>
 #endif
+      <menuseparator id="menu_pocketSeparator"/>
+      <menuitem id="menu_pocket" label="&pocketMenuitem.label;"
+                oncommand="openUILink(Pocket.listURL, event);"/>
       <menuseparator id="bookmarksMenuItemsSeparator"/>
       <!-- Bookmarks menu items -->
       <menuseparator builder="end"
diff --git a/browser/base/content/browser-places.js b/browser/base/content/browser-places.js
index 45b4bfc0b044..db344a919347 100644
--- a/browser/base/content/browser-places.js
+++ b/browser/base/content/browser-places.js
@@ -1565,6 +1565,12 @@ let BookmarkingUI = {
     PlacesCommandHook.updateBookmarkAllTabsCommand();
   },
 
+  updatePocketItemVisibility: function BUI_updatePocketItemVisibility(prefix) {
+    let hidden = !CustomizableUI.getPlacementOfWidget("pocket-button");
+    document.getElementById(prefix + "pocket").hidden = hidden;
+    document.getElementById(prefix + "pocketSeparator").hidden = hidden;
+  },
+
   _showBookmarkedNotification: function BUI_showBookmarkedNotification() {
     function getCenteringTransformForRects(rectToPosition, referenceRect) {
       let topDiff = referenceRect.top - rectToPosition.top;
@@ -1682,6 +1688,7 @@ let BookmarkingUI = {
 
   onPanelMenuViewShowing: function BUI_onViewShowing(aEvent) {
     this._updateBookmarkPageMenuItem();
+    this.updatePocketItemVisibility("panelMenu_");
     // Update checked status of the toolbar toggle.
     let viewToolbar = document.getElementById("panelMenu_viewBookmarksToolbar");
     let personalToolbar = document.getElementById("PersonalToolbar");
diff --git a/browser/base/content/browser-pocket.dtd b/browser/base/content/browser-pocket.dtd
index 96e712717725..c92e479946c6 100644
--- a/browser/base/content/browser-pocket.dtd
+++ b/browser/base/content/browser-pocket.dtd
@@ -7,3 +7,4 @@
 
 <!ENTITY saveToPocketCmd.label     "Save Page to Pocket">
 <!ENTITY saveToPocketCmd.accesskey "k">
+<!ENTITY pocketMenuitem.label      "View Pocket List">
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index ebbf44297c3f..9326772f55bc 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -883,6 +883,7 @@
                      oncommand="BookmarksEventHandler.onCommand(event, this.parentNode._placesView);"
                      onclick="BookmarksEventHandler.onClick(event, this.parentNode._placesView);"
                      onpopupshowing="BookmarkingUI.onPopupShowing(event);
+                                     BookmarkingUI.updatePocketItemVisibility('BMB_');
                                      BookmarkingUI.attachPlacesView(event, this);"
                      tooltip="bhTooltip" popupsinherittooltip="true">
             <menuitem id="BMB_viewBookmarksSidebar"
@@ -970,6 +971,11 @@
                           label="&readingList.showSidebar.label;"/>
               </menupopup>
             </menu>
+            <menuseparator id="BMB_pocketSeparator"/>
+            <menuitem id="BMB_pocket"
+                      class="menuitem-iconic bookmark-item subviewbutton"
+                      label="&pocketMenuitem.label;"
+                      oncommand="openUILink(Pocket.listURL, event);"/>
             <menuseparator/>
             <!-- Bookmarks menu items will go here -->
             <menuitem id="BMB_bookmarksShowAll"
diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul
index b48f25aac53d..01a0bbdd4040 100644
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -137,6 +137,10 @@
           <observes element="readingListSidebar" attribute="checked"/>
           <observes element="readingListSidebar" attribute="hidden"/>
         </toolbarbutton>
+        <toolbarseparator id="panelMenu_pocketSeparator"/>
+        <toolbarbutton id="panelMenu_pocket" label="&pocketMenuitem.label;"
+                       class="subviewbutton cui-withicon"
+                       oncommand="openUILink(Pocket.listURL, event);"/>
         <toolbarseparator class="small-separator"/>
         <toolbaritem id="panelMenu_bookmarksMenu"
                      orient="vertical"
diff --git a/browser/components/pocket/Pocket.jsm b/browser/components/pocket/Pocket.jsm
index 230dae8b72b7..df5b0f0fbe25 100644
--- a/browser/components/pocket/Pocket.jsm
+++ b/browser/components/pocket/Pocket.jsm
@@ -29,6 +29,8 @@ let Pocket = {
 
   get hostname() Services.prefs.getCharPref("browser.pocket.hostname"),
 
+  get listURL() { return "https://" + Pocket.hostname; },
+
   get _accessToken() {
     let sessionId, accessToken;
     let cookies = Services.cookies.getCookiesFromHost(this.hostname);
diff --git a/browser/components/pocket/jar.mn b/browser/components/pocket/jar.mn
index 1da4649c6ffd..6c98f1fa5b0a 100644
--- a/browser/components/pocket/jar.mn
+++ b/browser/components/pocket/jar.mn
@@ -16,6 +16,8 @@ browser.jar:
   content/browser/pocket/panels/img/pocketlogo@2x.png              (panels/img/pocketlogo@2x.png)
   content/browser/pocket/panels/img/pocketlogosolo@1x.png          (panels/img/pocketlogosolo@1x.png)
   content/browser/pocket/panels/img/pocketlogosolo@2x.png          (panels/img/pocketlogosolo@2x.png)
+  content/browser/pocket/panels/img/pocketmenuitem16.png           (panels/img/pocketmenuitem16.png)
+  content/browser/pocket/panels/img/pocketmenuitem16@2x.png        (panels/img/pocketmenuitem16@2x.png)
   content/browser/pocket/panels/img/pocketmultidevices@1x.png      (panels/img/pocketmultidevices@1x.png)
   content/browser/pocket/panels/img/pocketmultidevices@2x.png      (panels/img/pocketmultidevices@2x.png)
   content/browser/pocket/panels/img/signup_firefoxlogo@1x.png      (panels/img/signup_firefoxlogo@1x.png)
diff --git a/browser/components/pocket/panels/img/pocketmenuitem16.png b/browser/components/pocket/panels/img/pocketmenuitem16.png
new file mode 100644
index 0000000000000000000000000000000000000000..80816e1b049b3a2ad0b96df00f5f74bd4cef5eb3
GIT binary patch
literal 278
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP*AeO
zHKHUqKdq!Zu_%?nF(p4KRlzeiF+DXXH8G{K@MNkDP|;#f7sn8b)5$;n|F>sWo$+w4
z^9>e-fBtIo4mdQX8OYVJ$uK-(Q~1~5`jLIb9mX0qABI+)31JM6xIG^6H{4**GH;w9
zF0_D)bwOLh28Ixw#v2A24n{1?(`GP=7f5Vkm=@uXBa@}qpu+v3#Yp3T*@KDt4L1uK
zdo=bi_?-%1<|%NI)%(LJrp@E=&qU#ps(8YzKpqDp4My9I3a#!;Zh1>gteF|&UUkMQ
TuG9GgbS{IZtDnm{r-UW|?o3yS

literal 0
HcmV?d00001

diff --git a/browser/components/pocket/panels/img/pocketmenuitem16@2x.png b/browser/components/pocket/panels/img/pocketmenuitem16@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee341860adc7356379cb1c9a5353e2bca982ff75
GIT binary patch
literal 422
zcmeAS@N?(olHy`uVBq!ia0vp^iXhCv1|-9u9Lfh$oCO|{#S9GG!XV7ZFl&wkP*AeO
zHKHUqKdq!Zu_%?nF(p4KRlzeiF+DXXH8G{K@MNkD0|TS6r;B4q#NoHo&k8mx2()S*
z6w+uE(m5D>Zb|~@v<X0#kcOgafMXjUhlO{WK!{k+5lQ~{4|;ajDfj<XjLHs*ev+>+
z@9kQ{M{b83U)>XU)+nW^9P7BaSwfr9qEyT&q)kGvgZt4GfkWDQ!bU&uc289mXpWB)
zG;L)sOfv6a5fEj1!)SO^ito=O35M=Hx2MRpv+0{md}71cp!#L$liMF77&RGZ{B1Uj
z7D;)yLt>HfcC!WUF}r;QW{X%#1-P%BsF1_hpj_-(ziHBm2m10U3};x+w!bhI(&$JI
zkS+Ey<4yO8Oy2T)#<sUJN);MD@%kB6JAaJXxvRY4cRl9;^Xc**+AX*eN}06_{!C)u
zwZ>FnRs74flG|75c)nqksdVA8^DB?<NK7rUUd{33*v@ZzqAPRvGDy07nZ4#y#w=hM
OGkCiCxvX<aXaWF)$(v;W

literal 0
HcmV?d00001

diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index a9d7ecc5644d..a5b645eaa6b3 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -523,6 +523,12 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   list-style-image: url("chrome://browser/skin/readinglist/readinglist-icon.svg");
 }
 
+#panelMenu_pocket,
+#menu_pocket,
+#BMB_pocket {
+  list-style-image: url("chrome://browser/content/pocket/panels/img/pocketmenuitem16.png");
+}
+
 #menu_openDownloads {
   list-style-image: url("chrome://browser/skin/Toolbar-small.png");
   -moz-image-region: rect(0px 16px 16px 0px);
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 29e4e3d4a9a9..890a71233134 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -568,6 +568,24 @@ toolbarpaletteitem[place="palette"] > #personal-bookmarks > #bookmarks-toolbar-p
   list-style-image: url("chrome://browser/skin/readinglist/readinglist-icon.svg");
 }
 
+#panelMenu_pocket,
+#menu_pocket,
+#BMB_pocket {
+  list-style-image: url("chrome://browser/content/pocket/panels/img/pocketmenuitem16.png");
+}
+
+@media (min-resolution: 2dppx) {
+  #panelMenu_pocket,
+  #menu_pocket,
+  #BMB_pocket {
+    list-style-image: url("chrome://browser/content/pocket/panels/img/pocketmenuitem16@2x.png");
+  }
+
+  #panelMenu_pocket > .toolbarbutton-icon {
+    width: 16px;
+  }
+}
+
 /* ----- PRIMARY TOOLBAR BUTTONS ----- */
 
 toolbar .toolbarbutton-1:not([type="menu-button"]),
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index e06e31dfb9d0..9b8136496573 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -2297,6 +2297,12 @@ notification[value="loop-sharing-notification"] .messageImage {
   -moz-image-region: auto;
 }
 
+#panelMenu_pocket,
+#menu_pocket,
+#BMB_pocket {
+  list-style-image: url("chrome://browser/content/pocket/panels/img/pocketmenuitem16.png");
+}
+
 /* ::::: Keyboard UI Panel ::::: */
 
 .KUI-panel {