Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(780)

Side by Side Diff: headless/lib/headless_content_main_delegate.cc

Issue 2187473002: [headless] Add option to disable sandbox from API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Enable sandbox by default Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | headless/public/headless_browser.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/headless_content_main_delegate.h" 5 #include "headless/lib/headless_content_main_delegate.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "base/trace_event/trace_event.h" 10 #include "base/trace_event/trace_event.h"
(...skipping 26 matching lines...) Expand all
37 DCHECK(g_current_headless_content_main_delegate == this); 37 DCHECK(g_current_headless_content_main_delegate == this);
38 g_current_headless_content_main_delegate = nullptr; 38 g_current_headless_content_main_delegate = nullptr;
39 } 39 }
40 40
41 bool HeadlessContentMainDelegate::BasicStartupComplete(int* exit_code) { 41 bool HeadlessContentMainDelegate::BasicStartupComplete(int* exit_code) {
42 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); 42 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
43 43
44 if (browser_->options()->single_process_mode) 44 if (browser_->options()->single_process_mode)
45 command_line->AppendSwitch(switches::kSingleProcess); 45 command_line->AppendSwitch(switches::kSingleProcess);
46 46
47 if (browser_->options()->disable_sandbox)
48 command_line->AppendSwitch(switches::kNoSandbox);
49
47 // The headless backend is automatically chosen for a headless build, but also 50 // The headless backend is automatically chosen for a headless build, but also
48 // adding it here allows us to run in a non-headless build too. 51 // adding it here allows us to run in a non-headless build too.
49 command_line->AppendSwitchASCII(switches::kOzonePlatform, "headless"); 52 command_line->AppendSwitchASCII(switches::kOzonePlatform, "headless");
50 53
51 // TODO(skyostil): Investigate using Mesa/SwiftShader for output. 54 // TODO(skyostil): Investigate using Mesa/SwiftShader for output.
52 command_line->AppendSwitch(switches::kDisableGpu); 55 command_line->AppendSwitch(switches::kDisableGpu);
53 56
54 SetContentClient(&content_client_); 57 SetContentClient(&content_client_);
55 return false; 58 return false;
56 } 59 }
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 return renderer_client_.get(); 118 return renderer_client_.get();
116 } 119 }
117 120
118 content::ContentUtilityClient* 121 content::ContentUtilityClient*
119 HeadlessContentMainDelegate::CreateContentUtilityClient() { 122 HeadlessContentMainDelegate::CreateContentUtilityClient() {
120 utility_client_.reset(new HeadlessContentUtilityClient); 123 utility_client_.reset(new HeadlessContentUtilityClient);
121 return utility_client_.get(); 124 return utility_client_.get();
122 } 125 }
123 126
124 } // namespace headless 127 } // namespace headless
OLDNEW
« no previous file with comments | « no previous file | headless/public/headless_browser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698