Revert 133982 because it broke build on chromeos due to mid-air collision with 133961.

ash/accelerators/accelerator_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/accelerators/accelerator_controller.h"
 
 #include "ash/accelerators/accelerator_table.h"
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/ash_switches.h"
 #include "ash/caps_lock_delegate.h"
 #include "ash/focus_cycler.h"
 #include "ash/ime_control_delegate.h"
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/launcher/launcher_delegate.h"
 #include "ash/monitor/multi_monitor_manager.h"
 #include "ash/screenshot_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/brightness/brightness_control_delegate.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/volume_control_delegate.h"
-#include "ash/wm/property_util.h"
 #include "ash/wm/window_cycle_controller.h"
 #include "ash/wm/window_util.h"
-#include "ash/wm/workspace/snap_sizer.h"
 #include "base/command_line.h"
 #include "ui/aura/event.h"
 #include "ui/aura/root_window.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/accelerators/accelerator_manager.h"
 #include "ui/gfx/compositor/debug_utils.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/compositor/layer_animation_sequence.h"
 #include "ui/gfx/compositor/layer_animator.h"
 #include "ui/gfx/compositor/screen_rotation.h"
@@ skipping 409 matching lines @@
       break;
     case SELECT_WIN_6:
       SwitchToWindow(6);
       break;
     case SELECT_WIN_7:
       SwitchToWindow(7);
       break;
     case SELECT_LAST_WIN:
       SwitchToWindow(-1);
       break;
-    case WINDOW_SNAP_LEFT:
-    case WINDOW_SNAP_RIGHT: {
-      aura::Window* window = wm::GetActiveWindow();
-      if (!window)
-        break;
-      internal::SnapSizer sizer(window,
-          gfx::Point(),
-          action == WINDOW_SNAP_LEFT ? internal::SnapSizer::LEFT_EDGE :
-                                       internal::SnapSizer::RIGHT_EDGE,
-          shell->GetGridSize());
-      window->SetBounds(sizer.GetSnapBounds(window->bounds()));
-      break;
-    }
-    case WINDOW_MINIMIZE: {
-      aura::Window* window = wm::GetActiveWindow();
-      if (window)
-        wm::MinimizeWindow(window);
-      break;
-    }
-    case WINDOW_MAXIMIZE_RESTORE: {
-      aura::Window* window = wm::GetActiveWindow();
-      if (window) {
-        if (wm::IsWindowMaximized(window))
-          wm::RestoreWindow(window);
-        else
-          wm::MaximizeWindow(window);
-      }
-      break;
-    }
-    case WINDOW_POSITION_CENTER: {
-      aura::Window* window = wm::GetActiveWindow();
-      if (window)
-        wm::CenterWindow(window);
-      break;
-    }
     case ROTATE_WINDOWS:
       return HandleRotateWindows();
 #if !defined(NDEBUG)
     case ROTATE_SCREEN:
       return HandleRotateScreen();
     case TOGGLE_DESKTOP_BACKGROUND_MODE:
       return HandleToggleDesktopBackgroundMode();
     case TOGGLE_ROOT_WINDOW_FULL_SCREEN:
       return HandleToggleRootWindowFullScreen();
     case PRINT_LAYER_HIERARCHY:
@@ skipping 39 matching lines @@
     // Then set this one as active.
     ActivateLauncherItem(found_index);
   }
 }
 
 bool AcceleratorController::CanHandleAccelerators() const {
   return true;
 }
 
 }  // namespace ash