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

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

Issue 10919075: Move android mediaplayer from render process to browser process. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add the missing cookies_retriever.h file Created 8 years, 3 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 | Annotate | Revision Log
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/load_url_params.h"
17 #include "content/browser/android/sandboxed_process_launcher.h" 17 #include "content/browser/android/sandboxed_process_launcher.h"
18 #include "content/browser/android/surface_texture_peer_browser_impl.h"
18 #include "content/browser/android/touch_point.h" 19 #include "content/browser/android/touch_point.h"
19 #include "content/browser/android/web_contents_observer_android.h" 20 #include "content/browser/android/web_contents_observer_android.h"
20 #include "content/browser/geolocation/location_api_adapter_android.h" 21 #include "content/browser/geolocation/location_api_adapter_android.h"
21 #include "content/browser/renderer_host/ime_adapter_android.h" 22 #include "content/browser/renderer_host/ime_adapter_android.h"
22 #include "content/browser/renderer_host/java/java_bound_object.h" 23 #include "content/browser/renderer_host/java/java_bound_object.h"
23 24
24 namespace { 25 namespace {
25 base::android::RegistrationMethod kContentRegisteredMethods[] = { 26 base::android::RegistrationMethod kContentRegisteredMethods[] = {
26 { "AndroidLocationApiAdapter", 27 { "AndroidLocationApiAdapter",
27 AndroidLocationApiAdapter::RegisterGeolocationService }, 28 AndroidLocationApiAdapter::RegisterGeolocationService },
28 { "AndroidBrowserProcess", content::RegisterAndroidBrowserProcess }, 29 { "AndroidBrowserProcess", content::RegisterAndroidBrowserProcess },
30 { "BrowserProcessSurfaceTexture",
31 content::RegisterBrowserProcessSurfaceTexture },
29 { "ContentSettings", content::ContentSettings::RegisterContentSettings }, 32 { "ContentSettings", content::ContentSettings::RegisterContentSettings },
30 { "ContentVideoView", content::ContentVideoView::RegisterContentVideoView }, 33 { "ContentVideoView", content::ContentVideoView::RegisterContentVideoView },
31 { "ContentViewClient", content::RegisterContentViewClient }, 34 { "ContentViewClient", content::RegisterContentViewClient },
32 { "ContentViewCore", content::RegisterContentViewCore }, 35 { "ContentViewCore", content::RegisterContentViewCore },
33 { "DownloadController", 36 { "DownloadController",
34 content::DownloadController::RegisterDownloadController }, 37 content::DownloadController::RegisterDownloadController },
35 { "RegisterImeAdapter", content::RegisterImeAdapter }, 38 { "RegisterImeAdapter", content::RegisterImeAdapter },
36 { "JavaBoundObject", JavaBoundObject::RegisterJavaBoundObject }, 39 { "JavaBoundObject", JavaBoundObject::RegisterJavaBoundObject },
37 { "LoadUrlParams", content::RegisterLoadUrlParams }, 40 { "LoadUrlParams", content::RegisterLoadUrlParams },
38 { "SandboxedProcessLauncher", content::RegisterSandboxedProcessLauncher }, 41 { "SandboxedProcessLauncher", content::RegisterSandboxedProcessLauncher },
39 { "TouchPoint", content::RegisterTouchPoint }, 42 { "TouchPoint", content::RegisterTouchPoint },
40 { "WebContentsObserverAndroid", content::RegisterWebContentsObserverAndroid }, 43 { "WebContentsObserverAndroid", content::RegisterWebContentsObserverAndroid },
41 { "WebViewStatics", content::RegisterWebViewStatics }, 44 { "WebViewStatics", content::RegisterWebViewStatics },
42 }; 45 };
43 46
44 } // namespace 47 } // namespace
45 48
46 namespace content { 49 namespace content {
47 namespace android { 50 namespace android {
48 51
49 bool RegisterBrowserJni(JNIEnv* env) { 52 bool RegisterBrowserJni(JNIEnv* env) {
50 return RegisterNativeMethods(env, kContentRegisteredMethods, 53 return RegisterNativeMethods(env, kContentRegisteredMethods,
51 arraysize(kContentRegisteredMethods)); 54 arraysize(kContentRegisteredMethods));
52 } 55 }
53 56
54 } // namespace android 57 } // namespace android
55 } // namespace content 58 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698