Bug 826820: Remove "synced tabs" menu item in Tabs Panel. [r=mfinkle]

mobile/android/base/Makefile.in

@@ -527,7 +527,6 @@ RES_DRAWABLE_BASE = \
   res/drawable/ic_menu_new_private_tab_small.png \
   res/drawable/ic_menu_new_tab_small.png \
   res/drawable/ic_menu_reload.png \
-  res/drawable/ic_menu_synced_tabs.png \
   res/drawable/ic_menu_quit.xml \
   res/drawable/ic_status_logo.png \
   res/drawable/remote_tabs_off.png \
@@ -617,7 +616,6 @@ RES_DRAWABLE_HDPI = \
   res/drawable-hdpi/ic_menu_new_tab.png \
   res/drawable-hdpi/ic_menu_new_tab_small.png \
   res/drawable-hdpi/ic_menu_reload.png \
-  res/drawable-hdpi/ic_menu_synced_tabs.png \
   res/drawable-hdpi/ic_status_logo.png \
   res/drawable-hdpi/remote_tabs_off.png \
   res/drawable-hdpi/remote_tabs_on.png \
@@ -705,7 +703,6 @@ RES_DRAWABLE_XHDPI = \
   res/drawable-xhdpi/ic_menu_new_tab.png \
   res/drawable-xhdpi/ic_menu_new_tab_small.png \
   res/drawable-xhdpi/ic_menu_reload.png \
-  res/drawable-xhdpi/ic_menu_synced_tabs.png \
   res/drawable-xhdpi/ic_status_logo.png \
   res/drawable-xhdpi/tab_new.png \
   res/drawable-xhdpi/tab_close.png \

mobile/android/base/TabsPanel.java

@@ -203,26 +203,6 @@ public class TabsPanel extends TabHost
             mMenu.findItem(R.id.close_all_tabs).setEnabled(true); 
 
         mPopupMenu.show();
-
-        final Context context = mContext;
-        new SyncAccounts.AccountsExistTask() {
-            @Override
-            protected void onPostExecute(Boolean result) {
-                if (!result.booleanValue()) {
-                    return;
-                }
-                TabsAccessor.areClientsAvailable(context, new TabsAccessor.OnClientsAvailableListener() {
-                    @Override
-                    public void areAvailable(boolean available) {
-                        TabsPanel.this.enableRemoteTabs(available);
-                    }
-                });
-            }
-        }.execute(context);
-    }
-
-    public void enableRemoteTabs(boolean enable) {
-        mMenu.findItem(R.id.synced_tabs).setEnabled(enable);
     }
 
     public void openTabsSwitcherMenu() {
@@ -247,10 +227,6 @@ public class TabsPanel extends TabHost
                 show(Panel.REMOTE_TABS);
                 return true;
 
-            case R.id.synced_tabs:
-                show(Panel.REMOTE_TABS);
-                return true;
-
             case R.id.close_all_tabs:
                 for (Tab tab : Tabs.getInstance().getTabsInOrder()) {
                     Tabs.getInstance().closeTab(tab);

mobile/android/base/locales/en-US/android_strings.dtd

@@ -137,7 +137,6 @@ size. -->
 <!ENTITY tools "Tools">
 <!ENTITY new_tab "New Tab">
 <!ENTITY new_private_tab "New Private Tab">
-<!ENTITY synced_tabs "Synced Tabs">
 <!ENTITY close_all_tabs "Close All Tabs">
 <!ENTITY tabs_normal "Tabs">
 <!ENTITY tabs_private "Private">

mobile/android/base/resources/menu-v11/tabs_menu.xml

@@ -13,11 +13,6 @@
           android:icon="@drawable/ic_menu_new_private_tab"
           android:title="@string/new_private_tab"/>
 
-    <item android:id="@+id/synced_tabs"
-          android:icon="@drawable/ic_menu_synced_tabs"
-          android:title="@string/synced_tabs"
-          android:enabled="false"/>
-
     <item android:id="@+id/close_all_tabs"
           android:icon="@drawable/ic_menu_close_all_tabs"
           android:title="@string/close_all_tabs"/>

mobile/android/base/resources/menu/tabs_menu.xml

@@ -13,11 +13,6 @@
           android:icon="@drawable/ic_menu_new_private_tab_small"
           android:title="@string/new_private_tab"/>
 
-    <item android:id="@+id/synced_tabs"
-          android:icon="@drawable/ic_menu_synced_tabs"
-          android:title="@string/synced_tabs"
-          android:enabled="false"/>
-
     <item android:id="@+id/close_all_tabs"
           android:icon="@drawable/ic_menu_close_all_tabs"
           android:title="@string/close_all_tabs"/>

mobile/android/base/strings.xml.in

@@ -140,7 +140,6 @@
   <string name="char_encoding">&char_encoding;</string>
   <string name="new_tab">&new_tab;</string>
   <string name="new_private_tab">&new_private_tab;</string>
-  <string name="synced_tabs">&synced_tabs;</string>
   <string name="close_all_tabs">&close_all_tabs;</string>
   <string name="tabs_normal">&tabs_normal;</string>
   <string name="tabs_private">&tabs_private;</string>