chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc - Issue 2640023005: Load shelf preferences from ChromeLauncherController::AttachProfile.

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/launcher/chrome_launcher_controller_impl.cc

Issue 2640023005: Load shelf preferences from ChromeLauncherController::AttachProfile. (Closed)

Patch Set: Revert SetPerDisplayPref change. Created 3 years, 11 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:

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc

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

index e731a9ac7741a9a50bb18d59fd0e33aa78234886..ec70faf4f61a22855836299cec55d1e387142d05 100644

--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc

+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc

@@ -604,8 +604,8 @@ void ChromeLauncherControllerImpl::ActiveUserChanged(

for (auto& controller : app_window_controllers_)

controller->ActiveUserChanged(user_email);

// Update the user specific shell properties from the new user profile.

+ // Shelf preferences are loaded in ChromeLauncherController::AttachProfile.

UpdateAppLaunchersFromPref();

- SetShelfBehaviorsFromPrefs();

SetVirtualKeyboardBehaviorFromPrefs();

// Restore the order of running, but unpinned applications for the activated

« no previous file with comments | « chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc ('k') | no next file » | no next file with comments »