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

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

Issue 1507193002: Fix several crashes for ARC app launcher. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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/model_pref_updater.cc
diff --git a/chrome/browser/ui/app_list/model_pref_updater.cc b/chrome/browser/ui/app_list/model_pref_updater.cc
index ea79bd9d58473968ea12092466fc45a41178b885..8c0255723b3ff24c53a25ecb87b6b543c1b4eb44 100644
--- a/chrome/browser/ui/app_list/model_pref_updater.cc
+++ b/chrome/browser/ui/app_list/model_pref_updater.cc
@@ -10,6 +10,10 @@
#include "ui/app_list/app_list_item.h"
#include "ui/app_list/app_list_model.h"
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/ui/app_list/arc/arc_app_item.h"
+#endif
+
namespace app_list {
ModelPrefUpdater::ModelPrefUpdater(AppListPrefs* app_list_prefs,
@@ -41,6 +45,10 @@ void ModelPrefUpdater::UpdatePrefsFromAppListItem(AppListItem* item) {
info.item_type = AppListPrefs::AppListInfo::FOLDER_ITEM;
else if (item->GetItemType() == ExtensionAppItem::kItemType)
info.item_type = AppListPrefs::AppListInfo::APP_ITEM;
+#if defined(OS_CHROMEOS)
+ else if (item->GetItemType() == ArcAppItem::kItemType)
khmel 2015/12/08 05:42:51 'grep -r "ExtensionAppItem::kItemType" --include=*
+ info.item_type = AppListPrefs::AppListInfo::APP_ITEM;
+#endif
else
NOTREACHED();

Powered by Google App Engine
This is Rietveld 408576698