| 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 e6b0a86a3781e3ee315958a7186fee472860c2d9..2afafbbe26e27e701694888e2506ad41c63b18b7 100644
|
| --- a/chrome/browser/ui/toolbar/media_router_action.cc
|
| +++ b/chrome/browser/ui/toolbar/media_router_action.cc
|
| @@ -15,12 +15,17 @@
|
|
|
| using media_router::MediaRouterDialogController;
|
|
|
| -MediaRouterAction::MediaRouterAction()
|
| +MediaRouterAction::MediaRouterAction(Browser* browser)
|
| : id_("media_router_action"),
|
| name_(l10n_util::GetStringUTF16(IDS_MEDIA_ROUTER_TITLE)),
|
| media_router_idle_icon_(ui::ResourceBundle::GetSharedInstance().
|
| GetImageNamed(IDR_MEDIA_ROUTER_IDLE_ICON)),
|
| - delegate_(nullptr) {
|
| + delegate_(nullptr),
|
| +#if defined(OS_MACOSX)
|
| + platform_delegate_(nullptr) {
|
| +#else
|
| + platform_delegate_(MediaRouterActionPlatformDelegate::Create(browser)) {
|
| +#endif
|
| }
|
|
|
| MediaRouterAction::~MediaRouterAction() {
|
| @@ -87,6 +92,8 @@ bool MediaRouterAction::CanDrag() const {
|
|
|
| bool MediaRouterAction::ExecuteAction(bool by_user) {
|
| GetMediaRouterDialogController()->ShowMediaRouterDialog();
|
| + if (platform_delegate_)
|
| + platform_delegate_->CloseOverflowMenuIfOpen();
|
| return true;
|
| }
|
|
|
|
|