Remove docked windows entirely in M59.

chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc

Index: chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc
index f4eff34bbb1f2046c928e160a7445984b0edab52..8c0004a3f749e6aa2c63fd33dcf4e1f845ec11a1 100644
--- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc
+++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc
@@ -131,14 +131,6 @@ void ChromeNativeAppWindowViewsAuraAsh::InitializeWindow(
     const AppWindow::CreateParams& create_params) {
   ChromeNativeAppWindowViewsAura::InitializeWindow(app_window, create_params);
   aura::Window* window = widget()->GetNativeWindow();
-
-  // TODO(afakhry): Remove Docked Windows in M58.
-  // Restore docked state on ash desktop if the docked windows flag is enabled.
-  if (create_params.state == ui::SHOW_STATE_DOCKED &&
-      ash::switches::DockedWindowsEnabled()) {
-    window->SetProperty(aura::client::kShowStateKey, create_params.state);
-  }
-
   window->SetProperty(aura::client::kAppIdKey,
                       new std::string(app_window->extension_id()));
 
@@ -183,11 +175,9 @@ void ChromeNativeAppWindowViewsAuraAsh::OnBeforeWidgetInit(
 }
 
 void ChromeNativeAppWindowViewsAuraAsh::OnBeforePanelWidgetInit(
-    bool use_default_bounds,
     views::Widget::InitParams* init_params,
     views::Widget* widget) {
-  ChromeNativeAppWindowViewsAura::OnBeforePanelWidgetInit(use_default_bounds,
-                                                          init_params,
+  ChromeNativeAppWindowViewsAura::OnBeforePanelWidgetInit(init_params,
                                                           widget);
 
   if (ash_util::IsRunningInMash()) {
@@ -197,7 +187,7 @@ void ChromeNativeAppWindowViewsAuraAsh::OnBeforePanelWidgetInit(
         mojo::ConvertTo<std::vector<uint8_t>>(
             static_cast<aura::PropertyConverter::PrimitiveType>(
                 ash::TYPE_APP_PANEL));
-  } else if (ash::Shell::HasInstance() && use_default_bounds) {
+  } else if (ash::Shell::HasInstance()) {
     // Open a new panel on the target root.
     init_params->context = ash::Shell::GetRootWindowForNewWindows();
     init_params->bounds = gfx::Rect(GetPreferredSize());
@@ -254,16 +244,6 @@ ChromeNativeAppWindowViewsAuraAsh::GetRestoredState() const {
       }
       return ui::SHOW_STATE_FULLSCREEN;
     }
-
-    // TODO(afakhry): Remove Docked Windows in M58.
-    if (ash::switches::DockedWindowsEnabled() &&
-        (widget()->GetNativeWindow()->GetProperty(
-             aura::client::kShowStateKey) == ui::SHOW_STATE_DOCKED ||
-         widget()->GetNativeWindow()->GetProperty(
-             aura::client::kPreMinimizedShowStateKey) ==
-             ui::SHOW_STATE_DOCKED)) {
-      return ui::SHOW_STATE_DOCKED;
-    }
   }
 
   return GetRestorableState(restore_state);