Vanquish views::BubbleDelegate{View,}

ash/wm/immersive_fullscreen_controller_unittest.cc

 // Copyright 2013 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 "ash/wm/immersive_fullscreen_controller.h"
 
 #include "ash/display/display_manager.h"
 #include "ash/display/mouse_cursor_event_filter.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_types.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/display_manager_test_api.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_state_aura.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/display/manager/display_layout.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/events/test/test_event_handler.h"
 #include "ui/gfx/animation/slide_animation.h"
-#include "ui/views/bubble/bubble_delegate.h"
+#include "ui/views/bubble/bubble_dialog_delegate.h"
 #include "ui/views/controls/native/native_view_host.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 
 namespace {
 
+class TestBubbleDialogDelegate : public views::BubbleDialogDelegateView {
+ public:
+  explicit TestBubbleDialogDelegate(views::View* anchor)
+      : BubbleDialogDelegateView(anchor, views::BubbleBorder::NONE) {}
+  ~TestBubbleDialogDelegate() override {}
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(TestBubbleDialogDelegate);
+};
+
 class MockImmersiveFullscreenControllerDelegate
     : public ImmersiveFullscreenController::Delegate {
  public:
   MockImmersiveFullscreenControllerDelegate(views::View* top_container_view)
       : top_container_view_(top_container_view),
         enabled_(false),
         visible_fraction_(1) {
   }
   ~MockImmersiveFullscreenControllerDelegate() override {}
 
@@ skipping 611 matching lines @@
   EXPECT_FALSE(controller()->IsRevealed());
 
   // Initiate reveal via mouse, end reveal via touch.
   AttemptReveal(MODALITY_MOUSE);
   EXPECT_TRUE(controller()->IsRevealed());
   AttemptUnreveal(MODALITY_GESTURE_TAP);
   EXPECT_FALSE(controller()->IsRevealed());
 }
 
 // Test when the SWIPE_CLOSE edge gesture closes the top-of-window views.
-#if defined(OS_WIN)
-// On Windows, touch events do not result in mouse events being disabled.  As
-// a result, the last part of this test which ends the reveal via a gesture will
-// not work correctly.  See crbug.com/332430, and the function
+#if !defined(OS_CHROMEOS)
+// On Windows/Linux, touch events do not result in mouse events being disabled.
+// As a result, the last part of this test which ends the reveal via a gesture
+// will not work correctly.  See crbug.com/332430, and the function
 // ShouldHideCursorOnTouch() in compound_event_filter.cc.
 #define MAYBE_EndRevealViaGesture DISABLED_EndRevealViaGesture
 #else
 #define MAYBE_EndRevealViaGesture EndRevealViaGesture
 #endif
 TEST_F(ImmersiveFullscreenControllerTest, MAYBE_EndRevealViaGesture) {
   SetEnabled(true);
   EXPECT_TRUE(controller()->IsEnabled());
   EXPECT_FALSE(controller()->IsRevealed());
 
@@ skipping 225 matching lines @@
   views::View* unrelated_view = new views::View();
   unrelated_view->SetBounds(0, 100, 10, 10);
   top_container()->parent()->AddChildView(unrelated_view);
 
   SetEnabled(true);
   ASSERT_FALSE(controller()->IsRevealed());
 
   // 1) Test that a bubble anchored to a child of the top container triggers
   // a reveal and keeps the top-of-window views revealed for the duration of
   // its visibility.
-  views::Widget* bubble_widget1(views::BubbleDelegateView::CreateBubble(
-      new views::BubbleDelegateView(child_view, views::BubbleBorder::NONE)));
+  views::Widget* bubble_widget1(views::BubbleDialogDelegateView::CreateBubble(
+      new TestBubbleDialogDelegate(child_view)));
   bubble_widget1->Show();
   EXPECT_TRUE(controller()->IsRevealed());
 
   // Activating |top_container_widget| will close |bubble_widget1|.
   top_container_widget->Activate();
   AttemptReveal(MODALITY_MOUSE);
   revealed_lock.reset(controller()->GetRevealedLock(
       ImmersiveFullscreenController::ANIMATE_REVEAL_NO));
   EXPECT_TRUE(controller()->IsRevealed());
 
-  views::Widget* bubble_widget2 = views::BubbleDelegateView::CreateBubble(
-      new views::BubbleDelegateView(child_view, views::BubbleBorder::NONE));
+  views::Widget* bubble_widget2 = views::BubbleDialogDelegateView::CreateBubble(
+      new TestBubbleDialogDelegate(child_view));
   bubble_widget2->Show();
   EXPECT_TRUE(controller()->IsRevealed());
   revealed_lock.reset();
   SetHovered(false);
   EXPECT_TRUE(controller()->IsRevealed());
   bubble_widget2->Close();
   EXPECT_FALSE(controller()->IsRevealed());
 
   // 2) Test that transitioning from keeping the top-of-window views revealed
   // because of a bubble to keeping the top-of-window views revealed because of
   // mouse hover by activating |top_container_widget| works.
-  views::Widget* bubble_widget3 = views::BubbleDelegateView::CreateBubble(
-      new views::BubbleDelegateView(child_view, views::BubbleBorder::NONE));
+  views::Widget* bubble_widget3 = views::BubbleDialogDelegateView::CreateBubble(
+      new TestBubbleDialogDelegate(child_view));
   bubble_widget3->Show();
   SetHovered(true);
   EXPECT_TRUE(controller()->IsRevealed());
   top_container_widget->Activate();
   EXPECT_TRUE(controller()->IsRevealed());
 
   // 3) Test that the top-of-window views stay revealed as long as at least one
   // bubble anchored to a child of the top container is visible.
   SetHovered(false);
   EXPECT_FALSE(controller()->IsRevealed());
 
-  views::BubbleDelegateView* bubble_delegate4(new views::BubbleDelegateView(
-      child_view, views::BubbleBorder::NONE));
+  views::BubbleDialogDelegateView* bubble_delegate4(
+      new TestBubbleDialogDelegate(child_view));
   bubble_delegate4->set_can_activate(false);
-  views::Widget* bubble_widget4(views::BubbleDelegateView::CreateBubble(
-      bubble_delegate4));
+  views::Widget* bubble_widget4(
+      views::BubbleDialogDelegateView::CreateBubble(bubble_delegate4));
   bubble_widget4->Show();
 
-  views::BubbleDelegateView* bubble_delegate5(new views::BubbleDelegateView(
-      child_view, views::BubbleBorder::NONE));
+  views::BubbleDialogDelegateView* bubble_delegate5(
+      new TestBubbleDialogDelegate(child_view));
   bubble_delegate5->set_can_activate(false);
-  views::Widget* bubble_widget5(views::BubbleDelegateView::CreateBubble(
-      bubble_delegate5));
+  views::Widget* bubble_widget5(
+      views::BubbleDialogDelegateView::CreateBubble(bubble_delegate5));
   bubble_widget5->Show();
 
   EXPECT_TRUE(controller()->IsRevealed());
   bubble_widget4->Hide();
   EXPECT_TRUE(controller()->IsRevealed());
   bubble_widget5->Hide();
   EXPECT_FALSE(controller()->IsRevealed());
   bubble_widget5->Show();
   EXPECT_TRUE(controller()->IsRevealed());
 
   // 4) Test that visibility changes which occur while immersive fullscreen is
   // disabled are handled upon reenabling immersive fullscreen.
   SetEnabled(false);
   bubble_widget5->Hide();
   SetEnabled(true);
   EXPECT_FALSE(controller()->IsRevealed());
 
   // We do not need |bubble_widget4| or |bubble_widget5| anymore, close them.
   bubble_widget4->Close();
   bubble_widget5->Close();
 
   // 5) Test that a bubble added while immersive fullscreen is disabled is
   // handled upon reenabling immersive fullscreen.
   SetEnabled(false);
 
-  views::Widget* bubble_widget6 = views::BubbleDelegateView::CreateBubble(
-      new views::BubbleDelegateView(child_view, views::BubbleBorder::NONE));
+  views::Widget* bubble_widget6 = views::BubbleDialogDelegateView::CreateBubble(
+      new TestBubbleDialogDelegate(child_view));
   bubble_widget6->Show();
 
   SetEnabled(true);
   EXPECT_TRUE(controller()->IsRevealed());
 
   bubble_widget6->Close();
 
   // 6) Test that a bubble which is not anchored to a child of the
   // TopContainerView does not trigger a reveal or keep the
   // top-of-window views revealed if they are already revealed.
-  views::Widget* bubble_widget7 = views::BubbleDelegateView::CreateBubble(
-      new views::BubbleDelegateView(unrelated_view, views::BubbleBorder::NONE));
+  views::Widget* bubble_widget7 = views::BubbleDialogDelegateView::CreateBubble(
+      new TestBubbleDialogDelegate(unrelated_view));
   bubble_widget7->Show();
   EXPECT_FALSE(controller()->IsRevealed());
 
   // Activating |top_container_widget| will close |bubble_widget6|.
   top_container_widget->Activate();
   AttemptReveal(MODALITY_MOUSE);
   EXPECT_TRUE(controller()->IsRevealed());
 
-  views::Widget* bubble_widget8 = views::BubbleDelegateView::CreateBubble(
-      new views::BubbleDelegateView(unrelated_view, views::BubbleBorder::NONE));
+  views::Widget* bubble_widget8 = views::BubbleDialogDelegateView::CreateBubble(
+      new TestBubbleDialogDelegate(unrelated_view));
   bubble_widget8->Show();
   SetHovered(false);
   EXPECT_FALSE(controller()->IsRevealed());
   bubble_widget8->Close();
 }
 
 #endif  // defined(OS_WIN)
 
 // Test that the shelf is set to auto hide as long as the window is in
 // immersive fullscreen and that the shelf's state before entering immersive
@@ skipping 28 matching lines @@
   EXPECT_EQ(ash::SHELF_AUTO_HIDE, shelf->visibility_state());
 
   // Disabling immersive fullscreen maintains the user's auto-hide selection.
   SetEnabled(false);
   window()->SetProperty(aura::client::kShowStateKey,
                         ui::SHOW_STATE_NORMAL);
   EXPECT_EQ(ash::SHELF_AUTO_HIDE, shelf->visibility_state());
 }
 
 }  // namespase ash