summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/views/event_utils.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/browser/ui/views/event_utils.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/browser/ui/views/event_utils.cc')
-rw-r--r--chrome/browser/ui/views/event_utils.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/ui/views/event_utils.cc b/chrome/browser/ui/views/event_utils.cc
index 2677f19..8c59c51 100644
--- a/chrome/browser/ui/views/event_utils.cc
+++ b/chrome/browser/ui/views/event_utils.cc
@@ -11,15 +11,15 @@ using views::Event;
namespace event_utils {
WindowOpenDisposition DispositionFromEventFlags(int event_flags) {
- if (((event_flags & Event::EF_MIDDLE_BUTTON_DOWN) ==
- Event::EF_MIDDLE_BUTTON_DOWN) ||
- ((event_flags & Event::EF_CONTROL_DOWN) ==
- Event::EF_CONTROL_DOWN)) {
- return ((event_flags & Event::EF_SHIFT_DOWN) == Event::EF_SHIFT_DOWN) ?
+ if (((event_flags & ui::EF_MIDDLE_BUTTON_DOWN) ==
+ ui::EF_MIDDLE_BUTTON_DOWN) ||
+ ((event_flags & ui::EF_CONTROL_DOWN) ==
+ ui::EF_CONTROL_DOWN)) {
+ return ((event_flags & ui::EF_SHIFT_DOWN) == ui::EF_SHIFT_DOWN) ?
NEW_FOREGROUND_TAB : NEW_BACKGROUND_TAB;
}
- if ((event_flags & Event::EF_SHIFT_DOWN) == Event::EF_SHIFT_DOWN)
+ if ((event_flags & ui::EF_SHIFT_DOWN) == ui::EF_SHIFT_DOWN)
return NEW_WINDOW;
return false /*event.IsAltDown()*/ ? SAVE_TO_DISK : CURRENT_TAB;
}