[Media Router] Fix regression with icon not turning blue after casting.

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/macros.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"
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.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::LocalMediaRoutesObserver,
+                          public media_router::MediaRoutesObserver,
                           public TabStripModelObserver {
  public:
   MediaRouterAction(Browser* browser, ToolbarActionsBar* toolbar_actions_bar);
   ~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::LocalMediaRoutesObserver:
-  void OnHasLocalDisplayRouteUpdated(bool has_local_display_route) override;
+  // media_router::MediaRoutesObserver:
+  void OnRoutesUpdated(const std::vector<media_router::MediaRoute>& routes,

[Peter Kasting, 2016/01/30 00:52:19]

Nit: Separately, you may want to consider whether MediaRoutesObserver should
define type aliases for these param types for shorter and possibly more readable
code.

[imcheng, 2016/02/01 18:48:06]

Acknowledged.

+                       const std::vector<media_router::MediaRoute::Id>&
+                           joinable_route_ids) override;
 
   // ToolbarStripModelObserver:
   void ActiveTabChanged(content::WebContents* old_contents,
                         content::WebContents* new_contents,
                         int index,
                         int reason) override;
 
   void OnPopupHidden();
   void OnPopupShown();
 
@@ skipping 55 matching lines @@
 
   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_