libcef: Update due to underlying chromium changes.

- WebKit API changes.
- Use net::ProxyConfigService in BrowserRequestContext.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@61 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2009-10-25 19:29:12 +00:00
parent 5186e4a223
commit dc602cd0a4
7 changed files with 32 additions and 15 deletions

View File

@ -25,14 +25,12 @@ MessageLoop* g_io_thread;
scoped_refptr<URLRequestContext> g_request_context;
class WebSocketStreamHandleBridgeImpl
: public base::RefCountedThreadSafe<WebSocketStreamHandleBridgeImpl>,
public WebSocketStreamHandleBridge,
: public WebSocketStreamHandleBridge,
public net::SocketStream::Delegate {
public:
WebSocketStreamHandleBridgeImpl(
WebKit::WebSocketStreamHandle* handle,
webkit_glue::WebSocketStreamHandleDelegate* delegate);
virtual ~WebSocketStreamHandleBridgeImpl();
// WebSocketStreamHandleBridge methods.
virtual void Connect(const GURL& url);
@ -50,6 +48,8 @@ class WebSocketStreamHandleBridgeImpl
private:
virtual ~WebSocketStreamHandleBridgeImpl();
// Runs on |g_io_thread|;
void DoConnect(const GURL& url);
void DoSend(std::vector<char>* data);