WIP: simplified display management in ash

ash/system/status_area_widget.cc

Index: ash/system/status_area_widget.cc
diff --git a/ash/system/status_area_widget.cc b/ash/system/status_area_widget.cc
index 232602fce50975e722e99fc66746e2f1571077f9..8206e36b52e55048fa580120dbb3f20875fdc62a 100644
--- a/ash/system/status_area_widget.cc
+++ b/ash/system/status_area_widget.cc
@@ -4,6 +4,7 @@
 
 #include "ash/system/status_area_widget.h"
 
+#include "ash/public/cpp/config.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/wm_shelf.h"
@@ -212,7 +213,9 @@ void StatusAreaWidget::AddPaletteTray() {
   // 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() || palette_utils::IsPaletteEnabledOnEveryDisplay()) {
+  if (Shell::GetAshConfig() == Config::CLASSIC &&
+      (display.IsInternal() ||
+       palette_utils::IsPaletteEnabledOnEveryDisplay())) {
     palette_tray_ = new PaletteTray(wm_shelf_);
     status_area_widget_delegate_->AddTray(palette_tray_);
   }