[Views] Move modality tests from widget_unittest.cc to desktop_native_widget_aura_unittest.cc.

ui/views/widget/widget_unittest.cc

 // Copyright (c) 2012 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 <algorithm>
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 50 matching lines @@
 bool IsTestingSnowLeopard() {
 #if defined(OS_MACOSX)
   return base::mac::IsOSSnowLeopard();
 #else
   return false;
 #endif
 }
 
 }  // namespace
 
-// A view that keeps track of the events it receives, optionally consuming them.
-class EventCountView : public View {
- public:
-  // Whether to call SetHandled() on events as they are received. For some event
-  // types, this will allow EventCountView to receives future events in the
-  // event sequence, such as a drag.
-  enum HandleMode {
-    PROPAGATE_EVENTS,
-    CONSUME_EVENTS
-  };
-
-  EventCountView()
-      : last_flags_(0),
-        handle_mode_(PROPAGATE_EVENTS) {}
-
-  ~EventCountView() override {}
-
-  int GetEventCount(ui::EventType type) {
-    return event_count_[type];
-  }
-
-  void ResetCounts() {
-    event_count_.clear();
-  }
-
-  int last_flags() const {
-    return last_flags_;
-  }
-
-  void set_handle_mode(HandleMode handle_mode) {
-    handle_mode_ = handle_mode;
-  }
-
- protected:
-  // Overridden from View:
-  void OnMouseMoved(const ui::MouseEvent& event) override {
-    // MouseMove events are not re-dispatched from the RootView.
-    ++event_count_[ui::ET_MOUSE_MOVED];
-    last_flags_ = 0;
-  }
-
-  // Overridden from ui::EventHandler:
-  void OnKeyEvent(ui::KeyEvent* event) override { RecordEvent(event); }
-  void OnMouseEvent(ui::MouseEvent* event) override { RecordEvent(event); }
-  void OnScrollEvent(ui::ScrollEvent* event) override { RecordEvent(event); }
-  void OnGestureEvent(ui::GestureEvent* event) override { RecordEvent(event); }
-
- private:
-  void RecordEvent(ui::Event* event) {
-    ++event_count_[event->type()];
-    last_flags_ = event->flags();
-    if (handle_mode_ == CONSUME_EVENTS)
-      event->SetHandled();
-  }
-
-  std::map<ui::EventType, int> event_count_;
-  int last_flags_;
-  HandleMode handle_mode_;
-
-  DISALLOW_COPY_AND_ASSIGN(EventCountView);
-};
-
 // A view that keeps track of the events it receives, and consumes all scroll
 // gesture events and ui::ET_SCROLL events.
 class ScrollableEventCountView : public EventCountView {
  public:
   ScrollableEventCountView() {}
   ~ScrollableEventCountView() override {}
 
  private:
   // Overridden from ui::EventHandler:
   void OnGestureEvent(ui::GestureEvent* event) override {
@@ skipping 57 matching lines @@
  private:
   void RecordEvent(const ui::Event& event) {
     ++event_count_[event.type()];
   }
 
   std::map<ui::EventType, int> event_count_;
 
   DISALLOW_COPY_AND_ASSIGN(EventCountHandler);
 };
 
-// A helper WidgetDelegate for tests that require hooks into WidgetDelegate
-// calls, and removes some of the boilerplate for initializing a Widget. Calls
-// Widget::CloseNow() when destroyed if it hasn't already been done.
-class TestDesktopWidgetDelegate : public WidgetDelegate {
- public:
-  TestDesktopWidgetDelegate() : widget_(new Widget) {}
-
-  ~TestDesktopWidgetDelegate() override {
-    if (widget_)
-      widget_->CloseNow();
-    EXPECT_FALSE(widget_);
-  }
-
-  // Initialize the Widget, adding some meaningful default InitParams.
-  void InitWidget(Widget::InitParams init_params) {
-    init_params.delegate = this;
-#if !defined(OS_CHROMEOS)
-    init_params.native_widget = new PlatformDesktopNativeWidget(widget_);
-#endif
-    init_params.bounds = initial_bounds_;
-    widget_->Init(init_params);
-  }
-
-  // Set the contents view to be used during Widget initialization. For Widgets
-  // that use non-client views, this will be the contents_view used to
-  // initialize the ClientView in WidgetDelegate::CreateClientView(). Otherwise,
-  // it is the ContentsView of the Widget's RootView. Ownership passes to the
-  // view hierarchy during InitWidget().
-  void set_contents_view(View* contents_view) {
-    contents_view_ = contents_view;
-  }
-
-  int window_closing_count() const { return window_closing_count_; }
-  const gfx::Rect& initial_bounds() { return initial_bounds_; }
-
-  // WidgetDelegate overrides:
-  void WindowClosing() override {
-    window_closing_count_++;
-    widget_ = nullptr;
-  }
-
-  Widget* GetWidget() override { return widget_; }
-  const Widget* GetWidget() const override { return widget_; }
-
-  View* GetContentsView() override {
-    return contents_view_ ? contents_view_ : WidgetDelegate::GetContentsView();
-  }
-
-  bool ShouldAdvanceFocusToTopLevelWidget() const override {
-    return true;  // Same default as DefaultWidgetDelegate in widget.cc.
-  }
-
- private:
-  Widget* widget_;
-  View* contents_view_ = nullptr;
-  int window_closing_count_ = 0;
-  gfx::Rect initial_bounds_ = gfx::Rect(100, 100, 200, 200);
-
-  DISALLOW_COPY_AND_ASSIGN(TestDesktopWidgetDelegate);
-};
-
 TEST_F(WidgetTest, WidgetInitParams) {
   // Widgets are not transparent by default.
   Widget::InitParams init1;
   EXPECT_EQ(Widget::InitParams::INFER_OPACITY, init1.opacity);
 }
 
 TEST_F(WidgetTest, NativeWindowProperty) {
   const char* key = "foo";
   int value = 3;
 
@@ skipping 2766 matching lines @@
   RunDestroyChildWidgetsTest(true, true);
 }
 #endif  // !defined(OS_CHROMEOS)
 
 // See description of RunDestroyChildWidgetsTest().
 TEST_F(WidgetChildDestructionTest, DestroyChildWidgetsInOrder) {
   RunDestroyChildWidgetsTest(false, false);
 }
 
 #if !defined(OS_CHROMEOS)
-// Provides functionality to create a window modal dialog.
-class ModalDialogDelegate : public DialogDelegateView {
- public:
-  ModalDialogDelegate() {}
-  ~ModalDialogDelegate() override {}
-
-  // WidgetDelegate overrides.
-  ui::ModalType GetModalType() const override { return ui::MODAL_TYPE_WINDOW; }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ModalDialogDelegate);
-};
-
-// This test verifies that whether mouse events when a modal dialog is
-// displayed are eaten or recieved by the dialog.
-TEST_F(WidgetTest, WindowMouseModalityTest) {
-  // Create a top level widget.
-  Widget top_level_widget;
-  Widget::InitParams init_params =
-      CreateParams(Widget::InitParams::TYPE_WINDOW);
-  init_params.show_state = ui::SHOW_STATE_NORMAL;
-  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 PlatformDesktopNativeWidget(&top_level_widget);
-  top_level_widget.Init(init_params);
-  top_level_widget.Show();
-  EXPECT_TRUE(top_level_widget.IsVisible());
-
-  // Create a view and validate that a mouse moves makes it to the view.
-  EventCountView* widget_view = new EventCountView();
-  widget_view->SetBounds(0, 0, 10, 10);
-  top_level_widget.GetRootView()->AddChildView(widget_view);
-
-  gfx::Point cursor_location_main(5, 5);
-  ui::MouseEvent move_main(ui::ET_MOUSE_MOVED, cursor_location_main,
-                           cursor_location_main, ui::EventTimeForNow(),
-                           ui::EF_NONE, ui::EF_NONE);
-  ui::EventDispatchDetails details =
-      GetEventProcessor(&top_level_widget)->OnEventFromSource(&move_main);
-  ASSERT_FALSE(details.dispatcher_destroyed);
-
-  EXPECT_EQ(1, widget_view->GetEventCount(ui::ET_MOUSE_ENTERED));
-  widget_view->ResetCounts();
-
-  // Create a modal dialog and validate that a mouse down message makes it to
-  // the main view within the dialog.
-
-  // This instance will be destroyed when the dialog is destroyed.
-  ModalDialogDelegate* dialog_delegate = new ModalDialogDelegate;
-
-  Widget* modal_dialog_widget = views::DialogDelegate::CreateDialogWidget(
-      dialog_delegate, NULL, top_level_widget.GetNativeView());
-  modal_dialog_widget->SetBounds(gfx::Rect(100, 100, 200, 200));
-  EventCountView* dialog_widget_view = new EventCountView();
-  dialog_widget_view->SetBounds(0, 0, 50, 50);
-  modal_dialog_widget->GetRootView()->AddChildView(dialog_widget_view);
-  modal_dialog_widget->Show();
-  EXPECT_TRUE(modal_dialog_widget->IsVisible());
-
-  gfx::Point cursor_location_dialog(100, 100);
-  ui::MouseEvent mouse_down_dialog(
-      ui::ET_MOUSE_PRESSED, cursor_location_dialog, cursor_location_dialog,
-      ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE);
-  details = GetEventProcessor(&top_level_widget)->OnEventFromSource(
-      &mouse_down_dialog);
-  ASSERT_FALSE(details.dispatcher_destroyed);
-  EXPECT_EQ(1, dialog_widget_view->GetEventCount(ui::ET_MOUSE_PRESSED));
-
-  // Send a mouse move message to the main window. It should not be received by
-  // the main window as the modal dialog is still active.
-  gfx::Point cursor_location_main2(6, 6);
-  ui::MouseEvent mouse_down_main(ui::ET_MOUSE_MOVED, cursor_location_main2,
-                                 cursor_location_main2, ui::EventTimeForNow(),
-                                 ui::EF_NONE, ui::EF_NONE);
-  details = GetEventProcessor(&top_level_widget)->OnEventFromSource(
-      &mouse_down_main);
-  ASSERT_FALSE(details.dispatcher_destroyed);
-  EXPECT_EQ(0, widget_view->GetEventCount(ui::ET_MOUSE_MOVED));
-
-  modal_dialog_widget->CloseNow();
-  top_level_widget.CloseNow();
-}
-
 // Verifies nativeview visbility matches that of Widget visibility when
 // SetFullscreen is invoked.
 TEST_F(WidgetTest, FullscreenStatePropagated) {
   Widget::InitParams init_params =
       CreateParams(Widget::InitParams::TYPE_WINDOW);
   init_params.show_state = ui::SHOW_STATE_NORMAL;
   init_params.bounds = gfx::Rect(0, 0, 500, 500);
   init_params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
 
   {
     Widget top_level_widget;
     top_level_widget.Init(init_params);
     top_level_widget.SetFullscreen(true);
     EXPECT_EQ(top_level_widget.IsVisible(),
               IsNativeWindowVisible(top_level_widget.GetNativeWindow()));
     top_level_widget.CloseNow();
   }
 #if !defined(OS_CHROMEOS)

[tapted, 2015/08/03 01:10:46]

odd... this is already in #if !defined(OS_CHROMEOS) - not sure if that's
intentional. Did you try just removing the #if that starts on line 2933?

[jackhou1, 2015/08/03 05:09:50]

Done.

   {
     Widget top_level_widget;
     init_params.native_widget =
         new PlatformDesktopNativeWidget(&top_level_widget);
     top_level_widget.Init(init_params);
     top_level_widget.SetFullscreen(true);
     EXPECT_EQ(top_level_widget.IsVisible(),
               IsNativeWindowVisible(top_level_widget.GetNativeWindow()));
     top_level_widget.CloseNow();
   }
 #endif
 }
-#if defined(OS_WIN)
-
-// Tests whether we can activate the top level widget when a modal dialog is
-// active.
-TEST_F(WidgetTest, WindowModalityActivationTest) {
-  TestDesktopWidgetDelegate widget_delegate;
-  widget_delegate.InitWidget(CreateParams(Widget::InitParams::TYPE_WINDOW));
-
-  Widget* top_level_widget = widget_delegate.GetWidget();
-  top_level_widget->Show();
-  EXPECT_TRUE(top_level_widget->IsVisible());
-
-  HWND win32_window = views::HWNDForWidget(top_level_widget);
-  EXPECT_TRUE(::IsWindow(win32_window));
-
-  // This instance will be destroyed when the dialog is destroyed.
-  ModalDialogDelegate* dialog_delegate = new ModalDialogDelegate;
-
-  // We should be able to activate the window even if the WidgetDelegate
-  // says no, when a modal dialog is active.
-  widget_delegate.set_can_activate(false);
-
-  Widget* modal_dialog_widget = views::DialogDelegate::CreateDialogWidget(
-      dialog_delegate, NULL, top_level_widget->GetNativeView());
-  modal_dialog_widget->SetBounds(gfx::Rect(100, 100, 200, 200));
-  modal_dialog_widget->Show();
-  EXPECT_TRUE(modal_dialog_widget->IsVisible());
-
-  LRESULT activate_result = ::SendMessage(
-      win32_window,
-      WM_MOUSEACTIVATE,
-      reinterpret_cast<WPARAM>(win32_window),
-      MAKELPARAM(WM_LBUTTONDOWN, HTCLIENT));
-  EXPECT_EQ(activate_result, MA_ACTIVATE);
-
-  modal_dialog_widget->CloseNow();
-}
-#endif  // defined(OS_WIN)
 #endif  // !defined(OS_CHROMEOS)
 
 namespace {
 
 class FullscreenAwareFrame : public views::NonClientFrameView {
  public:
   explicit FullscreenAwareFrame(views::Widget* widget)
       : widget_(widget), fullscreen_layout_called_(false) {}
   ~FullscreenAwareFrame() override {}
 
@@ skipping 218 matching lines @@
   EXPECT_FALSE(widget->IsAlwaysOnTop());
   widget->SetAlwaysOnTop(true);
   EXPECT_TRUE(widget->IsAlwaysOnTop());
   widget->SetAlwaysOnTop(false);
   EXPECT_FALSE(widget->IsAlwaysOnTop());
   widget->CloseNow();
 }
 
 }  // namespace test
 }  // namespace views