| 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_
|
|
|