| 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/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 140 command_line.AppendSwitch( | 140 command_line.AppendSwitch( |
| 141 switches::kDisableGestureRequirementForMediaPlayback); | 141 switches::kDisableGestureRequirementForMediaPlayback); |
| 142 // Capturing pixel results does not yet work when implementation-side | 142 // Capturing pixel results does not yet work when implementation-side |
| 143 // painting is enabled. See http://crbug.com/250777 | 143 // painting is enabled. See http://crbug.com/250777 |
| 144 command_line.AppendSwitch(cc::switches::kDisableImplSidePainting); | 144 command_line.AppendSwitch(cc::switches::kDisableImplSidePainting); |
| 145 #endif | 145 #endif |
| 146 | 146 |
| 147 if (!command_line.HasSwitch(switches::kStableReleaseMode)) { | 147 if (!command_line.HasSwitch(switches::kStableReleaseMode)) { |
| 148 command_line.AppendSwitch( | 148 command_line.AppendSwitch( |
| 149 switches::kEnableExperimentalWebPlatformFeatures); | 149 switches::kEnableExperimentalWebPlatformFeatures); |
| 150 command_line.AppendSwitch(switches::kEnableCssShaders); | |
| 151 } | 150 } |
| 152 | 151 |
| 153 if (!command_line.HasSwitch(switches::kEnableThreadedCompositing)) | 152 if (!command_line.HasSwitch(switches::kEnableThreadedCompositing)) |
| 154 command_line.AppendSwitch(cc::switches::kDisableThreadedAnimation); | 153 command_line.AppendSwitch(cc::switches::kDisableThreadedAnimation); |
| 155 | 154 |
| 156 command_line.AppendSwitch(switches::kEnableInbandTextTracks); | 155 command_line.AppendSwitch(switches::kEnableInbandTextTracks); |
| 157 command_line.AppendSwitch(switches::kMuteAudio); | 156 command_line.AppendSwitch(switches::kMuteAudio); |
| 158 | 157 |
| 159 net::CookieMonster::EnableFileScheme(); | 158 net::CookieMonster::EnableFileScheme(); |
| 160 | 159 |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 232 browser_client_.reset(new ShellContentBrowserClient); | 231 browser_client_.reset(new ShellContentBrowserClient); |
| 233 return browser_client_.get(); | 232 return browser_client_.get(); |
| 234 } | 233 } |
| 235 | 234 |
| 236 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { | 235 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { |
| 237 renderer_client_.reset(new ShellContentRendererClient); | 236 renderer_client_.reset(new ShellContentRendererClient); |
| 238 return renderer_client_.get(); | 237 return renderer_client_.get(); |
| 239 } | 238 } |
| 240 | 239 |
| 241 } // namespace content | 240 } // namespace content |
| OLD | NEW |