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 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
137 #endif | 137 #endif |
138 | 138 |
139 #if defined(ENABLE_PLUGIN_INSTALLATION) | 139 #if defined(ENABLE_PLUGIN_INSTALLATION) |
140 #include "chrome/browser/plugins/plugins_resource_service.h" | 140 #include "chrome/browser/plugins/plugins_resource_service.h" |
141 #endif | 141 #endif |
142 | 142 |
143 #if defined(OS_ANDROID) | 143 #if defined(OS_ANDROID) |
144 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" | 144 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" |
145 #include "chrome/browser/android/new_tab_page_prefs.h" | 145 #include "chrome/browser/android/new_tab_page_prefs.h" |
146 #else | 146 #else |
147 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_service.h" | |
148 #include "chrome/browser/profile_resetter/automatic_profile_resetter_factory.h" | 147 #include "chrome/browser/profile_resetter/automatic_profile_resetter_factory.h" |
149 #include "chrome/browser/ui/autofill/generated_credit_card_bubble_controller.h" | 148 #include "chrome/browser/ui/autofill/generated_credit_card_bubble_controller.h" |
150 #endif | 149 #endif |
151 | 150 |
152 #if !defined(OS_ANDROID) && !defined(OS_IOS) | 151 #if !defined(OS_ANDROID) && !defined(OS_IOS) |
153 #include "chrome/browser/signin/signin_promo.h" | 152 #include "chrome/browser/signin/signin_promo.h" |
154 #endif | 153 #endif |
155 | 154 |
156 #if defined(OS_CHROMEOS) | 155 #if defined(OS_CHROMEOS) |
157 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" | 156 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" |
(...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
705 host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */); | 704 host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */); |
706 | 705 |
707 // We're done migrating the profile per-host zoom level values, so we clear | 706 // We're done migrating the profile per-host zoom level values, so we clear |
708 // them all. | 707 // them all. |
709 DictionaryPrefUpdate host_zoom_dictionary_update( | 708 DictionaryPrefUpdate host_zoom_dictionary_update( |
710 prefs, prefs::kPerHostZoomLevelsDeprecated); | 709 prefs, prefs::kPerHostZoomLevelsDeprecated); |
711 host_zoom_dictionary_update->Clear(); | 710 host_zoom_dictionary_update->Clear(); |
712 } | 711 } |
713 | 712 |
714 } // namespace chrome | 713 } // namespace chrome |
OLD | NEW |