Index: chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm |
diff --git a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm |
index c8281f35767b690e79dd2cf2a83695466dc90445..2f767eb739c05eb58cc3fd9b9391c5c42155f560 100644 |
--- a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm |
+++ b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm |
@@ -379,19 +379,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); |
- } |
- } |
Peter Kasting
2014/08/12 19:04:49
Make sure you remove any #includes (some of the pr
Devlin
2014/08/12 19:18:19
Whoops, done.
|
int savedButtonCount = toolbarModel_->GetVisibleIconCount(); |
if (savedButtonCount < 0 || // all icons are visible |