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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/android/chrome_jni_registrar.cc

Issue 928643003: Upstream Chrome for Android Cast. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix chrome.gyp dependencies 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 side-by-side diff with in-line comments
Download patch
« chrome/android/java/src/org/chromium/chrome/browser/media/remote/RemoteVideoInfo.java ('K') | « chrome/app/android/chrome_main_delegate_android.cc ('k') | chrome/browser/media/android/remote/DEPS » ('j') | chrome/browser/media/android/remote/remote_media_player_bridge.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/chrome_jni_registrar.cc
diff --git a/chrome/browser/android/chrome_jni_registrar.cc b/chrome/browser/android/chrome_jni_registrar.cc
index 37b63f2064ae0128eb48413667a3ad22749023e6..3d75fb07d1f5cf658314c82baf8b2a2c7bdea54f 100644
--- a/chrome/browser/android/chrome_jni_registrar.cc
+++ b/chrome/browser/android/chrome_jni_registrar.cc
@@ -64,6 +64,8 @@
#include "chrome/browser/history/android/sqlite_cursor.h"
#include "chrome/browser/invalidation/invalidation_service_factory_android.h"
#include "chrome/browser/lifetime/application_lifetime_android.h"
+#include "chrome/browser/media/android/remote/record_cast_action.h"
+#include "chrome/browser/media/android/remote/remote_media_player_bridge.h"
#include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h"
#include "chrome/browser/notifications/notification_ui_manager_android.h"
#include "chrome/browser/prerender/external_prerender_handler_android.h"
@@ -221,6 +223,9 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
{"ProfileDownloader", RegisterProfileDownloader},
{"ProfileSyncService", ProfileSyncServiceAndroid::Register},
{"RecentlyClosedBridge", RecentlyClosedTabsBridge::Register},
+ {"RecordCastAction", remote_media::RegisterRecordCastAction},
+ {"RemoteMediaPlayerBridge",
+ remote_media::RemoteMediaPlayerBridge::RegisterRemoteMediaPlayerBridge},
{"SavePasswordInfoBar", SavePasswordInfoBar::Register},
{"SceneLayer", chrome::android::RegisterSceneLayer},
{"ServiceTabLauncher", ServiceTabLauncher::RegisterServiceTabLauncher},
« chrome/android/java/src/org/chromium/chrome/browser/media/remote/RemoteVideoInfo.java ('K') | « chrome/app/android/chrome_main_delegate_android.cc ('k') | chrome/browser/media/android/remote/DEPS » ('j') | chrome/browser/media/android/remote/remote_media_player_bridge.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698