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

Side by Side Diff: headless/app/headless_shell.cc

Issue 2374063002: Headless: expose WebPreferences to embedder, add --hide-scrollbars. (Closed)
Patch Set: Address comments, add test. Created 4 years, 2 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/app/headless_shell_switches.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 <iostream> 5 #include <iostream>
6 #include <memory> 6 #include <memory>
7 #include <string> 7 #include <string>
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 : browser_(nullptr), 68 : browser_(nullptr),
69 devtools_client_(HeadlessDevToolsClient::Create()), 69 devtools_client_(HeadlessDevToolsClient::Create()),
70 web_contents_(nullptr), 70 web_contents_(nullptr),
71 processed_page_ready_(false), 71 processed_page_ready_(false),
72 browser_context_(nullptr) {} 72 browser_context_(nullptr) {}
73 ~HeadlessShell() override {} 73 ~HeadlessShell() override {}
74 74
75 void OnStart(HeadlessBrowser* browser) { 75 void OnStart(HeadlessBrowser* browser) {
76 browser_ = browser; 76 browser_ = browser;
77 77
78 HeadlessBrowserContext::Builder context_builder =
79 browser_->CreateBrowserContextBuilder();
78 if (base::CommandLine::ForCurrentProcess()->HasSwitch( 80 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
79 headless::switches::kDeterministicFetch)) { 81 headless::switches::kDeterministicFetch)) {
80 deterministic_dispatcher_.reset( 82 deterministic_dispatcher_.reset(
81 new headless::DeterministicDispatcher(browser_->BrowserIOThread())); 83 new headless::DeterministicDispatcher(browser_->BrowserIOThread()));
82 84
83 headless::ProtocolHandlerMap protocol_handlers; 85 headless::ProtocolHandlerMap protocol_handlers;
84 protocol_handlers[url::kHttpScheme] = 86 protocol_handlers[url::kHttpScheme] =
85 base::MakeUnique<headless::DeterministicHttpProtocolHandler>( 87 base::MakeUnique<headless::DeterministicHttpProtocolHandler>(
86 deterministic_dispatcher_.get(), browser->BrowserIOThread()); 88 deterministic_dispatcher_.get(), browser->BrowserIOThread());
87 protocol_handlers[url::kHttpsScheme] = 89 protocol_handlers[url::kHttpsScheme] =
88 base::MakeUnique<headless::DeterministicHttpProtocolHandler>( 90 base::MakeUnique<headless::DeterministicHttpProtocolHandler>(
89 deterministic_dispatcher_.get(), browser->BrowserIOThread()); 91 deterministic_dispatcher_.get(), browser->BrowserIOThread());
90 92
91 browser_context_ = browser_->CreateBrowserContextBuilder() 93 context_builder.SetProtocolHandlers(std::move(protocol_handlers));
92 .SetProtocolHandlers(std::move(protocol_handlers))
93 .Build();
94 } else {
95 browser_context_ = browser_->CreateBrowserContextBuilder().Build();
96 } 94 }
95 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
96 headless::switches::kHideScrollbars)) {
97 context_builder.SetOverrideWebPreferencesCallback(
98 base::Bind([](headless::WebPreferences* preferences) {
99 preferences->hide_scrollbars = true;
100 }));
101 }
102 browser_context_ = context_builder.Build();
97 103
98 HeadlessWebContents::Builder builder( 104 HeadlessWebContents::Builder builder(
99 browser_context_->CreateWebContentsBuilder()); 105 browser_context_->CreateWebContentsBuilder());
100 base::CommandLine::StringVector args = 106 base::CommandLine::StringVector args =
101 base::CommandLine::ForCurrentProcess()->GetArgs(); 107 base::CommandLine::ForCurrentProcess()->GetArgs();
102 108
103 // TODO(alexclarke): Should we navigate to about:blank first if using 109 // TODO(alexclarke): Should we navigate to about:blank first if using
104 // virtual time? 110 // virtual time?
105 if (!args.empty() && !args[0].empty()) 111 if (!args.empty() && !args[0].empty())
106 builder.SetInitialURL(GURL(args[0])); 112 builder.SetInitialURL(GURL(args[0]));
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
429 LOG(ERROR) << "Malformed window size"; 435 LOG(ERROR) << "Malformed window size";
430 return EXIT_FAILURE; 436 return EXIT_FAILURE;
431 } 437 }
432 builder.SetWindowSize(parsed_window_size); 438 builder.SetWindowSize(parsed_window_size);
433 } 439 }
434 440
435 return HeadlessBrowserMain( 441 return HeadlessBrowserMain(
436 builder.Build(), 442 builder.Build(),
437 base::Bind(&HeadlessShell::OnStart, base::Unretained(&shell))); 443 base::Bind(&HeadlessShell::OnStart, base::Unretained(&shell)));
438 } 444 }
OLDNEW
« no previous file with comments | « no previous file | headless/app/headless_shell_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698