chrome/browser/ui/startup/startup_browser_creator.cc - Issue 1861233003: Prepare for building with enable_app_list=0 on Desktop

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/startup/startup_browser_creator.cc

Issue 1861233003: Prepare for building with enable_app_list=0 on Desktop (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase to master (dependent CL landed) Created 4 years, 7 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

« chrome/browser/ui/apps/app_info_dialog.h ('K') | « chrome/browser/ui/apps/app_info_dialog.h ('k') | chrome/browser/ui/views/app_list/app_list_dialog_container.h » ('j') | chrome/chrome_tests.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/startup/startup_browser_creator.cc

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

index 11e51f87a412c529176e3afbb26c78733ad20f43..7a7f01df7f84ab6cd66fc254ef2932ba77dd83f9 100644

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

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

@@ -872,10 +872,12 @@ base::FilePath GetStartupProfilePath(const base::FilePath& user_data_dir,

command_line.GetSwitchValuePath(switches::kProfileDirectory));

}

+#if defined(ENABLE_APP_LIST)

// If we are showing the app list then chrome isn't shown so load the app

// list's profile rather than chrome's.

if (command_line.HasSwitch(switches::kShowAppList))

return AppListService::Get()->GetProfilePath(user_data_dir);

+#endif

return g_browser_process->profile_manager()->GetLastUsedProfileDir(

user_data_dir);