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 "base/debug/trace_event.h" | 7 #include "base/debug/trace_event.h" |
8 #include "base/prefs/pref_registry_simple.h" | 8 #include "base/prefs/pref_registry_simple.h" |
9 #include "base/prefs/pref_service.h" | 9 #include "base/prefs/pref_service.h" |
10 #include "chrome/browser/about_flags.h" | 10 #include "chrome/browser/about_flags.h" |
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
178 #endif | 178 #endif |
179 | 179 |
180 #if defined(OS_MACOSX) | 180 #if defined(OS_MACOSX) |
181 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h" | 181 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h" |
182 #include "chrome/browser/ui/cocoa/confirm_quit.h" | 182 #include "chrome/browser/ui/cocoa/confirm_quit.h" |
183 #include "chrome/browser/ui/cocoa/extensions/browser_actions_controller_prefs.h" | 183 #include "chrome/browser/ui/cocoa/extensions/browser_actions_controller_prefs.h" |
184 #endif | 184 #endif |
185 | 185 |
186 #if defined(OS_WIN) | 186 #if defined(OS_WIN) |
187 #include "chrome/browser/apps/app_launch_for_metro_restart_win.h" | 187 #include "chrome/browser/apps/app_launch_for_metro_restart_win.h" |
188 #include "chrome/browser/component_updater/sw_reporter_component_installer_win.h " | |
Sorin Jianu
2014/06/19 19:08:49
drop component then it will fit on one line => pre
MAD
2014/06/19 21:31:51
Done.
| |
188 #endif | 189 #endif |
189 | 190 |
190 #if defined(TOOLKIT_VIEWS) | 191 #if defined(TOOLKIT_VIEWS) |
191 #include "chrome/browser/ui/browser_view_prefs.h" | 192 #include "chrome/browser/ui/browser_view_prefs.h" |
192 #endif | 193 #endif |
193 | 194 |
194 #if defined(USE_ASH) | 195 #if defined(USE_ASH) |
195 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" | 196 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" |
196 #endif | 197 #endif |
197 | 198 |
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
322 policy::PolicyCertServiceFactory::RegisterPrefs(registry); | 323 policy::PolicyCertServiceFactory::RegisterPrefs(registry); |
323 #endif | 324 #endif |
324 | 325 |
325 #if defined(OS_MACOSX) | 326 #if defined(OS_MACOSX) |
326 confirm_quit::RegisterLocalState(registry); | 327 confirm_quit::RegisterLocalState(registry); |
327 QuitWithAppsController::RegisterPrefs(registry); | 328 QuitWithAppsController::RegisterPrefs(registry); |
328 #endif | 329 #endif |
329 | 330 |
330 #if defined(OS_WIN) | 331 #if defined(OS_WIN) |
331 app_metro_launch::RegisterPrefs(registry); | 332 app_metro_launch::RegisterPrefs(registry); |
333 component_updater::RegisterPrefsForSwReporterComponent(registry); | |
332 password_manager::PasswordManager::RegisterLocalPrefs(registry); | 334 password_manager::PasswordManager::RegisterLocalPrefs(registry); |
333 #endif | 335 #endif |
334 | 336 |
335 #if defined(TOOLKIT_VIEWS) | 337 #if defined(TOOLKIT_VIEWS) |
336 RegisterBrowserViewLocalPrefs(registry); | 338 RegisterBrowserViewLocalPrefs(registry); |
337 #endif | 339 #endif |
338 } | 340 } |
339 | 341 |
340 // Register prefs applicable to all profiles. | 342 // Register prefs applicable to all profiles. |
341 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { | 343 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { |
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
592 #if defined(OS_CHROMEOS) | 594 #if defined(OS_CHROMEOS) |
593 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); | 595 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); |
594 #endif | 596 #endif |
595 | 597 |
596 #if defined(TOOLKIT_VIEWS) | 598 #if defined(TOOLKIT_VIEWS) |
597 MigrateBrowserTabStripPrefs(local_state); | 599 MigrateBrowserTabStripPrefs(local_state); |
598 #endif | 600 #endif |
599 } | 601 } |
600 | 602 |
601 } // namespace chrome | 603 } // namespace chrome |
OLD | NEW |