[chromium-reviews] Fix bug: browser action button disappears when loading a new extension. This ...

chrome/browser/views/toolbar_view.cc

Index: chrome/browser/views/toolbar_view.cc
===================================================================
--- chrome/browser/views/toolbar_view.cc	(revision 28628)
+++ chrome/browser/views/toolbar_view.cc	(working copy)
@@ -552,6 +552,16 @@
   int next_menu_x = go_->x() + go_->width() + kMenuButtonOffset;
 
   browser_actions_->SetBounds(next_menu_x, 0, browser_actions_width, height());
+
+  // The browser action needs to do a layout explicitly, because when an
+  // extension is loaded/unloaded/changed, BrowserActionContainer removes and
+  // re-adds everything, regardless of whether it has a page action. For a
+  // page action, browser action bounds do not change, as a result of which
+  // SetBounds does not do a layout at all.
+  // TODO(sidchat): Rework the above bahavior so that explicit layout is not
+  //                required.
+  browser_actions_->Layout();
+
   next_menu_x += browser_actions_width;
 
   if (bookmark_menu_) {