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

Unified Diff: ash/wm/window_util.cc

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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/window_state.cc ('k') | ash/wm/workspace/multi_window_resize_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/window_util.cc
diff --git a/ash/wm/window_util.cc b/ash/wm/window_util.cc
index d37825eb53edaa80d6d4f23752a1c2d30d6e997f..a61b411b31baa3b0007271c65d5e34c5a7cd3132 100644
--- a/ash/wm/window_util.cc
+++ b/ash/wm/window_util.cc
@@ -46,15 +46,15 @@ int GetDefaultSnappedWindowWidth(aura::Window* window) {
// TODO(beng): replace many of these functions with the corewm versions.
void ActivateWindow(aura::Window* window) {
- views::corewm::ActivateWindow(window);
+ ::wm::ActivateWindow(window);
}
void DeactivateWindow(aura::Window* window) {
- views::corewm::DeactivateWindow(window);
+ ::wm::DeactivateWindow(window);
}
bool IsActiveWindow(aura::Window* window) {
- return views::corewm::IsActiveWindow(window);
+ return ::wm::IsActiveWindow(window);
}
aura::Window* GetActiveWindow() {
@@ -63,11 +63,11 @@ aura::Window* GetActiveWindow() {
}
aura::Window* GetActivatableWindow(aura::Window* window) {
- return views::corewm::GetActivatableWindow(window);
+ return ::wm::GetActivatableWindow(window);
}
bool CanActivateWindow(aura::Window* window) {
- return views::corewm::CanActivateWindow(window);
+ return ::wm::CanActivateWindow(window);
}
bool IsWindowMinimized(aura::Window* window) {
@@ -177,10 +177,10 @@ void ReparentTransientChildrenOfChild(aura::Window* child,
aura::Window* old_parent,
aura::Window* new_parent) {
for (size_t i = 0;
- i < views::corewm::GetTransientChildren(child).size();
+ i < ::wm::GetTransientChildren(child).size();
++i) {
ReparentChildWithTransientChildren(
- views::corewm::GetTransientChildren(child)[i],
+ ::wm::GetTransientChildren(child)[i],
old_parent,
new_parent);
}
« no previous file with comments | « ash/wm/window_state.cc ('k') | ash/wm/workspace/multi_window_resize_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698