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

Unified Diff: components/sync/android/java/src/org/chromium/components/sync/notifier/InvalidationIntentProtocol.java

Issue 2130453004: [Sync] Move //sync to //components/sync. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 5 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/sync/android/java/src/org/chromium/components/sync/notifier/InvalidationIntentProtocol.java
diff --git a/sync/android/java/src/org/chromium/sync/notifier/InvalidationIntentProtocol.java b/components/sync/android/java/src/org/chromium/components/sync/notifier/InvalidationIntentProtocol.java
similarity index 89%
rename from sync/android/java/src/org/chromium/sync/notifier/InvalidationIntentProtocol.java
rename to components/sync/android/java/src/org/chromium/components/sync/notifier/InvalidationIntentProtocol.java
index 6f0af9421cb70cd39c19722de74c6d915dfc4730..438a8d1e4534cec62c83b32028e2bf3011875004 100644
--- a/sync/android/java/src/org/chromium/sync/notifier/InvalidationIntentProtocol.java
+++ b/components/sync/android/java/src/org/chromium/components/sync/notifier/InvalidationIntentProtocol.java
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-package org.chromium.sync.notifier;
+package org.chromium.components.sync.notifier;
import android.accounts.Account;
import android.content.Intent;
@@ -11,7 +11,7 @@ import com.google.ipc.invalidation.external.client.types.ObjectId;
import com.google.protos.ipc.invalidation.Types;
import org.chromium.base.CollectionUtil;
-import org.chromium.sync.ModelTypeHelper;
+import org.chromium.components.sync.ModelTypeHelper;
import java.util.ArrayList;
import java.util.HashSet;
@@ -26,7 +26,7 @@ public class InvalidationIntentProtocol {
* Action set on register intents.
*/
public static final String ACTION_REGISTER =
- "org.chromium.sync.notifier.ACTION_REGISTER_TYPES";
+ "org.chromium.components.sync.notifier.ACTION_REGISTER_TYPES";
/**
* Parcelable-valued intent extra containing the account of the user.
@@ -66,8 +66,8 @@ public class InvalidationIntentProtocol {
for (Integer type : types) {
selectedTypesArray[pos++] = ModelTypeHelper.toNotificationType(type);
}
- registerIntent.putStringArrayListExtra(EXTRA_REGISTERED_TYPES,
- CollectionUtil.newArrayList(selectedTypesArray));
+ registerIntent.putStringArrayListExtra(
+ EXTRA_REGISTERED_TYPES, CollectionUtil.newArrayList(selectedTypesArray));
registerIntent.putExtra(EXTRA_ACCOUNT, account);
return registerIntent;
}
@@ -78,8 +78,8 @@ public class InvalidationIntentProtocol {
* Sync-specific objects are filtered out of the request since Sync types
* are registered using the other version of createRegisterIntent.
*/
- public static Intent createRegisterIntent(Account account, int[] objectSources,
- String[] objectNames) {
+ public static Intent createRegisterIntent(
+ Account account, int[] objectSources, String[] objectNames) {
if (objectSources.length != objectNames.length) {
throw new IllegalArgumentException(
"objectSources and objectNames must have the same length");
@@ -125,8 +125,8 @@ public class InvalidationIntentProtocol {
}
Set<ObjectId> objectIds = new HashSet<ObjectId>(objectSources.size());
for (int i = 0; i < objectSources.size(); i++) {
- objectIds.add(ObjectId.newInstance(
- objectSources.get(i), objectNames.get(i).getBytes()));
+ objectIds.add(
+ ObjectId.newInstance(objectSources.get(i), objectNames.get(i).getBytes()));
}
return objectIds;
}

Powered by Google App Engine
This is Rietveld 408576698