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

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

Issue 731663002: Remove Yoshi charger recall pop up warning UI code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Deprecat the related UMA metrics in histograms.xml. Created 6 years, 1 month 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
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 <string> 7 #include <string>
8 8
9 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h" 178 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"
179 #include "chrome/browser/chromeos/power/power_prefs.h" 179 #include "chrome/browser/chromeos/power/power_prefs.h"
180 #include "chrome/browser/chromeos/preferences.h" 180 #include "chrome/browser/chromeos/preferences.h"
181 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h" 181 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h"
182 #include "chrome/browser/chromeos/settings/device_settings_cache.h" 182 #include "chrome/browser/chromeos/settings/device_settings_cache.h"
183 #include "chrome/browser/chromeos/status/data_promo_notification.h" 183 #include "chrome/browser/chromeos/status/data_promo_notification.h"
184 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" 184 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h"
185 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr ise_platform_keys_private_api.h" 185 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr ise_platform_keys_private_api.h"
186 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h" 186 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h"
187 #include "chrome/browser/metrics/chromeos_metrics_provider.h" 187 #include "chrome/browser/metrics/chromeos_metrics_provider.h"
188 #include "chrome/browser/ui/webui/chromeos/charger_replacement_handler.h"
189 #include "chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h" 188 #include "chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h"
190 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h" 189 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h"
191 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h" 190 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h"
192 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" 191 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
193 #include "components/invalidation/invalidator_storage.h" 192 #include "components/invalidation/invalidator_storage.h"
194 #else 193 #else
195 #include "chrome/browser/extensions/default_apps.h" 194 #include "chrome/browser/extensions/default_apps.h"
196 #endif 195 #endif
197 196
198 #if defined(OS_MACOSX) 197 #if defined(OS_MACOSX)
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 // The native GCM is used on Android instead. 316 // The native GCM is used on Android instead.
318 gcm::GCMChannelStatusSyncer::RegisterPrefs(registry); 317 gcm::GCMChannelStatusSyncer::RegisterPrefs(registry);
319 #if !defined(OS_CHROMEOS) 318 #if !defined(OS_CHROMEOS)
320 RegisterDefaultBrowserPromptPrefs(registry); 319 RegisterDefaultBrowserPromptPrefs(registry);
321 #endif // !defined(OS_CHROMEOS) 320 #endif // !defined(OS_CHROMEOS)
322 #endif // !defined(OS_ANDROID) 321 #endif // !defined(OS_ANDROID)
323 322
324 #if defined(OS_CHROMEOS) 323 #if defined(OS_CHROMEOS)
325 ChromeOSMetricsProvider::RegisterPrefs(registry); 324 ChromeOSMetricsProvider::RegisterPrefs(registry);
326 chromeos::AudioDevicesPrefHandlerImpl::RegisterPrefs(registry); 325 chromeos::AudioDevicesPrefHandlerImpl::RegisterPrefs(registry);
327 chromeos::ChargerReplacementHandler::RegisterPrefs(registry);
328 chromeos::ChromeUserManagerImpl::RegisterPrefs(registry); 326 chromeos::ChromeUserManagerImpl::RegisterPrefs(registry);
329 chromeos::DataPromoNotification::RegisterPrefs(registry); 327 chromeos::DataPromoNotification::RegisterPrefs(registry);
330 chromeos::DeviceOAuth2TokenService::RegisterPrefs(registry); 328 chromeos::DeviceOAuth2TokenService::RegisterPrefs(registry);
331 chromeos::device_settings_cache::RegisterPrefs(registry); 329 chromeos::device_settings_cache::RegisterPrefs(registry);
332 chromeos::default_pinned_apps_field_trial::RegisterPrefs(registry); 330 chromeos::default_pinned_apps_field_trial::RegisterPrefs(registry);
333 chromeos::language_prefs::RegisterPrefs(registry); 331 chromeos::language_prefs::RegisterPrefs(registry);
334 chromeos::KioskAppManager::RegisterPrefs(registry); 332 chromeos::KioskAppManager::RegisterPrefs(registry);
335 chromeos::MultiProfileUserController::RegisterPrefs(registry); 333 chromeos::MultiProfileUserController::RegisterPrefs(registry);
336 chromeos::HIDDetectionScreenHandler::RegisterPrefs(registry); 334 chromeos::HIDDetectionScreenHandler::RegisterPrefs(registry);
337 chromeos::DemoModeDetector::RegisterPrefs(registry); 335 chromeos::DemoModeDetector::RegisterPrefs(registry);
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
703 host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */); 701 host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */);
704 702
705 // We're done migrating the profile per-host zoom level values, so we clear 703 // We're done migrating the profile per-host zoom level values, so we clear
706 // them all. 704 // them all.
707 DictionaryPrefUpdate host_zoom_dictionary_update( 705 DictionaryPrefUpdate host_zoom_dictionary_update(
708 prefs, prefs::kPerHostZoomLevelsDeprecated); 706 prefs, prefs::kPerHostZoomLevelsDeprecated);
709 host_zoom_dictionary_update->Clear(); 707 host_zoom_dictionary_update->Clear();
710 } 708 }
711 709
712 } // namespace chrome 710 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/ui/login_display_host_impl.cc ('k') | chrome/browser/resources/chromeos/charger_replacement.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698