Aura under Linux is enabled with:

   'use_aura': 1,

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/7850026

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101704 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 21 insertions, 3 deletions

diff --git a/views/controls/link.cc b/views/controls/link.cc
index 4f60d30..0b27ec5 100644
--- a/views/controls/link.cc
+++ b/views/controls/link.cc
@@ -103,6 +103,9 @@ gfx::NativeCursor Link::GetCursor(const MouseEvent& event) {
 #if defined(OS_WIN)
   static HCURSOR g_hand_cursor = LoadCursor(NULL, IDC_HAND);
   return g_hand_cursor;
+#elif defined(USE_AURA)
+  // TODO(saintlou):
+  return NULL;
 #elif defined(OS_LINUX)
   return gfx::GetCursor(GDK_HAND2);
 #endif
diff --git a/views/controls/resize_area.cc b/views/controls/resize_area.cc
index dd38286..951c82d 100644
--- a/views/controls/resize_area.cc
+++ b/views/controls/resize_area.cc
@@ -37,6 +37,9 @@ gfx::NativeCursor ResizeArea::GetCursor(const MouseEvent& event) {
 #if defined(OS_WIN)
   static HCURSOR g_resize_cursor = LoadCursor(NULL, IDC_SIZEWE);
   return g_resize_cursor;
+#elif defined(USE_AURA)
+  // TODO(saintlou):
+  return NULL;
 #elif defined(OS_LINUX)
   return gfx::GetCursor(GDK_SB_H_DOUBLE_ARROW);
 #endif
diff --git a/views/controls/single_split_view.cc b/views/controls/single_split_view.cc
index f6ea618..d566d88 100644
--- a/views/controls/single_split_view.cc
+++ b/views/controls/single_split_view.cc
@@ -100,6 +100,9 @@ gfx::NativeCursor SingleSplitView::GetCursor(const MouseEvent& event) {
   static HCURSOR we_resize_cursor = LoadCursor(NULL, IDC_SIZEWE);
   static HCURSOR ns_resize_cursor = LoadCursor(NULL, IDC_SIZENS);
   return is_horizontal_ ? we_resize_cursor : ns_resize_cursor;
+#elif defined(USE_AURA)
+  // TODO(saintlou):
+  return NULL;
 #elif defined(OS_LINUX)
   return gfx::GetCursor(is_horizontal_ ? GDK_SB_H_DOUBLE_ARROW :
                                          GDK_SB_V_DOUBLE_ARROW);
diff --git a/views/controls/textfield/native_textfield_views.cc b/views/controls/textfield/native_textfield_views.cc
index 95434d5..eecaae2 100644
--- a/views/controls/textfield/native_textfield_views.cc
+++ b/views/controls/textfield/native_textfield_views.cc
@@ -288,6 +288,10 @@ gfx::NativeCursor NativeTextfieldViews::GetCursor(const MouseEvent& event) {
   static HCURSOR ibeam = LoadCursor(NULL, IDC_IBEAM);
   static HCURSOR arrow = LoadCursor(NULL, IDC_ARROW);
   return text_cursor ? ibeam : arrow;
+#elif defined(USE_AURA)
+  // TODO(saintlou):
+  (void)text_cursor;
+  return NULL;
 #else
   return text_cursor ? gfx::GetCursor(GDK_XTERM) : NULL;
 #endif
diff --git a/views/events/event.h b/views/events/event.h
index 99a0c9b..4231598 100644
--- a/views/events/event.h
+++ b/views/events/event.h
@@ -32,7 +32,7 @@ class NativeWidgetView;
 class RootView;
 }
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(USE_AURA)
 VIEWS_EXPORT bool IsClientMouseEvent(const views::NativeEvent& native_event);
 VIEWS_EXPORT bool IsNonClientMouseEvent(const views::NativeEvent& native_event);
 #endif
diff --git a/views/focus/accelerator_handler.h b/views/focus/accelerator_handler.h
index 7154eef..36c2f98 100644
--- a/views/focus/accelerator_handler.h
+++ b/views/focus/accelerator_handler.h
@@ -20,7 +20,8 @@
 
 namespace views {
 
-#if defined(TOUCH_UI) && !defined(USE_WAYLAND)
+#if (defined(TOUCH_UI) && !defined(USE_WAYLAND)) \
+    || (!defined(WIN_OS) && defined(USE_AURA))
 // Dispatch an XEvent to the RootView. Return true if the event was dispatched
 // and handled, false otherwise.
 bool VIEWS_EXPORT DispatchXEvent(XEvent* xevent);
diff --git a/views/focus/accelerator_handler_aura.cc b/views/focus/accelerator_handler_aura.cc
index 2ec3208..ab552899 100644
--- a/views/focus/accelerator_handler_aura.cc
+++ b/views/focus/accelerator_handler_aura.cc
@@ -17,9 +17,13 @@ bool AcceleratorHandler::Dispatch(const MSG& msg) {
 }
 #else
 base::MessagePumpDispatcher::DispatchStatus AcceleratorHandler::Dispatch(
-    XEvent* xev) {
+    XEvent*) {
   return base::MessagePumpDispatcher::EVENT_IGNORED;
 }
+
+bool DispatchXEvent(XEvent* xev) {
+  return false;
+}
 #endif  // defined(OS_WIN)
 
 }  // namespace views