ash/system/web_notification/web_notification_tray_unittest.cc - Issue 580903003: Move Touch Feedback flag to ui_base_switches

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/system/web_notification/web_notification_tray_unittest.cc

Issue 580903003: Move Touch Feedback flag to ui_base_switches (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix tests Created 6 years, 3 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:

Index: ash/system/web_notification/web_notification_tray_unittest.cc

diff --git a/ash/system/web_notification/web_notification_tray_unittest.cc b/ash/system/web_notification/web_notification_tray_unittest.cc

index 4871753f590e62439032abc136eb5408924b1b18..02f0d7f2e5489c56a74d7c7e99e769d31f8c2f05 100644

--- a/ash/system/web_notification/web_notification_tray_unittest.cc

+++ b/ash/system/web_notification/web_notification_tray_unittest.cc

@@ -6,7 +6,6 @@

#include <vector>

-#include "ash/ash_switches.h"

#include "ash/display/display_manager.h"

#include "ash/root_window_controller.h"

#include "ash/shelf/shelf_layout_manager.h"

@@ -25,6 +24,7 @@

#include "base/strings/utf_string_conversions.h"

#include "ui/aura/client/aura_constants.h"

#include "ui/aura/window.h"

+#include "ui/base/ui_base_switches.h"

#include "ui/events/event.h"

#include "ui/events/test/event_generator.h"

#include "ui/gfx/display.h"

@@ -97,7 +97,7 @@ class WebNotificationTrayTest : public test::AshTestBase {

virtual void SetUp() OVERRIDE {

CommandLine::ForCurrentProcess()->AppendSwitch(

- switches::kAshEnableTouchViewTouchFeedback);

+ switches::kEnableTouchFeedback);

test::AshTestBase::SetUp();

}

« no previous file with comments | « ash/system/tray/tray_background_view.cc ('k') | chrome/app/generated_resources.grd » ('j') | no next file with comments »