chrome/browser/ui/webui/downloads_dom_handler.cc - Issue 10196004: Changed ChromeURLDataManager to a ProfileKeyedService and made a Factory for it.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/downloads_dom_handler.cc

Issue 10196004: Changed ChromeURLDataManager to a ProfileKeyedService and made a Factory for it. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Made ChromeURLDataManager's destructor virtual Created 8 years, 8 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/ui/webui/downloads_dom_handler.cc

diff --git a/chrome/browser/ui/webui/downloads_dom_handler.cc b/chrome/browser/ui/webui/downloads_dom_handler.cc

index a96ebd157ca1a0a54592117e60b798d08c13fccd..71b75158cd1c85090aae64a589fd8d3cb30e33cd 100644

--- a/chrome/browser/ui/webui/downloads_dom_handler.cc

+++ b/chrome/browser/ui/webui/downloads_dom_handler.cc

@@ -94,12 +94,10 @@ DownloadsDOMHandler::DownloadsDOMHandler(content::DownloadManager* dlm)

original_profile_download_manager_(NULL),

ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {

// Create our fileicon data source.

- Profile::FromBrowserContext(dlm->GetBrowserContext())->

- GetChromeURLDataManager()->AddDataSource(new FileIconSource());

+ Profile* profile = Profile::FromBrowserContext(dlm->GetBrowserContext());

+ ChromeURLDataManager::AddDataSource(profile, new FileIconSource());

// Figure out our parent DownloadManager, if any.

- Profile* profile =

- Profile::FromBrowserContext(download_manager_->GetBrowserContext());

Profile* original_profile = profile->GetOriginalProfile();

if (original_profile != profile) {

original_profile_download_manager_ = DownloadServiceFactory::GetForProfile(

« no previous file with comments | « chrome/browser/ui/webui/devtools_ui.cc ('k') | chrome/browser/ui/webui/downloads_ui.cc » ('j') | no next file with comments »