| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_cycle_list.h" | 5 #include "ash/wm/window_cycle_list.h" |
| 6 | 6 |
| 7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
| 8 #include "ash/wm/mru_window_tracker.h" | 8 #include "ash/wm/mru_window_tracker.h" |
| 9 #include "ash/wm/window_animations.h" | 9 #include "ash/wm/window_animations.h" |
| 10 #include "ash/wm/window_state.h" | 10 #include "ash/wm/window_state.h" |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 | 36 |
| 37 // Show |window| at the top of the stacking order. | 37 // Show |window| at the top of the stacking order. |
| 38 void Show(aura::Window* window); | 38 void Show(aura::Window* window); |
| 39 | 39 |
| 40 // Cancel restoring the window on going out of scope. | 40 // Cancel restoring the window on going out of scope. |
| 41 void CancelRestore(); | 41 void CancelRestore(); |
| 42 | 42 |
| 43 aura::Window* window() { return window_; } | 43 aura::Window* window() { return window_; } |
| 44 | 44 |
| 45 // aura::WindowObserver: | 45 // aura::WindowObserver: |
| 46 virtual void OnWillRemoveWindow(aura::Window* window) OVERRIDE; | 46 virtual void OnWillRemoveWindow(aura::Window* window) override; |
| 47 | 47 |
| 48 private: | 48 private: |
| 49 // The window being shown. | 49 // The window being shown. |
| 50 aura::Window* window_; | 50 aura::Window* window_; |
| 51 | 51 |
| 52 // The window immediately below where window_ belongs. | 52 // The window immediately below where window_ belongs. |
| 53 aura::Window* stack_window_above_; | 53 aura::Window* stack_window_above_; |
| 54 | 54 |
| 55 // If true, minimize window_ on going out of scope. | 55 // If true, minimize window_ on going out of scope. |
| 56 bool minimized_; | 56 bool minimized_; |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 162 DCHECK(i != windows_.end()); | 162 DCHECK(i != windows_.end()); |
| 163 int removed_index = static_cast<int>(i - windows_.begin()); | 163 int removed_index = static_cast<int>(i - windows_.begin()); |
| 164 windows_.erase(i); | 164 windows_.erase(i); |
| 165 if (current_index_ > removed_index || | 165 if (current_index_ > removed_index || |
| 166 current_index_ == static_cast<int>(windows_.size())) { | 166 current_index_ == static_cast<int>(windows_.size())) { |
| 167 current_index_--; | 167 current_index_--; |
| 168 } | 168 } |
| 169 } | 169 } |
| 170 | 170 |
| 171 } // namespace ash | 171 } // namespace ash |
| OLD | NEW |