Merge revision 1080 changes:

- Introduce chrome proxy implementation based on command-line flags (issue #600).

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1364@1081 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-02-06 20:46:10 +00:00
parent ce81e551d6
commit f0394ead29
37 changed files with 256 additions and 669 deletions

View File

@@ -17,6 +17,7 @@
#include "base/files/scoped_temp_dir.h"
#include "base/memory/scoped_ptr.h"
#include "base/threading/platform_thread.h"
#include "net/proxy/proxy_config_service.h"
namespace base {
class WaitableEvent;
@@ -66,6 +67,9 @@ class CefContext : public CefBase {
CefBrowserContext* browser_context() const;
CefDevToolsDelegate* devtools_delegate() const;
// Passes ownership.
scoped_ptr<net::ProxyConfigService> proxy_config_service() const;
CefTraceSubscriber* GetTraceSubscriber();
private: