ash/test/ash_test_helper.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/test/ash_test_helper.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/test/ash_test_helper.cc

diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc

index 49bb4d16ad1a0421e195c360d4ad8aef9bc3f1d9..8981507cfd760f8ed94c2796eee4584cc9bd8325 100644

--- a/ash/test/ash_test_helper.cc

+++ b/ash/test/ash_test_helper.cc

@@ -128,8 +128,8 @@ void AshTestHelper::RunAllPendingInMessageLoop() {

run_loop.RunUntilIdle();

}

-aura::RootWindow* AshTestHelper::CurrentContext() {

- aura::RootWindow* root_window = Shell::GetTargetRootWindow();

+aura::Window* AshTestHelper::CurrentContext() {

+ aura::Window* root_window = Shell::GetTargetRootWindow();

if (!root_window)

root_window = Shell::GetPrimaryRootWindow();

DCHECK(root_window);

« no previous file with comments | « ash/test/ash_test_helper.h ('k') | ash/test/test_launcher_item_delegate.h » ('j') | no next file with comments »