Consolidate icon loading on ChromeOS

chrome/chrome_browser.gypi

 # 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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 1421 matching lines @@
         'browser/history/url_index_private_data.cc',
         'browser/history/url_index_private_data.h',
         'browser/history/visit_database.cc',
         'browser/history/visit_database.h',
         'browser/history/visit_tracker.cc',
         'browser/history/visit_tracker.h',
         'browser/history/visitsegment_database.cc',
         'browser/history/visitsegment_database.h',
         'browser/icon_loader.cc',
         'browser/icon_loader.h',
+        'browser/icon_loader_chromeos.cc',
         'browser/icon_loader_linux.cc',
         'browser/icon_loader_mac.mm',
         'browser/icon_loader_win.cc',
         'browser/icon_manager.cc',
         'browser/icon_manager.h',
+        'browser/icon_manager_chromeos.cc',
         'browser/icon_manager_linux.cc',
         'browser/icon_manager_mac.mm',
         'browser/icon_manager_win.cc',
         'browser/idle_chromeos.cc',
         'browser/idle_linux.cc',
         'browser/idle_mac.mm',
         'browser/idle_query_linux.cc',
         'browser/idle_query_linux.h',
         'browser/idle_win.cc',
         'browser/image_decoder.cc',
@@ skipping 2354 matching lines @@
         'browser/ui/webui/edit_search_engine_dialog_ui_webui.cc',
         'browser/ui/webui/edit_search_engine_dialog_ui_webui.h',
         'browser/ui/webui/extensions/extension_icon_source.cc',
         'browser/ui/webui/extensions/extension_icon_source.h',
         'browser/ui/webui/extensions/extensions_ui.cc',
         'browser/ui/webui/extensions/extensions_ui.h',
         'browser/ui/webui/favicon_source.cc',
         'browser/ui/webui/favicon_source.h',
         'browser/ui/webui/fileicon_source.cc',
         'browser/ui/webui/fileicon_source.h',
-        'browser/ui/webui/fileicon_source_chromeos.cc',
-        'browser/ui/webui/fileicon_source_chromeos.h',
         'browser/ui/webui/flags_ui.cc',
         'browser/ui/webui/flags_ui.h',
         'browser/ui/webui/flash_ui.cc',
         'browser/ui/webui/flash_ui.h',
         'browser/ui/webui/gpu_internals_ui.cc',
         'browser/ui/webui/gpu_internals_ui.h',
         'browser/ui/webui/history_ui.cc',
         'browser/ui/webui/history_ui.h',
         'browser/ui/webui/input_window_dialog_ui.cc',
         'browser/ui/webui/input_window_dialog_ui.h',
@@ skipping 412 matching lines @@
             ['exclude', '^browser/ui/webui/chromeos'],
             ['exclude', '^browser/ui/webui/options/chromeos'],
             ['exclude', '^browser/ui/webui/options2/chromeos'],
             ['exclude', 'browser/extensions/api/terminal/terminal_private_api.cc'],
             ['exclude', 'browser/extensions/api/terminal/terminal_private_api.h'],
             ['exclude', 'browser/extensions/extension_input_ime_api.cc'],
             ['exclude', 'browser/extensions/extension_input_ime_api.h'],
             ['exclude', 'browser/extensions/extension_input_method_api.cc'],
             ['exclude', 'browser/extensions/extension_input_method_api.h'],
             ['exclude', 'browser/extensions/extension_tts_api_chromeos.cc'],
+            ['exclude', 'browser/icon_loader_chromeos.cc'],
+            ['exclude', 'browser/icon_manager_chromeos.cc'],
             ['exclude', 'browser/oom_priority_manager.cc'],
             ['exclude', 'browser/oom_priority_manager.h'],
             ['exclude', 'browser/policy/auto_enrollment_client.cc'],
             ['exclude', 'browser/policy/auto_enrollment_client.h'],
             ['exclude', 'browser/policy/device_policy_cache.cc'],
             ['exclude', 'browser/policy/device_policy_cache.h'],
             ['exclude', 'browser/policy/device_status_collector.cc'],
             ['exclude', 'browser/policy/device_status_collector.h'],
             ['exclude', 'browser/policy/enterprise_install_attributes.cc'],
             ['exclude', 'browser/policy/enterprise_install_attributes.h'],
             ['exclude', 'browser/policy/network_configuration_updater.cc'],
             ['exclude', 'browser/policy/network_configuration_updater.h'],
             ['exclude', 'browser/policy/proto/chrome_device_policy.pb.cc'],
             ['exclude', 'browser/policy/proto/chrome_device_policy.pb.h'],
             ['exclude', 'browser/renderer_host/offline_resource_handler.cc'],
             ['exclude', 'browser/renderer_host/offline_resource_handler.h'],
             ['exclude', 'browser/ui/toolbar/wrench_menu_model_chromeos.cc'],
             ['exclude', 'browser/ui/views/status_icons/status_tray_chromeos.cc'],
             ['exclude', 'browser/ui/views/status_icons/status_tray_chromeos.h'],
             ['exclude', 'browser/ui/views/status_icons/status_icon_chromeos.cc'],
             ['exclude', 'browser/ui/views/status_icons/status_icon_chromeos.h'],
             ['exclude', 'browser/ui/webui/about_page/about_page_handler.cc'],
             ['exclude', 'browser/ui/webui/about_page/about_page_handler.h'],
             ['exclude', 'browser/ui/webui/about_page/about_page_ui.cc'],
             ['exclude', 'browser/ui/webui/about_page/about_page_ui.h'],
             ['exclude', 'browser/ui/webui/active_downloads_ui.cc'],
-            ['exclude', 'browser/ui/webui/fileicon_source_chromeos.cc'],
-            ['exclude', 'browser/ui/webui/fileicon_source_chromeos.h'],
           ],
         }],
         ['chromeos==1', {
           'dependencies': [
             '../build/linux/system.gyp:dbus-glib',
             '../third_party/libevent/libevent.gyp:libevent',
             '../third_party/mozc/chrome/chromeos/renderer/chromeos_renderer.gyp:mozc_candidates_proto',
             'browser/chromeos/input_method/input_method.gyp:gencode',
           ],
           'sources!': [
             'browser/background/background_mode_manager_gtk.cc',
             'browser/extensions/default_apps.cc',
             'browser/extensions/default_apps.h',
             'browser/first_run/upgrade_util.cc',
             'browser/first_run/upgrade_util.h',
             'browser/first_run/upgrade_util_linux.cc',
+            'browser/icon_loader_linux.cc',
+            'browser/icon_manager_linux.cc',
             'browser/idle_linux.cc',
             'browser/password_manager/native_backend_gnome_x.cc',
             'browser/password_manager/native_backend_gnome_x.h',
             'browser/password_manager/native_backend_kwallet_x.cc',
             'browser/password_manager/native_backend_kwallet_x.h',
             'browser/platform_util_linux.cc',
             'browser/printing/print_dialog_gtk.cc',
             'browser/printing/print_dialog_gtk.h',
             'browser/ui/gtk/tab_modal_confirm_dialog_gtk.cc',
             'browser/ui/gtk/tab_modal_confirm_dialog_gtk.h',
@@ skipping 1165 matching lines @@
       'type': 'static_library',
       'sources': [ 'browser/history/in_memory_url_index_cache.proto' ],
       'variables': {
         'proto_in_dir': 'browser/history',
         'proto_out_dir': 'chrome/browser/history',
       },
       'includes': [ '../build/protoc.gypi' ]
     },
   ],
 }