Support Component Actions in the toolbar.

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/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"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia.h"
 
 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)),
       delegate_(nullptr),
       platform_delegate_(MediaRouterActionPlatformDelegate::Create(browser)),
       contextual_menu_(browser) {
 }
 
 MediaRouterAction::~MediaRouterAction() {
 }
@@ skipping 47 matching lines @@
 
 gfx::NativeView MediaRouterAction::GetPopupNativeView() {
   return nullptr;
 }
 
 ui::MenuModel* MediaRouterAction::GetContextMenu() {
   return contextual_menu_.menu_model();
 }
 
 bool MediaRouterAction::CanDrag() const {
-  return false;
+  return true;
 }
 
 bool MediaRouterAction::ExecuteAction(bool by_user) {
   GetMediaRouterDialogController()->ShowMediaRouterDialog();
   if (platform_delegate_)
     platform_delegate_->CloseOverflowMenuIfOpen();
   return true;
 }
 
 void MediaRouterAction::UpdateState() {
+ if (delegate_)
+    delegate_->UpdateState();
 }
 
 MediaRouterDialogController*
 MediaRouterAction::GetMediaRouterDialogController() {
   DCHECK(delegate_);
   content::WebContents* web_contents = delegate_->GetCurrentWebContents();
   DCHECK(web_contents);
   return MediaRouterDialogController::GetOrCreateForWebContents(web_contents);
 }
 
 bool MediaRouterAction::DisabledClickOpensMenu() const {
   return false;
 }