Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8553)

Unified Diff: chrome/browser/ui/views/toolbar/app_menu.cc

Issue 2374803002: Remove a bunch of pre-MD toolbar code and assets. (Closed)
Patch Set: fix mac? Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/toolbar/app_menu.cc
diff --git a/chrome/browser/ui/views/toolbar/app_menu.cc b/chrome/browser/ui/views/toolbar/app_menu.cc
index 26839ed476a25d322e51562a9eacdf3091f22452..c68cb760ab9ea1ea2d28cacae2cdb3eb40d70cf1 100644
--- a/chrome/browser/ui/views/toolbar/app_menu.cc
+++ b/chrome/browser/ui/views/toolbar/app_menu.cc
@@ -48,7 +48,6 @@
#include "ui/accessibility/ax_view_state.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/layout.h"
-#include "ui/base/material_design/material_design_controller.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/font_list.h"
@@ -1116,13 +1115,10 @@ void AppMenu::PopulateMenu(MenuItemView* parent, MenuModel* model) {
case IDC_EXTENSIONS_OVERFLOW_MENU: {
std::unique_ptr<ExtensionToolbarMenuView> extension_toolbar(
new ExtensionToolbarMenuView(browser_, this, item));
- if (ui::MaterialDesignController::IsModeMaterial()) {
- for (int i = 0; i < extension_toolbar->contents()->child_count();
- ++i) {
- View* action_view = extension_toolbar->contents()->child_at(i);
- action_view->set_background(new InMenuButtonBackground(
- InMenuButtonBackground::ROUNDED_BUTTON));
- }
+ for (int i = 0; i < extension_toolbar->contents()->child_count(); ++i) {
+ View* action_view = extension_toolbar->contents()->child_at(i);
+ action_view->set_background(new InMenuButtonBackground(
+ InMenuButtonBackground::ROUNDED_BUTTON));
}
extension_toolbar_ = extension_toolbar.get();
item->AddChildView(extension_toolbar.release());

Powered by Google App Engine
This is Rietveld 408576698