Index: ash/common/accelerators/accelerator_controller.cc |
diff --git a/ash/common/accelerators/accelerator_controller.cc b/ash/common/accelerators/accelerator_controller.cc |
index 89c946f59965017fdd1d93f76e90b306fc1b72f4..3f6eda76a376a617a387c222785e053df82f11d2 100644 |
--- a/ash/common/accelerators/accelerator_controller.cc |
+++ b/ash/common/accelerators/accelerator_controller.cc |
@@ -288,7 +288,7 @@ void HandleToggleOverview() { |
WmShell::Get()->window_selector_controller()->ToggleOverview(); |
} |
-bool CanHandleWindowSnapOrDock() { |
+bool CanHandleWindowSnap() { |
WmWindow* active_window = WmShell::Get()->GetActiveWindow(); |
if (!active_window) |
return false; |
@@ -299,15 +299,15 @@ bool CanHandleWindowSnapOrDock() { |
!window_state->IsFullscreen()); |
} |
-void HandleWindowSnapOrDock(AcceleratorAction action) { |
- if (action == WINDOW_CYCLE_SNAP_DOCK_LEFT) |
+void HandleWindowSnap(AcceleratorAction action) { |
+ if (action == WINDOW_CYCLE_SNAP_LEFT) |
base::RecordAction(UserMetricsAction("Accel_Window_Snap_Left")); |
else |
base::RecordAction(UserMetricsAction("Accel_Window_Snap_Right")); |
- const wm::WMEvent event(action == WINDOW_CYCLE_SNAP_DOCK_LEFT |
- ? wm::WM_EVENT_CYCLE_SNAP_DOCK_LEFT |
- : wm::WM_EVENT_CYCLE_SNAP_DOCK_RIGHT); |
+ const wm::WMEvent event(action == WINDOW_CYCLE_SNAP_LEFT |
+ ? wm::WM_EVENT_CYCLE_SNAP_LEFT |
+ : wm::WM_EVENT_CYCLE_SNAP_RIGHT); |
WmWindow* active_window = WmShell::Get()->GetActiveWindow(); |
DCHECK(active_window); |
active_window->GetWindowState()->OnWMEvent(&event); |
@@ -319,9 +319,7 @@ void HandleWindowMinimize() { |
} |
bool CanHandlePositionCenter() { |
- // Docked windows do not support centering. |
- WmWindow* active_window = WmShell::Get()->GetActiveWindow(); |
- return (active_window && !active_window->GetWindowState()->IsDocked()); |
+ return !!WmShell::Get()->GetActiveWindow(); |
varkha
2017/03/15 19:51:16
nit: I don't remember when but I had a comment onc
afakhry
2017/03/15 20:27:26
Done.
|
} |
void HandlePositionCenter() { |
@@ -802,9 +800,9 @@ bool AcceleratorController::CanPerformAction( |
return CanHandleToggleAppList(accelerator, previous_accelerator); |
case TOGGLE_CAPS_LOCK: |
return CanHandleToggleCapsLock(accelerator, previous_accelerator); |
- case WINDOW_CYCLE_SNAP_DOCK_LEFT: |
- case WINDOW_CYCLE_SNAP_DOCK_RIGHT: |
- return CanHandleWindowSnapOrDock(); |
+ case WINDOW_CYCLE_SNAP_LEFT: |
+ case WINDOW_CYCLE_SNAP_RIGHT: |
+ return CanHandleWindowSnap(); |
case WINDOW_POSITION_CENTER: |
return CanHandlePositionCenter(); |
@@ -1066,9 +1064,9 @@ void AcceleratorController::PerformAction(AcceleratorAction action, |
case VOLUME_UP: |
HandleVolumeUp(volume_controller_.get(), accelerator); |
break; |
- case WINDOW_CYCLE_SNAP_DOCK_LEFT: |
- case WINDOW_CYCLE_SNAP_DOCK_RIGHT: |
- HandleWindowSnapOrDock(action); |
+ case WINDOW_CYCLE_SNAP_LEFT: |
+ case WINDOW_CYCLE_SNAP_RIGHT: |
+ HandleWindowSnap(action); |
break; |
case WINDOW_MINIMIZE: |
HandleWindowMinimize(); |