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

Unified Diff: chrome/browser/ui/webui/media_router/media_router_dialog_controller.h

Issue 1224093004: [Media Router] 2nd take on fix route response callback lifetime in UI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix unit test 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/ui/webui/media_router/media_router_dialog_controller.h
diff --git a/chrome/browser/ui/webui/media_router/media_router_dialog_controller.h b/chrome/browser/ui/webui/media_router/media_router_dialog_controller.h
index f357d00bb173adb44d65fe467591b1280f31dc7a..79bcf9c709bc69fa4025b3182bf871c991fde7fd 100644
--- a/chrome/browser/ui/webui/media_router/media_router_dialog_controller.h
+++ b/chrome/browser/ui/webui/media_router/media_router_dialog_controller.h
@@ -6,7 +6,7 @@
#define CHROME_BROWSER_UI_WEBUI_MEDIA_ROUTER_MEDIA_ROUTER_DIALOG_CONTROLLER_H_
#include "base/macros.h"
-#include "chrome/browser/media/router/create_session_request.h"
+#include "chrome/browser/media/router/create_presentation_session_request.h"
#include "content/public/browser/web_contents_observer.h"
#include "content/public/browser/web_contents_user_data.h"
@@ -40,7 +40,7 @@ class MediaRouterDialogController
// Returns WebContents for the media router dialog if a dialog was created.
// Otherwise returns nullptr and |request| is deleted.
content::WebContents* ShowMediaRouterDialogForPresentation(
- scoped_ptr<CreateSessionRequest> request);
+ scoped_ptr<CreatePresentationSessionRequest> request);
// Returns the media router dialog WebContents.
// Returns nullptr if there is no dialog.
@@ -82,7 +82,7 @@ class MediaRouterDialogController
// Data for dialogs created under a Presentation API context.
// Passed from the caller of ShowMediaRouterDialogForPresentation(), and
// passed to the MediaRouterUI when it is initialized.
- scoped_ptr<CreateSessionRequest> presentation_request_;
+ scoped_ptr<CreatePresentationSessionRequest> presentation_request_;
base::ThreadChecker thread_checker_;

Powered by Google App Engine
This is Rietveld 408576698