summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpkotwicz <pkotwicz@chromium.org>2015-06-17 16:25:11 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-17 23:25:41 +0000
commit10fabd01b91cbc82f1e25ef1e332ec9246d68860 (patch)
treef7f23a021aa5ecfd60fa6b3268f5ae2b9646a2cf
parentc66933db708c909e878ae15ceda9e6cb7ac41c99 (diff)
downloadchromium_src-10fabd01b91cbc82f1e25ef1e332ec9246d68860.zip
chromium_src-10fabd01b91cbc82f1e25ef1e332ec9246d68860.tar.gz
chromium_src-10fabd01b91cbc82f1e25ef1e332ec9246d68860.tar.bz2
Disable FAVICON_IMAGE type when AndroidSessionNotifications experiment is on
Disable FAVICON_IMAGE type when AndroidSessionNotifications experiment is on because the FAVICON_IMAGE type only affects data shown on the "Recent Tabs" page on Android BUG=477054 TEST=None Review URL: https://codereview.chromium.org/1188283002 Cr-Commit-Position: refs/heads/master@{#334956}
-rw-r--r--sync/android/java/src/org/chromium/sync/internal_api/pub/base/ModelType.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/sync/android/java/src/org/chromium/sync/internal_api/pub/base/ModelType.java b/sync/android/java/src/org/chromium/sync/internal_api/pub/base/ModelType.java
index 1e9fe0c..5993d91 100644
--- a/sync/android/java/src/org/chromium/sync/internal_api/pub/base/ModelType.java
+++ b/sync/android/java/src/org/chromium/sync/internal_api/pub/base/ModelType.java
@@ -112,7 +112,8 @@ public enum ModelType {
}
private boolean isNonInvalidationType() {
- if ((this == SESSION || this == FAVICON_TRACKING) && LibraryLoader.isInitialized()) {
+ if ((this == SESSION || this == FAVICON_TRACKING || this == FAVICON_IMAGE)
+ && LibraryLoader.isInitialized()) {
return FieldTrialList
.findFullName("AndroidSessionNotifications")
.equals("Disabled");