Get views and views_unittests to build w/ use_aura=1

views/mouse_watcher.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/mouse_watcher.h"
 
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/task.h"
 #include "ui/gfx/screen.h"
@@ skipping 58 matching lines @@
         break;
       case ui::WAYLAND_POINTER_FOCUS:
         if (!event->pointer_focus.state)
           HandleGlobalMouseMoveEvent(true);
         break;
       default:
         break;
     }
     return EVENT_CONTINUE;
   }
-#else
+#elif defined(TOOLKIT_USES_GTK)
   void WillProcessEvent(GdkEvent* event) {
   }
 
   void DidProcessEvent(GdkEvent* event) {
     switch (event->type) {
       case GDK_MOTION_NOTIFY:
         HandleGlobalMouseMoveEvent(false);
         break;
       case GDK_LEAVE_NOTIFY:
         HandleGlobalMouseMoveEvent(true);
         break;
       default:
         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:
   View* view() const { return mouse_watcher_->host_; }
 
   // Returns whether or not the cursor is currently in the view's "zone" which
   // is defined as a slightly larger region than the view.
   bool IsCursorInViewZone() {
     gfx::Rect bounds = view()->GetLocalBounds();
     gfx::Point view_topleft(bounds.origin());
@@ skipping 77 matching lines @@
 void MouseWatcher::Stop() {
   observer_.reset(NULL);
 }
 
 void MouseWatcher::NotifyListener() {
   observer_.reset(NULL);
   listener_->MouseMovedOutOfView();
 }
 
 }  // namespace views