| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 Browser::RegisterPrefs(local_state); | 107 Browser::RegisterPrefs(local_state); |
| 108 FlagsUI::RegisterPrefs(local_state); | 108 FlagsUI::RegisterPrefs(local_state); |
| 109 WebCacheManager::RegisterPrefs(local_state); | 109 WebCacheManager::RegisterPrefs(local_state); |
| 110 ExternalProtocolHandler::RegisterPrefs(local_state); | 110 ExternalProtocolHandler::RegisterPrefs(local_state); |
| 111 GoogleURLTracker::RegisterPrefs(local_state); | 111 GoogleURLTracker::RegisterPrefs(local_state); |
| 112 IntranetRedirectDetector::RegisterPrefs(local_state); | 112 IntranetRedirectDetector::RegisterPrefs(local_state); |
| 113 KeywordEditorController::RegisterPrefs(local_state); | 113 KeywordEditorController::RegisterPrefs(local_state); |
| 114 MetricsLog::RegisterPrefs(local_state); | 114 MetricsLog::RegisterPrefs(local_state); |
| 115 MetricsService::RegisterPrefs(local_state); | 115 MetricsService::RegisterPrefs(local_state); |
| 116 NewTabPageHandler::RegisterPrefs(local_state); | 116 NewTabPageHandler::RegisterPrefs(local_state); |
| 117 #if !defined(OS_ANDROID) |
| 117 printing::PrintJobManager::RegisterPrefs(local_state); | 118 printing::PrintJobManager::RegisterPrefs(local_state); |
| 119 #endif |
| 118 PromoResourceService::RegisterPrefs(local_state); | 120 PromoResourceService::RegisterPrefs(local_state); |
| 119 | 121 |
| 120 #if defined(ENABLE_SAFE_BROWSING) | 122 #if defined(ENABLE_SAFE_BROWSING) |
| 121 SafeBrowsingService::RegisterPrefs(local_state); | 123 SafeBrowsingService::RegisterPrefs(local_state); |
| 122 #endif | 124 #endif |
| 123 browser_shutdown::RegisterPrefs(local_state); | 125 browser_shutdown::RegisterPrefs(local_state); |
| 124 #if defined(TOOLKIT_VIEWS) | 126 #if defined(TOOLKIT_VIEWS) |
| 125 BrowserView::RegisterBrowserViewPrefs(local_state); | 127 BrowserView::RegisterBrowserViewPrefs(local_state); |
| 126 #endif | 128 #endif |
| 127 UpgradeDetector::RegisterPrefs(local_state); | 129 UpgradeDetector::RegisterPrefs(local_state); |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 233 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); | 235 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); |
| 234 } | 236 } |
| 235 local_state->ClearPref(prefs::kBrowserWindowPlacement); | 237 local_state->ClearPref(prefs::kBrowserWindowPlacement); |
| 236 | 238 |
| 237 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 239 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 238 current_version | WINDOWS_PREFS); | 240 current_version | WINDOWS_PREFS); |
| 239 } | 241 } |
| 240 } | 242 } |
| 241 | 243 |
| 242 } // namespace browser | 244 } // namespace browser |
| OLD | NEW |