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

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

Issue 22793018: <webview>: Implement support for package-local chrome-extension:// URLs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix test that broken Created 7 years, 3 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
« no previous file with comments | « chrome/browser/guestview/webview/webview_guest.cc ('k') | chrome/chrome_common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile_impl_io_data.cc
diff --git a/chrome/browser/profiles/profile_impl_io_data.cc b/chrome/browser/profiles/profile_impl_io_data.cc
index a096dd17c7b32a2df962dbdce61b56194fbd7778..216ad8cf469e83ee5a1fe8fc6ff9b9c38309d61a 100644
--- a/chrome/browser/profiles/profile_impl_io_data.cc
+++ b/chrome/browser/profiles/profile_impl_io_data.cc
@@ -18,6 +18,7 @@
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/custom_handlers/protocol_handler_registry.h"
#include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"
+#include "chrome/browser/extensions/extension_protocols.h"
#include "chrome/browser/io_thread.h"
#include "chrome/browser/net/chrome_net_log.h"
#include "chrome/browser/net/chrome_network_delegate.h"
@@ -582,19 +583,11 @@ ProfileImplIOData::InitializeAppRequestContext(
scoped_ptr<net::URLRequestJobFactoryImpl> job_factory(
new net::URLRequestJobFactoryImpl());
InstallProtocolHandlers(job_factory.get(), protocol_handlers);
- scoped_ptr<net::URLRequestJobFactory> top_job_factory;
- // Overwrite the job factory that we inherit from the main context so
- // that we can later provide our own handlers for storage related protocols.
- // Install all the usual protocol handlers unless we are in a browser plugin
- // guest process, in which case only web-safe schemes are allowed.
- if (!partition_descriptor.in_memory) {
- top_job_factory = SetUpJobFactoryDefaults(
- job_factory.Pass(), protocol_handler_interceptor.Pass(),
- network_delegate(),
- ftp_factory_.get());
- } else {
- top_job_factory = job_factory.PassAs<net::URLRequestJobFactory>();
- }
+ scoped_ptr<net::URLRequestJobFactory> top_job_factory(
+ SetUpJobFactoryDefaults(
+ job_factory.Pass(), protocol_handler_interceptor.Pass(),
+ network_delegate(),
+ ftp_factory_.get()));
context->SetJobFactory(top_job_factory.Pass());
return context;
« no previous file with comments | « chrome/browser/guestview/webview/webview_guest.cc ('k') | chrome/chrome_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698