athena/test/athena_test_base.h - Issue 480353006: Separate athena's startup process from AppShell's

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: athena/test/athena_test_base.h

Issue 480353006: Separate athena's startup process from AppShell's (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 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:

Index: athena/test/athena_test_base.h

diff --git a/athena/test/athena_test_base.h b/athena/test/athena_test_base.h

index 0cd88d91b627030b20489e349f9e4a204ad51d77..8ab8285f9f6a20e70fcf0a24dd456d01f9ea4bb1 100644

--- a/athena/test/athena_test_base.h

+++ b/athena/test/athena_test_base.h

@@ -34,8 +34,8 @@ class AthenaTestBase : public testing::Test {

scoped_ptr<aura::Window> CreateTestWindow(aura::WindowDelegate* delegate,

const gfx::Rect& bounds);

- aura::Window* root_window() { return helper_->root_window(); }

- aura::WindowTreeHost* host() { return helper_->host(); }

+ aura::Window* root_window() { return helper_->GetRootWindow(); }

+ aura::WindowTreeHost* host() { return helper_->GetHost(); }

private:

bool setup_called_;