| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/shell/app/shell_main_delegate.h" | 5 #include "content/shell/app/shell_main_delegate.h" |
| 6 | 6 |
| 7 #include "base/base_switches.h" | 7 #include "base/base_switches.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/cpu.h" | 9 #include "base/cpu.h" |
| 10 #include "base/files/file.h" | 10 #include "base/files/file.h" |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 #endif | 150 #endif |
| 151 | 151 |
| 152 if (!command_line.HasSwitch(switches::kStableReleaseMode)) { | 152 if (!command_line.HasSwitch(switches::kStableReleaseMode)) { |
| 153 command_line.AppendSwitch( | 153 command_line.AppendSwitch( |
| 154 switches::kEnableExperimentalWebPlatformFeatures); | 154 switches::kEnableExperimentalWebPlatformFeatures); |
| 155 } | 155 } |
| 156 | 156 |
| 157 if (!command_line.HasSwitch(switches::kEnableThreadedCompositing)) { | 157 if (!command_line.HasSwitch(switches::kEnableThreadedCompositing)) { |
| 158 command_line.AppendSwitch(switches::kDisableThreadedCompositing); | 158 command_line.AppendSwitch(switches::kDisableThreadedCompositing); |
| 159 command_line.AppendSwitch(cc::switches::kDisableThreadedAnimation); | 159 command_line.AppendSwitch(cc::switches::kDisableThreadedAnimation); |
| 160 command_line.AppendSwitch(switches::kDisableImplSidePainting); |
| 160 } | 161 } |
| 161 | 162 |
| 162 command_line.AppendSwitch(switches::kEnableInbandTextTracks); | 163 command_line.AppendSwitch(switches::kEnableInbandTextTracks); |
| 163 command_line.AppendSwitch(switches::kMuteAudio); | 164 command_line.AppendSwitch(switches::kMuteAudio); |
| 164 | 165 |
| 165 #if defined(USE_AURA) || defined(OS_ANDROID) | 166 #if defined(USE_AURA) || defined(OS_ANDROID) |
| 166 // TODO: crbug.com/311404 Make layout tests work w/ delegated renderer. | 167 // TODO: crbug.com/311404 Make layout tests work w/ delegated renderer. |
| 167 command_line.AppendSwitch(switches::kDisableDelegatedRenderer); | 168 command_line.AppendSwitch(switches::kDisableDelegatedRenderer); |
| 168 command_line.AppendSwitch(cc::switches::kCompositeToMailbox); | 169 command_line.AppendSwitch(cc::switches::kCompositeToMailbox); |
| 169 #endif | 170 #endif |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 295 browser_client_.reset(new ShellContentBrowserClient); | 296 browser_client_.reset(new ShellContentBrowserClient); |
| 296 return browser_client_.get(); | 297 return browser_client_.get(); |
| 297 } | 298 } |
| 298 | 299 |
| 299 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { | 300 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { |
| 300 renderer_client_.reset(new ShellContentRendererClient); | 301 renderer_client_.reset(new ShellContentRendererClient); |
| 301 return renderer_client_.get(); | 302 return renderer_client_.get(); |
| 302 } | 303 } |
| 303 | 304 |
| 304 } // namespace content | 305 } // namespace content |
| OLD | NEW |