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..8fe6b29bf27042cca4e632268fbc94ca54ea98a9 100644 |
--- a/chrome/browser/ui/toolbar/media_router_action.cc |
+++ b/chrome/browser/ui/toolbar/media_router_action.cc |
@@ -5,6 +5,7 @@ |
#include "chrome/browser/ui/toolbar/media_router_action.h" |
#include "base/strings/utf_string_conversions.h" |
+#include "chrome/browser/ui/browser.h" |
Devlin
2015/07/14 17:23:02
Doesn't actually look like you need this.
apacible
2015/07/14 21:15:23
Forgot to remove this while cleaning up, done.
|
#include "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h" |
#include "chrome/browser/ui/webui/media_router/media_router_dialog_controller.h" |
#include "chrome/grit/generated_resources.h" |
@@ -15,12 +16,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 +93,8 @@ bool MediaRouterAction::CanDrag() const { |
bool MediaRouterAction::ExecuteAction(bool by_user) { |
GetMediaRouterDialogController()->ShowMediaRouterDialog(); |
+ if (platform_delegate_.get()) |
+ platform_delegate_.get()->CloseOverflowMenu(); |
Devlin
2015/07/14 17:23:02
no need for the .get(). Really, in either the if
apacible
2015/07/14 21:15:23
Done.
|
return true; |
} |