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

chrome/browser/ui/toolbar/media_router_contextual_menu.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_contextual_menu.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/metrics/user_metrics.h"
@@ skipping 11 matching lines @@
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "extensions/common/constants.h"
 #include "ui/base/models/menu_model_delegate.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/vector_icons_public.h"
 
-MediaRouterContextualMenu::MediaRouterContextualMenu(Browser* browser)
-    : MediaRouterContextualMenu(
-          browser,
-          MediaRouterActionController::IsActionShownByPolicy(
-              browser->profile())) {}
+// static
+std::unique_ptr<MediaRouterContextualMenu>
+MediaRouterContextualMenu::CreateForToolbar(Browser* browser) {
+  return base::MakeUnique<MediaRouterContextualMenu>(
+      browser, true,
+      MediaRouterActionController::IsActionShownByPolicy(browser->profile()));
+}
+
+// static
+std::unique_ptr<MediaRouterContextualMenu>
+MediaRouterContextualMenu::CreateForOverflowMenu(Browser* browser) {
+  return base::MakeUnique<MediaRouterContextualMenu>(
+      browser, false,
+      MediaRouterActionController::IsActionShownByPolicy(browser->profile()));
+}
 
 MediaRouterContextualMenu::MediaRouterContextualMenu(Browser* browser,
+                                                     bool is_action_in_toolbar,
                                                      bool shown_by_policy)
-    : browser_(browser), menu_model_(this) {
+    : browser_(browser),
+      menu_model_(this),
+      is_action_in_toolbar_(is_action_in_toolbar) {
   menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_ABOUT,
                                   IDS_MEDIA_ROUTER_ABOUT);
   menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
   menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_LEARN_MORE,
                                   IDS_MEDIA_ROUTER_LEARN_MORE);
   menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_HELP,
                                   IDS_MEDIA_ROUTER_HELP);
   if (shown_by_policy) {
     menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_SHOWN_BY_POLICY,
                                     IDS_MEDIA_ROUTER_SHOWN_BY_POLICY);
     menu_model_.SetIcon(
         menu_model_.GetIndexOfCommandId(IDC_MEDIA_ROUTER_SHOWN_BY_POLICY),
         gfx::Image(gfx::CreateVectorIcon(gfx::VectorIconId::BUSINESS, 16,
                                          gfx::kChromeIconGrey)));
   } else {
     menu_model_.AddCheckItemWithStringId(
         IDC_MEDIA_ROUTER_ALWAYS_SHOW_TOOLBAR_ACTION,
         IDS_MEDIA_ROUTER_ALWAYS_SHOW_TOOLBAR_ACTION);
   }
+  menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_SHOW_IN_TOOLBAR,
+                                  GetChangeVisibilityTextId());
   menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
   menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_MANAGE_DEVICES,
                                   IDS_MEDIA_ROUTER_MANAGE_DEVICES);
 #endif
   menu_model_.AddCheckItemWithStringId(IDC_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE,
                                        IDS_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE);
   menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_REPORT_ISSUE,
                                   IDS_MEDIA_ROUTER_REPORT_ISSUE);
 }
@@ skipping 14 matching lines @@
   if (command_id == IDC_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE) {
     return browser_->profile()->GetPrefs()->GetBoolean(
         prefs::kMediaRouterEnableCloudServices);
   }
   if (command_id == IDC_MEDIA_ROUTER_ALWAYS_SHOW_TOOLBAR_ACTION)
     return GetAlwaysShowActionPref();
   return false;
 }
 
 bool MediaRouterContextualMenu::IsCommandIdEnabled(int command_id) const {
+  // If the action is in the ephemeral state, disable the menu item for moving
+  // it between the toolbar and the overflow menu, since the preference would
+  // not persist.
+  if (command_id == IDC_MEDIA_ROUTER_SHOW_IN_TOOLBAR)
+    return GetAlwaysShowActionPref();
   return command_id != IDC_MEDIA_ROUTER_SHOWN_BY_POLICY;
 }
 
 bool MediaRouterContextualMenu::IsCommandIdVisible(int command_id) const {
   if (command_id == IDC_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE) {
     // Cloud services preference is not set or used if the user is not signed
     // in.
     SigninManagerBase* signin_manager =
         SigninManagerFactory::GetForProfile(browser_->profile());
     return signin_manager && signin_manager->IsAuthenticated();
@@ skipping 35 matching lines @@
       chrome::ShowSingletonTab(browser_, GURL(kCastLearnMorePageUrl));
       break;
 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
     case IDC_MEDIA_ROUTER_MANAGE_DEVICES:
       chrome::ShowSingletonTab(browser_, GURL(chrome::kChromeUICastURL));
       break;
 #endif
     case IDC_MEDIA_ROUTER_REPORT_ISSUE:
       ReportIssue();
       break;
+    case IDC_MEDIA_ROUTER_SHOW_IN_TOOLBAR:
+      ToolbarActionsModel::Get(browser_->profile())
+          ->SetActionVisibility(
+              ComponentToolbarActionsFactory::kMediaRouterActionId,
+              !is_action_in_toolbar_);
+      break;
     default:
       NOTREACHED();
   }
 }
 
 void MediaRouterContextualMenu::ReportIssue() {
   // Opens feedback page loaded from the media router extension.
   // This is temporary until feedback UI is redesigned.
   // TODO(crbug.com/597778): remove reference to MediaRouterMojoImpl
   media_router::MediaRouterMojoImpl* media_router =
       static_cast<media_router::MediaRouterMojoImpl*>(
           media_router::MediaRouterFactory::GetApiForBrowserContext(
               static_cast<content::BrowserContext*>(browser_->profile())));
   if (media_router->media_route_provider_extension_id().empty())
     return;
   std::string feedback_url(extensions::kExtensionScheme +
                            std::string(url::kStandardSchemeSeparator) +
                            media_router->media_route_provider_extension_id() +
                            "/feedback.html");
   chrome::ShowSingletonTab(browser_, GURL(feedback_url));
 }
+
+int MediaRouterContextualMenu::GetChangeVisibilityTextId() {
+  return is_action_in_toolbar_ ? IDS_EXTENSIONS_HIDE_BUTTON_IN_MENU
+                               : IDS_EXTENSIONS_SHOW_BUTTON_IN_TOOLBAR;
+}