Get views and views_unittests to build w/ use_aura=1

views/mouse_watcher.cc

Index: views/mouse_watcher.cc
diff --git a/views/mouse_watcher.cc b/views/mouse_watcher.cc
index 83fe75d2f3ab32be141b1ec008b1db5928e50fb9..b98d61b8ed3714c2cdfcb7a98dd3f64e771948c4 100644
--- a/views/mouse_watcher.cc
+++ b/views/mouse_watcher.cc
@@ -35,10 +35,10 @@ class MouseWatcher::Observer : public MessageLoopForUI::Observer {
 
   // MessageLoop::Observer implementation:
 #if defined(OS_WIN)
-  void WillProcessMessage(const MSG& msg) {
+  void WillProcessMessage(const MSG& msg) OVERRIDE {
   }
 
-  void DidProcessMessage(const MSG& msg) {
+  void DidProcessMessage(const MSG& msg) OVERRIDE {
     // We spy on three different Windows messages here to see if the mouse has
     // moved out of the bounds of the view. The messages are:
     //
@@ -62,7 +62,7 @@ class MouseWatcher::Observer : public MessageLoopForUI::Observer {
 }
 #elif defined(USE_WAYLAND)
   MessageLoopForUI::Observer::EventStatus WillProcessEvent(
-      ui::WaylandEvent* event) {
+      ui::WaylandEvent* event) OVERRIDE {
     switch (event->type) {
       case ui::WAYLAND_MOTION:
         HandleGlobalMouseMoveEvent(false);
@@ -76,11 +76,11 @@ class MouseWatcher::Observer : public MessageLoopForUI::Observer {
     }
     return EVENT_CONTINUE;
   }
-#else
-  void WillProcessEvent(GdkEvent* event) {
+#elif defined(TOOLKIT_USES_GTK)
+  void WillProcessEvent(GdkEvent* event) OVERRIDE {
   }
 
-  void DidProcessEvent(GdkEvent* event) {
+  void DidProcessEvent(GdkEvent* event) OVERRIDE {
     switch (event->type) {
       case GDK_MOTION_NOTIFY:
         HandleGlobalMouseMoveEvent(false);
@@ -92,6 +92,12 @@ class MouseWatcher::Observer : public MessageLoopForUI::Observer {
         break;
     }
   }
+#else
+  void WillProcessEvent(XEvent* event) OVERRIDE {

[sadrul, 2011/09/22 18:06:32]

WillProcessXEvent (note the X). Also the return type is different. This observer
also does not have DidProcessEvent to override.

Perhaps this block of could just doesn't need to be added?

+  }
+
+  void DidProcessEvent(XEvent* event) OVERRIDE {
+  }
 #endif
 
  private: