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/debug/trace_event.h" | 9 #include "base/debug/trace_event.h" |
10 #include "base/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
145 #include "chrome/browser/ui/autofill/generated_credit_card_bubble_controller.h" | 145 #include "chrome/browser/ui/autofill/generated_credit_card_bubble_controller.h" |
146 #endif | 146 #endif |
147 | 147 |
148 #if defined(OS_CHROMEOS) | 148 #if defined(OS_CHROMEOS) |
149 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" | 149 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" |
150 #include "chrome/browser/chromeos/attestation/platform_verification_flow.h" | 150 #include "chrome/browser/chromeos/attestation/platform_verification_flow.h" |
151 #include "chrome/browser/chromeos/audio/audio_devices_pref_handler_impl.h" | 151 #include "chrome/browser/chromeos/audio/audio_devices_pref_handler_impl.h" |
152 #include "chrome/browser/chromeos/customization_document.h" | 152 #include "chrome/browser/chromeos/customization_document.h" |
153 #include "chrome/browser/chromeos/display/display_preferences.h" | 153 #include "chrome/browser/chromeos/display/display_preferences.h" |
154 #include "chrome/browser/chromeos/extensions/echo_private_api.h" | 154 #include "chrome/browser/chromeos/extensions/echo_private_api.h" |
155 #include "chrome/browser/chromeos/file_system_provider/service.h" | 155 #include "chrome/browser/chromeos/file_system_provider/registry.h" |
156 #include "chrome/browser/chromeos/first_run/first_run.h" | 156 #include "chrome/browser/chromeos/first_run/first_run.h" |
157 #include "chrome/browser/chromeos/login/default_pinned_apps_field_trial.h" | 157 #include "chrome/browser/chromeos/login/default_pinned_apps_field_trial.h" |
158 #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h" | 158 #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h" |
159 #include "chrome/browser/chromeos/login/session/user_session_manager.h" | 159 #include "chrome/browser/chromeos/login/session/user_session_manager.h" |
160 #include "chrome/browser/chromeos/login/startup_utils.h" | 160 #include "chrome/browser/chromeos/login/startup_utils.h" |
161 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h" | 161 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h" |
162 #include "chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h" | 162 #include "chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h" |
163 #include "chrome/browser/chromeos/login/users/chrome_user_manager_impl.h" | 163 #include "chrome/browser/chromeos/login/users/chrome_user_manager_impl.h" |
164 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h" | 164 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h" |
165 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" | 165 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" |
(...skipping 521 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
687 zoom_level_prefs->ExtractPerHostZoomLevels(host_zoom_dictionary); | 687 zoom_level_prefs->ExtractPerHostZoomLevels(host_zoom_dictionary); |
688 | 688 |
689 // We're done migrating the profile per-host zoom level values, so we clear | 689 // We're done migrating the profile per-host zoom level values, so we clear |
690 // them all. | 690 // them all. |
691 DictionaryPrefUpdate host_zoom_dictionary_update( | 691 DictionaryPrefUpdate host_zoom_dictionary_update( |
692 prefs, prefs::kPerHostZoomLevelsDeprecated); | 692 prefs, prefs::kPerHostZoomLevelsDeprecated); |
693 host_zoom_dictionary_update->Clear(); | 693 host_zoom_dictionary_update->Clear(); |
694 } | 694 } |
695 | 695 |
696 } // namespace chrome | 696 } // namespace chrome |
OLD | NEW |