chrome/browser/ui/ash/chrome_shell_delegate.cc - Issue 12090062: Enable profile switching for standalone App Launcher via the Settings App.

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/ash/chrome_shell_delegate.cc

Issue 12090062: Enable profile switching for standalone App Launcher via the Settings App. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: disable tests on aura Created 7 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/ui/ash/app_list/app_list_controller_ash.cc ('k') | chrome/browser/ui/cocoa/app_list/app_list_controller_cocoa.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/chrome_shell_delegate.cc

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

index a28c94cbd322e43f926cec0e341e7a058dfde81d..59813fc7b3860c6f0fa727bf4a73131e333ce4c4 100644

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

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

@@ -416,7 +416,8 @@ app_list::AppListViewDelegate*

DCHECK(ash::Shell::HasInstance());

// Shell will own the created delegate, and the delegate will own

// the controller.

- return new AppListViewDelegate(new AppListControllerDelegateAsh());

+ Profile* profile = ProfileManager::GetDefaultProfileOrOffTheRecord();

+ return new AppListViewDelegate(new AppListControllerDelegateAsh(), profile);

}

ash::LauncherDelegate* ChromeShellDelegate::CreateLauncherDelegate(