Revert "[omnibox] Add and load Pedal concept data for de, en, fr, ja, zh-CN"
This reverts commit 1e6642b0358084c7d9069dca4fd03cad16641700.
Reason for revert: This change broke a translation extraction tool process outside of Chromium. It can probably be updated to handle the change, and better to not be broken in the meantime. For details, see https://crbug.com/954348 : Translation extraction failure (components_strings.grd)
Original change's description:
> [omnibox] Add and load Pedal concept data for de, en, fr, ja, zh-CN
>
> Previously, Pedal concept data was a singular resource in English but
> this CL restructures the resources to load localized data from a
> pak depending on selected language. Data for the first four non-English
> languages localized by the translation team is included.
>
> Bug: 893183
> Change-Id: I0e88d23de65038720a4f3543613ff8bd83dc5444
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1572526
> Reviewed-by: Ted Choc <tedchoc@chromium.org>
> Reviewed-by: Andrew Grieve <agrieve@chromium.org>
> Reviewed-by: Tommy Li <tommycli@chromium.org>
> Commit-Queue: Orin Jaworski <orinj@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#652212}
TBR=tommycli@chromium.org,tedchoc@chromium.org,agrieve@chromium.org,orinj@chromium.org
Change-Id: I0e3a37b3828b164f43275fa937e7a2a9d9a746bd
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 893183
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1574200
Reviewed-by: Orin Jaworski <orinj@chromium.org>
Commit-Queue: Orin Jaworski <orinj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#652368}diff --git a/components/components_strings.grd b/components/components_strings.grd
index 2bf0c34..71e8f629 100644
--- a/components/components_strings.grd
+++ b/components/components_strings.grd
@@ -363,9 +363,5 @@
Privacy
</message>
</messages>
- <includes>
- <!-- This part includes resources that do not require translation or further processing because they are already handled by a separate localization process. -->
- <part file="omnibox/resources/omnibox_resources.grdp" />
- </includes>
</release>
</grit>
diff --git a/components/omnibox/browser/omnibox_pedal_concepts.h b/components/omnibox/browser/omnibox_pedal_concepts.h
index e65f241..cff4d04 100644
--- a/components/omnibox/browser/omnibox_pedal_concepts.h
+++ b/components/omnibox/browser/omnibox_pedal_concepts.h
@@ -8,7 +8,7 @@
#define COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_PEDAL_CONCEPTS_H_
// The runtime loaded data must match this version exactly.
-constexpr int OMNIBOX_PEDAL_CONCEPTS_DATA_VERSION = 14769790;
+constexpr int OMNIBOX_PEDAL_CONCEPTS_DATA_VERSION = 14729733;
// Unique identifiers for Pedals, used to bind loaded data to implementations.
enum class OmniboxPedalId {
diff --git a/components/omnibox/browser/omnibox_pedal_implementations_unittest.cc b/components/omnibox/browser/omnibox_pedal_implementations_unittest.cc
index 777c470..0b3fa75 100644
--- a/components/omnibox/browser/omnibox_pedal_implementations_unittest.cc
+++ b/components/omnibox/browser/omnibox_pedal_implementations_unittest.cc
@@ -64,7 +64,7 @@
const std::vector<std::vector<const char*>> literal_concept_expressions = {
// Note: The lists below are auto-generated from raw synonym group data.
- // CLEAR_BROWSING_DATA
+ // Clear Browsing Data
{
"browser cache clear",
"browser cache delete",
@@ -96,46 +96,11 @@
"browser wipe cache",
"browser wipe data",
"browser wipe history",
- "browsing cache clear",
- "browsing cache delete",
- "browsing cache erase",
- "browsing cache remove",
- "browsing cache wipe",
- "browsing clear cache",
- "browsing clear data",
- "browsing clear history",
- "browsing data clear",
- "browsing data delete",
- "browsing data erase",
- "browsing data remove",
- "browsing data wipe",
- "browsing delete cache",
- "browsing delete data",
- "browsing delete history",
- "browsing erase cache",
- "browsing erase data",
- "browsing erase history",
- "browsing history clear",
- "browsing history delete",
- "browsing history erase",
- "browsing history remove",
- "browsing history wipe",
- "browsing remove cache",
- "browsing remove data",
- "browsing remove history",
- "browsing wipe cache",
- "browsing wipe data",
- "browsing wipe history",
"cache browser clear",
"cache browser delete",
"cache browser erase",
"cache browser remove",
"cache browser wipe",
- "cache browsing clear",
- "cache browsing delete",
- "cache browsing erase",
- "cache browsing remove",
- "cache browsing wipe",
"cache chrome clear",
"cache chrome delete",
"cache chrome erase",
@@ -143,17 +108,14 @@
"cache chrome wipe",
"cache clear",
"cache clear browser",
- "cache clear browsing",
"cache clear chrome",
"cache clear google chrome",
"cache delete",
"cache delete browser",
- "cache delete browsing",
"cache delete chrome",
"cache delete google chrome",
"cache erase",
"cache erase browser",
- "cache erase browsing",
"cache erase chrome",
"cache erase google chrome",
"cache google chrome clear",
@@ -163,12 +125,10 @@
"cache google chrome wipe",
"cache remove",
"cache remove browser",
- "cache remove browsing",
"cache remove chrome",
"cache remove google chrome",
"cache wipe",
"cache wipe browser",
- "cache wipe browsing",
"cache wipe chrome",
"cache wipe google chrome",
"chrome cache clear",
@@ -204,12 +164,8 @@
"clear browser cache",
"clear browser data",
"clear browser history",
- "clear browsing cache",
- "clear browsing data",
- "clear browsing history",
"clear cache",
"clear cache browser",
- "clear cache browsing",
"clear cache chrome",
"clear cache google chrome",
"clear chrome cache",
@@ -217,7 +173,6 @@
"clear chrome history",
"clear data",
"clear data browser",
- "clear data browsing",
"clear data chrome",
"clear data google chrome",
"clear google chrome cache",
@@ -225,7 +180,6 @@
"clear google chrome history",
"clear history",
"clear history browser",
- "clear history browsing",
"clear history chrome",
"clear history google chrome",
"data browser clear",
@@ -233,11 +187,6 @@
"data browser erase",
"data browser remove",
"data browser wipe",
- "data browsing clear",
- "data browsing delete",
- "data browsing erase",
- "data browsing remove",
- "data browsing wipe",
"data chrome clear",
"data chrome delete",
"data chrome erase",
@@ -245,17 +194,14 @@
"data chrome wipe",
"data clear",
"data clear browser",
- "data clear browsing",
"data clear chrome",
"data clear google chrome",
"data delete",
"data delete browser",
- "data delete browsing",
"data delete chrome",
"data delete google chrome",
"data erase",
"data erase browser",
- "data erase browsing",
"data erase chrome",
"data erase google chrome",
"data google chrome clear",
@@ -265,23 +211,17 @@
"data google chrome wipe",
"data remove",
"data remove browser",
- "data remove browsing",
"data remove chrome",
"data remove google chrome",
"data wipe",
"data wipe browser",
- "data wipe browsing",
"data wipe chrome",
"data wipe google chrome",
"delete browser cache",
"delete browser data",
"delete browser history",
- "delete browsing cache",
- "delete browsing data",
- "delete browsing history",
"delete cache",
"delete cache browser",
- "delete cache browsing",
"delete cache chrome",
"delete cache google chrome",
"delete chrome cache",
@@ -289,7 +229,6 @@
"delete chrome history",
"delete data",
"delete data browser",
- "delete data browsing",
"delete data chrome",
"delete data google chrome",
"delete google chrome cache",
@@ -297,18 +236,13 @@
"delete google chrome history",
"delete history",
"delete history browser",
- "delete history browsing",
"delete history chrome",
"delete history google chrome",
"erase browser cache",
"erase browser data",
"erase browser history",
- "erase browsing cache",
- "erase browsing data",
- "erase browsing history",
"erase cache",
"erase cache browser",
- "erase cache browsing",
"erase cache chrome",
"erase cache google chrome",
"erase chrome cache",
@@ -316,7 +250,6 @@
"erase chrome history",
"erase data",
"erase data browser",
- "erase data browsing",
"erase data chrome",
"erase data google chrome",
"erase google chrome cache",
@@ -324,7 +257,6 @@
"erase google chrome history",
"erase history",
"erase history browser",
- "erase history browsing",
"erase history chrome",
"erase history google chrome",
"google chrome cache clear",
@@ -362,11 +294,6 @@
"history browser erase",
"history browser remove",
"history browser wipe",
- "history browsing clear",
- "history browsing delete",
- "history browsing erase",
- "history browsing remove",
- "history browsing wipe",
"history chrome clear",
"history chrome delete",
"history chrome erase",
@@ -374,17 +301,14 @@
"history chrome wipe",
"history clear",
"history clear browser",
- "history clear browsing",
"history clear chrome",
"history clear google chrome",
"history delete",
"history delete browser",
- "history delete browsing",
"history delete chrome",
"history delete google chrome",
"history erase",
"history erase browser",
- "history erase browsing",
"history erase chrome",
"history erase google chrome",
"history google chrome clear",
@@ -394,23 +318,17 @@
"history google chrome wipe",
"history remove",
"history remove browser",
- "history remove browsing",
"history remove chrome",
"history remove google chrome",
"history wipe",
"history wipe browser",
- "history wipe browsing",
"history wipe chrome",
"history wipe google chrome",
"remove browser cache",
"remove browser data",
"remove browser history",
- "remove browsing cache",
- "remove browsing data",
- "remove browsing history",
"remove cache",
"remove cache browser",
- "remove cache browsing",
"remove cache chrome",
"remove cache google chrome",
"remove chrome cache",
@@ -418,7 +336,6 @@
"remove chrome history",
"remove data",
"remove data browser",
- "remove data browsing",
"remove data chrome",
"remove data google chrome",
"remove google chrome cache",
@@ -426,18 +343,13 @@
"remove google chrome history",
"remove history",
"remove history browser",
- "remove history browsing",
"remove history chrome",
"remove history google chrome",
"wipe browser cache",
"wipe browser data",
"wipe browser history",
- "wipe browsing cache",
- "wipe browsing data",
- "wipe browsing history",
"wipe cache",
"wipe cache browser",
- "wipe cache browsing",
"wipe cache chrome",
"wipe cache google chrome",
"wipe chrome cache",
@@ -445,7 +357,6 @@
"wipe chrome history",
"wipe data",
"wipe data browser",
- "wipe data browsing",
"wipe data chrome",
"wipe data google chrome",
"wipe google chrome cache",
@@ -453,12 +364,11 @@
"wipe google chrome history",
"wipe history",
"wipe history browser",
- "wipe history browsing",
"wipe history chrome",
"wipe history google chrome",
},
- // CHANGE_SEARCH_ENGINE
+ // Change Search Engine
{
"browser change default search engine",
"browser change search",
@@ -782,7 +692,7 @@
"switch standard search engine google chrome",
},
- // MANAGE_PASSWORDS
+ // Manage Passwords
{
"browser change passwords",
"browser manage passwords",
@@ -866,7 +776,7 @@
"update passwords google chrome",
},
- // CHANGE_HOME_PAGE
+ // Change Home Page
{
"browser change home page",
"browser change homepage",
@@ -990,7 +900,7 @@
"set homepage google chrome",
},
- // UPDATE_CREDIT_CARD
+ // Update Credit Card
{
"browser card info edit",
"browser card info update",
@@ -1194,7 +1104,7 @@
"update google chrome credit cards",
},
- // LAUNCH_INCOGNITO
+ // Launch Incognito
{
"browser enter incognito",
"browser enter incognito mode",
@@ -1758,7 +1668,7 @@
"start private window google chrome",
},
- // TRANSLATE
+ // Translate
{
"browser change language page",
"browser change language this",
@@ -1882,7 +1792,7 @@
"translate this page google chrome",
},
- // UPDATE_CHROME
+ // Update Chrome
{
"browser install",
"browser update",
diff --git a/components/omnibox/browser/omnibox_pedal_provider.cc b/components/omnibox/browser/omnibox_pedal_provider.cc
index 2e69161..59e466ac 100644
--- a/components/omnibox/browser/omnibox_pedal_provider.cc
+++ b/components/omnibox/browser/omnibox_pedal_provider.cc
@@ -10,10 +10,10 @@
#include "base/strings/string_tokenizer.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
+#include "components/grit/components_resources.h"
#include "components/omnibox/browser/autocomplete_provider_client.h"
#include "components/omnibox/browser/omnibox_pedal.h"
#include "components/omnibox/browser/omnibox_pedal_implementations.h"
-#include "components/strings/grit/components_strings.h"
#include "third_party/zlib/google/compression_utils.h"
#include "ui/base/resource/resource_bundle.h"
@@ -96,11 +96,9 @@
void OmniboxPedalProvider::LoadPedalConcepts() {
// Get raw gzipped data, uncompress it, then parse to base::Value for loading.
- scoped_refptr<base::RefCountedMemory> bytes =
- ui::ResourceBundle::GetSharedInstance().LoadLocalizedResourceBytes(
+ base::StringPiece compressed_data =
+ ui::ResourceBundle::GetSharedInstance().GetRawDataResource(
IDR_OMNIBOX_PEDAL_CONCEPTS);
- DCHECK(bool{bytes});
- base::StringPiece compressed_data(bytes->front_as<char>(), bytes->size());
std::string uncompressed_data;
uncompressed_data.resize(compression::GetUncompressedSize(compressed_data));
CHECK(compression::GzipUncompress(compressed_data, uncompressed_data));
diff --git a/components/omnibox/resources/omnibox_pedal_concepts.json b/components/omnibox/resources/omnibox_pedal_concepts.json
new file mode 100644
index 0000000..279038c
--- /dev/null
+++ b/components/omnibox/resources/omnibox_pedal_concepts.json
@@ -0,0 +1 @@
+{"schema":"pedal_concepts_runtime","schema_version":1,"data_version":14729733,"tokenize_characters":" ","dictionary":["a","an","browser","cache","card","cards","change","choose","chrome","clear","credit","data","default","delete","do","edit","engine","enter","erase","for","google","history","home","homepage","how","i","in","incognito","info","inside","install","language","launch","manage","manager","mode","my","on","open","page","passwords","private","remove","search","select","set","standard","start","switch","tab","the","this","to","translate","update","upgrade","window","wipe","within"],"pedals":[{"name":"CLEAR_BROWSING_DATA","id":1,"groups":[{"required":false,"single":true,"synonyms":[[20,8],[2],[8]]},{"required":true,"single":true,"synonyms":[[13],[42],[18],[9],[57]]},{"required":true,"single":true,"synonyms":[[21],[3],[11]]}]},{"name":"CHANGE_SEARCH_ENGINE","id":2,"groups":[{"required":false,"single":true,"synonyms":[[20,8],[2],[8]]},{"required":true,"single":true,"synonyms":[[7],[6],[48],[44]]},{"required":true,"single":true,"synonyms":[[46,43,16],[12,43,16],[43,16],[43]]}]},{"name":"MANAGE_PASSWORDS","id":3,"groups":[{"required":false,"single":true,"synonyms":[[20,8],[2],[8]]},{"required":true,"single":true,"synonyms":[[34],[33],[54],[6]]},{"required":true,"single":true,"synonyms":[[40]]}]},{"name":"CHANGE_HOME_PAGE","id":4,"groups":[{"required":false,"single":true,"synonyms":[[20,8],[2],[8]]},{"required":true,"single":true,"synonyms":[[6],[7],[45]]},{"required":true,"single":true,"synonyms":[[22,39],[23]]}]},{"name":"UPDATE_CREDIT_CARD","id":5,"groups":[{"required":false,"single":true,"synonyms":[[20,8],[2],[8]]},{"required":true,"single":true,"synonyms":[[54],[15]]},{"required":true,"single":true,"synonyms":[[10,4,28],[10,5],[10,4],[4,28],[5]]}]},{"name":"LAUNCH_INCOGNITO","id":6,"groups":[{"required":false,"single":true,"synonyms":[[20,8],[2],[8]]},{"required":true,"single":true,"synonyms":[[32],[47],[17],[38]]},{"required":true,"single":true,"synonyms":[[27,56],[27,35],[41,56],[27,49],[41,35],[41,49],[27]]}]},{"name":"TRANSLATE","id":7,"groups":[{"required":false,"single":true,"synonyms":[[20,8],[2],[8]]},{"required":true,"single":true,"synonyms":[[6,31],[53]]},{"required":true,"single":true,"synonyms":[[51,39],[39],[51]]}]},{"name":"UPDATE_CHROME","id":8,"groups":[{"required":true,"single":true,"synonyms":[[20,8],[2],[8]]},{"required":true,"single":true,"synonyms":[[55],[30],[54]]}]}],"ignore_group":{"required":false,"single":false,"synonyms":[[29],[58],[19],[24],[50],[1],[14],[26],[36],[37],[52],[0],[25]]},"max_tokens":32}
\ No newline at end of file
diff --git a/components/omnibox/resources/omnibox_pedal_concepts_de.json b/components/omnibox/resources/omnibox_pedal_concepts_de.json
deleted file mode 100644
index 2c61205..0000000
--- a/components/omnibox/resources/omnibox_pedal_concepts_de.json
+++ /dev/null
@@ -1 +0,0 @@
-{"schema":"pedal_concepts_runtime","schema_version":1,"data_version":14769790,"tokenize_characters":" -","dictionary":["aktualisieren","anschauen","anzeigen","arbeiten","aus","bearbeiten","browser","browserdaten","browserverlauf","cache","chrome","daten","den","die","diese","ein","einstellen","einstellungen","entfernen","fenster","google","ich","im","in","inkognito","inkognitofenster","inkognitomodus","installieren","kann","karte","kartendaten","kredit","kreditkarte","kreditkartendaten","leeren","löschen","man","mein","meine","meinem","meinen","mit","modus","passwort","passwörter","privat","privatmodus","sein","seine","seinem","seinen","seite","sprache","standard","standardeinstellung","standardsuche","standardsuchmaschine","start","starten","startseite","suche","sucheinstellung","suchmaschine","suchverlauf","surfen","umstellen","update","upgrade","upgraden","verlauf","verwalten","webseite","website","wechseln","wie","wo","ändern","öffnen","übersetzen"],"pedals":[{"name":"CLEAR_BROWSING_DATA","id":1,"groups":[{"required":false,"single":true,"synonyms":[[20,10],[6],[10]]},{"required":true,"single":true,"synonyms":[[18],[35],[34]]},{"required":true,"single":true,"synonyms":[[8],[7],[63],[69],[9],[11]]}]},{"name":"CHANGE_SEARCH_ENGINE","id":2,"groups":[{"required":false,"single":true,"synonyms":[[20,10],[6],[10],[20]]},{"required":true,"single":true,"synonyms":[[16],[65],[73],[76]]},{"required":true,"single":true,"synonyms":[[54,60],[53,62],[53,62],[56],[17,60],[61],[53,60],[55],[62]]}]},{"name":"MANAGE_PASSWORDS","id":3,"groups":[{"required":false,"single":true,"synonyms":[[20,10],[6],[10]]},{"required":true,"single":true,"synonyms":[[70],[1],[2],[76]]},{"required":true,"single":true,"synonyms":[[44],[43]]}]},{"name":"CHANGE_HOME_PAGE","id":4,"groups":[{"required":false,"single":true,"synonyms":[[20,10],[6],[10]]},{"required":true,"single":true,"synonyms":[[16],[65],[73],[76]]},{"required":true,"single":true,"synonyms":[[57,51],[59]]}]},{"name":"UPDATE_CREDIT_CARD","id":5,"groups":[{"required":false,"single":true,"synonyms":[[20,10],[6],[10]]},{"required":true,"single":true,"synonyms":[[0],[5],[76]]},{"required":true,"single":true,"synonyms":[[33],[31,29],[32],[30]]}]},{"name":"LAUNCH_INCOGNITO","id":6,"groups":[{"required":false,"single":true,"synonyms":[[20,10],[6],[10]]},{"required":true,"single":true,"synonyms":[[3],[58],[77],[64]]},{"required":true,"single":true,"synonyms":[[24,19],[25],[24,42],[26],[45,42],[46],[24],[45]]}]},{"name":"TRANSLATE","id":7,"groups":[{"required":false,"single":true,"synonyms":[[20,10],[6],[10]]},{"required":true,"single":true,"synonyms":[[52,76],[78]]},{"required":true,"single":true,"synonyms":[[14,71],[14,72],[14,51],[71],[72],[51]]},{"required":true,"single":true,"synonyms":[[14]]}]},{"name":"UPDATE_CHROME","id":8,"groups":[{"required":true,"single":true,"synonyms":[[20,10],[6],[10]]},{"required":true,"single":true,"synonyms":[[0],[27],[68],[67],[66]]}]}],"ignore_group":{"required":false,"single":false,"synonyms":[[39],[49],[50],[40],[38],[48],[28],[37],[47],[74],[21],[36],[13],[4],[41],[12],[15],[75],[23],[22]]},"max_tokens":32}
\ No newline at end of file
diff --git a/components/omnibox/resources/omnibox_pedal_concepts_en.json b/components/omnibox/resources/omnibox_pedal_concepts_en.json
deleted file mode 100644
index 21c4e1e..0000000
--- a/components/omnibox/resources/omnibox_pedal_concepts_en.json
+++ /dev/null
@@ -1 +0,0 @@
-{"schema":"pedal_concepts_runtime","schema_version":1,"data_version":14769790,"tokenize_characters":" -","dictionary":["a","an","browser","browsing","cache","card","cards","change","choose","chrome","clear","credit","data","default","delete","do","edit","engine","enter","erase","for","google","history","home","homepage","how","i","in","incognito","info","inside","install","language","launch","manage","manager","mode","my","on","open","page","passwords","private","remove","search","select","set","standard","start","switch","tab","the","this","to","translate","update","upgrade","window","wipe","within"],"pedals":[{"name":"CLEAR_BROWSING_DATA","id":1,"groups":[{"required":false,"single":true,"synonyms":[[21,9],[3],[2],[9]]},{"required":true,"single":true,"synonyms":[[14],[43],[19],[10],[58]]},{"required":true,"single":true,"synonyms":[[22],[4],[12]]}]},{"name":"CHANGE_SEARCH_ENGINE","id":2,"groups":[{"required":false,"single":true,"synonyms":[[21,9],[2],[9]]},{"required":true,"single":true,"synonyms":[[8],[7],[49],[45]]},{"required":true,"single":true,"synonyms":[[47,44,17],[13,44,17],[44,17],[44]]}]},{"name":"MANAGE_PASSWORDS","id":3,"groups":[{"required":false,"single":true,"synonyms":[[21,9],[2],[9]]},{"required":true,"single":true,"synonyms":[[35],[34],[55],[7]]},{"required":true,"single":true,"synonyms":[[41]]}]},{"name":"CHANGE_HOME_PAGE","id":4,"groups":[{"required":false,"single":true,"synonyms":[[21,9],[2],[9]]},{"required":true,"single":true,"synonyms":[[7],[8],[46]]},{"required":true,"single":true,"synonyms":[[23,40],[24]]}]},{"name":"UPDATE_CREDIT_CARD","id":5,"groups":[{"required":false,"single":true,"synonyms":[[21,9],[2],[9]]},{"required":true,"single":true,"synonyms":[[55],[16]]},{"required":true,"single":true,"synonyms":[[11,5,29],[11,6],[11,5],[5,29],[6]]}]},{"name":"LAUNCH_INCOGNITO","id":6,"groups":[{"required":false,"single":true,"synonyms":[[21,9],[2],[9]]},{"required":true,"single":true,"synonyms":[[33],[48],[18],[39]]},{"required":true,"single":true,"synonyms":[[28,57],[28,36],[42,57],[28,50],[42,36],[42,50],[28]]}]},{"name":"TRANSLATE","id":7,"groups":[{"required":false,"single":true,"synonyms":[[21,9],[2],[9]]},{"required":true,"single":true,"synonyms":[[7,32],[54]]},{"required":true,"single":true,"synonyms":[[52,40],[40],[52]]}]},{"name":"UPDATE_CHROME","id":8,"groups":[{"required":true,"single":true,"synonyms":[[21,9],[2],[9]]},{"required":true,"single":true,"synonyms":[[56],[31],[55]]}]}],"ignore_group":{"required":false,"single":false,"synonyms":[[30],[59],[20],[25],[51],[1],[15],[27],[37],[38],[53],[0],[26]]},"max_tokens":32}
\ No newline at end of file
diff --git a/components/omnibox/resources/omnibox_pedal_concepts_fr.json b/components/omnibox/resources/omnibox_pedal_concepts_fr.json
deleted file mode 100644
index e6e0a0f..0000000
--- a/components/omnibox/resources/omnibox_pedal_concepts_fr.json
+++ /dev/null
@@ -1 +0,0 @@
-{"schema":"pedal_concepts_runtime","schema_version":1,"data_version":14769790,"tokenize_characters":" -","dictionary":["accueil","actualise","actualiser","autre","bancaire","bancaires","cache","carte","cartes","cette","change","changer","choisir","choisis","choisit","chrome","confidentialité","confidentielle","crédit","d'accueil","dans","de","dernière","des","données","défaut","définir","définis","définit","démarre","démarrer","efface","effacer","enlever","enlève","fenetre","fenêtre","gestionnaire","google","gère","gérer","historique","homepage","incognito","informations","infos","installe","installer","jour","la","lance","lancer","langue","le","les","met","mets","mettre","mode","modifie","modifier","mot","moteur","mots","navigateur","navigation","naviguer","niveau","onglet","ouvre","ouvrir","page","paiement","par","passe","passer","privé","privée","recherche","sans","standard","supprime","supprimer","sélectionne","sélectionner","traces","traduire","traduis","traduit","un","une","version","vide","vider","à"],"pedals":[{"name":"CLEAR_BROWSING_DATA","id":1,"groups":[{"required":true,"single":true,"synonyms":[[38,15],[64],[15]]},{"required":true,"single":true,"synonyms":[[82],[81],[32],[33],[34],[31],[93],[92]]},{"required":true,"single":true,"synonyms":[[44],[41],[65],[24],[85],[6],[45]]}]},{"name":"CHANGE_SEARCH_ENGINE","id":2,"groups":[{"required":true,"single":true,"synonyms":[[38,15],[64],[15]]},{"required":true,"single":true,"synonyms":[[84],[83],[2],[1],[60],[12],[11],[13],[14],[59],[75],[10],[74]]},{"required":true,"single":true,"synonyms":[[62,21,78,73,25],[62,21,78,80],[3,62,21,78],[62,21,78],[78]]}]},{"name":"MANAGE_PASSWORDS","id":3,"groups":[{"required":true,"single":true,"synonyms":[[38,15],[64],[15]]},{"required":true,"single":true,"synonyms":[[57,94,48],[37],[56,94,48],[55,94,48],[55,94,48],[2],[1],[60],[11],[59],[40],[10],[39]]},{"required":true,"single":true,"synonyms":[[63,21,74],[61,21,74]]}]},{"name":"CHANGE_HOME_PAGE","id":4,"groups":[{"required":true,"single":true,"synonyms":[[38,15],[64],[15]]},{"required":true,"single":true,"synonyms":[[2],[1],[26],[60],[27],[28],[11],[12],[13],[14],[59]]},{"required":true,"single":true,"synonyms":[[71,19],[71,0],[42]]}]},{"name":"UPDATE_CREDIT_CARD","id":5,"groups":[{"required":true,"single":true,"synonyms":[[38,15],[64],[15]]},{"required":true,"single":true,"synonyms":[[57,94,48],[56,94,48],[55,94,48],[2],[1],[60],[11],[59],[10]]},{"required":true,"single":true,"synonyms":[[45,7,21,18],[44,5],[44,21,7],[8,21,72],[8,21,18],[7,21,72],[58,21,72],[8,5],[45,5],[7,4],[8]]}]},{"name":"LAUNCH_INCOGNITO","id":6,"groups":[{"required":true,"single":true,"synonyms":[[38,15],[64],[15]]},{"required":true,"single":true,"synonyms":[[84],[83],[30],[66],[29],[12],[13],[14],[51],[75],[70],[50],[74],[69]]},{"required":true,"single":true,"synonyms":[[65,17],[36,17],[58,16],[65,77],[36,77],[16],[68,43],[35,77],[58,43],[68,76],[58,76],[79,85],[43]]}]},{"name":"TRANSLATE","id":7,"groups":[{"required":true,"single":true,"synonyms":[[38,15],[64],[15]]},{"required":true,"single":true,"synonyms":[[84,49,52],[83,49,52],[11,52],[10,52],[86],[87],[88]]},{"required":true,"single":true,"synonyms":[[9,71],[9,71],[71]]}]},{"name":"UPDATE_CHROME","id":8,"groups":[{"required":true,"single":true,"synonyms":[[38,15],[64],[15]]},{"required":true,"single":true,"synonyms":[[57,94,67],[57,94,48],[56,94,67],[55,94,67],[56,94,48],[55,94,48],[2],[47],[1],[46]]},{"required":true,"single":true,"synonyms":[[22,91]]}]}],"ignore_group":{"required":false,"single":false,"synonyms":[[20],[90],[23],[54],[89],[21],[53],[49]]},"max_tokens":32}
\ No newline at end of file
diff --git a/components/omnibox/resources/omnibox_pedal_concepts_ja.json b/components/omnibox/resources/omnibox_pedal_concepts_ja.json
deleted file mode 100644
index a33f880..0000000
--- a/components/omnibox/resources/omnibox_pedal_concepts_ja.json
+++ /dev/null
@@ -1 +0,0 @@
-{"schema":"pedal_concepts_runtime","schema_version":1,"data_version":14769790,"tokenize_characters":"","dictionary":[" ","c","e","g","h","l","m","o","p","r","い","う","え","お","く","こ","す","で","の","ぶ","や","り","る","れ","を","ア","ィ","イ","ウ","エ","ォ","オ","カ","キ","ク","グ","サ","ザ","シ","ジ","ス","タ","ダ","チ","ッ","デ","ト","ド","パ","フ","ブ","プ","ベ","ペ","ホ","ム","モ","ャ","ュ","ラ","リ","ル","レ","ロ","ワ","ン","ー","仕","使","再","切","削","効","動","去","報","変","始","定","履","情","払","択","支","新","方","既","更","替","有","検","歴","法","消","理","管","索","編","翻","覧","言","設","訳","語","起","選","開","閲","除","集"],"pedals":[{"name":"CLEAR_BROWSING_DATA","id":1,"groups":[{"required":false,"single":true,"synonyms":[[35,66,35,61,34,63,66,55],[50,59,28,39,65,35],[50,59,28,37,66],[3,7,7,3,5,2,0,1,4,9,7,6,2],[50,59,28,37],[34,63,66,55],[1,4,9,7,6,2]]},{"required":true,"single":true,"synonyms":[[34,60,25],[93,16],[71,108],[93,74]]},{"required":true,"single":true,"synonyms":[[33,57,44,38,58],[107,99,79,91],[45,66,41],[79,91]]}]},{"name":"CHANGE_SEARCH_ENGINE","id":2,"groups":[{"required":false,"single":true,"synonyms":[[35,66,35,61,34,63,66,55],[50,59,28,37,66],[3,7,7,3,5,2,0,1,4,9,7,6,2],[50,59,28,37],[34,63,66,55],[1,4,9,7,6,2]]},{"required":true,"single":true,"synonyms":[[70,21,88,12],[76,12,22],[105,82],[76,87],[70,88],[95,94],[101,78]]},{"required":true,"single":true,"synonyms":[[45,49,30,61,46,90,96,29,65,39,65],[86,78,90,96,29,65,39,65],[36,66,43,29,65,39,65],[90,96,29,65,39,65]]}]},{"name":"MANAGE_PASSWORDS","id":3,"groups":[{"required":false,"single":true,"synonyms":[[35,66,35,61,34,63,66,55],[50,59,28,37,66],[3,7,7,3,5,2,0,1,4,9,7,6,2],[50,59,28,37],[34,63,66,55],[1,4,9,7,6,2]]},{"required":true,"single":true,"synonyms":[[25,44,51,45,66,46],[69,101,78],[76,12,22],[95,94],[87,84],[76,87]]},{"required":true,"single":true,"synonyms":[[48,40,64,66,47]]}]},{"name":"CHANGE_HOME_PAGE","id":4,"groups":[{"required":false,"single":true,"synonyms":[[35,66,35,61,34,63,66,55],[50,59,28,37,66],[3,7,7,3,5,2,0,1,4,9,7,6,2],[50,59,28,37],[34,63,66,55],[1,4,9,7,6,2]]},{"required":true,"single":true,"synonyms":[[76,12,22],[76,87],[105,82],[105,19],[101,78]]},{"required":true,"single":true,"synonyms":[[54,66,55,53,66,39],[4,8]]}]},{"name":"UPDATE_CREDIT_CARD","id":5,"groups":[{"required":false,"single":true,"synonyms":[[35,66,35,61,34,63,66,55],[50,59,28,37,66],[3,7,7,3,5,2,0,1,4,9,7,6,2],[50,59,28,37],[34,63,66,55],[1,4,9,7,6,2]]},{"required":true,"single":true,"synonyms":[[25,44,51,45,66,46],[76,12,22],[87,84],[97,109],[76,87]]},{"required":true,"single":true,"synonyms":[[34,62,39,44,46,32,66,47,80,75],[34,62,39,44,46,32,66,47],[13,83,81,10,80,75],[32,66,47,80,75],[83,81,10,80,75],[13,83,81,10],[32,66,47],[83,81,10]]}]},{"name":"LAUNCH_INCOGNITO","id":6,"groups":[{"required":false,"single":true,"synonyms":[[35,66,35,61,34,63,66,55],[50,59,28,37,66],[3,7,7,3,5,2,0,1,4,9,7,6,2],[50,59,28,37],[34,63,66,55],[1,4,9,7,6,2]]},{"required":true,"single":true,"synonyms":[[68,10,85],[104,73],[106,77],[106,14],[31,65],[89,72],[68,11]]},{"required":true,"single":true,"synonyms":[[51,59,27,52,66,46,50,59,28,39,65,35],[38,66,34,62,44,46,28,26,65,47,28],[38,66,34,62,44,46,56,66,47],[51,59,27,52,66,46,56,66,47],[38,66,34,62,44,46,41,50],[51,59,27,52,66,46,41,50],[38,66,34,62,44,46]]}]},{"name":"TRANSLATE","id":7,"groups":[{"required":false,"single":true,"synonyms":[[35,66,35,61,34,63,66,55],[50,59,28,37,66],[3,7,7,3,5,2,0,1,4,9,7,6,2],[50,59,28,37],[34,63,66,55],[1,4,9,7,6,2]]},{"required":true,"single":true,"synonyms":[[100,103,101,78],[100,103,70,88],[100,103,76,87],[98,102]]},{"required":true,"single":true,"synonyms":[[15,18,53,66,39],[53,66,39],[15,23],[15,18]]}]},{"name":"UPDATE_CHROME","id":8,"groups":[{"required":true,"single":true,"synonyms":[[35,66,35,61,34,63,66,55],[50,59,28,37,66],[3,7,7,3,5,2,0,1,4,9,7,6,2],[50,59,28,37],[34,63,66,55],[1,4,9,7,6,2]]},{"required":true,"single":true,"synonyms":[[25,44,51,35,62,66,47],[27,65,40,46,66,61],[25,44,51,45,66,46],[42,28,65,63,66,47],[87,84]]}]}],"ignore_group":{"required":false,"single":false,"synonyms":[[20,21,85],[16,22],[85,92],[67,85],[18],[17],[24]]},"max_tokens":32}
\ No newline at end of file
diff --git a/components/omnibox/resources/omnibox_pedal_concepts_zh-CN.json b/components/omnibox/resources/omnibox_pedal_concepts_zh-CN.json
deleted file mode 100644
index 71b3ed6c..0000000
--- a/components/omnibox/resources/omnibox_pedal_concepts_zh-CN.json
+++ /dev/null
@@ -1 +0,0 @@
-{"schema":"pedal_concepts_runtime","schema_version":1,"data_version":14769790,"tokenize_characters":"","dictionary":[" ","c","e","g","h","l","m","o","r","主","付","信","修","入","内","切","删","动","化","升","卡","历","去","变","口","句","史","启","器","始","存","安","容","密","开","式","引","录","打","换","据","搜","擎","擦","支","改","数","新","无","更","本","模","此","段","浏","清","理","用","痕","码","私","移","窗","管","索","级","缓","置","翻","行","装","览","言","认","记","设","访","译","话","语","身","转","这","进","银","问","除","隐","面","页","首","默"],"pedals":[{"name":"CLEAR_BROWSING_DATA","id":1,"groups":[{"required":false,"single":true,"synonyms":[[3,7,7,3,5,2,0,1,4,8,7,6,2],[54,71,28],[54,71],[1,4,8,7,6,2]]},{"required":true,"single":true,"synonyms":[[55,86],[16,86],[61,86],[22,86],[55,56],[43,86]]},{"required":true,"single":true,"synonyms":[[54,71,46,40],[54,71,21,26],[54,71,74,37],[76,85,74,37],[76,85,21,26],[46,40],[21,26],[74,37],[66,30]]}]},{"name":"CHANGE_SEARCH_ENGINE","id":2,"groups":[{"required":false,"single":true,"synonyms":[[3,7,7,3,5,2,0,1,4,8,7,6,2],[54,71,28],[1,4,8,7,6,2]]},{"required":true,"single":true,"synonyms":[[49,45],[49,39],[45,23],[15,39],[75,67],[39]]},{"required":true,"single":true,"synonyms":[[41,64,36,42],[91,73,41,64],[41,64,28],[41,64]]}]},{"name":"MANAGE_PASSWORDS","id":3,"groups":[{"required":false,"single":true,"synonyms":[[3,7,7,3,5,2,0,1,4,8,7,6,2],[54,71,28],[1,4,8,7,6,2]]},{"required":true,"single":true,"synonyms":[[63,56],[12,45],[49,47],[49,39],[49,45],[75,67]]},{"required":true,"single":true,"synonyms":[[33,59]]}]},{"name":"CHANGE_HOME_PAGE","id":4,"groups":[{"required":false,"single":true,"synonyms":[[3,7,7,3,5,2,0,1,4,8,7,6,2],[54,71,28],[1,4,8,7,6,2]]},{"required":true,"single":true,"synonyms":[[49,45],[49,39],[45,23],[15,39],[75,67],[12,45],[39]]},{"required":true,"single":true,"synonyms":[[9,89],[90,89]]}]},{"name":"UPDATE_CREDIT_CARD","id":5,"groups":[{"required":false,"single":true,"synonyms":[[3,7,7,3,5,2,0,1,4,8,7,6,2],[54,71,28],[1,4,8,7,6,2]]},{"required":true,"single":true,"synonyms":[[49,47],[49,45],[49,39],[12,45],[75,67]]},{"required":true,"single":true,"synonyms":[[11,57,20],[84,69,20],[44,10,20]]}]},{"name":"LAUNCH_INCOGNITO","id":6,"groups":[{"required":false,"single":true,"synonyms":[[3,7,7,3,5,2,0,1,4,8,7,6,2],[54,71,28],[54,71],[1,4,8,7,6,2]]},{"required":true,"single":true,"synonyms":[[27,17],[34,27],[38,34],[34,29],[27,57],[83,13]]},{"required":true,"single":true,"synonyms":[[48,58,51,35],[48,58,62,24],[60,33,51,35],[60,33,62,24],[87,80,51,35]]}]},{"name":"TRANSLATE","id":7,"groups":[{"required":false,"single":true,"synonyms":[[3,7,7,3,5,2,0,1,4,8,7,6,2],[54,71,28],[1,4,8,7,6,2]]},{"required":true,"single":true,"synonyms":[[15,39,79,72],[68,77],[81,39],[15,39],[81,18]]},{"required":false,"single":true,"synonyms":[[82,25,78],[82,53,78],[52,14,32],[50,89,88]]}]},{"name":"UPDATE_CHROME","id":8,"groups":[{"required":true,"single":true,"synonyms":[[3,7,7,3,5,2,0,1,4,8,7,6,2],[54,71,28],[1,4,8,7,6,2]]},{"required":true,"single":true,"synonyms":[[49,47],[19,65],[31,70]]}]}],"ignore_group":{"required":false,"single":false,"synonyms":[]},"max_tokens":32}
\ No newline at end of file
diff --git a/components/omnibox/resources/omnibox_resources.grdp b/components/omnibox/resources/omnibox_resources.grdp
deleted file mode 100644
index 672d2b31..0000000
--- a/components/omnibox/resources/omnibox_resources.grdp
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This part is included by /components/omnibox_strings.grdp so its resources can be per-language. -->
-<grit-part>
- <if expr="lang == 'de'">
- <include name="IDR_OMNIBOX_PEDAL_CONCEPTS" file="omnibox/resources/omnibox_pedal_concepts_de.json" type="BINDATA" compress="gzip" />
- </if>
- <if expr="lang == 'en'">
- <include name="IDR_OMNIBOX_PEDAL_CONCEPTS" file="omnibox/resources/omnibox_pedal_concepts_en.json" type="BINDATA" compress="gzip" />
- </if>
- <if expr="lang == 'fr'">
- <include name="IDR_OMNIBOX_PEDAL_CONCEPTS" file="omnibox/resources/omnibox_pedal_concepts_fr.json" type="BINDATA" compress="gzip" />
- </if>
- <if expr="lang == 'ja'">
- <include name="IDR_OMNIBOX_PEDAL_CONCEPTS" file="omnibox/resources/omnibox_pedal_concepts_ja.json" type="BINDATA" compress="gzip" />
- </if>
- <if expr="lang == 'zh-CN'">
- <include name="IDR_OMNIBOX_PEDAL_CONCEPTS" file="omnibox/resources/omnibox_pedal_concepts_zh-CN.json" type="BINDATA" compress="gzip" />
- </if>
- <if expr="not lang in ['de', 'en', 'fr', 'ja', 'zh-CN']">
- <!-- Fall back to English for unsupported languages. -->
- <include name="IDR_OMNIBOX_PEDAL_CONCEPTS" file="omnibox/resources/omnibox_pedal_concepts_en.json" type="BINDATA" compress="gzip" />
- </if>
-</grit-part>
diff --git a/components/resources/OWNERS b/components/resources/OWNERS
index 456bcda..7e1e4793 100644
--- a/components/resources/OWNERS
+++ b/components/resources/OWNERS
@@ -19,6 +19,7 @@
per-file neterror*=file://net/OWNERS
per-file ntp_tiles_resources.grdp=file://components/ntp_tiles/OWNERS
per-file offline_pages_resources.grdp=file://components/offline_pages/OWNERS
+per-file omnibox_resources.grdp=file://components/omnibox/OWNERS
per-file proximity_auth*=tengs@chromium.org
per-file printing_resources.grdp=file://printing/OWNERS
per-file security_interstitials_resources.grdp=file://components/security_interstitials/OWNERS
diff --git a/components/resources/components_resources.grd b/components/resources/components_resources.grd
index 1097ea5..7e12c82 100644
--- a/components/resources/components_resources.grd
+++ b/components/resources/components_resources.grd
@@ -17,6 +17,7 @@
<part file="neterror_resources.grdp" />
<part file="ntp_tiles_resources.grdp" />
<part file="offline_pages_resources.grdp" />
+ <part file="omnibox_resources.grdp" />
<part file="password_manager_internals_resources.grdp" />
<part file="printing_resources.grdp" />
<part file="safe_browsing_resources.grdp" />
diff --git a/components/resources/omnibox_resources.grdp b/components/resources/omnibox_resources.grdp
new file mode 100644
index 0000000..80372e1
--- /dev/null
+++ b/components/resources/omnibox_resources.grdp
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<grit-part>
+ <include name="IDR_OMNIBOX_PEDAL_CONCEPTS" file="../omnibox/resources/omnibox_pedal_concepts.json" type="BINDATA" compress="gzip" />
+</grit-part>
diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids
index 364209b..33dc989 100644
--- a/tools/gritsettings/resource_ids
+++ b/tools/gritsettings/resource_ids
@@ -193,8 +193,7 @@
"messages": [15070],
},
"components/components_strings.grd": {
- "includes": [15100],
- "messages": [15110],
+ "messages": [15100],
},
"components/policy/resources/policy_templates.grd": {
"structures": [17200],
