Show media router toolbar icon ephemerally for active local routes and issues

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/presentation_service_delegate_impl.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_finder.h"
@@ skipping 28 matching lines @@
 namespace {
 
 constexpr const int kMaxHeight = 2000;
 constexpr const int kMinHeight = 80;
 constexpr const int kWidth = 340;
 
 // WebDialogDelegate that specifies what the Media Router dialog
 // will look like.
 class MediaRouterDialogDelegate : public WebDialogDelegate {
  public:
-  MediaRouterDialogDelegate(base::WeakPtr<MediaRouterAction> action,
+  explicit MediaRouterDialogDelegate(
       const base::WeakPtr<MediaRouterDialogControllerImpl>& controller)
-      : action_(action),
-        controller_(controller) {}
+      : controller_(controller) {}
   ~MediaRouterDialogDelegate() override {}
 
   // WebDialogDelegate implementation.
   ui::ModalType GetDialogModalType() const override {
     // Not used, returning dummy value.
     return ui::MODAL_TYPE_WINDOW;
   }
 
   base::string16 GetDialogTitle() const override {
     return base::string16();
@@ skipping 10 matching lines @@
 
   void GetDialogSize(gfx::Size* size) const override;
 
   std::string GetDialogArgs() const override {
     return std::string();
   }
 
   void OnDialogClosed(const std::string& json_retval) override {
     // We don't delete |this| here because this class is owned
     // by ConstrainedWebDialogDelegate.
-    if (action_)
-      action_->OnPopupHidden();
   }
 
   void OnCloseContents(WebContents* source, bool* out_close_dialog) override {
     if (out_close_dialog)
       *out_close_dialog = true;
   }
 
   bool ShouldShowDialogTitle() const override {
     return false;
   }
@@ skipping 126 matching lines @@
   base::Time dialog_creation_time = base::Time::Now();
   TRACE_EVENT_NESTABLE_ASYNC_BEGIN0("media_router", "UI", initiator());
 
   Profile* profile =
       Profile::FromBrowserContext(initiator()->GetBrowserContext());
   DCHECK(profile);
 
   // |web_dialog_delegate|'s owner is |constrained_delegate|.
   // |constrained_delegate| is owned by the parent |views::View|.
   WebDialogDelegate* web_dialog_delegate =
-      new MediaRouterDialogDelegate(action_, weak_ptr_factory_.GetWeakPtr());
+      new MediaRouterDialogDelegate(weak_ptr_factory_.GetWeakPtr());
 
   // |ShowConstrainedWebDialogWithAutoResize()| will end up creating
   // ConstrainedWebDialogDelegateViewViews containing a WebContents containing
   // the MediaRouterUI, using the provided |web_dialog_delegate|. Then, the
   // view is shown as a modal dialog constrained to the |initiator| WebContents.
   // The dialog will resize between the given minimum and maximum size bounds
   // based on the currently rendered contents.
   ConstrainedWebDialogDelegate* constrained_delegate =
       ShowConstrainedWebDialogWithAutoResize(
           profile, web_dialog_delegate, initiator(),
@@ skipping 12 matching lines @@
     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));
 
   if (action_)
-    action_->OnPopupShown();
+    action_->OnDialogShown();
 }
 
 void MediaRouterDialogControllerImpl::Reset() {
   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 32 matching lines @@
           ->GetWeakPtr();
   if (!create_connection_request.get()) {
     media_router_ui->InitWithDefaultMediaSource(delegate);
   } else {
     media_router_ui->InitWithPresentationSessionRequest(
         initiator(), delegate, std::move(create_connection_request));
   }
 }
 
 }  // namespace media_router