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

Unified Diff: chrome/browser/ui/app_list/extension_app_item.cc

Issue 25859005: Elim ActivateAppListItem, ChromeAppListItem (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix static cast in AppModelBuilder, add AppType Created 7 years, 2 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/extension_app_item.cc
diff --git a/chrome/browser/ui/app_list/extension_app_item.cc b/chrome/browser/ui/app_list/extension_app_item.cc
index 6050cb7b01c67c83be0f7525190f3409e765ae40..de9219424d0ba9a5cfd758564e3c21bca57fda9b 100644
--- a/chrome/browser/ui/app_list/extension_app_item.cc
+++ b/chrome/browser/ui/app_list/extension_app_item.cc
@@ -71,8 +71,7 @@ ExtensionAppItem::ExtensionAppItem(Profile* profile,
const std::string& extension_name,
const gfx::ImageSkia& installing_icon,
bool is_platform_app)
- : ChromeAppListItem(TYPE_APP),
- profile_(profile),
+ : profile_(profile),
extension_id_(extension_id),
controller_(controller),
extension_name_(extension_name),
@@ -80,7 +79,7 @@ ExtensionAppItem::ExtensionAppItem(Profile* profile,
gfx::ImageSkiaOperations::CreateHSLShiftedImage(installing_icon,
shift)),
is_platform_app_(is_platform_app) {
- Reload();
+ Update();
GetExtensionSorting(profile_)->EnsureValidOrdinals(extension_id_,
syncer::StringOrdinal());
}
@@ -96,7 +95,7 @@ bool ExtensionAppItem::HasOverlay() const {
#endif
}
-void ExtensionAppItem::Reload() {
+void ExtensionAppItem::Update() {
const Extension* extension = GetExtension();
bool is_installing = !extension;
SetIsInstalling(is_installing);
@@ -252,6 +251,15 @@ void ExtensionAppItem::ExtensionEnableFlowAborted(bool user_initiated) {
controller_->OnCloseExtensionPrompt();
}
+// static
+std::string ExtensionAppItem::ExtensionAppType() {
+ return "ExtensionAppItem";
+}
+
+std::string ExtensionAppItem::AppType() const {
+ return ExtensionAppType();
+}
+
void ExtensionAppItem::Activate(int event_flags) {
// |extension| could be NULL when it is being unloaded for updating.
const Extension* extension = GetExtension();

Powered by Google App Engine
This is Rietveld 408576698