Compact Navigation prototype

views/events/event_win.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/events/event.h"
 
 #include <windows.h>
 
 #include "base/logging.h"
 #include "ui/base/keycodes/keyboard_code_conversion_win.h"
@@ skipping 56 matching lines @@
       return ui::ET_MOUSEWHEEL;
     case WM_MOUSELEAVE:
     case WM_NCMOUSELEAVE:
       return ui::ET_MOUSE_EXITED;
     default:
       NOTREACHED();
   }
   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;
 
   // TODO(msw): ORing the pressed/released button into the flags is _wrong_.
   // It makes it impossible to tell which button was modified when multiple
   // buttons are/were held down. We need to instead put the modified button into
   // a separate member on the MouseEvent, then audit all consumers of
   // MouseEvents to fix them to use the resulting values correctly.
   switch (native_event.message) {
@@ skipping 64 matching lines @@
       flags |= (win_flags & MK_RBUTTON) ? ui::EF_RIGHT_BUTTON_DOWN : 0;
       break;
     }
   }
 
   return flags;
 }
 
 }  // 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:
 
 int Event::GetWindowsFlags() const {
   // TODO: need support for x1/x2.
   int result = 0;
   result |= (flags_ & ui::EF_SHIFT_DOWN) ? MK_SHIFT : 0;
   result |= (flags_ & ui::EF_CONTROL_DOWN) ? MK_CONTROL : 0;
   result |= (flags_ & ui::EF_LEFT_BUTTON_DOWN) ? MK_LBUTTON : 0;
   result |= (flags_ & ui::EF_MIDDLE_BUTTON_DOWN) ? MK_MBUTTON : 0;
@@ skipping 100 matching lines @@
 
 MouseWheelEvent::MouseWheelEvent(NativeEvent2 native_event_2,
                                  FromNativeEvent2 from_native)
     : MouseEvent(native_event_2, from_native) {
   // No one should ever call this on Windows.
   // TODO(msw): remove once we rid views of Gtk/Gdk.
   NOTREACHED();
 }
 
 }  // namespace views