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

chrome/browser/views/toolbar_view.cc

 // 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.
 
 #include "chrome/browser/views/toolbar_view.h"
 
 #include <string>
 
 #include "app/drag_drop_types.h"
 #include "app/gfx/canvas.h"
@@ skipping 534 matching lines @@
   }
   location_bar_->SetBounds(location_x, child_y, std::max(available_width, 0),
                            child_height);
 
   go_->SetBounds(location_bar_->x() + location_bar_->width(), child_y,
                  go_button_width, child_height);
 
   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_) {
     bookmark_menu_->SetBounds(next_menu_x, child_y, bookmark_menu_width,
                               child_height);
     next_menu_x += bookmark_menu_width;
   }
 
   page_menu_->SetBounds(next_menu_x, child_y, page_menu_width, child_height);
   next_menu_x += page_menu_width;
@@ skipping 586 matching lines @@
   app_menu_contents_->AddItem(IDC_ABOUT,
                               l10n_util::GetStringFUTF16(
                                   IDS_ABOUT,
                                   l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
   app_menu_contents_->AddItemWithStringId(IDC_HELP_PAGE, IDS_HELP_PAGE);
   app_menu_contents_->AddSeparator();
   app_menu_contents_->AddItemWithStringId(IDC_EXIT, IDS_EXIT);
 
   app_menu_menu_.reset(new views::Menu2(app_menu_contents_.get()));
 }