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

Unified Diff: chrome/browser/ui/app_list/search/launcher_search/launcher_search_icon_image_loader_impl.cc

Issue 1200543003: Migrate LauncherSearchResult to use SetBadgeIcon. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: CHECK -> DCHECK. Created 5 years, 6 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
Index: chrome/browser/ui/app_list/search/launcher_search/launcher_search_icon_image_loader_impl.cc
diff --git a/chrome/browser/ui/app_list/search/launcher_search/extension_badged_icon_image_impl.cc b/chrome/browser/ui/app_list/search/launcher_search/launcher_search_icon_image_loader_impl.cc
similarity index 66%
rename from chrome/browser/ui/app_list/search/launcher_search/extension_badged_icon_image_impl.cc
rename to chrome/browser/ui/app_list/search/launcher_search/launcher_search_icon_image_loader_impl.cc
index 496b8da3de35b7119dd90683ff908bdb962f8169..6664837ba5d63e3b9ca3055fc871c119c08f6107 100644
--- a/chrome/browser/ui/app_list/search/launcher_search/extension_badged_icon_image_impl.cc
+++ b/chrome/browser/ui/app_list/search/launcher_search/launcher_search_icon_image_loader_impl.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/ui/app_list/search/launcher_search/extension_badged_icon_image_impl.h"
+#include "chrome/browser/ui/app_list/search/launcher_search/launcher_search_icon_image_loader_impl.h"
#include "chrome/browser/extensions/extension_util.h"
#include "extensions/browser/image_loader.h"
@@ -11,25 +11,25 @@
namespace app_list {
-ExtensionBadgedIconImageImpl::ExtensionBadgedIconImageImpl(
+LauncherSearchIconImageLoaderImpl::LauncherSearchIconImageLoaderImpl(
const GURL& custom_icon_url,
Profile* profile,
const extensions::Extension* extension,
const int icon_dimension,
scoped_ptr<chromeos::launcher_search_provider::ErrorReporter>
error_reporter)
- : ExtensionBadgedIconImage(custom_icon_url,
- profile,
- extension,
- icon_dimension,
- error_reporter.Pass()),
+ : LauncherSearchIconImageLoader(custom_icon_url,
+ profile,
+ extension,
+ icon_dimension,
+ error_reporter.Pass()),
weak_ptr_factory_(this) {
}
-ExtensionBadgedIconImageImpl::~ExtensionBadgedIconImageImpl() {
+LauncherSearchIconImageLoaderImpl::~LauncherSearchIconImageLoaderImpl() {
}
-const gfx::ImageSkia& ExtensionBadgedIconImageImpl::LoadExtensionIcon() {
+const gfx::ImageSkia& LauncherSearchIconImageLoaderImpl::LoadExtensionIcon() {
extension_icon_image_.reset(new extensions::IconImage(
profile_, extension_, extensions::IconsInfo::GetIcons(extension_),
icon_size_.width(), extensions::util::GetDefaultExtensionIcon(), this));
@@ -37,7 +37,7 @@ const gfx::ImageSkia& ExtensionBadgedIconImageImpl::LoadExtensionIcon() {
return extension_icon_image_->image_skia();
}
-void ExtensionBadgedIconImageImpl::LoadIconResourceFromExtension() {
+void LauncherSearchIconImageLoaderImpl::LoadIconResourceFromExtension() {
const base::FilePath& file_path =
extensions::file_util::ExtensionURLToRelativeFilePath(icon_url_);
const extensions::ExtensionResource& resource =
@@ -47,23 +47,22 @@ void ExtensionBadgedIconImageImpl::LoadIconResourceFromExtension() {
// DPI is done in BadgedIconSource.
std::vector<extensions::ImageLoader::ImageRepresentation> info_list;
info_list.push_back(extensions::ImageLoader::ImageRepresentation(
- resource,
- extensions::ImageLoader::ImageRepresentation::RESIZE_WHEN_LARGER,
+ resource, extensions::ImageLoader::ImageRepresentation::ALWAYS_RESIZE,
gfx::Size(icon_size_.width() * 2, icon_size_.height() * 2),
ui::SCALE_FACTOR_200P));
extensions::ImageLoader::Get(profile_)->LoadImagesAsync(
extension_, info_list,
- base::Bind(&ExtensionBadgedIconImageImpl::OnCustomIconImageLoaded,
+ base::Bind(&LauncherSearchIconImageLoaderImpl::OnCustomIconImageLoaded,
weak_ptr_factory_.GetWeakPtr()));
}
-void ExtensionBadgedIconImageImpl::OnExtensionIconImageChanged(
+void LauncherSearchIconImageLoaderImpl::OnExtensionIconImageChanged(
extensions::IconImage* image) {
DCHECK_EQ(extension_icon_image_, image);
OnExtensionIconChanged(extension_icon_image_->image_skia());
}
-void ExtensionBadgedIconImageImpl::OnCustomIconImageLoaded(
+void LauncherSearchIconImageLoaderImpl::OnCustomIconImageLoaded(
const gfx::Image& image) {
OnCustomIconLoaded(image.AsImageSkia());
}

Powered by Google App Engine
This is Rietveld 408576698