Fixes crash in launcher. Some tests don't end up creating a delegate,

Fixes crash in launcher. Some tests don't end up creating a delegate,
so need to NULL check it.

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

[Ben Goodger (Google), 2011-12-14 18:31:21]

LGTM

On Wed, Dec 14, 2011 at 10:25 AM, <sky@chromium.org> wrote:

> Reviewers: Ben Goodger (Google),
>
> Description:
> Fixes crash in launcher. Some tests don't end up creating a delegate,
> so need to NULL check it.
>
> BUG=none
> TEST=none
> R=ben@chromium.org
>
>
> Please review this at
http://codereview.chromium.**org/8914012/<http://codereview.chromium.org/8914...
>
> SVN Base:
svn://svn.chromium.org/chrome/**trunk/src<http://svn.chromium.org/chrome/trunk/src>
>
> Affected files:
>  M ui/aura_shell/launcher/**launcher_view.cc
>
>
> Index: ui/aura_shell/launcher/**launcher_view.cc
> diff --git a/ui/aura_shell/launcher/**launcher_view.cc
> b/ui/aura_shell/launcher/**launcher_view.cc
> index 7847f7712ccf0dfdf661f56875139d**b9d4d929f3..**
> 0f78a9b7c9efed68166d212b648b82**e86855ca24 100644
> --- a/ui/aura_shell/launcher/**launcher_view.cc
> +++ b/ui/aura_shell/launcher/**launcher_view.cc
> @@ -205,8 +205,10 @@ void LauncherView::Init() {
>   model_->AddObserver(this);
>   ResourceBundle& rb = ResourceBundle::**GetSharedInstance();
>   new_browser_button_ = new views::ImageButton(this);
> -  int new_browser_button_image_id =
> -      Shell::GetInstance()->**delegate()->**
> GetResourceIDForNewBrowserWind**ow();
> +  ShellDelegate* delegate = Shell::GetInstance()->**delegate();
> +  int new_browser_button_image_id = delegate ?
> +      delegate->**GetResourceIDForNewBrowserWind**ow() :
> +      IDR_AURA_LAUNCHER_ICON_CHROME;
>   new_browser_button_->SetImage(
>       views::CustomButton::BS_**NORMAL,
>       rb.GetImageNamed(new_browser_**button_image_id).ToSkBitmap())**;
>
>
>

[commit-bot: I haz the power, 2011-12-14 18:33:22]

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

[commit-bot: I haz the power, 2011-12-14 20:38:17]

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