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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 7564006: Rename PluginUpdater to PluginPrefs and make it per-profile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add static initialization again Created 9 years, 4 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
« no previous file with comments | « chrome/browser/plugin_updater.cc ('k') | chrome/browser/profiles/profile_dependency_manager.cc » ('j') | chrome/browser/profiles/profile_dependency_manager.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/background_contents_service.h" 9 #include "chrome/browser/background/background_contents_service.h"
10 #include "chrome/browser/background/background_mode_manager.h" 10 #include "chrome/browser/background/background_mode_manager.h"
(...skipping 18 matching lines...) Expand all
29 #include "chrome/browser/metrics/metrics_service.h" 29 #include "chrome/browser/metrics/metrics_service.h"
30 #include "chrome/browser/net/net_pref_observer.h" 30 #include "chrome/browser/net/net_pref_observer.h"
31 #include "chrome/browser/net/ssl_config_service_manager.h" 31 #include "chrome/browser/net/ssl_config_service_manager.h"
32 #include "chrome/browser/net/predictor_api.h" 32 #include "chrome/browser/net/predictor_api.h"
33 #include "chrome/browser/net/pref_proxy_config_service.h" 33 #include "chrome/browser/net/pref_proxy_config_service.h"
34 #include "chrome/browser/net/ssl_config_service_manager.h" 34 #include "chrome/browser/net/ssl_config_service_manager.h"
35 #include "chrome/browser/notifications/desktop_notification_service.h" 35 #include "chrome/browser/notifications/desktop_notification_service.h"
36 #include "chrome/browser/notifications/notification_ui_manager.h" 36 #include "chrome/browser/notifications/notification_ui_manager.h"
37 #include "chrome/browser/page_info_model.h" 37 #include "chrome/browser/page_info_model.h"
38 #include "chrome/browser/password_manager/password_manager.h" 38 #include "chrome/browser/password_manager/password_manager.h"
39 #include "chrome/browser/plugin_updater.h" 39 #include "chrome/browser/plugin_prefs.h"
40 #include "chrome/browser/policy/cloud_policy_subsystem.h" 40 #include "chrome/browser/policy/cloud_policy_subsystem.h"
41 #include "chrome/browser/prefs/incognito_mode_prefs.h" 41 #include "chrome/browser/prefs/incognito_mode_prefs.h"
42 #include "chrome/browser/prefs/session_startup_pref.h" 42 #include "chrome/browser/prefs/session_startup_pref.h"
43 #include "chrome/browser/printing/print_job_manager.h" 43 #include "chrome/browser/printing/print_job_manager.h"
44 #include "chrome/browser/profiles/profile_impl.h" 44 #include "chrome/browser/profiles/profile_impl.h"
45 #include "chrome/browser/profiles/profile_info_cache.h" 45 #include "chrome/browser/profiles/profile_info_cache.h"
46 #include "chrome/browser/profiles/profile_manager.h" 46 #include "chrome/browser/profiles/profile_manager.h"
47 #include "chrome/browser/remoting/firewall_traversal_tab_helper.h" 47 #include "chrome/browser/remoting/firewall_traversal_tab_helper.h"
48 #include "chrome/browser/renderer_host/web_cache_manager.h" 48 #include "chrome/browser/renderer_host/web_cache_manager.h"
49 #include "chrome/browser/safe_browsing/safe_browsing_service.h" 49 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 PasswordManager::RegisterUserPrefs(user_prefs); 149 PasswordManager::RegisterUserPrefs(user_prefs);
150 chrome_browser_net::RegisterUserPrefs(user_prefs); 150 chrome_browser_net::RegisterUserPrefs(user_prefs);
151 DownloadPrefs::RegisterUserPrefs(user_prefs); 151 DownloadPrefs::RegisterUserPrefs(user_prefs);
152 bookmark_utils::RegisterUserPrefs(user_prefs); 152 bookmark_utils::RegisterUserPrefs(user_prefs);
153 TabContentsWrapper::RegisterUserPrefs(user_prefs); 153 TabContentsWrapper::RegisterUserPrefs(user_prefs);
154 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); 154 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs);
155 ExtensionWebUI::RegisterUserPrefs(user_prefs); 155 ExtensionWebUI::RegisterUserPrefs(user_prefs);
156 ExtensionsUI::RegisterUserPrefs(user_prefs); 156 ExtensionsUI::RegisterUserPrefs(user_prefs);
157 IncognitoModePrefs::RegisterUserPrefs(user_prefs); 157 IncognitoModePrefs::RegisterUserPrefs(user_prefs);
158 NewTabUI::RegisterUserPrefs(user_prefs); 158 NewTabUI::RegisterUserPrefs(user_prefs);
159 PluginPrefs::RegisterPrefs(user_prefs);
159 PluginsUI::RegisterUserPrefs(user_prefs); 160 PluginsUI::RegisterUserPrefs(user_prefs);
160 PluginUpdater::RegisterPrefs(user_prefs);
161 ProfileImpl::RegisterUserPrefs(user_prefs); 161 ProfileImpl::RegisterUserPrefs(user_prefs);
162 PromoResourceService::RegisterUserPrefs(user_prefs); 162 PromoResourceService::RegisterUserPrefs(user_prefs);
163 HostContentSettingsMap::RegisterUserPrefs(user_prefs); 163 HostContentSettingsMap::RegisterUserPrefs(user_prefs);
164 DevToolsWindow::RegisterUserPrefs(user_prefs); 164 DevToolsWindow::RegisterUserPrefs(user_prefs);
165 PinnedTabCodec::RegisterUserPrefs(user_prefs); 165 PinnedTabCodec::RegisterUserPrefs(user_prefs);
166 ExtensionPrefs::RegisterUserPrefs(user_prefs); 166 ExtensionPrefs::RegisterUserPrefs(user_prefs);
167 GeolocationContentSettingsMap::RegisterUserPrefs(user_prefs); 167 GeolocationContentSettingsMap::RegisterUserPrefs(user_prefs);
168 TranslatePrefs::RegisterUserPrefs(user_prefs); 168 TranslatePrefs::RegisterUserPrefs(user_prefs);
169 DesktopNotificationService::RegisterUserPrefs(user_prefs); 169 DesktopNotificationService::RegisterUserPrefs(user_prefs);
170 PrefProxyConfigService::RegisterPrefs(user_prefs); 170 PrefProxyConfigService::RegisterPrefs(user_prefs);
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); 214 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue()));
215 } 215 }
216 local_state->ClearPref(prefs::kBrowserWindowPlacement); 216 local_state->ClearPref(prefs::kBrowserWindowPlacement);
217 217
218 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 218 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
219 current_version | WINDOWS_PREFS); 219 current_version | WINDOWS_PREFS);
220 } 220 }
221 } 221 }
222 222
223 } // namespace browser 223 } // namespace browser
OLDNEW
« no previous file with comments | « chrome/browser/plugin_updater.cc ('k') | chrome/browser/profiles/profile_dependency_manager.cc » ('j') | chrome/browser/profiles/profile_dependency_manager.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698