1 files changed, 32 insertions, 8 deletions

diff --git a/chrome/browser/chromeos/customization_document.h b/chrome/browser/chromeos/customization_document.h
index ce9d68a..a46d847 100644
--- a/chrome/browser/chromeos/customization_document.h
+++ b/chrome/browser/chromeos/customization_document.h
@@ -5,19 +5,22 @@
 #ifndef CHROME_BROWSER_CHROMEOS_CUSTOMIZATION_DOCUMENT_H_
 #define CHROME_BROWSER_CHROMEOS_CUSTOMIZATION_DOCUMENT_H_
 
-#include <list>
 #include <map>
 #include <string>
+#include <vector>
 
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
 #include "third_party/skia/include/core/SkColor.h"
 
 class DictionaryValue;
+class ListValue;
 class FilePath;
 
 namespace chromeos {
 
+// Base class for OEM customization document classes.
+
 class CustomizationDocument {
  public:
   CustomizationDocument() {}
@@ -38,6 +41,8 @@ class CustomizationDocument {
   DISALLOW_COPY_AND_ASSIGN(CustomizationDocument);
 };
 
+// OEM startup customization document class.
+
 class StartupCustomizationDocument : public CustomizationDocument {
  public:
   struct SetupContent {
@@ -85,24 +90,43 @@ class StartupCustomizationDocument : public CustomizationDocument {
   DISALLOW_COPY_AND_ASSIGN(StartupCustomizationDocument);
 };
 
+// OEM services customization document class.
+
 class ServicesCustomizationDocument : public CustomizationDocument {
  public:
+  typedef std::vector<std::string> StringList;
+
   ServicesCustomizationDocument() {}
 
+  const std::string& initial_start_page_url() const {
+    return initial_start_page_url_;
+  }
+  const std::string& app_menu_section_title() const {
+    return app_menu_section_title_;
+  }
+  const std::string& app_menu_support_page_url() const {
+    return app_menu_support_page_url_;
+  }
+  const StringList& web_apps() const { return web_apps_; }
+  const StringList& extensions() const { return extensions_; }
+
  protected:
   virtual bool ParseFromJsonValue(const DictionaryValue* root);
 
+  bool ParseStringListFromJsonValue(const ListValue* list_value,
+                                    StringList* string_list);
+
   // Partner's welcome page that is opened right after the OOBE.
-  std::string initial_start_page_;
+  std::string initial_start_page_url_;
 
-  // Title for the partner's apps section in apps menu.
-  std::string app_menu_section_title_;
+  // Partner's featured apps URLs list.
+  StringList web_apps_;
 
-  // Partner's featured apps URLs.
-  std::list<std::string> web_apps_;
+  // Partner's featured extensions URLs list.
+  StringList extensions_;
 
-  // Partner's featured extensions URLs.
-  std::list<std::string> extensions_;
+  // Title for the partner's apps section in apps menu.
+  std::string app_menu_section_title_;
 
   // Partner's apps section support page URL.
   std::string app_menu_support_page_url_;