chrome/browser/ui/browser.cc - Issue 9590001: Launch panels as popup windows in Aura, and add separate launcher icon logic for panels.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/browser.cc

Issue 9590001: Launch panels as popup windows in Aura, and add separate launcher icon logic for panels. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: . Created 8 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/extension_tabs_module.cc ('k') | chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/browser.cc

diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc

index 22fcb5a4d87c25c7261cbbc0741ff84d8d2eb505..89138e94bf58d97eef40281c952e991b0529147c 100644

--- a/chrome/browser/ui/browser.cc

+++ b/chrome/browser/ui/browser.cc

@@ -4603,10 +4603,18 @@ void Browser::ShowFirstRunBubble() {

BrowserWindow* Browser::CreateBrowserWindow() {

// TODO(yfriedman): remove OS_ANDROID clause when browser is excluded from

// Android build.

-#if (!defined(OS_CHROMEOS) || defined(USE_AURA)) && !defined(OS_ANDROID)

- if (is_type_panel())

- return PanelManager::GetInstance()->CreatePanel(this);

+#if !defined(OS_ANDROID)

+ bool create_panel = false;

+#if defined(USE_AURA)

+ 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)

+ return PanelManager::GetInstance()->CreatePanel(this);

+#endif // OS_ANDROID

return BrowserWindow::CreateBrowserWindow(this);

}