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

Unified Diff: ash/system/status_area_widget_unittest.cc

Issue 2825383003: Fix stylus tools palette. (Closed)
Patch Set: Fix nits. Created 3 years, 7 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/system/status_area_widget.cc ('k') | chrome/browser/about_flags.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/status_area_widget_unittest.cc
diff --git a/ash/system/status_area_widget_unittest.cc b/ash/system/status_area_widget_unittest.cc
index 49e4f957f20d623c4780867bc0fdb6903e74acd6..36f91403721df13828e26d435fc021fe07e33c7f 100644
--- a/ash/system/status_area_widget_unittest.cc
+++ b/ash/system/status_area_widget_unittest.cc
@@ -41,9 +41,7 @@ TEST_F(StatusAreaWidgetTest, Basics) {
EXPECT_TRUE(status->logout_button_tray_for_testing());
EXPECT_TRUE(status->ime_menu_tray());
EXPECT_TRUE(status->virtual_keyboard_tray_for_testing());
-
- // Stylus palette is only constructed if hardware supports it.
- EXPECT_FALSE(status->palette_tray());
+ EXPECT_TRUE(status->palette_tray());
// Needed because WebNotificationTray updates its initial visibility
// asynchronously.
@@ -69,7 +67,7 @@ class StatusAreaWidgetPaletteTest : public test::AshTestBase {
// to ui::InputDeviceManager in a mus environment, which it can't.
if (aura::Env::GetInstance()->mode() != aura::Env::Mode::MUS) {
base::CommandLine* cmd = base::CommandLine::ForCurrentProcess();
- cmd->AppendSwitch(switches::kAshForceEnablePalette);
+ cmd->AppendSwitch(switches::kAshForceEnableStylusTools);
// It's difficult to write a test that marks the primary display as
// internal before the status area is constructed. Just force the palette
// for all displays.
« no previous file with comments | « ash/system/status_area_widget.cc ('k') | chrome/browser/about_flags.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698