summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-09 16:24:45 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-09 16:24:45 +0000
commit0983c7a0180c34abe1b0d305797e538c65fce6cc (patch)
tree91f81052ba1657bbe7174609d41271b9630cb0c8 /chrome/browser/extensions
parentbe7f2174ece293c452eb1226c33ea3784c5c7901 (diff)
downloadchromium_src-0983c7a0180c34abe1b0d305797e538c65fce6cc.zip
chromium_src-0983c7a0180c34abe1b0d305797e538c65fce6cc.tar.gz
chromium_src-0983c7a0180c34abe1b0d305797e538c65fce6cc.tar.bz2
Splits ChromeURLDataManager into 2 chunks:
. ChromeURLDataManager is no longer a singleton and is always used on the UI thread. ChromeURLDataManager is now profile specific (you get from the profile). . ChromeURLDataManagerBackend handles the URLRequests and the DataSources. ChromeURLDataManagerBackend is created by ChromeURLRequestContext. All DataSources are now profile specific. There were two that wanted to be global, but have been converted. BUG=52022 71868 TEST=none Review URL: http://codereview.chromium.org/6286131 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74292 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/extension_function_dispatcher.cc6
-rw-r--r--chrome/browser/extensions/extensions_ui.cc7
2 files changed, 2 insertions, 11 deletions
diff --git a/chrome/browser/extensions/extension_function_dispatcher.cc b/chrome/browser/extensions/extension_function_dispatcher.cc
index 839b341..3d6f4d4 100644
--- a/chrome/browser/extensions/extension_function_dispatcher.cc
+++ b/chrome/browser/extensions/extension_function_dispatcher.cc
@@ -391,11 +391,7 @@ ExtensionFunctionDispatcher::ExtensionFunctionDispatcher(
// ChromeURLDataManager.
if (extension->HasHostPermission(GURL(chrome::kChromeUIFavIconURL))) {
WebUIFavIconSource* favicon_source = new WebUIFavIconSource(profile_);
- BrowserThread::PostTask(
- BrowserThread::IO, FROM_HERE,
- NewRunnableMethod(ChromeURLDataManager::GetInstance(),
- &ChromeURLDataManager::AddDataSource,
- make_scoped_refptr(favicon_source)));
+ profile_->GetChromeURLDataManager()->AddDataSource(favicon_source);
}
// Update the extension permissions. Doing this each time we create an EFD
diff --git a/chrome/browser/extensions/extensions_ui.cc b/chrome/browser/extensions/extensions_ui.cc
index 087102c..c0406dd 100644
--- a/chrome/browser/extensions/extensions_ui.cc
+++ b/chrome/browser/extensions/extensions_ui.cc
@@ -959,12 +959,7 @@ ExtensionsUI::ExtensionsUI(TabContents* contents) : DOMUI(contents) {
ExtensionsUIHTMLSource* html_source = new ExtensionsUIHTMLSource();
// Set up the chrome://extensions/ source.
- BrowserThread::PostTask(
- BrowserThread::IO, FROM_HERE,
- NewRunnableMethod(
- ChromeURLDataManager::GetInstance(),
- &ChromeURLDataManager::AddDataSource,
- make_scoped_refptr(html_source)));
+ contents->profile()->GetChromeURLDataManager()->AddDataSource(html_source);
}
// static