From 33befac088c0d4901b5b97dc596f72290ec20a3e Mon Sep 17 00:00:00 2001 From: Chenxia Liu Date: Mon, 28 Mar 2016 15:58:16 -0700 Subject: [PATCH] Bug 1220928 - Remove old History and Synced Tabs panel for uncustomized home panels. r=sebastian MozReview-Commit-ID: G3hIeoiiNs5 --HG-- extra : rebase_source : 2eb3d63c216af77b35685d63749c08d2523ec324 --- .../org/mozilla/gecko/home/HomeConfigPrefsBackend.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/home/HomeConfigPrefsBackend.java b/mobile/android/base/java/org/mozilla/gecko/home/HomeConfigPrefsBackend.java index 7853f9bd3d56..543ed2f39312 100644 --- a/mobile/android/base/java/org/mozilla/gecko/home/HomeConfigPrefsBackend.java +++ b/mobile/android/base/java/org/mozilla/gecko/home/HomeConfigPrefsBackend.java @@ -15,13 +15,11 @@ import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; import org.mozilla.gecko.GeckoSharedPrefs; -import org.mozilla.gecko.Restrictions; import org.mozilla.gecko.home.HomeConfig.HomeConfigBackend; import org.mozilla.gecko.home.HomeConfig.OnReloadListener; import org.mozilla.gecko.home.HomeConfig.PanelConfig; import org.mozilla.gecko.home.HomeConfig.PanelType; import org.mozilla.gecko.home.HomeConfig.State; -import org.mozilla.gecko.restrictions.Restrictable; import org.mozilla.gecko.util.HardwareUtils; import android.content.BroadcastReceiver; @@ -74,13 +72,8 @@ public class HomeConfigPrefsBackend implements HomeConfigBackend { EnumSet.of(PanelConfig.Flags.DEFAULT_PANEL))); panelConfigs.add(createBuiltinPanelConfig(mContext, PanelType.BOOKMARKS)); - panelConfigs.add(createBuiltinPanelConfig(mContext, PanelType.HISTORY)); panelConfigs.add(createBuiltinPanelConfig(mContext, PanelType.COMBINED_HISTORY)); - // We disable Synced Tabs for guest mode / restricted profiles. - if (Restrictions.isAllowed(mContext, Restrictable.MODIFY_ACCOUNTS)) { - panelConfigs.add(createBuiltinPanelConfig(mContext, PanelType.REMOTE_TABS)); - } panelConfigs.add(createBuiltinPanelConfig(mContext, PanelType.RECENT_TABS)); panelConfigs.add(createBuiltinPanelConfig(mContext, PanelType.READING_LIST));