| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "headless/lib/browser/headless_browser_impl.h" | 5 #include "headless/lib/browser/headless_browser_impl.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <utility> | 8 #include <utility> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| 11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
| 12 #include "base/memory/ptr_util.h" | 12 #include "base/memory/ptr_util.h" |
| 13 #include "base/threading/thread_task_runner_handle.h" | 13 #include "base/threading/thread_task_runner_handle.h" |
| 14 #include "content/public/app/content_main.h" | 14 #include "content/public/app/content_main.h" |
| 15 #include "content/public/browser/browser_thread.h" | 15 #include "content/public/browser/browser_thread.h" |
| 16 #include "content/public/browser/web_contents.h" | 16 #include "content/public/browser/web_contents.h" |
| 17 #include "content/public/common/content_switches.h" | 17 #include "content/public/common/content_switches.h" |
| 18 #include "headless/lib/browser/headless_browser_context_impl.h" | 18 #include "headless/lib/browser/headless_browser_context_impl.h" |
| 19 #include "headless/lib/browser/headless_browser_main_parts.h" | 19 #include "headless/lib/browser/headless_browser_main_parts.h" |
| 20 #include "headless/lib/browser/headless_web_contents_impl.h" | 20 #include "headless/lib/browser/headless_web_contents_impl.h" |
| 21 #include "headless/lib/headless_content_main_delegate.h" | 21 #include "headless/lib/headless_content_main_delegate.h" |
| 22 #include "ui/aura/env.h" | 22 #include "ui/aura/env.h" |
| 23 #include "ui/aura/window.h" | 23 #include "ui/aura/window.h" |
| 24 #include "ui/events/devices/device_data_manager.h" | 24 #include "ui/events/devices/device_data_manager.h" |
| 25 #include "ui/gfx/geometry/size.h" | 25 #include "ui/gfx/geometry/size.h" |
| 26 | 26 |
| 27 #if defined(OS_WIN) |
| 28 #include "content/public/app/sandbox_helper_win.h" |
| 29 #include "sandbox/win/src/sandbox_types.h" |
| 30 #endif |
| 31 |
| 27 namespace headless { | 32 namespace headless { |
| 28 namespace { | 33 namespace { |
| 29 | 34 |
| 30 int RunContentMain( | 35 int RunContentMain( |
| 31 HeadlessBrowser::Options options, | 36 HeadlessBrowser::Options options, |
| 32 const base::Callback<void(HeadlessBrowser*)>& on_browser_start_callback) { | 37 const base::Callback<void(HeadlessBrowser*)>& on_browser_start_callback) { |
| 33 content::ContentMainParams params(nullptr); | 38 content::ContentMainParams params(nullptr); |
| 39 #if defined(OS_WIN) |
| 40 sandbox::SandboxInterfaceInfo sandbox_info = {0}; |
| 41 content::InitializeSandboxInfo(&sandbox_info); |
| 42 params.sandbox_info = &sandbox_info; |
| 43 #elif !defined(OS_ANDROID) |
| 34 params.argc = options.argc; | 44 params.argc = options.argc; |
| 35 params.argv = options.argv; | 45 params.argv = options.argv; |
| 46 #endif |
| 36 | 47 |
| 37 // TODO(skyostil): Implement custom message pumps. | 48 // TODO(skyostil): Implement custom message pumps. |
| 38 DCHECK(!options.message_pump); | 49 DCHECK(!options.message_pump); |
| 39 | 50 |
| 40 std::unique_ptr<HeadlessBrowserImpl> browser( | 51 std::unique_ptr<HeadlessBrowserImpl> browser( |
| 41 new HeadlessBrowserImpl(on_browser_start_callback, std::move(options))); | 52 new HeadlessBrowserImpl(on_browser_start_callback, std::move(options))); |
| 42 headless::HeadlessContentMainDelegate delegate(std::move(browser)); | 53 headless::HeadlessContentMainDelegate delegate(std::move(browser)); |
| 43 params.delegate = &delegate; | 54 params.delegate = &delegate; |
| 44 return content::ContentMain(params); | 55 return content::ContentMain(params); |
| 45 } | 56 } |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 209 | 220 |
| 210 // Child processes should not end up here. | 221 // Child processes should not end up here. |
| 211 DCHECK(!base::CommandLine::ForCurrentProcess()->HasSwitch( | 222 DCHECK(!base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 212 switches::kProcessType)); | 223 switches::kProcessType)); |
| 213 #endif | 224 #endif |
| 214 return RunContentMain(std::move(options), | 225 return RunContentMain(std::move(options), |
| 215 std::move(on_browser_start_callback)); | 226 std::move(on_browser_start_callback)); |
| 216 } | 227 } |
| 217 | 228 |
| 218 } // namespace headless | 229 } // namespace headless |
| OLD | NEW |