Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(571)

Unified Diff: chrome/browser/profiles/off_the_record_profile_impl.cc

Issue 11896113: Add chrome-search: access from Instant overlay (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Yet another rebase Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/profiles/off_the_record_profile_impl.cc
diff --git a/chrome/browser/profiles/off_the_record_profile_impl.cc b/chrome/browser/profiles/off_the_record_profile_impl.cc
index 81062f47d2ddcf5e4488885bde651b3996e092f7..7ff079cc46e654342532acb46076fea193a9f387 100644
--- a/chrome/browser/profiles/off_the_record_profile_impl.cc
+++ b/chrome/browser/profiles/off_the_record_profile_impl.cc
@@ -261,19 +261,8 @@ net::URLRequestContextGetter* OffTheRecordProfileImpl::GetRequestContext() {
}
net::URLRequestContextGetter* OffTheRecordProfileImpl::CreateRequestContext(
- scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
- blob_protocol_handler,
- scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
- file_system_protocol_handler,
- scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
- developer_protocol_handler,
- scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
- chrome_protocol_handler,
- scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
- chrome_devtools_protocol_handler) {
- return io_data_.CreateMainRequestContextGetter(blob_protocol_handler.Pass(),
- file_system_protocol_handler.Pass(), developer_protocol_handler.Pass(),
- chrome_protocol_handler.Pass(), chrome_devtools_protocol_handler.Pass());
+ content::ProtocolHandlerMap* protocol_handlers) {
+ return io_data_.CreateMainRequestContextGetter(protocol_handlers);
}
net::URLRequestContextGetter*
@@ -313,20 +302,9 @@ net::URLRequestContextGetter*
OffTheRecordProfileImpl::CreateRequestContextForStoragePartition(
const base::FilePath& partition_path,
bool in_memory,
- scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
- blob_protocol_handler,
- scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
- file_system_protocol_handler,
- scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
- developer_protocol_handler,
- scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
- chrome_protocol_handler,
- scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
- chrome_devtools_protocol_handler) {
+ content::ProtocolHandlerMap* protocol_handlers) {
return io_data_.CreateIsolatedAppRequestContextGetter(
- partition_path, in_memory, blob_protocol_handler.Pass(),
- file_system_protocol_handler.Pass(), developer_protocol_handler.Pass(),
- chrome_protocol_handler.Pass(), chrome_devtools_protocol_handler.Pass());
+ partition_path, in_memory, protocol_handlers);
}
content::ResourceContext* OffTheRecordProfileImpl::GetResourceContext() {
« no previous file with comments | « chrome/browser/profiles/off_the_record_profile_impl.h ('k') | chrome/browser/profiles/off_the_record_profile_io_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698