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