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

Unified Diff: content/app/android/content_jni_registrar.cc

Issue 10536066: android content shell bringup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync and merge Created 8 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 | « chrome/browser/file_select_helper.cc ('k') | content/browser/android/content_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/app/android/content_jni_registrar.cc
diff --git a/content/app/android/content_jni_registrar.cc b/content/app/android/content_jni_registrar.cc
index 8db347d2bff8ea6fd7ee0cc8da476929e8ff568d..fb509c102c458dc4f49d09a73221635d2ff5f4cd 100644
--- a/content/app/android/content_jni_registrar.cc
+++ b/content/app/android/content_jni_registrar.cc
@@ -10,11 +10,13 @@
#include "content/app/android/sandboxed_process_service.h"
#include "content/browser/android/android_browser_process.h"
#include "content/browser/android/command_line.h"
+#include "content/browser/android/content_view_client.h"
#include "content/browser/android/device_info.h"
#include "content/browser/android/download_controller.h"
#include "content/browser/android/jni_helper.h"
#include "content/browser/android/sandboxed_process_launcher.h"
#include "content/browser/android/trace_event_binding.h"
+#include "content/browser/android/content_view_impl.h"
#include "content/common/android/surface_callback.h"
namespace content {
@@ -23,6 +25,8 @@ namespace android {
base::android::RegistrationMethod kContentRegisteredMethods[] = {
{ "AndroidBrowserProcess", content::RegisterAndroidBrowserProcess },
{ "CommandLine", RegisterCommandLine },
+ { "ContentView", RegisterContentView },
+ { "ContentViewClient", RegisterContentViewClient },
{ "ContentMain", content::RegisterContentMain },
{ "DeviceInfo", RegisterDeviceInfo },
{ "DownloadController", DownloadController::RegisterDownloadController },
« no previous file with comments | « chrome/browser/file_select_helper.cc ('k') | content/browser/android/content_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698