| 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 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 342 #if defined(ENABLE_NOTIFICATIONS) | 342 #if defined(ENABLE_NOTIFICATIONS) |
| 343 DesktopNotificationService::RegisterProfilePrefs(registry); | 343 DesktopNotificationService::RegisterProfilePrefs(registry); |
| 344 #endif | 344 #endif |
| 345 | 345 |
| 346 #if defined(TOOLKIT_VIEWS) | 346 #if defined(TOOLKIT_VIEWS) |
| 347 RegisterInvertBubbleUserPrefs(registry); | 347 RegisterInvertBubbleUserPrefs(registry); |
| 348 #elif defined(TOOLKIT_GTK) | 348 #elif defined(TOOLKIT_GTK) |
| 349 BrowserWindowGtk::RegisterProfilePrefs(registry); | 349 BrowserWindowGtk::RegisterProfilePrefs(registry); |
| 350 #endif | 350 #endif |
| 351 | 351 |
| 352 #if defined(ENABLE_FULL_PRINTING) |
| 353 print_dialog_cloud::RegisterProfilePrefs(registry); |
| 354 printing::StickySettings::RegisterProfilePrefs(registry); |
| 355 CloudPrintURL::RegisterProfilePrefs(registry); |
| 356 #endif |
| 357 |
| 352 #if defined(OS_ANDROID) | 358 #if defined(OS_ANDROID) |
| 353 PromoHandler::RegisterProfilePrefs(registry); | 359 PromoHandler::RegisterProfilePrefs(registry); |
| 354 #endif | 360 #endif |
| 355 | 361 |
| 356 #if defined(USE_ASH) | 362 #if defined(USE_ASH) |
| 357 ash::RegisterChromeLauncherUserPrefs(registry); | 363 ash::RegisterChromeLauncherUserPrefs(registry); |
| 358 #endif | 364 #endif |
| 359 | 365 |
| 360 #if !defined(OS_ANDROID) | 366 #if !defined(OS_ANDROID) |
| 361 CloudPrintURL::RegisterProfilePrefs(registry); | |
| 362 DeviceIDFetcher::RegisterProfilePrefs(registry); | 367 DeviceIDFetcher::RegisterProfilePrefs(registry); |
| 363 DevToolsWindow::RegisterProfilePrefs(registry); | 368 DevToolsWindow::RegisterProfilePrefs(registry); |
| 364 extensions::CommandService::RegisterProfilePrefs(registry); | 369 extensions::CommandService::RegisterProfilePrefs(registry); |
| 365 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry); | 370 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry); |
| 366 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry); | 371 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry); |
| 367 first_run::RegisterProfilePrefs(registry); | 372 first_run::RegisterProfilePrefs(registry); |
| 368 PepperFlashSettingsManager::RegisterProfilePrefs(registry); | 373 PepperFlashSettingsManager::RegisterProfilePrefs(registry); |
| 369 PinnedTabCodec::RegisterProfilePrefs(registry); | 374 PinnedTabCodec::RegisterProfilePrefs(registry); |
| 370 PluginsUI::RegisterProfilePrefs(registry); | 375 PluginsUI::RegisterProfilePrefs(registry); |
| 371 print_dialog_cloud::RegisterProfilePrefs(registry); | |
| 372 printing::StickySettings::RegisterProfilePrefs(registry); | |
| 373 RegisterAutolaunchUserPrefs(registry); | 376 RegisterAutolaunchUserPrefs(registry); |
| 374 signin::RegisterProfilePrefs(registry); | 377 signin::RegisterProfilePrefs(registry); |
| 375 #endif | 378 #endif |
| 376 | 379 |
| 377 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) | 380 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) |
| 378 default_apps::RegisterProfilePrefs(registry); | 381 default_apps::RegisterProfilePrefs(registry); |
| 379 #endif | 382 #endif |
| 380 | 383 |
| 381 #if defined(OS_CHROMEOS) | 384 #if defined(OS_CHROMEOS) |
| 382 chromeos::Preferences::RegisterProfilePrefs(registry); | 385 chromeos::Preferences::RegisterProfilePrefs(registry); |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 512 } | 515 } |
| 513 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 516 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 514 | 517 |
| 515 current_version |= GOOGLE_URL_TRACKER_PREFS; | 518 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 516 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 519 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 517 current_version); | 520 current_version); |
| 518 } | 521 } |
| 519 } | 522 } |
| 520 | 523 |
| 521 } // namespace chrome | 524 } // namespace chrome |
| OLD | NEW |