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" |
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
80 | 80 |
81 aura::Window* GetModalTransientParent(aura::Window* window) { | 81 aura::Window* GetModalTransientParent(aura::Window* window) { |
82 if (window->GetProperty(aura::client::kModalKey) == ui::MODAL_TYPE_WINDOW) | 82 if (window->GetProperty(aura::client::kModalKey) == ui::MODAL_TYPE_WINDOW) |
83 return ::wm::GetTransientParent(window); | 83 return ::wm::GetTransientParent(window); |
84 return NULL; | 84 return NULL; |
85 } | 85 } |
86 | 86 |
87 } // namespace | 87 } // namespace |
88 | 88 |
89 const int ScopedTransformOverviewWindow::kTransitionMilliseconds = 200; | 89 const int ScopedTransformOverviewWindow::kTransitionMilliseconds = 200; |
90 | 90 |
tdanderson
2014/04/10 22:37:12
nit: No blank line between 89 and 91.
Nina
2014/04/14 16:24:04
Done.
| |
91 const int ScopedTransformOverviewWindow::kFadeInMilliseconds = 80; | |
92 | |
91 ScopedTransformOverviewWindow::ScopedTransformOverviewWindow( | 93 ScopedTransformOverviewWindow::ScopedTransformOverviewWindow( |
92 aura::Window* window) | 94 aura::Window* window) |
93 : window_(window), | 95 : window_(window), |
94 minimized_(window->GetProperty(aura::client::kShowStateKey) == | 96 minimized_(window->GetProperty(aura::client::kShowStateKey) == |
95 ui::SHOW_STATE_MINIMIZED), | 97 ui::SHOW_STATE_MINIMIZED), |
96 ignored_by_shelf_(ash::wm::GetWindowState(window)->ignored_by_shelf()), | 98 ignored_by_shelf_(ash::wm::GetWindowState(window)->ignored_by_shelf()), |
97 overview_started_(false), | 99 overview_started_(false), |
98 original_transform_(window->layer()->GetTargetTransform()) { | 100 original_transform_(window->layer()->GetTargetTransform()) { |
99 } | 101 } |
100 | 102 |
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
260 } | 262 } |
261 | 263 |
262 void ScopedTransformOverviewWindow::PrepareForOverview() { | 264 void ScopedTransformOverviewWindow::PrepareForOverview() { |
263 DCHECK(!overview_started_); | 265 DCHECK(!overview_started_); |
264 overview_started_ = true; | 266 overview_started_ = true; |
265 ash::wm::GetWindowState(window_)->set_ignored_by_shelf(true); | 267 ash::wm::GetWindowState(window_)->set_ignored_by_shelf(true); |
266 RestoreWindow(); | 268 RestoreWindow(); |
267 } | 269 } |
268 | 270 |
269 } // namespace ash | 271 } // namespace ash |
OLD | NEW |