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

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

Issue 2678123003: Revert of Convert MediaRouter mojom apis to intake url::Origin objects instead of strings (Closed)
Patch Set: Created 3 years, 10 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
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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 create_connection_request = TakeCreateConnectionRequest(); 46 create_connection_request = TakeCreateConnectionRequest();
47 if (!create_connection_request) 47 if (!create_connection_request)
48 return; 48 return;
49 49
50 const PresentationRequest& presentation_request = 50 const PresentationRequest& presentation_request =
51 create_connection_request->presentation_request(); 51 create_connection_request->presentation_request();
52 52
53 // TODO(crbug.com/627655): Support multiple URLs. 53 // TODO(crbug.com/627655): Support multiple URLs.
54 const MediaSource::Id source_id = 54 const MediaSource::Id source_id =
55 presentation_request.GetMediaSources()[0].id(); 55 presentation_request.GetMediaSources()[0].id();
56 const auto& origin = presentation_request.frame_origin(); 56 const GURL origin = presentation_request.frame_url().GetOrigin();
57 57
58 std::vector<MediaRouteResponseCallback> route_response_callbacks; 58 std::vector<MediaRouteResponseCallback> route_response_callbacks;
59 route_response_callbacks.push_back( 59 route_response_callbacks.push_back(
60 base::Bind(&CreatePresentationConnectionRequest::HandleRouteResponse, 60 base::Bind(&CreatePresentationConnectionRequest::HandleRouteResponse,
61 base::Passed(&create_connection_request))); 61 base::Passed(&create_connection_request)));
62 62
63 content::BrowserContext* browser_context = initiator()->GetBrowserContext(); 63 content::BrowserContext* browser_context = initiator()->GetBrowserContext();
64 MediaRouter* router = MediaRouterFactory::GetApiForBrowserContext( 64 MediaRouter* router = MediaRouterFactory::GetApiForBrowserContext(
65 browser_context); 65 browser_context);
66 router->CreateRoute(source_id, ConvertJavaStringToUTF8(env, jsink_id), origin, 66 router->CreateRoute(source_id, ConvertJavaStringToUTF8(env, jsink_id), origin,
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 } 159 }
160 160
161 bool MediaRouterDialogControllerAndroid::IsShowingMediaRouterDialog() const { 161 bool MediaRouterDialogControllerAndroid::IsShowingMediaRouterDialog() const {
162 JNIEnv* env = base::android::AttachCurrentThread(); 162 JNIEnv* env = base::android::AttachCurrentThread();
163 return Java_ChromeMediaRouterDialogController_isShowingDialog( 163 return Java_ChromeMediaRouterDialogController_isShowingDialog(
164 env, java_dialog_controller_); 164 env, java_dialog_controller_);
165 } 165 }
166 166
167 } // namespace media_router 167 } // namespace media_router
168 168
OLDNEW
« no previous file with comments | « chrome/browser/media/android/router/media_router_android.cc ('k') | chrome/browser/media/router/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698