summaryrefslogtreecommitdiffstats
path: root/ash/accelerators/nested_dispatcher_controller_unittest.cc
diff options
context:
space:
mode:
authorrjkroege@chromium.org <rjkroege@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-06 04:51:21 +0000
committerrjkroege@chromium.org <rjkroege@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-06 04:51:21 +0000
commitc335f480be26b7bea785ed96501e89272069fa47 (patch)
tree4d223fb7842f249c23031dca4295e05ae1207c9e /ash/accelerators/nested_dispatcher_controller_unittest.cc
parentd33e05ceff2ae365e47e1e1a8f36592d2fb10526 (diff)
downloadchromium_src-c335f480be26b7bea785ed96501e89272069fa47.zip
chromium_src-c335f480be26b7bea785ed96501e89272069fa47.tar.gz
chromium_src-c335f480be26b7bea785ed96501e89272069fa47.tar.bz2
Add a message pump for ChromeOS Embedded.
A message pump implementation for embedded ChromeOS. BUG=180666 Review URL: https://chromiumcodereview.appspot.com/12546010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192703 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/accelerators/nested_dispatcher_controller_unittest.cc')
-rw-r--r--ash/accelerators/nested_dispatcher_controller_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/accelerators/nested_dispatcher_controller_unittest.cc b/ash/accelerators/nested_dispatcher_controller_unittest.cc
index 4e42d6b..3cf1721 100644
--- a/ash/accelerators/nested_dispatcher_controller_unittest.cc
+++ b/ash/accelerators/nested_dispatcher_controller_unittest.cc
@@ -35,13 +35,13 @@ class MockDispatcher : public MessageLoop::Dispatcher {
int num_key_events_dispatched() { return num_key_events_dispatched_; }
-#if defined(OS_WIN) || defined(USE_X11)
+#if defined(OS_WIN) || defined(USE_X11) || defined(USE_MESSAGEPUMP_LINUX)
virtual bool Dispatch(const base::NativeEvent& event) OVERRIDE {
if (ui::EventTypeFromNative(event) == ui::ET_KEY_RELEASED)
num_key_events_dispatched_++;
return !ui::IsNoopEvent(event);
}
-#endif // defined(OS_WIN) || defined(USE_X11)
+#endif
private:
int num_key_events_dispatched_;