Show Media Router toolbar icon ephemerally for MR dialogs

chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
+#include "chrome/browser/media/router/media_router_ui_service.h"
 #include "chrome/browser/media/router/presentation_service_delegate_impl.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/toolbar/media_router_action.h"
 #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h"
 #include "chrome/browser/ui/webui/media_router/media_router_ui.h"
 #include "chrome/common/url_constants.h"
 #include "components/guest_view/browser/guest_view_base.h"
 #include "components/web_modal/web_contents_modal_dialog_host.h"
@@ skipping 80 matching lines @@
 };
 
 void MediaRouterDialogDelegate::GetDialogSize(gfx::Size* size) const {
   DCHECK(size);
   // GetDialogSize() is called when the browser window resizes. We may want to
   // update the maximum height of the dialog and scale the WebUI to the new
   // height. |size| is not set because the dialog is auto-resizeable.
   controller_->UpdateMaxDialogSize();
 }
 
+MediaRouterActionController* GetActionController(WebContents* web_contents) {
+  Profile* profile =
+      Profile::FromBrowserContext(web_contents->GetBrowserContext());
+  return MediaRouterUIService::Get(profile)->action_controller();
+}
+
 }  // namespace
 
 // static
 MediaRouterDialogControllerImpl*
 MediaRouterDialogControllerImpl::GetOrCreateForWebContents(
     WebContents* web_contents) {
   DCHECK(web_contents);
   // This call does nothing if the controller already exists.
   MediaRouterDialogControllerImpl::CreateForWebContents(web_contents);
   return MediaRouterDialogControllerImpl::FromWebContents(web_contents);
@@ skipping 26 matching lines @@
     dialog_controller_->CloseMediaRouterDialog();
   }
 
   MediaRouterDialogControllerImpl* const dialog_controller_;
 };
 
 MediaRouterDialogControllerImpl::MediaRouterDialogControllerImpl(
     WebContents* web_contents)
     : MediaRouterDialogController(web_contents),
       media_router_dialog_pending_(false),
-      weak_ptr_factory_(this) {
-}
+      action_controller_(GetActionController(web_contents)),
+      weak_ptr_factory_(this) {}

[mark a. foltz, 2016/10/17 18:57:40]

Can you DCHECK(action_controller_) here?

[takumif, 2016/10/27 23:06:38]

Done.

 
 MediaRouterDialogControllerImpl::~MediaRouterDialogControllerImpl() {
+  Reset();
 }
 
 WebContents* MediaRouterDialogControllerImpl::GetMediaRouterDialog() const {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   return dialog_observer_.get() ? dialog_observer_->web_contents() : nullptr;
 }
 
 void MediaRouterDialogControllerImpl::SetMediaRouterAction(
     const base::WeakPtr<MediaRouterAction>& action) {
   action_ = action;
@@ skipping 82 matching lines @@
         media_router_dialog->GetWebUI()->GetController());
     DCHECK(media_router_ui);
     media_router_ui->SetUIInitializationTimer(dialog_creation_time);
   }
 
   media_router_dialog_pending_ = true;
 
   dialog_observer_.reset(new DialogWebContentsObserver(
       media_router_dialog, this));
 
+  // The |action_controller_| must be notified after |action_| to avoid a UI
+  // bug in which the drop shadow is drawn in an incorrect position.
   if (action_)
     action_->OnDialogShown();
+  action_controller_->OnDialogShown();
 }
 
 void MediaRouterDialogControllerImpl::Reset() {
+  if (IsShowingMediaRouterDialog()) {
+    if (action_)
+      action_->OnDialogHidden();
+    action_controller_->OnDialogHidden();
+  }
   MediaRouterDialogController::Reset();
   dialog_observer_.reset();
-  if (action_)
-    action_->OnDialogHidden();
 }
 
 void MediaRouterDialogControllerImpl::OnDialogNavigated(
     const content::LoadCommittedDetails& details) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   WebContents* media_router_dialog = GetMediaRouterDialog();
   CHECK(media_router_dialog);
   ui::PageTransition transition_type = details.entry->GetTransitionType();
   content::NavigationType nav_type = details.type;
 
@@ skipping 29 matching lines @@
       PresentationServiceDelegateImpl::FromWebContents(initiator());
   if (!create_connection_request.get()) {
     media_router_ui->InitWithDefaultMediaSource(initiator(), delegate);
   } else {
     media_router_ui->InitWithPresentationSessionRequest(
         initiator(), delegate, std::move(create_connection_request));
   }
 }
 
 }  // namespace media_router