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/prefs/pref_registry_simple.h" | 10 #include "base/prefs/pref_registry_simple.h" |
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
190 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h" | 190 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h" |
191 #include "chrome/browser/media/protected_media_identifier_permission_context.h" | 191 #include "chrome/browser/media/protected_media_identifier_permission_context.h" |
192 #include "chrome/browser/metrics/chromeos_metrics_provider.h" | 192 #include "chrome/browser/metrics/chromeos_metrics_provider.h" |
193 #include "chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h" | 193 #include "chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h" |
194 #include "chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler
.h" | 194 #include "chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler
.h" |
195 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h" | 195 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h" |
196 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h" | 196 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h" |
197 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" | 197 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" |
198 #include "chromeos/audio/audio_devices_pref_handler_impl.h" | 198 #include "chromeos/audio/audio_devices_pref_handler_impl.h" |
199 #include "chromeos/timezone/timezone_resolver.h" | 199 #include "chromeos/timezone/timezone_resolver.h" |
200 #include "components/invalidation/invalidator_storage.h" | 200 #include "components/invalidation/impl/invalidator_storage.h" |
201 #else | 201 #else |
202 #include "chrome/browser/extensions/default_apps.h" | 202 #include "chrome/browser/extensions/default_apps.h" |
203 #endif | 203 #endif |
204 | 204 |
205 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST) | 205 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST) |
206 #include "chrome/browser/ui/app_list/google_now_extension.h" | 206 #include "chrome/browser/ui/app_list/google_now_extension.h" |
207 #endif | 207 #endif |
208 | 208 |
209 #if defined(OS_MACOSX) | 209 #if defined(OS_MACOSX) |
210 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h" | 210 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h" |
(...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
630 host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */); | 630 host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */); |
631 | 631 |
632 // We're done migrating the profile per-host zoom level values, so we clear | 632 // We're done migrating the profile per-host zoom level values, so we clear |
633 // them all. | 633 // them all. |
634 DictionaryPrefUpdate host_zoom_dictionary_update( | 634 DictionaryPrefUpdate host_zoom_dictionary_update( |
635 prefs, prefs::kPerHostZoomLevelsDeprecated); | 635 prefs, prefs::kPerHostZoomLevelsDeprecated); |
636 host_zoom_dictionary_update->Clear(); | 636 host_zoom_dictionary_update->Clear(); |
637 } | 637 } |
638 | 638 |
639 } // namespace chrome | 639 } // namespace chrome |
OLD | NEW |