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

Unified Diff: headless/lib/browser/headless_url_request_context_getter.h

Issue 1674263002: headless: Initial headless embedder API implementation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fine, no console logging Mr. Presubmit. Created 4 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: headless/lib/browser/headless_url_request_context_getter.h
diff --git a/content/shell/browser/shell_url_request_context_getter.h b/headless/lib/browser/headless_url_request_context_getter.h
similarity index 56%
copy from content/shell/browser/shell_url_request_context_getter.h
copy to headless/lib/browser/headless_url_request_context_getter.h
index a7fa233b652d7fbd7f878b578278395fe2e177f8..cfd927b1071a5270606adb42e74f00f15d032569 100644
--- a/content/shell/browser/shell_url_request_context_getter.h
+++ b/headless/lib/browser/headless_url_request_context_getter.h
@@ -1,9 +1,9 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2015 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CONTENT_SHELL_BROWSER_SHELL_URL_REQUEST_CONTEXT_GETTER_H_
-#define CONTENT_SHELL_BROWSER_SHELL_URL_REQUEST_CONTEXT_GETTER_H_
+#ifndef HEADLESS_LIB_BROWSER_HEADLESS_URL_REQUEST_CONTEXT_GETTER_H_
+#define HEADLESS_LIB_BROWSER_HEADLESS_URL_REQUEST_CONTEXT_GETTER_H_
#include "base/compiler_specific.h"
#include "base/files/file_path.h"
@@ -11,6 +11,7 @@
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "content/public/browser/content_browser_client.h"
+#include "headless/public/headless_browser.h"
#include "net/proxy/proxy_config_service.h"
#include "net/url_request/url_request_context_getter.h"
#include "net/url_request/url_request_job_factory.h"
@@ -29,34 +30,33 @@ class ProxyService;
class URLRequestContextStorage;
}
-namespace content {
+namespace headless {
-class ShellURLRequestContextGetter : public net::URLRequestContextGetter {
+class HeadlessURLRequestContextGetter : public net::URLRequestContextGetter {
public:
- ShellURLRequestContextGetter(
+ HeadlessURLRequestContextGetter(
bool ignore_certificate_errors,
const base::FilePath& base_path,
scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> file_task_runner,
- ProtocolHandlerMap* protocol_handlers,
- URLRequestInterceptorScopedVector request_interceptors,
- net::NetLog* net_log);
+ content::ProtocolHandlerMap* protocol_handlers,
+ content::URLRequestInterceptorScopedVector request_interceptors,
+ net::NetLog* net_log,
+ const HeadlessBrowser::Options& options);
- // net::URLRequestContextGetter implementation.
+ // net::URLRequestContextGetter implementation:
net::URLRequestContext* GetURLRequestContext() override;
scoped_refptr<base::SingleThreadTaskRunner> GetNetworkTaskRunner()
const override;
- net::HostResolver* host_resolver();
+ net::HostResolver* host_resolver() const;
protected:
- ~ShellURLRequestContextGetter() override;
+ ~HeadlessURLRequestContextGetter() override;
- // Used by subclasses to create their own implementation of NetworkDelegate
- // and net::ProxyService.
- virtual scoped_ptr<net::NetworkDelegate> CreateNetworkDelegate();
- virtual scoped_ptr<net::ProxyConfigService> GetProxyConfigService();
- virtual scoped_ptr<net::ProxyService> GetProxyService();
+ scoped_ptr<net::NetworkDelegate> CreateNetworkDelegate();
+ scoped_ptr<net::ProxyConfigService> GetProxyConfigService();
+ scoped_ptr<net::ProxyService> GetProxyService();
private:
bool ignore_certificate_errors_;
@@ -64,17 +64,18 @@ class ShellURLRequestContextGetter : public net::URLRequestContextGetter {
scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
scoped_refptr<base::SingleThreadTaskRunner> file_task_runner_;
net::NetLog* net_log_;
+ HeadlessBrowser::Options options_;
scoped_ptr<net::ProxyConfigService> proxy_config_service_;
scoped_ptr<net::NetworkDelegate> network_delegate_;
scoped_ptr<net::URLRequestContextStorage> storage_;
scoped_ptr<net::URLRequestContext> url_request_context_;
- ProtocolHandlerMap protocol_handlers_;
- URLRequestInterceptorScopedVector request_interceptors_;
+ content::ProtocolHandlerMap protocol_handlers_;
+ content::URLRequestInterceptorScopedVector request_interceptors_;
- DISALLOW_COPY_AND_ASSIGN(ShellURLRequestContextGetter);
+ DISALLOW_COPY_AND_ASSIGN(HeadlessURLRequestContextGetter);
};
-} // namespace content
+} // namespace headless
-#endif // CONTENT_SHELL_BROWSER_SHELL_URL_REQUEST_CONTEXT_GETTER_H_
+#endif // HEADLESS_LIB_BROWSER_HEADLESS_URL_REQUEST_CONTEXT_GETTER_H_
« no previous file with comments | « headless/lib/browser/headless_screen.cc ('k') | headless/lib/browser/headless_url_request_context_getter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698