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 d86dc90d390f060393fc3c0d529ef817bfc8d44f..96a9a71c466d99d09c242dd232305530ccfb105a 100644 |
--- a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm |
+++ b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm |
@@ -245,6 +245,10 @@ class ExtensionServiceObserverBridge |
void ToolbarVisibleCountChanged() override {} |
+ void OnToolbarReorderNecessary(content::WebContents* web_contents) override { |
+ // TODO(devlin): Implement on mac. |
+ } |
+ |
void ToolbarHighlightModeChanged(bool is_highlighting) override {} |
Browser* GetBrowser() override { return browser_; } |
@@ -355,9 +359,7 @@ class ExtensionServiceObserverBridge |
} |
- (void)resizeContainerAndAnimate:(BOOL)animate { |
- int iconCount = toolbarModel_->GetVisibleIconCount(); |
- if (iconCount < 0) // If no buttons are hidden. |
- iconCount = [self buttonCount]; |
+ int iconCount = toolbarModel_->visible_icon_count(); |
[containerView_ resizeToWidth:[self containerWidthWithButtonCount:iconCount] |
animate:animate]; |
@@ -377,9 +379,8 @@ class ExtensionServiceObserverBridge |
if (!toolbarModel_) |
return 0; |
- int savedButtonCount = toolbarModel_->GetVisibleIconCount(); |
- if (savedButtonCount < 0 || // all icons are visible |
- static_cast<NSUInteger>(savedButtonCount) > [self buttonCount]) |
+ int savedButtonCount = toolbarModel_->visible_icon_count(); |
+ if (static_cast<NSUInteger>(savedButtonCount) > [self buttonCount]) |
savedButtonCount = [self buttonCount]; |
return [self containerWidthWithButtonCount:savedButtonCount]; |
} |