ash/shelf/shelf_tooltip_manager_unittest.cc - Issue 37733003: Make GetRootWindow() return a Window instead of a RootWindow.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/shelf/shelf_tooltip_manager_unittest.cc

Issue 37733003: Make GetRootWindow() return a Window instead of a RootWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 2 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:

Index: ash/shelf/shelf_tooltip_manager_unittest.cc

diff --git a/ash/shelf/shelf_tooltip_manager_unittest.cc b/ash/shelf/shelf_tooltip_manager_unittest.cc

index 6f2f0fa832754b3af97c05150de29b41ba195415..d4b9c0704a9fb0aead62b20ffd61be348e3cbb66 100644

--- a/ash/shelf/shelf_tooltip_manager_unittest.cc

+++ b/ash/shelf/shelf_tooltip_manager_unittest.cc

@@ -180,7 +180,7 @@ TEST_F(ShelfTooltipManagerTest, ShouldHideForEvents) {

ShowImmediately();

ASSERT_TRUE(TooltipIsVisible());

- aura::RootWindow* root_window = Shell::GetInstance()->GetPrimaryRootWindow();

+ aura::Window* root_window = Shell::GetInstance()->GetPrimaryRootWindow();

ui::EventHandler* event_handler = GetEventHandler();

// Should not hide for key events.

@@ -222,7 +222,7 @@ TEST_F(ShelfTooltipManagerTest, HideForMouseMoveEvent) {

ShowImmediately();

ASSERT_TRUE(TooltipIsVisible());

- aura::RootWindow* root_window = Shell::GetInstance()->GetPrimaryRootWindow();

+ aura::Window* root_window = Shell::GetInstance()->GetPrimaryRootWindow();

ui::EventHandler* event_handler = GetEventHandler();

gfx::Rect tooltip_rect = GetTooltipWidget()->GetNativeWindow()->bounds();

@@ -251,7 +251,7 @@ TEST_F(ShelfTooltipManagerTest, HideForMouseClickEvent) {

ShowImmediately();

ASSERT_TRUE(TooltipIsVisible());

- aura::RootWindow* root_window = Shell::GetInstance()->GetPrimaryRootWindow();

+ aura::Window* root_window = Shell::GetInstance()->GetPrimaryRootWindow();

ui::EventHandler* event_handler = GetEventHandler();

gfx::Rect tooltip_rect = GetTooltipWidget()->GetNativeWindow()->bounds();

« no previous file with comments | « ash/shelf/shelf_tooltip_manager.cc ('k') | ash/shelf/shelf_view.cc » ('j') | no next file with comments »