Fix regression where extension action icons may not be displayed properly

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

Index: chrome/browser/ui/views/toolbar/browser_action_view.cc
diff --git a/chrome/browser/ui/views/toolbar/browser_action_view.cc b/chrome/browser/ui/views/toolbar/browser_action_view.cc
index 2ae971d8dcba2eaa335234b188a76332b6962c05..0e1e724f03670420c907252e70549ae94a095e00 100644
--- a/chrome/browser/ui/views/toolbar/browser_action_view.cc
+++ b/chrome/browser/ui/views/toolbar/browser_action_view.cc
@@ -79,6 +79,7 @@ BrowserActionView::BrowserActionView(const Extension* extension,
       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();
 }