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

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1281 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-06-22 02:06:32 +00:00
parent 45691556e4
commit 2fc9788311
60 changed files with 201 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libcef/browser/browser_main.cc
View File

@@ -15,7 +15,7 @@
#include "base/bind.h"
#include "base/command_line.h"
#include "base/message_loop.h"
#include "base/string_number_conversions.h"
#include "base/strings/string_number_conversions.h"
#include "chrome/browser/net/proxy_service_factory.h"
#include "content/browser/webui/content_web_ui_controller_factory.h"
#include "content/public/browser/gpu_data_manager.h"
@@ -38,7 +38,6 @@ base::StringPiece ResourceProvider(int resource_id) {
CefBrowserMainParts::CefBrowserMainParts(
const content::MainFunctionParams& parameters)
: BrowserMainParts(),
devtools_delegate_(NULL),
proxy_v8_isolate_(NULL) {
}
@@ -112,7 +111,7 @@ void CefBrowserMainParts::PreMainMessageLoopRun() {
command_line.GetSwitchValueASCII(switches::kRemoteDebuggingPort);
int port;
if (base::StringToInt(port_str, &port) && port > 0 && port < 65535) {
devtools_delegate_ = new CefDevToolsDelegate(port);
devtools_delegate_.reset(new CefDevToolsDelegate(port));
} else {
LOG(WARNING) << "Invalid http debugger port number " << port;
}