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

6
libcef/browser/browser_main.h
View File

@@ -11,12 +11,13 @@
#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
#include "base/prefs/pref_service.h"
#include "base/string_piece.h"
#include "base/strings/string_piece.h"
#include "chrome/browser/net/pref_proxy_config_tracker.h"
#include "content/public/browser/browser_main_parts.h"
#include "net/proxy/proxy_config_service.h"
namespace base {
class MessageLoop;
class Thread;
}
@@ -30,7 +31,6 @@ class Isolate;
class CefBrowserContext;
class CefDevToolsDelegate;
class MessageLoop;
class CefBrowserMainParts : public content::BrowserMainParts {
public:
@@ -57,7 +57,7 @@ class CefBrowserMainParts : public content::BrowserMainParts {
scoped_ptr<CefBrowserContext> browser_context_;
CefDevToolsDelegate* devtools_delegate_;
scoped_ptr<MessageLoop> message_loop_;
scoped_ptr<base::MessageLoop> message_loop_;
scoped_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;
scoped_ptr<net::ProxyConfigService> proxy_config_service_;
scoped_refptr<CefBrowserPrefStore> pref_store_;