Attempt at fixing crash. Because BrowserActionView lazily creates its

Attempt at fixing crash. Because BrowserActionView lazily creates its
button it is entirely possible for Layout() to be invoked before the
button_ has been created.

BUG=143001
TEST=none
R=ben@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=151828

[Ben Goodger (Google), 2012-08-16 00:09:53]

lgtm


On Wed, Aug 15, 2012 at 5:02 PM, <sky@chromium.org> wrote:

> Reviewers: Ben Goodger (Google),
>
> Description:
> Attempt at fixing crash. Because BrowserActionView lazily creates its
> button it is entirely possible for Layout() to be invoked before the
> button_ has been created.
>
> BUG=143001
> TEST=none
> R=ben@chromium.org
>
>
> Please review this at
http://codereview.chromium.**org/10857024/<http://codereview.chromium.org/108...
>
> SVN Base:
svn://svn.chromium.org/chrome/**trunk/src<http://svn.chromium.org/chrome/trunk/src>
>
> Affected files:
>   M chrome/browser/ui/views/**action_box_menu.cc
>   M chrome/browser/ui/views/**browser_action_view.cc
>
>
> Index: chrome/browser/ui/views/**action_box_menu.cc
> diff --git a/chrome/browser/ui/views/**action_box_menu.cc
> b/chrome/browser/ui/views/**action_box_menu.cc
> index 2704499d36287609bc8ad2bf08aef0**760b5effec..**
> 6eaeae414f477de96e9a4ab2c623b8**34cb15ff21 100644
> --- a/chrome/browser/ui/views/**action_box_menu.cc
> +++ b/chrome/browser/ui/views/**action_box_menu.cc
> @@ -57,7 +57,7 @@ void ActionBoxMenu::RunMenu(views::**MenuButton*
> menu_button) {
>  }
>
>  void ActionBoxMenu::ExecuteCommand(**int id) {
> -};
> +}
>
>  views::Border* ActionBoxMenu::**CreateMenuBorder() {
>    // TODO(yefim): Use correct theme color on non-Windows.
> 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 19f817a2be176cf0d0cc1f13d2be94**6c4fdf675c..**
> 5db3bad73e3ebcb48bf7cf6d2dd652**029d6ad8d0 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
>
>
>

[commit-bot: I haz the power, 2012-08-16 00:11:55]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/sky@chromium.org/10857024/1

[commit-bot: I haz the power, 2012-08-16 01:54:09]

Try job failure for 10857024-1 (retry) on linux_rel for step
"interactive_ui_tests".
It's a second try, previously, step "interactive_ui_tests" failed.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_rel&...