Skip to content
This repository was archived by the owner on Mar 23, 2024. It is now read-only.

Commit a3320b3

Browse files
committed
Import chromium-121.0.6167.139
1 parent dbb661c commit a3320b3

File tree

440 files changed

+3372
-1923
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

440 files changed

+3372
-1923
lines changed

DEPS

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -302,15 +302,15 @@ vars = {
302302
# Three lines of non-changing comments so that
303303
# the commit queue can handle CLs rolling V8
304304
# and whatever else without interference from each other.
305-
'src_internal_revision': '120d3ccaafff929c3f5c0b054947fdd64b49d627',
305+
'src_internal_revision': '72da1507d1bc1e98569c5e79c259344dfd6cfd1d',
306306
# Three lines of non-changing comments so that
307307
# the commit queue can handle CLs rolling Skia
308308
# and whatever else without interference from each other.
309-
'skia_revision': '589c46555055ec23bcc4634c209f7f543f6b424c',
309+
'skia_revision': 'a5f25943a09f03496ff86380c340968c4a008e31',
310310
# Three lines of non-changing comments so that
311311
# the commit queue can handle CLs rolling V8
312312
# and whatever else without interference from each other.
313-
'v8_revision': '10e031124843c5b5b0b43b9a98f3cd6efa5f2de4',
313+
'v8_revision': '1fbb9881419d2c7c278a6013df6c8ca16344dbd9',
314314
# Three lines of non-changing comments so that
315315
# the commit queue can handle CLs rolling ANGLE
316316
# and whatever else without interference from each other.
@@ -821,7 +821,7 @@ deps = {
821821

822822
'src/clank': {
823823
'url': Var('chrome_git') + '/clank/internal/apps.git' + '@' +
824-
'9b63c452155e22ce71e8a717cb8b7a5632de468c',
824+
'844fd8643c299bc3af2c6bcc856549146e20e552',
825825
'condition': 'checkout_android and checkout_src_internal',
826826
},
827827

@@ -1849,7 +1849,7 @@ deps = {
18491849
Var('chromium_git') + '/external/github.com/gpuweb/cts.git' + '@' + '33675caf6fdc25af475ec16930f86c5ce0c324fc',
18501850

18511851
'src/third_party/webrtc':
1852-
Var('webrtc_git') + '/src.git' + '@' + '0f741da200c064aea70a790d2fbf678e930bff39',
1852+
Var('webrtc_git') + '/src.git' + '@' + '79ba9b0b2b28e49ecc32992ff9163917299beedc',
18531853

18541854
# Wuffs' canonical repository is at github.com/google/wuffs, but we use
18551855
# Skia's mirror of Wuffs, the same as in upstream Skia's DEPS file.
@@ -4012,7 +4012,7 @@ deps = {
40124012

40134013
'src/ios_internal': {
40144014
'url': Var('chrome_git') + '/chrome/ios_internal.git' + '@' +
4015-
'2a3ae3d0d73c993518d0de62179b4d15834807a5',
4015+
'1f11f0029d89e34cda96121751e69333ab3429b7',
40164016
'condition': 'checkout_ios and checkout_src_internal',
40174017
},
40184018

ash/session/session_aborted_dialog.cc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@ SessionAbortedDialog::SessionAbortedDialog() {
6767
IDS_ASH_MULTIPROFILES_SESSION_ABORT_BUTTON_LABEL));
6868
SetAcceptCallback(base::BindOnce(
6969
[]() { Shell::Get()->session_controller()->RequestSignOut(); }));
70+
// Prevent dismissing dialog via keyboard accelerator.
71+
SetCancelCallbackWithClose(
72+
base::BindRepeating([]() -> bool { return false; }));
7073
}
7174

7275
SessionAbortedDialog::~SessionAbortedDialog() = default;

ash/shelf/shelf_shutdown_confirmation_bubble.cc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,10 @@ ShelfShutdownConfirmationBubble::ShelfShutdownConfirmationBubble(
149149
views::Emphasis::kHigh));
150150
GetBubbleFrameView()->SetBubbleBorder(std::move(bubble_border));
151151
GetBubbleFrameView()->SetBackgroundColor(GetBackgroundColor());
152+
// The bubble content size changes after border setting, therefore resize
153+
// the widget to its content.
154+
// TODO(crbug.com/1520953): widget should autoresize to its content.
155+
SizeToContents();
152156
GetWidget()->Show();
153157

154158
base::UmaHistogramEnumeration(

ash/strings/ash_strings_af.xtb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ Hier is 'n paar dinge wat jy kan probeer om aan die gang te kom.</translation>
389389
<translation id="2624588537172718173">Toesteloudio en -mikrofoon</translation>
390390
<translation id="263399434338050016">"Kies alles"</translation>
391391
<translation id="2644422758626431000">Speld venster aan linkerkant vas</translation>
392-
<translation id="2645435784669275700">Chrome-bedryfstelsel</translation>
392+
<translation id="2645435784669275700">ChromeOS</translation>
393393
<translation id="2653019840645008922">Vensterskoot</translation>
394394
<translation id="2653659639078652383">Dien in</translation>
395395
<translation id="2658778018866295321">Klik en sleep</translation>

ash/strings/ash_strings_ar.xtb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@
390390
<translation id="2624588537172718173">صوت الجهاز والميكروفون</translation>
391391
<translation id="263399434338050016">"اختيار الكل"</translation>
392392
<translation id="2644422758626431000">تثبيت النافذة على اليمين</translation>
393-
<translation id="2645435784669275700">‏نظام التشغيل Chrome</translation>
393+
<translation id="2645435784669275700">ChromeOS</translation>
394394
<translation id="2653019840645008922">لقطة نافذة</translation>
395395
<translation id="2653659639078652383">إرسال</translation>
396396
<translation id="2658778018866295321">انقر واسحب</translation>

ash/strings/ash_strings_be.xtb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@
389389
<translation id="2624588537172718173">Аўдыя з прылады і мікрафон</translation>
390390
<translation id="263399434338050016">"Выбраць усё"</translation>
391391
<translation id="2644422758626431000">Замацаваць акно злева</translation>
392-
<translation id="2645435784669275700">Chrome OS</translation>
392+
<translation id="2645435784669275700">ChromeOS</translation>
393393
<translation id="2653019840645008922">Здыманне акна</translation>
394394
<translation id="2653659639078652383">Адправіць</translation>
395395
<translation id="2658778018866295321">Націснуць і перацягнуць</translation>

ash/strings/ash_strings_bg.xtb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@
389389
<translation id="2624588537172718173">Аудио от устройството и микрофона</translation>
390390
<translation id="263399434338050016">„Select all“</translation>
391391
<translation id="2644422758626431000">Фиксиране на прозореца отляво</translation>
392-
<translation id="2645435784669275700">Chrome OS</translation>
392+
<translation id="2645435784669275700">ChromeOS</translation>
393393
<translation id="2653019840645008922">Заснемане на прозореца</translation>
394394
<translation id="2653659639078652383">Изпращане</translation>
395395
<translation id="2658778018866295321">Кликване и преместване с плъзгане</translation>

ash/strings/ash_strings_de.xtb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ Hier sind ein paar Dinge, die du tun kannst, um loszulegen.</translation>
389389
<translation id="2624588537172718173">Audio des Geräts und über Mikrofon</translation>
390390
<translation id="263399434338050016">„Alles auswählen“</translation>
391391
<translation id="2644422758626431000">Fenster links anpinnen</translation>
392-
<translation id="2645435784669275700">Chrome OS</translation>
392+
<translation id="2645435784669275700">ChromeOS</translation>
393393
<translation id="2653019840645008922">Fensteraufnahme</translation>
394394
<translation id="2653659639078652383">Senden</translation>
395395
<translation id="2658778018866295321">Klicken und ziehen</translation>

ash/strings/ash_strings_el.xtb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@
389389
<translation id="2624588537172718173">Ήχος συσκευής και μικρόφωνο</translation>
390390
<translation id="263399434338050016">"Επιλογή όλων"</translation>
391391
<translation id="2644422758626431000">Καρφίτσωμα παραθύρου στα αριστερά</translation>
392-
<translation id="2645435784669275700">Chrome OS</translation>
392+
<translation id="2645435784669275700">ChromeOS</translation>
393393
<translation id="2653019840645008922">Λήψη παραθύρου</translation>
394394
<translation id="2653659639078652383">Υποβολή</translation>
395395
<translation id="2658778018866295321">Κάντε κλικ και σύρετε</translation>

ash/strings/ash_strings_en-GB.xtb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ Here are some things that you can try to get started.</translation>
389389
<translation id="2624588537172718173">Device audio and microphone</translation>
390390
<translation id="263399434338050016">'Select all'</translation>
391391
<translation id="2644422758626431000">Pin window to left</translation>
392-
<translation id="2645435784669275700">Chrome OS</translation>
392+
<translation id="2645435784669275700">ChromeOS</translation>
393393
<translation id="2653019840645008922">Window capture</translation>
394394
<translation id="2653659639078652383">Submit</translation>
395395
<translation id="2658778018866295321">Click and drag</translation>

0 commit comments

Comments
 (0)