| OLD | NEW |
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/common/wm/workspace_controller.h" | 5 #include "ash/wm/workspace_controller.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "ash/common/shelf/wm_shelf.h" | |
| 10 #include "ash/common/wm/dock/docked_window_layout_manager.h" | |
| 11 #include "ash/common/wm/fullscreen_window_finder.h" | |
| 12 #include "ash/common/wm/window_state.h" | |
| 13 #include "ash/common/wm/wm_window_animations.h" | |
| 14 #include "ash/common/wm/workspace/workspace_event_handler.h" | |
| 15 #include "ash/common/wm/workspace/workspace_layout_manager.h" | |
| 16 #include "ash/common/wm/workspace/workspace_layout_manager_backdrop_delegate.h" | |
| 17 #include "ash/common/wm_shell.h" | |
| 18 #include "ash/common/wm_window.h" | |
| 19 #include "ash/public/cpp/shell_window_ids.h" | 9 #include "ash/public/cpp/shell_window_ids.h" |
| 20 #include "ash/root_window_controller.h" | 10 #include "ash/root_window_controller.h" |
| 11 #include "ash/shelf/wm_shelf.h" |
| 12 #include "ash/wm/dock/docked_window_layout_manager.h" |
| 13 #include "ash/wm/fullscreen_window_finder.h" |
| 14 #include "ash/wm/window_state.h" |
| 15 #include "ash/wm/wm_window_animations.h" |
| 16 #include "ash/wm/workspace/workspace_event_handler.h" |
| 17 #include "ash/wm/workspace/workspace_layout_manager.h" |
| 18 #include "ash/wm/workspace/workspace_layout_manager_backdrop_delegate.h" |
| 19 #include "ash/wm_shell.h" |
| 20 #include "ash/wm_window.h" |
| 21 #include "base/memory/ptr_util.h" | 21 #include "base/memory/ptr_util.h" |
| 22 #include "ui/compositor/layer.h" | 22 #include "ui/compositor/layer.h" |
| 23 #include "ui/compositor/scoped_layer_animation_settings.h" | 23 #include "ui/compositor/scoped_layer_animation_settings.h" |
| 24 | 24 |
| 25 namespace ash { | 25 namespace ash { |
| 26 namespace { | 26 namespace { |
| 27 | 27 |
| 28 // Amount of time to pause before animating anything. Only used during initial | 28 // Amount of time to pause before animating anything. Only used during initial |
| 29 // animation (when logging in). | 29 // animation (when logging in). |
| 30 const int kInitialPauseTimeMS = 750; | 30 const int kInitialPauseTimeMS = 750; |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 void WorkspaceController::OnWindowDestroying(aura::Window* window) { | 125 void WorkspaceController::OnWindowDestroying(aura::Window* window) { |
| 126 DCHECK_EQ(WmWindow::Get(window), viewport_); | 126 DCHECK_EQ(WmWindow::Get(window), viewport_); |
| 127 viewport_->aura_window()->RemoveObserver(this); | 127 viewport_->aura_window()->RemoveObserver(this); |
| 128 viewport_ = nullptr; | 128 viewport_ = nullptr; |
| 129 // Destroy |event_handler_| too as it depends upon |window|. | 129 // Destroy |event_handler_| too as it depends upon |window|. |
| 130 event_handler_.reset(); | 130 event_handler_.reset(); |
| 131 layout_manager_ = nullptr; | 131 layout_manager_ = nullptr; |
| 132 } | 132 } |
| 133 | 133 |
| 134 } // namespace ash | 134 } // namespace ash |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2736573002:
chromeos: Move files in //ash/common to //ash, part 2 (Closed)
