Remove docked windows entirely in M59.

ui/views/mus/desktop_window_tree_host_mus.cc

 // Copyright 2016 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 "ui/views/mus/desktop_window_tree_host_mus.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 198 matching lines @@
   // the cursor-client needs to be unset on the root-window before
   // |cursor_manager_| is destroyed.
   aura::client::SetCursorClient(window(), nullptr);
   desktop_native_widget_aura_->content_window()->RemoveObserver(this);
   native_widget_delegate_->AsWidget()->RemoveObserver(this);
   MusClient::Get()->RemoveObserver(this);
   aura::Env::GetInstance()->RemoveObserver(this);
   desktop_native_widget_aura_->OnDesktopWindowTreeHostDestroyed(this);
 }
 
-// TODO(afakhry): Remove Docked Windows in M58.
-bool DesktopWindowTreeHostMus::IsDocked() const {
-  return window()->GetProperty(aura::client::kShowStateKey) ==
-         ui::SHOW_STATE_DOCKED;
-}
-
 void DesktopWindowTreeHostMus::SendClientAreaToServer() {
   if (!ShouldSendClientAreaToServer())
     return;
 
   NonClientView* non_client_view =
       native_widget_delegate_->AsWidget()->non_client_view();
   if (!non_client_view || !non_client_view->client_view())
     return;
 
   const gfx::Rect client_area_rect(non_client_view->client_view()->bounds());
@@ skipping 151 matching lines @@
 
   DestroyCompositor();
   desktop_native_widget_aura_->OnHostClosed();
 }
 
 aura::WindowTreeHost* DesktopWindowTreeHostMus::AsWindowTreeHost() {
   return this;
 }
 
 void DesktopWindowTreeHostMus::ShowWindowWithState(ui::WindowShowState state) {
-  // TODO(afakhry): Remove Docked Windows in M58.
-  if (state == ui::SHOW_STATE_MAXIMIZED || state == ui::SHOW_STATE_FULLSCREEN ||
-      state == ui::SHOW_STATE_DOCKED) {
+  if (state == ui::SHOW_STATE_MAXIMIZED || state == ui::SHOW_STATE_FULLSCREEN)
     window()->SetProperty(aura::client::kShowStateKey, state);
-  }
   window()->Show();
   if (compositor())
     compositor()->SetVisible(true);
 
   native_widget_delegate_->OnNativeWidgetVisibilityChanged(true);
 
   if (native_widget_delegate_->CanActivate()) {
     if (state != ui::SHOW_STATE_INACTIVE)
       Activate();
 
@@ skipping 81 matching lines @@
 }
 
 gfx::Rect DesktopWindowTreeHostMus::GetClientAreaBoundsInScreen() const {
   // View-to-screen coordinate system transformations depend on this returning
   // the full window bounds, for example View::ConvertPointToScreen().
   return GetWindowBoundsInScreen();
 }
 
 gfx::Rect DesktopWindowTreeHostMus::GetRestoredBounds() const {
   // Restored bounds should only be relevant if the window is minimized,
-  // maximized, fullscreen or docked. However, in some places the code expects
+  // maximized, or fullscreen. However, in some places the code expects
   // GetRestoredBounds() to return the current window bounds if the window is
   // not in either state.
   if (IsMinimized() || IsMaximized() || IsFullscreen()) {
     // Restore bounds are in screen coordinates, no need to convert.
     gfx::Rect* restore_bounds =
         window()->GetProperty(aura::client::kRestoreBoundsKey);
     if (restore_bounds)
       return *restore_bounds;
   }
-  gfx::Rect bounds = GetWindowBoundsInScreen();
-  if (IsDocked()) {
-    // Restore bounds are in screen coordinates, no need to convert.
-    gfx::Rect* restore_bounds =
-        window()->GetProperty(aura::client::kRestoreBoundsKey);
-    // Use current window horizontal offset origin in order to preserve docked
-    // alignment but preserve restored size and vertical offset for the time
-    // when the |window_| gets undocked.
-    if (restore_bounds) {
-      bounds.set_size(restore_bounds->size());
-      bounds.set_y(restore_bounds->y());
-    }
-  }
-  return bounds;
+  return GetWindowBoundsInScreen();
 }
 
 std::string DesktopWindowTreeHostMus::GetWorkspace() const {
   // Only used on x11.
   return std::string();
 }
 
 gfx::Rect DesktopWindowTreeHostMus::GetWorkAreaBoundsInScreen() const {
   // TODO(sky): GetDisplayNearestWindow() should take a const aura::Window*.
   return display::Screen::GetScreen()
@@ skipping 277 matching lines @@
     aura::client::FocusClient* focus_client,
     aura::Window* window) {
   if (window == this->window()) {
     desktop_native_widget_aura_->HandleActivationChanged(true);
   } else if (is_active_) {
     desktop_native_widget_aura_->HandleActivationChanged(false);
   }
 }
 
 }  // namespace views