cros: Use runtime stylus detection for ash palette.

ash/magnifier/partial_magnification_controller.cc

 // Copyright (c) 2012 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/magnifier/partial_magnification_controller.h"
 
 #include "ash/common/system/chromeos/palette/palette_utils.h"
 #include "ash/shell.h"
 #include "third_party/skia/include/core/SkDrawLooper.h"
 #include "ui/aura/window_event_dispatcher.h"
@@ skipping 263 matching lines @@
     return;
 
   // Compute the event location in screen space.
   aura::Window* target = static_cast<aura::Window*>(event->target());
   aura::Window* event_root = target->GetRootWindow();
   gfx::Point screen_point = event->root_location();
   wm::ConvertPointToScreen(event_root, &screen_point);
 
   // If the stylus is pressed on the palette icon or widget, do not activate.
   if (event->type() == ui::ET_TOUCH_PRESSED &&
-      !PaletteContainsPointInScreen(screen_point)) {
+      !palette_utils::PaletteContainsPointInScreen(screen_point)) {
     SetActive(true);
   }
 
   if (event->type() == ui::ET_TOUCH_RELEASED)
     SetActive(false);
 
   if (!is_active_)
     return;
 
   // If the previous root window was detached host_widget_ will be null;
   // reconstruct it. We also need to change the root window if the cursor has
   // crossed display boundries.
   SwitchTargetRootWindowIfNeeded(GetCurrentRootWindow());
 
   // If that failed for any reason return.
   if (!host_widget_) {
     SetActive(false);
     return;
   }
 
   // Remap point from where it was captured to the display it is actually on.
   gfx::Point point = event->root_location();
   aura::Window::ConvertPointToTarget(
       event_root, host_widget_->GetNativeView()->GetRootWindow(), &point);
   host_widget_->SetBounds(GetBounds(point));
 
   // If the stylus is over the palette icon or widget, do not consume the event.
-  if (!PaletteContainsPointInScreen(screen_point))
+  if (!palette_utils::PaletteContainsPointInScreen(screen_point))
     event->StopPropagation();
 }
 
 void PartialMagnificationController::CreateMagnifierWindow(
     aura::Window* root_window) {
   if (host_widget_ || !root_window)
     return;
 
   root_window->AddObserver(this);
 
@@ skipping 48 matching lines @@
 
 void PartialMagnificationController::RemoveZoomWidgetObservers() {
   DCHECK(host_widget_);
   host_widget_->RemoveObserver(this);
   aura::Window* root_window = host_widget_->GetNativeView()->GetRootWindow();
   DCHECK(root_window);
   root_window->RemoveObserver(this);
 }
 
 }  // namespace ash