| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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_window.h" | 5 #include "ash/wm_window.h" |
| 6 | 6 |
| 7 #include "ash/ash_constants.h" | 7 #include "ash/ash_constants.h" |
| 8 #include "ash/public/cpp/config.h" | 8 #include "ash/public/cpp/config.h" |
| 9 #include "ash/public/cpp/shell_window_ids.h" | 9 #include "ash/public/cpp/shell_window_ids.h" |
| 10 #include "ash/public/cpp/window_properties.h" | 10 #include "ash/public/cpp/window_properties.h" |
| (...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 437 } | 437 } |
| 438 | 438 |
| 439 void WmWindow::SetShowState(ui::WindowShowState show_state) { | 439 void WmWindow::SetShowState(ui::WindowShowState show_state) { |
| 440 window_->SetProperty(aura::client::kShowStateKey, show_state); | 440 window_->SetProperty(aura::client::kShowStateKey, show_state); |
| 441 } | 441 } |
| 442 | 442 |
| 443 ui::WindowShowState WmWindow::GetShowState() const { | 443 ui::WindowShowState WmWindow::GetShowState() const { |
| 444 return window_->GetProperty(aura::client::kShowStateKey); | 444 return window_->GetProperty(aura::client::kShowStateKey); |
| 445 } | 445 } |
| 446 | 446 |
| 447 void WmWindow::SetPreMinimizedShowState(ui::WindowShowState show_state) { | |
| 448 window_->SetProperty(aura::client::kPreMinimizedShowStateKey, show_state); | |
| 449 } | |
| 450 | |
| 451 ui::WindowShowState WmWindow::GetPreMinimizedShowState() const { | |
| 452 return window_->GetProperty(aura::client::kPreMinimizedShowStateKey); | |
| 453 } | |
| 454 | |
| 455 void WmWindow::SetPreFullscreenShowState(ui::WindowShowState show_state) { | 447 void WmWindow::SetPreFullscreenShowState(ui::WindowShowState show_state) { |
| 456 // We should never store the ui::SHOW_STATE_MINIMIZED as the show state before | 448 // We should never store the ui::SHOW_STATE_MINIMIZED as the show state before |
| 457 // fullscreen. | 449 // fullscreen. |
| 458 DCHECK_NE(show_state, ui::SHOW_STATE_MINIMIZED); | 450 DCHECK_NE(show_state, ui::SHOW_STATE_MINIMIZED); |
| 459 window_->SetProperty(aura::client::kPreFullscreenShowStateKey, show_state); | 451 window_->SetProperty(aura::client::kPreFullscreenShowStateKey, show_state); |
| 460 } | 452 } |
| 461 | 453 |
| 462 void WmWindow::SetRestoreOverrides(const gfx::Rect& bounds_override, | 454 void WmWindow::SetRestoreOverrides(const gfx::Rect& bounds_override, |
| 463 ui::WindowShowState window_state_override) { | 455 ui::WindowShowState window_state_override) { |
| 464 if (bounds_override.IsEmpty()) { | 456 if (bounds_override.IsEmpty()) { |
| (...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 732 observer.OnTransientChildAdded(this, Get(transient)); | 724 observer.OnTransientChildAdded(this, Get(transient)); |
| 733 } | 725 } |
| 734 | 726 |
| 735 void WmWindow::OnTransientChildRemoved(aura::Window* window, | 727 void WmWindow::OnTransientChildRemoved(aura::Window* window, |
| 736 aura::Window* transient) { | 728 aura::Window* transient) { |
| 737 for (auto& observer : transient_observers_) | 729 for (auto& observer : transient_observers_) |
| 738 observer.OnTransientChildRemoved(this, Get(transient)); | 730 observer.OnTransientChildRemoved(this, Get(transient)); |
| 739 } | 731 } |
| 740 | 732 |
| 741 } // namespace ash | 733 } // namespace ash |
| OLD | NEW |