Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(210)

Side by Side Diff: chrome/browser/prefs/browser_prefs.cc

Issue 292433015: Refactor MetricsLogChromeOS to ChromeOSMetricsProvider. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Build fixes Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/metrics/metrics_service_unittest.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" 153 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
154 #include "chrome/browser/chromeos/policy/device_status_collector.h" 154 #include "chrome/browser/chromeos/policy/device_status_collector.h"
155 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h" 155 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"
156 #include "chrome/browser/chromeos/power/power_prefs.h" 156 #include "chrome/browser/chromeos/power/power_prefs.h"
157 #include "chrome/browser/chromeos/preferences.h" 157 #include "chrome/browser/chromeos/preferences.h"
158 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h" 158 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h"
159 #include "chrome/browser/chromeos/settings/device_settings_cache.h" 159 #include "chrome/browser/chromeos/settings/device_settings_cache.h"
160 #include "chrome/browser/chromeos/status/data_promo_notification.h" 160 #include "chrome/browser/chromeos/status/data_promo_notification.h"
161 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" 161 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h"
162 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr ise_platform_keys_private_api.h" 162 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr ise_platform_keys_private_api.h"
163 #include "chrome/browser/metrics/chromeos_metrics_provider.h"
163 #include "chrome/browser/ui/webui/chromeos/charger_replacement_handler.h" 164 #include "chrome/browser/ui/webui/chromeos/charger_replacement_handler.h"
164 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h" 165 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h"
165 #include "chrome/browser/ui/webui/chromeos/login/network_screen_handler.h" 166 #include "chrome/browser/ui/webui/chromeos/login/network_screen_handler.h"
166 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" 167 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
167 #else 168 #else
168 #include "chrome/browser/extensions/default_apps.h" 169 #include "chrome/browser/extensions/default_apps.h"
169 #endif 170 #endif
170 171
171 #if defined(OS_MACOSX) 172 #if defined(OS_MACOSX)
172 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h" 173 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h"
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 #if !defined(OS_ANDROID) 274 #if !defined(OS_ANDROID)
274 AutomaticProfileResetterFactory::RegisterPrefs(registry); 275 AutomaticProfileResetterFactory::RegisterPrefs(registry);
275 BackgroundModeManager::RegisterPrefs(registry); 276 BackgroundModeManager::RegisterPrefs(registry);
276 RegisterBrowserPrefs(registry); 277 RegisterBrowserPrefs(registry);
277 #if !defined(OS_CHROMEOS) 278 #if !defined(OS_CHROMEOS)
278 RegisterDefaultBrowserPromptPrefs(registry); 279 RegisterDefaultBrowserPromptPrefs(registry);
279 #endif // !defined(OS_CHROMEOS) 280 #endif // !defined(OS_CHROMEOS)
280 #endif // !defined(OS_ANDROID) 281 #endif // !defined(OS_ANDROID)
281 282
282 #if defined(OS_CHROMEOS) 283 #if defined(OS_CHROMEOS)
284 ChromeOSMetricsProvider::RegisterPrefs(registry);
283 chromeos::AudioDevicesPrefHandlerImpl::RegisterPrefs(registry); 285 chromeos::AudioDevicesPrefHandlerImpl::RegisterPrefs(registry);
284 chromeos::ChargerReplacementHandler::RegisterPrefs(registry); 286 chromeos::ChargerReplacementHandler::RegisterPrefs(registry);
285 chromeos::DataPromoNotification::RegisterPrefs(registry); 287 chromeos::DataPromoNotification::RegisterPrefs(registry);
286 chromeos::DeviceOAuth2TokenService::RegisterPrefs(registry); 288 chromeos::DeviceOAuth2TokenService::RegisterPrefs(registry);
287 chromeos::device_settings_cache::RegisterPrefs(registry); 289 chromeos::device_settings_cache::RegisterPrefs(registry);
288 chromeos::default_pinned_apps_field_trial::RegisterPrefs(registry); 290 chromeos::default_pinned_apps_field_trial::RegisterPrefs(registry);
289 chromeos::language_prefs::RegisterPrefs(registry); 291 chromeos::language_prefs::RegisterPrefs(registry);
290 chromeos::KioskAppManager::RegisterPrefs(registry); 292 chromeos::KioskAppManager::RegisterPrefs(registry);
291 chromeos::LoginUtils::RegisterPrefs(registry); 293 chromeos::LoginUtils::RegisterPrefs(registry);
292 chromeos::MultiProfileUserController::RegisterPrefs(registry); 294 chromeos::MultiProfileUserController::RegisterPrefs(registry);
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
571 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 573 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
572 current_version); 574 current_version);
573 } 575 }
574 576
575 #if defined(OS_CHROMEOS) 577 #if defined(OS_CHROMEOS)
576 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); 578 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state);
577 #endif 579 #endif
578 } 580 }
579 581
580 } // namespace chrome 582 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/metrics/metrics_service_unittest.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698