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

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

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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_list.h ('k') | ash/wm/window_manager_unittest.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"
(...skipping 25 matching lines...) Expand all
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
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
OLDNEW
« no previous file with comments | « ash/wm/window_cycle_list.h ('k') | ash/wm/window_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698