Change behaviour of the Alt-] and Alt-[ keys so that it cycles through SnapLeft/SnapRight to DockLe…

ash/wm/dock/docked_window_layout_manager.cc

 // Copyright (c) 2013 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/wm/dock/docked_window_layout_manager.h"
 
 #include "ash/screen_util.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_constants.h"
 #include "ash/shelf/shelf_layout_manager.h"
@@ skipping 398 matching lines @@
       in_layout_(false),
       dragged_window_(NULL),
       is_dragged_window_docked_(false),
       is_dragged_from_dock_(false),
       shelf_(NULL),
       workspace_controller_(workspace_controller),
       in_fullscreen_(workspace_controller_->GetWindowState() ==
                      WORKSPACE_WINDOW_STATE_FULL_SCREEN),
       docked_width_(0),
       alignment_(DOCKED_ALIGNMENT_NONE),
+      preferred_alignment_(DOCKED_ALIGNMENT_NONE),
+      event_source_(DOCKED_ACTION_SOURCE_UNKNOWN),
       last_active_window_(NULL),
       last_action_time_(base::Time::Now()),
       background_widget_(new DockedBackgroundWidget(dock_container_)) {
   DCHECK(dock_container);
   aura::client::GetActivationClient(Shell::GetPrimaryRootWindow())->
       AddObserver(this);
   Shell::GetInstance()->AddShellObserver(this);
 }
 
 DockedWindowLayoutManager::~DockedWindowLayoutManager() {
@@ skipping 201 matching lines @@
       alignment != DOCKED_ALIGNMENT_NONE &&
       alignment != desired_alignment) {
     return false;
   }
   // Do not allow docking on the same side as shelf.
   return IsDockedAlignmentValid(desired_alignment);
 }
 
 bool DockedWindowLayoutManager::IsDockedAlignmentValid(
     DockedAlignment alignment) const {
-  ShelfAlignment shelf_alignment = shelf_ ? shelf->alignment() :
+  ShelfAlignment shelf_alignment = shelf_ ? shelf_->alignment() :
       SHELF_ALIGNMENT_BOTTOM;
   if ((alignment == DOCKED_ALIGNMENT_LEFT &&
        shelf_alignment == SHELF_ALIGNMENT_LEFT) ||
       (alignment == DOCKED_ALIGNMENT_RIGHT &&
        shelf_alignment == SHELF_ALIGNMENT_RIGHT)) {
     return false;
   }
   return true;
 }
 
@@ skipping 34 matching lines @@
   if (IsPopupOrTransient(child))
     return;
   // Dragged windows are already observed by StartDragging and do not change
   // docked alignment during the drag.
   if (child == dragged_window_)
     return;
   // If this is the first window getting docked - update alignment.
   // A window can be added without proper bounds when window is moved to another
   // display via API or due to display configuration change, so the alignment
   // is set based on which edge is closer in the new display.
-  if (alignment_ == DOCKED_ALIGNMENT_NONE)
-    alignment_ = GetEdgeNearestWindow(child);
+  if (alignment_ == DOCKED_ALIGNMENT_NONE) {
+    alignment_ = preferred_alignment_ != DOCKED_ALIGNMENT_NONE ?
+        preferred_alignment_ : GetEdgeNearestWindow(child);
+  }
   MaybeMinimizeChildrenExcept(child);
   child->AddObserver(this);
   wm::GetWindowState(child)->AddObserver(this);
   Relayout();
   UpdateDockBounds(DockedWindowLayoutManagerObserver::CHILD_CHANGED);
+
+  // Only keyboard-initiated actions are recorded here. Dragging cases
+  // are handled in FinishDragging

[varkha, 2014/10/03 17:42:12]

nit: period at the end of a sentence.

[dtapuska, 2014/10/03 19:05:59]

Done.

+  if (event_source_ != DOCKED_ACTION_SOURCE_UNKNOWN)
+    RecordUmaAction(DOCKED_ACTION_DOCK, event_source_);
 }
 
 void DockedWindowLayoutManager::OnWindowRemovedFromLayout(aura::Window* child) {
   if (IsPopupOrTransient(child))
     return;
   // Dragged windows are stopped being observed by FinishDragging and do not
   // change alignment during the drag. They also cannot be set to be the
   // |last_active_window_|.
   if (child == dragged_window_)
     return;
@@ skipping 129 matching lines @@
   if (IsPopupOrTransient(window))
     return;
   // The window property will still be set, but no actual change will occur
   // until OnFullscreenStateChange is called when exiting fullscreen.
   if (in_fullscreen_)
     return;
   if (!window_state->IsDocked()) {
     if (window != dragged_window_) {
       UndockWindow(window);
       if (window_state->IsMaximizedOrFullscreen())
-        RecordUmaAction(DOCKED_ACTION_MAXIMIZE, DOCKED_ACTION_SOURCE_UNKNOWN);
+        RecordUmaAction(DOCKED_ACTION_MAXIMIZE, event_source_);
+      else
+        RecordUmaAction(DOCKED_ACTION_UNDOCK, event_source_);
     }
   } else if (window_state->IsMinimized()) {
     MinimizeDockedWindow(window_state);
   } else if (old_type == wm::WINDOW_STATE_TYPE_DOCKED_MINIMIZED) {
     RestoreDockedWindow(window_state);
+  } else if (old_type == wm::WINDOW_STATE_TYPE_MINIMIZED) {
+    NOTREACHED() << "Minimized window in docked layout manager";
   }
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // DockedWindowLayoutManager, WindowObserver implementation:
 
 void DockedWindowLayoutManager::OnWindowBoundsChanged(
     aura::Window* window,
     const gfx::Rect& old_bounds,
     const gfx::Rect& new_bounds) {
@@ skipping 18 matching lines @@
 }
 
 void DockedWindowLayoutManager::OnWindowDestroying(aura::Window* window) {
   if (dragged_window_ == window) {
     FinishDragging(DOCKED_ACTION_NONE, DOCKED_ACTION_SOURCE_UNKNOWN);
     DCHECK(!dragged_window_);
     DCHECK(!is_dragged_window_docked_);
   }
   if (window == last_active_window_)
     last_active_window_ = NULL;
-  RecordUmaAction(DOCKED_ACTION_CLOSE, DOCKED_ACTION_SOURCE_UNKNOWN);
+  RecordUmaAction(DOCKED_ACTION_CLOSE, event_source_);
 }
 
 
 ////////////////////////////////////////////////////////////////////////////////
 // DockedWindowLayoutManager, aura::client::ActivationChangeObserver
 // implementation:
 
 void DockedWindowLayoutManager::OnWindowActivated(aura::Window* gained_active,
                                                   aura::Window* lost_active) {
   if (gained_active && IsPopupOrTransient(gained_active))
@@ skipping 46 matching lines @@
     }
   }
 }
 
 void DockedWindowLayoutManager::MinimizeDockedWindow(
     wm::WindowState* window_state) {
   DCHECK(!IsPopupOrTransient(window_state->window()));
   window_state->window()->Hide();
   if (window_state->IsActive())
     window_state->Deactivate();
-  RecordUmaAction(DOCKED_ACTION_MINIMIZE, DOCKED_ACTION_SOURCE_UNKNOWN);
+  RecordUmaAction(DOCKED_ACTION_MINIMIZE, event_source_);
 }
 
 void DockedWindowLayoutManager::RestoreDockedWindow(
     wm::WindowState* window_state) {
   aura::Window* window = window_state->window();
   DCHECK(!IsPopupOrTransient(window));
   // Always place restored window at the bottom shuffling the other windows up.
   // TODO(varkha): add a separate container for docked windows to keep track
   // of ordering.
   gfx::Display display = Shell::GetScreen()->GetDisplayNearestWindow(
       dock_container_);
   const gfx::Rect work_area = display.work_area();
 
   // Evict the window if it can no longer be docked because of its height.
   if (!CanDockWindow(window, DOCKED_ALIGNMENT_NONE)) {
     window_state->Restore();
-    RecordUmaAction(DOCKED_ACTION_EVICT, DOCKED_ACTION_SOURCE_UNKNOWN);
+    RecordUmaAction(DOCKED_ACTION_EVICT, event_source_);
     return;
   }
   gfx::Rect bounds(window->bounds());
   bounds.set_y(work_area.bottom());
   window->SetBounds(bounds);
   window->Show();
   MaybeMinimizeChildrenExcept(window);
-  RecordUmaAction(DOCKED_ACTION_RESTORE, DOCKED_ACTION_SOURCE_UNKNOWN);
+  RecordUmaAction(DOCKED_ACTION_RESTORE, event_source_);
 }
 
 void DockedWindowLayoutManager::RecordUmaAction(DockedAction action,
                                                 DockedActionSource source) {
   if (action == DOCKED_ACTION_NONE)
     return;
   UMA_HISTOGRAM_ENUMERATION("Ash.Dock.Action", action, DOCKED_ACTION_COUNT);
   UMA_HISTOGRAM_ENUMERATION("Ash.Dock.ActionSource", source,
                             DOCKED_ACTION_SOURCE_COUNT);
   base::Time time_now = base::Time::Now();
@@ skipping 351 matching lines @@
 
 void DockedWindowLayoutManager::OnKeyboardBoundsChanging(
     const gfx::Rect& keyboard_bounds) {
   // This bounds change will have caused a change to the Shelf which does not
   // propagate automatically to this class, so manually recalculate bounds.
   Relayout();
   UpdateDockBounds(DockedWindowLayoutManagerObserver::KEYBOARD_BOUNDS_CHANGING);
 }
 
 }  // namespace ash