Mash: miscellaneous window related cleanups

- remove some window properties that had been used for theming
- remove dead member variable
- update comments
- use remove_standard_frame / kRemoveStandardFrame_InitProperty instead
  of kDisableImmersive_InitProperty for Mash browser windows

Bug: 887051
Change-Id: Ia7d64acebca600354162be9560bc64761bd3570e
Reviewed-on: https://chromium-review.googlesource.com/c/1255924Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Evan Stade <estade@chromium.org>
Cr-Commit-Position: refs/heads/master@{#596357}

ash/frame/header_view.cc

@@ -325,12 +325,7 @@ void HeaderView::UpdateCaptionButtonsVisibility() {
   if (!target_widget_)
     return;
 
-  caption_button_container_->SetVisible(
-      should_paint_ && !(Shell::Get()
-                             ->tablet_mode_controller()
-                             ->IsTabletModeWindowManagerEnabled() &&
-                         target_widget_->GetNativeWindow()->GetProperty(
-                             ash::kHideCaptionButtonsInTabletModeKey)));
+  caption_button_container_->SetVisible(should_paint_);
 }
 
 }  // namespace ash

ash/frame/non_client_frame_view_ash_unittest.cc

@@ -9,7 +9,6 @@
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/frame/header_view.h"
 #include "ash/frame/wide_frame_view.h"
-#include "ash/public/cpp/app_list/app_list_features.h"
 #include "ash/public/cpp/ash_layout_constants.h"
 #include "ash/public/cpp/ash_switches.h"
 #include "ash/public/cpp/caption_buttons/frame_caption_button.h"
@@ -29,7 +28,6 @@
 #include "ash/wm/wm_event.h"
 #include "base/command_line.h"
 #include "base/containers/flat_set.h"
-#include "base/test/scoped_feature_list.h"
 #include "services/ws/public/mojom/window_tree_constants.mojom.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
@@ -927,81 +925,4 @@ TEST_P(NonClientFrameViewAshFrameColorTest, WideFrameInitialColor) {
 // Run frame color tests with and without custom wm::WindowStateDelegate.
 INSTANTIATE_TEST_CASE_P(, NonClientFrameViewAshFrameColorTest, testing::Bool());
 
-class HomeLauncherNonClientFrameViewAshTest : public AshTestBase {
- public:
-  HomeLauncherNonClientFrameViewAshTest() = default;
-  ~HomeLauncherNonClientFrameViewAshTest() override = default;
-
-  void SetUp() override {
-    scoped_feature_list_.InitAndEnableFeature(
-        app_list_features::kEnableHomeLauncher);
-    AshTestBase::SetUp();
-  }
-
- private:
-  base::test::ScopedFeatureList scoped_feature_list_;
-
-  DISALLOW_COPY_AND_ASSIGN(HomeLauncherNonClientFrameViewAshTest);
-};
-
-// Tests the visibility of the caption button container when
-// kHideCaptionButtonsInTabletModeKey is set.
-TEST_F(HomeLauncherNonClientFrameViewAshTest,
-       TabletModeBrowserCaptionButtonVisibility) {
-  auto* delegate = new NonClientFrameViewAshTestWidgetDelegate();
-  std::unique_ptr<views::Widget> widget = CreateTestWidget(
-      delegate, kShellWindowId_DefaultContainer, gfx::Rect(100, 0, 400, 500));
-  widget->GetNativeWindow()->SetProperty(kHideCaptionButtonsInTabletModeKey,
-                                         true);
-
-  FrameCaptionButtonContainerView* caption_buttons =
-      delegate->non_client_frame_view()
-          ->GetHeaderView()
-          ->caption_button_container();
-
-  EXPECT_TRUE(caption_buttons->visible());
-  ash::Shell* shell = ash::Shell::Get();
-  ash::TabletModeController* tablet_mode_controller =
-      shell->tablet_mode_controller();
-  tablet_mode_controller->EnableTabletModeWindowManager(true);
-  EXPECT_FALSE(caption_buttons->visible());
-
-  shell->window_selector_controller()->ToggleOverview();
-  EXPECT_FALSE(caption_buttons->visible());
-  shell->window_selector_controller()->ToggleOverview();
-  EXPECT_FALSE(caption_buttons->visible());
-
-  tablet_mode_controller->EnableTabletModeWindowManager(false);
-  EXPECT_TRUE(caption_buttons->visible());
-}
-
-// Tests the visibility of the caption button container when
-// kHideCaptionButtonsInTabletModeKey is not set.
-TEST_F(HomeLauncherNonClientFrameViewAshTest,
-       TabletModeAppCaptionButtonVisibility) {
-  auto* delegate = new NonClientFrameViewAshTestWidgetDelegate();
-  std::unique_ptr<views::Widget> widget = CreateTestWidget(
-      delegate, kShellWindowId_DefaultContainer, gfx::Rect(100, 0, 400, 500));
-
-  FrameCaptionButtonContainerView* caption_buttons =
-      delegate->non_client_frame_view()
-          ->GetHeaderView()
-          ->caption_button_container();
-
-  EXPECT_TRUE(caption_buttons->visible());
-  ash::Shell* shell = ash::Shell::Get();
-  ash::TabletModeController* tablet_mode_controller =
-      shell->tablet_mode_controller();
-  tablet_mode_controller->EnableTabletModeWindowManager(true);
-  EXPECT_TRUE(caption_buttons->visible());
-
-  shell->window_selector_controller()->ToggleOverview();
-  EXPECT_FALSE(caption_buttons->visible());
-  shell->window_selector_controller()->ToggleOverview();
-  EXPECT_TRUE(caption_buttons->visible());
-
-  tablet_mode_controller->EnableTabletModeWindowManager(false);
-  EXPECT_TRUE(caption_buttons->visible());
-}
-
 }  // namespace ash

ash/public/cpp/frame_header.cc

@@ -164,7 +164,7 @@ void FrameHeader::SetLeftHeaderView(views::View* left_header_view) {
 void FrameHeader::SetBackButton(FrameCaptionButton* back_button) {
   back_button_ = back_button;
   if (back_button_) {
-    back_button_->SetColorMode(GetButtonColorMode());
+    back_button_->SetColorMode(button_color_mode_);
     back_button_->SetBackgroundColor(GetCurrentFrameColor());
     back_button_->SetImage(CAPTION_BUTTON_ICON_BACK,
                            FrameCaptionButton::ANIMATE_NO,
@@ -208,12 +208,10 @@ gfx::Rect FrameHeader::GetPaintedBounds() const {
 }
 
 void FrameHeader::UpdateCaptionButtonColors() {
-  auto button_color_mode = GetButtonColorMode();
-
-  caption_button_container_->SetColorMode(button_color_mode);
+  caption_button_container_->SetColorMode(button_color_mode_);
   caption_button_container_->SetBackgroundColor(GetCurrentFrameColor());
   if (back_button_) {
-    back_button_->SetColorMode(button_color_mode);
+    back_button_->SetColorMode(button_color_mode_);
     back_button_->SetBackgroundColor(GetCurrentFrameColor());
   }
 }
@@ -303,11 +301,4 @@ gfx::Rect FrameHeader::GetTitleBounds() const {
                                  GetHeaderHeight());
 }
 
-FrameCaptionButton::ColorMode FrameHeader::GetButtonColorMode() {
-  return target_widget()->GetNativeWindow()->GetProperty(
-             ash::kFrameIsThemedByHostedAppKey)
-             ? FrameCaptionButton::ColorMode::kThemed
-             : FrameCaptionButton::ColorMode::kDefault;
-}
-
 }  // namespace ash

ash/public/cpp/frame_header.h

@@ -78,6 +78,10 @@ class ASH_PUBLIC_EXPORT FrameHeader : public gfx::AnimationDelegate {
   // gfx::AnimationDelegate:
   void AnimationProgressed(const gfx::Animation* animation) override;
 
+  void set_button_color_mode(FrameCaptionButton::ColorMode button_color_mode) {
+    button_color_mode_ = button_color_mode;
+  }
+
  protected:
   FrameHeader(views::Widget* target_widget, views::View* view);
 
@@ -127,7 +131,8 @@ class ASH_PUBLIC_EXPORT FrameHeader : public gfx::AnimationDelegate {
 
   gfx::Rect GetTitleBounds() const;
 
-  FrameCaptionButton::ColorMode GetButtonColorMode();
+  FrameCaptionButton::ColorMode button_color_mode_ =
+      FrameCaptionButton::ColorMode::kDefault;
 
   // The widget that the caption buttons act on. This can be different from
   // |view_|'s widget.

ash/public/cpp/mus_property_mirror_ash.cc

@@ -85,13 +85,6 @@ void MusPropertyMirrorAsh::MirrorPropertyFromWidgetWindowToRootWindow(
   } else if (key == kFrameInactiveColorKey) {
     root_window->SetProperty(kFrameInactiveColorKey,
                              window->GetProperty(kFrameInactiveColorKey));
-  } else if (key == kFrameIsThemedByHostedAppKey) {
-    root_window->SetProperty(kFrameIsThemedByHostedAppKey,
-                             window->GetProperty(kFrameIsThemedByHostedAppKey));
-  } else if (key == kHideCaptionButtonsInTabletModeKey) {
-    root_window->SetProperty(
-        kHideCaptionButtonsInTabletModeKey,
-        window->GetProperty(kHideCaptionButtonsInTabletModeKey));
   } else if (key == kImmersiveImpliedByFullscreen) {
     root_window->SetProperty(
         kImmersiveImpliedByFullscreen,

ash/public/cpp/window_properties.cc

@@ -59,17 +59,10 @@ void RegisterWindowProperties(aura::PropertyConverter* property_converter) {
       kFrameActiveColorKey,
       ws::mojom::WindowManager::kFrameActiveColor_Property,
       aura::PropertyConverter::CreateAcceptAnyValueCallback());
-  property_converter->RegisterPrimitiveProperty(
-      kHideCaptionButtonsInTabletModeKey,
-      mojom::kHideCaptionButtonsInTabletMode_Property,
-      aura::PropertyConverter::CreateAcceptAnyValueCallback());
   property_converter->RegisterPrimitiveProperty(
       kFrameInactiveColorKey,
       ws::mojom::WindowManager::kFrameInactiveColor_Property,
       aura::PropertyConverter::CreateAcceptAnyValueCallback());
-  property_converter->RegisterPrimitiveProperty(
-      kFrameIsThemedByHostedAppKey, mojom::kFrameIsThemedByHostedApp_Property,
-      aura::PropertyConverter::CreateAcceptAnyValueCallback());
   property_converter->RegisterPrimitiveProperty(
       kHideShelfWhenFullscreenKey, mojom::kHideShelfWhenFullscreen_Property,
       aura::PropertyConverter::CreateAcceptAnyValueCallback());
@@ -157,7 +150,6 @@ DEFINE_UI_CLASS_PROPERTY_KEY(BackdropWindowMode,
 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kBlockedForAssistantSnapshotKey, false);
 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kCanAttachToAnotherWindowKey, true);
 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kCanConsumeSystemKeysKey, false);
-DEFINE_UI_CLASS_PROPERTY_KEY(bool, kHideCaptionButtonsInTabletModeKey, false);
 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kHideInOverviewKey, false);
 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kHideShelfWhenFullscreenKey, true);
 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kImmersiveImpliedByFullscreen, true);
@@ -196,7 +188,6 @@ DEFINE_UI_CLASS_PROPERTY_KEY(SkColor, kFrameActiveColorKey, kDefaultFrameColor);
 DEFINE_UI_CLASS_PROPERTY_KEY(SkColor,
                              kFrameInactiveColorKey,
                              kDefaultFrameColor);
-DEFINE_UI_CLASS_PROPERTY_KEY(bool, kFrameIsThemedByHostedAppKey, false);
 DEFINE_UI_CLASS_PROPERTY_KEY(mojom::WindowPinType,
                              kWindowPinTypeKey,
                              mojom::WindowPinType::NONE);

ash/public/cpp/window_properties.h

@@ -68,11 +68,6 @@ ASH_PUBLIC_EXPORT extern const aura::WindowProperty<bool>* const
 ASH_PUBLIC_EXPORT extern const aura::WindowProperty<bool>* const
     kCanConsumeSystemKeysKey;
 
-// A property to control the visibility of the frame captions buttons when in
-// tablet mode (when not in tablet mode, this property is ignored).
-ASH_PUBLIC_EXPORT extern const aura::WindowProperty<bool>* const
-    kHideCaptionButtonsInTabletModeKey;
-
 // A property key to indicate whether we should hide this window in overview
 // mode and Alt + Tab.
 ASH_PUBLIC_EXPORT extern const aura::WindowProperty<bool>* const
@@ -172,11 +167,6 @@ ASH_PUBLIC_EXPORT extern const aura::WindowProperty<SkColor>* const
 ASH_PUBLIC_EXPORT extern const aura::WindowProperty<SkColor>* const
     kFrameInactiveColorKey;
 
-// True when the frame colors were provided by a hosted app, i.e. by a
-// progressive web app manifest.
-ASH_PUBLIC_EXPORT extern const aura::WindowProperty<bool>* const
-    kFrameIsThemedByHostedAppKey;
-
 // A property key to store ash::WindowPinType for a window.
 // When setting this property to PINNED or TRUSTED_PINNED, the window manager
 // will try to fullscreen the window and pin it on the top of the screen. If the

ash/public/interfaces/window_properties.mojom

@@ -18,31 +18,19 @@ const string kBlockedForAssistantSnapshot_Property =
 const string kCanConsumeSystemKeys_Property =
   "ash:can-consume-system-keys";
 
-// A boolean that tells Ash whether the frame's colors come from a PWA manifest.
-const string kFrameIsThemedByHostedApp_Property =
-    "ash:frame-is-themed-by-hosted-app";
-
-// The color of the text drawn on the frame (i.e. the window title). Only used
-// for tabless browser windows.
-const string kFrameTextColor_Property = "ash:frame-text-color";
-
-// See ash::kHideCaptionButtonsInTabletModeKey.
-const string kHideCaptionButtonsInTabletMode_Property =
-    "ash:hide-caption-buttons-in-tablet-mode";
-
 // True if the shelf should be hidden when this window is put into fullscreen.
 // Exposed because some windows want to explicitly opt-out of this.
 const string kHideShelfWhenFullscreen_Property =
   "ash:hide-shelf-when-fullscreen";
 
-// See ash::kImmseriveImpliedByFullscreen.
+// See ash::kImmersiveImpliedByFullscreen.
 const string kImmersiveImpliedByFullscreen_Property =
   "ash:immersive-implied-by-fullscreen";
 
-// See ash::kImmseriveIsActive.
+// See ash::kImmersiveIsActive.
 const string kImmersiveIsActive_Property = "ash:immersive-is-active";
 
-// See ash::kImmseriveTopContainerBoundsInScreen.
+// See ash::kImmersiveTopContainerBoundsInScreen.
 const string kImmersiveTopContainerBoundsInScreen_Property =
     "ash:immersive-top-container-bounds-in-screen";
 

ash/wm/non_client_frame_controller.cc

@@ -81,15 +81,13 @@ class EmptyDraggableNonClientFrameView : public views::NonClientFrameView {
 class WmNativeWidgetAura : public views::NativeWidgetAura {
  public:
   WmNativeWidgetAura(views::internal::NativeWidgetDelegate* delegate,
-                     bool remove_standard_frame,
-                     bool should_ash_control_immersive)
+                     bool remove_standard_frame)
       // The NativeWidget is mirroring the real Widget created in client code.
       // |is_parallel_widget_in_window_manager| is used to indicate this
       : views::NativeWidgetAura(delegate,
                                 true /* is_parallel_widget_in_window_manager */,
                                 Shell::Get()->aura_env()),
-        remove_standard_frame_(remove_standard_frame),
-        should_ash_control_immersive_(should_ash_control_immersive) {}
+        remove_standard_frame_(remove_standard_frame) {}
   ~WmNativeWidgetAura() override = default;
 
   void set_cursor(const ui::Cursor& cursor) { cursor_ = cursor; }
@@ -98,12 +96,8 @@ class WmNativeWidgetAura : public views::NativeWidgetAura {
   views::NonClientFrameView* CreateNonClientFrameView() override {
     // TODO(sky): investigate why we have this. Seems this should be the same
     // as not specifying client area insets.
-    if (remove_standard_frame_)
-      return new EmptyDraggableNonClientFrameView();
-    aura::Window* window = GetNativeView();
-
-    if (!should_ash_control_immersive_) {
-      wm::InstallResizeHandleWindowTargeterForWindow(window);
+    if (remove_standard_frame_) {
+      wm::InstallResizeHandleWindowTargeterForWindow(GetNativeWindow());
       return new EmptyDraggableNonClientFrameView();
     }
 
@@ -129,7 +123,6 @@ class WmNativeWidgetAura : public views::NativeWidgetAura {
 
  private:
   const bool remove_standard_frame_;
-  const bool should_ash_control_immersive_;
 
   // The cursor for this widget. CompoundEventFilter will retrieve this cursor
   // via GetCursor and update the CursorManager's active cursor as appropriate
@@ -225,8 +218,7 @@ NonClientFrameController::NonClientFrameController(
   params.opacity = views::Widget::InitParams::OPAQUE_WINDOW;
   params.layer_type = ui::LAYER_SOLID_COLOR;
   WmNativeWidgetAura* native_widget =
-      new WmNativeWidgetAura(widget_, ShouldRemoveStandardFrame(*properties),
-                             ShouldEnableImmersive(*properties));
+      new WmNativeWidgetAura(widget_, ShouldRemoveStandardFrame(*properties));
   window_ = native_widget->GetNativeView();
   window_->SetProperty(kNonClientFrameControllerKey, this);
   window_->SetProperty(kWidgetCreationTypeKey, WidgetCreationType::FOR_CLIENT);

ash/wm/property_util.cc

@@ -57,12 +57,6 @@ bool ShouldRemoveStandardFrame(const InitProperties& properties) {
   return iter != properties.end() && mojo::ConvertTo<bool>(iter->second);
 }
 
-bool ShouldEnableImmersive(const InitProperties& properties) {
-  auto iter =
-      properties.find(ws::mojom::WindowManager::kDisableImmersive_InitProperty);
-  return iter == properties.end() || !mojo::ConvertTo<bool>(iter->second);
-}
-
 void ApplyProperties(
     aura::Window* window,
     aura::PropertyConverter* property_converter,

ash/wm/property_util.h

@@ -55,8 +55,6 @@ bool GetWindowPreferredSize(const InitProperties& properties, gfx::Size* size);
 
 bool ShouldRemoveStandardFrame(const InitProperties& properties);
 
-bool ShouldEnableImmersive(const InitProperties& properties);
-
 // Applies |properties| to |window| using |property_converter|.
 void ApplyProperties(
     aura::Window* window,

ash/wm/window_util.cc

@@ -97,8 +97,10 @@ class InteriorResizeHandleTargeter : public aura::WindowTargeter {
 
   bool ShouldUseExtendedBounds(const aura::Window* target) const override {
     // Fullscreen/maximized windows can't be drag-resized.
-    if (GetWindowState(window())->IsMaximizedOrFullscreenOrPinned())
+    if (GetWindowState(window())->IsMaximizedOrFullscreenOrPinned() ||
+        !wm::GetWindowState(target)->CanResize()) {
       return false;
+    }
 
     // The shrunken hit region only applies to children of |window()|.
     return target->parent() == window();

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

@@ -58,9 +58,9 @@ views::Widget::InitParams BrowserFrameMash::GetWidgetParams() {
   params.delegate = browser_view_;
   std::map<std::string, std::vector<uint8_t>> properties =
       views::MusClient::ConfigurePropertiesFromParams(params);
-  // Indicates mash shouldn't handle immersive, rather we will.
-  properties[ws::mojom::WindowManager::kDisableImmersive_InitProperty] =
-      mojo::ConvertTo<std::vector<uint8_t>>(true);
+
+  // The client will draw the frame.
+  params.remove_standard_frame = true;
 
   // ChromeLauncherController manages the browser shortcut shelf item; set the
   // window's shelf item type property to be ignored by ash::ShelfWindowWatcher.

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

@@ -186,17 +186,6 @@ void BrowserNonClientFrameViewAsh::Init() {
       static_cast<int>(browser->is_app() ? ash::AppType::CHROME_APP
                                          : ash::AppType::BROWSER));
 
-  // In tablet mode, to prevent accidental taps of the window controls, and to
-  // give more horizontal space for tabs and the new tab button especially in
-  // splitscreen view, we hide the window controls. We only do this when the
-  // Home Launcher feature is enabled, since it gives the user the ability to
-  // minimize all windows when pressing the Launcher button on the shelf.
-  window->SetProperty(
-      ash::kHideCaptionButtonsInTabletModeKey,
-      (browser->is_app() || !app_list_features::IsHomeLauncherEnabled())
-          ? false
-          : true);
-
   window_observer_.Add(GetFrameWindow());
 
   // To preserve privacy, tag incognito windows so that they won't be included
@@ -452,8 +441,6 @@ void BrowserNonClientFrameViewAsh::OnThemeChanged() {
 
 void BrowserNonClientFrameViewAsh::ChildPreferredSizeChanged(
     views::View* child) {
-  // This is required even when Ash provides the header (as in Mash) for the
-  // |hosted_app_button_container_|.
   if (browser_view()->initialized()) {
     InvalidateLayout();
     frame()->GetRootView()->Layout();
@@ -744,9 +731,15 @@ void BrowserNonClientFrameViewAsh::OnProfileAvatarChanged(
 // BrowserNonClientFrameViewAsh, private:
 
 bool BrowserNonClientFrameViewAsh::ShouldShowCaptionButtons() const {
-  if (frame()->GetNativeWindow()->GetProperty(
-          ash::kHideCaptionButtonsInTabletModeKey) &&
-      TabletModeClient::Get() &&
+  // In tablet mode, to prevent accidental taps of the window controls, and to
+  // give more horizontal space for tabs and the new tab button especially in
+  // splitscreen view, we hide the window controls. We only do this when the
+  // Home Launcher feature is enabled, since it gives the user the ability to
+  // minimize all windows when pressing the Launcher button on the shelf.
+  const bool hide_caption_buttons_in_tablet_mode =
+      !browser_view()->browser()->is_app() &&
+      app_list_features::IsHomeLauncherEnabled();
+  if (hide_caption_buttons_in_tablet_mode && TabletModeClient::Get() &&
       TabletModeClient::Get()->tablet_mode_enabled()) {
     return false;
   }
@@ -823,11 +816,8 @@ void BrowserNonClientFrameViewAsh::SetUpForHostedApp(
   base::Optional<SkColor> theme_color =
       browser->hosted_app_controller()->GetThemeColor();
   if (theme_color) {
-    frame()->GetNativeWindow()->SetProperty(
-        ash::kFrameIsThemedByHostedAppKey,
-        !!browser->hosted_app_controller()->GetThemeColor());
+    header->set_button_color_mode(ash::FrameCaptionButton::ColorMode::kThemed);
     header->SetFrameColors(*theme_color, *theme_color);
-
     active_color = ash::FrameCaptionButton::GetButtonColor(
         ash::FrameCaptionButton::ColorMode::kThemed, *theme_color);
   }
@@ -852,7 +842,9 @@ void BrowserNonClientFrameViewAsh::UpdateFrameColors() {
                  IsForExperimentalHostedAppBrowser(browser_view()->browser())) {
     active_color =
         browser_view()->browser()->hosted_app_controller()->GetThemeColor();
-    window->SetProperty(ash::kFrameIsThemedByHostedAppKey, !!active_color);
+    frame_header_->set_button_color_mode(
+        active_color ? ash::FrameCaptionButton::ColorMode::kThemed
+                     : ash::FrameCaptionButton::ColorMode::kDefault);
   } else if (!browser_view()->browser()->is_app()) {
     active_color = kMdWebUiFrameColor;
   }

chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h

@@ -247,11 +247,6 @@ class BrowserNonClientFrameViewAsh
   // Owned by views hierarchy.
   HostedAppButtonContainer* hosted_app_button_container_ = nullptr;
 
-  // A view that contains the extra views used for hosted apps
-  // (|hosted_app_button_container_| and |hosted_app_origin_text_|).
-  // Only used in Mash.
-  views::View* hosted_app_extras_container_ = nullptr;
-
   // Ash's mojom::SplitViewController.
   ash::mojom::SplitViewControllerPtr split_view_controller_;
 

services/ws/public/mojom/window_manager.mojom

@@ -34,11 +34,6 @@ interface WindowManager {
   // Type: int32_t.
   const string kContainerId_InitProperty = "init:container_id";
 
-  // Disables the window manager from handling immersive fullscreen for the
-  // window. This is typically done if the client wants to handle immersive
-  // themselves. Type: bool.
-  const string kDisableImmersive_InitProperty = "init:disable_immersive";
-
   // The id of the display (display::Display::id()) to create the window on.
   // Type: int64.
   const string kDisplayId_InitProperty = "init:display_id";