Enable apple touch icons to be used with bookmark apps disabled.

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 <stddef.h>
 
 #include <string>
 #include <vector>
 
-#include "base/command_line.h"
-#include "base/feature_list.h"
 #include "base/json/json_reader.h"
 #include "base/strings/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 "build/build_config.h"
-#include "chrome/common/chrome_features.h"
 #include "chrome/common/web_application_info.h"
 #include "third_party/WebKit/public/platform/WebIconSizesParser.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebElement.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebNode.h"
 #include "ui/gfx/geometry/size.h"
 #include "url/gurl.h"
@@ skipping 110 matching lines @@
 
     if (elem.HasHTMLTagName("link")) {
       std::string rel = elem.GetAttribute("rel").Utf8();
       // "rel" attribute may use either "icon" or "shortcut icon".
       // see also
       //   <http://en.wikipedia.org/wiki/Favicon>
       //   <http://dev.w3.org/html5/spec/Overview.html#rel-icon>
       //
       // Bookmark apps also support "apple-touch-icon" and
       // "apple-touch-icon-precomposed".
-#if defined(OS_MACOSX)
-      bool bookmark_apps_enabled =
-          base::FeatureList::IsEnabled(features::kBookmarkApps);
-#else
-      bool bookmark_apps_enabled = true;
-#endif
       if (base::LowerCaseEqualsASCII(rel, "icon") ||
           base::LowerCaseEqualsASCII(rel, "shortcut icon") ||
-          (bookmark_apps_enabled &&
-           (base::LowerCaseEqualsASCII(rel, "apple-touch-icon") ||
-            base::LowerCaseEqualsASCII(rel, "apple-touch-icon-precomposed")))) {
+          base::LowerCaseEqualsASCII(rel, "apple-touch-icon") ||
+          base::LowerCaseEqualsASCII(rel, "apple-touch-icon-precomposed")) {
         AddInstallIcon(elem, &app_info->icons);
       }
     } else if (elem.HasHTMLTagName("meta") && elem.HasAttribute("name")) {
       std::string name = elem.GetAttribute("name").Utf8();
       WebString content = elem.GetAttribute("content");
       if (name == "application-name") {
         app_info->title = content.Utf16();
       } else if (name == "description") {
         app_info->description = content.Utf16();
       } 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" &&
                  base::LowerCaseEqualsASCII(content.Utf16(), "yes")) {
         app_info->mobile_capable = WebApplicationInfo::MOBILE_CAPABLE;
       } else if (name == "apple-mobile-web-app-capable" &&
                  base::LowerCaseEqualsASCII(content.Utf16(), "yes") &&
                  app_info->mobile_capable ==
                      WebApplicationInfo::MOBILE_CAPABLE_UNSPECIFIED) {
         app_info->mobile_capable = WebApplicationInfo::MOBILE_CAPABLE_APPLE;
       }
     }
   }
 }
 
 }  // namespace web_apps