| Index: ash/common/system/status_area_widget.cc
|
| diff --git a/ash/common/system/status_area_widget.cc b/ash/common/system/status_area_widget.cc
|
| index 1fe17f64284d53add21b975cd45565e34177b97b..afb108870bbe0c0a2b4e9896661935412726e61e 100644
|
| --- a/ash/common/system/status_area_widget.cc
|
| +++ b/ash/common/system/status_area_widget.cc
|
| @@ -210,16 +210,13 @@ void StatusAreaWidget::AddLogoutButtonTray() {
|
| }
|
|
|
| void StatusAreaWidget::AddPaletteTray() {
|
| - if (!IsPaletteFeatureEnabled())
|
| - return;
|
| -
|
| const display::Display& display =
|
| WmLookup::Get()->GetWindowForWidget(this)->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() || IsPaletteEnabledOnEveryDisplay()) {
|
| + if (display.IsInternal() || palette_utils::IsPaletteEnabledOnEveryDisplay()) {
|
| palette_tray_ = new PaletteTray(wm_shelf_);
|
| status_area_widget_delegate_->AddTray(palette_tray_);
|
| }
|
|
|