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

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

Issue 10532155: Upstream some more content/ DEPS-related cleanup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove JNIHelper/BitmapHolder 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 | « base/android/jni_array.cc ('k') | content/app/android/library_loader_hooks.cc » ('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 fb509c102c458dc4f49d09a73221635d2ff5f4cd..a9fe08da4cfb965318a1ae5396c4efd3cb5eac66 100644
--- a/content/app/android/content_jni_registrar.cc
+++ b/content/app/android/content_jni_registrar.cc
@@ -9,15 +9,14 @@
#include "content/app/android/content_main.h"
#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/content_view_impl.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/command_line.h"
#include "content/common/android/surface_callback.h"
+#include "content/common/android/trace_event_binding.h"
namespace content {
namespace android {
@@ -30,7 +29,6 @@ base::android::RegistrationMethod kContentRegisteredMethods[] = {
{ "ContentMain", content::RegisterContentMain },
{ "DeviceInfo", RegisterDeviceInfo },
{ "DownloadController", DownloadController::RegisterDownloadController },
- { "JniHelper", RegisterJniHelper },
{ "SandboxedProcessLauncher", content::RegisterSandboxedProcessLauncher },
{ "SandboxedProcessService", content::RegisterSandboxedProcessService },
{ "SurfaceCallback", content::RegisterSurfaceCallback },
« no previous file with comments | « base/android/jni_array.cc ('k') | content/app/android/library_loader_hooks.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698