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

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

Issue 10735043: Exclude extension_settings_handler.cc from android build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
« no previous file with comments | « no previous file | chrome/chrome_browser.gypi » ('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) 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 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 void RegisterUserPrefs(PrefService* user_prefs) { 192 void RegisterUserPrefs(PrefService* user_prefs) {
193 // User prefs 193 // User prefs
194 AlternateErrorPageTabObserver::RegisterUserPrefs(user_prefs); 194 AlternateErrorPageTabObserver::RegisterUserPrefs(user_prefs);
195 AutofillManager::RegisterUserPrefs(user_prefs); 195 AutofillManager::RegisterUserPrefs(user_prefs);
196 bookmark_utils::RegisterUserPrefs(user_prefs); 196 bookmark_utils::RegisterUserPrefs(user_prefs);
197 ChromeContentBrowserClient::RegisterUserPrefs(user_prefs); 197 ChromeContentBrowserClient::RegisterUserPrefs(user_prefs);
198 ChromeVersionService::RegisterUserPrefs(user_prefs); 198 ChromeVersionService::RegisterUserPrefs(user_prefs);
199 chrome_browser_net::HttpServerPropertiesManager::RegisterPrefs(user_prefs); 199 chrome_browser_net::HttpServerPropertiesManager::RegisterPrefs(user_prefs);
200 chrome_browser_net::Predictor::RegisterUserPrefs(user_prefs); 200 chrome_browser_net::Predictor::RegisterUserPrefs(user_prefs);
201 DownloadPrefs::RegisterUserPrefs(user_prefs); 201 DownloadPrefs::RegisterUserPrefs(user_prefs);
202 ExtensionSettingsHandler::RegisterUserPrefs(user_prefs);
203 GAIAInfoUpdateService::RegisterUserPrefs(user_prefs); 202 GAIAInfoUpdateService::RegisterUserPrefs(user_prefs);
204 HostContentSettingsMap::RegisterUserPrefs(user_prefs); 203 HostContentSettingsMap::RegisterUserPrefs(user_prefs);
205 IncognitoModePrefs::RegisterUserPrefs(user_prefs); 204 IncognitoModePrefs::RegisterUserPrefs(user_prefs);
206 InstantController::RegisterUserPrefs(user_prefs); 205 InstantController::RegisterUserPrefs(user_prefs);
207 NetPrefObserver::RegisterPrefs(user_prefs); 206 NetPrefObserver::RegisterPrefs(user_prefs);
208 NewTabUI::RegisterUserPrefs(user_prefs); 207 NewTabUI::RegisterUserPrefs(user_prefs);
209 PasswordManager::RegisterUserPrefs(user_prefs); 208 PasswordManager::RegisterUserPrefs(user_prefs);
210 PrefProxyConfigTrackerImpl::RegisterPrefs(user_prefs); 209 PrefProxyConfigTrackerImpl::RegisterPrefs(user_prefs);
211 PrefsTabHelper::RegisterUserPrefs(user_prefs); 210 PrefsTabHelper::RegisterUserPrefs(user_prefs);
212 ProfileImpl::RegisterUserPrefs(user_prefs); 211 ProfileImpl::RegisterUserPrefs(user_prefs);
(...skipping 19 matching lines...) Expand all
232 231
233 #if defined(USE_ASH) 232 #if defined(USE_ASH)
234 ash::RegisterChromeLauncherUserPrefs(user_prefs); 233 ash::RegisterChromeLauncherUserPrefs(user_prefs);
235 #endif 234 #endif
236 235
237 #if !defined(OS_ANDROID) 236 #if !defined(OS_ANDROID)
238 AppsPromo::RegisterUserPrefs(user_prefs); 237 AppsPromo::RegisterUserPrefs(user_prefs);
239 extensions::CommandService::RegisterUserPrefs(user_prefs); 238 extensions::CommandService::RegisterUserPrefs(user_prefs);
240 extensions::ComponentLoader::RegisterUserPrefs(user_prefs); 239 extensions::ComponentLoader::RegisterUserPrefs(user_prefs);
241 extensions::ExtensionPrefs::RegisterUserPrefs(user_prefs); 240 extensions::ExtensionPrefs::RegisterUserPrefs(user_prefs);
241 ExtensionSettingsHandler::RegisterUserPrefs(user_prefs);
242 ExtensionWebUI::RegisterUserPrefs(user_prefs); 242 ExtensionWebUI::RegisterUserPrefs(user_prefs);
243 RegisterBrowserUserPrefs(user_prefs); 243 RegisterBrowserUserPrefs(user_prefs);
244 RegisterAutolaunchPrefs(user_prefs); 244 RegisterAutolaunchPrefs(user_prefs);
245 DevToolsWindow::RegisterUserPrefs(user_prefs); 245 DevToolsWindow::RegisterUserPrefs(user_prefs);
246 PepperFlashSettingsManager::RegisterUserPrefs(user_prefs); 246 PepperFlashSettingsManager::RegisterUserPrefs(user_prefs);
247 PinnedTabCodec::RegisterUserPrefs(user_prefs); 247 PinnedTabCodec::RegisterUserPrefs(user_prefs);
248 PluginsUI::RegisterUserPrefs(user_prefs); 248 PluginsUI::RegisterUserPrefs(user_prefs);
249 PromoResourceService::RegisterUserPrefs(user_prefs); 249 PromoResourceService::RegisterUserPrefs(user_prefs);
250 SyncPromoUI::RegisterUserPrefs(user_prefs); 250 SyncPromoUI::RegisterUserPrefs(user_prefs);
251 #endif 251 #endif
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 } 329 }
330 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 330 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
331 331
332 current_version |= GOOGLE_URL_TRACKER_PREFS; 332 current_version |= GOOGLE_URL_TRACKER_PREFS;
333 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 333 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
334 current_version); 334 current_version);
335 } 335 }
336 } 336 }
337 337
338 } // namespace chrome 338 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698