Mash cleanup: Remove some more window and window frame related code.

TBR=tsepez@chromium.org

Bug: 958154
Change-Id: I21dadda1bd78fbd713eb3574edea7f2087100762
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1595982
Commit-Queue: Evan Stade <estade@chromium.org>
Auto-Submit: Evan Stade <estade@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#657429}

ash/shelf/shelf_window_watcher.cc

@@ -66,9 +66,7 @@ void UpdateShelfItemForWindow(ShelfItem* item, aura::Window* window) {
   }
 
   // Prefer app icons over window icons, they're typically larger.
-  gfx::ImageSkia* image = window->GetProperty(aura::client::kAppIconLargeKey);
-  if (!image || image->isNull())
-    image = window->GetProperty(aura::client::kAppIconKey);
+  gfx::ImageSkia* image = window->GetProperty(aura::client::kAppIconKey);
   if (!image || image->isNull())
     image = window->GetProperty(aura::client::kWindowIconKey);
   if (!image || image->isNull()) {
@@ -137,8 +135,7 @@ void ShelfWindowWatcher::UserWindowObserver::OnWindowPropertyChanged(
         ShelfID::Deserialize(window->GetProperty(kShelfIDKey)));
   }
 
-  if (key == aura::client::kAppIconLargeKey ||
-      key == aura::client::kAppIconKey || key == aura::client::kWindowIconKey ||
+  if (key == aura::client::kAppIconKey || key == aura::client::kWindowIconKey ||
       key == aura::client::kDrawAttentionKey || key == kShelfItemTypeKey ||
       key == kShelfIDKey) {
     window_watcher_->OnUserWindowPropertyChanged(window);

ash/wm/overview/caption_container_view.cc

@@ -114,11 +114,8 @@ CaptionContainerView::CaptionContainerView(EventDelegate* event_delegate,
           kHorizontalLabelPaddingDp));
   AddChildWithLayer(this, header_view_);
 
-  // Prefer kAppIconSmallKey (set by the client in Mash), then kAppIconKey and
-  // kWindowIconKey (set for client windows in classic Ash but not Mash).
-  gfx::ImageSkia* icon = window->GetProperty(aura::client::kAppIconSmallKey);
-  if (!icon || icon->size().IsEmpty())
-    icon = window->GetProperty(aura::client::kAppIconKey);
+  // Prefer kAppIconKey over kWindowIconKey as the app icon is typically larger.
+  gfx::ImageSkia* icon = window->GetProperty(aura::client::kAppIconKey);
   if (!icon || icon->size().IsEmpty())
     icon = window->GetProperty(aura::client::kWindowIconKey);
   if (icon && !icon->size().IsEmpty()) {

chrome/browser/ui/views/chrome_views_delegate_chromeos.cc

@@ -78,13 +78,12 @@ views::NativeWidget* ChromeViewsDelegate::CreateNativeWidget(
   if (params->context)
     params->context = params->context->GetRootWindow();
 
-  // Classic ash requires a parent or a context that it can use to look up a
-  // root window to find a WindowParentingClient. Mash handles window parenting
-  // inside ash, see ash::CreateAndParentTopLevelWindow().
-  if (!features::IsUsingWindowService() && !params->parent && !params->context)
+  // Ash requires a parent or a context that it can use to look up a root window
+  // to find a WindowParentingClient.
+  if (!params->parent && !params->context)
     params->context = ash::Shell::GetRootWindowForNewWindows();
 
   // By returning null Widget creates the default NativeWidget implementation,
-  // which for chromeos is NativeWidgetAura.
+  // which for Chrome OS is NativeWidgetAura.
   return nullptr;
 }

chrome/browser/ui/views/frame/browser_view.cc

@@ -173,7 +173,6 @@
 #include "chrome/browser/ui/ash/window_properties.h"
 #include "chrome/browser/ui/views/frame/top_controls_slide_controller_chromeos.h"
 #include "chrome/grit/chrome_unscaled_resources.h"
-#include "ui/base/ui_base_features.h"
 #else
 #include "chrome/browser/ui/signin_view_controller.h"
 #endif  // !defined(OS_CHROMEOS)

chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc

@@ -27,7 +27,6 @@
 #include "ui/aura/mus/window_tree_host_mus.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_targeter.h"
-#include "ui/base/ui_base_features.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/paint_context.h"
 #include "ui/compositor/paint_recorder.h"

chrome/browser/ui/views/frame/immersive_mode_controller_ash_browsertest.cc

@@ -33,7 +33,6 @@
 #include "services/service_manager/public/cpp/connector.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/test/mus/change_completion_waiter.h"
-#include "ui/base/ui_base_features.h"
 #include "ui/views/animation/test/ink_drop_host_view_test_api.h"
 #include "ui/views/window/frame_caption_button.h"
 

chrome/browser/ui/views/frame/top_controls_slide_controller_chromeos_browsertest.cc

@@ -36,7 +36,6 @@
 #include "services/service_manager/public/cpp/connector.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
-#include "ui/base/ui_base_features.h"
 #include "ui/display/display.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/geometry/rect.h"
@@ -891,11 +890,8 @@ IN_PROC_BROWSER_TEST_F(TopControlsSlideControllerTest, TestDropDowns) {
   OpenUrlAtIndex(embedded_test_server()->GetURL("/top_controls_scroll.html"),
                  0);
 
-  // On mash, use nullptr root windows to route events over mojo to ash.
   aura::Window* browser_window = browser()->window()->GetNativeWindow();
-  ui::test::EventGenerator event_generator(
-      features::IsUsingWindowService() ? nullptr
-                                       : browser_window->GetRootWindow());
+  ui::test::EventGenerator event_generator(browser_window->GetRootWindow());
 
   // Send a mouse click event that should open the popup drop-down menu of the
   // <select> html element on the page.

chrome/browser/ui/views/task_manager_view.cc

@@ -38,9 +38,8 @@
 #include "ash/public/cpp/shelf_item.h"
 #include "ash/public/cpp/window_properties.h"
 #include "chrome/grit/theme_resources.h"
-#include "ui/aura/client/aura_constants.h"
+#include "ui/aura/window.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/base/ui_base_features.h"
 #include "ui/gfx/image/image_skia.h"
 #endif  // defined(OS_CHROMEOS)
 
@@ -104,16 +103,6 @@ task_manager::TaskManagerTableModel* TaskManagerView::Show(Browser* browser) {
   const ash::ShelfID shelf_id(kTaskManagerId);
   window->SetProperty(ash::kShelfIDKey, new std::string(shelf_id.Serialize()));
   window->SetProperty<int>(ash::kShelfItemTypeKey, ash::TYPE_DIALOG);
-  // For classic Ash, GetWindowIcon() is sufficient. For Mash, the task manager
-  // specifically needs to set a large app icon for the benefit of
-  // ShelfWindowWatcher.
-  if (features::IsUsingWindowService()) {
-    window->GetRootWindow()->SetProperty(
-        aura::client::kAppIconLargeKey,
-        new gfx::ImageSkia(
-            *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-                IDR_ASH_SHELF_ICON_TASK_MANAGER)));
-  }
 #endif
   return g_task_manager_view->table_model_.get();
 }

services/ws/public/mojom/window_manager.mojom

@@ -63,12 +63,6 @@ interface WindowManager {
   // A boolean determining whether animations are disabled for the window.
   const string kAnimationsDisabled_Property = "prop:animations-disabled";
 
-  // A large version of the application icon. Type: SkBitmap
-  const string kAppIconLarge_Property = "prop:app-icon-large";
-
-  // A small version of the application icon. Type: SkBitmap
-  const string kAppIconSmall_Property = "prop:app-icon-small";
-
   // The avatar icon to display in the frame header, if any. Type: SkBitmap
   const string kAvatarIcon_Property = "prop:avatar-icon";
 

ui/aura/client/aura_constants.cc

@@ -44,8 +44,6 @@ DEFINE_UI_CLASS_PROPERTY_KEY(bool, kActivateOnPointerKey, true)
 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kAlwaysOnTopKey, false)
 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kAnimationsDisabledKey, false)
 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::ImageSkia, kAppIconKey, nullptr)
-DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::ImageSkia, kAppIconLargeKey, nullptr)
-DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::ImageSkia, kAppIconSmallKey, nullptr)
 DEFINE_UI_CLASS_PROPERTY_KEY(int, kAppType, 0)
 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::SizeF, kAspectRatio, nullptr)
 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::ImageSkia, kAvatarIconKey, nullptr)

ui/aura/client/aura_constants.h

@@ -52,16 +52,6 @@ AURA_EXPORT extern const WindowProperty<bool>* const kAnimationsDisabledKey;
 // This is not transported to the window service.
 AURA_EXPORT extern const WindowProperty<gfx::ImageSkia*>* const kAppIconKey;
 
-// A property key to store a large version of the app icon, which is
-// transported to the window service.
-AURA_EXPORT extern const WindowProperty<gfx::ImageSkia*>* const
-    kAppIconLargeKey;
-
-// A property key to store a smaller version of the app icon, which is
-// transported to the window service.
-AURA_EXPORT extern const WindowProperty<gfx::ImageSkia*>* const
-    kAppIconSmallKey;
-
 // A property key to store the type of window that will be used to record
 // pointer metrics. See AppType in ash/public/cpp/app_types.h for more details.
 AURA_EXPORT extern const WindowProperty<int>* const kAppType;

ui/aura/mus/property_converter.cc

@@ -72,10 +72,6 @@ PropertyConverter::CreateAcceptAnyValueCallback() {
 
 PropertyConverter::PropertyConverter() {
   // Add known aura properties with associated mus properties.
-  RegisterImageSkiaProperty(client::kAppIconLargeKey,
-                            ws::mojom::WindowManager::kAppIconLarge_Property);
-  RegisterImageSkiaProperty(client::kAppIconSmallKey,
-                            ws::mojom::WindowManager::kAppIconSmall_Property);
   RegisterImageSkiaProperty(client::kAvatarIconKey,
                             ws::mojom::WindowManager::kAvatarIcon_Property);
   RegisterPrimitiveProperty(client::kAlwaysOnTopKey,

ui/views/mus/desktop_window_tree_host_mus.cc

@@ -874,22 +874,7 @@ void DesktopWindowTreeHostMus::SetAspectRatio(const gfx::SizeF& aspect_ratio) {
 }
 
 void DesktopWindowTreeHostMus::SetWindowIcons(const gfx::ImageSkia& window_icon,
-                                              const gfx::ImageSkia& app_icon) {
-  // In Ash, the app icon is always used in preference to the window icon, so
-  // ignore the window icon. The max size that ash needs is 24dip, which is
-  // kIconSize in caption_container_view.cc.
-  constexpr gfx::Size kMaxUsefulAppIconSize(24, 24);
-  DCHECK_EQ(app_icon.width(), app_icon.height());
-  gfx::ImageSkia app_icon_resized =
-      app_icon.width() > kMaxUsefulAppIconSize.width()
-          ? gfx::ImageSkiaOperations::CreateResizedImage(
-                app_icon, skia::ImageOperations::RESIZE_BEST,
-                kMaxUsefulAppIconSize)
-          : app_icon;
-
-  window()->GetRootWindow()->SetProperty(aura::client::kAppIconSmallKey,
-                                         new gfx::ImageSkia(app_icon_resized));
-}
+                                              const gfx::ImageSkia& app_icon) {}
 
 void DesktopWindowTreeHostMus::InitModalType(ui::ModalType modal_type) {
   // See comment in Init() related to |InitParams::parent| as to why this DCHECK