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

Unified Diff: chrome/browser/prefs/browser_prefs.cc

Issue 13991017: Commit InvalidationService implementations (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Another attempt to fix Android Created 7 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/prefs/browser_prefs.cc
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 785459e4f029bec540d44fe71a0a31af6d09f430..b79f83a0aaa57c86a8e5bdb7beadf745c476d61a 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -34,6 +34,7 @@
#include "chrome/browser/gpu/gl_string_manager.h"
#include "chrome/browser/gpu/gpu_mode_manager.h"
#include "chrome/browser/intranet_redirect_detector.h"
+#include "chrome/browser/invalidation/invalidator_storage.h"
#include "chrome/browser/io_thread.h"
#include "chrome/browser/managed_mode/managed_mode.h"
#include "chrome/browser/managed_mode/managed_user_service.h"
@@ -67,7 +68,6 @@
#include "chrome/browser/search/search.h"
#include "chrome/browser/search_engines/template_url_prepopulate_data.h"
#include "chrome/browser/signin/signin_manager_factory.h"
-#include "chrome/browser/sync/invalidations/invalidator_storage.h"
#include "chrome/browser/sync/sync_prefs.h"
#include "chrome/browser/task_manager/task_manager.h"
#include "chrome/browser/translate/translate_prefs.h"
@@ -295,7 +295,7 @@ void RegisterUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
HostContentSettingsMap::RegisterUserPrefs(registry);
IncognitoModePrefs::RegisterUserPrefs(registry);
InstantUI::RegisterUserPrefs(registry);
- browser_sync::InvalidatorStorage::RegisterUserPrefs(registry);
+ invalidation::InvalidatorStorage::RegisterUserPrefs(registry);
MediaCaptureDevicesDispatcher::RegisterUserPrefs(registry);
MediaStreamDevicesController::RegisterUserPrefs(registry);
NetPrefObserver::RegisterUserPrefs(registry);

Powered by Google App Engine
This is Rietveld 408576698