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

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

Issue 12388038: Android: Remove Surface cruft (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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"
(...skipping 14 matching lines...) Expand all
25 #include "content/browser/renderer_host/ime_adapter_android.h" 25 #include "content/browser/renderer_host/ime_adapter_android.h"
26 #include "content/browser/renderer_host/java/java_bound_object.h" 26 #include "content/browser/renderer_host/java/java_bound_object.h"
27 27
28 using content::SurfaceTexturePeerBrowserImpl; 28 using content::SurfaceTexturePeerBrowserImpl;
29 29
30 namespace { 30 namespace {
31 base::android::RegistrationMethod kContentRegisteredMethods[] = { 31 base::android::RegistrationMethod kContentRegisteredMethods[] = {
32 { "AndroidLocationApiAdapter", 32 { "AndroidLocationApiAdapter",
33 content::AndroidLocationApiAdapter::RegisterGeolocationService }, 33 content::AndroidLocationApiAdapter::RegisterGeolocationService },
34 { "AndroidBrowserProcess", content::RegisterAndroidBrowserProcess }, 34 { "AndroidBrowserProcess", content::RegisterAndroidBrowserProcess },
35 { "BrowserProcessSurfaceTexture",
36 SurfaceTexturePeerBrowserImpl::RegisterBrowserProcessSurfaceTexture },
37 { "ContentSettings", content::ContentSettings::RegisterContentSettings }, 35 { "ContentSettings", content::ContentSettings::RegisterContentSettings },
38 { "ContentViewRenderView", 36 { "ContentViewRenderView",
39 content::ContentViewRenderView::RegisterContentViewRenderView }, 37 content::ContentViewRenderView::RegisterContentViewRenderView },
40 { "ContentVideoView", content::ContentVideoView::RegisterContentVideoView }, 38 { "ContentVideoView", content::ContentVideoView::RegisterContentVideoView },
41 { "ContentViewCore", content::RegisterContentViewCore }, 39 { "ContentViewCore", content::RegisterContentViewCore },
42 { "DateTimePickerAndroid", content::RegisterDateTimeChooserAndroid}, 40 { "DateTimePickerAndroid", content::RegisterDateTimeChooserAndroid},
43 { "DownloadControllerAndroidImpl", 41 { "DownloadControllerAndroidImpl",
44 content::DownloadControllerAndroidImpl::RegisterDownloadController }, 42 content::DownloadControllerAndroidImpl::RegisterDownloadController },
45 { "InterstitialPageDelegateAndroid", 43 { "InterstitialPageDelegateAndroid",
46 content::InterstitialPageDelegateAndroid 44 content::InterstitialPageDelegateAndroid
(...skipping 12 matching lines...) Expand all
59 namespace content { 57 namespace content {
60 namespace android { 58 namespace android {
61 59
62 bool RegisterBrowserJni(JNIEnv* env) { 60 bool RegisterBrowserJni(JNIEnv* env) {
63 return RegisterNativeMethods(env, kContentRegisteredMethods, 61 return RegisterNativeMethods(env, kContentRegisteredMethods,
64 arraysize(kContentRegisteredMethods)); 62 arraysize(kContentRegisteredMethods));
65 } 63 }
66 64
67 } // namespace android 65 } // namespace android
68 } // namespace content 66 } // namespace content
OLDNEW
« no previous file with comments | « content/app/android/sandboxed_process_service.cc ('k') | content/browser/android/content_video_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698