diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-04 17:07:42 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-04 17:07:42 +0000 |
| commit | 8a39b47ee588b1ddc3c2996b8e5c0f400e68c989 (patch) | |
| tree | fede0e6391363a92860103f206659b9fe6ec7bdb /chrome/browser/ui/webui | |
| parent | 8bb46c251e7121e5eee3cb17e4fc3f2edc741462 (diff) | |
| download | chromium_src-8a39b47ee588b1ddc3c2996b8e5c0f400e68c989.zip chromium_src-8a39b47ee588b1ddc3c2996b8e5c0f400e68c989.tar.gz chromium_src-8a39b47ee588b1ddc3c2996b8e5c0f400e68c989.tar.bz2 | |
Cleanup: Get rid of Profile::GetProtocolHandlerRegistry().
Review URL: https://chromiumcodereview.appspot.com/13446007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192349 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/webui')
| -rw-r--r-- | chrome/browser/ui/webui/options/content_settings_handler.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/options/handler_options_handler.cc | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc index 04cee71..85249bc 100644 --- a/chrome/browser/ui/webui/options/content_settings_handler.cc +++ b/chrome/browser/ui/webui/options/content_settings_handler.cc @@ -18,6 +18,7 @@ #include "chrome/browser/content_settings/content_settings_utils.h" #include "chrome/browser/content_settings/host_content_settings_map.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_service.h" #include "chrome/browser/extensions/extension_special_storage_policy.h" #include "chrome/browser/notifications/desktop_notification_service.h" @@ -1301,7 +1302,8 @@ HostContentSettingsMap* ContentSettingsHandler::GetContentSettingsMap() { } ProtocolHandlerRegistry* ContentSettingsHandler::GetProtocolHandlerRegistry() { - return Profile::FromWebUI(web_ui())->GetProtocolHandlerRegistry(); + return ProtocolHandlerRegistryFactory::GetForProfile( + Profile::FromWebUI(web_ui())); } HostContentSettingsMap* diff --git a/chrome/browser/ui/webui/options/handler_options_handler.cc b/chrome/browser/ui/webui/options/handler_options_handler.cc index adbf8c8..ee52ee6 100644 --- a/chrome/browser/ui/webui/options/handler_options_handler.cc +++ b/chrome/browser/ui/webui/options/handler_options_handler.cc @@ -11,6 +11,7 @@ #include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" #include "base/values.h" +#include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_notification_types.h" #include "content/public/browser/web_ui.h" @@ -83,7 +84,8 @@ void HandlerOptionsHandler::RegisterMessages() { } ProtocolHandlerRegistry* HandlerOptionsHandler::GetProtocolHandlerRegistry() { - return Profile::FromWebUI(web_ui())->GetProtocolHandlerRegistry(); + return ProtocolHandlerRegistryFactory::GetForProfile( + Profile::FromWebUI(web_ui())); } static void GetHandlersAsListValue( |