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

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1221 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-04-15 22:16:01 +00:00
parent 414befcd92
commit bb6eeee686
47 changed files with 154 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libcef/browser/browser_main.cc
View File

@@ -10,6 +10,7 @@
#include "libcef/browser/browser_message_loop.h"
#include "libcef/browser/context.h"
#include "libcef/browser/devtools_delegate.h"
#include "libcef/common/content_client.h"
#include "base/bind.h"
#include "base/command_line.h"
@@ -19,7 +20,6 @@
#include "content/browser/webui/content_web_ui_controller_factory.h"
#include "content/public/browser/gpu_data_manager.h"
#include "content/public/browser/web_ui_controller_factory.h"
#include "content/public/common/content_client.h"
#include "content/public/common/content_switches.h"
#include "net/base/net_module.h"
#include "net/proxy/proxy_resolver_v8.h"
@@ -29,8 +29,8 @@
namespace {
base::StringPiece ResourceProvider(int resource_id) {
return content::GetContentClient()->GetDataResource(resource_id,
ui::SCALE_FACTOR_NONE);
return CefContentClient::Get()->GetDataResource(resource_id,
ui::SCALE_FACTOR_NONE);
}
} // namespace
@@ -46,7 +46,7 @@ CefBrowserMainParts::~CefBrowserMainParts() {
}
void CefBrowserMainParts::PreMainMessageLoopStart() {
if (!MessageLoop::current()) {
if (!base::MessageLoop::current()) {
// Create the browser message loop.
message_loop_.reset(new CefBrowserMessageLoop());
message_loop_->set_thread_name("CrBrowserMain");