OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/wm/overview/scoped_transform_overview_window.h" | 5 #include "ash/wm/overview/scoped_transform_overview_window.h" |
6 | 6 |
7 #include "ash/screen_util.h" | 7 #include "ash/screen_util.h" |
8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
9 #include "ash/wm/overview/scoped_window_copy.h" | 9 #include "ash/wm/overview/scoped_window_copy.h" |
10 #include "ash/wm/window_state.h" | 10 #include "ash/wm/window_state.h" |
11 #include "ui/aura/client/aura_constants.h" | 11 #include "ui/aura/client/aura_constants.h" |
12 #include "ui/aura/client/screen_position_client.h" | 12 #include "ui/aura/client/screen_position_client.h" |
13 #include "ui/aura/window.h" | 13 #include "ui/aura/window.h" |
14 #include "ui/compositor/scoped_layer_animation_settings.h" | 14 #include "ui/compositor/scoped_layer_animation_settings.h" |
15 #include "ui/gfx/animation/tween.h" | 15 #include "ui/gfx/animation/tween.h" |
16 #include "ui/views/corewm/window_animations.h" | |
17 #include "ui/views/corewm/window_util.h" | |
18 #include "ui/views/widget/widget.h" | 16 #include "ui/views/widget/widget.h" |
| 17 #include "ui/wm/core/window_animations.h" |
| 18 #include "ui/wm/core/window_util.h" |
19 | 19 |
20 namespace ash { | 20 namespace ash { |
21 | 21 |
22 namespace { | 22 namespace { |
23 | 23 |
24 // The animation settings used for window selector animations. | 24 // The animation settings used for window selector animations. |
25 class WindowSelectorAnimationSettings | 25 class WindowSelectorAnimationSettings |
26 : public ui::ScopedLayerAnimationSettings { | 26 : public ui::ScopedLayerAnimationSettings { |
27 public: | 27 public: |
28 WindowSelectorAnimationSettings(aura::Window* window) : | 28 WindowSelectorAnimationSettings(aura::Window* window) : |
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
260 } | 260 } |
261 | 261 |
262 void ScopedTransformOverviewWindow::PrepareForOverview() { | 262 void ScopedTransformOverviewWindow::PrepareForOverview() { |
263 DCHECK(!overview_started_); | 263 DCHECK(!overview_started_); |
264 overview_started_ = true; | 264 overview_started_ = true; |
265 ash::wm::GetWindowState(window_)->set_ignored_by_shelf(true); | 265 ash::wm::GetWindowState(window_)->set_ignored_by_shelf(true); |
266 RestoreWindow(); | 266 RestoreWindow(); |
267 } | 267 } |
268 | 268 |
269 } // namespace ash | 269 } // namespace ash |
OLD | NEW |