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

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

Issue 1274913004: Revert of Android WebVR implementation, Cardboard 0.5.5 SDK (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « content/browser/BUILD.gn ('k') | content/browser/vr/android/cardboard/cardboard_vr_device.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/accessibility/browser_accessibility_android.h" 9 #include "content/browser/accessibility/browser_accessibility_android.h"
10 #include "content/browser/accessibility/browser_accessibility_manager_android.h" 10 #include "content/browser/accessibility/browser_accessibility_manager_android.h"
(...skipping 22 matching lines...) Expand all
33 #include "content/browser/media/android/media_session.h" 33 #include "content/browser/media/android/media_session.h"
34 #include "content/browser/mojo/service_registrar_android.h" 34 #include "content/browser/mojo/service_registrar_android.h"
35 #include "content/browser/mojo/service_registry_android.h" 35 #include "content/browser/mojo/service_registry_android.h"
36 #include "content/browser/power_save_blocker_android.h" 36 #include "content/browser/power_save_blocker_android.h"
37 #include "content/browser/renderer_host/ime_adapter_android.h" 37 #include "content/browser/renderer_host/ime_adapter_android.h"
38 #include "content/browser/renderer_host/input/motion_event_android.h" 38 #include "content/browser/renderer_host/input/motion_event_android.h"
39 #include "content/browser/renderer_host/input/synthetic_gesture_target_android.h " 39 #include "content/browser/renderer_host/input/synthetic_gesture_target_android.h "
40 #include "content/browser/screen_orientation/screen_orientation_delegate_android .h" 40 #include "content/browser/screen_orientation/screen_orientation_delegate_android .h"
41 #include "content/browser/speech/speech_recognizer_impl_android.h" 41 #include "content/browser/speech/speech_recognizer_impl_android.h"
42 #include "content/browser/time_zone_monitor_android.h" 42 #include "content/browser/time_zone_monitor_android.h"
43 #include "content/browser/vr/android/cardboard/cardboard_vr_device.h"
44 #include "content/browser/web_contents/web_contents_android.h" 43 #include "content/browser/web_contents/web_contents_android.h"
45 #include "mojo/android/system/core_impl.h" 44 #include "mojo/android/system/core_impl.h"
46 45
47 namespace { 46 namespace {
48 base::android::RegistrationMethod kContentRegisteredMethods[] = { 47 base::android::RegistrationMethod kContentRegisteredMethods[] = {
49 {"AndroidLocationApiAdapter", 48 {"AndroidLocationApiAdapter",
50 content::AndroidLocationApiAdapter::RegisterGeolocationService}, 49 content::AndroidLocationApiAdapter::RegisterGeolocationService},
51 {"BackgroundSyncLauncherAndroid", 50 {"BackgroundSyncLauncherAndroid",
52 content::BackgroundSyncLauncherAndroid::RegisterLauncher}, 51 content::BackgroundSyncLauncherAndroid::RegisterLauncher},
53 {"BrowserAccessibilityManager", 52 {"BrowserAccessibilityManager",
54 content::RegisterBrowserAccessibilityManager}, 53 content::RegisterBrowserAccessibilityManager},
55 {"BrowserStartupController", content::RegisterBrowserStartupController}, 54 {"BrowserStartupController", content::RegisterBrowserStartupController},
56 #if defined(ENABLE_WEBVR)
57 {"CardboardVRDevice",
58 content::CardboardVRDevice::RegisterCardboardVRDevice},
59 #endif
60 {"ChildProcessLauncher", content::RegisterChildProcessLauncher}, 55 {"ChildProcessLauncher", content::RegisterChildProcessLauncher},
61 {"ContentReadbackHandler", 56 {"ContentReadbackHandler",
62 content::ContentReadbackHandler::RegisterContentReadbackHandler}, 57 content::ContentReadbackHandler::RegisterContentReadbackHandler},
63 {"ContentVideoView", content::ContentVideoView::RegisterContentVideoView}, 58 {"ContentVideoView", content::ContentVideoView::RegisterContentVideoView},
64 {"ContentViewCore", content::RegisterContentViewCore}, 59 {"ContentViewCore", content::RegisterContentViewCore},
65 {"ContentViewRenderView", 60 {"ContentViewRenderView",
66 content::ContentViewRenderView::RegisterContentViewRenderView}, 61 content::ContentViewRenderView::RegisterContentViewRenderView},
67 {"CoreImpl", mojo::android::RegisterCoreImpl}, 62 {"CoreImpl", mojo::android::RegisterCoreImpl},
68 {"DateTimePickerAndroid", content::RegisterDateTimeChooserAndroid}, 63 {"DateTimePickerAndroid", content::RegisterDateTimeChooserAndroid},
69 {"DownloadControllerAndroidImpl", 64 {"DownloadControllerAndroidImpl",
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 namespace content { 106 namespace content {
112 namespace android { 107 namespace android {
113 108
114 bool RegisterBrowserJni(JNIEnv* env) { 109 bool RegisterBrowserJni(JNIEnv* env) {
115 return RegisterNativeMethods(env, kContentRegisteredMethods, 110 return RegisterNativeMethods(env, kContentRegisteredMethods,
116 arraysize(kContentRegisteredMethods)); 111 arraysize(kContentRegisteredMethods));
117 } 112 }
118 113
119 } // namespace android 114 } // namespace android
120 } // namespace content 115 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/BUILD.gn ('k') | content/browser/vr/android/cardboard/cardboard_vr_device.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698