diff options
| author | varkha@chromium.org <varkha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-25 21:19:57 +0000 |
|---|---|---|
| committer | varkha@chromium.org <varkha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-25 21:19:57 +0000 |
| commit | ae6f06153630c4c0940a4630443ae4faf44ef409 (patch) | |
| tree | 3a0e2d688106828131e624ef2aec8fc175f51db6 /ash/accelerators/accelerator_controller.cc | |
| parent | e7df39152ff45e8abdbfbab57a5dcec0c09ae34f (diff) | |
| download | chromium_src-ae6f06153630c4c0940a4630443ae4faf44ef409.zip chromium_src-ae6f06153630c4c0940a4630443ae4faf44ef409.tar.gz chromium_src-ae6f06153630c4c0940a4630443ae4faf44ef409.tar.bz2 | |
Avoids centering docked windows, Unsnaps when centering.
BUG=322196
Review URL: https://codereview.chromium.org/79023009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237143 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/accelerators/accelerator_controller.cc')
| -rw-r--r-- | ash/accelerators/accelerator_controller.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc index 2e8d4b7..d9c2d79 100644 --- a/ash/accelerators/accelerator_controller.cc +++ b/ash/accelerators/accelerator_controller.cc @@ -851,7 +851,7 @@ bool AcceleratorController::PerformAction(int action, case WINDOW_SNAP_LEFT: case WINDOW_SNAP_RIGHT: { wm::WindowState* window_state = wm::GetActiveWindowState(); - // Disable window docking shortcut key for full screen window due to + // Disable window snapping shortcut key for full screen window due to // http://crbug.com/135487. if (!window_state || window_state->window()->type() != aura::client::WINDOW_TYPE_NORMAL || @@ -879,8 +879,10 @@ bool AcceleratorController::PerformAction(int action, return true; } case WINDOW_POSITION_CENTER: { + content::RecordAction(content::UserMetricsAction("Accel_Center")); aura::Window* window = wm::GetActiveWindow(); - if (window) { + // Docked windows do not support centering and ignore accelerator. + if (window && !wm::GetWindowState(window)->IsDocked()) { wm::CenterWindow(window); return true; } |