summaryrefslogtreecommitdiffstats
path: root/ui/wm
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-18 20:45:32 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-18 20:45:32 +0000
commit9cdbb8cbd23103d00b1f67af2a892b4ac9899b74 (patch)
tree8c48839fef9c293051ae81ca66e2ab6ebd1b1f32 /ui/wm
parent74e734ad51e68a7622383674aaf4601703ef90fb (diff)
downloadchromium_src-9cdbb8cbd23103d00b1f67af2a892b4ac9899b74.zip
chromium_src-9cdbb8cbd23103d00b1f67af2a892b4ac9899b74.tar.gz
chromium_src-9cdbb8cbd23103d00b1f67af2a892b4ac9899b74.tar.bz2
Fix "unreachable code" warning (MSVC warning 4702) in ui/wm/core/.
BUG=346399 TEST=none R=sky@chromium.org Review URL: https://codereview.chromium.org/242263002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@264848 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/wm')
-rw-r--r--ui/wm/core/compound_event_filter.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/ui/wm/core/compound_event_filter.cc b/ui/wm/core/compound_event_filter.cc
index 21270e3..d1f652c 100644
--- a/ui/wm/core/compound_event_filter.cc
+++ b/ui/wm/core/compound_event_filter.cc
@@ -30,8 +30,7 @@ namespace {
bool ShouldHideCursorOnTouch(const ui::TouchEvent& event) {
#if defined(OS_WIN)
return true;
-#endif // defind(OS_WIN)
-#if defined(OS_CHROMEOS)
+#elif defined(OS_CHROMEOS)
#if defined(USE_X11)
int device_id = event.source_device_id();
if (device_id >= 0 &&