Support Component Actions in the toolbar.

chrome/browser/ui/toolbar/media_router_action.cc

Index: chrome/browser/ui/toolbar/media_router_action.cc
diff --git a/chrome/browser/ui/toolbar/media_router_action.cc b/chrome/browser/ui/toolbar/media_router_action.cc
index cdfa0ae4332f52ecbd3896b00414eba81a706c43..eebe5de73dce07f4d6d06721a4067b335c79ab78 100644
--- a/chrome/browser/ui/toolbar/media_router_action.cc
+++ b/chrome/browser/ui/toolbar/media_router_action.cc
@@ -13,6 +13,7 @@
 #include "chrome/browser/media/router/media_router_mojo_impl.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h"
 #include "chrome/browser/ui/toolbar/media_router_action_platform_delegate.h"
 #include "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h"
 #include "chrome/grit/generated_resources.h"
@@ -26,22 +27,23 @@ using media_router::MediaRouterDialogController;
 MediaRouterAction::MediaRouterAction(Browser* browser)
     : media_router::IssuesObserver(GetMediaRouter(browser)),
       media_router::MediaRoutesObserver(GetMediaRouter(browser)),
-      id_("media_router_action"),
+      id_(ComponentToolbarActionsFactory::kMediaRouterActionId),
       name_(l10n_util::GetStringUTF16(IDS_MEDIA_ROUTER_TITLE)),
-      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)),
-      media_router_warning_icon_(ui::ResourceBundle::GetSharedInstance().
-          GetImageNamed(IDR_MEDIA_ROUTER_WARNING_ICON)),
+      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)),
+      media_router_warning_icon_(
+          ui::ResourceBundle::GetSharedInstance()
+              .GetImageNamed(IDR_MEDIA_ROUTER_WARNING_ICON)),
       current_icon_(&media_router_idle_icon_),
       has_local_route_(false),
       delegate_(nullptr),
       platform_delegate_(MediaRouterActionPlatformDelegate::Create(browser)),
-      contextual_menu_(browser) {
-}
+      contextual_menu_(browser) {}
 
 MediaRouterAction::~MediaRouterAction() {
 }
@@ -101,7 +103,7 @@ ui::MenuModel* MediaRouterAction::GetContextMenu() {
 }
 
 bool MediaRouterAction::CanDrag() const {
-  return false;
+  return true;
 }
 
 bool MediaRouterAction::ExecuteAction(bool by_user) {
@@ -112,6 +114,8 @@ bool MediaRouterAction::ExecuteAction(bool by_user) {
 }
 
 void MediaRouterAction::UpdateState() {
+  if (delegate_)
+    delegate_->UpdateState();
 }
 
 bool MediaRouterAction::DisabledClickOpensMenu() const {