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

Unified Diff: ui/wm/core/window_util.h

Issue 194843004: Move files from ui/views/corewm to ui/wm/core (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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/wm/core/window_modality_controller.cc ('k') | ui/wm/core/window_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/wm/core/window_util.h
diff --git a/ui/views/corewm/window_util.h b/ui/wm/core/window_util.h
similarity index 55%
rename from ui/views/corewm/window_util.h
rename to ui/wm/core/window_util.h
index 1772e190ced5cbcee8aed7681e89d27c6d89f453..3cb7484ac799daf0ac318206d539f391b1064cba 100644
--- a/ui/views/corewm/window_util.h
+++ b/ui/wm/core/window_util.h
@@ -2,15 +2,15 @@
// 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_UTIL_H_
-#define UI_VIEWS_COREWM_WINDOW_UTIL_H_
+#ifndef UI_WM_CORE_WINDOW_UTIL_H_
+#define UI_WM_CORE_WINDOW_UTIL_H_
#include <vector>
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
-#include "ui/views/views_export.h"
+#include "ui/wm/core/wm_core_export.h"
namespace aura {
class Window;
@@ -25,18 +25,18 @@ class LayerTreeOwner;
namespace views {
namespace corewm {
-VIEWS_EXPORT void ActivateWindow(aura::Window* window);
-VIEWS_EXPORT void DeactivateWindow(aura::Window* window);
-VIEWS_EXPORT bool IsActiveWindow(aura::Window* window);
-VIEWS_EXPORT bool CanActivateWindow(aura::Window* window);
+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);
// Retrieves the activatable window for |window|. The ActivationClient makes
// this determination.
-VIEWS_EXPORT aura::Window* GetActivatableWindow(aura::Window* window);
+WM_CORE_EXPORT aura::Window* GetActivatableWindow(aura::Window* window);
// Retrieves the toplevel window for |window|. The ActivationClient makes this
// determination.
-VIEWS_EXPORT aura::Window* GetToplevelWindow(aura::Window* window);
+WM_CORE_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
@@ -44,26 +44,28 @@ VIEWS_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.
-VIEWS_EXPORT scoped_ptr<ui::LayerTreeOwner> RecreateLayers(
+WM_CORE_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.
-VIEWS_EXPORT aura::Window* GetTransientParent(aura::Window* window);
-VIEWS_EXPORT const aura::Window* GetTransientParent(const aura::Window* window);
-VIEWS_EXPORT const std::vector<aura::Window*>& GetTransientChildren(
+WM_CORE_EXPORT aura::Window* GetTransientParent(aura::Window* window);
+WM_CORE_EXPORT const aura::Window* GetTransientParent(
const aura::Window* window);
-VIEWS_EXPORT void AddTransientChild(aura::Window* parent, aura::Window* child);
-VIEWS_EXPORT void RemoveTransientChild(aura::Window* parent,
- aura::Window* child);
+WM_CORE_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);
// Returns true if |window| has |ancestor| as a transient ancestor. A transient
// ancestor is found by following the transient parent chain of the window.
-VIEWS_EXPORT bool HasTransientAncestor(const aura::Window* window,
- const aura::Window* ancestor);
+WM_CORE_EXPORT bool HasTransientAncestor(const aura::Window* window,
+ const aura::Window* ancestor);
} // namespace corewm
} // namespace views
-#endif // UI_VIEWS_COREWM_WINDOW_UTIL_H_
+#endif // UI_WM_CORE_WINDOW_UTIL_H_
« no previous file with comments | « ui/wm/core/window_modality_controller.cc ('k') | ui/wm/core/window_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698