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

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

Issue 2737413003: [Presentation API] Remove references to presentation sessions. (Closed)
Patch Set: Update PresentationServiceDelegateImpl unittest Created 3 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/browser_presentation_connection_proxy.h » ('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 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 CancelPresentationRequest(); 88 CancelPresentationRequest();
89 } 89 }
90 90
91 void MediaRouterDialogControllerAndroid::CancelPresentationRequest() { 91 void MediaRouterDialogControllerAndroid::CancelPresentationRequest() {
92 std::unique_ptr<CreatePresentationConnectionRequest> request = 92 std::unique_ptr<CreatePresentationConnectionRequest> request =
93 TakeCreateConnectionRequest(); 93 TakeCreateConnectionRequest();
94 if (!request) 94 if (!request)
95 return; 95 return;
96 96
97 request->InvokeErrorCallback(content::PresentationError( 97 request->InvokeErrorCallback(content::PresentationError(
98 content::PRESENTATION_ERROR_SESSION_REQUEST_CANCELLED, 98 content::PRESENTATION_ERROR_PRESENTATION_REQUEST_CANCELLED,
99 "Dialog closed.")); 99 "Dialog closed."));
100 } 100 }
101 101
102 MediaRouterDialogControllerAndroid::MediaRouterDialogControllerAndroid( 102 MediaRouterDialogControllerAndroid::MediaRouterDialogControllerAndroid(
103 WebContents* web_contents) 103 WebContents* web_contents)
104 : MediaRouterDialogController(web_contents) { 104 : MediaRouterDialogController(web_contents) {
105 JNIEnv* env = base::android::AttachCurrentThread(); 105 JNIEnv* env = base::android::AttachCurrentThread();
106 java_dialog_controller_.Reset(Java_ChromeMediaRouterDialogController_create( 106 java_dialog_controller_.Reset(Java_ChromeMediaRouterDialogController_create(
107 env, 107 env,
108 reinterpret_cast<jlong>(this), 108 reinterpret_cast<jlong>(this),
(...skipping 50 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 | « no previous file | chrome/browser/media/router/browser_presentation_connection_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698