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

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

Issue 954123002: Remove wm::SHADOW_TYPE_RECTANGULAR_ALWAYS_ACTIVE. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 | « no previous file | ui/wm/core/shadow_controller_unittest.cc » ('j') | 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 d25b4a551c34b9854b8011da97bfdbed347827f6..9ba88d3618d36ed0c8083fdb59fe38402a945a7e 100644
--- a/ui/wm/core/shadow_controller.cc
+++ b/ui/wm/core/shadow_controller.cc
@@ -52,14 +52,9 @@ bool ShouldUseSmallShadowForWindow(aura::Window* window) {
return false;
}
-bool IsShadowAlwaysActive(aura::Window* window) {
- return GetShadowType(window) == SHADOW_TYPE_RECTANGULAR_ALWAYS_ACTIVE;
-}
-
Shadow::Style GetShadowStyleForWindow(aura::Window* window) {
return ShouldUseSmallShadowForWindow(window) ? Shadow::STYLE_SMALL :
- ((IsActiveWindow(window) || IsShadowAlwaysActive(window)) ?
- Shadow::STYLE_ACTIVE : Shadow::STYLE_INACTIVE);
+ (IsActiveWindow(window) ? Shadow::STYLE_ACTIVE : Shadow::STYLE_INACTIVE);
}
// Returns the shadow style to be applied to |losing_active| when it is losing
@@ -68,9 +63,6 @@ Shadow::Style GetShadowStyleForWindow(aura::Window* window) {
Shadow::Style GetShadowStyleForWindowLosingActive(
aura::Window* losing_active,
aura::Window* gaining_active) {
- if (IsShadowAlwaysActive(losing_active))
- return Shadow::STYLE_ACTIVE;
-
if (gaining_active && aura::client::GetHideOnDeactivate(gaining_active)) {
aura::Window::Windows::const_iterator it =
std::find(GetTransientChildren(losing_active).begin(),
@@ -221,7 +213,6 @@ bool ShadowController::Impl::ShouldShowShadowForWindow(
case SHADOW_TYPE_NONE:
return false;
case SHADOW_TYPE_RECTANGULAR:
- case SHADOW_TYPE_RECTANGULAR_ALWAYS_ACTIVE:
return true;
default:
NOTREACHED() << "Unknown shadow type " << type;
« no previous file with comments | « no previous file | ui/wm/core/shadow_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698