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

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

Issue 2825613002: Update ash phantom window aesthetics. (Closed)
Patch Set: solid color layer Created 3 years, 8 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_controller.h ('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_controller.cc
diff --git a/ui/wm/core/shadow_controller.cc b/ui/wm/core/shadow_controller.cc
index 6fc4366ad014eccf64b89cf53a70cd68beb54ff1..d2b078638fc32ac959eddd69fa65339c77a66bc0 100644
--- a/ui/wm/core/shadow_controller.cc
+++ b/ui/wm/core/shadow_controller.cc
@@ -19,7 +19,6 @@
#include "ui/base/ui_base_types.h"
#include "ui/compositor/layer.h"
#include "ui/wm/core/shadow.h"
-#include "ui/wm/core/shadow_types.h"
#include "ui/wm/core/window_util.h"
#include "ui/wm/public/activation_client.h"
@@ -32,7 +31,6 @@ namespace wm {
namespace {
-constexpr ShadowElevation kActiveNormalShadowElevation = ShadowElevation::LARGE;
constexpr ShadowElevation kInactiveNormalShadowElevation =
ShadowElevation::MEDIUM;
@@ -67,7 +65,7 @@ ShadowElevation GetShadowElevationForActiveState(aura::Window* window) {
return elevation;
if (IsActiveWindow(window))
- return kActiveNormalShadowElevation;
+ return ShadowController::kActiveNormalShadowElevation;
return GetDefaultShadowElevationForWindow(window);
}
@@ -84,7 +82,7 @@ ShadowElevation GetShadowElevationForWindowLosingActive(
GetTransientChildren(losing_active).end(),
gaining_active);
if (it != GetTransientChildren(losing_active).end())
- return kActiveNormalShadowElevation;
+ return ShadowController::kActiveNormalShadowElevation;
}
return kInactiveNormalShadowElevation;
}
« no previous file with comments | « ui/wm/core/shadow_controller.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698