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

chrome/browser/cocoa/toolbar_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 "chrome/browser/cocoa/toolbar_controller.h"
 
 #include "app/l10n_util_mac.h"
 #include "base/mac_util.h"
 #include "base/nsimage_cache_mac.h"
 #include "base/sys_string_conversions.h"
@@ skipping 282 matching lines @@
       setEnabled:commands->IsCommandEnabled(IDC_FORWARD) ? YES : NO];
   [reloadButton_ setEnabled:commands->IsCommandEnabled(IDC_RELOAD) ? YES : NO];
   [homeButton_ setEnabled:commands->IsCommandEnabled(IDC_HOME) ? YES : NO];
   [starButton_
       setEnabled:commands->IsCommandEnabled(IDC_BOOKMARK_PAGE) ? YES : NO];
 }
 
 - (void)updateToolbarWithContents:(TabContents*)tab
                shouldRestoreState:(BOOL)shouldRestore {
   locationBarView_->Update(tab, shouldRestore ? true : false);
+
+  if (browserActionsController_.get()) {
+    [browserActionsController_ update];
+  }
 }
 
 - (void)setStarredState:(BOOL)isStarred {
   NSImage* starImage = nil;
   NSString* toolTip;
   if (isStarred) {
     starImage = nsimage_cache::ImageNamed(kStarButtonFillingImageName);
     // Cache the string since we'll need it a lot
     static NSString* starredToolTip =
         [l10n_util::GetNSStringWithFixup(IDS_TOOLTIP_STARRED) retain];
@@ skipping 288 matching lines @@
 
   NSRect r = NSMakeRect(minX, NSMinY(locationFrame), maxX - minX,
                         NSHeight(locationFrame));
   gfx::Rect stack_bounds(
       NSRectToCGRect([[self view] convertRect:r toView:nil]));
   // Inset the bounds to just inside the visible edges (see comment above).
   stack_bounds.Inset(kLocationStackEdgeWidth, 0);
   return stack_bounds;
 }
 @end