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

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

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.h
diff --git a/chrome/browser/ui/app_list/search/launcher_search/extension_badged_icon_image_impl.h b/chrome/browser/ui/app_list/search/launcher_search/launcher_search_icon_image_loader_impl.h
similarity index 53%
rename from chrome/browser/ui/app_list/search/launcher_search/extension_badged_icon_image_impl.h
rename to chrome/browser/ui/app_list/search/launcher_search/launcher_search_icon_image_loader_impl.h
index ae103bdcafb5b80e31c167a9edf3d4ddd1fe8a40..9e8d813d23c95553c55e551754752f532935837d 100644
--- a/chrome/browser/ui/app_list/search/launcher_search/extension_badged_icon_image_impl.h
+++ b/chrome/browser/ui/app_list/search/launcher_search/launcher_search_icon_image_loader_impl.h
@@ -2,29 +2,29 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_UI_APP_LIST_SEARCH_LAUNCHER_SEARCH_EXTENSION_BADGED_ICON_IMAGE_IMPL_H_
-#define CHROME_BROWSER_UI_APP_LIST_SEARCH_LAUNCHER_SEARCH_EXTENSION_BADGED_ICON_IMAGE_IMPL_H_
+#ifndef CHROME_BROWSER_UI_APP_LIST_SEARCH_LAUNCHER_SEARCH_LAUNCHER_SEARCH_ICON_IMAGE_LOADER_IMPL_H_
+#define CHROME_BROWSER_UI_APP_LIST_SEARCH_LAUNCHER_SEARCH_LAUNCHER_SEARCH_ICON_IMAGE_LOADER_IMPL_H_
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
-#include "chrome/browser/ui/app_list/search/launcher_search/extension_badged_icon_image.h"
+#include "chrome/browser/ui/app_list/search/launcher_search/launcher_search_icon_image_loader.h"
#include "extensions/browser/extension_icon_image.h"
namespace app_list {
-// ExtensionBadgedIconImageImpl loads extension icon and icon resource from
+// LauncherSearchIconImageLoaderImpl loads extension icon and icon resource from
// extension.
-class ExtensionBadgedIconImageImpl : public ExtensionBadgedIconImage,
- extensions::IconImage::Observer {
+class LauncherSearchIconImageLoaderImpl : public LauncherSearchIconImageLoader,
+ extensions::IconImage::Observer {
public:
- ExtensionBadgedIconImageImpl(
+ 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);
- ~ExtensionBadgedIconImageImpl() override;
+ ~LauncherSearchIconImageLoaderImpl() override;
const gfx::ImageSkia& LoadExtensionIcon() override;
void LoadIconResourceFromExtension() override;
@@ -37,11 +37,11 @@ class ExtensionBadgedIconImageImpl : public ExtensionBadgedIconImage,
private:
scoped_ptr<extensions::IconImage> extension_icon_image_;
- base::WeakPtrFactory<ExtensionBadgedIconImageImpl> weak_ptr_factory_;
+ base::WeakPtrFactory<LauncherSearchIconImageLoaderImpl> weak_ptr_factory_;
- DISALLOW_COPY_AND_ASSIGN(ExtensionBadgedIconImageImpl);
+ DISALLOW_COPY_AND_ASSIGN(LauncherSearchIconImageLoaderImpl);
};
} // namespace app_list
-#endif // CHROME_BROWSER_UI_APP_LIST_SEARCH_LAUNCHER_SEARCH_EXTENSION_BADGED_ICON_IMAGE_IMPL_H_
+#endif // CHROME_BROWSER_UI_APP_LIST_SEARCH_LAUNCHER_SEARCH_LAUNCHER_SEARCH_ICON_IMAGE_LOADER_IMPL_H_

Powered by Google App Engine
This is Rietveld 408576698