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

Unified Diff: chrome/browser/media/android/router/media_router_dialog_controller_android.cc

Issue 1243173003: [MediaRouter] Moved the code useful for Android to MediaRouterDialogController (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@build-media-router-android
Patch Set: Moved base CloseMediaRouterDialog to the end of the derived implementation method Created 5 years, 5 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
Index: chrome/browser/media/android/router/media_router_dialog_controller_android.cc
diff --git a/chrome/browser/media/android/router/media_router_dialog_controller_android.cc b/chrome/browser/media/android/router/media_router_dialog_controller_android.cc
index 74943e480f8b0f31df3d94c235fd685691407e02..c836f611c0a2cacee9ad2814dbb94600c60d9305 100644
--- a/chrome/browser/media/android/router/media_router_dialog_controller_android.cc
+++ b/chrome/browser/media/android/router/media_router_dialog_controller_android.cc
@@ -26,7 +26,8 @@ MediaRouterDialogControllerAndroid::GetOrCreateForWebContents(
}
MediaRouterDialogControllerAndroid::MediaRouterDialogControllerAndroid(
- WebContents* web_contents) {
+ WebContents* web_contents)
+ : MediaRouterDialogController(web_contents) {
DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
}
@@ -37,8 +38,18 @@ MediaRouterDialogControllerAndroid::~MediaRouterDialogControllerAndroid() {
bool MediaRouterDialogControllerAndroid::ShowMediaRouterDialogForPresentation(
scoped_ptr<CreatePresentationSessionRequest> request) {
DCHECK(thread_checker_.CalledOnValidThread());
+ SetPresentationRequest(request.Pass());
+ ActivateInitiatorWebContents();
+ MediaRouterDialogController::CreateMediaRouterDialog();
return false;
}
+void MediaRouterDialogControllerAndroid::CloseMediaRouterDialog() {
+ MediaRouterDialogController::CloseMediaRouterDialog();
+}
+
+void MediaRouterDialogControllerAndroid::Reset() {
+}
+
} // namespace media_router

Powered by Google App Engine
This is Rietveld 408576698