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

Unified Diff: components/invalidation/impl/ticl_profile_settings_provider.cc

Issue 1418573005: [invalidation] Componentize TiclProfileSettingsProvider (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Maintain pref registration on Android Created 5 years, 2 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: components/invalidation/impl/ticl_profile_settings_provider.cc
diff --git a/chrome/browser/invalidation/ticl_profile_settings_provider.cc b/components/invalidation/impl/ticl_profile_settings_provider.cc
similarity index 67%
rename from chrome/browser/invalidation/ticl_profile_settings_provider.cc
rename to components/invalidation/impl/ticl_profile_settings_provider.cc
index 67e3235f991b89f69d435d0e644eab67ead5738c..1658c162cc88707256b206c1359ef8e7e5bd758f 100644
--- a/chrome/browser/invalidation/ticl_profile_settings_provider.cc
+++ b/components/invalidation/impl/ticl_profile_settings_provider.cc
@@ -2,23 +2,22 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/invalidation/ticl_profile_settings_provider.h"
+#include "components/invalidation/impl/ticl_profile_settings_provider.h"
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/command_line.h"
#include "base/prefs/pref_service.h"
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/services/gcm/gcm_profile_service.h"
-#include "chrome/common/chrome_switches.h"
-#include "chrome/common/pref_names.h"
#include "components/gcm_driver/gcm_channel_status_syncer.h"
+#include "components/invalidation/impl/invalidation_prefs.h"
+#include "components/invalidation/impl/invalidation_switches.h"
+#include "components/pref_registry/pref_registry_syncable.h"
namespace invalidation {
-TiclProfileSettingsProvider::TiclProfileSettingsProvider(Profile* profile)
- : profile_(profile) {
- registrar_.Init(profile->GetPrefs());
+TiclProfileSettingsProvider::TiclProfileSettingsProvider(PrefService* prefs)
+ : prefs_(prefs) {
+ registrar_.Init(prefs_);
registrar_.Add(
prefs::kInvalidationServiceUseGCMChannel,
base::Bind(&TiclProfileSettingsProvider::FireOnUseGCMChannelChanged,
@@ -29,12 +28,10 @@ TiclProfileSettingsProvider::TiclProfileSettingsProvider(Profile* profile)
base::Unretained(this)));
}
-TiclProfileSettingsProvider::~TiclProfileSettingsProvider() {
-}
+TiclProfileSettingsProvider::~TiclProfileSettingsProvider() {}
bool TiclProfileSettingsProvider::UseGCMChannel() const {
- if (profile_->GetPrefs()->GetBoolean(
- prefs::kInvalidationServiceUseGCMChannel)) {
+ if (prefs_->GetBoolean(prefs::kInvalidationServiceUseGCMChannel)) {
// Use GCM channel if it was enabled via prefs.
return true;
}

Powered by Google App Engine
This is Rietveld 408576698