Chromium Code Reviews| 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 const int ScopedTransformOverviewWindow::kFadeInMilliseconds = 80; | |
|
flackr
2014/04/16 02:37:10
This constant probably belongs in WindowSelectorIt
Nina
2014/04/16 18:19:12
Done.
| |
| 90 | 91 |
| 91 ScopedTransformOverviewWindow::ScopedTransformOverviewWindow( | 92 ScopedTransformOverviewWindow::ScopedTransformOverviewWindow( |
| 92 aura::Window* window) | 93 aura::Window* window) |
| 93 : window_(window), | 94 : window_(window), |
| 94 minimized_(window->GetProperty(aura::client::kShowStateKey) == | 95 minimized_(window->GetProperty(aura::client::kShowStateKey) == |
| 95 ui::SHOW_STATE_MINIMIZED), | 96 ui::SHOW_STATE_MINIMIZED), |
| 96 ignored_by_shelf_(ash::wm::GetWindowState(window)->ignored_by_shelf()), | 97 ignored_by_shelf_(ash::wm::GetWindowState(window)->ignored_by_shelf()), |
| 97 overview_started_(false), | 98 overview_started_(false), |
| 98 original_transform_(window->layer()->GetTargetTransform()) { | 99 original_transform_(window->layer()->GetTargetTransform()) { |
| 99 } | 100 } |
| (...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 260 } | 261 } |
| 261 | 262 |
| 262 void ScopedTransformOverviewWindow::PrepareForOverview() { | 263 void ScopedTransformOverviewWindow::PrepareForOverview() { |
| 263 DCHECK(!overview_started_); | 264 DCHECK(!overview_started_); |
| 264 overview_started_ = true; | 265 overview_started_ = true; |
| 265 ash::wm::GetWindowState(window_)->set_ignored_by_shelf(true); | 266 ash::wm::GetWindowState(window_)->set_ignored_by_shelf(true); |
| 266 RestoreWindow(); | 267 RestoreWindow(); |
| 267 } | 268 } |
| 268 | 269 |
| 269 } // namespace ash | 270 } // namespace ash |
| OLD | NEW |