Commit 467d4e4f authored by Gauthier Ambard's avatar Gauthier Ambard Committed by Commit Bot

Add assets for Search Button popup menu

This CL adds the assets for the actions of the popup menu associated
with the Search button.

Bug: 845491
Cq-Include-Trybots: luci.chromium.try:ios-simulator-full-configs;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: Ie793e1a666d72277c519b4f349f6b5416704e65b
Reviewed-on: https://chromium-review.googlesource.com/1078736
Commit-Queue: Gauthier Ambard <gambard@chromium.org>
Reviewed-by: default avatarOlivier Robin <olivierrobin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#562829}
parent b85ebef5
......@@ -71,6 +71,8 @@ source_set("popup_menu_ui") {
"resources:popup_menu_history",
"resources:popup_menu_new_incognito_tab",
"resources:popup_menu_new_tab",
"resources:popup_menu_paste_and_go",
"resources:popup_menu_qr_scanner",
"resources:popup_menu_read_later",
"resources:popup_menu_reading_list",
"resources:popup_menu_recent_tabs",
......@@ -81,6 +83,7 @@ source_set("popup_menu_ui") {
"resources:popup_menu_settings",
"resources:popup_menu_site_information",
"resources:popup_menu_stop",
"resources:popup_menu_voice_search",
"//base",
"//ios/chrome/app/strings",
"//ios/chrome/browser/ui",
......
......@@ -577,18 +577,18 @@ PopupMenuToolsItem* CreateTableViewItem(int titleID,
NSString* pasteboardString = [UIPasteboard generalPasteboard].string;
if (pasteboardString) {
PopupMenuToolsItem* pasteAndGo = CreateTableViewItem(
IDS_IOS_TOOLS_MENU_PASTE_AND_GO, PopupMenuActionPasteAndGo, nil,
kToolsMenuPasteAndGo);
IDS_IOS_TOOLS_MENU_PASTE_AND_GO, PopupMenuActionPasteAndGo,
@"popup_menu_paste_and_go", kToolsMenuPasteAndGo);
[items addObject:pasteAndGo];
}
PopupMenuToolsItem* QRCodeSearch = CreateTableViewItem(
IDS_IOS_TOOLS_MENU_QR_SCANNER, PopupMenuActionQRCodeSearch, nil,
kToolsMenuQRCodeSearch);
IDS_IOS_TOOLS_MENU_QR_SCANNER, PopupMenuActionQRCodeSearch,
@"popup_menu_qr_scanner", kToolsMenuQRCodeSearch);
[items addObject:QRCodeSearch];
PopupMenuToolsItem* voiceSearch = CreateTableViewItem(
IDS_IOS_TOOLS_MENU_VOICE_SEARCH, PopupMenuActionVoiceSearch, nil,
kToolsMenuVoiceSearch);
IDS_IOS_TOOLS_MENU_VOICE_SEARCH, PopupMenuActionVoiceSearch,
@"popup_menu_voice_search", kToolsMenuVoiceSearch);
[items addObject:voiceSearch];
self.items = @[ items ];
......
......@@ -4,6 +4,33 @@
import("//build/config/ios/asset_catalog.gni")
imageset("popup_menu_paste_and_go") {
sources = [
"popup_menu_paste_and_go.imageset/Contents.json",
"popup_menu_paste_and_go.imageset/popup_menu_paste_and_go.png",
"popup_menu_paste_and_go.imageset/popup_menu_paste_and_go@2x.png",
"popup_menu_paste_and_go.imageset/popup_menu_paste_and_go@3x.png",
]
}
imageset("popup_menu_qr_scanner") {
sources = [
"popup_menu_qr_scanner.imageset/Contents.json",
"popup_menu_qr_scanner.imageset/popup_menu_qr_scanner.png",
"popup_menu_qr_scanner.imageset/popup_menu_qr_scanner@2x.png",
"popup_menu_qr_scanner.imageset/popup_menu_qr_scanner@3x.png",
]
}
imageset("popup_menu_voice_search") {
sources = [
"popup_menu_voice_search.imageset/Contents.json",
"popup_menu_voice_search.imageset/popup_menu_voice_search.png",
"popup_menu_voice_search.imageset/popup_menu_voice_search@2x.png",
"popup_menu_voice_search.imageset/popup_menu_voice_search@3x.png",
]
}
imageset("popup_menu_read_later") {
sources = [
"popup_menu_read_later.imageset/Contents.json",
......
{
"images": [
{
"idiom": "universal",
"scale": "1x",
"filename": "popup_menu_paste_and_go.png"
},
{
"idiom": "universal",
"scale": "2x",
"filename": "popup_menu_paste_and_go@2x.png"
},
{
"idiom": "universal",
"scale": "3x",
"filename": "popup_menu_paste_and_go@3x.png"
}
],
"info": {
"version": 1,
"author": "xcode"
}
}
{
"images": [
{
"idiom": "universal",
"scale": "1x",
"filename": "popup_menu_qr_scanner.png"
},
{
"idiom": "universal",
"scale": "2x",
"filename": "popup_menu_qr_scanner@2x.png"
},
{
"idiom": "universal",
"scale": "3x",
"filename": "popup_menu_qr_scanner@3x.png"
}
],
"info": {
"version": 1,
"author": "xcode"
}
}
{
"images": [
{
"idiom": "universal",
"scale": "1x",
"filename": "popup_menu_voice_search.png"
},
{
"idiom": "universal",
"scale": "2x",
"filename": "popup_menu_voice_search@2x.png"
},
{
"idiom": "universal",
"scale": "3x",
"filename": "popup_menu_voice_search@3x.png"
}
],
"info": {
"version": 1,
"author": "xcode"
}
}
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