Update to Chromium revision 207871.

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

View File

@@ -45,7 +45,7 @@ class CefBrowserMainParts : public content::BrowserMainParts {
virtual void PostDestroyThreads() OVERRIDE;
CefBrowserContext* browser_context() const { return browser_context_.get(); }
CefDevToolsDelegate* devtools_delegate() const { return devtools_delegate_; }
CefDevToolsDelegate* devtools_delegate() const { return devtools_delegate_.get(); }
PrefService* pref_service() const { return pref_service_.get(); }
scoped_ptr<net::ProxyConfigService> proxy_config_service() {
return proxy_config_service_.Pass();
@@ -56,7 +56,7 @@ class CefBrowserMainParts : public content::BrowserMainParts {
void PlatformCleanup();
scoped_ptr<CefBrowserContext> browser_context_;
CefDevToolsDelegate* devtools_delegate_;
scoped_ptr<CefDevToolsDelegate> devtools_delegate_;
scoped_ptr<base::MessageLoop> message_loop_;
scoped_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;
scoped_ptr<net::ProxyConfigService> proxy_config_service_;