MediaRouterAction: Only observe Media Routes when there is a local route.

chrome/browser/ui/toolbar/media_router_action.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_TOOLBAR_MEDIA_ROUTER_ACTION_H_
 #define CHROME_BROWSER_UI_TOOLBAR_MEDIA_ROUTER_ACTION_H_
 
 #include "base/scoped_observer.h"
 #include "chrome/browser/media/router/issues_observer.h"
+#include "chrome/browser/media/router/local_media_routes_observer.h"
 #include "chrome/browser/media/router/media_routes_observer.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
 #include "chrome/browser/ui/toolbar/media_router_contextual_menu.h"
 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
 
 class Browser;
 class MediaRouterActionPlatformDelegate;
 class TabStripModel;
 
 namespace media_router {
 class MediaRouterDialogControllerImpl;
 }  // namespace media_router
 
 // The class for the Media Router component action that will be shown in
 // the toolbar.
 class MediaRouterAction : public ToolbarActionViewController,
                           public media_router::IssuesObserver,
-                          public media_router::MediaRoutesObserver,
+                          public media_router::LocalMediaRoutesObserver,
                           public TabStripModelObserver {
  public:
   explicit MediaRouterAction(Browser* browser);
   ~MediaRouterAction() override;
 
   // ToolbarActionViewController implementation.
   std::string GetId() const override;
   void SetDelegate(ToolbarActionViewDelegate* delegate) override;
   gfx::Image GetIcon(content::WebContents* web_contents,
                      const gfx::Size& size) override;
   base::string16 GetActionName() const override;
   base::string16 GetAccessibleName(content::WebContents* web_contents)
       const override;
   base::string16 GetTooltip(content::WebContents* web_contents)
       const override;
   bool IsEnabled(content::WebContents* web_contents) const override;
   bool WantsToRun(content::WebContents* web_contents) const override;
   bool HasPopup(content::WebContents* web_contents) const override;
   void HidePopup() override;
   gfx::NativeView GetPopupNativeView() override;
   ui::MenuModel* GetContextMenu() override;
   bool ExecuteAction(bool by_user) override;
   void UpdateState() override;
   bool DisabledClickOpensMenu() const override;
 
   // media_router::IssuesObserver:
   void OnIssueUpdated(const media_router::Issue* issue) override;
 
-  // media_router::MediaRoutesObserver:
-  void OnRoutesUpdated(const std::vector<media_router::MediaRoute>& routes)
-      override;
+  // media_router::LocalMediaRoutesObserver:
+  void OnLocalRouteCreated() override;
 
   // ToolbarStripModelObserver:
   void ActiveTabChanged(content::WebContents* old_contents,
                         content::WebContents* new_contents,
                         int index,
                         int reason) override;
 
   void OnPopupHidden();
   void OnPopupShown();
 
+  void SetHasLocalRoute(bool has_local_route);
+
  private:
+  class ActionMediaRoutesObserver : public media_router::MediaRoutesObserver {
+   public:
+    ActionMediaRoutesObserver(media_router::MediaRouter* router,
+                              MediaRouterAction* action);
+    ~ActionMediaRoutesObserver() override;
+
+    // media_router::MediaRoutesObserver:
+    void OnRoutesUpdated(const std::vector<media_router::MediaRoute>& routes)
+        override;
+
+   private:
+    MediaRouterAction* action_;

[imcheng, 2015/10/01 18:46:50]

 MediaRouterAction* const action_;

[apacible, 2015/10/01 23:21:47]

Done (moved to MediaRouterMojoImpl).

+
+    DISALLOW_COPY_AND_ASSIGN(ActionMediaRoutesObserver);
+  };
+
   void UpdatePopupState();
 
   // Returns a reference to the MediaRouterDialogControllerImpl associated with
   // |delegate_|'s current WebContents. Guaranteed to be non-null.
   // |delegate_| and its current WebContents must not be null.
   // Marked virtual for tests.
   virtual media_router::MediaRouterDialogControllerImpl*
       GetMediaRouterDialogController();
 
   // Overridden by tests.
@@ skipping 25 matching lines @@
   // in OnIssueUpdated(), which is called by the IssueManager.
   scoped_ptr<media_router::Issue> issue_;
 
   // Whether a local active route exists.
   bool has_local_route_;
 
   ToolbarActionViewDelegate* delegate_;
 
   Browser* const browser_;
 
+  // |routes_observer_| listens for updated MediaRoutes. We only listen when
+  // there is a local route that could be closed. |routes_observer_| is only
+  // set and registered on creation of |this| or when |has_local_route_| is
+  // true.
+  scoped_ptr<media_router::MediaRoutesObserver> routes_observer_;
+
   // The delegate to handle platform-specific implementations.
   scoped_ptr<MediaRouterActionPlatformDelegate> platform_delegate_;
 
   MediaRouterContextualMenu contextual_menu_;
 
   ScopedObserver<TabStripModel, TabStripModelObserver>
       tab_strip_model_observer_;
 
   base::WeakPtrFactory<MediaRouterAction> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaRouterAction);
 };
 
 #endif  // CHROME_BROWSER_UI_TOOLBAR_MEDIA_ROUTER_ACTION_H_