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

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

Issue 1693963003: Pass origin to StartObservingMediaSinks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Marks Review Fixes with URL changes Created 4 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/media/router/media_router.mojom » ('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 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/context_utils.h" 7 #include "base/android/context_utils.h"
8 #include "base/android/jni_android.h" 8 #include "base/android/jni_android.h"
9 #include "base/android/jni_string.h" 9 #include "base/android/jni_string.h"
10 #include "chrome/browser/media/android/router/media_router_android.h" 10 #include "chrome/browser/media/android/router/media_router_android.h"
(...skipping 27 matching lines...) Expand all
38 38
39 void MediaRouterDialogControllerAndroid::OnSinkSelected( 39 void MediaRouterDialogControllerAndroid::OnSinkSelected(
40 JNIEnv* env, 40 JNIEnv* env,
41 const JavaParamRef<jobject>& obj, 41 const JavaParamRef<jobject>& obj,
42 const JavaParamRef<jstring>& jsink_id) { 42 const JavaParamRef<jstring>& jsink_id) {
43 scoped_ptr<CreatePresentationConnectionRequest> create_connection_request = 43 scoped_ptr<CreatePresentationConnectionRequest> create_connection_request =
44 TakeCreateConnectionRequest(); 44 TakeCreateConnectionRequest();
45 const PresentationRequest& presentation_request = 45 const PresentationRequest& presentation_request =
46 create_connection_request->presentation_request(); 46 create_connection_request->presentation_request();
47 const MediaSource::Id source_id = presentation_request.GetMediaSource().id(); 47 const MediaSource::Id source_id = presentation_request.GetMediaSource().id();
48 const GURL origin = presentation_request.frame_url().GetOrigin(); 48 const GURL origin = presentation_request.frame_url().origin();
49 49
50 std::vector<MediaRouteResponseCallback> route_response_callbacks; 50 std::vector<MediaRouteResponseCallback> route_response_callbacks;
51 route_response_callbacks.push_back( 51 route_response_callbacks.push_back(
52 base::Bind(&CreatePresentationConnectionRequest::HandleRouteResponse, 52 base::Bind(&CreatePresentationConnectionRequest::HandleRouteResponse,
53 base::Passed(&create_connection_request))); 53 base::Passed(&create_connection_request)));
54 54
55 content::BrowserContext* browser_context = initiator()->GetBrowserContext(); 55 content::BrowserContext* browser_context = initiator()->GetBrowserContext();
56 MediaRouter* router = MediaRouterFactory::GetApiForBrowserContext( 56 MediaRouter* router = MediaRouterFactory::GetApiForBrowserContext(
57 browser_context); 57 browser_context);
58 router->CreateRoute(source_id, ConvertJavaStringToUTF8(env, jsink_id), origin, 58 router->CreateRoute(source_id, ConvertJavaStringToUTF8(env, jsink_id), origin,
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 } 148 }
149 149
150 bool MediaRouterDialogControllerAndroid::IsShowingMediaRouterDialog() const { 150 bool MediaRouterDialogControllerAndroid::IsShowingMediaRouterDialog() const {
151 JNIEnv* env = base::android::AttachCurrentThread(); 151 JNIEnv* env = base::android::AttachCurrentThread();
152 return Java_ChromeMediaRouterDialogController_isShowingDialog( 152 return Java_ChromeMediaRouterDialogController_isShowingDialog(
153 env, java_dialog_controller_.obj()); 153 env, java_dialog_controller_.obj());
154 } 154 }
155 155
156 } // namespace media_router 156 } // namespace media_router
157 157
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/media/router/media_router.mojom » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698