summaryrefslogtreecommitdiffstats
path: root/chrome/test/webdriver/keymap.cc
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-10 04:56:36 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-10 04:56:36 +0000
commit8d577a70f6e6d2e47f0ac32f8606e489a7a77998 (patch)
tree48eae3f525e0323362db629efa2589e70a5a4e49 /chrome/test/webdriver/keymap.cc
parent8fb0ecf45b286845fd2004a157a294d7e3ca7a39 (diff)
downloadchromium_src-8d577a70f6e6d2e47f0ac32f8606e489a7a77998.zip
chromium_src-8d577a70f6e6d2e47f0ac32f8606e489a7a77998.tar.gz
chromium_src-8d577a70f6e6d2e47f0ac32f8606e489a7a77998.tar.bz2
Migrate Event API methods to Google Style.
Re-landing, moving the bits Mac uses to ui/base/events.h BUG=72040 TEST=none TBR=sky Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=74377 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74408 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/webdriver/keymap.cc')
-rw-r--r--chrome/test/webdriver/keymap.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/test/webdriver/keymap.cc b/chrome/test/webdriver/keymap.cc
index c3080d7..91b0e07 100644
--- a/chrome/test/webdriver/keymap.cc
+++ b/chrome/test/webdriver/keymap.cc
@@ -5,7 +5,7 @@
#include "chrome/test/webdriver/keymap.h"
#include "chrome/browser/automation/ui_controls.h"
-#include "views/events/event.h"
+#include "ui/base/events.h"
namespace webdriver {
@@ -147,17 +147,17 @@ bool KeyMap::Press(const scoped_refptr<WindowProxy>& window,
int modifiers = 0;
if (shift_ || shifted_keys_.find(key) != shifted_keys_.end()) {
- modifiers = modifiers | views::Event::EF_SHIFT_DOWN;
+ modifiers = modifiers | ui::EF_SHIFT_DOWN;
}
if (control_) {
- modifiers = modifiers | views::Event::EF_CONTROL_DOWN;
+ modifiers = modifiers | ui::EF_CONTROL_DOWN;
}
if (alt_) {
- modifiers = modifiers | views::Event::EF_ALT_DOWN;
+ modifiers = modifiers | ui::EF_ALT_DOWN;
}
if (command_) {
VLOG(1) << "Pressing command key on linux!!";
- modifiers = modifiers | views::Event::EF_COMMAND_DOWN;
+ modifiers = modifiers | ui::EF_COMMAND_DOWN;
}
// TODO(jmikhail): need to be able to capture modifier key up.