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

Unified Diff: ui/views/controls/button/label_button.cc

Issue 2389453002: Remove IsModeMaterial checks in ui/views/ (Closed)
Patch Set: oops 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: ui/views/controls/button/label_button.cc
diff --git a/ui/views/controls/button/label_button.cc b/ui/views/controls/button/label_button.cc
index 68a347286166806eacd855ee7b0db6dac6a7733d..fc7fedb686ebab8365d1a50f932d219f32f3f6d0 100644
--- a/ui/views/controls/button/label_button.cc
+++ b/ui/views/controls/button/label_button.cc
@@ -12,7 +12,6 @@
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "build/build_config.h"
-#include "ui/base/material_design/material_design_controller.h"
#include "ui/gfx/animation/throb_animation.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/color_utils.h"
@@ -390,10 +389,8 @@ void LabelButton::EnableCanvasFlippingForRTLUI(bool flip) {
}
std::unique_ptr<LabelButtonBorder> LabelButton::CreateDefaultBorder() const {
- if (!ui::MaterialDesignController::IsModeMaterial() ||
- style_ != Button::STYLE_TEXTBUTTON) {
+ if (style_ != Button::STYLE_TEXTBUTTON)
return base::MakeUnique<LabelButtonAssetBorder>(style_);
- }
std::unique_ptr<LabelButtonBorder> border =
base::MakeUnique<LabelButtonBorder>();
border->set_insets(views::LabelButtonAssetBorder::GetDefaultInsetsForStyle(

Powered by Google App Engine
This is Rietveld 408576698