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

Side by Side Diff: ui/wm/core/window_modality_controller.h

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/window_animations_unittest.cc ('k') | ui/wm/core/window_modality_controller.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef UI_WM_CORE_WINDOW_MODALITY_CONTROLLER_H_ 5 #ifndef UI_WM_CORE_WINDOW_MODALITY_CONTROLLER_H_
6 #define UI_WM_CORE_WINDOW_MODALITY_CONTROLLER_H_ 6 #define UI_WM_CORE_WINDOW_MODALITY_CONTROLLER_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "ui/aura/env_observer.h" 11 #include "ui/aura/env_observer.h"
12 #include "ui/aura/window_observer.h" 12 #include "ui/aura/window_observer.h"
13 #include "ui/events/event_handler.h" 13 #include "ui/events/event_handler.h"
14 #include "ui/wm/core/wm_core_export.h" 14 #include "ui/wm/core/wm_core_export.h"
15 15
16 namespace ui { 16 namespace ui {
17 class EventTarget; 17 class EventTarget;
18 class LocatedEvent; 18 class LocatedEvent;
19 } 19 }
20 20
21 namespace views { 21 namespace wm {
22 namespace corewm {
23 22
24 // Sets the modal parent for the child. 23 // Sets the modal parent for the child.
25 WM_CORE_EXPORT void SetModalParent(aura::Window* child, aura::Window* parent); 24 WM_CORE_EXPORT void SetModalParent(aura::Window* child, aura::Window* parent);
26 25
27 // Returns the modal transient child of |window|, or NULL if |window| does not 26 // Returns the modal transient child of |window|, or NULL if |window| does not
28 // have any modal transient children. 27 // have any modal transient children.
29 WM_CORE_EXPORT aura::Window* GetModalTransient(aura::Window* window); 28 WM_CORE_EXPORT aura::Window* GetModalTransient(aura::Window* window);
30 29
31 // WindowModalityController is an event filter that consumes events sent to 30 // WindowModalityController is an event filter that consumes events sent to
32 // windows that are the transient parents of window-modal windows. This filter 31 // windows that are the transient parents of window-modal windows. This filter
(...skipping 27 matching lines...) Expand all
60 bool ProcessLocatedEvent(aura::Window* target, 59 bool ProcessLocatedEvent(aura::Window* target,
61 ui::LocatedEvent* event); 60 ui::LocatedEvent* event);
62 61
63 std::vector<aura::Window*> windows_; 62 std::vector<aura::Window*> windows_;
64 63
65 ui::EventTarget* event_target_; 64 ui::EventTarget* event_target_;
66 65
67 DISALLOW_COPY_AND_ASSIGN(WindowModalityController); 66 DISALLOW_COPY_AND_ASSIGN(WindowModalityController);
68 }; 67 };
69 68
70 } // namespace corewm 69 } // namespace wm
71 } // namespace views
72 70
73 #endif // UI_WM_CORE_WINDOW_MODALITY_CONTROLLER_H_ 71 #endif // UI_WM_CORE_WINDOW_MODALITY_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ui/wm/core/window_animations_unittest.cc ('k') | ui/wm/core/window_modality_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698