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 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
165 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" | 165 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" |
166 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr
ise_platform_keys_private_api.h" | 166 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr
ise_platform_keys_private_api.h" |
167 #include "chrome/browser/ui/webui/chromeos/charger_replacement_handler.h" | 167 #include "chrome/browser/ui/webui/chromeos/charger_replacement_handler.h" |
168 #include "chrome/browser/ui/webui/chromeos/login/network_screen_handler.h" | 168 #include "chrome/browser/ui/webui/chromeos/login/network_screen_handler.h" |
169 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" | 169 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" |
170 #else | 170 #else |
171 #include "chrome/browser/extensions/default_apps.h" | 171 #include "chrome/browser/extensions/default_apps.h" |
172 #endif | 172 #endif |
173 | 173 |
174 #if defined(OS_MACOSX) | 174 #if defined(OS_MACOSX) |
| 175 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h" |
175 #include "chrome/browser/ui/cocoa/confirm_quit.h" | 176 #include "chrome/browser/ui/cocoa/confirm_quit.h" |
176 #include "chrome/browser/ui/cocoa/extensions/browser_actions_controller_prefs.h" | 177 #include "chrome/browser/ui/cocoa/extensions/browser_actions_controller_prefs.h" |
177 #endif | 178 #endif |
178 | 179 |
179 #if defined(OS_WIN) | 180 #if defined(OS_WIN) |
180 #include "chrome/browser/apps/app_launch_for_metro_restart_win.h" | 181 #include "chrome/browser/apps/app_launch_for_metro_restart_win.h" |
181 #endif | 182 #endif |
182 | 183 |
183 #if defined(TOOLKIT_VIEWS) | 184 #if defined(TOOLKIT_VIEWS) |
184 #include "chrome/browser/ui/browser_view_prefs.h" | 185 #include "chrome/browser/ui/browser_view_prefs.h" |
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
308 chromeos::echo_offer::RegisterPrefs(registry); | 309 chromeos::echo_offer::RegisterPrefs(registry); |
309 policy::AutoEnrollmentClient::RegisterPrefs(registry); | 310 policy::AutoEnrollmentClient::RegisterPrefs(registry); |
310 policy::BrowserPolicyConnectorChromeOS::RegisterPrefs(registry); | 311 policy::BrowserPolicyConnectorChromeOS::RegisterPrefs(registry); |
311 policy::DeviceCloudPolicyManagerChromeOS::RegisterPrefs(registry); | 312 policy::DeviceCloudPolicyManagerChromeOS::RegisterPrefs(registry); |
312 policy::DeviceStatusCollector::RegisterPrefs(registry); | 313 policy::DeviceStatusCollector::RegisterPrefs(registry); |
313 policy::PolicyCertServiceFactory::RegisterPrefs(registry); | 314 policy::PolicyCertServiceFactory::RegisterPrefs(registry); |
314 #endif | 315 #endif |
315 | 316 |
316 #if defined(OS_MACOSX) | 317 #if defined(OS_MACOSX) |
317 confirm_quit::RegisterLocalState(registry); | 318 confirm_quit::RegisterLocalState(registry); |
| 319 QuitWithAppsController::RegisterPrefs(registry); |
318 #endif | 320 #endif |
319 | 321 |
320 #if defined(OS_WIN) | 322 #if defined(OS_WIN) |
321 app_metro_launch::RegisterPrefs(registry); | 323 app_metro_launch::RegisterPrefs(registry); |
322 password_manager::PasswordManager::RegisterLocalPrefs(registry); | 324 password_manager::PasswordManager::RegisterLocalPrefs(registry); |
323 #endif | 325 #endif |
324 | 326 |
325 #if defined(TOOLKIT_VIEWS) | 327 #if defined(TOOLKIT_VIEWS) |
326 RegisterBrowserViewLocalPrefs(registry); | 328 RegisterBrowserViewLocalPrefs(registry); |
327 RegisterTabStripLayoutTypePrefs(registry); | 329 RegisterTabStripLayoutTypePrefs(registry); |
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
573 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 575 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
574 current_version); | 576 current_version); |
575 } | 577 } |
576 | 578 |
577 #if defined(OS_CHROMEOS) | 579 #if defined(OS_CHROMEOS) |
578 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); | 580 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); |
579 #endif | 581 #endif |
580 } | 582 } |
581 | 583 |
582 } // namespace chrome | 584 } // namespace chrome |
OLD | NEW |