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

Unified Diff: chrome/browser/services/gcm/instance_id/instance_id_profile_service.cc

Issue 1131793011: Remove the extra guard in InstanceIDProfileService (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « chrome/browser/extensions/api/instance_id/instance_id_apitest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/services/gcm/instance_id/instance_id_profile_service.cc
diff --git a/chrome/browser/services/gcm/instance_id/instance_id_profile_service.cc b/chrome/browser/services/gcm/instance_id/instance_id_profile_service.cc
index dc80f364d99561afc9a4df06b7da5ba6e621ccf3..b8d1f3c70d32da04c5ffb7f615b3f568fdead120 100644
--- a/chrome/browser/services/gcm/instance_id/instance_id_profile_service.cc
+++ b/chrome/browser/services/gcm/instance_id/instance_id_profile_service.cc
@@ -8,7 +8,6 @@
#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/chrome_version_info.h"
#include "components/gcm_driver/instance_id/instance_id_driver.h"
namespace instance_id {
@@ -19,13 +18,6 @@ bool InstanceIDProfileService::IsInstanceIDEnabled(Profile* profile) {
if (!gcm::GCMProfileService::IsGCMEnabled(profile))
return false;
- // Enabled only for trunk/canary/dev builds.
- chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
- if (channel == chrome::VersionInfo::CHANNEL_BETA ||
- channel == chrome::VersionInfo::CHANNEL_STABLE) {
- return false;
- }
-
return InstanceIDDriver::IsInstanceIDEnabled();
}
« no previous file with comments | « chrome/browser/extensions/api/instance_id/instance_id_apitest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698