Commit 985d58f5 authored by Min Chen's avatar Min Chen Committed by Commit Bot

Remove flag kEnableFeedbackItem of feedback item in power menu.

Delete related finch experiments:
https://critique.corp.google.com/#review/258627188

Bug: 982537
Change-Id: I913809629a0fd92860ff5bf2983ec00d90203eb5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1707238Reviewed-by: default avatarAhmed Fakhry <afakhry@chromium.org>
Commit-Queue: Min Chen <minch@chromium.org>
Cr-Commit-Position: refs/heads/master@{#678509}
parent 6378df49
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
#include "base/command_line.h" #include "base/command_line.h"
#include "base/json/json_writer.h" #include "base/json/json_writer.h"
#include "base/run_loop.h" #include "base/run_loop.h"
#include "base/test/scoped_feature_list.h"
#include "base/test/simple_test_tick_clock.h" #include "base/test/simple_test_tick_clock.h"
#include "chromeos/dbus/power/fake_power_manager_client.h" #include "chromeos/dbus/power/fake_power_manager_client.h"
#include "chromeos/dbus/power_manager/suspend.pb.h" #include "chromeos/dbus/power_manager/suspend.pb.h"
...@@ -798,9 +797,6 @@ TEST_F(PowerButtonControllerTest, MouseClickToDismissMenu) { ...@@ -798,9 +797,6 @@ TEST_F(PowerButtonControllerTest, MouseClickToDismissMenu) {
// Tests the menu items according to the login and screen locked status. // Tests the menu items according to the login and screen locked status.
TEST_F(PowerButtonControllerTest, MenuItemsToLoginAndLockedStatus) { TEST_F(PowerButtonControllerTest, MenuItemsToLoginAndLockedStatus) {
base::test::ScopedFeatureList features;
features.InitAndEnableFeature(PowerButtonMenuView::kEnableFeedbackItem);
// No sign out, lock screen and feedback items if user is not logged in. // No sign out, lock screen and feedback items if user is not logged in.
ClearLogin(); ClearLogin();
Shell::Get()->UpdateAfterLoginStatusChange(LoginStatus::NOT_LOGGED_IN); Shell::Get()->UpdateAfterLoginStatusChange(LoginStatus::NOT_LOGGED_IN);
...@@ -998,9 +994,6 @@ TEST_F(PowerButtonControllerTest, ESCDismissMenu) { ...@@ -998,9 +994,6 @@ TEST_F(PowerButtonControllerTest, ESCDismissMenu) {
// Tests the navigation of the menu. // Tests the navigation of the menu.
TEST_F(PowerButtonControllerTest, MenuNavigation) { TEST_F(PowerButtonControllerTest, MenuNavigation) {
base::test::ScopedFeatureList features;
features.InitAndEnableFeature(PowerButtonMenuView::kEnableFeedbackItem);
OpenPowerButtonMenu(); OpenPowerButtonMenu();
ASSERT_TRUE(power_button_test_api_->MenuHasSignOutItem()); ASSERT_TRUE(power_button_test_api_->MenuHasSignOutItem());
ASSERT_TRUE(power_button_test_api_->MenuHasLockScreenItem()); ASSERT_TRUE(power_button_test_api_->MenuHasLockScreenItem());
......
...@@ -38,7 +38,6 @@ constexpr int kPaddingBetweenMenuItems = 8; ...@@ -38,7 +38,6 @@ constexpr int kPaddingBetweenMenuItems = 8;
using PowerButtonPosition = PowerButtonController::PowerButtonPosition; using PowerButtonPosition = PowerButtonController::PowerButtonPosition;
constexpr base::Feature PowerButtonMenuView::kEnableFeedbackItem;
constexpr base::TimeDelta PowerButtonMenuView::kMenuAnimationDuration; constexpr base::TimeDelta PowerButtonMenuView::kMenuAnimationDuration;
PowerButtonMenuView::PowerButtonMenuView( PowerButtonMenuView::PowerButtonMenuView(
...@@ -163,15 +162,12 @@ void PowerButtonMenuView::CreateItems() { ...@@ -163,15 +162,12 @@ void PowerButtonMenuView::CreateItems() {
IDS_ASH_POWER_BUTTON_MENU_LOCK_SCREEN_BUTTON)); IDS_ASH_POWER_BUTTON_MENU_LOCK_SCREEN_BUTTON));
AddChildView(lock_screen_item_); AddChildView(lock_screen_item_);
if (base::FeatureList::IsEnabled(kEnableFeedbackItem)) {
feedback_item_ = new PowerButtonMenuItemView( feedback_item_ = new PowerButtonMenuItemView(
this, kSystemPowerButtonMenuFeedbackIcon, this, kSystemPowerButtonMenuFeedbackIcon,
l10n_util::GetStringUTF16( l10n_util::GetStringUTF16(IDS_ASH_POWER_BUTTON_MENU_FEEDBACK_BUTTON));
IDS_ASH_POWER_BUTTON_MENU_FEEDBACK_BUTTON));
AddChildView(feedback_item_); AddChildView(feedback_item_);
} }
} }
}
} }
void PowerButtonMenuView::Layout() { void PowerButtonMenuView::Layout() {
......
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
#include "ash/ash_export.h" #include "ash/ash_export.h"
#include "ash/system/power/power_button_controller.h" #include "ash/system/power/power_button_controller.h"
#include "base/feature_list.h"
#include "base/macros.h" #include "base/macros.h"
#include "ui/compositor/layer_animation_observer.h" #include "ui/compositor/layer_animation_observer.h"
#include "ui/views/controls/button/button.h" #include "ui/views/controls/button/button.h"
...@@ -29,11 +28,6 @@ class ASH_EXPORT PowerButtonMenuView : public views::View, ...@@ -29,11 +28,6 @@ class ASH_EXPORT PowerButtonMenuView : public views::View,
// Distance of the menu animation transform. // Distance of the menu animation transform.
static constexpr int kMenuViewTransformDistanceDp = 16; static constexpr int kMenuViewTransformDistanceDp = 16;
// The feedback item is controlled by a feature solely so it can be turned on
// only for some users on the beta, dev and stable channels.
static constexpr base::Feature kEnableFeedbackItem{
"PowerButtonMenuFeedbackItem", base::FEATURE_DISABLED_BY_DEFAULT};
// Direction of the animation transform. X means to translate from // Direction of the animation transform. X means to translate from
// x-coordinate. Y means to translate from y-coordinate. // x-coordinate. Y means to translate from y-coordinate.
enum class TransformDirection { NONE, X, Y }; enum class TransformDirection { NONE, X, Y };
......
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