Send orientation and display mode from Web Manifest to WebAPK server

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 <stddef.h>
 
 #include "base/json/json_reader.h"
 #include "base/memory/ptr_util.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/public/common/manifest_util.h"
 #include "content/renderer/manifest/manifest_uma_util.h"
 #include "third_party/WebKit/public/platform/WebColor.h"
 #include "third_party/WebKit/public/platform/WebIconSizesParser.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/web/WebCSSParser.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace content {
 
@@ skipping 186 matching lines @@
   }
   return scope;
 }
 
 blink::WebDisplayMode ManifestParser::ParseDisplay(
     const base::DictionaryValue& dictionary) {
   base::NullableString16 display = ParseString(dictionary, "display", Trim);
   if (display.is_null())
     return blink::WebDisplayModeUndefined;
 
-  if (base::LowerCaseEqualsASCII(display.string(), "fullscreen"))
-    return blink::WebDisplayModeFullscreen;
-  else if (base::LowerCaseEqualsASCII(display.string(), "standalone"))
-    return blink::WebDisplayModeStandalone;
-  else if (base::LowerCaseEqualsASCII(display.string(), "minimal-ui"))
-    return blink::WebDisplayModeMinimalUi;
-  else if (base::LowerCaseEqualsASCII(display.string(), "browser"))
-    return blink::WebDisplayModeBrowser;
-  else {
+  blink::WebDisplayMode display_enum =
+      WebDisplayModeFromString(base::UTF16ToUTF8(display.string()));
+  if (display_enum == blink::WebDisplayModeUndefined)
     AddErrorInfo("unknown 'display' value ignored.");
-    return blink::WebDisplayModeUndefined;
-  }
+  return display_enum;
 }
 
 blink::WebScreenOrientationLockType ManifestParser::ParseOrientation(
     const base::DictionaryValue& dictionary) {
   base::NullableString16 orientation =
       ParseString(dictionary, "orientation", Trim);
 
   if (orientation.is_null())
     return blink::WebScreenOrientationLockDefault;
 
-  if (base::LowerCaseEqualsASCII(orientation.string(), "any"))
-    return blink::WebScreenOrientationLockAny;
-  else if (base::LowerCaseEqualsASCII(orientation.string(), "natural"))
-    return blink::WebScreenOrientationLockNatural;
-  else if (base::LowerCaseEqualsASCII(orientation.string(), "landscape"))
-    return blink::WebScreenOrientationLockLandscape;
-  else if (base::LowerCaseEqualsASCII(orientation.string(),
-                                      "landscape-primary"))
-    return blink::WebScreenOrientationLockLandscapePrimary;
-  else if (base::LowerCaseEqualsASCII(orientation.string(),
-                                      "landscape-secondary"))
-    return blink::WebScreenOrientationLockLandscapeSecondary;
-  else if (base::LowerCaseEqualsASCII(orientation.string(), "portrait"))
-    return blink::WebScreenOrientationLockPortrait;
-  else if (base::LowerCaseEqualsASCII(orientation.string(),
-                                      "portrait-primary"))
-    return blink::WebScreenOrientationLockPortraitPrimary;
-  else if (base::LowerCaseEqualsASCII(orientation.string(),
-                                      "portrait-secondary"))
-    return blink::WebScreenOrientationLockPortraitSecondary;
-  else {
+  blink::WebScreenOrientationLockType orientation_enum =
+      WebScreenOrientationLockTypeFromString(
+          base::UTF16ToUTF8(orientation.string()));
+  if (orientation_enum == blink::WebScreenOrientationLockDefault)
     AddErrorInfo("unknown 'orientation' value ignored.");
-    return blink::WebScreenOrientationLockDefault;
-  }
+  return orientation_enum;
 }
 
 GURL ManifestParser::ParseIconSrc(const base::DictionaryValue& icon) {
   return ParseURL(icon, "src", manifest_url_);
 }
 
 base::NullableString16 ManifestParser::ParseIconType(
     const base::DictionaryValue& icon) {
   return ParseString(icon, "type", Trim);
 }
@@ skipping 129 matching lines @@
 }
 
 void ManifestParser::AddErrorInfo(const std::string& error_msg,
                                   bool critical,
                                   int error_line,
                                   int error_column) {
   errors_.push_back({error_msg, critical, error_line, error_column});
 }
 
 } // namespace content