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

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

Issue 2178973004: DialogSurfaceManager implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: removed whitespace changes Created 4 years, 1 month 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 "base/macros.h" 9 #include "base/macros.h"
10 #include "content/browser/accessibility/browser_accessibility_android.h" 10 #include "content/browser/accessibility/browser_accessibility_android.h"
11 #include "content/browser/accessibility/browser_accessibility_manager_android.h" 11 #include "content/browser/accessibility/browser_accessibility_manager_android.h"
12 #include "content/browser/android/app_web_message_port_service_impl.h" 12 #include "content/browser/android/app_web_message_port_service_impl.h"
13 #include "content/browser/android/background_sync_network_observer_android.h" 13 #include "content/browser/android/background_sync_network_observer_android.h"
14 #include "content/browser/android/browser_startup_controller.h" 14 #include "content/browser/android/browser_startup_controller.h"
15 #include "content/browser/android/child_process_launcher_android.h" 15 #include "content/browser/android/child_process_launcher_android.h"
16 #include "content/browser/android/content_video_view.h" 16 #include "content/browser/android/content_video_view.h"
17 #include "content/browser/android/content_view_core_impl.h" 17 #include "content/browser/android/content_view_core_impl.h"
18 #include "content/browser/android/content_view_render_view.h" 18 #include "content/browser/android/content_view_render_view.h"
19 #include "content/browser/android/content_view_statics.h" 19 #include "content/browser/android/content_view_statics.h"
20 #include "content/browser/android/date_time_chooser_android.h" 20 #include "content/browser/android/date_time_chooser_android.h"
21 #include "content/browser/android/interstitial_page_delegate_android.h" 21 #include "content/browser/android/interstitial_page_delegate_android.h"
22 #include "content/browser/android/load_url_params.h" 22 #include "content/browser/android/load_url_params.h"
23 #include "content/browser/android/tracing_controller_android.h" 23 #include "content/browser/android/tracing_controller_android.h"
24 #include "content/browser/android/web_contents_observer_proxy.h" 24 #include "content/browser/android/web_contents_observer_proxy.h"
25 #include "content/browser/device_sensors/sensor_manager_android.h" 25 #include "content/browser/device_sensors/sensor_manager_android.h"
26 #include "content/browser/frame_host/navigation_controller_android.h" 26 #include "content/browser/frame_host/navigation_controller_android.h"
27 #include "content/browser/media/android/dialog_surface_activity_mapper.h"
27 #include "content/browser/media/session/audio_focus_delegate_android.h" 28 #include "content/browser/media/session/audio_focus_delegate_android.h"
28 #include "content/browser/media/session/media_session_android.h" 29 #include "content/browser/media/session/media_session_android.h"
29 #include "content/browser/memory/memory_monitor_android.h" 30 #include "content/browser/memory/memory_monitor_android.h"
30 #include "content/browser/renderer_host/ime_adapter_android.h" 31 #include "content/browser/renderer_host/ime_adapter_android.h"
31 #include "content/browser/speech/speech_recognizer_impl_android.h" 32 #include "content/browser/speech/speech_recognizer_impl_android.h"
32 #include "content/browser/web_contents/web_contents_android.h" 33 #include "content/browser/web_contents/web_contents_android.h"
33 #include "mojo/android/system/core_impl.h" 34 #include "mojo/android/system/core_impl.h"
34 #include "mojo/android/system/watcher_impl.h" 35 #include "mojo/android/system/watcher_impl.h"
35 36
36 namespace { 37 namespace {
37 base::android::RegistrationMethod kContentRegisteredMethods[] = { 38 base::android::RegistrationMethod kContentRegisteredMethods[] = {
38 {"AppWebMessagePortService", content::RegisterAppWebMessagePortService}, 39 {"AppWebMessagePortService", content::RegisterAppWebMessagePortService},
39 {"AudioFocusDelegate", content::AudioFocusDelegateAndroid::Register}, 40 {"AudioFocusDelegate", content::AudioFocusDelegateAndroid::Register},
40 {"BrowserStartupController", content::RegisterBrowserStartupController}, 41 {"BrowserStartupController", content::RegisterBrowserStartupController},
41 {"ChildProcessLauncher", content::RegisterChildProcessLauncher}, 42 {"ChildProcessLauncher", content::RegisterChildProcessLauncher},
42 {"ContentVideoView", content::ContentVideoView::RegisterContentVideoView}, 43 {"ContentVideoView", content::ContentVideoView::RegisterContentVideoView},
43 {"CoreImpl", mojo::android::RegisterCoreImpl}, 44 {"CoreImpl", mojo::android::RegisterCoreImpl},
44 {"MemoryMonitorAndroid", content::MemoryMonitorAndroid::Register}, 45 {"MemoryMonitorAndroid", content::MemoryMonitorAndroid::Register},
45 {"BackgroundSyncNetworkObserverAndroid", 46 {"BackgroundSyncNetworkObserverAndroid",
46 content::BackgroundSyncNetworkObserverAndroid::Observer:: 47 content::BackgroundSyncNetworkObserverAndroid::Observer::
47 RegisterNetworkObserver}, 48 RegisterNetworkObserver},
48 {"BrowserAccessibilityManager", 49 {"BrowserAccessibilityManager",
49 content::RegisterBrowserAccessibilityManager}, 50 content::RegisterBrowserAccessibilityManager},
50 {"ContentViewCore", content::RegisterContentViewCore}, 51 {"ContentViewCore", content::RegisterContentViewCore},
51 {"ContentViewRenderView", 52 {"ContentViewRenderView",
52 content::ContentViewRenderView::RegisterContentViewRenderView}, 53 content::ContentViewRenderView::RegisterContentViewRenderView},
53 {"DateTimePickerAndroid", content::RegisterDateTimeChooserAndroid}, 54 {"DateTimePickerAndroid", content::RegisterDateTimeChooserAndroid},
55 {"DialogSurfaceActivityMapper",
56 content::RegisterDialogSurfaceActivityMapper},
54 {"InterstitialPageDelegateAndroid", 57 {"InterstitialPageDelegateAndroid",
55 content::InterstitialPageDelegateAndroid:: 58 content::InterstitialPageDelegateAndroid::
56 RegisterInterstitialPageDelegateAndroid}, 59 RegisterInterstitialPageDelegateAndroid},
57 {"LoadUrlParams", content::RegisterLoadUrlParams}, 60 {"LoadUrlParams", content::RegisterLoadUrlParams},
58 {"MediaSessionImpl", content::MediaSessionAndroid::Register}, 61 {"MediaSessionImpl", content::MediaSessionAndroid::Register},
59 {"NavigationControllerAndroid", 62 {"NavigationControllerAndroid",
60 content::NavigationControllerAndroid::Register}, 63 content::NavigationControllerAndroid::Register},
61 {"RegisterImeAdapter", content::RegisterImeAdapter}, 64 {"RegisterImeAdapter", content::RegisterImeAdapter},
62 {"SensorManagerAndroid", content::SensorManagerAndroid::Register}, 65 {"SensorManagerAndroid", content::SensorManagerAndroid::Register},
63 {"SpeechRecognizerImplAndroid", 66 {"SpeechRecognizerImplAndroid",
(...skipping 10 matching lines...) Expand all
74 namespace content { 77 namespace content {
75 namespace android { 78 namespace android {
76 79
77 bool RegisterBrowserJni(JNIEnv* env) { 80 bool RegisterBrowserJni(JNIEnv* env) {
78 return RegisterNativeMethods(env, kContentRegisteredMethods, 81 return RegisterNativeMethods(env, kContentRegisteredMethods,
79 arraysize(kContentRegisteredMethods)); 82 arraysize(kContentRegisteredMethods));
80 } 83 }
81 84
82 } // namespace android 85 } // namespace android
83 } // namespace content 86 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698