Commit fb5ccdeb authored by bartfab@chromium.org's avatar bartfab@chromium.org

Set default for prefs::kGCMChannelEnabled to true on all channels

GCMProfileService tweaks the default value of prefs::kGCMChannelEnabled
so that GCM is enabled by default on the canary/dev/custom channels only.
However, the code that uses this pref has been broken for three months
now (since http://crrev.com/253787) so that it completely ignores the
default pref value. Hence, there is no need to tweak the default.

BUG=376746
TEST=Manual

Review URL: https://codereview.chromium.org/301433002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272669 0039d316-1c4b-4281-b951-d872f2087c98
parent 8705654b
......@@ -15,7 +15,6 @@
#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
#include "chrome/browser/signin/signin_manager_factory.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_version_info.h"
#include "chrome/common/pref_names.h"
#include "components/gcm_driver/gcm_client_factory.h"
#include "components/pref_registry/pref_registry_syncable.h"
......@@ -63,17 +62,9 @@ std::string GCMProfileService::GetGCMEnabledStateString(GCMEnabledState state) {
// static
void GCMProfileService::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
// GCM support is only enabled by default for Canary/Dev/Custom builds.
chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
bool on_by_default = false;
if (channel == chrome::VersionInfo::CHANNEL_UNKNOWN ||
channel == chrome::VersionInfo::CHANNEL_CANARY ||
channel == chrome::VersionInfo::CHANNEL_DEV) {
on_by_default = true;
}
registry->RegisterBooleanPref(
prefs::kGCMChannelEnabled,
on_by_default,
true,
user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment