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

Unified Diff: blimp/client/app/android/blimp_app_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
« no previous file with comments | « blimp/client/app/android/blimp_app_jni_registrar.h ('k') | blimp/client/app/android/blimp_jni_registrar.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: blimp/client/app/android/blimp_app_jni_registrar.cc
diff --git a/blimp/client/app/android/blimp_jni_registrar.cc b/blimp/client/app/android/blimp_app_jni_registrar.cc
similarity index 65%
copy from blimp/client/app/android/blimp_jni_registrar.cc
copy to blimp/client/app/android/blimp_app_jni_registrar.cc
index c0f3fbcdcd51f4e68be429ba3310eb6b240b5f48..af4ce1271af04d9bd7ac20bc4f1a7b48540a087d 100644
--- a/blimp/client/app/android/blimp_jni_registrar.cc
+++ b/blimp/client/app/android/blimp_app_jni_registrar.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "blimp/client/app/android/blimp_jni_registrar.h"
+#include "blimp/client/app/android/blimp_app_jni_registrar.h"
#include "base/android/jni_registrar.h"
#include "blimp/client/app/android/blimp_client_session_android.h"
@@ -11,10 +11,6 @@
#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 {
@@ -23,12 +19,7 @@ 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},
@@ -38,7 +29,7 @@ base::android::RegistrationMethod kBlimpRegistrationMethods[] = {
} // namespace
-bool RegisterBlimpJni(JNIEnv* env) {
+bool RegisterBlimpAppJni(JNIEnv* env) {
return base::android::RegisterNativeMethods(
env, kBlimpRegistrationMethods, arraysize(kBlimpRegistrationMethods));
}
« no previous file with comments | « blimp/client/app/android/blimp_app_jni_registrar.h ('k') | blimp/client/app/android/blimp_jni_registrar.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698