diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-30 23:14:03 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-30 23:14:03 +0000 |
| commit | de4ec531ed531ea578a783f7da16f67ce0f6d658 (patch) | |
| tree | 4ec6d291f8da0240e153e4ce126d625d5fe89c5d /ash/accelerators/accelerator_dispatcher_win.cc | |
| parent | 6a73c3006dde579493a5b070fe9bd3008608d5b1 (diff) | |
| download | chromium_src-de4ec531ed531ea578a783f7da16f67ce0f6d658.zip chromium_src-de4ec531ed531ea578a783f7da16f67ce0f6d658.tar.gz chromium_src-de4ec531ed531ea578a783f7da16f67ce0f6d658.tar.bz2 | |
Ash/aura split: Get views_examples_exe semi-running on linux/X11.
This adds tons of hacks, most of which should be clearly labeled with TODOs.
BUG=119759
TEST=
Review URL: http://codereview.chromium.org/9873035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129990 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/accelerators/accelerator_dispatcher_win.cc')
| -rw-r--r-- | ash/accelerators/accelerator_dispatcher_win.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ash/accelerators/accelerator_dispatcher_win.cc b/ash/accelerators/accelerator_dispatcher_win.cc index 9a3f18d..f5d2c10 100644 --- a/ash/accelerators/accelerator_dispatcher_win.cc +++ b/ash/accelerators/accelerator_dispatcher_win.cc @@ -5,7 +5,6 @@ #include "ash/accelerators/accelerator_dispatcher.h" #include "ash/accelerators/accelerator_controller.h" -#include "ash/ime/event.h" #include "ash/shell.h" #include "ui/aura/env.h" #include "ui/aura/event.h" @@ -40,7 +39,7 @@ bool AcceleratorDispatcher::Dispatch(const MSG& msg) { accelerator.set_type(ui::ET_KEY_RELEASED); if (accelerator_controller->Process(accelerator)) return true; - accelerator.set_type(TranslatedKeyEvent(msg, false).type()); + accelerator.set_type(aura::TranslatedKeyEvent(msg, false).type()); if (accelerator_controller->Process(accelerator)) return true; } |