chrome/browser/prefs/browser_prefs.cc - Issue 10445043: browser: Handle the registration of ChromeLauncher prefs outside of views.

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 10445043: browser: Handle the registration of ChromeLauncher prefs outside of views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 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

« no previous file with comments | « chrome/browser/policy/configuration_policy_handler_chromeos_unittest.cc ('k') | chrome/browser/ui/ash/chrome_launcher_prefs.h » ('j') | no next file with comments »
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 6376e41f95d26215997f576664b397d604eb9147..e030358a0d7a87ad085228f4ec65ce71550f5a3e 100644

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

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

@@ -102,7 +102,7 @@

#endif

#if defined(USE_ASH)

-#include "chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.h"

+#include "chrome/browser/ui/ash/chrome_launcher_prefs.h"

#endif

namespace browser {

@@ -215,7 +215,7 @@ void RegisterUserPrefs(PrefService* user_prefs) {

#endif

#if defined(USE_ASH)

- ChromeLauncherController::RegisterUserPrefs(user_prefs);

+ ash::RegisterChromeLauncherUserPrefs(user_prefs);

#endif

#if !defined(OS_ANDROID)