Commit b916e68c authored by yilkal's avatar yilkal Committed by Commit Bot

Enable feedback from power button menu in KioskNext sessions

 Bug: 967931

Change-Id: I302a4eb12ff69c117c0254fdc86d1a2323231180
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1647454Reviewed-by: default avatarJames Cook <jamescook@chromium.org>
Reviewed-by: default avatarMichael Giuffrida <michaelpg@chromium.org>
Commit-Queue: Yilkal Abe <yilkal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#667308}
parent 96cda792
......@@ -5,6 +5,7 @@
#include "ash/system/power/power_button_menu_view.h"
#include "ash/display/screen_orientation_controller.h"
#include "ash/kiosk_next/kiosk_next_shell_controller_impl.h"
#include "ash/public/cpp/new_window_delegate.h"
#include "ash/resources/vector_icons/vector_icons.h"
#include "ash/session/session_controller_impl.h"
......@@ -165,7 +166,8 @@ void PowerButtonMenuView::CreateItems() {
IDS_ASH_POWER_BUTTON_MENU_LOCK_SCREEN_BUTTON));
AddChildView(lock_screen_item_);
if (base::FeatureList::IsEnabled(kEnableFeedbackItem)) {
if (base::FeatureList::IsEnabled(kEnableFeedbackItem) ||
Shell::Get()->kiosk_next_shell_controller()->IsEnabled()) {
feedback_item_ = new PowerButtonMenuItemView(
this, kSystemPowerButtonMenuFeedbackIcon,
l10n_util::GetStringUTF16(
......
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