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

Side by Side Diff: chrome/browser/chromeos/login/users/wallpaper/wallpaper_window_state_manager.cc

Issue 2889413002: chromeos: nukes window_state_aura (Closed)
Patch Set: merge, remove include from windows and shuffle functions for declaration Created 3 years, 7 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
OLDNEW
1 // Copyright 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 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 "chrome/browser/chromeos/login/users/wallpaper/wallpaper_window_state_m anager.h" 5 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_window_state_m anager.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_state.h" 9 #include "ash/wm/window_state.h"
10 #include "ash/wm/window_state_aura.h"
11 #include "ash/wm/window_util.h" 10 #include "ash/wm/window_util.h"
12 #include "ash/wm_window.h" 11 #include "ash/wm_window.h"
13 #include "chrome/browser/ui/ash/ash_util.h" 12 #include "chrome/browser/ui/ash/ash_util.h"
14 #include "ui/aura/window.h" 13 #include "ui/aura/window.h"
15 14
16 namespace chromeos { 15 namespace chromeos {
17 16
18 // static 17 // static
19 WallpaperWindowStateManager* g_window_state_manager = nullptr; 18 WallpaperWindowStateManager* g_window_state_manager = nullptr;
20 19
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 // If user interacted with the |window| while wallpaper picker is opening, 129 // If user interacted with the |window| while wallpaper picker is opening,
131 // removes the |window| from observed list. 130 // removes the |window| from observed list.
132 for (auto iter = user_id_hash_window_list_map_.begin(); 131 for (auto iter = user_id_hash_window_list_map_.begin();
133 iter != user_id_hash_window_list_map_.end(); ++iter) { 132 iter != user_id_hash_window_list_map_.end(); ++iter) {
134 iter->second.erase(window); 133 iter->second.erase(window);
135 } 134 }
136 window->RemoveObserver(this); 135 window->RemoveObserver(this);
137 } 136 }
138 137
139 } // namespace chromeos 138 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698