diff options
| author | jonross <jonross@chromium.org> | 2014-12-01 15:55:30 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-01 23:56:08 +0000 |
| commit | d24d766f3bf1549e35582971aadf82b9532c3aec (patch) | |
| tree | 3fa69e7b28dc4d4614340748510726324f906a86 /ash/shelf/shelf_view_unittest.cc | |
| parent | 78c18bdb7076e2d91e6776e030a1d5b8d44dd247 (diff) | |
| download | chromium_src-d24d766f3bf1549e35582971aadf82b9532c3aec.zip chromium_src-d24d766f3bf1549e35582971aadf82b9532c3aec.tar.gz chromium_src-d24d766f3bf1549e35582971aadf82b9532c3aec.tar.bz2 | |
Enable Touch Feedback Experiment by default
Change touch feedback switch to be a disabling switch. Update locations currently referencing the switch. Update unittests to no longer set the flag as it will be on by default.
TEST=SystemTrayTest.TrayPopupItemContainerTouchFeedback, SystemTrayTest.TrayPopupItemContainerTouchFeedbackCancellation, TrayDetailsViewTest.HoverHighlightViewTouchFeedback, TrayDetailsViewTest.HoverHighlightViewTouchFeedbackCancellation, MenuButtonTest.TouchFeedbackDuringTap, MenuButtonTest.TouchFeedbackDuringTapCancel
Review URL: https://codereview.chromium.org/752163003
Cr-Commit-Position: refs/heads/master@{#306298}
Diffstat (limited to 'ash/shelf/shelf_view_unittest.cc')
| -rw-r--r-- | ash/shelf/shelf_view_unittest.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/ash/shelf/shelf_view_unittest.cc b/ash/shelf/shelf_view_unittest.cc index bf7f21d..902cf51 100644 --- a/ash/shelf/shelf_view_unittest.cc +++ b/ash/shelf/shelf_view_unittest.cc @@ -30,7 +30,6 @@ #include "ash/test/test_shelf_delegate.h" #include "ash/test/test_shelf_item_delegate.h" #include "base/basictypes.h" -#include "base/command_line.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_number_conversions.h" @@ -38,7 +37,6 @@ #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/ui_base_switches.h" #include "ui/compositor/layer.h" #include "ui/events/event.h" #include "ui/events/event_constants.h" @@ -290,8 +288,6 @@ class ShelfViewTest : public AshTestBase { ~ShelfViewTest() override {} void SetUp() override { - base::CommandLine::ForCurrentProcess()->AppendSwitch( - switches::kEnableTouchFeedback); AshTestBase::SetUp(); test::ShellTestApi test_api(Shell::GetInstance()); model_ = test_api.shelf_model(); |