Gut ash::MaterialDesignController, and remove the about:flags entry.

ash/common/wm/overview/window_selector_item.cc

 // Copyright 2013 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 "ash/common/wm/overview/window_selector_item.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/common/material_design/material_design_controller.h"
@@ skipping 26 matching lines @@
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/geometry/safe_integer_conversions.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/transform_util.h"
 #include "ui/strings/grit/ui_strings.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/window/non_client_view.h"
 #include "ui/wm/core/shadow.h"
-#include "ui/wm/core/shadow_types.h"
 #include "ui/wm/core/window_util.h"
 
 namespace ash {
 
 namespace {
 
 // In the conceptual overview table, the window margin is the space reserved
 // around the window within the cell. This margin does not overlap so the
 // closest distance between adjacent windows will be twice this amount.
 static const int kWindowMargin = 5;
@@ skipping 435 matching lines @@
   SetItemBounds(inset_bounds, animation_type);
 
   // SetItemBounds is called before UpdateHeaderLayout so the header can
   // properly use the updated windows bounds.
   UpdateHeaderLayout(HeaderFadeInMode::UPDATE, animation_type);
 }
 
 void WindowSelectorItem::SetSelected(bool selected) {
   selected_ = selected;
   background_view_->AnimateBackgroundOpacity(selected ? 0.f : kHeaderOpacity);
-
-  if (shadow_) {
-    ui::ScopedLayerAnimationSettings animation_settings_shadow(
-        shadow_->shadow_layer()->GetAnimator());
-    animation_settings_shadow.SetTransitionDuration(
-        base::TimeDelta::FromMilliseconds(kSelectorFadeInMilliseconds));
-    animation_settings_shadow.SetTweenType(
-        selected ? gfx::Tween::FAST_OUT_LINEAR_IN
-                 : gfx::Tween::LINEAR_OUT_SLOW_IN);
-    animation_settings_shadow.SetPreemptionStrategy(
-        ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
-    shadow_->shadow_layer()->SetOpacity(selected ? 0.0f : 1.0f);
-  }
 }
 
 void WindowSelectorItem::SendAccessibleSelectionEvent() {
   caption_container_view_->listener_button()->NotifyAccessibilityEvent(
       ui::AX_EVENT_SELECTION, true);
 }
 
 void WindowSelectorItem::CloseWindow() {
   gfx::Rect inset_bounds(target_bounds_);
   inset_bounds.Inset(target_bounds_.width() * kPreCloseScale,
@@ skipping 135 matching lines @@
   // background color is opaque or transparent to decide whether to use
   // subpixel rendering. Does not actually set the label's background color.
   label_view_->SetBackgroundColor(kLabelBackgroundColor);
 
   caption_container_view_ = new CaptionContainerView(
       this, label_view_, close_button_, background_view_);
   item_widget_->SetContentsView(caption_container_view_);
   label_view_->SetVisible(false);
   item_widget_->SetOpacity(0);
   item_widget_->Show();
-
-  // TODO(varkha): Restore shadows when programmatic shadows exist.
-  // Note: current shadow implementation does not allow proper animation when
-  // the parent layer bounds change during the animation since
-  // Shadow::UpdateLayerBounds() only happens before the animation starts.
-  if (ash::MaterialDesignController::GetMode() ==
-      ash::MaterialDesignController::Mode::MATERIAL_EXPERIMENTAL) {
-    shadow_.reset(new ::wm::Shadow());
-    shadow_->Init(::wm::ShadowElevation::MEDIUM);
-    shadow_->layer()->SetVisible(true);
-    item_widget_->GetLayer()->Add(shadow_->layer());
-  }
   item_widget_->GetLayer()->SetMasksToBounds(false);
 }
 
 void WindowSelectorItem::UpdateHeaderLayout(
     HeaderFadeInMode mode,
     OverviewAnimationType animation_type) {
   gfx::Rect transformed_window_bounds = root_window_->ConvertRectFromScreen(
       transform_window_.GetTransformedBounds());
 
   gfx::Rect label_rect(close_button_->GetPreferredSize());
@@ skipping 36 matching lines @@
   if (mode != HeaderFadeInMode::ENTER) {
     label_rect.set_height(close_button_->GetPreferredSize().height() +
                           transformed_window_bounds.height());
   }
   label_rect.Inset(-kWindowSelectorMargin, -kWindowSelectorMargin);
   widget_window->SetBounds(label_rect);
   gfx::Transform label_transform;
   label_transform.Translate(transformed_window_bounds.x(),
                             transformed_window_bounds.y());
   widget_window->SetTransform(label_transform);
-
-  gfx::Rect shadow_bounds(label_rect.size());
-  shadow_bounds.Inset(kWindowSelectorMargin, kWindowSelectorMargin);
-  if (shadow_)
-    shadow_->SetContentBounds(shadow_bounds);
 }
 
 void WindowSelectorItem::AnimateOpacity(float opacity,
                                         OverviewAnimationType animation_type) {
   DCHECK_GE(opacity, 0.f);
   DCHECK_LE(opacity, 1.f);
   ScopedTransformOverviewWindow::ScopedAnimationSettings animation_settings;
   transform_window_.BeginScopedAnimation(animation_type, &animation_settings);
   transform_window_.SetOpacity(opacity);
 
@@ skipping 38 matching lines @@
 
 gfx::SlideAnimation* WindowSelectorItem::GetBackgroundViewAnimation() {
   return background_view_ ? background_view_->animation() : nullptr;
 }
 
 WmWindow* WindowSelectorItem::GetOverviewWindowForMinimizedStateForTest() {
   return transform_window_.GetOverviewWindowForMinimizedState();
 }
 
 }  // namespace ash