Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into master.lion
Browse files Browse the repository at this point in the history
  • Loading branch information
blueboxd committed Jun 19, 2023
2 parents 662c0b0 + bbad56a commit 4295f4b
Show file tree
Hide file tree
Showing 714 changed files with 8,557 additions and 5,517 deletions.
28 changes: 14 additions & 14 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling Skia
# and whatever else without interference from each other.
'skia_revision': '2a9e11fd9d37ad96907f1f5aa89cace18cf50069',
'skia_revision': '24f2336d87f29f5fae787f484e68f5b6246072ae',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling V8
# and whatever else without interference from each other.
Expand All @@ -334,7 +334,7 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling Fuchsia sdk
# and whatever else without interference from each other.
'fuchsia_version': 'version:13.20230616.3.1',
'fuchsia_version': 'version:13.20230618.3.1',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling google-toolbox-for-mac
# and whatever else without interference from each other.
Expand Down Expand Up @@ -394,7 +394,7 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling devtools-frontend
# and whatever else without interference from each other.
'devtools_frontend_revision': '13847ed879863874653ce1c1f9d0109bef3d3a42',
'devtools_frontend_revision': '2dd8398b55dbcfe97ea154c82154ccb1c844f509',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling libprotobuf-mutator
# and whatever else without interference from each other.
Expand Down Expand Up @@ -438,7 +438,7 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling feed
# and whatever else without interference from each other.
'quiche_revision': '731acaf58ca1353f9add4f57485806303f61e46b',
'quiche_revision': '1b0f3d9d792dbe749f5779152f178fad66e5f521',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling ios_webkit
# and whatever else without interference from each other.
Expand Down Expand Up @@ -814,7 +814,7 @@ deps = {

'src/clank': {
'url': Var('chrome_git') + '/clank/internal/apps.git' + '@' +
'0e065e77ae126cbc97ac305775d61af2b7252142',
'c94bc5f9b2b6ee21bca5bd9e07905a06320836a9',
'condition': 'checkout_android and checkout_src_internal',
},

Expand Down Expand Up @@ -1009,7 +1009,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/androidx',
'version': 'zJLxZx9tZxONNreiJRr09YEtAPBqbuokjsT9FUTF79QC',
'version': 'Gb7vLkZsOy6VLPsYkenQNXw9Fqr75GVpG5UEbDrEqlEC',
},
],
'condition': 'checkout_android',
Expand Down Expand Up @@ -1256,7 +1256,7 @@ deps = {
Var('chromium_git') + '/devtools/devtools-frontend' + '@' + Var('devtools_frontend_revision'),

'src/third_party/devtools-frontend-internal': {
'url': Var('chrome_git') + '/devtools/devtools-internal.git' + '@' + '28a4e98484228528f405604fd3d91c9e4ba272c4',
'url': Var('chrome_git') + '/devtools/devtools-internal.git' + '@' + '3eb3477249030d71e1fe9745251009a531a1283a',
'condition': 'checkout_src_internal',
},

Expand Down Expand Up @@ -1587,7 +1587,7 @@ deps = {
Var('chromium_git') + '/webm/libwebm.git' + '@' + 'e4fbea0c9751ae8aa86629b197a28d8276a2b0da',

'src/third_party/libwebp/src':
Var('chromium_git') + '/webm/libwebp.git' + '@' + 'fd7b5d48464475408d32d2611bdb6947d4246b97',
Var('chromium_git') + '/webm/libwebp.git' + '@' + '6a319d4da3956f22f0dd5ad5a7bb294f88131bbd',

'src/third_party/libyuv':
Var('chromium_git') + '/libyuv/libyuv.git' + '@' + '04821d1e7d60845525e8db55c7bcd41ef5be9406',
Expand Down Expand Up @@ -1766,7 +1766,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/r8',
'version': 'T4trA4OwFaP5g_IWGlymh-yh6JaBu-WsX-rBjkEyxK8C',
'version': 'rByCj9NgDDYIIW97qHizKUoC4pyBnIbr-mHt_DcskjYC',
},
],
'condition': 'checkout_android',
Expand Down Expand Up @@ -1911,7 +1911,7 @@ deps = {
Var('chromium_git') + '/external/github.com/gpuweb/cts.git' + '@' + '7a75cdbc1aee3b8f9111060ef5d5f5740524957c',

'src/third_party/webrtc':
Var('webrtc_git') + '/src.git' + '@' + '11affddbbc7e976abbf10afa9468fa4026316627',
Var('webrtc_git') + '/src.git' + '@' + 'c929ab49b92a05b249bbabd6336a01e768ca92eb',

# Wuffs' canonical repository is at github.com/google/wuffs, but we use
# Skia's mirror of Wuffs, the same as in upstream Skia's DEPS file.
Expand Down Expand Up @@ -2036,7 +2036,7 @@ deps = {
'packages': [
{
'package': 'chromeos_internal/apps/help_app/app',
'version': 'qiizk_233WcWsb4eZwzaci3MxI6LGbW1q5fKbdxnmgcC',
'version': 'LVDSBPDGiygRViVFE-K8u1X7ZpjTCf7ABchLMx3jELAC',
},
],
'condition': 'checkout_chromeos and checkout_src_internal',
Expand All @@ -2047,7 +2047,7 @@ deps = {
'packages': [
{
'package': 'chromeos_internal/apps/media_app/app',
'version': 'rLMvnsUP0a_0FDf2rmkKjcfO-JNNX-nYvOXoWJ9ev3MC',
'version': 'WzMjhonPf_iSV4_oev23oxx03NI-G7qq4w5oz_lZjmgC',
},
],
'condition': 'checkout_chromeos and checkout_src_internal',
Expand All @@ -2069,7 +2069,7 @@ deps = {
'packages': [
{
'package': 'chromeos_internal/apps/projector_app/app',
'version': 'S4PFqJJIa0tcPH4y4xLaAEijddayevF1uPmPoqXFgpEC',
'version': 'zfE9bxid94ovhGhtS9pi4HNHCKTogU9lCq9WZNuAkSEC',
},
],
'condition': 'checkout_chromeos and checkout_src_internal',
Expand Down Expand Up @@ -4195,7 +4195,7 @@ deps = {

'src/ios_internal': {
'url': Var('chrome_git') + '/chrome/ios_internal.git' + '@' +
'9511541dce12abf0d4679c733752af2dbe460c3a',
'ee66b46587cde460acaa10c36929b7fd33226cd5',
'condition': 'checkout_ios and checkout_src_internal',
},

Expand Down
4 changes: 2 additions & 2 deletions ash/constants/ash_features.cc
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ BASE_FEATURE(kAllowAmbientEQ,
// Allows DevTools to open from the context menu and shortcut keys in Ash if
// Lacros is the only browser.
BASE_FEATURE(kAllowDevtoolsInSystemUI,
"kAllowDevtoolsInSystemUI",
"AllowDevtoolsInSystemUI",
base::FEATURE_DISABLED_BY_DEFAULT);

// Allows network connections which use EAP methods that validate the
Expand Down Expand Up @@ -1309,7 +1309,7 @@ BASE_FEATURE(kImeFstDecoderParamsUpdate,
// If enabled use the updated US English IME language models.
BASE_FEATURE(kImeUsEnglishModelUpdate,
"ImeUsEnglishModelUpdate",
base::FEATURE_DISABLED_BY_DEFAULT);
base::FEATURE_ENABLED_BY_DEFAULT);

// Enable or disable system emoji picker falling back to clipboard.
BASE_FEATURE(kImeSystemEmojiPickerClipboard,
Expand Down
2 changes: 1 addition & 1 deletion ash/strings/ash_strings_af.xtb
Original file line number Diff line number Diff line change
Expand Up @@ -740,6 +740,7 @@ Alle gebruikers moet afmeld om voort te gaan.</translation>
<translation id="4261870227682513959">Wys kennisgewinginstellings. Kennisgewings is af</translation>
<translation id="4269883910223712419">Hierdie toestel se administrateur kan</translation>
<translation id="4274537685965975248">Die kortpadsleutel Ctrl + Alt + afpyl het verander. Om die End-sleutel te gebruik moet jy die <ph name="LAUNCHER_KEY_NAME" />-sleutel + regspyl druk.</translation>
<translation id="4275283744500212192">Maak vensteruitlegopsies oop</translation>
<translation id="4279490309300973883">Weerspieëling</translation>
<translation id="4280601795273309128">Sekuriteitopdaterings het geëindig. Gradeer jou toestel op.</translation>
<translation id="4283888303416325161">Voer wagwoord in vir meer sekuriteit</translation>
Expand Down Expand Up @@ -1392,7 +1393,6 @@ Nuwe installasie</translation>
<translation id="7165278925115064263">Alt+Shift+K</translation>
<translation id="7168224885072002358">Stel oor <ph name="TIMEOUT_SECONDS" /> terug na ou resolusie</translation>
<translation id="7180611975245234373">Herlaai</translation>
<translation id="7185362672357349361">Sakel die demppor aan? Jy sal ingelig word as jy praat terwyl dit gedemp is. Oudio verlaat nooit jou toestel nie.</translation>
<translation id="7187711731540696127">Jou <ph name="DEVICE_NAME" />-warmkol is aan; daar is geen toestelle gekoppel nie</translation>
<translation id="7188494361780961876">Kieslys is na die skerm se hoek links onder geskuif.</translation>
<translation id="7189412385142492784">Hoe ver is Venus</translation>
Expand Down
2 changes: 1 addition & 1 deletion ash/strings/ash_strings_am.xtb
Original file line number Diff line number Diff line change
Expand Up @@ -739,6 +739,7 @@
<translation id="4261870227682513959">የማሳወቂያ ቅንብሮችን አሳይ። ማሳወቂያዎች ጠፍተዋል</translation>
<translation id="4269883910223712419">የዚህ መሣሪያ የሚከተሉትን የማድረግ ችሎታ አለው፦</translation>
<translation id="4274537685965975248">የCtrl + Alt + የታች ቀስት ቁልፍ ሰሌዳ አቋራጭ ተለውጧል። የመጨረሻውን ቁልፍ ለመጠቀም የ<ph name="LAUNCHER_KEY_NAME" /> ቁልፍ + የቀኝ ቀስት ይጫኑ።</translation>
<translation id="4275283744500212192">የመስኮት አቀማመጥ አማራጮችን ይክፈቱ</translation>
<translation id="4279490309300973883">በማንጸባረቅ ላይ</translation>
<translation id="4280601795273309128">የደህንነት ዝማኔዎች አብተዋል። መሣሪያዎን ያዘምኑ።</translation>
<translation id="4283888303416325161">ለበለጠ ደህንነት የይለፍ ቃል ያስገቡ</translation>
Expand Down Expand Up @@ -1391,7 +1392,6 @@
<translation id="7165278925115064263">Alt+Shift+K</translation>
<translation id="7168224885072002358">በ<ph name="TIMEOUT_SECONDS" /> ውስጥ ወደ ቀድሞው ጥራት በመመለስ ላይ</translation>
<translation id="7180611975245234373">አድስ</translation>
<translation id="7185362672357349361">ድምፀ-ከልን ገፋ ማድረግ ይብራ? ድምፀ-ከል ሆነው ሳለ ካወሩ ማሳወቂያ ይደርስዎታል። ኦዲዮ ከመሣሪያዎ በጭራሽ አይወጣም።</translation>
<translation id="7187711731540696127">የእርስዎ <ph name="DEVICE_NAME" /> መገናኛ ነጥብ በርቷል፣ ምንም መሣሪያዎች አልተገናኙም</translation>
<translation id="7188494361780961876">ምናሌ ወደ የማያ ገጹ የላይኛው ግራ ጥግ ተወስዷል።</translation>
<translation id="7189412385142492784">ቬኑስ ምን ያህል ይርቃል</translation>
Expand Down
2 changes: 1 addition & 1 deletion ash/strings/ash_strings_ar.xtb
Original file line number Diff line number Diff line change
Expand Up @@ -741,6 +741,7 @@
<translation id="4261870227682513959">عرض إعدادات الإشعارات. تم إيقاف الإشعارات</translation>
<translation id="4269883910223712419">يمتلك مشرف هذا الجهاز القدرة على ما يلي:</translation>
<translation id="4274537685965975248">‏تم تغيير اختصارات لوحة المفاتيح "Ctrl + Alt + السهم المتّجه للأسفل". لاستخدام مفتاح End، اضغط على المفتاحَين "<ph name="LAUNCHER_KEY_NAME" /> + السهم المتّجه لليمين".</translation>
<translation id="4275283744500212192">فتح خيارات تنسيق النوافذ</translation>
<translation id="4279490309300973883">النسخ المطابق</translation>
<translation id="4280601795273309128">انتهت تحديثات الأمان المتوفّرة لهذا الجهاز. يُرجى ترقية الجهاز.</translation>
<translation id="4283888303416325161">أدخِل كلمة المرور لزيادة مستوى الأمان</translation>
Expand Down Expand Up @@ -1393,7 +1394,6 @@
<translation id="7165278925115064263">Alt+Shift+K</translation>
<translation id="7168224885072002358">سيتم الرجوع إلى درجة الدقة القديمة في غضون <ph name="TIMEOUT_SECONDS" /></translation>
<translation id="7180611975245234373">إعادة التحميل</translation>
<translation id="7185362672357349361">هل تريد تفعيل تذكير تلقائي ينبّهك إلى أنّ الصوت مكتوم؟ ستتلقّى إشعارًا إذا كنت تتحدث وصوت الميكروفون مكتوم. ولن يتم إرسال بياناتك الصوتية خارج جهازك مطلقًا.</translation>
<translation id="7187711731540696127">نقطة اتصال جهاز <ph name="DEVICE_NAME" /> مفعَّلة، وما مِن أجهزة متصلة بها.</translation>
<translation id="7188494361780961876">تم نقل القائمة إلى أعلى يمين الشاشة.</translation>
<translation id="7189412385142492784">كم يبعد كوكب الزهرة؟</translation>
Expand Down
2 changes: 1 addition & 1 deletion ash/strings/ash_strings_as.xtb
Original file line number Diff line number Diff line change
Expand Up @@ -739,6 +739,7 @@
<translation id="4261870227682513959">জাননীৰ ছেটিং দেখুৱাওক। জাননী অফ আছে</translation>
<translation id="4269883910223712419">এই ডিভাইচটোৰ প্ৰশাসকে এইকেইটা কাৰ্য কৰিব পাৰে:</translation>
<translation id="4274537685965975248">কীব’ৰ্ডৰ শ্বৰ্টকাট কণ্ট্ৰ'ল+ অল্ট + ডাউন এৰ'টো সলনি হৈছে। এণ্ড কীটো ব্যৱহাৰ কৰিবলৈ, <ph name="LAUNCHER_KEY_NAME" /> কীটো + ৰাইট এৰ' টিপক।</translation>
<translation id="4275283744500212192">ৱিণ্ড’ লে’আউটৰ বিকল্পসমূহ খোলক</translation>
<translation id="4279490309300973883">প্ৰতিবিম্বকৰণ</translation>
<translation id="4280601795273309128">সুৰক্ষা সম্পৰ্কীয় আপডে’ট সমাপ্ত হৈছে। আপোনাৰ ডিভাইচটো আপগ্ৰে’ড কৰক।</translation>
<translation id="4283888303416325161">অধিক সুৰক্ষাৰ বাবে পাছৱর্ড দিয়ক</translation>
Expand Down Expand Up @@ -1391,7 +1392,6 @@
<translation id="7165278925115064263">Alt+Shift+K</translation>
<translation id="7168224885072002358"><ph name="TIMEOUT_SECONDS" />ত আগৰ ৰিজলিউশ্বনটোলৈ উভতি যোৱা হ’ব</translation>
<translation id="7180611975245234373">ৰিফ্ৰেশ্ব কৰক</translation>
<translation id="7185362672357349361">নাজ মিউট কৰাৰ সুবিধাটো অন কৰিবনে? আপুনি মিউট হৈ থাকোঁতে কথা ক’লে জাননী পাব। আপোনাৰ ডিভাইচৰ পৰা অডিঅ’ কেতিয়াও স্থানান্তৰ কৰা নহয়।</translation>
<translation id="7187711731540696127">আপোনাৰ <ph name="DEVICE_NAME" />ৰ হ’টস্প’ট অন আছে, কোনো ডিভাইচ সংযোগ কৰি হোৱা নাই</translation>
<translation id="7188494361780961876">স্ক্ৰীনখনৰ ওপৰৰ বাওঁফালৰ কোণটোলৈ মেনুখন নিয়া হৈছে।</translation>
<translation id="7189412385142492784">শুক্ৰ গ্ৰহলৈ কিমান দূৰ</translation>
Expand Down
2 changes: 1 addition & 1 deletion ash/strings/ash_strings_az.xtb
Original file line number Diff line number Diff line change
Expand Up @@ -739,6 +739,7 @@ Cihazınızı enerji mənbəyinə qoşun.</translation>
<translation id="4261870227682513959">Bildiriş ayarlarını göstərin. Bildirişlər deaktivdir</translation>
<translation id="4269883910223712419">Bu cihazın admini edə bilər:</translation>
<translation id="4274537685965975248">Ctrl + Alt + Aşağı Ox klaviatura qısayolu dəyişib. Son düyməsindən istifadə etmək üçün <ph name="LAUNCHER_KEY_NAME" /> + Sağa Ox düyməsini basın.</translation>
<translation id="4275283744500212192">Pəncərə düzəni seçimlərini açın</translation>
<translation id="4279490309300973883">Əks etdirilir</translation>
<translation id="4280601795273309128">Təhlükəsizlik güncəllənmələri başa çatdı. Cihazı təkmilləşdirin.</translation>
<translation id="4283888303416325161">Əlavə təhlükəsizlik üçün parol daxil edin</translation>
Expand Down Expand Up @@ -1391,7 +1392,6 @@ Yeni quraşdırma</translation>
<translation id="7165278925115064263">Alt+Shift+K</translation>
<translation id="7168224885072002358"><ph name="TIMEOUT_SECONDS" /> daxilində köhnə həllə qayıtma</translation>
<translation id="7180611975245234373">Yeniləyin</translation>
<translation id="7185362672357349361">Xatırlatma bildirişinin susdurulması aktiv edilsin? Susdurulduqda danışsanız, bildiriş alacaqsınız. Audio cihazdan ötürülmür.</translation>
<translation id="7187711731540696127"><ph name="DEVICE_NAME" /> hotspotu aktivdir, cihaz qoşulmayıb</translation>
<translation id="7188494361780961876">Menyu ekranın yuxarı sol küncünə köçürülüb.</translation>
<translation id="7189412385142492784">Venera nə qədər uzaqdadır</translation>
Expand Down
2 changes: 1 addition & 1 deletion ash/strings/ash_strings_be.xtb
Original file line number Diff line number Diff line change
Expand Up @@ -739,6 +739,7 @@
<translation id="4261870227682513959">Паказаць налады апавяшчэнняў. Апавяшчэнні выключаны</translation>
<translation id="4269883910223712419">Адміністратар гэтай прылады мае наступныя магчымасці:</translation>
<translation id="4274537685965975248">Змянілася прызначэнне спалучэння клавіш Ctrl + Alt + стрэлка ўніз. Каб выканаць дзеянне клавішы End, націсніце <ph name="LAUNCHER_KEY_NAME" /> + стрэлка ўправа.</translation>
<translation id="4275283744500212192">Адкрыць параметры зрушэння макета акна</translation>
<translation id="4279490309300973883">Адлюстраванне</translation>
<translation id="4280601795273309128">Ваша прылада больш не будзе атрымліваць абнаўленні сістэмы бяспекі. Перайдзіце на новую прыладу.</translation>
<translation id="4283888303416325161">Для дадатковай бяспекі ўвядзіце пароль</translation>
Expand Down Expand Up @@ -1391,7 +1392,6 @@
<translation id="7165278925115064263">Alt + Shift + K</translation>
<translation id="7168224885072002358">Вяртанне да старой раздзяляльнасці праз <ph name="TIMEOUT_SECONDS" /></translation>
<translation id="7180611975245234373">Абнавіць</translation>
<translation id="7185362672357349361">Уключыць напамін пра выключаны гук? Вы атрымаеце апавяшчэнне, калі будзеце размаўляць з выключаным гукам. Аўдыязапісы захоўваюцца толькі на вашай прыладзе і нікуды не адпраўляюцца.</translation>
<translation id="7187711731540696127">Хот-спот прылады <ph name="DEVICE_NAME" /> уключаны, няма падключаных прылад</translation>
<translation id="7188494361780961876">Меню перамешчана ў левы верхні вугал экрана.</translation>
<translation id="7189412385142492784">Якая адлегласць да Венеры</translation>
Expand Down
Loading

0 comments on commit 4295f4b

Please sign in to comment.