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

Unified Diff: content/browser/android/browser_jni_registrar.cc

Issue 2416853005: Fixing naming issues in MediaSession (Closed)
Patch Set: addressed nits Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/BUILD.gn ('k') | content/browser/media/session/audio_focus_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/android/browser_jni_registrar.cc
diff --git a/content/browser/android/browser_jni_registrar.cc b/content/browser/android/browser_jni_registrar.cc
index 7985f7c59f73a3fa6e650bef1767110b1f4da473..32dfc1042175dd3e5a5f4dd80846f148929c582e 100644
--- a/content/browser/android/browser_jni_registrar.cc
+++ b/content/browser/android/browser_jni_registrar.cc
@@ -24,7 +24,7 @@
#include "content/browser/android/web_contents_observer_proxy.h"
#include "content/browser/device_sensors/sensor_manager_android.h"
#include "content/browser/frame_host/navigation_controller_android.h"
-#include "content/browser/media/session/media_session_delegate_android.h"
+#include "content/browser/media/session/audio_focus_delegate_android.h"
#include "content/browser/memory/memory_monitor_android.h"
#include "content/browser/renderer_host/ime_adapter_android.h"
#include "content/browser/speech/speech_recognizer_impl_android.h"
@@ -35,11 +35,11 @@
namespace {
base::android::RegistrationMethod kContentRegisteredMethods[] = {
{"AppWebMessagePortService", content::RegisterAppWebMessagePortService},
+ {"AudioFocusDelegate", content::AudioFocusDelegateAndroid::Register},
{"BrowserStartupController", content::RegisterBrowserStartupController},
{"ChildProcessLauncher", content::RegisterChildProcessLauncher},
{"ContentVideoView", content::ContentVideoView::RegisterContentVideoView},
{"CoreImpl", mojo::android::RegisterCoreImpl},
- {"MediaSessionDelegate", content::MediaSessionDelegateAndroid::Register},
{"MemoryMonitorAndroid", content::MemoryMonitorAndroid::Register},
{"BackgroundSyncNetworkObserverAndroid",
content::BackgroundSyncNetworkObserverAndroid::Observer::
« no previous file with comments | « content/browser/BUILD.gn ('k') | content/browser/media/session/audio_focus_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698