Not moving a docked window when restoring a previously maximized window

chrome/browser/ui/views/tabs/tab_drag_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 "chrome/browser/ui/views/tabs/tab_drag_controller.h"
 
 #include <math.h>
 #include <set>
 
 #include "base/auto_reset.h"
@@ skipping 34 matching lines @@
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/focus/view_storage.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(USE_ASH)
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
+#include "ash/shell_window_ids.h"
 #include "ash/wm/coordinate_conversion.h"
 #include "ash/wm/window_state.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/events/gestures/gesture_recognizer.h"
 #endif
 
 #if defined(OS_WIN) && defined(USE_AURA)
 #include "ui/aura/window.h"
 #include "ui/events/gestures/gesture_recognizer.h"
@@ skipping 1801 matching lines @@
         data->source_model_index, data->contents,
         (data->pinned ? TabStripModel::ADD_PINNED : 0));
   }
 }
 
 void TabDragController::CompleteDrag() {
   DCHECK(started_drag_);
 
   if (attached_tabstrip_) {
     if (is_dragging_new_browser_) {
+#if defined(USE_ASH)
+      if (attached_tabstrip_->GetWidget()->GetNativeWindow()->parent()->id() ==
+          ash::internal::kShellWindowId_DockedContainer) {
+        was_source_maximized_ = false;
+        was_source_fullscreen_ = false;
+      }
+#endif
       // If source window was maximized - maximize the new window as well.
       if (was_source_maximized_)
         attached_tabstrip_->GetWidget()->Maximize();
 #if defined(USE_ASH)
       if (was_source_fullscreen_ &&
           host_desktop_type_ == chrome::HOST_DESKTOP_TYPE_ASH) {
         // In fullscreen mode it is only possible to get here if the source
         // was in "immersive fullscreen" mode, so toggle it back on.
         ash::Shell::GetInstance()->delegate()->ToggleFullscreen();
       }
 #endif
+    } else {
+#if defined(USE_ASH)
+      // When dragging results in maximized or fullscreen browser window getting
+      // docked, restore it.
+      if (host_desktop_type_ == chrome::HOST_DESKTOP_TYPE_ASH &&

[oshima, 2013/10/25 16:12:32]

I think this check isn't necessary as the paren'ts ID won't match in desktop
environment. Maybe this should be DCHECK in if block.

[varkha, 2013/10/25 17:05:04]

Done.

+          (was_source_fullscreen_ || was_source_maximized_) &&
+          (attached_tabstrip_->GetWidget()->GetNativeWindow()->parent()->id() ==
+              ash::internal::kShellWindowId_DockedContainer)) {
+        attached_tabstrip_->GetWidget()->Restore();
+      }
+#endif
     }
     attached_tabstrip_->StoppedDraggingTabs(
         GetTabsMatchingDraggedContents(attached_tabstrip_),
         initial_tab_positions_,
         move_behavior_ == MOVE_VISIBILE_TABS,
         true);
   } else {
     if (dock_info_.type() != DockInfo::NONE) {
       switch (dock_info_.type()) {
         case DockInfo::LEFT_OF_WINDOW:
@@ skipping 361 matching lines @@
 gfx::Vector2d TabDragController::GetWindowOffset(
     const gfx::Point& point_in_screen) {
   TabStrip* owning_tabstrip = (attached_tabstrip_ && detach_into_browser_) ?
       attached_tabstrip_ : source_tabstrip_;
   views::View* toplevel_view = owning_tabstrip->GetWidget()->GetContentsView();
 
   gfx::Point point = point_in_screen;
   views::View::ConvertPointFromScreen(toplevel_view, &point);
   return point.OffsetFromOrigin();
 }