OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "chrome/browser/browser_main_gtk.h" | 5 #include "chrome/browser/browser_main_gtk.h" |
6 | 6 |
7 #include <sys/stat.h> | 7 #include <sys/stat.h> |
8 #include <sys/types.h> | 8 #include <sys/types.h> |
9 #include <unistd.h> | 9 #include <unistd.h> |
10 | 10 |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
79 #if defined(LINUX_SANDBOX_PATH) | 79 #if defined(LINUX_SANDBOX_PATH) |
80 if (!sandbox_binary) | 80 if (!sandbox_binary) |
81 sandbox_binary = LINUX_SANDBOX_PATH; | 81 sandbox_binary = LINUX_SANDBOX_PATH; |
82 #endif | 82 #endif |
83 | 83 |
84 std::string sandbox_cmd; | 84 std::string sandbox_cmd; |
85 if (sandbox_binary && !parsed_command_line().HasSwitch(switches::kNoSandbox)) | 85 if (sandbox_binary && !parsed_command_line().HasSwitch(switches::kNoSandbox)) |
86 sandbox_cmd = sandbox_binary; | 86 sandbox_cmd = sandbox_binary; |
87 | 87 |
88 // Tickle the sandbox host and zygote host so they fork now. | 88 // Tickle the sandbox host and zygote host so they fork now. |
89 RenderSandboxHostLinux* shost = Singleton<RenderSandboxHostLinux>::get(); | 89 RenderSandboxHostLinux* shost = RenderSandboxHostLinux::GetInstance(); |
90 shost->Init(sandbox_cmd); | 90 shost->Init(sandbox_cmd); |
91 ZygoteHost* zhost = Singleton<ZygoteHost>::get(); | 91 ZygoteHost* zhost = ZygoteHost::GetInstance(); |
92 zhost->Init(sandbox_cmd); | 92 zhost->Init(sandbox_cmd); |
93 } | 93 } |
94 | 94 |
95 void DidEndMainMessageLoop() { | 95 void DidEndMainMessageLoop() { |
96 } | 96 } |
97 | 97 |
98 void RecordBreakpadStatusUMA(MetricsService* metrics) { | 98 void RecordBreakpadStatusUMA(MetricsService* metrics) { |
99 #if defined(USE_LINUX_BREAKPAD) | 99 #if defined(USE_LINUX_BREAKPAD) |
100 metrics->RecordBreakpadRegistration(IsCrashReporterEnabled()); | 100 metrics->RecordBreakpadRegistration(IsCrashReporterEnabled()); |
101 #else | 101 #else |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
133 BrowserX11IOErrorHandler); | 133 BrowserX11IOErrorHandler); |
134 } | 134 } |
135 | 135 |
136 #if !defined(OS_CHROMEOS) | 136 #if !defined(OS_CHROMEOS) |
137 // static | 137 // static |
138 BrowserMainParts* BrowserMainParts::CreateBrowserMainParts( | 138 BrowserMainParts* BrowserMainParts::CreateBrowserMainParts( |
139 const MainFunctionParams& parameters) { | 139 const MainFunctionParams& parameters) { |
140 return new BrowserMainPartsGtk(parameters); | 140 return new BrowserMainPartsGtk(parameters); |
141 } | 141 } |
142 #endif | 142 #endif |
OLD | NEW |