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 136 matching lines @@
              gfx::ImageSkiaOperations::CreateSuperimposedImage(bg, icon));
   }
 
   // If the browser action name is empty, show the extension name instead.
   std::string title = extension_action()->GetTitle(tab_id);
   base::string16 name =
       base::UTF8ToUTF16(title.empty() ? extension()->name() : title);
   SetTooltipText(name);
   SetAccessibleName(name);
 
+  Layout();  // We need to layout since we may have added an icon as a result.
   SchedulePaint();
 }
 
 bool BrowserActionView::IsPopup() {
   int tab_id = view_controller_->GetCurrentTabId();
   return (tab_id < 0) ? false : extension_action()->HasPopup(tab_id);
 }
 
 void BrowserActionView::Observe(int type,
                                 const content::NotificationSource& source,
@@ skipping 169 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.
 }