Commit efba6ba2 authored by Zhuoyu Qian's avatar Zhuoyu Qian Committed by Commit Bot

Rename *ShortcutInfos() to *ShortcutsMenuItemInfos().

This patch rename UpdateShortcutInfosFromManifest() to
UpdateShortcutsMenuItemInfosFromManifest().
And rename CreateShortcutInfos() to CreateShortcutsMenuItemInfos().

Bug: 1100751
Change-Id: Ibffe82bcac99676d6ca89f63df0588d776efae5a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2354126Reviewed-by: default avatarDaniel Murphy <dmurph@chromium.org>
Commit-Queue: Zhuoyu Qian <zhuoyu.qian@samsung.com>
Cr-Commit-Position: refs/heads/master@{#798547}
parent e0aa0ed1
...@@ -77,7 +77,7 @@ void AddSquareIconsFromBitmaps( ...@@ -77,7 +77,7 @@ void AddSquareIconsFromBitmaps(
// Populate |web_app_info|'s shortcuts_menu_item_infos vector using the // Populate |web_app_info|'s shortcuts_menu_item_infos vector using the
// blink::Manifest's shortcuts vector. // blink::Manifest's shortcuts vector.
std::vector<WebApplicationShortcutsMenuItemInfo> std::vector<WebApplicationShortcutsMenuItemInfo>
UpdateShortcutInfosFromManifest( UpdateShortcutsMenuItemInfosFromManifest(
const std::vector<blink::Manifest::ShortcutItem>& shortcuts) { const std::vector<blink::Manifest::ShortcutItem>& shortcuts) {
std::vector<WebApplicationShortcutsMenuItemInfo> web_app_shortcut_infos; std::vector<WebApplicationShortcutsMenuItemInfo> web_app_shortcut_infos;
int num_shortcut_icons = 0; int num_shortcut_icons = 0;
...@@ -216,7 +216,7 @@ void UpdateWebAppInfoFromManifest(const blink::Manifest& manifest, ...@@ -216,7 +216,7 @@ void UpdateWebAppInfoFromManifest(const blink::Manifest& manifest,
base::FeatureList::IsEnabled( base::FeatureList::IsEnabled(
features::kDesktopPWAsAppIconShortcutsMenu)) { features::kDesktopPWAsAppIconShortcutsMenu)) {
web_app_info->shortcuts_menu_item_infos = web_app_info->shortcuts_menu_item_infos =
UpdateShortcutInfosFromManifest(manifest.shortcuts); UpdateShortcutsMenuItemInfosFromManifest(manifest.shortcuts);
} }
} }
......
...@@ -116,9 +116,8 @@ class WebAppDatabaseTest : public WebAppTest { ...@@ -116,9 +116,8 @@ class WebAppDatabaseTest : public WebAppTest {
return protocol_handlers; return protocol_handlers;
} }
static std::vector<WebApplicationShortcutsMenuItemInfo> CreateShortcutInfos( static std::vector<WebApplicationShortcutsMenuItemInfo>
const std::string& base_url, CreateShortcutsMenuItemInfos(const std::string& base_url, uint32_t suffix) {
uint32_t suffix) {
std::vector<WebApplicationShortcutsMenuItemInfo> shortcuts_menu_item_infos; std::vector<WebApplicationShortcutsMenuItemInfo> shortcuts_menu_item_infos;
for (unsigned int i = 0; i < 3; ++i) { for (unsigned int i = 0; i < 3; ++i) {
std::string suffix_str = std::string suffix_str =
...@@ -261,7 +260,7 @@ class WebAppDatabaseTest : public WebAppTest { ...@@ -261,7 +260,7 @@ class WebAppDatabaseTest : public WebAppTest {
app->SetAdditionalSearchTerms(std::move(additional_search_terms)); app->SetAdditionalSearchTerms(std::move(additional_search_terms));
app->SetShortcutsMenuItemInfos( app->SetShortcutsMenuItemInfos(
CreateShortcutInfos(base_url, random.next_uint())); CreateShortcutsMenuItemInfos(base_url, random.next_uint()));
app->SetDownloadedShortcutsMenuIconsSizes( app->SetDownloadedShortcutsMenuIconsSizes(
CreateDownloadedShortcutsMenuIconsSizes()); CreateDownloadedShortcutsMenuIconsSizes());
......
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