ui/aura/desktop.cc - Issue 8240006: Use a mocked compositor for unit tests

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/desktop.cc

Issue 8240006: Use a mocked compositor for unit tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: cleanup Created 9 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: ui/aura/desktop.cc

diff --git a/ui/aura/desktop.cc b/ui/aura/desktop.cc

index 565628e5139741a1a1e3a37d23dfaed8377fe132..ed211326f116cf4ff095d890a8571b7ad3bd7e02 100644

--- a/ui/aura/desktop.cc

+++ b/ui/aura/desktop.cc

@@ -33,7 +33,7 @@ Desktop::Desktop()

active_window_(NULL),

in_destructor_(false) {

if (compositor_factory_) {

- compositor_ = (*Desktop::compositor_factory())();

+ compositor_ = (*Desktop::compositor_factory())(this);

} else {

compositor_ = ui::Compositor::Create(this, host_->GetAcceleratedWidget(),

host_->GetSize());