mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium revision 261035.
- The CefSettings.release_dcheck_enabled option has been removed. This functionality can be enabled by setting the dcheck_always_on=1 gyp variable before building CEF/Chromium. See http://crbug.com/350462 for details. - The UR_FLAG_ALLOW_COOKIES option has been removed and the functionality has been merged into UR_FLAG_ALLOW_CACHED_CREDENTIALS. - Mac: [NSApplication sharedApplication] should no longer be called in the renderer process. See http://crbug.com/306348 for details. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1641 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@@ -567,10 +567,13 @@ void CefContentBrowserClient::RenderProcessWillLaunch(
|
||||
|
||||
net::URLRequestContextGetter* CefContentBrowserClient::CreateRequestContext(
|
||||
content::BrowserContext* content_browser_context,
|
||||
content::ProtocolHandlerMap* protocol_handlers) {
|
||||
content::ProtocolHandlerMap* protocol_handlers,
|
||||
content::ProtocolHandlerScopedVector protocol_interceptors) {
|
||||
CefBrowserContext* cef_browser_context =
|
||||
static_cast<CefBrowserContext*>(content_browser_context);
|
||||
return cef_browser_context->CreateRequestContext(protocol_handlers);
|
||||
return cef_browser_context->CreateRequestContext(
|
||||
protocol_handlers,
|
||||
protocol_interceptors.Pass());
|
||||
}
|
||||
|
||||
net::URLRequestContextGetter*
|
||||
@@ -578,11 +581,15 @@ CefContentBrowserClient::CreateRequestContextForStoragePartition(
|
||||
content::BrowserContext* content_browser_context,
|
||||
const base::FilePath& partition_path,
|
||||
bool in_memory,
|
||||
content::ProtocolHandlerMap* protocol_handlers) {
|
||||
content::ProtocolHandlerMap* protocol_handlers,
|
||||
content::ProtocolHandlerScopedVector protocol_interceptors) {
|
||||
CefBrowserContext* cef_browser_context =
|
||||
static_cast<CefBrowserContext*>(content_browser_context);
|
||||
return cef_browser_context->CreateRequestContextForStoragePartition(
|
||||
partition_path, in_memory, protocol_handlers);
|
||||
partition_path,
|
||||
in_memory,
|
||||
protocol_handlers,
|
||||
protocol_interceptors.Pass());
|
||||
}
|
||||
|
||||
bool CefContentBrowserClient::IsHandledURL(const GURL& url) {
|
||||
@@ -610,7 +617,6 @@ void CefContentBrowserClient::AppendExtraCommandLineSwitches(
|
||||
#endif
|
||||
switches::kDisablePackLoading,
|
||||
switches::kEnableCrashReporter,
|
||||
switches::kEnableReleaseDcheck,
|
||||
switches::kLang,
|
||||
switches::kLocalesDirPath,
|
||||
switches::kLogFile,
|
||||
@@ -873,7 +879,7 @@ std::string CefContentBrowserClient::GetDefaultDownloadName() {
|
||||
|
||||
#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
||||
void CefContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
|
||||
const CommandLine& command_line,
|
||||
const base::CommandLine& command_line,
|
||||
int child_process_id,
|
||||
std::vector<content::FileDescriptorInfo>* mappings) {
|
||||
int crash_signal_fd = GetCrashSignalFD(command_line);
|
||||
|
Reference in New Issue
Block a user