Remove menu_marker from MenuButton.

This is always false except for in tests and menu_example.cc which is
not used. This helps simplify MenuButton for the Button cleanup task.

Bug: 901183
Change-Id: If5a3cf7b6ba1ce5618548d112df1c4404b2ae181
Reviewed-on: https://chromium-review.googlesource.com/c/1324375Reviewed-by: Mitsuru Oshima <oshima@chromium.org>
Reviewed-by: Robert Flack <flackr@chromium.org>
Reviewed-by: Trent Apted <tapted@chromium.org>
Reviewed-by: Michael Wasserman <msw@chromium.org>
Commit-Queue: Charlene Yan <cyan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#607061}

ash/shelf/login_shelf_view.cc

@@ -193,10 +193,7 @@ class KioskAppsButton : public views::MenuButton,
                         public ui::SimpleMenuModel::Delegate {
  public:
   KioskAppsButton(const base::string16& text, const gfx::ImageSkia& image)
-      : MenuButton(text, this, true), ui::SimpleMenuModel(this) {
-    // We don't want a menu marker for the apps button.
-    set_menu_marker(&empty_menu_marker_);
-
+      : MenuButton(text, this), ui::SimpleMenuModel(this) {
     SetFocusBehavior(FocusBehavior::ALWAYS);
     SetFocusPainter(views::Painter::CreateSolidFocusPainter(
         kFocusBorderColor, kFocusBorderThickness, gfx::InsetsF()));
@@ -324,8 +321,6 @@ class KioskAppsButton : public views::MenuButton,
  private:
   std::unique_ptr<views::MenuRunner> menu_runner_;
   std::vector<mojom::KioskAppInfoPtr> kiosk_apps_;
-  // Passed to set_menu_marker to remove menu marker
-  gfx::ImageSkia empty_menu_marker_;
   bool is_launch_enabled_ = true;
 
   DISALLOW_COPY_AND_ASSIGN(KioskAppsButton);

chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc

@@ -320,9 +320,8 @@ const char ShortcutButton::kViewClassName[] = "ShortcutButton";
 class BookmarkMenuButtonBase : public views::MenuButton {
  public:
   BookmarkMenuButtonBase(const base::string16& title,
-                         views::MenuButtonListener* menu_button_listener,
-                         bool show_menu_marker)
-      : MenuButton(title, menu_button_listener, show_menu_marker) {
+                         views::MenuButtonListener* menu_button_listener)
+      : MenuButton(title, menu_button_listener) {
     SetImageLabelSpacing(ChromeLayoutProvider::Get()->GetDistanceMetric(
         DISTANCE_RELATED_LABEL_HORIZONTAL_LIST));
     SetInkDropMode(InkDropMode::ON);
@@ -365,9 +364,8 @@ class BookmarkMenuButtonBase : public views::MenuButton {
 class BookmarkFolderButton : public BookmarkMenuButtonBase {
  public:
   BookmarkFolderButton(const base::string16& title,
-                       views::MenuButtonListener* menu_button_listener,
-                       bool show_menu_marker)
-      : BookmarkMenuButtonBase(title, menu_button_listener, show_menu_marker) {
+                       views::MenuButtonListener* menu_button_listener)
+      : BookmarkMenuButtonBase(title, menu_button_listener) {
     show_animation_.reset(new gfx::SlideAnimation(this));
     if (!animations_enabled) {
       // For some reason during testing the events generated by animating
@@ -415,7 +413,7 @@ class BookmarkFolderButton : public BookmarkMenuButtonBase {
 class OverflowButton : public BookmarkMenuButtonBase {
  public:
   explicit OverflowButton(BookmarkBarView* owner)
-      : BookmarkMenuButtonBase(base::string16(), owner, false), owner_(owner) {}
+      : BookmarkMenuButtonBase(base::string16(), owner), owner_(owner) {}
 
   bool OnMousePressed(const ui::MouseEvent& e) override {
     owner_->StopThrobbing(true);
@@ -1565,7 +1563,7 @@ int BookmarkBarView::GetFirstHiddenNodeIndex() {
 
 MenuButton* BookmarkBarView::CreateOtherBookmarksButton() {
   // Title is set in Loaded.
-  MenuButton* button = new BookmarkFolderButton(base::string16(), this, false);
+  MenuButton* button = new BookmarkFolderButton(base::string16(), this);
   button->set_id(VIEW_ID_OTHER_BOOKMARKS);
   button->set_context_menu_controller(this);
   return button;
@@ -1573,7 +1571,7 @@ MenuButton* BookmarkBarView::CreateOtherBookmarksButton() {
 
 MenuButton* BookmarkBarView::CreateManagedBookmarksButton() {
   // Title is set in Loaded.
-  MenuButton* button = new BookmarkFolderButton(base::string16(), this, false);
+  MenuButton* button = new BookmarkFolderButton(base::string16(), this);
   button->set_id(VIEW_ID_MANAGED_BOOKMARKS);
   button->set_context_menu_controller(this);
   return button;
@@ -1605,7 +1603,7 @@ views::View* BookmarkBarView::CreateBookmarkButton(const BookmarkNode* node) {
   if (node->is_url()) {
     button = new BookmarkButton(this, node->url(), node->GetTitle());
   } else {
-    button = new BookmarkFolderButton(node->GetTitle(), this, false);
+    button = new BookmarkFolderButton(node->GetTitle(), this);
   }
   ConfigureButton(node, button);
   bookmark_buttons_.insert(bookmark_buttons_.cbegin() + index, button);

chrome/browser/ui/views/frame/app_menu_button.cc

@@ -12,7 +12,7 @@
 #include "ui/views/controls/menu/menu_listener.h"
 
 AppMenuButton::AppMenuButton(views::MenuButtonListener* menu_button_listener)
-    : views::MenuButton(base::string16(), menu_button_listener, false) {}
+    : views::MenuButton(base::string16(), menu_button_listener) {}
 
 AppMenuButton::~AppMenuButton() {}
 

chrome/browser/ui/views/hover_button.cc

@@ -65,7 +65,7 @@ void SetTooltipAndAccessibleName(views::Button* parent,
 
 HoverButton::HoverButton(views::ButtonListener* button_listener,
                          const base::string16& text)
-    : views::MenuButton(text, this, false),
+    : views::MenuButton(text, this),
       title_(nullptr),
       subtitle_(nullptr),
       icon_view_(nullptr),

chrome/browser/ui/views/menu_model_adapter_test.cc

@@ -66,12 +66,12 @@ class CommonMenuModel : public ui::MenuModel {
   bool GetIconAt(int index, gfx::Image* icon) override { return false; }
 
   ui::ButtonMenuItemModel* GetButtonMenuItemAt(int index) const override {
-    return NULL;
+    return nullptr;
   }
 
   bool IsEnabledAt(int index) const override { return true; }
 
-  ui::MenuModel* GetSubmenuModelAt(int index) const override { return NULL; }
+  ui::MenuModel* GetSubmenuModelAt(int index) const override { return nullptr; }
 
   void HighlightChangedTo(int index) override {}
 
@@ -79,7 +79,9 @@ class CommonMenuModel : public ui::MenuModel {
 
   void SetMenuModelDelegate(ui::MenuModelDelegate* delegate) override {}
 
-  ui::MenuModelDelegate* GetMenuModelDelegate() const override { return NULL; }
+  ui::MenuModelDelegate* GetMenuModelDelegate() const override {
+    return nullptr;
+  }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CommonMenuModel);
@@ -162,18 +164,17 @@ class MenuModelAdapterTest : public ViewEventTestBase,
  public:
   MenuModelAdapterTest()
       : ViewEventTestBase(),
-        button_(NULL),
+        button_(nullptr),
         menu_model_adapter_(&top_menu_model_),
-        menu_(NULL) {
-  }
+        menu_(nullptr) {}
 
   ~MenuModelAdapterTest() override {}
 
   // ViewEventTestBase implementation.
 
   void SetUp() override {
-    button_ = new views::MenuButton(base::ASCIIToUTF16("Menu Adapter Test"),
-                                    this, true);
+    button_ =
+        new views::MenuButton(base::ASCIIToUTF16("Menu Adapter Test"), this);
 
     menu_ = menu_model_adapter_.CreateMenu();
     menu_runner_.reset(
@@ -183,8 +184,8 @@ class MenuModelAdapterTest : public ViewEventTestBase,
   }
 
   void TearDown() override {
-    menu_runner_.reset(NULL);
-    menu_ = NULL;
+    menu_runner_ = nullptr;
+    menu_ = nullptr;
     ViewEventTestBase::TearDown();
   }
 

chrome/browser/ui/views/menu_test_base.cc

@@ -46,7 +46,7 @@ int MenuTestBase::GetMenuRunnerFlags() {
 void MenuTestBase::SetUp() {
   views::test::DisableMenuClosureAnimations();
 
-  button_ = new views::MenuButton(base::ASCIIToUTF16("Menu Test"), this, true);
+  button_ = new views::MenuButton(base::ASCIIToUTF16("Menu Test"), this);
   menu_ = new views::MenuItemView(this);
   BuildMenu(menu_);
   menu_runner_.reset(new views::MenuRunner(menu_, GetMenuRunnerFlags()));

chrome/browser/ui/views/page_info/permission_selector_row.cc

@@ -180,9 +180,7 @@ PermissionSelectorRow::PermissionSelectorRow(
     const GURL& url,
     const PageInfoUI::PermissionInfo& permission,
     views::GridLayout* layout)
-    : profile_(profile),
-      icon_(nullptr),
-      combobox_(nullptr) {
+    : profile_(profile), icon_(nullptr), combobox_(nullptr) {
   const int list_item_padding = ChromeLayoutProvider::Get()->GetDistanceMetric(
                                     DISTANCE_CONTROL_LIST_VERTICAL) /
                                 2;

chrome/browser/ui/views/tab_icon_view.cc

@@ -56,7 +56,7 @@ void TabIconView::InitializeIfNeeded() {
 
 TabIconView::TabIconView(TabIconViewModel* model,
                          views::MenuButtonListener* listener)
-    : views::MenuButton(base::string16(), listener, false),
+    : views::MenuButton(base::string16(), listener),
       model_(model),
       is_light_(false) {
   InitializeIfNeeded();

chrome/browser/ui/views/toolbar/toolbar_action_view.cc

@@ -51,7 +51,7 @@ const int kBorderInset = 0;
 ToolbarActionView::ToolbarActionView(
     ToolbarActionViewController* view_controller,
     ToolbarActionView::Delegate* delegate)
-    : MenuButton(base::string16(), this, false),
+    : MenuButton(base::string16(), this),
       view_controller_(view_controller),
       delegate_(delegate),
       called_register_command_(false),

chrome/browser/ui/views/toolbar/toolbar_action_view_unittest.cc

@@ -272,7 +272,7 @@ TEST_F(ToolbarActionViewUnitTest, BasicToolbarActionViewTest) {
   EXPECT_FALSE(view.wants_to_run_for_testing());
 
   // Create an overflow button.
-  views::MenuButton overflow_button(base::string16(), nullptr, false);
+  views::MenuButton overflow_button(base::string16(), nullptr);
   overflow_button.set_owned_by_client();
   action_view_delegate.set_overflow_reference_view(&overflow_button);
 

tools/gritsettings/startup_resources_win.txt

-IDR_MOJO_CONTENT_BROWSER_MANIFEST 101
-IDR_CHROME_CONTENT_BROWSER_MANIFEST_OVERLAY 102
-IDR_MOJO_CONTENT_GPU_MANIFEST 103
-IDR_CHROME_CONTENT_GPU_MANIFEST_OVERLAY 104
-IDR_MOJO_CONTENT_PACKAGED_SERVICES_MANIFEST 105
-IDR_CHROME_CONTENT_PACKAGED_SERVICES_MANIFEST_OVERLAY 106
-IDR_MOJO_CONTENT_PLUGIN_MANIFEST 107
-IDR_CHROME_CONTENT_PLUGIN_MANIFEST_OVERLAY 108
-IDR_MOJO_CONTENT_RENDERER_MANIFEST 109
-IDR_CHROME_CONTENT_RENDERER_MANIFEST_OVERLAY 110
-IDR_MOJO_CONTENT_UTILITY_MANIFEST 111
-IDR_CHROME_CONTENT_UTILITY_MANIFEST_OVERLAY 112
-IDR_MOJO_CATALOG_MANIFEST 113
-IDR_NACL_LOADER_MANIFEST 114
-IDR_NACL_BROKER_MANIFEST 115
-IDR_DOWNLOAD_FILE_TYPES_PB 116
-IDR_PLUGIN_DB_JSON 117
-IDS_DEFAULT_PROFILE_NAME 118
-IDS_LEGACY_DEFAULT_PROFILE_NAME 119
-IDS_ACCEPT_LANGUAGES 120
-IDS_DEFAULT_ENCODING 121
-IDS_STANDARD_FONT_FAMILY 122
-IDS_FIXED_FONT_FAMILY 123
-IDS_FIXED_FONT_FAMILY_ALT_WIN 124
-IDS_SERIF_FONT_FAMILY 125
-IDS_SANS_SERIF_FONT_FAMILY 126
-IDS_CURSIVE_FONT_FAMILY 127
-IDS_FANTASY_FONT_FAMILY 128
-IDS_PICTOGRAPH_FONT_FAMILY 129
-IDS_STANDARD_FONT_FAMILY_JAPANESE 130
-IDS_FIXED_FONT_FAMILY_JAPANESE 131
-IDS_SERIF_FONT_FAMILY_JAPANESE 132
-IDS_SANS_SERIF_FONT_FAMILY_JAPANESE 133
-IDS_STANDARD_FONT_FAMILY_KOREAN 134
-IDS_SERIF_FONT_FAMILY_KOREAN 135
-IDS_SANS_SERIF_FONT_FAMILY_KOREAN 136
-IDS_STANDARD_FONT_FAMILY_SIMPLIFIED_HAN 137
-IDS_SERIF_FONT_FAMILY_SIMPLIFIED_HAN 138
-IDS_SANS_SERIF_FONT_FAMILY_SIMPLIFIED_HAN 139
-IDS_STANDARD_FONT_FAMILY_TRADITIONAL_HAN 140
-IDS_SERIF_FONT_FAMILY_TRADITIONAL_HAN 141
-IDS_SANS_SERIF_FONT_FAMILY_TRADITIONAL_HAN 142
-IDS_CURSIVE_FONT_FAMILY_SIMPLIFIED_HAN 143
-IDS_CURSIVE_FONT_FAMILY_TRADITIONAL_HAN 144
-IDS_FIXED_FONT_FAMILY_ARABIC 145
-IDS_SANS_SERIF_FONT_FAMILY_ARABIC 146
-IDS_STANDARD_FONT_FAMILY_CYRILLIC 147
-IDS_FIXED_FONT_FAMILY_CYRILLIC 148
-IDS_SERIF_FONT_FAMILY_CYRILLIC 149
-IDS_SANS_SERIF_FONT_FAMILY_CYRILLIC 150
-IDS_STANDARD_FONT_FAMILY_GREEK 151
-IDS_FIXED_FONT_FAMILY_GREEK 152
-IDS_SERIF_FONT_FAMILY_GREEK 153
-IDS_SANS_SERIF_FONT_FAMILY_GREEK 154
-IDS_FIXED_FONT_FAMILY_KOREAN 155
-IDS_CURSIVE_FONT_FAMILY_KOREAN 156
-IDS_FIXED_FONT_FAMILY_SIMPLIFIED_HAN 157
-IDS_FIXED_FONT_FAMILY_TRADITIONAL_HAN 158
-IDS_DEFAULT_FONT_SIZE 159
-IDS_DEFAULT_FIXED_FONT_SIZE 160
-IDS_MINIMUM_FONT_SIZE 161
-IDS_MINIMUM_LOGICAL_FONT_SIZE 162
-IDS_SPELLCHECK_DICTIONARY 163
-IDR_PREF_HASH_SEED_BIN 164
-IDS_POLICY_VALUE_FORMAT_ERROR 165
-IDS_POLICY_LIST_ENTRY_ERROR 166
-IDS_BOOKMARK_BAR_FOLDER_NAME 167
-IDS_BOOKMARK_BAR_OTHER_FOLDER_NAME 168
-IDS_BOOKMARK_BAR_MOBILE_FOLDER_NAME 169
-IDS_PRODUCT_NAME 170
-IDS_PROFILES_DEFAULT_NAME 171
-IDR_BOOKMARKS_MANIFEST 172
-IDR_CLOUDPRINT_MANIFEST 173
-IDS_WEBSTORE_APP_DESCRIPTION 174
-IDS_WEBSTORE_NAME_STORE 175
-IDR_WEBSTORE_MANIFEST 176
-IDR_HANGOUT_SERVICES_MANIFEST 177
-IDR_FEEDBACK_MANIFEST 178
-IDR_NETWORK_SPEECH_SYNTHESIS_MANIFEST 179
-IDR_CRYPTOTOKEN_MANIFEST 180
-IDR_PDF_MANIFEST 181
-IDS_CHROME_WELCOME_URL 182
-IDS_NEW_TAB_CHROME_WELCOME_PAGE_TITLE 183
-IDS_WEBSTORE_URL 184
-IDS_EXTENSION_WEB_STORE_TITLE 185
-IDR_EXTENSIONS_FAVICON 186
-IDS_BOOKMARK_BAR_MANAGED_FOLDER_DEFAULT_NAME 187
-IDS_BOOKMARK_BAR_SUPERVISED_FOLDER_DEFAULT_NAME 188
-IDS_CRASH_RECOVERY_TITLE 189
-IDS_CRASH_RECOVERY_CONTENT 190
-IDR_CONTENT_RIGHT_SIDE 191
-IDR_CONTENT_BOTTOM_CENTER 192
-IDR_CONTENT_LEFT_SIDE 193
-IDS_UI_FONT_FAMILY 194
-IDS_UI_FONT_SIZE_SCALER 195
-IDS_MINIMUM_UI_FONT_SIZE 196
-IDS_APP_COPY 197
-IDS_APP_SELECT_ALL 198
-IDR_TEXTBUTTON_HOVER_TOP_LEFT 199
-IDR_TEXTBUTTON_HOVER_TOP 200
-IDR_TEXTBUTTON_HOVER_TOP_RIGHT 201
-IDR_TEXTBUTTON_HOVER_LEFT 202
-IDR_TEXTBUTTON_HOVER_CENTER 203
-IDR_TEXTBUTTON_HOVER_RIGHT 204
-IDR_TEXTBUTTON_HOVER_BOTTOM_LEFT 205
-IDR_TEXTBUTTON_HOVER_BOTTOM 206
-IDR_TEXTBUTTON_HOVER_BOTTOM_RIGHT 207
-IDR_TEXTBUTTON_PRESSED_TOP_LEFT 208
-IDR_TEXTBUTTON_PRESSED_TOP 209
-IDR_TEXTBUTTON_PRESSED_TOP_RIGHT 210
-IDR_TEXTBUTTON_PRESSED_LEFT 211
-IDR_TEXTBUTTON_PRESSED_CENTER 212
-IDR_TEXTBUTTON_PRESSED_RIGHT 213
-IDR_TEXTBUTTON_PRESSED_BOTTOM_LEFT 214
-IDR_TEXTBUTTON_PRESSED_BOTTOM 215
-IDR_TEXTBUTTON_PRESSED_BOTTOM_RIGHT 216
-IDR_AVATAR_GLASS_BUTTON_NORMAL_TOP_LEFT 217
-IDR_AVATAR_GLASS_BUTTON_NORMAL_TOP 218
-IDR_AVATAR_GLASS_BUTTON_NORMAL_TOP_RIGHT 219
-IDR_AVATAR_GLASS_BUTTON_NORMAL_LEFT 220
-IDR_AVATAR_GLASS_BUTTON_NORMAL_CENTER 221
-IDR_AVATAR_GLASS_BUTTON_NORMAL_RIGHT 222
-IDR_AVATAR_GLASS_BUTTON_NORMAL_BOTTOM_LEFT 223
-IDR_AVATAR_GLASS_BUTTON_NORMAL_BOTTOM 224
-IDR_AVATAR_GLASS_BUTTON_NORMAL_BOTTOM_RIGHT 225
-IDR_AVATAR_GLASS_BUTTON_HOVER_TOP_LEFT 226
-IDR_AVATAR_GLASS_BUTTON_HOVER_TOP 227
-IDR_AVATAR_GLASS_BUTTON_HOVER_TOP_RIGHT 228
-IDR_AVATAR_GLASS_BUTTON_HOVER_LEFT 229
-IDR_AVATAR_GLASS_BUTTON_HOVER_CENTER 230
-IDR_AVATAR_GLASS_BUTTON_HOVER_RIGHT 231
-IDR_AVATAR_GLASS_BUTTON_HOVER_BOTTOM_LEFT 232
-IDR_AVATAR_GLASS_BUTTON_HOVER_BOTTOM 233
-IDR_AVATAR_GLASS_BUTTON_HOVER_BOTTOM_RIGHT 234
-IDR_AVATAR_GLASS_BUTTON_PRESSED_TOP_LEFT 235
-IDR_AVATAR_GLASS_BUTTON_PRESSED_TOP 236
-IDR_AVATAR_GLASS_BUTTON_PRESSED_TOP_RIGHT 237
-IDR_AVATAR_GLASS_BUTTON_PRESSED_LEFT 238
-IDR_AVATAR_GLASS_BUTTON_PRESSED_CENTER 239
-IDR_AVATAR_GLASS_BUTTON_PRESSED_RIGHT 240
-IDR_AVATAR_GLASS_BUTTON_PRESSED_BOTTOM_LEFT 241
-IDR_AVATAR_GLASS_BUTTON_PRESSED_BOTTOM 242
-IDR_AVATAR_GLASS_BUTTON_PRESSED_BOTTOM_RIGHT 243
-IDR_AVATAR_GLASS_BUTTON_AVATAR 244
-IDS_TOOLTIP_NEW_TAB 245
-IDS_ACCNAME_NEWTAB 246
-IDR_TAB_DROP_DOWN 247
-IDS_TOOLTIP_BACK 248
-IDS_ACCNAME_BACK 249
-IDS_TOOLTIP_FORWARD 250
-IDS_ACCNAME_FORWARD 251
-IDS_RELOAD_MENU_NORMAL_RELOAD_ITEM 252
-IDS_RELOAD_MENU_HARD_RELOAD_ITEM 253
-IDS_RELOAD_MENU_EMPTY_AND_HARD_RELOAD_ITEM 254
-IDS_ACCNAME_RELOAD 255
-IDS_TOOLTIP_HOME 256
-IDS_ACCNAME_HOME 257
-IDR_DEVELOPER_MODE_HIGHLIGHT_TOP_LEFT 258
-IDR_DEVELOPER_MODE_HIGHLIGHT_TOP 259
-IDR_DEVELOPER_MODE_HIGHLIGHT_TOP_RIGHT 260
-IDR_DEVELOPER_MODE_HIGHLIGHT_LEFT 261
-IDR_DEVELOPER_MODE_HIGHLIGHT_CENTER 262
-IDR_DEVELOPER_MODE_HIGHLIGHT_RIGHT 263
-IDR_DEVELOPER_MODE_HIGHLIGHT_BOTTOM_LEFT 264
-IDR_DEVELOPER_MODE_HIGHLIGHT_BOTTOM 265
-IDR_DEVELOPER_MODE_HIGHLIGHT_BOTTOM_RIGHT 266
-IDR_MENU_DROPARROW 267
-IDS_ACCNAME_APP 268
-IDS_APPMENU_TOOLTIP 269
-IDS_APP_TAB_KEY 270
-IDS_REGISTER_PROTOCOL_HANDLER_TOOLTIP 271
-IDS_TOOLTIP_SAVE_CREDIT_CARD 272
-IDS_TOOLTIP_TRANSLATE 273
-IDS_TOOLTIP_STAR 274
-IDS_DEFAULT_TAB_TITLE 275
-IDS_BROWSER_WINDOW_TITLE_FORMAT 276
-IDR_DEFAULT_FAVICON 277
-IDS_NEW_TAB_TITLE 278
-IDS_ACCNAME_CLOSE 279
-IDS_ACCNAME_BOOKMARKS_CHEVRON 280
-IDS_BOOKMARK_BAR_APPS_SHORTCUT_NAME 281
-IDS_BOOKMARK_BAR_APPS_SHORTCUT_TOOLTIP 282
-IDR_BOOKMARK_BAR_APPS_SHORTCUT 283
-IDS_BOOKMARKS_NO_ITEMS 284
-IDS_BOOKMARK_BAR_IMPORT_LINK 285
+IDS_DEFAULT_PROFILE_NAME 101
+IDS_LEGACY_DEFAULT_PROFILE_NAME 102
+IDR_MOJO_CONTENT_BROWSER_MANIFEST 103
+IDR_CHROME_CONTENT_BROWSER_MANIFEST_OVERLAY 104
+IDR_MOJO_CONTENT_GPU_MANIFEST 105
+IDR_CHROME_CONTENT_GPU_MANIFEST_OVERLAY 106
+IDR_MOJO_CONTENT_PACKAGED_SERVICES_MANIFEST 107
+IDR_CHROME_CONTENT_PACKAGED_SERVICES_MANIFEST_OVERLAY 108
+IDR_MOJO_CONTENT_PLUGIN_MANIFEST 109
+IDR_CHROME_CONTENT_PLUGIN_MANIFEST_OVERLAY 110
+IDR_MOJO_CONTENT_RENDERER_MANIFEST 111
+IDR_CHROME_CONTENT_RENDERER_MANIFEST_OVERLAY 112
+IDR_MOJO_CONTENT_UTILITY_MANIFEST 113
+IDR_CHROME_CONTENT_UTILITY_MANIFEST_OVERLAY 114
+IDR_MOJO_CATALOG_MANIFEST 115
+IDR_NACL_LOADER_MANIFEST 116
+IDR_NACL_BROKER_MANIFEST 117
+IDR_PDF_COMPOSITOR_MANIFEST 118
+IDR_CHROME_RENDERER_SERVICE_MANIFEST 119
+IDR_DOWNLOAD_FILE_TYPES_PB 120
+IDR_PLUGIN_DB_JSON 121
+IDS_ACCEPT_LANGUAGES 122
+IDS_DEFAULT_ENCODING 123
+IDS_STANDARD_FONT_FAMILY 124
+IDS_FIXED_FONT_FAMILY 125
+IDS_FIXED_FONT_FAMILY_ALT_WIN 126
+IDS_SERIF_FONT_FAMILY 127
+IDS_SANS_SERIF_FONT_FAMILY 128
+IDS_CURSIVE_FONT_FAMILY 129
+IDS_FANTASY_FONT_FAMILY 130
+IDS_PICTOGRAPH_FONT_FAMILY 131
+IDS_STANDARD_FONT_FAMILY_JAPANESE 132
+IDS_FIXED_FONT_FAMILY_JAPANESE 133
+IDS_SERIF_FONT_FAMILY_JAPANESE 134
+IDS_SANS_SERIF_FONT_FAMILY_JAPANESE 135
+IDS_STANDARD_FONT_FAMILY_KOREAN 136
+IDS_SERIF_FONT_FAMILY_KOREAN 137
+IDS_SANS_SERIF_FONT_FAMILY_KOREAN 138
+IDS_STANDARD_FONT_FAMILY_SIMPLIFIED_HAN 139
+IDS_SERIF_FONT_FAMILY_SIMPLIFIED_HAN 140
+IDS_SANS_SERIF_FONT_FAMILY_SIMPLIFIED_HAN 141
+IDS_STANDARD_FONT_FAMILY_TRADITIONAL_HAN 142
+IDS_SERIF_FONT_FAMILY_TRADITIONAL_HAN 143
+IDS_SANS_SERIF_FONT_FAMILY_TRADITIONAL_HAN 144
+IDS_CURSIVE_FONT_FAMILY_SIMPLIFIED_HAN 145
+IDS_CURSIVE_FONT_FAMILY_TRADITIONAL_HAN 146
+IDS_FIXED_FONT_FAMILY_ARABIC 147
+IDS_SANS_SERIF_FONT_FAMILY_ARABIC 148
+IDS_STANDARD_FONT_FAMILY_CYRILLIC 149
+IDS_FIXED_FONT_FAMILY_CYRILLIC 150
+IDS_SERIF_FONT_FAMILY_CYRILLIC 151
+IDS_SANS_SERIF_FONT_FAMILY_CYRILLIC 152
+IDS_STANDARD_FONT_FAMILY_GREEK 153
+IDS_FIXED_FONT_FAMILY_GREEK 154
+IDS_SERIF_FONT_FAMILY_GREEK 155
+IDS_SANS_SERIF_FONT_FAMILY_GREEK 156
+IDS_FIXED_FONT_FAMILY_KOREAN 157
+IDS_CURSIVE_FONT_FAMILY_KOREAN 158
+IDS_FIXED_FONT_FAMILY_SIMPLIFIED_HAN 159
+IDS_FIXED_FONT_FAMILY_TRADITIONAL_HAN 160
+IDS_DEFAULT_FONT_SIZE 161
+IDS_DEFAULT_FIXED_FONT_SIZE 162
+IDS_MINIMUM_FONT_SIZE 163
+IDS_MINIMUM_LOGICAL_FONT_SIZE 164
+IDS_SPELLCHECK_DICTIONARY 165
+IDS_BOOKMARK_BAR_FOLDER_NAME 166
+IDS_BOOKMARK_BAR_OTHER_FOLDER_NAME 167
+IDS_BOOKMARK_BAR_MOBILE_FOLDER_NAME 168
+IDS_PRODUCT_NAME 169
+IDS_PROFILES_DEFAULT_NAME 170
+IDR_CLOUDPRINT_MANIFEST 171
+IDS_WEBSTORE_APP_DESCRIPTION 172
+IDS_WEBSTORE_NAME_STORE 173
+IDR_WEBSTORE_MANIFEST 174
+IDR_CRYPTOTOKEN_MANIFEST 175
+IDR_PDF_MANIFEST 176
+IDS_VERSION_UI_UNOFFICIAL 177
+IDS_CRASH_RECOVERY_TITLE 178
+IDS_CRASH_RECOVERY_CONTENT 179
+IDS_BOOKMARK_BAR_MANAGED_FOLDER_DEFAULT_NAME 180
+IDS_APP_ACCNAME_MINIMIZE 181
+IDS_APP_ACCNAME_MAXIMIZE 182
+IDS_APP_ACCNAME_RESTORE 183
+IDS_APP_ACCNAME_CLOSE 184
+IDS_TOOLTIP_NEW_TAB 185
+IDS_ACCNAME_NEWTAB 186
+IDR_TAB_DROP_DOWN 187
+IDS_UI_FONT_FAMILY 188
+IDS_UI_FONT_SIZE_SCALER 189
+IDS_MINIMUM_UI_FONT_SIZE 190
+IDS_APP_COPY 191
+IDS_APP_SELECT_ALL 192
+IDS_TOOLTIP_BACK 193
+IDS_ACCNAME_BACK 194
+IDS_ACCDESCRIPTION_BACK 195
+IDS_TOOLTIP_FORWARD 196
+IDS_ACCNAME_FORWARD 197
+IDS_ACCDESCRIPTION_FORWARD 198
+IDS_RELOAD_MENU_NORMAL_RELOAD_ITEM 199
+IDS_RELOAD_MENU_HARD_RELOAD_ITEM 200
+IDS_RELOAD_MENU_EMPTY_AND_HARD_RELOAD_ITEM 201
+IDS_ACCNAME_RELOAD 202
+IDS_TOOLTIP_HOME 203
+IDS_ACCNAME_HOME 204
+IDS_MEDIA_ROUTER_ABOUT 205
+IDS_LEARN_MORE 206
+IDS_MEDIA_ROUTER_HELP 207
+IDS_MEDIA_ROUTER_ALWAYS_SHOW_TOOLBAR_ACTION 208
+IDS_MEDIA_ROUTER_TOGGLE_MEDIA_REMOTING 209
+IDS_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE 210
+IDS_MEDIA_ROUTER_REPORT_ISSUE 211
+IDS_MEDIA_ROUTER_ICON_TOOLTIP_TEXT 212
+IDS_GENERIC_USER_AVATAR_LABEL 213
+IDS_ACCNAME_APP 214
+IDS_APPMENU_TOOLTIP 215
+IDS_OMNIBOX_PLACEHOLDER_TEXT 216
+IDS_AUTOCOMPLETE_MATCH_DESCRIPTION_SEPARATOR 217
+IDS_REGISTER_PROTOCOL_HANDLER_TOOLTIP 218
+IDS_OMNIBOX_CLEAR_ALL 219
+IDS_EMPTY_KEYWORD_VALUE 220
+IDS_DEFAULT_TAB_TITLE 221
+IDS_BROWSER_WINDOW_TITLE_FORMAT 222
+IDS_EXTENSION_WEB_STORE_TITLE_SHORT 223
+IDS_WEBSTORE_URL 224
+IDS_NTP_CONFIRM_MSG_SHORTCUT_REMOVED 225
+IDS_NEW_TAB_REMOVE_THUMBNAIL_TOOLTIP 226
+IDS_NEW_TAB_UNDO_THUMBNAIL_REMOVE 227
+IDS_NEW_TAB_RESTORE_THUMBNAILS_SHORT_LINK 228
+IDS_NEW_TAB_ATTRIBUTION_INTRO 229
+IDS_NEW_TAB_TITLE 230
+IDS_NEW_TAB_MOST_VISITED 231
+IDS_GOOGLE_SEARCH_BOX_EMPTY_HINT_MD 232
+IDS_NTP_CUSTOM_BG_CUSTOMIZE_BACKGROUND 233
+IDS_NTP_CUSTOM_BG_GOOGLE_PHOTOS 234
+IDS_NTP_CUSTOM_BG_CHROME_WALLPAPERS 235
+IDS_NTP_CUSTOM_BG_UPLOAD_AN_IMAGE 236
+IDS_NTP_CUSTOM_BG_RESTORE_DEFAULT 237
+IDS_NTP_CUSTOM_BG_SELECT_A_COLLECTION 238
+IDS_NTP_CUSTOM_BG_DAILY_REFRESH 239
+IDS_NTP_CUSTOM_LINKS_DONE 240
+IDS_NTP_CUSTOM_BG_CANCEL 241
+IDS_NTP_CUSTOM_BG_SELECT_GOOGLE_ALBUM 242
+IDS_NTP_CONNECTION_ERROR_NO_PERIOD 243
+IDS_NTP_CONNECTION_ERROR 244
+IDS_NTP_ERROR_MORE_INFO 245
+IDS_NTP_CUSTOM_BG_BACKGROUNDS_UNAVAILABLE 246
+IDS_NTP_CUSTOM_BG_CUSTOMIZE_NTP_LABEL 247
+IDS_NTP_CUSTOM_BG_BACK_LABEL 248
+IDS_NTP_CUSTOM_BG_GOOGLE_PHOTO_LABEL 249
+IDS_NTP_CUSTOM_BG_PHOTO_SELECTED 250
+IDS_NTP_CUSTOM_LINKS_ADD_SHORTCUT_TITLE 251
+IDS_NTP_CUSTOM_LINKS_ADD_SHORTCUT_TOOLTIP 252
+IDS_NTP_CUSTOM_LINKS_EDIT_SHORTCUT 253
+IDS_NTP_CUSTOM_LINKS_EDIT_SHORTCUT_TOOLTIP 254
+IDS_NTP_CUSTOM_LINKS_NAME 255
+IDS_NTP_CUSTOM_LINKS_URL 256
+IDS_NTP_CUSTOM_LINKS_REMOVE 257
+IDS_NTP_CUSTOM_LINKS_CANCEL 258
+IDS_NTP_CUSTOM_LINKS_INVALID_URL 259
+IDS_NTP_CONFIRM_MSG_SHORTCUT_EDITED 260
+IDS_NTP_CONFIRM_MSG_SHORTCUT_ADDED 261
+IDS_NTP_CONFIRM_MSG_RESTORE_DEFAULTS 262
+IDS_NTP_CUSTOM_LINKS_CANT_CREATE 263
+IDS_NTP_CUSTOM_LINKS_CANT_EDIT 264
+IDS_NTP_CUSTOM_LINKS_CANT_REMOVE 265
+IDS_NEW_TAB_VOICE_AUDIO_ERROR 266
+IDS_NEW_TAB_VOICE_DETAILS 267
+IDS_CLICK_TO_VIEW_DOODLE 268
+IDS_TOOLTIP_MIC_SEARCH 269
+IDS_NEW_TAB_VOICE_LANGUAGE_ERROR 270
+IDS_NEW_TAB_VOICE_LISTENING 271
+IDS_NEW_TAB_VOICE_NETWORK_ERROR 272
+IDS_NEW_TAB_VOICE_NO_TRANSLATION 273
+IDS_NEW_TAB_VOICE_NO_VOICE 274
+IDS_NEW_TAB_VOICE_PERMISSION_ERROR 275
+IDS_NEW_TAB_VOICE_READY 276
+IDS_NEW_TAB_VOICE_TRY_AGAIN 277
+IDS_NEW_TAB_VOICE_WAITING 278
+IDS_NEW_TAB_VOICE_OTHER_ERROR 279
+IDR_DEFAULT_FAVICON 280
+IDS_ACCNAME_CLOSE 281
+IDS_BOOKMARK_BAR_APPS_SHORTCUT_NAME 282
+IDS_BOOKMARK_BAR_APPS_SHORTCUT_TOOLTIP 283
+IDR_BOOKMARK_BAR_APPS_SHORTCUT 284
+IDS_ACCNAME_BOOKMARKS_CHEVRON 285
 IDR_BOOKMARK_BAR_FOLDER 286
 IDR_BOOKMARK_BAR_FOLDER_MANAGED 287
-IDR_BOOKMARK_BAR_FOLDER_SUPERVISED 288
+IDR_SSL_ERROR_ASSISTANT_PB 288
 IDS_WEB_FONT_SIZE 289
 IDS_WEB_FONT_FAMILY 290
-IDS_DEFAULT_BROWSER_INFOBAR_SHORT_TEXT 291
-IDS_DEFAULT_BROWSER_INFOBAR_OK_BUTTON_LABEL 292
-IDR_CONTENT_BOTTOM_RIGHT_CORNER 293
-IDR_CONTENT_BOTTOM_LEFT_CORNER 294
-IDS_UTILITY_PROCESS_PROXY_RESOLVER_NAME 295
-IDS_UTILITY_PROCESS_MANIFEST_PARSER_NAME 296
-IDR_MOST_VISITED_SINGLE_HTML 297
-IDR_MOST_VISITED_SINGLE_CSS 298
-IDR_MOST_VISITED_SINGLE_JS 299
-IDR_NEWTAB_CHROME_WELCOME_PAGE_THUMBNAIL 300
-IDR_PRODUCT_LOGO_16 301
-IDR_NEWTAB_WEBSTORE_THUMBNAIL 302
-IDR_WEBSTORE_ICON_16 303
-IDR_CLOSE_3_MASK 304
-IDS_AUTOCOMPLETE_SEARCH_DESCRIPTION 305
-IDS_AUTOCOMPLETE_MATCH_DESCRIPTION_SEPARATOR 306
-IDS_UTILITY_PROCESS_EXTENSION_UNPACKER_NAME 307
-IDS_NEW_TAB_MOST_VISITED 308
-IDS_RECENTLY_CLOSED 309
-IDS_NEW_WINDOW 310
-IDS_NEW_INCOGNITO_WINDOW 311
-IDS_EXTENSION_USB_DEVICE_PRODUCT_NAME_AND_VENDOR 312
-IDS_APP_SHORTCUTS_SUBDIR_NAME 313
-IDR_LOCAL_NTP_HTML 314
-IDR_LOCAL_NTP_CSS 315
-IDS_NEW_TAB_THUMBNAIL_REMOVED_NOTIFICATION 316
-IDS_NEW_TAB_REMOVE_THUMBNAIL_TOOLTIP 317
-IDS_NEW_TAB_UNDO_THUMBNAIL_REMOVE 318
-IDS_NEW_TAB_RESTORE_THUMBNAILS_SHORT_LINK 319
-IDS_NEW_TAB_ATTRIBUTION_INTRO 320
-IDS_SEARCH_BOX_EMPTY_HINT 321
-IDR_LOCAL_NTP_JS 322
-IDR_ADDITIONAL_MODULE_IDS 323
+IDR_LOCAL_NTP_HTML 291
+IDS_LOAD_STATE_WAITING_FOR_DELEGATE_GENERIC 292
+IDS_UTILITY_PROCESS_PROXY_RESOLVER_NAME 293
+IDR_LOCAL_NTP_CSS 294
+IDR_LOCAL_NTP_VOICE_CSS 295
+IDR_LOCAL_NTP_CUSTOM_BACKGROUNDS_CSS 296
+IDR_LOCAL_NTP_CUSTOM_BACKGROUNDS_JS 297
+IDR_LOCAL_NTP_JS 298
+IDR_LOCAL_NTP_VOICE_JS 299
+IDR_MOST_VISITED_SINGLE_HTML 300
+IDR_CUSTOM_LINKS_EDIT_HTML 301
+IDR_MOST_VISITED_SINGLE_CSS 302
+IDR_MOST_VISITED_SINGLE_JS 303
+IDR_CUSTOM_LINKS_EDIT_CSS 304
+IDR_CUSTOM_LINKS_EDIT_JS 305
+IDR_WEBSTORE_ICON_32 306
+IDS_NTP_FONT_FAMILY 307
+IDR_CUSTOM_LINKS_EDIT_MENU_SVG 308
+IDR_CUSTOM_LINKS_ADD_SVG 309
+IDS_TOOLTIP_STARRED 310
\ No newline at end of file

ui/resources/ui_resources.grd

@@ -118,7 +118,6 @@
       <if expr="is_macosx or is_ios">
         <structure type="chrome_scaled_image" name="IDR_MENU_HIERARCHY_ARROW" file="mac/menu_hierarchy_arrow.png" />
       </if>
-      <structure type="chrome_scaled_image" name="IDR_MENU_DROPARROW" file="cros/menu_droparrow.png" />
       <if expr="toolkit_views or is_ios">
         <if expr="is_win">
           <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_CLOSE" file="win/notification_close.png"/>

ui/views/controls/button/button_unittest.cc

@@ -364,10 +364,10 @@ TEST_F(ButtonTest, GestureEventsSetState) {
 TEST_F(ButtonTest, AsButton) {
   base::string16 text;
 
-  LabelButton label_button(NULL, text);
+  LabelButton label_button(nullptr, text);
   EXPECT_TRUE(Button::AsButton(&label_button));
 
-  ImageButton image_button(NULL);
+  ImageButton image_button(nullptr);
   EXPECT_TRUE(Button::AsButton(&image_button));
 
   Checkbox checkbox(text);
@@ -376,10 +376,10 @@ TEST_F(ButtonTest, AsButton) {
   RadioButton radio_button(text, 0);
   EXPECT_TRUE(Button::AsButton(&radio_button));
 
-  MenuButton menu_button(text, NULL, false);
+  MenuButton menu_button(text, nullptr);
   EXPECT_TRUE(Button::AsButton(&menu_button));
 
-  ToggleButton toggle_button(NULL);
+  ToggleButton toggle_button(nullptr);
   EXPECT_TRUE(Button::AsButton(&toggle_button));
 
   Label label;

ui/views/controls/button/menu_button.cc

@@ -7,15 +7,12 @@
 #include "base/strings/utf_string_conversions.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
-#include "ui/base/resource/resource_bundle.h"
 #include "ui/display/screen.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_utils.h"
 #include "ui/gfx/canvas.h"
-#include "ui/gfx/image/image.h"
 #include "ui/gfx/text_constants.h"
-#include "ui/resources/grit/ui_resources.h"
 #include "ui/views/animation/ink_drop.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/menu_button_listener.h"
@@ -65,15 +62,10 @@ MenuButton::PressedLock::~PressedLock() {
 ////////////////////////////////////////////////////////////////////////////////
 
 MenuButton::MenuButton(const base::string16& text,
-                       MenuButtonListener* menu_button_listener,
-                       bool show_menu_marker)
+                       MenuButtonListener* menu_button_listener)
     : LabelButton(nullptr, text),
       menu_offset_(kDefaultMenuOffsetX, kDefaultMenuOffsetY),
       listener_(menu_button_listener),
-      show_menu_marker_(show_menu_marker),
-      menu_marker_(ui::ResourceBundle::GetSharedInstance()
-                       .GetImageNamed(IDR_MENU_DROPARROW)
-                       .ToImageSkia()),
       weak_factory_(this) {
   SetHorizontalAlignment(gfx::ALIGN_LEFT);
 }
@@ -176,16 +168,6 @@ bool MenuButton::IsTriggerableEventType(const ui::Event& event) {
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-gfx::Size MenuButton::CalculatePreferredSize() const {
-  gfx::Size prefsize = LabelButton::CalculatePreferredSize();
-  if (show_menu_marker_) {
-    prefsize.Enlarge(menu_marker_->width() + kMenuMarkerPaddingLeft +
-                         kMenuMarkerPaddingRight,
-                     0);
-  }
-  return prefsize;
-}
-
 const char* MenuButton::GetClassName() const {
   return kViewClassName;
 }
@@ -293,31 +275,6 @@ void MenuButton::GetAccessibleNodeData(ui::AXNodeData* node_data) {
     node_data->SetDefaultActionVerb(ax::mojom::DefaultActionVerb::kOpen);
 }
 
-void MenuButton::PaintMenuMarker(gfx::Canvas* canvas) {
-  gfx::Insets insets = GetInsets();
-
-  // Using the Views mirroring infrastructure incorrectly flips icon content.
-  // Instead, manually mirror the position of the down arrow.
-  gfx::Rect arrow_bounds(width() - insets.right() -
-                         menu_marker_->width() - kMenuMarkerPaddingRight,
-                         height() / 2 - menu_marker_->height() / 2,
-                         menu_marker_->width(),
-                         menu_marker_->height());
-  arrow_bounds.set_x(GetMirroredXForRect(arrow_bounds));
-  canvas->DrawImageInt(*menu_marker_, arrow_bounds.x(), arrow_bounds.y());
-}
-
-gfx::Rect MenuButton::GetChildAreaBounds() {
-  gfx::Size s = size();
-
-  if (show_menu_marker_) {
-    s.set_width(s.width() - menu_marker_->width() - kMenuMarkerPaddingLeft -
-                kMenuMarkerPaddingRight);
-  }
-
-  return gfx::Rect(s);
-}
-
 bool MenuButton::IsTriggerableEvent(const ui::Event& event) {
   if (!IsTriggerableEventType(event))
     return false;
@@ -354,11 +311,6 @@ void MenuButton::NotifyClick(const ui::Event& event) {
   Activate(&event);
 }
 
-void MenuButton::PaintButtonContents(gfx::Canvas* canvas) {
-  if (show_menu_marker_)
-    PaintMenuMarker(canvas);
-}
-
 void MenuButton::IncrementPressedLocked(bool snap_ink_drop_to_activated,
                                         const ui::LocatedEvent* event) {
   ++pressed_lock_count_;

ui/views/controls/button/menu_button.h

@@ -52,16 +52,9 @@ class VIEWS_EXPORT MenuButton : public LabelButton {
 
   // Create a Button.
   MenuButton(const base::string16& text,
-             MenuButtonListener* menu_button_listener,
-             bool show_menu_marker);
+             MenuButtonListener* menu_button_listener);
   ~MenuButton() override;
 
-  bool show_menu_marker() const { return show_menu_marker_; }
-  void set_menu_marker(const gfx::ImageSkia* menu_marker) {
-    menu_marker_ = menu_marker;
-  }
-  const gfx::ImageSkia* menu_marker() const { return menu_marker_; }
-
   const gfx::Point& menu_offset() const { return menu_offset_; }
   void set_menu_offset(int x, int y) { menu_offset_.SetPoint(x, y); }
 
@@ -76,7 +69,6 @@ class VIEWS_EXPORT MenuButton : public LabelButton {
   virtual bool IsTriggerableEventType(const ui::Event& event);
 
   // Overridden from View:
-  gfx::Size CalculatePreferredSize() const override;
   const char* GetClassName() const override;
   bool OnMousePressed(const ui::MouseEvent& event) override;
   void OnMouseReleased(const ui::MouseEvent& event) override;
@@ -89,18 +81,12 @@ class VIEWS_EXPORT MenuButton : public LabelButton {
   void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
 
  protected:
-  // Paint the menu marker image.
-  void PaintMenuMarker(gfx::Canvas* canvas);
-
-  // Overridden from LabelButton:
-  gfx::Rect GetChildAreaBounds() override;
 
   // Overridden from Button:
   bool IsTriggerableEvent(const ui::Event& event) override;
   bool ShouldEnterPushedState(const ui::Event& event) override;
   void StateChanged(ButtonState old_state) override;
   void NotifyClick(const ui::Event& event) override;
-  void PaintButtonContents(gfx::Canvas* canvas) override;
 
   // Offset of the associated menu position.
   gfx::Point menu_offset_;
@@ -132,12 +118,6 @@ class VIEWS_EXPORT MenuButton : public LabelButton {
   // Our listener. Not owned.
   MenuButtonListener* listener_;
 
-  // Whether or not we're showing a drop marker.
-  bool show_menu_marker_;
-
-  // The down arrow used to differentiate the menu button from normal buttons.
-  const gfx::ImageSkia* menu_marker_;
-
   // The current number of "pressed" locks this button has.
   int pressed_lock_count_ = 0;
 

ui/views/controls/button/menu_button_unittest.cc

@@ -38,8 +38,7 @@ class TestMenuButton : public MenuButton {
  public:
   explicit TestMenuButton(MenuButtonListener* menu_button_listener)
       : MenuButton(base::string16(ASCIIToUTF16("button")),
-                   menu_button_listener,
-                   false) {}
+                   menu_button_listener) {}
 
   ~TestMenuButton() override {}
 
@@ -693,7 +692,7 @@ TEST_F(MenuButtonTest,
 class DestroyButtonInGestureListener : public MenuButtonListener {
  public:
   DestroyButtonInGestureListener() {
-    menu_button_ = std::make_unique<MenuButton>(base::string16(), this, true);
+    menu_button_ = std::make_unique<MenuButton>(base::string16(), this);
   }
 
   ~DestroyButtonInGestureListener() override = default;

ui/views/examples/menu_example.cc

@@ -171,10 +171,9 @@ void ExampleMenuModel::ExecuteCommand(int command_id, int event_flags) {
 // ExampleMenuButton -----------------------------------------------------------
 
 ExampleMenuButton::ExampleMenuButton(const base::string16& test)
-    : MenuButton(test, this, true) {}
+    : MenuButton(test, this) {}
 
-ExampleMenuButton::~ExampleMenuButton() {
-}
+ExampleMenuButton::~ExampleMenuButton() {}
 
 void ExampleMenuButton::OnMenuButtonClicked(MenuButton* source,
                                             const gfx::Point& point,