Action box menu

chrome/browser/extensions/extension_prefs.cc

Index: chrome/browser/extensions/extension_prefs.cc
diff --git a/chrome/browser/extensions/extension_prefs.cc b/chrome/browser/extensions/extension_prefs.cc
index dbbbf8d4115408fe03d568fca98e441d763afe32..8ee1200c4e7b9f7ff8e3d3d17d802fd068584563 100644
--- a/chrome/browser/extensions/extension_prefs.cc
+++ b/chrome/browser/extensions/extension_prefs.cc
@@ -70,6 +70,15 @@ const char kPrefDisableReason[] = "disable_reason";
 // object stored in the Preferences file. The extensions are stored by ID.
 const char kExtensionToolbar[] = "extensions.toolbar";
 
+// A preference that tracks order of extensions in an action box
+// (list of extension ids).
+const char kExtensionActionBox[] = "extensions.action_box_order";
+
+// A preference that tracks order of extensions in an toolbar when
+// action box enabled (list of extension ids).
+const char kExtensionActionBoxBar[] =
+    "extensions.toolbar_order_with_action_box";
+
 // The key for a serialized Time value indicating the start of the day (from the
 // server's perspective) an extension last included a "ping" parameter during
 // its update check.
@@ -1176,27 +1185,26 @@ bool ExtensionPrefs::IsExtensionDisabled(
 }
 
 std::vector<std::string> ExtensionPrefs::GetToolbarOrder() {
-  ExtensionIdSet extension_ids;
-  const ListValue* toolbar_order = prefs_->GetList(kExtensionToolbar);
-  if (toolbar_order) {
-    for (size_t i = 0; i < toolbar_order->GetSize(); ++i) {
-      std::string extension_id;
-      if (toolbar_order->GetString(i, &extension_id))
-        extension_ids.push_back(extension_id);
-    }
-  }
-  return extension_ids;
+  bool action_box_enabled = extensions::switch_utils::IsActionBoxEnabled();
+  return GetExtensionPrefAsVector(
+      action_box_enabled ? kExtensionActionBoxBar : kExtensionToolbar);
 }
 
 void ExtensionPrefs::SetToolbarOrder(
     const std::vector<std::string>& extension_ids) {
-  ListPrefUpdate update(prefs_, kExtensionToolbar);
-  ListValue* toolbar_order = update.Get();
-  toolbar_order->Clear();
-  for (std::vector<std::string>::const_iterator iter = extension_ids.begin();
-       iter != extension_ids.end(); ++iter) {
-    toolbar_order->Append(new StringValue(*iter));
-  }
+  bool action_box_enabled = extensions::switch_utils::IsActionBoxEnabled();
+  SetExtensionPrefFromVector(
+      action_box_enabled ? kExtensionActionBoxBar : kExtensionToolbar,
+      extension_ids);
+}
+
+std::vector<std::string> ExtensionPrefs::GetActionBoxOrder() {
+  return GetExtensionPrefAsVector(kExtensionActionBox);
+}
+
+void ExtensionPrefs::SetActionBoxOrder(
+    const std::vector<std::string>& extension_ids) {
+  SetExtensionPrefFromVector(kExtensionActionBox, extension_ids);
 }
 
 void ExtensionPrefs::OnExtensionInstalled(
@@ -1913,6 +1921,8 @@ URLPatternSet ExtensionPrefs::GetAllowedInstallSites() {
 void ExtensionPrefs::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterDictionaryPref(kExtensionsPref, PrefService::UNSYNCABLE_PREF);
   prefs->RegisterListPref(kExtensionToolbar, PrefService::UNSYNCABLE_PREF);
+  prefs->RegisterListPref(kExtensionActionBox, PrefService::UNSYNCABLE_PREF);
+  prefs->RegisterListPref(kExtensionActionBoxBar, PrefService::UNSYNCABLE_PREF);
   prefs->RegisterIntegerPref(prefs::kExtensionToolbarSize,
                              -1,  // default value
                              PrefService::UNSYNCABLE_PREF);
@@ -1940,4 +1950,29 @@ void ExtensionPrefs::RegisterUserPrefs(PrefService* prefs) {
                           PrefService::UNSYNCABLE_PREF);
 }
 
+std::vector<std::string> ExtensionPrefs::GetExtensionPrefAsVector(
+    const char* pref) {
+  ExtensionIdSet extension_ids;
+  const ListValue* list_of_values = prefs_->GetList(pref);
+  if (!list_of_values)
+    return extension_ids;
+
+  for (size_t i = 0; i < list_of_values->GetSize(); ++i) {
+    std::string extension_id;
+    if (list_of_values->GetString(i, &extension_id))
+      extension_ids.push_back(extension_id);
+  }
+  return extension_ids;
+}
+
+void ExtensionPrefs::SetExtensionPrefFromVector(const char* pref,
+    const std::vector<std::string>& strings) {
+  ListPrefUpdate update(prefs_, pref);
+  ListValue* list_of_values = update.Get();
+  list_of_values->Clear();
+  for (std::vector<std::string>::const_iterator iter = strings.begin();
+       iter != strings.end(); ++iter)
+    list_of_values->Append(new StringValue(*iter));
+}
+
 }  // namespace extensions