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

Side by Side Diff: chrome/browser/media/android/router/media_router_dialog_controller_android.cc

Issue 1277883003: [PresentationAPI,Android] Implement the ChromeMediaRouterDialogController. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@media-router-dialog-controller-jni
Patch Set: Corrected Cast URN domain and close the dialog fragment upon dialog dismissal. 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 unified diff | Download patch
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/media/router/cast/MediaSource.java ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "chrome/browser/media/android/router/media_router_dialog_controller_and roid.h" 5 #include "chrome/browser/media/android/router/media_router_dialog_controller_and roid.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_string.h"
9 #include "chrome/browser/media/router/media_source.h"
8 #include "content/public/browser/browser_thread.h" 10 #include "content/public/browser/browser_thread.h"
9 #include "content/public/browser/web_contents.h" 11 #include "content/public/browser/web_contents.h"
10 #include "content/public/browser/web_contents_delegate.h" 12 #include "content/public/browser/web_contents_delegate.h"
11 #include "jni/ChromeMediaRouterDialogController_jni.h" 13 #include "jni/ChromeMediaRouterDialogController_jni.h"
12 14
13 DEFINE_WEB_CONTENTS_USER_DATA_KEY( 15 DEFINE_WEB_CONTENTS_USER_DATA_KEY(
14 media_router::MediaRouterDialogControllerAndroid); 16 media_router::MediaRouterDialogControllerAndroid);
15 17
16 using content::WebContents; 18 using content::WebContents;
17 19
(...skipping 24 matching lines...) Expand all
42 bool ret = RegisterNativesImpl(env); 44 bool ret = RegisterNativesImpl(env);
43 // No native calls to register yet. 45 // No native calls to register yet.
44 // DCHECK(g_ChromeMediaRouterDialogController_clazz); 46 // DCHECK(g_ChromeMediaRouterDialogController_clazz);
45 return ret; 47 return ret;
46 } 48 }
47 49
48 MediaRouterDialogControllerAndroid::~MediaRouterDialogControllerAndroid() { 50 MediaRouterDialogControllerAndroid::~MediaRouterDialogControllerAndroid() {
49 } 51 }
50 52
51 void MediaRouterDialogControllerAndroid::CreateMediaRouterDialog() { 53 void MediaRouterDialogControllerAndroid::CreateMediaRouterDialog() {
52 NOTIMPLEMENTED(); 54 JNIEnv* env = base::android::AttachCurrentThread();
55
56 scoped_ptr<CreatePresentationSessionRequest> presentation_request(
57 PassPresentationRequest());
58
59 ScopedJavaLocalRef<jstring> jsource_urn =
60 base::android::ConvertUTF8ToJavaString(
61 env, presentation_request->GetMediaSource().id());
62
63 Java_ChromeMediaRouterDialogController_createDialog(
64 env, java_dialog_controller_.obj(), jsource_urn.obj());
53 } 65 }
54 66
55 void MediaRouterDialogControllerAndroid::CloseMediaRouterDialog() { 67 void MediaRouterDialogControllerAndroid::CloseMediaRouterDialog() {
56 NOTIMPLEMENTED(); 68 JNIEnv* env = base::android::AttachCurrentThread();
69
70 Java_ChromeMediaRouterDialogController_closeDialog(
71 env, java_dialog_controller_.obj());
57 } 72 }
58 73
59 bool MediaRouterDialogControllerAndroid::IsShowingMediaRouterDialog() const { 74 bool MediaRouterDialogControllerAndroid::IsShowingMediaRouterDialog() const {
60 NOTIMPLEMENTED(); 75 JNIEnv* env = base::android::AttachCurrentThread();
61 return false; 76 return Java_ChromeMediaRouterDialogController_isShowingDialog(
77 env, java_dialog_controller_.obj());
62 } 78 }
63 79
64 } // namespace media_router 80 } // namespace media_router
65 81
OLDNEW
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/media/router/cast/MediaSource.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698