Close wrench menu when Media Router Action clicked in Views.

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/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"
 #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()
+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() {
 }
 
 const std::string& MediaRouterAction::GetId() const {
   return id_;
 }
 
 void MediaRouterAction::SetDelegate(ToolbarActionViewDelegate* delegate) {
@@ skipping 46 matching lines @@
 ui::MenuModel* MediaRouterAction::GetContextMenu() {
   return nullptr;
 }
 
 bool MediaRouterAction::CanDrag() const {
   return false;
 }
 
 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 statement or here, but it
looks particularly odd here.

[apacible, 2015/07/14 21:15:23]

Done.

   return true;
 }
 
 void MediaRouterAction::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;
 }