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

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

Issue 7155015: Store profile avatar to preferences (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address review comments Created 9 years, 6 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/autofill/autofill_manager.h" 8 #include "chrome/browser/autofill/autofill_manager.h"
9 #include "chrome/browser/background_contents_service.h" 9 #include "chrome/browser/background_contents_service.h"
10 #include "chrome/browser/background_mode_manager.h" 10 #include "chrome/browser/background_mode_manager.h"
(...skipping 20 matching lines...) Expand all
31 #include "chrome/browser/net/pref_proxy_config_service.h" 31 #include "chrome/browser/net/pref_proxy_config_service.h"
32 #include "chrome/browser/notifications/desktop_notification_service.h" 32 #include "chrome/browser/notifications/desktop_notification_service.h"
33 #include "chrome/browser/notifications/notification_ui_manager.h" 33 #include "chrome/browser/notifications/notification_ui_manager.h"
34 #include "chrome/browser/page_info_model.h" 34 #include "chrome/browser/page_info_model.h"
35 #include "chrome/browser/password_manager/password_manager.h" 35 #include "chrome/browser/password_manager/password_manager.h"
36 #include "chrome/browser/plugin_updater.h" 36 #include "chrome/browser/plugin_updater.h"
37 #include "chrome/browser/policy/cloud_policy_subsystem.h" 37 #include "chrome/browser/policy/cloud_policy_subsystem.h"
38 #include "chrome/browser/prefs/session_startup_pref.h" 38 #include "chrome/browser/prefs/session_startup_pref.h"
39 #include "chrome/browser/printing/print_job_manager.h" 39 #include "chrome/browser/printing/print_job_manager.h"
40 #include "chrome/browser/profiles/profile_impl.h" 40 #include "chrome/browser/profiles/profile_impl.h"
41 #include "chrome/browser/profiles/profile_info_cache.h"
41 #include "chrome/browser/profiles/profile_manager.h" 42 #include "chrome/browser/profiles/profile_manager.h"
42 #include "chrome/browser/renderer_host/web_cache_manager.h" 43 #include "chrome/browser/renderer_host/web_cache_manager.h"
43 #include "chrome/browser/safe_browsing/safe_browsing_service.h" 44 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
44 #include "chrome/browser/search_engines/template_url_service.h" 45 #include "chrome/browser/search_engines/template_url_service.h"
45 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" 46 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
46 #include "chrome/browser/sync/signin_manager.h" 47 #include "chrome/browser/sync/signin_manager.h"
47 #include "chrome/browser/tabs/pinned_tab_codec.h" 48 #include "chrome/browser/tabs/pinned_tab_codec.h"
48 #include "chrome/browser/task_manager/task_manager.h" 49 #include "chrome/browser/task_manager/task_manager.h"
49 #include "chrome/browser/translate/translate_prefs.h" 50 #include "chrome/browser/translate/translate_prefs.h"
50 #include "chrome/browser/ui/browser.h" 51 #include "chrome/browser/ui/browser.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 BrowserView::RegisterBrowserViewPrefs(local_state); 104 BrowserView::RegisterBrowserViewPrefs(local_state);
104 #endif 105 #endif
105 UpgradeDetector::RegisterPrefs(local_state); 106 UpgradeDetector::RegisterPrefs(local_state);
106 TaskManager::RegisterPrefs(local_state); 107 TaskManager::RegisterPrefs(local_state);
107 geolocation::RegisterPrefs(local_state); 108 geolocation::RegisterPrefs(local_state);
108 AutofillManager::RegisterBrowserPrefs(local_state); 109 AutofillManager::RegisterBrowserPrefs(local_state);
109 BackgroundModeManager::RegisterPrefs(local_state); 110 BackgroundModeManager::RegisterPrefs(local_state);
110 NotificationUIManager::RegisterPrefs(local_state); 111 NotificationUIManager::RegisterPrefs(local_state);
111 PrefProxyConfigService::RegisterPrefs(local_state); 112 PrefProxyConfigService::RegisterPrefs(local_state);
112 policy::CloudPolicySubsystem::RegisterPrefs(local_state); 113 policy::CloudPolicySubsystem::RegisterPrefs(local_state);
114 ProfileInfoCache::RegisterPrefs(local_state);
113 ProfileManager::RegisterPrefs(local_state); 115 ProfileManager::RegisterPrefs(local_state);
114 #if defined(OS_CHROMEOS) 116 #if defined(OS_CHROMEOS)
115 chromeos::AudioMixerAlsa::RegisterPrefs(local_state); 117 chromeos::AudioMixerAlsa::RegisterPrefs(local_state);
116 chromeos::UserManager::RegisterPrefs(local_state); 118 chromeos::UserManager::RegisterPrefs(local_state);
117 chromeos::UserCrosSettingsProvider::RegisterPrefs(local_state); 119 chromeos::UserCrosSettingsProvider::RegisterPrefs(local_state);
118 chromeos::WizardController::RegisterPrefs(local_state); 120 chromeos::WizardController::RegisterPrefs(local_state);
119 chromeos::InputMethodMenu::RegisterPrefs(local_state); 121 chromeos::InputMethodMenu::RegisterPrefs(local_state);
120 chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state); 122 chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state);
121 chromeos::SignedSettingsTempStorage::RegisterPrefs(local_state); 123 chromeos::SignedSettingsTempStorage::RegisterPrefs(local_state);
122 chromeos::NetworkMenuButton::RegisterPrefs(local_state); 124 chromeos::NetworkMenuButton::RegisterPrefs(local_state);
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); 197 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue()));
196 } 198 }
197 local_state->ClearPref(prefs::kBrowserWindowPlacement); 199 local_state->ClearPref(prefs::kBrowserWindowPlacement);
198 200
199 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 201 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
200 current_version | WINDOWS_PREFS); 202 current_version | WINDOWS_PREFS);
201 } 203 }
202 } 204 }
203 205
204 } // namespace browser 206 } // namespace browser
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698