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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1110833004: Move audio focus control from media/ to content/ and make it per WebContents. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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 | « android_webview/javatests/src/org/chromium/android_webview/test/MultipleVideosTest.java ('k') | content/browser/media/android/browser_media_player_manager.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 11 matching lines...) Expand all
22 #include "content/browser/android/load_url_params.h" 22 #include "content/browser/android/load_url_params.h"
23 #include "content/browser/android/popup_touch_handle_drawable.h" 23 #include "content/browser/android/popup_touch_handle_drawable.h"
24 #include "content/browser/android/tracing_controller_android.h" 24 #include "content/browser/android/tracing_controller_android.h"
25 #include "content/browser/android/web_contents_observer_proxy.h" 25 #include "content/browser/android/web_contents_observer_proxy.h"
26 #include "content/browser/device_sensors/sensor_manager_android.h" 26 #include "content/browser/device_sensors/sensor_manager_android.h"
27 #include "content/browser/frame_host/navigation_controller_android.h" 27 #include "content/browser/frame_host/navigation_controller_android.h"
28 #include "content/browser/gamepad/gamepad_platform_data_fetcher_android.h" 28 #include "content/browser/gamepad/gamepad_platform_data_fetcher_android.h"
29 #include "content/browser/geolocation/location_api_adapter_android.h" 29 #include "content/browser/geolocation/location_api_adapter_android.h"
30 #include "content/browser/media/android/media_drm_credential_manager.h" 30 #include "content/browser/media/android/media_drm_credential_manager.h"
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/media/android/media_session.h"
32 #include "content/browser/mojo/service_registrar_android.h" 33 #include "content/browser/mojo/service_registrar_android.h"
33 #include "content/browser/mojo/service_registry_android.h" 34 #include "content/browser/mojo/service_registry_android.h"
34 #include "content/browser/power_save_blocker_android.h" 35 #include "content/browser/power_save_blocker_android.h"
35 #include "content/browser/renderer_host/ime_adapter_android.h" 36 #include "content/browser/renderer_host/ime_adapter_android.h"
36 #include "content/browser/renderer_host/input/motion_event_android.h" 37 #include "content/browser/renderer_host/input/motion_event_android.h"
37 #include "content/browser/renderer_host/input/synthetic_gesture_target_android.h " 38 #include "content/browser/renderer_host/input/synthetic_gesture_target_android.h "
38 #include "content/browser/screen_orientation/screen_orientation_delegate_android .h" 39 #include "content/browser/screen_orientation/screen_orientation_delegate_android .h"
39 #include "content/browser/speech/speech_recognizer_impl_android.h" 40 #include "content/browser/speech/speech_recognizer_impl_android.h"
40 #include "content/browser/time_zone_monitor_android.h" 41 #include "content/browser/time_zone_monitor_android.h"
41 #include "content/browser/web_contents/web_contents_android.h" 42 #include "content/browser/web_contents/web_contents_android.h"
(...skipping 23 matching lines...) Expand all
65 {"HandleViewResources", 66 {"HandleViewResources",
66 content::CompositedTouchHandleDrawable::RegisterHandleViewResources}, 67 content::CompositedTouchHandleDrawable::RegisterHandleViewResources},
67 {"InterstitialPageDelegateAndroid", 68 {"InterstitialPageDelegateAndroid",
68 content::InterstitialPageDelegateAndroid:: 69 content::InterstitialPageDelegateAndroid::
69 RegisterInterstitialPageDelegateAndroid}, 70 RegisterInterstitialPageDelegateAndroid},
70 {"LoadUrlParams", content::RegisterLoadUrlParams}, 71 {"LoadUrlParams", content::RegisterLoadUrlParams},
71 {"MediaDrmCredentialManager", 72 {"MediaDrmCredentialManager",
72 content::MediaDrmCredentialManager::RegisterMediaDrmCredentialManager}, 73 content::MediaDrmCredentialManager::RegisterMediaDrmCredentialManager},
73 {"MediaResourceGetterImpl", 74 {"MediaResourceGetterImpl",
74 content::MediaResourceGetterImpl::RegisterMediaResourceGetter}, 75 content::MediaResourceGetterImpl::RegisterMediaResourceGetter},
76 {"MediaSession", content::MediaSession::RegisterMediaSession},
75 {"MotionEventAndroid", 77 {"MotionEventAndroid",
76 content::MotionEventAndroid::RegisterMotionEventAndroid}, 78 content::MotionEventAndroid::RegisterMotionEventAndroid},
77 {"NavigationControllerAndroid", 79 {"NavigationControllerAndroid",
78 content::NavigationControllerAndroid::Register}, 80 content::NavigationControllerAndroid::Register},
79 {"PopupTouchHandleDrawable", 81 {"PopupTouchHandleDrawable",
80 content::PopupTouchHandleDrawable::RegisterPopupTouchHandleDrawable}, 82 content::PopupTouchHandleDrawable::RegisterPopupTouchHandleDrawable},
81 {"PowerSaveBlock", content::RegisterPowerSaveBlocker}, 83 {"PowerSaveBlock", content::RegisterPowerSaveBlocker},
82 {"RegisterImeAdapter", content::RegisterImeAdapter}, 84 {"RegisterImeAdapter", content::RegisterImeAdapter},
83 {"ScreenOrientationProvider", 85 {"ScreenOrientationProvider",
84 content::ScreenOrientationDelegateAndroid::Register}, 86 content::ScreenOrientationDelegateAndroid::Register},
(...skipping 16 matching lines...) Expand all
101 namespace content { 103 namespace content {
102 namespace android { 104 namespace android {
103 105
104 bool RegisterBrowserJni(JNIEnv* env) { 106 bool RegisterBrowserJni(JNIEnv* env) {
105 return RegisterNativeMethods(env, kContentRegisteredMethods, 107 return RegisterNativeMethods(env, kContentRegisteredMethods,
106 arraysize(kContentRegisteredMethods)); 108 arraysize(kContentRegisteredMethods));
107 } 109 }
108 110
109 } // namespace android 111 } // namespace android
110 } // namespace content 112 } // namespace content
OLDNEW
« no previous file with comments | « android_webview/javatests/src/org/chromium/android_webview/test/MultipleVideosTest.java ('k') | content/browser/media/android/browser_media_player_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698