Close wrench menu when Media Router Action clicked in Views.

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 e6b0a86a3781e3ee315958a7186fee472860c2d9..baf90944194b8c17e0201a2841b7ea8f904e0ad7 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/toolbar/media_router_action_platform_delegate.h"
 #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)) {

[Kevin M, 2015/07/17 20:15:19]

It seems to me that we should put the platform ifdefs (which are platform
specific details) inside PlatformDelegate instead of putting them here.
PlatformDelegate is then free to do whatever it wants to provide
platform-appropriate bindings, from just using #ifdefs to linking to different
.cc files entirely.

[apacible, 2015/07/17 20:41:50]

There won't be any ifdefs when OSX is implemented; this is just temporary since
there isn't a stub impl for OSX yet. PlatformDelegate is only implemented for
independent platforms; none of it will be shared between both views/cocoa.

[Kevin M, 2015/07/17 20:55:50]

Ack, this is more like a code organization nit - keeping the platform switches
into a file that concerns itself with platform code makes more sense to me. You
could go about it several ways  - you could have #ifdef rules make the class
into an empty stub; you could have Create() return nullptr (but you still have
to preface your delegate->Run with an existence check); different source files;
etc.

This is just a nit so I'm LGTM'ing anyway.

[apacible, 2015/07/20 15:40:29]

Done.

+#endif
 }
 
 MediaRouterAction::~MediaRouterAction() {
@@ -87,6 +93,8 @@ bool MediaRouterAction::CanDrag() const {
 
 bool MediaRouterAction::ExecuteAction(bool by_user) {
   GetMediaRouterDialogController()->ShowMediaRouterDialog();
+  if (platform_delegate_)
+    platform_delegate_->CloseOverflowMenuIfOpen();
   return true;
 }