Commit 573e2eab authored by yilkal's avatar yilkal Committed by Commit Bot

Suppress Stylus Welcome bubble in KioskNext in Chromeos

Bug: 969227
Change-Id: Ide1703ae4e37a22535c6d1f4034f7d55d716e635
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1638963Reviewed-by: default avatarJames Cook <jamescook@chromium.org>
Reviewed-by: default avatarSammie Quon <sammiequon@chromium.org>
Commit-Queue: Yilkal Abe <yilkal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#665655}
parent 84273f9f
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include <memory> #include <memory>
#include "ash/kiosk_next/kiosk_next_shell_controller.h"
#include "ash/public/cpp/ash_pref_names.h" #include "ash/public/cpp/ash_pref_names.h"
#include "ash/public/cpp/shell_window_ids.h" #include "ash/public/cpp/shell_window_ids.h"
#include "ash/session/session_controller_impl.h" #include "ash/session/session_controller_impl.h"
...@@ -121,6 +122,9 @@ void PaletteWelcomeBubble::ShowIfNeeded() { ...@@ -121,6 +122,9 @@ void PaletteWelcomeBubble::ShowIfNeeded() {
return; return;
} }
if (Shell::Get()->kiosk_next_shell_controller()->IsEnabled())
return;
if (!HasBeenShown()) if (!HasBeenShown())
Show(); Show();
} }
......
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