Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2133)

Unified Diff: chrome/renderer/web_apps.cc

Issue 2954473003: Enable apple touch icons to be used with bookmark apps disabled. (Closed)
Patch Set: Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/web_apps.cc
diff --git a/chrome/renderer/web_apps.cc b/chrome/renderer/web_apps.cc
index 43c6056cce99f2d4db846a9c291f9c6c0ad72130..ec1a1a9268beb18fe3ad0aba5c9be5d07727da36 100644
--- a/chrome/renderer/web_apps.cc
+++ b/chrome/renderer/web_apps.cc
@@ -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")) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698