Refactor extension app icon.

chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

 // Copyright 2013 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/ash/launcher/chrome_launcher_controller.h"
 
 #include "ash/public/interfaces/constants.mojom.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/chromeos/arc/arc_util.h"
-#include "chrome/browser/extensions/extension_app_icon_loader.h"
+#include "chrome/browser/extensions/chrome_app_icon_loader.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_icon_loader.h"
 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
 #include "chrome/browser/ui/ash/launcher/launcher_controller_helper.h"
 #include "content/public/common/service_manager_connection.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 
 // static
@@ skipping 113 matching lines @@
         base::MakeUnique<LauncherControllerHelper>(profile_);
   } else {
     launcher_controller_helper_->set_profile(profile_);
   }
 
   // TODO(skuhne): The AppIconLoaderImpl has the same problem. Each loaded
   // image is associated with a profile (its loader requires the profile).
   // Since icon size changes are possible, the icon could be requested to be
   // reloaded. However - having it not multi profile aware would cause problems
   // if the icon cache gets deleted upon user switch.
-  std::unique_ptr<AppIconLoader> extension_app_icon_loader =
-      base::MakeUnique<extensions::ExtensionAppIconLoader>(
+  std::unique_ptr<AppIconLoader> chrome_app_icon_loader =
+      base::MakeUnique<extensions::ChromeAppIconLoader>(
           profile_, extension_misc::EXTENSION_ICON_SMALL, this);
-  app_icon_loaders_.push_back(std::move(extension_app_icon_loader));
+  app_icon_loaders_.push_back(std::move(chrome_app_icon_loader));
 
   if (arc::IsArcAllowedForProfile(profile_)) {
     std::unique_ptr<AppIconLoader> arc_app_icon_loader =
         base::MakeUnique<ArcAppIconLoader>(
             profile_, extension_misc::EXTENSION_ICON_SMALL, this);
     app_icon_loaders_.push_back(std::move(arc_app_icon_loader));
   }
 
   SetShelfBehaviorsFromPrefs();
 }
@@ skipping 31 matching lines @@
   // This will uselessly store a preference value for invalid display ids.
   ash::launcher::SetShelfAutoHideBehaviorPref(profile_->GetPrefs(), display_id,
                                               auto_hide);
 }
 
 void ChromeLauncherController::OnAppImageUpdated(const std::string& app_id,
                                                  const gfx::ImageSkia& image) {
   // Implemented by subclasses; this should not be called.
   NOTREACHED();
 }