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 65e254eb468daea8636b16878902bd6f4e891609..86a08fb80b5ccb0ecd5efda20653c125c91b77e2 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()));
 
@@ -253,16 +245,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);