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

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

Issue 10824067: Some fixes to run unit_tests bundle on android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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/download/download_util.cc ('k') | no next file » | 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 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 void RegisterUserPrefs(PrefService* user_prefs) { 191 void RegisterUserPrefs(PrefService* user_prefs) {
192 // User prefs 192 // User prefs
193 AlternateErrorPageTabObserver::RegisterUserPrefs(user_prefs); 193 AlternateErrorPageTabObserver::RegisterUserPrefs(user_prefs);
194 AutofillManager::RegisterUserPrefs(user_prefs); 194 AutofillManager::RegisterUserPrefs(user_prefs);
195 bookmark_utils::RegisterUserPrefs(user_prefs); 195 bookmark_utils::RegisterUserPrefs(user_prefs);
196 ChromeContentBrowserClient::RegisterUserPrefs(user_prefs); 196 ChromeContentBrowserClient::RegisterUserPrefs(user_prefs);
197 ChromeVersionService::RegisterUserPrefs(user_prefs); 197 ChromeVersionService::RegisterUserPrefs(user_prefs);
198 chrome_browser_net::HttpServerPropertiesManager::RegisterPrefs(user_prefs); 198 chrome_browser_net::HttpServerPropertiesManager::RegisterPrefs(user_prefs);
199 chrome_browser_net::Predictor::RegisterUserPrefs(user_prefs); 199 chrome_browser_net::Predictor::RegisterUserPrefs(user_prefs);
200 DownloadPrefs::RegisterUserPrefs(user_prefs); 200 DownloadPrefs::RegisterUserPrefs(user_prefs);
201 ExtensionWebUI::RegisterUserPrefs(user_prefs);
201 GAIAInfoUpdateService::RegisterUserPrefs(user_prefs); 202 GAIAInfoUpdateService::RegisterUserPrefs(user_prefs);
202 HostContentSettingsMap::RegisterUserPrefs(user_prefs); 203 HostContentSettingsMap::RegisterUserPrefs(user_prefs);
203 IncognitoModePrefs::RegisterUserPrefs(user_prefs); 204 IncognitoModePrefs::RegisterUserPrefs(user_prefs);
204 InstantController::RegisterUserPrefs(user_prefs); 205 InstantController::RegisterUserPrefs(user_prefs);
205 NetPrefObserver::RegisterPrefs(user_prefs); 206 NetPrefObserver::RegisterPrefs(user_prefs);
206 NewTabUI::RegisterUserPrefs(user_prefs); 207 NewTabUI::RegisterUserPrefs(user_prefs);
207 PasswordManager::RegisterUserPrefs(user_prefs); 208 PasswordManager::RegisterUserPrefs(user_prefs);
208 PrefProxyConfigTrackerImpl::RegisterPrefs(user_prefs); 209 PrefProxyConfigTrackerImpl::RegisterPrefs(user_prefs);
209 PrefsTabHelper::RegisterUserPrefs(user_prefs); 210 PrefsTabHelper::RegisterUserPrefs(user_prefs);
210 ProfileImpl::RegisterUserPrefs(user_prefs); 211 ProfileImpl::RegisterUserPrefs(user_prefs);
(...skipping 22 matching lines...) Expand all
233 ash::RegisterChromeLauncherUserPrefs(user_prefs); 234 ash::RegisterChromeLauncherUserPrefs(user_prefs);
234 #endif 235 #endif
235 236
236 #if !defined(OS_ANDROID) 237 #if !defined(OS_ANDROID)
237 AppsPromo::RegisterUserPrefs(user_prefs); 238 AppsPromo::RegisterUserPrefs(user_prefs);
238 ChromeToMobileService::RegisterUserPrefs(user_prefs); 239 ChromeToMobileService::RegisterUserPrefs(user_prefs);
239 extensions::CommandService::RegisterUserPrefs(user_prefs); 240 extensions::CommandService::RegisterUserPrefs(user_prefs);
240 extensions::ComponentLoader::RegisterUserPrefs(user_prefs); 241 extensions::ComponentLoader::RegisterUserPrefs(user_prefs);
241 extensions::ExtensionPrefs::RegisterUserPrefs(user_prefs); 242 extensions::ExtensionPrefs::RegisterUserPrefs(user_prefs);
242 ExtensionSettingsHandler::RegisterUserPrefs(user_prefs); 243 ExtensionSettingsHandler::RegisterUserPrefs(user_prefs);
243 ExtensionWebUI::RegisterUserPrefs(user_prefs);
244 RegisterBrowserUserPrefs(user_prefs); 244 RegisterBrowserUserPrefs(user_prefs);
245 RegisterAutolaunchPrefs(user_prefs); 245 RegisterAutolaunchPrefs(user_prefs);
246 DevToolsWindow::RegisterUserPrefs(user_prefs); 246 DevToolsWindow::RegisterUserPrefs(user_prefs);
247 PepperFlashSettingsManager::RegisterUserPrefs(user_prefs); 247 PepperFlashSettingsManager::RegisterUserPrefs(user_prefs);
248 PinnedTabCodec::RegisterUserPrefs(user_prefs); 248 PinnedTabCodec::RegisterUserPrefs(user_prefs);
249 PluginsUI::RegisterUserPrefs(user_prefs); 249 PluginsUI::RegisterUserPrefs(user_prefs);
250 SyncPromoUI::RegisterUserPrefs(user_prefs); 250 SyncPromoUI::RegisterUserPrefs(user_prefs);
251 printing::StickySettings::RegisterUserPrefs(user_prefs); 251 printing::StickySettings::RegisterUserPrefs(user_prefs);
252 #endif 252 #endif
253 253
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 } 326 }
327 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 327 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
328 328
329 current_version |= GOOGLE_URL_TRACKER_PREFS; 329 current_version |= GOOGLE_URL_TRACKER_PREFS;
330 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 330 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
331 current_version); 331 current_version);
332 } 332 }
333 } 333 }
334 334
335 } // namespace chrome 335 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/download/download_util.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698