| Index: ash/wm/workspace/multi_window_resize_controller.cc
|
| diff --git a/ash/wm/workspace/multi_window_resize_controller.cc b/ash/wm/workspace/multi_window_resize_controller.cc
|
| index 36cebc21df79791aa9ba08b96239956e1366a565..df4391465d0bb42b3aee626821a12a9a7163d416 100644
|
| --- a/ash/wm/workspace/multi_window_resize_controller.cc
|
| +++ b/ash/wm/workspace/multi_window_resize_controller.cc
|
| @@ -100,7 +100,7 @@ class MultiWindowResizeController::ResizeView : public views::View {
|
| virtual gfx::NativeCursor GetCursor(
|
| const ui::MouseEvent& event) OVERRIDE {
|
| int component = (direction_ == LEFT_RIGHT) ? HTRIGHT : HTBOTTOM;
|
| - return views::corewm::CompoundEventFilter::CursorForWindowComponent(
|
| + return ::wm::CompoundEventFilter::CursorForWindowComponent(
|
| component);
|
| }
|
|
|
| @@ -393,9 +393,9 @@ void MultiWindowResizeController::ShowNow() {
|
| ResizeView* view = new ResizeView(this, windows_.direction);
|
| resize_widget_->set_focus_on_creation(false);
|
| resize_widget_->Init(params);
|
| - views::corewm::SetWindowVisibilityAnimationType(
|
| + ::wm::SetWindowVisibilityAnimationType(
|
| resize_widget_->GetNativeWindow(),
|
| - views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE);
|
| + ::wm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE);
|
| resize_widget_->GetNativeWindow()->SetName("MultiWindowResizeController");
|
| resize_widget_->SetContentsView(view);
|
| show_bounds_in_screen_ = ScreenUtil::ConvertRectToScreen(
|
|
|