cros/ash: Only show the stylus palette on the internal display.

ash/common/system/status_area_widget.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/common/system/status_area_widget.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/system/overview/overview_button_tray.h"
 #include "ash/common/system/status_area_widget_delegate.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/web_notification/web_notification_tray.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 "base/i18n/time_formatting.h"
 #include "ui/native_theme/native_theme_dark_aura.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/common/system/chromeos/ime_menu/ime_menu_tray.h"
 #include "ash/common/system/chromeos/palette/palette_tray.h"
 #include "ash/common/system/chromeos/palette/palette_utils.h"
 #include "ash/common/system/chromeos/session/logout_button_tray.h"
 #include "ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h"
+#include "ui/display/display.h"
+#include "ui/display/screen.h"
 #endif
 
 namespace ash {
 
 StatusAreaWidget::StatusAreaWidget(WmWindow* status_container,
                                    WmShelf* wm_shelf)
     : status_area_widget_delegate_(new StatusAreaWidgetDelegate),
       overview_button_tray_(nullptr),
       system_tray_(nullptr),
       web_notification_tray_(nullptr),
@@ skipping 206 matching lines @@
   status_area_widget_delegate_->AddTray(web_notification_tray_);
 }
 
 #if defined(OS_CHROMEOS)
 void StatusAreaWidget::AddLogoutButtonTray() {
   logout_button_tray_ = new LogoutButtonTray(wm_shelf_);
   status_area_widget_delegate_->AddTray(logout_button_tray_);
 }
 
 void StatusAreaWidget::AddPaletteTray() {
-  if (IsPaletteFeatureEnabled()) {
+  if (!IsPaletteFeatureEnabled())
+    return;
+
+  const display::Display& display =
+      display::Screen::GetScreen()->GetDisplayNearestWindow(GetNativeWindow());

[James Cook, 2016/09/01 17:00:55]

Use WmLookup::Get()->GetWindowForWidget(this)->GetDisplayNearestWindow()
instead. (You'd have no way of knowing this, but I suspect what you have
wouldn't work on mustash since GetNativeWidget() returns aura::Window.)

[jdufault, 2016/09/02 20:12:37]

Done.

+
+  // Create the palette only on the internal display, where the stylus is
+  // available. We also create a palette on every display if requested from the
+  // command line.
+  if (display.IsInternal() || IsPaletteEnabledOnEveryDisplay()) {
     palette_tray_ = new PaletteTray(wm_shelf_);
     status_area_widget_delegate_->AddTray(palette_tray_);
   }
 }
 
 void StatusAreaWidget::AddVirtualKeyboardTray() {
   virtual_keyboard_tray_ = new VirtualKeyboardTray(wm_shelf_);
   status_area_widget_delegate_->AddTray(virtual_keyboard_tray_);
 }
 
@@ skipping 19 matching lines @@
   return false;
 }
 #endif
 
 void StatusAreaWidget::AddOverviewButtonTray() {
   overview_button_tray_ = new OverviewButtonTray(wm_shelf_);
   status_area_widget_delegate_->AddTray(overview_button_tray_);
 }
 
 }  // namespace ash