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 139606.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@658 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2012-05-31 15:19:33 +00:00
parent dbe75b1326
commit 38f216a9c2
29 changed files with 114 additions and 765 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libcef/browser/devtools_delegate.cc
View File

@@ -20,7 +20,9 @@
#include "content/public/common/content_client.h"
#include "content/public/common/content_switches.h"
#include "grit/cef_resources.h"
#include "net/base/tcp_listen_socket.h"
#include "net/url_request/url_request_context_getter.h"
#include "ui/base/layout.h"
#include "ui/base/resource/resource_bundle.h"
namespace {
@@ -95,8 +97,7 @@ CefDevToolsDelegate::CefDevToolsDelegate(
int port,
net::URLRequestContextGetter* context_getter) {
devtools_http_handler_ = content::DevToolsHttpHandler::Start(
"127.0.0.1",
port,
new net::TCPListenSocketFactory("127.0.0.1", port),
"",
context_getter,
this);
@@ -115,7 +116,7 @@ void CefDevToolsDelegate::Stop() {
std::string CefDevToolsDelegate::GetDiscoveryPageHTML() {
return content::GetContentClient()->GetDataResource(
IDR_CEF_DEVTOOLS_DISCOVERY_PAGE).as_string();
IDR_CEF_DEVTOOLS_DISCOVERY_PAGE, ui::SCALE_FACTOR_NONE).as_string();
}
bool CefDevToolsDelegate::BundlesFrontendResources() {