chrome/browser/android/chrome_jni_registrar.cc - Issue 1270353003: [PresentationAPI, Android] Add ChromeMediaRouterDialogController.java and bind it with the native M…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1270353003: [PresentationAPI, Android] Add ChromeMediaRouterDialogController.java and bind it with the native M… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@media-router-jni

Patch Set: Disabled unnecessary DCHECK Created 5 years, 4 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 | « chrome/android/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterDialogController.java ('k') | chrome/browser/media/android/router/media_router_dialog_controller_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | 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 b839ff754e2b054ec72f20a1e622d2054a7435a8..17e4037c5ae397689355ff9b617f38b47f33923d 100644

--- a/chrome/browser/android/chrome_jni_registrar.cc

+++ b/chrome/browser/android/chrome_jni_registrar.cc

@@ -83,6 +83,7 @@

#include "chrome/browser/media/android/remote/record_cast_action.h"

#include "chrome/browser/media/android/remote/remote_media_player_bridge.h"

#include "chrome/browser/media/android/router/media_router_android.h"

+#include "chrome/browser/media/android/router/media_router_dialog_controller_android.h"

#include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h"

#include "chrome/browser/notifications/notification_ui_manager_android.h"

#include "chrome/browser/password_manager/credential_android.h"

@@ -196,6 +197,8 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {

ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler},

#if defined(ENABLE_MEDIA_ROUTER)

{"ChromeMediaRouter", media_router::MediaRouterAndroid::Register},

+ {"ChromeMediaRouterDialogController",

+ media_router::MediaRouterDialogControllerAndroid::Register},

#endif

{"ChromeWebContentsDelegateAndroid",

RegisterChromeWebContentsDelegateAndroid},