build: remove //chrome/browser/icon_loader source copies (electron#14955

)

* build: remove //chrome/browser/icon_loader source copies

* chore: add DCHECK to ensure IconManager is accessed from UI thread

BUILD.gn

@@ -367,7 +367,6 @@ static_library("electron_lib") {
       # Disable warnings for g_settings_list_schemas.
       "GLIB_DISABLE_DEPRECATION_WARNINGS",
     ]
-    sources += filenames.lib_sources_linux
     sources += filenames.lib_sources_nss
   }
   if (is_win) {

atom/browser/api/atom_api_app.cc

@@ -1100,7 +1100,7 @@ void App::GetFileIcon(const base::FilePath& path, mate::Arguments* args) {
     return;
   }
 
-  auto* icon_manager = g_browser_process->GetIconManager();
+  auto* icon_manager = AtomBrowserMainParts::Get()->GetIconManager();
   gfx::Image* icon =
       icon_manager->LookupIconFromFilepath(normalized_path, icon_size);
   if (icon) {

atom/browser/atom_browser_main_parts.cc

@@ -21,6 +21,7 @@
 #include "base/command_line.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/icon_manager.h"
 #include "chrome/browser/net/chrome_net_log_helper.h"
 #include "components/net_log/chrome_net_log.h"
 #include "components/net_log/net_export_file_writer.h"
@@ -309,4 +310,11 @@ AtomBrowserMainParts::GetGeolocationControl() {
   return geolocation_control_.get();
 }
 
+IconManager* AtomBrowserMainParts::GetIconManager() {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+  if (!icon_manager_.get())
+    icon_manager_.reset(new IconManager);
+  return icon_manager_.get();
+}
+
 }  // namespace atom

atom/browser/atom_browser_main_parts.h

@@ -17,6 +17,7 @@
 #include "services/device/public/mojom/geolocation_control.mojom.h"
 
 class BrowserProcess;
+class IconManager;
 
 #if defined(TOOLKIT_VIEWS)
 namespace brightray {
@@ -65,6 +66,9 @@ class AtomBrowserMainParts : public brightray::BrowserMainParts {
   // used to enable the location services once per client.
   device::mojom::GeolocationControl* GetGeolocationControl();
 
+  // Returns handle to the class responsible for extracting file icons.
+  IconManager* GetIconManager();
+
   Browser* browser() { return browser_.get(); }
   IOThread* io_thread() const { return io_thread_.get(); }
   net_log::ChromeNetLog* net_log() { return net_log_.get(); }
@@ -119,6 +123,7 @@ class AtomBrowserMainParts : public brightray::BrowserMainParts {
   std::unique_ptr<NodeDebugger> node_debugger_;
   std::unique_ptr<IOThread> io_thread_;
   std::unique_ptr<net_log::ChromeNetLog> net_log_;
+  std::unique_ptr<IconManager> icon_manager_;
 
   base::Timer gc_timer_;
 

chromium_src/BUILD.gn

@@ -9,6 +9,12 @@ import("//electron/buildflags/buildflags.gni")
 source_set("chrome") {
   visibility = [ "//electron:electron_lib" ]
   sources = [
+    "//chrome/browser/icon_loader.cc",
+    "//chrome/browser/icon_loader.h",
+    "//chrome/browser/icon_loader_mac.mm",
+    "//chrome/browser/icon_loader_win.cc",
+    "//chrome/browser/icon_manager.cc",
+    "//chrome/browser/icon_manager.h",
     "//chrome/browser/net/chrome_mojo_proxy_resolver_factory.cc",
     "//chrome/browser/net/chrome_mojo_proxy_resolver_factory.h",
     "//chrome/browser/net/chrome_net_log_helper.cc",
@@ -35,6 +41,10 @@ source_set("chrome") {
     "//components/security_state/content",
   ]
 
+  if (is_linux) {
+    sources += [ "//chrome/browser/icon_loader_auralinux.cc" ]
+  }
+
   if (enable_desktop_capturer) {
     sources += [
       "//chrome/browser/media/webrtc/desktop_media_list.h",

chromium_src/chrome/browser/browser_process.cc

@@ -4,15 +4,13 @@
 
 #include "chrome/browser/browser_process.h"
 
-#include "chrome/browser/icon_manager.h"
 #include "chrome/browser/printing/print_job_manager.h"
 #include "ui/base/l10n/l10n_util.h"
 
 BrowserProcess* g_browser_process = NULL;
 
 BrowserProcess::BrowserProcess()
-    : print_job_manager_(new printing::PrintJobManager),
-      icon_manager_(new IconManager) {
+    : print_job_manager_(new printing::PrintJobManager) {
   g_browser_process = this;
 }
 
@@ -28,12 +26,6 @@ std::string BrowserProcess::GetApplicationLocale() {
   return locale_;
 }
 
-IconManager* BrowserProcess::GetIconManager() {
-  if (!icon_manager_.get())
-    icon_manager_.reset(new IconManager);
-  return icon_manager_.get();
-}
-
 printing::PrintJobManager* BrowserProcess::print_job_manager() {
   return print_job_manager_.get();
 }

chromium_src/chrome/browser/browser_process.h

@@ -15,8 +15,6 @@
 
 #include "base/macros.h"
 
-class IconManager;
-
 namespace printing {
 class PrintJobManager;
 }
@@ -30,13 +28,11 @@ class BrowserProcess {
 
   void SetApplicationLocale(const std::string& locale);
   std::string GetApplicationLocale();
-  IconManager* GetIconManager();
 
   printing::PrintJobManager* print_job_manager();
 
  private:
   std::unique_ptr<printing::PrintJobManager> print_job_manager_;
-  std::unique_ptr<IconManager> icon_manager_;
   std::string locale_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserProcess);