Commit 3f4961b6 authored by benwells's avatar benwells Committed by Commit Bot

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

There is no reason to restrict use of these icons when bookmark
apps are disabled.

BUG=735926

Review-Url: https://codereview.chromium.org/2954473003
Cr-Commit-Position: refs/heads/master@{#481625}
parent a7cd47aa
......@@ -9,8 +9,6 @@
#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"
......@@ -19,7 +17,6 @@
#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"
......@@ -150,17 +147,10 @@ void ParseWebAppFromWebDocument(WebFrame* frame,
//
// 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")) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment