Remove WebApkAdaptiveIcon feature flag.
Feature has been launched to stable.
Bug: 1147291
Change-Id: I326292a7b38aba0f5a8d71f1dab908f4707c78b3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2542848
Commit-Queue: Evan Stade <[email protected]>
Reviewed-by: Dominick Ng <[email protected]>
Reviewed-by: Glenn Hartmann <[email protected]>
Cr-Commit-Position: refs/heads/master@{#828269}
diff --git a/chrome/browser/android/shortcut_helper.cc b/chrome/browser/android/shortcut_helper.cc
index 768e612..7c5c5db8 100644
--- a/chrome/browser/android/shortcut_helper.cc
+++ b/chrome/browser/android/shortcut_helper.cc
@@ -13,7 +13,6 @@
#include "base/android/jni_string.h"
#include "base/bind.h"
#include "base/callback.h"
-#include "base/feature_list.h"
#include "base/guid.h"
#include "base/optional.h"
#include "base/strings/string16.h"
@@ -21,7 +20,6 @@
#include "base/threading/thread_restrictions.h"
#include "chrome/android/chrome_jni_headers/ShortcutHelper_jni.h"
#include "chrome/browser/android/color_helpers.h"
-#include "chrome/browser/flags/android/chrome_feature_list.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/manifest_icon_downloader.h"
#include "content/public/browser/web_contents.h"
@@ -347,9 +345,8 @@
// static
bool ShortcutHelper::DoesAndroidSupportMaskableIcons() {
- return base::FeatureList::IsEnabled(chrome::android::kWebApkAdaptiveIcon) &&
- base::android::BuildInfo::GetInstance()->sdk_int() >=
- base::android::SDK_VERSION_OREO;
+ return base::android::BuildInfo::GetInstance()->sdk_int() >=
+ base::android::SDK_VERSION_OREO;
}
// static
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
index f10166c7..adc691a 100644
--- a/chrome/browser/flags/android/chrome_feature_list.cc
+++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -228,7 +228,6 @@
&kUpdateNotificationScheduleServiceImmediateShowOption,
&kVoiceButtonInTopToolbar,
&kVrBrowsingFeedback,
- &kWebApkAdaptiveIcon,
&kPrefetchNotificationSchedulingIntegration,
&features::kDnsOverHttps,
&net::features::kSameSiteByDefaultCookies,
@@ -671,9 +670,6 @@
const base::Feature kVrBrowsingFeedback{"VrBrowsingFeedback",
base::FEATURE_ENABLED_BY_DEFAULT};
-const base::Feature kWebApkAdaptiveIcon{"WebApkAdaptiveIcon",
- base::FEATURE_ENABLED_BY_DEFAULT};
-
static jboolean JNI_ChromeFeatureList_IsEnabled(
JNIEnv* env,
const JavaParamRef<jstring>& jfeature_name) {
diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
index 075e09bd..0c892f6 100644
--- a/chrome/browser/flags/android/chrome_feature_list.h
+++ b/chrome/browser/flags/android/chrome_feature_list.h
@@ -137,7 +137,6 @@
extern const base::Feature kUserMediaScreenCapturing;
extern const base::Feature kVoiceButtonInTopToolbar;
extern const base::Feature kVrBrowsingFeedback;
-extern const base::Feature kWebApkAdaptiveIcon;
extern const base::Feature kPrefetchNotificationSchedulingIntegration;
} // namespace android
diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
index a95fd14..fbd444d 100644
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -453,7 +453,6 @@
public static final String USE_CHIME_ANDROID_SDK = "UseChimeAndroidSdk";
public static final String VOICE_BUTTON_IN_TOP_TOOLBAR = "VoiceButtonInTopToolbar";
public static final String VR_BROWSING_FEEDBACK = "VrBrowsingFeedback";
- public static final String WEBAPK_ADAPTIVE_ICON = "WebApkAdaptiveIcon";
public static final String WEB_AUTH = "WebAuthentication";
public static final String WEB_AUTH_PHONE_SUPPORT = "WebAuthenticationPhoneSupport";
