diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-11 16:02:40 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-11 16:02:40 +0000 |
| commit | 0c304949918cb35cc4c730847669b0c09f6fd248 (patch) | |
| tree | 879ffb8e336d37f6902435d045150ff7845b7a26 /views/focus | |
| parent | ffeb154342de3593288afcd6a1ca90043e299b48 (diff) | |
| download | chromium_src-0c304949918cb35cc4c730847669b0c09f6fd248.zip chromium_src-0c304949918cb35cc4c730847669b0c09f6fd248.tar.gz chromium_src-0c304949918cb35cc4c730847669b0c09f6fd248.tar.bz2 | |
Use DispatchX for dispatching X events.
This fixes an error clang shows with -Woverloaded-virtual.
BUG=72575
TEST=none
Review URL: http://codereview.chromium.org/6487004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74595 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/focus')
| -rw-r--r-- | views/focus/accelerator_handler.h | 2 | ||||
| -rw-r--r-- | views/focus/accelerator_handler_touch.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/views/focus/accelerator_handler.h b/views/focus/accelerator_handler.h index 9774922..96eb55d 100644 --- a/views/focus/accelerator_handler.h +++ b/views/focus/accelerator_handler.h @@ -43,7 +43,7 @@ class AcceleratorHandler : public MessageLoopForUI::Dispatcher { #else virtual bool Dispatch(GdkEvent* event); #if defined(TOUCH_UI) - virtual MessagePumpGlibXDispatcher::DispatchStatus Dispatch(XEvent* xev); + virtual MessagePumpGlibXDispatcher::DispatchStatus DispatchX(XEvent* xev); #endif #endif diff --git a/views/focus/accelerator_handler_touch.cc b/views/focus/accelerator_handler_touch.cc index 9b588c1..ec3b750 100644 --- a/views/focus/accelerator_handler_touch.cc +++ b/views/focus/accelerator_handler_touch.cc @@ -220,8 +220,8 @@ bool AcceleratorHandler::Dispatch(GdkEvent* event) { return true; } -base::MessagePumpGlibXDispatcher::DispatchStatus AcceleratorHandler::Dispatch( - XEvent* xev) { +base::MessagePumpGlibXDispatcher::DispatchStatus + AcceleratorHandler::DispatchX(XEvent* xev) { return DispatchXEvent(xev) ? base::MessagePumpGlibXDispatcher::EVENT_PROCESSED : base::MessagePumpGlibXDispatcher::EVENT_IGNORED; |