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