Remove deprecated kBrowserActionContainerWidth pref

We migrated to the new kToolbarSize pref over four years ago.  I think this is
safe to remove. :)

Review URL: https://codereview.chromium.org/451193003

Cr-Commit-Position: refs/heads/master@{#289184}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289184 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 0 insertions, 45 deletions

diff --git a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm
index c8281f3..1c8550e 100644
--- a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm
+++ b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm
@@ -7,7 +7,6 @@
 #include <cmath>
 #include <string>
 
-#include "base/prefs/pref_service.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_action.h"
@@ -25,13 +24,11 @@
 #import "chrome/browser/ui/cocoa/menu_button.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/extensions/api/extension_action/action_info.h"
-#include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
 #include "extensions/browser/extension_registry.h"
-#include "extensions/browser/pref_names.h"
 #include "grit/theme_resources.h"
 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h"
 
@@ -379,19 +376,6 @@ class ExtensionServiceObserverBridge
 - (CGFloat)savedWidth {
   if (!toolbarModel_)
     return 0;
-  if (!profile_->GetPrefs()->HasPrefPath(
-          extensions::pref_names::kToolbarSize)) {
-    // Migration code to the new VisibleIconCount pref.
-    // TODO(mpcomplete): remove this at some point.
-    double predefinedWidth = profile_->GetPrefs()->GetDouble(
-        extensions::pref_names::kBrowserActionContainerWidth);
-    if (predefinedWidth != 0) {
-      int iconWidth = kBrowserActionWidth + kBrowserActionButtonPadding;
-      int extraWidth = kChevronWidth;
-      toolbarModel_->SetVisibleIconCount(
-          (predefinedWidth - extraWidth) / iconWidth);
-    }
-  }
 
   int savedButtonCount = toolbarModel_->GetVisibleIconCount();
   if (savedButtonCount < 0 ||  // all icons are visible
diff --git a/chrome/browser/ui/views/toolbar/browser_actions_container.cc b/chrome/browser/ui/views/toolbar/browser_actions_container.cc
index 877dec7..828b916 100644
--- a/chrome/browser/ui/views/toolbar/browser_actions_container.cc
+++ b/chrome/browser/ui/views/toolbar/browser_actions_container.cc
@@ -5,7 +5,6 @@
 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
 
 #include "base/compiler_specific.h"
-#include "base/prefs/pref_service.h"
 #include "base/stl_util.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/extension_view_host.h"
@@ -23,7 +22,6 @@
 #include "chrome/common/extensions/command.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
-#include "extensions/browser/pref_names.h"
 #include "extensions/browser/runtime_data.h"
 #include "extensions/common/feature_switch.h"
 #include "grit/generated_resources.h"
@@ -195,16 +193,6 @@ void BrowserActionsContainer::Init() {
 
   // We wait to set the container width until now so that the chevron images
   // will be loaded.  The width calculation needs to know the chevron size.
-  if (model_ &&
-      !profile_->GetPrefs()->HasPrefPath(
-          extensions::pref_names::kToolbarSize)) {
-    // Migration code to the new VisibleIconCount pref.
-    // TODO(mpcomplete): remove this after users are upgraded to 5.0.
-    int predefined_width = profile_->GetPrefs()->GetInteger(
-        extensions::pref_names::kBrowserActionContainerWidth);
-    if (predefined_width != 0)
-      model_->SetVisibleIconCount(WidthToIconCount(predefined_width));
-  }
   if (model_ && model_->extensions_initialized())
     SetContainerWidth();
 }
diff --git a/extensions/browser/extension_prefs.cc b/extensions/browser/extension_prefs.cc
index 502816c..6676c68 100644
--- a/extensions/browser/extension_prefs.cc
+++ b/extensions/browser/extension_prefs.cc
@@ -1984,17 +1984,6 @@ void ExtensionPrefs::RegisterProfilePrefs(
       pref_names::kLastChromeVersion,
       std::string(),  // default value
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-#if defined(OS_MACOSX)
-  registry->RegisterDoublePref(
-      pref_names::kBrowserActionContainerWidth,
-      0,
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-#else
-  registry->RegisterIntegerPref(
-      pref_names::kBrowserActionContainerWidth,
-      0,
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-#endif
   registry->RegisterDictionaryPref(
       kInstallSignature,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
diff --git a/extensions/browser/pref_names.cc b/extensions/browser/pref_names.cc
index b693d21..f08b689 100644
--- a/extensions/browser/pref_names.cc
+++ b/extensions/browser/pref_names.cc
@@ -32,8 +32,6 @@ const char kAllowedInstallSites[] = "extensions.allowed_install_sites";
 const char kAllowedTypes[] = "extensions.allowed_types";
 const char kBookmarkAppCreationLaunchType[] =
     "extensions.bookmark_app_creation_launch_type";
-const char kBrowserActionContainerWidth[] =
-    "extensions.browseractions.container.width";
 const char kExtensions[] = "extensions.settings";
 const char kInstallAllowList[] = "extensions.install.allowlist";
 const char kInstallDenyList[] = "extensions.install.denylist";
diff --git a/extensions/browser/pref_names.h b/extensions/browser/pref_names.h
index 131a939..20f39f7 100644
--- a/extensions/browser/pref_names.h
+++ b/extensions/browser/pref_names.h
@@ -40,10 +40,6 @@ extern const char kAllowedTypes[];
 // by default.
 extern const char kBookmarkAppCreationLaunchType[];
 
-// Integer boolean representing the width (in pixels) of the container for
-// browser actions.
-extern const char kBrowserActionContainerWidth[];
-
 // Dictionary pref that keeps track of per-extension settings. The keys are
 // extension ids.
 extern const char kExtensions[];