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 <inttypes.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"
 #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 91 matching lines @@
     ManifestUmaUtil::ParseFailed();
     failed_ = true;
     return;
   }
   DCHECK(dictionary);
 
   manifest_.name = ParseName(*dictionary);
   manifest_.short_name = ParseShortName(*dictionary);
   manifest_.start_url = ParseStartURL(*dictionary);
   manifest_.display = ParseDisplay(*dictionary);
+  manifest_.theme_color = ParseThemeColor(*dictionary);
   manifest_.orientation = ParseOrientation(*dictionary);
   manifest_.icons = ParseIcons(*dictionary);
   manifest_.related_applications = ParseRelatedApplications(*dictionary);
   manifest_.prefer_related_applications =
       ParsePreferRelatedApplications(*dictionary);
   manifest_.gcm_sender_id = ParseGCMSenderID(*dictionary);
 
   ManifestUmaUtil::ParseSucceeded(manifest_);
 }
 
@@ skipping 71 matching lines @@
 
   if (start_url.GetOrigin() != document_url_.GetOrigin()) {
     errors_.push_back(GetErrorPrefix() + "property 'start_url' ignored, should "
                       "be same origin as document.");
     return GURL();
   }
 
   return start_url;
 }
 
+int64_t ManifestParser::ParseThemeColor(
+    const base::DictionaryValue& dictionary) {
+  base::NullableString16 display = ParseString(dictionary, "theme_color", Trim);
+  if (display.is_null())

[mlamouri (slow - plz ping), 2015/07/16 12:35:41]

s/display/theme_color/g

[Lalit Maganti, 2015/07/16 14:49:02]

Done.

+    return Manifest::kInvalidThemeColor;
+
+  blink::WebColor color = SK_ColorTRANSPARENT;

[mlamouri (slow - plz ping), 2015/07/16 12:35:41]

I don't think you need to initialize that.

[Lalit Maganti, 2015/07/16 14:49:02]

Done.

+
+  bool success = blink::WebCSSParser::parseColor(&color, display.string());
+  if (!success) {

[mlamouri (slow - plz ping), 2015/07/16 12:35:40]

You don't need the |success| variable.

[Lalit Maganti, 2015/07/16 14:49:01]

Done.

+      errors_.push_back(GetErrorPrefix() +
+                        "unable to parse 'theme_color' as color.");

[mlamouri (slow - plz ping), 2015/07/16 12:35:40]

nit: follow the same language as the other errors:
"""
"property 'theme_color' ignored, " + theme_color.string() + " is not a valid
color."
"""

[Lalit Maganti, 2015/07/16 14:49:02]

Almost done - the concatenation of the strings did not work due to type issues
so I changed the wording slightly to match other properties.

+      return Manifest::kInvalidThemeColor;
+  }
+
+  int64_t int_color = color;
+  return int_color;

[mlamouri (slow - plz ping), 2015/07/16 12:35:41]

return static_cast<int64>(color);

[Lalit Maganti, 2015/07/16 14:49:01]

Done.

+}
+
 Manifest::DisplayMode ManifestParser::ParseDisplay(
     const base::DictionaryValue& dictionary) {
   base::NullableString16 display = ParseString(dictionary, "display", Trim);
   if (display.is_null())
     return Manifest::DISPLAY_MODE_UNSPECIFIED;
 
   if (base::LowerCaseEqualsASCII(display.string(), "fullscreen"))
     return Manifest::DISPLAY_MODE_FULLSCREEN;
   else if (base::LowerCaseEqualsASCII(display.string(), "standalone"))
     return Manifest::DISPLAY_MODE_STANDALONE;
@@ skipping 178 matching lines @@
     const base::DictionaryValue& dictionary) {
   return ParseBoolean(dictionary, "prefer_related_applications", false);
 }
 
 base::NullableString16 ManifestParser::ParseGCMSenderID(
     const base::DictionaryValue& dictionary)  {
   return ParseString(dictionary, "gcm_sender_id", Trim);
 }
 
 } // namespace content