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

Side by Side Diff: ui/wm/core/transient_window_manager.cc

Issue 801953002: Use template specialization to generate WindowProperty code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use namespace Created 6 years 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 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 "ui/wm/core/transient_window_manager.h" 5 #include "ui/wm/core/transient_window_manager.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <functional> 8 #include <functional>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
11 #include "base/stl_util.h" 11 #include "base/stl_util.h"
12 #include "ui/aura/window.h" 12 #include "ui/aura/window.h"
13 #include "ui/aura/window_property.h" 13 #include "ui/aura/window_property.h"
14 #include "ui/wm/core/transient_window_observer.h" 14 #include "ui/wm/core/transient_window_observer.h"
15 #include "ui/wm/core/transient_window_stacking_client.h" 15 #include "ui/wm/core/transient_window_stacking_client.h"
16 #include "ui/wm/core/window_util.h" 16 #include "ui/wm/core/window_util.h"
17 17
18 using aura::Window; 18 using aura::Window;
19 19
20 DECLARE_WINDOW_PROPERTY_TYPE(wm::TransientWindowManager*);
21
20 namespace wm { 22 namespace wm {
21 namespace { 23 namespace {
22 24
23 DEFINE_OWNED_WINDOW_PROPERTY_KEY(TransientWindowManager, kPropertyKey, NULL); 25 DEFINE_OWNED_WINDOW_PROPERTY_KEY(TransientWindowManager, kPropertyKey, NULL);
24 26
25 } // namespace 27 } // namespace
26 28
27 TransientWindowManager::~TransientWindowManager() { 29 TransientWindowManager::~TransientWindowManager() {
28 } 30 }
29 31
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 213
212 // Destroy transient children, only after we've removed ourselves from our 214 // Destroy transient children, only after we've removed ourselves from our
213 // parent, as destroying an active transient child may otherwise attempt to 215 // parent, as destroying an active transient child may otherwise attempt to
214 // refocus us. 216 // refocus us.
215 Windows transient_children(transient_children_); 217 Windows transient_children(transient_children_);
216 STLDeleteElements(&transient_children); 218 STLDeleteElements(&transient_children);
217 DCHECK(transient_children_.empty()); 219 DCHECK(transient_children_.empty());
218 } 220 }
219 221
220 } // namespace wm 222 } // namespace wm
OLDNEW
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc ('k') | ui/wm/core/window_animations.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698