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

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

Issue 12647008: Refactor OAuth2TokenService to have profile- and device-based implementations. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Moved DeviceOAuth2TokenService factory method to g_browser_process Created 7 years, 9 months 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
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/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 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 #include "chrome/browser/chromeos/login/oauth2_login_manager.h" 121 #include "chrome/browser/chromeos/login/oauth2_login_manager.h"
122 #include "chrome/browser/chromeos/login/user_image_manager.h" 122 #include "chrome/browser/chromeos/login/user_image_manager.h"
123 #include "chrome/browser/chromeos/login/user_manager.h" 123 #include "chrome/browser/chromeos/login/user_manager.h"
124 #include "chrome/browser/chromeos/login/wallpaper_manager.h" 124 #include "chrome/browser/chromeos/login/wallpaper_manager.h"
125 #include "chrome/browser/chromeos/login/wizard_controller.h" 125 #include "chrome/browser/chromeos/login/wizard_controller.h"
126 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h" 126 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h"
127 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" 127 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
128 #include "chrome/browser/chromeos/policy/device_status_collector.h" 128 #include "chrome/browser/chromeos/policy/device_status_collector.h"
129 #include "chrome/browser/chromeos/preferences.h" 129 #include "chrome/browser/chromeos/preferences.h"
130 #include "chrome/browser/chromeos/proxy_config_service_impl.h" 130 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
131 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h"
131 #include "chrome/browser/chromeos/settings/device_settings_cache.h" 132 #include "chrome/browser/chromeos/settings/device_settings_cache.h"
132 #include "chrome/browser/chromeos/status/data_promo_notification.h" 133 #include "chrome/browser/chromeos/status/data_promo_notification.h"
133 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" 134 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h"
134 #else 135 #else
135 #include "chrome/browser/extensions/default_apps.h" 136 #include "chrome/browser/extensions/default_apps.h"
136 #endif 137 #endif
137 138
138 #if defined(USE_ASH) 139 #if defined(USE_ASH)
139 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" 140 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
140 #endif 141 #endif
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 #if !defined(OS_ANDROID) 231 #if !defined(OS_ANDROID)
231 BackgroundModeManager::RegisterPrefs(registry); 232 BackgroundModeManager::RegisterPrefs(registry);
232 chrome_variations::VariationsService::RegisterPrefs(registry); 233 chrome_variations::VariationsService::RegisterPrefs(registry);
233 RegisterBrowserPrefs(registry); 234 RegisterBrowserPrefs(registry);
234 ManagedMode::RegisterPrefs(registry); 235 ManagedMode::RegisterPrefs(registry);
235 #endif 236 #endif
236 237
237 #if defined(OS_CHROMEOS) 238 #if defined(OS_CHROMEOS)
238 chromeos::AudioHandler::RegisterPrefs(registry); 239 chromeos::AudioHandler::RegisterPrefs(registry);
239 chromeos::DataPromoNotification::RegisterPrefs(registry); 240 chromeos::DataPromoNotification::RegisterPrefs(registry);
241 chromeos::DeviceOAuth2TokenService::RegisterPrefs(registry);
240 chromeos::device_settings_cache::RegisterPrefs(registry); 242 chromeos::device_settings_cache::RegisterPrefs(registry);
241 chromeos::language_prefs::RegisterPrefs(registry); 243 chromeos::language_prefs::RegisterPrefs(registry);
242 chromeos::KioskAppManager::RegisterPrefs(registry); 244 chromeos::KioskAppManager::RegisterPrefs(registry);
243 chromeos::LoginUtils::RegisterPrefs(registry); 245 chromeos::LoginUtils::RegisterPrefs(registry);
244 chromeos::Preferences::RegisterPrefs(registry); 246 chromeos::Preferences::RegisterPrefs(registry);
245 chromeos::ProxyConfigServiceImpl::RegisterPrefs(registry); 247 chromeos::ProxyConfigServiceImpl::RegisterPrefs(registry);
246 chromeos::RegisterDisplayLocalStatePrefs(registry); 248 chromeos::RegisterDisplayLocalStatePrefs(registry);
247 chromeos::ServicesCustomizationDocument::RegisterPrefs(registry); 249 chromeos::ServicesCustomizationDocument::RegisterPrefs(registry);
248 chromeos::system::AutomaticRebootManager::RegisterPrefs(registry); 250 chromeos::system::AutomaticRebootManager::RegisterPrefs(registry);
249 chromeos::UserImageManager::RegisterPrefs(registry); 251 chromeos::UserImageManager::RegisterPrefs(registry);
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
437 } 439 }
438 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 440 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
439 441
440 current_version |= GOOGLE_URL_TRACKER_PREFS; 442 current_version |= GOOGLE_URL_TRACKER_PREFS;
441 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 443 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
442 current_version); 444 current_version);
443 } 445 }
444 } 446 }
445 447
446 } // namespace chrome 448 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698