Index: chrome/browser/ui/views/browser_action_view.cc |
diff --git a/chrome/browser/ui/views/browser_action_view.cc b/chrome/browser/ui/views/browser_action_view.cc |
index 19f817a2be176cf0d0cc1f13d2be946c4fdf675c..5db3bad73e3ebcb48bf7cf6d2dd652029d6ad8d0 100644 |
--- a/chrome/browser/ui/views/browser_action_view.cc |
+++ b/chrome/browser/ui/views/browser_action_view.cc |
@@ -64,6 +64,10 @@ gfx::ImageSkia BrowserActionView::GetIconWithBadge() { |
} |
void BrowserActionView::Layout() { |
+ // |button_| is NULL if Layout() is invoked before we have a valid widget. |
+ if (!button_) |
+ return; |
+ |
// We can't rely on button_->GetPreferredSize() here because that's not set |
// correctly until the first call to |
// BrowserActionsContainer::RefreshBrowserActionViews(), whereas this can be |