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 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
136 v8_breakpad_support::SetUp(); | 136 v8_breakpad_support::SetUp(); |
137 #endif | 137 #endif |
138 #if defined(OS_MACOSX) | 138 #if defined(OS_MACOSX) |
139 // Needs to happen before InitializeResourceBundle() and before | 139 // Needs to happen before InitializeResourceBundle() and before |
140 // BlinkTestPlatformInitialize() are called. | 140 // BlinkTestPlatformInitialize() are called. |
141 OverrideFrameworkBundlePath(); | 141 OverrideFrameworkBundlePath(); |
142 OverrideChildProcessPath(); | 142 OverrideChildProcessPath(); |
143 EnsureCorrectResolutionSettings(); | 143 EnsureCorrectResolutionSettings(); |
144 #endif // OS_MACOSX | 144 #endif // OS_MACOSX |
145 | 145 |
146 // Log to stderr when run with --run-layout-tests | 146 InitLogging(); |
147 // so the layout tests can capture and display any messages. | |
148 if (!command_line.HasSwitch(switches::kRunLayoutTest)) | |
149 InitLogging(); | |
150 if (command_line.HasSwitch(switches::kCheckLayoutTestSysDeps)) { | 147 if (command_line.HasSwitch(switches::kCheckLayoutTestSysDeps)) { |
151 // If CheckLayoutSystemDeps succeeds, we don't exit early. Instead we | 148 // If CheckLayoutSystemDeps succeeds, we don't exit early. Instead we |
152 // continue and try to load the fonts in BlinkTestPlatformInitialize | 149 // continue and try to load the fonts in BlinkTestPlatformInitialize |
153 // 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. |
154 if (!CheckLayoutSystemDeps()) { | 151 if (!CheckLayoutSystemDeps()) { |
155 *exit_code = 1; | 152 *exit_code = 1; |
156 return true; | 153 return true; |
157 } | 154 } |
158 } | 155 } |
159 | 156 |
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
370 | 367 |
371 return renderer_client_.get(); | 368 return renderer_client_.get(); |
372 } | 369 } |
373 | 370 |
374 ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() { | 371 ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() { |
375 utility_client_.reset(new ShellContentUtilityClient); | 372 utility_client_.reset(new ShellContentUtilityClient); |
376 return utility_client_.get(); | 373 return utility_client_.get(); |
377 } | 374 } |
378 | 375 |
379 } // namespace content | 376 } // namespace content |
OLD | NEW |