From 521c703f8d62fa698c3e88287c64d8d23f9ac675 Mon Sep 17 00:00:00 2001 From: "ben@chromium.org" Date: Thu, 13 Mar 2014 15:31:49 +0000 Subject: Move wm/core to wm namespace. Also sets up new targets for wm_core, wm_core_unittests, etc. R=sky@chromium.org TBR=sky@chromium.org BUG= Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=256680 Review URL: https://codereview.chromium.org/196063002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256839 0039d316-1c4b-4281-b951-d872f2087c98 --- ash/wm/dock/docked_window_layout_manager.cc | 10 +++++----- ash/wm/dock/docked_window_resizer_unittest.cc | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'ash/wm/dock') diff --git a/ash/wm/dock/docked_window_layout_manager.cc b/ash/wm/dock/docked_window_layout_manager.cc index d81c34a..63ad210 100644 --- a/ash/wm/dock/docked_window_layout_manager.cc +++ b/ash/wm/dock/docked_window_layout_manager.cc @@ -221,7 +221,7 @@ namespace { // Returns true if a window is a popup or a transient child. bool IsPopupOrTransient(const aura::Window* window) { return (window->type() == ui::wm::WINDOW_TYPE_POPUP || - views::corewm::GetTransientParent(window)); + ::wm::GetTransientParent(window)); } // Certain windows (minimized, hidden or popups) do not matter to docking. @@ -834,15 +834,15 @@ void DockedWindowLayoutManager::OnWindowVisibilityChanging( aura::Window* window, bool visible) { if (IsPopupOrTransient(window)) return; - int animation_type = views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_DEFAULT; + int animation_type = ::wm::WINDOW_VISIBILITY_ANIMATION_TYPE_DEFAULT; if (visible) { - animation_type = views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_DROP; - views::corewm::SetWindowVisibilityAnimationDuration( + animation_type = ::wm::WINDOW_VISIBILITY_ANIMATION_TYPE_DROP; + ::wm::SetWindowVisibilityAnimationDuration( window, base::TimeDelta::FromMilliseconds(kFadeDurationMs)); } else if (wm::GetWindowState(window)->IsMinimized()) { animation_type = WINDOW_VISIBILITY_ANIMATION_TYPE_MINIMIZE; } - views::corewm::SetWindowVisibilityAnimationType(window, animation_type); + ::wm::SetWindowVisibilityAnimationType(window, animation_type); } void DockedWindowLayoutManager::OnWindowDestroying(aura::Window* window) { diff --git a/ash/wm/dock/docked_window_resizer_unittest.cc b/ash/wm/dock/docked_window_resizer_unittest.cc index 82b87ef..65f7658 100644 --- a/ash/wm/dock/docked_window_resizer_unittest.cc +++ b/ash/wm/dock/docked_window_resizer_unittest.cc @@ -1445,10 +1445,10 @@ TEST_P(DockedWindowResizerTest, DragWindowWithTransientChild) { scoped_ptr window(CreateTestWindow(gfx::Rect(0, 0, 201, 201))); scoped_ptr child(CreateTestWindowInShellWithDelegateAndType( NULL, ui::wm::WINDOW_TYPE_NORMAL, 0, gfx::Rect(20, 20, 150, 20))); - views::corewm::AddTransientChild(window.get(), child.get()); + ::wm::AddTransientChild(window.get(), child.get()); if (window->parent() != child->parent()) window->parent()->AddChild(child.get()); - EXPECT_EQ(window.get(), views::corewm::GetTransientParent(child.get())); + EXPECT_EQ(window.get(), ::wm::GetTransientParent(child.get())); DragToVerticalPositionAndToEdge(DOCKED_EDGE_RIGHT, window.get(), 20); @@ -1495,8 +1495,8 @@ TEST_P(DockedWindowResizerTest, DragWindowWithModalTransientChild) { // While still dragging create a modal window and make it a transient child of // the |window|. scoped_ptr child(CreateModalWindow(gfx::Rect(20, 20, 150, 20))); - views::corewm::AddTransientChild(window.get(), child.get()); - EXPECT_EQ(window.get(), views::corewm::GetTransientParent(child.get())); + ::wm::AddTransientChild(window.get(), child.get()); + EXPECT_EQ(window.get(), ::wm::GetTransientParent(child.get())); EXPECT_EQ(internal::kShellWindowId_SystemModalContainer, child->parent()->id()); @@ -1516,7 +1516,7 @@ TEST_P(DockedWindowResizerTest, DragWindowWithModalTransientChild) { EXPECT_EQ(gfx::Point(20, 20).ToString(), child->GetBoundsInScreen().origin().ToString()); // The |child| should still be a transient child of |window|. - EXPECT_EQ(window.get(), views::corewm::GetTransientParent(child.get())); + EXPECT_EQ(window.get(), ::wm::GetTransientParent(child.get())); } // Tests that side snapping a window undocks it, closes the dock and then snaps. -- cgit v1.1