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 cc9425e2e29181180028cb4d9f5b94a518816b76..78c0e195c17535aa8e18e7ac076c397adaf169f7 100644
--- a/chrome/browser/ui/toolbar/media_router_action.cc
+++ b/chrome/browser/ui/toolbar/media_router_action.cc
@@ -6,6 +6,7 @@
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/media/router/media_router_dialog_controller.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"
@@ -17,7 +18,7 @@
 using media_router::MediaRouterDialogController;
 
 MediaRouterAction::MediaRouterAction(Browser* browser)
-    : id_("media_router_action"),
+    : id_(ComponentToolbarActionsFactory::kMediaRouterActionId),
       name_(l10n_util::GetStringUTF16(IDS_MEDIA_ROUTER_TITLE)),
       media_router_idle_icon_(ui::ResourceBundle::GetSharedInstance().
           GetImageNamed(IDR_MEDIA_ROUTER_IDLE_ICON)),
@@ -85,7 +86,7 @@ ui::MenuModel* MediaRouterAction::GetContextMenu() {
 }
 
 bool MediaRouterAction::CanDrag() const {
-  return false;
+  return true;
 }
 
 bool MediaRouterAction::ExecuteAction(bool by_user) {
@@ -96,6 +97,8 @@ bool MediaRouterAction::ExecuteAction(bool by_user) {
 }
 
 void MediaRouterAction::UpdateState() {
+ if (delegate_)
+    delegate_->UpdateState();
 }
 
 MediaRouterDialogController*