Merge 32980 - o Updates the browser action buttons when a tab is changed. Thi...

chrome/browser/cocoa/extensions/browser_actions_controller.mm

Index: chrome/browser/cocoa/extensions/browser_actions_controller.mm
===================================================================
--- chrome/browser/cocoa/extensions/browser_actions_controller.mm	(revision 33261)
+++ chrome/browser/cocoa/extensions/browser_actions_controller.mm	(working copy)
@@ -214,8 +214,11 @@
     return;
 
   std::string tooltip = extension_->browser_action()->GetTitle(tabId);
-  if (!tooltip.empty())
+  if (tooltip.empty()) {
+    [self setToolTip:nil];
+  } else {
     [self setToolTip:base::SysUTF8ToNSString(tooltip)];
+  }
 
   SkBitmap image = extension_->browser_action()->GetIcon(tabId);
   if (!image.isNull()) {
@@ -318,6 +321,12 @@
   return self;
 }
 
+- (void)update {
+  for (BrowserActionButton* button in [buttons_ allValues]) {
+    [button updateState];
+  }
+}
+
 - (void)hidePopup {
   [popupController_ close];
   popupController_ = nil;