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

Unified Diff: ui/wm/core/shadow_unittest.cc

Issue 2596743002: Replace WM shadow types (on/off) and styles (small/inactive/active) (Closed)
Patch Set: one more mechanical change Created 3 years, 11 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
« no previous file with comments | « ui/wm/core/shadow_types.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/wm/core/shadow_unittest.cc
diff --git a/ui/wm/core/shadow_unittest.cc b/ui/wm/core/shadow_unittest.cc
index b4b1f739f599a4afef47e8b181ed11dd999bb33d..cd8548fcae5f6b5de76f673f994278e0101213b0 100644
--- a/ui/wm/core/shadow_unittest.cc
+++ b/ui/wm/core/shadow_unittest.cc
@@ -6,6 +6,7 @@
#include "base/macros.h"
#include "ui/aura/test/aura_test_base.h"
+#include "ui/wm/core/shadow_types.h"
namespace wm {
namespace {
@@ -21,7 +22,7 @@ TEST_F(ShadowTest, SetContentBounds) {
// Verify that layer bounds are outset from content bounds.
Shadow shadow;
{
- shadow.Init(Shadow::STYLE_ACTIVE);
+ shadow.Init(ShadowElevation::LARGE);
gfx::Rect content_bounds(100, 100, 300, 300);
shadow.SetContentBounds(content_bounds);
EXPECT_EQ(content_bounds, shadow.content_bounds());
@@ -31,7 +32,7 @@ TEST_F(ShadowTest, SetContentBounds) {
}
{
- shadow.SetStyle(Shadow::STYLE_SMALL);
+ shadow.SetElevation(ShadowElevation::SMALL);
gfx::Rect content_bounds(100, 100, 300, 300);
shadow.SetContentBounds(content_bounds);
EXPECT_EQ(content_bounds, shadow.content_bounds());
@@ -45,7 +46,7 @@ TEST_F(ShadowTest, SetContentBounds) {
// the full elevation.
TEST_F(ShadowTest, AdjustElevationForSmallContents) {
Shadow shadow;
- shadow.Init(Shadow::STYLE_ACTIVE);
+ shadow.Init(ShadowElevation::LARGE);
{
gfx::Rect content_bounds(100, 100, 300, 300);
shadow.SetContentBounds(content_bounds);
« no previous file with comments | « ui/wm/core/shadow_types.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698