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

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

Issue 2132163002: Add BlimpClientContext and factory with real and dummy implementation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move-blimp-client-core-public-to-blimp-client
Patch Set: git merge origin/master before CQ for good measure 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: 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 4bbf922ca0f2243819dacf25b6edde7e2b3a3726..3eb63a11f7ff6e3dbffe30b992b37d6c745c0ae6 100644
--- a/chrome/browser/android/chrome_jni_registrar.cc
+++ b/chrome/browser/android/chrome_jni_registrar.cc
@@ -8,6 +8,7 @@
#include "base/android/jni_registrar.h"
#include "base/macros.h"
#include "base/trace_event/trace_event.h"
+#include "blimp/client/public/android/blimp_jni_registrar.h"
#include "chrome/browser/after_startup_task_utils_android.h"
#include "chrome/browser/android/accessibility/font_size_prefs_android.h"
#include "chrome/browser/android/accessibility_util.h"
@@ -15,6 +16,8 @@
#include "chrome/browser/android/background_sync_launcher_android.h"
#include "chrome/browser/android/banners/app_banner_infobar_delegate_android.h"
#include "chrome/browser/android/banners/app_banner_manager_android.h"
+#include "chrome/browser/android/blimp/blimp_client_context_factory_android.h"
+#include "chrome/browser/android/blimp/chrome_blimp_client_context_delegate_android.h"
#include "chrome/browser/android/bookmarks/bookmark_bridge.h"
#include "chrome/browser/android/bookmarks/partner_bookmarks_reader.h"
#include "chrome/browser/android/bottombar/overlay_panel_content.h"
@@ -225,9 +228,11 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
{"AutofillProfileBridge", autofill::RegisterAutofillProfileBridge},
{"AutoSigninSnackbarController", RegisterAutoSigninSnackbarController},
{"BackgroundSchedulerBridge",
- offline_pages::android::RegisterBackgroundSchedulerBridge},
+ offline_pages::android::RegisterBackgroundSchedulerBridge},
{"BackgroundSyncLauncherAndroid",
BackgroundSyncLauncherAndroid::RegisterLauncher},
+ {"BlimpClientContextFactory", RegisterBlimpClientContextFactoryJni},
+ {"Blimp", blimp::client::RegisterBlimpJni},
{"BluetoothChooserAndroid", BluetoothChooserAndroid::Register},
{"BookmarkBridge", BookmarkBridge::RegisterBookmarkBridge},
{"BrowsingDataCounterBridge", BrowsingDataCounterBridge::Register},
@@ -236,6 +241,8 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
{"ChildAccountFeedbackReporter", RegisterChildAccountFeedbackReporter},
{"ChildAccountService", RegisterChildAccountService},
{"ChromeApplication", ChromeApplication::RegisterBindings},
+ {"ChromeBlimpClientContextDelegate",
+ ChromeBlimpClientContextDelegateAndroid::RegisterJni},
{"ChromeBrowserProvider",
ChromeBrowserProvider::RegisterChromeBrowserProvider},
{"ChromeFeatureList", RegisterChromeFeatureListJni},
« no previous file with comments | « chrome/browser/android/blimp/chrome_blimp_client_context_delegate_android.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698