chrome/browser/prefs/browser_prefs.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/prefs/browser_prefs.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

Index: chrome/browser/prefs/browser_prefs.cc

diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc

index 26472e47db57bd9eec167ca90875e893e7cebce5..61613ee6c42b2c318714b31a947babd414a98e07 100644

--- a/chrome/browser/prefs/browser_prefs.cc

+++ b/chrome/browser/prefs/browser_prefs.cc

@@ -59,6 +59,7 @@

#include "chrome/browser/task_manager/task_manager.h"

#include "chrome/browser/translate/translate_prefs.h"

#include "chrome/browser/ui/alternate_error_tab_observer.h"

+#include "chrome/browser/ui/app_list/app_list_util.h"

#include "chrome/browser/ui/browser_instant_controller.h"

#include "chrome/browser/ui/browser_ui_prefs.h"

#include "chrome/browser/ui/network_profile_bubble.h"

@@ -222,6 +223,10 @@ void RegisterLocalState(PrefServiceSimple* local_state) {

#if defined(OS_MACOSX)

confirm_quit::RegisterLocalState(local_state);

#endif

+#if defined(ENABLE_SETTINGS_APP)

+ chrome::RegisterAppListPrefs(local_state);

+#endif

}

void RegisterUserPrefs(PrefServiceSyncable* user_prefs) {

« no previous file with comments | « chrome/browser/extensions/extension_install_ui_default.cc ('k') | chrome/browser/profiles/profile_manager.h » ('j') | no next file with comments »