chrome/browser/prefs/browser_prefs.cc - Issue 11968034: 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 11968034: Enable profile switching for standalone App Launcher via the Settings App. (Closed) Base URL: git://nomatter.syd/chromium/src.git@master

Patch Set: respond to comments Created 7 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:

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

Download patch

« no previous file with comments | « chrome/browser/extensions/extension_install_ui_default.cc ('k') | chrome/browser/profiles/profile_manager.h » ('j') | chrome/browser/resources/options/options_settings_app.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/prefs/browser_prefs.cc

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

index 1cf05832dd7d8f0ab00f1df073182d5fad97eeea..71ddd1d62742e2bf4178d5f310896f466087328a 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"

@@ -220,6 +221,10 @@ void RegisterLocalState(PrefServiceSimple* local_state) {

#if defined(OS_MACOSX)

confirm_quit::RegisterLocalState(local_state);

#endif

+#if defined(ENABLE_APP_LIST)

tapted 2013/01/26 01:10:08 This will be true on CrOS, so it should be ENABLE_

koz (OOO until 15th September) 2013/01/29 00:34:11 Done.

+ chrome::RegisterAppListPrefs(local_state);

tapted 2013/01/26 01:10:08 Otherwise CrOS will need a definition of this in a

+#endif

}

void RegisterUserPrefs(PrefServiceSyncable* user_prefs) {