diff options
| author | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-13 16:07:12 +0000 |
|---|---|---|
| committer | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-13 16:07:12 +0000 |
| commit | 39dd9bc271d69d85d3189847b01e911d8ac7aeda (patch) | |
| tree | fd3c3a40714a2b2dae82b2466517969138024d45 /chrome/browser/ui/views/extensions/extension_popup.cc | |
| parent | 9a6cfefacd9f3509fd3b85f453fb4e5dd1f001d7 (diff) | |
| download | chromium_src-39dd9bc271d69d85d3189847b01e911d8ac7aeda.zip chromium_src-39dd9bc271d69d85d3189847b01e911d8ac7aeda.tar.gz chromium_src-39dd9bc271d69d85d3189847b01e911d8ac7aeda.tar.bz2 | |
Revert "Move wm/core to wm namespace."
This reverts commit 521c703f8d62fa698c3e88287c64d8d23f9ac675.
Broke gyp
BUG=
Review URL: https://codereview.chromium.org/199263002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256846 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/views/extensions/extension_popup.cc')
| -rw-r--r-- | chrome/browser/ui/views/extensions/extension_popup.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/ui/views/extensions/extension_popup.cc b/chrome/browser/ui/views/extensions/extension_popup.cc index e8a31ab..939b2cc 100644 --- a/chrome/browser/ui/views/extensions/extension_popup.cc +++ b/chrome/browser/ui/views/extensions/extension_popup.cc @@ -198,7 +198,7 @@ void ExtensionPopup::OnWindowActivated(aura::Window* gained_active, if (!inspect_with_devtools_ && anchor_window == gained_active && host_desktop_type != chrome::HOST_DESKTOP_TYPE_ASH && this_window->GetRootWindow() == anchor_window->GetRootWindow() && - wm::GetTransientParent(gained_active) != this_window) + views::corewm::GetTransientParent(gained_active) != this_window) GetWidget()->Close(); } #endif @@ -224,10 +224,10 @@ ExtensionPopup* ExtensionPopup::ShowPopup(const GURL& url, #if defined(USE_AURA) gfx::NativeView native_view = popup->GetWidget()->GetNativeView(); - wm::SetWindowVisibilityAnimationType( + views::corewm::SetWindowVisibilityAnimationType( native_view, - wm::WINDOW_VISIBILITY_ANIMATION_TYPE_VERTICAL); - wm::SetWindowVisibilityAnimationVerticalPosition( + views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_VERTICAL); + views::corewm::SetWindowVisibilityAnimationVerticalPosition( native_view, -3.0f); #endif |