| Index: ui/wm/core/window_modality_controller.h
|
| diff --git a/ui/views/corewm/window_modality_controller.h b/ui/wm/core/window_modality_controller.h
|
| similarity index 78%
|
| rename from ui/views/corewm/window_modality_controller.h
|
| rename to ui/wm/core/window_modality_controller.h
|
| index 88150a5425302bab0e82021a948062fb828c5772..f31162ab32d110159de20379bb51aa004473717f 100644
|
| --- a/ui/views/corewm/window_modality_controller.h
|
| +++ b/ui/wm/core/window_modality_controller.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef UI_VIEWS_COREWM_WINDOW_MODALITY_CONTROLLER_H_
|
| -#define UI_VIEWS_COREWM_WINDOW_MODALITY_CONTROLLER_H_
|
| +#ifndef UI_WM_CORE_WINDOW_MODALITY_CONTROLLER_H_
|
| +#define UI_WM_CORE_WINDOW_MODALITY_CONTROLLER_H_
|
|
|
| #include <vector>
|
|
|
| @@ -11,7 +11,7 @@
|
| #include "ui/aura/env_observer.h"
|
| #include "ui/aura/window_observer.h"
|
| #include "ui/events/event_handler.h"
|
| -#include "ui/views/views_export.h"
|
| +#include "ui/wm/core/wm_core_export.h"
|
|
|
| namespace ui {
|
| class EventTarget;
|
| @@ -22,18 +22,18 @@ namespace views {
|
| namespace corewm {
|
|
|
| // Sets the modal parent for the child.
|
| -VIEWS_EXPORT void SetModalParent(aura::Window* child, aura::Window* parent);
|
| +WM_CORE_EXPORT void SetModalParent(aura::Window* child, aura::Window* parent);
|
|
|
| // Returns the modal transient child of |window|, or NULL if |window| does not
|
| // have any modal transient children.
|
| -VIEWS_EXPORT aura::Window* GetModalTransient(aura::Window* window);
|
| +WM_CORE_EXPORT aura::Window* GetModalTransient(aura::Window* window);
|
|
|
| // WindowModalityController is an event filter that consumes events sent to
|
| // windows that are the transient parents of window-modal windows. This filter
|
| // must be added to the CompoundEventFilter so that activation works properly.
|
| -class VIEWS_EXPORT WindowModalityController : public ui::EventHandler,
|
| - public aura::EnvObserver,
|
| - public aura::WindowObserver {
|
| +class WM_CORE_EXPORT WindowModalityController : public ui::EventHandler,
|
| + public aura::EnvObserver,
|
| + public aura::WindowObserver {
|
| public:
|
| explicit WindowModalityController(ui::EventTarget* event_target);
|
| virtual ~WindowModalityController();
|
| @@ -70,4 +70,4 @@ class VIEWS_EXPORT WindowModalityController : public ui::EventHandler,
|
| } // namespace corewm
|
| } // namespace views
|
|
|
| -#endif // UI_VIEWS_COREWM_WINDOW_MODALITY_CONTROLLER_H_
|
| +#endif // UI_WM_CORE_WINDOW_MODALITY_CONTROLLER_H_
|
|
|