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

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

Issue 196063002: Move wm/core to wm namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 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 | Annotate | Revision Log
« no previous file with comments | « ui/wm/core/transient_window_manager.h ('k') | ui/wm/core/transient_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 "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 namespace views { 20 namespace wm {
21 namespace corewm {
22 21
23 DEFINE_OWNED_WINDOW_PROPERTY_KEY(TransientWindowManager, kPropertyKey, NULL); 22 DEFINE_OWNED_WINDOW_PROPERTY_KEY(TransientWindowManager, kPropertyKey, NULL);
24 23
25 TransientWindowManager::~TransientWindowManager() { 24 TransientWindowManager::~TransientWindowManager() {
26 } 25 }
27 26
28 // static 27 // static
29 TransientWindowManager* TransientWindowManager::Get(Window* window) { 28 TransientWindowManager* TransientWindowManager::Get(Window* window) {
30 TransientWindowManager* manager = window->GetProperty(kPropertyKey); 29 TransientWindowManager* manager = window->GetProperty(kPropertyKey);
31 if (!manager) { 30 if (!manager) {
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 144
146 // Destroy transient children, only after we've removed ourselves from our 145 // Destroy transient children, only after we've removed ourselves from our
147 // parent, as destroying an active transient child may otherwise attempt to 146 // parent, as destroying an active transient child may otherwise attempt to
148 // refocus us. 147 // refocus us.
149 // NOTE: this use to be after removed from parent, now its before. 148 // NOTE: this use to be after removed from parent, now its before.
150 Windows transient_children(transient_children_); 149 Windows transient_children(transient_children_);
151 STLDeleteElements(&transient_children); 150 STLDeleteElements(&transient_children);
152 DCHECK(transient_children_.empty()); 151 DCHECK(transient_children_.empty());
153 } 152 }
154 153
155 } // namespace corewm 154 } // namespace wm
156 } // namespace views
OLDNEW
« no previous file with comments | « ui/wm/core/transient_window_manager.h ('k') | ui/wm/core/transient_window_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698