components/gcm_driver/instance_id/instance_id_driver.cc - Issue 1830983002: Implement InstanceIDAndroid using InstanceIDWithSubtype.java

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/gcm_driver/instance_id/instance_id_driver.cc

Issue 1830983002: Implement InstanceIDAndroid using InstanceIDWithSubtype.java (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@iid1subtype

Patch Set: Rebase Created 4 years, 8 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

« components/gcm_driver/instance_id/instance_id_android.cc ('K') | « components/gcm_driver/instance_id/instance_id_android.cc ('k') | components/gcm_driver/instance_id/instance_id_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/gcm_driver/instance_id/instance_id_driver.cc

diff --git a/components/gcm_driver/instance_id/instance_id_driver.cc b/components/gcm_driver/instance_id/instance_id_driver.cc

index 374be2244a51c26945eddc7c0807fe702c45b07d..937d77b4bb416cadd1d672bb16d9feffc21bfb78 100644

--- a/components/gcm_driver/instance_id/instance_id_driver.cc

+++ b/components/gcm_driver/instance_id/instance_id_driver.cc

@@ -12,22 +12,15 @@

namespace instance_id {

namespace {

-#if !defined(OS_ANDROID)

const char kInstanceIDFieldTrialName[] = "InstanceID";

const char kInstanceIDFieldTrialEnabledGroupName[] = "Enabled";

-#endif // !defined(OS_ANDROID)

} // namespace

// static

bool InstanceIDDriver::IsInstanceIDEnabled() {

-#if defined(OS_ANDROID)

- // Not implemented yet.

- return false;

-#else

std::string group_name =

base::FieldTrialList::FindFullName(kInstanceIDFieldTrialName);

return group_name == kInstanceIDFieldTrialEnabledGroupName;

-#endif // defined(OS_ANDROID)

}

InstanceIDDriver::InstanceIDDriver(gcm::GCMDriver* gcm_driver)