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

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

Issue 2754963002: Update cros network info bubble (Closed)
Patch Set: more clean up Created 3 years, 9 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/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

Powered by Google App Engine
This is Rietveld 408576698