Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(106)

Unified Diff: ash/common/system/status_area_widget.cc

Issue 2644713002: cros: Use runtime stylus detection for ash palette. (Closed)
Patch Set: Fix test Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/system/chromeos/palette/palette_utils.cc ('k') | ash/common/test/test_palette_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_);
}
« no previous file with comments | « ash/common/system/chromeos/palette/palette_utils.cc ('k') | ash/common/test/test_palette_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698