diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 8f687097bfac3d..854092d77d4655 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -4978,9 +4978,6 @@ Even if you have downloaded files from this website before, the website might ha Manage extensions - - Open in sidebar - Inspect popup @@ -4998,9 +4995,6 @@ Even if you have downloaded files from this website before, the website might ha Hide Button - - Open in sidebar - Manage Extensions diff --git a/chrome/browser/extensions/extension_context_menu_model.cc b/chrome/browser/extensions/extension_context_menu_model.cc index 7d65c6f88869e9..e8e36d4f9c67c3 100644 --- a/chrome/browser/extensions/extension_context_menu_model.cc +++ b/chrome/browser/extensions/extension_context_menu_model.cc @@ -127,9 +127,6 @@ ExtensionContextMenuModel::ExtensionContextMenuModel(const Extension* extension, } bool ExtensionContextMenuModel::IsCommandIdChecked(int command_id) const { - if (command_id == SIDEBAR) { - return profile_->GetPrefs()->GetBoolean(prefs::kShowPopupInSidebar); - } if (command_id >= IDC_EXTENSIONS_CONTEXT_CUSTOM_FIRST && command_id <= IDC_EXTENSIONS_CONTEXT_CUSTOM_LAST) return extension_items_->IsCommandIdChecked(command_id); @@ -144,8 +141,6 @@ bool ExtensionContextMenuModel::IsCommandIdEnabled(int command_id) const { if (command_id >= IDC_EXTENSIONS_CONTEXT_CUSTOM_FIRST && command_id <= IDC_EXTENSIONS_CONTEXT_CUSTOM_LAST) { return extension_items_->IsCommandIdEnabled(command_id); - } else if (command_id == SIDEBAR) { - return true; } else if (command_id == CONFIGURE) { return extensions::OptionsPageInfo::HasOptionsPage(extension); } else if (command_id == NAME) { @@ -206,11 +201,6 @@ void ExtensionContextMenuModel::ExecuteCommand(int command_id, } break; } - case SIDEBAR: { - bool current = profile_->GetPrefs()->GetBoolean(prefs::kShowPopupInSidebar); - profile_->GetPrefs()->SetBoolean(prefs::kShowPopupInSidebar, !current); - } - break; case CONFIGURE: DCHECK(extensions::OptionsPageInfo::HasOptionsPage(extension)); extensions::ExtensionTabUtil::OpenOptionsPage(extension, browser_); @@ -298,7 +288,6 @@ void ExtensionContextMenuModel::InitMenu(const Extension* extension) { ->WantsToRun(extension)) { AddItemWithStringId(ALWAYS_RUN, IDS_EXTENSIONS_ALWAYS_RUN); } - AddCheckItem(SIDEBAR, l10n_util::GetStringUTF16(IDS_USE_SIDEBAR)); AddItemWithStringId(CONFIGURE, IDS_EXTENSIONS_OPTIONS_MENU_ITEM); AddItem(UNINSTALL, l10n_util::GetStringUTF16(IDS_EXTENSIONS_UNINSTALL)); diff --git a/chrome/browser/extensions/extension_context_menu_model.h b/chrome/browser/extensions/extension_context_menu_model.h index 86dfa14052e299..264c31d0bb39b1 100644 --- a/chrome/browser/extensions/extension_context_menu_model.h +++ b/chrome/browser/extensions/extension_context_menu_model.h @@ -35,7 +35,6 @@ class ExtensionContextMenuModel enum MenuEntries { NAME = 0, CONFIGURE, - SIDEBAR, TOGGLE_VISIBILITY, UNINSTALL, MANAGE, diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc index b468b0be9ea662..0a47eddcd4f97d 100644 --- a/chrome/browser/ui/browser_ui_prefs.cc +++ b/chrome/browser/ui/browser_ui_prefs.cc @@ -32,10 +32,6 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) { prefs::kShowHomeButton, false, user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); -registry->RegisterBooleanPref( - prefs::kShowPopupInSidebar, - false, - user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); #if defined(OS_MACOSX) // This really belongs in platform code, but there's no good place to // initialize it between the time when the AppController is created diff --git a/chrome/browser/ui/extensions/extension_action_view_controller.cc b/chrome/browser/ui/extensions/extension_action_view_controller.cc index 47e6daa41e82fe..814795343b8450 100644 --- a/chrome/browser/ui/extensions/extension_action_view_controller.cc +++ b/chrome/browser/ui/extensions/extension_action_view_controller.cc @@ -288,9 +288,7 @@ bool ExtensionActionViewController::ShowPopupWithUrl( if (already_showing) return false; - bool use_sidebar = - browser()->profile()->GetPrefs()->GetBoolean(prefs::kShowPopupInSidebar) || - extension_action_->open_in_sidebar(); + bool use_sidebar = extension_action_->open_in_sidebar(); if (use_sidebar) { SidebarManager* sidebar_manager = SidebarManager::GetInstance(); diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc index ee99b5b1277e6a..ed19baf95e6c51 100644 --- a/chrome/common/pref_names.cc +++ b/chrome/common/pref_names.cc @@ -836,10 +836,6 @@ const char kIpcDisabledMessages[] = "ipc_log_disabled_messages"; // visible on the toolbar. const char kShowHomeButton[] = "browser.show_home_button"; -// A boolean pref set to true if an extension popup to open the pages should be -// visible in the sidebar. -const char kShowPopupInSidebar[] = "browser.show_home_popup_in_sidebar"; - // A string value which saves short list of recently user selected encodings // separated with comma punctuation mark. const char kRecentlySelectedEncoding[] = "profile.recently_selected_encodings"; diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h index 3015f612b4ac0b..a5348d5a43c0de 100644 --- a/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h @@ -275,7 +275,6 @@ extern const char kForceMaximizeOnFirstRun[]; #endif // defined(OS_CHROMEOS) extern const char kIpcDisabledMessages[]; extern const char kShowHomeButton[]; -extern const char kShowPopupInSidebar[]; extern const char kRecentlySelectedEncoding[]; extern const char kDeleteBrowsingHistory[]; extern const char kDeleteDownloadHistory[];