diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-27 23:54:53 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-27 23:54:53 +0000 |
| commit | 24ea7a17338ce6ed2621aeaeb5542edf5b07d098 (patch) | |
| tree | fdbf45cf0ba6af23069b542d5491867da692d980 /chrome/browser/extensions/extension_system.cc | |
| parent | d017a7046c34bb37a980e0a1a4fd20ec44ba7c78 (diff) | |
| download | chromium_src-24ea7a17338ce6ed2621aeaeb5542edf5b07d098.zip chromium_src-24ea7a17338ce6ed2621aeaeb5542edf5b07d098.tar.gz chromium_src-24ea7a17338ce6ed2621aeaeb5542edf5b07d098.tar.bz2 | |
Stop using content's internal URLDataManager methods from chrome.
BUG=169170
Review URL: https://codereview.chromium.org/12077017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179094 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_system.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_system.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/extensions/extension_system.cc b/chrome/browser/extensions/extension_system.cc index 97150c3..dd7d8a1 100644 --- a/chrome/browser/extensions/extension_system.cc +++ b/chrome/browser/extensions/extension_system.cc @@ -38,7 +38,6 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" -#include "chrome/browser/ui/webui/chrome_url_data_manager.h" #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info.h" @@ -46,6 +45,7 @@ #include "chrome/common/extensions/features/feature.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" +#include "content/public/browser/url_data_source.h" #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/login/user_manager.h" @@ -199,8 +199,7 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) { } // Make the chrome://extension-icon/ resource available. - ChromeURLDataManager::AddDataSource(profile_, - new ExtensionIconSource(profile_)); + content::URLDataSource::Add(profile_, new ExtensionIconSource(profile_)); // Initialize extension event routers. Note that on Chrome OS, this will // not succeed if the user has not logged in yet, in which case the |