athena/test/athena_test_helper.cc - Issue 316323002: Introduces ActivityFactory for SampleActivity.

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_helper.cc

Issue 316323002: Introduces ActivityFactory for SampleActivity. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 6 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_helper.cc

diff --git a/athena/test/athena_test_helper.cc b/athena/test/athena_test_helper.cc

index 30d4d0d9d572cd962039e7ee47aaff1ef8de219e..88961bad1eda8dafc5d23d12958f60bfdf2f1367 100644

--- a/athena/test/athena_test_helper.cc

+++ b/athena/test/athena_test_helper.cc

@@ -5,6 +5,7 @@

#include "athena/test/athena_test_helper.h"

#include "athena/main/athena_launcher.h"

+#include "athena/test/sample_activity_factory.h"

#include "base/message_loop/message_loop.h"

#include "base/run_loop.h"

#include "ui/aura/client/aura_constants.h"

@@ -77,7 +78,7 @@ void AthenaTestHelper::SetUp(ui::ContextFactory* context_factory) {

// Ensure width != height so tests won't confuse them.

host()->SetBounds(gfx::Rect(800, 600));

- athena::StartAthena(root_window());

+ athena::StartAthena(root_window(), new SampleActivityFactory());

}

void AthenaTestHelper::TearDown() {