ui/aura/desktop.cc - Issue 8500012: Fixes compile with webkit compositor

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 8500012: Fixes compile with webkit compositor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years, 1 month 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 2f6bde8b8459871b0ce8203c41ff5e28c4619249..2518039b96ef270774abec593b8b235101714b95 100644

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

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

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

Desktop::~Desktop() {

in_destructor_ = true;

#ifdef USE_WEBKIT_COMPOSITOR

- if (!compositor_factory_)

+ if (!ui::Compositor::compositor_factory())

ui::CompositorCC::Terminate();

#endif

if (instance_ == this)

« no previous file with comments | « no previous file | no next file » | no next file with comments »