diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-26 15:33:35 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-26 15:33:35 +0000 |
commit | 4cc33f40fde0c1c537863321fa6fde6aa2629843 (patch) | |
tree | 49a4c1e4b9b8139634530af085e544e1d003ebe5 /ui/wm/public | |
parent | 14be8a2901fd1ef01b2d886fdc67b46dfad95a8f (diff) | |
download | chromium_src-4cc33f40fde0c1c537863321fa6fde6aa2629843.zip chromium_src-4cc33f40fde0c1c537863321fa6fde6aa2629843.tar.gz chromium_src-4cc33f40fde0c1c537863321fa6fde6aa2629843.tar.bz2 |
Revert 259580 "Move wm/public into wm target"
> Move wm/public into wm target
>
> TBR=sky@chromium.org
> http://crbug/com/308710
>
> Review URL: https://codereview.chromium.org/209383003
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/213033002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259589 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/wm/public')
-rw-r--r-- | ui/wm/public/activation_change_observer.h | 9 | ||||
-rw-r--r-- | ui/wm/public/activation_client.cc | 2 | ||||
-rw-r--r-- | ui/wm/public/activation_client.h | 14 | ||||
-rw-r--r-- | ui/wm/public/activation_delegate.h | 10 | ||||
-rw-r--r-- | ui/wm/public/animation_host.h | 9 | ||||
-rw-r--r-- | ui/wm/public/dispatcher_client.h | 10 | ||||
-rw-r--r-- | ui/wm/public/drag_drop_client.h | 9 | ||||
-rw-r--r-- | ui/wm/public/drag_drop_delegate.h | 9 | ||||
-rw-r--r-- | ui/wm/public/scoped_tooltip_disabler.h | 3 | ||||
-rw-r--r-- | ui/wm/public/tooltip_client.h | 13 | ||||
-rw-r--r-- | ui/wm/public/transient_window_client.h | 8 | ||||
-rw-r--r-- | ui/wm/public/window_move_client.h | 9 |
12 files changed, 55 insertions, 50 deletions
diff --git a/ui/wm/public/activation_change_observer.h b/ui/wm/public/activation_change_observer.h index 6a4fe3b..68d5b8a 100644 --- a/ui/wm/public/activation_change_observer.h +++ b/ui/wm/public/activation_change_observer.h @@ -5,14 +5,14 @@ #ifndef UI_WM_PUBLIC_ACTIVATION_CHANGE_OBSERVER_H_ #define UI_WM_PUBLIC_ACTIVATION_CHANGE_OBSERVER_H_ -#include "ui/wm/wm_export.h" +#include "ui/aura/aura_export.h" namespace aura { class Window; namespace client { -class WM_EXPORT ActivationChangeObserver { +class AURA_EXPORT ActivationChangeObserver { public: // Called when |active| gains focus, or there is no active window // (|active| is NULL in this case.) |old_active| refers to the @@ -33,10 +33,11 @@ class WM_EXPORT ActivationChangeObserver { // Gets/Sets the ActivationChangeObserver for a specific window. This observer // is notified after the ActivationClient notifies all registered observers. -WM_EXPORT void SetActivationChangeObserver( +AURA_EXPORT void SetActivationChangeObserver( Window* window, ActivationChangeObserver* observer); -WM_EXPORT ActivationChangeObserver* GetActivationChangeObserver(Window* window); +AURA_EXPORT ActivationChangeObserver* GetActivationChangeObserver( + Window* window); } // namespace client } // namespace aura diff --git a/ui/wm/public/activation_client.cc b/ui/wm/public/activation_client.cc index f22ac9c..6a47554 100644 --- a/ui/wm/public/activation_client.cc +++ b/ui/wm/public/activation_client.cc @@ -7,7 +7,7 @@ #include "ui/aura/window.h" #include "ui/aura/window_property.h" -DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(WM_EXPORT, aura::Window*) +DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, aura::Window*) DECLARE_WINDOW_PROPERTY_TYPE(aura::client::ActivationClient*) namespace aura { diff --git a/ui/wm/public/activation_client.h b/ui/wm/public/activation_client.h index decd26d..fc35131 100644 --- a/ui/wm/public/activation_client.h +++ b/ui/wm/public/activation_client.h @@ -5,7 +5,7 @@ #ifndef UI_WM_PUBLIC_ACTIVATION_CLIENT_H_ #define UI_WM_PUBLIC_ACTIVATION_CLIENT_H_ -#include "ui/wm/wm_export.h" +#include "ui/aura/aura_export.h" namespace ui { class Event; @@ -18,7 +18,7 @@ namespace client { class ActivationChangeObserver; // An interface implemented by an object that manages window activation. -class WM_EXPORT ActivationClient { +class AURA_EXPORT ActivationClient { public: // Adds/Removes ActivationChangeObservers. virtual void AddObserver(ActivationChangeObserver* observer) = 0; @@ -57,9 +57,9 @@ class WM_EXPORT ActivationClient { }; // Sets/Gets the activation client on the root Window. -WM_EXPORT void SetActivationClient(Window* root_window, - ActivationClient* client); -WM_EXPORT ActivationClient* GetActivationClient(Window* root_window); +AURA_EXPORT void SetActivationClient(Window* root_window, + ActivationClient* client); +AURA_EXPORT ActivationClient* GetActivationClient(Window* root_window); // Some types of transient window are only visible when active. // The transient parents of these windows may have visual appearance properties @@ -68,8 +68,8 @@ WM_EXPORT ActivationClient* GetActivationClient(Window* root_window); // TODO(beng): currently the UI framework (views) implements the actual // close-on-deactivate component of this feature but it should be // possible to implement in the aura client. -WM_EXPORT void SetHideOnDeactivate(Window* window, bool hide_on_deactivate); -WM_EXPORT bool GetHideOnDeactivate(Window* window); +AURA_EXPORT void SetHideOnDeactivate(Window* window, bool hide_on_deactivate); +AURA_EXPORT bool GetHideOnDeactivate(Window* window); } // namespace clients } // namespace aura diff --git a/ui/wm/public/activation_delegate.h b/ui/wm/public/activation_delegate.h index 5fe5d53..3c5b3ae 100644 --- a/ui/wm/public/activation_delegate.h +++ b/ui/wm/public/activation_delegate.h @@ -5,7 +5,7 @@ #ifndef UI_WM_PUBLIC_ACTIVATION_DELEGATE_H_ #define UI_WM_PUBLIC_ACTIVATION_DELEGATE_H_ -#include "ui/wm/wm_export.h" +#include "ui/aura/aura_export.h" namespace ui { class Event; @@ -17,7 +17,7 @@ namespace client { // An interface implemented by an object that configures and responds to changes // to a window's activation state. -class WM_EXPORT ActivationDelegate { +class AURA_EXPORT ActivationDelegate { public: // Returns true if the window should be activated. virtual bool ShouldActivate() const = 0; @@ -27,9 +27,9 @@ class WM_EXPORT ActivationDelegate { }; // Sets/Gets the ActivationDelegate on the Window. No ownership changes. -WM_EXPORT void SetActivationDelegate(Window* window, - ActivationDelegate* delegate); -WM_EXPORT ActivationDelegate* GetActivationDelegate(Window* window); +AURA_EXPORT void SetActivationDelegate(Window* window, + ActivationDelegate* delegate); +AURA_EXPORT ActivationDelegate* GetActivationDelegate(Window* window); } // namespace client } // namespace aura diff --git a/ui/wm/public/animation_host.h b/ui/wm/public/animation_host.h index 5352e62..71f9f4d 100644 --- a/ui/wm/public/animation_host.h +++ b/ui/wm/public/animation_host.h @@ -6,7 +6,7 @@ #define UI_WM_PUBLIC_ANIMATION_HOST_H_ #include "base/compiler_specific.h" -#include "ui/wm/wm_export.h" +#include "ui/aura/aura_export.h" namespace gfx { class Vector2d; @@ -19,7 +19,7 @@ namespace client { // Interface for top level window host of animation. Communicates additional // bounds required for animation as well as animation completion for deferring // window closes on hide. -class WM_EXPORT AnimationHost { +class AURA_EXPORT AnimationHost { public: // Ensure the host window is at least this large so that transitions have // sufficient space. @@ -38,8 +38,9 @@ class WM_EXPORT AnimationHost { virtual ~AnimationHost() {} }; -WM_EXPORT void SetAnimationHost(Window* window, AnimationHost* animation_host); -WM_EXPORT AnimationHost* GetAnimationHost(Window* window); +AURA_EXPORT void SetAnimationHost(Window* window, + AnimationHost* animation_host); +AURA_EXPORT AnimationHost* GetAnimationHost(Window* window); } // namespace client } // namespace aura diff --git a/ui/wm/public/dispatcher_client.h b/ui/wm/public/dispatcher_client.h index 03376c5..9fd9c94 100644 --- a/ui/wm/public/dispatcher_client.h +++ b/ui/wm/public/dispatcher_client.h @@ -6,23 +6,23 @@ #define UI_WM_PUBLIC_DISPATCHER_CLIENT_H_ #include "base/message_loop/message_pump_dispatcher.h" -#include "ui/wm/wm_export.h" +#include "ui/aura/aura_export.h" namespace aura { class Window; namespace client { // An interface implemented by an object which handles nested dispatchers. -class WM_EXPORT DispatcherClient { +class AURA_EXPORT DispatcherClient { public: virtual void RunWithDispatcher(base::MessagePumpDispatcher* dispatcher) = 0; virtual void QuitNestedMessageLoop() = 0; }; -WM_EXPORT void SetDispatcherClient(Window* root_window, - DispatcherClient* client); -WM_EXPORT DispatcherClient* GetDispatcherClient(Window* root_window); +AURA_EXPORT void SetDispatcherClient(Window* root_window, + DispatcherClient* client); +AURA_EXPORT DispatcherClient* GetDispatcherClient(Window* root_window); } // namespace client } // namespace aura diff --git a/ui/wm/public/drag_drop_client.h b/ui/wm/public/drag_drop_client.h index d0dcbe2..62a2355 100644 --- a/ui/wm/public/drag_drop_client.h +++ b/ui/wm/public/drag_drop_client.h @@ -5,9 +5,9 @@ #ifndef UI_WM_PUBLIC_DRAG_DROP_CLIENT_H_ #define UI_WM_PUBLIC_DRAG_DROP_CLIENT_H_ +#include "ui/aura/aura_export.h" #include "ui/base/dragdrop/drag_drop_types.h" #include "ui/gfx/native_widget_types.h" -#include "ui/wm/wm_export.h" namespace gfx { class Point; @@ -23,7 +23,7 @@ class Window; namespace client { // An interface implemented by an object that controls a drag and drop session. -class WM_EXPORT DragDropClient { +class AURA_EXPORT DragDropClient { public: virtual ~DragDropClient() {} @@ -52,8 +52,9 @@ class WM_EXPORT DragDropClient { virtual bool IsDragDropInProgress() = 0; }; -WM_EXPORT void SetDragDropClient(Window* root_window, DragDropClient* client); -WM_EXPORT DragDropClient* GetDragDropClient(Window* root_window); +AURA_EXPORT void SetDragDropClient(Window* root_window, + DragDropClient* client); +AURA_EXPORT DragDropClient* GetDragDropClient(Window* root_window); } // namespace client } // namespace aura diff --git a/ui/wm/public/drag_drop_delegate.h b/ui/wm/public/drag_drop_delegate.h index bf52b93..50f6c26 100644 --- a/ui/wm/public/drag_drop_delegate.h +++ b/ui/wm/public/drag_drop_delegate.h @@ -5,7 +5,7 @@ #ifndef UI_WM_PUBLIC_DRAG_DROP_DELEGATE_H_ #define UI_WM_PUBLIC_DRAG_DROP_DELEGATE_H_ -#include "ui/wm/wm_export.h" +#include "ui/aura/aura_export.h" namespace ui { class DropTargetEvent; @@ -16,7 +16,7 @@ class Window; namespace client { // Delegate interface for drag and drop actions on aura::Window. -class WM_EXPORT DragDropDelegate { +class AURA_EXPORT DragDropDelegate { public: // OnDragEntered is invoked when the mouse enters this window during a drag & // drop session. This is immediately followed by an invocation of @@ -41,8 +41,9 @@ class WM_EXPORT DragDropDelegate { virtual ~DragDropDelegate() {} }; -WM_EXPORT void SetDragDropDelegate(Window* window, DragDropDelegate* delegate); -WM_EXPORT DragDropDelegate* GetDragDropDelegate(Window* window); +AURA_EXPORT void SetDragDropDelegate(Window* window, + DragDropDelegate* delegate); +AURA_EXPORT DragDropDelegate* GetDragDropDelegate(Window* window); } // namespace client } // namespace aura diff --git a/ui/wm/public/scoped_tooltip_disabler.h b/ui/wm/public/scoped_tooltip_disabler.h index 8371c02..0fd3e11 100644 --- a/ui/wm/public/scoped_tooltip_disabler.h +++ b/ui/wm/public/scoped_tooltip_disabler.h @@ -6,13 +6,12 @@ #define UI_WM_PUBLIC_SCOPED_TOOLTIP_DISABLER_H_ #include "ui/aura/window_observer.h" -#include "ui/wm/wm_export.h" namespace aura { namespace client { // Use to temporarily disable tooltips. -class WM_EXPORT ScopedTooltipDisabler : aura::WindowObserver { +class AURA_EXPORT ScopedTooltipDisabler : aura::WindowObserver { public: // Disables tooltips on |window| (does nothing if |window| is NULL). Tooltips // are reenabled from the destructor when there are no most outstanding diff --git a/ui/wm/public/tooltip_client.h b/ui/wm/public/tooltip_client.h index 477b239..f592b21 100644 --- a/ui/wm/public/tooltip_client.h +++ b/ui/wm/public/tooltip_client.h @@ -5,8 +5,8 @@ #ifndef UI_WM_PUBLIC_TOOLTIP_CLIENT_H_ #define UI_WM_PUBLIC_TOOLTIP_CLIENT_H_ +#include "ui/aura/aura_export.h" #include "ui/gfx/font.h" -#include "ui/wm/wm_export.h" namespace aura { class Window; @@ -14,7 +14,7 @@ namespace client { class ScopedTooltipDisabler; -class WM_EXPORT TooltipClient { +class AURA_EXPORT TooltipClient { public: // Informs the shell tooltip manager of change in tooltip for window |target|. virtual void UpdateTooltip(Window* target) = 0; @@ -32,11 +32,12 @@ class WM_EXPORT TooltipClient { friend class ScopedTooltipDisabler; }; -WM_EXPORT void SetTooltipClient(Window* root_window, TooltipClient* client); -WM_EXPORT TooltipClient* GetTooltipClient(Window* root_window); +AURA_EXPORT void SetTooltipClient(Window* root_window, + TooltipClient* client); +AURA_EXPORT TooltipClient* GetTooltipClient(Window* root_window); -WM_EXPORT void SetTooltipText(Window* window, base::string16* tooltip_text); -WM_EXPORT const base::string16 GetTooltipText(Window* window); +AURA_EXPORT void SetTooltipText(Window* window, base::string16* tooltip_text); +AURA_EXPORT const base::string16 GetTooltipText(Window* window); } // namespace client } // namespace aura diff --git a/ui/wm/public/transient_window_client.h b/ui/wm/public/transient_window_client.h index 66aa33f..2086100 100644 --- a/ui/wm/public/transient_window_client.h +++ b/ui/wm/public/transient_window_client.h @@ -6,7 +6,7 @@ #define UI_WM_PUBLIC_TRANSIENT_WINDOW_CLIENT_H_ #include "base/basictypes.h" -#include "ui/wm/wm_export.h" +#include "ui/aura/aura_export.h" namespace aura { @@ -24,7 +24,7 @@ namespace client { // Transient windows are typically used for popups and menus. // TODO(sky): nuke this class and replace with calls to TransientWindowManager. // This is temporary until we start moving to ui/wm. -class WM_EXPORT TransientWindowClient { +class AURA_EXPORT TransientWindowClient { public: virtual void AddTransientChild(Window* parent, Window* child) = 0; virtual void RemoveTransientChild(Window* parent, Window* child) = 0; @@ -38,8 +38,8 @@ class WM_EXPORT TransientWindowClient { // Sets/gets the TransientWindowClient. This does *not* take ownership of // |client|. It is assumed the caller will invoke SetTransientWindowClient(NULL) // before deleting |client|. -WM_EXPORT void SetTransientWindowClient(TransientWindowClient* client); -WM_EXPORT TransientWindowClient* GetTransientWindowClient(); +AURA_EXPORT void SetTransientWindowClient(TransientWindowClient* client); +AURA_EXPORT TransientWindowClient* GetTransientWindowClient(); } // namespace client } // namespace aura diff --git a/ui/wm/public/window_move_client.h b/ui/wm/public/window_move_client.h index d8e5794..b8943d3 100644 --- a/ui/wm/public/window_move_client.h +++ b/ui/wm/public/window_move_client.h @@ -5,8 +5,8 @@ #ifndef UI_WM_PUBLIC_WINDOW_MOVE_CLIENT_H_ #define UI_WM_PUBLIC_WINDOW_MOVE_CLIENT_H_ +#include "ui/aura/aura_export.h" #include "ui/gfx/vector2d.h" -#include "ui/wm/wm_export.h" namespace gfx { class Point; @@ -28,7 +28,7 @@ enum WindowMoveSource { // An interface implemented by an object that manages programatically keyed // window moving. -class WM_EXPORT WindowMoveClient { +class AURA_EXPORT WindowMoveClient { public: // Starts a nested message loop for moving the window. |drag_offset| is the // offset from the window origin to the cursor when the drag was started. @@ -46,8 +46,9 @@ class WM_EXPORT WindowMoveClient { }; // Sets/Gets the activation client for the specified window. -WM_EXPORT void SetWindowMoveClient(Window* window, WindowMoveClient* client); -WM_EXPORT WindowMoveClient* GetWindowMoveClient(Window* window); +AURA_EXPORT void SetWindowMoveClient(Window* window, + WindowMoveClient* client); +AURA_EXPORT WindowMoveClient* GetWindowMoveClient(Window* window); } // namespace client } // namespace aura |