cros: Hide stylus tools on various sign-in screens, disable active mode when inserting stylus.

ash/common/system/chromeos/palette/palette_tray.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/common/system/chromeos/palette/palette_tray.h"
 
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/shell_window_ids.h"
@@ skipping 51 matching lines @@
 const int kIconSize = 20;
 
 // Creates a separator.
 views::Separator* CreateSeparator(views::Separator::Orientation orientation) {
   views::Separator* separator =
       new views::Separator(views::Separator::HORIZONTAL);
   separator->SetColor(ash::kBorderDarkColor);
   return separator;
 }
 
+// Returns true if we are in a user session that can show the stylus tools.
+bool IsInUserSession() {
+  SessionStateDelegate* session_state_delegate =
+      WmShell::Get()->GetSessionStateDelegate();
+  return !session_state_delegate->IsUserSessionBlocked() &&
+         session_state_delegate->GetSessionState() ==
+             SessionStateDelegate::SESSION_STATE_ACTIVE &&
+         WmShell::Get()->system_tray_delegate()->GetUserLoginStatus() !=
+             LoginStatus::KIOSK_APP;
+}
+
 class TitleView : public views::View, public views::ButtonListener {
  public:
   explicit TitleView(PaletteTray* palette_tray) : palette_tray_(palette_tray) {
     auto& rb = ui::ResourceBundle::GetSharedInstance();
 
     auto* box_layout =
         new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0);
     SetLayoutManager(box_layout);
 
     views::Label* text_label =
@@ skipping 158 matching lines @@
     host->AddChildView(view.view);
 }
 
 void PaletteTray::SessionStateChanged(
     SessionStateDelegate::SessionState state) {
   UpdateIconVisibility();
 }
 
 void PaletteTray::OnLockStateChanged(bool locked) {
   UpdateIconVisibility();
+
+  // The user can eject the stylus during the lock screen transition, which will
+  // open the palette. Make sure to close it if that happens.
+  if (locked)
+    HidePalette();
 }
 
 void PaletteTray::ClickedOutsideBubble() {
   if (num_actions_in_bubble_ == 0)
     RecordPaletteOptionsUsage(PaletteTrayOptions::PALETTE_CLOSED_NO_ACTION);
   HidePalette();
 }
 
 base::string16 PaletteTray::GetAccessibleNameForTray() {
   return l10n_util::GetStringUTF16(IDS_ASH_STYLUS_TOOLS_TITLE);
@@ skipping 124 matching lines @@
 }
 
 void PaletteTray::UpdateTrayIcon() {
   icon_->SetImage(CreateVectorIcon(
       palette_tool_manager_->GetActiveTrayIcon(
           palette_tool_manager_->GetActiveTool(ash::PaletteGroup::MODE)),
       kShelfIconSize, kShelfIconColor));
 }
 
 void PaletteTray::OnStylusStateChanged(ui::StylusState stylus_state) {
-  if (!WmShell::Get()->palette_delegate()->ShouldAutoOpenPalette())
+  PaletteDelegate* palette_delegate = WmShell::Get()->palette_delegate();
+
+  // Don't do anything if the palette should not be shown or if the user has
+  // disabled it all-together.
+  if (!IsInUserSession() || !palette_delegate->ShouldShowPalette())
     return;
 
-  if (stylus_state == ui::StylusState::REMOVED && !bubble_) {
-    is_bubble_auto_opened_ = true;
-    ShowPalette();
-  } else if (stylus_state == ui::StylusState::INSERTED && bubble_) {
-    HidePalette();
+  // Auto show/hide the palette if allowed by the user.
+  if (palette_delegate->ShouldAutoOpenPalette()) {
+    if (stylus_state == ui::StylusState::REMOVED && !bubble_) {
+      is_bubble_auto_opened_ = true;
+      ShowPalette();
+    } else if (stylus_state == ui::StylusState::INSERTED && bubble_) {
+      HidePalette();
+    }
+  }
+
+  // Disable any active modes if the stylus has been inserted.
+  if (stylus_state == ui::StylusState::INSERTED)
+    palette_tool_manager_->DisableActiveTool(PaletteGroup::MODE);
+}
+
+void PaletteTray::OnPaletteEnabledPrefChanged(bool enabled) {
+  if (!enabled) {
+    SetVisible(false);
+    palette_tool_manager_->DisableActiveTool(PaletteGroup::MODE);
+  } else {
+    UpdateIconVisibility();
   }
 }
 
-void PaletteTray::OnPaletteEnabledPrefChanged(bool enabled) {
-  if (!enabled)
-    SetVisible(false);
-  else
-    UpdateIconVisibility();
-}
-
 void PaletteTray::UpdateIconVisibility() {
-  SessionStateDelegate* session_state_delegate =
-      WmShell::Get()->GetSessionStateDelegate();
-
-  SetVisible(!session_state_delegate->IsScreenLocked() &&
-             session_state_delegate->GetSessionState() ==
-                 SessionStateDelegate::SESSION_STATE_ACTIVE &&
-             WmShell::Get()->system_tray_delegate()->GetUserLoginStatus() !=
-                 LoginStatus::KIOSK_APP);
+  SetVisible(IsInUserSession());
 }
 
 }  // namespace ash