bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision 74933.

Browse Source 
- CefRegisterPlugin now only supports a single mime type per registration.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@186 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2011-02-15 18:07:24 +00:00
parent 44ca592cff
commit 163f8d6db9
78 changed files with 537 additions and 538 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libcef/browser_socket_stream_bridge.cc
View File

@@ -12,9 +12,9 @@
#include "net/socket_stream/socket_stream_job.h"
#include "net/websockets/websocket_job.h"
#include "net/url_request/url_request_context.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebSocketStreamHandle.h"
#include "webkit/glue/websocketstreamhandle_bridge.h"
#include "webkit/glue/websocketstreamhandle_delegate.h"
#include "third_party/WebKit/WebKit/chromium/public/WebSocketStreamHandle.h"
using webkit_glue::WebSocketStreamHandleBridge;
@@ -23,7 +23,7 @@ static const int kNoSocketId = 0;
namespace {
MessageLoop* g_io_thread;
scoped_refptr<URLRequestContext> g_request_context;
scoped_refptr<net::URLRequestContext> g_request_context;
class WebSocketStreamHandleBridgeImpl
: public WebSocketStreamHandleBridge,
@@ -220,7 +220,7 @@ void WebSocketStreamHandleBridgeImpl::DoOnClose() {
/* static */
void BrowserSocketStreamBridge::InitializeOnIOThread(
URLRequestContext* request_context) {
net::URLRequestContext* request_context) {
g_io_thread = MessageLoop::current();
g_request_context = request_context;
}