| Index: ui/compositor/compositor.cc
|
| diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
|
| index 56b5eb4d9629f3efb3e452475cf08bc1902c5b69..839036671730222649190c0a9cb64591171a6f79 100644
|
| --- a/ui/compositor/compositor.cc
|
| +++ b/ui/compositor/compositor.cc
|
| @@ -535,7 +535,17 @@ Compositor::~Compositor() {
|
| }
|
|
|
| // static
|
| -void Compositor::Initialize(bool use_thread) {
|
| +void Compositor::Initialize() {
|
| +#if defined(OS_CHROMEOS)
|
| + bool use_thread = !CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kUIDisableThreadedCompositing);
|
| +#else
|
| + bool use_thread =
|
| + CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kUIEnableThreadedCompositing) &&
|
| + !CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kUIDisableThreadedCompositing);
|
| +#endif
|
| if (use_thread) {
|
| g_compositor_thread = new base::Thread("Browser Compositor");
|
| g_compositor_thread->Start();
|
|
|