ash/tooltips/tooltip_controller_unittest.cc - Issue 10831361: Draggable region support for frameless app window on CrOS.

Unified Diff: ash/tooltips/tooltip_controller_unittest.cc

Issue 10831361: Draggable region support for frameless app window on CrOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Use ShouldDescendIntoChildForEventHandling Created 8 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: ash/tooltips/tooltip_controller_unittest.cc

diff --git a/ash/tooltips/tooltip_controller_unittest.cc b/ash/tooltips/tooltip_controller_unittest.cc

index 995f889732cf2bd3a340c9ac359d1a8668e27e5e..bc693cf5e1bb592c2a3fb56a9e93ddd3cbb1756a 100644

--- a/ash/tooltips/tooltip_controller_unittest.cc

+++ b/ash/tooltips/tooltip_controller_unittest.cc

@@ -157,7 +157,7 @@ TEST_F(TooltipControllerTest, ViewTooltip) {

aura::Window* window = widget->GetNativeView();

EXPECT_EQ(window, Shell::GetPrimaryRootWindow()->GetEventHandlerForPoint(

- generator.current_location()));

+ generator.current_location(), ui::ET_MOUSE_ENTERED));

string16 expected_tooltip = ASCIIToUTF16("Tooltip Text");

EXPECT_EQ(expected_tooltip, aura::client::GetTooltipText(window));

EXPECT_EQ(string16(), GetTooltipText());

@@ -199,7 +199,7 @@ TEST_F(TooltipControllerTest, TooltipsInMultipleViews) {

EXPECT_TRUE(IsTooltipVisible());

EXPECT_EQ(window,

Shell::GetPrimaryRootWindow()->GetEventHandlerForPoint(

- generator.current_location()));

+ generator.current_location(), ui::ET_MOUSE_ENTERED));

string16 expected_tooltip = ASCIIToUTF16("Tooltip Text");

EXPECT_EQ(expected_tooltip, aura::client::GetTooltipText(window));

EXPECT_EQ(expected_tooltip, GetTooltipText());

@@ -210,7 +210,7 @@ TEST_F(TooltipControllerTest, TooltipsInMultipleViews) {

EXPECT_FALSE(IsTooltipVisible());

EXPECT_EQ(window,

Shell::GetPrimaryRootWindow()->GetEventHandlerForPoint(

- generator.current_location()));

+ generator.current_location(), ui::ET_MOUSE_ENTERED));

string16 expected_tooltip; // = ""

EXPECT_EQ(expected_tooltip, aura::client::GetTooltipText(window));

EXPECT_EQ(expected_tooltip, GetTooltipText());

@@ -404,7 +404,7 @@ TEST_F(TooltipControllerTest, TooltipHidesOnKeyPressAndStaysHiddenUntilChange) {

EXPECT_FALSE(IsTooltipShownTimerRunning());

EXPECT_EQ(window,

Shell::GetPrimaryRootWindow()->GetEventHandlerForPoint(

- generator.current_location()));

+ generator.current_location(), ui::ET_MOUSE_ENTERED));

string16 expected_tooltip = ASCIIToUTF16("Tooltip Text for view 1");

EXPECT_EQ(expected_tooltip, aura::client::GetTooltipText(window));

EXPECT_EQ(expected_tooltip, GetTooltipText());

@@ -459,7 +459,7 @@ TEST_F(TooltipControllerTest, TooltipHidesOnTimeoutAndStaysHiddenUntilChange) {

EXPECT_FALSE(IsTooltipShownTimerRunning());

EXPECT_EQ(window,

Shell::GetPrimaryRootWindow()->GetEventHandlerForPoint(

- generator.current_location()));

+ generator.current_location(), ui::ET_MOUSE_ENTERED));

string16 expected_tooltip = ASCIIToUTF16("Tooltip Text for view 1");

EXPECT_EQ(expected_tooltip, aura::client::GetTooltipText(window));

EXPECT_EQ(expected_tooltip, GetTooltipText());

« no previous file with comments | « no previous file | chrome/browser/ui/views/extensions/shell_window_views.h » ('j') | chrome/browser/ui/views/extensions/shell_window_views.cc » ('J')