cros: Use runtime stylus detection for ash palette.

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/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/wm_shelf.h"
@@ skipping 11 matching lines @@
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/root_window_controller.h"
 #include "base/metrics/histogram_macros.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/input_device_manager.h"
 #include "ui/events/devices/stylus_state.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/vector_icons_public.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"
 
@@ skipping 118 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(TitleView);
 };
 
 }  // namespace
 
 PaletteTray::PaletteTray(WmShelf* wm_shelf)
     : TrayBackgroundView(wm_shelf),
       palette_tool_manager_(new PaletteToolManager(this)),
       weak_factory_(this) {
-  // PaletteTray should only be instantiated if the palette feature is enabled.
-  DCHECK(IsPaletteFeatureEnabled());
-
   PaletteTool::RegisterToolInstances(palette_tool_manager_.get());
 
   if (MaterialDesignController::IsShelfMaterial()) {
     SetInkDropMode(InkDropMode::ON);
     SetContentsBackground(false);
   } else {
     SetContentsBackground(true);
   }
 
   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,
-                   weak_factory_.GetWeakPtr()));
-  }
+  ui::InputDeviceManager::GetInstance()->AddObserver(this);
 }
 
 PaletteTray::~PaletteTray() {
   if (bubble_)
     bubble_->bubble_view()->reset_delegate();
 
+  ui::InputDeviceManager::GetInstance()->RemoveObserver(this);
   WmShell::Get()->RemoveShellObserver(this);
   WmShell::Get()->GetSessionStateDelegate()->RemoveSessionStateObserver(this);
 }
 
 bool PaletteTray::PerformAction(const ui::Event& event) {
   if (bubble_) {
     if (num_actions_in_bubble_ == 0)
       RecordPaletteOptionsUsage(PaletteTrayOptions::PALETTE_CLOSED_NO_ACTION);
     HidePalette();
     return true;
@@ skipping 85 matching lines @@
 
 base::string16 PaletteTray::GetAccessibleNameForTray() {
   return l10n_util::GetStringUTF16(IDS_ASH_STYLUS_TOOLS_TITLE);
 }
 
 void PaletteTray::HideBubbleWithView(const views::TrayBubbleView* bubble_view) {
   if (bubble_->bubble_view() == bubble_view)
     HidePalette();
 }
 
+void PaletteTray::OnTouchscreenDeviceConfigurationChanged() {
+  UpdateIconVisibility();
+}
+
+void PaletteTray::OnStylusStateChanged(ui::StylusState stylus_state) {
+  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;
+
+  // 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::BubbleViewDestroyed() {
   palette_tool_manager_->NotifyViewsDestroyed();
   SetIsActive(false);
 }
 
 void PaletteTray::OnMouseEnteredView() {}
 
 void PaletteTray::OnMouseExitedView() {}
 
 base::string16 PaletteTray::GetAccessibleNameForBubble() {
@@ skipping 72 matching lines @@
   TrayBackgroundView::SetShelfAlignment(alignment);
   SetIconBorderForShelfAlignment();
 }
 
 void PaletteTray::AnchorUpdated() {
   if (bubble_)
     bubble_->bubble_view()->UpdateBubble();
 }
 
 void PaletteTray::Initialize() {
-  // OnPaletteEnabledPrefChanged will get called with the initial pref value,
-  // which will take care of showing the palette.
-  palette_enabled_subscription_ =
-      WmShell::Get()->palette_delegate()->AddPaletteEnableListener(
-          base::Bind(&PaletteTray::OnPaletteEnabledPrefChanged,
-                     weak_factory_.GetWeakPtr()));
+  PaletteDelegate* delegate = WmShell::Get()->palette_delegate();
+  if (delegate) {

[stevenjb, 2017/01/21 00:23:50]

if (!delegate) return;

[jdufault, 2017/01/25 00:53:15]

Done.

+    // OnPaletteEnabledPrefChanged will get called with the initial pref value,
+    // which will take care of showing the palette.
+    palette_enabled_subscription_ = delegate->AddPaletteEnableListener(
+        base::Bind(&PaletteTray::OnPaletteEnabledPrefChanged,
+                   weak_factory_.GetWeakPtr()));
+  }
 }
 
 void PaletteTray::SetIconBorderForShelfAlignment() {
   // TODO(tdanderson): Ensure PaletteTray follows material design specs. See
   // crbug.com/630464.
   if (IsHorizontalAlignment(shelf_alignment())) {
     icon_->SetBorder(views::CreateEmptyBorder(gfx::Insets(
         kHorizontalShelfVerticalPadding, kHorizontalShelfHorizontalPadding)));
   } else {
     icon_->SetBorder(views::CreateEmptyBorder(gfx::Insets(
         kVerticalShelfVerticalPadding, kVerticalShelfHorizontalPadding)));
   }
 }
 
 void PaletteTray::UpdateTrayIcon() {
   icon_->SetImage(CreateVectorIcon(
       palette_tool_manager_->GetActiveTrayIcon(
           palette_tool_manager_->GetActiveTool(ash::PaletteGroup::MODE)),
       kTrayIconSize, kShelfIconColor));
 }
 
-void PaletteTray::OnStylusStateChanged(ui::StylusState stylus_state) {
-  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;
-
-  // 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) {
   is_palette_enabled_ = enabled;
 
   if (!enabled) {
     SetVisible(false);
     palette_tool_manager_->DisableActiveTool(PaletteGroup::MODE);
   } else {
     UpdateIconVisibility();
   }
 }
 
 void PaletteTray::UpdateIconVisibility() {
-  SetVisible(is_palette_enabled_ && IsInUserSession());
+  SetVisible(is_palette_enabled_ && HasStylusInput() && IsInUserSession());
 }
 
 }  // namespace ash