Chromium Code Reviews| Index: chrome/browser/ui/views/aura/chrome_shell_delegate.cc |
| diff --git a/chrome/browser/ui/views/aura/chrome_shell_delegate.cc b/chrome/browser/ui/views/aura/chrome_shell_delegate.cc |
| index 911c4670d05f9ca585954218da287c420688ab10..b4af97337572f90defa2e7ea8c85124a489f4044 100644 |
| --- a/chrome/browser/ui/views/aura/chrome_shell_delegate.cc |
| +++ b/chrome/browser/ui/views/aura/chrome_shell_delegate.cc |
| @@ -10,6 +10,7 @@ |
| #include "chrome/browser/ui/views/aura/status_area_host_aura.h" |
| #include "chrome/browser/ui/views/frame/browser_view.h" |
| #include "ui/aura/window.h" |
| +#include "ui/aura_shell/shell.h" |
|
sky
2011/12/12 15:46:29
sort
James Cook
2011/12/12 18:33:36
Done.
|
| #include "ui/aura_shell/launcher/launcher_types.h" |
| // static |
| @@ -32,6 +33,9 @@ StatusAreaView* ChromeShellDelegate::GetStatusArea() { |
| bool ChromeShellDelegate::ShouldCreateLauncherItemForBrowser( |
| Browser* browser, |
| aura_shell::LauncherItemType* type) { |
| + // Don't create items if we don't have a launcher at all. |
| + if (!aura_shell::Shell::GetInstance()->launcher()) |
|
sky
2011/12/12 15:46:29
It doesn't seem like you create the launcher, so t
James Cook
2011/12/12 18:33:36
I was using this to avoid a null-check in BrowserV
|
| + return false; |
| if (browser->type() == Browser::TYPE_TABBED) { |
| *type = aura_shell::TYPE_TABBED; |
| return true; |