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

chrome/browser/cocoa/extensions/browser_actions_controller.mm

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "browser_actions_controller.h"
 
 #include <string>
 
 #include "app/gfx/canvas_paint.h"
 #include "base/sys_string_conversions.h"
@@ skipping 196 matching lines @@
 - (void)setTabSpecificIcon:(NSImage*)image {
   tabSpecificIcon_.reset([image retain]);
 }
 
 - (void)updateState {
   int tabId = [controller_ currentTabId];
   if (tabId < 0)
     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()) {
     [self setTabSpecificIcon:gfx::SkBitmapToNSImage(image)];
     [self setImage:tabSpecificIcon_];
   } else if (defaultIcon_) {
     [self setImage:defaultIcon_];
   }
 
   [badgeView_ setTabId:tabId];
@@ skipping 82 matching lines @@
     containerView_ = container;
     [containerView_ setHidden:YES];
     observer_.reset(new ExtensionsServiceObserverBridge(self, profile_));
     buttons_.reset([[NSMutableDictionary alloc] init]);
     buttonOrder_.reset([[NSMutableArray alloc] init]);
   }
 
   return self;
 }
 
+- (void)update {
+  for (BrowserActionButton* button in [buttons_ allValues]) {
+    [button updateState];
+  }
+}
+
 - (void)hidePopup {
   [popupController_ close];
   popupController_ = nil;
 }
 
 - (ExtensionPopupController*)popup {
   return popupController_;
 }
 
 - (void)browserActionVisibilityHasChanged {
@@ skipping 114 matching lines @@
 
 - (int)currentTabId {
   TabContents* selected_tab = browser_->GetSelectedTabContents();
   if (!selected_tab)
     return -1;
 
   return selected_tab->controller().session_id().id();
 }
 
 @end