From cbc5df777caae32d4c48a5e22f389f4642994a0d Mon Sep 17 00:00:00 2001
From: jackhou <jackhou@chromium.org>
Date: Wed, 25 Feb 2015 12:52:53 -0800
Subject: Remove wm::SHADOW_TYPE_RECTANGULAR_ALWAYS_ACTIVE.

This was added for athena here:
https://codereview.chromium.org/455543004

Since athena has been deleted, this is no longer used.

BUG=440818

Review URL: https://codereview.chromium.org/954123002

Cr-Commit-Position: refs/heads/master@{#318110}
---
 ui/wm/core/shadow_controller.cc          | 11 +------
 ui/wm/core/shadow_controller_unittest.cc | 54 --------------------------------
 ui/wm/core/shadow_types.h                |  1 -
 3 files changed, 1 insertion(+), 65 deletions(-)

diff --git a/ui/wm/core/shadow_controller.cc b/ui/wm/core/shadow_controller.cc
index d25b4a5..9ba88d3 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;
diff --git a/ui/wm/core/shadow_controller_unittest.cc b/ui/wm/core/shadow_controller_unittest.cc
index 6e3818b..516b92d 100644
--- a/ui/wm/core/shadow_controller_unittest.cc
+++ b/ui/wm/core/shadow_controller_unittest.cc
@@ -241,58 +241,4 @@ TEST_F(ShadowControllerTest, TransientParentKeepsActiveShadow) {
   EXPECT_EQ(Shadow::STYLE_ACTIVE, shadow1->style());
 }
 
-TEST_F(ShadowControllerTest, AlwaysActive) {
-  ShadowController::TestApi api(shadow_controller());
-
-  scoped_ptr<aura::Window> window1(new aura::Window(NULL));
-  window1->SetType(ui::wm::WINDOW_TYPE_NORMAL);
-  window1->Init(aura::WINDOW_LAYER_TEXTURED);
-  ParentWindow(window1.get());
-  window1->SetBounds(gfx::Rect(10, 20, 300, 400));
-  SetShadowType(window1.get(), SHADOW_TYPE_RECTANGULAR_ALWAYS_ACTIVE);
-  window1->Show();
-
-  // Showing the window with SHADOW_TYPE_RECTANGULAR_ALWAYS_ACTIVE should
-  // have active shadow.
-  EXPECT_EQ(Shadow::STYLE_ACTIVE,
-            api.GetShadowForWindow(window1.get())->style());
-
-  scoped_ptr<aura::Window> window2(new aura::Window(NULL));
-  window2->SetType(ui::wm::WINDOW_TYPE_NORMAL);
-  window2->Init(aura::WINDOW_LAYER_TEXTURED);
-  ParentWindow(window2.get());
-  window2->SetBounds(gfx::Rect(11, 21, 301, 401));
-  window2->Show();
-
-  // Setting SHADOW_TYPE_RECTANGULAR_ALWAYS_ACTIVE to the visible window
-  // should set the active shadow.
-  EXPECT_EQ(Shadow::STYLE_INACTIVE,
-            api.GetShadowForWindow(window2.get())->style());
-  SetShadowType(window2.get(), SHADOW_TYPE_RECTANGULAR_ALWAYS_ACTIVE);
-  EXPECT_EQ(Shadow::STYLE_ACTIVE,
-            api.GetShadowForWindow(window2.get())->style());
-
-  // Activation should not change the shadow style.
-  ActivateWindow(window2.get());
-  EXPECT_EQ(Shadow::STYLE_ACTIVE,
-            api.GetShadowForWindow(window1.get())->style());
-  EXPECT_EQ(Shadow::STYLE_ACTIVE,
-            api.GetShadowForWindow(window2.get())->style());
-
-  ActivateWindow(window1.get());
-  EXPECT_EQ(Shadow::STYLE_ACTIVE,
-            api.GetShadowForWindow(window1.get())->style());
-  EXPECT_EQ(Shadow::STYLE_ACTIVE,
-            api.GetShadowForWindow(window2.get())->style());
-
-  // Restore the style to plain RECTANGULAR and make sure the inactive window
-  // gets the inactive shadow.
-  SetShadowType(window1.get(), SHADOW_TYPE_RECTANGULAR);
-  SetShadowType(window2.get(), SHADOW_TYPE_RECTANGULAR);
-  EXPECT_EQ(Shadow::STYLE_ACTIVE,
-            api.GetShadowForWindow(window1.get())->style());
-  EXPECT_EQ(Shadow::STYLE_INACTIVE,
-            api.GetShadowForWindow(window2.get())->style());
-}
-
 }  // namespace wm
diff --git a/ui/wm/core/shadow_types.h b/ui/wm/core/shadow_types.h
index ef6be1d..1198a43 100644
--- a/ui/wm/core/shadow_types.h
+++ b/ui/wm/core/shadow_types.h
@@ -20,7 +20,6 @@ enum ShadowType {
   // Starts at 0 due to the cast in GetShadowType().
   SHADOW_TYPE_NONE = 0,
   SHADOW_TYPE_RECTANGULAR,
-  SHADOW_TYPE_RECTANGULAR_ALWAYS_ACTIVE,
 };
 
 WM_EXPORT void SetShadowType(aura::Window* window, ShadowType shadow_type);
-- 
cgit v1.1