| Index: chrome/browser/ui/browser.cc
|
| diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
|
| index 029e9b96ab05f8cd8a36c32541c34ff5dd8af7dc..227153b3cc3809ae43a64cb5cd69d71a64a9ae2b 100644
|
| --- a/chrome/browser/ui/browser.cc
|
| +++ b/chrome/browser/ui/browser.cc
|
| @@ -1424,17 +1424,10 @@ void Browser::ShowFirstRunBubble() {
|
| // Browser, protected:
|
|
|
| BrowserWindow* Browser::CreateBrowserWindow() {
|
| - bool create_panel = false;
|
| -#if defined(USE_ASH)
|
| - if (CommandLine::ForCurrentProcess()->HasSwitch(
|
| - ash::switches::kAuraPanelManager))
|
| - create_panel = is_type_panel();
|
| -#elif !defined(OS_CHROMEOS)
|
| - create_panel = is_type_panel();
|
| -#endif
|
| - if (create_panel)
|
| +#if !defined(USE_ASH)
|
| + if (is_type_panel())
|
| return PanelManager::GetInstance()->CreatePanel(this)->browser_window();
|
| -
|
| +#endif
|
| return BrowserWindow::CreateBrowserWindow(this);
|
| }
|
|
|
|
|