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

Unified Diff: ash/wm/stacking_controller.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/resize_shadow.cc ('k') | ash/wm/stacking_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/stacking_controller.cc
diff --git a/ash/wm/stacking_controller.cc b/ash/wm/stacking_controller.cc
index b99f832e02f2d4ccb98f309e7920238b11d06769..62263d450151082f353a2bcf57c84766a28fe34f 100644
--- a/ash/wm/stacking_controller.cc
+++ b/ash/wm/stacking_controller.cc
@@ -39,8 +39,8 @@ bool IsSystemModal(aura::Window* window) {
}
bool HasTransientParentWindow(const aura::Window* window) {
- return views::corewm::GetTransientParent(window) &&
- views::corewm::GetTransientParent(window)->type() !=
+ return ::wm::GetTransientParent(window) &&
+ ::wm::GetTransientParent(window)->type() !=
ui::wm::WINDOW_TYPE_UNKNOWN;
}
@@ -68,7 +68,7 @@ aura::Window* StackingController::GetDefaultParent(aura::Window* context,
aura::Window* window,
const gfx::Rect& bounds) {
aura::Window* target_root = NULL;
- aura::Window* transient_parent = views::corewm::GetTransientParent(window);
+ aura::Window* transient_parent = ::wm::GetTransientParent(window);
if (transient_parent) {
// Transient window should use the same root as its transient parent.
target_root = transient_parent->GetRootWindow();
@@ -83,7 +83,7 @@ aura::Window* StackingController::GetDefaultParent(aura::Window* context,
return GetSystemModalContainer(target_root, window);
else if (HasTransientParentWindow(window))
return internal::RootWindowController::GetContainerForWindow(
- views::corewm::GetTransientParent(window));
+ ::wm::GetTransientParent(window));
return GetAlwaysOnTopController(target_root)->GetContainer(window);
case ui::wm::WINDOW_TYPE_CONTROL:
return GetContainerById(
@@ -123,7 +123,7 @@ aura::Window* StackingController::GetSystemModalContainer(
SessionStateDelegate* session_state_delegate =
Shell::GetInstance()->session_state_delegate();
if (!session_state_delegate->IsUserSessionBlocked() ||
- !views::corewm::GetTransientParent(window)) {
+ !::wm::GetTransientParent(window)) {
return GetContainerById(root,
internal::kShellWindowId_SystemModalContainer);
}
@@ -131,7 +131,7 @@ aura::Window* StackingController::GetSystemModalContainer(
// Otherwise those that originate from LockScreen container and above are
// placed in the screen lock modal container.
int window_container_id =
- views::corewm::GetTransientParent(window)->parent()->id();
+ ::wm::GetTransientParent(window)->parent()->id();
aura::Window* container = NULL;
if (window_container_id < internal::kShellWindowId_LockScreenContainer) {
container = GetContainerById(
« no previous file with comments | « ash/wm/resize_shadow.cc ('k') | ash/wm/stacking_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698