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

chrome/browser/ui/toolbar/media_router_contextual_menu.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_TOOLBAR_MEDIA_ROUTER_CONTEXTUAL_MENU_H_
 #define CHROME_BROWSER_UI_TOOLBAR_MEDIA_ROUTER_CONTEXTUAL_MENU_H_
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/models/simple_menu_model.h"
 
 class Browser;
 
 // The class for the contextual menu for the Media Router action.
 class MediaRouterContextualMenu : public ui::SimpleMenuModel::Delegate {
  public:
-  explicit MediaRouterContextualMenu(Browser* browser);
+  static std::unique_ptr<MediaRouterContextualMenu> CreateForToolbar(

[msw, 2017/03/02 03:12:58]

nit: add function comments here and below

[takumif, 2017/03/03 00:10:48]

Done.

+      Browser* browser);
 
-  // Constructor for injecting values in tests.
-  MediaRouterContextualMenu(Browser* browser, bool shown_by_policy);
+  static std::unique_ptr<MediaRouterContextualMenu> CreateForOverflowMenu(
+      Browser* browser);
+
+  // Constructor called by the static Create* methods above and tests.
+  MediaRouterContextualMenu(Browser* browser,
+                            bool is_in_toolbar,

[msw, 2017/03/02 03:12:58]

optional nit: rename this and the new member |is_action_in_toolbar| or similar.

[takumif, 2017/03/03 00:10:48]

Done.

+                            bool shown_by_policy);
   ~MediaRouterContextualMenu() override;
 
-  ui::MenuModel* menu_model() { return &menu_model_; }
+  ui::SimpleMenuModel* menu_model() { return &menu_model_; }
 
  private:
   FRIEND_TEST_ALL_PREFIXES(MediaRouterContextualMenuUnitTest,
                            ToggleCloudServicesItem);
   FRIEND_TEST_ALL_PREFIXES(MediaRouterContextualMenuUnitTest,
                            ToggleAlwaysShowIconItem);
   FRIEND_TEST_ALL_PREFIXES(MediaRouterContextualMenuUnitTest,
                            ActionShownByPolicy);
 
   // Gets or sets the "Always show icon" option.
   bool GetAlwaysShowActionPref() const;
   void SetAlwaysShowActionPref(bool always_show);
 
   // ui::SimpleMenuModel::Delegate:
   bool IsCommandIdChecked(int command_id) const override;
   bool IsCommandIdEnabled(int command_id) const override;
   bool IsCommandIdVisible(int command_id) const override;
   void ExecuteCommand(int command_id, int event_flags) override;
 
   void ReportIssue();
+  int GetChangeVisibilityTextId();

[msw, 2017/03/02 03:12:58]

nit: add function comments for this and ReportIsssue

[takumif, 2017/03/03 00:10:48]

Done.

 
   Browser* const browser_;
   ui::SimpleMenuModel menu_model_;
 
+  // Whether the action icon is in the toolbar, as opposed to the overflow menu.
+  const bool is_in_toolbar_;
+
   DISALLOW_COPY_AND_ASSIGN(MediaRouterContextualMenu);
 };
 
 #endif  // CHROME_BROWSER_UI_TOOLBAR_MEDIA_ROUTER_CONTEXTUAL_MENU_H_