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

Side by Side Diff: content/browser/android/browser_jni_registrar.cc

Issue 10823207: Consolidate ContentViewCore::Load* functions (Closed) Base URL: http://git.chromium.org/chromium/src.git@cleanup_load
Patch Set: Rebase. Add extra_headers to LoadUrlParams. Created 8 years, 4 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/android/browser_jni_registrar.h" 5 #include "content/browser/android/browser_jni_registrar.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_registrar.h" 8 #include "base/android/jni_registrar.h"
9 #include "content/browser/android/android_browser_process.h" 9 #include "content/browser/android/android_browser_process.h"
10 #include "content/browser/android/content_settings.h" 10 #include "content/browser/android/content_settings.h"
11 #include "content/browser/android/content_video_view.h" 11 #include "content/browser/android/content_video_view.h"
12 #include "content/browser/android/content_view_client.h" 12 #include "content/browser/android/content_view_client.h"
13 #include "content/browser/android/content_view_core_impl.h" 13 #include "content/browser/android/content_view_core_impl.h"
14 #include "content/browser/android/content_view_statics.h" 14 #include "content/browser/android/content_view_statics.h"
15 #include "content/browser/android/download_controller.h" 15 #include "content/browser/android/download_controller.h"
16 #include "content/browser/android/load_url_params.h"
16 #include "content/browser/android/sandboxed_process_launcher.h" 17 #include "content/browser/android/sandboxed_process_launcher.h"
17 #include "content/browser/android/touch_point.h" 18 #include "content/browser/android/touch_point.h"
18 #include "content/browser/geolocation/location_api_adapter_android.h" 19 #include "content/browser/geolocation/location_api_adapter_android.h"
19 #include "content/browser/renderer_host/java/java_bound_object.h" 20 #include "content/browser/renderer_host/java/java_bound_object.h"
20 21
21 namespace { 22 namespace {
22 base::android::RegistrationMethod kContentRegisteredMethods[] = { 23 base::android::RegistrationMethod kContentRegisteredMethods[] = {
23 { "AndroidLocationApiAdapter", 24 { "AndroidLocationApiAdapter",
24 AndroidLocationApiAdapter::RegisterGeolocationService }, 25 AndroidLocationApiAdapter::RegisterGeolocationService },
25 { "AndroidBrowserProcess", content::RegisterAndroidBrowserProcess }, 26 { "AndroidBrowserProcess", content::RegisterAndroidBrowserProcess },
26 { "ContentSettings", content::ContentSettings::RegisterContentSettings }, 27 { "ContentSettings", content::ContentSettings::RegisterContentSettings },
27 { "ContentVideoView", content::ContentVideoView::RegisterContentVideoView }, 28 { "ContentVideoView", content::ContentVideoView::RegisterContentVideoView },
28 { "ContentViewClient", content::RegisterContentViewClient }, 29 { "ContentViewClient", content::RegisterContentViewClient },
29 { "ContentViewCore", content::RegisterContentViewCore }, 30 { "ContentViewCore", content::RegisterContentViewCore },
30 { "DownloadController", 31 { "DownloadController",
31 content::DownloadController::RegisterDownloadController }, 32 content::DownloadController::RegisterDownloadController },
32 { "JavaBoundObject", JavaBoundObject::RegisterJavaBoundObject }, 33 { "JavaBoundObject", JavaBoundObject::RegisterJavaBoundObject },
34 { "LoadUrlParams", content::RegisterLoadUrlParams },
33 { "SandboxedProcessLauncher", content::RegisterSandboxedProcessLauncher }, 35 { "SandboxedProcessLauncher", content::RegisterSandboxedProcessLauncher },
34 { "TouchPoint", content::RegisterTouchPoint }, 36 { "TouchPoint", content::RegisterTouchPoint },
35 { "WebViewStatics", content::RegisterWebViewStatics }, 37 { "WebViewStatics", content::RegisterWebViewStatics },
36 }; 38 };
37 39
38 } // namespace 40 } // namespace
39 41
40 namespace content { 42 namespace content {
41 namespace android { 43 namespace android {
42 44
43 bool RegisterBrowserJni(JNIEnv* env) { 45 bool RegisterBrowserJni(JNIEnv* env) {
44 return RegisterNativeMethods(env, kContentRegisteredMethods, 46 return RegisterNativeMethods(env, kContentRegisteredMethods,
45 arraysize(kContentRegisteredMethods)); 47 arraysize(kContentRegisteredMethods));
46 } 48 }
47 49
48 } // namespace android 50 } // namespace android
49 } // namespace content 51 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/android/content_view_core_impl.h » ('j') | content/browser/android/content_view_core_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698