| 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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 #include "components/crash/app/breakpad_mac.h" | 52 #include "components/crash/app/breakpad_mac.h" |
| 53 #include "content/shell/app/paths_mac.h" | 53 #include "content/shell/app/paths_mac.h" |
| 54 #include "content/shell/app/shell_main_delegate_mac.h" | 54 #include "content/shell/app/shell_main_delegate_mac.h" |
| 55 #endif // OS_MACOSX | 55 #endif // OS_MACOSX |
| 56 | 56 |
| 57 #if defined(OS_WIN) | 57 #if defined(OS_WIN) |
| 58 #include <initguid.h> | 58 #include <initguid.h> |
| 59 #include <windows.h> | 59 #include <windows.h> |
| 60 #include "base/logging_win.h" | 60 #include "base/logging_win.h" |
| 61 #include "components/crash/app/breakpad_win.h" | 61 #include "components/crash/app/breakpad_win.h" |
| 62 #include "content/shell/common/v8_breakpad_support_win.h" |
| 62 #endif | 63 #endif |
| 63 | 64 |
| 64 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 65 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
| 65 #include "components/crash/app/breakpad_linux.h" | 66 #include "components/crash/app/breakpad_linux.h" |
| 66 #endif | 67 #endif |
| 67 | 68 |
| 68 namespace { | 69 namespace { |
| 69 | 70 |
| 70 base::LazyInstance<content::ShellCrashReporterClient>::Leaky | 71 base::LazyInstance<content::ShellCrashReporterClient>::Leaky |
| 71 g_shell_crash_client = LAZY_INSTANCE_INITIALIZER; | 72 g_shell_crash_client = LAZY_INSTANCE_INITIALIZER; |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 ShellMainDelegate::ShellMainDelegate() { | 107 ShellMainDelegate::ShellMainDelegate() { |
| 107 } | 108 } |
| 108 | 109 |
| 109 ShellMainDelegate::~ShellMainDelegate() { | 110 ShellMainDelegate::~ShellMainDelegate() { |
| 110 } | 111 } |
| 111 | 112 |
| 112 bool ShellMainDelegate::BasicStartupComplete(int* exit_code) { | 113 bool ShellMainDelegate::BasicStartupComplete(int* exit_code) { |
| 113 #if defined(OS_WIN) | 114 #if defined(OS_WIN) |
| 114 // Enable trace control and transport through event tracing for Windows. | 115 // Enable trace control and transport through event tracing for Windows. |
| 115 logging::LogEventProvider::Initialize(kContentShellProviderName); | 116 logging::LogEventProvider::Initialize(kContentShellProviderName); |
| 117 |
| 118 v8_breakpad_support::SetUp(); |
| 116 #endif | 119 #endif |
| 117 #if defined(OS_MACOSX) | 120 #if defined(OS_MACOSX) |
| 118 // Needs to happen before InitializeResourceBundle() and before | 121 // Needs to happen before InitializeResourceBundle() and before |
| 119 // WebKitTestPlatformInitialize() are called. | 122 // WebKitTestPlatformInitialize() are called. |
| 120 OverrideFrameworkBundlePath(); | 123 OverrideFrameworkBundlePath(); |
| 121 OverrideChildProcessPath(); | 124 OverrideChildProcessPath(); |
| 122 EnsureCorrectResolutionSettings(); | 125 EnsureCorrectResolutionSettings(); |
| 123 #endif // OS_MACOSX | 126 #endif // OS_MACOSX |
| 124 | 127 |
| 125 InitLogging(); | 128 InitLogging(); |
| (...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 302 browser_client_.reset(new ShellContentBrowserClient); | 305 browser_client_.reset(new ShellContentBrowserClient); |
| 303 return browser_client_.get(); | 306 return browser_client_.get(); |
| 304 } | 307 } |
| 305 | 308 |
| 306 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { | 309 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { |
| 307 renderer_client_.reset(new ShellContentRendererClient); | 310 renderer_client_.reset(new ShellContentRendererClient); |
| 308 return renderer_client_.get(); | 311 return renderer_client_.get(); |
| 309 } | 312 } |
| 310 | 313 |
| 311 } // namespace content | 314 } // namespace content |
| OLD | NEW |