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

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

Issue 1149893020: [Media Router] Implement MediaRouterAction + MediaRouterUI tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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.cc
diff --git a/chrome/browser/ui/webui/media_router/media_router_dialog_controller.cc b/chrome/browser/ui/webui/media_router/media_router_dialog_controller.cc
index 1265f53dd411b25d3d72ea2e29ef12ad56b4427a..b6246f90de436f05e955ea4ad52b094c1f7c0287 100644
--- a/chrome/browser/ui/webui/media_router/media_router_dialog_controller.cc
+++ b/chrome/browser/ui/webui/media_router/media_router_dialog_controller.cc
@@ -100,6 +100,22 @@ void MediaRouterDialogDelegate::GetDialogSize(gfx::Size* size) const {
} // namespace
+// static
+MediaRouterDialogController*
+MediaRouterDialogController::GetOrCreateForWebContents(
+ WebContents* web_contents) {
+ DCHECK(web_contents);
+ MediaRouterDialogController* controller =
+ media_router::MediaRouterDialogController::FromWebContents(web_contents);
Peter Kasting 2015/06/04 00:17:53 Nit: media_router:: namespace qualifier not necess
imcheng (use chromium acct) 2015/06/04 01:04:20 Done.
+ if (controller)
+ return controller;
+
+ MediaRouterDialogController::CreateForWebContents(web_contents);
+ controller = MediaRouterDialogController::FromWebContents(web_contents);
+ DCHECK(controller);
+ return controller;
Peter Kasting 2015/06/04 00:17:53 Nit: This function is more verbose than it needs t
imcheng (use chromium acct) 2015/06/04 01:04:20 My reasoning was that although CreateForWebContent
+}
+
class MediaRouterDialogController::DialogWebContentsObserver
: public content::WebContentsObserver {
public:

Powered by Google App Engine
This is Rietveld 408576698