ui/aura/demo/demo_main.cc - Issue 45963003: Move test-only ContextFactory implementations out of production targets

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: ui/aura/demo/demo_main.cc

Issue 45963003: Move test-only ContextFactory implementations out of production targets (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: revert bad ui/base changes 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:

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

Download patch

Index: ui/aura/demo/demo_main.cc

diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc

index f9d8986cfa97148f8c65e8885782099b1c20b223..75b1d6023470b79265b8b201868b1dfa84fbbe3a 100644

--- a/ui/aura/demo/demo_main.cc

+++ b/ui/aura/demo/demo_main.cc

@@ -19,7 +19,7 @@

#include "ui/base/hit_test.h"

#include "ui/base/resource/resource_bundle.h"

#include "ui/base/ui_base_paths.h"

-#include "ui/compositor/compositor.h"

+#include "ui/compositor/test/context_factories_for_test.h"

#include "ui/events/event.h"

#include "ui/gfx/canvas.h"

#include "ui/gfx/rect.h"

@@ -112,7 +112,7 @@ int DemoMain() {

// The ContextFactory must exist before any Compositors are created.

bool allow_test_contexts = false;

- ui::Compositor::InitializeContextFactoryForTests(allow_test_contexts);

+ ui::InitializeContextFactoryForTests(allow_test_contexts);

aura::Env::CreateInstance();

scoped_ptr<aura::TestScreen> test_screen(aura::TestScreen::Create());

« no previous file with comments | « ui/aura/bench/bench_main.cc ('k') | ui/aura/test/aura_test_helper.cc » ('j') | ui/compositor/reflector.h » ('J')