chrome/browser/android/chrome_jni_registrar.cc - Issue 459513002: Massive refactor of the Android invalidation code.

Unified Diff: chrome/browser/android/chrome_jni_registrar.cc

Issue 459513002: Massive refactor of the Android invalidation code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase. Created 6 years, 3 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

« chrome/android/shell/java/AndroidManifest.xml ('K') | « chrome/android/shell/java/AndroidManifest.xml ('k') | chrome/browser/invalidation/invalidation_controller_android.h » ('j') | chrome/browser/invalidation/invalidation_service_factory_android.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/android/chrome_jni_registrar.cc

diff --git a/chrome/browser/android/chrome_jni_registrar.cc b/chrome/browser/android/chrome_jni_registrar.cc

index cc569aceda0d5426a6033cc32b2ac2afd30ea55b..46978dd1831409b7be9e70e943580f4a1ba529bc 100644

--- a/chrome/browser/android/chrome_jni_registrar.cc

+++ b/chrome/browser/android/chrome_jni_registrar.cc

@@ -43,7 +43,7 @@

#include "chrome/browser/dom_distiller/dom_distiller_service_factory_android.h"

#include "chrome/browser/dom_distiller/tab_utils_android.h"

#include "chrome/browser/history/android/sqlite_cursor.h"

-#include "chrome/browser/invalidation/invalidation_controller_android.h"

+#include "chrome/browser/invalidation/invalidation_service_factory_android.h"

#include "chrome/browser/lifetime/application_lifetime_android.h"

#include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h"

#include "chrome/browser/prerender/external_prerender_handler_android.h"

@@ -77,6 +77,7 @@

#include "components/dom_distiller/android/component_jni_registrar.h"

#include "components/enhanced_bookmarks/android/component_jni_registrar.h"

#include "components/gcm_driver/android/component_jni_registrar.h"

+#include "components/invalidation/android/component_jni_registrar.h"

#include "components/navigation_interception/component_jni_registrar.h"

#include "components/variations/android/component_jni_registrar.h"

#include "components/web_contents_delegate_android/component_jni_registrar.h"

@@ -97,6 +98,7 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {

{ "EnhancedBookmarks",

enhanced_bookmarks::android::RegisterEnhancedBookmarks },

{ "GCMDriver", gcm::android::RegisterGCMDriverJni },

+ { "Invalidation", invalidation::android::RegisterInvalidationJni },

{ "NavigationInterception",

navigation_interception::RegisterNavigationInterceptionJni },

{ "WebContentsDelegateAndroid",

@@ -150,9 +152,10 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {

{ "ForeignSessionHelper",

ForeignSessionHelper::RegisterForeignSessionHelper },

{ "InfoBarContainer", RegisterInfoBarContainer },

+ { "InvalidationServiceFactory",

+ invalidation::InvalidationServiceFactoryAndroid::Register },

{ "ShortcutHelper", ShortcutHelper::RegisterShortcutHelper },

{ "IntentHelper", RegisterIntentHelper },

- { "InvalidationController", invalidation::RegisterInvalidationController },

{ "JavascriptAppModalDialog",

JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog },

{ "LogoBridge", RegisterLogoBridge },