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

Unified Diff: ui/views/controls/button/custom_button_unittest.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/custom_button_unittest.cc
diff --git a/ui/views/controls/button/custom_button_unittest.cc b/ui/views/controls/button/custom_button_unittest.cc
index 01a233c7db9ae3f57d0c292bc32808e63d57bc09..816d8a4d9cf94ff7d0093da7384349ce4625cea0 100644
--- a/ui/views/controls/button/custom_button_unittest.cc
+++ b/ui/views/controls/button/custom_button_unittest.cc
@@ -9,7 +9,6 @@
#include "build/build_config.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/layout.h"
-#include "ui/base/material_design/material_design_controller.h"
#include "ui/display/screen.h"
#include "ui/events/event_utils.h"
#include "ui/events/test/event_generator.h"
@@ -380,10 +379,7 @@ TEST_F(CustomButtonTest, CaptureLossHidesInkDrop) {
widget()->ReleaseCapture();
SetDraggedView(nullptr);
EXPECT_EQ(InkDropState::HIDDEN, ink_drop->GetTargetInkDropState());
- EXPECT_EQ(ui::MaterialDesignController::IsModeMaterial()
- ? Button::ButtonState::STATE_NORMAL
- : Button::ButtonState::STATE_PRESSED,
- button()->state());
+ EXPECT_EQ(Button::ButtonState::STATE_NORMAL, button()->state());
}
TEST_F(CustomButtonTest, HideInkDropWhenShowingContextMenu) {

Powered by Google App Engine
This is Rietveld 408576698