Update to Chromium revision 157509.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@835 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2012-10-03 19:52:50 +00:00
parent ecf5ff4c6e
commit 2592b05444
11 changed files with 55 additions and 35 deletions

View File

@@ -175,6 +175,7 @@ class CefSpeechRecognitionPreferences
CefBrowserContext::CefBrowserContext() {
// Initialize the request context getter.
url_request_getter_ = new CefURLRequestContextGetter(
false,
GetPath(),
BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::IO),
BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::FILE));
@@ -233,6 +234,18 @@ net::URLRequestContextGetter*
return GetRequestContext();
}
net::URLRequestContextGetter*
CefBrowserContext::GetMediaRequestContextForStoragePartition(
const std::string& partition_id) {
return GetRequestContext();
}
net::URLRequestContextGetter*
CefBrowserContext::GetRequestContextForStoragePartition(
const std::string& partition_id) {
return NULL;
}
content::ResourceContext* CefBrowserContext::GetResourceContext() {
if (!resource_context_.get()) {
resource_context_.reset(new CefResourceContext(