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 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
167 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" | 167 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" |
168 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr
ise_platform_keys_private_api.h" | 168 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr
ise_platform_keys_private_api.h" |
169 #include "chrome/browser/ui/webui/chromeos/charger_replacement_handler.h" | 169 #include "chrome/browser/ui/webui/chromeos/charger_replacement_handler.h" |
170 #include "chrome/browser/ui/webui/chromeos/login/network_screen_handler.h" | 170 #include "chrome/browser/ui/webui/chromeos/login/network_screen_handler.h" |
171 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" | 171 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" |
172 #else | 172 #else |
173 #include "chrome/browser/extensions/default_apps.h" | 173 #include "chrome/browser/extensions/default_apps.h" |
174 #endif | 174 #endif |
175 | 175 |
176 #if defined(OS_MACOSX) | 176 #if defined(OS_MACOSX) |
| 177 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h" |
177 #include "chrome/browser/ui/cocoa/confirm_quit.h" | 178 #include "chrome/browser/ui/cocoa/confirm_quit.h" |
178 #include "chrome/browser/ui/cocoa/extensions/browser_actions_controller_prefs.h" | 179 #include "chrome/browser/ui/cocoa/extensions/browser_actions_controller_prefs.h" |
179 #endif | 180 #endif |
180 | 181 |
181 #if defined(OS_WIN) | 182 #if defined(OS_WIN) |
182 #include "chrome/browser/apps/app_launch_for_metro_restart_win.h" | 183 #include "chrome/browser/apps/app_launch_for_metro_restart_win.h" |
183 #endif | 184 #endif |
184 | 185 |
185 #if defined(TOOLKIT_VIEWS) | 186 #if defined(TOOLKIT_VIEWS) |
186 #include "chrome/browser/ui/browser_view_prefs.h" | 187 #include "chrome/browser/ui/browser_view_prefs.h" |
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
314 chromeos::echo_offer::RegisterPrefs(registry); | 315 chromeos::echo_offer::RegisterPrefs(registry); |
315 policy::AutoEnrollmentClient::RegisterPrefs(registry); | 316 policy::AutoEnrollmentClient::RegisterPrefs(registry); |
316 policy::BrowserPolicyConnectorChromeOS::RegisterPrefs(registry); | 317 policy::BrowserPolicyConnectorChromeOS::RegisterPrefs(registry); |
317 policy::DeviceCloudPolicyManagerChromeOS::RegisterPrefs(registry); | 318 policy::DeviceCloudPolicyManagerChromeOS::RegisterPrefs(registry); |
318 policy::DeviceStatusCollector::RegisterPrefs(registry); | 319 policy::DeviceStatusCollector::RegisterPrefs(registry); |
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); |
| 325 QuitWithAppsController::RegisterPrefs(registry); |
324 #endif | 326 #endif |
325 | 327 |
326 #if defined(OS_WIN) | 328 #if defined(OS_WIN) |
327 app_metro_launch::RegisterPrefs(registry); | 329 app_metro_launch::RegisterPrefs(registry); |
328 PasswordManager::RegisterLocalPrefs(registry); | 330 PasswordManager::RegisterLocalPrefs(registry); |
329 #endif | 331 #endif |
330 | 332 |
331 #if defined(TOOLKIT_VIEWS) | 333 #if defined(TOOLKIT_VIEWS) |
332 RegisterBrowserViewLocalPrefs(registry); | 334 RegisterBrowserViewLocalPrefs(registry); |
333 RegisterTabStripLayoutTypePrefs(registry); | 335 RegisterTabStripLayoutTypePrefs(registry); |
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
583 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 585 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
584 current_version); | 586 current_version); |
585 } | 587 } |
586 | 588 |
587 #if defined(OS_CHROMEOS) | 589 #if defined(OS_CHROMEOS) |
588 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); | 590 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); |
589 #endif | 591 #endif |
590 } | 592 } |
591 | 593 |
592 } // namespace chrome | 594 } // namespace chrome |
OLD | NEW |