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..4ef78509c0a93899058acea7bdf1f5635791f7d1 100644
--- a/views/mouse_watcher.cc
+++ b/views/mouse_watcher.cc
@@ -76,7 +76,7 @@ class MouseWatcher::Observer : public MessageLoopForUI::Observer {
     }
     return EVENT_CONTINUE;
   }
-#else
+#elif defined(TOOLKIT_USES_GTK)
   void WillProcessEvent(GdkEvent* event) {
   }
 
@@ -92,6 +92,12 @@ class MouseWatcher::Observer : public MessageLoopForUI::Observer {
         break;
     }
   }
+#else
+  void WillProcessEvent(GdkEvent* event) {

[sadrul, 2011/09/22 17:44:31]

I think this should be

 MessageLoopForUI::Observer::EventStatus WillProcessXEvent(Xevent*)

since this should be overriding the MessagePumpObserver defined in
message_pump_x.h?

Also, OVERRIDE

[DaveMoore, 2011/09/22 18:03:07]

Done.

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