Remove docked windows entirely in M59.

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

 // Copyright 2016 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/apps/chrome_native_app_window_views_aura_ash.h"
 
 #include "apps/ui/views/app_window_frame_view.h"
 #include "ash/common/ash_constants.h"
 #include "ash/common/ash_switches.h"
 #include "ash/common/frame/custom_frame_view_ash.h"
@@ skipping 113 matching lines @@
 
 ChromeNativeAppWindowViewsAuraAsh::ChromeNativeAppWindowViewsAuraAsh() {}
 
 ChromeNativeAppWindowViewsAuraAsh::~ChromeNativeAppWindowViewsAuraAsh() {}
 
 void ChromeNativeAppWindowViewsAuraAsh::InitializeWindow(
     AppWindow* app_window,
     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()));
 
   if (app_window->window_type_is_panel()) {
     // Ash's ShelfWindowWatcher handles app panel windows once this type is set.
     // The type should have been initialized for mash below, via mus_properties.
     if (!ash_util::IsRunningInMash())
       window->SetProperty<int>(ash::kShelfItemTypeKey, ash::TYPE_APP_PANEL);
   } else {
     window->SetProperty(aura::client::kAppType,
@@ skipping 24 matching lines @@
     }
   }
   DCHECK_NE(AppWindow::WINDOW_TYPE_PANEL, create_params.window_type);
   DCHECK_NE(AppWindow::WINDOW_TYPE_V1_PANEL, create_params.window_type);
   init_params->mus_properties
       [ui::mojom::WindowManager::kRemoveStandardFrame_InitProperty] =
       mojo::ConvertTo<std::vector<uint8_t>>(init_params->remove_standard_frame);
 }
 
 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()) {
     // Ash's ShelfWindowWatcher handles app panel windows once this type is set.
     init_params
         ->mus_properties[ui::mojom::WindowManager::kShelfItemType_Property] =
         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());
     wm::ConvertRectToScreen(ash::Shell::GetRootWindowForNewWindows(),
                             &init_params->bounds);
   }
 }
 
 views::NonClientFrameView*
 ChromeNativeAppWindowViewsAuraAsh::CreateNonStandardAppFrame() {
@@ skipping 36 matching lines @@
     if (IsFullscreen()) {
       if (immersive_fullscreen_controller_.get() &&
           immersive_fullscreen_controller_->IsEnabled()) {
         // Restore windows which were previously in immersive fullscreen to
         // maximized. Restoring the window to a different fullscreen type
         // makes for a bad experience.
         return ui::SHOW_STATE_MAXIMIZED;
       }
       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);
 }
 
 bool ChromeNativeAppWindowViewsAuraAsh::IsAlwaysOnTop() const {
   if (app_window()->window_type_is_panel())
     return widget()->GetNativeWindow()->GetProperty(ash::kPanelAttachedKey);
   return widget()->IsAlwaysOnTop();
 }
@@ skipping 117 matching lines @@
     window_tree_host->SetClientArea(insets,
                                     std::move(additional_client_regions));
   }
 }
 
 void ChromeNativeAppWindowViewsAuraAsh::OnMenuClosed() {
   menu_runner_.reset();
   menu_model_adapter_.reset();
   menu_model_.reset();
 }