Commit c1d7a3e2 authored by Qiang Xu's avatar Qiang Xu Committed by Commit Bot

cros: remove ash-enable-persistent-window-bounds flag

Feature is landed in M66. Now we can remove the flag in M69.

Bug: 805046
Test: manual

Cq-Include-Trybots: luci.chromium.try:closure_compilation
Change-Id: Id98b066228f5f5b45d9d02d405bcc57d41fde20a
Reviewed-on: https://chromium-review.googlesource.com/1113097Reviewed-by: default avatarMitsuru Oshima (OOO 6/27) <oshima@chromium.org>
Commit-Queue: Qiang Xu <warx@google.com>
Cr-Commit-Position: refs/heads/master@{#571136}
parent 96eb86ad
......@@ -5,7 +5,6 @@
#include "ash/display/persistent_window_controller.h"
#include "ash/display/persistent_window_info.h"
#include "ash/public/cpp/ash_features.h"
#include "ash/session/session_controller.h"
#include "ash/shell.h"
#include "ash/wm/mru_window_tracker.h"
......@@ -30,9 +29,6 @@ MruWindowTracker::WindowList GetWindowList() {
// Returns true when window cycle list can be processed to perform save/restore
// operations on observing display changes.
bool ShouldProcessWindowList() {
if (!features::IsPersistentWindowBoundsEnabled())
return false;
// Window cycle list exists in active user session only.
if (!Shell::Get()->session_controller()->IsActiveUserSessionStarted())
return false;
......
......@@ -6,38 +6,19 @@
#include "ash/display/display_move_window_util.h"
#include "ash/display/window_tree_host_manager.h"
#include "ash/public/cpp/ash_features.h"
#include "ash/session/test_session_controller_client.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
#include "ash/wm/window_state.h"
#include "ash/wm/window_util.h"
#include "base/test/metrics/histogram_tester.h"
#include "base/test/scoped_feature_list.h"
#include "ui/display/test/display_manager_test_api.h"
using session_manager::SessionState;
namespace ash {
class PersistentWindowControllerTest : public AshTestBase {
protected:
PersistentWindowControllerTest() = default;
~PersistentWindowControllerTest() override = default;
// AshTestBase:
void SetUp() override {
// Explicitly enable persistent window bounds feature for the tests.
scoped_feature_list_.InitAndEnableFeature(
features::kPersistentWindowBounds);
AshTestBase::SetUp();
}
private:
base::test::ScopedFeatureList scoped_feature_list_;
DISALLOW_COPY_AND_ASSIGN(PersistentWindowControllerTest);
};
using PersistentWindowControllerTest = AshTestBase;
TEST_F(PersistentWindowControllerTest, DisconnectDisplay) {
UpdateDisplay("0+0-500x500,0+501-500x500");
......
......@@ -36,9 +36,6 @@ const base::Feature kNightLight{"NightLight", base::FEATURE_ENABLED_BY_DEFAULT};
const base::Feature kOverviewSwipeToClose{"OverviewSwipeToClose",
base::FEATURE_DISABLED_BY_DEFAULT};
const base::Feature kPersistentWindowBounds{"PersistentWindowBounds",
base::FEATURE_ENABLED_BY_DEFAULT};
const base::Feature kSystemTrayUnified{"SystemTrayUnified",
base::FEATURE_ENABLED_BY_DEFAULT};
......@@ -76,10 +73,6 @@ bool IsNightLightEnabled() {
return base::FeatureList::IsEnabled(kNightLight);
}
bool IsPersistentWindowBoundsEnabled() {
return base::FeatureList::IsEnabled(kPersistentWindowBounds);
}
bool IsSystemTrayUnifiedEnabled() {
return base::FeatureList::IsEnabled(kSystemTrayUnified);
}
......
......@@ -52,11 +52,6 @@ ASH_PUBLIC_EXPORT extern const base::Feature kNightLight;
// https://crbug.com/828646.
ASH_PUBLIC_EXPORT extern const base::Feature kOverviewSwipeToClose;
// Enables persistent window bounds in multi-displays scenario.
// TODO(warx): Remove this after the feature is fully launched.
// https://crbug.com/805046.
ASH_PUBLIC_EXPORT extern const base::Feature kPersistentWindowBounds;
// Enables new system menu.
ASH_PUBLIC_EXPORT extern const base::Feature kSystemTrayUnified;
......@@ -81,8 +76,6 @@ ASH_PUBLIC_EXPORT bool IsNewWallpaperPickerEnabled();
ASH_PUBLIC_EXPORT bool IsNightLightEnabled();
ASH_PUBLIC_EXPORT bool IsPersistentWindowBoundsEnabled();
ASH_PUBLIC_EXPORT bool IsSystemTrayUnifiedEnabled();
ASH_PUBLIC_EXPORT bool IsTrilinearFilteringEnabled();
......
......@@ -3534,11 +3534,6 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kAshDisableLoginDimAndBlurName,
flag_descriptions::kAshDisableLoginDimAndBlurDescription, kOsCrOS,
SINGLE_DISABLE_VALUE_TYPE(ash::switches::kAshDisableLoginDimAndBlur)},
{"ash-enable-persistent-window-bounds",
flag_descriptions::kAshEnablePersistentWindowBoundsName,
flag_descriptions::kAshEnablePersistentWindowBoundsDescription, kOsCrOS,
FEATURE_VALUE_TYPE(ash::features::kPersistentWindowBounds)},
#endif // OS_CHROMEOS
{"clipboard-content-setting",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment