| Index: ash/wm/ash_native_cursor_manager.cc
 | 
| diff --git a/ash/wm/ash_native_cursor_manager.cc b/ash/wm/ash_native_cursor_manager.cc
 | 
| index a8349c03cde5f05665bf2f808ed691542a3ef6cc..ba56a7c612b69108e883c8270d437b7c58f9099d 100644
 | 
| --- a/ash/wm/ash_native_cursor_manager.cc
 | 
| +++ b/ash/wm/ash_native_cursor_manager.cc
 | 
| @@ -63,14 +63,14 @@ AshNativeCursorManager::~AshNativeCursorManager() {
 | 
|  void AshNativeCursorManager::SetNativeCursorEnabled(bool enabled) {
 | 
|    native_cursor_enabled_ = enabled;
 | 
|  
 | 
| -  views::corewm::CursorManager* cursor_manager =
 | 
| +  ::wm::CursorManager* cursor_manager =
 | 
|        Shell::GetInstance()->cursor_manager();
 | 
|    SetCursor(cursor_manager->GetCursor(), cursor_manager);
 | 
|  }
 | 
|  
 | 
|  void AshNativeCursorManager::SetDisplay(
 | 
|      const gfx::Display& display,
 | 
| -    views::corewm::NativeCursorManagerDelegate* delegate) {
 | 
| +    ::wm::NativeCursorManagerDelegate* delegate) {
 | 
|    if (image_cursors_->SetDisplay(display))
 | 
|      SetCursor(delegate->GetCursor(), delegate);
 | 
|  #if defined(OS_CHROMEOS)
 | 
| @@ -81,7 +81,7 @@ void AshNativeCursorManager::SetDisplay(
 | 
|  
 | 
|  void AshNativeCursorManager::SetCursor(
 | 
|      gfx::NativeCursor cursor,
 | 
| -    views::corewm::NativeCursorManagerDelegate* delegate) {
 | 
| +    ::wm::NativeCursorManagerDelegate* delegate) {
 | 
|    gfx::NativeCursor new_cursor = cursor;
 | 
|    if (native_cursor_enabled_) {
 | 
|      image_cursors_->SetPlatformCursor(&new_cursor);
 | 
| @@ -105,7 +105,7 @@ void AshNativeCursorManager::SetCursor(
 | 
|  
 | 
|  void AshNativeCursorManager::SetCursorSet(
 | 
|      ui::CursorSetType cursor_set,
 | 
| -    views::corewm::NativeCursorManagerDelegate* delegate) {
 | 
| +    ::wm::NativeCursorManagerDelegate* delegate) {
 | 
|    image_cursors_->SetCursorSet(cursor_set);
 | 
|    delegate->CommitCursorSet(cursor_set);
 | 
|  
 | 
| @@ -121,7 +121,7 @@ void AshNativeCursorManager::SetCursorSet(
 | 
|  
 | 
|  void AshNativeCursorManager::SetScale(
 | 
|      float scale,
 | 
| -    views::corewm::NativeCursorManagerDelegate* delegate) {
 | 
| +    ::wm::NativeCursorManagerDelegate* delegate) {
 | 
|    image_cursors_->SetScale(scale);
 | 
|    delegate->CommitScale(scale);
 | 
|  
 | 
| @@ -131,7 +131,7 @@ void AshNativeCursorManager::SetScale(
 | 
|  
 | 
|  void AshNativeCursorManager::SetVisibility(
 | 
|      bool visible,
 | 
| -    views::corewm::NativeCursorManagerDelegate* delegate) {
 | 
| +    ::wm::NativeCursorManagerDelegate* delegate) {
 | 
|    delegate->CommitVisibility(visible);
 | 
|  
 | 
|    if (visible) {
 | 
| @@ -147,7 +147,7 @@ void AshNativeCursorManager::SetVisibility(
 | 
|  
 | 
|  void AshNativeCursorManager::SetMouseEventsEnabled(
 | 
|      bool enabled,
 | 
| -    views::corewm::NativeCursorManagerDelegate* delegate) {
 | 
| +    ::wm::NativeCursorManagerDelegate* delegate) {
 | 
|    delegate->CommitMouseEventsEnabled(enabled);
 | 
|  
 | 
|    if (enabled) {
 | 
| 
 |