Replaced BackgroundAnimator with ShelfBackgroundAnimator.

ash/common/wm/dock/docked_window_layout_manager.cc

 // Copyright (c) 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/dock/docked_window_layout_manager.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shelf/wm_shelf_observer.h"
@@ skipping 37 matching lines @@
 
 class DockedBackgroundWidget : public views::Widget,
                                public BackgroundAnimatorDelegate,
                                public WmShelfObserver {
  public:
   explicit DockedBackgroundWidget(DockedWindowLayoutManager* manager)
       : manager_(manager),
         alignment_(DOCKED_ALIGNMENT_NONE),
         background_animator_(this, 0, GetShelfConstant(SHELF_BACKGROUND_ALPHA)),
         alpha_(0),
+        // TODO(bruthig): Remove opaque_background_.
         opaque_background_(ui::LAYER_SOLID_COLOR),
         visible_background_type_(manager_->shelf()->GetBackgroundType()),
         visible_background_change_type_(BACKGROUND_CHANGE_IMMEDIATE) {
     manager_->shelf()->AddObserver(this);
     InitWidget(manager_->dock_container());
   }
 
   ~DockedBackgroundWidget() override {
     manager_->shelf()->RemoveObserver(this);
   }
 
   // Sets widget bounds and sizes opaque background layer to fill the widget.
   void SetBackgroundBounds(const gfx::Rect& bounds, DockedAlignment alignment) {
     SetBounds(bounds);
+    // TODO(bruthig): Remove opaque_background_.
     opaque_background_.SetBounds(gfx::Rect(bounds.size()));
     alignment_ = alignment;
   }
 
  private:
   // views::Widget:
   void OnNativeWidgetVisibilityChanged(bool visible) override {
     views::Widget::OnNativeWidgetVisibilityChanged(visible);
     UpdateBackground();
   }
@@ skipping 25 matching lines @@
               ? 0
               : shelf_background.width() - 1,
           0, 1, shelf_background.height(),
           alignment_ == DOCKED_ALIGNMENT_LEFT ? 0 : shelf_background.width(), 0,
           local_window_bounds.width() - shelf_background.width(),
           local_window_bounds.height(), false, paint);
     }
   }
 
   // BackgroundAnimatorDelegate:
-  void UpdateBackground(int alpha) override {
+  void UpdateBackground(BackgroundAnimator* animator, int alpha) override {
     alpha_ = alpha;
     SchedulePaintInRect(gfx::Rect(GetWindowBoundsInScreen().size()));
   }
 
   // ShelfLayoutManagerObserver:
   void OnBackgroundUpdated(ShelfBackgroundType background_type,
                            BackgroundAnimatorChangeType change_type) override {
     // Sets the background type. Starts an animation to transition to
     // |background_type| if the widget is visible. If the widget is not visible,
     // the animation is postponed till the widget becomes visible.
@@ skipping 10 matching lines @@
     params.keep_on_top = false;
     params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
     params.accept_events = false;
     set_focus_on_creation(false);
     parent->GetRootWindowController()->ConfigureWidgetInitParamsForContainer(
         this, parent->GetShellWindowId(), &params);
     Init(params);
     SetVisibilityChangedAnimationsEnabled(false);
     WmWindow* wm_window = WmLookup::Get()->GetWindowForWidget(this);
     wm_window->SetLockedToRoot(true);
+    // TODO(bruthig): Remove opaque_background_.
     opaque_background_.SetColor(SK_ColorBLACK);
     opaque_background_.SetBounds(gfx::Rect(GetWindowBoundsInScreen().size()));
     opaque_background_.SetOpacity(0.0f);
     wm_window->GetLayer()->Add(&opaque_background_);
 
     if (!MaterialDesignController::IsShelfMaterial()) {
       ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
       gfx::ImageSkia shelf_background =
           *rb.GetImageSkiaNamed(IDR_ASH_SHELF_BACKGROUND);
       shelf_background_left_ = gfx::ImageSkiaOperations::CreateRotatedImage(
           shelf_background, SkBitmapOperations::ROTATION_90_CW);
       shelf_background_right_ = gfx::ImageSkiaOperations::CreateRotatedImage(
           shelf_background, SkBitmapOperations::ROTATION_270_CW);
     }
 
     // This background should be explicitly stacked below any windows already in
     // the dock, otherwise the z-order is set by the order in which windows were
     // added to the container, and UpdateStacking only manages user windows, not
     // the background widget.
     parent->StackChildAtBottom(wm_window);
   }
 
+  // TODO(bruthig): Remove opaque_background_ => and this entire method.
   // Transitions to |visible_background_type_| if the widget is visible and to
   // SHELF_BACKGROUND_DEFAULT if it is not.
   void UpdateBackground() {
     ShelfBackgroundType background_type =
         IsVisible() ? visible_background_type_ : SHELF_BACKGROUND_DEFAULT;
     BackgroundAnimatorChangeType change_type =
         IsVisible() ? visible_background_change_type_
                     : BACKGROUND_CHANGE_IMMEDIATE;
 
     float target_opacity =
@@ skipping 13 matching lines @@
     // See also ShelfWidget::SetPaintsBackground.
     background_animator_.SetPaintsBackground(
         background_type != SHELF_BACKGROUND_DEFAULT, change_type);
     SchedulePaintInRect(gfx::Rect(GetWindowBoundsInScreen().size()));
   }
 
   DockedWindowLayoutManager* manager_;
 
   DockedAlignment alignment_;
 
+  // TODO(bruthig): Replace BackgroundAnimator with ShelfBackgroundAnimator.
   // The animator for the background transitions.
   BackgroundAnimator background_animator_;
 
   // The alpha to use for drawing image assets covering the docked background.
   int alpha_;
 
+  // TODO(bruthig): Remove opaque_background_.
   // Solid black background that can be made fully opaque.
   ui::Layer opaque_background_;
 
   // Backgrounds created from shelf background by 90 or 270 degree rotation.
   // TODO(tdanderson): These members can be removed once the material design
   // shelf is enabled by default. See crbug.com/614453.
   gfx::ImageSkia shelf_background_left_;
   gfx::ImageSkia shelf_background_right_;
 
   // The background type to use when the widget is visible. When not visible,
@@ skipping 1107 matching lines @@
 
 void DockedWindowLayoutManager::OnKeyboardBoundsChanging(
     const gfx::Rect& keyboard_bounds) {
   // This bounds change will have caused a change to the Shelf which does not
   // propagate automatically to this class, so manually recalculate bounds.
   Relayout();
   UpdateDockBounds(DockedWindowLayoutManagerObserver::KEYBOARD_BOUNDS_CHANGING);
 }
 
 }  // namespace ash