Fix regression where extension action icons may not be displayed properly

chrome/browser/ui/views/toolbar/browser_action_view.cc

 // Copyright 2013 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/ui/views/toolbar/browser_action_view.h"
 
 #include <string>
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 61 matching lines @@
                  notification_source);
 
   // We also listen for browser theme changes on linux because a switch from or
   // to GTK requires that we regrab our browser action images.
   registrar_.Add(
       this,
       chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
       content::Source<ThemeService>(
           ThemeServiceFactory::GetForProfile(browser->profile())));
 
+  Layout();  // We need to layout since we may have added an icon as a result.

[Peter Kasting, 2014/09/26 20:28:17]

Should Layout() call UpdateState()?  Conversely, should UpdateState() call
Layout()?

[Devlin, 2014/09/26 20:45:34]

Sorry about that - copied the patch over from a Win8 testing machine, and
somewhere along the line it made it into the wrong method.  This was supposed to
be in UpdateState(), which is where the image is set.  We shouldn't have to
worry about calling UpdateState() from Layout() (since we only update state when
something has changed, and UpdateState() now calls Layout()).

   UpdateState();
 }
 
 BrowserActionView::~BrowserActionView() {
 }
 
 void BrowserActionView::ViewHierarchyChanged(
     const ViewHierarchyChangedDetails& details) {
   if (details.is_add && !called_registered_extension_command_ &&
       GetFocusManager()) {
@@ skipping 244 matching lines @@
 }
 
 void BrowserActionView::CleanupPopup() {
   // We need to do these actions synchronously (instead of closing and then
   // performing the rest of the cleanup in OnWidgetDestroyed()) because
   // OnWidgetDestroyed() can be called asynchronously from Close(), and we need
   // to keep the delegate's popup owner up-to-date.
   delegate_->SetPopupOwner(NULL);
   pressed_lock_.reset();  // Unpress the menu button if it was pressed.
 }