[Media Router Action] Hide action back in the overflow menu after popping it out

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/metrics/user_metrics.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/media/router/issue.h"
 #include "chrome/browser/media/router/media_route.h"
@@ skipping 120 matching lines @@
 }
 
 gfx::NativeView MediaRouterAction::GetPopupNativeView() {
   return nullptr;
 }
 
 ui::MenuModel* MediaRouterAction::GetContextMenu() {
   return contextual_menu_.menu_model();
 }
 
+void MediaRouterAction::OnContextMenuClosed() {
+  if (toolbar_actions_bar_->popped_out_action() == this &&
+      !GetMediaRouterDialogController()->IsShowingMediaRouterDialog()) {
+    toolbar_actions_bar_->UndoPopOut();
+  }
+}
+
 bool MediaRouterAction::ExecuteAction(bool by_user) {
   base::RecordAction(base::UserMetricsAction("MediaRouter_Icon_Click"));
 
   if (GetMediaRouterDialogController()->IsShowingMediaRouterDialog()) {
     GetMediaRouterDialogController()->HideMediaRouterDialog();
     return false;
   }
 
   GetMediaRouterDialogController()->ShowMediaRouterDialog();
   if (GetPlatformDelegate()) {
@@ skipping 124 matching lines @@
     if (severity == media_router::IssueInfo::Severity::FATAL)
       return gfx::VectorIconId::MEDIA_ROUTER_ERROR;
     if (severity == media_router::IssueInfo::Severity::WARNING)
       return gfx::VectorIconId::MEDIA_ROUTER_WARNING;
     // Fall through for Severity::NOTIFICATION.
   }
 
   return has_local_display_route_ ? gfx::VectorIconId::MEDIA_ROUTER_ACTIVE
                                   : gfx::VectorIconId::MEDIA_ROUTER_IDLE;
 }