Index: ui/wm/core/window_util.h |
diff --git a/ui/wm/core/window_util.h b/ui/wm/core/window_util.h |
index 81989f970609df8b7ee22cb9a6a131d7189fcc5c..78f2ffbf112e141d412dda04714e20c68fe04b94 100644 |
--- a/ui/wm/core/window_util.h |
+++ b/ui/wm/core/window_util.h |
@@ -10,7 +10,7 @@ |
#include "base/basictypes.h" |
#include "base/compiler_specific.h" |
#include "base/memory/scoped_ptr.h" |
-#include "ui/wm/core/wm_core_export.h" |
+#include "ui/wm/wm_export.h" |
namespace aura { |
class Window; |
@@ -24,18 +24,18 @@ class LayerTreeOwner; |
namespace wm { |
-WM_CORE_EXPORT void ActivateWindow(aura::Window* window); |
-WM_CORE_EXPORT void DeactivateWindow(aura::Window* window); |
-WM_CORE_EXPORT bool IsActiveWindow(aura::Window* window); |
-WM_CORE_EXPORT bool CanActivateWindow(aura::Window* window); |
+WM_EXPORT void ActivateWindow(aura::Window* window); |
+WM_EXPORT void DeactivateWindow(aura::Window* window); |
+WM_EXPORT bool IsActiveWindow(aura::Window* window); |
+WM_EXPORT bool CanActivateWindow(aura::Window* window); |
// Retrieves the activatable window for |window|. The ActivationClient makes |
// this determination. |
-WM_CORE_EXPORT aura::Window* GetActivatableWindow(aura::Window* window); |
+WM_EXPORT aura::Window* GetActivatableWindow(aura::Window* window); |
// Retrieves the toplevel window for |window|. The ActivationClient makes this |
// determination. |
-WM_CORE_EXPORT aura::Window* GetToplevelWindow(aura::Window* window); |
+WM_EXPORT aura::Window* GetToplevelWindow(aura::Window* window); |
// Returns the existing Layer for |root| (and all its descendants) and creates |
// a new layer for |root| and all its descendants. This is intended for |
@@ -43,26 +43,24 @@ WM_CORE_EXPORT aura::Window* GetToplevelWindow(aura::Window* window); |
// |
// As a result of this |root| has freshly created layers, meaning the layers |
// have not yet been painted to. |
-WM_CORE_EXPORT scoped_ptr<ui::LayerTreeOwner> RecreateLayers( |
+WM_EXPORT scoped_ptr<ui::LayerTreeOwner> RecreateLayers( |
ui::LayerOwner* root); |
// Convenience functions that get the TransientWindowManager for the window and |
// redirect appropriately. These are preferable to calling functions on |
// TransientWindowManager as they handle the appropriate NULL checks. |
-WM_CORE_EXPORT aura::Window* GetTransientParent(aura::Window* window); |
-WM_CORE_EXPORT const aura::Window* GetTransientParent( |
+WM_EXPORT aura::Window* GetTransientParent(aura::Window* window); |
+WM_EXPORT const aura::Window* GetTransientParent( |
const aura::Window* window); |
-WM_CORE_EXPORT const std::vector<aura::Window*>& GetTransientChildren( |
+WM_EXPORT const std::vector<aura::Window*>& GetTransientChildren( |
const aura::Window* window); |
-WM_CORE_EXPORT void AddTransientChild(aura::Window* parent, |
- aura::Window* child); |
-WM_CORE_EXPORT void RemoveTransientChild(aura::Window* parent, |
- aura::Window* child); |
+WM_EXPORT void AddTransientChild(aura::Window* parent, aura::Window* child); |
+WM_EXPORT void RemoveTransientChild(aura::Window* parent, aura::Window* child); |
// Returns true if |window| has |ancestor| as a transient ancestor. A transient |
// ancestor is found by following the transient parent chain of the window. |
-WM_CORE_EXPORT bool HasTransientAncestor(const aura::Window* window, |
- const aura::Window* ancestor); |
+WM_EXPORT bool HasTransientAncestor(const aura::Window* window, |
+ const aura::Window* ancestor); |
} // namespace wm |