Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(186)

Side by Side Diff: chrome/browser/prefs/browser_prefs.cc

Issue 107103004: Implement the spring charger replacement UI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Point iFrame to production site. Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h" 152 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h"
153 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" 153 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
154 #include "chrome/browser/chromeos/policy/device_status_collector.h" 154 #include "chrome/browser/chromeos/policy/device_status_collector.h"
155 #include "chrome/browser/chromeos/power/power_prefs.h" 155 #include "chrome/browser/chromeos/power/power_prefs.h"
156 #include "chrome/browser/chromeos/preferences.h" 156 #include "chrome/browser/chromeos/preferences.h"
157 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h" 157 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h"
158 #include "chrome/browser/chromeos/settings/device_settings_cache.h" 158 #include "chrome/browser/chromeos/settings/device_settings_cache.h"
159 #include "chrome/browser/chromeos/status/data_promo_notification.h" 159 #include "chrome/browser/chromeos/status/data_promo_notification.h"
160 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" 160 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h"
161 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr ise_platform_keys_private_api.h" 161 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr ise_platform_keys_private_api.h"
162 #include "chrome/browser/ui/webui/chromeos/charger_replacement_handler.h"
162 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" 163 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
163 #else 164 #else
164 #include "chrome/browser/extensions/default_apps.h" 165 #include "chrome/browser/extensions/default_apps.h"
165 #endif 166 #endif
166 167
167 #if defined(OS_MACOSX) 168 #if defined(OS_MACOSX)
168 #include "chrome/browser/ui/cocoa/confirm_quit.h" 169 #include "chrome/browser/ui/cocoa/confirm_quit.h"
169 #include "chrome/browser/ui/cocoa/extensions/browser_actions_controller_prefs.h" 170 #include "chrome/browser/ui/cocoa/extensions/browser_actions_controller_prefs.h"
170 #endif 171 #endif
171 172
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 AutomaticProfileResetterFactory::RegisterPrefs(registry); 274 AutomaticProfileResetterFactory::RegisterPrefs(registry);
274 BackgroundModeManager::RegisterPrefs(registry); 275 BackgroundModeManager::RegisterPrefs(registry);
275 RegisterBrowserPrefs(registry); 276 RegisterBrowserPrefs(registry);
276 #if !defined(OS_CHROMEOS) 277 #if !defined(OS_CHROMEOS)
277 RegisterDefaultBrowserPromptPrefs(registry); 278 RegisterDefaultBrowserPromptPrefs(registry);
278 #endif // !defined(OS_CHROMEOS) 279 #endif // !defined(OS_CHROMEOS)
279 #endif // !defined(OS_ANDROID) 280 #endif // !defined(OS_ANDROID)
280 281
281 #if defined(OS_CHROMEOS) 282 #if defined(OS_CHROMEOS)
282 chromeos::AudioDevicesPrefHandlerImpl::RegisterPrefs(registry); 283 chromeos::AudioDevicesPrefHandlerImpl::RegisterPrefs(registry);
284 chromeos::ChargerReplacementHandler::RegisterPrefs(registry);
283 chromeos::DataPromoNotification::RegisterPrefs(registry); 285 chromeos::DataPromoNotification::RegisterPrefs(registry);
284 chromeos::DeviceOAuth2TokenService::RegisterPrefs(registry); 286 chromeos::DeviceOAuth2TokenService::RegisterPrefs(registry);
285 chromeos::device_settings_cache::RegisterPrefs(registry); 287 chromeos::device_settings_cache::RegisterPrefs(registry);
286 chromeos::default_pinned_apps_field_trial::RegisterPrefs(registry); 288 chromeos::default_pinned_apps_field_trial::RegisterPrefs(registry);
287 chromeos::language_prefs::RegisterPrefs(registry); 289 chromeos::language_prefs::RegisterPrefs(registry);
288 chromeos::KioskAppManager::RegisterPrefs(registry); 290 chromeos::KioskAppManager::RegisterPrefs(registry);
289 chromeos::LoginUtils::RegisterPrefs(registry); 291 chromeos::LoginUtils::RegisterPrefs(registry);
290 chromeos::MultiProfileUserController::RegisterPrefs(registry); 292 chromeos::MultiProfileUserController::RegisterPrefs(registry);
291 chromeos::Preferences::RegisterPrefs(registry); 293 chromeos::Preferences::RegisterPrefs(registry);
292 chromeos::proxy_config::RegisterPrefs(registry); 294 chromeos::proxy_config::RegisterPrefs(registry);
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
560 } 562 }
561 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 563 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
562 564
563 current_version |= GOOGLE_URL_TRACKER_PREFS; 565 current_version |= GOOGLE_URL_TRACKER_PREFS;
564 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 566 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
565 current_version); 567 current_version);
566 } 568 }
567 } 569 }
568 570
569 } // namespace chrome 571 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/system/ash_system_tray_delegate.cc ('k') | chrome/browser/resources/chromeos/charger_replacement.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698