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

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

Issue 6825052: Update the web store promo to be clearer and configurable at run-time. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Incorporate Aaron's feedback. Created 9 years, 8 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/extensions/extension_service.cc ('k') | chrome/browser/profiles/profile_impl.h » ('j') | no next file with comments »
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_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"
11 #include "chrome/browser/background_page_tracker.h" 11 #include "chrome/browser/background_page_tracker.h"
12 #include "chrome/browser/bookmarks/bookmark_utils.h" 12 #include "chrome/browser/bookmarks/bookmark_utils.h"
13 #include "chrome/browser/browser_shutdown.h" 13 #include "chrome/browser/browser_shutdown.h"
14 #include "chrome/browser/content_settings/host_content_settings_map.h" 14 #include "chrome/browser/content_settings/host_content_settings_map.h"
15 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" 15 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
16 #include "chrome/browser/debugger/devtools_manager.h" 16 #include "chrome/browser/debugger/devtools_manager.h"
17 #include "chrome/browser/download/download_prefs.h" 17 #include "chrome/browser/download/download_prefs.h"
18 #include "chrome/browser/extensions/apps_promo.h"
18 #include "chrome/browser/extensions/extension_prefs.h" 19 #include "chrome/browser/extensions/extension_prefs.h"
19 #include "chrome/browser/extensions/extension_web_ui.h" 20 #include "chrome/browser/extensions/extension_web_ui.h"
20 #include "chrome/browser/extensions/extensions_ui.h" 21 #include "chrome/browser/extensions/extensions_ui.h"
21 #include "chrome/browser/external_protocol_handler.h" 22 #include "chrome/browser/external_protocol_handler.h"
22 #include "chrome/browser/geolocation/geolocation_content_settings_map.h" 23 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"
23 #include "chrome/browser/geolocation/geolocation_prefs.h" 24 #include "chrome/browser/geolocation/geolocation_prefs.h"
24 #include "chrome/browser/google/google_url_tracker.h" 25 #include "chrome/browser/google/google_url_tracker.h"
25 #include "chrome/browser/instant/instant_controller.h" 26 #include "chrome/browser/instant/instant_controller.h"
26 #include "chrome/browser/intranet_redirect_detector.h" 27 #include "chrome/browser/intranet_redirect_detector.h"
27 #include "chrome/browser/metrics/metrics_log.h" 28 #include "chrome/browser/metrics/metrics_log.h"
(...skipping 18 matching lines...) Expand all
46 #include "chrome/browser/tabs/pinned_tab_codec.h" 47 #include "chrome/browser/tabs/pinned_tab_codec.h"
47 #include "chrome/browser/task_manager/task_manager.h" 48 #include "chrome/browser/task_manager/task_manager.h"
48 #include "chrome/browser/translate/translate_prefs.h" 49 #include "chrome/browser/translate/translate_prefs.h"
49 #include "chrome/browser/ui/browser.h" 50 #include "chrome/browser/ui/browser.h"
50 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" 51 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
51 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" 52 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
52 #include "chrome/browser/ui/webui/flags_ui.h" 53 #include "chrome/browser/ui/webui/flags_ui.h"
53 #include "chrome/browser/ui/webui/new_tab_ui.h" 54 #include "chrome/browser/ui/webui/new_tab_ui.h"
54 #include "chrome/browser/ui/webui/plugins_ui.h" 55 #include "chrome/browser/ui/webui/plugins_ui.h"
55 #include "chrome/browser/upgrade_detector.h" 56 #include "chrome/browser/upgrade_detector.h"
57 #include "chrome/browser/web_resource/promo_resource_service.h"
56 #include "chrome/common/pref_names.h" 58 #include "chrome/common/pref_names.h"
57 #include "content/browser/host_zoom_map.h" 59 #include "content/browser/host_zoom_map.h"
58 60
59 #if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port 61 #if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port
60 #include "chrome/browser/ui/views/browser_actions_container.h" 62 #include "chrome/browser/ui/views/browser_actions_container.h"
61 #include "chrome/browser/ui/views/frame/browser_view.h" 63 #include "chrome/browser/ui/views/frame/browser_view.h"
62 #endif 64 #endif
63 65
64 #if defined(TOOLKIT_GTK) 66 #if defined(TOOLKIT_GTK)
65 #include "chrome/browser/ui/gtk/browser_window_gtk.h" 67 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
66 #endif 68 #endif
67 69
68 #if defined(OS_CHROMEOS) 70 #if defined(OS_CHROMEOS)
69 #include "chrome/browser/chromeos/audio_mixer_alsa.h" 71 #include "chrome/browser/chromeos/audio_mixer_alsa.h"
70 #include "chrome/browser/chromeos/login/apply_services_customization.h" 72 #include "chrome/browser/chromeos/login/apply_services_customization.h"
71 #include "chrome/browser/chromeos/login/signed_settings_temp_storage.h" 73 #include "chrome/browser/chromeos/login/signed_settings_temp_storage.h"
72 #include "chrome/browser/chromeos/login/user_manager.h" 74 #include "chrome/browser/chromeos/login/user_manager.h"
73 #include "chrome/browser/chromeos/login/wizard_controller.h" 75 #include "chrome/browser/chromeos/login/wizard_controller.h"
74 #include "chrome/browser/chromeos/preferences.h" 76 #include "chrome/browser/chromeos/preferences.h"
75 #include "chrome/browser/chromeos/status/input_method_menu.h" 77 #include "chrome/browser/chromeos/status/input_method_menu.h"
76 #include "chrome/browser/chromeos/user_cros_settings_provider.h" 78 #include "chrome/browser/chromeos/user_cros_settings_provider.h"
77 #endif 79 #endif
78 80
79 namespace browser { 81 namespace browser {
80 82
81 void RegisterLocalState(PrefService* local_state) { 83 void RegisterLocalState(PrefService* local_state) {
82 // Prefs in Local State 84 // Prefs in Local State
85 AppsPromo::RegisterPrefs(local_state);
83 Browser::RegisterPrefs(local_state); 86 Browser::RegisterPrefs(local_state);
84 FlagsUI::RegisterPrefs(local_state); 87 FlagsUI::RegisterPrefs(local_state);
85 WebCacheManager::RegisterPrefs(local_state); 88 WebCacheManager::RegisterPrefs(local_state);
86 ExternalProtocolHandler::RegisterPrefs(local_state); 89 ExternalProtocolHandler::RegisterPrefs(local_state);
87 GoogleURLTracker::RegisterPrefs(local_state); 90 GoogleURLTracker::RegisterPrefs(local_state);
88 IntranetRedirectDetector::RegisterPrefs(local_state); 91 IntranetRedirectDetector::RegisterPrefs(local_state);
89 KeywordEditorController::RegisterPrefs(local_state); 92 KeywordEditorController::RegisterPrefs(local_state);
90 MetricsLog::RegisterPrefs(local_state); 93 MetricsLog::RegisterPrefs(local_state);
91 MetricsService::RegisterPrefs(local_state); 94 MetricsService::RegisterPrefs(local_state);
95 PromoResourceService::RegisterPrefs(local_state);
92 SafeBrowsingService::RegisterPrefs(local_state); 96 SafeBrowsingService::RegisterPrefs(local_state);
93 browser_shutdown::RegisterPrefs(local_state); 97 browser_shutdown::RegisterPrefs(local_state);
94 #if defined(TOOLKIT_VIEWS) 98 #if defined(TOOLKIT_VIEWS)
95 BrowserView::RegisterBrowserViewPrefs(local_state); 99 BrowserView::RegisterBrowserViewPrefs(local_state);
96 #endif 100 #endif
97 UpgradeDetector::RegisterPrefs(local_state); 101 UpgradeDetector::RegisterPrefs(local_state);
98 TaskManager::RegisterPrefs(local_state); 102 TaskManager::RegisterPrefs(local_state);
99 geolocation::RegisterPrefs(local_state); 103 geolocation::RegisterPrefs(local_state);
100 AutofillManager::RegisterBrowserPrefs(local_state); 104 AutofillManager::RegisterBrowserPrefs(local_state);
101 BackgroundPageTracker::RegisterPrefs(local_state); 105 BackgroundPageTracker::RegisterPrefs(local_state);
102 NotificationUIManager::RegisterPrefs(local_state); 106 NotificationUIManager::RegisterPrefs(local_state);
103 PrefProxyConfigService::RegisterPrefs(local_state); 107 PrefProxyConfigService::RegisterPrefs(local_state);
104 policy::CloudPolicySubsystem::RegisterPrefs(local_state); 108 policy::CloudPolicySubsystem::RegisterPrefs(local_state);
105 #if defined(OS_CHROMEOS) 109 #if defined(OS_CHROMEOS)
106 chromeos::AudioMixerAlsa::RegisterPrefs(local_state); 110 chromeos::AudioMixerAlsa::RegisterPrefs(local_state);
107 chromeos::UserManager::RegisterPrefs(local_state); 111 chromeos::UserManager::RegisterPrefs(local_state);
108 chromeos::UserCrosSettingsProvider::RegisterPrefs(local_state); 112 chromeos::UserCrosSettingsProvider::RegisterPrefs(local_state);
109 WizardController::RegisterPrefs(local_state); 113 WizardController::RegisterPrefs(local_state);
110 chromeos::InputMethodMenu::RegisterPrefs(local_state); 114 chromeos::InputMethodMenu::RegisterPrefs(local_state);
111 chromeos::ApplyServicesCustomization::RegisterPrefs(local_state); 115 chromeos::ApplyServicesCustomization::RegisterPrefs(local_state);
112 chromeos::SignedSettingsTempStorage::RegisterPrefs(local_state); 116 chromeos::SignedSettingsTempStorage::RegisterPrefs(local_state);
113 #endif 117 #endif
114 } 118 }
115 119
116 void RegisterUserPrefs(PrefService* user_prefs) { 120 void RegisterUserPrefs(PrefService* user_prefs) {
117 // User prefs 121 // User prefs
122 AppsPromo::RegisterUserPrefs(user_prefs);
118 AutofillManager::RegisterUserPrefs(user_prefs); 123 AutofillManager::RegisterUserPrefs(user_prefs);
119 SessionStartupPref::RegisterUserPrefs(user_prefs); 124 SessionStartupPref::RegisterUserPrefs(user_prefs);
120 Browser::RegisterUserPrefs(user_prefs); 125 Browser::RegisterUserPrefs(user_prefs);
121 PasswordManager::RegisterUserPrefs(user_prefs); 126 PasswordManager::RegisterUserPrefs(user_prefs);
122 chrome_browser_net::RegisterUserPrefs(user_prefs); 127 chrome_browser_net::RegisterUserPrefs(user_prefs);
123 DownloadPrefs::RegisterUserPrefs(user_prefs); 128 DownloadPrefs::RegisterUserPrefs(user_prefs);
124 bookmark_utils::RegisterUserPrefs(user_prefs); 129 bookmark_utils::RegisterUserPrefs(user_prefs);
125 TabContentsWrapper::RegisterUserPrefs(user_prefs); 130 TabContentsWrapper::RegisterUserPrefs(user_prefs);
126 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); 131 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs);
127 ExtensionWebUI::RegisterUserPrefs(user_prefs); 132 ExtensionWebUI::RegisterUserPrefs(user_prefs);
128 ExtensionsUI::RegisterUserPrefs(user_prefs); 133 ExtensionsUI::RegisterUserPrefs(user_prefs);
129 NewTabUI::RegisterUserPrefs(user_prefs); 134 NewTabUI::RegisterUserPrefs(user_prefs);
130 PluginsUI::RegisterUserPrefs(user_prefs); 135 PluginsUI::RegisterUserPrefs(user_prefs);
131 ProfileImpl::RegisterUserPrefs(user_prefs); 136 ProfileImpl::RegisterUserPrefs(user_prefs);
137 PromoResourceService::RegisterUserPrefs(user_prefs);
132 HostContentSettingsMap::RegisterUserPrefs(user_prefs); 138 HostContentSettingsMap::RegisterUserPrefs(user_prefs);
133 HostZoomMap::RegisterUserPrefs(user_prefs); 139 HostZoomMap::RegisterUserPrefs(user_prefs);
134 DevToolsManager::RegisterUserPrefs(user_prefs); 140 DevToolsManager::RegisterUserPrefs(user_prefs);
135 PinnedTabCodec::RegisterUserPrefs(user_prefs); 141 PinnedTabCodec::RegisterUserPrefs(user_prefs);
136 ExtensionPrefs::RegisterUserPrefs(user_prefs); 142 ExtensionPrefs::RegisterUserPrefs(user_prefs);
137 GeolocationContentSettingsMap::RegisterUserPrefs(user_prefs); 143 GeolocationContentSettingsMap::RegisterUserPrefs(user_prefs);
138 TranslatePrefs::RegisterUserPrefs(user_prefs); 144 TranslatePrefs::RegisterUserPrefs(user_prefs);
139 DesktopNotificationService::RegisterUserPrefs(user_prefs); 145 DesktopNotificationService::RegisterUserPrefs(user_prefs);
140 PrefProxyConfigService::RegisterPrefs(user_prefs); 146 PrefProxyConfigService::RegisterPrefs(user_prefs);
141 #if defined(TOOLKIT_VIEWS) 147 #if defined(TOOLKIT_VIEWS)
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); 187 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue()));
182 } 188 }
183 local_state->ClearPref(prefs::kBrowserWindowPlacement); 189 local_state->ClearPref(prefs::kBrowserWindowPlacement);
184 190
185 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 191 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
186 current_version | WINDOWS_PREFS); 192 current_version | WINDOWS_PREFS);
187 } 193 }
188 } 194 }
189 195
190 } // namespace browser 196 } // namespace browser
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_service.cc ('k') | chrome/browser/profiles/profile_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698