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

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

Issue 829803003: Adding Chrome-side WebVR interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updates/cleanups before pulling in reviewers. Created 5 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
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 20 matching lines...) Expand all
31 #include "content/browser/media/android/media_resource_getter_impl.h" 31 #include "content/browser/media/android/media_resource_getter_impl.h"
32 #include "content/browser/mojo/service_registrar_android.h" 32 #include "content/browser/mojo/service_registrar_android.h"
33 #include "content/browser/mojo/service_registry_android.h" 33 #include "content/browser/mojo/service_registry_android.h"
34 #include "content/browser/power_save_blocker_android.h" 34 #include "content/browser/power_save_blocker_android.h"
35 #include "content/browser/renderer_host/ime_adapter_android.h" 35 #include "content/browser/renderer_host/ime_adapter_android.h"
36 #include "content/browser/renderer_host/input/motion_event_android.h" 36 #include "content/browser/renderer_host/input/motion_event_android.h"
37 #include "content/browser/renderer_host/input/synthetic_gesture_target_android.h " 37 #include "content/browser/renderer_host/input/synthetic_gesture_target_android.h "
38 #include "content/browser/screen_orientation/screen_orientation_delegate_android .h" 38 #include "content/browser/screen_orientation/screen_orientation_delegate_android .h"
39 #include "content/browser/speech/speech_recognizer_impl_android.h" 39 #include "content/browser/speech/speech_recognizer_impl_android.h"
40 #include "content/browser/time_zone_monitor_android.h" 40 #include "content/browser/time_zone_monitor_android.h"
41 #include "content/browser/vr/cardboard/cardboard_vr_device.h"
41 #include "content/browser/web_contents/web_contents_android.h" 42 #include "content/browser/web_contents/web_contents_android.h"
42 #include "mojo/android/system/core_impl.h" 43 #include "mojo/android/system/core_impl.h"
43 44
44 namespace { 45 namespace {
45 base::android::RegistrationMethod kContentRegisteredMethods[] = { 46 base::android::RegistrationMethod kContentRegisteredMethods[] = {
46 {"AndroidLocationApiAdapter", 47 {"AndroidLocationApiAdapter",
47 content::AndroidLocationApiAdapter::RegisterGeolocationService}, 48 content::AndroidLocationApiAdapter::RegisterGeolocationService},
48 {"BrowserAccessibilityManager", 49 {"BrowserAccessibilityManager",
49 content::RegisterBrowserAccessibilityManager}, 50 content::RegisterBrowserAccessibilityManager},
50 {"BrowserStartupController", content::RegisterBrowserStartupController}, 51 {"BrowserStartupController", content::RegisterBrowserStartupController},
52 {"CardboardVRDevice",
53 content::CardboardVRDevice::RegisterCardboardVRDevice},
no sievers 2015/03/19 01:24:51 nit: indent
51 {"ChildProcessLauncher", content::RegisterChildProcessLauncher}, 54 {"ChildProcessLauncher", content::RegisterChildProcessLauncher},
52 {"ContentReadbackHandler", 55 {"ContentReadbackHandler",
53 content::ContentReadbackHandler::RegisterContentReadbackHandler}, 56 content::ContentReadbackHandler::RegisterContentReadbackHandler},
54 {"ContentVideoView", content::ContentVideoView::RegisterContentVideoView}, 57 {"ContentVideoView", content::ContentVideoView::RegisterContentVideoView},
55 {"ContentViewCore", content::RegisterContentViewCore}, 58 {"ContentViewCore", content::RegisterContentViewCore},
56 {"ContentViewRenderView", 59 {"ContentViewRenderView",
57 content::ContentViewRenderView::RegisterContentViewRenderView}, 60 content::ContentViewRenderView::RegisterContentViewRenderView},
58 {"CoreImpl", mojo::android::RegisterCoreImpl}, 61 {"CoreImpl", mojo::android::RegisterCoreImpl},
59 {"DateTimePickerAndroid", content::RegisterDateTimeChooserAndroid}, 62 {"DateTimePickerAndroid", content::RegisterDateTimeChooserAndroid},
60 {"DownloadControllerAndroidImpl", 63 {"DownloadControllerAndroidImpl",
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 namespace content { 104 namespace content {
102 namespace android { 105 namespace android {
103 106
104 bool RegisterBrowserJni(JNIEnv* env) { 107 bool RegisterBrowserJni(JNIEnv* env) {
105 return RegisterNativeMethods(env, kContentRegisteredMethods, 108 return RegisterNativeMethods(env, kContentRegisteredMethods,
106 arraysize(kContentRegisteredMethods)); 109 arraysize(kContentRegisteredMethods));
107 } 110 }
108 111
109 } // namespace android 112 } // namespace android
110 } // namespace content 113 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698