Remove docked windows entirely in M59.

chrome/browser/ui/views/frame/browser_frame_ash.cc

 // Copyright 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 "chrome/browser/ui/views/frame/browser_frame_ash.h"
 
 #include "ash/common/ash_switches.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/window_state_delegate.h"
 #include "ash/shell.h"
@@ skipping 100 matching lines @@
   } else {
     *bounds = GetWidget()->GetRestoredBounds();
     *show_state = GetWidget()->GetNativeWindow()->GetProperty(
                       aura::client::kShowStateKey);
   }
 
   if (*show_state != ui::SHOW_STATE_MAXIMIZED &&
       *show_state != ui::SHOW_STATE_MINIMIZED) {
     *show_state = ui::SHOW_STATE_NORMAL;
   }
-
-  // TODO(afakhry): Remove Docked Windows in M58.
-  if (ash::switches::DockedWindowsEnabled() &&
-      ash::wm::GetWindowState(GetNativeWindow())->IsDocked()) {
-    if (browser_view_->browser()->is_app()) {
-      // Only web app windows (not tabbed browser windows) persist docked state.
-      *show_state = ui::SHOW_STATE_DOCKED;
-    } else {
-      // Restore original restore bounds for tabbed browser windows ignoring
-      // the docked origin.
-      gfx::Rect* restore_bounds = GetWidget()->GetNativeWindow()->GetProperty(
-          aura::client::kRestoreBoundsKey);
-      if (restore_bounds)
-        *bounds = *restore_bounds;
-    }
-  }
 }
 
 bool BrowserFrameAsh::PreHandleKeyboardEvent(
     const content::NativeWebKeyboardEvent& event) {
   return false;
 }
 
 bool BrowserFrameAsh::HandleKeyboardEvent(
     const content::NativeWebKeyboardEvent& event) {
   return false;
@@ skipping 31 matching lines @@
 // BrowserFrameAsh, private:
 
 void BrowserFrameAsh::SetWindowAutoManaged() {
   // For browser window in Chrome OS, we should only enable the auto window
   // management logic for tabbed browser.
   if (!browser_view_->browser()->is_type_popup()) {
     ash::wm::GetWindowState(GetNativeWindow())
         ->set_window_position_managed(true);
   }
 }