mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
libcef: Update due to underlying chromium changes.
- Add simple_clipboard_impl.cc to the libcef project because it is no longer included as part of the webkit/glue project. - Add the FindProxyForUrl() function to browser_resource_loader_bridge.cc. - NPAPI function pointers are now stored in a structure member of NPAPI::PluginVersionInfo. - Change gfx::NativeWindow to gfx::NativeView in webview_host and webview_host. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@14 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@@ -46,6 +46,7 @@
|
||||
#include "net/base/io_buffer.h"
|
||||
#include "net/base/net_util.h"
|
||||
#include "net/base/upload_data.h"
|
||||
#include "net/proxy/proxy_service.h"
|
||||
#include "net/url_request/url_request.h"
|
||||
#include "webkit/glue/resource_loader_bridge.h"
|
||||
#include "webkit/glue/webframe.h"
|
||||
@@ -628,6 +629,24 @@ std::string GetCookies(const GURL& url, const GURL& policy_url) {
|
||||
return getter->GetResult();
|
||||
}
|
||||
|
||||
// Issue the proxy resolve request on the io thread, and wait
|
||||
// for the result.
|
||||
bool FindProxyForUrl(const GURL& url, std::string* proxy_list) {
|
||||
DCHECK(request_context);
|
||||
|
||||
scoped_refptr<net::SyncProxyServiceHelper> sync_proxy_service(
|
||||
new net::SyncProxyServiceHelper(io_thread->message_loop(),
|
||||
request_context->proxy_service()));
|
||||
|
||||
net::ProxyInfo proxy_info;
|
||||
int rv = sync_proxy_service->ResolveProxy(url, &proxy_info);
|
||||
if (rv == net::OK) {
|
||||
*proxy_list = proxy_info.GetAnnotatedProxyList();
|
||||
}
|
||||
|
||||
return rv == net::OK;
|
||||
}
|
||||
|
||||
} // namespace webkit_glue
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
Reference in New Issue
Block a user