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/shell_main_delegate.h" | 5 #include "content/shell/shell_main_delegate.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/file_path.h" | 8 #include "base/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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
84 // Enable trace control and transport through event tracing for Windows. | 84 // Enable trace control and transport through event tracing for Windows. |
85 logging::LogEventProvider::Initialize(kContentShellProviderName); | 85 logging::LogEventProvider::Initialize(kContentShellProviderName); |
86 #endif | 86 #endif |
87 | 87 |
88 InitLogging(); | 88 InitLogging(); |
89 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) { | 89 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) { |
90 CommandLine::ForCurrentProcess()->AppendSwitch( | 90 CommandLine::ForCurrentProcess()->AppendSwitch( |
91 switches::kAllowFileAccessFromFiles); | 91 switches::kAllowFileAccessFromFiles); |
92 CommandLine::ForCurrentProcess()->AppendSwitch( | 92 CommandLine::ForCurrentProcess()->AppendSwitch( |
93 switches::kForceCompositingMode); | 93 switches::kForceCompositingMode); |
94 net::HttpStreamFactory::set_ignore_certificate_errors(true); | 94 //net::HttpStreamFactory::set_ignore_certificate_errors(true); |
95 net::CookieMonster::EnableFileScheme(); | 95 net::CookieMonster::EnableFileScheme(); |
96 } | 96 } |
97 SetContentClient(&content_client_); | 97 SetContentClient(&content_client_); |
98 return false; | 98 return false; |
99 } | 99 } |
100 | 100 |
101 void ShellMainDelegate::PreSandboxStartup() { | 101 void ShellMainDelegate::PreSandboxStartup() { |
102 #if defined(OS_MACOSX) | 102 #if defined(OS_MACOSX) |
103 OverrideFrameworkBundlePath(); | 103 OverrideFrameworkBundlePath(); |
104 OverrideChildProcessPath(); | 104 OverrideChildProcessPath(); |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
163 browser_client_.reset(new ShellContentBrowserClient); | 163 browser_client_.reset(new ShellContentBrowserClient); |
164 return browser_client_.get(); | 164 return browser_client_.get(); |
165 } | 165 } |
166 | 166 |
167 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { | 167 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { |
168 renderer_client_.reset(new ShellContentRendererClient); | 168 renderer_client_.reset(new ShellContentRendererClient); |
169 return renderer_client_.get(); | 169 return renderer_client_.get(); |
170 } | 170 } |
171 | 171 |
172 } // namespace content | 172 } // namespace content |
OLD | NEW |