| 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_contents_service.h" | 9 #include "chrome/browser/background/background_contents_service.h" |
| 10 #include "chrome/browser/background/background_mode_manager.h" | 10 #include "chrome/browser/background/background_mode_manager.h" |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 NewTabUI::RegisterUserPrefs(user_prefs); | 157 NewTabUI::RegisterUserPrefs(user_prefs); |
| 158 PluginPrefs::RegisterPrefs(user_prefs); | 158 PluginPrefs::RegisterPrefs(user_prefs); |
| 159 PluginsUI::RegisterUserPrefs(user_prefs); | 159 PluginsUI::RegisterUserPrefs(user_prefs); |
| 160 ProfileImpl::RegisterUserPrefs(user_prefs); | 160 ProfileImpl::RegisterUserPrefs(user_prefs); |
| 161 PromoResourceService::RegisterUserPrefs(user_prefs); | 161 PromoResourceService::RegisterUserPrefs(user_prefs); |
| 162 HostContentSettingsMap::RegisterUserPrefs(user_prefs); | 162 HostContentSettingsMap::RegisterUserPrefs(user_prefs); |
| 163 DevToolsWindow::RegisterUserPrefs(user_prefs); | 163 DevToolsWindow::RegisterUserPrefs(user_prefs); |
| 164 PinnedTabCodec::RegisterUserPrefs(user_prefs); | 164 PinnedTabCodec::RegisterUserPrefs(user_prefs); |
| 165 ExtensionPrefs::RegisterUserPrefs(user_prefs); | 165 ExtensionPrefs::RegisterUserPrefs(user_prefs); |
| 166 TranslatePrefs::RegisterUserPrefs(user_prefs); | 166 TranslatePrefs::RegisterUserPrefs(user_prefs); |
| 167 DesktopNotificationService::RegisterUserPrefs(user_prefs); | |
| 168 PrefProxyConfigService::RegisterPrefs(user_prefs); | 167 PrefProxyConfigService::RegisterPrefs(user_prefs); |
| 169 #if defined(TOOLKIT_VIEWS) | 168 #if defined(TOOLKIT_VIEWS) |
| 170 BrowserActionsContainer::RegisterUserPrefs(user_prefs); | 169 BrowserActionsContainer::RegisterUserPrefs(user_prefs); |
| 171 #elif defined(TOOLKIT_GTK) | 170 #elif defined(TOOLKIT_GTK) |
| 172 BrowserWindowGtk::RegisterUserPrefs(user_prefs); | 171 BrowserWindowGtk::RegisterUserPrefs(user_prefs); |
| 173 #endif | 172 #endif |
| 174 #if defined(OS_CHROMEOS) | 173 #if defined(OS_CHROMEOS) |
| 175 chromeos::Preferences::RegisterUserPrefs(user_prefs); | 174 chromeos::Preferences::RegisterUserPrefs(user_prefs); |
| 176 #endif | 175 #endif |
| 177 BackgroundContentsService::RegisterUserPrefs(user_prefs); | 176 BackgroundContentsService::RegisterUserPrefs(user_prefs); |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 210 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); | 209 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); |
| 211 } | 210 } |
| 212 local_state->ClearPref(prefs::kBrowserWindowPlacement); | 211 local_state->ClearPref(prefs::kBrowserWindowPlacement); |
| 213 | 212 |
| 214 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 213 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 215 current_version | WINDOWS_PREFS); | 214 current_version | WINDOWS_PREFS); |
| 216 } | 215 } |
| 217 } | 216 } |
| 218 | 217 |
| 219 } // namespace browser | 218 } // namespace browser |
| OLD | NEW |