blimp/client/app/android/blimp_jni_registrar.cc - Issue 2059443002: Java versions of BlimpContents[,Observer] and BlimpNavigationController

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: blimp/client/app/android/blimp_jni_registrar.cc

Issue 2059443002: Java versions of BlimpContents[,Observer] and BlimpNavigationController (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@chrome-with-blimp

Patch Set: git merge origin/master - track master Created 4 years, 6 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

« no previous file with comments | « blimp/client/BUILD.gn ('k') | blimp/client/app/android/javatests/src/org/chromium/blimp/BlimpNativeInstrumentationTestCase.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: blimp/client/app/android/blimp_jni_registrar.cc

diff --git a/blimp/client/app/android/blimp_jni_registrar.cc b/blimp/client/app/android/blimp_jni_registrar.cc

index 06b5b35d8fef54fad6e1c6d612ff50f3aa98876c..c0f3fbcdcd51f4e68be429ba3310eb6b240b5f48 100644

--- a/blimp/client/app/android/blimp_jni_registrar.cc

+++ b/blimp/client/app/android/blimp_jni_registrar.cc

@@ -11,6 +11,10 @@

#include "blimp/client/app/android/tab_control_feature_android.h"

#include "blimp/client/app/android/toolbar.h"

#include "blimp/client/app/android/web_input_box.h"

+#include "blimp/client/core/android/blimp_contents_factory.h"

+#include "blimp/client/core/android/blimp_contents_impl_android.h"

+#include "blimp/client/core/android/blimp_contents_observer_proxy.h"

+#include "blimp/client/core/android/blimp_navigation_controller_impl_android.h"

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

namespace blimp {

@@ -19,7 +23,12 @@ namespace {

base::android::RegistrationMethod kBlimpRegistrationMethods[] = {

{"BlimpClientSessionAndroid", BlimpClientSessionAndroid::RegisterJni},

+ {"BlimpContentsFactory", RegisterBlimpContentsFactoryJni},

+ {"BlimpContentsImpl", BlimpContentsImplAndroid::RegisterJni},

+ {"BlimpContentsObserverProxy", BlimpContentsObserverProxy::RegisterJni},

{"BlimpLibraryLoader", RegisterBlimpLibraryLoaderJni},

+ {"BlimpNavigationControllerImplAndroid",

+ BlimpNavigationControllerImplAndroid::RegisterJni},

{"BlimpView", BlimpView::RegisterJni},

{"SafeJson", safe_json::android::RegisterSafeJsonJni},

{"TabControlFeatureAndroid", TabControlFeatureAndroid::RegisterJni},