| 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 18 matching lines...) Expand all Loading... |
| 29 #include "content/shell/common/layout_test/layout_test_content_client.h" | 29 #include "content/shell/common/layout_test/layout_test_content_client.h" |
| 30 #include "content/shell/common/layout_test/layout_test_switches.h" | 30 #include "content/shell/common/layout_test/layout_test_switches.h" |
| 31 #include "content/shell/common/shell_content_client.h" | 31 #include "content/shell/common/shell_content_client.h" |
| 32 #include "content/shell/common/shell_switches.h" | 32 #include "content/shell/common/shell_switches.h" |
| 33 #include "content/shell/renderer/layout_test/layout_test_content_renderer_client
.h" | 33 #include "content/shell/renderer/layout_test/layout_test_content_renderer_client
.h" |
| 34 #include "content/shell/renderer/shell_content_renderer_client.h" | 34 #include "content/shell/renderer/shell_content_renderer_client.h" |
| 35 #include "content/shell/utility/shell_content_utility_client.h" | 35 #include "content/shell/utility/shell_content_utility_client.h" |
| 36 #include "media/base/media_switches.h" | 36 #include "media/base/media_switches.h" |
| 37 #include "media/base/mime_util.h" | 37 #include "media/base/mime_util.h" |
| 38 #include "net/cookies/cookie_monster.h" | 38 #include "net/cookies/cookie_monster.h" |
| 39 #include "ppapi/features/features.h" |
| 39 #include "ui/base/resource/resource_bundle.h" | 40 #include "ui/base/resource/resource_bundle.h" |
| 40 #include "ui/base/ui_base_paths.h" | 41 #include "ui/base/ui_base_paths.h" |
| 41 #include "ui/base/ui_base_switches.h" | 42 #include "ui/base/ui_base_switches.h" |
| 42 #include "ui/display/display_switches.h" | 43 #include "ui/display/display_switches.h" |
| 43 #include "ui/events/event_switches.h" | 44 #include "ui/events/event_switches.h" |
| 44 #include "ui/gl/gl_switches.h" | 45 #include "ui/gl/gl_switches.h" |
| 45 | 46 |
| 46 #include "ipc/ipc_message.h" // For IPC_MESSAGE_LOG_ENABLED. | 47 #include "ipc/ipc_message.h" // For IPC_MESSAGE_LOG_ENABLED. |
| 47 | 48 |
| 48 #if defined(IPC_MESSAGE_LOG_ENABLED) | 49 #if defined(IPC_MESSAGE_LOG_ENABLED) |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 149 // below, and then try to bring up the rest of the content module. | 150 // below, and then try to bring up the rest of the content module. |
| 150 if (!CheckLayoutSystemDeps()) { | 151 if (!CheckLayoutSystemDeps()) { |
| 151 *exit_code = 1; | 152 *exit_code = 1; |
| 152 return true; | 153 return true; |
| 153 } | 154 } |
| 154 } | 155 } |
| 155 | 156 |
| 156 if (command_line.HasSwitch(switches::kRunLayoutTest)) { | 157 if (command_line.HasSwitch(switches::kRunLayoutTest)) { |
| 157 EnableBrowserLayoutTestMode(); | 158 EnableBrowserLayoutTestMode(); |
| 158 | 159 |
| 159 #if defined(ENABLE_PLUGINS) | 160 #if BUILDFLAG(ENABLE_PLUGINS) |
| 160 if (!ppapi::RegisterBlinkTestPlugin(&command_line)) { | 161 if (!ppapi::RegisterBlinkTestPlugin(&command_line)) { |
| 161 *exit_code = 1; | 162 *exit_code = 1; |
| 162 return true; | 163 return true; |
| 163 } | 164 } |
| 164 #endif | 165 #endif |
| 165 command_line.AppendSwitch(cc::switches::kEnableGpuBenchmarking); | 166 command_line.AppendSwitch(cc::switches::kEnableGpuBenchmarking); |
| 166 command_line.AppendSwitch(switches::kProcessPerTab); | 167 command_line.AppendSwitch(switches::kProcessPerTab); |
| 167 command_line.AppendSwitch(switches::kEnableLogging); | 168 command_line.AppendSwitch(switches::kEnableLogging); |
| 168 command_line.AppendSwitch(switches::kAllowFileAccessFromFiles); | 169 command_line.AppendSwitch(switches::kAllowFileAccessFromFiles); |
| 169 // only default to osmesa if the flag isn't already specified. | 170 // only default to osmesa if the flag isn't already specified. |
| (...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 366 | 367 |
| 367 return renderer_client_.get(); | 368 return renderer_client_.get(); |
| 368 } | 369 } |
| 369 | 370 |
| 370 ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() { | 371 ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() { |
| 371 utility_client_.reset(new ShellContentUtilityClient); | 372 utility_client_.reset(new ShellContentUtilityClient); |
| 372 return utility_client_.get(); | 373 return utility_client_.get(); |
| 373 } | 374 } |
| 374 | 375 |
| 375 } // namespace content | 376 } // namespace content |
| OLD | NEW |