OLD | NEW |
---|---|
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/prefs/browser_prefs.h" | 5 #include "chrome/browser/prefs/browser_prefs.h" |
6 | 6 |
7 #include "chrome/browser/about_flags.h" | 7 #include "chrome/browser/about_flags.h" |
8 #include "chrome/browser/autofill/autofill_manager.h" | 8 #include "chrome/browser/autofill/autofill_manager.h" |
9 #include "chrome/browser/background/background_mode_manager.h" | 9 #include "chrome/browser/background/background_mode_manager.h" |
10 #include "chrome/browser/bookmarks/bookmark_model.h" | 10 #include "chrome/browser/bookmarks/bookmark_model.h" |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
75 #include "chrome/browser/ui/views/frame/browser_view.h" | 75 #include "chrome/browser/ui/views/frame/browser_view.h" |
76 #endif | 76 #endif |
77 | 77 |
78 #if defined(TOOLKIT_GTK) | 78 #if defined(TOOLKIT_GTK) |
79 #include "chrome/browser/ui/gtk/browser_window_gtk.h" | 79 #include "chrome/browser/ui/gtk/browser_window_gtk.h" |
80 #endif | 80 #endif |
81 | 81 |
82 #if defined(OS_CHROMEOS) | 82 #if defined(OS_CHROMEOS) |
83 #include "chrome/browser/chromeos/audio_mixer_alsa.h" | 83 #include "chrome/browser/chromeos/audio_mixer_alsa.h" |
84 #include "chrome/browser/chromeos/customization_document.h" | 84 #include "chrome/browser/chromeos/customization_document.h" |
85 #include "chrome/browser/chromeos/login/signed_settings_temp_storage.h" | 85 #include "chrome/browser/chromeos/login/signed_settings_cache.h" |
86 #include "chrome/browser/chromeos/login/user_manager.h" | 86 #include "chrome/browser/chromeos/login/user_manager.h" |
87 #include "chrome/browser/chromeos/login/wizard_controller.h" | 87 #include "chrome/browser/chromeos/login/wizard_controller.h" |
88 #include "chrome/browser/chromeos/preferences.h" | 88 #include "chrome/browser/chromeos/preferences.h" |
89 #include "chrome/browser/chromeos/proxy_config_service_impl.h" | 89 #include "chrome/browser/chromeos/proxy_config_service_impl.h" |
90 #include "chrome/browser/chromeos/status/input_method_menu.h" | 90 #include "chrome/browser/chromeos/status/input_method_menu.h" |
91 #include "chrome/browser/chromeos/status/network_menu_button.h" | 91 #include "chrome/browser/chromeos/status/network_menu_button.h" |
92 #include "chrome/browser/chromeos/user_cros_settings_provider.h" | 92 #include "chrome/browser/chromeos/device_settings_provider.h" |
Mattias Nissler (ping if slow)
2011/11/30 12:25:50
can be removed?
pastarmovj
2011/11/30 17:21:16
Done.
| |
93 #else | 93 #else |
94 #include "chrome/browser/extensions/default_apps.h" | 94 #include "chrome/browser/extensions/default_apps.h" |
95 #endif | 95 #endif |
96 | 96 |
97 namespace browser { | 97 namespace browser { |
98 | 98 |
99 void RegisterLocalState(PrefService* local_state) { | 99 void RegisterLocalState(PrefService* local_state) { |
100 // Prefs in Local State | 100 // Prefs in Local State |
101 local_state->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0); | 101 local_state->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0); |
102 AppsPromo::RegisterPrefs(local_state); | 102 AppsPromo::RegisterPrefs(local_state); |
(...skipping 25 matching lines...) Expand all Loading... | |
128 PrefProxyConfigTrackerImpl::RegisterPrefs(local_state); | 128 PrefProxyConfigTrackerImpl::RegisterPrefs(local_state); |
129 SSLConfigServiceManager::RegisterPrefs(local_state); | 129 SSLConfigServiceManager::RegisterPrefs(local_state); |
130 #if defined(ENABLE_CONFIGURATION_POLICY) | 130 #if defined(ENABLE_CONFIGURATION_POLICY) |
131 policy::CloudPolicySubsystem::RegisterPrefs(local_state); | 131 policy::CloudPolicySubsystem::RegisterPrefs(local_state); |
132 #endif | 132 #endif |
133 ProfileInfoCache::RegisterPrefs(local_state); | 133 ProfileInfoCache::RegisterPrefs(local_state); |
134 ProfileManager::RegisterPrefs(local_state); | 134 ProfileManager::RegisterPrefs(local_state); |
135 #if defined(OS_CHROMEOS) | 135 #if defined(OS_CHROMEOS) |
136 chromeos::AudioMixerAlsa::RegisterPrefs(local_state); | 136 chromeos::AudioMixerAlsa::RegisterPrefs(local_state); |
137 chromeos::UserManager::RegisterPrefs(local_state); | 137 chromeos::UserManager::RegisterPrefs(local_state); |
138 chromeos::UserCrosSettingsProvider::RegisterPrefs(local_state); | |
139 chromeos::WizardController::RegisterPrefs(local_state); | 138 chromeos::WizardController::RegisterPrefs(local_state); |
140 chromeos::InputMethodMenu::RegisterPrefs(local_state); | 139 chromeos::InputMethodMenu::RegisterPrefs(local_state); |
141 chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state); | 140 chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state); |
142 chromeos::SignedSettingsTempStorage::RegisterPrefs(local_state); | 141 chromeos::SignedSettingsCache::RegisterPrefs(local_state); |
143 chromeos::NetworkMenuButton::RegisterPrefs(local_state); | 142 chromeos::NetworkMenuButton::RegisterPrefs(local_state); |
144 chromeos::ProxyConfigServiceImpl::RegisterPrefs(local_state); | 143 chromeos::ProxyConfigServiceImpl::RegisterPrefs(local_state); |
145 #endif | 144 #endif |
146 } | 145 } |
147 | 146 |
148 void RegisterUserPrefs(PrefService* user_prefs) { | 147 void RegisterUserPrefs(PrefService* user_prefs) { |
149 // User prefs | 148 // User prefs |
150 AppsPromo::RegisterUserPrefs(user_prefs); | 149 AppsPromo::RegisterUserPrefs(user_prefs); |
151 AutofillManager::RegisterUserPrefs(user_prefs); | 150 AutofillManager::RegisterUserPrefs(user_prefs); |
152 SessionStartupPref::RegisterUserPrefs(user_prefs); | 151 SessionStartupPref::RegisterUserPrefs(user_prefs); |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
224 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); | 223 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); |
225 } | 224 } |
226 local_state->ClearPref(prefs::kBrowserWindowPlacement); | 225 local_state->ClearPref(prefs::kBrowserWindowPlacement); |
227 | 226 |
228 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 227 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
229 current_version | WINDOWS_PREFS); | 228 current_version | WINDOWS_PREFS); |
230 } | 229 } |
231 } | 230 } |
232 | 231 |
233 } // namespace browser | 232 } // namespace browser |
OLD | NEW |