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 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
177 #endif | 177 #endif |
178 | 178 |
179 #if defined(OS_MACOSX) | 179 #if defined(OS_MACOSX) |
180 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h" | 180 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h" |
181 #include "chrome/browser/ui/cocoa/confirm_quit.h" | 181 #include "chrome/browser/ui/cocoa/confirm_quit.h" |
182 #include "chrome/browser/ui/cocoa/extensions/browser_actions_controller_prefs.h" | 182 #include "chrome/browser/ui/cocoa/extensions/browser_actions_controller_prefs.h" |
183 #endif | 183 #endif |
184 | 184 |
185 #if defined(OS_WIN) | 185 #if defined(OS_WIN) |
186 #include "chrome/browser/apps/app_launch_for_metro_restart_win.h" | 186 #include "chrome/browser/apps/app_launch_for_metro_restart_win.h" |
| 187 #include "chrome/browser/component_updater/sw_reporter_component_installer_win.h
" |
187 #endif | 188 #endif |
188 | 189 |
189 #if defined(TOOLKIT_VIEWS) | 190 #if defined(TOOLKIT_VIEWS) |
190 #include "chrome/browser/ui/browser_view_prefs.h" | 191 #include "chrome/browser/ui/browser_view_prefs.h" |
191 #endif | 192 #endif |
192 | 193 |
193 #if defined(USE_ASH) | 194 #if defined(USE_ASH) |
194 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" | 195 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" |
195 #endif | 196 #endif |
196 | 197 |
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
321 policy::PolicyCertServiceFactory::RegisterPrefs(registry); | 322 policy::PolicyCertServiceFactory::RegisterPrefs(registry); |
322 #endif | 323 #endif |
323 | 324 |
324 #if defined(OS_MACOSX) | 325 #if defined(OS_MACOSX) |
325 confirm_quit::RegisterLocalState(registry); | 326 confirm_quit::RegisterLocalState(registry); |
326 QuitWithAppsController::RegisterPrefs(registry); | 327 QuitWithAppsController::RegisterPrefs(registry); |
327 #endif | 328 #endif |
328 | 329 |
329 #if defined(OS_WIN) | 330 #if defined(OS_WIN) |
330 app_metro_launch::RegisterPrefs(registry); | 331 app_metro_launch::RegisterPrefs(registry); |
| 332 component_updater::RegisterPrefsForSwReporterComponent(registry); |
331 password_manager::PasswordManager::RegisterLocalPrefs(registry); | 333 password_manager::PasswordManager::RegisterLocalPrefs(registry); |
332 #endif | 334 #endif |
333 | 335 |
334 #if defined(TOOLKIT_VIEWS) | 336 #if defined(TOOLKIT_VIEWS) |
335 RegisterBrowserViewLocalPrefs(registry); | 337 RegisterBrowserViewLocalPrefs(registry); |
336 #endif | 338 #endif |
337 } | 339 } |
338 | 340 |
339 // Register prefs applicable to all profiles. | 341 // Register prefs applicable to all profiles. |
340 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { | 342 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { |
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
591 #if defined(OS_CHROMEOS) | 593 #if defined(OS_CHROMEOS) |
592 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); | 594 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); |
593 #endif | 595 #endif |
594 | 596 |
595 #if defined(TOOLKIT_VIEWS) | 597 #if defined(TOOLKIT_VIEWS) |
596 MigrateBrowserTabStripPrefs(local_state); | 598 MigrateBrowserTabStripPrefs(local_state); |
597 #endif | 599 #endif |
598 } | 600 } |
599 | 601 |
600 } // namespace chrome | 602 } // namespace chrome |
OLD | NEW |