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

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

Issue 10808068: Store ChromeToMobile device list and timestamp prefs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add GetMobiles ownership/lifetime comment. Created 8 years, 5 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "chrome/browser/about_flags.h" 7 #include "chrome/browser/about_flags.h"
8 #include "chrome/browser/accessibility/invert_bubble_prefs.h" 8 #include "chrome/browser/accessibility/invert_bubble_prefs.h"
9 #include "chrome/browser/autofill/autofill_manager.h" 9 #include "chrome/browser/autofill/autofill_manager.h"
10 #include "chrome/browser/background/background_mode_manager.h" 10 #include "chrome/browser/background/background_mode_manager.h"
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 #include "chrome/browser/policy/auto_enrollment_client.h" 101 #include "chrome/browser/policy/auto_enrollment_client.h"
102 #include "chrome/browser/policy/device_status_collector.h" 102 #include "chrome/browser/policy/device_status_collector.h"
103 #else 103 #else
104 #include "chrome/browser/extensions/default_apps.h" 104 #include "chrome/browser/extensions/default_apps.h"
105 #endif 105 #endif
106 106
107 #if defined(USE_ASH) 107 #if defined(USE_ASH)
108 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" 108 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
109 #endif 109 #endif
110 110
111 #if !defined(OS_ANDROID)
112 #include "chrome/browser/chrome_to_mobile_service.h"
113 #endif
114
111 namespace { 115 namespace {
112 116
113 enum MigratedPreferences { 117 enum MigratedPreferences {
114 NO_PREFS = 0, 118 NO_PREFS = 0,
115 DNS_PREFS = 1 << 0, 119 DNS_PREFS = 1 << 0,
116 WINDOWS_PREFS = 1 << 1, 120 WINDOWS_PREFS = 1 << 1,
117 GOOGLE_URL_TRACKER_PREFS = 1 << 2, 121 GOOGLE_URL_TRACKER_PREFS = 1 << 2,
118 }; 122 };
119 123
120 } // namespace 124 } // namespace
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 GAIAInfoUpdateService::RegisterUserPrefs(user_prefs); 207 GAIAInfoUpdateService::RegisterUserPrefs(user_prefs);
204 HostContentSettingsMap::RegisterUserPrefs(user_prefs); 208 HostContentSettingsMap::RegisterUserPrefs(user_prefs);
205 IncognitoModePrefs::RegisterUserPrefs(user_prefs); 209 IncognitoModePrefs::RegisterUserPrefs(user_prefs);
206 InstantController::RegisterUserPrefs(user_prefs); 210 InstantController::RegisterUserPrefs(user_prefs);
207 NetPrefObserver::RegisterPrefs(user_prefs); 211 NetPrefObserver::RegisterPrefs(user_prefs);
208 NewTabUI::RegisterUserPrefs(user_prefs); 212 NewTabUI::RegisterUserPrefs(user_prefs);
209 PasswordManager::RegisterUserPrefs(user_prefs); 213 PasswordManager::RegisterUserPrefs(user_prefs);
210 PrefProxyConfigTrackerImpl::RegisterPrefs(user_prefs); 214 PrefProxyConfigTrackerImpl::RegisterPrefs(user_prefs);
211 PrefsTabHelper::RegisterUserPrefs(user_prefs); 215 PrefsTabHelper::RegisterUserPrefs(user_prefs);
212 ProfileImpl::RegisterUserPrefs(user_prefs); 216 ProfileImpl::RegisterUserPrefs(user_prefs);
217 PromoResourceService::RegisterUserPrefs(user_prefs);
213 ProtocolHandlerRegistry::RegisterPrefs(user_prefs); 218 ProtocolHandlerRegistry::RegisterPrefs(user_prefs);
214 SessionStartupPref::RegisterUserPrefs(user_prefs); 219 SessionStartupPref::RegisterUserPrefs(user_prefs);
215 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); 220 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs);
216 TranslatePrefs::RegisterUserPrefs(user_prefs); 221 TranslatePrefs::RegisterUserPrefs(user_prefs);
217 web_intents::RegisterUserPrefs(user_prefs); 222 web_intents::RegisterUserPrefs(user_prefs);
218 223
219 #if defined(ENABLE_CONFIGURATION_POLICY) 224 #if defined(ENABLE_CONFIGURATION_POLICY)
220 policy::URLBlacklistManager::RegisterPrefs(user_prefs); 225 policy::URLBlacklistManager::RegisterPrefs(user_prefs);
221 #endif 226 #endif
222 227
223 #if defined(TOOLKIT_VIEWS) 228 #if defined(TOOLKIT_VIEWS)
224 RegisterInvertBubbleUserPrefs(user_prefs); 229 RegisterInvertBubbleUserPrefs(user_prefs);
225 #elif defined(TOOLKIT_GTK) 230 #elif defined(TOOLKIT_GTK)
226 BrowserWindowGtk::RegisterUserPrefs(user_prefs); 231 BrowserWindowGtk::RegisterUserPrefs(user_prefs);
227 #endif 232 #endif
228 233
229 #if defined(OS_ANDROID) 234 #if defined(OS_ANDROID)
230 geolocation::RegisterUserPrefs(user_prefs); 235 geolocation::RegisterUserPrefs(user_prefs);
231 #endif 236 #endif
232 237
233 #if defined(USE_ASH) 238 #if defined(USE_ASH)
234 ash::RegisterChromeLauncherUserPrefs(user_prefs); 239 ash::RegisterChromeLauncherUserPrefs(user_prefs);
235 #endif 240 #endif
236 241
237 PromoResourceService::RegisterUserPrefs(user_prefs);
238 #if !defined(OS_ANDROID) 242 #if !defined(OS_ANDROID)
239 AppsPromo::RegisterUserPrefs(user_prefs); 243 AppsPromo::RegisterUserPrefs(user_prefs);
244 ChromeToMobileService::RegisterUserPrefs(user_prefs);
240 extensions::CommandService::RegisterUserPrefs(user_prefs); 245 extensions::CommandService::RegisterUserPrefs(user_prefs);
241 extensions::ComponentLoader::RegisterUserPrefs(user_prefs); 246 extensions::ComponentLoader::RegisterUserPrefs(user_prefs);
242 extensions::ExtensionPrefs::RegisterUserPrefs(user_prefs); 247 extensions::ExtensionPrefs::RegisterUserPrefs(user_prefs);
243 ExtensionSettingsHandler::RegisterUserPrefs(user_prefs); 248 ExtensionSettingsHandler::RegisterUserPrefs(user_prefs);
244 ExtensionWebUI::RegisterUserPrefs(user_prefs); 249 ExtensionWebUI::RegisterUserPrefs(user_prefs);
245 RegisterBrowserUserPrefs(user_prefs); 250 RegisterBrowserUserPrefs(user_prefs);
246 RegisterAutolaunchPrefs(user_prefs); 251 RegisterAutolaunchPrefs(user_prefs);
247 DevToolsWindow::RegisterUserPrefs(user_prefs); 252 DevToolsWindow::RegisterUserPrefs(user_prefs);
248 PepperFlashSettingsManager::RegisterUserPrefs(user_prefs); 253 PepperFlashSettingsManager::RegisterUserPrefs(user_prefs);
249 PinnedTabCodec::RegisterUserPrefs(user_prefs); 254 PinnedTabCodec::RegisterUserPrefs(user_prefs);
250 PluginsUI::RegisterUserPrefs(user_prefs); 255 PluginsUI::RegisterUserPrefs(user_prefs);
251 SyncPromoUI::RegisterUserPrefs(user_prefs); 256 SyncPromoUI::RegisterUserPrefs(user_prefs);
252 printing::StickySettings::RegisterUserPrefs(user_prefs); 257 printing::StickySettings::RegisterUserPrefs(user_prefs);
253
254 #endif 258 #endif
255 259
256 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) 260 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
257 default_apps::RegisterUserPrefs(user_prefs); 261 default_apps::RegisterUserPrefs(user_prefs);
258 #endif 262 #endif
259 263
260 #if defined(OS_CHROMEOS) 264 #if defined(OS_CHROMEOS)
261 chromeos::Preferences::RegisterUserPrefs(user_prefs); 265 chromeos::Preferences::RegisterUserPrefs(user_prefs);
262 chromeos::ProxyConfigServiceImpl::RegisterPrefs(user_prefs); 266 chromeos::ProxyConfigServiceImpl::RegisterPrefs(user_prefs);
263 #endif 267 #endif
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 } 336 }
333 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 337 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
334 338
335 current_version |= GOOGLE_URL_TRACKER_PREFS; 339 current_version |= GOOGLE_URL_TRACKER_PREFS;
336 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 340 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
337 current_version); 341 current_version);
338 } 342 }
339 } 343 }
340 344
341 } // namespace chrome 345 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/chrome_to_mobile_service_factory.cc ('k') | chrome/browser/ui/cocoa/chrome_to_mobile_bubble_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698