| Index: ash/common/wm/window_dimmer.cc
|
| diff --git a/ash/common/wm/window_dimmer.cc b/ash/common/wm/window_dimmer.cc
|
| deleted file mode 100644
|
| index c90d806832fe21d6b24aa82e6689315fee2209f6..0000000000000000000000000000000000000000
|
| --- a/ash/common/wm/window_dimmer.cc
|
| +++ /dev/null
|
| @@ -1,88 +0,0 @@
|
| -// Copyright 2015 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/window_dimmer.h"
|
| -
|
| -#include <memory>
|
| -
|
| -#include "ash/common/wm_shell.h"
|
| -#include "ash/common/wm_window.h"
|
| -#include "base/time/time.h"
|
| -#include "ui/aura/window.h"
|
| -#include "ui/compositor/layer.h"
|
| -#include "ui/wm/core/window_animations.h"
|
| -
|
| -namespace ash {
|
| -namespace {
|
| -
|
| -const int kDefaultDimAnimationDurationMs = 200;
|
| -
|
| -const float kDefaultDimOpacity = 0.5f;
|
| -
|
| -} // namespace
|
| -
|
| -WindowDimmer::WindowDimmer(WmWindow* parent)
|
| - : parent_(parent),
|
| - window_(WmShell::Get()->NewWindow(ui::wm::WINDOW_TYPE_NORMAL,
|
| - ui::LAYER_SOLID_COLOR)) {
|
| - window_->SetVisibilityChangesAnimated();
|
| - window_->SetVisibilityAnimationType(
|
| - ::wm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE);
|
| - window_->SetVisibilityAnimationDuration(
|
| - base::TimeDelta::FromMilliseconds(kDefaultDimAnimationDurationMs));
|
| - window_->aura_window()->AddObserver(this);
|
| -
|
| - SetDimOpacity(kDefaultDimOpacity);
|
| -
|
| - parent->AddChild(window_);
|
| - parent->aura_window()->AddObserver(this);
|
| - parent->StackChildAtTop(window_);
|
| -
|
| - window_->SetBounds(gfx::Rect(parent_->GetBounds().size()));
|
| -}
|
| -
|
| -WindowDimmer::~WindowDimmer() {
|
| - if (parent_)
|
| - parent_->aura_window()->RemoveObserver(this);
|
| - if (window_) {
|
| - window_->aura_window()->RemoveObserver(this);
|
| - window_->Destroy();
|
| - }
|
| -}
|
| -
|
| -void WindowDimmer::SetDimOpacity(float target_opacity) {
|
| - DCHECK(window_);
|
| - window_->GetLayer()->SetColor(
|
| - SkColorSetA(SK_ColorBLACK, 255 * target_opacity));
|
| -}
|
| -
|
| -void WindowDimmer::OnWindowBoundsChanged(aura::Window* window,
|
| - const gfx::Rect& old_bounds,
|
| - const gfx::Rect& new_bounds) {
|
| - if (WmWindow::Get(window) == parent_)
|
| - window_->SetBounds(gfx::Rect(new_bounds.size()));
|
| -}
|
| -
|
| -void WindowDimmer::OnWindowDestroying(aura::Window* window) {
|
| - if (WmWindow::Get(window) == parent_) {
|
| - parent_->aura_window()->RemoveObserver(this);
|
| - parent_ = nullptr;
|
| - } else {
|
| - DCHECK_EQ(window_, WmWindow::Get(window));
|
| - window_->aura_window()->RemoveObserver(this);
|
| - window_ = nullptr;
|
| - }
|
| -}
|
| -
|
| -void WindowDimmer::OnWindowHierarchyChanging(
|
| - const HierarchyChangeParams& params) {
|
| - if (WmWindow::Get(params.receiver) == window_ &&
|
| - params.target == params.receiver) {
|
| - // This may happen on a display change or some unexpected condition. Hide
|
| - // the window to ensure it isn't obscuring the wrong thing.
|
| - window_->Hide();
|
| - }
|
| -}
|
| -
|
| -} // namespace ash
|
|
|