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

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

Issue 2374803002: Remove a bunch of pre-MD toolbar code and assets. (Closed)
Patch Set: more cocoa stuff 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/toolbar_action_view.cc
diff --git a/chrome/browser/ui/views/toolbar/toolbar_action_view.cc b/chrome/browser/ui/views/toolbar/toolbar_action_view.cc
index 9c1669d08dd54b0f53fd1e3fd1bee9801fd1dd5f..b3b98084bb6151fbf16c3dca3b90fcf339c3de6d 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_action_view.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_action_view.cc
@@ -16,7 +16,6 @@
#include "chrome/browser/ui/view_ids.h"
#include "content/public/browser/notification_source.h"
#include "ui/accessibility/ax_view_state.h"
-#include "ui/base/material_design/material_design_controller.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/theme_provider.h"
#include "ui/compositor/paint_recorder.h"
@@ -54,10 +53,8 @@ ToolbarActionView::ToolbarActionView(
wants_to_run_(false),
menu_(nullptr),
weak_factory_(this) {
- if (ui::MaterialDesignController::IsModeMaterial()) {
- SetInkDropMode(InkDropMode::ON);
- SetFocusPainter(nullptr);
- }
+ SetInkDropMode(InkDropMode::ON);
+ SetFocusPainter(nullptr);
set_has_ink_drop_action_on_click(true);
set_id(VIEW_ID_BROWSER_ACTION);
view_controller_->SetDelegate(this);

Powered by Google App Engine
This is Rietveld 408576698