Index: ui/wm/core/shadow_controller.cc |
diff --git a/ui/wm/core/shadow_controller.cc b/ui/wm/core/shadow_controller.cc |
index bce9beac84feaa17a4fd02ed883c1bdc419f3208..6fc4366ad014eccf64b89cf53a70cd68beb54ff1 100644 |
--- a/ui/wm/core/shadow_controller.cc |
+++ b/ui/wm/core/shadow_controller.cc |
@@ -62,10 +62,14 @@ ShadowElevation GetShadowElevationConvertDefault(aura::Window* window) { |
} |
ShadowElevation GetShadowElevationForActiveState(aura::Window* window) { |
+ ShadowElevation elevation = window->GetProperty(kShadowElevationKey); |
+ if (elevation != ShadowElevation::DEFAULT) |
+ return elevation; |
+ |
if (IsActiveWindow(window)) |
return kActiveNormalShadowElevation; |
- return GetShadowElevationConvertDefault(window); |
+ return GetDefaultShadowElevationForWindow(window); |
} |
// Returns the shadow style to be applied to |losing_active| when it is losing |