diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-14 19:56:14 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-14 19:56:14 +0000 |
| commit | e319c7ec34024b7c06ee300303b6927063f255f7 (patch) | |
| tree | 1778920d6f5299c325df18b8c278f6618db172a6 /ash/wm/dock/docked_window_layout_manager.cc | |
| parent | 0706341097163814a7bacf89aec118ebfd5ba69c (diff) | |
| download | chromium_src-e319c7ec34024b7c06ee300303b6927063f255f7.zip chromium_src-e319c7ec34024b7c06ee300303b6927063f255f7.tar.gz chromium_src-e319c7ec34024b7c06ee300303b6927063f255f7.tar.bz2 | |
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
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=256839
Review URL: https://codereview.chromium.org/196063002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257183 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/dock/docked_window_layout_manager.cc')
| -rw-r--r-- | ash/wm/dock/docked_window_layout_manager.cc | 10 |
1 files changed, 5 insertions, 5 deletions
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) { |