diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-16 07:12:34 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-16 07:12:34 +0000 |
| commit | 651ee8875014500562546390eeed405a924a2c01 (patch) | |
| tree | 81e3108ec66afead54a18b286e71f4b6e281012e /ash | |
| parent | c0b70eaca8f47ebdbd0a9ffd95b529dc1c04a8c9 (diff) | |
| download | chromium_src-651ee8875014500562546390eeed405a924a2c01.zip chromium_src-651ee8875014500562546390eeed405a924a2c01.tar.gz chromium_src-651ee8875014500562546390eeed405a924a2c01.tar.bz2 | |
Fix ui test related crash.
BUG=none
TEST=none
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9418001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122250 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/launcher/launcher.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/launcher/launcher.cc b/ash/launcher/launcher.cc index 891b789..8bcb15d 100644 --- a/ash/launcher/launcher.cc +++ b/ash/launcher/launcher.cc @@ -107,7 +107,8 @@ Launcher::Launcher(aura::Window* window_container) window_container_(window_container), delegate_view_(NULL) { model_.reset(new LauncherModel); - delegate_.reset(Shell::GetInstance()->delegate()->CreateLauncherDelegate()); + if (Shell::GetInstance()->delegate()) + delegate_.reset(Shell::GetInstance()->delegate()->CreateLauncherDelegate()); widget_.reset(new views::Widget); views::Widget::InitParams params( |