Mirror app list hierarchy data in profile prefs.

chrome/browser/ui/app_list/app_list_prefs.cc

+// Copyright 2014 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 "base/prefs/pref_service.h"
+#include "base/prefs/scoped_user_pref_update.h"
+#include "chrome/browser/ui/app_list/app_list_prefs.h"
+#include "chrome/browser/ui/app_list/app_list_prefs_factory.h"
+#include "components/pref_registry/pref_registry_syncable.h"
+
+namespace app_list {
+
+namespace {
+
+// App list ordering and folder data.
+const char kPrefModel[] = "app_list.model";
+
+const char kModelItemPosition[] = "position";
+const char kModelItemType[] = "item_type";
+const char kModelItemFolderId[] = "folder_id";
+const char kModelItemName[] = "name";
+
+}  // namespace
+
+// static
+void AppListPrefs::RegisterProfilePrefs(
+    user_prefs::PrefRegistrySyncable* registry) {
+  registry->RegisterDictionaryPref(
+      kPrefModel, user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+}
+
+// static
+AppListPrefs* AppListPrefs::Create(PrefService* pref_service) {
+  return new AppListPrefs(pref_service);
+}
+
+// static
+AppListPrefs* AppListPrefs::Get(content::BrowserContext* context) {
+  return AppListPrefsFactory::GetInstance()->GetForBrowserContext(context);
+}
+
+AppListPrefs::AppListInfo::AppListInfo(const base::DictionaryValue* item_dict) {

[Matt Giuca, 2014/09/30 02:49:46]

Add comments delineating the methods of different types, like:

// AppListInfo

and later

// AppListPrefs

(This will make more sense when you move AppListInfo to the top of the class.)

[calamity, 2014/09/30 05:40:08]

Done.

+  std::string item_ordinal_string;
+  int item_type_int = -1;
+  if (!item_dict->GetString(kModelItemPosition, &item_ordinal_string) ||
+      !item_dict->GetString(kModelItemFolderId, &folder_id) ||
+      !item_dict->GetString(kModelItemName, &name) ||
+      !item_dict->GetInteger(kModelItemType, &item_type_int) ||
+      item_type_int < AppListInfo::ITEM_TYPE_BEGIN ||
+      item_type_int > AppListInfo::ITEM_TYPE_END) {
+    item_type = AppListInfo::ITEM_TYPE_INVALID;

[Matt Giuca, 2014/09/30 02:49:47]

Return early; no else.

[calamity, 2014/09/30 05:40:08]

Done.

+  } else {
+    position = syncer::StringOrdinal(item_ordinal_string);
+    item_type = static_cast<ItemType>(item_type_int);
+  }
+}
+
+AppListPrefs::AppListInfo::AppListInfo() : item_type(ITEM_TYPE_INVALID) {
+}
+
+AppListPrefs::AppListInfo::~AppListInfo() {
+}
+
+AppListPrefs::AppListPrefs(PrefService* pref_service)
+    : pref_service_(pref_service) {
+}
+
+AppListPrefs::~AppListPrefs() {
+}
+
+void AppListPrefs::SetAppListInfo(const std::string& id,
+                                  const AppListPrefs::AppListInfo& info) {
+  DictionaryPrefUpdate update(pref_service_, kPrefModel);
+  scoped_ptr<base::DictionaryValue> info_dict(new base::DictionaryValue());

[Matt Giuca, 2014/09/30 02:49:46]

I think this should be a method on AppListInfo:

scoped_ptr<base::DictionaryValue> AppListInfo::ToDict() const;

Then SetAppListInfo can just be a one-liner. If you're taking Steven's advice to
make the constructor into a static factory method (ie FromDict), then it nicely
mirrors that method.

[calamity, 2014/09/30 05:40:08]

Done.

+  info_dict->Set(kModelItemPosition,
+                 new base::StringValue(info.position.ToInternalValue()));
+  info_dict->Set(kModelItemFolderId, new base::StringValue(info.folder_id));
+  info_dict->Set(kModelItemName, new base::StringValue(info.name));
+  info_dict->Set(kModelItemType, new base::FundamentalValue(info.item_type));

[Matt Giuca, 2014/09/30 02:49:46]

Should this be static_cast too?

[calamity, 2014/09/30 05:40:07]

Hmm. Doesn't seem to need to be.

+  update->Set(id, info_dict.release());
+}
+
+scoped_ptr<AppListPrefs::AppListInfo> AppListPrefs::GetAppListInfo(
+    const std::string& id) const {
+  const base::DictionaryValue* model_dict =
+      pref_service_->GetDictionary(kPrefModel);
+  const base::DictionaryValue* item_dict = NULL;
+  if (!model_dict || !model_dict->GetDictionary(id, &item_dict)) {
+    return scoped_ptr<AppListInfo>();
+  }
+
+  scoped_ptr<AppListInfo> info(new AppListInfo(item_dict));
+  if (info->item_type == AppListInfo::ITEM_TYPE_INVALID)
+    return scoped_ptr<AppListInfo>();
+
+  return info.Pass();
+}
+
+std::map<std::string, AppListPrefs::AppListInfo>
+AppListPrefs::GetAllAppListInfos() const {
+  const base::DictionaryValue* model_dict =
+      pref_service_->GetDictionary(kPrefModel);
+  std::map<std::string, AppListInfo> infos;
+  if (!model_dict)
+    return infos;
+
+  for (base::DictionaryValue::Iterator it(*model_dict); !it.IsAtEnd();
+       it.Advance()) {
+    const base::DictionaryValue* item_dict = NULL;
+    it.value().GetAsDictionary(&item_dict);
+    DCHECK(item_dict);
+    infos[it.key()] = AppListInfo(item_dict);
+  }
+  return infos;
+}
+
+void AppListPrefs::DeleteAppListInfo(const std::string& id) {
+  DictionaryPrefUpdate model_dict(pref_service_, kPrefModel);
+  model_dict->Remove(id, NULL);
+}
+
+}  // namespace app_list