| 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 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 switches::kEnableExperimentalWebPlatformFeatures); | 142 switches::kEnableExperimentalWebPlatformFeatures); |
| 143 command_line.AppendSwitch(switches::kEnableCssShaders); | 143 command_line.AppendSwitch(switches::kEnableCssShaders); |
| 144 } | 144 } |
| 145 | 145 |
| 146 if (!command_line.HasSwitch(switches::kEnableThreadedCompositing)) | 146 if (!command_line.HasSwitch(switches::kEnableThreadedCompositing)) |
| 147 command_line.AppendSwitch(cc::switches::kDisableThreadedAnimation); | 147 command_line.AppendSwitch(cc::switches::kDisableThreadedAnimation); |
| 148 | 148 |
| 149 command_line.AppendSwitch(switches::kEnableInbandTextTracks); | 149 command_line.AppendSwitch(switches::kEnableInbandTextTracks); |
| 150 command_line.AppendSwitch(switches::kMuteAudio); | 150 command_line.AppendSwitch(switches::kMuteAudio); |
| 151 | 151 |
| 152 net::CookieMonster::EnableFileScheme(); | |
| 153 | |
| 154 // Unless/until WebM files are added to the media layout tests, we need to | 152 // Unless/until WebM files are added to the media layout tests, we need to |
| 155 // avoid removing MP4/H264/AAC so that layout tests can run on Android. | 153 // avoid removing MP4/H264/AAC so that layout tests can run on Android. |
| 156 #if !defined(OS_ANDROID) | 154 #if !defined(OS_ANDROID) |
| 157 net::RemoveProprietaryMediaTypesAndCodecsForTests(); | 155 net::RemoveProprietaryMediaTypesAndCodecsForTests(); |
| 158 #endif | 156 #endif |
| 159 | 157 |
| 160 if (!WebKitTestPlatformInitialize()) { | 158 if (!WebKitTestPlatformInitialize()) { |
| 161 if (exit_code) | 159 if (exit_code) |
| 162 *exit_code = 1; | 160 *exit_code = 1; |
| 163 return true; | 161 return true; |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 225 browser_client_.reset(new ShellContentBrowserClient); | 223 browser_client_.reset(new ShellContentBrowserClient); |
| 226 return browser_client_.get(); | 224 return browser_client_.get(); |
| 227 } | 225 } |
| 228 | 226 |
| 229 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { | 227 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { |
| 230 renderer_client_.reset(new ShellContentRendererClient); | 228 renderer_client_.reset(new ShellContentRendererClient); |
| 231 return renderer_client_.get(); | 229 return renderer_client_.get(); |
| 232 } | 230 } |
| 233 | 231 |
| 234 } // namespace content | 232 } // namespace content |
| OLD | NEW |