Consolidate icon loading on ChromeOS

chrome/browser/ui/webui/active_downloads_ui.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/active_downloads_ui.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 20 matching lines @@
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/file_manager_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #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"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/render_view_host_delegate.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
@@ skipping 122 matching lines @@
 
 ActiveDownloadsHandler::~ActiveDownloadsHandler() {
   for (size_t i = 0; i < downloads_.size(); ++i) {
     downloads_[i]->RemoveObserver(this);
   }
   download_manager_->RemoveObserver(this);
 }
 
 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,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("pauseToggleDownload",
       base::Bind(&ActiveDownloadsHandler::HandlePauseToggleDownload,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("allowDownload",
       base::Bind(&ActiveDownloadsHandler::HandleAllowDownload,
                  base::Unretained(this)));
@@ skipping 196 matching lines @@
         return (*it);
       }
     }
   }
   return NULL;
 }
 
 const ActiveDownloadsUI::DownloadList& ActiveDownloadsUI::GetDownloads() const {
   return handler_->downloads();
 }