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

chrome/browser/ui/toolbar/media_router_action.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/toolbar/media_router_action.h"
 
 #include "base/metrics/user_metrics.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/media/router/issue.h"
 #include "chrome/browser/media/router/media_route.h"
@@ skipping 21 matching lines @@
 media_router::MediaRouter* GetMediaRouter(Browser* browser) {
   return media_router::MediaRouterFactory::GetApiForBrowserContext(
       browser->profile());
 }
 
 }  // namespace
 
 MediaRouterAction::MediaRouterAction(Browser* browser,
                                      ToolbarActionsBar* toolbar_actions_bar)
     : media_router::IssuesObserver(GetMediaRouter(browser)),
-      media_router::LocalMediaRoutesObserver(GetMediaRouter(browser)),
+      media_router::MediaRoutesObserver(GetMediaRouter(browser)),
       media_router_active_icon_(
-          ui::ResourceBundle::GetSharedInstance()
-              .GetImageNamed(IDR_MEDIA_ROUTER_ACTIVE_ICON)),
-      media_router_error_icon_(ui::ResourceBundle::GetSharedInstance()
-                                   .GetImageNamed(IDR_MEDIA_ROUTER_ERROR_ICON)),
-      media_router_idle_icon_(ui::ResourceBundle::GetSharedInstance()
-                                  .GetImageNamed(IDR_MEDIA_ROUTER_IDLE_ICON)),
+          ui::ResourceBundle::GetSharedInstance().GetImageNamed(
+              IDR_MEDIA_ROUTER_ACTIVE_ICON)),
+      media_router_error_icon_(
+          ui::ResourceBundle::GetSharedInstance().GetImageNamed(
+              IDR_MEDIA_ROUTER_ERROR_ICON)),
+      media_router_idle_icon_(
+          ui::ResourceBundle::GetSharedInstance().GetImageNamed(
+              IDR_MEDIA_ROUTER_IDLE_ICON)),
       media_router_warning_icon_(
-          ui::ResourceBundle::GetSharedInstance()
-              .GetImageNamed(IDR_MEDIA_ROUTER_WARNING_ICON)),
+          ui::ResourceBundle::GetSharedInstance().GetImageNamed(
+              IDR_MEDIA_ROUTER_WARNING_ICON)),
       current_icon_(&media_router_idle_icon_),
       has_local_display_route_(false),
       delegate_(nullptr),
       browser_(browser),
       toolbar_actions_bar_(toolbar_actions_bar),
       platform_delegate_(MediaRouterActionPlatformDelegate::Create(browser)),
       contextual_menu_(browser),
       tab_strip_model_observer_(this),
       weak_ptr_factory_(this) {
   DCHECK(browser_);
   DCHECK(toolbar_actions_bar_);
   tab_strip_model_observer_.Add(browser_->tab_strip_model());
 
   RegisterObserver();
-  OnHasLocalDisplayRouteUpdated(
-      GetMediaRouter(browser)->HasLocalDisplayRoute());
 }
 
 MediaRouterAction::~MediaRouterAction() {
   UnregisterObserver();
 }
 
 std::string MediaRouterAction::GetId() const {
   return ComponentToolbarActionsFactory::kMediaRouterActionId;
 }
 
@@ skipping 77 matching lines @@
 bool MediaRouterAction::DisabledClickOpensMenu() const {
   return false;
 }
 
 void MediaRouterAction::OnIssueUpdated(const media_router::Issue* issue) {
   issue_.reset(issue ? new media_router::Issue(*issue) : nullptr);
 
   MaybeUpdateIcon();
 }
 
-void MediaRouterAction::OnHasLocalDisplayRouteUpdated(
-    bool has_local_display_route) {
-  has_local_display_route_ = has_local_display_route;
+void MediaRouterAction::OnRoutesUpdated(
+    const std::vector<media_router::MediaRoute>& routes,
+    const std::vector<media_router::MediaRoute::Id>& joinable_route_ids) {
+  has_local_display_route_ =
+      std::find_if(routes.begin(), routes.end(),

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

Nit: Prefer std::any_of() to (std::find_if() != end())

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

I was going to use that, but it looks like it's a C++11 feature that's not
allowed yet.

+                   [](const media_router::MediaRoute& route) {
+                     return route.is_local() && route.for_display();
+                   }) != routes.end();
   MaybeUpdateIcon();
 }
 
 void MediaRouterAction::ActiveTabChanged(content::WebContents* old_contents,
                                          content::WebContents* new_contents,
                                          int index,
                                          int reason) {
   UpdatePopupState();
 }
 
@@ skipping 64 matching lines @@
   if (issue_) {
     if (issue_->severity() == media_router::Issue::FATAL)
       return &media_router_error_icon_;
     if (issue_->severity() == media_router::Issue::WARNING)
       return &media_router_warning_icon_;
   }
 
   return has_local_display_route_ ? &media_router_active_icon_
                                   : &media_router_idle_icon_;
 }