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/ime | |
| 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/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 ac520f9..ca37b23 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); - views::corewm::SetWindowVisibilityAnimationType( + wm::SetWindowVisibilityAnimationType( widget->GetNativeView(), - views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE); + wm::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 b268ee7..e48e88e 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); - views::corewm::SetWindowVisibilityAnimationType( + wm::SetWindowVisibilityAnimationType( widget->GetNativeView(), - views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE); + wm::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 e7d514f..ccc1eae 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() { - views::corewm::SetWindowVisibilityAnimationTransition( + wm::SetWindowVisibilityAnimationTransition( GetWidget()->GetNativeView(), - views::corewm::ANIMATE_HIDE); + wm::ANIMATE_HIDE); GetWidget()->Show(); timer_.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(kShowingDuration), |