summaryrefslogtreecommitdiffstats
path: root/ash/ime
diff options
context:
space:
mode:
Diffstat (limited to 'ash/ime')
-rw-r--r--ash/ime/candidate_window_view.cc4
-rw-r--r--ash/ime/infolist_window.cc4
-rw-r--r--ash/ime/mode_indicator_view.cc4
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),