Bug 876712 - Rename awesomebar_contextmenu to home_contextmenu. r=sriram
authorMargaret Leibovic <margaret.leibovic@gmail.com>
Wed, 12 Jun 2013 13:23:29 -0700
changeset 143327 13e4b6ac54104dcb5e70ea9aaa7c0866e9dbcb19
parent 143326 95d4652040a644772a431aa4d24a68efd7fc6ff7
child 143328 00ef1efa58bf4f776d50454c659226cdf06ca5db
push id25130
push userlrocha@mozilla.com
push dateWed, 21 Aug 2013 09:41:27 +0000
treeherdermozilla-central@b2486721572e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssriram
bugs876712
milestone24.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 876712 - Rename awesomebar_contextmenu to home_contextmenu. r=sriram
mobile/android/base/Makefile.in
mobile/android/base/home/BookmarksPage.java
mobile/android/base/resources/menu/awesomebar_contextmenu.xml
mobile/android/base/resources/menu/home_contextmenu.xml
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -1034,19 +1034,19 @@ RES_COLOR = \
   res/color/tertiary_text.xml \
   res/color/tertiary_text_inverse.xml \
   res/color/url_bar_title.xml \
   res/color/url_bar_title_hint.xml \
   $(NULL)
 
 RES_MENU = \
   res/menu/abouthome_topsites_contextmenu.xml \
-  res/menu/awesomebar_contextmenu.xml \
   res/menu/browser_app_menu.xml \
   res/menu/gecko_app_menu.xml \
+  res/menu/home_contextmenu.xml \
   res/menu/titlebar_contextmenu.xml \
   res/menu-large-v11/browser_app_menu.xml \
   res/menu-v11/browser_app_menu.xml \
   res/menu-xlarge-v11/browser_app_menu.xml \
   $(NULL)
 
 JAVA_CLASSPATH = $(ANDROID_SDK)/android.jar
 
--- a/mobile/android/base/home/BookmarksPage.java
+++ b/mobile/android/base/home/BookmarksPage.java
@@ -243,17 +243,17 @@ public class BookmarksPage extends HomeF
             HomeContextMenuInfo info = (HomeContextMenuInfo) menuInfo;
 
             // Don't show the context menu for folders.
             if (info.isFolder) {
                 return;
             }
 
             MenuInflater inflater = new MenuInflater(view.getContext());
-            inflater.inflate(R.menu.awesomebar_contextmenu, menu);
+            inflater.inflate(R.menu.home_contextmenu, menu);
 
             // Show Open Private Tab if we're in private mode, Open New Tab otherwise
             boolean isPrivate = false;
             Tab tab = Tabs.getInstance().getSelectedTab();
             if (tab != null) {
                 isPrivate = tab.isPrivate();
             }
             menu.findItem(R.id.open_new_tab).setVisible(!isPrivate);
rename from mobile/android/base/resources/menu/awesomebar_contextmenu.xml
rename to mobile/android/base/resources/menu/home_contextmenu.xml