chrome/browser/ui/webui/active_downloads_ui.cc - Issue 9167019: Consolidate icon loading on ChromeOS

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/active_downloads_ui.cc

Issue 9167019: Consolidate icon loading on ChromeOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Add comment. Created 8 years, 11 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:

Index: chrome/browser/ui/webui/active_downloads_ui.cc

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

index 669a97ca73f72c4b5e995be07026cf8e38251181..d12bd506ca48b9f7cebc9487e7d777a9fa870faf 100644

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

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

@@ -38,7 +38,7 @@

#include "chrome/browser/ui/browser_window.h"

#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"

#include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"

-#include "chrome/browser/ui/webui/fileicon_source_chromeos.h"

+#include "chrome/browser/ui/webui/fileicon_source.h"

#include "chrome/common/chrome_paths.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/url_constants.h"

@@ -181,7 +181,7 @@ ActiveDownloadsHandler::~ActiveDownloadsHandler() {

void ActiveDownloadsHandler::RegisterMessages() {

profile_ = Profile::FromWebUI(web_ui());

- profile_->GetChromeURLDataManager()->AddDataSource(new FileIconSourceCros());

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

web_ui()->RegisterMessageCallback("getDownloads",

base::Bind(&ActiveDownloadsHandler::HandleGetDownloads,