| 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 <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/metrics/histogram_macros.h" | 9 #include "base/metrics/histogram_macros.h" |
| 10 #include "base/trace_event/trace_event.h" | 10 #include "base/trace_event/trace_event.h" |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 #if defined(ENABLE_AUTOFILL_DIALOG) | 102 #if defined(ENABLE_AUTOFILL_DIALOG) |
| 103 #include "chrome/browser/ui/autofill/autofill_dialog_controller.h" | 103 #include "chrome/browser/ui/autofill/autofill_dialog_controller.h" |
| 104 #endif | 104 #endif |
| 105 | 105 |
| 106 #if BUILDFLAG(ENABLE_BACKGROUND) | 106 #if BUILDFLAG(ENABLE_BACKGROUND) |
| 107 #include "chrome/browser/background/background_mode_manager.h" | 107 #include "chrome/browser/background/background_mode_manager.h" |
| 108 #endif | 108 #endif |
| 109 | 109 |
| 110 #if defined(ENABLE_EXTENSIONS) | 110 #if defined(ENABLE_EXTENSIONS) |
| 111 #include "chrome/browser/accessibility/animation_policy_prefs.h" | 111 #include "chrome/browser/accessibility/animation_policy_prefs.h" |
| 112 #include "chrome/browser/apps/drive/drive_app_mapping.h" | |
| 113 #include "chrome/browser/apps/shortcut_manager.h" | 112 #include "chrome/browser/apps/shortcut_manager.h" |
| 114 #include "chrome/browser/extensions/activity_log/activity_log.h" | 113 #include "chrome/browser/extensions/activity_log/activity_log.h" |
| 115 #include "chrome/browser/extensions/api/commands/command_service.h" | 114 #include "chrome/browser/extensions/api/commands/command_service.h" |
| 116 #include "chrome/browser/extensions/api/copresence/copresence_api.h" | 115 #include "chrome/browser/extensions/api/copresence/copresence_api.h" |
| 117 #include "chrome/browser/extensions/api/tabs/tabs_api.h" | 116 #include "chrome/browser/extensions/api/tabs/tabs_api.h" |
| 118 #include "chrome/browser/extensions/component_migration_helper.h" | 117 #include "chrome/browser/extensions/component_migration_helper.h" |
| 119 #include "chrome/browser/extensions/extension_web_ui.h" | 118 #include "chrome/browser/extensions/extension_web_ui.h" |
| 120 #include "chrome/browser/extensions/launch_util.h" | 119 #include "chrome/browser/extensions/launch_util.h" |
| 121 #include "chrome/browser/signin/easy_unlock_service.h" | 120 #include "chrome/browser/signin/easy_unlock_service.h" |
| 122 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" | 121 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 223 #endif | 222 #endif |
| 224 | 223 |
| 225 #if defined(USE_ASH) | 224 #if defined(USE_ASH) |
| 226 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" | 225 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" |
| 227 #endif | 226 #endif |
| 228 | 227 |
| 229 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) | 228 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) |
| 230 #include "chrome/browser/ui/startup/default_browser_prompt.h" | 229 #include "chrome/browser/ui/startup/default_browser_prompt.h" |
| 231 #endif | 230 #endif |
| 232 | 231 |
| 232 #if defined(ENABLE_APP_LIST) |
| 233 #include "chrome/browser/apps/drive/drive_app_mapping.h" |
| 234 #endif |
| 235 |
| 233 namespace { | 236 namespace { |
| 234 | 237 |
| 235 #if defined(OS_WIN) | 238 #if defined(OS_WIN) |
| 236 // Deprecated 11/2015 (M48). TODO(gab): delete in M52+. | 239 // Deprecated 11/2015 (M48). TODO(gab): delete in M52+. |
| 237 const char kShownAutoLaunchInfobarDeprecated[] = | 240 const char kShownAutoLaunchInfobarDeprecated[] = |
| 238 "browser.shown_autolaunch_infobar"; | 241 "browser.shown_autolaunch_infobar"; |
| 239 #endif // defined(OS_WIN) | 242 #endif // defined(OS_WIN) |
| 240 | 243 |
| 241 // The SessionStartupPref used this pref to store the list of URLs to restore | 244 // The SessionStartupPref used this pref to store the list of URLs to restore |
| 242 // on startup, and then renamed it to "sessions.startup_urls" in M31. Migration | 245 // on startup, and then renamed it to "sessions.startup_urls" in M31. Migration |
| (...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 510 #if BUILDFLAG(ANDROID_JAVA_UI) | 513 #if BUILDFLAG(ANDROID_JAVA_UI) |
| 511 variations::VariationsService::RegisterProfilePrefs(registry); | 514 variations::VariationsService::RegisterProfilePrefs(registry); |
| 512 MostVisitedSites::RegisterProfilePrefs(registry); | 515 MostVisitedSites::RegisterProfilePrefs(registry); |
| 513 NewTabPagePrefs::RegisterProfilePrefs(registry); | 516 NewTabPagePrefs::RegisterProfilePrefs(registry); |
| 514 PartnerBookmarksShim::RegisterProfilePrefs(registry); | 517 PartnerBookmarksShim::RegisterProfilePrefs(registry); |
| 515 PopularSites::RegisterProfilePrefs(registry); | 518 PopularSites::RegisterProfilePrefs(registry); |
| 516 #else | 519 #else |
| 517 AppShortcutManager::RegisterProfilePrefs(registry); | 520 AppShortcutManager::RegisterProfilePrefs(registry); |
| 518 DeviceIDFetcher::RegisterProfilePrefs(registry); | 521 DeviceIDFetcher::RegisterProfilePrefs(registry); |
| 519 DevToolsWindow::RegisterProfilePrefs(registry); | 522 DevToolsWindow::RegisterProfilePrefs(registry); |
| 523 #if defined(ENABLE_APP_LIST) |
| 520 DriveAppMapping::RegisterProfilePrefs(registry); | 524 DriveAppMapping::RegisterProfilePrefs(registry); |
| 525 #endif |
| 521 extensions::CommandService::RegisterProfilePrefs(registry); | 526 extensions::CommandService::RegisterProfilePrefs(registry); |
| 522 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry); | 527 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry); |
| 523 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry); | 528 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry); |
| 524 first_run::RegisterProfilePrefs(registry); | 529 first_run::RegisterProfilePrefs(registry); |
| 525 gcm::GCMChannelStatusSyncer::RegisterProfilePrefs(registry); | 530 gcm::GCMChannelStatusSyncer::RegisterProfilePrefs(registry); |
| 526 NewTabUI::RegisterProfilePrefs(registry); | 531 NewTabUI::RegisterProfilePrefs(registry); |
| 527 PepperFlashSettingsManager::RegisterProfilePrefs(registry); | 532 PepperFlashSettingsManager::RegisterProfilePrefs(registry); |
| 528 PinnedTabCodec::RegisterProfilePrefs(registry); | 533 PinnedTabCodec::RegisterProfilePrefs(registry); |
| 529 signin::RegisterProfilePrefs(registry); | 534 signin::RegisterProfilePrefs(registry); |
| 530 #endif | 535 #endif |
| (...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 693 metrics_service | 698 metrics_service |
| 694 ? base::Time::FromTimeT(metrics_service->GetInstallDate()) | 699 ? base::Time::FromTimeT(metrics_service->GetInstallDate()) |
| 695 : base::Time::Now(); | 700 : base::Time::Now(); |
| 696 profile_prefs->SetInt64(prefs::kDefaultBrowserLastDeclined, | 701 profile_prefs->SetInt64(prefs::kDefaultBrowserLastDeclined, |
| 697 install_time.ToInternalValue()); | 702 install_time.ToInternalValue()); |
| 698 } | 703 } |
| 699 profile_prefs->ClearPref(kCheckDefaultBrowser); | 704 profile_prefs->ClearPref(kCheckDefaultBrowser); |
| 700 } | 705 } |
| 701 | 706 |
| 702 } // namespace chrome | 707 } // namespace chrome |
| OLD | NEW |