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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/api/gcm/gcm_api.cc

Issue 1425783002: Componentizing GcmProfileService. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix UT errors as per comments Created 5 years, 1 month 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
« no previous file with comments | « chrome/browser/extensions/api/copresence/copresence_api.cc ('k') | chrome/browser/extensions/api/instance_id/instance_id_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/gcm/gcm_api.cc
diff --git a/chrome/browser/extensions/api/gcm/gcm_api.cc b/chrome/browser/extensions/api/gcm/gcm_api.cc
index 60dd2922a90f4823e89760e402a8b04e349b9768..09275a38c87006124000569d008ffe892df1a726 100644
--- a/chrome/browser/extensions/api/gcm/gcm_api.cc
+++ b/chrome/browser/extensions/api/gcm/gcm_api.cc
@@ -13,11 +13,11 @@
#include "base/strings/string_util.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/services/gcm/gcm_profile_service.h"
#include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
#include "chrome/common/extensions/api/gcm.h"
#include "components/gcm_driver/common/gcm_messages.h"
#include "components/gcm_driver/gcm_driver.h"
+#include "components/gcm_driver/gcm_profile_service.h"
#include "extensions/browser/event_router.h"
#include "extensions/common/extension.h"
@@ -96,7 +96,7 @@ bool GcmApiFunction::IsGcmApiEnabled() const {
if (profile->IsOffTheRecord())
return false;
- return gcm::GCMProfileService::IsGCMEnabled(profile);
+ return gcm::GCMProfileService::IsGCMEnabled(profile->GetPrefs());
}
gcm::GCMDriver* GcmApiFunction::GetGCMDriver() const {
« no previous file with comments | « chrome/browser/extensions/api/copresence/copresence_api.cc ('k') | chrome/browser/extensions/api/instance_id/instance_id_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698