| 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 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 163 command_line.AppendSwitch(switches::kMuteAudio); | 163 command_line.AppendSwitch(switches::kMuteAudio); |
| 164 | 164 |
| 165 #if defined(USE_AURA) || defined(OS_ANDROID) | 165 #if defined(USE_AURA) || defined(OS_ANDROID) |
| 166 // TODO: crbug.com/311404 Make layout tests work w/ delegated renderer. | 166 // TODO: crbug.com/311404 Make layout tests work w/ delegated renderer. |
| 167 command_line.AppendSwitch(switches::kDisableDelegatedRenderer); | 167 command_line.AppendSwitch(switches::kDisableDelegatedRenderer); |
| 168 command_line.AppendSwitch(cc::switches::kCompositeToMailbox); | 168 command_line.AppendSwitch(cc::switches::kCompositeToMailbox); |
| 169 #endif | 169 #endif |
| 170 | 170 |
| 171 command_line.AppendSwitch(switches::kEnableFileCookies); | 171 command_line.AppendSwitch(switches::kEnableFileCookies); |
| 172 | 172 |
| 173 command_line.AppendSwitch(switches::kEnablePreciseMemoryInfo); |
| 174 |
| 173 // Unless/until WebM files are added to the media layout tests, we need to | 175 // Unless/until WebM files are added to the media layout tests, we need to |
| 174 // avoid removing MP4/H264/AAC so that layout tests can run on Android. | 176 // avoid removing MP4/H264/AAC so that layout tests can run on Android. |
| 175 #if !defined(OS_ANDROID) | 177 #if !defined(OS_ANDROID) |
| 176 net::RemoveProprietaryMediaTypesAndCodecsForTests(); | 178 net::RemoveProprietaryMediaTypesAndCodecsForTests(); |
| 177 #endif | 179 #endif |
| 178 | 180 |
| 179 if (!WebKitTestPlatformInitialize()) { | 181 if (!WebKitTestPlatformInitialize()) { |
| 180 if (exit_code) | 182 if (exit_code) |
| 181 *exit_code = 1; | 183 *exit_code = 1; |
| 182 return true; | 184 return true; |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 292 browser_client_.reset(new ShellContentBrowserClient); | 294 browser_client_.reset(new ShellContentBrowserClient); |
| 293 return browser_client_.get(); | 295 return browser_client_.get(); |
| 294 } | 296 } |
| 295 | 297 |
| 296 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { | 298 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { |
| 297 renderer_client_.reset(new ShellContentRendererClient); | 299 renderer_client_.reset(new ShellContentRendererClient); |
| 298 return renderer_client_.get(); | 300 return renderer_client_.get(); |
| 299 } | 301 } |
| 300 | 302 |
| 301 } // namespace content | 303 } // namespace content |
| OLD | NEW |