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 /ash/ime | |
| 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 'ash/ime')
| -rw-r--r-- | ash/ime/candidate_window_view.cc | 4 | ||||
| -rw-r--r-- | ash/ime/infolist_window.cc | 4 | ||||
| -rw-r--r-- | ash/ime/mode_indicator_view.cc | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/ash/ime/candidate_window_view.cc b/ash/ime/candidate_window_view.cc index ca37b23..ac520f9 100644 --- a/ash/ime/candidate_window_view.cc +++ b/ash/ime/candidate_window_view.cc @@ -191,9 +191,9 @@ CandidateWindowView::~CandidateWindowView() { views::Widget* CandidateWindowView::InitWidget() { views::Widget* widget = BubbleDelegateView::CreateBubble(this); - wm::SetWindowVisibilityAnimationType( + views::corewm::SetWindowVisibilityAnimationType( widget->GetNativeView(), - wm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE); + views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE); GetBubbleFrameView()->SetBubbleBorder(scoped_ptr<views::BubbleBorder>( new CandidateWindowBorder(parent_window()))); diff --git a/ash/ime/infolist_window.cc b/ash/ime/infolist_window.cc index e48e88e..b268ee7 100644 --- a/ash/ime/infolist_window.cc +++ b/ash/ime/infolist_window.cc @@ -211,9 +211,9 @@ InfolistWindow::~InfolistWindow() { void InfolistWindow::InitWidget() { views::Widget* widget = views::BubbleDelegateView::CreateBubble(this); - wm::SetWindowVisibilityAnimationType( + views::corewm::SetWindowVisibilityAnimationType( widget->GetNativeView(), - wm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE); + views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE); // BubbleFrameView will be initialized through CreateBubble. GetBubbleFrameView()->SetBubbleBorder( diff --git a/ash/ime/mode_indicator_view.cc b/ash/ime/mode_indicator_view.cc index ccc1eae..e7d514f 100644 --- a/ash/ime/mode_indicator_view.cc +++ b/ash/ime/mode_indicator_view.cc @@ -58,9 +58,9 @@ ModeIndicatorView::ModeIndicatorView(gfx::NativeView parent, ModeIndicatorView::~ModeIndicatorView() {} void ModeIndicatorView::ShowAndFadeOut() { - wm::SetWindowVisibilityAnimationTransition( + views::corewm::SetWindowVisibilityAnimationTransition( GetWidget()->GetNativeView(), - wm::ANIMATE_HIDE); + views::corewm::ANIMATE_HIDE); GetWidget()->Show(); timer_.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(kShowingDuration), |