| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "apps/prefs.h" | 7 #include "apps/prefs.h" |
| 8 #include "base/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
| 9 #include "base/prefs/pref_registry_simple.h" | 9 #include "base/prefs/pref_registry_simple.h" |
| 10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
| (...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 333 #if defined(ENABLE_NOTIFICATIONS) | 333 #if defined(ENABLE_NOTIFICATIONS) |
| 334 DesktopNotificationService::RegisterProfilePrefs(registry); | 334 DesktopNotificationService::RegisterProfilePrefs(registry); |
| 335 #endif | 335 #endif |
| 336 | 336 |
| 337 #if defined(TOOLKIT_VIEWS) | 337 #if defined(TOOLKIT_VIEWS) |
| 338 RegisterInvertBubbleUserPrefs(registry); | 338 RegisterInvertBubbleUserPrefs(registry); |
| 339 #elif defined(TOOLKIT_GTK) | 339 #elif defined(TOOLKIT_GTK) |
| 340 BrowserWindowGtk::RegisterProfilePrefs(registry); | 340 BrowserWindowGtk::RegisterProfilePrefs(registry); |
| 341 #endif | 341 #endif |
| 342 | 342 |
| 343 #if defined(ENABLE_FULL_PRINTING) |
| 344 print_dialog_cloud::RegisterProfilePrefs(registry); |
| 345 printing::StickySettings::RegisterProfilePrefs(registry); |
| 346 CloudPrintURL::RegisterProfilePrefs(registry); |
| 347 #endif |
| 348 |
| 343 #if defined(OS_ANDROID) | 349 #if defined(OS_ANDROID) |
| 344 PromoHandler::RegisterProfilePrefs(registry); | 350 PromoHandler::RegisterProfilePrefs(registry); |
| 345 #endif | 351 #endif |
| 346 | 352 |
| 347 #if defined(USE_ASH) | 353 #if defined(USE_ASH) |
| 348 ash::RegisterChromeLauncherUserPrefs(registry); | 354 ash::RegisterChromeLauncherUserPrefs(registry); |
| 349 #endif | 355 #endif |
| 350 | 356 |
| 351 #if !defined(OS_ANDROID) | 357 #if !defined(OS_ANDROID) |
| 352 CloudPrintURL::RegisterProfilePrefs(registry); | |
| 353 DeviceIDFetcher::RegisterProfilePrefs(registry); | 358 DeviceIDFetcher::RegisterProfilePrefs(registry); |
| 354 DevToolsWindow::RegisterProfilePrefs(registry); | 359 DevToolsWindow::RegisterProfilePrefs(registry); |
| 355 extensions::CommandService::RegisterProfilePrefs(registry); | 360 extensions::CommandService::RegisterProfilePrefs(registry); |
| 356 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry); | 361 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry); |
| 357 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry); | 362 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry); |
| 358 first_run::RegisterProfilePrefs(registry); | 363 first_run::RegisterProfilePrefs(registry); |
| 359 PepperFlashSettingsManager::RegisterProfilePrefs(registry); | 364 PepperFlashSettingsManager::RegisterProfilePrefs(registry); |
| 360 PinnedTabCodec::RegisterProfilePrefs(registry); | 365 PinnedTabCodec::RegisterProfilePrefs(registry); |
| 361 PluginsUI::RegisterProfilePrefs(registry); | 366 PluginsUI::RegisterProfilePrefs(registry); |
| 362 print_dialog_cloud::RegisterProfilePrefs(registry); | |
| 363 printing::StickySettings::RegisterProfilePrefs(registry); | |
| 364 RegisterAutolaunchUserPrefs(registry); | 367 RegisterAutolaunchUserPrefs(registry); |
| 365 signin::RegisterProfilePrefs(registry); | 368 signin::RegisterProfilePrefs(registry); |
| 366 #endif | 369 #endif |
| 367 | 370 |
| 368 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) | 371 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) |
| 369 default_apps::RegisterProfilePrefs(registry); | 372 default_apps::RegisterProfilePrefs(registry); |
| 370 #endif | 373 #endif |
| 371 | 374 |
| 372 #if defined(OS_CHROMEOS) | 375 #if defined(OS_CHROMEOS) |
| 373 chromeos::Preferences::RegisterProfilePrefs(registry); | 376 chromeos::Preferences::RegisterProfilePrefs(registry); |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 503 } | 506 } |
| 504 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 507 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 505 | 508 |
| 506 current_version |= GOOGLE_URL_TRACKER_PREFS; | 509 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 507 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 510 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 508 current_version); | 511 current_version); |
| 509 } | 512 } |
| 510 } | 513 } |
| 511 | 514 |
| 512 } // namespace chrome | 515 } // namespace chrome |
| OLD | NEW |