Commit a3230092 authored by jdufault's avatar jdufault Committed by Commit bot

Hide ash palette on lock screen, show it in guest mode.

TEST=manual
BUG=638994

Review-Url: https://codereview.chromium.org/2280293002
Cr-Commit-Position: refs/heads/master@{#415209}
parent b7865805
...@@ -231,6 +231,10 @@ void PaletteTray::SessionStateChanged( ...@@ -231,6 +231,10 @@ void PaletteTray::SessionStateChanged(
UpdateIconVisibility(); UpdateIconVisibility();
} }
void PaletteTray::OnLockStateChanged(bool locked) {
UpdateIconVisibility();
}
void PaletteTray::ClickedOutsideBubble() { void PaletteTray::ClickedOutsideBubble() {
bubble_.reset(); bubble_.reset();
} }
......
...@@ -45,6 +45,9 @@ class ASH_EXPORT PaletteTray : public TrayBackgroundView, ...@@ -45,6 +45,9 @@ class ASH_EXPORT PaletteTray : public TrayBackgroundView,
// SessionStateObserver: // SessionStateObserver:
void SessionStateChanged(SessionStateDelegate::SessionState state) override; void SessionStateChanged(SessionStateDelegate::SessionState state) override;
// ShellObserver:
void OnLockStateChanged(bool locked) override;
// TrayBackgroundView: // TrayBackgroundView:
void ClickedOutsideBubble() override; void ClickedOutsideBubble() override;
base::string16 GetAccessibleNameForTray() override; base::string16 GetAccessibleNameForTray() override;
......
...@@ -179,6 +179,8 @@ void DeriveCommandLine(const GURL& start_url, ...@@ -179,6 +179,8 @@ void DeriveCommandLine(const GURL& start_url,
app_list::switches::kEnableCenteredAppList, app_list::switches::kEnableCenteredAppList,
app_list::switches::kEnableSyncAppList, app_list::switches::kEnableSyncAppList,
ash::switches::kAshEnableTouchView, ash::switches::kAshEnableTouchView,
ash::switches::kAshEnablePalette,
ash::switches::kAshEnableExperimentalPaletteFeatures,
ash::switches::kAshEnableUnifiedDesktop, ash::switches::kAshEnableUnifiedDesktop,
ash::switches::kAshHostWindowBounds, ash::switches::kAshHostWindowBounds,
ash::switches::kAshTouchHud, ash::switches::kAshTouchHud,
......
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