summaryrefslogtreecommitdiffstats
path: root/ui/base
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-20 22:05:15 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-20 22:05:15 +0000
commit8349a2017892645867f33dac308f2a47e0e6d4fe (patch)
tree80cb0c34d3fab6b98c3ebc3da3bb9350a99b8ccf /ui/base
parent667f09512bb4d1ae58b5e868cf4823d7dfdc39ad (diff)
downloadchromium_src-8349a2017892645867f33dac308f2a47e0e6d4fe.zip
chromium_src-8349a2017892645867f33dac308f2a47e0e6d4fe.tar.gz
chromium_src-8349a2017892645867f33dac308f2a47e0e6d4fe.tar.bz2
Create the skeleton of a new FocusController in corewm.
This code will: - implement the API handling focus and activation changes. - respond to events or window disposition changes with focus and activation changes. - dispatch focus and activation changes as events. http://crbug.com/162100 R=sky@chromium.org Review URL: https://codereview.chromium.org/11414090 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168882 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base')
-rw-r--r--ui/base/events/event_constants.h5
-rw-r--r--ui/base/events/event_utils.cc8
-rw-r--r--ui/base/events/event_utils.h3
3 files changed, 15 insertions, 1 deletions
diff --git a/ui/base/events/event_constants.h b/ui/base/events/event_constants.h
index 504fd89..984b790 100644
--- a/ui/base/events/event_constants.h
+++ b/ui/base/events/event_constants.h
@@ -26,7 +26,6 @@ enum EventType {
ET_TOUCH_STATIONARY,
ET_TOUCH_CANCELLED,
ET_DROP_TARGET_EVENT,
- ET_FOCUS_CHANGE,
ET_TRANSLATED_KEY_PRESS,
ET_TRANSLATED_KEY_RELEASE,
@@ -55,6 +54,10 @@ enum EventType {
ET_SCROLL,
ET_SCROLL_FLING_START,
ET_SCROLL_FLING_CANCEL,
+
+ // Must always be last. User namespace starts above this value.
+ // See ui::RegisterCustomEventType().
+ ET_LAST
};
// Event flags currently supported
diff --git a/ui/base/events/event_utils.cc b/ui/base/events/event_utils.cc
index 2d1e7af..ef16fb9e 100644
--- a/ui/base/events/event_utils.cc
+++ b/ui/base/events/event_utils.cc
@@ -8,8 +8,16 @@
namespace ui {
+namespace {
+int g_custom_event_types = ET_LAST;
+} // namespace
+
bool EventCanceledDefaultHandling(const Event& event) {
return event.phase() == EP_POSTTARGET && event.result() != ER_UNHANDLED;
}
+int RegisterCustomEventType() {
+ return ++g_custom_event_types;
+}
+
} // namespace ui
diff --git a/ui/base/events/event_utils.h b/ui/base/events/event_utils.h
index da1d4c6..1e1240e 100644
--- a/ui/base/events/event_utils.h
+++ b/ui/base/events/event_utils.h
@@ -131,6 +131,9 @@ UI_EXPORT bool IsMouseEventFromTouch(UINT message);
// its dispatch to its target.
UI_EXPORT bool EventCanceledDefaultHandling(const Event& event);
+// Registers a custom event type.
+UI_EXPORT int RegisterCustomEventType();
+
} // namespace ui
#endif // UI_BASE_EVENTS_EVENT_UTILS_H_