Remove persisted docked windows

chrome/browser/ui/window_sizer/window_sizer.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/window_sizer/window_sizer.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/browser_window_state.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/prefs/pref_service.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 
 #if defined(USE_ASH)
+#include "ash/common/ash_switches.h"
 #include "ash/common/wm/window_positioner.h"  // nogncheck
 #include "ash/shell.h"  // nogncheck
 #include "chrome/browser/ui/ash/ash_util.h"  // nogncheck
 #endif
 
 namespace {
 
 // Minimum height of the visible part of a window.
 const int kMinVisibleHeight = 30;
 // Minimum width of the visible part of a window.
@@ skipping 37 matching lines @@
     int work_area_bottom = 0;
     int work_area_right = 0;
     if (wp_pref) {
       wp_pref->GetInteger("work_area_top", &work_area_top);
       wp_pref->GetInteger("work_area_left", &work_area_left);
       wp_pref->GetInteger("work_area_bottom", &work_area_bottom);
       wp_pref->GetInteger("work_area_right", &work_area_right);
       if (*show_state == ui::SHOW_STATE_DEFAULT && maximized)
         *show_state = ui::SHOW_STATE_MAXIMIZED;
 #if defined(USE_ASH)
-      bool docked = false;
-      wp_pref->GetBoolean("docked", &docked);
-      if (*show_state == ui::SHOW_STATE_DEFAULT && docked &&
-          !browser_->is_type_tabbed()) {
-        *show_state = ui::SHOW_STATE_DOCKED;
+      // TODO(afakhry): Remove Docked Windows in M58.
+      if (ash::switches::DockedWindowsEnabled()) {
+        bool docked = false;
+        wp_pref->GetBoolean("docked", &docked);
+        if (*show_state == ui::SHOW_STATE_DEFAULT && docked &&
+            !browser_->is_type_tabbed()) {
+          *show_state = ui::SHOW_STATE_DOCKED;
+        }
       }
 #endif  // USE_ASH
     }
     work_area->SetRect(work_area_left, work_area_top,
                       std::max(0, work_area_right - work_area_left),
                       std::max(0, work_area_bottom - work_area_top));
 
     return has_prefs;
   }
 
@@ skipping 328 matching lines @@
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kStartMaximized))
     return ui::SHOW_STATE_MAXIMIZED;
 
   if (browser_->initial_show_state() != ui::SHOW_STATE_DEFAULT)
     return browser_->initial_show_state();
 
   // Otherwise we use the default which can be overridden later on.
   return ui::SHOW_STATE_DEFAULT;
 }