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

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

Issue 12328054: Fix prefs registration for BrowserInstantController. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sketch of solution. Created 7 years, 10 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 "apps/prefs.h" 7 #include "apps/prefs.h"
8 #include "base/prefs/pref_registry_simple.h" 8 #include "base/prefs/pref_registry_simple.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "chrome/browser/about_flags.h" 10 #include "chrome/browser/about_flags.h"
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 PrefRegistrySyncable* registry) { 261 PrefRegistrySyncable* registry) {
262 // TODO(joi): Get rid of the need for the PrefService parameter, and 262 // TODO(joi): Get rid of the need for the PrefService parameter, and
263 // do registration prior to PrefService creation. 263 // do registration prior to PrefService creation.
264 264
265 // User prefs. Please keep this list alphabetized. 265 // User prefs. Please keep this list alphabetized.
266 AlternateErrorPageTabObserver::RegisterUserPrefs(registry); 266 AlternateErrorPageTabObserver::RegisterUserPrefs(registry);
267 autofill::AutofillDialogControllerImpl::RegisterUserPrefs(registry); 267 autofill::AutofillDialogControllerImpl::RegisterUserPrefs(registry);
268 AutofillManager::RegisterUserPrefs(registry); 268 AutofillManager::RegisterUserPrefs(registry);
269 BookmarkPromptPrefs::RegisterUserPrefs(registry); 269 BookmarkPromptPrefs::RegisterUserPrefs(registry);
270 bookmark_utils::RegisterUserPrefs(registry); 270 bookmark_utils::RegisterUserPrefs(registry);
271 BrowserInstantController::RegisterUserPrefs(user_prefs, registry); 271 BrowserInstantController::RegisterUserPrefs(registry);
272 browser_sync::SyncPrefs::RegisterUserPrefs(user_prefs, registry); 272 browser_sync::SyncPrefs::RegisterUserPrefs(user_prefs, registry);
273 ChromeContentBrowserClient::RegisterUserPrefs(registry); 273 ChromeContentBrowserClient::RegisterUserPrefs(registry);
274 ChromeDownloadManagerDelegate::RegisterUserPrefs(registry); 274 ChromeDownloadManagerDelegate::RegisterUserPrefs(registry);
275 ChromeVersionService::RegisterUserPrefs(registry); 275 ChromeVersionService::RegisterUserPrefs(registry);
276 chrome_browser_net::HttpServerPropertiesManager::RegisterUserPrefs( 276 chrome_browser_net::HttpServerPropertiesManager::RegisterUserPrefs(
277 registry); 277 registry);
278 chrome_browser_net::Predictor::RegisterUserPrefs(registry); 278 chrome_browser_net::Predictor::RegisterUserPrefs(registry);
279 DownloadPrefs::RegisterUserPrefs(registry); 279 DownloadPrefs::RegisterUserPrefs(registry);
280 extensions::ComponentLoader::RegisterUserPrefs(registry); 280 extensions::ComponentLoader::RegisterUserPrefs(registry);
281 extensions::ExtensionPrefs::RegisterUserPrefs(registry); 281 extensions::ExtensionPrefs::RegisterUserPrefs(registry);
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
435 } 435 }
436 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 436 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
437 437
438 current_version |= GOOGLE_URL_TRACKER_PREFS; 438 current_version |= GOOGLE_URL_TRACKER_PREFS;
439 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 439 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
440 current_version); 440 current_version);
441 } 441 }
442 } 442 }
443 443
444 } // namespace chrome 444 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698