Commit 73cf221c authored by Daniel Bratell's avatar Daniel Bratell Committed by Commit Bot

Avoid having two functions named DoesAndroidSupportMaskableIcons

In use_jumbo_build=true builds without goma (i.e. chunk size 50)
chrome/browser/android/webapps/add_to_homescreen_data_fetcher.cc
and chrome/browser/android/webapk/webapk_update_data_fetcher.cc will
compile in the same translation unit and then their (identical)
helper functions DoesAndroidSupportMaskableIcons() then clashed.

It would be nice to only have a single implementation of the function
but since it's just "return false;" and I don't know where it
could be shared I elected to give the functions unique names.

Bug: 988037
Change-Id: I058f1db0c0ec6711e42e5ecfff6b3b016c60a1bb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1720772
Commit-Queue: Daniel Bratell <bratell@opera.com>
Auto-Submit: Daniel Bratell <bratell@opera.com>
Reviewed-by: default avatarPeter Kotwicz <pkotwicz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#681378}
parent 67a679d4
......@@ -35,7 +35,7 @@ using base::android::ScopedJavaLocalRef;
namespace {
bool DoesAndroidSupportMaskableIcons() {
bool DoesAndroidSupportMaskableIconsForWebApk() {
// TODO(crbug.com/977173): re-enable maskable icon support once server support
// is ready.
return false;
......@@ -119,7 +119,7 @@ void WebApkUpdateDataFetcher::FetchInstallableData() {
InstallableParams params;
params.valid_manifest = true;
params.prefer_maskable_icon = DoesAndroidSupportMaskableIcons();
params.prefer_maskable_icon = DoesAndroidSupportMaskableIconsForWebApk();
params.has_worker = true;
params.valid_primary_icon = true;
params.valid_badge_icon = true;
......
......@@ -45,7 +45,7 @@ GURL GetShortcutUrl(content::WebContents* web_contents) {
web_contents->GetVisibleURL());
}
bool DoesAndroidSupportMaskableIcons() {
bool DoesAndroidSupportMaskableIconsForHomescreen() {
// TODO(crbug.com/977173): re-enable maskable icon support once server support
// is ready.
return false;
......@@ -54,7 +54,7 @@ bool DoesAndroidSupportMaskableIcons() {
InstallableParams ParamsToPerformManifestAndIconFetch() {
InstallableParams params;
params.valid_primary_icon = true;
params.prefer_maskable_icon = DoesAndroidSupportMaskableIcons();
params.prefer_maskable_icon = DoesAndroidSupportMaskableIconsForHomescreen();
params.valid_badge_icon = true;
params.wait_for_worker = true;
return params;
......@@ -66,7 +66,7 @@ InstallableParams ParamsToPerformInstallableCheck() {
params.valid_manifest = true;
params.has_worker = true;
params.valid_primary_icon = true;
params.prefer_maskable_icon = DoesAndroidSupportMaskableIcons();
params.prefer_maskable_icon = DoesAndroidSupportMaskableIconsForHomescreen();
params.wait_for_worker = true;
return params;
}
......
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