Remove persisted docked windows

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"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
@@ skipping 94 matching lines @@
     *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;
   }
 
-  if (ash::wm::GetWindowState(GetNativeWindow())->IsDocked()) {
+  // 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;
@@ skipping 42 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserFrameAsh, private:
 
 void BrowserFrameAsh::SetWindowAutoManaged() {
   if (!browser_view_->browser()->is_type_popup() ||
       browser_view_->browser()->is_app()) {
     ash::wm::GetWindowState(GetNativeWindow())->
         set_window_position_managed(true);
   }
 }