diff options
| author | stevet@chromium.org <stevet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-10 19:28:50 +0000 |
|---|---|---|
| committer | stevet@chromium.org <stevet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-10 19:28:50 +0000 |
| commit | b584fb90f233ce696c9e1f26a306e4e13af78a56 (patch) | |
| tree | b375031588f8ab04eca6707227774901bac33674 /views | |
| parent | 08873a8668f8ec74d3f7ccb7f64971b11d57176c (diff) | |
| download | chromium_src-b584fb90f233ce696c9e1f26a306e4e13af78a56.zip chromium_src-b584fb90f233ce696c9e1f26a306e4e13af78a56.tar.gz chromium_src-b584fb90f233ce696c9e1f26a306e4e13af78a56.tar.bz2 | |
The initial prototype code for the compact navigation (cnav) prototype, currently only active in windows. This is well hidden behind a flag and a context menu option.
Loosely based off oshima's original prototype patch: http://codereview.chromium.org/165272
BUG=None
TEST=Activate the cnav prototype in about:flags. Right click a tab and select "Hide Toolbar" to go into cnav mode. Ensure that the compact location bar provides the same basic functionality as the toolbar (except browser actions).
Review URL: http://codereview.chromium.org/6913026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84831 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/events/event.h | 5 | ||||
| -rw-r--r-- | views/events/event_win.cc | 28 |
2 files changed, 19 insertions, 14 deletions
diff --git a/views/events/event.h b/views/events/event.h index 5ede973..924a350 100644 --- a/views/events/event.h +++ b/views/events/event.h @@ -27,6 +27,11 @@ namespace views { class RootView; class View; +#if defined(OS_WIN) +bool IsClientMouseEvent(const views::NativeEvent& native_event); +bool IsNonClientMouseEvent(const views::NativeEvent& native_event); +#endif + //////////////////////////////////////////////////////////////////////////////// // // Event class diff --git a/views/events/event_win.cc b/views/events/event_win.cc index 06c892c..9e063d3 100644 --- a/views/events/event_win.cc +++ b/views/events/event_win.cc @@ -74,20 +74,6 @@ ui::EventType EventTypeFromNative(NativeEvent native_event) { return ui::ET_UNKNOWN; } -bool IsClientMouseEvent(NativeEvent native_event) { - return native_event.message == WM_MOUSELEAVE || - native_event.message == WM_MOUSEHOVER || - (native_event.message >= WM_MOUSEFIRST && - native_event.message <= WM_MOUSELAST); -} - -bool IsNonClientMouseEvent(NativeEvent native_event) { - return native_event.message == WM_NCMOUSELEAVE || - native_event.message == WM_NCMOUSEHOVER || - (native_event.message >= WM_NCMOUSEMOVE && - native_event.message <= WM_NCXBUTTONDBLCLK); -} - // Get views::Event flags from a native Windows message int EventFlagsFromNative(NativeEvent native_event) { int flags = 0; @@ -172,6 +158,20 @@ int EventFlagsFromNative(NativeEvent native_event) { } // namespace +bool IsClientMouseEvent(const views::NativeEvent& native_event) { + return native_event.message == WM_MOUSELEAVE || + native_event.message == WM_MOUSEHOVER || + (native_event.message >= WM_MOUSEFIRST && + native_event.message <= WM_MOUSELAST); +} + +bool IsNonClientMouseEvent(const views::NativeEvent& native_event) { + return native_event.message == WM_NCMOUSELEAVE || + native_event.message == WM_NCMOUSEHOVER || + (native_event.message >= WM_NCMOUSEMOVE && + native_event.message <= WM_NCXBUTTONDBLCLK); +} + //////////////////////////////////////////////////////////////////////////////// // Event, public: |