[Media Router] Add "Hide in menu/Show in toolbar" option to Cast toolbar icon

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 30 matching lines @@
                                      ToolbarActionsBar* toolbar_actions_bar)
     : media_router::IssuesObserver(GetMediaRouter(browser)),
       media_router::MediaRoutesObserver(GetMediaRouter(browser)),
       current_icon_(&ui::kMediaRouterIdleIcon),
       has_local_display_route_(false),
       has_dialog_(false),
       delegate_(nullptr),
       browser_(browser),
       toolbar_actions_bar_(toolbar_actions_bar),
       platform_delegate_(MediaRouterActionPlatformDelegate::Create(browser)),
-      contextual_menu_(browser),
       tab_strip_model_observer_(this),
       toolbar_actions_bar_observer_(this),
       weak_ptr_factory_(this) {
   DCHECK(browser_);
   DCHECK(toolbar_actions_bar_);
   tab_strip_model_observer_.Add(browser_->tab_strip_model());
   toolbar_actions_bar_observer_.Add(toolbar_actions_bar_);
   IssuesObserver::Init();
 }
 
@@ skipping 66 matching lines @@
 
 void MediaRouterAction::HidePopup() {
   GetMediaRouterDialogController()->HideMediaRouterDialog();
 }
 
 gfx::NativeView MediaRouterAction::GetPopupNativeView() {
   return nullptr;
 }
 
 ui::MenuModel* MediaRouterAction::GetContextMenu() {
-  return contextual_menu_.menu_model();
+  if (toolbar_actions_bar_->IsActionVisibleOnMainBar(this)) {
+    contextual_menu_ = MediaRouterContextualMenu::CreateForToolbar(browser_);
+  } else {
+    contextual_menu_ =
+        MediaRouterContextualMenu::CreateForOverflowMenu(browser_);
+  }
+  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) {
@@ skipping 16 matching lines @@
 
 void MediaRouterAction::UpdateState() {
   delegate_->UpdateState();
 }
 
 bool MediaRouterAction::DisabledClickOpensMenu() const {
   return false;
 }
 
 void MediaRouterAction::OnIssue(const media_router::Issue& issue) {
-  current_issue_.reset(new media_router::IssueInfo(issue.info()));
+  current_issue_ = base::MakeUnique<media_router::IssueInfo>(issue.info());
   MaybeUpdateIcon();
 }
 
 void MediaRouterAction::OnIssuesCleared() {
   current_issue_.reset();
   MaybeUpdateIcon();
 }
 
 void MediaRouterAction::OnRoutesUpdated(
     const std::vector<media_router::MediaRoute>& routes,
@@ skipping 96 matching lines @@
     if (severity == media_router::IssueInfo::Severity::FATAL)
       return ui::kMediaRouterErrorIcon;
     if (severity == media_router::IssueInfo::Severity::WARNING)
       return ui::kMediaRouterWarningIcon;
     // Fall through for Severity::NOTIFICATION.
   }
 
   return has_local_display_route_ ? ui::kMediaRouterActiveIcon
                                   : ui::kMediaRouterIdleIcon;
 }