Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(327)

Side by Side Diff: ash/wm/window_cycle_list.cc

Issue 1890713002: Adds WmWindow and converts WindowState to use it (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge again Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/wm/window_cycle_controller_unittest.cc ('k') | ash/wm/window_positioner.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
11 #include "ash/wm/window_state_aura.h"
11 #include "ash/wm/window_util.h" 12 #include "ash/wm/window_util.h"
12 #include "ui/aura/window.h" 13 #include "ui/aura/window.h"
13 14
14 namespace ash { 15 namespace ash {
15 16
16 // Returns the window immediately below |window| in the current container. 17 // Returns the window immediately below |window| in the current container.
17 aura::Window* GetWindowBelow(aura::Window* window) { 18 aura::Window* GetWindowBelow(aura::Window* window) {
18 aura::Window* parent = window->parent(); 19 aura::Window* parent = window->parent();
19 if (!parent) 20 if (!parent)
20 return NULL; 21 return NULL;
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 CHECK(i != windows_.end()); 161 CHECK(i != windows_.end());
161 int removed_index = static_cast<int>(i - windows_.begin()); 162 int removed_index = static_cast<int>(i - windows_.begin());
162 windows_.erase(i); 163 windows_.erase(i);
163 if (current_index_ > removed_index || 164 if (current_index_ > removed_index ||
164 current_index_ == static_cast<int>(windows_.size())) { 165 current_index_ == static_cast<int>(windows_.size())) {
165 current_index_--; 166 current_index_--;
166 } 167 }
167 } 168 }
168 169
169 } // namespace ash 170 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/window_cycle_controller_unittest.cc ('k') | ash/wm/window_positioner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698