Commit 3debd6e1 authored by Zhuoyu Qian's avatar Zhuoyu Qian Committed by Commit Bot

Rename SetShortcutInfos to SetShortcutsMenuItemInfos.

Bug: 1100751
Change-Id: I19f9a410341f777fff944dbfc2420ea8df872def
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2344441Reviewed-by: default avatarDaniel Murphy <dmurph@chromium.org>
Commit-Queue: Zhuoyu Qian <zhuoyu.qian@samsung.com>
Cr-Commit-Position: refs/heads/master@{#796680}
parent e5a99311
...@@ -209,8 +209,9 @@ void WebApp::SetProtocolHandlers( ...@@ -209,8 +209,9 @@ void WebApp::SetProtocolHandlers(
protocol_handlers_ = std::move(handlers); protocol_handlers_ = std::move(handlers);
} }
void WebApp::SetShortcutInfos(std::vector<WebApplicationShortcutsMenuItemInfo> void WebApp::SetShortcutsMenuItemInfos(
shortcuts_menu_item_infos) { std::vector<WebApplicationShortcutsMenuItemInfo>
shortcuts_menu_item_infos) {
shortcuts_menu_item_infos_ = std::move(shortcuts_menu_item_infos); shortcuts_menu_item_infos_ = std::move(shortcuts_menu_item_infos);
} }
......
...@@ -179,8 +179,9 @@ class WebApp { ...@@ -179,8 +179,9 @@ class WebApp {
// Performs sorting of |sizes| vector. Must be called rarely. // Performs sorting of |sizes| vector. Must be called rarely.
void SetDownloadedIconSizes(std::vector<SquareSizePx> sizes); void SetDownloadedIconSizes(std::vector<SquareSizePx> sizes);
void SetIsGeneratedIcon(bool is_generated_icon); void SetIsGeneratedIcon(bool is_generated_icon);
void SetShortcutInfos(std::vector<WebApplicationShortcutsMenuItemInfo> void SetShortcutsMenuItemInfos(
shortcuts_menu_item_infos); std::vector<WebApplicationShortcutsMenuItemInfo>
shortcuts_menu_item_infos);
void SetDownloadedShortcutsMenuIconsSizes( void SetDownloadedShortcutsMenuIconsSizes(
std::vector<std::vector<SquareSizePx>> icon_sizes); std::vector<std::vector<SquareSizePx>> icon_sizes);
void SetFileHandlers(apps::FileHandlers file_handlers); void SetFileHandlers(apps::FileHandlers file_handlers);
......
...@@ -423,7 +423,7 @@ std::unique_ptr<WebApp> WebAppDatabase::CreateWebApp( ...@@ -423,7 +423,7 @@ std::unique_ptr<WebApp> WebAppDatabase::CreateWebApp(
} }
shortcuts_menu_item_infos.emplace_back(std::move(shortcut_info)); shortcuts_menu_item_infos.emplace_back(std::move(shortcut_info));
} }
web_app->SetShortcutInfos(std::move(shortcuts_menu_item_infos)); web_app->SetShortcutsMenuItemInfos(std::move(shortcuts_menu_item_infos));
std::vector<std::vector<SquareSizePx>> shortcuts_menu_icons_sizes; std::vector<std::vector<SquareSizePx>> shortcuts_menu_icons_sizes;
for (const auto& shortcuts_icon_sizes_proto : for (const auto& shortcuts_icon_sizes_proto :
......
...@@ -252,7 +252,8 @@ class WebAppDatabaseTest : public WebAppTest { ...@@ -252,7 +252,8 @@ class WebAppDatabaseTest : public WebAppTest {
} }
app->SetAdditionalSearchTerms(std::move(additional_search_terms)); app->SetAdditionalSearchTerms(std::move(additional_search_terms));
app->SetShortcutInfos(CreateShortcutInfos(base_url, random.next_uint())); app->SetShortcutsMenuItemInfos(
CreateShortcutInfos(base_url, random.next_uint()));
app->SetDownloadedShortcutsMenuIconsSizes( app->SetDownloadedShortcutsMenuIconsSizes(
CreateDownloadedShortcutsMenuIconsSizes()); CreateDownloadedShortcutsMenuIconsSizes());
......
...@@ -453,7 +453,7 @@ void WebAppInstallFinalizer::SetWebAppManifestFieldsAndWriteData( ...@@ -453,7 +453,7 @@ void WebAppInstallFinalizer::SetWebAppManifestFieldsAndWriteData(
GetSquareSizePxs(web_app_info.icon_bitmaps_any)); GetSquareSizePxs(web_app_info.icon_bitmaps_any));
web_app->SetIsGeneratedIcon(web_app_info.is_generated_icon); web_app->SetIsGeneratedIcon(web_app_info.is_generated_icon);
web_app->SetShortcutInfos(web_app_info.shortcuts_menu_item_infos); web_app->SetShortcutsMenuItemInfos(web_app_info.shortcuts_menu_item_infos);
web_app->SetDownloadedShortcutsMenuIconsSizes( web_app->SetDownloadedShortcutsMenuIconsSizes(
GetDownloadedShortcutsMenuIconsSizes( GetDownloadedShortcutsMenuIconsSizes(
web_app_info.shortcuts_menu_icons_bitmaps)); web_app_info.shortcuts_menu_icons_bitmaps));
......
...@@ -240,7 +240,7 @@ std::unique_ptr<WebApp> WebAppMigrationManager::MigrateBookmarkApp( ...@@ -240,7 +240,7 @@ std::unique_ptr<WebApp> WebAppMigrationManager::MigrateBookmarkApp(
if (base::FeatureList::IsEnabled( if (base::FeatureList::IsEnabled(
features::kDesktopPWAsAppIconShortcutsMenu)) { features::kDesktopPWAsAppIconShortcutsMenu)) {
web_app->SetShortcutInfos( web_app->SetShortcutsMenuItemInfos(
bookmark_app_registrar_.GetAppShortcutInfos(app_id)); bookmark_app_registrar_.GetAppShortcutInfos(app_id));
web_app->SetDownloadedShortcutsMenuIconsSizes( web_app->SetDownloadedShortcutsMenuIconsSizes(
bookmark_app_registrar_.GetAppDownloadedShortcutsMenuIconsSizes( bookmark_app_registrar_.GetAppDownloadedShortcutsMenuIconsSizes(
......
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