Merge Android RetrieveWebappInformation and Extensions GetApplicationInfo.

chrome/renderer/web_apps.cc

 // Copyright (c) 2012 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 "chrome/renderer/web_apps.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 100 matching lines @@
       sizes->push_back(size);
     }
   }
   if (*is_any && !sizes->empty()) {
     // If is_any is true, it must occur by itself.
     return false;
   }
   return (*is_any || !sizes->empty());
 }
 
-bool ParseWebAppFromWebDocument(WebFrame* frame,
-                                WebApplicationInfo* app_info,
-                                base::string16* error) {
+void ParseWebAppFromWebDocument(WebFrame* frame,
+                                WebApplicationInfo* app_info) {
   WebDocument document = frame->document();
   if (document.isNull())
-    return true;
+    return;
 
   WebElement head = document.head();
   if (head.isNull())
-    return true;
+    return;
 
   GURL document_url = document.url();
   WebNodeList children = head.childNodes();
   for (unsigned i = 0; i < children.length(); ++i) {
     WebNode child = children.item(i);
     if (!child.isElementNode())
       continue;
     WebElement elem = child.to<WebElement>();
 
     if (elem.hasHTMLTagName("link")) {
@@ skipping 19 matching lines @@
       if (name == "application-name") {
         app_info->title = content;
       } else if (name == "description") {
         app_info->description = content;
       } else if (name == "application-url") {
         std::string url = content.utf8();
         app_info->app_url = document_url.is_valid() ?
             document_url.Resolve(url) : GURL(url);
         if (!app_info->app_url.is_valid())
           app_info->app_url = GURL();
+      } else if (name == "mobile-web-app-capable" &&
+                 LowerCaseEqualsASCII(content, "yes")) {
+        app_info->mobile_capable = WebApplicationInfo::MOBILE_CAPABLE;
+      } else if (name == "apple-mobile-web-app-capable" &&
+                 LowerCaseEqualsASCII(content, "yes") &&
+                 app_info->mobile_capable ==
+                    WebApplicationInfo::MOBILE_CAPABLE_UNSPECIFIED) {

[gone, 2014/09/15 16:55:17]

indentation is weird here; seems like it's indented by only 3.

[mlamouri (slow - plz ping), 2014/09/15 20:30:53]

Good catch.

+        app_info->mobile_capable = WebApplicationInfo::MOBILE_CAPABLE_APPLE;
       }
     }
   }
-
-  return true;
 }
 
 }  // namespace web_apps