WIP: simplified display management in ash

ash/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/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"
 #include "ash/shell.h"
 #include "ash/system/ime_menu/ime_menu_tray.h"
 #include "ash/system/overview/overview_button_tray.h"
 #include "ash/system/palette/palette_tray.h"
 #include "ash/system/palette/palette_utils.h"
 #include "ash/system/session/logout_button_tray.h"
 #include "ash/system/status_area_widget_delegate.h"
@@ skipping 188 matching lines @@
   status_area_widget_delegate_->AddTray(logout_button_tray_);
 }
 
 void StatusAreaWidget::AddPaletteTray() {
   const display::Display& display =
       WmWindow::Get(this->GetNativeWindow())->GetDisplayNearestWindow();
 
   // 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_);
   }
 }
 
 void StatusAreaWidget::AddVirtualKeyboardTray() {
   virtual_keyboard_tray_ = new VirtualKeyboardTray(wm_shelf_);
   status_area_widget_delegate_->AddTray(virtual_keyboard_tray_);
 }
 
 void StatusAreaWidget::AddImeMenuTray() {
   ime_menu_tray_ = new ImeMenuTray(wm_shelf_);
   status_area_widget_delegate_->AddTray(ime_menu_tray_);
 }
 
 void StatusAreaWidget::AddOverviewButtonTray() {
   overview_button_tray_ = new OverviewButtonTray(wm_shelf_);
   status_area_widget_delegate_->AddTray(overview_button_tray_);
 }
 
 }  // namespace ash