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

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

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)
Patch Set: Created 3 years, 9 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/mru_window_tracker.h ('k') | ash/wm/mru_window_tracker_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 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/mru_window_tracker.h" 5 #include "ash/wm/mru_window_tracker.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "ash/common/wm_shell.h"
10 #include "ash/common/wm_window.h"
9 #include "ash/public/cpp/shell_window_ids.h" 11 #include "ash/public/cpp/shell_window_ids.h"
10 #include "ash/wm/focus_rules.h" 12 #include "ash/wm/focus_rules.h"
11 #include "ash/wm/switchable_windows.h" 13 #include "ash/wm/switchable_windows.h"
12 #include "ash/wm/window_state.h" 14 #include "ash/wm/window_state.h"
13 #include "ash/wm_shell.h"
14 #include "ash/wm_window.h"
15 #include "base/bind.h" 15 #include "base/bind.h"
16 #include "ui/aura/window.h" 16 #include "ui/aura/window.h"
17 17
18 namespace ash { 18 namespace ash {
19 19
20 namespace { 20 namespace {
21 21
22 using CanActivateWindowPredicate = base::Callback<bool(WmWindow*)>; 22 using CanActivateWindowPredicate = base::Callback<bool(WmWindow*)>;
23 23
24 bool CallCanActivate(WmWindow* window) { 24 bool CallCanActivate(WmWindow* window) {
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 152
153 void MruWindowTracker::OnWindowDestroyed(aura::Window* window) { 153 void MruWindowTracker::OnWindowDestroyed(aura::Window* window) {
154 // It's possible for OnWindowActivated() to be called after 154 // It's possible for OnWindowActivated() to be called after
155 // OnWindowDestroying(). This means we need to override OnWindowDestroyed() 155 // OnWindowDestroying(). This means we need to override OnWindowDestroyed()
156 // else we may end up with a deleted window in |mru_windows_|. 156 // else we may end up with a deleted window in |mru_windows_|.
157 mru_windows_.remove(WmWindow::Get(window)); 157 mru_windows_.remove(WmWindow::Get(window));
158 window->RemoveObserver(this); 158 window->RemoveObserver(this);
159 } 159 }
160 160
161 } // namespace ash 161 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/mru_window_tracker.h ('k') | ash/wm/mru_window_tracker_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698