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

Unified Diff: blimp/client/app/android/blimp_app_jni_registrar.cc

Issue 2493333002: Move Java Blimp shell code to app subpackage (Closed)
Patch Set: Merge branch 'refs/heads/master' into blimp-shell-integration Created 4 years, 1 month 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: blimp/client/app/android/blimp_app_jni_registrar.cc
diff --git a/blimp/client/app/android/blimp_app_jni_registrar.cc b/blimp/client/app/android/blimp_app_jni_registrar.cc
index ee1a033217e9a56fc9cb2eae8c7d3ca836491537..191a35d83f7f2cf26a59c71afe64bea7321e56af 100644
--- a/blimp/client/app/android/blimp_app_jni_registrar.cc
+++ b/blimp/client/app/android/blimp_app_jni_registrar.cc
@@ -6,8 +6,8 @@
#include "base/android/jni_registrar.h"
#include "blimp/client/app/android/blimp_client_session_android.h"
+#include "blimp/client/app/android/blimp_contents_display.h"
#include "blimp/client/app/android/blimp_library_loader.h"
-#include "blimp/client/app/android/blimp_view.h"
#include "blimp/client/app/android/tab_control_feature_android.h"
#include "blimp/client/app/android/toolbar.h"
#include "blimp/client/core/contents/android/ime_helper_dialog.h"
@@ -20,7 +20,7 @@ namespace {
base::android::RegistrationMethod kBlimpRegistrationMethods[] = {
{"BlimpClientSessionAndroid", BlimpClientSessionAndroid::RegisterJni},
{"BlimpLibraryLoader", RegisterBlimpLibraryLoaderJni},
- {"BlimpView", app::BlimpView::RegisterJni},
+ {"BlimpContentsDisplay", app::BlimpContentsDisplay::RegisterJni},
{"ImeHelperDialog", ImeHelperDialog::RegisterJni},
{"SafeJson", safe_json::android::RegisterSafeJsonJni},
{"TabControlFeatureAndroid", TabControlFeatureAndroid::RegisterJni},
« no previous file with comments | « blimp/client/app/android/AndroidManifest.xml.jinja2 ('k') | blimp/client/app/android/blimp_contents_display.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698