chrome/browser/prefs/browser_prefs.cc - Issue 10690060: startup: Put it in chrome namespace.

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 10690060: startup: Put it in chrome namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 6 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/prefs/browser_prefs.cc

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

index cd7287eddf34c1b5cdb66de6a6e728d2a3231aad..71ba28b7a88460a08d92daf3147a54742255cc6a 100644

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

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

@@ -173,7 +173,7 @@ void RegisterLocalState(PrefService* local_state) {

#endif

#if defined(OS_MACOSX)

- browser::RegisterObsoleteOSInfobarPrefs(local_state);

+ chrome::RegisterObsoleteOSInfobarPrefs(local_state);

confirm_quit::RegisterLocalState(local_state);

#endif

}

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

ExtensionPrefs::RegisterUserPrefs(user_prefs);

ExtensionWebUI::RegisterUserPrefs(user_prefs);

chrome::RegisterBrowserUserPrefs(user_prefs);

- browser::RegisterAutolaunchPrefs(user_prefs);

+ chrome::RegisterAutolaunchPrefs(user_prefs);

DevToolsWindow::RegisterUserPrefs(user_prefs);

PepperFlashSettingsManager::RegisterUserPrefs(user_prefs);

PinnedTabCodec::RegisterUserPrefs(user_prefs);