Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(120)

Unified Diff: chrome/browser/prefs/browser_prefs.h

Issue 10698111: browser: Move more files into chrome namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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/user_cloud_policy_manager_unittest.cc ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prefs/browser_prefs.h
diff --git a/chrome/browser/prefs/browser_prefs.h b/chrome/browser/prefs/browser_prefs.h
index 28ca78937cc0efee8b18feacd61d5fef26f10217..0f2026d2518ad8f855fd876112621a4264253e88 100644
--- a/chrome/browser/prefs/browser_prefs.h
+++ b/chrome/browser/prefs/browser_prefs.h
@@ -2,29 +2,22 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_PREFS_BROWSER_PREFS_H__
-#define CHROME_BROWSER_PREFS_BROWSER_PREFS_H__
+#ifndef CHROME_BROWSER_PREFS_BROWSER_PREFS_H_
+#define CHROME_BROWSER_PREFS_BROWSER_PREFS_H_
#pragma once
class PrefService;
class Profile;
-namespace browser {
-
-// Bitmask for kMultipleProfilePrefMigration.
-enum MigratedPreferences {
- NO_PREFS = 0,
- DNS_PREFS = 1 << 0,
- WINDOWS_PREFS = 1 << 1,
- GOOGLE_URL_TRACKER_PREFS = 1 << 2,
-};
+namespace chrome {
// Makes the PrefService objects aware of all the prefs.
void RegisterLocalState(PrefService* local_state);
void RegisterUserPrefs(PrefService* user_prefs);
-// Migrate prefs from local_state to |profile|'s pref store.
+
+// Migrates prefs from |local_state| to |profile|'s pref store.
void MigrateBrowserPrefs(Profile* profile, PrefService* local_state);
-} // namespace browser
+} // namespace chrome
-#endif // CHROME_BROWSER_PREFS_BROWSER_PREFS_H__
+#endif // CHROME_BROWSER_PREFS_BROWSER_PREFS_H_
« no previous file with comments | « chrome/browser/policy/user_cloud_policy_manager_unittest.cc ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698