Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3678)

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 9167019: Consolidate icon loading on ChromeOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased 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:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/icon_loader_chromeos.cc ('K') | « chrome/browser/ui/webui/active_downloads_ui.cc ('k') | chrome/browser/ui/webui/fileicon_source.h » ('j') | chrome/browser/ui/webui/fileicon_source.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 d1fc34520b8cdfb84fa531892e1f59c107d502fc..777628ee43067fd57a7878fae37c7748ba3f4fb7 100644
--- a/chrome/browser/ui/webui/downloads_dom_handler.cc
+++ b/chrome/browser/ui/webui/downloads_dom_handler.cc
@@ -27,7 +27,6 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
#include "chrome/browser/ui/webui/fileicon_source.h"
-#include "chrome/browser/ui/webui/fileicon_source_chromeos.h"
#include "chrome/common/url_constants.h"
#include "content/public/browser/download_item.h"
#include "content/public/browser/user_metrics.h"
@@ -128,12 +127,7 @@ DownloadsDOMHandler::DownloadsDOMHandler(DownloadManager* dlm)
download_manager_(dlm) {
// Create our fileicon data source.
Profile::FromBrowserContext(dlm->GetBrowserContext())->
- GetChromeURLDataManager()->AddDataSource(
-#if defined(OS_CHROMEOS)
- new FileIconSourceCros());
-#else
- new FileIconSource());
-#endif // OS_CHROMEOS
+ GetChromeURLDataManager()->AddDataSource(new FileIconSource());
}
DownloadsDOMHandler::~DownloadsDOMHandler() {
« chrome/browser/icon_loader_chromeos.cc ('K') | « chrome/browser/ui/webui/active_downloads_ui.cc ('k') | chrome/browser/ui/webui/fileicon_source.h » ('j') | chrome/browser/ui/webui/fileicon_source.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698