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

Unified Diff: chrome/browser/net/chrome_url_request_context.h

Issue 6410115: Adds navigator.registerProtocolHandler. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 years, 10 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/net/chrome_url_request_context.h
diff --git a/chrome/browser/net/chrome_url_request_context.h b/chrome/browser/net/chrome_url_request_context.h
index 5d57b4692a14ca206fa8c62c0cd6c06260930275..8ffb0ef7d0dbd2b5d6e88051c3a4a00961ffa7ed 100644
--- a/chrome/browser/net/chrome_url_request_context.h
+++ b/chrome/browser/net/chrome_url_request_context.h
@@ -13,6 +13,7 @@
#include "chrome/browser/appcache/chrome_appcache_service.h"
#include "chrome/browser/chrome_blob_storage_context.h"
#include "chrome/browser/content_settings/host_content_settings_map.h"
+#include "chrome/browser/custom_handlers/protocol_handler_registry.h"
#include "chrome/browser/extensions/extension_info_map.h"
#include "chrome/browser/extensions/extension_io_event_router.h"
#include "chrome/browser/extensions/extension_webrequest_api.h"
@@ -102,6 +103,10 @@ class ChromeURLRequestContext : public net::URLRequestContext {
return prerender_manager_.get();
}
+ const ProtocolHandlerRegistry* protocol_handler_registry() const {
+ return protocol_handler_registry_;
+ }
+
protected:
virtual ~ChromeURLRequestContext();
@@ -168,6 +173,9 @@ class ChromeURLRequestContext : public net::URLRequestContext {
void set_prerender_manager(PrerenderManager* prerender_manager) {
prerender_manager_ = prerender_manager;
}
+ void set_protocol_handler_registry(ProtocolHandlerRegistry* registry) {
+ protocol_handler_registry_ = registry;
+ }
// Callback for when the accept language changes.
void OnAcceptLanguageChange(const std::string& accept_language);
@@ -191,6 +199,7 @@ class ChromeURLRequestContext : public net::URLRequestContext {
scoped_refptr<ExtensionInfoMap> extension_info_map_;
scoped_refptr<ExtensionIOEventRouter> extension_io_event_router_;
scoped_refptr<PrerenderManager> prerender_manager_;
+ scoped_refptr<ProtocolHandlerRegistry> protocol_handler_registry_;
bool is_off_the_record_;
@@ -354,6 +363,7 @@ class ChromeURLRequestContextFactory {
scoped_refptr<ExtensionInfoMap> extension_info_map_;
scoped_refptr<ExtensionIOEventRouter> extension_io_event_router_;
scoped_refptr<PrerenderManager> prerender_manager_;
+ scoped_refptr<ProtocolHandlerRegistry> protocol_handler_registry_;
FilePath profile_dir_path_;

Powered by Google App Engine
This is Rietveld 408576698