Remove wm::SHADOW_TYPE_RECTANGULAR_ALWAYS_ACTIVE.

ui/wm/core/shadow_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/wm/core/shadow_controller.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 34 matching lines @@
   switch (window->type()) {
     case ui::wm::WINDOW_TYPE_MENU:
     case ui::wm::WINDOW_TYPE_TOOLTIP:
       return true;
     default:
       break;
   }
   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
 // active to |gaining_active|. |gaining_active| may be of a type that hides when
 // inactive, and as such we do not want to render |losing_active| as inactive.
 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(),
                   GetTransientChildren(losing_active).end(),
                   gaining_active);
     if (it != GetTransientChildren(losing_active).end())
       return Shadow::STYLE_ACTIVE;
   }
   return Shadow::STYLE_INACTIVE;
 }
@@ skipping 130 matching lines @@
   if (show_state == ui::SHOW_STATE_FULLSCREEN ||
       show_state == ui::SHOW_STATE_MAXIMIZED) {
     return SHADOW_TYPE_NONE;
   }
 
   const ShadowType type = GetShadowType(window);
   switch (type) {
     case SHADOW_TYPE_NONE:
       return false;
     case SHADOW_TYPE_RECTANGULAR:
-    case SHADOW_TYPE_RECTANGULAR_ALWAYS_ACTIVE:
       return true;
     default:
       NOTREACHED() << "Unknown shadow type " << type;
       return false;
   }
 }
 
 Shadow* ShadowController::Impl::GetShadowForWindow(aura::Window* window) {
   WindowShadowMap::const_iterator it = window_shadows_.find(window);
   return it != window_shadows_.end() ? it->second.get() : NULL;
@@ skipping 50 matching lines @@
   impl_->OnWindowActivated(gained_active, lost_active);
 }
 
 // ShadowController::TestApi ---------------------------------------------------
 
 Shadow* ShadowController::TestApi::GetShadowForWindow(aura::Window* window) {
   return controller_->impl_->GetShadowForWindow(window);
 }
 
 }  // namespace wm