Auto open and close the palette on an eject event.

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/palette_delegate.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"
 #include "ash/common/system/chromeos/palette/palette_tool_manager.h"
 #include "ash/common/system/chromeos/palette/palette_utils.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/tray_bubble_wrapper.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_header_button.h"
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/events/devices/stylus_state.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
 
 namespace ash {
 
 namespace {
@@ skipping 92 matching lines @@
 
   SetLayoutManager(new views::FillLayout());
   icon_ = new views::ImageView();
   UpdateTrayIcon();
 
   SetIconBorderForShelfAlignment();
   tray_container()->AddChildView(icon_);
 
   WmShell::Get()->AddShellObserver(this);
   WmShell::Get()->GetSessionStateDelegate()->AddSessionStateObserver(this);
+  if (WmShell::Get()->palette_delegate()) {
+    WmShell::Get()->palette_delegate()->SetStylusStateChangedCallback(
+        base::Bind(&PaletteTray::OnStylusStateChanged, base::Unretained(this)));

[stevenjb, 2016/08/25 22:48:56]

Need to pass this as a weak_ptr. It's always iffy to rely on destruction order
and with views it is especially uncertain.

[jdufault, 2016/08/25 23:09:15]

Done.

+  }
 
   UpdateIconVisibility();
 }
 
 PaletteTray::~PaletteTray() {
   if (bubble_)
     bubble_->bubble_view()->reset_delegate();
 
   WmShell::Get()->RemoveShellObserver(this);
   WmShell::Get()->GetSessionStateDelegate()->RemoveSessionStateObserver(this);
@@ skipping 56 matching lines @@
     host->AddChildView(view.view);
   }
 }
 
 void PaletteTray::SessionStateChanged(
     SessionStateDelegate::SessionState state) {
   UpdateIconVisibility();
 }
 
 void PaletteTray::ClickedOutsideBubble() {
-  HidePalette();
+  bubble_.reset();
 }
 
 base::string16 PaletteTray::GetAccessibleNameForTray() {
   return l10n_util::GetStringUTF16(IDS_ASH_PALETTE_TITLE);
 }
 
 void PaletteTray::HideBubbleWithView(const views::TrayBubbleView* bubble_view) {
   if (bubble_->bubble_view() == bubble_view)
     bubble_.reset();
 }
@@ skipping 84 matching lines @@
         kVerticalShelfVerticalPadding, kVerticalShelfHorizontalPadding)));
   }
 }
 
 void PaletteTray::UpdateTrayIcon() {
   gfx::VectorIconId icon = palette_tool_manager_->GetActiveTrayIcon(
       palette_tool_manager_->GetActiveTool(ash::PaletteGroup::MODE));
   icon_->SetImage(CreateVectorIcon(icon, kShelfIconSize, kShelfIconColor));
 }
 
+void PaletteTray::OnStylusStateChanged(ui::StylusState stylus_state) {
+  if (!WmShell::Get()->palette_delegate()->ShouldAutoOpenPalette())
+    return;
+
+  if (stylus_state == ui::StylusState::REMOVED && !bubble_)
+    OpenBubble();
+  else if (stylus_state == ui::StylusState::INSERTED && bubble_)
+    bubble_.reset();
+}
+
 void PaletteTray::UpdateIconVisibility() {
   if (!IsPaletteEnabled())
     return;
 
   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);
 }
 
 }  // namespace ash