MacViews: Get widget_interactive_uitest compiling on Mac

ui/views/widget/widget_interactive_uitest.cc

Index: ui/views/widget/widget_interactive_uitest.cc
diff --git a/ui/views/widget/widget_interactive_uitest.cc b/ui/views/widget/widget_interactive_uitest.cc
index 3340462d064684c91d03eb40e8117f11085409b1..e4be7ed6920dcb3468a8fc39d8d87585ebf22dd4 100644
--- a/ui/views/widget/widget_interactive_uitest.cc
+++ b/ui/views/widget/widget_interactive_uitest.cc
@@ -9,10 +9,6 @@
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
-#include "ui/aura/client/focus_client.h"
-#include "ui/aura/env.h"
-#include "ui/aura/window.h"
-#include "ui/aura/window_tree_host.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/base/ui_base_switches.h"
@@ -28,11 +24,10 @@
 #include "ui/views/window/dialog_delegate.h"
 #include "ui/wm/public/activation_client.h"
 
-#if !defined(OS_CHROMEOS)
-#include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
-#endif
-
 #if defined(OS_WIN)
+#include "ui/aura/window.h"
+#include "ui/aura/window_tree_host.h"
+#include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #include "ui/views/win/hwnd_util.h"
 #endif
 
@@ -175,7 +170,10 @@ class WidgetTestInteractive : public WidgetTest {
     DCHECK(controller);
     if (controller->context_menu_timer_.IsRunning()) {
       controller->context_menu_timer_.Stop();
+// TODO(tapted): Enable this when porting ui/views/touchui to Mac.
+#if !defined(OS_MACOSX)
       controller->ContextMenuTimerFired();
+#endif

[tapted, 2014/08/05 13:42:26]

This is to avoid a link error, and is all that strictly necessary here to get
interactive_ui_tests to link. Looking at it again though, maybe more should be
guarded (along with the touchui #include), or these tests should be moved to a
separate file for touch. Let me know what you think.

     }
   }
 
@@ -249,7 +247,7 @@ TEST_F(WidgetTestInteractive, DesktopNativeWidgetAuraActivationAndFocusTest) {
             reinterpret_cast<aura::Window*>(NULL));
   EXPECT_EQ(activation_client1->GetActiveWindow(), widget1.GetNativeView());
 }
-#endif
+#endif  // defined(OS_WIN)
 
 TEST_F(WidgetTestInteractive, CaptureAutoReset) {
   Widget* toplevel = CreateTopLevelFramelessPlatformWidget();
@@ -632,7 +630,7 @@ TEST_F(WidgetTestInteractive, WidgetNotActivatedOnFakeActivationMessages) {
   EXPECT_EQ(true, widget1.active());
   EXPECT_EQ(false, widget2.active());
 }
-#endif
+#endif  // defined(OS_WIN)
 
 #if !defined(OS_CHROMEOS)
 // Provides functionality to create a window modal dialog.
@@ -663,13 +661,13 @@ TEST_F(WidgetTestInteractive, WindowModalWindowDestroyedActivationTest) {
   gfx::Rect initial_bounds(0, 0, 500, 500);
   init_params.bounds = initial_bounds;
   init_params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
-  init_params.native_widget = new DesktopNativeWidgetAura(&top_level_widget);
+  init_params.native_widget =
+      new PlatformDesktopNativeWidget(&top_level_widget);
   top_level_widget.Init(init_params);
   top_level_widget.Show();
 
-  aura::Window* top_level_window = top_level_widget.GetNativeWindow();
-  EXPECT_EQ(top_level_window, aura::client::GetFocusClient(
-                top_level_window)->GetFocusedWindow());
+  gfx::NativeWindow top_level_window = top_level_widget.GetNativeWindow();
+  EXPECT_EQ(top_level_window, CurrentlyFocussedWindow(&top_level_widget));
 
   // Create a modal dialog.
   // This instance will be destroyed when the dialog is destroyed.
@@ -677,16 +675,15 @@ TEST_F(WidgetTestInteractive, WindowModalWindowDestroyedActivationTest) {
       new ModalDialogDelegate(ui::MODAL_TYPE_WINDOW);
 
   Widget* modal_dialog_widget = views::DialogDelegate::CreateDialogWidget(
-      dialog_delegate, NULL, top_level_widget.GetNativeWindow());
+      dialog_delegate, NULL, top_level_widget.GetNativeView());
   modal_dialog_widget->SetBounds(gfx::Rect(100, 100, 200, 200));
   modal_dialog_widget->Show();
-  aura::Window* dialog_window = modal_dialog_widget->GetNativeWindow();
-  EXPECT_EQ(dialog_window, aura::client::GetFocusClient(
-                top_level_window)->GetFocusedWindow());
 
+  gfx::NativeWindow dialog_window = modal_dialog_widget->GetNativeWindow();
+  EXPECT_EQ(dialog_window, CurrentlyFocussedWindow(&top_level_widget));
   modal_dialog_widget->CloseNow();
-  EXPECT_EQ(top_level_window, aura::client::GetFocusClient(
-                top_level_window)->GetFocusedWindow());
+  EXPECT_EQ(top_level_window, CurrentlyFocussedWindow(&top_level_widget));
+
   top_level_widget.CloseNow();
 }
 
@@ -700,34 +697,34 @@ TEST_F(WidgetTestInteractive, SystemModalWindowReleasesCapture) {
   gfx::Rect initial_bounds(0, 0, 500, 500);
   init_params.bounds = initial_bounds;
   init_params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
-  init_params.native_widget = new DesktopNativeWidgetAura(&top_level_widget);
+  init_params.native_widget =
+      new PlatformDesktopNativeWidget(&top_level_widget);
   top_level_widget.Init(init_params);
   top_level_widget.Show();
 
-  aura::Window* top_level_window = top_level_widget.GetNativeWindow();
-  EXPECT_EQ(top_level_window, aura::client::GetFocusClient(
-                top_level_window)->GetFocusedWindow());
+  gfx::NativeWindow top_level_window = top_level_widget.GetNativeWindow();
+  EXPECT_EQ(top_level_window, CurrentlyFocussedWindow(&top_level_widget));
 
-  EXPECT_FALSE(top_level_window->HasCapture());
-  top_level_window->SetCapture();
-  EXPECT_TRUE(top_level_window->HasCapture());
+  EXPECT_FALSE(top_level_widget.HasCapture());
+  top_level_widget.SetCapture(NULL);
+  EXPECT_TRUE(top_level_widget.HasCapture());
 
   // Create a modal dialog.
   ModalDialogDelegate* dialog_delegate =
       new ModalDialogDelegate(ui::MODAL_TYPE_SYSTEM);
 
   Widget* modal_dialog_widget = views::DialogDelegate::CreateDialogWidget(
-      dialog_delegate, NULL, top_level_widget.GetNativeWindow());
+      dialog_delegate, NULL, top_level_widget.GetNativeView());
   modal_dialog_widget->SetBounds(gfx::Rect(100, 100, 200, 200));
   modal_dialog_widget->Show();
 
-  EXPECT_FALSE(top_level_window->HasCapture());
+  EXPECT_FALSE(top_level_widget.HasCapture());
 
   modal_dialog_widget->CloseNow();
   top_level_widget.CloseNow();
 }
 
-#endif
+#endif  // !defined(OS_CHROMEOS)
 
 TEST_F(WidgetTestInteractive, CanActivateFlagIsHonored) {
   Widget widget;
@@ -737,7 +734,7 @@ TEST_F(WidgetTestInteractive, CanActivateFlagIsHonored) {
   init_params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   init_params.activatable = Widget::InitParams::ACTIVATABLE_NO;
 #if !defined(OS_CHROMEOS)
-  init_params.native_widget = new DesktopNativeWidgetAura(&widget);
+  init_params.native_widget = new PlatformDesktopNativeWidget(&widget);
 #endif  // !defined(OS_CHROMEOS)
   widget.Init(init_params);
 
@@ -771,7 +768,7 @@ TEST_F(WidgetTestInteractive, TouchSelectionQuickMenuIsNotActivated) {
 
   RunPendingMessages();
 
-  ui::test::EventGenerator generator(widget.GetNativeView()->GetRootWindow());
+  ui::test::EventGenerator generator(widget.GetNativeWindow());
   generator.GestureTapAt(gfx::Point(10, 10));
   ShowQuickMenuImmediately(static_cast<TouchSelectionControllerImpl*>(
       textfield_test_api.touch_selection_controller()));
@@ -874,7 +871,7 @@ class WidgetCaptureTest : public ViewsTestBase {
                                    Widget* widget) {
 #if !defined(OS_CHROMEOS)
     if (create_desktop_native_widget)
-      return new DesktopNativeWidgetAura(widget);
+      return new PlatformDesktopNativeWidget(widget);
 #endif
     return NULL;
   }
@@ -919,11 +916,10 @@ TEST_F(WidgetCaptureTest, FailedCaptureRequestIsNoop) {
   EXPECT_FALSE(widget.HasCapture());
 
   widget.Show();
-  ui::MouseEvent mouse_press_event(ui::ET_MOUSE_PRESSED, gfx::Point(300, 10),
-      gfx::Point(300, 10), ui::EF_NONE, ui::EF_NONE);
-  ui::EventDispatchDetails details = widget.GetNativeWindow()->GetHost()->
-      event_processor()->OnEventFromSource(&mouse_press_event);
-  ASSERT_FALSE(details.dispatcher_destroyed);
+  ui::test::EventGenerator generator(GetContext(), widget.GetNativeWindow());
+  generator.set_current_location(gfx::Point(300, 10));
+  generator.PressLeftButton();
+
   EXPECT_FALSE(mouse_view1->pressed());
   EXPECT_TRUE(mouse_view2->pressed());
 }
@@ -953,11 +949,10 @@ TEST_F(WidgetCaptureTest, MouseExitOnCaptureGrab) {
   widget2.Show();
   widget2.SetBounds(gfx::Rect(400, 0, 300, 300));
 
-  ui::MouseEvent mouse_move_event(ui::ET_MOUSE_MOVED, gfx::Point(100, 100),
-      gfx::Point(100, 100), ui::EF_NONE, ui::EF_NONE);
-  ui::EventDispatchDetails details = widget1.GetNativeWindow()->GetHost()->
-      event_processor()->OnEventFromSource(&mouse_move_event);
-  ASSERT_FALSE(details.dispatcher_destroyed);
+  ui::test::EventGenerator generator(widget1.GetNativeWindow());
+  generator.set_current_location(gfx::Point(100, 100));
+  generator.MoveMouseBy(0, 0);
+
   EXPECT_EQ(1, mouse_view1->EnteredCalls());
   EXPECT_EQ(0, mouse_view1->ExitedCalls());
 
@@ -967,7 +962,7 @@ TEST_F(WidgetCaptureTest, MouseExitOnCaptureGrab) {
   // in addition to the one generated by Chrome.
   EXPECT_LT(0, mouse_view1->ExitedCalls());
 }
-#endif
+#endif  // !defined(OS_CHROMEOS)
 
 namespace {
 
@@ -1006,7 +1001,7 @@ TEST_F(WidgetCaptureTest, SetCaptureToNonToplevel) {
   Widget::InitParams child_params =
       CreateParams(Widget::InitParams::TYPE_WINDOW_FRAMELESS);
   child_params.parent = toplevel.GetNativeView();
-  child_params.context = toplevel.GetNativeView();
+  child_params.context = toplevel.GetNativeWindow();
   child->Init(child_params);
 
   CaptureOnActivationObserver observer;
@@ -1083,7 +1078,7 @@ TEST_F(WidgetCaptureTest, MouseEventDispatchedToRightWindow) {
   EXPECT_TRUE(widget1.GetAndClearGotMouseEvent());
   EXPECT_FALSE(widget2.GetAndClearGotMouseEvent());
 }
-#endif
+#endif  // defined(OS_WIN)
 
 }  // namespace test
 }  // namespace views