manifest: add theme_color value to the manifest

content/renderer/manifest/manifest_parser.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 "content/renderer/manifest/manifest_parser.h"
 
 #include "base/json/json_reader.h"
 #include "base/strings/nullable_string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "content/public/common/manifest.h"
 #include "content/renderer/manifest/manifest_uma_util.h"
+#include "third_party/WebKit/public/platform/WebColor.h"
+#include "third_party/WebKit/public/platform/WebString.h"
+#include "third_party/WebKit/public/web/WebCSSParser.h"
+#include "third_party/skia/include/core/SkColor.h"

[mlamouri (slow - plz ping), 2015/07/16 14:53:31]

I don't think you need SkColor.

[Lalit Maganti, 2015/07/16 15:12:28]

Done.

 #include "ui/gfx/geometry/size.h"
 
 namespace content {
 
 namespace {
 
 // Helper function that returns whether the given |str| is a valid width or
 // height value for an icon sizes per:
 // https://html.spec.whatwg.org/multipage/semantics.html#attr-link-sizes
 bool IsValidIconWidthOrHeight(const std::string& str) {
@@ skipping 96 matching lines @@
 
   manifest_.name = ParseName(*dictionary);
   manifest_.short_name = ParseShortName(*dictionary);
   manifest_.start_url = ParseStartURL(*dictionary);
   manifest_.display = ParseDisplay(*dictionary);
   manifest_.orientation = ParseOrientation(*dictionary);
   manifest_.icons = ParseIcons(*dictionary);
   manifest_.related_applications = ParseRelatedApplications(*dictionary);
   manifest_.prefer_related_applications =
       ParsePreferRelatedApplications(*dictionary);
+  manifest_.theme_color = ParseThemeColor(*dictionary);
   manifest_.gcm_sender_id = ParseGCMSenderID(*dictionary);
 
   ManifestUmaUtil::ParseSucceeded(manifest_);
 }
 
 const Manifest& ManifestParser::manifest() const {
   return manifest_;
 }
 
 const std::vector<std::string>& ManifestParser::errors() const {
@@ skipping 258 matching lines @@
   }
 
   return applications;
 }
 
 bool ManifestParser::ParsePreferRelatedApplications(
     const base::DictionaryValue& dictionary) {
   return ParseBoolean(dictionary, "prefer_related_applications", false);
 }
 
+int64_t ManifestParser::ParseThemeColor(
+    const base::DictionaryValue& dictionary) {
+  base::NullableString16 theme_color = ParseString(
+      dictionary, "theme_color", Trim);
+  if (theme_color.is_null())
+    return Manifest::kInvalidOrMissingThemeColor;
+
+  blink::WebColor color;
+  if (!blink::WebCSSParser::parseColor(&color, theme_color.string())) {
+      errors_.push_back(GetErrorPrefix() +
+                        "property 'theme_color' ignored, " +
+                        "invalid color specified.");

[mlamouri (slow - plz ping), 2015/07/16 14:53:31]

Could you include theme_color.string() it would be easier for developers to
debug with that:
"""
"property 'theme_color' ignored, " + theme_color.string() + " is not a valid
color."
"""

[mlamouri (slow - plz ping), 2015/07/16 15:00:49]

You can use UTF16ToASCII(theme_color.string()).

[Lalit Maganti, 2015/07/16 15:12:28]

Done

+      return Manifest::kInvalidOrMissingThemeColor;
+  }
+
+  return static_cast<int64_t>(color);
+}
+
 base::NullableString16 ManifestParser::ParseGCMSenderID(
     const base::DictionaryValue& dictionary)  {
   return ParseString(dictionary, "gcm_sender_id", Trim);
 }
 
 } // namespace content