diff --git a/DEPS b/DEPS index eb1d2ea7..c44e57f2b 100644 --- a/DEPS +++ b/DEPS
@@ -280,7 +280,7 @@ # 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': 'a38c4ae0287a1d6d4a57db85b8b52c0d43965deb', + 'skia_revision': '46df6fed41442f0c28bf56534530bbd6e24193e5', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling V8 # and whatever else without interference from each other. @@ -396,7 +396,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling feed # and whatever else without interference from each other. - 'dawn_revision': '158ed9a7b3205341e4e5ece2dda413e7b2020afc', + 'dawn_revision': '23bb5c06534109dcbdcf41174be544f2836b430f', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling feed # and whatever else without interference from each other. @@ -500,7 +500,7 @@ # If you change this, also update the libc++ revision in # //buildtools/deps_revisions.gni. - 'libcxx_revision': 'ec4ac17a44a46b162c28d38f313f157f76236a6c', + 'libcxx_revision': '11c38d901d29bc91aee3efb53652f7141f72f47f', # GN CIPD package version. 'gn_version': 'git_revision:c97a86a72105f3328a540f5a5ab17d11989ab7dd', @@ -707,7 +707,7 @@ 'packages': [ { 'package': 'chrome_internal/third_party/google3/data_sharing_sdk', - 'version': 'aUh0lm0ZUvAROWVybt5kOpv5TCTMhpH4TgAGe83AQ-EC', + 'version': 'auu6Zggy4Soot7tUJT28qMhahwQ0zuXEmd1b3EGcpeEC', }, ], 'condition': 'checkout_src_internal and non_git_source', @@ -1304,7 +1304,7 @@ 'src/clank': { 'url': Var('chrome_git') + '/clank/internal/apps.git' + '@' + - 'c21490b893c1a3efa293da12c73480149478ce73', + '2bf79a00d99f68d4fab6a186f66f856748e24972', 'condition': 'checkout_android and checkout_src_internal', }, @@ -1333,7 +1333,7 @@ }, 'src/ios/third_party/material_components_ios/src': { - 'url': Var('chromium_git') + '/external/github.com/material-components/material-components-ios.git' + '@' + '554b1f5b861658d1e14bc83764a84621d38512bf', + 'url': Var('chromium_git') + '/external/github.com/material-components/material-components-ios.git' + '@' + '24a0ffbd03f2168492465662825ef38f0308c7b6', 'condition': 'checkout_ios', }, @@ -2301,7 +2301,7 @@ Var('pdfium_git') + '/pdfium.git' + '@' + Var('pdfium_revision'), 'src/third_party/perfetto': - Var('android_git') + '/platform/external/perfetto.git' + '@' + '1e7633eb8271449051555e5b8f6488c6e0189dd0', + Var('android_git') + '/platform/external/perfetto.git' + '@' + '7bf1bcbc57dff90be8ff68c017832c47a1d03a24', 'src/base/tracing/test/data': { 'bucket': 'perfetto', @@ -2669,7 +2669,7 @@ Var('chromium_git') + '/webpagereplay.git' + '@' + Var('webpagereplay_revision'), 'src/third_party/webrtc': - Var('webrtc_git') + '/src.git' + '@' + '39f41d369962364cf1023f9e2aa4ec3cce2936ca', + Var('webrtc_git') + '/src.git' + '@' + 'd243359901730e1c46e4b0bdf35baa0eb4b0198e', # 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. @@ -2795,7 +2795,7 @@ 'packages': [ { 'package': 'chromeos_internal/apps/boca_app/app', - 'version': '6n8zZuUP2zVCU01uFmNg8eCMfSJdDwsN4swtWw1nPOMC', + 'version': 'fIJyA0gj8vqgnXwMPAqAH7ID9hsa7Zo5XZa7uhcTefwC', }, ], 'condition': 'checkout_chromeos and checkout_src_internal', @@ -2806,7 +2806,7 @@ 'packages': [ { 'package': 'chromeos_internal/apps/help_app/app', - 'version': 'ZaW5tvpDVNmz2lDsOHOQbRb2TNLl-zwzvbKBszKNROQC', + 'version': 'BYzotWtdugXo4sM6szh0LKu6EZ9t7uXpQHOjvEPm9pwC', }, ], 'condition': 'checkout_chromeos and checkout_src_internal', @@ -2817,7 +2817,7 @@ 'packages': [ { 'package': 'chromeos_internal/apps/media_app/app', - 'version': '_VHyXP4_vnZAX_0MMoCkkc6ZlfJ9N2HfsLEHp_c77SgC', + 'version': '6gsn3VqGgMIeJQ4RK2fMlQ2WVxptPKxYpMYpjMCaeawC', }, ], 'condition': 'checkout_chromeos and checkout_src_internal', @@ -2850,7 +2850,7 @@ 'packages': [ { 'package': 'chromeos_internal/apps/projector_app/app', - 'version': 'y2KrCFWVq8zT2blrntM-c_Mqw2V3sRFJbPIqQ9bJUdMC', + 'version': 'mU6sjQCLUISqBDt6KgC_gFF0JXpKCjIUjTQdOcywLL8C', }, ], 'condition': 'checkout_chromeos and checkout_src_internal', @@ -4497,7 +4497,7 @@ 'src/ios_internal': { 'url': Var('chrome_git') + '/chrome/ios_internal.git' + '@' + - '156f0000208f3f45680ec110953276b784deec94', + 'd4240f6c622349bab9877c20fcacba15f5da9ae9', 'condition': 'checkout_ios and checkout_src_internal', },
diff --git a/ash/strings/ash_strings_bs.xtb b/ash/strings/ash_strings_bs.xtb index 07827bd..f93b531 100644 --- a/ash/strings/ash_strings_bs.xtb +++ b/ash/strings/ash_strings_bs.xtb
@@ -1647,6 +1647,7 @@ <translation id="6539852571005954999">Preuzimanje fajla <ph name="FILENAME" /> koji se skenira</translation> <translation id="6542521951477560771">Emitiranje na uređaj <ph name="RECEIVER_NAME" /></translation> <translation id="6542891623636520977">Emodžiji, GIF-ovi i drugo</translation> +<translation id="6543942526104794893">Jeste li sigurni da želite isključiti pokrete licem?</translation> <translation id="6545382064335350438">Potvrda PIN-a i dalje nije uspjela. Pokušajte ponovo.</translation> <translation id="6555373427270923730">Napišite adresu web lokacije u traku za adresu, a zatim pritisnite <ph name="MODIFIER" /><ph name="KEY" /></translation> <translation id="655633303491376835"><ph name="APP_NAME" /> @@ -2313,6 +2314,7 @@ <translation id="8855885154700222542">Tipka za prikaz preko cijelog ekrana</translation> <translation id="8858369206579825206">Kontrole privatnosti</translation> <translation id="8860366331836346216">Dodajte eSIM</translation> +<translation id="8869149849311827122">Jeste li sigurni da želite isključiti upravljanje pokazivačem miša?</translation> <translation id="8870509716567206129">Aplikacija ne podržava dijeljenje ekrana.</translation> <translation id="8873203135446552888">Potvrdite da želite onemogućiti ugrađenu dodirnu podlogu</translation> <translation id="8874184842967597500">Nije povezano</translation>
diff --git a/ash/strings/ash_strings_hr.xtb b/ash/strings/ash_strings_hr.xtb index fba8ed8..b07a418 100644 --- a/ash/strings/ash_strings_hr.xtb +++ b/ash/strings/ash_strings_hr.xtb
@@ -1647,6 +1647,7 @@ <translation id="6539852571005954999">Pregled preuzimanja datoteke <ph name="FILENAME" /></translation> <translation id="6542521951477560771">Emitiranje na uređaj <ph name="RECEIVER_NAME" /></translation> <translation id="6542891623636520977">Emojiji, GIF-ovi i drugo</translation> +<translation id="6543942526104794893">Jeste li sigurni da želite isključiti pokrete licem?</translation> <translation id="6545382064335350438">Potvrda PIN-a opet nije uspjela. Pokušajte ponovo.</translation> <translation id="6555373427270923730">Unesite web-adresu u adresnu traku i pritisnite <ph name="MODIFIER" /><ph name="KEY" /></translation> <translation id="655633303491376835"><ph name="APP_NAME" /> @@ -2313,6 +2314,7 @@ <translation id="8855885154700222542">tipka cijelog zaslona</translation> <translation id="8858369206579825206">Kontrole privatnosti</translation> <translation id="8860366331836346216">Dodajte eSIM</translation> +<translation id="8869149849311827122">Jeste li sigurni da želite isključiti upravljanje pokazivačem miša?</translation> <translation id="8870509716567206129">Aplikacija ne podržava podijeljeni zaslon.</translation> <translation id="8873203135446552888">Potvrdite da želite onemogućiti ugrađenu dodirnu podlogu</translation> <translation id="8874184842967597500">Niste povezani</translation>
diff --git a/ash/strings/ash_strings_it.xtb b/ash/strings/ash_strings_it.xtb index a8abc574..f5e362c 100644 --- a/ash/strings/ash_strings_it.xtb +++ b/ash/strings/ash_strings_it.xtb
@@ -1644,6 +1644,7 @@ <translation id="6539852571005954999">Scansione del file <ph name="FILENAME" /> per il download in corso…</translation> <translation id="6542521951477560771">Trasmissione di contenuti a <ph name="RECEIVER_NAME" /> in corso</translation> <translation id="6542891623636520977">Emoji, GIF e altro ancora</translation> +<translation id="6543942526104794893">Disattivare le espressioni facciali?</translation> <translation id="6545382064335350438">Ancora impossibile verificare il PIN. Riprova.</translation> <translation id="6555373427270923730">Digita un indirizzo web nella barra degli indirizzi, quindi premi <ph name="MODIFIER" /><ph name="KEY" /></translation> <translation id="655633303491376835"><ph name="APP_NAME" /> @@ -2309,6 +2310,7 @@ <translation id="8855885154700222542">Tasto schermo intero</translation> <translation id="8858369206579825206">Controlli per la privacy</translation> <translation id="8860366331836346216">Aggiungi eSIM</translation> +<translation id="8869149849311827122">Disattivare il controllo del cursore del mouse?</translation> <translation id="8870509716567206129">L'app non supporta la modalità Schermo diviso.</translation> <translation id="8873203135446552888">Conferma di voler disattivare il touchpad integrato</translation> <translation id="8874184842967597500">Non connesso</translation>
diff --git a/ash/strings/ash_strings_ka.xtb b/ash/strings/ash_strings_ka.xtb index db6bea1..c9d586a1 100644 --- a/ash/strings/ash_strings_ka.xtb +++ b/ash/strings/ash_strings_ka.xtb
@@ -1647,6 +1647,7 @@ <translation id="6539852571005954999">ჩამოტვირთული <ph name="FILENAME" /> სკანირდება</translation> <translation id="6542521951477560771">მიმდინარეობს ტრანსლირება <ph name="RECEIVER_NAME" />-ში</translation> <translation id="6542891623636520977">Emoji-ები, GIF-ები და სხვა</translation> +<translation id="6543942526104794893">ნამდვილად გსურთ, გამორთოთ სახის ჟესტები?</translation> <translation id="6545382064335350438">თქვენი პაროლი კვლავ არ დადასტურდა. ცადეთ ხელახლა.</translation> <translation id="6555373427270923730">მისამართთა ზოლში აკრიფეთ ვებმისამართი, ხოლო შემდეგ დაჭერით აირჩიეთ <ph name="MODIFIER" /><ph name="KEY" /></translation> <translation id="655633303491376835"><ph name="APP_NAME" /> @@ -2313,6 +2314,7 @@ <translation id="8855885154700222542">სრულეკრანიან რეჟიმზე გადართვის კლავიში</translation> <translation id="8858369206579825206">კონფიდენციალურობის მართვის პარამეტრები</translation> <translation id="8860366331836346216">eSIM-ის დამატება</translation> +<translation id="8869149849311827122">ნამდვილად გსურთ, გამორთოთ მაუსის კურსორის კონტროლი?</translation> <translation id="8870509716567206129">ეკრანის გაყოფა არ არის მხარდაჭერილი აპის მიერ.</translation> <translation id="8873203135446552888">დაადასტურეთ, რომ ჩაშენებული სენსორული პანელის გათიშვა გსურთ</translation> <translation id="8874184842967597500">არ არის დაკავშირებული</translation>
diff --git a/ash/strings/ash_strings_lo.xtb b/ash/strings/ash_strings_lo.xtb index c7a84787..408a9a8 100644 --- a/ash/strings/ash_strings_lo.xtb +++ b/ash/strings/ash_strings_lo.xtb
@@ -1647,6 +1647,7 @@ <translation id="6539852571005954999">ກຳລັງສະແກນການດາວໂຫຼດ <ph name="FILENAME" /></translation> <translation id="6542521951477560771">ກໍາລັງສົ່ງສັນຍານຫາ <ph name="RECEIVER_NAME" /></translation> <translation id="6542891623636520977">ອີໂມຈິ, GIF ແລະ ອື່ນໆ</translation> +<translation id="6543942526104794893">ທ່ານແນ່ໃຈບໍວ່າທ່ານຕ້ອງການປິດການສະແດງສີໜ້າ?</translation> <translation id="6545382064335350438">ຍັງຄົງບໍ່ສາມາດຢັ້ງຢືນ PIN ຂອງທ່ານໄດ້. ກະລຸນາລອງໃໝ່.</translation> <translation id="6555373427270923730">ພິມທີ່ຢູ່ເວັບໃນແຖບທີ່ຢູ່, ແລ້ວກົດ <ph name="MODIFIER" /><ph name="KEY" /></translation> <translation id="655633303491376835"><ph name="APP_NAME" /> @@ -2313,6 +2314,7 @@ <translation id="8855885154700222542">ປຸ່ມເຕັມຈໍ</translation> <translation id="8858369206579825206">ການຄວບຄຸມຄວາມເປັນສ່ວນຕົວ</translation> <translation id="8860366331836346216">ເພີ່ມ eSIM</translation> +<translation id="8869149849311827122">ທ່ານແນ່ໃຈບໍ່ວ່າທ່ານຕ້ອງການປິດການຄວບຄຸມເຄີເຊີເມົ້າ?</translation> <translation id="8870509716567206129">ແອັບບໍ່ຮອງຮັບໜ້າຈໍແບບແຍກກັນ.</translation> <translation id="8873203135446552888">ຢືນຢັນວ່າທ່ານຕ້ອງການປິດການນຳໃຊ້ແຜ່ນສຳຜັດໃນຕົວ</translation> <translation id="8874184842967597500">ບໍ່ໄດ້ເຊື່ອມຕໍ່</translation>
diff --git a/ash/strings/ash_strings_ms.xtb b/ash/strings/ash_strings_ms.xtb index 3317253..ef95af3 100644 --- a/ash/strings/ash_strings_ms.xtb +++ b/ash/strings/ash_strings_ms.xtb
@@ -1647,6 +1647,7 @@ <translation id="6539852571005954999">Pengimbasan muat turun <ph name="FILENAME" /></translation> <translation id="6542521951477560771">Menghantar ke <ph name="RECEIVER_NAME" /></translation> <translation id="6542891623636520977">Emoji, GIF dan pelbagai lagi</translation> +<translation id="6543942526104794893">Adakah anda pasti mahu mematikan gerak isyarat wajah?</translation> <translation id="6545382064335350438">PIN anda masih tidak dapat disahkan. Cuba lagi.</translation> <translation id="6555373427270923730">Taipkan alamat web dalam bar alamat, kemudian tekan <ph name="MODIFIER" /><ph name="KEY" /></translation> <translation id="655633303491376835"><ph name="APP_NAME" /> @@ -2313,6 +2314,7 @@ <translation id="8855885154700222542">Kekunci skrin penuh</translation> <translation id="8858369206579825206">Kawalan privasi</translation> <translation id="8860366331836346216">Tambahkan eSIM</translation> +<translation id="8869149849311827122">Adakah anda pasti mahu mematikan kawalan kursor tetikus?</translation> <translation id="8870509716567206129">Apl tidak menyokong skrin pisah.</translation> <translation id="8873203135446552888">Sahkan bahawa anda mahu melumpuhkan pad sentuh terbina dalam</translation> <translation id="8874184842967597500">Tidak bersambung</translation>
diff --git a/ash/strings/ash_strings_no.xtb b/ash/strings/ash_strings_no.xtb index afda2476..383b4032 100644 --- a/ash/strings/ash_strings_no.xtb +++ b/ash/strings/ash_strings_no.xtb
@@ -1965,7 +1965,7 @@ <translation id="7658239707568436148">Avbryt</translation> <translation id="7659861092419699379">Skrivebordet og vinduene er lukket</translation> <translation id="7660160718439869192"><ph name="NAME" /> vises på enheter som er tilknyttet <ph name="EMAIL" /></translation> -<translation id="7662283695561029522">Trykk for å konfigurere</translation> +<translation id="7662283695561029522">Konfigurer</translation> <translation id="7670953955701272011">Åpne denne datoen i Google Kalender</translation> <translation id="7671610481353807627">Appene er sortert etter farge</translation> <translation id="7672095158465655885">Koblet til <ph name="NAME" />, <ph name="SUBTEXT" /></translation>
diff --git a/ash/strings/ash_strings_pt-PT.xtb b/ash/strings/ash_strings_pt-PT.xtb index 8bafa20..5097504 100644 --- a/ash/strings/ash_strings_pt-PT.xtb +++ b/ash/strings/ash_strings_pt-PT.xtb
@@ -1647,6 +1647,7 @@ <translation id="6539852571005954999">A analisar a transferência <ph name="FILENAME" /></translation> <translation id="6542521951477560771">A transmitir para <ph name="RECEIVER_NAME" /></translation> <translation id="6542891623636520977">Emojis, GIFs e muito mais</translation> +<translation id="6543942526104794893">Quer mesmo desativar os gestos faciais?</translation> <translation id="6545382064335350438">Ainda não foi possível validar o PIN. Tente novamente.</translation> <translation id="6555373427270923730">Introduza um endereço Web na barra de endereço e, em seguida, prima <ph name="MODIFIER" /><ph name="KEY" /></translation> <translation id="655633303491376835"><ph name="APP_NAME" /> @@ -2313,6 +2314,7 @@ <translation id="8855885154700222542">Tecla de ecrã inteiro</translation> <translation id="8858369206579825206">Controlos de privacidade</translation> <translation id="8860366331836346216">Adicionar eSIM</translation> +<translation id="8869149849311827122">Quer mesmo desativar o controlo do cursor do rato?</translation> <translation id="8870509716567206129">A aplicação não é compatível com o ecrã dividido.</translation> <translation id="8873203135446552888">Confirme que quer desativar o touchpad incorporado</translation> <translation id="8874184842967597500">Sem ligação</translation>
diff --git a/ash/strings/ash_strings_sr-Latn.xtb b/ash/strings/ash_strings_sr-Latn.xtb index d007ad4..53acbb5 100644 --- a/ash/strings/ash_strings_sr-Latn.xtb +++ b/ash/strings/ash_strings_sr-Latn.xtb
@@ -1648,6 +1648,7 @@ <translation id="6539852571005954999">Skenira se fajl <ph name="FILENAME" /> koji se preuzima</translation> <translation id="6542521951477560771">Prebacuje se na <ph name="RECEIVER_NAME" /></translation> <translation id="6542891623636520977">Emodžiji, GIF-ovi i drugo</translation> +<translation id="6543942526104794893">Želite li stvarno da isključite pokrete licem?</translation> <translation id="6545382064335350438">Verifikacija lozinke još nije uspela. Probajte ponovo.</translation> <translation id="6555373427270923730">Unesite veb-adresu u traku za adresu, pa pritisnite <ph name="MODIFIER" /><ph name="KEY" /></translation> <translation id="655633303491376835"><ph name="APP_NAME" /> @@ -2315,6 +2316,7 @@ <translation id="8855885154700222542">Taster za ceo ekran</translation> <translation id="8858369206579825206">Kontrole privatnosti</translation> <translation id="8860366331836346216">Dodaj eSIM</translation> +<translation id="8869149849311827122">Želite li stvarno da isključite kontrolu kursora miša?</translation> <translation id="8870509716567206129">Aplikacija ne podržava podeljeni ekran.</translation> <translation id="8873203135446552888">Potvrdite da želite da onemogućite ugrađeni tačped</translation> <translation id="8874184842967597500">Nije povezano</translation>
diff --git a/ash/strings/ash_strings_sr.xtb b/ash/strings/ash_strings_sr.xtb index de95cd8..a47492fb 100644 --- a/ash/strings/ash_strings_sr.xtb +++ b/ash/strings/ash_strings_sr.xtb
@@ -1648,6 +1648,7 @@ <translation id="6539852571005954999">Скенира се фајл <ph name="FILENAME" /> који се преузима</translation> <translation id="6542521951477560771">Пребацује се на <ph name="RECEIVER_NAME" /></translation> <translation id="6542891623636520977">Емоџији, GIF-ови и друго</translation> +<translation id="6543942526104794893">Желите ли стварно да искључите покрете лицем?</translation> <translation id="6545382064335350438">Верификација лозинке још није успела. Пробајте поново.</translation> <translation id="6555373427270923730">Унесите веб-адресу у траку за адресу, па притисните <ph name="MODIFIER" /><ph name="KEY" /></translation> <translation id="655633303491376835"><ph name="APP_NAME" /> @@ -2315,6 +2316,7 @@ <translation id="8855885154700222542">Тастер за цео екран</translation> <translation id="8858369206579825206">Контроле приватности</translation> <translation id="8860366331836346216">Додај eSIM</translation> +<translation id="8869149849311827122">Желите ли стварно да искључите контролу курсора миша?</translation> <translation id="8870509716567206129">Апликација не подржава подељени екран.</translation> <translation id="8873203135446552888">Потврдите да желите да онемогућите уграђени тачпед</translation> <translation id="8874184842967597500">Није повезано</translation>
diff --git a/ash/webui/camera_app_ui/resources/strings/camera_strings_fr.xtb b/ash/webui/camera_app_ui/resources/strings/camera_strings_fr.xtb index 5bacfdef..a3fe17230 100644 --- a/ash/webui/camera_app_ui/resources/strings/camera_strings_fr.xtb +++ b/ash/webui/camera_app_ui/resources/strings/camera_strings_fr.xtb
@@ -11,7 +11,7 @@ <translation id="1467231725790366244"><ph name="CAMERA" /> est débranchée.</translation> <translation id="1473110567575736769">Minuteur de 3 secondes</translation> <translation id="148783771699678004">Déplacement vers le haut à droite</translation> -<translation id="1545749641540134597">Scanner le code QR</translation> +<translation id="1545749641540134597">Scanner le QR code</translation> <translation id="1560052704389894104">GIF</translation> <translation id="1588438908519853928">Standard</translation> <translation id="1620510694547887537">Caméra</translation> @@ -29,7 +29,7 @@ <translation id="2064538373111010176">Option <ph name="CAMERA" /> activée</translation> <translation id="2134029355740465625">Paramètres vidéo</translation> <translation id="2144806332417375165">Paramètres vidéo personnalisés</translation> -<translation id="2175927920773552910">Code QR</translation> +<translation id="2175927920773552910">QR code</translation> <translation id="2244252133441425811">Activer le sélecteur de FPS vidéo</translation> <translation id="2271433936731426666">Activer les instantanés vidéo en taille réelle</translation> <translation id="2320741269052147773">Pano à gauche</translation>
diff --git a/base/android/field_trial_list.cc b/base/android/field_trial_list.cc index 8e9149d..c859508 100644 --- a/base/android/field_trial_list.cc +++ b/base/android/field_trial_list.cc
@@ -34,8 +34,8 @@ // Changes to format of the log message below must be accompanied by // changes to finch smoke tests since they look for this log message // in the logcat. - LOG(INFO) << "Active field trial \"" << trial_name - << "\" in group \"" << group_name<< '"'; + LOG(INFO) << "Active field trial \"" << trial_name << "\" in group \"" + << group_name << '"'; } protected:
diff --git a/base/metrics/field_trial_params_nocompile.nc b/base/metrics/field_trial_params_nocompile.nc index eca1ff11..65bc30291 100644 --- a/base/metrics/field_trial_params_nocompile.nc +++ b/base/metrics/field_trial_params_nocompile.nc
@@ -16,9 +16,9 @@ constexpr FeatureParam<> kParam1{&kNoCompileFeature, "Param"}; // expected-error {{too few template arguments}} constexpr FeatureParam<float> kParam3{&kNoCompileFeature, "Param"}; // expected-error@*:* {{Unsupported FeatureParam<> type}} -// expected-error@../../base/metrics/field_trial_params.h:37 {{cannot form a reference to 'void'}} -// expected-error@../../base/metrics/field_trial_params.h:40 {{cannot form a reference to 'void'}} -// expected-error@../../base/metrics/field_trial_params.h:204 {{Unsupported FeatureParam<> type}} +// expected-error@*:* {{cannot form a reference to 'void'}} +// expected-error@*:* {{cannot form a reference to 'void'}} +// expected-error@*:* {{Unsupported FeatureParam<> type}} constexpr FeatureParam<void> kParam2{&kNoCompileFeature, "Param"}; enum Param { kFoo, kBar };
diff --git a/base/synchronization/waitable_event.h b/base/synchronization/waitable_event.h index e067e22..00015c8 100644 --- a/base/synchronization/waitable_event.h +++ b/base/synchronization/waitable_event.h
@@ -9,6 +9,7 @@ #include "base/base_export.h" #include "base/compiler_specific.h" +#include "base/containers/circular_deque.h" #include "base/memory/raw_ptr.h" #include "build/build_config.h" @@ -17,7 +18,6 @@ #elif BUILDFLAG(IS_APPLE) #include <mach/mach.h> -#include <list> #include <memory> #include "base/apple/scoped_mach_port.h" @@ -239,7 +239,7 @@ base::Lock lock_; const bool manual_reset_; bool signaled_; - std::list<raw_ptr<Waiter, CtnExperimental>> waiters_; + base::circular_deque<raw_ptr<Waiter, CtnExperimental>> waiters_; private: friend class RefCountedThreadSafe<WaitableEventKernel>;
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn index ebfaf63..33a232ed 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn
@@ -1996,11 +1996,6 @@ # TODO(crbug.com/376641662): Fix and re-enable. cflags += [ "-Wno-nontrivial-memcall" ] } - - if (is_castos) { - # TODO(crbug.com/383016423): Re-enable. - cflags += [ "-Wno-unused-private-field" ] - } } # Some builders, such as Cronet, use a different version of Clang than
diff --git a/buildtools/deps_revisions.gni b/buildtools/deps_revisions.gni index 8b82af0..ba259c8 100644 --- a/buildtools/deps_revisions.gni +++ b/buildtools/deps_revisions.gni
@@ -5,5 +5,5 @@ declare_args() { # Used to cause full rebuilds on libc++ rolls. This should be kept in sync # with the libcxx_revision var in //DEPS. - libcxx_revision = "ec4ac17a44a46b162c28d38f313f157f76236a6c" + libcxx_revision = "11c38d901d29bc91aee3efb53652f7141f72f47f" }
diff --git a/cc/test/fake_paint_image_generator.cc b/cc/test/fake_paint_image_generator.cc index 26314921..e579d65 100644 --- a/cc/test/fake_paint_image_generator.cc +++ b/cc/test/fake_paint_image_generator.cc
@@ -54,6 +54,10 @@ uint32_t lazy_pixel_ref) { base::AutoLock lock(lock_); + if (force_fail_decode_) { + return false; + } + CHECK(!is_yuv_ || expect_fallback_to_rgb_); const SkImageInfo& dst_info = dst_pixmap.info(); if (image_backing_memory_.empty()) @@ -91,6 +95,10 @@ PaintImage::GeneratorClientId client_id) { base::AutoLock lock(lock_); + if (force_fail_decode_) { + return false; + } + CHECK(is_yuv_); CHECK(!expect_fallback_to_rgb_); if (image_backing_memory_.empty())
diff --git a/cc/test/fake_paint_image_generator.h b/cc/test/fake_paint_image_generator.h index e0363268..6fc2e456 100644 --- a/cc/test/fake_paint_image_generator.h +++ b/cc/test/fake_paint_image_generator.h
@@ -65,6 +65,7 @@ frames_decoded_count_.clear(); } + void SetForceFailDecode() { force_fail_decode_ = true; } void SetExpectFallbackToRGB() { base::AutoLock lock(lock_); @@ -94,6 +95,7 @@ // planes and after Chrome implements it, we should no longer expect RGB // fallback. bool expect_fallback_to_rgb_ = false; + bool force_fail_decode_ = false; ImageHeaderMetadata image_metadata_; };
diff --git a/cc/tiles/gpu_image_decode_cache.cc b/cc/tiles/gpu_image_decode_cache.cc index 4ab5e27..2f9614b0 100644 --- a/cc/tiles/gpu_image_decode_cache.cc +++ b/cc/tiles/gpu_image_decode_cache.cc
@@ -2712,6 +2712,11 @@ auto aux_image_index = AuxImageIndex(aux_image); const auto& info = image_data->GetImageInfo(aux_image); if (aux_image == AuxImage::kGainmap) { + // The gainmap image is allowed to silently fail to decode. If that + // happens, there will be no data. Just pretend it didn't exist. + if (!image_data->decode.data(aux_image)) { + continue; + } has_gainmap = info.rgba.has_value() || info.yuva.has_value(); } if (info.yuva.has_value()) {
diff --git a/cc/tiles/gpu_image_decode_cache_unittest.cc b/cc/tiles/gpu_image_decode_cache_unittest.cc index 699221c..186f267 100644 --- a/cc/tiles/gpu_image_decode_cache_unittest.cc +++ b/cc/tiles/gpu_image_decode_cache_unittest.cc
@@ -653,14 +653,19 @@ return std::move(draw_image); } - sk_sp<SkImage> GetLastTransferredImage() { + ServiceImageTransferCacheEntry* GetLastTransferredCacheEntry() { auto& key = transfer_cache_helper_.GetLastAddedEntry(); ServiceTransferCacheEntry* entry = transfer_cache_helper_.GetEntryInternal(key.first, key.second); if (!entry) return nullptr; CHECK_EQ(TransferCacheEntryType::kImage, entry->Type()); - return static_cast<ServiceImageTransferCacheEntry*>(entry)->image(); + return static_cast<ServiceImageTransferCacheEntry*>(entry); + } + + sk_sp<SkImage> GetLastTransferredImage() { + auto* entry = GetLastTransferredCacheEntry(); + return entry ? entry->image() : nullptr; } void CompareAllPlanesToMippedVersions( @@ -5133,5 +5138,147 @@ #undef EXPECT_TRUE_IF_NOT_USING_TRANSFER_CACHE #undef EXPECT_FALSE_IF_NOT_USING_TRANSFER_CACHE +TEST_P(GpuImageDecodeCacheTest, GainmapImage) { + auto cache = CreateCache(); + const uint32_t client_id = cache->GenerateClientId(); + + SkImageInfo base_info = SkImageInfo::Make( + 16, 32, kN32_SkColorType, kPremul_SkAlphaType, SkColorSpace::MakeSRGB()); + SkImageInfo gain_info = SkImageInfo::Make( + 8, 16, kN32_SkColorType, kPremul_SkAlphaType, SkColorSpace::MakeSRGB()); + SkGainmapInfo gainmap_info; + + PaintImage paint_image; + { + const bool allocate_encoded_memory = true; + auto base_generator = sk_make_sp<FakePaintImageGenerator>( + base_info, std::vector<FrameMetadata>{FrameMetadata()}, + allocate_encoded_memory); + auto gain_generator = sk_make_sp<FakePaintImageGenerator>( + gain_info, std::vector<FrameMetadata>{FrameMetadata()}, + allocate_encoded_memory); + paint_image = + PaintImageBuilder::WithDefault() + .set_id(PaintImage::GetNextId()) + .set_paint_image_generator(base_generator) + .set_gainmap_paint_image_generator(gain_generator, gainmap_info) + .set_decoding_mode(PaintImage::DecodingMode::kUnspecified) + .TakePaintImage(); + } + + DrawImage draw_image = CreateDrawImageInternal(paint_image); + ImageDecodeCache::TaskResult result = cache->GetTaskForImageAndRef( + client_id, draw_image, ImageDecodeCache::TracingInfo()); + EXPECT_TRUE(result.need_unref); + EXPECT_TRUE(result.task); + + TestTileTaskRunner::ProcessTask(result.task->dependencies()[0].get()); + TestTileTaskRunner::ProcessTask(result.task.get()); + + viz::RasterContextProvider::ScopedRasterContextLock context_lock( + context_provider()); + DecodedDrawImage decoded_draw_image = + cache->GetDecodedImageForDraw(draw_image); + + if (use_transfer_cache_) { + auto* entry = GetLastTransferredCacheEntry(); + auto service_base_image = entry->image(); + auto service_gain_image = entry->gainmap_image(); + + // If using the transfer cache, the color conversion should be applied + // there during upload. + sk_sp<SkImage> service_image = GetLastTransferredImage(); + ASSERT_TRUE(service_base_image); + ASSERT_TRUE(service_gain_image); + EXPECT_TRUE(service_base_image->isTextureBacked()); + EXPECT_TRUE(service_gain_image->isTextureBacked()); + EXPECT_EQ(base_info.width(), service_base_image->width()); + EXPECT_EQ(base_info.height(), service_base_image->height()); + EXPECT_EQ(gain_info.width(), service_gain_image->width()); + EXPECT_EQ(gain_info.height(), service_gain_image->height()); + } else { + // Gainmap images are only supported via the transfer cache. + } + + cache->DrawWithImageFinished(draw_image, decoded_draw_image); + cache->UnrefImage(draw_image); +} + +TEST_P(GpuImageDecodeCacheTest, GainmapImageFailsDecode) { + auto cache = CreateCache(); + const uint32_t client_id = cache->GenerateClientId(); + + // Create two transfer cache entries. The first one will succeed in its + // gainmap decode, and the second will fail. + for (int i = 0; i < 2; ++i) { + SkImageInfo base_info = + SkImageInfo::Make(16, 32, kN32_SkColorType, kPremul_SkAlphaType, + SkColorSpace::MakeSRGB()); + SkImageInfo gain_info = SkImageInfo::Make( + 8, 16, kN32_SkColorType, kPremul_SkAlphaType, SkColorSpace::MakeSRGB()); + SkGainmapInfo gainmap_info; + + PaintImage paint_image; + { + const bool allocate_encoded_memory = true; + auto base_generator = sk_make_sp<FakePaintImageGenerator>( + base_info, std::vector<FrameMetadata>{FrameMetadata()}, + allocate_encoded_memory); + auto gain_generator = sk_make_sp<FakePaintImageGenerator>( + gain_info, std::vector<FrameMetadata>{FrameMetadata()}, + allocate_encoded_memory); + // Fail just the gainmap decode. + if (i == 1) { + gain_generator->SetForceFailDecode(); + } + paint_image = + PaintImageBuilder::WithDefault() + .set_id(PaintImage::GetNextId()) + .set_paint_image_generator(base_generator) + .set_gainmap_paint_image_generator(gain_generator, gainmap_info) + .set_decoding_mode(PaintImage::DecodingMode::kUnspecified) + .TakePaintImage(); + } + + DrawImage draw_image = CreateDrawImageInternal(paint_image); + ImageDecodeCache::TaskResult result = cache->GetTaskForImageAndRef( + client_id, draw_image, ImageDecodeCache::TracingInfo()); + EXPECT_TRUE(result.need_unref); + EXPECT_TRUE(result.task); + + TestTileTaskRunner::ProcessTask(result.task->dependencies()[0].get()); + TestTileTaskRunner::ProcessTask(result.task.get()); + + viz::RasterContextProvider::ScopedRasterContextLock context_lock( + context_provider()); + DecodedDrawImage decoded_draw_image = + cache->GetDecodedImageForDraw(draw_image); + + if (use_transfer_cache_) { + auto* entry = GetLastTransferredCacheEntry(); + auto service_base_image = entry->image(); + auto service_gain_image = entry->gainmap_image(); + + ASSERT_TRUE(service_base_image); + EXPECT_TRUE(service_base_image->isTextureBacked()); + EXPECT_EQ(base_info.width(), service_base_image->width()); + EXPECT_EQ(base_info.height(), service_base_image->height()); + if (i == 0) { + ASSERT_TRUE(service_gain_image); + EXPECT_TRUE(service_gain_image->isTextureBacked()); + EXPECT_EQ(gain_info.width(), service_gain_image->width()); + EXPECT_EQ(gain_info.height(), service_gain_image->height()); + } else { + EXPECT_FALSE(service_gain_image); + } + } else { + // Gainmap images are only supported via the transfer cache. + } + + cache->DrawWithImageFinished(draw_image, decoded_draw_image); + cache->UnrefImage(draw_image); + } +} + } // namespace } // namespace cc
diff --git a/chrome/VERSION b/chrome/VERSION index 7c17b4ac..c3522d945 100644 --- a/chrome/VERSION +++ b/chrome/VERSION
@@ -1,4 +1,4 @@ MAJOR=133 MINOR=0 -BUILD=6910 +BUILD=6914 PATCH=0
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/automotivetoolbar/AutomotiveBackButtonToolbarCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/automotivetoolbar/AutomotiveBackButtonToolbarCoordinator.java index 28f0de33..a3bb9e0 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/automotivetoolbar/AutomotiveBackButtonToolbarCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/automotivetoolbar/AutomotiveBackButtonToolbarCoordinator.java
@@ -13,7 +13,6 @@ import android.widget.FrameLayout; import androidx.annotation.AnimRes; -import androidx.annotation.VisibleForTesting; import androidx.appcompat.widget.Toolbar; import org.chromium.chrome.R; @@ -38,10 +37,9 @@ @Override public void run() { if (mIsFullscreen) { + assert (mEdgeSwipeGestureDetector != null); + mEdgeSwipeGestureDetector.setIsReadyForNewScroll(false); mOnSwipeAutomotiveToolbar.startAnimation(mHideOnSwipeToolbarAnimation); - if (mEdgeSwipeGestureDetector != null) { - mEdgeSwipeGestureDetector.readyForNewScroll(); - } } } }; @@ -63,8 +61,31 @@ interface OnSwipeCallback { /** Handles actions required after a swipe occurs. */ void handleSwipe(); + + /** Handles actions required after a back swipe occurs. */ + void handleBackSwipe(); } + private OnSwipeCallback mOnSwipeCallback = + new OnSwipeCallback() { + @Override + public void handleSwipe() { + if (mIsFullscreen && mOnSwipeAutomotiveToolbar.getVisibility() == View.GONE) { + mOnSwipeAutomotiveToolbar.startAnimation(mShowOnSwipeToolbarAnimation); + mHandler.postDelayed(mHideToolbar, SHOW_TOOLBAR_ON_SWIPE_DURATION_MS); + } + } + + @Override + public void handleBackSwipe() { + if (mIsFullscreen + && mOnSwipeAutomotiveToolbar.getVisibility() == View.VISIBLE) { + mOnSwipeAutomotiveToolbar.startAnimation(mHideOnSwipeToolbarAnimation); + mHandler.removeCallbacks(mHideToolbar); + } + } + }; + private FullscreenManager.Observer mFullscreenObserver = new FullscreenManager.Observer() { @Override @@ -73,7 +94,7 @@ mTouchEventProvider.addTouchEventObserver(mEdgeSwipeGestureDetector); mBackButtonToolbarForAutomotive.setVisibility(View.GONE); mIsFullscreen = true; - mEdgeSwipeGestureDetector.readyForNewScroll(); + mEdgeSwipeGestureDetector.setIsReadyForNewScroll(true); } @Override @@ -105,7 +126,7 @@ mFullscreenManager = fullscreenManager; mTouchEventProvider = touchEventProvider; mBackPressedManager = backPressManager; - mEdgeSwipeGestureDetector = new EdgeSwipeGestureDetector(mContext, this::handleSwipe); + mEdgeSwipeGestureDetector = new EdgeSwipeGestureDetector(mContext, mOnSwipeCallback); mFullscreenManager.addObserver(mFullscreenObserver); mBackButtonToolbarForAutomotive = automotiveBaseFrameLayout.findViewById(R.id.back_button_toolbar); @@ -116,15 +137,6 @@ R.id.automotive_on_swipe_back_button_toolbar_stub)); } - /** Handles back button toolbar visibility on a swipe. */ - @VisibleForTesting - void handleSwipe() { - if (mIsFullscreen) { - mOnSwipeAutomotiveToolbar.startAnimation(mShowOnSwipeToolbarAnimation); - mHandler.postDelayed(mHideToolbar, SHOW_TOOLBAR_ON_SWIPE_DURATION_MS); - } - } - private void setOnSwipeBackButtonToolbar(ViewStub onSwipeAutomotiveToolbarStub) { // TODO(https://crbug.com/376737727): Revisit when toolbar improvements is fully launched. mOnSwipeAutomotiveToolbar = (Toolbar) onSwipeAutomotiveToolbarStub.inflate(); @@ -145,6 +157,12 @@ public void onAnimationStart(Animation animation) { mOnSwipeAutomotiveToolbar.setVisibility(View.VISIBLE); } + + @Override + public void onAnimationEnd(Animation animation) { + assert (mEdgeSwipeGestureDetector != null); + mEdgeSwipeGestureDetector.setIsReadyForNewScroll(true); + } }); @AnimRes @@ -157,6 +175,8 @@ @Override public void onAnimationEnd(Animation animation) { mOnSwipeAutomotiveToolbar.setVisibility(View.GONE); + assert (mEdgeSwipeGestureDetector != null); + mEdgeSwipeGestureDetector.setIsReadyForNewScroll(true); } }); // TODO(https://crbug.com/376740682): Configure back press behavior for Automotive Toolbar @@ -181,4 +201,8 @@ EdgeSwipeGestureDetector getEdgeSwipeGestureDetectorForTesting() { return mEdgeSwipeGestureDetector; } + + OnSwipeCallback getOnSwipeCallbackForTesting() { + return mOnSwipeCallback; + } }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/automotivetoolbar/EdgeSwipeGestureDetector.java b/chrome/android/java/src/org/chromium/chrome/browser/automotivetoolbar/EdgeSwipeGestureDetector.java index 40686e1b..c9accd0 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/automotivetoolbar/EdgeSwipeGestureDetector.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/automotivetoolbar/EdgeSwipeGestureDetector.java
@@ -20,9 +20,10 @@ */ @SuppressWarnings("UnusedVariable") // Remove once implementation is complete. public class EdgeSwipeGestureDetector implements TouchEventObserver { - // Width of a rectangular area in dp on the left/right edge used for navigation. - // Swipe beginning from a point within these rects triggers the operation. - @VisibleForTesting static final int EDGE_WIDTH_DP = 48; + // Width of back button toolbar in dp on the left edge used for navigation. + // Swipe beginning from a point within these rects triggers the back button toolbar to visible. + // When the back button toolbar is visible, swipes ending within hide the back button toolbar. + @VisibleForTesting static final int EDGE_WIDTH_DP = 77; // Minimum horizontal width of a scroll to be considered a swipe. static final int SWIPE_THRESHOLD_DP = 48; @@ -47,11 +48,19 @@ @NonNull MotionEvent currentMotion, float distanceX, float distanceY) { - if (mIsReadyForNewScroll - && startMotion != null - && isValidSwipe(startMotion, currentMotion, distanceX, distanceY)) { - mOnSwipeCallback.handleSwipe(); + if (!mIsReadyForNewScroll || startMotion == null) { + return false; + } + if (isValidSwipe(startMotion, currentMotion, distanceX, distanceY)) { mIsReadyForNewScroll = false; + mOnSwipeCallback.handleSwipe(); + return true; + } + if (isValidBackSwipe(startMotion, currentMotion, distanceX, distanceY)) { + // TODO(https://crbug.com/384991179): Ensure back swipe works for horizontal + // toolbar and RTL + mIsReadyForNewScroll = false; + mOnSwipeCallback.handleBackSwipe(); return true; } return false; @@ -86,8 +95,8 @@ } /** Clear the state and mark the detector ready to detect a new swipe gesture. */ - public void readyForNewScroll() { - mIsReadyForNewScroll = true; + public void setIsReadyForNewScroll(boolean isReadyForNewScroll) { + mIsReadyForNewScroll = isReadyForNewScroll; } /** @@ -99,13 +108,32 @@ * @param distanceY Y delta between previous and current motion event. * @return Whether the swipe is valid or not. */ - private boolean isValidSwipe( + @VisibleForTesting + public boolean isValidSwipe( MotionEvent startMotion, MotionEvent currentMotion, float distanceX, float distanceY) { return Math.abs(startMotion.getX() - currentMotion.getX()) > mSwipeThreshold && Math.abs(distanceX) > Math.abs(distanceY) * WEIGHTED_TRIGGER_THRESHOLD && startMotion.getX() < mEdgeWidthPx; } + /** + * Processes whether the scroll is a horizontal back swipe from right to left. A horizontal back + * swipe occurs whenever a swipe ends within the back button toolbar width. + * + * @param startMotion event for the start of the swipe. + * @param currentMotion event for where the swipe currently is. + * @param distanceX X delta between previous and current motion event. + * @param distanceY Y delta between previous and current motion event. + * @return Whether the back swipe is valid or not. + */ + @VisibleForTesting + public boolean isValidBackSwipe( + MotionEvent startMotion, MotionEvent currentMotion, float distanceX, float distanceY) { + return startMotion.getX() - currentMotion.getX() > mSwipeThreshold + && Math.abs(distanceX) > Math.abs(distanceY) * WEIGHTED_TRIGGER_THRESHOLD + && currentMotion.getX() < mEdgeWidthPx; + } + GestureDetector.SimpleOnGestureListener getSwipeGestureListenerForTesting() { return mSwipeGestureListener; }
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/automotivetoolbar/AutomotiveBackButtonToolbarCoordinatorUnitTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/automotivetoolbar/AutomotiveBackButtonToolbarCoordinatorUnitTest.java index 4092e8c..0da7525 100644 --- a/chrome/android/junit/src/org/chromium/chrome/browser/automotivetoolbar/AutomotiveBackButtonToolbarCoordinatorUnitTest.java +++ b/chrome/android/junit/src/org/chromium/chrome/browser/automotivetoolbar/AutomotiveBackButtonToolbarCoordinatorUnitTest.java
@@ -125,7 +125,8 @@ mAutomotiveBackButtonToolbarCoordinator .getFullscreenObserverForTesting() .onEnterFullscreen(tab, fullscreenOptions); - mAutomotiveBackButtonToolbarCoordinator.handleSwipe(); + mOnSwipeAutomotiveToolbar.setVisibility(View.GONE); + mAutomotiveBackButtonToolbarCoordinator.getOnSwipeCallbackForTesting().handleSwipe(); ShadowLooper.idleMainLooper(ANIMATION_DURATION_MS, TimeUnit.MILLISECONDS); Assert.assertEquals( @@ -138,4 +139,84 @@ mOnSwipeAutomotiveToolbar.getVisibility(), View.GONE); } + + @Test + public void testOnBackSwipe_handleBackSwipe() { + Tab tab = Mockito.mock(Tab.class); + FullscreenOptions fullscreenOptions = Mockito.mock(FullscreenOptions.class); + mAutomotiveBackButtonToolbarCoordinator + .getFullscreenObserverForTesting() + .onEnterFullscreen(tab, fullscreenOptions); + mOnSwipeAutomotiveToolbar.setVisibility(View.VISIBLE); + mAutomotiveBackButtonToolbarCoordinator.getOnSwipeCallbackForTesting().handleBackSwipe(); + ShadowLooper.idleMainLooper(ANIMATION_DURATION_MS, TimeUnit.MILLISECONDS); + Assert.assertEquals( + "On swipe toolbar should be gone after a back swipe", + mOnSwipeAutomotiveToolbar.getVisibility(), + View.GONE); + } + + @Test + public void testMultipleSwipes_handleForwardSwipe() { + Tab tab = Mockito.mock(Tab.class); + FullscreenOptions fullscreenOptions = Mockito.mock(FullscreenOptions.class); + mAutomotiveBackButtonToolbarCoordinator + .getFullscreenObserverForTesting() + .onEnterFullscreen(tab, fullscreenOptions); + mOnSwipeAutomotiveToolbar.setVisibility(View.GONE); + mAutomotiveBackButtonToolbarCoordinator.getOnSwipeCallbackForTesting().handleSwipe(); + mAutomotiveBackButtonToolbarCoordinator.getOnSwipeCallbackForTesting().handleBackSwipe(); + ShadowLooper.idleMainLooper(ANIMATION_DURATION_MS, TimeUnit.MILLISECONDS); + Assert.assertEquals( + "First swipe gesture will be consumed to show the toolbar, and the backswipe will" + + " be ignored", + mOnSwipeAutomotiveToolbar.getVisibility(), + View.VISIBLE); + + mAutomotiveBackButtonToolbarCoordinator + .getFullscreenObserverForTesting() + .onEnterFullscreen(tab, fullscreenOptions); + mOnSwipeAutomotiveToolbar.setVisibility(View.GONE); + mAutomotiveBackButtonToolbarCoordinator.getOnSwipeCallbackForTesting().handleSwipe(); + mAutomotiveBackButtonToolbarCoordinator.getOnSwipeCallbackForTesting().handleBackSwipe(); + mAutomotiveBackButtonToolbarCoordinator.getOnSwipeCallbackForTesting().handleSwipe(); + ShadowLooper.idleMainLooper(ANIMATION_DURATION_MS, TimeUnit.MILLISECONDS); + Assert.assertEquals( + "First swipe gesture will be consumed to show the toolbar, and the backswipe and" + + " following forward swipe will be ignored", + mOnSwipeAutomotiveToolbar.getVisibility(), + View.VISIBLE); + } + + @Test + public void testMultipleSwipes_handleBackSwipe() { + Tab tab = Mockito.mock(Tab.class); + FullscreenOptions fullscreenOptions = Mockito.mock(FullscreenOptions.class); + mAutomotiveBackButtonToolbarCoordinator + .getFullscreenObserverForTesting() + .onEnterFullscreen(tab, fullscreenOptions); + mOnSwipeAutomotiveToolbar.setVisibility(View.VISIBLE); + mAutomotiveBackButtonToolbarCoordinator.getOnSwipeCallbackForTesting().handleBackSwipe(); + mAutomotiveBackButtonToolbarCoordinator.getOnSwipeCallbackForTesting().handleSwipe(); + ShadowLooper.idleMainLooper(ANIMATION_DURATION_MS, TimeUnit.MILLISECONDS); + Assert.assertEquals( + "First swipe gesture will be consumed to hide the toolbar, and the forward swipe" + + " will be ignored", + mOnSwipeAutomotiveToolbar.getVisibility(), + View.GONE); + + mAutomotiveBackButtonToolbarCoordinator + .getFullscreenObserverForTesting() + .onEnterFullscreen(tab, fullscreenOptions); + mOnSwipeAutomotiveToolbar.setVisibility(View.VISIBLE); + mAutomotiveBackButtonToolbarCoordinator.getOnSwipeCallbackForTesting().handleBackSwipe(); + mAutomotiveBackButtonToolbarCoordinator.getOnSwipeCallbackForTesting().handleSwipe(); + mAutomotiveBackButtonToolbarCoordinator.getOnSwipeCallbackForTesting().handleBackSwipe(); + ShadowLooper.idleMainLooper(ANIMATION_DURATION_MS, TimeUnit.MILLISECONDS); + Assert.assertEquals( + "First swipe gesture will be consumed to hide the toolbar, and the foward swipe and" + + " following back swipe will be ignored", + mOnSwipeAutomotiveToolbar.getVisibility(), + View.GONE); + } }
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/automotivetoolbar/EdgeSwipeGestureDetectorUnitTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/automotivetoolbar/EdgeSwipeGestureDetectorUnitTest.java index 9ddbcb0a..cd26ebac 100644 --- a/chrome/android/junit/src/org/chromium/chrome/browser/automotivetoolbar/EdgeSwipeGestureDetectorUnitTest.java +++ b/chrome/android/junit/src/org/chromium/chrome/browser/automotivetoolbar/EdgeSwipeGestureDetectorUnitTest.java
@@ -54,7 +54,7 @@ public void onSwipe_validSwipe() { MotionEvent eventSrc = MotionEvent.obtain(0, 0, MotionEvent.ACTION_DOWN, 7, 0, 0); MotionEvent eventTo = MotionEvent.obtain(0, 100, MotionEvent.ACTION_MOVE, 300, 0, 0); - assertTrue(mSimpleOnGestureListener.onScroll(eventSrc, eventTo, -300, 0)); + assertTrue(mSimpleOnGestureListener.onScroll(eventSrc, eventTo, 293, 0)); verify(mOnSwipeCallback).handleSwipe(); } @@ -64,24 +64,60 @@ MotionEvent eventTo = MotionEvent.obtain(0, 100, MotionEvent.ACTION_MOVE, 0, 0, 0); assertFalse( "Swipe in opposite direction should not be consumed", - mSimpleOnGestureListener.onScroll(eventSrc, eventTo, 300, 0)); + mEdgeSwipeGestureDetector.isValidSwipe(eventSrc, eventTo, 300, 0)); MotionEvent eventSrc1 = MotionEvent.obtain(0, 0, MotionEvent.ACTION_DOWN, 300, 0, 0); MotionEvent eventTo1 = MotionEvent.obtain(0, 100, MotionEvent.ACTION_MOVE, 600, 0, 0); assertFalse( "Swipe does not start on left edge", - mSimpleOnGestureListener.onScroll(eventSrc1, eventTo1, -300, 0)); + mEdgeSwipeGestureDetector.isValidSwipe(eventSrc1, eventTo1, -300, 0)); MotionEvent eventSrc2 = MotionEvent.obtain(0, 0, MotionEvent.ACTION_DOWN, 0, 0, 0); MotionEvent eventTo2 = MotionEvent.obtain(0, 100, MotionEvent.ACTION_MOVE, 40, 0, 0); assertFalse( "Swipe does not meet horizontal threshold", - mSimpleOnGestureListener.onScroll(eventSrc2, eventTo2, -40, 0)); + mEdgeSwipeGestureDetector.isValidSwipe(eventSrc2, eventTo2, -40, 0)); MotionEvent eventSrc3 = MotionEvent.obtain(0, 0, MotionEvent.ACTION_DOWN, 7, 0, 0); MotionEvent eventTo3 = MotionEvent.obtain(0, 100, MotionEvent.ACTION_MOVE, 300, 500, 0); assertFalse( "Swipe has too much vertical delta", - mSimpleOnGestureListener.onScroll(eventSrc3, eventTo3, -300, 500)); + mEdgeSwipeGestureDetector.isValidSwipe(eventSrc3, eventTo3, -300, 500)); + } + + @Test + public void onSwipe_validBackSwipe() { + MotionEvent eventSrc = MotionEvent.obtain(0, 0, MotionEvent.ACTION_DOWN, 300, 0, 0); + MotionEvent eventTo = MotionEvent.obtain(0, 100, MotionEvent.ACTION_MOVE, 7, 0, 0); + assertTrue(mSimpleOnGestureListener.onScroll(eventSrc, eventTo, -293, 0)); + verify(mOnSwipeCallback).handleBackSwipe(); + } + + @Test + public void onSwipe_invalidBackSwipe() { + mEdgeSwipeGestureDetector.setIsReadyForNewScroll(false); + MotionEvent eventSrc = MotionEvent.obtain(0, 0, MotionEvent.ACTION_DOWN, 7, 0, 0); + MotionEvent eventTo = MotionEvent.obtain(0, 100, MotionEvent.ACTION_MOVE, 300, 0, 0); + assertFalse( + "Swipe in opposite direction should not be consumed", + mEdgeSwipeGestureDetector.isValidBackSwipe(eventSrc, eventTo, 293, 0)); + + MotionEvent eventSrc1 = MotionEvent.obtain(0, 0, MotionEvent.ACTION_DOWN, 400, 0, 0); + MotionEvent eventTo1 = MotionEvent.obtain(0, 100, MotionEvent.ACTION_MOVE, 100, 0, 0); + assertFalse( + "Swipe does end near left edge", + mEdgeSwipeGestureDetector.isValidBackSwipe(eventSrc1, eventTo1, -300, 0)); + + MotionEvent eventSrc2 = MotionEvent.obtain(0, 0, MotionEvent.ACTION_DOWN, 40, 0, 0); + MotionEvent eventTo2 = MotionEvent.obtain(0, 100, MotionEvent.ACTION_MOVE, 10, 0, 0); + assertFalse( + "Swipe does not meet horizontal threshold", + mEdgeSwipeGestureDetector.isValidBackSwipe(eventSrc2, eventTo2, -30, 0)); + + MotionEvent eventSrc3 = MotionEvent.obtain(0, 0, MotionEvent.ACTION_DOWN, 300, 0, 0); + MotionEvent eventTo3 = MotionEvent.obtain(0, 100, MotionEvent.ACTION_MOVE, 7, 500, 0); + assertFalse( + "Swipe has too much vertical delta", + mEdgeSwipeGestureDetector.isValidBackSwipe(eventSrc3, eventTo3, 293, 500)); } }
diff --git a/chrome/app/resources/chromium_strings_bs.xtb b/chrome/app/resources/chromium_strings_bs.xtb index 9e97db8..c515ca1 100644 --- a/chrome/app/resources/chromium_strings_bs.xtb +++ b/chrome/app/resources/chromium_strings_bs.xtb
@@ -114,6 +114,7 @@ <translation id="2483889755041906834">U Chromiumu</translation> <translation id="2485422356828889247">Deinstaliraj</translation> <translation id="2513154137948333830">Potrebno je ponovno pokretanje: <ph name="INSTALL_SUCCESS" /></translation> +<translation id="2522009821193247726">Da biste nastavili, trebate se prijaviti u Chromium pomoću e-adrese <ph name="EMAIL" />. To osigurava usklađenost s pravilima vaše organizacije.</translation> <translation id="2542968102051442371">Odaberite tekst putem pretraživanja pomoću slika</translation> <translation id="2554739539410784893">Chromium pokušava zamijeniti postojeće lozinke. Upišite lozinku za Windows da ovo dozvolite.</translation> <translation id="2560420686485554789">Chromium treba pristup pohrani zbog preuzimanja fajlova</translation>
diff --git a/chrome/app/resources/chromium_strings_en-GB.xtb b/chrome/app/resources/chromium_strings_en-GB.xtb index c1f015e5..ccbf3bd 100644 --- a/chrome/app/resources/chromium_strings_en-GB.xtb +++ b/chrome/app/resources/chromium_strings_en-GB.xtb
@@ -114,6 +114,7 @@ <translation id="2483889755041906834">In Chromium</translation> <translation id="2485422356828889247">Uninstall</translation> <translation id="2513154137948333830">Reboot required: <ph name="INSTALL_SUCCESS" /></translation> +<translation id="2522009821193247726">To continue, you'll need to sign in to Chromium with <ph name="EMAIL" />. This ensures compliance with your organisation's policies.</translation> <translation id="2542968102051442371">Select text with image search</translation> <translation id="2554739539410784893">Chromium is trying to replace existing passwords. Type in your Windows password to allow this.</translation> <translation id="2560420686485554789">Chromium needs storage access to download files</translation>
diff --git a/chrome/app/resources/chromium_strings_fa.xtb b/chrome/app/resources/chromium_strings_fa.xtb index 246806eb..ac2ae92 100644 --- a/chrome/app/resources/chromium_strings_fa.xtb +++ b/chrome/app/resources/chromium_strings_fa.xtb
@@ -112,6 +112,7 @@ <translation id="2483889755041906834">در Chromium</translation> <translation id="2485422356828889247">حذف نصب</translation> <translation id="2513154137948333830">بازراهاندازی لازم است: <ph name="INSTALL_SUCCESS" /></translation> +<translation id="2522009821193247726">برای ادامه دادن، باید با <ph name="EMAIL" /> به سیستم Chromium وارد شوید. با این کار، پیروی از خطمشیهای سازمان تضمین میشود.</translation> <translation id="2542968102051442371">نوشتاری را برای استفاده از «جستجوی تصویر» انتخاب کنید</translation> <translation id="2554739539410784893">Chromium میخواهد گذواژههای موجود را جایگزین کند. برای مجاز کردن این کار، گذرواژه Windows خود را تایپ کنید.</translation> <translation id="2560420686485554789">Chromium برای بارگیری فایلها باید به حافظه دسترسی داشته باشد</translation>
diff --git a/chrome/app/resources/chromium_strings_gu.xtb b/chrome/app/resources/chromium_strings_gu.xtb index bfbf09d8..91c933c 100644 --- a/chrome/app/resources/chromium_strings_gu.xtb +++ b/chrome/app/resources/chromium_strings_gu.xtb
@@ -114,6 +114,7 @@ <translation id="2483889755041906834">Chromium માં</translation> <translation id="2485422356828889247">અનઇન્સ્ટૉલ કરો</translation> <translation id="2513154137948333830">રીબૂટ કરવું આવશ્યક છે: <ph name="INSTALL_SUCCESS" /></translation> +<translation id="2522009821193247726">આગળ વધવા માટે, તમારે <ph name="EMAIL" /> વડે Chromiumમાં સાઇન ઇન કરવું જરૂરી રહેશે. આનાથી તમારી સંસ્થાની પૉલિસીઓનું પાલન થતું હોવાની ખાતરી થાય છે.</translation> <translation id="2542968102051442371">'છબી વડે શોધ' સુવિધા વડે ટેક્સ્ટ પસંદ કરો</translation> <translation id="2554739539410784893">Chromium વર્તમાન પાસવર્ડ બદલવાનો પ્રયાસ કરી રહ્યું છે. આને મંજૂરી આપવા માટે Windowsનો પાસવર્ડ ટાઇપ કરો.</translation> <translation id="2560420686485554789">ફાઇલો ડાઉનલોડ કરવા માટે Chromiumને સ્ટોરેજના ઍક્સેસની જરૂર પડે છે</translation>
diff --git a/chrome/app/resources/chromium_strings_hr.xtb b/chrome/app/resources/chromium_strings_hr.xtb index d8c9ee9..2a39479 100644 --- a/chrome/app/resources/chromium_strings_hr.xtb +++ b/chrome/app/resources/chromium_strings_hr.xtb
@@ -112,6 +112,7 @@ <translation id="2483889755041906834">U Chromiumu</translation> <translation id="2485422356828889247">Deinstaliraj</translation> <translation id="2513154137948333830">Potrebno je ponovno pokretanje: <ph name="INSTALL_SUCCESS" /></translation> +<translation id="2522009821193247726">Da biste nastavili, trebate se prijaviti u Chromium pomoću e-adrese <ph name="EMAIL" />. To osigurava usklađenost s pravilima vaše organizacije.</translation> <translation id="2542968102051442371">Odaberite tekst pomoću pretraživanja slika</translation> <translation id="2554739539410784893">Chromium pokušava zamijeniti postojeće zaporke. Upišite svoju zaporku za Windows da biste to dopustili.</translation> <translation id="2560420686485554789">Chromium treba pristup pohrani radi preuzimanja datoteka</translation>
diff --git a/chrome/app/resources/chromium_strings_hu.xtb b/chrome/app/resources/chromium_strings_hu.xtb index 2ff035fc..4f01c5fe 100644 --- a/chrome/app/resources/chromium_strings_hu.xtb +++ b/chrome/app/resources/chromium_strings_hu.xtb
@@ -112,6 +112,7 @@ <translation id="2483889755041906834">A Chromiumban</translation> <translation id="2485422356828889247">Eltávolítás</translation> <translation id="2513154137948333830">Újraindításra van szükség: <ph name="INSTALL_SUCCESS" /></translation> +<translation id="2522009821193247726">A folytatáshoz be kell jelentkeznie a Chromiumba a következővel: <ph name="EMAIL" />. Ezzel biztosíthatja, hogy megfeleljen a szervezete házirendjeinek.</translation> <translation id="2542968102051442371">Jelölje ki a szöveget a Képkeresővel</translation> <translation id="2554739539410784893">A Chromium lecserélni próbálja a meglévő jelszavakat. Az engedélyezéshez adja meg Windows-jelszavát.</translation> <translation id="2560420686485554789">A Chromiumnak tárhelyhozzáférésre van szüksége a fájlok letöltéséhez</translation>
diff --git a/chrome/app/resources/chromium_strings_it.xtb b/chrome/app/resources/chromium_strings_it.xtb index 15193bc1..6fb1d50 100644 --- a/chrome/app/resources/chromium_strings_it.xtb +++ b/chrome/app/resources/chromium_strings_it.xtb
@@ -111,6 +111,7 @@ <translation id="2483889755041906834">In Chromium</translation> <translation id="2485422356828889247">Disinstalla</translation> <translation id="2513154137948333830">È richiesto il riavvio: <ph name="INSTALL_SUCCESS" /></translation> +<translation id="2522009821193247726">Per continuare, devi accedere a Chromium con <ph name="EMAIL" />. In questo modo viene garantita la conformità ai criteri della tua organizzazione.</translation> <translation id="2542968102051442371">Seleziona testo con la ricerca immagini</translation> <translation id="2554739539410784893">Chromium sta cercando di sostituire le password esistenti. Digita la tua password di Windows per consentire l'operazione.</translation> <translation id="2560420686485554789">Chromium deve avere accesso allo spazio di archiviazione per poter scaricare file</translation>
diff --git a/chrome/app/resources/chromium_strings_km.xtb b/chrome/app/resources/chromium_strings_km.xtb index 57075f3..aafcd81 100644 --- a/chrome/app/resources/chromium_strings_km.xtb +++ b/chrome/app/resources/chromium_strings_km.xtb
@@ -113,6 +113,7 @@ <translation id="2483889755041906834">នៅក្នុង Chromium</translation> <translation id="2485422356828889247">លុប</translation> <translation id="2513154137948333830">តម្រូវឱ្យចាប់ផ្ដើមឡើងវិញ៖ <ph name="INSTALL_SUCCESS" /></translation> +<translation id="2522009821193247726">ដើម្បីបន្ត អ្នកនឹងត្រូវចូលគណនី Chromium ដោយប្រើ <ph name="EMAIL" />។ ការធ្វើបែបនេះធានាបាននូវអនុលោមភាពជាមួយគោលការណ៍របស់ស្ថាប័នអ្នក។</translation> <translation id="2542968102051442371">ជ្រើសរើសអក្សរសម្រាប់ស្វែងរកដោយប្រើការស្វែងរករូបភាព</translation> <translation id="2554739539410784893">Chromium កំពុងព្យាយាមជំនួសពាក្យសម្ងាត់ដែលមានស្រាប់។ សូមវាយបញ្ចូលពាក្យសម្ងាត់ Windows របស់អ្នក ដើម្បីអនុញ្ញាតការជំនួសនេះ។</translation> <translation id="2560420686485554789">Chromium ត្រូវការសិទ្ធិចូលប្រើទំហំផ្ទុកដើម្បីទាញយកឯកសារ</translation>
diff --git a/chrome/app/resources/chromium_strings_lo.xtb b/chrome/app/resources/chromium_strings_lo.xtb index f9ba336..8a571503 100644 --- a/chrome/app/resources/chromium_strings_lo.xtb +++ b/chrome/app/resources/chromium_strings_lo.xtb
@@ -114,6 +114,7 @@ <translation id="2483889755041906834">ໃນ Chromium</translation> <translation id="2485422356828889247">ຖອນຕິດຕັ້ງ</translation> <translation id="2513154137948333830">ຕ້ອງປິດເປີດໃໝ່: <ph name="INSTALL_SUCCESS" /></translation> +<translation id="2522009821193247726">ເພື່ອສືບຕໍ່, ທ່ານຈະຕ້ອງເຂົ້າສູ່ລະບົບ Chromium ດ້ວຍ <ph name="EMAIL" />. ສິ່ງນີ້ເພື່ອໃຫ້ໝັ້ນໃຈວ່າເປັນການປະຕິບັດຕາມນະໂຍບາຍຂອງອົງກອນຂອງທ່ານ.</translation> <translation id="2542968102051442371">ເລືອກຂໍ້ຄວາມດ້ວຍການຊອກຫາຮູບ</translation> <translation id="2554739539410784893">Chromium ກຳລັງພະຍາຍາມປ່ຽນແທນລະຫັດຜ່ານທີ່ມີຢູ່. ພິມລະຫັດຜ່ານ Windows ຂອງທ່ານໃສ່ເພື່ອອະນຸຍາດສິ່ງນີ້.</translation> <translation id="2560420686485554789">Chromium ຕ້ອງການເຂົ້າເຖິງບ່ອນເກັບຂໍ້ມູນເພື່ອດາວໂຫຼດໄຟລ໌</translation>
diff --git a/chrome/app/resources/chromium_strings_ms.xtb b/chrome/app/resources/chromium_strings_ms.xtb index e635079..024d718 100644 --- a/chrome/app/resources/chromium_strings_ms.xtb +++ b/chrome/app/resources/chromium_strings_ms.xtb
@@ -112,6 +112,7 @@ <translation id="2483889755041906834">Dalam Chromium</translation> <translation id="2485422356828889247">Nyahpasang</translation> <translation id="2513154137948333830">But semula diperlukan: <ph name="INSTALL_SUCCESS" /></translation> +<translation id="2522009821193247726">Untuk meneruskan proses, anda perlu log masuk ke Chromium dengan <ph name="EMAIL" />. Langkah ini memastikan pematuhan dengan dasar organisasi anda.</translation> <translation id="2542968102051442371">Pilih imej menggunakan Carian Imej</translation> <translation id="2554739539410784893">Chromium cuba menggantikan kata laluan sedia ada. Taip kata laluan Windows anda untuk membenarkan tindakan ini.</translation> <translation id="2560420686485554789">Chromium memerlukan akses storan untuk memuat turun fail</translation>
diff --git a/chrome/app/resources/chromium_strings_sk.xtb b/chrome/app/resources/chromium_strings_sk.xtb index 66a86c1..c0e3876 100644 --- a/chrome/app/resources/chromium_strings_sk.xtb +++ b/chrome/app/resources/chromium_strings_sk.xtb
@@ -113,6 +113,7 @@ <translation id="2483889755041906834">V prehliadači Chromium</translation> <translation id="2485422356828889247">Odinštalovať</translation> <translation id="2513154137948333830">Vyžaduje sa reštart: <ph name="INSTALL_SUCCESS" /></translation> +<translation id="2522009821193247726">Ak chcete pokračovať, musíte sa do prehliadača Chromium prihlásiť účtom <ph name="EMAIL" />. Zaistí sa tým súlad s pravidlami vašej organizácie.</translation> <translation id="2542968102051442371">Vyberte text pomocou funkcie vyhľadávanie podľa obrázkov</translation> <translation id="2554739539410784893">Chromium sa pokúša nahradiť existujúce heslá. Ak to chcete povoliť, zadajte heslo systému Windows.</translation> <translation id="2560420686485554789">Chromium potrebuje na sťahovanie súborov prístup k úložisku</translation>
diff --git a/chrome/app/resources/generated_resources_af.xtb b/chrome/app/resources/generated_resources_af.xtb index 87cf4e7..34d283f 100644 --- a/chrome/app/resources/generated_resources_af.xtb +++ b/chrome/app/resources/generated_resources_af.xtb
@@ -667,7 +667,6 @@ <translation id="1464258312790801189">Jou rekeninge</translation> <translation id="1464597059227482327">Maak seker dat “Nabysigbaarheid” op die Chromebook aangeskakel is as jy met ’n Chromebook deel wat nie in jou kontakte is nie. Om “Nabysigbaarheid” aan te skakel, moet jy die hoek onder regs kies en dan kies om “Nabysigbaarheid” aan te skakel. <ph name="LINK_BEGIN" />Kom meer te wete<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Gaan na Instellings toe vir toestelvoorkeure</translation> -<translation id="146481294006497945">Geen gestoorde wagwoorde nie</translation> <translation id="1465176863081977902">Kopieer oudio-adres</translation> <translation id="146522654774760805">Wagwoorde en outovul</translation> <translation id="1465827627707997754">Pizzaskyf</translation> @@ -2178,7 +2177,6 @@ <translation id="2485394160472549611">Topkeuses vir jou</translation> <translation id="2485422356828889247">Deïnstalleer</translation> <translation id="2485681265915754872">Google Play se diensbepalings</translation> -<translation id="2486036712620651117">Wagwoorde en toegangsleutels</translation> <translation id="248676429071089168">Swiep op om die bladsy af te beweeg</translation> <translation id="2487067538648443797">Voeg nuwe boekmerk by</translation> <translation id="2489686758589235262">Wys nog 2 skakelaars toe</translation> @@ -3901,7 +3899,6 @@ <translation id="3721178866505920080">Meer inligting oor die aanskakel van uitgebreide vooraflaai</translation> <translation id="3722108462506185496">Kon nie die virtuelemasjiendiens begin nie. Probeer asseblief weer.</translation> <translation id="3722624153992426516"><ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" />-instruksie is ontvang</translation> -<translation id="3724897774652282549">Vul die vorm in</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Beskikbare wi-fi-netwerke</translation> @@ -4334,7 +4331,6 @@ <translation id="3993887353483242788">Sinkroniseer jou <ph name="DEVICE_TYPE" /> sodat jou voorkeure op enige toestel gereed sal wees wanneer jy by jou Google-rekening aanmeld. Voorkeure sluit in programme, instellings, wi-fi-wagwoorde, tale, muurpapier, kortpadsleutels en meer.</translation> <translation id="3994318741694670028">Ongelukkig is jou rekenaar opgestel met ’n misvormde hardeware-ID. Dit verhinder Chrome OS Flex om met die nuutste sekuriteitsoplossings op te dateer, en jou rekenaar <ph name="BEGIN_BOLD" />kan blootgestel wees aan kwaadwillige aanvalle<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Ontsluit jou foon en bring dit nader om jou <ph name="DEVICE_TYPE" /> te ontsluit.</translation> -<translation id="3994522032746736727">Meld aan as <ph name="EMAIL" /></translation> <translation id="3994530503403062649">Vind knoppies op jou tablet</translation> <translation id="3994708120330953242">Sommige van jou wagwoorde is in ’n dataskending gekry. Jy moet hierdie wagwoorde nou verander om jou rekeninge te beveilig.</translation> <translation id="3994878504415702912">Zoem</translation> @@ -6606,7 +6602,6 @@ <translation id="5646994841348250879">Kies ’n rekening om by <ph name="SITE_ETLD_PLUS_ONE" /> aan te meld</translation> <translation id="5648021990716966815">Mikrofoonsok</translation> <translation id="5648166631817621825">Afgelope 7 dae</translation> -<translation id="5650537073531199882">Vul die vorm in</translation> <translation id="5651308944918885595">Nabydeling: opspoorbaarheid</translation> <translation id="5653154844073528838">Jy het <ph name="PRINTER_COUNT" /> gestoorde drukkers.</translation> <translation id="5654669866168491665">Kom meer te wete oor werwe wat dalk nie werk wanneer derdepartywebkoekies geblokkeer word nie</translation> @@ -8605,6 +8600,7 @@ <translation id="7113974454301513811">Voeg nou die huidige oortjie by jou lys</translation> <translation id="7114054701490058191">Wagwoorde stem nie ooreen nie</translation> <translation id="7114648273807173152">Gaan na Instellings > Gekoppelde toestelle > Jou foon > Smart Lock toe om Smart Lock te gebruik om by jou Google-rekening aan te meld.</translation> +<translation id="7115051913071512405">Probeer dit</translation> <translation id="7115361495406486998">Geen bereikbare kontakte nie</translation> <translation id="7115731767122970828">Gee nou hupstoot</translation> <translation id="7116554090938189816">Drukker se SSL-sertifikaat het verval. Herbegin drukker en probeer weer.</translation>
diff --git a/chrome/app/resources/generated_resources_am.xtb b/chrome/app/resources/generated_resources_am.xtb index b37c1f51..6e4d791c 100644 --- a/chrome/app/resources/generated_resources_am.xtb +++ b/chrome/app/resources/generated_resources_am.xtb
@@ -667,7 +667,6 @@ <translation id="1464258312790801189">የእርስዎ መለያዎች</translation> <translation id="1464597059227482327">በዕውቂያዎችዎ ውስጥ ከሌለ Chromebook ጋር እያጋሩ ከሆነ በዚህ Chromebook ላይ «የአቅራቢያ ታይነት» መብራቱን ያረጋግጡ። «የአቅራቢያ ታይነት» ለማብራት ታችኛውን ቀኝ ጥግ ይምረጡ እና ከዚያም «የአቅራቢያ ታይነት» ማብራትን ይምረጡ። <ph name="LINK_BEGIN" />የበለጠ ለመረዳት<ph name="LINK_END" /></translation> <translation id="1464781208867302907">ለመሣሪያ ምርጫዎች፣ ወደ ቅንብሮች ሂድ</translation> -<translation id="146481294006497945">ምንም የተቀመጡ የይለፍ ቃላት የሉም</translation> <translation id="1465176863081977902">የኦዲዮ አድራሻ &ቅዳ</translation> <translation id="146522654774760805">የይለፍ ቃላት እና ራስ-ሙላ</translation> <translation id="1465827627707997754">የፒዛ ቁራጭ</translation> @@ -2174,7 +2173,6 @@ <translation id="2485394160472549611">ለእርስዎ የተመረጡ ምርጦች</translation> <translation id="2485422356828889247">አራግፍ</translation> <translation id="2485681265915754872">የGoogle Play አገልግሎት ውል</translation> -<translation id="2486036712620651117">የይለፍ ቃላት እና የይለፍ ቁልፎች</translation> <translation id="248676429071089168">ገጹን ወደታች ለማንቀሳቀስ ወደላይ ያሸብልሉ</translation> <translation id="2487067538648443797">አዲስ ዕልባት ያክሉ</translation> <translation id="2489686758589235262">2 ተጨማሪ መቀየሪያዎችን ይመድቡ</translation> @@ -3897,7 +3895,6 @@ <translation id="3721178866505920080">የተራዘመ ቅድሚያ መጫንን ስለማብራት ተጨማሪ መረጃ</translation> <translation id="3722108462506185496">ምናባዊ ማሽንን ማስጀመር አልተቻለም። እባክዎ እንደገና ይሞክሩ።</translation> <translation id="3722624153992426516"><ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /> መመሪያ ተቀባይነት አግኝቷል</translation> -<translation id="3724897774652282549">የሚሞላ ቅጽ</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">የሚገኙ የWiFi አውታረ መረቦች</translation> @@ -4330,7 +4327,6 @@ <translation id="3993887353483242788">በGoogle መለያዎ ሲገቡ ምርጫዎችዎ በማንኛውም መሣሪያ ላይ ዝግጁ እንዲሆኑ የእርስዎን <ph name="DEVICE_TYPE" /> ያስምሩ። ምርጫዎች መተግበሪያዎችን፣ ቅንብሮችን፣ የWi-Fi ይለፍ ቃላትን፣ ቋንቋዎችን፣ ልጣፍን፣ የቁልፍ ሰሌዳ አቋራጮችን እና ሌሎችንም ያካትታሉ።</translation> <translation id="3994318741694670028">የአጋጣሚ ነገር ሆኖ ኮምፒውተርዎ የተዋቀረው በተበላሸ የሃርድዌር መታወቂያ ነው። ይህ ChromeOS Flex በቅርብ ጊዜዎቹ የደህንነት ጥገናዎች እንዳይዘመን ያግደዋል እና የእርስዎ ኮምፒውተር <ph name="BEGIN_BOLD" />ለተንኮል-አዘል ጥቃቶች የተጋለጠ ሊሆን ይችላል<ph name="END_BOLD" />።</translation> <translation id="3994374631886003300">የእርስዎን <ph name="DEVICE_TYPE" /> ለመክፈት የእርስዎን ስልክ ይክፈቱና ያስጠጉት።</translation> -<translation id="3994522032746736727">እንደ <ph name="EMAIL" /> ሆነው ይግቡ</translation> <translation id="3994530503403062649">ጡባዊዎ ላይ አዝራሮችን ያግኙ</translation> <translation id="3994708120330953242">አንዳንድ የይለፍ ቃላትዎ በውሂብ ጥሰት ውስጥ ተገኝተዋል። የመለያዎችዎን ደህንነት ለመጠበቅ እነዚህን የይለፍ ቃላት አሁን መቀየር አለብዎት።</translation> <translation id="3994878504415702912">&ማጉሊያ</translation> @@ -6599,7 +6595,6 @@ <translation id="5646994841348250879">ወደ «<ph name="SITE_ETLD_PLUS_ONE" />» የሚገቡበትን መለያ ይምረጡ</translation> <translation id="5648021990716966815">የማይክሮፎን መሰኪያ</translation> <translation id="5648166631817621825">ያለፉት 7 ቀኖች</translation> -<translation id="5650537073531199882">የሚሞላ ቅጽ</translation> <translation id="5651308944918885595">የአቅራቢያ አጋራ ተገኝነት</translation> <translation id="5653154844073528838">የተቀመጡ <ph name="PRINTER_COUNT" /> አታሚዎች አልዎት።</translation> <translation id="5654669866168491665">የሦስተኛ ወገን ኩኪዎች በሚታገዱበት ጊዜ ላይሠሩ ስለሚችሉ ጣቢያዎች የበለጠ ይወቁ</translation> @@ -8601,6 +8596,7 @@ <translation id="7113974454301513811">የአሁኑን ትር ወደ ዝርዝርዎ አሁን ያክሉት</translation> <translation id="7114054701490058191">የይለፍ ቃላት አይዛመዱም</translation> <translation id="7114648273807173152">Smart Lockን ተጠቅመው ወደ የGoogle መለያዎ ለመግባት ወደ ቅንብሮች > የተገናኙ መሣሪያዎች > የእርስዎ ስልክ > Smart Lock ይሂዱ።</translation> +<translation id="7115051913071512405">ሞክረው</translation> <translation id="7115361495406486998">ሊደረስባቸው የሚችሉ እውቂያዎች የሉም</translation> <translation id="7115731767122970828">አሁን ጨምር</translation> <translation id="7116554090938189816">የማተሚያ የኤስኤስኤል የዕውቅና ማረጋገጫ ጊዜው አልፎበታል። ማተሚያን እንደገና ያስጀመሩ እና እንደገና ይሞክሩ።</translation>
diff --git a/chrome/app/resources/generated_resources_ar.xtb b/chrome/app/resources/generated_resources_ar.xtb index 9fcd7ec..d83ebe4 100644 --- a/chrome/app/resources/generated_resources_ar.xtb +++ b/chrome/app/resources/generated_resources_ar.xtb
@@ -669,7 +669,6 @@ <translation id="1464258312790801189">حساباتك</translation> <translation id="1464597059227482327">إذا كنت تشارك الملفات مع جهاز Chromebook غير مدرَج في جهات اتصالك، يُرجى التأكّد من تفعيل وضع "مشاركة عن قرب" على جهاز Chromebook. لتفعيل وضع "مشاركة عن قرب"، انقر على الزاوية السفلية اليسرى ثم انقر لتفعيل وضع "مشاركة عن قرب". <ph name="LINK_BEGIN" />مزيد من المعلومات<ph name="LINK_END" /></translation> <translation id="1464781208867302907">بالنسبة إلى الإعدادات المفضلة، يُرجى الانتقال إلى "الإعدادات".</translation> -<translation id="146481294006497945">ما مِن كلمات مرور محفوظة</translation> <translation id="1465176863081977902">ن&سخ عنوان الصوت</translation> <translation id="146522654774760805">كلمات المرور والملء التلقائي</translation> <translation id="1465827627707997754">شريحة بيتزا</translation> @@ -2170,7 +2169,6 @@ <translation id="2485394160472549611">أهم الاقتراحات المخصّصة لك</translation> <translation id="2485422356828889247">إزالة التثبيت</translation> <translation id="2485681265915754872">بنود خدمة Google Play</translation> -<translation id="2486036712620651117">كلمات المرور ومفاتيح المرور</translation> <translation id="248676429071089168">التمرير سريعًا للأعلى لتحريك الصفحة للأسفل</translation> <translation id="2487067538648443797">إضافة إشارة مرجعية جديدة</translation> <translation id="2489686758589235262">تخصيص مفتاحَي تحكّم إضافيَّين</translation> @@ -3893,7 +3891,6 @@ <translation id="3721178866505920080">مزيد من المعلومات حول تفعيل التحميل المُسبَق الموسَّع</translation> <translation id="3722108462506185496">حدث خطأ أثناء بدء تشغيل خدمة الآلة الافتراضية. يُرجى إعادة المحاولة.</translation> <translation id="3722624153992426516">تم تلقي تعليمات "<ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" />".</translation> -<translation id="3724897774652282549">يُرجى ملء الاستمارة</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">شبكات Wi-Fi المتاحة</translation> @@ -4324,7 +4321,6 @@ <translation id="3993887353483242788">يُرجى مزامنة إعدادات جهاز <ph name="DEVICE_TYPE" /> لتتوفّر إعداداتك المفضّلة على أي جهاز عند تسجيل الدخول عليه بحسابك على Google. وتشتمل هذه الإعدادات المفضّلة على الإعدادات والتطبيقات وكلمات مرور Wi-Fi واللغات والخلفية واختصارات لوحة المفاتيح وغيرها الكثير.</translation> <translation id="3994318741694670028">تم إعداد جهاز الكمبيوتر باستخدام معرّف جهاز غير صحيح. ويؤدي ذلك إلى منع تحديث نظام التشغيل ChromeOS Flex وتوفير أحدث الإصلاحات المتعلّقة بالأمان، وقد يكون جهاز الكمبيوتر <ph name="BEGIN_BOLD" />عرضة للهجمات الضارة<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">ألغِ قفل هاتفك وقرِّبه لإلغاء قفل جهاز <ph name="DEVICE_TYPE" />.</translation> -<translation id="3994522032746736727">تسجيل الدخول بحساب <ph name="EMAIL" /></translation> <translation id="3994530503403062649">تحديد مكان الأزرار على جهازك اللوحي</translation> <translation id="3994708120330953242">استُخدمت بعض كلمات المرور الخاصة بك في عملية اختراق للبيانات. لحماية حساباتك، عليك تغيير كلمات المرور هذه الآن.</translation> <translation id="3994878504415702912">&تكبير/تصغير</translation> @@ -6595,7 +6591,6 @@ <translation id="5646994841348250879">اختيار حساب لتسجيل الدخول إلى <ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">مقبس الميكروفون</translation> <translation id="5648166631817621825">آخر 7 أيام</translation> -<translation id="5650537073531199882">ملء الاستمارة</translation> <translation id="5651308944918885595">قابلية اكتشاف الجهاز الذي يستخدم ميزة "المشاركة عن قرب"</translation> <translation id="5653154844073528838">يتوفّر لديك <ph name="PRINTER_COUNT" /> طابعة محفوظة.</translation> <translation id="5654669866168491665">مزيد من المعلومات حول المواقع الإلكترونية التي قد لا تعمل عند حظر ملفات تعريف الارتباط التابعة لجهات خارجية</translation> @@ -8603,6 +8598,7 @@ <translation id="7113974454301513811">عليك الآن إضافة علامة التبويب الحالية إلى قائمتك.</translation> <translation id="7114054701490058191">كلمات المرور غير متطابقة</translation> <translation id="7114648273807173152">لاستخدام Smart Lock لتسجيل الدخول إلى حسابك على Google، يمكنك الانتقال إلى "الإعدادات" > "الأجهزة المتصلة" > "هاتفك" > Smart Lock.</translation> +<translation id="7115051913071512405">جرب بنفسك</translation> <translation id="7115361495406486998">ما من جهات اتصال يمكن الوصول إليها</translation> <translation id="7115731767122970828">تعزيز الأداء الآن</translation> <translation id="7116554090938189816">انتهت صلاحية شهادة طبقة المقابس الآمنة (SSL) للطابعة. يُرجى إعادة تشغيل الطابعة والمحاولة مرة أخرى.</translation>
diff --git a/chrome/app/resources/generated_resources_as.xtb b/chrome/app/resources/generated_resources_as.xtb index b3577da..f8c39f1 100644 --- a/chrome/app/resources/generated_resources_as.xtb +++ b/chrome/app/resources/generated_resources_as.xtb
@@ -668,7 +668,6 @@ <translation id="1464258312790801189">আপোনাৰ একাউণ্ট</translation> <translation id="1464597059227482327">যদি আপুনি আপোনাৰ সম্পৰ্কসূচীত নথকা Chromebookৰ সৈতে শ্বেয়াৰ কৰি আছে, নিশ্চিত কৰক যে Chromebookটোত "নিকটৱৰ্তী দৃশ্যমানতা" অন কৰা আছে। "নিকটৱৰ্তী দৃশ্যমানতা" অন কৰিবলৈ, একেবাৰে তলৰ সোঁ কোণটো বাছনি কৰক আৰু তাৰ পাছত "নিকটৱৰ্তী দৃশ্যমানতা" অন কৰিবলৈ বাছনি কৰক। <ph name="LINK_BEGIN" />অধিক জানক<ph name="LINK_END" /></translation> <translation id="1464781208867302907">ডিভাইচৰ অগ্ৰাধিকাৰসমূহৰ বাবে ছেটিংসমূহলৈ যাওক।</translation> -<translation id="146481294006497945">কোনো ছেভ কৰা পাছৱৰ্ড নাই</translation> <translation id="1465176863081977902">অডিঅ’ ঠিকনা প্ৰতি&লিপি কৰক</translation> <translation id="146522654774760805">পাছৱৰ্ড আৰু স্বয়ংক্রিয়ভাৱে পূৰ হোৱাৰ সুবিধা</translation> <translation id="1465827627707997754">পিজ্জাৰ টুকুৰা</translation> @@ -2176,7 +2175,6 @@ <translation id="2485394160472549611">আপোনাৰ বাবে শীৰ্ষ বাছনিসমূহ</translation> <translation id="2485422356828889247">আনইনষ্টল কৰক</translation> <translation id="2485681265915754872">Google Playৰ সেৱাৰ চৰ্তাৱলী</translation> -<translation id="2486036712620651117">পাছৱৰ্ড আৰু পাছকী</translation> <translation id="248676429071089168">পৃষ্ঠাটো তললৈ নিবলৈ ওপৰলৈ ছোৱাইপ কৰক</translation> <translation id="2487067538648443797">নতুন বুকমাৰ্ক যোগ কৰক</translation> <translation id="2489686758589235262">আৰু ২ টা ছুইচ আবণ্টন কৰক</translation> @@ -3899,7 +3897,6 @@ <translation id="3721178866505920080">সময়সীমা বৃদ্ধি কৰা আগতীয়াকৈ ল’ড কৰা বিকল্পটোৰ বিষয়ে অধিক তথ্য</translation> <translation id="3722108462506185496">ভাৰ্চুৱেল মেচিন সেৱা আৰম্ভ কৰাত আসোঁৱাহৰ সৃষ্টি হৈছে৷ অনুগ্ৰহ কৰি আকৌ চেষ্টা কৰক।</translation> <translation id="3722624153992426516"><ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /> নিৰ্দেশনা লাভ কৰা হৈছে</translation> -<translation id="3724897774652282549">ফ’ৰ্মখন পূৰাওক</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">উপলব্ধ ৱাই-ফাই নেটৱৰ্ক</translation> @@ -4331,7 +4328,6 @@ <translation id="3993887353483242788">আপুনি নিজৰ Google একাউণ্টটোৰ জৰিয়তে ছাইন ইন কৰিলে আপোনাৰ অগ্ৰাধিকাৰসমূহ যিকোনো ডিভাইচত সাজু হৈ থাকিবলৈ আপোনাৰ <ph name="DEVICE_TYPE" /> ছিংক কৰক। অগ্ৰাধিকাৰসমূহত এপ্, ছেটিং, ৱাই-ফাইৰ পাছৱৰ্ড, ভাষা, ৱালপেপাৰ, কীব’ৰ্ডৰ শ্বৰ্টকাট আৰু বহুতো থাকে।</translation> <translation id="3994318741694670028">দুৰ্ভাগ্যবশতঃ, আপোনাৰ কম্পিউটাৰটো এটা ভুল হাৰ্ডৱেৰ আইডিৰ সৈতে কনফিগাৰ কৰা আছে। ই ChromeOS Flexক সুৰক্ষা সম্পৰ্কীয় শেহতীয়া সমস্যাৰ সমাধান ব্যৱহাৰ কৰি আপডে’ট কৰিবলৈ নিদিয়ে আৰু আপোনাৰ কম্পিউটাৰটো <ph name="BEGIN_BOLD" />ক্ষতিকাৰক আক্ৰমণৰ বলি হোৱাৰ সম্ভাৱনা থাকিব পাৰে<ph name="END_BOLD" />।</translation> <translation id="3994374631886003300">আপোনাৰ ফনটো আনলক কৰক আৰু আপোনাৰ <ph name="DEVICE_TYPE" /> আনলক কৰিবলৈ ওচৰলৈ আনক।</translation> -<translation id="3994522032746736727"><ph name="EMAIL" /> হিচাপে ছাইন ইন কৰক</translation> <translation id="3994530503403062649">আপোনাৰ টেবলেটত বুটামৰ অৱস্থান নিৰ্ধাৰণ কৰক</translation> <translation id="3994708120330953242">আপোনাৰ কিছুমান পাছৱৰ্ড এটা ডেটা উলংঘনত পোৱা গৈছে। আপোনাৰ একাউণ্টসমূহ সুৰক্ষিত কৰিবলৈ আপুনি আপোনাৰ পাছৱৰ্ডটো এতিয়াই সলনি কৰাৰ প্ৰয়োজন।</translation> <translation id="3994878504415702912">&জুম কৰক</translation> @@ -6602,7 +6598,6 @@ <translation id="5646994841348250879"><ph name="SITE_ETLD_PLUS_ONE" />ত ছাইন ইন কৰিবলৈ এটা একাউণ্ট বাছনি কৰক</translation> <translation id="5648021990716966815">মাইকৰ জেক</translation> <translation id="5648166631817621825">যোৱা ৭ দিনত</translation> -<translation id="5650537073531199882">ফ’ৰ্মখন পূৰাওক</translation> <translation id="5651308944918885595">Nearby Shareৰ দৃশ্যমানতাৰ ছেটিং</translation> <translation id="5653154844073528838">আপোনাৰ <ph name="PRINTER_COUNT" /> টা ছেভ কৰি থোৱা প্ৰিণ্টাৰ আছে।</translation> <translation id="5654669866168491665">তৃতীয় পক্ষৰ কুকি অৱৰোধ কৰিলে কাম নকৰিব পৰা ছাইটসমূহৰ বিষয়ে অধিক জানক</translation>
diff --git a/chrome/app/resources/generated_resources_az.xtb b/chrome/app/resources/generated_resources_az.xtb index fde8ff9..0b6c252 100644 --- a/chrome/app/resources/generated_resources_az.xtb +++ b/chrome/app/resources/generated_resources_az.xtb
@@ -664,7 +664,6 @@ <translation id="1464258312790801189">Hesablarınız</translation> <translation id="1464597059227482327">Kontaktlarda olmayan Chromebook ilə paylaşırsınızsa, Chromebook-da "Yaxınlıqda görünmə" aktiv edilməlidir. Aşağı sağ küncdə "Yaxınlıqda görünmə" seçimini aktiv edin. <ph name="LINK_BEGIN" />Ətraflı məlumat<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Cihaz seçimləri üçün ayarlara daxil olun.</translation> -<translation id="146481294006497945">Yadda saxlanmış parol yoxdur</translation> <translation id="1465176863081977902">Audio ünvanını kopyalayın</translation> <translation id="146522654774760805">Parollar və avtodoldurma</translation> <translation id="1465827627707997754">Pizza dilimi</translation> @@ -2164,7 +2163,6 @@ <translation id="2485394160472549611">Sizin üçün əsas seçilənlər</translation> <translation id="2485422356828889247">Sistemdən silin</translation> <translation id="2485681265915754872">Google Play xidmət şərtləri</translation> -<translation id="2486036712620651117">Parol və giriş açarları</translation> <translation id="248676429071089168">Səhifəni aşağı köçürmək üçün yuxarı sürüşdürün</translation> <translation id="2487067538648443797">Yeni əlfəcin əlavə edin</translation> <translation id="2489686758589235262">Daha 2 keçirici təyin edin</translation> @@ -3887,7 +3885,6 @@ <translation id="3721178866505920080">Artırılmış əvvəlcədən yükləməni aktivləşdirmək haqqında ətraflı məlumat</translation> <translation id="3722108462506185496">Virtual cihaz xidmətini başlatmaq mümkün olmadı. Sonra yenidən cəhd edin.</translation> <translation id="3722624153992426516"><ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /> təlimatı alınıb</translation> -<translation id="3724897774652282549">Formanı doldurun</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Əlçatan WiFi şəbəkələri</translation> @@ -4320,7 +4317,6 @@ <translation id="3993887353483242788"><ph name="DEVICE_TYPE" /> cihazınızı sinxronizasiya edin ki, Google Hesabınızla daxil olduğunuz zaman tərcihləriniz istənilən cihazda hazır olsun. Tərcihlərə tətbiqlər, ayarlar, Wi-Fi parolları, dillər, divar kağızı, klaviatura qısayolları və s. daxildir.</translation> <translation id="3994318741694670028">Kompüteriniz düzgün olmayan avadanlıq ID-si ilə sazlanıb. Bu, ChromeOS Flex'i ən son güvənlik bərpaları etməyə mane ola və kompüteriniz <ph name="BEGIN_BOLD" />hücumlara məruz qala bilər<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Telefonu kiliddən çıxarın və <ph name="DEVICE_TYPE" /> cihazını kiliddən çıxarmaq üçün onu yaxın tutun.</translation> -<translation id="3994522032746736727"><ph name="EMAIL" /> olaraq daxil olun</translation> <translation id="3994530503403062649">Planşetdə düymələrin yerini tapın</translation> <translation id="3994708120330953242">Parollarınızdan bəziləri data pozuntusunda aşkar edilib. Hesablarınızı qorumaq üçün bu parolları indi dəyişməlisiniz.</translation> <translation id="3994878504415702912">&Zoom</translation> @@ -6589,7 +6585,6 @@ <translation id="5646994841348250879"><ph name="SITE_ETLD_PLUS_ONE" /> tətbiqinə daxil olmaq üçün hesab seçin</translation> <translation id="5648021990716966815">Mikrofon yuvası</translation> <translation id="5648166631817621825">Son 7 gün</translation> -<translation id="5650537073531199882">Formanı doldurun</translation> <translation id="5651308944918885595">Yaxınlıqda Paylaşım rejimində kəşf oluna bilmə</translation> <translation id="5653154844073528838">Yadda saxlanmış <ph name="PRINTER_COUNT" /> printeriniz var.</translation> <translation id="5654669866168491665">Üçüncü tərəf kukilərini bloklayarkən işləməyəcək saytlar haqqında ətraflı məlumat</translation> @@ -8586,6 +8581,7 @@ <translation id="7113974454301513811">İndi siyahınıza cari tabı əlavə edin</translation> <translation id="7114054701490058191">Parollar eyni deyil</translation> <translation id="7114648273807173152">Smart Lock istifadə etmək üçün Google Hesabına daxil olun, Ayarlar > Qoşulu cihazlar> Telefon > Smart Lock bölməsinə daxil olun.</translation> +<translation id="7115051913071512405">Bunu sınayın</translation> <translation id="7115361495406486998">Əlçatan kontakt yoxdur</translation> <translation id="7115731767122970828">İndi gücləndirin</translation> <translation id="7116554090938189816">Printerin SSL sertifikatının vaxtı bitib. Printeri yenidən başladıb, təkrar cəhd edin.</translation>
diff --git a/chrome/app/resources/generated_resources_be.xtb b/chrome/app/resources/generated_resources_be.xtb index 25a7bd49..1bc466c 100644 --- a/chrome/app/resources/generated_resources_be.xtb +++ b/chrome/app/resources/generated_resources_be.xtb
@@ -669,7 +669,6 @@ <translation id="1464258312790801189">Вашы ўліковыя запісы</translation> <translation id="1464597059227482327">Каб абагульваць даныя з прыладай Chromebook, якой няма ў вашых кантактах, уключыце на ёй параметр "Бачнасць паблізу". Каб зрабіць гэта, перайдзіце да патрэбных налад, націснуўшы на правы ніжні вугал экрана. <ph name="LINK_BEGIN" />Даведацца больш<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Каб адкрыць параметры прылады, перайдзіце ў Налады.</translation> -<translation id="146481294006497945">Няма захаваных пароляў</translation> <translation id="1465176863081977902">К&апіраваць адрас аўдыя</translation> <translation id="146522654774760805">Паролі і аўтазапаўненне</translation> <translation id="1465827627707997754">Кавалак піцы</translation> @@ -2166,7 +2165,6 @@ <translation id="2485394160472549611">Найлепшыя падборкі для вас</translation> <translation id="2485422356828889247">Выдаліць</translation> <translation id="2485681265915754872">Умовы выкарыстання Google Play</translation> -<translation id="2486036712620651117">Паролі і ключы доступу</translation> <translation id="248676429071089168">Калі прагортваць уверх, старонка будзе перамяшчацца ўніз</translation> <translation id="2487067538648443797">Дадаць новую закладку</translation> <translation id="2489686758589235262">Прызначыць яшчэ 2 пераключальнікі</translation> @@ -3887,7 +3885,6 @@ <translation id="3721178866505920080">Дадатковая інфармацыя пра ўключэнне функцыі пашыранай перадзагрузкі</translation> <translation id="3722108462506185496">Памылка запуску сэрвісу віртуальнай машыны. Паўтарыце спробу.</translation> <translation id="3722624153992426516">Атрымана інструкцыя: <ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /></translation> -<translation id="3724897774652282549">Запоўніць форму</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Даступныя сеткі Wi-Fi</translation> @@ -4320,7 +4317,6 @@ <translation id="3993887353483242788">Сінхранізуйце прыладу "<ph name="DEVICE_TYPE" />", каб вашы праграмы, налады, паролі Wi-Fi, мовы, шпалеры, спалучэнні клавіш і іншыя параметры былі даступныя вам на ўсіх прыладах, з якіх вы ўвайшлі ва Уліковы запіс Google.</translation> <translation id="3994318741694670028">Ваш камп’ютар сканфігураваны з няправільным ідэнтыфікатарам апаратнага забеспячэння. Гэта не дае ўсталяваць апошнія выпраўленні сістэмы бяспекі для Chrome OS Flex. Ваш камп’ютар <ph name="BEGIN_BOLD" />можа быць прыступным для атак зламыснікаў<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Разблакіруйце тэлефон і паднясіце яго бліжэй, каб разблакіраваць <ph name="DEVICE_TYPE" />.</translation> -<translation id="3994522032746736727">Увайсці як <ph name="EMAIL" /></translation> <translation id="3994530503403062649">Знайдзіце на планшэце кнопкі</translation> <translation id="3994708120330953242">Некаторыя з вашых пароляў былі раскрыты ў выніку парушэння прыватнасці даных. Каб абараніць свае ўліковыя запісы, вам трэба неадкладна змяніць гэтыя паролі.</translation> <translation id="3994878504415702912">&Маштаб</translation> @@ -6590,7 +6586,6 @@ <translation id="5646994841348250879">Выберыце ўліковы запіс для ўваходу на сайт <ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">Раздым для мікрафона</translation> <translation id="5648166631817621825">За апошнія 7 дзён</translation> -<translation id="5650537073531199882">Запаўненне формы</translation> <translation id="5651308944918885595">Абагульванне паблізу: бачнасць</translation> <translation id="5653154844073528838">У вас некалькі (<ph name="PRINTER_COUNT" />) захаваных прынтараў.</translation> <translation id="5654669866168491665">Даведацца больш пра сайты, якія могуць не працаваць, калі блакіруюцца староннія файлы cookie</translation>
diff --git a/chrome/app/resources/generated_resources_bg.xtb b/chrome/app/resources/generated_resources_bg.xtb index 3959e78..327a486b 100644 --- a/chrome/app/resources/generated_resources_bg.xtb +++ b/chrome/app/resources/generated_resources_bg.xtb
@@ -667,7 +667,6 @@ <translation id="1464258312790801189">Вашите профили</translation> <translation id="1464597059227482327">Ако споделяте с устройство Chromebook, което не е в контактите ви, не забравяйте да включите „Видимост наблизо“ за него. За целта кликнете върху долния десен ъгъл и включете „Видимост наблизо“. <ph name="LINK_BEGIN" />Научете повече<ph name="LINK_END" /></translation> <translation id="1464781208867302907">За предпочитания за устройството отворете „Настройки“</translation> -<translation id="146481294006497945">Няма запазени пароли</translation> <translation id="1465176863081977902">К&опиране на адреса на аудиозаписа</translation> <translation id="146522654774760805">Пароли и автоматично попълване</translation> <translation id="1465827627707997754">Парче пица</translation> @@ -2174,7 +2173,6 @@ <translation id="2485394160472549611">Избрано за вас</translation> <translation id="2485422356828889247">Деинсталиране</translation> <translation id="2485681265915754872">Общи условия на Google Play</translation> -<translation id="2486036712620651117">Пароли и ключове за достъп</translation> <translation id="248676429071089168">Прекарайте пръст нагоре, за да преместите страницата надолу</translation> <translation id="2487067538648443797">Добавяне на нова отметка</translation> <translation id="2489686758589235262">Задаване на още 2 превключвателя</translation> @@ -3897,7 +3895,6 @@ <translation id="3721178866505920080">Още информация за включването на разширеното предварително зареждане</translation> <translation id="3722108462506185496">Грешка при стартирането на услугата на виртуалната машина. Моля, опитайте отново.</translation> <translation id="3722624153992426516">Получена е инструкция за <ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /></translation> -<translation id="3724897774652282549">Попълване на формуляра</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Налични Wi-Fi мрежи</translation> @@ -4331,7 +4328,6 @@ <translation id="3993887353483242788">Синхронизирайте устройството си <ph name="DEVICE_TYPE" />, така че предпочитанията ви да са зададени на всяко устройство, когато влезете в профила си в Google. Те включват приложенията, настройките, паролите за Wi-Fi, езиците, тапета, клавишните комбинации и др.</translation> <translation id="3994318741694670028">За съжаление, компютърът ви е конфигуриран с неправилно образуван идентификационен номер на хардуера. Това не позволява на ChromeOS Flex да се актуализира с най-новите корекции за сигурност и устройството ви <ph name="BEGIN_BOLD" />може да е уязвимо на злонамерени атаки<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">За да отключите своя <ph name="DEVICE_TYPE" />, отключете телефона си и го приближете до него.</translation> -<translation id="3994522032746736727">Вход като <ph name="EMAIL" /></translation> <translation id="3994530503403062649">Намиране на бутони на таблета ви</translation> <translation id="3994708120330953242">Някои от паролите ви бяха открити при нарушение на сигурността на данните. Променете ги сега, за да защитите профилите си.</translation> <translation id="3994878504415702912">&Мащаб</translation> @@ -6603,7 +6599,6 @@ <translation id="5646994841348250879">Изберете профил, за да влезете в(ъв) <ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">Жак за микрофон</translation> <translation id="5648166631817621825">Последните 7 дни</translation> -<translation id="5650537073531199882">Попълване на формуляра</translation> <translation id="5651308944918885595">Откриваемост за „Споделяне наблизо“</translation> <translation id="5653154844073528838">Имате <ph name="PRINTER_COUNT" /> запазени принтера.</translation> <translation id="5654669866168491665">Научете повече за сайтовете, които може да не работят, когато блокирате „бисквитките“ на трети страни</translation> @@ -8603,6 +8598,7 @@ <translation id="7113974454301513811">Сега добавете текущия раздел към списъка си</translation> <translation id="7114054701490058191">Паролите не са идентични</translation> <translation id="7114648273807173152">За да използвате Smart Lock за влизане в профила ви в Google, отворете „Настройки > Свързани устройства > Вашият телефон > Smart Lock“.</translation> +<translation id="7115051913071512405">Изпробване</translation> <translation id="7115361495406486998">Няма налични контакти</translation> <translation id="7115731767122970828">Подобряване</translation> <translation id="7116554090938189816">SSL сертификатът на принтера е изтекъл. Рестартирайте принтера и опитайте отново.</translation> @@ -8634,6 +8630,7 @@ <translation id="7134951043985383439">Изтеглен бе опасен файл</translation> <translation id="7135729336746831607">Да се включи ли Bluetooth?</translation> <translation id="7136694880210472378">Задаване като основна</translation> +<translation id="7137277889990479760">Продължаване като <ph name="EMAIL" /></translation> <translation id="7137771508221868414">Данните, съхранявани от сайтовете и инсталираните приложения, в размер на <ph name="TOTAL_USAGE" /> ще бъдат изтрити</translation> <translation id="7138678301420049075">Друго</translation> <translation id="7139627972753429585"><ph name="APP_NAME" /> използва микрофона ви</translation> @@ -9212,6 +9209,7 @@ <translation id="7561196759112975576">Винаги</translation> <translation id="7561759921596375678">Включване на звука</translation> <translation id="7561982940498449837">Затваряне на менюто</translation> +<translation id="7563970324931922582">[placeholder text]</translation> <translation id="756445078718366910">Отваряне на прозореца на браузъра</translation> <translation id="7564847347806291057">Прекратяване на процеса</translation> <translation id="756503097602602175">Можете да управлявате профилите в Google, в които сте влезли, от <ph name="LINK_BEGIN" />настройките<ph name="LINK_END" />. Разрешенията, които сте предоставили на уебсайтове и приложения, може да важат за всички профили. Ако не искате сайтове или приложения да имат достъп до информацията в профила ви, можете да влезете в своя <ph name="DEVICE_TYPE" /> като гост или да сърфирате в мрежата в <ph name="LINK_2_BEGIN" />прозорец в режим „инкогнито“<ph name="LINK_2_END" />.</translation> @@ -10904,6 +10902,7 @@ <translation id="8737966899544698733">Точност на местоположението (само за Android)</translation> <translation id="8738418093147087440">Търсене по държави, език или имена на методи на въвеждане</translation> <translation id="8740086188450289493">Използване на паролата за профила в Google</translation> +<translation id="874023689350909633">Изпробване</translation> <translation id="8740247629089392745">Можете да дадете този Chromebook на <ph name="SUPERVISED_USER_NAME" />. Настройването почти завърши и устройството скоро ще е готово за използване.</translation> <translation id="8740672167979365981">Изисква се актуализация на ChromeOS Flex</translation> <translation id="8741944563400125534">Ръководство за настройване на „Достъп с превключване“</translation>
diff --git a/chrome/app/resources/generated_resources_bn.xtb b/chrome/app/resources/generated_resources_bn.xtb index 90884b2..39816c7d 100644 --- a/chrome/app/resources/generated_resources_bn.xtb +++ b/chrome/app/resources/generated_resources_bn.xtb
@@ -668,7 +668,6 @@ <translation id="1464258312790801189">আপনার অ্যাকাউন্টগুলি</translation> <translation id="1464597059227482327">এমন একটি Chromebook-এর সাথে যদি শেয়ার করেন যেটা আপনার পরিচিতিতে নেই, তাহলে "নিয়ারবাই দৃশ্যমানতা" চালু করা আছে কিনা তা নিশ্চিত করুন। "নিয়ারবাই দৃশ্যমানতা" চালু করতে, নিচে ডানদিকের কোণের বোতাম বেছে নিন এবং তারপর "নিয়ারবাই দৃশ্যমানতা" চালু করার বিকল্প বেছে নিন। <ph name="LINK_BEGIN" />আরও জানুন<ph name="LINK_END" /></translation> <translation id="1464781208867302907">ডিভাইস প্রেফারেন্সের জন্য সেটিংসে যান।</translation> -<translation id="146481294006497945">কোনও সেভ করা পাসওয়ার্ড নেই</translation> <translation id="1465176863081977902">অ&ডিও ঠিকানা কপি করুন</translation> <translation id="146522654774760805">পাসওয়ার্ড ও অটোফিল</translation> <translation id="1465827627707997754">পিৎজার টুকরা</translation> @@ -2179,7 +2178,6 @@ <translation id="2485394160472549611">আপনার জন্য বেছে নেওয়া সেরা ফলাফল</translation> <translation id="2485422356828889247">আনইনস্টল</translation> <translation id="2485681265915754872">Google Play পরিষেবার শর্তাবলী</translation> -<translation id="2486036712620651117">পাসওয়ার্ড ও পাসকী</translation> <translation id="248676429071089168">পৃষ্ঠা নিচের দিকে নামাতে উপরের দিকে সোয়াইপ করুন</translation> <translation id="2487067538648443797">নতুন বুকমার্ক যোগ করুন</translation> <translation id="2489686758589235262">আরও ২টি সুইচ অ্যাসাইন করুন</translation> @@ -3902,7 +3900,6 @@ <translation id="3721178866505920080">'এক্সটেন্ডেড প্রিলোডিং' ফিচার চালু করার ব্যাপারে আরও তথ্য</translation> <translation id="3722108462506185496">ভার্চুয়াল মেশিন পরিষেবা চালাতে সমস্যা হচ্ছে। আবার চেষ্টা করুন।</translation> <translation id="3722624153992426516"><ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /> নির্দেশ রিসিভ করা হয়েছে</translation> -<translation id="3724897774652282549">ফর্ম পূরণ করুন</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">উপলভ্য ওয়াই-ফাই নেটওয়ার্ক</translation> @@ -4334,7 +4331,6 @@ <translation id="3993887353483242788">আপনার <ph name="DEVICE_TYPE" /> সিঙ্ক করুন যাতে Google অ্যাকাউন্টের মাধ্যমে যেকোনও ডিভাইসে সাইন-ইন করলেই আপনার পছন্দ অনুযায়ী সবকিছু দেখতে পান। অ্যাপ, সেটিংস, ওয়াই-ফাই পাসওয়ার্ড, ভাষা, ওয়ালপেপার, কীবোর্ড শর্টকাট এবং আরও অনেক কিছু এই পছন্দের মধ্যে অন্তর্ভুক্ত।</translation> <translation id="3994318741694670028">আপনার কম্পিউটার একটি ত্রুটিপূর্ণ হার্ডওয়্যার আইডির মাধ্যমে কনফিগার করা হয়েছে। এটি ChromeOS Flex-কে সাম্প্রতিক সুরক্ষা সমাধানে আপডেট করা থেকে বাধা দেয় এবং আপনার কম্পিউটার <ph name="BEGIN_BOLD" />ক্ষতিকর আক্রমণের ফলে সুরক্ষিত নাও হতে পারে<ph name="END_BOLD" />।</translation> <translation id="3994374631886003300">আপনার ফোন আনলক করুন এবং <ph name="DEVICE_TYPE" /> আনলক করতে কাছাকাছি আনুন।</translation> -<translation id="3994522032746736727"><ph name="EMAIL" /> হিসেবে সাইন-ইন করুন</translation> <translation id="3994530503403062649">আপনার ট্যাবলেটে থাকা বোতামে ক্লিক করুন</translation> <translation id="3994708120330953242">আপনার সেভ করা কিছু পাসওয়ার্ড ডেটার নিরাপত্তা লঙ্ঘন করে দেখানো হয়েছে। আপনার অ্য়াকাউন্ট সুরক্ষিত রাখতে, এখনই এইসব পাসওয়ার্ড পরিবর্তন করতে হবে।</translation> <translation id="3994878504415702912">&জুম</translation> @@ -6607,7 +6603,6 @@ <translation id="5646994841348250879"><ph name="SITE_ETLD_PLUS_ONE" />-এ সাইন করতে একটি অ্যাকাউন্ট বেছে নিন</translation> <translation id="5648021990716966815">মাইক জ্যাক</translation> <translation id="5648166631817621825">গত ৭ দিন</translation> -<translation id="5650537073531199882">ফর্ম পূরণ করুন</translation> <translation id="5651308944918885595">'নিয়ারবাই শেয়ার'-এর মাধ্যমে ডিভাইস খুঁজে নেওয়ার সুবিধা</translation> <translation id="5653154844073528838">আপনার কাছে আগে থেকেই <ph name="PRINTER_COUNT" />টি প্রিন্টার সেভ করা আছে।</translation> <translation id="5654669866168491665">থার্ড-পার্টি কুকি ব্লক করার সময় কাজ করতে নাও পারে এমন সাইট সম্পর্কে আরও জানুন</translation> @@ -8609,6 +8604,7 @@ <translation id="7113974454301513811">এখন আপনার তালিকায় বর্তমান ট্যাব যোগ করুন</translation> <translation id="7114054701490058191">পাসওয়ার্ডগুলি মিলছে না</translation> <translation id="7114648273807173152">Smart Lock ব্যবহার করতে আপনার Google অ্যাকাউন্টে সাইন-ইন করে সেটিংস > কানেক্ট করা ডিভাইস > আপনার ফোন > Smart Lock বিকল্পে যান।</translation> +<translation id="7115051913071512405">এটি চেষ্টা করে দেখুন</translation> <translation id="7115361495406486998">যোগাযোগ করা যেতে পারে এমন কোনও পরিচিত নেই</translation> <translation id="7115731767122970828">এখনই বুস্ট করুন</translation> <translation id="7116554090938189816">প্রিন্টারের SSL সার্টিফিকেটের মেয়াদ শেষ হয়ে গেছে। প্রিন্টার রিস্টার্ট করে আবার চেষ্টা করুন।</translation>
diff --git a/chrome/app/resources/generated_resources_bs.xtb b/chrome/app/resources/generated_resources_bs.xtb index 326ee20cd..b4026ad 100644 --- a/chrome/app/resources/generated_resources_bs.xtb +++ b/chrome/app/resources/generated_resources_bs.xtb
@@ -541,6 +541,7 @@ <translation id="1368603372088757436">Linux nije podržan na uređaju <ph name="DEVICE_TYPE" />. <ph name="LINK_BEGIN" />Saznajte više<ph name="LINK_END" /></translation> <translation id="1370249617397887619">Da ih koristite na drugim uređajima, sačuvajte ih na Google račun</translation> <translation id="1370384480654163477">Pregledajte i uredite fajlove od posljednje posjete ovoj web lokaciji:</translation> +<translation id="1372259917802609049">Došlo je do pogreške pri brisanju ograničenja</translation> <translation id="1372841398847029212">Sinhroniziraj s računom</translation> <translation id="1373176046406139583">Vidljivost vašeg uređaja kontrolira ko s vama može dijeliti sadržaj dok je ekran otključan. <ph name="LINK_BEGIN" />Saznajte više<ph name="LINK_END" /></translation> <translation id="1374844444528092021">Potvrda koju zahtijeva mreža "<ph name="NETWORK_NAME" />" nije instalirana ili više ne važi. Nabavite novu potvrdu i pokušajte se ponovo povezati.</translation> @@ -669,7 +670,6 @@ <translation id="1464258312790801189">Vaši računi</translation> <translation id="1464597059227482327">Ako dijelite s Chromebookom koji nije u vašim kontaktima, provjerite je li na njemu uključena "Vidljivost u blizini". Da uključite "Vidljivost u blizini", odaberite donji desni ugao, a zatim odaberite da uključite "Vidljivost u blizini". <ph name="LINK_BEGIN" />Saznajte više<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Da pristupite postavkama uređaja, otvorite Postavke.</translation> -<translation id="146481294006497945">Nema sačuvanih lozinki</translation> <translation id="1465176863081977902">K&opiraj adresu audiozapisa</translation> <translation id="146522654774760805">Lozinke i automatsko popunjavanje</translation> <translation id="1465827627707997754">Komad pice</translation> @@ -1489,6 +1489,7 @@ To neće uticati na aplikacije ili sadržaj na drugim uređajima.</translation> <translation id="2018189721942291407">Niste sigurni trebate li se prijaviti?</translation> <translation id="2018352199541442911">Žao nam je, vaš eksterni uređaj za pohranu nije trenutno podržan.</translation> +<translation id="2019213483156307334">Došlo je do pogreške pri dodavanju ograničenja</translation> <translation id="2019718679933488176">&Otvori zvuk na novoj kartici</translation> <translation id="2020183425253392403">Prikaži postavke mrežne adrese</translation> <translation id="2020225359413970060">Skeniranje fajla</translation> @@ -2177,7 +2178,6 @@ <translation id="2485394160472549611">Izabrano za vas</translation> <translation id="2485422356828889247">Deinstaliraj</translation> <translation id="2485681265915754872">Uslovi korištenja usluge Google Play</translation> -<translation id="2486036712620651117">Lozinke i pristupni ključevi</translation> <translation id="248676429071089168">Prevucite nagore da pomjerite stranicu nadolje</translation> <translation id="2487067538648443797">Dodaj novu oznaku</translation> <translation id="2489686758589235262">Dodijeli još 2 prekidača</translation> @@ -3156,6 +3156,7 @@ <translation id="3188257591659621405">Moji fajlovi</translation> <translation id="3188465121994729530">Prosjek premještanja</translation> <translation id="3189187154924005138">Veliki kursor</translation> +<translation id="3189533916970342007">{PASSWORD_COUNT,plural, =1{Jedna zaporka i druge stavke spremaju se samo na ovaj uređaj. Da biste ih upotrebljavali na svojim drugim uređajima, spremite ih na svoj Google račun.}one{{PASSWORD_COUNT} zaporka i druge stavke spremaju se samo na ovaj uređaj. Da biste ih upotrebljavali na svojim drugim uređajima, spremite ih na svoj Google račun.}few{{PASSWORD_COUNT} zaporke i druge stavke spremaju se samo na ovaj uređaj. Da biste ih upotrebljavali na svojim drugim uređajima, spremite ih na svoj Google račun.}other{{PASSWORD_COUNT} zaporki i druge stavke spremaju se samo na ovaj uređaj. Da biste ih upotrebljavali na svojim drugim uređajima, spremite ih na svoj Google račun.}}</translation> <translation id="3190558889382726167">Lozinka je sačuvana</translation> <translation id="3192586965067888278">Detaljno opišite problem. Povratne informacije će se poslati Googleu za ručni pregled i mogu se koristiti za poboljšanje ili razvoj Googleovih proizvoda i usluga.</translation> <translation id="3192947282887913208">Audio fajlovi</translation> @@ -3626,6 +3627,7 @@ <translation id="3537881477201137177">To možete kasnije izmijeniti u Postavkama</translation> <translation id="3538066758857505094">Greška prilikom deinstaliranja Linuxa. Pokušajte ponovo.</translation> <translation id="3539537154248488260">Uključivanje/isključivanje inspiracije</translation> +<translation id="3539791442352537591">Došlo je do pogreške prilikom spremanja promjene stanja pouzdanosti</translation> <translation id="3540173484406326944">Nema mreže putem uređaja <ph name="HOST_DEVICE_NAME" /></translation> <translation id="354060433403403521">AC adapter</translation> <translation id="354068948465830244">Može čitati i mijenjati podatke na ovoj web lokaciji</translation> @@ -3900,7 +3902,6 @@ <translation id="3721178866505920080">Više informacija o uključivanju proširenog predučitavanja</translation> <translation id="3722108462506185496">Greška prilikom pokretanja usluge virtuelne mašine. Pokušajte ponovo.</translation> <translation id="3722624153992426516">Primljeno uputstvo: <ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /></translation> -<translation id="3724897774652282549">Popunite obrazac</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Dostupne WiFi mreže</translation> @@ -4333,7 +4334,6 @@ <translation id="3993887353483242788">Sinhronizirajte uređaj <ph name="DEVICE_TYPE" /> da vaše postavke budu spremne na svakom uređaju kada se prijavite pomoću Google računa. Preference uključuju aplikacije, postavke, lozinke za WiFi, jezike, pozadinske slike, prečice tastature i još mnogo toga.</translation> <translation id="3994318741694670028">Nažalost, računar je konfiguriran s neispravnim ID-om hardvera. Ovim se sprečava da se ChromeOS Flex ažurira najnovijim sigurnosnim ispravkama i vaš računar <ph name="BEGIN_BOLD" />može biti izložen zlonamjernim napadima<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Otključajte telefon i primaknite ga da otključate svoj <ph name="DEVICE_TYPE" />.</translation> -<translation id="3994522032746736727">Prijavite se kao <ph name="EMAIL" /></translation> <translation id="3994530503403062649">Pronađite dugmad na tabletu</translation> <translation id="3994708120330953242">Neke od vaših lozinki su pronađene u narušavanju podataka. Da zaštitite račune, trebate sada promijeniti ove lozinke.</translation> <translation id="3994878504415702912">&Zumiranje</translation> @@ -4624,6 +4624,7 @@ <translation id="4220648711404560261">Došlo je do greške prilikom aktiviranja.</translation> <translation id="4222917615373664617">Praćenje cijene je omogućeno. Cijena iznosi <ph name="CURRENT_PRICE" />.</translation> <translation id="4223404254440398437">Mikrofon nije dozvoljen</translation> +<translation id="4224541845943007092">Čitanje i spremanje unosa pomoću tipkovnice iz adresne trake</translation> <translation id="4225397296022057997">Na svim web lokacijama</translation> <translation id="4228071595943929139">Koristite adresu e-pošte organizacije</translation> <translation id="4228209296591583948">{NUM_EXTENSIONS,plural, =1{Ova ekstenzija nije dozvoljena}one{Neke ekstenzije nisu dozvoljene}few{Neke ekstenzije nisu dozvoljene}other{Neke ekstenzije nisu dozvoljene}}</translation> @@ -4816,6 +4817,7 @@ <translation id="4361745360460842907">Otvori kao karticu</translation> <translation id="4363262124589131906">Novi fajlovi na usluzi Moj disk će se prestati automatski sinhronizirati s Chromebookom</translation> <translation id="4364327530094270451">Dinja</translation> +<translation id="4364417397164696363">{ITEM_COUNT,plural, =1{Jedna stavka sprema se samo na ovaj uređaj. Da biste je upotrebljavali na svojim drugim uređajima, spremite je na svoj Google račun.}one{{ITEM_COUNT} stavka sprema se samo na ovaj uređaj. Da biste ih upotrebljavali na svojim drugim uređajima, spremite ih na svoj Google račun.}few{{ITEM_COUNT} stavke spremaju se samo na ovaj uređaj. Da biste ih upotrebljavali na svojim drugim uređajima, spremite ih na svoj Google račun.}other{{ITEM_COUNT} stavki sprema se samo na ovaj uređaj. Da biste ih upotrebljavali na svojim drugim uređajima, spremite ih na svoj Google račun.}}</translation> <translation id="4364567974334641491">Aplikacija <ph name="APP_NAME" /> dijeli prozor.</translation> <translation id="4364830672918311045">Prikaži obavještenja</translation> <translation id="4367971618859387374">Ime za prikaz</translation> @@ -5738,6 +5740,7 @@ <translation id="5029287942302939687">Lozinka je postavljena</translation> <translation id="5029873138381728058">Provjera VM-ova nije uspjela</translation> <translation id="503155457707535043">Preuzimanje aplikacija</translation> +<translation id="5031769842769721381">{SELECTED_ITEMS,plural, =0{Adrese}=1{Adrese ({SELECTED_ITEMS})}one{Adrese ({SELECTED_ITEMS})}few{Adrese ({SELECTED_ITEMS})}other{Adrese ({SELECTED_ITEMS})}}</translation> <translation id="5032430150487044192">Nije moguće kreirati QR kôd</translation> <translation id="5033137252639132982">Nije dozvoljeno korištenje senzora kretanja</translation> <translation id="5035846135112863536">Odaberite "Više detalja" u nastavku da saznate više informacija od pružaoca usluga <ph name="IDENTITY_PROVIDER_ETLD_PLUS_ONE" />.</translation> @@ -6487,6 +6490,7 @@ <translation id="5568069709869097550">Ne možete se prijaviti</translation> <translation id="5568525251731145240">Izbrisati podatke web lokacije i odobrenja za <ph name="SITE_NAME" />, sve web lokacije povezane s njom i instalirane aplikacije?</translation> <translation id="5568602038816065197">Web lokacije mogu koristiti napredne funkcije s bilo kojeg štampača dostupnog vašem uređaju bez prolaska kroz standardni upit za štampanje</translation> +<translation id="5570149859473005144">{SELECTED_ITEMS,plural, =0{Zaporke}=1{Zaporke ({SELECTED_ITEMS})}one{Zaporke ({SELECTED_ITEMS})}few{Zaporke ({SELECTED_ITEMS})}other{Zaporke ({SELECTED_ITEMS})}}</translation> <translation id="5571066253365925590">Bluetooth je omogućen</translation> <translation id="5571092938913434726">Globalne kontrole medija</translation> <translation id="5571832155627049070">Prilagodite profil</translation> @@ -6604,7 +6608,6 @@ <translation id="5646994841348250879">Odaberite račun da se prijavite na <ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">Priključak za mikrofon</translation> <translation id="5648166631817621825">Posljednjih 7 dana</translation> -<translation id="5650537073531199882">Popunite obrazac</translation> <translation id="5651308944918885595">Mogućnost otkrivanja Dijeljenja u blizini</translation> <translation id="5653154844073528838">Imate sljedeći broj sačuvanih štampača: <ph name="PRINTER_COUNT" />.</translation> <translation id="5654669866168491665">Više informacija o web lokacijama koje možda neće funkcionirati prilikom blokiranja kolačića trećih strana</translation> @@ -6992,6 +6995,7 @@ <translation id="5941153596444580863">Dodaj osobu…</translation> <translation id="5941343993301164315">Prijavite se na <ph name="TOKEN_NAME" />.</translation> <translation id="5941711191222866238">Minimiziraj</translation> +<translation id="5941854976565320351">{PASSWORD_COUNT,plural, =1{Jedna zaporka sprema se samo na ovaj uređaj. Da biste je upotrebljavali na svojim drugim uređajima, spremite je na svoj Google račun.}one{{PASSWORD_COUNT} zaporka sprema se samo na ovaj uređaj. Da biste ih upotrebljavali na svojim drugim uređajima, spremite ih na svoj Google račun.}few{{PASSWORD_COUNT} zaporke spremaju se samo na ovaj uređaj. Da biste ih upotrebljavali na svojim drugim uređajima, spremite ih na svoj Google račun.}other{{PASSWORD_COUNT} zaporki sprema se samo na ovaj uređaj. Da biste ih upotrebljavali na svojim drugim uređajima, spremite ih na svoj Google račun.}}</translation> <translation id="594221546068848596">Pretražite stranicu pomoću usluge <ph name="VISUAL_SEARCH_PROVIDER" /></translation> <translation id="5942779427914696408">Vidljivost uređaja</translation> <translation id="5943127421590245687">Potvrda je uspješno izvršena. Da otključate i vratite lokalne podatke, unesite staru lozinku uređaja <ph name="DEVICE_TYPE" />.</translation> @@ -8513,6 +8517,7 @@ <translation id="7036706669646341689">Preporučuje se <ph name="DISK_SIZE" /> prostora za Linux. Da oslobodite prostor, izbrišite fajlove s uređaja.</translation> <translation id="7037157058268992880">Zaboravljen PIN</translation> <translation id="7037509989619051237">Tekst za pregledanje</translation> +<translation id="7037633074390821254">Ograničenje DNS-a ili CIDR-a</translation> <translation id="7038632520572155338">Pristup pomoću prekidača</translation> <translation id="7038710352229712897">Dodajte drugi Google račun za korisnika <ph name="USER_NAME" /></translation> <translation id="7039326228527141150">Pristup USB uređajima dobavljača <ph name="VENDOR_NAME" /></translation> @@ -8608,6 +8613,7 @@ <translation id="7113974454301513811">Sada dodajte trenutnu karticu na listu</translation> <translation id="7114054701490058191">Lozinke se ne podudaraju</translation> <translation id="7114648273807173152">Da koristite Pametno zaključavanja prilikom prijave na Google račun, idite na Postavke > Povezani uređaji > Vaš telefon > Pametno zaključavanje.</translation> +<translation id="7115051913071512405">Isprobajte</translation> <translation id="7115361495406486998">Nema nijednog dostupnog kontakta</translation> <translation id="7115731767122970828">Poboljšaj sada</translation> <translation id="7116554090938189816">SSL certifikat štampača je istekao. Ponovo pokrenite štampač i pokušajte ponovo.</translation> @@ -8760,6 +8766,7 @@ <translation id="7231260028442989757">Pregledajte, odbacite i odgovorite na obavještenja telefona</translation> <translation id="7231347196745816203">Upotrijebite telefon da otključate <ph name="DEVICE_TYPE" />.</translation> <translation id="7232750842195536390">Promjena naziva nije uspjela</translation> +<translation id="7232962679391151113">{BOOKMARK_COUNT,plural, =1{Jedna oznaka i druge stavke spremaju se samo na ovaj uređaj. Da biste ih upotrebljavali na svojim drugim uređajima, spremite ih na svoj Google račun.}one{{BOOKMARK_COUNT} oznaka i druge stavke spremaju se samo na ovaj uređaj. Da biste ih upotrebljavali na svojim drugim uređajima, spremite ih na svoj Google račun.}few{{BOOKMARK_COUNT} oznake i druge stavke spremaju se samo na ovaj uređaj. Da biste ih upotrebljavali na svojim drugim uređajima, spremite ih na svoj Google račun.}other{{BOOKMARK_COUNT} oznaka i druge stavke spremaju se samo na ovaj uređaj. Da biste ih upotrebljavali na svojim drugim uređajima, spremite ih na svoj Google račun.}}</translation> <translation id="723343421145275488">Pretraži slike uz <ph name="VISUAL_SEARCH_PROVIDER" /></translation> <translation id="7234010996000898150">Otkazivanje vraćanja Linuxa</translation> <translation id="7235305658956131898">Android aplikacija koju je instalirao administrator uređaja.</translation> @@ -8886,6 +8893,7 @@ <translation id="7327989755579928735">Domena <ph name="MANAGER" /> je onemogućila otklanjanje grešaka putem ADB-a. Nakon ponovnog pokretanja uređaja <ph name="DEVICE_TYPE" />, više nećete moći lokalno instalirati aplikacije.</translation> <translation id="7328119182036084494">Sačuvano na <ph name="WEB_DRIVE" /></translation> <translation id="7328162502911382168">(<ph name="COUNT" />)</translation> +<translation id="732845903678043302">{BOOKMARK_COUNT,plural, =1{Jedna oznaka sprema se samo na ovaj uređaj. Da biste je upotrebljavali na svojim drugim uređajima, spremite je na svoj Google račun.}one{{BOOKMARK_COUNT} oznaka sprema se samo na ovaj uređaj. Da biste ih upotrebljavali na svojim drugim uređajima, spremite ih na svoj Google račun.}few{{BOOKMARK_COUNT} oznake spremaju se samo na ovaj uređaj. Da biste ih upotrebljavali na svojim drugim uređajima, spremite ih na svoj Google račun.}other{{BOOKMARK_COUNT} oznaka sprema se samo na ovaj uređaj. Da biste ih upotrebljavali na svojim drugim uređajima, spremite ih na svoj Google račun.}}</translation> <translation id="7328867076235380839">Nevažeća kombinacija</translation> <translation id="7329154610228416156">Prijava nije uspjela jer je konfigurirana za korištenje nesigurnog URL-a (<ph name="BLOCKED_URL" />). Obratite se svom administratoru.</translation> <translation id="7330533963640151632">Postavke funkcije <ph name="FEATURE_NAME" /> za uređaj koji koristi <ph name="USER_NAME" />, koji dijeli putem računa <ph name="USER_EMAIL" />.</translation> @@ -10429,6 +10437,7 @@ <translation id="8398877366907290961">Svejedno nastavi</translation> <translation id="8399282673057829204">Prikaži lozinku</translation> <translation id="839949601275221554">Došlo je do greške na uređaju. Ponovo pokrenite uređaj i pokušajte ponovo.</translation> +<translation id="8399889560226245071">{SELECTED_ITEMS,plural, =0{Oznake}=1{Oznake ({SELECTED_ITEMS})}one{Oznake ({SELECTED_ITEMS})}few{Oznake ({SELECTED_ITEMS})}other{Oznake ({SELECTED_ITEMS})}}</translation> <translation id="8401432541486058167">Unesite PIN koji je povezan s vašom pametnom karticom.</translation> <translation id="8403807918453631441"><ph name="BRAND" /> može provjeravati vaše lozinke kada ih sačuvate</translation> <translation id="8405046151008197676">Otkrijte istaknute novosti o najnovijem ažuriranju</translation> @@ -11685,6 +11694,7 @@ <translation id="97905529126098460">Ovaj prozor će se zatvoriti nakon završetka otkazivanja.</translation> <translation id="980731642137034229">Dugme menija s radnjama</translation> <translation id="981121421437150478">Van mreže</translation> +<translation id="982083952953998237">Dodavanje ograničenja</translation> <translation id="98235653036850093">Zdravo, <ph name="PROFILE_NAME" />,</translation> <translation id="983192555821071799">Zatvori sve kartice</translation> <translation id="983531994960412650"><ph name="WINDOW_TITLE" /> – snimanje kamerom i mikrofonom</translation>
diff --git a/chrome/app/resources/generated_resources_ca.xtb b/chrome/app/resources/generated_resources_ca.xtb index 525ce53..ef84fc0 100644 --- a/chrome/app/resources/generated_resources_ca.xtb +++ b/chrome/app/resources/generated_resources_ca.xtb
@@ -666,7 +666,6 @@ <translation id="1464258312790801189">Els comptes</translation> <translation id="1464597059227482327">Si vols compartir fitxers amb un Chromebook que no és als teus contactes, comprova que tingui el mode Visibilitat Nearby activat. Per activar-lo, selecciona l'extrem inferior dret i, a continuació, activa Visibilitat Nearby. <ph name="LINK_BEGIN" />Més informació<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Per accedir a les preferències del dispositiu, ves a Configuració.</translation> -<translation id="146481294006497945">No hi ha cap contrasenya desada</translation> <translation id="1465176863081977902">C&opia l'adreça de l'àudio</translation> <translation id="146522654774760805">Contrasenyes i emplenament automàtic</translation> <translation id="1465827627707997754">Tall de pizza</translation> @@ -2165,7 +2164,6 @@ <translation id="2485394160472549611">Selecció destacada per a tu</translation> <translation id="2485422356828889247">Desinstal·la</translation> <translation id="2485681265915754872">Condicions del servei de Google Play</translation> -<translation id="2486036712620651117">Contrasenyes i claus d'accés</translation> <translation id="248676429071089168">Llisca cap amunt per moure la pàgina cap avall</translation> <translation id="2487067538648443797">Afegeix una adreça d'interès nova</translation> <translation id="2489686758589235262">Assigna 2 interruptors més</translation> @@ -3886,7 +3884,6 @@ <translation id="3721178866505920080">Més informació sobre com es pot activar la precàrrega ampliada</translation> <translation id="3722108462506185496">Hi ha hagut un error en iniciar el servei de màquina virtual. Torna-ho a provar.</translation> <translation id="3722624153992426516">S'ha rebut la instrucció <ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /></translation> -<translation id="3724897774652282549">Emplena el formulari</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Xarxes Wi-Fi disponibles</translation> @@ -4318,7 +4315,6 @@ <translation id="3993887353483242788">Sincronitza <ph name="DEVICE_TYPE" /> perquè les teves preferències estiguin preparades en qualsevol dispositiu quan iniciïs la sessió amb el teu Compte de Google. Les preferències inclouen, entre altres coses, les aplicacions, la configuració, les contrasenyes de Wi-Fi, els idiomes, el fons de pantalla i les tecles de drecera.</translation> <translation id="3994318741694670028">Malauradament, l'ordinador està configurat amb un identificador de maquinari que té un format incorrecte. Això impedeix a ChromeOS Flex actualitzar-se amb les darreres correccions de seguretat i <ph name="BEGIN_BOLD" />pot ser que l'ordinador sigui vulnerable a atacs maliciosos<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Desbloqueja el telèfon i acosta'l per desbloquejar <ph name="DEVICE_TYPE" />.</translation> -<translation id="3994522032746736727">Inicia la sessió com a <ph name="EMAIL" /></translation> <translation id="3994530503403062649">Localitza botons a la tauleta</translation> <translation id="3994708120330953242">Algunes de les teves contrasenyes s'han trobat en una violació de les dades. Et recomanem que les canviïs ara mateix per protegir els teus comptes.</translation> <translation id="3994878504415702912">&Zoom</translation> @@ -6587,7 +6583,6 @@ <translation id="5646994841348250879">Tria un compte per iniciar la sessió a <ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">Connector per al micròfon</translation> <translation id="5648166631817621825">7 darrers dies</translation> -<translation id="5650537073531199882">Emplena el formulari</translation> <translation id="5651308944918885595">Visibilitat de Compartició Nearby</translation> <translation id="5653154844073528838">Tens <ph name="PRINTER_COUNT" /> impressores desades.</translation> <translation id="5654669866168491665">Més informació sobre els llocs web que pot ser que no funcionin si es bloquegen les galetes de tercers</translation> @@ -8586,6 +8581,7 @@ <translation id="7113974454301513811">Ara afegeix la pestanya actual a la llista</translation> <translation id="7114054701490058191">Les contrasenyes no coincideixen</translation> <translation id="7114648273807173152">Per utilitzar Smart Lock per iniciar la sessió al Compte de Google, ves a Configuració > Dispositius connectats > El teu telèfon > Smart Lock.</translation> +<translation id="7115051913071512405">Prova-ho</translation> <translation id="7115361495406486998">No hi ha cap contacte a l'abast</translation> <translation id="7115731767122970828">Optimitza ara</translation> <translation id="7116554090938189816">El certificat SSL de la impressora ha caducat. Reinicia la impressora i torna-ho a provar.</translation>
diff --git a/chrome/app/resources/generated_resources_cs.xtb b/chrome/app/resources/generated_resources_cs.xtb index bb4d4b0d..8009f832 100644 --- a/chrome/app/resources/generated_resources_cs.xtb +++ b/chrome/app/resources/generated_resources_cs.xtb
@@ -668,7 +668,6 @@ <translation id="1464258312790801189">Vaše účty</translation> <translation id="1464597059227482327">Jestliže obsah sdílíte s Chromebookem, který nemáte v kontaktech, musí na něm být zapnutá viditelnost nablízko. Viditelnost nablízko zapnete tak, že vyberete pravý dolní roh a poté zapnete možnost Viditelnost nablízko. <ph name="LINK_BEGIN" />Další informace<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Předvolby zařízení naleznete v Nastavení.</translation> -<translation id="146481294006497945">Nemáte žádná uložená hesla</translation> <translation id="1465176863081977902">K&opírovat adresu zvukového souboru</translation> <translation id="146522654774760805">Hesla a automatické vyplňování</translation> <translation id="1465827627707997754">Kousek pizzy</translation> @@ -2167,7 +2166,6 @@ <translation id="2485394160472549611">Výběr pro vás</translation> <translation id="2485422356828889247">Odinstalovat</translation> <translation id="2485681265915754872">Smluvní podmínky služby Google Play</translation> -<translation id="2486036712620651117">Hesla a přístupové klíče</translation> <translation id="248676429071089168">Při přejetí prstem nahoru posunout stránku dolů</translation> <translation id="2487067538648443797">Přidat novou záložku</translation> <translation id="2489686758589235262">Přiřadit dva další přepínače</translation> @@ -3888,7 +3886,6 @@ <translation id="3721178866505920080">Další informace o zapnutí rozšířeného předběžného načítání</translation> <translation id="3722108462506185496">Spuštění služby virtuálního počítače se nezdařilo. Zkuste to znovu.</translation> <translation id="3722624153992426516">Byl přijat pokyn <ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /></translation> -<translation id="3724897774652282549">Vyplnit formulář</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Dostupné sítě Wi-Fi</translation> @@ -4320,7 +4317,6 @@ <translation id="3993887353483242788">Synchronizujte své zařízení <ph name="DEVICE_TYPE" />, abyste své předvolby měli připravené v každém zařízení, do kterého se přihlásíte pomocí účtu Google. Předvolby zahrnují aplikace, nastavení, hesla sítí Wi-Fi, jazyky, tapetu, klávesové zkratky a další.</translation> <translation id="3994318741694670028">Váš počítač je bohužel nakonfigurován pomocí chybného čísla hardwaru. Systému ChromeOS Flex to zabraňuje získat aktualizace s nejnovějšími bezpečnostními opravami, a počítač tak <ph name="BEGIN_BOLD" />může být zranitelnější vůči škodlivým útokům<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Chcete-li zařízení <ph name="DEVICE_TYPE" /> odemknout, odemkněte telefon a umístěte jej blíže.</translation> -<translation id="3994522032746736727">Přihlaste se jako <ph name="EMAIL" /></translation> <translation id="3994530503403062649">Najděte tlačítka na tabletu</translation> <translation id="3994708120330953242">Při porušení zabezpečení údajů byla vyzrazena některá vaše hesla. Za účelem zabezpečení účtů tato hesla ihned změňte.</translation> <translation id="3994878504415702912">Velikost písma</translation> @@ -6587,7 +6583,6 @@ <translation id="5646994841348250879">Vyberte účet, pomocí kterého se chcete přihlásit na web <ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">Konektor mikrofonu</translation> <translation id="5648166631817621825">Posledních 7 dní</translation> -<translation id="5650537073531199882">Vyplnit formulář</translation> <translation id="5651308944918885595">Viditelnost pro sdílení nablízko</translation> <translation id="5653154844073528838">Máte tento počet uložených tiskáren: <ph name="PRINTER_COUNT" />.</translation> <translation id="5654669866168491665">Další informace o webech, které nemusí fungovat při blokování souborů cookie třetích stran</translation> @@ -8590,6 +8585,7 @@ <translation id="7113974454301513811">Teď do seznamu přidejte aktuální kartu</translation> <translation id="7114054701490058191">Hesla nejsou shodná</translation> <translation id="7114648273807173152">Chcete-li se ke svému účtu Google přihlašovat pomocí funkce Smart Lock, přejděte na Nastavení > Připojená zařízení > Váš telefon > Smart Lock.</translation> +<translation id="7115051913071512405">Vyzkoušejte to</translation> <translation id="7115361495406486998">Žádné dostupné kontakty</translation> <translation id="7115731767122970828">Zvýšit výkon</translation> <translation id="7116554090938189816">Platnost certifikátu SSL tiskárny vypršela. Restartujte tiskárnu a zkuste to znovu.</translation>
diff --git a/chrome/app/resources/generated_resources_cy.xtb b/chrome/app/resources/generated_resources_cy.xtb index 622f83d..b1a9feda 100644 --- a/chrome/app/resources/generated_resources_cy.xtb +++ b/chrome/app/resources/generated_resources_cy.xtb
@@ -671,7 +671,6 @@ <translation id="1464258312790801189">Eich Cyfrifon</translation> <translation id="1464597059227482327">Os ydych yn rhannu gyda Chromebook nad yw yn eich cysylltiadau, gwnewch yn siŵr bod "Gwelededd gerllaw" wedi'i droi ymlaen ar y Chromebook. I droi "Gwelededd gerllaw" ymlaen, dewiswch y gornel dde isaf ac yna dewiswch droi "Gwelededd gerllaw" ymlaen. <ph name="LINK_BEGIN" />Dysgu rhagor<ph name="LINK_END" /></translation> <translation id="1464781208867302907">I weld dewisiadau'r ddyfais, ewch i'r Gosodiadau.</translation> -<translation id="146481294006497945">Dim Cyfrineiriau Wedi'u Cadw</translation> <translation id="1465176863081977902">C&opïo Cyfeiriad Sain</translation> <translation id="146522654774760805">Cyfrineiriau ac awtolenwi</translation> <translation id="1465827627707997754">Darn o bitsa</translation> @@ -2181,7 +2180,6 @@ <translation id="2485394160472549611">Yr argymhellion gorau i chi</translation> <translation id="2485422356828889247">Dadosod</translation> <translation id="2485681265915754872">Telerau gwasanaeth Google Play</translation> -<translation id="2486036712620651117">Cyfrineiriau a Chodau pas</translation> <translation id="248676429071089168">Sweipiwch i fyny i symud y dudalen i lawr</translation> <translation id="2487067538648443797">Ychwanegu nod tudalen newydd</translation> <translation id="2489686758589235262">Aseinio 2 switsh arall</translation> @@ -3904,7 +3902,6 @@ <translation id="3721178866505920080">Rhagor o wybodaeth am droi rhaglwytho estynedig ymlaen</translation> <translation id="3722108462506185496">Bu gwall wrth ddechrau'r gwasanaeth peiriant rhithwir. Rhowch gynnig arall arni.</translation> <translation id="3722624153992426516">Derbyniwyd cyfarwyddyd <ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /></translation> -<translation id="3724897774652282549">Llenwi'r ffurflen</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Rhwydweithiau WiFi sydd ar gael</translation> @@ -4337,7 +4334,6 @@ <translation id="3993887353483242788">Cysoni eich <ph name="DEVICE_TYPE" /> fel y bydd eich dewisiadau yn barod ar unrhyw ddyfais pan fyddwch yn mewngofnodi gyda'ch Cyfrif Google. Ymhlith y dewisiadau mae apiau, gosodiadau, cyfrineiriau Wi-Fi, ieithoedd, papur wal, llwybrau byr bysellfwrdd a rhagor.</translation> <translation id="3994318741694670028">Yn anffodus, mae eich cyfrifiadur wedi'i ffurfweddu â chaledwedd sydd wedi'i gamffurfio. Mae hyn yn atal ChromeOS Flex rhag diweddaru gyda'r gwelliannau diogelwch diweddaraf ac <ph name="BEGIN_BOLD" />mae'n bosib y bydd eich cyfrifiadur yn agored i ymosodiadau maleisus<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Datglowch eich ffôn a dewch ag ef yn agosach i ddatgloi eich <ph name="DEVICE_TYPE" />.</translation> -<translation id="3994522032746736727">Mewngofnodi fel <ph name="EMAIL" /></translation> <translation id="3994530503403062649">Lleolwch fotymau ar eich llechen</translation> <translation id="3994708120330953242">Canfuwyd rhai o'ch cyfrineiriau mewn achos o dor data. I ddiogelu'ch cyfrifon, dylech newid y cyfrineiriau hyn nawr.</translation> <translation id="3994878504415702912">&Chwyddo</translation> @@ -6608,7 +6604,6 @@ <translation id="5646994841348250879">Dewiswch gyfrif i fewngofnodi i <ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">Cysylltydd meic</translation> <translation id="5648166631817621825">Saith diwrnod diwethaf</translation> -<translation id="5650537073531199882">Llenwi'r Ffurflen</translation> <translation id="5651308944918885595">Darganfodadwyedd Rhannu Gerllaw</translation> <translation id="5653154844073528838">Mae gennych <ph name="PRINTER_COUNT" /> argraffydd sydd wedi'u cadw.</translation> <translation id="5654669866168491665">Dysgu rhagor am wefannau sydd efallai ddim yn gweithio wrth rwystro cwcis trydydd parti</translation>
diff --git a/chrome/app/resources/generated_resources_da.xtb b/chrome/app/resources/generated_resources_da.xtb index 572d20af..87f8e9f 100644 --- a/chrome/app/resources/generated_resources_da.xtb +++ b/chrome/app/resources/generated_resources_da.xtb
@@ -668,7 +668,6 @@ <translation id="1464258312790801189">Dine konti</translation> <translation id="1464597059227482327">Hvis du deler med en Chromebook, der ikke er i dine kontakter, skal du sørge for, at "Deling tæt på" er aktiveret på din Chromebook. Hvis du vil aktivere "Deling tæt på", skal du vælge nederste højre hjørne og derefter aktivere "Deling tæt på". <ph name="LINK_BEGIN" />Få flere oplysninger<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Gå til indstillingerne for at se enhedspræferencer.</translation> -<translation id="146481294006497945">Der er ingen gemte adgangskoder</translation> <translation id="1465176863081977902">K&opiér webadressen til lyden</translation> <translation id="146522654774760805">Adgangskoder og autofyld</translation> <translation id="1465827627707997754">Pizzastykke</translation> @@ -2179,7 +2178,6 @@ <translation id="2485394160472549611">Populære valg til dig</translation> <translation id="2485422356828889247">Afinstaller</translation> <translation id="2485681265915754872">Servicevilkår for Google Play</translation> -<translation id="2486036712620651117">Adgangskoder og adgangsnøgler</translation> <translation id="248676429071089168">Stryg opad for at gå ned på siden</translation> <translation id="2487067538648443797">Tilføj nyt bogmærke</translation> <translation id="2489686758589235262">Tildel 2 kontakter mere</translation> @@ -3902,7 +3900,6 @@ <translation id="3721178866505920080">Flere oplysninger om aktivering af udvidet forudindlæsning</translation> <translation id="3722108462506185496">Der opstod en fejl under opstarten af tjenesten på den virtuelle maskine. Prøv igen.</translation> <translation id="3722624153992426516"><ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" />-instruktionen er modtaget</translation> -<translation id="3724897774652282549">Udfyld formularen</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Tilgængelige Wi-Fi-netværk</translation> @@ -4335,7 +4332,6 @@ <translation id="3993887353483242788">Synkroniser din <ph name="DEVICE_TYPE" />, så dine præferencer anvendes på enhver enhed, hvor du logger ind med din Google-konto. Præferencer omfatter apps, indstillinger, Wi-Fi-adgangskoder, sprog, baggrund, tastaturgenveje og meget mere.</translation> <translation id="3994318741694670028">Din computer er desværre konfigureret med et hardware-id i forkert format. Dette forhindrer ChromeOS Flex i at opdatere med de nyeste sikkerhedsrettelser, og din computer <ph name="BEGIN_BOLD" />kan være sårbar over for ondartede angreb<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Lås din telefon op, og flyt den tættere på din <ph name="DEVICE_TYPE" /> for at låse den op.</translation> -<translation id="3994522032746736727">Log ind som <ph name="EMAIL" /></translation> <translation id="3994530503403062649">Identificer knapperne på din tablet</translation> <translation id="3994708120330953242">Nogle af dine adgangskoder er blevet lækket i forbindelse med et brud på datasikkerheden. Du bør ændre disse adgangskoder nu for at beskytte dine konti.</translation> <translation id="3994878504415702912">&Zoom</translation> @@ -6606,7 +6602,6 @@ <translation id="5646994841348250879">Vælg en konto for at logge ind på <ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">Stik til mikrofon</translation> <translation id="5648166631817621825">De seneste syv dage</translation> -<translation id="5650537073531199882">Udfyld formularen</translation> <translation id="5651308944918885595">Synlighed for Deling tæt på</translation> <translation id="5653154844073528838">Du har <ph name="PRINTER_COUNT" /> gemte printere.</translation> <translation id="5654669866168491665">Få flere oplysninger om websites, der muligvis ikke fungerer, når tredjepartscookies blokeres</translation> @@ -8608,6 +8603,7 @@ <translation id="7113974454301513811">Føj nu den aktuelle fane til din liste</translation> <translation id="7114054701490058191">Adgangskoderne matcher ikke</translation> <translation id="7114648273807173152">Du kan bruge Smart Lock til at logge ind på din Google-konto ved at gå til Indstillinger > Tilsluttede enheder > Din telefon > Smart Lock.</translation> +<translation id="7115051913071512405">Prøv det</translation> <translation id="7115361495406486998">Der er ingen tilgængelige kontakter</translation> <translation id="7115731767122970828">Boost nu</translation> <translation id="7116554090938189816">Printerens SSL-certifikat er udløbet. Genstart printeren, og prøv igen.</translation>
diff --git a/chrome/app/resources/generated_resources_de.xtb b/chrome/app/resources/generated_resources_de.xtb index f8259b7..7a496c6 100644 --- a/chrome/app/resources/generated_resources_de.xtb +++ b/chrome/app/resources/generated_resources_de.xtb
@@ -666,7 +666,6 @@ <translation id="1464258312790801189">Meine Konten</translation> <translation id="1464597059227482327">Wenn du Inhalte mit einem Chromebook teilen möchtest, das sich nicht in deinen Kontakten befindet, muss darauf die Nearby-Sichtbarkeit aktiviert sein. Wenn du die Nearby-Sichtbarkeit aktivieren möchtest, wähle unten rechts die Option „Nearby-Sichtbarkeit“ aus. <ph name="LINK_BEGIN" />Weitere Informationen<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Die Geräteeinstellungen findest du in den Einstellungen.</translation> -<translation id="146481294006497945">Keine gespeicherten Passwörter</translation> <translation id="1465176863081977902">Audioadresse k&opieren</translation> <translation id="146522654774760805">Passwörter und Autofill</translation> <translation id="1465827627707997754">Pizzascheibe</translation> @@ -2162,7 +2161,6 @@ <translation id="2485394160472549611">Top-Empfehlungen</translation> <translation id="2485422356828889247">Deinstallieren</translation> <translation id="2485681265915754872">Google Play-Nutzungsbedingungen</translation> -<translation id="2486036712620651117">Passwörter und Passkeys</translation> <translation id="248676429071089168">Nach oben wischen, um die Seite nach unten zu verschieben</translation> <translation id="2487067538648443797">Neues Lesezeichen hinzufügen</translation> <translation id="2489686758589235262">2 weitere Schalter einrichten</translation> @@ -3883,7 +3881,6 @@ <translation id="3721178866505920080">Weitere Informationen zum Aktivieren des erweiterten Vorabladens</translation> <translation id="3722108462506185496">Fehler beim Starten des Dienstes für die virtuelle Maschine. Bitte versuche es noch einmal.</translation> <translation id="3722624153992426516">Anweisung „<ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" />“ erhalten</translation> -<translation id="3724897774652282549">Formular ausfüllen</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">Qt</translation> <translation id="3727144509609414201">Verfügbare WLANs</translation> @@ -4316,7 +4313,6 @@ <translation id="3993887353483242788">Wenn du dein <ph name="DEVICE_TYPE" /> synchronisierst, stehen deine Einstellungen auf jedem Gerät zur Verfügung, auf dem du dich in deinem Google-Konto anmeldest. Das schließt u. a. Apps, Einstellungen, WLAN-Passwörter, Sprachen, Hintergründe und Tastenkombinationen ein.</translation> <translation id="3994318741694670028">Dein Computer wurde mit einer ungültigen Hardware-ID konfiguriert. Daher kann Chrome OS Flex keine aktuellen Sicherheitsupdates installieren und dein Computer ist <ph name="BEGIN_BOLD" />möglicherweise anfällig für schädliche Angriffe<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Entsperre dein Smartphone und verringere den Abstand zu deinem <ph name="DEVICE_TYPE" />.</translation> -<translation id="3994522032746736727">Als <ph name="EMAIL" /> anmelden</translation> <translation id="3994530503403062649">Tasten an deinem Tablet erkennen</translation> <translation id="3994708120330953242">Einige deiner Passwörter wurden bei einer Datenpanne gefunden. Du solltest diese Passwörter umgehend ändern, um deine Konten zu schützen.</translation> <translation id="3994878504415702912">&Zoom</translation> @@ -6583,7 +6579,6 @@ <translation id="5646994841348250879">Konto zur Anmeldung in <ph name="SITE_ETLD_PLUS_ONE" /> auswählen</translation> <translation id="5648021990716966815">Mikrofonanschluss</translation> <translation id="5648166631817621825">Letzte 7 Tage</translation> -<translation id="5650537073531199882">Formular ausfüllen</translation> <translation id="5651308944918885595">Nearby Share-Sichtbarkeit</translation> <translation id="5653154844073528838">Du hast <ph name="PRINTER_COUNT" /> gespeicherte Drucker.</translation> <translation id="5654669866168491665">Weitere Informationen zu Websites, die möglicherweise nicht funktionieren, wenn Drittanbieter-Cookies blockiert werden</translation> @@ -8582,6 +8577,7 @@ <translation id="7113974454301513811">Füge jetzt den aktuellen Tab deiner Liste hinzu</translation> <translation id="7114054701490058191">Die Passwörter stimmen nicht überein</translation> <translation id="7114648273807173152">Wenn du Smart Lock für die Anmeldung in deinem Google-Konto verwenden möchtest, gehe zu "Einstellungen" > "Verbundene Geräte" > "Mein Smartphone" > "Smart Lock".</translation> +<translation id="7115051913071512405">Testen</translation> <translation id="7115361495406486998">Keine erreichbaren Kontakte</translation> <translation id="7115731767122970828">Leistung steigern</translation> <translation id="7116554090938189816">Das SSL-Zertifikat für den Drucker ist abgelaufen. Starte den Drucker neu und versuche es dann noch einmal.</translation>
diff --git a/chrome/app/resources/generated_resources_el.xtb b/chrome/app/resources/generated_resources_el.xtb index 83ba435f..9edfc43 100644 --- a/chrome/app/resources/generated_resources_el.xtb +++ b/chrome/app/resources/generated_resources_el.xtb
@@ -667,7 +667,6 @@ <translation id="1464258312790801189">Οι λογαριασμοί σας</translation> <translation id="1464597059227482327">Εάν κάνετε κοινή χρήση με ένα Chromebook που δεν βρίσκεται στις επαφές σας, βεβαιωθείτε ότι είναι ενεργοποιημένη η επιλογή Ορατότητα κοντά στο Chromebook. Για να ενεργοποιήσετε την Ορατότητα κοντά, επιλέξτε την κάτω δεξιά γωνία και, στη συνέχεια, ενεργοποιήστε την επιλογή Ορατότητα κοντά. <ph name="LINK_BEGIN" />Μάθετε περισσότερα<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Για τις προτιμήσεις συσκευής, μεταβείτε στις Ρυθμίσεις.</translation> -<translation id="146481294006497945">Δεν υπάρχουν αποθηκευμένοι κωδικοί πρόσβασης</translation> <translation id="1465176863081977902">Α&ντιγραφή διεύθυνσης ήχου</translation> <translation id="146522654774760805">Κωδικοί πρόσβασης και αυτόματη συμπλήρωση</translation> <translation id="1465827627707997754">Κομμάτι πίτσα</translation> @@ -2178,7 +2177,6 @@ <translation id="2485394160472549611">Κορυφαίες επιλογές για εσάς</translation> <translation id="2485422356828889247">Απεγκατάσταση</translation> <translation id="2485681265915754872">Όροι Παροχής Υπηρεσιών Google Play</translation> -<translation id="2486036712620651117">Κωδικοί πρόσβασης και κλειδιά πρόσβασης</translation> <translation id="248676429071089168">Σύρετε προς τα επάνω για να μετακινήσετε τη σελίδα προς τα κάτω</translation> <translation id="2487067538648443797">Προσθήκη νέου σελιδοδείκτη</translation> <translation id="2489686758589235262">Αντιστοίχιση δύο ακόμα διακοπτών</translation> @@ -3901,7 +3899,6 @@ <translation id="3721178866505920080">Περισσότερες πληροφορίες σχετικά με την ενεργοποίηση της εκτεταμένης προφόρτωσης</translation> <translation id="3722108462506185496">Σφάλμα έναρξης της υπηρεσίας εικονικού μηχανήματος. Δοκιμάστε ξανά.</translation> <translation id="3722624153992426516">Έγινε λήψη της οδηγίας <ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /></translation> -<translation id="3724897774652282549">Συμπλήρωση φόρμας</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Διαθέσιμα δίκτυα Wi-Fi</translation> @@ -4334,7 +4331,6 @@ <translation id="3993887353483242788">Συγχρονίστε τη συσκευή <ph name="DEVICE_TYPE" />, έτσι ώστε οι προτιμήσεις σας να είναι έτοιμες σε οποιαδήποτε συσκευή όταν συνδέεστε στον Λογαριασμό σας Google. Οι προτιμήσεις περιλαμβάνουν εφαρμογές, ρυθμίσεις, κωδικούς πρόσβασης Wi-Fi, γλώσσες, ταπετσαρία, συντομεύσεις πληκτρολογίου και άλλα.</translation> <translation id="3994318741694670028">Δυστυχώς, ο υπολογιστής σας έχει διαμορφωθεί με ένα εσφαλμένο αναγνωριστικό εξοπλισμού. Αυτό παρεμποδίζει την ενημέρωση του ChromeOS Flex με τις πιο πρόσφατες επιδιορθώσεις ασφαλείας και ο υπολογιστής σας <ph name="BEGIN_BOLD" />ενδέχεται να είναι ευάλωτος σε κακόβουλες επιθέσεις<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Ξεκλειδώστε το τηλέφωνό σας και πλησιάστε το, για να ξεκλειδώσετε το <ph name="DEVICE_TYPE" />.</translation> -<translation id="3994522032746736727">Σύνδεση ως <ph name="EMAIL" /></translation> <translation id="3994530503403062649">Εντοπισμός κουμπιών στο tablet σας</translation> <translation id="3994708120330953242">Ορισμένοι από τους κωδικούς πρόσβασής σας εντοπίστηκαν σε παραβίαση δεδομένων. Για να προστατεύσετε τους λογαριασμούς σας, θα πρέπει να αλλάξετε αυτούς τους κωδικούς πρόσβασης τώρα.</translation> <translation id="3994878504415702912">&Εστίαση</translation> @@ -6606,7 +6602,6 @@ <translation id="5646994841348250879">Επιλέξτε έναν λογαριασμό για να συνδεθείτε στο <ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">Υποδοχή μικροφώνου</translation> <translation id="5648166631817621825">Τελευταίες 7 ημέρες</translation> -<translation id="5650537073531199882">Συμπλήρωση φόρμας</translation> <translation id="5651308944918885595">Δυνατότητα ανακάλυψης Κοινοποίησης κοντά</translation> <translation id="5653154844073528838">Έχετε <ph name="PRINTER_COUNT" /> αποθηκευμένους εκτυπωτές.</translation> <translation id="5654669866168491665">Μάθετε περισσότερα σχετικά με τους ιστοτόπους που ενδέχεται να μην λειτουργούν κατά τον αποκλεισμό των cookie τρίτου μέρους</translation> @@ -8606,6 +8601,7 @@ <translation id="7113974454301513811">Τώρα προσθέστε την τρέχουσα καρτέλα στη λίστα σας.</translation> <translation id="7114054701490058191">Οι κωδικοί πρόσβασης δεν ταιριάζουν</translation> <translation id="7114648273807173152">Για να χρησιμοποιήσετε το Smart Lock για σύνδεση στον Λογαριασμό σας Google, μεταβείτε στις Ρυθμίσεις > Συνδεδεμένες συσκευές > Το τηλέφωνό σας > Smart Lock.</translation> +<translation id="7115051913071512405">Δοκιμάστε το</translation> <translation id="7115361495406486998">Δεν υπάρχουν επαφές με τις οποίες μπορείτε να επικοινωνήσετε</translation> <translation id="7115731767122970828">Άμεση ενίσχυση</translation> <translation id="7116554090938189816">Το πιστοποιητικό SSL του εκτυπωτή έχει λήξει. Επανεκκινήστε τον εκτυπωτή και δοκιμάστε ξανά.</translation>
diff --git a/chrome/app/resources/generated_resources_en-GB.xtb b/chrome/app/resources/generated_resources_en-GB.xtb index 6ed5db3..fea5a1c 100644 --- a/chrome/app/resources/generated_resources_en-GB.xtb +++ b/chrome/app/resources/generated_resources_en-GB.xtb
@@ -667,7 +667,6 @@ <translation id="1464258312790801189">Your Accounts</translation> <translation id="1464597059227482327">If you're sharing with a Chromebook that is not in your contacts, make sure that the Chromebook has 'Nearby visibility' turned on. To turn on 'Nearby visibility', select the bottom-right corner and then select to turn on 'Nearby visibility'. <ph name="LINK_BEGIN" />Learn more<ph name="LINK_END" /></translation> <translation id="1464781208867302907">For device preferences, go to Settings.</translation> -<translation id="146481294006497945">No saved passwords</translation> <translation id="1465176863081977902">C&opy Audio Address</translation> <translation id="146522654774760805">Passwords and autofill</translation> <translation id="1465827627707997754">Pizza slice</translation> @@ -2178,7 +2177,6 @@ <translation id="2485394160472549611">Top picks for you</translation> <translation id="2485422356828889247">Uninstall</translation> <translation id="2485681265915754872">Google Play Terms of Service</translation> -<translation id="2486036712620651117">Passwords and passkeys</translation> <translation id="248676429071089168">Swipe up to move the page down</translation> <translation id="2487067538648443797">Add new bookmark</translation> <translation id="2489686758589235262">Assign 2 more switches</translation> @@ -3901,7 +3899,6 @@ <translation id="3721178866505920080">More info about turning on extended preloading</translation> <translation id="3722108462506185496">Error starting the virtual machine service. Please try again.</translation> <translation id="3722624153992426516"><ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /> instruction received</translation> -<translation id="3724897774652282549">Fill in form</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Available Wi-Fi networks</translation> @@ -4334,7 +4331,6 @@ <translation id="3993887353483242788">Sync your <ph name="DEVICE_TYPE" /> so that your preferences will be ready on any device when you sign in with your Google Account. Preferences include apps, settings, Wi-Fi passwords, languages, wallpaper, keyboard shortcuts and more.</translation> <translation id="3994318741694670028">Unfortunately, your computer is configured with a malformed hardware ID. This prevents Chrome OS Flex from updating with the latest security fixes and your computer <ph name="BEGIN_BOLD" />may be vulnerable to malicious attacks<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Unlock your phone and bring it closer to unlock your <ph name="DEVICE_TYPE" />.</translation> -<translation id="3994522032746736727">Sign in as <ph name="EMAIL" /></translation> <translation id="3994530503403062649">Locate buttons on your tablet</translation> <translation id="3994708120330953242">Some of your passwords were found in a data breach. To secure your accounts, you should change these passwords now.</translation> <translation id="3994878504415702912">&Zoom</translation> @@ -4625,6 +4621,7 @@ <translation id="4220648711404560261">An error occurred during activation.</translation> <translation id="4222917615373664617">Price tracking is enabled. Price is <ph name="CURRENT_PRICE" />.</translation> <translation id="4223404254440398437">Microphone not allowed</translation> +<translation id="4224541845943007092">Read and save keyboard input from the address bar</translation> <translation id="4225397296022057997">On all sites</translation> <translation id="4228071595943929139">Use your organisation’s email address</translation> <translation id="4228209296591583948">{NUM_EXTENSIONS,plural, =1{This extension is not allowed}other{Some extensions are not allowed}}</translation> @@ -6605,7 +6602,6 @@ <translation id="5646994841348250879">Choose an account to sign in to <ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">Mic jack</translation> <translation id="5648166631817621825">Last 7 days</translation> -<translation id="5650537073531199882">Fill in form</translation> <translation id="5651308944918885595">Nearby Share discoverability</translation> <translation id="5653154844073528838">You have <ph name="PRINTER_COUNT" /> saved printers.</translation> <translation id="5654669866168491665">Learn more about sites that may not work when blocking third-party cookies</translation> @@ -8605,6 +8601,7 @@ <translation id="7113974454301513811">Now add the current tab to your list</translation> <translation id="7114054701490058191">Passwords don't match</translation> <translation id="7114648273807173152">To use Smart Lock to sign in to your Google Account, go to Settings > Connected devices > Your phone > Smart Lock.</translation> +<translation id="7115051913071512405">Try it out</translation> <translation id="7115361495406486998">No reachable contacts</translation> <translation id="7115731767122970828">Boost now</translation> <translation id="7116554090938189816">Printer SSL certificate is expired. Restart printer and try again.</translation>
diff --git a/chrome/app/resources/generated_resources_es-419.xtb b/chrome/app/resources/generated_resources_es-419.xtb index b40d64e..0159e843 100644 --- a/chrome/app/resources/generated_resources_es-419.xtb +++ b/chrome/app/resources/generated_resources_es-419.xtb
@@ -666,7 +666,6 @@ <translation id="1464258312790801189">Tus cuentas</translation> <translation id="1464597059227482327">Si compartes contenido con una Chromebook que no está entre tus contactos, asegúrate de que la Chromebook tenga activada la opción "Visibilidad de Nearby". Para activar la opción "Visibilidad de Nearby", selecciona la esquina inferior derecha y, luego, activa la opción correspondiente. <ph name="LINK_BEGIN" />Más información<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Para ver las preferencias del dispositivo, accede a Configuración.</translation> -<translation id="146481294006497945">No hay contraseñas guardadas</translation> <translation id="1465176863081977902">Copiar dirección del audio</translation> <translation id="146522654774760805">Contraseñas y autocompletar</translation> <translation id="1465827627707997754">Porción de pizza</translation> @@ -2162,7 +2161,6 @@ <translation id="2485394160472549611">Recomendaciones para ti</translation> <translation id="2485422356828889247">Desinstalación</translation> <translation id="2485681265915754872">Condiciones del Servicio de Google Play</translation> -<translation id="2486036712620651117">Contraseñas y llaves de acceso</translation> <translation id="248676429071089168">Desliza el dedo hacia arriba para bajar la página</translation> <translation id="2487067538648443797">Agregar un favorito nuevo</translation> <translation id="2489686758589235262">Asignar 2 interruptores más</translation> @@ -3885,7 +3883,6 @@ <translation id="3721178866505920080">Más información sobre la activación de la precarga extendida</translation> <translation id="3722108462506185496">Se produjo un error al iniciar el servicio de máquina virtual. Vuelve a intentarlo.</translation> <translation id="3722624153992426516">Instrucciones <ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /> recibidas</translation> -<translation id="3724897774652282549">Completa el formulario</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Redes Wi-Fi disponibles</translation> @@ -4318,7 +4315,6 @@ <translation id="3993887353483242788">Sincroniza tu <ph name="DEVICE_TYPE" /> para que tus preferencias estén listas en cualquier dispositivo cuando accedas a tu Cuenta de Google. Las preferencias incluyen apps, parámetros de configuración, contraseñas de Wi-Fi, idiomas, fondos de pantalla, combinaciones de teclas y más.</translation> <translation id="3994318741694670028">Lamentablemente, la computadora está configurada con un ID de hardware incorrecto. Esto impide que ChromeOS Flex se actualice con las correcciones de seguridad más recientes, y la computadora <ph name="BEGIN_BOLD" />puede quedar expuesta a ataques maliciosos<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Desbloquea tu teléfono y acércalo para desbloquear tu <ph name="DEVICE_TYPE" />.</translation> -<translation id="3994522032746736727">Acceder como <ph name="EMAIL" /></translation> <translation id="3994530503403062649">Encuentra los botones de la tablet</translation> <translation id="3994708120330953242">Se encontraron algunas de tus contraseñas en una violación de la seguridad de los datos. Cámbialas para proteger tus cuentas.</translation> <translation id="3994878504415702912">&Tamaño</translation> @@ -6589,7 +6585,6 @@ <translation id="5646994841348250879">Elige una cuenta para acceder a <ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">Conector para micrófono</translation> <translation id="5648166631817621825">Últimos 7 días</translation> -<translation id="5650537073531199882">Completa el formulario</translation> <translation id="5651308944918885595">Detección de Compartir con Nearby</translation> <translation id="5653154844073528838">Tienes <ph name="PRINTER_COUNT" /> impresoras guardadas.</translation> <translation id="5654669866168491665">Más información sobre los sitios que podrían no funcionar cuando se bloquean las cookies de terceros</translation> @@ -8589,6 +8584,7 @@ <translation id="7113974454301513811">Ahora agrega la pestaña actual a tu lista</translation> <translation id="7114054701490058191">Las contraseñas no coinciden</translation> <translation id="7114648273807173152">Si quieres usar Smart Lock para acceder a tu Cuenta de Google, ve a Configuración > Dispositivos conectados > Tu teléfono > Smart Lock.</translation> +<translation id="7115051913071512405">Probar</translation> <translation id="7115361495406486998">No hay contactos disponibles</translation> <translation id="7115731767122970828">Aumentar ahora</translation> <translation id="7116554090938189816">El certificado SSL de la impresora venció. Reinicia la impresora y vuelve a intentarlo.</translation>
diff --git a/chrome/app/resources/generated_resources_es.xtb b/chrome/app/resources/generated_resources_es.xtb index dd0199e..c378fa1 100644 --- a/chrome/app/resources/generated_resources_es.xtb +++ b/chrome/app/resources/generated_resources_es.xtb
@@ -666,7 +666,6 @@ <translation id="1464258312790801189">Tus cuentas</translation> <translation id="1464597059227482327">Si vas a compartir archivos con un Chromebook que no está en tus contactos, comprueba que esté activada la opción Visibilidad Nearby. Para activar Visibilidad Nearby, selecciona la esquina inferior derecha y, después, la opción Visibilidad Nearby para activarla. <ph name="LINK_BEGIN" />Más información<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Para ver las preferencias del dispositivo, ve a Configuración.</translation> -<translation id="146481294006497945">No hay contraseñas guardadas</translation> <translation id="1465176863081977902">C&opiar dirección de audio</translation> <translation id="146522654774760805">Contraseñas y Autocompletar</translation> <translation id="1465827627707997754">Porción de pizza</translation> @@ -2166,7 +2165,6 @@ <translation id="2485394160472549611">Recomendaciones para ti</translation> <translation id="2485422356828889247">Desinstalar</translation> <translation id="2485681265915754872">Términos del Servicio de Google Play</translation> -<translation id="2486036712620651117">Contraseñas y llaves de acceso</translation> <translation id="248676429071089168">Desliza hacia arriba para mover la página hacia abajo</translation> <translation id="2487067538648443797">Añadir nuevo marcador</translation> <translation id="2489686758589235262">Asignar 2 interruptores más</translation> @@ -3889,7 +3887,6 @@ <translation id="3721178866505920080">Más información sobre cómo activar la precarga ampliada</translation> <translation id="3722108462506185496">No se ha podido iniciar el servicio de la máquina virtual. Inténtalo de nuevo.</translation> <translation id="3722624153992426516">Instrucción <ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /> recibida</translation> -<translation id="3724897774652282549">Rellena el formulario</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Redes Wi‑Fi disponibles</translation> @@ -4321,7 +4318,6 @@ <translation id="3993887353483242788">Sincroniza tu <ph name="DEVICE_TYPE" /> para encontrar tus preferencias guardadas cuando inicies sesión con tu cuenta de Google en cualquier dispositivo. Tus preferencias incluyen aplicaciones, ajustes, contraseñas de redes Wi‑Fi, idiomas, fondos de pantalla y combinaciones de teclas, entre otros.</translation> <translation id="3994318741694670028">Lamentablemente, tu ordenador está configurado con un identificador de hardware incorrecto. Esto impide que ChromeOS Flex se actualice con los últimos parches de seguridad y hace que el ordenador <ph name="BEGIN_BOLD" />pueda ser vulnerable a ataques maliciosos<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Desbloquea el teléfono y acércalo para desbloquear tu <ph name="DEVICE_TYPE" />.</translation> -<translation id="3994522032746736727">Iniciar sesión como <ph name="EMAIL" /></translation> <translation id="3994530503403062649">Localizar botones en tu tablet</translation> <translation id="3994708120330953242">Algunas de tus contraseñas se han encontrado en una brecha de seguridad de datos. Para proteger tus cuentas, deberías cambiar estas contraseñas ahora.</translation> <translation id="3994878504415702912">&Tamaño</translation> @@ -6590,7 +6586,6 @@ <translation id="5646994841348250879">Elige una cuenta para iniciar sesión en <ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">Conector jack para micrófono</translation> <translation id="5648166631817621825">Últimos 7 días</translation> -<translation id="5650537073531199882">Rellenar formulario</translation> <translation id="5651308944918885595">Detección de Compartir con Nearby</translation> <translation id="5653154844073528838">Tienes <ph name="PRINTER_COUNT" /> impresoras guardadas.</translation> <translation id="5654669866168491665">Más información sobre los sitios que posiblemente no funcionen al bloquear las cookies de terceros</translation> @@ -8590,6 +8585,7 @@ <translation id="7113974454301513811">Ahora añade la pestaña actual a tu lista</translation> <translation id="7114054701490058191">Las contraseñas no coinciden</translation> <translation id="7114648273807173152">Si quieres usar Smart Lock para iniciar sesión en tu cuenta de Google, ve a Configuración > Dispositivos conectados > Tu teléfono > Smart Lock.</translation> +<translation id="7115051913071512405">Pruébalo</translation> <translation id="7115361495406486998">No hay contactos disponibles</translation> <translation id="7115731767122970828">Mejorar ahora</translation> <translation id="7116554090938189816">El certificado SSL de la impresora ha caducado. Reinicia la impresora e inténtalo de nuevo.</translation>
diff --git a/chrome/app/resources/generated_resources_et.xtb b/chrome/app/resources/generated_resources_et.xtb index da013a2..59d9ac6 100644 --- a/chrome/app/resources/generated_resources_et.xtb +++ b/chrome/app/resources/generated_resources_et.xtb
@@ -667,7 +667,6 @@ <translation id="1464258312790801189">Teie kontod</translation> <translation id="1464597059227482327">Kui jagate Chromebookiga, mis pole teie kontaktide hulgas, veenduge, et Chromebooki „Nähtavus läheduses” oleks sisse lülitatud Funktsiooni „Nähtavus läheduses” sisselülitamiseks valige parempoolne alumine nurk ja seejärel valige sisselülitamiseks „Nähtavus läheduses”. <ph name="LINK_BEGIN" />Lisateave<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Seadme eelistused on saadaval jaotises Seaded.</translation> -<translation id="146481294006497945">Salvestatud paroole ei ole</translation> <translation id="1465176863081977902">K&opeeri heli aadress</translation> <translation id="146522654774760805">Paroolid ja automaattäide</translation> <translation id="1465827627707997754">Pitsalõik</translation> @@ -2169,7 +2168,6 @@ <translation id="2485394160472549611">Soovitused teile</translation> <translation id="2485422356828889247">Desinstalli</translation> <translation id="2485681265915754872">Google Play teenusetingimused</translation> -<translation id="2486036712620651117">Paroolid ja pääsuvõtmed</translation> <translation id="248676429071089168">Lehe allapoole liigutamiseks pühkige üles</translation> <translation id="2487067538648443797">Uue järjehoidja lisamine</translation> <translation id="2489686758589235262">Määrake veel kaks lülitit</translation> @@ -3892,7 +3890,6 @@ <translation id="3721178866505920080">Lisateave laiendatud eellaadimise sisselülitamise kohta</translation> <translation id="3722108462506185496">Viga virtuaalseadme teenuse käivitamisel. Proovige uuesti.</translation> <translation id="3722624153992426516">Juhis <ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /> võeti vastu</translation> -<translation id="3724897774652282549">Täitke vorm</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Saadaolevad WiFi-võrgud</translation> @@ -4325,7 +4322,6 @@ <translation id="3993887353483242788">Sünkroonige oma seade <ph name="DEVICE_TYPE" />, et teie eelistused oleksid valmis igas seadmes, kui sellesse oma Google'i kontoga sisse logite. Eelistused hõlmavad rakendusi, seadeid, WiFi-võrkude paroole, keeli, taustapilti, klaviatuuri otseteid ja muudki.</translation> <translation id="3994318741694670028">Kahjuks on teie arvuti seadistatud valesti vormindatud riistvara ID-ga. See ei lase Chrome OS Flexil uusimate turvaparandustega värskendada ja teie arvuti <ph name="BEGIN_BOLD" />võib olla pahatahtlike rünnakute suhtes haavatav<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Seadme <ph name="DEVICE_TYPE" /> avamiseks avage oma telefon ja tooge see lähemale.</translation> -<translation id="3994522032746736727">Logige sisse kasutajana <ph name="EMAIL" /></translation> <translation id="3994530503403062649">Leidke oma tahvelarvuti nupud</translation> <translation id="3994708120330953242">Mõned teie paroolid leiti andmetega seotud rikkumise käigus. Oma kontode kaitsmiseks peate neid paroole kohe muutma.</translation> <translation id="3994878504415702912">&Suumi</translation> @@ -6596,7 +6592,6 @@ <translation id="5646994841348250879">Valige konto, millega saidile <ph name="SITE_ETLD_PLUS_ONE" /> sisse logida</translation> <translation id="5648021990716966815">Mikrofoni pistikupesa</translation> <translation id="5648166631817621825">Viimased seitse päeva</translation> -<translation id="5650537073531199882">Täitke vorm</translation> <translation id="5651308944918885595">Läheduses jagamine – leitavus</translation> <translation id="5653154844073528838">Teil on <ph name="PRINTER_COUNT" /> salvestatud printerit.</translation> <translation id="5654669866168491665">Vaadake lisateavet saitide kohta, mis ei pruugi töötada, kui kolmanda osapoole küpsisefailid on blokeeritud</translation> @@ -8596,6 +8591,7 @@ <translation id="7113974454301513811">Lisage nüüd praegune vaheleht oma loendisse</translation> <translation id="7114054701490058191">Paroolid ei ühti</translation> <translation id="7114648273807173152">Oma Google’i kontole funktsiooni Smart Lock abil sisselogimiseks tehke valikud Seaded > Ühendatud seaded > Teie telefon > Smart Lock.</translation> +<translation id="7115051913071512405">Proovi järele</translation> <translation id="7115361495406486998">Kättesaadavaid kontakte ei ole</translation> <translation id="7115731767122970828">Võimenda kohe</translation> <translation id="7116554090938189816">Printeri SSL-sertifikaat on aegunud. Taaskäivitage printer ja proovige uuesti.</translation>
diff --git a/chrome/app/resources/generated_resources_eu.xtb b/chrome/app/resources/generated_resources_eu.xtb index 84bc173..9a1c904 100644 --- a/chrome/app/resources/generated_resources_eu.xtb +++ b/chrome/app/resources/generated_resources_eu.xtb
@@ -666,7 +666,6 @@ <translation id="1464258312790801189">Zure kontuak</translation> <translation id="1464597059227482327">Zure kontaktuetan ez dagoen Chromebook batekin edukia partekatzeko asmoa baduzu, egiaztatu Nearby-ren ikusgaitasuna aktibatuta daukala. Nearby-ren ikusgaitasuna aktibatzeko, hautatu beheko eskuineko izkina eta, gero, hautatu Nearby-ren ikusgaitasuna aktibatzeko aukera. <ph name="LINK_BEGIN" />Lortu informazio gehiago<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Gailuaren hobespenak ikusteko, joan ezarpenetara.</translation> -<translation id="146481294006497945">Ez dago pasahitzik gordeta</translation> <translation id="1465176863081977902">K&opiatu audioaren helbidea</translation> <translation id="146522654774760805">Pasahitzak eta Betetze automatikoa</translation> <translation id="1465827627707997754">Pizza zatia</translation> @@ -2165,7 +2164,6 @@ <translation id="2485394160472549611">Zuretzako aukerarik onenak</translation> <translation id="2485422356828889247">Desinstalatu</translation> <translation id="2485681265915754872">Google Play-ren Zerbitzu-baldintzak</translation> -<translation id="2486036712620651117">Pasahitzak eta sarbide-gakoak</translation> <translation id="248676429071089168">Pasatu hatza gorantz orria beherantz mugitzeko</translation> <translation id="2487067538648443797">Gehitu laster-marka bat</translation> <translation id="2489686758589235262">Esleitu beste bi erabilerraztasun-etengailu</translation> @@ -3886,7 +3884,6 @@ <translation id="3721178866505920080">Informazio gehiago aurrez kargatzeko modu hedatua aktibatzeari buruz</translation> <translation id="3722108462506185496">Errore bat gertatu da makina birtualaren zerbitzua abiaraztean. Saiatu berriro.</translation> <translation id="3722624153992426516"><ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /> argibidea jaso da</translation> -<translation id="3724897774652282549">Bete inprimakia</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Wifi-sare erabilgarriak</translation> @@ -4319,7 +4316,6 @@ <translation id="3993887353483242788">Sinkronizatu <ph name="DEVICE_TYPE" /> gailua; horrela, hobespenak prest egongo dira edozein gailutan Google-ko kontuarekin saioa hasten duzunean. Hobespenen artean hauek daude: aplikazioak, ezarpenak, wifi-sareetako pasahitzak, hizkuntzak, horma-paperak, lasterbideak eta beste.</translation> <translation id="3994318741694670028">Ordenagailua formatu okerreko hardware-identifikatzaile batekin konfiguratuta dago. Ondorioz, ezin da eguneratu ChromeOS Flex azken segurtasun-konponketekin, eta baliteke ordenagailuak <ph name="BEGIN_BOLD" />asmo txarreko erasoak jasotzea<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300"><ph name="DEVICE_TYPE" /> gailua desblokeatzeko, desblokeatu telefonoa eta hurbil ezazu.</translation> -<translation id="3994522032746736727">Hasi saioa <ph name="EMAIL" /> gisa</translation> <translation id="3994530503403062649">Bilatu tabletaren botoiak</translation> <translation id="3994708120330953242">Gordetako pasahitzetako batzuk datuen isilpekotasunaren urratze batean aurkitu dira. Kontuak babesteko, pasahitz horiek aldatzea gomendatzen dizugu.</translation> <translation id="3994878504415702912">&Zooma</translation> @@ -6586,7 +6582,6 @@ <translation id="5646994841348250879">Aukeratu <ph name="SITE_ETLD_PLUS_ONE" /> aplikazioan saioa hasteko erabili nahi duzun kontua</translation> <translation id="5648021990716966815">Mikrofonoaren konektorea</translation> <translation id="5648166631817621825">Azken zazpi egunetakoak</translation> -<translation id="5650537073531199882">Bete inprimakia</translation> <translation id="5651308944918885595">Nearby Share-ren ikusgaitasuna</translation> <translation id="5653154844073528838"><ph name="PRINTER_COUNT" /> inprimagailu dauzkazu gordeta.</translation> <translation id="5654669866168491665">Lortu informazio gehiago hirugarrenen cookieak blokeatuz gero agian funtzionatuko ez duten webguneei buruz</translation> @@ -8584,6 +8579,7 @@ <translation id="7113974454301513811">Gehitu oraingo fitxa zerrendan</translation> <translation id="7114054701490058191">Pasahitzak ez datoz bat</translation> <translation id="7114648273807173152">Smart Lock erabili nahi baduzu Google-ko kontuan saioa hasteko, joan Ezarpenak > Konektatutako gailuak > Zure telefonoa > Smart Lock atalera.</translation> +<translation id="7115051913071512405">Proba ezazu</translation> <translation id="7115361495406486998">Ez dago kontaktu eskuragarririk</translation> <translation id="7115731767122970828">Hobetu</translation> <translation id="7116554090938189816">Inprimagailuaren SSL ziurtagiria iraungi egin da. Berrabiarazi inprimagailua eta saiatu berriro.</translation>
diff --git a/chrome/app/resources/generated_resources_fa.xtb b/chrome/app/resources/generated_resources_fa.xtb index ff21ae62..b4088c1 100644 --- a/chrome/app/resources/generated_resources_fa.xtb +++ b/chrome/app/resources/generated_resources_fa.xtb
@@ -668,7 +668,6 @@ <translation id="1464258312790801189">حسابهای شما</translation> <translation id="1464597059227482327">اگر دستگاه Chromebook که درحال همرسانی با آن هستید در مخاطبین شما قرار ندارد، مطمئن شوید «نمایان برای اطراف» در دستگاه Chromebook روشن باشد. برای روشن کردن «نمایان برای اطراف»، گوشه پایین را انتخاب کنید و «نمایان برای اطراف» را روشن کنید. <ph name="LINK_BEGIN" />بیشتر بدانید<ph name="LINK_END" /></translation> <translation id="1464781208867302907">برای اولویتهای دستگاه، به «تنظیمات» بروید</translation> -<translation id="146481294006497945">گذرواژهای ذخیره نشده است</translation> <translation id="1465176863081977902">کپی آدرس صوت</translation> <translation id="146522654774760805">گذرواژهها و تکمیل خودکار</translation> <translation id="1465827627707997754">تکه پیتزا</translation> @@ -2175,7 +2174,6 @@ <translation id="2485394160472549611">انتخابهای برتر برای شما</translation> <translation id="2485422356828889247">حذف نصب</translation> <translation id="2485681265915754872">شرایط خدمات Google Play</translation> -<translation id="2486036712620651117">گذرواژهها و گذرکلیدها</translation> <translation id="248676429071089168">برای رفتن بهپایین صفحه، تند بهبالا بکشید</translation> <translation id="2487067538648443797">افزودن نشانک جدید</translation> <translation id="2489686758589235262">اختصاص دادن ۲ کلید دیگر</translation> @@ -3898,7 +3896,6 @@ <translation id="3721178866505920080">اطلاعات بیشتر درباره روشن کردن پیشبارگذاری گسترده</translation> <translation id="3722108462506185496">هنگام شروع سرویس دستگاه مجازی خطایی روی داد. لطفاً دوباره امتحان کنید.</translation> <translation id="3722624153992426516">دستورالعمل <ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /> دریافت شده است</translation> -<translation id="3724897774652282549">فرم را تکمیل کنید</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> - <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">شبکههای WiFi دردسترس</translation> @@ -4331,7 +4328,6 @@ <translation id="3993887353483242788"><ph name="DEVICE_TYPE" /> خود را همگامسازی کنید تا وقتی با «حساب Google» خودتان به سیستم وارد میشوید، اولویتهایتان در همه دستگاهها آماده استفاده باشند. اولویتها شامل برنامهها، تنظیمات، گذرواژههای Wi-Fi، زبانها، کاغذدیواری، میانبرهای صفحهکلید، و موارد دیگر میشود.</translation> <translation id="3994318741694670028">متأسفانه، رایانه شما با شناسه سختافزار ناقص پیکربندی شده است. این موضوع مانع از بهروزرسانی ChromeOS Flex با آخرین اصلاحات امنیتی میشود و <ph name="BEGIN_BOLD" />میتواند رایانهتان را دربرابر حملات مخرب آسیبپذیر کند<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">برای باز کردن قفل <ph name="DEVICE_TYPE" />، قفل تلفنتان را باز کنید و آن را نزدیکتر بیاورید.</translation> -<translation id="3994522032746736727">ورود به سیستم بهعنوان <ph name="EMAIL" /></translation> <translation id="3994530503403062649">مکانیابی دکمههای رایانه لوحی</translation> <translation id="3994708120330953242">برخیاز گذرواژههایتان در سرقت اطلاعات شبکه پیدا شده است. برای ایمن کردن حسابهایتان، توصیه میشود این گذرواژهها را همینحالا تغییر دهید.</translation> <translation id="3994878504415702912">&بزرگنمایی</translation> @@ -4622,6 +4618,7 @@ <translation id="4220648711404560261">خطایی درحین فعالسازی روی داد.</translation> <translation id="4222917615373664617">پیگیری قیمت فعال است. قیمت <ph name="CURRENT_PRICE" /> است.</translation> <translation id="4223404254440398437">میکروفون مجاز نیست</translation> +<translation id="4224541845943007092">خواندن و ذخیره کردن ورودی صفحهکلید از نوار نشانی</translation> <translation id="4225397296022057997">در همه سایتها</translation> <translation id="4228071595943929139">استفاده از نشانی ایمیل سازمان</translation> <translation id="4228209296591583948">{NUM_EXTENSIONS,plural, =1{این افزونه مجاز نیست}one{برخی افزونهها مجاز نیستند}other{برخی افزونهها مجاز نیستند}}</translation> @@ -6602,7 +6599,6 @@ <translation id="5646994841348250879">برای ورود به سیستم <ph name="SITE_ETLD_PLUS_ONE" />، حسابی انتخاب کنید</translation> <translation id="5648021990716966815">فیش میکروفون</translation> <translation id="5648166631817621825">۷ روز گذشته</translation> -<translation id="5650537073531199882">تکمیل فرم</translation> <translation id="5651308944918885595">قابلیت شناسایی «همرسانی با اطراف»</translation> <translation id="5653154844073528838"><ph name="PRINTER_COUNT" /> چاپگر ذخیرهشده دارید.</translation> <translation id="5654669866168491665">درباره سایتهایی که ممکن است هنگام مسدود کردن کوکیهای طرف سوم کار نکنند بیشتر بدانید</translation> @@ -8604,6 +8600,7 @@ <translation id="7113974454301513811">اکنون برگه فعلی را به فهرست اضافه کنید</translation> <translation id="7114054701490058191">گذرواژهها مطابقت ندارند</translation> <translation id="7114648273807173152">برای استفاده از Smart Lock برای ورود به سیستم حساب Google، به «تنظیمات > دستگاههای متصل > Smart Lock» بروید.</translation> +<translation id="7115051913071512405">امتحان کنید</translation> <translation id="7115361495406486998">مخاطبی دردسترس نیست</translation> <translation id="7115731767122970828">اکنون تقویت شود</translation> <translation id="7116554090938189816">گواهینامه SSL چاپگر منقضی شده است. چاپگر را بازراهاندازی کنید و دوباره امتحان کنید.</translation>
diff --git a/chrome/app/resources/generated_resources_fi.xtb b/chrome/app/resources/generated_resources_fi.xtb index 9155add..187d2250 100644 --- a/chrome/app/resources/generated_resources_fi.xtb +++ b/chrome/app/resources/generated_resources_fi.xtb
@@ -667,7 +667,6 @@ <translation id="1464258312790801189">Tilisi</translation> <translation id="1464597059227482327">Jos jaat sisältöä Chromebookille, joka ei ole yhteystiedoissasi, varmista, että Lähinäkyvyys on päällä Chromebookilla. Laita Lähinäkyvyys-asetus päälle klikkaamalla oikeasta alakulmasta ja valitsemalla sitten "Lähinäkyvyys". <ph name="LINK_BEGIN" />Lue lisää<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Katso laitevalinnat asetuksista.</translation> -<translation id="146481294006497945">Ei tallennettuja salasanoja</translation> <translation id="1465176863081977902">K&opioi äänen osoite</translation> <translation id="146522654774760805">Salasanat ja automaattinen täyttö</translation> <translation id="1465827627707997754">Pizzapala</translation> @@ -2177,7 +2176,6 @@ <translation id="2485394160472549611">Suositukset sinulle</translation> <translation id="2485422356828889247">Poista</translation> <translation id="2485681265915754872">Google Playn käyttöehdot</translation> -<translation id="2486036712620651117">Salasanat ja avainkoodit</translation> <translation id="248676429071089168">Siirry alaspäin sivulla pyyhkäisemällä ylöspäin</translation> <translation id="2487067538648443797">Lisää kirjanmerkki</translation> <translation id="2489686758589235262">Ota käyttöön kaksi kytkintä lisää</translation> @@ -3900,7 +3898,6 @@ <translation id="3721178866505920080">Lisätietoa laajennetun esilatauksen laittamisesta päälle</translation> <translation id="3722108462506185496">Virtuaalikonepalvelun käynnistys epäonnistui. Yritä myöhemmin uudelleen.</translation> <translation id="3722624153992426516">Ohje vastaanotettu: <ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /></translation> -<translation id="3724897774652282549">Täytä lomake</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Käytettävissä olevat Wi-Fi-verkot</translation> @@ -4330,7 +4327,6 @@ <translation id="3993887353483242788">Synkronoi <ph name="DEVICE_TYPE" />, niin valinnat säilyvät millä tahansa laitteella, kun kirjaudut sisään Google-tililläsi. Valinnat koskevat esimerkiksi sovelluksia, asetuksia, Wi-Fi-verkon salasanoja, kieliä, taustakuvaa ja pikanäppäimiä.</translation> <translation id="3994318741694670028">Tietokoneesi on valitettavasti määritetty virheellisellä laitteistotunnuksella. Tämän takia ChromeOS Flex ei voi asentaa uusimpia tietoturvapäivityksiä ja tietokoneesi <ph name="BEGIN_BOLD" />voi altistua hyökkäyksille<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Avaa laitteen <ph name="DEVICE_TYPE" /> lukitus avaamalla ensin puhelimesi ja tuomalla se lähelle laitetta.</translation> -<translation id="3994522032746736727">Kirjaudu sisään tilillä <ph name="EMAIL" /></translation> <translation id="3994530503403062649">Aseta tabletin painikkeet</translation> <translation id="3994708120330953242">Salasanojasi on paljastunut tietosuojaloukkauksen yhteydessä. Suojaa tilejäsi vaihtamalla salasanat nyt.</translation> <translation id="3994878504415702912">&Koko</translation> @@ -6601,7 +6597,6 @@ <translation id="5646994841348250879">Valitse millä tilillä kirjaudut sovellukseen (<ph name="SITE_ETLD_PLUS_ONE" />)</translation> <translation id="5648021990716966815">Mikrofoniliitäntä</translation> <translation id="5648166631817621825">Viimeiset seitsemän päivää</translation> -<translation id="5650537073531199882">Täytä lomake</translation> <translation id="5651308944918885595">Lähijakaminen löydettävyys</translation> <translation id="5653154844073528838">Sinulla on <ph name="PRINTER_COUNT" /> tallennettua tulostinta</translation> <translation id="5654669866168491665">Lue lisää sivustoista, jotka eivät välttämättä toimi kolmannen osapuolen evästeitä estettäessä</translation> @@ -8601,6 +8596,7 @@ <translation id="7113974454301513811">Lisää nykyinen välilehti listalle</translation> <translation id="7114054701490058191">Salasanat eivät täsmää</translation> <translation id="7114648273807173152">Jos haluat kirjautua Google-tilillesi Smart Lockin avulla, siirry kohtaan Asetukset > Yhdistetyt laitteet > Puhelimesi > Smart Lock.</translation> +<translation id="7115051913071512405">Kokeile</translation> <translation id="7115361495406486998">Ei kontakteja tavoitettavissa</translation> <translation id="7115731767122970828">Tehosta nyt</translation> <translation id="7116554090938189816">Tulostimen SSL-varmenne on vanhentunut. Käynnistä tulostin uudelleen ja yritä uudelleen.</translation>
diff --git a/chrome/app/resources/generated_resources_fil.xtb b/chrome/app/resources/generated_resources_fil.xtb index 42182b4..db5a709 100644 --- a/chrome/app/resources/generated_resources_fil.xtb +++ b/chrome/app/resources/generated_resources_fil.xtb
@@ -668,7 +668,6 @@ <translation id="1464258312790801189">Ang Iyong Mga Account</translation> <translation id="1464597059227482327">Kung nagshe-share ka sa isang Chromebook na wala sa iyong mga contact, tiyaking naka-on ang “visibility ng Nearby” ng Chromebook. Para i-on ang “visibility ng Nearby,” pumunta sa kanang sulok sa ibaba at pagkatapos ay piliing i-on ang “visibility ng Nearby.” <ph name="LINK_BEGIN" />Matuto pa<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Para sa mga kagustuhan sa device, pumunta sa Mga Setting.</translation> -<translation id="146481294006497945">Walang Naka-save na Password</translation> <translation id="1465176863081977902">K&opyahin ang Address ng Audio</translation> <translation id="146522654774760805">Mga password at autofill</translation> <translation id="1465827627707997754">Hiwa ng pizza</translation> @@ -2179,7 +2178,6 @@ <translation id="2485394160472549611">Mga nangunguna para sa iyo</translation> <translation id="2485422356828889247">I-uninstall</translation> <translation id="2485681265915754872">Mga tuntunin ng serbisyo ng Google Play</translation> -<translation id="2486036712620651117">Mga Password at Passkey</translation> <translation id="248676429071089168">Mag-swipe pataas para ibaba ang page</translation> <translation id="2487067538648443797">Magdagdag ng bagong bookmark</translation> <translation id="2489686758589235262">Magtalaga ng 2 pang switch</translation> @@ -3902,7 +3900,6 @@ <translation id="3721178866505920080">Higit pang impormasyon tungkol sa pag-on sa extended na pag-preload</translation> <translation id="3722108462506185496">Nagkaroon ng error sa pagpapagana ng serbisyo ng virtual machine. Pakisubukang muli.</translation> <translation id="3722624153992426516">Natanggap ang tagubiling <ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /></translation> -<translation id="3724897774652282549">Punan ang form</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Mga available na WiFi network</translation> @@ -4335,7 +4332,6 @@ <translation id="3993887353483242788">I-sync ang iyong <ph name="DEVICE_TYPE" /> para magamit mo sa anumang device ang mga kagustuhan mo kapag nag-sign in ka sa iyong Google Account. Kasama sa mga kagustuhan ang mga app, mga setting, mga password ng Wi-Fi, mga wika, wallpaper, mga keyboard shortcut, at iba pa.</translation> <translation id="3994318741694670028">Sa kasamaang-palad, na-configure ang iyong computer gamit ang isang hardware ID na mali ang pagkakabuo. Pinipigilan nito ang ChromeOS Flex na mag-update sa mga pinakabagong pag-aayos sa seguridad at <ph name="BEGIN_BOLD" />posibleng maging mahina sa mga nakakapinsalang pag-atake<ph name="END_BOLD" /> ang iyong computer.</translation> <translation id="3994374631886003300">I-unlock ang iyong telepono at ilapit pa ito upang ma-unlock ang <ph name="DEVICE_TYPE" /> mo.</translation> -<translation id="3994522032746736727">Mag-sign in bilang <ph name="EMAIL" /></translation> <translation id="3994530503403062649">Magtakda ng mga button sa iyong tablet</translation> <translation id="3994708120330953242">Nakita ang ilan sa iyong mga password sa isang paglabag sa data. Para i-secure ang iyong mga account, dapat mong palitan ang mga password na ito ngayon mismo.</translation> <translation id="3994878504415702912">&I-zoom</translation> @@ -6606,7 +6602,6 @@ <translation id="5646994841348250879">Pumili ng account na isa-sign in sa <ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">Jack ng mikropono</translation> <translation id="5648166631817621825">Nakalipas na 7 araw</translation> -<translation id="5650537073531199882">Punan ang Form</translation> <translation id="5651308944918885595">Pagiging nahahanap sa Nearby Share</translation> <translation id="5653154844073528838">May <ph name="PRINTER_COUNT" /> kang naka-save na printer.</translation> <translation id="5654669866168491665">Matuto pa tungkol sa mga site na posibleng hindi gumana kapag nagba-block ng third-party na cookies</translation> @@ -8608,6 +8603,7 @@ <translation id="7113974454301513811">Idagdag ngayon ang kasalukuyang tab sa iyong listahan</translation> <translation id="7114054701490058191">Hindi magkatugma ang mga password</translation> <translation id="7114648273807173152">Para gamitin ang Smart Lock para mag-sign in sa iyong Google Account, pumunta sa Mga Setting > Mga nakakonektang device > Iyong telepono > Smart Lock.</translation> +<translation id="7115051913071512405">Subukan ito</translation> <translation id="7115361495406486998">Walang maabot na contact</translation> <translation id="7115731767122970828">Mag-boost ngayon</translation> <translation id="7116554090938189816">Nag-expire na ang SSL certificate ng printer. I-restart ang printer at subukan ulit.</translation>
diff --git a/chrome/app/resources/generated_resources_fr-CA.xtb b/chrome/app/resources/generated_resources_fr-CA.xtb index 5fccaac9..1db6b2c 100644 --- a/chrome/app/resources/generated_resources_fr-CA.xtb +++ b/chrome/app/resources/generated_resources_fr-CA.xtb
@@ -666,7 +666,6 @@ <translation id="1464258312790801189">Vos comptes</translation> <translation id="1464597059227482327">Si vous partagez du contenu avec un Chromebook qui ne figure pas dans vos contacts, assurez-vous que le « Partage à proximité » est activé. Pour activer le « Partage à proximité », sélectionnez le coin inférieur droit, puis « Partage à proximité » pour l'activer. <ph name="LINK_BEGIN" />En savoir plus<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Pour ouvrir les préférences de l'appareil, accédez au menu Paramètres.</translation> -<translation id="146481294006497945">Aucun mot de passe enregistré</translation> <translation id="1465176863081977902">C&opier l'adresse de l'audio</translation> <translation id="146522654774760805">Mots de passe et remplissage automatique</translation> <translation id="1465827627707997754">Pointe de pizza</translation> @@ -2164,7 +2163,6 @@ <translation id="2485394160472549611">Meilleures recommandations pour vous</translation> <translation id="2485422356828889247">Désinstaller</translation> <translation id="2485681265915754872">Conditions d'utilisation de Google Play</translation> -<translation id="2486036712620651117">Mots de passe et clés d'accès</translation> <translation id="248676429071089168">Balayez l'écran vers le haut pour déplacer la page vers le bas</translation> <translation id="2487067538648443797">Ajouter un favori</translation> <translation id="2489686758589235262">Attribuer au moins deux commutateurs</translation> @@ -3884,7 +3882,6 @@ <translation id="3721178866505920080">Plus de renseignements sur l'activation du préchargement étendu</translation> <translation id="3722108462506185496">Erreur lors du démarrage du service de machine virtuelle. Veuillez réessayer.</translation> <translation id="3722624153992426516">Instruction <ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /> reçue</translation> -<translation id="3724897774652282549">Remplir le formulaire</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Réseaux Wi-Fi disponibles</translation> @@ -4315,7 +4312,6 @@ <translation id="3993887353483242788">Synchronisez votre <ph name="DEVICE_TYPE" /> afin que vos préférences soient prêtes sur n'importe quel appareil lorsque vous vous connectez avec votre compte Google. Ces préférences comprennent les applications, les paramètres, les mots de passe Wi-Fi, les langues, les fonds d'écran, les raccourcis-clavier, etc.</translation> <translation id="3994318741694670028">Malheureusement, votre ordinateur est configuré avec un identifiant de matériel malformé. Cela empêche l'installation des derniers correctifs de sécurité pour Chrome OS Flex. Votre ordinateur <ph name="BEGIN_BOLD" />peut ainsi être vulnérable aux attaques malveillantes<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Déverrouillez votre téléphone et rapprochez-le de votre <ph name="DEVICE_TYPE" /> pour le déverrouiller.</translation> -<translation id="3994522032746736727">Se connecter en tant que <ph name="EMAIL" /></translation> <translation id="3994530503403062649">Localiser les boutons sur votre tablette</translation> <translation id="3994708120330953242">Certains de vos mots de passe ont été trouvés dans un cas de violation de données. Pour sécuriser vos comptes, changez ces mots de passe maintenant.</translation> <translation id="3994878504415702912">&Zoom</translation> @@ -6580,7 +6576,6 @@ <translation id="5646994841348250879">Choisissez un compte pour vous connecter à <ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">Prise du microphone</translation> <translation id="5648166631817621825">Sept derniers jours</translation> -<translation id="5650537073531199882">Remplir le formulaire</translation> <translation id="5651308944918885595">Visibilité pour le partage à proximité</translation> <translation id="5653154844073528838">Vous avez <ph name="PRINTER_COUNT" /> imprimantes enregistrées.</translation> <translation id="5654669866168491665">En savoir plus sur les sites qui peuvent ne pas fonctionner si les témoins tiers sont bloqués</translation> @@ -8575,6 +8570,7 @@ <translation id="7113974454301513811">Maintenant, ajoutez l'onglet actuel à votre liste</translation> <translation id="7114054701490058191">Les mots de passe ne correspondent pas</translation> <translation id="7114648273807173152">Pour utiliser Smart Lock pour vous connecter à votre compte Google, accédez à Paramètres > Appareils connectés > Votre téléphone > Smart Lock.</translation> +<translation id="7115051913071512405">Essayez-le</translation> <translation id="7115361495406486998">Aucun contact joignable</translation> <translation id="7115731767122970828">Améliorer maintenant</translation> <translation id="7116554090938189816">Le certificat SSL de l'imprimante a expiré. Redémarrez l'imprimante et réessayez.</translation>
diff --git a/chrome/app/resources/generated_resources_fr.xtb b/chrome/app/resources/generated_resources_fr.xtb index 13f32b7f..92b8d34 100644 --- a/chrome/app/resources/generated_resources_fr.xtb +++ b/chrome/app/resources/generated_resources_fr.xtb
@@ -95,7 +95,7 @@ <translation id="1059944192885972544"><ph name="NUM" /> onglets trouvés pour "<ph name="SEARCH_TEXT" />"</translation> <translation id="1060570945511946595">Gérer les tickets</translation> <translation id="1061130374843955397">Bienvenue sur votre <ph name="DEVICE_TYPE" /></translation> -<translation id="1061373870045429865">Créer un code QR pour ce lien</translation> +<translation id="1061373870045429865">Créer un QR code pour ce lien</translation> <translation id="1061904396131502319">Il est presque temps de faire une pause</translation> <translation id="10619348099955377">Copier le nom à afficher</translation> <translation id="1062407476771304334">Remplacer</translation> @@ -355,7 +355,7 @@ <translation id="1232569758102978740">Sans titre</translation> <translation id="1233497634904001272">Appuyez de nouveau sur votre clé de sécurité pour finaliser la requête.</translation> <translation id="1233721473400465416">Paramètres régionaux</translation> -<translation id="1234736487471201993">Créer un code QR pour cette image</translation> +<translation id="1234736487471201993">Créer un QR code pour cette image</translation> <translation id="1234808891666923653">Service Workers</translation> <translation id="1235458158152011030">Réseaux connus</translation> <translation id="123578888592755962">Disque saturé.</translation> @@ -667,7 +667,6 @@ <translation id="1464258312790801189">Vos comptes</translation> <translation id="1464597059227482327">Si vous partagez des fichiers avec un Chromebook qui ne figure pas dans vos contacts, assurez-vous que l'option "Visibilité à proximité" est activée sur ce Chromebook. Pour activer la fonctionnalité "Visibilité à proximité", sélectionnez l'option "Visibilité à proximité" en bas à droite. <ph name="LINK_BEGIN" />En savoir plus<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Pour ouvrir les préférences de l'appareil, accédez aux paramètres.</translation> -<translation id="146481294006497945">Aucun mot de passe enregistré</translation> <translation id="1465176863081977902">C&opier l'adresse audio</translation> <translation id="146522654774760805">Mots de passe et saisie automatique</translation> <translation id="1465827627707997754">Part de pizza</translation> @@ -709,7 +708,7 @@ <translation id="1486012259353794050">Lorsque vous posez des questions, l'Assistant Google vous fournit des réponses personnalisées en fonction de votre écran</translation> <translation id="1486096554574027028">Rechercher</translation> <translation id="1486458761710757218">Ajuster automatiquement la luminosité du rétroéclairage du clavier</translation> -<translation id="1486486872607808064">Scannez ce code QR avec l'appareil photo de l'appareil sur lequel vous voulez créer une clé d'accès pour <ph name="APP_NAME" /></translation> +<translation id="1486486872607808064">Scannez ce QR code avec l'appareil photo de l'appareil sur lequel vous voulez créer une clé d'accès pour <ph name="APP_NAME" /></translation> <translation id="1486616492435615702">Créez un brouillon ou améliorez un travail existant.</translation> <translation id="1487335504823219454">Activée – Paramètres personnalisés</translation> <translation id="1493892686965953381">En attente de <ph name="LOAD_STATE_PARAMETER" />...</translation> @@ -782,7 +781,7 @@ <translation id="1543538514740974167">Accédez plus rapidement à cette page</translation> <translation id="1544588554445317666">Essayez d'utiliser un nom de fichier plus court ou de l'enregistrer dans un dossier différent</translation> <translation id="1545177026077493356">Mode Kiosque automatique</translation> -<translation id="1545749641540134597">Scanner le code QR</translation> +<translation id="1545749641540134597">Scanner le QR code</translation> <translation id="1545775234664667895">Thème "<ph name="THEME_NAME" />" installé</translation> <translation id="1546031833947068368">{COUNT,plural, =1{La fenêtre de navigation privée ne sera pas rouverte.}one{# fenêtre de navigation privée ne sera pas rouverte.}other{Les # fenêtres de navigation privée ne seront pas rouvertes.}}</translation> <translation id="1546280085599573572">Cette extension a modifié la page affichée lorsque vous cliquez sur le bouton Accueil.</translation> @@ -1173,7 +1172,7 @@ <translation id="1807246157184219062">Clair</translation> <translation id="1809201888580326312">Vous avez choisi de ne pas enregistrer les mots de passe pour ces sites et applis</translation> <translation id="1809734401532861917">Ajouter mes favoris, mon historique, mes mots de passe et d'autres paramètres au compte <ph name="USER_EMAIL_ADDRESS" /></translation> -<translation id="1810070166657251157">Pour utiliser vos mots de passe enregistrés sur votre téléphone, scannez le code QR, téléchargez Chrome pour iOS et connectez-vous à votre compte Google.</translation> +<translation id="1810070166657251157">Pour utiliser vos mots de passe enregistrés sur votre téléphone, scannez le QR code, téléchargez Chrome pour iOS et connectez-vous à votre compte Google.</translation> <translation id="1810366086647840386">Serveur d'image</translation> <translation id="1811908311154949291">Cadre cloisonné de navigation privée : <ph name="FENCEDFRAME_SITE" /></translation> <translation id="1812027881030482584"><ph name="SITE_ETLD_PLUS_ONE" /> ne peut pas poursuivre avec <ph name="IDENTITY_PROVIDER_ETLD_PLUS_ONE" /></translation> @@ -1484,7 +1483,7 @@ <translation id="2019718679933488176">&Ouvrir le fichier audio dans un nouvel onglet</translation> <translation id="2020183425253392403">Afficher les paramètres d'adresse réseau</translation> <translation id="2020225359413970060">Analyser le fichier</translation> -<translation id="2022953316617983419">Code QR</translation> +<translation id="2022953316617983419">QR code</translation> <translation id="2023042679320690325">Le <ph name="BRAND" /> ne parvient pas à comparer vos mots de passe aux violations de données. Réessayez dans 24 heures.</translation> <translation id="2023167225947895179">Ce code est facile à deviner</translation> <translation id="202352106777823113">Le téléchargement a été trop long et a été interrompu par le réseau.</translation> @@ -1693,7 +1692,7 @@ <translation id="2162705204091149050">Lire les infos sur vos navigateur, OS, appareil, logiciels installés et fichiers</translation> <translation id="2163470535490402084">Veuillez vous connecter à Internet pour vous connecter à votre <ph name="DEVICE_TYPE" />.</translation> <translation id="2164131635608782358"><ph name="FIRST_SWITCH" />, <ph name="SECOND_SWITCH" />, <ph name="THIRD_SWITCH" /> et 1 autre contacteur</translation> -<translation id="2165102982098084499">Vous avez associé ces appareils en scannant un code QR.</translation> +<translation id="2165102982098084499">Vous avez associé ces appareils en scannant un QR code.</translation> <translation id="2165177462441582039">Sélectionnez la durée d'affichage de l'élément en surbrillance</translation> <translation id="2166369534954157698">Voici à quoi ressemblera votre texte.</translation> <translation id="2169062631698640254">Se connecter quand même</translation> @@ -1701,7 +1700,7 @@ <translation id="2173801458090845390">Ajoutez un ID de réquisition sur cet appareil</translation> <translation id="2175384018164129879">&Gérer les moteurs de recherche et Site Search</translation> <translation id="217576141146192373">Impossible d'ajouter une imprimante. Vérifiez la configuration de votre imprimante et réessayez.</translation> -<translation id="2175927920773552910">Code QR</translation> +<translation id="2175927920773552910">QR code</translation> <translation id="217631816678106981">Ne pas coller</translation> <translation id="2177950615300672361">Onglet de navigation privée : <ph name="TAB_NAME" /></translation> <translation id="2178056538281447670">Microsoft 365</translation> @@ -2166,7 +2165,6 @@ <translation id="2485394160472549611">Recommandé pour vous</translation> <translation id="2485422356828889247">Désinstaller</translation> <translation id="2485681265915754872">Conditions d'utilisation de Google Play</translation> -<translation id="2486036712620651117">Mots de passe et clés d'accès</translation> <translation id="248676429071089168">Balayer vers le haut pour déplacer la page vers le bas</translation> <translation id="2487067538648443797">Ajouter un favori</translation> <translation id="2489686758589235262">Associer 2 autres contacteurs</translation> @@ -3887,7 +3885,6 @@ <translation id="3721178866505920080">En savoir plus sur l'activation du préchargement avancé</translation> <translation id="3722108462506185496">Erreur lors du démarrage du service de machine virtuelle. Veuillez réessayer.</translation> <translation id="3722624153992426516">Instruction <ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /> reçue</translation> -<translation id="3724897774652282549">Remplir le formulaire</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Réseaux Wi-Fi disponibles</translation> @@ -4320,7 +4317,6 @@ <translation id="3993887353483242788">Synchronisez votre <ph name="DEVICE_TYPE" /> pour que vos préférences soient appliquées sur n'importe quel appareil lorsque vous vous connectez avec votre compte Google. Les préférences regroupent les applis, les paramètres, les mots de passe Wi-Fi, les langues, le fond d'écran, les raccourcis clavier, etc.</translation> <translation id="3994318741694670028">Malheureusement, votre ordinateur est configuré avec un ID matériel incorrect. Cela empêche l'installation des derniers correctifs de sécurité sur ChromeOS Flex et rend votre ordinateur <ph name="BEGIN_BOLD" />potentiellement vulnérable aux attaques malveillantes<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Déverrouillez votre téléphone et rapprochez-le de votre <ph name="DEVICE_TYPE" /> pour le déverrouiller.</translation> -<translation id="3994522032746736727">Se connecter en tant que <ph name="EMAIL" /></translation> <translation id="3994530503403062649">Localisez les boutons de votre tablette</translation> <translation id="3994708120330953242">Certains de vos mots de passe ont été exposés lors d'une violation de données. Changez-les maintenant pour protéger vos comptes.</translation> <translation id="3994878504415702912">&Zoom</translation> @@ -4344,7 +4340,7 @@ <translation id="4015163439792426608">Vous avez des extensions ? <ph name="BEGIN_LINK" />Gérez-les<ph name="END_LINK" /> facilement depuis une seule et même interface.</translation> <translation id="4015250302257349679">Appuyer sur <ph name="ACCELERATOR" /> pour sélectionner cette info-bulle, puis appuyer de nouveau pour sélectionner l'élément vers lequel elle pointe.</translation> <translation id="4016762287427926315">Les autorisations que vous accordez à <ph name="APP_NAME" /> le seront aussi pour cette appli. <ph name="BEGIN_LINK" />Gérer<ph name="END_LINK" /></translation> -<translation id="4017225831995090447">Créer un code QR pour ce lien</translation> +<translation id="4017225831995090447">Créer un QR code pour ce lien</translation> <translation id="4019983356493507433">Modifier la liste des favoris</translation> <translation id="4020327272915390518">Menu Options</translation> <translation id="4021279097213088397">–</translation> @@ -4993,7 +4989,7 @@ <translation id="4503748371388753124">Votre ordinateur comprend un dispositif de sécurité avec module de plate-forme sécurisée (TPM, Trusted Platform Module) qui permet d'implémenter plusieurs fonctionnalités de sécurité critiques dans ChromeOS Flex. Consultez le centre d'aide Chromebook pour en savoir plus : https://support.google.com/chromebook/?p=tpm</translation> <translation id="4504374760782163539">{COUNT,plural, =0{Les cookies sont autorisés}=1{Les cookies sont autorisés, 1 exception}one{Les cookies sont autorisés, {COUNT} exception}other{Les cookies sont autorisés, {COUNT} exceptions}}</translation> <translation id="4504940961672722399">Utilisez cette extension en cliquant sur cette icône ou en appuyant sur <ph name="EXTENSION_SHORTCUT" /></translation> -<translation id="4505469832694348179">Téléchargez Chrome à l'aide de ce code QR, puis connectez-vous à votre compte Google.</translation> +<translation id="4505469832694348179">Téléchargez Chrome à l'aide de ce QR code, puis connectez-vous à votre compte Google.</translation> <translation id="450552327874992444">Terme déjà ajouté</translation> <translation id="450602096898954067">Des réviseurs spécialisés peuvent consulter les données pour améliorer cette fonctionnalité</translation> <translation id="4507373251891673233">Vous avez bloqué toutes les extensions pour <ph name="HOST" /></translation> @@ -5444,7 +5440,7 @@ <translation id="4827283332383516812">Supprimer la carte</translation> <translation id="4827675678516992122">Impossible de se connecter</translation> <translation id="4827784381479890589">Correcteur orthographique avancé dans le navigateur Chrome (le texte est envoyé à Google pour vous proposer des suggestions d'orthographe)</translation> -<translation id="4827904420700932487">Créer un code QR pour cette image</translation> +<translation id="4827904420700932487">Créer un QR code pour cette image</translation> <translation id="4827970183019354123">Outil de vérification d'URL</translation> <translation id="4828567746430452681"><ph name="EXTENSION_NAME" /> n'est plus compatible</translation> <translation id="482952334869563894">Appareils USB du fournisseur <ph name="VENDOR_ID" /></translation> @@ -5724,7 +5720,7 @@ <translation id="5029287942302939687">Votre mot de passe est défini</translation> <translation id="5029873138381728058">Échec de la vérification des VM</translation> <translation id="503155457707535043">Téléchargement des applications</translation> -<translation id="5032430150487044192">Impossible de créer le code QR</translation> +<translation id="5032430150487044192">Impossible de créer le QR code</translation> <translation id="5033137252639132982">Non autorisé à utiliser des capteurs de mouvement</translation> <translation id="5035846135112863536">Sélectionnez "Plus d'informations" ci-dessous pour obtenir des informations complémentaires auprès de <ph name="IDENTITY_PROVIDER_ETLD_PLUS_ONE" />.</translation> <translation id="5037676449506322593">Tout sélectionner</translation> @@ -6590,7 +6586,6 @@ <translation id="5646994841348250879">Sélectionnez un compte pour vous connecter à <ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">Connecteur micro</translation> <translation id="5648166631817621825">7 derniers jours</translation> -<translation id="5650537073531199882">Remplir le formulaire</translation> <translation id="5651308944918885595">Découvrabilité pour le Partage à proximité</translation> <translation id="5653154844073528838">Vous avez <ph name="PRINTER_COUNT" /> imprimantes enregistrées.</translation> <translation id="5654669866168491665">En savoir plus sur les sites susceptibles de ne pas fonctionner quand les cookies tiers sont bloqués</translation> @@ -7136,7 +7131,7 @@ <translation id="6059652578941944813">Hiérarchie des certificats</translation> <translation id="6059925163896151826">Appareils USB</translation> <translation id="6061408389284235459">Une notification a été envoyée à <ph name="DEVICE_NAME" /></translation> -<translation id="6063284707309177505">Créer un code QR</translation> +<translation id="6063284707309177505">Créer un QR code</translation> <translation id="6063847492705284550"><ph name="BEGIN_BOLD" />Remarque<ph name="END_BOLD" /> : Il se peut qu'une voix similaire ou un enregistrement puissent accéder aux résultats personnels de <ph name="SUPERVISED_USER_NAME" />. Afin d'économiser la batterie, configurez les paramètres de l'Assistant de <ph name="SUPERVISED_USER_NAME" /> pour que "Hey Google" ne soit actif que quand l'appareil est branché à l'alimentation.</translation> <translation id="6064217302520318294">Verrouillage de l'écran</translation> <translation id="606449270532897041">Gérer les données des sites</translation> @@ -7324,7 +7319,7 @@ <translation id="6195693561221576702">Impossible de configurer cet appareil en mode de démonstration hors connexion.</translation> <translation id="6196640612572343990">Bloquer les cookies tiers</translation> <translation id="6196854373336333322">L'extension <ph name="EXTENSION_NAME" /> a pris le contrôle de vos paramètres de proxy, ce qui signifie que toutes vos activités en ligne peuvent être modifiées, interrompues ou espionnées. Si vous ne savez pas pourquoi cette modification s'est produite, c'est qu'elle est probablement indésirable.</translation> -<translation id="6197128521826316819">Créer un code QR pour cette page</translation> +<translation id="6197128521826316819">Créer un QR code pour cette page</translation> <translation id="6198223452299275399">Balayer pour passer d'une page à l'autre</translation> <translation id="6198252989419008588">Modifier le code</translation> <translation id="61988015556954366">Clignotement de l'écran</translation> @@ -7380,7 +7375,7 @@ <translation id="6233154960150021497">Utiliser par défaut les commandes vocales plutôt que le clavier</translation> <translation id="6234108445915742946">Les conditions d'utilisation de Chrome vont changer le 31 mars</translation> <translation id="6234474535228214774">Installation en attente</translation> -<translation id="6235208551686043831">La caméra de l'appareil est activée. Veuillez placer le code QR de votre eSIM face à la caméra.</translation> +<translation id="6235208551686043831">La caméra de l'appareil est activée. Veuillez placer le QR code de votre eSIM face à la caméra.</translation> <translation id="6237297174664969437">Vous pouvez toujours choisir quelles données de navigateur seront synchronisées dans les paramètres de Chrome. Dans les <ph name="LINK_BEGIN" />paramètres des appareils<ph name="LINK_END" />, vous pouvez contrôler la synchronisation des applis Web installées à partir du navigateur Chrome. Google peut personnaliser la recherche et d'autres services en fonction de votre historique.</translation> <translation id="6237474966939441970">Application de prise de notes avec le stylet</translation> <translation id="6237481151388361546">Modifiez votre connexion Internet et sélectionnez "Réessayer", ou choisissez "Ouvrir dans l'éditeur de base" pour utiliser des options d'affichage et de modification limitées.</translation> @@ -8592,6 +8587,7 @@ <translation id="7113974454301513811">Ajoutez maintenant l'onglet actif à votre liste</translation> <translation id="7114054701490058191">Les mots de passe ne correspondent pas.</translation> <translation id="7114648273807173152">Pour utiliser Smart Lock pour vous connecter à votre compte Google, accédez à Paramètres > Appareils connectés > Votre téléphone > Smart Lock.</translation> +<translation id="7115051913071512405">Essayer</translation> <translation id="7115361495406486998">Aucun contact joignable</translation> <translation id="7115731767122970828">Améliorer maintenant</translation> <translation id="7116554090938189816">Le certificat SSL de l'imprimante a expiré. Redémarrez-la, puis réessayez.</translation> @@ -8708,7 +8704,7 @@ <translation id="7201420661433230412">Voir les fichiers</translation> <translation id="7201432510117121839">Impossible de caster le contenu audio de l'ordinateur de bureau sur cet appareil</translation> <translation id="7201535955609308429">Veuillez patienter pendant la validation</translation> -<translation id="7202337678781136582">Scanner le code QR avec votre téléphone Android</translation> +<translation id="7202337678781136582">Scanner le QR code avec votre téléphone Android</translation> <translation id="7203150201908454328">Développé</translation> <translation id="720715819012336933">{NUM_PAGES,plural, =1{Quitter la page}one{Quitter la page}other{Quitter les pages}}</translation> <translation id="7207457272187520234">Envoyer des données d'utilisation et de diagnostic. À l'heure actuelle, cet appareil envoie automatiquement à Google des données liées à son utilisation et à celle des applications, ainsi que des données de diagnostic. Ces informations nous aideront à améliorer, entre autres, la stabilité du système et des applications. Certaines données globales seront également utiles aux développeurs des applications Google et à nos partenaires tels que les développeurs Android. Ce paramètre est appliqué par le propriétaire. Si vous avez activé le paramètre "Activité additionnelle sur le Web et les applications", ces données peuvent être enregistrées dans votre compte Google.</translation> @@ -8929,7 +8925,7 @@ <translation id="7366316827772164604">Recherche d'appareils à proximité…</translation> <translation id="7366415735885268578">Ajouter un site</translation> <translation id="7366909168761621528">Données de navigation</translation> -<translation id="7367714965999718019">Générateur de code QR</translation> +<translation id="7367714965999718019">Générateur de QR code</translation> <translation id="7368695150573390554">Toutes les données hors ligne seront supprimées</translation> <translation id="736877393389250337">Impossible d'ouvrir <ph name="URL" /> dans <ph name="ALTERNATIVE_BROWSER_NAME" />. Veuillez contacter votre administrateur système.</translation> <translation id="7368927539449986686">Modifier une recherche sur un site</translation> @@ -9091,7 +9087,7 @@ <translation id="7476989672001283112">Autorisations bloquées automatiquement : <ph name="PERMISSION" /> (et <ph name="COUNT" /> de plus)</translation> <translation id="7477460499687558352">Sélectionnez un profil eSIM à télécharger</translation> <translation id="7477599578899108080">Utilisation élevée de la mémoire : <ph name="MEMORY_USAGE" /></translation> -<translation id="7477748600276493962">Créer un code QR pour cette page</translation> +<translation id="7477748600276493962">Créer un QR code pour cette page</translation> <translation id="7477793887173910789">Contrôlez votre musique, vos vidéos et bien plus</translation> <translation id="7478069565037869084">Large</translation> <translation id="7478485216301680444">Impossible d'installer l'application kiosque.</translation> @@ -9525,7 +9521,7 @@ <translation id="778480864305029524">Pour utiliser le partage de connexion instantané, activez les notifications pour les services Google Play.</translation> <translation id="7785471469930192436">Lisez les instructions du moteur de recherche pour supprimer l'historique de vos recherches, si besoin</translation> <translation id="77855763949601045">&Ouvrir le profil Invité</translation> -<translation id="7786663536153819505">Suivez les instructions affichées sur votre téléphone pour scanner le code QR. Vérifiez que le Bluetooth est activé sur votre téléphone. +<translation id="7786663536153819505">Suivez les instructions affichées sur votre téléphone pour scanner le QR code. Vérifiez que le Bluetooth est activé sur votre téléphone. <ph name="BR" /> <ph name="BR" /> Visible sur les appareils à proximité avec le nom "<ph name="QUICK_START_DEVICE_DISPLAY_NAME" />"…</translation> @@ -9811,7 +9807,7 @@ <translation id="7980066177668669492">Multiples certificats à encodage en base64 ASCII</translation> <translation id="7980084013673500153">ID d'élément : <ph name="ASSET_ID" /></translation> <translation id="7981410461060625406">Utiliser une clé d'accès enregistrée pour <ph name="APP_NAME" /></translation> -<translation id="7981662863948574132">Afficher le pop-up contenant le code QR et l'EID de l'appareil</translation> +<translation id="7981662863948574132">Afficher le pop-up contenant le QR code et l'EID de l'appareil</translation> <translation id="7981670705071137488">Les mises à jour logicielles seront effectuées en tâches de fond. Vous pouvez consulter vos préférences de mise à jour dans les paramètres.</translation> <translation id="7982083145464587921">Pour corriger cette erreur, veuillez redémarrer votre appareil.</translation> <translation id="7982578888426609524">Dernières modifications apportées à ce groupe</translation> @@ -10057,7 +10053,7 @@ <translation id="8149870652370242480">Pour utiliser vos mots de passe enregistrés sur votre téléphone, téléchargez Chrome pour iOS et connectez-vous à votre compte Google.</translation> <translation id="8150396590017071059">Modifier le code du Gestionnaire de mots de passe</translation> <translation id="8151057139207656239">Détails du build copiés</translation> -<translation id="815114315010033526">Utiliser un code QR à la place</translation> +<translation id="815114315010033526">Utiliser un QR code à la place</translation> <translation id="8151638057146502721">Configurer</translation> <translation id="8151748163667572916">Désactiver le point d'accès instantané</translation> <translation id="815347678407292813">Les applis et les sites Web pourraient toujours voir votre position via votre adresse IP</translation> @@ -10140,7 +10136,7 @@ <translation id="8210398899759134986">{MUTED_NOTIFICATIONS_COUNT,plural, =1{Nouvelle notification}one{# nouvelle notification}other{# nouvelles notifications}}</translation> <translation id="8212008074015601248">{NUM_DOWNLOAD,plural, =1{Téléchargement en cours}one{Téléchargement en cours}other{Téléchargements en cours}}</translation> <translation id="8212601853154459483">Ce profil est géré par <ph name="PROFILE_MANAGER" />. Vous devez créer un profil distinct pour le compte <ph name="USER_EMAIL_ADDRESS" />.</translation> -<translation id="8212792694174629011">Aucun profil n'a été trouvé. Essayez de scanner le code QR avec l'appareil photo de votre mobile ou saisissez le code d'activation fourni par votre opérateur.</translation> +<translation id="8212792694174629011">Aucun profil n'a été trouvé. Essayez de scanner le QR code avec l'appareil photo de votre mobile ou saisissez le code d'activation fourni par votre opérateur.</translation> <translation id="8214489666383623925">Ouvrir le fichier...</translation> <translation id="8215129063232901118">Accédez aux fonctionnalités de votre téléphone depuis votre <ph name="DEVICE_TYPE" /></translation> <translation id="8217212468862726597">Mettre le pointeur en surbrillance</translation> @@ -10836,7 +10832,7 @@ <translation id="8705331520020532516">Numéro de série</translation> <translation id="8705580154597116082">Wi-Fi disponible via le téléphone</translation> <translation id="8705629851992224300">Impossible de lire votre clé de sécurité</translation> -<translation id="8706111173576263877">Code QR scanné.</translation> +<translation id="8706111173576263877">QR code scanné.</translation> <translation id="8707318721234217615">Espacement des lettres</translation> <translation id="8707562594602678416">Lieux</translation> <translation id="8708000541097332489">Supprimer les données à la fin de la session</translation> @@ -10875,7 +10871,7 @@ <translation id="8727751378406387165">Envoyer des <ph name="BEGIN_LINK1" />métadonnées de saisie automatique<ph name="END_LINK1" /> <ph name="LINE_BREAK" /> (vos données de saisie automatique ne seront pas partagées)</translation> -<translation id="8729133765463465108">Scanner le code QR avec l'appareil photo</translation> +<translation id="8729133765463465108">Scanner le QR code avec l'appareil photo</translation> <translation id="8730621377337864115">OK</translation> <translation id="8731029916209785242">Autorisations (<ph name="FORMATTED_ORIGIN" />)</translation> <translation id="8731268612289859741">Code de sécurité</translation> @@ -11117,7 +11113,7 @@ <translation id="8894761918470382415">Protection de l'accès aux données pour les périphériques</translation> <translation id="8895454554629927345">Liste des favoris</translation> <translation id="8896830132794747524">Bouger la souris plus rapidement déplacera le curseur plus loin</translation> -<translation id="8897537894864195436">Scannez ce code QR avec l'appareil photo de l'appareil qui dispose de votre clé d'accès pour <ph name="APP_NAME" /></translation> +<translation id="8897537894864195436">Scannez ce QR code avec l'appareil photo de l'appareil qui dispose de votre clé d'accès pour <ph name="APP_NAME" /></translation> <translation id="8898786835233784856">Sélectionner l'onglet suivant</translation> <translation id="8898790559170352647">Ajouter votre compte Microsoft</translation> <translation id="8898822736010347272">Les URL de certaines pages que vous consultez, ainsi que des informations système limitées et une partie du contenu de certaines pages sont envoyées à Google, à la fois pour identifier les nouvelles menaces et pour protéger tous les utilisateurs sur le Web.</translation> @@ -11304,7 +11300,7 @@ <translation id="9022847679183471841">Ce compte est déjà utilisé sur cet ordinateur par <ph name="AVATAR_NAME" />.</translation> <translation id="9022871169049522985">Les sites et les annonceurs peuvent mesurer les performances de leurs annonces</translation> <translation id="9023015617655685412">Ajouter cet onglet aux favoris…</translation> -<translation id="902319268551617004">Scannez le code QR avec l'appareil photo de votre appareil ou saisissez le code d'activation fourni par votre opérateur.</translation> +<translation id="902319268551617004">Scannez le QR code avec l'appareil photo de votre appareil ou saisissez le code d'activation fourni par votre opérateur.</translation> <translation id="9023723490232936872">Chichén Itzá</translation> <translation id="9023909777842748145">Sachez que la désactivation de cette fonctionnalité n'empêche pas votre appareil d'envoyer les informations nécessaires pour bénéficier de services essentiels tels que les mises à jour du système et la sécurité.</translation> <translation id="9024127637873500333">&Ouvrir dans un nouvel onglet</translation> @@ -11514,9 +11510,9 @@ <ph name="LIST_ITEM" />Reconnectez-vous au réseau Wi-Fi. <ph name="LIST_ITEM" />Exécutez Chrome Connectivity Diagnostics. <ph name="END_LIST" /></translation> -<translation id="9165856803582999927">Scannez ce code QR avec l'appareil photo de l'appareil sur lequel vous voulez créer et enregistrer votre clé d'accès pour <ph name="APP_NAME" /></translation> +<translation id="9165856803582999927">Scannez ce QR code avec l'appareil photo de l'appareil sur lequel vous voulez créer et enregistrer votre clé d'accès pour <ph name="APP_NAME" /></translation> <translation id="916607977885256133">Picture-in-picture</translation> -<translation id="9166253503936244008">Scannez ce code QR avec l'appareil qui a la clé d'accès que vous voulez utiliser pour <ph name="APP_NAME" /></translation> +<translation id="9166253503936244008">Scannez ce QR code avec l'appareil qui a la clé d'accès que vous voulez utiliser pour <ph name="APP_NAME" /></translation> <translation id="9167063903968449027">Afficher la liste de lecture</translation> <translation id="9167450455589251456">Profil non accepté</translation> <translation id="9167813284871066981"><ph name="NUM_ACCOUNTS" /> comptes</translation>
diff --git a/chrome/app/resources/generated_resources_gl.xtb b/chrome/app/resources/generated_resources_gl.xtb index ec10c47..1dd2667 100644 --- a/chrome/app/resources/generated_resources_gl.xtb +++ b/chrome/app/resources/generated_resources_gl.xtb
@@ -666,7 +666,6 @@ <translation id="1464258312790801189">As túas contas</translation> <translation id="1464597059227482327">Se vas compartir contido cun Chromebook que non se atope entre os teus contactos, asegúrate de que teña activada a opción de visibilidade de Nearby. Para activala, selecciona a esquina inferior dereita e busca a opción Visibilidade. <ph name="LINK_BEGIN" />Máis información<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Para ver as preferencias do dispositivo, vai a Configuración.</translation> -<translation id="146481294006497945">Ningún contrasinal gardado</translation> <translation id="1465176863081977902">C&opiar enderezo do audio</translation> <translation id="146522654774760805">Contrasinais e autocompletado</translation> <translation id="1465827627707997754">Porción de pizza</translation> @@ -2164,7 +2163,6 @@ <translation id="2485394160472549611">Recomendacións personalizadas</translation> <translation id="2485422356828889247">Desinstalar</translation> <translation id="2485681265915754872">Condicións de servizo de Google Play</translation> -<translation id="2486036712620651117">Contrasinais e claves de acceso</translation> <translation id="248676429071089168">Pasa o dedo cara arriba para mover a páxina cara abaixo</translation> <translation id="2487067538648443797">Engadir un marcador novo</translation> <translation id="2489686758589235262">Asignar accións a 2 interruptores máis</translation> @@ -3890,7 +3888,6 @@ <translation id="3721178866505920080">Máis información sobre a activación da precarga ampliada</translation> <translation id="3722108462506185496">Non se puido iniciar o servizo da máquina virtual. Téntao de novo.</translation> <translation id="3722624153992426516">Recibiuse a instrución <ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /></translation> -<translation id="3724897774652282549">Completar formulario</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Redes wifi dispoñibles</translation> @@ -4323,7 +4320,6 @@ <translation id="3993887353483242788">Sincroniza o dispositivo (<ph name="DEVICE_TYPE" />) para que as túas preferencias estean dispoñibles en calquera dispositivo cando inicies sesión coa túa Conta de Google. Nas preferencias inclúense, entre outros elementos, as aplicacións, as opcións de configuración, os contrasinais de redes wifi, os idiomas, o fondo de pantalla e os atallos de teclado.</translation> <translation id="3994318741694670028">O ordenador está configurado cun ID de hardware incorrecto, polo que Chrome OS Flex non pode actualizarse coas correccións de seguranza máis recentes e <ph name="BEGIN_BOLD" />é posible que o teu ordenador quede exposto a ataques maliciosos<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Desbloquea o teléfono e achégao ao <ph name="DEVICE_TYPE" /> para desbloquealo.</translation> -<translation id="3994522032746736727">Iniciar sesión como <ph name="EMAIL" /></translation> <translation id="3994530503403062649">Localiza os botóns da tableta</translation> <translation id="3994708120330953242">Algúns dos teus contrasinais atopáronse nunha violación da seguranza dos datos. Para protexer as túas contas, deberías cambiar estes contrasinais agora.</translation> <translation id="3994878504415702912">&Zoom</translation> @@ -6592,7 +6588,6 @@ <translation id="5646994841348250879">Escolle unha conta para iniciar sesión en <ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">Conector do micrófono</translation> <translation id="5648166631817621825">Últimos 7 días</translation> -<translation id="5650537073531199882">Completar formulario</translation> <translation id="5651308944918885595">Detectabilidade de Compartir por Nearby</translation> <translation id="5653154844073528838">Tes <ph name="PRINTER_COUNT" /> impresoras gardadas.</translation> <translation id="5654669866168491665">Máis información sobre os sitios que pode que non funcionen ao bloquear as cookies de terceiros</translation> @@ -8590,6 +8585,7 @@ <translation id="7113974454301513811">Agora engade a pestana actual á lista</translation> <translation id="7114054701490058191">Os contrasinais non coinciden</translation> <translation id="7114648273807173152">Se queres usar Smart Lock para iniciar sesión na túa Conta de Google, vai a Configuración > Dispositivos conectados > O teu teléfono > Smart Lock.</translation> +<translation id="7115051913071512405">Próbao</translation> <translation id="7115361495406486998">Non hai ningún contacto co que se poida establecer conexión</translation> <translation id="7115731767122970828">Mellorar agora</translation> <translation id="7116554090938189816">O certificado SSL da impresora caducou. Reinicia a impresora e téntao de novo.</translation>
diff --git a/chrome/app/resources/generated_resources_gu.xtb b/chrome/app/resources/generated_resources_gu.xtb index d027b71..bfda041b 100644 --- a/chrome/app/resources/generated_resources_gu.xtb +++ b/chrome/app/resources/generated_resources_gu.xtb
@@ -667,7 +667,6 @@ <translation id="1464258312790801189">તમારા એકાઉન્ટ્સ</translation> <translation id="1464597059227482327">જો તમે તમારા સંપર્કોમાં ન હોય એવા Chromebook સાથે શેર કરી રહ્યાં હો, તો ખાતરી કરો કે Chromebookમાં "નજીકની દૃશ્યતા" સુવિધા ચાલુ કરી હોય. "નજીકની દૃશ્યતા" સુવિધા ચાલુ કરવા માટે, સૌથી નીચે જમણો ખૂણો પસંદ કરો અને પછી "નજીકની દૃશ્યતા" સુવિધા ચાલુ કરવાનો વિકલ્પ પસંદ કરો. <ph name="LINK_BEGIN" />વધુ જાણો<ph name="LINK_END" /></translation> <translation id="1464781208867302907">ડિવાઇસની પસંદગીઓ માટે, સેટિંગ પર જાઓ.</translation> -<translation id="146481294006497945">કોઈ સાચવેલો પાસવર્ડ નથી</translation> <translation id="1465176863081977902">ઑડિઓ સરનામું કૉ&પિ કરો</translation> <translation id="146522654774760805">પાસવર્ડ અને ઑટોમૅટિક ભરવાની સુવિધા</translation> <translation id="1465827627707997754">પીઝા સ્લાઇસ</translation> @@ -2163,7 +2162,6 @@ <translation id="2485394160472549611">ખાસ તમારા માટે શ્રેષ્ઠ પસંદગીઓ</translation> <translation id="2485422356828889247">અનઇન્સ્ટૉલ કરો</translation> <translation id="2485681265915754872">Google Playની સેવાની શરતો</translation> -<translation id="2486036712620651117">પાસવર્ડ અને પાસકી</translation> <translation id="248676429071089168">પેજને નીચે લઈ જવા માટે ઉપર સ્વાઇપ કરો</translation> <translation id="2487067538648443797">નવું બુકમાર્ક ઉમેરો</translation> <translation id="2489686758589235262">વધુ 2 સ્વિચની સોંપણી કરો</translation> @@ -3886,7 +3884,6 @@ <translation id="3721178866505920080">પહેલેથી લોડ કરવાનો વિસ્તૃત મોડ ચાલુ કરવા વિશે વધુ માહિતી</translation> <translation id="3722108462506185496">વર્ચ્યુઅલ મશીન સેવા શરૂ કરતી વખતે ભૂલ આવી. કૃપા કરીને ફરી પ્રયાસ કરો.</translation> <translation id="3722624153992426516"><ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /> સૂચના મેળવી</translation> -<translation id="3724897774652282549">ફોર્મ ભરો</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">ઉપલબ્ધ વાઇ-ફાઇ નેટવર્ક</translation> @@ -4319,7 +4316,6 @@ <translation id="3993887353483242788">તમારા <ph name="DEVICE_TYPE" />ને સિંક કરો, જેથી જ્યારે તમે તમારા Google એકાઉન્ટ વડે સાઇન ઇન કરો, ત્યારે કોઈપણ ડિવાઇસ પર તમારી પસંદગીઓ તૈયાર થઈ જશે. પસંદગીઓમાં ઍપ, સેટિંગ, વાઇ-ફાઇના પાસવર્ડ, ભાષાઓ, વૉલપેપર અને કીબોર્ડના શૉર્ટકટ જેવી અન્ય ઘણી બાબતો શામેલ છે.</translation> <translation id="3994318741694670028">કમનસીબે, તમારું કમ્પ્યુટર દૂષિત હાર્ડવેર ID સાથે કન્ફિગર કરવામાં આવ્યું છે. આ ChromeOS Flexને નવીનતમ સુરક્ષા સુધારાની સાથે અપડેટ થતું અટકાવે છે અને તમારું કમ્પ્યુટર <ph name="BEGIN_BOLD" />દુર્ભાવનાપૂર્ણ હુમલાઓ પ્રત્યે સંવેદનશીલ હોઈ શકે છે<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">તમારો ફોન અનલૉક કરો અને તમારા <ph name="DEVICE_TYPE" />ને અનલૉક કરવા માટે તેને વધુ નજીક લાવો.</translation> -<translation id="3994522032746736727"><ph name="EMAIL" /> તરીકે સાઇન ઇન કરો</translation> <translation id="3994530503403062649">તમારા ટૅબ્લેટ પર બટન શોધો</translation> <translation id="3994708120330953242">તમારા કેટલાક પાસવર્ડ ડેટા ઉલ્લંઘનમાં હોવાનું જણાયું છે. તમારા એકાઉન્ટને સુરક્ષિત કરવા માટે, તમારે હમણાં જ આ પાસવર્ડ બદલવા જોઈએ.</translation> <translation id="3994878504415702912">&ઝૂમ કરો</translation> @@ -4610,6 +4606,7 @@ <translation id="4220648711404560261">સક્રિયકરણ દરમ્યાન એક ભૂલ આવી.</translation> <translation id="4222917615373664617">કિંમત ટ્રૅક કરવાની સુવિધા ચાલુ છે. કિંમત <ph name="CURRENT_PRICE" /> છે.</translation> <translation id="4223404254440398437">માઇક્રોફોનની મંજૂરી નથી</translation> +<translation id="4224541845943007092">ઍડ્રેસ બારમાંથી કીબોર્ડ ઇનપુટ વાંચો અને સાચવો</translation> <translation id="4225397296022057997">બધી સાઇટ પર</translation> <translation id="4228071595943929139">તમારી સંસ્થાના ઇમેઇલ ઍડ્રેસનો ઉપયોગ કરો</translation> <translation id="4228209296591583948">{NUM_EXTENSIONS,plural, =1{આ એક્સ્ટેન્શન મંજૂરી ધરાવતું નથી}one{આ એક્સ્ટેન્શન મંજૂરી ધરાવતું નથી}other{કેટલાક એક્સ્ટેન્શન મંજૂરી ધરાવતા નથી}}</translation> @@ -6591,7 +6588,6 @@ <translation id="5646994841348250879"><ph name="SITE_ETLD_PLUS_ONE" />માં સાઇન ઇન કરવા માટે કોઈ એકાઉન્ટ પસંદ કરો</translation> <translation id="5648021990716966815">માઇક જેક</translation> <translation id="5648166631817621825">છેલ્લા 7 દિવસ</translation> -<translation id="5650537073531199882">ફોર્મ ભરો</translation> <translation id="5651308944918885595">'નજીકના શેર'ની શોધક્ષમતા</translation> <translation id="5653154844073528838">તમારી પાસે <ph name="PRINTER_COUNT" /> સાચવેલા પ્રિન્ટર છે.</translation> <translation id="5654669866168491665">ત્રીજા પક્ષની કુકીને બ્લૉક કરવામાં આવે ત્યારે કામ કરતી ન હોઈ શકે એવી સાઇટ વિશે વધુ જાણો</translation> @@ -8594,6 +8590,7 @@ <translation id="7113974454301513811">હવે તમારા હાલના ટૅબને તમારી સૂચિમાં ઉમેરો</translation> <translation id="7114054701490058191">પાસવર્ડ્સ મેળ ખાતા નથી</translation> <translation id="7114648273807173152">તમારા Google એકાઉન્ટમાં સાઇન ઇન કરવા માટે SmartLockનો ઉપયોગ કરવા, સેટિંગ > કનેક્ટ કરેલાં ડિવાઇસ > તમારો ફોન > SmartLock પર જાઓ.</translation> +<translation id="7115051913071512405">તેને અજમાવી જુઓ</translation> <translation id="7115361495406486998">જેના સુધી પહોંચી શકાય તેવો કોઈ સંપર્ક નથી</translation> <translation id="7115731767122970828">અત્યારે બૂસ્ટ કરો</translation> <translation id="7116554090938189816">પ્રિન્ટરના SSL સર્ટિફિકેટની સમયસીમા સમાપ્ત થઈ ગઈ છે. પ્રિન્ટર ફરી શરૂ કરો અને ફરી પ્રયાસ કરો.</translation> @@ -8625,6 +8622,7 @@ <translation id="7134951043985383439">જોખમી ફાઇલ ડાઉનલોડ કરી</translation> <translation id="7135729336746831607">બ્લૂટૂથ ચાલુ કરીએ?</translation> <translation id="7136694880210472378">ડિફૉલ્ટ બનાવો</translation> +<translation id="7137277889990479760"><ph name="EMAIL" /> તરીકે આગળ વધો</translation> <translation id="7137771508221868414">આમ કરવાથી સાઇટ અને ઇન્સ્ટૉલ કરવામાં આવેલી ઍપ દ્વારા સ્ટોર કરવામાં આવેલો <ph name="TOTAL_USAGE" /> ડેટા ડિલીટ કરવામાં આવશે</translation> <translation id="7138678301420049075">અન્ય</translation> <translation id="7139627972753429585"><ph name="APP_NAME" /> તમારા માઇક્રોફોનનો ઉપયોગ કરી રહી છે</translation> @@ -9203,6 +9201,7 @@ <translation id="7561196759112975576">હંમેશાં</translation> <translation id="7561759921596375678">વૉલ્યૂમ ચાલુ કરો</translation> <translation id="7561982940498449837">મેનૂ બંધ કરો</translation> +<translation id="7563970324931922582">[પ્લેસહોલ્ડરની ટેક્સ્ટ]</translation> <translation id="756445078718366910">બ્રાઉઝર વિંડો ખોલો</translation> <translation id="7564847347806291057">પ્રક્રિયાનો અંત કરો</translation> <translation id="756503097602602175">તમે <ph name="LINK_BEGIN" />સેટિંગ<ph name="LINK_END" />માં જઈને સાઇન ઇન કરેલા હોય એવા Google એકાઉન્ટ મેનેજ કરી શકો છો. તમે વેબસાઇટ અને ઍપને આપેલી પરવાનગીઓ કદાચ બધા એકાઉન્ટ પર લાગુ થઈ શકે છે. જો તમે ઇચ્છતા ન હો કે સાઇટ અથવા ઍપ તમારા એકાઉન્ટની માહિતી ઍક્સેસ કરે, તો તમે તમારા <ph name="DEVICE_TYPE" />માં અતિથિ તરીકે સાઇન ઇન કરી શકો છો અથવા <ph name="LINK_2_BEGIN" />છૂપી વિન્ડો<ph name="LINK_2_END" />માં વેબ બ્રાઉઝ કરી શકો છો.</translation> @@ -10889,6 +10888,7 @@ <translation id="8737966899544698733">લોકેશનની સચોટતા (માત્ર Android)</translation> <translation id="8738418093147087440">દેશ, ભાષા કે ઇનપુટના નામ મુજબ શોધો</translation> <translation id="8740086188450289493">Google એકાઉન્ટના પાસવર્ડનો ઉપયોગ કરો</translation> +<translation id="874023689350909633">તેને અજમાવી જુઓ</translation> <translation id="8740247629089392745">તમે આ Chromebook <ph name="SUPERVISED_USER_NAME" />ને સોંપી શકો છો. સેટઅપ કરવાનું લગભગ પૂર્ણ થઈ ગયું છે અને હવે આ શોધખોળ કરવાનો સમય છે.</translation> <translation id="8740672167979365981">ChromeOS Flex અપડેટ કરવાની જરૂર છે</translation> <translation id="8741944563400125534">સ્વિચ ઍક્સેસનું સેટઅપ કરવા માટે ગાઇડ</translation>
diff --git a/chrome/app/resources/generated_resources_hi.xtb b/chrome/app/resources/generated_resources_hi.xtb index afe5a60..c315dc9a 100644 --- a/chrome/app/resources/generated_resources_hi.xtb +++ b/chrome/app/resources/generated_resources_hi.xtb
@@ -668,7 +668,6 @@ <translation id="1464258312790801189">आपके खाते</translation> <translation id="1464597059227482327">अगर किसी ऐसे Chromebook के साथ फ़ाइलें शेयर की जा रही हैं जो आपके संपर्क में नहीं है, तो पक्का करें कि Chromebook में “आस-पास दिखे” सुविधा चालू हो. “आस-पास दिखे” सुविधा चालू करने के लिए, स्क्रीन पर सबसे नीचे दाएं कोने को चुनें. इसके बाद, “आस-पास दिखे” सुविधा को चालू करें. <ph name="LINK_BEGIN" />ज़्यादा जानें<ph name="LINK_END" /></translation> <translation id="1464781208867302907">डिवाइस की प्राथमिकताओं के लिए, सेटिंग पेज पर जाएं.</translation> -<translation id="146481294006497945">कोई भी पासवर्ड सेव नहीं किया गया है</translation> <translation id="1465176863081977902">ऑडियो के पते को कॉ&पी करें</translation> <translation id="146522654774760805">पासवर्ड और ऑटोमैटिक भरने की सुविधा</translation> <translation id="1465827627707997754">पिज़्ज़ा का टुकड़ा</translation> @@ -2179,7 +2178,6 @@ <translation id="2485394160472549611">आपके लिए चुने गए सबसे अच्छे विकल्प</translation> <translation id="2485422356828889247">विस्थापित करें</translation> <translation id="2485681265915754872">Google Play की सेवा की शर्तें</translation> -<translation id="2486036712620651117">पासवर्ड और पासकी</translation> <translation id="248676429071089168">पेज को नीचे ले जाने के लिए, ऊपर की ओर स्वाइप करें</translation> <translation id="2487067538648443797">नया बुकमार्क जोड़ें</translation> <translation id="2489686758589235262">दो स्विच और असाइन करें</translation> @@ -3902,7 +3900,6 @@ <translation id="3721178866505920080">पहले से लोड करने की एक्सटेंडेड सुविधा को चालू करने के बारे में ज़्यादा जानकारी</translation> <translation id="3722108462506185496">वर्चुअल मशीन सेवा शुरू करने में गड़बड़ी हुई. कृपया फिर से कोशिश करें.</translation> <translation id="3722624153992426516"><ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /> निर्देश मिला</translation> -<translation id="3724897774652282549">फ़ॉर्म भरें</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">उपलब्ध वाई-फ़ाई नेटवर्क</translation> @@ -4334,7 +4331,6 @@ <translation id="3993887353483242788">अपने <ph name="DEVICE_TYPE" /> को सिंक करें, ताकि जब आप अपने Google खाते से किसी दूसरे डिवाइस पर साइन इन करें, तब आपकी सेव की गई सेटिंग उस डिवाइस पर, इस्तेमाल के लिए पहले से तैयार हों. आपकी सेव की गई सेटिंग में ऐप्लिकेशन, सेटिंग, वाई-फ़ाई पासवर्ड, भाषा, वॉलपेपर, कीबोर्ड शॉर्टकट, और बहुत कुछ शामिल होता है.</translation> <translation id="3994318741694670028">माफ़ करें, आपका कंप्यूटर किसी गलत हार्डवेयर आईडी से कॉन्फ़िगर किया गया है. इस वजह से ChromeOS Flex में नए सुरक्षा सुधार अपडेट नहीं हो पा रहे हैं. इसके अलावा, आपके कंप्यूटर को <ph name="BEGIN_BOLD" />नुकसान पहुंचाने वाले हमलों का जोखिम हो सकता है<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">अपना फ़ोन अनलॉक करें और उसे पास लाकर अपने <ph name="DEVICE_TYPE" /> को अनलॉक करें.</translation> -<translation id="3994522032746736727"><ph name="EMAIL" /> के तौर पर साइन इन करें</translation> <translation id="3994530503403062649">अपने टैबलेट पर मौजूद बटन पर क्लिक करें</translation> <translation id="3994708120330953242">आपके कुछ पासवर्ड, डेटा के गलत इस्तेमाल की वजह से लीक हो चुके हैं. अपने खातों को सुरक्षित रखने के लिए, इन पासवर्ड को अभी बदलें.</translation> <translation id="3994878504415702912">&ज़ूम</translation> @@ -6603,7 +6599,6 @@ <translation id="5646994841348250879"><ph name="SITE_ETLD_PLUS_ONE" /> में साइन इन करने के लिए कोई खाता चुनें</translation> <translation id="5648021990716966815">माइक जैक</translation> <translation id="5648166631817621825">पिछले 7 दिन</translation> -<translation id="5650537073531199882">फ़ॉर्म भरें</translation> <translation id="5651308944918885595">आस-पास शेयर करने की सुविधा और 'खोजने लायक बनाना' सेटिंग</translation> <translation id="5653154844073528838">आपके पास <ph name="PRINTER_COUNT" /> सेव किए गए प्रिंटर हैं.</translation> <translation id="5654669866168491665">उन साइटों के बारे में ज़्यादा जानें जो तीसरे पक्ष की कुकी ब्लॉक करने पर शायद काम न करें</translation> @@ -8605,6 +8600,7 @@ <translation id="7113974454301513811">अब मौजूदा टैब को अपनी सूची में जोड़ें</translation> <translation id="7114054701490058191">पासवर्ड मेल नहीं खाते</translation> <translation id="7114648273807173152">Smart Lock का इस्तेमाल करके अपने Google खाते में साइन इन करने के लिए, सेटिंग > कनेक्ट किए हुए डिवाइस > आपका फ़ोन > Smart Lock पर जाएं.</translation> +<translation id="7115051913071512405">इसे आज़माएं</translation> <translation id="7115361495406486998">Google खाते वाला कोई भी संपर्क नहीं है</translation> <translation id="7115731767122970828">अभी बूस्ट करें</translation> <translation id="7116554090938189816">प्रिंटर के एसएसएल सर्टिफ़िकेट की समयसीमा खत्म हो गई है. प्रिंटर को रीस्टार्ट करें और फिर से कोशिश करें.</translation> @@ -8636,6 +8632,7 @@ <translation id="7134951043985383439">खतरनाक फ़ाइल डाउनलोड की गई</translation> <translation id="7135729336746831607">क्या आप ब्लूटूथ चालू करना चाहते हैं?</translation> <translation id="7136694880210472378">डिफ़ॉल्ट बनाएं</translation> +<translation id="7137277889990479760"><ph name="EMAIL" /> के तौर पर जारी रखें</translation> <translation id="7137771508221868414">साइटों और इंस्टॉल किए गए ऐप्लिकेशन के सेव किए गए कुल डेटा में से <ph name="TOTAL_USAGE" /> डेटा मिट जाएगा</translation> <translation id="7138678301420049075">अन्य</translation> <translation id="7139627972753429585"><ph name="APP_NAME" /> आपके माइक्रोफ़ोन का इस्तेमाल कर रहा है</translation> @@ -9213,6 +9210,7 @@ <translation id="7561196759112975576">हमेशा</translation> <translation id="7561759921596375678">आवाज़ चालू करें</translation> <translation id="7561982940498449837">मेन्यू बंद करें</translation> +<translation id="7563970324931922582">[placeholder text]</translation> <translation id="756445078718366910">ब्राउज़र विंडो खोलें</translation> <translation id="7564847347806291057">प्रक्रिया खत्म करें</translation> <translation id="756503097602602175">आप <ph name="LINK_BEGIN" />सेटिंग<ph name="LINK_END" /> में जाकर, साइन-इन किए गए Google खाते मैनेज कर सकते हैं. आपने वेबसाइटों और ऐप्लिकेशन को जो अनुमतियां दी हैं वे सभी खातों पर लागू हो सकती हैं. अगर आप नहीं चाहते कि साइटें या ऐप्लिकेशन आपके खाते की जानकारी को ऐक्सेस करें, तो आप अपने <ph name="DEVICE_TYPE" /> में मेहमान के तौर पर साइन इन कर सकते हैं. इसके अलावा, आप वेब को <ph name="LINK_2_BEGIN" />गुप्त विंडो<ph name="LINK_2_END" /> में भी ब्राउज़ कर सकते हैं.</translation> @@ -10904,6 +10902,7 @@ <translation id="8737966899544698733">जगह की सटीक जानकारी (सिर्फ़ Android पर)</translation> <translation id="8738418093147087440">देश या भाषा के हिसाब से खोजें या नाम डालें</translation> <translation id="8740086188450289493">Google खाते के पासवर्ड का इस्तेमाल करें</translation> +<translation id="874023689350909633">इसे आज़माएं</translation> <translation id="8740247629089392745">आप यह Chromebook <ph name="SUPERVISED_USER_NAME" /> को इस्तेमाल करने के लिए दे सकते हैं. सेट अप करीब-करीब पूरा हो गया है, अब इसका कॉन्टेंट देखा जा सकता है.</translation> <translation id="8740672167979365981">ChromeOS Flex को अपडेट करना ज़रूरी है</translation> <translation id="8741944563400125534">स्विच ऐक्सेस की सुविधा सेट अप करने के लिए गाइड</translation>
diff --git a/chrome/app/resources/generated_resources_hr.xtb b/chrome/app/resources/generated_resources_hr.xtb index 65173820..dc397fc 100644 --- a/chrome/app/resources/generated_resources_hr.xtb +++ b/chrome/app/resources/generated_resources_hr.xtb
@@ -541,6 +541,7 @@ <translation id="1368603372088757436">Linux nije podržan na vašem uređaju <ph name="DEVICE_TYPE" />. <ph name="LINK_BEGIN" />Saznajte više<ph name="LINK_END" /></translation> <translation id="1370249617397887619">Da biste ih upotrebljavali na svojim drugim uređajima, spremite ih na svoj Google račun, .</translation> <translation id="1370384480654163477">Pregledajte i uredite datoteke od posljednjeg posjeta ovoj web-lokaciji:</translation> +<translation id="1372259917802609049">Došlo je do pogreške pri brisanju ograničenja</translation> <translation id="1372841398847029212">Sinkroniziraj sa svojim računom</translation> <translation id="1373176046406139583">Pomoću vidljivosti uređaja određuje se tko s vama može dijeliti kad vam je zaslon otključan. <ph name="LINK_BEGIN" />Saznajte više<ph name="LINK_END" /></translation> <translation id="1374844444528092021">Certifikat koji zahtijeva mreža "<ph name="NETWORK_NAME" />" nije instaliran ili više ne vrijedi. Preuzmite novi certifikat i pokušajte se povezati ponovo.</translation> @@ -668,7 +669,6 @@ <translation id="1464258312790801189">Vaši računi</translation> <translation id="1464597059227482327">Ako dijelite s Chromebookom koji nije u vašim kontaktima, provjerite je li na njemu uključena vidljivost uređaja. Da biste uključili vidljivost uređaja, odaberite donji desni kut i zatim uključite vidljivost uređaja. <ph name="LINK_BEGIN" />Saznajte više<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Za postavke uređaja otvorite Postavke.</translation> -<translation id="146481294006497945">Nema nijedne spremljene zaporke</translation> <translation id="1465176863081977902">K&opiraj adresu audiozapisa</translation> <translation id="146522654774760805">Zaporke i automatsko popunjavanje</translation> <translation id="1465827627707997754">Komad pizze</translation> @@ -1482,6 +1482,7 @@ To ne utječe na aplikacije i sadržaj na ostalim uređajima.</translation> <translation id="2018189721942291407">Niste sigurni biste li se trebali prijaviti?</translation> <translation id="2018352199541442911">Žao nam je, vanjski uređaj za pohranu trenutačno nije podržan.</translation> +<translation id="2019213483156307334">Došlo je do pogreške pri dodavanju ograničenja</translation> <translation id="2019718679933488176">&Otvori zvučni zapis na novoj kartici</translation> <translation id="2020183425253392403">Prikaži postavke mrežne adrese</translation> <translation id="2020225359413970060">Skeniraj datoteku</translation> @@ -2168,7 +2169,6 @@ <translation id="2485394160472549611">Najbolji odabiri za vas</translation> <translation id="2485422356828889247">Deinstaliraj</translation> <translation id="2485681265915754872">Uvjeti pružanja usluge za Google Play</translation> -<translation id="2486036712620651117">Zaporke i pristupni ključevi</translation> <translation id="248676429071089168">Prijeđite prstom prema gore za pomicanje stranice prema dolje</translation> <translation id="2487067538648443797">Dodajte novu oznaku</translation> <translation id="2489686758589235262">Dodijeli još dva prekidača</translation> @@ -3146,6 +3146,7 @@ <translation id="3188257591659621405">Moje datoteke</translation> <translation id="3188465121994729530">Klizni prosjek</translation> <translation id="3189187154924005138">Veliki pokazivač</translation> +<translation id="3189533916970342007">{PASSWORD_COUNT,plural, =1{Jedna zaporka i druge stavke spremaju se samo na ovaj uređaj. Da biste ih upotrebljavali na svojim drugim uređajima, spremite ih na svoj Google račun.}one{{PASSWORD_COUNT} zaporka i druge stavke spremaju se samo na ovaj uređaj. Da biste ih upotrebljavali na svojim drugim uređajima, spremite ih na svoj Google račun.}few{{PASSWORD_COUNT} zaporke i druge stavke spremaju se samo na ovaj uređaj. Da biste ih upotrebljavali na svojim drugim uređajima, spremite ih na svoj Google račun.}other{{PASSWORD_COUNT} zaporki i druge stavke spremaju se samo na ovaj uređaj. Da biste ih upotrebljavali na svojim drugim uređajima, spremite ih na svoj Google račun.}}</translation> <translation id="3190558889382726167">Zaporka spremljena</translation> <translation id="3192586965067888278">Detaljno opišite poteškoću. Povratne informacije šalju se Googleu na pregled koji provode ljudi, a mogu se upotrijebiti za poboljšanje ili razvoj Googleovih proizvoda i usluga.</translation> <translation id="3192947282887913208">Audio datoteke</translation> @@ -3616,6 +3617,7 @@ <translation id="3537881477201137177">To se može izmijeniti kasnije u postavkama</translation> <translation id="3538066758857505094">Došlo je do pogreške prilikom deinstaliranja Linuxa. Pokušajte ponovo.</translation> <translation id="3539537154248488260">Uključite ili isključite inspiraciju</translation> +<translation id="3539791442352537591">Došlo je do pogreške prilikom spremanja promjene stanja pouzdanosti</translation> <translation id="3540173484406326944">Nema mreže do <ph name="HOST_DEVICE_NAME" /></translation> <translation id="354060433403403521">Punjač</translation> <translation id="354068948465830244">Može čitati i mijenjati podatke web-lokacije</translation> @@ -3890,7 +3892,6 @@ <translation id="3721178866505920080">Više informacija o uključivanju proširenog predučitavanja</translation> <translation id="3722108462506185496">Došlo je do pogreške prilikom pokretanja usluge virtualnog računala. Pokušajte ponovo.</translation> <translation id="3722624153992426516">Primljena je uputa <ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /></translation> -<translation id="3724897774652282549">Ispunjavanje obrasca</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Dostupne Wi-Fi mreže</translation> @@ -4323,7 +4324,6 @@ <translation id="3993887353483242788">Sinkronizirajte uređaj <ph name="DEVICE_TYPE" /> kako bi vaše preferencije bile spremne na svim uređajima kad se prijavite Google računom. Preferencije uključuju aplikacije, postavke, zaporke Wi-Fi mreže, jezike, pozadinu, tipkovne prečace i više.</translation> <translation id="3994318741694670028">Nažalost, vaše je računalo konfigurirano pogrešno oblikovanim ID-jem hardvera. To sprječava ažuriranje ChromeOS Flexa najnovijim sigurnosnim popravcima pa bi vaše računalo <ph name="BEGIN_BOLD" />moglo biti ranjivo na zlonamjerne napade<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Otključajte telefon i približite ga da biste otključali svoj <ph name="DEVICE_TYPE" />.</translation> -<translation id="3994522032746736727">Prijavite se kao <ph name="EMAIL" /></translation> <translation id="3994530503403062649">Pronađite gumbe na tabletu</translation> <translation id="3994708120330953242">Neke od vaših zaporki otkrivene su u neovlaštenom pristupu podacima. Da biste zaštitili svoje račune, odmah promijenite te zaporke.</translation> <translation id="3994878504415702912">&Zum</translation> @@ -4614,6 +4614,7 @@ <translation id="4220648711404560261">Došlo je do pogreške prilikom aktivacije.</translation> <translation id="4222917615373664617">Praćenje cijene je omogućeno. Cijena je <ph name="CURRENT_PRICE" />.</translation> <translation id="4223404254440398437">Mikrofon nije dopušten</translation> +<translation id="4224541845943007092">Čitanje i spremanje unosa pomoću tipkovnice iz adresne trake</translation> <translation id="4225397296022057997">Na svim web-lokacijama</translation> <translation id="4228071595943929139">Upotrijebite e-adresu svoje organizacije</translation> <translation id="4228209296591583948">{NUM_EXTENSIONS,plural, =1{To proširenje nije dopušteno}one{Neka proširenja nisu dopuštena}few{Neka proširenja nisu dopuštena}other{Neka proširenja nisu dopuštena}}</translation> @@ -4806,6 +4807,7 @@ <translation id="4361745360460842907">Otvori kao karticu</translation> <translation id="4363262124589131906">Nove datoteke na Mojem disku prestat će se automatski sinkronizirati s ovim Chromebookom</translation> <translation id="4364327530094270451">Dinja</translation> +<translation id="4364417397164696363">{ITEM_COUNT,plural, =1{Jedna stavka sprema se samo na ovaj uređaj. Da biste je upotrebljavali na svojim drugim uređajima, spremite je na svoj Google račun.}one{{ITEM_COUNT} stavka sprema se samo na ovaj uređaj. Da biste ih upotrebljavali na svojim drugim uređajima, spremite ih na svoj Google račun.}few{{ITEM_COUNT} stavke spremaju se samo na ovaj uređaj. Da biste ih upotrebljavali na svojim drugim uređajima, spremite ih na svoj Google račun.}other{{ITEM_COUNT} stavki sprema se samo na ovaj uređaj. Da biste ih upotrebljavali na svojim drugim uređajima, spremite ih na svoj Google račun.}}</translation> <translation id="4364567974334641491"><ph name="APP_NAME" /> dijeli prozor.</translation> <translation id="4364830672918311045">Prikaži obavijesti</translation> <translation id="4367971618859387374">Naziv za prikaz</translation> @@ -4940,7 +4942,7 @@ <translation id="445099924538929605"><ph name="DEVICE_OS" /> detektirao je aktivan TPM koji može sigurnije pohraniti vaše podatke.</translation> <translation id="4452898361839215358">ili odaberite PPD. <ph name="LINK_BEGIN" />Saznajte više<ph name="LINK_END" /></translation> <translation id="4453430595102511050">Dodirnite senzor otiska prsta u gornjem desnom kutu tipkovnice. Podaci o otisku prsta sigurno se pohranjuju i nikamo se ne šalju s uređaja <ph name="DEVICE_TYPE" />.</translation> -<translation id="4453946976636652378">Pretraži <ph name="SEARCH_ENGINE_NAME" /> ili unesi URL</translation> +<translation id="4453946976636652378">Pretražite <ph name="SEARCH_ENGINE_NAME" /> ili unesite URL</translation> <translation id="4457472090507035117">Odaberite trenutačni glas:</translation> <translation id="4459169140545916303">Aktivan prije <ph name="DEVICE_LAST_ACTIVATED_TIME" /> dana</translation> <translation id="4460014764210899310">Razgrupiraj</translation> @@ -5727,6 +5729,7 @@ <translation id="5029287942302939687">Zaporka je postavljena</translation> <translation id="5029873138381728058">Provjera VM-ova nije uspjela</translation> <translation id="503155457707535043">Preuzimanje aplikacija</translation> +<translation id="5031769842769721381">{SELECTED_ITEMS,plural, =0{Adrese}=1{Adrese ({SELECTED_ITEMS})}one{Adrese ({SELECTED_ITEMS})}few{Adrese ({SELECTED_ITEMS})}other{Adrese ({SELECTED_ITEMS})}}</translation> <translation id="5032430150487044192">Izrada QR koda nije uspjela</translation> <translation id="5033137252639132982">Nije dopuštena upotreba senzora kretanja</translation> <translation id="5035846135112863536">Odaberite Više pojedinosti u nastavku da biste saznali više informacija od <ph name="IDENTITY_PROVIDER_ETLD_PLUS_ONE" />.</translation> @@ -6475,6 +6478,7 @@ <translation id="5568069709869097550">Ne mogu se prijaviti</translation> <translation id="5568525251731145240">Želite li izbrisati podatke i dopuštenja za web-lokaciju <ph name="SITE_NAME" />, sve njoj podređene web-lokacije i instalirane aplikacije?</translation> <translation id="5568602038816065197">Web-lokacije mogu upotrebljavati napredne značajke s bilo kojeg pisača koji je dostupan vašem uređaju bez prolaska kroz standardni prompt za ispis</translation> +<translation id="5570149859473005144">{SELECTED_ITEMS,plural, =0{Zaporke}=1{Zaporke ({SELECTED_ITEMS})}one{Zaporke ({SELECTED_ITEMS})}few{Zaporke ({SELECTED_ITEMS})}other{Zaporke ({SELECTED_ITEMS})}}</translation> <translation id="5571066253365925590">Bluetooth omogućen</translation> <translation id="5571092938913434726">Globalne medijske kontrole</translation> <translation id="5571832155627049070">Prilagodite svoj profil</translation> @@ -6590,7 +6594,6 @@ <translation id="5646994841348250879">Odaberite račun da biste se prijavili na: <ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">Utičnica mikrofona</translation> <translation id="5648166631817621825">Posljednjih 7 dana</translation> -<translation id="5650537073531199882">Ispunjavanje obrasca</translation> <translation id="5651308944918885595">Vidljivost uređaja za dijeljenje u blizini</translation> <translation id="5653154844073528838">Imate još spremljenih pisača: <ph name="PRINTER_COUNT" />.</translation> <translation id="5654669866168491665">Saznajte više o web-lokacijama koje možda neće funkcionirati prilikom blokiranja kolačića trećih strana</translation> @@ -6978,6 +6981,7 @@ <translation id="5941153596444580863">Dodavanje osobe...</translation> <translation id="5941343993301164315">Prijavite se na <ph name="TOKEN_NAME" />.</translation> <translation id="5941711191222866238">Minimiziraj</translation> +<translation id="5941854976565320351">{PASSWORD_COUNT,plural, =1{Jedna zaporka sprema se samo na ovaj uređaj. Da biste je upotrebljavali na svojim drugim uređajima, spremite je na svoj Google račun.}one{{PASSWORD_COUNT} zaporka sprema se samo na ovaj uređaj. Da biste ih upotrebljavali na svojim drugim uređajima, spremite ih na svoj Google račun.}few{{PASSWORD_COUNT} zaporke spremaju se samo na ovaj uređaj. Da biste ih upotrebljavali na svojim drugim uređajima, spremite ih na svoj Google račun.}other{{PASSWORD_COUNT} zaporki sprema se samo na ovaj uređaj. Da biste ih upotrebljavali na svojim drugim uređajima, spremite ih na svoj Google račun.}}</translation> <translation id="594221546068848596">Pretraži stranicu pomoću usluge <ph name="VISUAL_SEARCH_PROVIDER" /></translation> <translation id="5942779427914696408">Vidljivost uređaja</translation> <translation id="5943127421590245687">Potvrda je uspjela. Da biste otključali i vratili lokalne podatke, unesite staru zaporku za uređaj <ph name="DEVICE_TYPE" />.</translation> @@ -8498,6 +8502,7 @@ <translation id="7036706669646341689">Za Linux se preporučuje <ph name="DISK_SIZE" /> prostora. Da biste oslobodili prostor, izbrišite datoteke s uređaja.</translation> <translation id="7037157058268992880">Zaboravljen PIN</translation> <translation id="7037509989619051237">Tekst za pregled</translation> +<translation id="7037633074390821254">Ograničenje DNS-a ili CIDR-a</translation> <translation id="7038632520572155338">Navigacija prekidačima</translation> <translation id="7038710352229712897">Dodavanje još jednog Google računa kojim će se koristiti <ph name="USER_NAME" /></translation> <translation id="7039326228527141150">pristupiti USB uređajima dobavljača <ph name="VENDOR_NAME" /></translation> @@ -8593,6 +8598,7 @@ <translation id="7113974454301513811">Sada dodajte trenutačnu karticu na popis</translation> <translation id="7114054701490058191">Zaporke se ne podudaraju</translation> <translation id="7114648273807173152">Da biste upotrebljavali Smart Lock za prijavu na Google račun, idite na Postavke > Povezani uređaji > Vaš telefon > Smart Lock.</translation> +<translation id="7115051913071512405">Isprobajte</translation> <translation id="7115361495406486998">Nema dostupnih kontakata</translation> <translation id="7115731767122970828">Pojačaj odmah</translation> <translation id="7116554090938189816">SSL certifikat pisača je istekao. Ponovo pokrenite pisač i pokušajte opet.</translation> @@ -8745,6 +8751,7 @@ <translation id="7231260028442989757">Pregledajte obavijesti telefona, odgovorite na njih ili ih odbacite.</translation> <translation id="7231347196745816203">Koristite telefon za otključavanje <ph name="DEVICE_TYPE" /> uređaja.</translation> <translation id="7232750842195536390">Preimenovanje nije uspjelo</translation> +<translation id="7232962679391151113">{BOOKMARK_COUNT,plural, =1{Jedna oznaka i druge stavke spremaju se samo na ovaj uređaj. Da biste ih upotrebljavali na svojim drugim uređajima, spremite ih na svoj Google račun.}one{{BOOKMARK_COUNT} oznaka i druge stavke spremaju se samo na ovaj uređaj. Da biste ih upotrebljavali na svojim drugim uređajima, spremite ih na svoj Google račun.}few{{BOOKMARK_COUNT} oznake i druge stavke spremaju se samo na ovaj uređaj. Da biste ih upotrebljavali na svojim drugim uređajima, spremite ih na svoj Google račun.}other{{BOOKMARK_COUNT} oznaka i druge stavke spremaju se samo na ovaj uređaj. Da biste ih upotrebljavali na svojim drugim uređajima, spremite ih na svoj Google račun.}}</translation> <translation id="723343421145275488">Pretraži slike pomoću usluge <ph name="VISUAL_SEARCH_PROVIDER" /></translation> <translation id="7234010996000898150">Otkazivanje vraćanja Linuxa</translation> <translation id="7235305658956131898">Administrator vašeg uređaja instalirao je Android aplikaciju.</translation> @@ -8871,6 +8878,7 @@ <translation id="7327989755579928735">Domena <ph name="MANAGER" /> onemogućila je ADB otklanjanje pogrešaka. Nakon što ponovo pokrenete uređaj <ph name="DEVICE_TYPE" />, nećete moći učitavati aplikacije s drugog izvora.</translation> <translation id="7328119182036084494">Spremljeno na popis <ph name="WEB_DRIVE" /></translation> <translation id="7328162502911382168">(<ph name="COUNT" />)</translation> +<translation id="732845903678043302">{BOOKMARK_COUNT,plural, =1{Jedna oznaka sprema se samo na ovaj uređaj. Da biste je upotrebljavali na svojim drugim uređajima, spremite je na svoj Google račun.}one{{BOOKMARK_COUNT} oznaka sprema se samo na ovaj uređaj. Da biste ih upotrebljavali na svojim drugim uređajima, spremite ih na svoj Google račun.}few{{BOOKMARK_COUNT} oznake spremaju se samo na ovaj uređaj. Da biste ih upotrebljavali na svojim drugim uređajima, spremite ih na svoj Google račun.}other{{BOOKMARK_COUNT} oznaka sprema se samo na ovaj uređaj. Da biste ih upotrebljavali na svojim drugim uređajima, spremite ih na svoj Google račun.}}</translation> <translation id="7328867076235380839">Nevažeća kombinacija</translation> <translation id="7329154610228416156">Prijava nije uspjela jer je konfigurirana za upotrebu nesigurnog URL-a (<ph name="BLOCKED_URL" />). Obratite se administratoru.</translation> <translation id="7330533963640151632">Postavke značajke <ph name="FEATURE_NAME" /> za uređaj na kojem <ph name="USER_NAME" /> dijeli putem računa <ph name="USER_EMAIL" />.</translation> @@ -10414,6 +10422,7 @@ <translation id="8398877366907290961">Svejedno nastavi</translation> <translation id="8399282673057829204">Prikaži zaporku</translation> <translation id="839949601275221554">Uređaj je naišao na pogrešku. Ponovo pokrenite uređaj i pokušajte opet.</translation> +<translation id="8399889560226245071">{SELECTED_ITEMS,plural, =0{Oznake}=1{Oznake ({SELECTED_ITEMS})}one{Oznake ({SELECTED_ITEMS})}few{Oznake ({SELECTED_ITEMS})}other{Oznake ({SELECTED_ITEMS})}}</translation> <translation id="8401432541486058167">Unesite PIN za pametnu karticu.</translation> <translation id="8403807918453631441"><ph name="BRAND" /> može provjeriti vaše zaporke kad ih spremite</translation> <translation id="8405046151008197676">Primite najzanimljivije dijelove najnovijeg ažuriranja</translation> @@ -11670,6 +11679,7 @@ <translation id="97905529126098460">Ovaj će se prozor zatvoriti nakon što otkazivanje završi.</translation> <translation id="980731642137034229">Gumb izbornika aktivnosti</translation> <translation id="981121421437150478">Izvanmrežno</translation> +<translation id="982083952953998237">Dodavanje ograničenja</translation> <translation id="98235653036850093">Pozdrav, <ph name="PROFILE_NAME" /></translation> <translation id="983192555821071799">Zatvori sve kartice</translation> <translation id="983531994960412650"><ph name="WINDOW_TITLE" /> – snimanje kamerom i mikrofonom</translation>
diff --git a/chrome/app/resources/generated_resources_hu.xtb b/chrome/app/resources/generated_resources_hu.xtb index 75c19e64..5b0237d 100644 --- a/chrome/app/resources/generated_resources_hu.xtb +++ b/chrome/app/resources/generated_resources_hu.xtb
@@ -667,7 +667,6 @@ <translation id="1464258312790801189">Az Ön fiókjai</translation> <translation id="1464597059227482327">Ha olyan Chromebookkal oszt meg tartalmat, amely nem szerepel a névjegyei között, győződjön meg arról, hogy a Chromebookon be van kapcsolva a „Közeli láthatóság” funkció. A „Közeli láthatóság” funkció bekapcsolásához kattintson a jobb alsó sarokban található „Közeli láthatóság” elemre. <ph name="LINK_BEGIN" />További információ<ph name="LINK_END" />.</translation> <translation id="1464781208867302907">Az eszközbeállításokhoz nyissa meg a Beállításokat.</translation> -<translation id="146481294006497945">Nincsenek mentett jelszavak</translation> <translation id="1465176863081977902">Audi&ocím másolása</translation> <translation id="146522654774760805">Jelszavak és automatikus kitöltés</translation> <translation id="1465827627707997754">Pizzaszelet</translation> @@ -2177,7 +2176,6 @@ <translation id="2485394160472549611">Népszerű javaslatok</translation> <translation id="2485422356828889247">Eltávolítás</translation> <translation id="2485681265915754872">A Google Play Általános Szerződési Feltételei</translation> -<translation id="2486036712620651117">Jelszavak és azonosítókulcsok</translation> <translation id="248676429071089168">Az oldal lefelé mozgatásához csúsztasson felfelé</translation> <translation id="2487067538648443797">Új könyvjelző hozzáadása</translation> <translation id="2489686758589235262">Két további kapcsoló hozzárendelése</translation> @@ -3900,7 +3898,6 @@ <translation id="3721178866505920080">További információ a kiterjesztett előtöltés bekapcsolásáról</translation> <translation id="3722108462506185496">Nem sikerült elindítani a virtuális gép szolgáltatást. Próbálja újra később.</translation> <translation id="3722624153992426516">Utasítás érkezett: <ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /></translation> -<translation id="3724897774652282549">Űrlap kitöltése</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Hozzáférhető WiFi-hálózatok</translation> @@ -4332,7 +4329,6 @@ <translation id="3993887353483242788">Szinkronizálja <ph name="DEVICE_TYPE" /> eszközét, hogy beállításai minden eszközön rendelkezésre álljanak, amikor be van jelentkezve Google-fiókjával. A beállítások közé tartoznak többek között az alkalmazások, a Wi-Fi-jelszavak, a nyelvek, a háttérkép és a billentyűparancsok.</translation> <translation id="3994318741694670028">Sajnos számítógépe nem megfelelő formátumú hardverazonosítóval van konfigurálva. Emiatt a ChromeOS Flex nem tud frissülni a legújabb biztonsági javításokkal, és számítógépe <ph name="BEGIN_BOLD" />sebezhető lehet a rosszindulatú támadásokkal szemben<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">A belépéshez oldja fel telefonja lezárását, és helyezze közelebb a(z) <ph name="DEVICE_TYPE" /> zárolásának feloldásához.</translation> -<translation id="3994522032746736727">Bejelentkezés mint <ph name="EMAIL" /></translation> <translation id="3994530503403062649">A táblagép gombjai helyének meghatározása</translation> <translation id="3994708120330953242">Egyes jelszavai érintettek voltak egy adatvédelmi incidensben. Fiókjai védelme érdekében azonnal módosítsa ezeket a jelszavakat.</translation> <translation id="3994878504415702912">&Szöveg mérete</translation> @@ -4623,6 +4619,7 @@ <translation id="4220648711404560261">Hiba történt az aktiválás során.</translation> <translation id="4222917615373664617">Az árkövetés engedélyezve van. Jelenlegi ár: <ph name="CURRENT_PRICE" />.</translation> <translation id="4223404254440398437">Mikrofonhasználat nem engedélyezett</translation> +<translation id="4224541845943007092">A címsávban lévő billentyűzettel való bevitel olvasása és mentése</translation> <translation id="4225397296022057997">Az összes webhelyen</translation> <translation id="4228071595943929139">Saját szervezete e-mail-címének használata</translation> <translation id="4228209296591583948">{NUM_EXTENSIONS,plural, =1{Ez a bővítmény nem engedélyezett}other{Egyes bővítmények nem engedélyezettek}}</translation> @@ -6604,7 +6601,6 @@ <translation id="5646994841348250879">Válasszon fiókot a következőn való bejelentkezéshez: <ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">Mikrofon jack csatlakozója</translation> <translation id="5648166631817621825">Az elmúlt 7 napból</translation> -<translation id="5650537073531199882">Űrlap kitöltése</translation> <translation id="5651308944918885595">Közeli megosztás felfedezhetőség</translation> <translation id="5653154844073528838"><ph name="PRINTER_COUNT" /> mentett nyomtató található.</translation> <translation id="5654669866168491665">További információ azokról a webhelyekről, amelyek nem feltétlenül működnek a harmadik féltől származó cookie-k letiltásakor</translation> @@ -8604,6 +8600,7 @@ <translation id="7113974454301513811">Most pedig adja hozzá a jelenlegi lapot a listájához.</translation> <translation id="7114054701490058191">A jelszavak nem egyeznek</translation> <translation id="7114648273807173152">Ha használni szeretné a Smart Lock funkciót Google-fiókjában, lépjen a Beállítások > Társított eszközök > Telefon > Smart Lock menüpontba.</translation> +<translation id="7115051913071512405">Próbálja ki</translation> <translation id="7115361495406486998">Nincsenek hozzáférhető névjegyek</translation> <translation id="7115731767122970828">Optimalizálás most</translation> <translation id="7116554090938189816">A nyomtató SSL-tanúsítványa lejárt. Indítsa újra a nyomtatót, majd próbálkozzon újra.</translation>
diff --git a/chrome/app/resources/generated_resources_hy.xtb b/chrome/app/resources/generated_resources_hy.xtb index 08c57a2..ab8d6ee73 100644 --- a/chrome/app/resources/generated_resources_hy.xtb +++ b/chrome/app/resources/generated_resources_hy.xtb
@@ -668,7 +668,6 @@ <translation id="1464258312790801189">Ձեր հաշիվները</translation> <translation id="1464597059227482327">Եթե դուք կիսվում եք ֆայլերով Chromebook սարքի հետ, որը ձեր կոնտակտներում ներառված չէ, համոզվեք, որ այնտեղ միացված է «Մոտակա սարքերի տեսանելիություն» գործառույթը։ Այն միացնելու համար սեղմեք էկրանի ներքևի աջ անկյունի վրա և սեղմեք «Մոտակա սարքերի տեսանելիություն» գործառույթը։ <ph name="LINK_BEGIN" />Իմանալ ավելին<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Սարքի պարամետրերը փոխելու համար անցեք կարգավորումներ:</translation> -<translation id="146481294006497945">Պահված գաղտնաբառեր չկան</translation> <translation id="1465176863081977902">Պատճենել ձայնանյութի հասցեն</translation> <translation id="146522654774760805">Գաղտնաբառեր և ինքնալրացում</translation> <translation id="1465827627707997754">Պիցցայի կտոր</translation> @@ -2167,7 +2166,6 @@ <translation id="2485394160472549611">Հատուկ ձեզ համար</translation> <translation id="2485422356828889247">Ապատեղադրել</translation> <translation id="2485681265915754872">Google Play-ի օգտագործման պայմաններ</translation> -<translation id="2486036712620651117">Գաղտնաբառեր և մուտքի բանալիներ</translation> <translation id="248676429071089168">Սահեցրեք վերև՝ էջի ներքև անցնելու համար</translation> <translation id="2487067538648443797">Ավելացնել նոր էջանիշ</translation> <translation id="2489686758589235262">Նշանակել ևս 2 փոխանջատիչ</translation> @@ -3886,7 +3884,6 @@ <translation id="3721178866505920080">Լրացուցիչ տեղեկություններ ընդլայնված նախաբեռնումը միացնելու մասին</translation> <translation id="3722108462506185496">Չհաջողվեց մեկնարկել վիրտուալ մեքենայի ծառայությունը: Նորից փորձեք:</translation> <translation id="3722624153992426516">Ստացվել է ուղեցույց՝ <ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /></translation> -<translation id="3724897774652282549">Լրացրեք ձևը</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Հասանելի Wi-Fi ցանցեր</translation> @@ -4319,7 +4316,6 @@ <translation id="3993887353483242788">Համաժամացրեք ձեր <ph name="DEVICE_TYPE" /> սարքը, որպեսզի ձեր նախընտրանքները (հավելվածները, կարգավորումները, Wi-Fi-ի գաղտնաբառերը, լեզուները, պաստառները, ստեղնային դյուրանցումները և այլն) հասանելի լինեն բոլոր սարքերում, երբ մուտք գործեք Google հաշիվ։</translation> <translation id="3994318741694670028">Ձեր համակարգիչը կազմաձևված է սարքակազմի սխալ ID-ով։ Սա թույլ չի տալիս, որպեսզի ChromeOS Flex-ը ստանա անվտանգության վերջին թարմացումները, և ձեր համակարգիչը <ph name="BEGIN_BOLD" />կարող է վնասաբեր հարձակումների թիրախ դառնալ<ph name="END_BOLD" />։</translation> <translation id="3994374631886003300"><ph name="DEVICE_TYPE" /> սարքն ապակողպելու համար ապակողպեք ձեր հեռախոսը և այն մոտեցրեք սարքին։</translation> -<translation id="3994522032746736727">Մուտք գործել որպես <ph name="EMAIL" /></translation> <translation id="3994530503403062649">Գտեք պլանշետի կոճակները</translation> <translation id="3994708120330953242">Տվյալների արտահոսքի հետևանքով ձեր որոշ գաղտնաբառեր բացահայտվել են։ Ձեր հաշիվները պաշտպանելու համար անհապաղ փոխեք գաղտնաբառերը։</translation> <translation id="3994878504415702912">&Խոշորացնել</translation> @@ -6587,7 +6583,6 @@ <translation id="5646994841348250879">Ընտրեք հաշիվ՝ <ph name="SITE_ETLD_PLUS_ONE" /> կայք մուտք գործելու համար</translation> <translation id="5648021990716966815">Խոսափողի հարակցիչ</translation> <translation id="5648166631817621825">Վերջին 7 օրվա</translation> -<translation id="5650537073531199882">Լրացրեք ձևը</translation> <translation id="5651308944918885595">«Փոխանակում մոտակա սարքերի հետ» գործառույթի հայտնաբերելիություն</translation> <translation id="5653154844073528838">Դուք ունեք <ph name="PRINTER_COUNT" /> պահված տպիչ։</translation> <translation id="5654669866168491665">Իմանալ ավելին այն կայքերի մասին, որոնք կարող են չաշխատել, երբ երրորդ կողմի քուքիներն արգելափակված են</translation> @@ -8587,6 +8582,7 @@ <translation id="7113974454301513811">Այժմ ընթացիկ ներդիրն ավելացրեք ձեր ցանկում</translation> <translation id="7114054701490058191">Գաղտնաբառերը չեն համընկնում</translation> <translation id="7114648273807173152">Smart Lock-ն օգտագործելու համար մտեք ձեր Google հաշիվ, անցեք Կարգավորումներ > Միացված սարքեր > Ձեր հեռախոսը > Smart Lock:</translation> +<translation id="7115051913071512405">Փորձել</translation> <translation id="7115361495406486998">Հասանելի կոնտակտներ չկան</translation> <translation id="7115731767122970828">Բարձրացնել</translation> <translation id="7116554090938189816">Տպիչի SSL հավաստագրի ժամկետը լրացել է։ Վերագործարկեք տպիչը և նորից փորձեք։</translation>
diff --git a/chrome/app/resources/generated_resources_id.xtb b/chrome/app/resources/generated_resources_id.xtb index 8588c6c6..701c8fef 100644 --- a/chrome/app/resources/generated_resources_id.xtb +++ b/chrome/app/resources/generated_resources_id.xtb
@@ -667,7 +667,6 @@ <translation id="1464258312790801189">Akun Anda</translation> <translation id="1464597059227482327">Jika Anda berbagi dengan Chromebook yang tidak ada dalam kontak Anda, pastikan Chromebook sudah mengaktifkan “Visibilitas Berbagi Langsung”. Untuk mengaktifkan “Visibilitas Berbagi Langsung”, pilih pojok kanan bawah lalu pilih untuk mengaktifkan “Visibilitas Berbagi Langsung”. <ph name="LINK_BEGIN" />Pelajari lebih lanjut<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Untuk preferensi perangkat, buka Setelan.</translation> -<translation id="146481294006497945">Tidak Ada Sandi Tersimpan</translation> <translation id="1465176863081977902">S&alin Alamat Audio</translation> <translation id="146522654774760805">Sandi dan isi otomatis</translation> <translation id="1465827627707997754">Irisan pizza</translation> @@ -2178,7 +2177,6 @@ <translation id="2485394160472549611">Pilihan teratas untuk Anda</translation> <translation id="2485422356828889247">Uninstal</translation> <translation id="2485681265915754872">Persyaratan layanan Google Play</translation> -<translation id="2486036712620651117">Sandi dan Kunci Sandi</translation> <translation id="248676429071089168">Geser ke atas untuk memindahkan halaman ke bawah</translation> <translation id="2487067538648443797">Tambahkan bookmark baru</translation> <translation id="2489686758589235262">Tetapkan 2 tombol akses lagi</translation> @@ -3901,7 +3899,6 @@ <translation id="3721178866505920080">Info selengkapnya tentang mengaktifkan pramuat ekstensif</translation> <translation id="3722108462506185496">Error saat memulai layanan mesin virtual. Harap coba lagi nanti.</translation> <translation id="3722624153992426516">Petunjuk <ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /> diterima</translation> -<translation id="3724897774652282549">Isi formulir</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Jaringan WiFi yang tersedia</translation> @@ -4334,7 +4331,6 @@ <translation id="3993887353483242788">Sinkronkan <ph name="DEVICE_TYPE" /> agar preferensi Anda bisa digunakan di perangkat mana pun saat Anda login dengan Akun Google Anda. Preferensi meliputi aplikasi, setelan, sandi Wi-Fi, bahasa, wallpaper, pintasan keyboard, dan lainnya.</translation> <translation id="3994318741694670028">Sayangnya, komputer Anda dikonfigurasi dengan ID hardware yang salah. Hal ini mencegah ChromeOS Flex diupdate dengan perbaikan keamanan terbaru dan komputer Anda <ph name="BEGIN_BOLD" />mungkin rentan terhadap serangan berbahaya<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Buka kunci ponsel dan dekatkan untuk membuka kunci <ph name="DEVICE_TYPE" /> Anda.</translation> -<translation id="3994522032746736727">Login sebagai <ph name="EMAIL" /></translation> <translation id="3994530503403062649">Temukan tombol di tablet Anda</translation> <translation id="3994708120330953242">Beberapa sandi Anda terekspos dalam pelanggaran data. Untuk mengamankan akun Anda, Anda harus mengubah sandi ini sekarang.</translation> <translation id="3994878504415702912">&Zum</translation> @@ -6605,7 +6601,6 @@ <translation id="5646994841348250879">Pilih akun untuk login ke <ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">Colokan mikrofon</translation> <translation id="5648166631817621825">7 hari terakhir</translation> -<translation id="5650537073531199882">Isi Formulir</translation> <translation id="5651308944918885595">Visibilitas Berbagi Langsung</translation> <translation id="5653154844073528838">Anda memiliki <ph name="PRINTER_COUNT" /> printer tersimpan.</translation> <translation id="5654669866168491665">Pelajari lebih lanjut situs yang mungkin tidak berfungsi saat memblokir cookie pihak ketiga</translation> @@ -8605,6 +8600,7 @@ <translation id="7113974454301513811">Sekarang tambahkan tab saat ini ke daftar Anda</translation> <translation id="7114054701490058191">Sandi tidak cocok</translation> <translation id="7114648273807173152">Agar dapat menggunakan Smart Lock untuk login ke akun Google Anda, buka Setelan > Perangkat terhubung > Ponsel Anda > Smart Lock.</translation> +<translation id="7115051913071512405">Cobalah</translation> <translation id="7115361495406486998">Tidak ada kontak yang dapat dihubungi</translation> <translation id="7115731767122970828">Tingkatkan sekarang</translation> <translation id="7116554090938189816">Masa berlaku sertifikat SSL printer telah berakhir. Mulai ulang printer, lalu coba lagi.</translation>
diff --git a/chrome/app/resources/generated_resources_is.xtb b/chrome/app/resources/generated_resources_is.xtb index e8cb95d..807975cd 100644 --- a/chrome/app/resources/generated_resources_is.xtb +++ b/chrome/app/resources/generated_resources_is.xtb
@@ -668,7 +668,6 @@ <translation id="1464258312790801189">Reikningarnir þínir</translation> <translation id="1464597059227482327">Ef þú deilir með Chromebook sem er ekki í tengiliðunum þínum skaltu tryggja að kveikt sé á „Nærsýnileiki“ í Chromebook-tölvunni. Til að kveikja á „Nærsýnileiki“ skaltu velja neðra hægra hornið og velja síðan að kveikja á „Nærsýnileiki“. <ph name="LINK_BEGIN" />Nánar<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Farðu í stillingarnar til að velja kjörstillingar tækis.</translation> -<translation id="146481294006497945">Engin vistuð aðgangsorð</translation> <translation id="1465176863081977902">A&frita slóð hljóðs</translation> <translation id="146522654774760805">Aðgangsorð og sjálfvirk útfylling</translation> <translation id="1465827627707997754">Pítsusneið</translation> @@ -2179,7 +2178,6 @@ <translation id="2485394160472549611">Valið fyrir þig</translation> <translation id="2485422356828889247">Fjarlægja</translation> <translation id="2485681265915754872">Þjónustuskilmálar Google Play</translation> -<translation id="2486036712620651117">Aðgangsorð og aðgangslyklar</translation> <translation id="248676429071089168">Strjúktu upp til að færa síðuna niður</translation> <translation id="2487067538648443797">Bæta nýju bókamerki við</translation> <translation id="2489686758589235262">Úthluta tveimur rofum í viðbót</translation> @@ -3902,7 +3900,6 @@ <translation id="3721178866505920080">Nánari upplýsingar um að kveikja á aukinni forhleðslu</translation> <translation id="3722108462506185496">Villa við að ræsa þjónustu sýndarvélar. Reyndu aftur.</translation> <translation id="3722624153992426516"><ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" />: leiðbeiningar mótteknar</translation> -<translation id="3724897774652282549">Fylla út eyðublað</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Tiltæk Wi-Fi-netkerfi</translation> @@ -4335,7 +4332,6 @@ <translation id="3993887353483242788">Samstilltu <ph name="DEVICE_TYPE" /> svo að kjörstillingarnar þínar verði til reiðu í hvaða tæki sem er þegar þú skráir þig inn á Google reikninginn þinn. Kjörstillingar eru t.d. forrit, stillingar, WiFi-aðgangsorð, tungumál, veggfóður, flýtilyklar og fleira.</translation> <translation id="3994318741694670028">Tölvan er því miður grunnstillt með gölluðu vélbúnaðarauðkenni. Þetta kemur í veg fyrir að ChromeOS Flex geti uppfært í nýjustu öryggisúrræði og tölvan <ph name="BEGIN_BOLD" />kann að vera berskjölduð gagnvart árásum<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Taktu símann úr lás og færðu hann nær <ph name="DEVICE_TYPE" /> til að taka úr lás.</translation> -<translation id="3994522032746736727">Skrá inn sem <ph name="EMAIL" /></translation> <translation id="3994530503403062649">Finndu hnappana á spjaldtölvunni</translation> <translation id="3994708120330953242">Einhver aðgangsorðanna þinna fundust í öryggisbroti. Þú ættir að breyta þessum aðgangsorðum núna til að vernda reikningana þína.</translation> <translation id="3994878504415702912">Aðdráttur</translation> @@ -6606,7 +6602,6 @@ <translation id="5646994841348250879">Veldu reikning til að skrá þig inn á <ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">Hljóðnematengi</translation> <translation id="5648166631817621825">Síðastliðna sjö daga</translation> -<translation id="5650537073531199882">Fylla út</translation> <translation id="5651308944918885595">Sýnileiki Nærdeilingar</translation> <translation id="5653154844073528838">Þú ert með <ph name="PRINTER_COUNT" /> vistaða prentara.</translation> <translation id="5654669866168491665">Nánar um vefsvæði sem virka ef til vill ekki þegar lokað er á fótspor þriðju aðila</translation> @@ -8607,6 +8602,7 @@ <translation id="7113974454301513811">Nú skaltu bæta núverandi flipa á listann</translation> <translation id="7114054701490058191">Aðgangsorðin stemma ekki</translation> <translation id="7114648273807173152">Þú getur notað Smart Lock til að skrá þig inn á Google reikninginn þinn með því að fara í Stillingar > Tengd tæki > Síminn þinn > Smart Lock.</translation> +<translation id="7115051913071512405">Prófa</translation> <translation id="7115361495406486998">Ekki næst í neina tengiliði</translation> <translation id="7115731767122970828">Bæta núna</translation> <translation id="7116554090938189816">SSL-vottorð prentara er útrunnið. Endurræstu prentarann og reyndu aftur.</translation>
diff --git a/chrome/app/resources/generated_resources_it.xtb b/chrome/app/resources/generated_resources_it.xtb index a47582d..95a0b05 100644 --- a/chrome/app/resources/generated_resources_it.xtb +++ b/chrome/app/resources/generated_resources_it.xtb
@@ -539,6 +539,7 @@ <translation id="1368603372088757436">Linux non è supportato su <ph name="DEVICE_TYPE" />. <ph name="LINK_BEGIN" />Scopri di più<ph name="LINK_END" /></translation> <translation id="1370249617397887619">Per usarle sugli altri tuoi dispositivi, salvale nel tuo Account Google</translation> <translation id="1370384480654163477">Visualizzare e modificare i file dall'ultima visita al sito:</translation> +<translation id="1372259917802609049">Si è verificato un errore durante l'eliminazione del vincolo</translation> <translation id="1372841398847029212">Sincronizza con il tuo account</translation> <translation id="1373176046406139583">L'impostazione Visibilità del dispositivo ti consente di stabilire chi può condividere file con te mentre il tuo schermo è sbloccato. <ph name="LINK_BEGIN" />Scopri di più<ph name="LINK_END" /></translation> <translation id="1374844444528092021">Il certificato richiesto dalla rete "<ph name="NETWORK_NAME" />" non è installato o non è più valido. Richiedi un nuovo certificato e riprova a connetterti.</translation> @@ -666,7 +667,6 @@ <translation id="1464258312790801189">I tuoi account</translation> <translation id="1464597059227482327">Se vuoi attivare la condivisione con un Chromebook non presente nei tuoi contatti, assicurati che sul dispositivo in questione sia attiva l'opzione "Visibilità nelle vicinanze". Per attivare l'opzione "Visibilità nelle vicinanze", seleziona l'angolo in basso a destra, quindi attiva l'opzione. <ph name="LINK_BEGIN" />Scopri di più<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Per le preferenze del dispositivo, vai alle Impostazioni.</translation> -<translation id="146481294006497945">Nessuna password salvata</translation> <translation id="1465176863081977902">C&opia l'indirizzo dell'audio</translation> <translation id="146522654774760805">Password e compilazione automatica</translation> <translation id="1465827627707997754">Fetta di pizza</translation> @@ -1480,6 +1480,7 @@ Ciò non interessa app o contenuti su altri dispositivi.</translation> <translation id="2018189721942291407">Non sai se effettuare la registrazione?</translation> <translation id="2018352199541442911">Spiacenti, il dispositivo di archiviazione esterno non è al momento supportato.</translation> +<translation id="2019213483156307334">Si è verificato un errore durante l'aggiunta del vincolo</translation> <translation id="2019718679933488176">&Apri audio in un'altra scheda</translation> <translation id="2020183425253392403">Mostra impostazioni indirizzi di rete</translation> <translation id="2020225359413970060">Esegui la scansione del file</translation> @@ -2165,7 +2166,6 @@ <translation id="2485394160472549611">Scelti per te</translation> <translation id="2485422356828889247">Disinstalla</translation> <translation id="2485681265915754872">Termini di servizio di Google Play</translation> -<translation id="2486036712620651117">Password e passkey</translation> <translation id="248676429071089168">Scorri verso l'alto per spostare la pagina verso il basso</translation> <translation id="2487067538648443797">Aggiungi nuovo preferito</translation> <translation id="2489686758589235262">Assegna altri 2 sensori</translation> @@ -3144,6 +3144,7 @@ <translation id="3188257591659621405">I miei file</translation> <translation id="3188465121994729530">Media spostamento</translation> <translation id="3189187154924005138">Puntatore grande</translation> +<translation id="3189533916970342007">{PASSWORD_COUNT,plural, =1{1 password e altri elementi sono salvati solo su questo dispositivo. Per usarli sugli altri dispositivi, salvali nel tuo Account Google.}other{{PASSWORD_COUNT} password e altri elementi sono salvati solo su questo dispositivo. Per usarli sugli altri dispositivi, salvali nel tuo Account Google.}}</translation> <translation id="3190558889382726167">Password salvata</translation> <translation id="3192586965067888278">Descrivi il problema in modo dettagliato. Il feedback verrà inviato a Google per la revisione umana e potrebbe essere utilizzato per migliorare o sviluppare i prodotti e i servizi Google.</translation> <translation id="3192947282887913208">File audio</translation> @@ -3614,6 +3615,7 @@ <translation id="3537881477201137177">Le dimensioni possono essere modificate in seguito nelle Impostazioni</translation> <translation id="3538066758857505094">Errore durante la disinstallazione di Linux. Riprova.</translation> <translation id="3539537154248488260">Attiva/disattiva ispirazione</translation> +<translation id="3539791442352537591">Si è verificato un errore durante il salvataggio della modifica dello stato di attendibilità</translation> <translation id="3540173484406326944">Nessuna rete tramite <ph name="HOST_DEVICE_NAME" /></translation> <translation id="354060433403403521">Adattatore CA</translation> <translation id="354068948465830244">Può leggere e cambiare i dati dei siti</translation> @@ -3888,7 +3890,6 @@ <translation id="3721178866505920080">Maggiori informazioni sull'attivazione del precaricamento esteso</translation> <translation id="3722108462506185496">Errore durante l'avvio del servizio macchina virtuale. Riprova.</translation> <translation id="3722624153992426516">È stata ricevuta l'istruzione <ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /></translation> -<translation id="3724897774652282549">Compila il modulo</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Reti Wi-Fi disponibili</translation> @@ -4321,7 +4322,6 @@ <translation id="3993887353483242788">Sincronizza il tuo <ph name="DEVICE_TYPE" /> in modo che le tue preferenze siano salvate su qualsiasi dispositivo quando accedi con il tuo Account Google. Le preferenze includono app, impostazioni, password del Wi-Fi, lingue, sfondi, scorciatoie da tastiera e altro ancora.</translation> <translation id="3994318741694670028">Purtroppo il tuo computer è configurato con un ID hardware non valido. Questo impedisce l'aggiornamento di ChromeOS Flex con le ultime correzioni relative alla sicurezza e il tuo computer <ph name="BEGIN_BOLD" />potrebbe essere vulnerabile ad attacchi dannosi<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Sblocca il telefono e avvicinalo al dispositivo <ph name="DEVICE_TYPE" /> per sbloccarlo.</translation> -<translation id="3994522032746736727">Accedi come <ph name="EMAIL" /></translation> <translation id="3994530503403062649">Individua i pulsanti sul tablet</translation> <translation id="3994708120330953242">Alcune password potrebbero essere state compromesse nell'ambito di una violazione dei dati. Cambiale subito per proteggere i tuoi account.</translation> <translation id="3994878504415702912">&Carattere</translation> @@ -4612,6 +4612,7 @@ <translation id="4220648711404560261">Si è verificato un errore durante l'attivazione.</translation> <translation id="4222917615373664617">Il monitoraggio dei prezzi è attivo. Il prezzo è <ph name="CURRENT_PRICE" />.</translation> <translation id="4223404254440398437">Microfono non consentito</translation> +<translation id="4224541845943007092">Leggi e salva l'input della tastiera dalla barra degli indirizzi</translation> <translation id="4225397296022057997">Su tutti i siti</translation> <translation id="4228071595943929139">Utilizza l'indirizzo email della tua organizzazione</translation> <translation id="4228209296591583948">{NUM_EXTENSIONS,plural, =1{Questa estensione non è consentita}other{Alcune estensioni non sono consentite}}</translation> @@ -4804,6 +4805,7 @@ <translation id="4361745360460842907">Apri in una scheda</translation> <translation id="4363262124589131906">La sincronizzazione automatica con questo Chromebook dei nuovi file in Il mio Drive verrà interrotta</translation> <translation id="4364327530094270451">Melone</translation> +<translation id="4364417397164696363">{ITEM_COUNT,plural, =1{1 elemento è salvato solo su questo dispositivo. Per usarlo sugli altri dispositivi, salvalo nel tuo Account Google.}other{{ITEM_COUNT} elementi sono salvati solo su questo dispositivo. Per usarli sugli altri dispositivi, salvali nel tuo Account Google.}}</translation> <translation id="4364567974334641491"><ph name="APP_NAME" /> condivide una finestra.</translation> <translation id="4364830672918311045">Mostrare notifiche</translation> <translation id="4367971618859387374">Nome visualizzato</translation> @@ -5725,6 +5727,7 @@ <translation id="5029287942302939687">La tua password è stata impostata</translation> <translation id="5029873138381728058">Impossibile controllare le VM</translation> <translation id="503155457707535043">Download delle app in corso</translation> +<translation id="5031769842769721381">{SELECTED_ITEMS,plural, =0{Indirizzi}=1{Indirizzo ({SELECTED_ITEMS})}other{Indirizzi ({SELECTED_ITEMS})}}</translation> <translation id="5032430150487044192">Impossibile creare codice QR</translation> <translation id="5033137252639132982">Non possono utilizzare i sensori di movimento</translation> <translation id="5035846135112863536">Scegli "Altri dettagli" di seguito per ottenere maggiori informazioni da <ph name="IDENTITY_PROVIDER_ETLD_PLUS_ONE" />.</translation> @@ -6474,6 +6477,7 @@ <translation id="5568069709869097550">Non riesco a effettuare l'accesso</translation> <translation id="5568525251731145240">Vuoi eliminare le autorizzazioni e i dati del sito <ph name="SITE_NAME" />, di tutti i relativi siti secondari e le app installate?</translation> <translation id="5568602038816065197">I siti possono utilizzare le funzionalità avanzate di qualsiasi stampante accessibile sul dispositivo, senza visualizzare il messaggio di stampa standard</translation> +<translation id="5570149859473005144">{SELECTED_ITEMS,plural, =0{Password}=1{Password ({SELECTED_ITEMS})}other{Password ({SELECTED_ITEMS})}}</translation> <translation id="5571066253365925590">Bluetooth attivo</translation> <translation id="5571092938913434726">Global Media Controls</translation> <translation id="5571832155627049070">Personalizza il tuo profilo</translation> @@ -6589,7 +6593,6 @@ <translation id="5646994841348250879">Scegli un account per accedere a <ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">Jack per microfono</translation> <translation id="5648166631817621825">Ultima settimana</translation> -<translation id="5650537073531199882">Compila il modulo</translation> <translation id="5651308944918885595">Rilevabilità Condivisione nelle vicinanze</translation> <translation id="5653154844073528838">Hai <ph name="PRINTER_COUNT" /> stampanti salvate.</translation> <translation id="5654669866168491665">Scopri di più sui siti che potrebbero non funzionare quando blocchi i cookie di terze parti</translation> @@ -6977,6 +6980,7 @@ <translation id="5941153596444580863">Aggiungi persona...</translation> <translation id="5941343993301164315">Accedi a <ph name="TOKEN_NAME" />.</translation> <translation id="5941711191222866238">Riduci a icona</translation> +<translation id="5941854976565320351">{PASSWORD_COUNT,plural, =1{1 password è salvata solo su questo dispositivo. Per usarla sugli altri dispositivi, salvala nel tuo Account Google.}other{{PASSWORD_COUNT} password sono salvate solo su questo dispositivo. Per usarle sugli altri dispositivi, salvale nel tuo Account Google.}}</translation> <translation id="594221546068848596">Pagina di ricerca con <ph name="VISUAL_SEARCH_PROVIDER" /></translation> <translation id="5942779427914696408">Visibilità del dispositivo</translation> <translation id="5943127421590245687">La verifica è andata a buon fine. Per sbloccare e ripristinare i dati locali, inserisci la vecchia password del dispositivo <ph name="DEVICE_TYPE" />.</translation> @@ -8493,6 +8497,7 @@ <translation id="7036706669646341689">Sono consigliati <ph name="DISK_SIZE" /> di spazio libero per Linux. Per aumentare lo spazio disponibile, elimina i file dal dispositivo.</translation> <translation id="7037157058268992880">PIN dimenticato</translation> <translation id="7037509989619051237">Anteprima del testo</translation> +<translation id="7037633074390821254">Vincolo DNS o CIDR</translation> <translation id="7038632520572155338">Switch Access</translation> <translation id="7038710352229712897">Aggiungi un altro Account Google per <ph name="USER_NAME" /></translation> <translation id="7039326228527141150">Accedi a dispositivi USB di <ph name="VENDOR_NAME" /></translation> @@ -8588,6 +8593,7 @@ <translation id="7113974454301513811">Ora aggiungi la scheda corrente al tuo elenco</translation> <translation id="7114054701490058191">Le password non corrispondono</translation> <translation id="7114648273807173152">Per utilizzare Smart Lock per accedere al tuo Account Google, apri Impostazioni > Dispositivi connessi > Il tuo telefono > Smart Lock.</translation> +<translation id="7115051913071512405">Provalo</translation> <translation id="7115361495406486998">Nessun contatto raggiungibile</translation> <translation id="7115731767122970828">Aumenta prestazioni ora</translation> <translation id="7116554090938189816">Il certificato SSL della stampante è scaduto. Riavvia la stampante e riprova.</translation> @@ -8740,6 +8746,7 @@ <translation id="7231260028442989757">Visualizza, ignora e rispondi alle notifiche del tuo telefono</translation> <translation id="7231347196745816203">Usa lo smartphone per sbloccare il tuo <ph name="DEVICE_TYPE" />.</translation> <translation id="7232750842195536390">Ridenominazione non riuscita</translation> +<translation id="7232962679391151113">{BOOKMARK_COUNT,plural, =1{1 preferito e altri elementi sono salvati solo su questo dispositivo. Per usarli sugli altri dispositivi, salvali nel tuo Account Google.}other{{BOOKMARK_COUNT} preferiti e altri elementi sono salvati solo su questo dispositivo. Per usarli sugli altri dispositivi, salvali nel tuo Account Google.}}</translation> <translation id="723343421145275488">Cerca immagini con <ph name="VISUAL_SEARCH_PROVIDER" /></translation> <translation id="7234010996000898150">Annullamento del ripristino di Linux</translation> <translation id="7235305658956131898">App per Android installata dall'amministratore del dispositivo.</translation> @@ -8866,6 +8873,7 @@ <translation id="7327989755579928735"><ph name="MANAGER" /> ha disattivato il debug ADB. Dopo il riavvio del dispositivo <ph name="DEVICE_TYPE" /> non potrai installare app tramite sideload.</translation> <translation id="7328119182036084494">Elemento salvato su <ph name="WEB_DRIVE" /></translation> <translation id="7328162502911382168">(<ph name="COUNT" />)</translation> +<translation id="732845903678043302">{BOOKMARK_COUNT,plural, =1{1 preferito è salvato solo su questo dispositivo. Per usarlo sugli altri dispositivi, salvalo nel tuo Account Google.}other{{BOOKMARK_COUNT} preferiti sono salvati solo su questo dispositivo. Per usarli sugli altri dispositivi, salvali nel tuo Account Google.}}</translation> <translation id="7328867076235380839">Combinazione non valida</translation> <translation id="7329154610228416156">Accesso non riuscito perché è stato configurato l'utilizzo di un URL non protetto (<ph name="BLOCKED_URL" />). Contatta l'amministratore.</translation> <translation id="7330533963640151632">Impostazioni di <ph name="FEATURE_NAME" /> per il dispositivo di <ph name="USER_NAME" />, condivisione con l'account <ph name="USER_EMAIL" />.</translation> @@ -10409,6 +10417,7 @@ <translation id="8398877366907290961">Procedi comunque</translation> <translation id="8399282673057829204">Visualizza password</translation> <translation id="839949601275221554">Si è verificato un errore con il dispositivo. Riavvia il dispositivo e riprova.</translation> +<translation id="8399889560226245071">{SELECTED_ITEMS,plural, =0{Preferiti}=1{Preferito ({SELECTED_ITEMS})}other{Preferiti ({SELECTED_ITEMS})}}</translation> <translation id="8401432541486058167">Specifica il PIN associato alla tua smart card.</translation> <translation id="8403807918453631441"><ph name="BRAND" /> può controllare le tue password se le salvi</translation> <translation id="8405046151008197676">Scopri le novità principali dell'ultimo aggiornamento</translation> @@ -11663,6 +11672,7 @@ <translation id="97905529126098460">Questa finestra verrà chiusa una volta completato l'annullamento.</translation> <translation id="980731642137034229">Pulsante del menu azione</translation> <translation id="981121421437150478">Offline</translation> +<translation id="982083952953998237">Aggiungi vincoli</translation> <translation id="98235653036850093">Ciao <ph name="PROFILE_NAME" /></translation> <translation id="983192555821071799">Chiudi tutte le schede</translation> <translation id="983531994960412650"><ph name="WINDOW_TITLE" /> - Registrazione con videocamera e microfono</translation>
diff --git a/chrome/app/resources/generated_resources_iw.xtb b/chrome/app/resources/generated_resources_iw.xtb index 59b5d63..dcc1afb 100644 --- a/chrome/app/resources/generated_resources_iw.xtb +++ b/chrome/app/resources/generated_resources_iw.xtb
@@ -669,7 +669,6 @@ <translation id="1464258312790801189">החשבונות שלך</translation> <translation id="1464597059227482327">אם משתפים עם Chromebook שלא רשום באנשי הקשר, צריך לוודא שהמצב 'גישה בסביבה' פועל ב-Chromebook. כדי להפעיל את מצב 'גישה בסביבה', בוחרים בפינה השמאלית התחתונה ואז באפשרות 'גישה בסביבה'. <ph name="LINK_BEGIN" />מידע נוסף<ph name="LINK_END" /></translation> <translation id="1464781208867302907">דרך ההגדרות אפשר לגשת להעדפות המכשיר.</translation> -<translation id="146481294006497945">אין סיסמאות שמורות</translation> <translation id="1465176863081977902">העתקת כתובת &אודיו</translation> <translation id="146522654774760805">סיסמאות ומילוי אוטומטי</translation> <translation id="1465827627707997754">משולש פיצה</translation> @@ -2177,7 +2176,6 @@ <translation id="2485394160472549611">המלצות בשבילך</translation> <translation id="2485422356828889247">הסרה</translation> <translation id="2485681265915754872">התנאים וההגבלות של Google Play</translation> -<translation id="2486036712620651117">סיסמאות ומפתחות גישה</translation> <translation id="248676429071089168">החלקה למעלה להזזת הדף למטה</translation> <translation id="2487067538648443797">הוספת סימנייה חדשה</translation> <translation id="2489686758589235262">הקצאת 2 מתגים נוספים</translation> @@ -3900,7 +3898,6 @@ <translation id="3721178866505920080">מידע נוסף על הפעלת האפשרות 'טעינה מורחבת מראש'</translation> <translation id="3722108462506185496">קרתה שגיאה בהפעלת שירות המכונה הווירטואלית. צריך לנסות שוב.</translation> <translation id="3722624153992426516">התקבלה הוראה של <ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /></translation> -<translation id="3724897774652282549">מילוי הטופס</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">רשתות Wi-Fi זמינות</translation> @@ -4333,7 +4330,6 @@ <translation id="3993887353483242788">צריך לסנכרן את <ph name="DEVICE_TYPE" /> כדי שההעדפות שלך יהיו מוכנות בכל המכשירים בעת הכניסה לחשבון Google. ההעדפות מתייחסות לאפליקציות, להגדרות, לסיסמאות ל-Wi-Fi, לשפות, לטפט, למקשי קיצור ועוד.</translation> <translation id="3994318741694670028">לצערנו, המחשב שלך מוגדר באמצעות מזהה חומרה פגום. המצב הזה מונע מ-ChromeOS Flex להתקין את עדכוני האבטחה האחרונים, <ph name="BEGIN_BOLD" />ויכול להיות שהמחשב שלך יהיה חשוף להתקפות זדוניות<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">עליך לבטל את נעילת הטלפון ולקרב אותו ל-<ph name="DEVICE_TYPE" /> כדי לבטל את הנעילה שלו.</translation> -<translation id="3994522032746736727">כניסה בתור <ph name="EMAIL" /></translation> <translation id="3994530503403062649">איתור לחצנים בטאבלט</translation> <translation id="3994708120330953242">חלק מהסיסמאות שלך נחשפו בפרצה באבטחת מידע. כדי לאבטח את החשבונות שלך, עליך לשנות את הסיסמאות האלה עכשיו.</translation> <translation id="3994878504415702912">מרחק מתצוגה</translation> @@ -6605,7 +6601,6 @@ <translation id="5646994841348250879">צריך לבחור חשבון כדי להיכנס לאתר <ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">שקע מיקרופון</translation> <translation id="5648166631817621825">מהשבוע האחרון</translation> -<translation id="5650537073531199882">מילוי הטופס</translation> <translation id="5651308944918885595">יכולת גילוי של 'שיתוף בקרבת מקום'</translation> <translation id="5653154844073528838">יש לך <ph name="PRINTER_COUNT" /> מדפסות שמורות.</translation> <translation id="5654669866168491665">מידע נוסף על אתרים שעשויים לא לפעול כשחוסמים קובצי Cookie של צדדים שלישיים</translation> @@ -8609,6 +8604,7 @@ <translation id="7113974454301513811">עכשיו צריך להוסיף את הכרטיסייה הנוכחית לרשימה</translation> <translation id="7114054701490058191">הסיסמאות לא תואמות</translation> <translation id="7114648273807173152">כדי להשתמש ב-Smart Lock על מנת להיכנס אל חשבון Google צריך לעבור אל 'הגדרות' > 'מכשירים מחוברים' > 'הטלפון שלך' > Smart Lock.</translation> +<translation id="7115051913071512405">נסה את זה</translation> <translation id="7115361495406486998">אין אנשי קשר זמינים</translation> <translation id="7115731767122970828">שיפור עכשיו</translation> <translation id="7116554090938189816">פג התוקף של אישור ה-SSL של המדפסת. צריך להפעיל את המדפסת מחדש ולנסות שוב.</translation>
diff --git a/chrome/app/resources/generated_resources_ja.xtb b/chrome/app/resources/generated_resources_ja.xtb index 543ed722..e8d5673 100644 --- a/chrome/app/resources/generated_resources_ja.xtb +++ b/chrome/app/resources/generated_resources_ja.xtb
@@ -666,7 +666,6 @@ <translation id="1464258312790801189">お使いのアカウント</translation> <translation id="1464597059227482327">連絡先に登録されていない Chromebook と共有する場合は、その Chromebook で [周辺ユーザーによる検出] がオンになっていることを確認してください。[周辺ユーザーによる検出] をオンにするには、右下の隅を選択してから [周辺ユーザーによる検出] をオンにします。<ph name="LINK_BEGIN" />詳細<ph name="LINK_END" /></translation> <translation id="1464781208867302907">デバイス設定を行うには、[設定] に移動してください。</translation> -<translation id="146481294006497945">保存したパスワードはありません</translation> <translation id="1465176863081977902">オーディオ アドレスをコピー(&C)</translation> <translation id="146522654774760805">パスワードと自動入力</translation> <translation id="1465827627707997754">ピザ</translation> @@ -2160,7 +2159,6 @@ <translation id="2485394160472549611">あなたへのおすすめ</translation> <translation id="2485422356828889247">アンインストール</translation> <translation id="2485681265915754872">Google Play 利用規約</translation> -<translation id="2486036712620651117">パスワードとパスキー</translation> <translation id="248676429071089168">上にスワイプすると、ページ下部に移動します</translation> <translation id="2487067538648443797">新しいブックマークを追加</translation> <translation id="2489686758589235262">スイッチを 2 つ追加で割り当てる</translation> @@ -3879,7 +3877,6 @@ <translation id="3721178866505920080">拡張プリロードの有効化の詳細</translation> <translation id="3722108462506185496">仮想マシンサービスの起動中にエラーが発生しました。もう一度お試しください。</translation> <translation id="3722624153992426516"><ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /> の指示を受信しました</translation> -<translation id="3724897774652282549">フォームに入力</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">利用可能な Wi-Fi ネットワーク</translation> @@ -4312,7 +4309,6 @@ <translation id="3993887353483242788"><ph name="DEVICE_TYPE" /> を同期すると、Google アカウントでログインする他のデバイスでご自分の環境設定を使用できるようになります。環境設定には、アプリ、設定、Wi-Fi パスワード、言語、壁紙、キーボード ショートカットなどが含まれます。</translation> <translation id="3994318741694670028">パソコンに設定されているハードウェア ID の形式が正しくありません。このため、ChromeOS Flex に最新のセキュリティ修正を適用することができません。お使いのパソコンは、<ph name="BEGIN_BOLD" />悪意のある攻撃を受けやすくなる可能性があります<ph name="END_BOLD" />。</translation> <translation id="3994374631886003300"><ph name="DEVICE_TYPE" /> のロックを解除するには、スマートフォンのロックを解除してデバイスに近づけます。</translation> -<translation id="3994522032746736727"><ph name="EMAIL" /> としてログイン</translation> <translation id="3994530503403062649">タブレットのボタン設定</translation> <translation id="3994708120330953242">パスワードの一部がデータ侵害で漏洩しました。これらのパスワードを今すぐ変更して、アカウントを保護してください。</translation> <translation id="3994878504415702912">ズーム(&Z)</translation> @@ -6576,7 +6572,6 @@ <translation id="5646994841348250879"><ph name="SITE_ETLD_PLUS_ONE" /> へのログイン用アカウントを選択してください</translation> <translation id="5648021990716966815">マイク差込口</translation> <translation id="5648166631817621825">過去 7 日間</translation> -<translation id="5650537073531199882">フォームに入力</translation> <translation id="5651308944918885595">ニアバイシェアの検出の許可</translation> <translation id="5653154844073528838">保存済みのプリンタは <ph name="PRINTER_COUNT" /> 件です。</translation> <translation id="5654669866168491665">サードパーティ Cookie をブロックした場合に動作しない可能性のあるサイトについての詳細</translation> @@ -8574,6 +8569,7 @@ <translation id="7113974454301513811">ここで現在のタブをリストに追加します</translation> <translation id="7114054701490058191">パスワードが一致しません</translation> <translation id="7114648273807173152">Smart Lock を使用して Google アカウントにログインするには、[設定] > [接続済みのデバイス] > [スマートフォン] > [Smart Lock] に移動します。</translation> +<translation id="7115051913071512405">試してみる</translation> <translation id="7115361495406486998">連絡先が見つかりませんでした</translation> <translation id="7115731767122970828">今すぐ向上</translation> <translation id="7116554090938189816">プリンタの SSL 証明書の有効期限が切れています。プリンタを再起動してもう一度お試しください。</translation>
diff --git a/chrome/app/resources/generated_resources_ka.xtb b/chrome/app/resources/generated_resources_ka.xtb index 552835da..f8191ed 100644 --- a/chrome/app/resources/generated_resources_ka.xtb +++ b/chrome/app/resources/generated_resources_ka.xtb
@@ -539,6 +539,7 @@ <translation id="1368603372088757436">Linux არ არის მხარდაჭერილი თქვენს <ph name="DEVICE_TYPE" />-ზე. <ph name="LINK_BEGIN" />შეიტყვეთ მეტი<ph name="LINK_END" /></translation> <translation id="1370249617397887619">თქვენს სხვა მოწყობილობებზე მათ გამოსაყენებლად შეინახეთ ისინი თქვენს Google ანგარიშში.</translation> <translation id="1370384480654163477">იხილეთ და დაარედაქტირეთ ფაილები თქვენ მიერ ამ საიტის ბოლოს მონახულებიდან:</translation> +<translation id="1372259917802609049">შეზღუდვის წაშლა ვერ მოხერხდა შეცდომის გამო</translation> <translation id="1372841398847029212">თქვენს ანგარიშთან სინქრონიზაცია</translation> <translation id="1373176046406139583">თქვენი მოწყობილობის ხილვადობა განსაზღვრავს, თუ ვის შეუძლია თქვენთვის გაზიარება, როცა თქვენი ეკრანი განბლოკილია. <ph name="LINK_BEGIN" />შეიტყვეთ მეტი<ph name="LINK_END" /></translation> <translation id="1374844444528092021">„<ph name="NETWORK_NAME" />“ ქსელის მიერ მოთხოვნილი სერთიფიკატი ან არ არის დაყენებული ან აღარ მოქმედებს. გთხოვთ, მიიღოთ ახალი სერტიფიკატი და ხელახლა სცადოთ დაკავშირება.</translation> @@ -666,7 +667,6 @@ <translation id="1464258312790801189">თქვენი ანგარიშები</translation> <translation id="1464597059227482327">თუ კონტენტს უზიარებთ Chromebook-ს, რომელიც თქვენს კონტაქტებში არ არის, დარწმუნდით, რომ მასზე ჩართულია „ახლომახლო ხილვადობა“. „ახლომახლო ხილვადობის“ ჩასართავად აირჩიეთ ქვედა მარცხენა კუთხე, შემდეგ კი — „ახლომახლო ხილვადობის“ ჩართვა. <ph name="LINK_BEGIN" />შეიტყვეთ მეტი<ph name="LINK_END" /></translation> <translation id="1464781208867302907">მოწყობილობის უპირატესი პარამეტრებისთვის გადადით პარამეტრებზე.</translation> -<translation id="146481294006497945">შენახული პაროლები არ არის</translation> <translation id="1465176863081977902">აუდიოს მისამართის კ&ოპირება</translation> <translation id="146522654774760805">პაროლები და ავტომატური შევსება</translation> <translation id="1465827627707997754">პიცის ნაჭერი</translation> @@ -1480,6 +1480,7 @@ ეს ქმედება არ აისახება სხვა მოწყობილობებზე არსებულ აპებსა თუ კონტენტზე.</translation> <translation id="2018189721942291407">ზუსტად არ იცით, გჭირდებათ თუ არა რეგისტრაცია?</translation> <translation id="2018352199541442911">სამწუხაროდ, თქვენს გარე მეხსიერების მოწყობილობას ამჟამად არ აქვს მხარდაჭერა.</translation> +<translation id="2019213483156307334">შეზღუდვის დამატება ვერ მოხერხდა შეცდომის გამო</translation> <translation id="2019718679933488176">აუდიოს &გახსნა ახალ ჩანართზე</translation> <translation id="2020183425253392403">ქსელის მისამართის პარამეტრების ჩვენება</translation> <translation id="2020225359413970060">ფაილის სკანირება</translation> @@ -2165,7 +2166,6 @@ <translation id="2485394160472549611">საუკეთესო რეკომენდაციები თქვენთვის</translation> <translation id="2485422356828889247">დეინსტალაცია</translation> <translation id="2485681265915754872">Google Play-ს მომსახურების პირობები</translation> -<translation id="2486036712620651117">პაროლები და წვდომის გასაღებები</translation> <translation id="248676429071089168">ზემოთ გადაფურცვლა გვერდის ჩამოსაწევად</translation> <translation id="2487067538648443797">ახალი სანიშნის დამატება</translation> <translation id="2489686758589235262">კიდევ 2 გადამრთველის მიკუთვნება</translation> @@ -3144,6 +3144,7 @@ <translation id="3188257591659621405">ჩემი ფაილები</translation> <translation id="3188465121994729530">საშუალო გადაადგილება</translation> <translation id="3189187154924005138">დიდი კურსორი</translation> +<translation id="3189533916970342007">{PASSWORD_COUNT,plural, =1{1 პაროლი და სხვა ერთეულები შენახულია მხოლოდ ამ მოწყობილობაზე. თქვენს სხვა მოწყობილობებზე მის გამოსაყენებლად შეინახეთ ის თქვენს Google ანგარიშში.}other{{PASSWORD_COUNT} პაროლი და სხვა ერთეულები შენახულია მხოლოდ ამ მოწყობილობაზე. თქვენს სხვა მოწყობილობებზე მათ გამოსაყენებლად შეინახეთ ის თქვენს Google ანგარიშში.}}</translation> <translation id="3190558889382726167">პაროლი შენახულია</translation> <translation id="3192586965067888278">დეტალურად აღწერეთ პრობლემა. გამოხმაურება გაეგზავნება Google-ს ადამიანის მიერ შემოწმებისთვის და ის, შესაძლოა, გამოყენებული იყოს Google-ის პროდუქტებისა თუ სერვისების გაუმჯობესებისა და შემუშავებისთვის.</translation> <translation id="3192947282887913208">აუდიო ფაილები</translation> @@ -3614,6 +3615,7 @@ <translation id="3537881477201137177">აღნიშნულის მოგვიანებით შეცვლა შესაძლებელია პარამეტრებიდან</translation> <translation id="3538066758857505094">Linux-ის დეინსტალაცია ვერ მოხერხდა. გთხოვთ, ცადოთ ხელახლა.</translation> <translation id="3539537154248488260">შთაგონების გადართვა</translation> +<translation id="3539791442352537591">ნდობის დონის სტატუსის ცვლილების შენახვა ვერ მოხერხდა შეცდომის გამო</translation> <translation id="3540173484406326944"><ph name="HOST_DEVICE_NAME" />-ის მეშვეობით ქსელი უზრუნველყოფილი არ არის</translation> <translation id="354060433403403521">ცვლადი დენის ადაპტერი</translation> <translation id="354068948465830244">საიტების მონაცემების წაკითხვისა და შეცვლის შესაძლებლობა</translation> @@ -3888,7 +3890,6 @@ <translation id="3721178866505920080">დამატებითი ინფორმაცია გაფართოებული წინასწარი ჩატვირთვის ჩართვის შესახებ</translation> <translation id="3722108462506185496">ვირტუალური მოწყობილობის სერვისის გაშვება ვერ მოხერხდა. გთხოვთ, ცადოთ ხელახლა.</translation> <translation id="3722624153992426516">მიღებულია <ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /> ინსტრუქცია</translation> -<translation id="3724897774652282549">ფორმის შევსება</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">ხელმისაწვდომი Wi-Fi ქსელები</translation> @@ -4321,7 +4322,6 @@ <translation id="3993887353483242788">შეასრულეთ თქვენი <ph name="DEVICE_TYPE" />-ის სინქრონიზაცია, რათა თქვენი შენახული პარამეტრები გამოსაყენებლად მზად იყოს ნებისმიერ მოწყობილობაზე, რომელშიც თქვენი Google ანგარიშით შეხვალთ. აღნიშნული მოიცავს აპებს, პარამეტრებს, Wi-Fi პაროლებს, ენებს, ფონს, კლავიატურის მალსახმობებსა და სხვას.</translation> <translation id="3994318741694670028">სამწუხაროდ, თქვენი კომპიუტერი კონფიგურირებულია აპარატურის არასწორად ფორმირებული ID-თი. ეს ხელს უშლის ChromeOS Flex-ში უსაფრთხოების უახლესი შესწორებების დაყენებას, რის გამოც თქვენი კომპიუტერი <ph name="BEGIN_BOLD" />შეიძლება გახდეს მავნე პროგრამების მხრიდან შეტევების ობიექტი<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300"><ph name="DEVICE_TYPE" />-ის განსაბლოკად მოაახლოვეთ და განბლოკეთ თქვენი ტელეფონი.</translation> -<translation id="3994522032746736727">შედით, როგორც <ph name="EMAIL" /></translation> <translation id="3994530503403062649">განსაზღვრეთ თქვენი ტაბლეტის ღილაკები</translation> <translation id="3994708120330953242">თქვენი ზოგიერთი პაროლი ნაპოვნია გაჟონილ პერსონალურ მონაცემებში. თქვენი ანგარიშების დაცვის მიზნით, აღნიშნული პაროლები ახლავე უნდა შეცვალოთ.</translation> <translation id="3994878504415702912">&მასშტაბი</translation> @@ -4805,6 +4805,7 @@ <translation id="4361745360460842907">გახსენით როგორც ჩანართი</translation> <translation id="4363262124589131906">„ჩემი Drive“-იდან ახალი ფაილები აღარ იქნება ავტომატურად სინქრონიზებული ამ Chromebook-თან</translation> <translation id="4364327530094270451">ნესვი</translation> +<translation id="4364417397164696363">{ITEM_COUNT,plural, =1{1 ერთეული შენახულია მხოლოდ ამ მოწყობილობაზე. თქვენს სხვა მოწყობილობებზე მის გამოსაყენებლად შეინახეთ ის თქვენს Google ანგარიშში.}other{{ITEM_COUNT} ერთეული შენახულია მხოლოდ ამ მოწყობილობაზე. თქვენს სხვა მოწყობილობებზე მათ გამოსაყენებლად შეინახეთ ის თქვენს Google ანგარიშში.}}</translation> <translation id="4364567974334641491"><ph name="APP_NAME" /> ფანჯარას აზიარებს.</translation> <translation id="4364830672918311045">შეტყობინებების ჩვენება</translation> <translation id="4367971618859387374">საჩვენებელი სახელი</translation> @@ -5727,6 +5728,7 @@ <translation id="5029287942302939687">თქვენი პაროლი დაყენდა</translation> <translation id="5029873138381728058">ვირტუალური მოწყობილობების შემოწმება ვერ მოხერხდა</translation> <translation id="503155457707535043">მიმდინარეობს აპების ჩამოტვირთვა</translation> +<translation id="5031769842769721381">{SELECTED_ITEMS,plural, =0{მისამართები}=1{მისამართი ({SELECTED_ITEMS})}other{მისამართი ({SELECTED_ITEMS})}}</translation> <translation id="5032430150487044192">QR კოდის შექმნა ვერ მოხერხდა</translation> <translation id="5033137252639132982">მოძრაობის სენსორების გამოყენება დაუშვებელია</translation> <translation id="5035846135112863536"><ph name="IDENTITY_PROVIDER_ETLD_PLUS_ONE" />-დან დამატებითი ინფორმაციის მისაღებად ქვემოთ აირჩიეთ „დაწვრილებით“.</translation> @@ -6476,6 +6478,7 @@ <translation id="5568069709869097550">სისტემაში შესვლა ვერ მოხერხდა</translation> <translation id="5568525251731145240">გსურთ, წაშალოთ საიტების მონაცემები და ნებართვები როგორც <ph name="SITE_NAME" />-ის, ისე მასთან დაკავშირებული ყველა საიტისთვისა და დაინსტალირებული აპისთვის?</translation> <translation id="5568602038816065197">საიტებს შეუძლია თქვენი მოწყობილობისთვის ხელმისაწვდომი ნებისმიერი პრინტერის გაფართოებული ფუნქციების გამოყენება, ბეჭდვის სტანდარტული მოთხოვნის პროცესის გავლის გარეშე</translation> +<translation id="5570149859473005144">{SELECTED_ITEMS,plural, =0{პაროლები}=1{პაროლები ({SELECTED_ITEMS})}other{პაროლები ({SELECTED_ITEMS})}}</translation> <translation id="5571066253365925590">Bluetooth ჩართულია</translation> <translation id="5571092938913434726">მედიის მართვის გლობალური საშუალებები</translation> <translation id="5571832155627049070">მოირგეთ პროფილი</translation> @@ -6593,7 +6596,6 @@ <translation id="5646994841348250879">აირჩიეთ ანგარიში <ph name="SITE_ETLD_PLUS_ONE" />-ში შესასვლელად</translation> <translation id="5648021990716966815">მიკროფონის ჯეკი</translation> <translation id="5648166631817621825">ბოლო 7 დღე</translation> -<translation id="5650537073531199882">ფორმის შევსება</translation> <translation id="5651308944918885595">მახლობლად გაზიარების აღმოჩენადობა</translation> <translation id="5653154844073528838">თქვენ გაქვთ <ph name="PRINTER_COUNT" /> შენახული პრინტერი.</translation> <translation id="5654669866168491665">შეიტყვეთ მეტი იმ საიტების შესახებ, რომლებმაც, შესაძლოა, არ იმუშაოს, როცა მესამე მხარის ქუქი-ჩანაწერები დაბლოკილია</translation> @@ -6981,6 +6983,7 @@ <translation id="5941153596444580863">მომხმარებლის დამატება…</translation> <translation id="5941343993301164315">შედით <ph name="TOKEN_NAME" />-ში.</translation> <translation id="5941711191222866238">ჩაკეცვა</translation> +<translation id="5941854976565320351">{PASSWORD_COUNT,plural, =1{1 პაროლი შენახულია მხოლოდ ამ მოწყობილობაზე. თქვენს სხვა მოწყობილობებზე მის გამოსაყენებლად შეინახეთ ის თქვენს Google ანგარიშში.}other{{PASSWORD_COUNT} პაროლი შენახულია მხოლოდ ამ მოწყობილობაზე. თქვენს სხვა მოწყობილობებზე მათ გამოსაყენებლად შეინახეთ ის თქვენს Google ანგარიშში.}}</translation> <translation id="594221546068848596">გვერდში ძიება <ph name="VISUAL_SEARCH_PROVIDER" />-ით</translation> <translation id="5942779427914696408">მოწყობილობის ხილვადობა</translation> <translation id="5943127421590245687">დადასტურება წარმატებით დასრულდა. თქვენი ლოკალური მონაცემების განსაბლოკად და აღსადგენად, შეიყვანეთ <ph name="DEVICE_TYPE" />-ის ძველი პაროლი.</translation> @@ -8497,6 +8500,7 @@ <translation id="7036706669646341689">Linux-ისთვის რეკომენდებულია მინიმუმ <ph name="DISK_SIZE" />. მეხსიერების გათავისუფლება შეგიძლიათ მოწყობილობიდან ფაილების წაშლით.</translation> <translation id="7037157058268992880">PIN-კოდი დამავიწყდა</translation> <translation id="7037509989619051237">გადასახედი ტექსტი</translation> +<translation id="7037633074390821254">DNS ან CIDR შეზღუდვა</translation> <translation id="7038632520572155338">გადამრთველით წვდომა</translation> <translation id="7038710352229712897">დაამატეთ კიდევ ერთი Google ანგარიში <ph name="USER_NAME" />-ისთვის</translation> <translation id="7039326228527141150"><ph name="VENDOR_NAME" />-საგან USB მოწყობილობებზე წვდომა</translation> @@ -8592,6 +8596,7 @@ <translation id="7113974454301513811">ახლა დაამატეთ ამჟამინდელი ჩანართი თქვენს სიას</translation> <translation id="7114054701490058191">პაროლები არ ემთხვევა</translation> <translation id="7114648273807173152">თქვენს Google ანგარიშში Smart Lock-ის მეშვეობით შესასვლელად გადადით აქ: პარამეტრები > დაკავშირებული მოწყობილობები > თქვენი ტელეფონი > Smart Lock.</translation> +<translation id="7115051913071512405">შეამოწმეთ ეს</translation> <translation id="7115361495406486998">კონტაქტები მიუწვდომელია</translation> <translation id="7115731767122970828">ახლავე გაძლიერება</translation> <translation id="7116554090938189816">პრინტერის SSL სერტიფიკატს მოქმედების ვადა გაუვიდა. გადატვირთეთ პრინტერი და ხელახლა ცადეთ.</translation> @@ -8623,6 +8628,7 @@ <translation id="7134951043985383439">ჩამოტვირთულია სახიფათო ფაილი</translation> <translation id="7135729336746831607">გსურთ Bluetooth-ის ჩართვა?</translation> <translation id="7136694880210472378">აქციეთ ნაგულისხმევად</translation> +<translation id="7137277889990479760">გაგრძელება, როგორც <ph name="EMAIL" /></translation> <translation id="7137771508221868414">ამ მოქმედებით წაიშლება საიტებისა და დაინსტალირებული აპების მიერ შენახული მონაცემების <ph name="TOTAL_USAGE" /></translation> <translation id="7138678301420049075">სხვა</translation> <translation id="7139627972753429585"><ph name="APP_NAME" /> იყენებს თქვენს მიკროფონს</translation> @@ -8744,6 +8750,7 @@ <translation id="7231260028442989757">ნახეთ და დახურეთ თქვენი ტელეფონის შეტყობინებები, ასევე, უპასუხეთ მათ</translation> <translation id="7231347196745816203"><ph name="DEVICE_TYPE" />-ის განბლოკვა თქვენი ტელეფონის მეშვეობით.</translation> <translation id="7232750842195536390">გადარქმევა ვერ მოხერხდა</translation> +<translation id="7232962679391151113">{BOOKMARK_COUNT,plural, =1{1 სანიშნე და სხვა ერთეულები შენახულია მხოლოდ ამ მოწყობილობაზე. თქვენს სხვა მოწყობილობებზე მის გამოსაყენებლად შეინახეთ ის თქვენს Google ანგარიშში.}other{{BOOKMARK_COUNT} სანიშნე და სხვა ერთეულები შენახულია მხოლოდ ამ მოწყობილობაზე. თქვენს სხვა მოწყობილობებზე მათ გამოსაყენებლად შეინახეთ ის თქვენს Google ანგარიშში.}}</translation> <translation id="723343421145275488">მოიძიეთ სურათები <ph name="VISUAL_SEARCH_PROVIDER" />-ით</translation> <translation id="7234010996000898150">მიმდინარეობს Linux აღდგენის გაუქმება</translation> <translation id="7235305658956131898">Android აპი დაყენებულია თქვენი მოწყობილობის ადმინისტრატორის მიერ.</translation> @@ -8870,6 +8877,7 @@ <translation id="7327989755579928735"><ph name="MANAGER" />-მა გაითიშა ADB გამართვა. <ph name="DEVICE_TYPE" />-ის გადატვირთვის შემდეგ აპების გარეშე წყაროდან ჩატვირთვას ვეღარ მოახერხებთ.</translation> <translation id="7328119182036084494">შენახულია <ph name="WEB_DRIVE" />-ში</translation> <translation id="7328162502911382168">(<ph name="COUNT" />)</translation> +<translation id="732845903678043302">{BOOKMARK_COUNT,plural, =1{1 სანიშნე შენახულია მხოლოდ ამ მოწყობილობაზე. თქვენს სხვა მოწყობილობებზე მის გამოსაყენებლად შეინახეთ ის თქვენს Google ანგარიშში.}other{{BOOKMARK_COUNT} სანიშნე შენახულია მხოლოდ ამ მოწყობილობაზე. თქვენს სხვა მოწყობილობებზე მათ გამოსაყენებლად შეინახეთ ის თქვენს Google ანგარიშში.}}</translation> <translation id="7328867076235380839">კომბინაცია არასწორია</translation> <translation id="7329154610228416156">შესვლა ვერ მოხერხდა, რადგან იგი არაუსაფრთხო URL-ის (<ph name="BLOCKED_URL" />) მეშვეობით დაკონფიგურირდა. გთხოვთ, დაუკავშირდეთ ადმინისტრატორს.</translation> <translation id="7330533963640151632">ფუნქციის „<ph name="FEATURE_NAME" />“ პარამეტრები <ph name="USER_NAME" />-ის მოწყობილობისთვის, გაზიარება ხორციელდება <ph name="USER_EMAIL" />-ის ანგარიშით.</translation> @@ -9200,6 +9208,7 @@ <translation id="7561196759112975576">ყოველთვის</translation> <translation id="7561759921596375678">ხმის ჩართვა</translation> <translation id="7561982940498449837">მენიუს დახურვა</translation> +<translation id="7563970324931922582">[ჩანაცვლების ველის ტექსტი]</translation> <translation id="756445078718366910">გახსენით ბრაუზერის ფანჯარა</translation> <translation id="7564847347806291057">პროცესის დასასრული</translation> <translation id="756503097602602175">სისტემაში შესული Google ანგარიშების მართვა შეგიძლიათ <ph name="LINK_BEGIN" />პარამეტრებიდან<ph name="LINK_END" />. ვებსაიტებისა და აპებისთვის მინიჭებული ნებართვები, შესაძლოა, ყველა ანგარიშზე ვრცელდებოდეს. თუ არ გსურთ, რომ საიტებსა თუ აპებს წვდომა ჰქონდეს თქვენი ანგარიშის ინფორმაციაზე, <ph name="DEVICE_TYPE" />-ში შესვლა შეგიძლიათ სტუმრის სტატუსით, ან ვები <ph name="LINK_2_BEGIN" />ინკოგნიტო რეჟიმში<ph name="LINK_2_END" /> დაათვალიეროთ.</translation> @@ -10411,6 +10420,7 @@ <translation id="8398877366907290961">მაინც გაგრძელება</translation> <translation id="8399282673057829204">პაროლის ნახვა</translation> <translation id="839949601275221554">ამ მოწყობილობამ დააფიქსირა შეცდომა. გადატვირთეთ მოწყობილობა და ცადეთ ხელახლა.</translation> +<translation id="8399889560226245071">{SELECTED_ITEMS,plural, =0{სანიშნეები}=1{სანიშნეები ({SELECTED_ITEMS})}other{სანიშნეები ({SELECTED_ITEMS})}}</translation> <translation id="8401432541486058167">მიუთითეთ PIN-კოდი, რომელიც დაკავშირებულია თქვენს სმარტ-ბარათთან.</translation> <translation id="8403807918453631441">პაროლების შემოწმებას <ph name="BRAND" /> შეძლებს მათი შენახვის შემდეგ</translation> <translation id="8405046151008197676">გაეცანით ძირითად სიახლეებს ბოლო განახლებაში</translation> @@ -10891,6 +10901,7 @@ <translation id="8737966899544698733">მდებარეობის სიზუსტე (მხოლოდ Android-ზე)</translation> <translation id="8738418093147087440">მოიძიეთ ქვეყნების, ენის ან შეყვანის სახელების მიხედვით</translation> <translation id="8740086188450289493">Google ანგარიშის პაროლის გამოყენება</translation> +<translation id="874023689350909633">ცდა</translation> <translation id="8740247629089392745">შეგიძლიათ გადასცეთ ეს Chromebook <ph name="SUPERVISED_USER_NAME" />-ს. დაყენება თითქმის დასრულდა, მომდევნო ეტაპი გაცნობაა.</translation> <translation id="8740672167979365981">საჭიროა ChromeOS Flex-ის განახლება</translation> <translation id="8741944563400125534">გადამრთველით წვდომის დაყენების სახელმძღვანელო</translation> @@ -11665,6 +11676,7 @@ <translation id="97905529126098460">გაუქმების დასრულების შემდეგ ეს ფანჯარა დაიხურება.</translation> <translation id="980731642137034229">ქმედებების მენიუს ღილაკი</translation> <translation id="981121421437150478">ოფლაინი</translation> +<translation id="982083952953998237">შეზღუდვის დამატება</translation> <translation id="98235653036850093">გამარჯობა, <ph name="PROFILE_NAME" /></translation> <translation id="983192555821071799">ყველა ჩანართის დახურვა</translation> <translation id="983531994960412650"><ph name="WINDOW_TITLE" /> — კამერა და მიკროფონი იწერს</translation>
diff --git a/chrome/app/resources/generated_resources_kk.xtb b/chrome/app/resources/generated_resources_kk.xtb index c2d6206..ac616c4 100644 --- a/chrome/app/resources/generated_resources_kk.xtb +++ b/chrome/app/resources/generated_resources_kk.xtb
@@ -666,7 +666,6 @@ <translation id="1464258312790801189">Аккаунттарыңыз</translation> <translation id="1464597059227482327">Егер контактілеріңізде жоқ Chromebook құрылғысымен бөлісетін болсаңыз, "Nearby көрсетілуі" қосулы екеніне көз жеткізіңіз. "Nearby көрсетілуі" мүмкіндігін қосу үшін төменгі оң жақ бұрышты таңдап, "Nearby көрсетілуі" мүмкіндігін қосуды таңдаңыз. <ph name="LINK_BEGIN" />Толық ақпарат<ph name="LINK_END" /></translation> <translation id="1464781208867302907">"Параметрлер" бөліміне өтіп, құрылғыда қалаған параметрді таңдай аласыз.</translation> -<translation id="146481294006497945">Ешқандай құпия сөз сақталмаған</translation> <translation id="1465176863081977902">Аудиофайл мекенжайын к&өшіру</translation> <translation id="146522654774760805">Құпия сөздер және автотолтыру</translation> <translation id="1465827627707997754">Пицца тілімі</translation> @@ -2162,7 +2161,6 @@ <translation id="2485394160472549611">Сіз үшін таңдалған үздіктер</translation> <translation id="2485422356828889247">Жою</translation> <translation id="2485681265915754872">Google Play Қызмет көрсету шарттары</translation> -<translation id="2486036712620651117">Құпия сөздер мен кіру кілттері</translation> <translation id="248676429071089168">Бетті төмен жылжыту үшін жоғары қарай сырғытыңыз</translation> <translation id="2487067538648443797">Жаңа бетбелгі қосу</translation> <translation id="2489686758589235262">Тағы 2 ауыстырғыш тағайындау</translation> @@ -3883,7 +3881,6 @@ <translation id="3721178866505920080">Кеңейтілген алдын ала жүктеуді қосу туралы қосымша ақпарат</translation> <translation id="3722108462506185496">Виртуалдық құрылғы қызметін іске қосу кезінде қате шықты. Кейінірек қайталап көріңіз.</translation> <translation id="3722624153992426516"><ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /> нұсқауы алынды</translation> -<translation id="3724897774652282549">Үлгіні толтыру</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Қолжетімді WiFi желілері</translation> @@ -4316,7 +4313,6 @@ <translation id="3993887353483242788"><ph name="DEVICE_TYPE" /> құрылғыңызды синхрондасаңыз, Google аккаунтыңызбен кірген кезде, параметрлеріңіз кез келген құрылғыда дайын тұрады. Ол параметрлерге қолданбалар, Wi-Fi құпия сөздері, тілдер, тұсқағаздар, перне тіркесімдері және т.б. кіреді.</translation> <translation id="3994318741694670028">Өкінішке орай, компьютеріңіз бұзылған жабдық идентификаторымен конфигурацияланған. Бұл жайт ChromeOS Flex операциялық жүйесінің соңғы қауіпсіздік түзетулерімен жаңартылуына кедергі жасайды және компьютеріңіз <ph name="BEGIN_BOLD" />зиянды шабуылдардан қорғана алмауы мүмкін<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300"><ph name="DEVICE_TYPE" /> құрылғысының құлпын ашу үшін телефонның құлпын ашып, оны жақындатыңыз.</translation> -<translation id="3994522032746736727"><ph name="EMAIL" /> ретінде кіру</translation> <translation id="3994530503403062649">Планшеттен түймелерді табыңыз</translation> <translation id="3994708120330953242">Деректердің қолды болуы салдарынан кейбір құпия сөздеріңіз жария етілді. Аккаунттардың қауіпсіздігін арттыру үшін сол құпия сөздерді қазір өзгертуіңіз керек.</translation> <translation id="3994878504415702912">&Масштабтау</translation> @@ -6583,7 +6579,6 @@ <translation id="5646994841348250879"><ph name="SITE_ETLD_PLUS_ONE" /> сайтына кіру үшін аккаунт таңдаңыз</translation> <translation id="5648021990716966815">Микрофон ұяшығы</translation> <translation id="5648166631817621825">Соңғы 7 күн</translation> -<translation id="5650537073531199882">Үлгіні толтыру</translation> <translation id="5651308944918885595">Nearby Share функциясының көріну мүмкіндігі</translation> <translation id="5653154844073528838"><ph name="PRINTER_COUNT" /> принтер сақталған.</translation> <translation id="5654669866168491665">Үшінші тарап cookie файлдарын блоктаған кезде жұмыс істемеуі мүмкін сайттар туралы толық ақпарат</translation> @@ -8581,6 +8576,7 @@ <translation id="7113974454301513811">Енді тізімге ағымдағы қойындыны қосыңыз.</translation> <translation id="7114054701490058191">Құпия сөздер сәйкес емес</translation> <translation id="7114648273807173152">Smart Lock қолданбасын пайдалану үшін Google аккаунтыңызға кіріңіз. Ол үшін "Параметрлер > Жалғанған құрылғылар> Телефоныңыз> Smart Lock" тармағына өтіңіз.</translation> +<translation id="7115051913071512405">Оны пайдаланып көру</translation> <translation id="7115361495406486998">Қолжетімді контактілер жоқ</translation> <translation id="7115731767122970828">Қазір арттыру</translation> <translation id="7116554090938189816">Принтердің SSL сертификатының мерзімі біткен. Принтерді қайта іске қосып, әрекетті қайталаңыз.</translation>
diff --git a/chrome/app/resources/generated_resources_km.xtb b/chrome/app/resources/generated_resources_km.xtb index 26775d8..d9cdf05b 100644 --- a/chrome/app/resources/generated_resources_km.xtb +++ b/chrome/app/resources/generated_resources_km.xtb
@@ -667,7 +667,6 @@ <translation id="1464258312790801189">គណនីរបស់អ្នក</translation> <translation id="1464597059227482327">ប្រសិនបើអ្នកកំពុងចែករំលែកជាមួយ Chromebook ដែលមិនមាននៅក្នុងទំនាក់ទំនងរបស់អ្នកទេ សូមប្រាកដថា Chromebook នោះបានបើក “លទ្ធភាពមើលឃើញនៅជិត”។ ដើម្បីបើក “លទ្ធភាពមើលឃើញនៅជិត” សូមជ្រើសរើសជ្រុងខាងស្ដាំផ្នែកខាងក្រោម រួចជ្រើសរើសបើក “លទ្ធភាពមើលឃើញនៅជិត”។ <ph name="LINK_BEGIN" />ស្វែងយល់បន្ថែម<ph name="LINK_END" /></translation> <translation id="1464781208867302907">សម្រាប់ចំណូលចិត្តឧបករណ៍ សូមចូលទៅកាន់ការកំណត់។</translation> -<translation id="146481294006497945">មិនមានពាក្យសម្ងាត់ដែលបានរក្សាទុកទេ</translation> <translation id="1465176863081977902">ថតចម្លងអាសយដ្ឋានសំឡេង</translation> <translation id="146522654774760805">ពាក្យសម្ងាត់ និងការបំពេញស្វ័យប្រវត្តិ</translation> <translation id="1465827627707997754">ចំណិតភីហ្សា</translation> @@ -2178,7 +2177,6 @@ <translation id="2485394160472549611">ជម្រើសកំពូលសម្រាប់អ្នក</translation> <translation id="2485422356828889247">លុប</translation> <translation id="2485681265915754872">លក្ខខណ្ឌប្រើប្រាស់ Google Play</translation> -<translation id="2486036712620651117">ពាក្យសម្ងាត់ និងកូដសម្ងាត់</translation> <translation id="248676429071089168">អូសឡើងលើដើម្បីផ្លាស់ទីទំព័រចុះក្រោម</translation> <translation id="2487067538648443797">បន្ថែមចំណាំថ្មី</translation> <translation id="2489686758589235262">កំណត់ឧបករណ៍ចុច 2 ទៀត</translation> @@ -3899,7 +3897,6 @@ <translation id="3721178866505920080">ព័ត៌មានបន្ថែមអំពីការបើកការផ្ទុកជាមុនបន្ថែម</translation> <translation id="3722108462506185496">មានបញ្ហាក្នុងការចាប់ផ្ដើមសេវាកម្មម៉ាស៊ីននិម្មិត។ សូមព្យាយាមម្តងទៀត។</translation> <translation id="3722624153992426516">បានទទួលការណែនាំ <ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /></translation> -<translation id="3724897774652282549">បំពេញទម្រង់បែបបទ</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">បណ្ដាញ Wi-Fi ដែលមាន</translation> @@ -4332,7 +4329,6 @@ <translation id="3993887353483242788">ធ្វើសមកាលកម្ម <ph name="DEVICE_TYPE" /> របស់អ្នក ដូច្នេះចំណូលចិត្តរបស់អ្នកនឹងអាចប្រើបាននៅលើរាល់ឧបករណ៍ នៅពេលអ្នកចូលដោយប្រើគណនី Google របស់អ្នក។ ចំណូលចិត្តរួមមានកម្មវិធី, ការកំណត់, ពាក្យសម្ងាត់ Wi-Fi, ភាសា, ផ្ទាំងរូបភាព, ផ្លូវកាត់ក្ដារចុច និងអ្វីៗជាច្រើនទៀត។</translation> <translation id="3994318741694670028">គួរឱ្យសោកស្ដាយ កុំព្យូទ័ររបស់អ្នកត្រូវបានកំណត់រចនាសម្ព័ន្ធដោយប្រើលេខសម្គាល់ហាតវែរដែលមានទម្រង់មិនត្រឹមត្រូវ។ ករណីនេះអាចទប់ស្កាត់ ChromeOS Flex មិនឱ្យធ្វើបច្ចុប្បន្នភាពដោយប្រើដំណោះស្រាយសុវត្ថិភាពថ្មីបំផុត ហើយកុំព្យូទ័ររបស់អ្នក<ph name="BEGIN_BOLD" />អាចងាយរងគ្រោះដោយសារការវាយប្រហារដែលគ្រោះថ្នាក់<ph name="END_BOLD" />។</translation> <translation id="3994374631886003300">ដោះសោទូរសព្ទរបស់អ្នក រួចដាក់វាឲ្យកាន់តែជិត ដើម្បីដោះសោ <ph name="DEVICE_TYPE" /> របស់អ្នក។</translation> -<translation id="3994522032746736727">ចូលគណនីជា <ph name="EMAIL" /></translation> <translation id="3994530503403062649">កំណត់ទីតាំងប៊ូតុងនៅលើថេប្លេតរបស់អ្នក</translation> <translation id="3994708120330953242">ពាក្យសម្ងាត់មួយចំនួនរបស់អ្នកត្រូវបានរកឃើញនៅក្នុងការបែកធ្លាយទិន្នន័យ។ ដើម្បីរក្សាសុវត្ថិភាពគណនីរបស់អ្នក អ្នកគួរតែប្ដូរពាក្យសម្ងាត់ទាំងនេះឥឡូវនេះ។</translation> <translation id="3994878504415702912">ពង្រីក</translation> @@ -4623,6 +4619,7 @@ <translation id="4220648711404560261">មានបញ្ហាបានកើតឡើង អំឡុងពេលបើកដំណើរការ។</translation> <translation id="4222917615373664617">ការតាមដានតម្លៃត្រូវបានបើក។ តម្លៃស្មើ <ph name="CURRENT_PRICE" />។</translation> <translation id="4223404254440398437">មិនបានអនុញ្ញាតឱ្យប្រើមីក្រូហ្វូនទេ</translation> +<translation id="4224541845943007092">អាន និងរក្សាទុកធាតុចូលតាមក្ដារចុចពីរបារអាសយដ្ឋាន</translation> <translation id="4225397296022057997">នៅលើទំព័រទាំងអស់</translation> <translation id="4228071595943929139">ប្រើអាសយដ្ឋានអ៊ីមែលរបស់ស្ថាប័នអ្នក</translation> <translation id="4228209296591583948">{NUM_EXTENSIONS,plural, =1{កម្មវិធីបន្ថែមនេះមិនត្រូវបានអនុញ្ញាតទេ}other{កម្មវិធីបន្ថែមមួយចំនួនមិនត្រូវបានអនុញ្ញាតទេ}}</translation> @@ -6602,7 +6599,6 @@ <translation id="5646994841348250879">ជ្រើសរើសគណនីដើម្បីចូល <ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">ឌុយមីក្រូហ្វូន</translation> <translation id="5648166631817621825">7 ថ្ងៃមុន</translation> -<translation id="5650537073531199882">បំពេញទម្រង់បែបបទ</translation> <translation id="5651308944918885595">លទ្ធភាពរកឃើញការចែករំលែកនៅជិត</translation> <translation id="5653154844073528838">អ្នកមានម៉ាស៊ីនបោះពុម្ពដែលបានរក្សាទុក <ph name="PRINTER_COUNT" />។</translation> <translation id="5654669866168491665">ស្វែងយល់បន្ថែមអំពីគេហទំព័រដែលប្រហែលជាមិនដំណើរការ នៅពេលទប់ស្កាត់ខូគីភាគីទីបី</translation> @@ -8601,6 +8597,7 @@ <translation id="7113974454301513811">ឥឡូវនេះ បញ្ចូលផ្ទាំងបច្ចុប្បន្នទៅក្នុងបញ្ជីរបស់អ្នក</translation> <translation id="7114054701490058191">ពាក្យសម្ងាត់មិនត្រូវគ្នាទេ</translation> <translation id="7114648273807173152">ដើម្បីប្រើ Smart Lock សម្រាប់ចូលគណនី Google របស់អ្នក សូមចូលទៅកាន់ការកំណត់ > ឧបករណ៍ដែលបានភ្ជាប់ > ទូរសព្ទរបស់អ្នក > Smart Lock ។</translation> +<translation id="7115051913071512405">សាកល្បងវាមើល</translation> <translation id="7115361495406486998">គ្មានទំនាក់ទំនងដែលអាចភ្ជាប់បានទេ</translation> <translation id="7115731767122970828">បង្កើនល្បឿនឥឡូវនេះ</translation> <translation id="7116554090938189816">វិញ្ញាបនបត្រ SSL របស់ម៉ាស៊ីនបោះពុម្ពផុតកំណត់ហើយ។ សូមចាប់ផ្ដើមម៉ាស៊ីនបោះពុម្ពឡើងវិញ រួចព្យាយាមម្ដងទៀត។</translation>
diff --git a/chrome/app/resources/generated_resources_kn.xtb b/chrome/app/resources/generated_resources_kn.xtb index 4928b56..96e751e2 100644 --- a/chrome/app/resources/generated_resources_kn.xtb +++ b/chrome/app/resources/generated_resources_kn.xtb
@@ -668,7 +668,6 @@ <translation id="1464258312790801189">ನಿಮ್ಮ ಖಾತೆಗಳು</translation> <translation id="1464597059227482327">ನಿಮ್ಮ ಸಂಪರ್ಕಗಳಲ್ಲಿರದ Chromebook ಜೊತೆಗೆ ನೀವು ಹಂಚಿಕೊಳ್ಳುತ್ತಿದ್ದರೆ, ಅದು “ಸಮೀಪದ ಗೋಚರತೆ” ಫೀಚರ್ ಅನ್ನು ಆನ್ ಮಾಡಿರುವುದನ್ನು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ. "ಸಮೀಪದ ಗೋಚರತೆ" ಫೀಚರ್ ಅನ್ನು ಆನ್ ಮಾಡಲು, ಕೆಳಗಿನ ಬಲ ಮೂಲೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ ಮತ್ತು ನಂತರ "ಸಮೀಪದ ಗೋಚರತೆ" ಆನ್ ಮಾಡಲು ಆಯ್ಕೆಮಾಡಿ. <ph name="LINK_BEGIN" />ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ<ph name="LINK_END" /></translation> <translation id="1464781208867302907">ಸಾಧನದ ಪ್ರಾಶಸ್ತ್ಯಗಳಿಗಾಗಿ, ಸೆಟ್ಟಿಂಗ್ಗಳಿಗೆ ಹೋಗಿ.</translation> -<translation id="146481294006497945">ಸೇವ್ ಮಾಡಿರುವ ಯಾವುದೇ ಪಾಸ್ವರ್ಡ್ಗಳಿಲ್ಲ.</translation> <translation id="1465176863081977902">ಆಡಿಯೋ ವಿಳಾಸವನ್ನು ನ&ಕಲಿಸಿ</translation> <translation id="146522654774760805">ಪಾಸ್ವರ್ಡ್ಗಳು ಮತ್ತು ಆಟೋಫಿಲ್</translation> <translation id="1465827627707997754">ಪಿಜ್ಜಾ ಸ್ಲೈಸ್</translation> @@ -2171,7 +2170,6 @@ <translation id="2485394160472549611">ನಿಮಗಾಗಿ ಉತ್ಕೃಷ್ಟ ಆಯ್ಕೆಗಳು</translation> <translation id="2485422356828889247">ಅನ್ಇನ್ಸ್ಟಾಲ್</translation> <translation id="2485681265915754872">Google Play ಸೇವಾ ನಿಯಮಗಳು</translation> -<translation id="2486036712620651117">ಪಾಸ್ವರ್ಡ್ಗಳು ಮತ್ತು ಪಾಸ್ಕೀಗಳು</translation> <translation id="248676429071089168">ಪುಟವನ್ನು ಕೆಳಕ್ಕೆ ಸರಿಸಲು ಮೇಲಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ</translation> <translation id="2487067538648443797">ಹೊಸ ಬುಕ್ಮಾರ್ಕ್ ಸೇರಿಸಿ</translation> <translation id="2489686758589235262">ಇನ್ನೂ 2 ಸ್ವಿಚ್ಗಳನ್ನು ನಿಯೋಜಿಸಿ</translation> @@ -3893,7 +3891,6 @@ <translation id="3721178866505920080">ವಿಸ್ತರಿತ ಪ್ರಿಲೋಡಿಂಗ್ ಅನ್ನು ಆನ್ ಮಾಡುವ ಕುರಿತು ಹೆಚ್ಚಿನ ಮಾಹಿತಿ</translation> <translation id="3722108462506185496">ವರ್ಚುವಲ್ ಯಂತ್ರದ ಸೇವೆಯನ್ನು ಪ್ರಾರಂಭಿಸುವಲ್ಲಿ ದೋಷ ಕಂಡುಬಂದಿದೆ. ದಯವಿಟ್ಟು ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ.</translation> <translation id="3722624153992426516"><ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /> ಸೂಚನೆಯನ್ನು ಸ್ವೀಕರಿಸಲಾಗಿದೆ</translation> -<translation id="3724897774652282549">ಫಾರ್ಮ್ನಲ್ಲಿ ಭರ್ತಿ ಮಾಡಿ</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">ಲಭ್ಯವಿರುವ ವೈಫೈ ನೆಟ್ವರ್ಕ್ಗಳು</translation> @@ -4326,7 +4323,6 @@ <translation id="3993887353483242788">ನಿಮ್ಮ <ph name="DEVICE_TYPE" /> ಅನ್ನು ಸಿಂಕ್ ಮಾಡಿ ಇದರಿಂದ ನೀವು ನಿಮ್ಮ Google ಖಾತೆಯೊಂದಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಿದಾಗ ನಿಮ್ಮ ಆದ್ಯತೆಗಳು ಯಾವುದೇ ಸಾಧನದಲ್ಲಿ ಸಿದ್ಧವಾಗುತ್ತವೆ. ಆದ್ಯತೆಗಳು ಆ್ಯಪ್ಗಳು, ಸೆಟ್ಟಿಂಗ್ಗಳು, ವೈ-ಫೈ ಪಾಸ್ವರ್ಡ್ಗಳು, ಭಾಷೆಗಳು, ವಾಲ್ಪೇಪರ್, ಕೀಬೋರ್ಡ್ ಶಾರ್ಟ್ಕಟ್ಗಳು ಮತ್ತು ಹೆಚ್ಚಿನದನ್ನು ಒಳಗೊಂಡಿವೆ.</translation> <translation id="3994318741694670028">ದುರದೃಷ್ಟವಶಾತ್, ನಿಮ್ಮ ಕಂಪ್ಯೂಟರ್ ಅನ್ನು ಸರಿಯಾಗಿ ರೂಪುಗೊಳ್ಳದ ಹಾರ್ಡ್ವೇರ್ ID ಯ ಜೊತೆಗೆ ಕಾನ್ಫಿಗರ್ ಮಾಡಲಾಗಿದೆ. ಇದು ChromeOS Flex ಇತ್ತೀಚಿನ ಭದ್ರತಾ ಸರಿಪಡಿಸುವಿಕೆಗಳೊಂದಿಗೆ ಅಪ್ಡೇಟ್ ಆಗುವುದನ್ನು ತಡೆಗಟ್ಟುತ್ತದೆ ಮತ್ತು ನಿಮ್ಮ ಕಂಪ್ಯೂಟರ್ <ph name="BEGIN_BOLD" />ದುರುದ್ದೇಶಪ್ರೇರಿತ ದಾಳಿಗಳಿಗೆ ಗುರಿಯಾಗಬಹುದು<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಅನ್ಲಾಕ್ ಮಾಡಿ ಮತ್ತು ಅದನ್ನು ನಿಮ್ಮ <ph name="DEVICE_TYPE" /> ಸಾಧನದ ಹತ್ತಿರ ಇರಿಸಿ.</translation> -<translation id="3994522032746736727"><ph name="EMAIL" /> ಆಗಿ ಸೈನ್ ಇನ್ ಮಾಡಿ</translation> <translation id="3994530503403062649">ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ನಲ್ಲಿ ಬಟನ್ಗಳನ್ನು ಪತ್ತೆ ಮಾಡಿ</translation> <translation id="3994708120330953242">ನಿಮ್ಮ ಕೆಲವು ಪಾಸ್ವರ್ಡ್ಗಳು ಡೇಟಾ ಉಲ್ಲಂಘನೆಯಲ್ಲಿ ಕಂಡುಬಂದಿವೆ. ನಿಮ್ಮ ಖಾತೆಗಳನ್ನು ಸುರಕ್ಷಿತವಾಗಿರಿಸಲು, ಈಗಲೇ ನೀವು ಈ ಪಾಸ್ವರ್ಡ್ಗಳನ್ನು ಬದಲಾಯಿಸಬೇಕು.</translation> <translation id="3994878504415702912">&ಝೂಮ್</translation> @@ -6597,7 +6593,6 @@ <translation id="5646994841348250879"><ph name="SITE_ETLD_PLUS_ONE" /> ಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ಖಾತೆಯನ್ನು ಆರಿಸಿ</translation> <translation id="5648021990716966815">ಮೈಕ್ ಜ್ಯಾಕ್</translation> <translation id="5648166631817621825">ಕಳೆದ 7 ದಿನಗಳು</translation> -<translation id="5650537073531199882">ಫಾರ್ಮ್ನಲ್ಲಿ ಭರ್ತಿ ಮಾಡಿ</translation> <translation id="5651308944918885595">Nearby ಶೇರ್ ಪರಿಶೋಧಿಸುವಿಕೆ</translation> <translation id="5653154844073528838">ನೀವು <ph name="PRINTER_COUNT" /> ಪ್ರಿಂಟರ್ಗಳನ್ನು ಉಳಿಸಿದ್ದೀರಿ.</translation> <translation id="5654669866168491665">ಥರ್ಡ್-ಪಾರ್ಟಿ ಕುಕೀಗಳನ್ನು ನಿರ್ಬಂಧಿಸುವಾಗ ಕಾರ್ಯನಿರ್ವಹಿಸದಿರುವ ಸೈಟ್ಗಳ ಕುರಿತು ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ</translation> @@ -8600,6 +8595,7 @@ <translation id="7113974454301513811">ಈಗ ನಿಮ್ಮ ಪಟ್ಟಿಯಲ್ಲಿ ಪ್ರಸ್ತುತ ಟ್ಯಾಬ್ ಅನ್ನು ಸೇರಿಸಿ</translation> <translation id="7114054701490058191">ಪಾಸ್ವರ್ಡ್ಗಳು ಹೊಂದಾಣಿಕೆಯಾಗುವುದಿಲ್ಲ</translation> <translation id="7114648273807173152">ನಿಮ್ಮ Google ಖಾತೆಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು Smart Lock ಬಳಸುವುದಕ್ಕೆ, ಸೆಟ್ಟಿಂಗ್ಗಳು > ಸಂಪರ್ಕಗೊಂಡಿರುವ ಸಾಧನಗಳು > ನಿಮ್ಮ ಫೋನ್ > Smart Lock ಎಂಬಲ್ಲಿ ಹೋಗಿ.</translation> +<translation id="7115051913071512405">ಇದನ್ನು ಪ್ರಯತ್ನಿಸಿ</translation> <translation id="7115361495406486998">ಯಾವುದೇ ಸಂಪರ್ಕಗಳಿಗೆ ಕನೆಕ್ಟ್ ಆಗುತ್ತಿಲ್ಲ</translation> <translation id="7115731767122970828">ಈಗಲೇ ಬೂಸ್ಟ್ ಮಾಡಿ</translation> <translation id="7116554090938189816">ಪ್ರಿಂಟರ್ SSL ಪ್ರಮಾಣಪತ್ರದ ಅವಧಿ ಮೀರಿದೆ. ಪ್ರಿಂಟರ್ ಅನ್ನು ಮರುಪ್ರಾರಂಭಿಸಿ ಮತ್ತು ಪುನಃ ಪ್ರಯತ್ನಿಸಿ.</translation>
diff --git a/chrome/app/resources/generated_resources_ko.xtb b/chrome/app/resources/generated_resources_ko.xtb index 722ca624..959aa06 100644 --- a/chrome/app/resources/generated_resources_ko.xtb +++ b/chrome/app/resources/generated_resources_ko.xtb
@@ -667,7 +667,6 @@ <translation id="1464258312790801189">내 계정</translation> <translation id="1464597059227482327">연락처에 없는 Chromebook과 공유하는 경우 Chromebook에 'Nearby 공개 상태'가 사용 설정되어 있는지 확인하세요. 'Nearby 공개 상태'를 사용 설정하려면 오른쪽 하단을 선택하고 'Nearby 공개 상태'를 사용 설정하면 됩니다. <ph name="LINK_BEGIN" />자세히 알아보기<ph name="LINK_END" /></translation> <translation id="1464781208867302907">기기 환경설정을 보려면 설정으로 이동하세요.</translation> -<translation id="146481294006497945">저장된 비밀번호 없음</translation> <translation id="1465176863081977902">오디오 주소 복사(&O)</translation> <translation id="146522654774760805">비밀번호 및 자동 완성</translation> <translation id="1465827627707997754">피자 조각</translation> @@ -2180,7 +2179,6 @@ <translation id="2485394160472549611">추천</translation> <translation id="2485422356828889247">제거</translation> <translation id="2485681265915754872">Google Play 서비스 약관</translation> -<translation id="2486036712620651117">비밀번호 및 패스키</translation> <translation id="248676429071089168">위로 스와이프하여 페이지 아래로 이동</translation> <translation id="2487067538648443797">새 북마크 추가</translation> <translation id="2489686758589235262">추가 스위치 2개 할당</translation> @@ -3903,7 +3901,6 @@ <translation id="3721178866505920080">확장된 미리 로드 사용 설정에 관한 추가 정보</translation> <translation id="3722108462506185496">가상 머신 서비스를 시작하지 못했습니다. 다시 시도해 주세요.</translation> <translation id="3722624153992426516"><ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /> 안내 받음</translation> -<translation id="3724897774652282549">양식 작성</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">사용 가능한 Wi-Fi 네트워크</translation> @@ -4336,7 +4333,6 @@ <translation id="3993887353483242788">Google 계정으로 로그인했을 때 모든 기기에서 환경설정을 사용할 수 있도록 <ph name="DEVICE_TYPE" /> 기기를 동기화하세요. 환경설정에는 앱, 설정, Wi-Fi 비밀번호, 언어, 배경화면, 단축키 등이 포함됩니다.</translation> <translation id="3994318741694670028">컴퓨터가 잘못된 형식의 하드웨어 ID로 구성되어 있습니다. 이렇게 하면 ChromeOS Flex가 최신 보안 수정사항으로 업데이트되지 않으며 컴퓨터가 <ph name="BEGIN_BOLD" />악의적인 공격에 취약해질 수 있습니다<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300"><ph name="DEVICE_TYPE" />을(를) 잠금 해제하려면 휴대전화를 잠금 해제하고 더 가까이 가져오세요.</translation> -<translation id="3994522032746736727"><ph name="EMAIL" />(으)로 로그인</translation> <translation id="3994530503403062649">태블릿에서 버튼 찾기</translation> <translation id="3994708120330953242">일부 비밀번호가 정보 유출로 인해 노출된 것으로 확인되었습니다. 계정 보안을 유지하려면 지금 비밀번호를 변경해야 합니다.</translation> <translation id="3994878504415702912">글꼴 크기(&Z)</translation> @@ -6606,7 +6602,6 @@ <translation id="5646994841348250879"><ph name="SITE_ETLD_PLUS_ONE" />에 로그인하는 데 사용할 계정을 선택하세요.</translation> <translation id="5648021990716966815">마이크 잭</translation> <translation id="5648166631817621825">지난 7일</translation> -<translation id="5650537073531199882">양식 작성</translation> <translation id="5651308944918885595">Nearby Share 검색 가능 여부</translation> <translation id="5653154844073528838">저장된 프린터가 <ph name="PRINTER_COUNT" />대 있습니다.</translation> <translation id="5654669866168491665">서드 파티 쿠키를 차단하면 작동하지 않을 수 있는 사이트에 대해 자세히 알아보기</translation> @@ -8606,6 +8601,7 @@ <translation id="7113974454301513811">이제 목록에 현재 탭을 추가합니다.</translation> <translation id="7114054701490058191">비밀번호가 일치하지 않습니다.</translation> <translation id="7114648273807173152">Smart Lock을 사용해 Google 계정에 로그인하려면 설정 > 연결된 기기 > 휴대전화 > Smart Lock으로 이동하세요.</translation> +<translation id="7115051913071512405">사용해 보기</translation> <translation id="7115361495406486998">연락 가능한 연락처 없음</translation> <translation id="7115731767122970828">지금 향상</translation> <translation id="7116554090938189816">프린터 SSL 인증서가 만료되었습니다. 프린터를 다시 시작한 후 다시 시도해 보세요</translation>
diff --git a/chrome/app/resources/generated_resources_ky.xtb b/chrome/app/resources/generated_resources_ky.xtb index 8181073..456dd5f 100644 --- a/chrome/app/resources/generated_resources_ky.xtb +++ b/chrome/app/resources/generated_resources_ky.xtb
@@ -667,7 +667,6 @@ <translation id="1464258312790801189">Каттоо эсептериңиз</translation> <translation id="1464597059227482327">Байланыштарыңызда болбогон Chromebook менен бөлүшүп жатсаңыз, андагы "Nearby'да көрүнүү" параметрин күйгүзүү керек. Ал үчүн төмөнкү оң бурчту басып, ал параметрди тандаңыз. <ph name="LINK_BEGIN" />Кеңири маалымат<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Түзмөктөгү жеке параметрлерди өзгөртүү үчүн параметрлерге өтүңүз.</translation> -<translation id="146481294006497945">Сакталган сырсөздөр жок</translation> <translation id="1465176863081977902">А&удио дарегин көчүрүү</translation> <translation id="146522654774760805">Сырсөздөр жана автокиргизүү</translation> <translation id="1465827627707997754">Бир кесим пицца</translation> @@ -2178,7 +2177,6 @@ <translation id="2485394160472549611">Сиз үчүн тандалган видеолор</translation> <translation id="2485422356828889247">Орнотуудан чыгаруу</translation> <translation id="2485681265915754872">Google Play тейлөө шарттары</translation> -<translation id="2486036712620651117">Сырсөздөр жана киргизүүчү ачкычтар</translation> <translation id="248676429071089168">Баракты ылдый жылдыруу үчүн экранды өйдө сүрүңүз</translation> <translation id="2487067538648443797">Жаңы кыстарма кошуу</translation> <translation id="2489686758589235262">Дагы 2 которгучту дайындоо</translation> @@ -3901,7 +3899,6 @@ <translation id="3721178866505920080">Кеңейтилген алдын ала жүктөөнү күйгүзүү тууралуу кеңири маалымат</translation> <translation id="3722108462506185496">Виртуалдык машина кызматы иштеп баштабай калды. Кайталап көрүңүз.</translation> <translation id="3722624153992426516"><ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /> нускамасы алынды</translation> -<translation id="3724897774652282549">Форманы толтуруу</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Жеткиликтүү WiFi тармактары</translation> @@ -4334,7 +4331,6 @@ <translation id="3993887353483242788"><ph name="DEVICE_TYPE" /> түзмөгүңүздү шайкештирсеңиз, параметрлериңиз Google аккаунтуңуз менен кирген бардык түзмөктөрдө колдонулат. Параметрлерге колдонмолор, жөндөөлөр, Wi-Fi сырсөздөрү, тилдер, тушкагаз, ыкчам баскычтар жана башка нерселер кирет.</translation> <translation id="3994318741694670028">Тилекке каршы, компьютериңиз туура эмес форматтагы аппараттык камсыздоонун идентификатору менен конфигурацияланган. Ушундан улам, ChromeOS Flex эң акыркы коопсуздук чаралары менен жаңыртылбагандыктан, компьютериңиз <ph name="BEGIN_BOLD" />зыянкеч чабуулдардан коргоно албай калышы мүмкүн<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Телефонуңуздун кулпусун ачып туруп, <ph name="DEVICE_TYPE" /> түзмөгүн ачуу үчүн аны жакыныраак алып келиңиз.</translation> -<translation id="3994522032746736727"><ph name="EMAIL" /> аккаунту менен кириңиз</translation> <translation id="3994530503403062649">Планшетиңиздеги баскычтарды табыңыз</translation> <translation id="3994708120330953242">Сырсөздөрүңүздүн айрымдары уурдалганы белгилүү болду. Аккаунттарыңыздын коопсуздугун коргоо үчүн бул сырсөздөрдү азыр өзгөртүңүз.</translation> <translation id="3994878504415702912">&Ченөлчөм</translation> @@ -6605,7 +6601,6 @@ <translation id="5646994841348250879"><ph name="SITE_ETLD_PLUS_ONE" /> колдонмосуна кирүү үчүн аккаунт тандаңыз</translation> <translation id="5648021990716966815">Микрофондун оюкчасы</translation> <translation id="5648166631817621825">Акыркы 7 күн</translation> -<translation id="5650537073531199882">Форманы толтуруу</translation> <translation id="5651308944918885595">Nearby Share функциясынын көрүнүү параметрлери</translation> <translation id="5653154844073528838">Сакталган <ph name="PRINTER_COUNT" /> принтериңиз бар.</translation> <translation id="5654669866168491665">Үчүнчү тараптын cookie файлдары бөгөттөлгөндө иштебей калышы мүмкүн болгон сайттар жөнүндө маалымат алыңыз</translation> @@ -8604,6 +8599,7 @@ <translation id="7113974454301513811">Эми учурдагы өтмөктү тизмеңизге кошуңуз</translation> <translation id="7114054701490058191">Сырсөздөр дал келген жок</translation> <translation id="7114648273807173152">Google аккаунтуңузга кирүүгө Smart Lock'ту колдонуу үчүн Параметрлер > Байланышкан түзмөктөр > Телефонуңуз > Smart Lock'ко өтүңүз.</translation> +<translation id="7115051913071512405">Муну байкап көрүңүз</translation> <translation id="7115361495406486998">Жеткиликтүү байланыштар жок</translation> <translation id="7115731767122970828">Азыр жакшыртуу</translation> <translation id="7116554090938189816">Принтердин SSL тастыктамасынын мөөнөтү бүттү. Принтерди кайра иштетип, кайталап көрүңүз.</translation>
diff --git a/chrome/app/resources/generated_resources_lo.xtb b/chrome/app/resources/generated_resources_lo.xtb index e512d57..46e54e8 100644 --- a/chrome/app/resources/generated_resources_lo.xtb +++ b/chrome/app/resources/generated_resources_lo.xtb
@@ -539,6 +539,7 @@ <translation id="1368603372088757436">ຂອງທ່ານບໍ່ຮອງຮັບ <ph name="DEVICE_TYPE" />. <ph name="LINK_BEGIN" />ສຶກສາເພີ່ມເຕີມ<ph name="LINK_END" /></translation> <translation id="1370249617397887619">ເພື່ອໃຊ້ພວກມັນຢູ່ອຸປະກອນອື່ນຂອງທ່ານ, ບັນທຶກພວກມັນໄວ້ໃນບັນຊີ Google ຂອງທ່ານ</translation> <translation id="1370384480654163477">ເບິ່ງ ແລະ ແກ້ໄຂໄຟລ໌ຈາກເທື່ອສຸດທ້າຍທີ່ທ່ານເຂົ້າເບິ່ງເວັບໄຊນີ້:</translation> +<translation id="1372259917802609049">ເກີດຄວາມຜິດພາດໃນການລຶບຂໍ້ຈຳກັັດ</translation> <translation id="1372841398847029212">ຊິ້ງຂໍ້ມູນກັບບັນຊີຂອງທ່ານ</translation> <translation id="1373176046406139583">ການເບິ່ງເຫັນຂອງອຸປະກອນທ່ານຈະຄວບຄຸມວ່າໃຜສາມາດແບ່ງປັນໃຫ້ກັບທ່ານໃນຕອນທີ່ໜ້າຈໍຂອງທ່ານຖືກປົດລັອກໄດ້ແດ່. <ph name="LINK_BEGIN" />ສຶກສາເພີ່ມເຕີມ<ph name="LINK_END" /></translation> <translation id="1374844444528092021">ໃບຢັ້ງຢືນທີ່ເຄືອຂ່າຍຕ້ອງການ "<ph name="NETWORK_NAME" />" ບໍ່ໄດ້ຖືກຕິດຕັ້ງ ຫຼືໃຊ້ບໍ່ໄດ້ອີກ. ກະລຸນາເອົາໃບຢັ້ງຢືນໃໝ່ ແລະລອງເຊື່ອມຕໍ່ອີກ.</translation> @@ -667,7 +668,6 @@ <translation id="1464258312790801189">ບັນຊີຂອງທ່ານ</translation> <translation id="1464597059227482327">ຫາກທ່ານຈະແບ່ງປັນກັບ Chromebook ທີ່ບໍ່ໄດ້ຢູ່ໃນລາຍຊື່ຜູ້ຕິດຕໍ່ຂອງທ່ານ, ກະລຸນາກວດສອບໃຫ້ໝັ້ນໃຈວ່າ Chromebook ເປີດ “ການເບິ່ງເຫັນໃກ້ຄຽງ” ຢູ່. ເພື່ອເປີດ “ການເບິ່ງເຫັນໃກ້ຄຽງ”, ໃຫ້ເລືອກມຸມຂວາລຸ່ມສຸດ ແລ້ວເລືອກເພື່ອເປີດ “ການເບິ່ງເຫັນໃກ້ຄຽງ”. <ph name="LINK_BEGIN" />ສຶກສາເພີ່ມເຕີມ<ph name="LINK_END" /></translation> <translation id="1464781208867302907">ສຳລັບການຕັ້ງຄ່າອຸປະກອນ, ໄປທີ່ການຕັ້ງຄ່າ.</translation> -<translation id="146481294006497945">ບໍ່ມີລະຫັດຜ່ານທີ່ບັນທຶກໄວ້</translation> <translation id="1465176863081977902">ອັດສຳເນົາທີ່ຢູ່ສຽງ</translation> <translation id="146522654774760805">ລະຫັດຜ່ານ ແລະ ການຕື່ມຂໍ້ມູນອັດຕະໂນມັດ</translation> <translation id="1465827627707997754">ແຜ່ນພິດຊ້າ</translation> @@ -1487,6 +1487,7 @@ ແຕ່ສິ່ງນີ້ຈະບໍ່ສົ່ງຜົນຕໍ່ແອັບ ຫຼື ເນື້ອຫາໃນອຸປະກອນອື່ນໆ.</translation> <translation id="2018189721942291407">ບໍ່ແນ່ໃຈວ່າທ່ານຄວນລົງທະບຽນບໍ?</translation> <translation id="2018352199541442911">ຂໍອະໄພ, ອຸປະກອນເກັບຂໍ້ມູນທາງນອກບໍ່ຮອງຮັບໃນເວລານີ້.</translation> +<translation id="2019213483156307334">ເກີດຄວາມຜິດພາດໃນການເພີ່ມຂໍ້ຈຳກັັດ</translation> <translation id="2019718679933488176">ແລະເປີດສຽງໃນແຖບໃໝ່</translation> <translation id="2020183425253392403">ສະແດງການຕັ້ງຄ່າທີ່ຢູ່ເຄືອຂ່າຍ</translation> <translation id="2020225359413970060">ສະແກນໄຟລ໌</translation> @@ -2177,7 +2178,6 @@ <translation id="2485394160472549611">ເລືອກໃຫ້ສະເພາະທ່ານ</translation> <translation id="2485422356828889247">ຖອນຕິດຕັ້ງ</translation> <translation id="2485681265915754872">ຂໍ້ກຳນົດບໍລິການຂອງ Google Play</translation> -<translation id="2486036712620651117">ລະຫັດຜ່ານ ແລະ ກະແຈຜ່ານ</translation> <translation id="248676429071089168">ປັດຂຶ້ນເພື່ອເລື່ອນໜ້າລົງ</translation> <translation id="2487067538648443797">ເພີ່ມບຸກມາກໃໝ່</translation> <translation id="2489686758589235262">ມອບໝາຍສະວິດ 2 ອັນເພີ່ມເຕີມ</translation> @@ -3156,6 +3156,7 @@ <translation id="3188257591659621405">ໄຟລ໌ຂອງຂ້ອຍ</translation> <translation id="3188465121994729530">ການຍ້າຍໂດຍສະເລ່ຍ</translation> <translation id="3189187154924005138">ເຄີເຊີຂະໜາດໃຫຍ່</translation> +<translation id="3189533916970342007">{PASSWORD_COUNT,plural, =1{ລະບົບຈະບັນທຶກລະຫັດຜ່ານ 1 ລາຍການ ແລະ ລາຍການອື່ນໆໄວ້ໃນອຸປະກອນນີ້ເທົ່ານັ້ນ. ເພື່ອໃຊ້ພວກມັນຢູ່ອຸປະກອນເຄື່ອງອື່ນຂອງທ່ານ, ໃຫ້ ບັນທຶກພວກມັນໄວ້ໃນບັນຊີ Google ຂອງທ່ານ.}other{ລະບົບຈະບັນທຶກລະຫັດຜ່ານ {PASSWORD_COUNT} ລາຍການ ແລະ ລາຍການອື່ນໆໄວ້ໃນອຸປະກອນນີ້ເທົ່ານັ້ນ. ເພື່ອໃຊ້ພວກມັນຢູ່ອຸປະກອນເຄື່ອງອື່ນຂອງທ່ານ, ໃຫ້ ບັນທຶກພວກມັນໄວ້ໃນບັນຊີ Google ຂອງທ່ານ.}}</translation> <translation id="3190558889382726167">ບັນທຶກລະຫັດຜ່ານແລ້ວ</translation> <translation id="3192586965067888278">ອະທິບາຍບັນຫາໂດຍລະອຽດ. ຄຳຕິຊົມຈະຖືກສົ່ງໄປໃຫ້ Google ເພື່ອໃຫ້ທີມງານກວດສອບ ແລະ ອາດຖືກໃຊ້ເພື່ອການປັບປຸງ ຫຼື ພັດທະນາຜະລິດຕະພັນ ແລະ ບໍລິການ Google.</translation> <translation id="3192947282887913208">ໄຟລ໌ສຽງ</translation> @@ -3626,6 +3627,7 @@ <translation id="3537881477201137177">ສາມາດແກ້ໄຂສິ່ງນີ້ໃນພາຍຫຼັງໄດ້ໃນການຕັ້ງຄ່າ</translation> <translation id="3538066758857505094">ເກີດຄວາມຜິດພາດໃນຖອນການຕິດຕັ້ງ Linux. ກະລຸນາລອງໃໝ່ໃນພາຍຫຼັງ.</translation> <translation id="3539537154248488260">ສະຫຼັບແຮງບັນດານໃຈ</translation> +<translation id="3539791442352537591">ເກີດຂໍ້ຜິດພາດໃນການບັນທຶກການປ່ຽນແປງສະຖານະຄວາມເຊື່ອຖື</translation> <translation id="3540173484406326944">ບໍ່ມີເຄືອຂ່າຍຜ່ານທາງ <ph name="HOST_DEVICE_NAME" /></translation> <translation id="354060433403403521">ເຄື່ອງປັບໄຟ AC</translation> <translation id="354068948465830244">ນີ້ສາມາດອ່ານ ແລະ ປ່ຽນຂໍ້ມູນເວັບໄຊໄດ້</translation> @@ -3900,7 +3902,6 @@ <translation id="3721178866505920080">ຂໍ້ມູນເພີ່ມເຕີມກ່ຽວກັບການເປີດການໂຫຼດກ່ອນລ່ວງໜ້າແບບຂະຫຍາຍ</translation> <translation id="3722108462506185496">ເກີດຄວາມຜິດພາດໃນການເລີ່ມການບໍລິການເຄື່ອງຈຳລອງສະເໝືອນຈິງ. ກະລຸນາລອງໃໝ່ໃນພາຍຫຼັງ.</translation> <translation id="3722624153992426516">ໄດ້ຮັບຄຳສັ່ງ <ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /> ລາຍການແລ້ວ</translation> -<translation id="3724897774652282549">ຕື່ມຂໍ້ມູນໃສ່ແບບຟອມ</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">ເຄືອຂ່າຍ WiFi ທີ່ສາມາດໃຊ້ໄດ້</translation> @@ -4333,7 +4334,6 @@ <translation id="3993887353483242788">ຊິ້ງຂໍ້ມູນ <ph name="DEVICE_TYPE" /> ຂອງທ່ານເພື່ອໃຫ້ການຕັ້ງຄ່າຂອງທ່ານພ້ອມໃຊ້ຢູ່ອຸປະກອນໃດກໍຕາມທີ່ທ່ານເຂົ້າສູ່ລະບົບດ້ວຍບັນຊີ Google ຂອງທ່ານ. ການຕັ້ງຄ່າຮວມມີແອັບ, ການຕັ້ງຄ່າ, ລະຫັດຜ່ານ Wi-Fi, ພາສາ, ຮູບພື້ນຫຼັງ, ຄີລັດ ແລະ ອື່ນໆ.</translation> <translation id="3994318741694670028">ຢ່າງໃດກໍຕາມ, ຄອມພິວເຕີຂອງທ່ານຖືກຕັ້ງຄ່າດ້ວຍ ID ຮາດແວທີ່ຜິດຮູບແບບ. ນີ້ປ້ອງກັນບໍ່ໃຫ້ ChromeOS Flex ອັບເດດການແກ້ໄຂຄວາມປອດໄພຫຼ້າສຸດໄດ້ ແລະ ຄອມພິວເຕີຂອງທ່ານ <ph name="BEGIN_BOLD" />ອາດສ່ຽງຕໍ່ການໂຈມຕີທີ່ປະສົງຮ້າຍ<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">ປົດລັອກໂທລະສັບຂອງງທ່ານ ແລະ ຈັບມັນເຂົ້າມາໃກ້ໆເພື່ອປົດລັອກ <ph name="DEVICE_TYPE" /> ຂອງທ່ານ.</translation> -<translation id="3994522032746736727">ເຂົ້າສູ່ລະບົບໃນຖານະ <ph name="EMAIL" /></translation> <translation id="3994530503403062649">ຊອກຫາປຸ່ມຢູ່ແທັບເລັດຂອງທ່ານ</translation> <translation id="3994708120330953242">ພົບລະຫັດຜ່ານຂອງທ່ານຈຳນວນໜຶ່ງໃນການລະເມີດຂໍ້ມູນ. ເພື່ອຮັກສາບັນຊີຂອງທ່ານໃຫ້ປອດໄພ, ທ່ານຄວນປ່ຽນລະຫັດຜ່ານເຫຼົ່ານີ້ດຽວນີ້.</translation> <translation id="3994878504415702912">ຊູມ</translation> @@ -4624,6 +4624,7 @@ <translation id="4220648711404560261">ເກີດຄວາມຜິດພາດໃນລະຫວ່າງການເປີດນຳໃຊ້.</translation> <translation id="4222917615373664617">ການຕິດຕາມລາຄາເປີດການນຳໃຊ້ຢູ່. ລາຄາແມ່ນ <ph name="CURRENT_PRICE" />.</translation> <translation id="4223404254440398437">ບໍ່ອະນຸຍາດໃຫ້ໃຊ້ໄມໂຄຣໂຟນ</translation> +<translation id="4224541845943007092">ອ່ານ ແລະ ບັນທຶກການປ້ອນຂໍ້ມູນໂດຍແປ້ນພິມຈາກແຖບທີ່ຢູ່</translation> <translation id="4225397296022057997">ໃນທຸກເວັບໄຊ</translation> <translation id="4228071595943929139">ໃຊ້ທີ່ຢູ່ອີເມວຂອງອົງການຂອງທ່ານ</translation> <translation id="4228209296591583948">{NUM_EXTENSIONS,plural, =1{ບໍ່ອະນຸຍາດສ່ວນຂະຫຍາຍນີ້}other{ບໍ່ອະນຸຍາດສ່ວນຂະຫຍາຍບາງອັນ}}</translation> @@ -4816,6 +4817,7 @@ <translation id="4361745360460842907">ເປີດເປັນແຖບ</translation> <translation id="4363262124589131906">ໄຟລ໌ໃໝ່ໃນໄດຣຟ໌ຂອງຂ້ອຍຈະຢຸດຊິ້ງກັບ Chromebook ເຄື່ອງນີ້ໂດຍອັດຕະໂນມັດ</translation> <translation id="4364327530094270451">ໝາກໂມ</translation> +<translation id="4364417397164696363">{ITEM_COUNT,plural, =1{ລະບົບຈະບັນທຶກຂໍ້ມູນ 1 ລາຍການໄວ້ໃນອຸປະກອນນີ້ເທົ່ານັ້ນ. ເພື່ອໃຊ້ມັນຢູ່ອຸປະກອນອື່ນຂອງທ່ານ, ໃຫ້ບັນທຶກມັນໄວ້ໃນບັນຊີ Google ຂອງທ່ານ.}other{ລະບົບຈະບັນທຶກຂໍ້ມູນ {ITEM_COUNT} ລາຍການໄວ້ໃນອຸປະກອນນີ້ເທົ່ານັ້ນ. ເພື່ອໃຊ້ພວກມັນຢູ່ອຸປະກອນເຄື່ອງອື່ນຂອງທ່ານ, ໃຫ້ ບັນທຶກພວກມັນໄວ້ໃນບັນຊີ Google ຂອງທ່ານ.}}</translation> <translation id="4364567974334641491"><ph name="APP_NAME" /> ກຳລັງແບ່ງປັນໜ້າຈໍ.</translation> <translation id="4364830672918311045">ສະແດງການແຈ້ງເຕືອນ</translation> <translation id="4367971618859387374">ຊື່ສະແດງ</translation> @@ -5738,6 +5740,7 @@ <translation id="5029287942302939687">ຕັ້ງລະຫັດຜ່ານຂອງທ່ານແລ້ວ</translation> <translation id="5029873138381728058">ກວດສອບ VM ບໍ່ສຳເລັດ</translation> <translation id="503155457707535043">ກຳລັງດາວໂຫຼດແອັບ</translation> +<translation id="5031769842769721381">{SELECTED_ITEMS,plural, =0{ທີ່ຢູ່}=1{ທີ່ຢູ່ ({SELECTED_ITEMS})}other{ທີ່ຢູ່ ({SELECTED_ITEMS})}}</translation> <translation id="5032430150487044192">ບໍ່ສາມາດສ້າງລະຫັດ QR ໄດ້</translation> <translation id="5033137252639132982">ບໍ່ໄດ້ຮັບອະນຸຍາດໃຫ້ໃຊ້ເຊັນເຊີກວດຈັບການເຄື່ອນໄຫວ</translation> <translation id="5035846135112863536">ເລືອກ "ລາຍລະອຽດເພີ່ມເຕີມ" ຢູ່ລຸ່ມນີ້ເພື່ອເບິ່ງຂໍ້ມູນເພີ່ມເຕີມຈາກ <ph name="IDENTITY_PROVIDER_ETLD_PLUS_ONE" />.</translation> @@ -6486,6 +6489,7 @@ <translation id="5568069709869097550">ບໍ່ສາມາດເຂົ້າສູ່ລະບົບໄດ້</translation> <translation id="5568525251731145240">ລຶບຂໍ້ມູນເວັບໄຊ ແລະ ການອະນຸຍາດສຳລັບ <ph name="SITE_NAME" />, ເວັບໄຊທັງໝົດພາຍໃຕ້ມັນ ແລະ ແອັບທີ່ຕິດຕັ້ງໄວ້ແລ້ວບໍ?</translation> <translation id="5568602038816065197">ເວັບໄຊຕ່າງໆສາມາດໃຊ້ຄຸນສົມບັດຂັ້ນສູງຈາກເຄື່ອງພິມໃດກໍຕາມທີ່ເຂົ້າເຖິງໄດ້ຫາອຸປະກອນຂອງທ່ານໂດຍບໍ່ຕ້ອງເຂົ້າໄປຜ່ານຂໍ້ຄວາມການພິມແບບມາດຕະຖານ</translation> +<translation id="5570149859473005144">{SELECTED_ITEMS,plural, =0{ລະຫັດຜ່ານ}=1{ລະຫັດຜ່ານ ({SELECTED_ITEMS})}other{ລະຫັດຜ່ານ ({SELECTED_ITEMS})}}</translation> <translation id="5571066253365925590">Bluetooth ເປີດໃຊ້ງານແລ້ວ</translation> <translation id="5571092938913434726">ການຄວບຄຸມສື່ສ່ວນກາງ</translation> <translation id="5571832155627049070">ປັບແຕ່ງໂປຣໄຟລ໌ຂອງທ່ານ</translation> @@ -6603,7 +6607,6 @@ <translation id="5646994841348250879">ເລືອກບັນຊີທີ່ຈະເຂົ້າສູ່ລະບົບ <ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">ແຈັກໄມໂຄຣໂຟນ</translation> <translation id="5648166631817621825">7 ມື້ທີ່ຜ່ານມາ</translation> -<translation id="5650537073531199882">ຕື່ມຂໍ້ມູນໃສ່ແບບຟອມ</translation> <translation id="5651308944918885595">ການຄົ້ນພົບການແບ່ງປັນໃກ້ຄຽງ</translation> <translation id="5653154844073528838">ທ່ານມີເຄື່ອງພິມທີ່ບັນທຶກໄວ້ <ph name="PRINTER_COUNT" /> ເຄື່ອງ.</translation> <translation id="5654669866168491665">ສຶກສາເພີ່ມເຕີມກ່ຽວກັບເວັບໄຊທີ່ອາດນຳໃຊ້ບໍ່ໄດ້ເມື່ອບລັອກຄຸກກີ້ພາກສ່ວນທີສາມ</translation> @@ -6991,6 +6994,7 @@ <translation id="5941153596444580863">ເພີ່ມບຸກຄົນ...</translation> <translation id="5941343993301164315">ກະລຸນາລົງຊື່ເຂົ້າໃຊ້<ph name="TOKEN_NAME" />.</translation> <translation id="5941711191222866238">ຫຍໍ້ລົງ</translation> +<translation id="5941854976565320351">{PASSWORD_COUNT,plural, =1{ລະບົບຈະບັນທຶກລະຫັດຜ່ານ 1 ລາຍການໄວ້ໃນອຸປະກອນນີ້ເທົ່ານັ້ນ. ເພື່ອໃຊ້ມັນຢູ່ອຸປະກອນອື່ນຂອງທ່ານ, ໃຫ້ບັນທຶກມັນໄວ້ໃນບັນຊີ Google ຂອງທ່ານ.}other{ລະຫັດຜ່ານ {PASSWORD_COUNT} ລາຍການຈະຖືກບັນທຶກໄວ້ໃນອຸປະກອນນີ້ເທົ່ານັ້ນ. ເພື່ອໃຊ້ພວກມັນຢູ່ອຸປະກອນເຄື່ອງອື່ນຂອງທ່ານ, ໃຫ້ ບັນທຶກພວກມັນໄວ້ໃນບັນຊີ Google ຂອງທ່ານ.}}</translation> <translation id="594221546068848596">ຊອກຫາໜ້າດ້ວຍ <ph name="VISUAL_SEARCH_PROVIDER" /></translation> <translation id="5942779427914696408">ການສະແດງອຸປະກອນ</translation> <translation id="5943127421590245687">ການຢັ້ງຢືນຂອງທ່ານສຳເລັດແລ້ວ. ເພື່ອປົດລັອກ ແລະ ກູ້ຄືນຂໍ້ມູນໃນເຄື່ອງຂອງທ່ານ, ກະລຸນາປ້ອນລະຫັດຜ່ານ <ph name="DEVICE_TYPE" /> ເກົ່າຂອງທ່ານ.</translation> @@ -8507,6 +8511,7 @@ <translation id="7036706669646341689">ຂໍແນະນຳໃຫ້ມີພື້ນທີ່ຫວ່າງ <ph name="DISK_SIZE" /> ສຳລັບ Linux. ເພື່ອເພີ່ມພື້ນທີ່ຫວ່າງ, ກະລຸນາລຶບໄຟລ໌ຕ່າງໆອອກຈາກອຸປະກອນຂອງທ່ານ.</translation> <translation id="7037157058268992880">ລືມ PIN</translation> <translation id="7037509989619051237">ຂໍ້ຄວາມເພື່ອສະແດງຕົວຢ່າງ</translation> +<translation id="7037633074390821254">ຂໍ້ຈຳກັດ DNS ຫຼື CIDR</translation> <translation id="7038632520572155338">ການເຂົ້າເຖິງດ້ວຍປຸ່ມກົດ</translation> <translation id="7038710352229712897">ເພີ່ມບັນຊີ Google ອື່ນສຳລັບ <ph name="USER_NAME" /></translation> <translation id="7039326228527141150">ເຂົ້າຫາອຸປະກອນ USB ຈາກ <ph name="VENDOR_NAME" /></translation> @@ -8602,6 +8607,7 @@ <translation id="7113974454301513811">ຕອນນີ້ໃຫ້ເພີ່ມແຖບປັດຈຸບັນໃສ່ໃນລາຍຊື່ຂອງທ່ານ</translation> <translation id="7114054701490058191">ລະຫັດຜ່ານບໍ່ກົງກັນ</translation> <translation id="7114648273807173152">ເພື່ອໃຊ້ Smart Lock ເພື່ອເຂົ້າສູ່ລະບົບບັນຊີ Google ຂອງທ່ານ, ກະລຸນາໄປທີ່ການຕັ້ງຄ່າ > ອຸປະກອນທີ່ເຊື່ອມຕໍ່ > ໂທລະສັບຂອງທ່ານ > Smart Lock.</translation> +<translation id="7115051913071512405">ລອງມັນເບິ່ງ</translation> <translation id="7115361495406486998">ບໍ່ມີລາຍຊື່ຜູ້ຕິດຕໍ່ທີ່ຕິດຕໍ່ຫາໄດ້</translation> <translation id="7115731767122970828">ເພີ່ມຕອນນີ້ເລີຍ</translation> <translation id="7116554090938189816">ໃບຮັບຮອງ SSL ຂອງເຄື່ອງພິມໝົດອາຍຸແລ້ວ. ຣີສະຕາດເຄື່ອງພິມແລ້ວລອງໃໝ່.</translation> @@ -8633,6 +8639,7 @@ <translation id="7134951043985383439">ດາວໂຫຼດໄຟລ໌ທີ່ອັນຕະລາຍແລ້ວ</translation> <translation id="7135729336746831607">ເປີດ Bluetooth ບໍ?</translation> <translation id="7136694880210472378">ເຮັດເປັນຄ່າມາດຕະຖານ</translation> +<translation id="7137277889990479760">ສືບຕໍ່ເປັນ <ph name="EMAIL" /></translation> <translation id="7137771508221868414">ນີ້ຈະລຶບຂໍ້ມູນ <ph name="TOTAL_USAGE" /> ທີ່ເກັບໄວ້ໂດຍເວັບໄຊ ແລະ ແອັບທີ່ຕິດຕັ້ງໄວ້</translation> <translation id="7138678301420049075">ອື່ນໆ</translation> <translation id="7139627972753429585"><ph name="APP_NAME" /> ກຳລັງໃຊ້ໄມໂຄຣໂຟນຂອງທ່ານ</translation> @@ -8754,6 +8761,7 @@ <translation id="7231260028442989757">ເບິ່ງ, ປິດໄວ້ ແລະ ຕອບກັບຫາການແຈ້ງເຕືອນຂອງໂທລະສັບທ່ານ</translation> <translation id="7231347196745816203">ໃຊ້ໂທລະສັບຂອງທ່ານເພື່ອປົດລັອກ <ph name="DEVICE_TYPE" />.</translation> <translation id="7232750842195536390">ການປ່ຽນຊື່ບໍ່ສຳເລັດ</translation> +<translation id="7232962679391151113">{BOOKMARK_COUNT,plural, =1{ບຸກມາກ 1 ລາຍການ ແລະ ລາຍການອື່ນໆຈະຖືກບັນທຶກໄວ້ໃນອຸປະກອນນີ້ເທົ່ານັ້ນ. ເພື່ອໃຊ້ພວກມັນຢູ່ອຸປະກອນເຄື່ອງອື່ນຂອງທ່ານ, ໃຫ້ ບັນທຶກພວກມັນໄວ້ໃນບັນຊີ Google ຂອງທ່ານ.}other{{BOOKMARK_COUNT} ບຸກມາກ ແລະ ລາຍການອື່ນໆຈະຖືກບັນທຶກໄວ້ໃນອຸປະກອນນີ້ເທົ່ານັ້ນ. ເພື່ອໃຊ້ພວກມັນຢູ່ອຸປະກອນເຄື່ອງອື່ນຂອງທ່ານ, ໃຫ້ ບັນທຶກພວກມັນໄວ້ໃນບັນຊີ Google ຂອງທ່ານ.}}</translation> <translation id="723343421145275488">ຊອກຫາຮູບພາບດ້ວຍ <ph name="VISUAL_SEARCH_PROVIDER" /></translation> <translation id="7234010996000898150">ກຳລັງຍົກເລີກການກູ້ຂໍ້ມູນ Linux</translation> <translation id="7235305658956131898">ແອັບ Android ທີ່ຜູ້ເບິ່ງແຍງລະບົບອຸປະກອນຂອງທ່ານຕິດຕັ້ງ.</translation> @@ -8880,6 +8888,7 @@ <translation id="7327989755579928735"><ph name="MANAGER" /> ໄດ້ປິດການນຳໃຊ້ການດີບັກ ADB ແລ້ວ. ເມື່ອທ່ານຣີສະຕາດ <ph name="DEVICE_TYPE" /> ຂອງທ່ານແລ້ວ, ທ່ານຈະບໍ່ສາມາດໂຫຼດແອັບຢ່າງບໍ່ເປັນທາງການໄດ້.</translation> <translation id="7328119182036084494">ບັນທຶກໄປໃສ່ <ph name="WEB_DRIVE" /> ແລ້ວ</translation> <translation id="7328162502911382168">(<ph name="COUNT" />)</translation> +<translation id="732845903678043302">{BOOKMARK_COUNT,plural, =1{1 ບຸກມາກຖືກບັນທຶກໃສ່ອຸປະກອນນີ້ເທົ່ານັ້ນ. ເພື່ອໃຊ້ມັນຢູ່ອຸປະກອນອື່ນຂອງທ່ານ, ໃຫ້ບັນທຶກມັນໄວ້ໃນບັນຊີ Google ຂອງທ່ານ.}other{ບຸກມາກ {BOOKMARK_COUNT} ລາຍການຖືກບັນທຶກໄວ້ໃນອຸປະກອນນີ້ເທົ່ານັ້ນ. ເພື່ອໃຊ້ພວກມັນຢູ່ອຸປະກອນເຄື່ອງອື່ນຂອງທ່ານ, ໃຫ້ ບັນທຶກພວກມັນໄວ້ໃນບັນຊີ Google ຂອງທ່ານ.}}</translation> <translation id="7328867076235380839">ການລວມເຂົ້າກັນບໍ່ຖືກຕ້ອງ</translation> <translation id="7329154610228416156">ລົງຊື່ເຂົ້າໃຊ້ບໍ່ສໍາເລັດ ເພາະວ່າມັນບໍ່ຖືກປັບຕັ້ງຄ່າໃຫ້ໃຊ້ URL ທີ່ບໍ່ປອດໄພ (<ph name="BLOCKED_URL" />). ກະລຸນາຕິດຕໍ່ຜູ້ຄວບຄຸມຂອງທ່ານ.</translation> <translation id="7330533963640151632">ການຕັ້ງຄ່າ <ph name="FEATURE_NAME" /> ສຳລັບອຸປະກອນຂອງ <ph name="USER_NAME" /> ທີ່ແບ່ງປັນໂດຍໃຊ້ບັນຊີ <ph name="USER_EMAIL" />.</translation> @@ -9210,6 +9219,7 @@ <translation id="7561196759112975576">ຢູ່ສະເໝີ</translation> <translation id="7561759921596375678">ເປີດລະດັບສຽງ</translation> <translation id="7561982940498449837">ປິດເມນູ</translation> +<translation id="7563970324931922582">[ຂໍ້ຄວາມຕົວຍຶດບ່ອນ]</translation> <translation id="756445078718366910">ເປີດໜ້າຕ່າງບຣາວເຊີ</translation> <translation id="7564847347806291057">ສິ້ນສຸດຂະບວນການ</translation> <translation id="756503097602602175">ທ່ານສາມາດຈັດການບັນຊີ Google ທີ່ເຂົ້າສູ່ລະບົບແລ້ວໄດ້ຈາກ <ph name="LINK_BEGIN" />ການຕັ້ງຄ່າ<ph name="LINK_END" />. ການອະນຸຍາດທີ່ທ່ານໃຫ້ເວັບໄຊ ແລະ ແອັບອາດຈະນຳໃຊ້ກັບບັນຊີທັງໝົດ. ຖ້າທ່ານບໍ່ຕ້ອງການໃຫ້ເວັບໄຊ ຫຼື ແອັບເຂົ້າເຖິງຂໍ້ມູນບັນຊີຂອງທ່ານ, ທ່ານສາມາດເຂົ້າສູ່ລະບົບຫາ <ph name="DEVICE_TYPE" /> ຂອງທ່ານເປັນແຂກ ຫຼື ທ່ອງເວັບໃນ <ph name="LINK_2_BEGIN" />ໜ້າຈໍທີ່ບໍ່ເປີດເຜີຍຕົວຕົນ<ph name="LINK_2_END" /> ໄດ້.</translation> @@ -10420,6 +10430,7 @@ <translation id="8398877366907290961">ແນວໃດກໍ່ດໍາເນີນການຕໍ່</translation> <translation id="8399282673057829204">ເບິ່ງລະຫັດຜ່ານ</translation> <translation id="839949601275221554">ອຸປະກອນພົບຂໍ້ຜິດພາດ. ກະລຸນາຣີສະຕາດອຸປະກອນຂອງທ່ານ ແລ້ວລອງໃໝ່.</translation> +<translation id="8399889560226245071">{SELECTED_ITEMS,plural, =0{Bookmarks}=1{Bookmarks ({SELECTED_ITEMS})}other{Bookmarks ({SELECTED_ITEMS})}}</translation> <translation id="8401432541486058167">ໃຫ້ PIN ທີ່ເຊື່ອມໂຍງກັບບັດອັດສະລິຍະຂອງທ່ານ.</translation> <translation id="8403807918453631441"><ph name="BRAND" /> ສາມາດກວດເບິ່ງລະຫັດຜ່ານຂອງທ່ານເມື່ອທ່ານບັນທຶກພວກມັນໄວ້</translation> <translation id="8405046151008197676">ຮັບໄຮໄລ້ຈາກການອັບເດດຫຼ້າສຸດ</translation> @@ -10900,6 +10911,7 @@ <translation id="8737966899544698733">ຄວາມຖືກຕ້ອງຂອງສະຖານທີ່ (Android ເທົ່ານັ້ນ)</translation> <translation id="8738418093147087440">ຊອກຫາຕາມປະເທດ, ພາສາ ຫຼື ຊື່ການປ້ອນຂໍ້ມູນ</translation> <translation id="8740086188450289493">ໃຊ້ລະຫັດຜ່ານບັນຊີ Google</translation> +<translation id="874023689350909633">ລອງໃຊ້ມັນເບິ່ງ</translation> <translation id="8740247629089392745">ທ່ານສາມາດມອບ Chromebook ນີ້ໃຫ້ <ph name="SUPERVISED_USER_NAME" /> ໄດ້. ການຕັ້ງຄ່າເກືອບສຳເລັດແລ້ວ, ຈາກນັ້ນມັນກໍເຖິງເວລາສຳຫຼວດແລ້ວ.</translation> <translation id="8740672167979365981">ຕ້ອງອັບເດດ ChromeOS Flex</translation> <translation id="8741944563400125534">ການແນະນຳການຕັ້ງຄ່າການເຂົ້າເຖິງດ້ວຍປຸ່ມກົດ</translation> @@ -11674,6 +11686,7 @@ <translation id="97905529126098460">ໜ້າຈໍນີ້ຈະປິດຫຼັງຈາກສຳເລັດການຍົກເລີກແລ້ວ.</translation> <translation id="980731642137034229">ປຸ່ມເມນູຄຳສັ່ງ</translation> <translation id="981121421437150478">ອອຟລາຍນ໌</translation> +<translation id="982083952953998237">ເພີ່ມຂໍ້ຈຳກັດ</translation> <translation id="98235653036850093">ສະບາຍດີ, <ph name="PROFILE_NAME" /></translation> <translation id="983192555821071799">ປິດທຸກແຖບ</translation> <translation id="983531994960412650"><ph name="WINDOW_TITLE" /> - ການບັນທຶກກ້ອງຖ່າຍຮູບ ແລະ ໄມໂຄຣໂຟນ</translation>
diff --git a/chrome/app/resources/generated_resources_lt.xtb b/chrome/app/resources/generated_resources_lt.xtb index 18cb5958..5f845e1 100644 --- a/chrome/app/resources/generated_resources_lt.xtb +++ b/chrome/app/resources/generated_resources_lt.xtb
@@ -670,7 +670,6 @@ <translation id="1464258312790801189">Jūsų paskyros</translation> <translation id="1464597059227482327">Jei bendrinate su „Chromebook“, kurio nėra jūsų kontaktuose, įsitikinkite, kad „Chromebook“ įjungta parinktis „Matomumas netoliese“. Norėdami įjungti matomumo netoliese funkciją, pasirinkite apatinį dešinįjį kampą, tada pasirinkite „Matomumas netoliese“. <ph name="LINK_BEGIN" />Sužinokite daugiau<ph name="LINK_END" />.</translation> <translation id="1464781208867302907">Įrenginio nuostatas rasite skiltyje „Nustatymai“.</translation> -<translation id="146481294006497945">Nėra išsaugotų slaptažodžių</translation> <translation id="1465176863081977902">K&opijuoti garso įrašo adresą</translation> <translation id="146522654774760805">Slaptažodžiai ir automatinis pildymas</translation> <translation id="1465827627707997754">Picos gabalėlis</translation> @@ -2181,7 +2180,6 @@ <translation id="2485394160472549611">Jums skirti populiariausi pasirinkimai</translation> <translation id="2485422356828889247">Pašalinti</translation> <translation id="2485681265915754872">„Google Play“ paslaugų teikimo sąlygos</translation> -<translation id="2486036712620651117">Slaptažodžiai ir prieigos raktai</translation> <translation id="248676429071089168">Perbraukite aukštyn, kad perkeltumėte puslapį žemyn</translation> <translation id="2487067538648443797">Pridėti naują žymą</translation> <translation id="2489686758589235262">Priskirti dar du jungiklius</translation> @@ -3904,7 +3902,6 @@ <translation id="3721178866505920080">Daugiau informacijos apie išplėstinio išankstinio įkėlimo įjungimą</translation> <translation id="3722108462506185496">Paleidžiant virtualaus įrenginio paslaugą įvyko klaida. Bandykite dar kartą.</translation> <translation id="3722624153992426516">Instrukcija „<ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" />“ gauta</translation> -<translation id="3724897774652282549">Formos pildymas</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Pasiekiami „Wi-Fi“ tinklai</translation> @@ -4337,7 +4334,6 @@ <translation id="3993887353483242788">Sinchronizuokite „<ph name="DEVICE_TYPE" />“, kad jūsų nuostatos būtų paruoštos bet kuriame įrenginyje, kai prisijungsite naudodami „Google“ paskyrą. Nuostatos apima programas, nustatymus, „Wi-Fi“ slaptažodžius, kalbas, ekrano foną, sparčiuosius klavišus ir kt.</translation> <translation id="3994318741694670028">Deja, jūsų kompiuteris yra sukonfigūruotas naudojant netinkamai suformuotą aparatinės įrangos ID. Tai neleidžia „ChromeOS Flex“ atnaujinti naujausiais saugos pataisymais ir jūsų kompiuteris <ph name="BEGIN_BOLD" />gali būti neatsparus kenkėjiškoms atakoms<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Kad atrakintumėte „<ph name="DEVICE_TYPE" />“, atrakinkite telefoną ir padėkite jį arčiau.</translation> -<translation id="3994522032746736727">Prisijungti kaip <ph name="EMAIL" /></translation> <translation id="3994530503403062649">Planšetinio kompiuterio klavišai</translation> <translation id="3994708120330953242">Kai kurie jūsų slaptažodžiai rasti duomenų saugos pažeidime. Kad apsaugotumėte paskyras, pakeiskite šiuos slaptažodžius dabar.</translation> <translation id="3994878504415702912">Priartinti</translation> @@ -6609,7 +6605,6 @@ <translation id="5646994841348250879">Pasirinkite paskyrą, kurią naudodami norite prisijungti prie <ph name="SITE_ETLD_PLUS_ONE" />“</translation> <translation id="5648021990716966815">Mikrofono jungtis</translation> <translation id="5648166631817621825">Pastarosios 7 dienos</translation> -<translation id="5650537073531199882">Formos pildymas</translation> <translation id="5651308944918885595">Bendrinimo netoliese aptinkamumas</translation> <translation id="5653154844073528838">Esate išsaugoję <ph name="PRINTER_COUNT" /> spausdintuv.</translation> <translation id="5654669866168491665">Sužinokite daugiau apie svetaines, kurios gali neveikti, kai blokuojami trečiųjų šalių slapukai</translation> @@ -8615,6 +8610,7 @@ <translation id="7113974454301513811">Dabar pridėkite dabartinį skirtuką prie sąrašo</translation> <translation id="7114054701490058191">Slaptažodžiai neatitinka</translation> <translation id="7114648273807173152">Jei norite prisijungti prie „Google“ paskyros naudodami „Smart Lock“, eikite į skiltį „Nustatymai“ > „Prijungti įrenginiai“ > „Jūsų telefonas“ > „Smart Lock“.</translation> +<translation id="7115051913071512405">Išbandykite</translation> <translation id="7115361495406486998">Pasiekiamų kontaktų nėra</translation> <translation id="7115731767122970828">Padidinti dabar</translation> <translation id="7116554090938189816">Spausdintuvo SSL sertifikatas nebegalioja. Iš naujo paleiskite spausdintuvą ir bandykite dar kartą.</translation>
diff --git a/chrome/app/resources/generated_resources_lv.xtb b/chrome/app/resources/generated_resources_lv.xtb index a52ecd66..b10b476f 100644 --- a/chrome/app/resources/generated_resources_lv.xtb +++ b/chrome/app/resources/generated_resources_lv.xtb
@@ -668,7 +668,6 @@ <translation id="1464258312790801189">Jūsu konti</translation> <translation id="1464597059227482327">Ja veicat kopīgošanu ar Chromebook datoru, kas nav iekļauts jūsu kontaktpersonu sarakstā, datorā ir jāieslēdz funkcija “Tuvumā: redzamība”. Lai ieslēgtu funkciju “Tuvumā: redzamība”, atlasiet apakšējo labo stūri un pēc tam atlasiet funkcijas “Tuvumā: redzamība” ieslēgšanas opciju. <ph name="LINK_BEGIN" />Uzzināt vairāk<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Lai skatītu ierīces preferences, pārejiet uz sadaļu Iestatījumi.</translation> -<translation id="146481294006497945">Nav saglabātu paroļu</translation> <translation id="1465176863081977902">Kopēt audio adresi</translation> <translation id="146522654774760805">Paroles un automātiskā aizpilde</translation> <translation id="1465827627707997754">Picas šķēle</translation> @@ -2167,7 +2166,6 @@ <translation id="2485394160472549611">Labākie ieteikumi jums</translation> <translation id="2485422356828889247">Atinstalēt</translation> <translation id="2485681265915754872">Google Play pakalpojumu sniegšanas noteikumi</translation> -<translation id="2486036712620651117">Paroles un piekļuves atslēgas</translation> <translation id="248676429071089168">Velciet augšup, lai pārvietotu lapu uz leju</translation> <translation id="2487067538648443797">Pievienot jaunu grāmatzīmi</translation> <translation id="2489686758589235262">Piešķirt vēl divus slēdžus</translation> @@ -3888,7 +3886,6 @@ <translation id="3721178866505920080">Plašāka informācija par paplašinātas iepriekšējas ielādes ieslēgšanu</translation> <translation id="3722108462506185496">Startējot virtuālās mašīnas pakalpojumu, radās kļūda. Lūdzu, mēģiniet vēlreiz.</translation> <translation id="3722624153992426516">Saņemts norādījums <ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /></translation> -<translation id="3724897774652282549">Aizpildiet veidlapu</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Pieejamie Wi-Fi tīkli</translation> @@ -4321,7 +4318,6 @@ <translation id="3993887353483242788">Sinhronizējiet savu ierīci (<ph name="DEVICE_TYPE" />), lai jūsu preferences būtu pieejamas jebkurā ierīcē, kad pierakstāties ar savu Google kontu. Preferences ietver lietotnes, iestatījumus, Wi-Fi paroles, valodas, fona tapetes, īsinājumtaustiņus u.c.</translation> <translation id="3994318741694670028">Diemžēl jūsu datora konfigurācijā tika izmantots nepareizi veidots aparatūras ID. Tādēļ operētājsistēmu Chrome OS Flex nevarēja atjaunināt, izmantojot jaunākos drošības labojumus, un jūsu dators, <ph name="BEGIN_BOLD" />iespējams, nav aizsargāts pret ļaunprātīgiem uzbrukumiem<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Atbloķējiet tālruni un pietuviniet to, lai atbloķētu savu ierīci (<ph name="DEVICE_TYPE" />).</translation> -<translation id="3994522032746736727">Pierakstīties ar kontu <ph name="EMAIL" /></translation> <translation id="3994530503403062649">Atrodiet pogas uz planšetdatora</translation> <translation id="3994708120330953242">Datu aizsardzības pārkāpuma dēļ tika atklātas dažas jūsu saglabātās paroles. Lai aizsargātu kontus, šīs paroles ir jānomaina tūlīt.</translation> <translation id="3994878504415702912">Tālummaiņa</translation> @@ -6589,7 +6585,6 @@ <translation id="5646994841348250879">Izvēlieties kontu, ar kuru pierakstīties šeit: <ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">Mikrofona ligzda</translation> <translation id="5648166631817621825">Pēdējās 7 dienas</translation> -<translation id="5650537073531199882">Veidlapas aizpilde</translation> <translation id="5651308944918885595">Uztveramība funkcijai “Kopīgošana tuvumā”</translation> <translation id="5653154844073528838">Jums ir <ph name="PRINTER_COUNT" /> saglabāti printeri.</translation> <translation id="5654669866168491665">Uzzināt vairāk par vietnēm, kas var vairs nedarboties, kad bloķējat trešo pušu sīkfailus</translation> @@ -8592,6 +8587,7 @@ <translation id="7113974454301513811">Tagad pievienojiet sarakstam pašreizējo cilni.</translation> <translation id="7114054701490058191">Paroles nav vienādas</translation> <translation id="7114648273807173152">Lai pierakstītos Google kontā, izmantojot Smart Lock, atveriet sadaļu Iestatījumi > Pievienotās ierīces > Jūsu tālrunis > Smart Lock.</translation> +<translation id="7115051913071512405">Izmēģināt</translation> <translation id="7115361495406486998">Nav sasniedzamu kontaktpersonu</translation> <translation id="7115731767122970828">Uzlabot tūlīt</translation> <translation id="7116554090938189816">Printera SSL sertifikātam ir beidzies derīguma termiņš. Restartējiet printeri un mēģiniet vēlreiz.</translation>
diff --git a/chrome/app/resources/generated_resources_mk.xtb b/chrome/app/resources/generated_resources_mk.xtb index ee11773..cb7e81b0 100644 --- a/chrome/app/resources/generated_resources_mk.xtb +++ b/chrome/app/resources/generated_resources_mk.xtb
@@ -668,7 +668,6 @@ <translation id="1464258312790801189">Ваши сметки</translation> <translation id="1464597059227482327">Ако споделувате со Chromebook што не е во вашите контакти, проверете дали уредот Chromebook има вклучено „Видливост во близина“. За да вклучите „Видливост во близина“, изберете го долниот десен агол, па изберете за да вклучите „Видливост во близина“. <ph name="LINK_BEGIN" />Дознајте повеќе<ph name="LINK_END" /></translation> <translation id="1464781208867302907">За поставки за уредот, одете во „Поставки“.</translation> -<translation id="146481294006497945">Нема зачувани лозинки</translation> <translation id="1465176863081977902">К&опирај ја адресата на аудиото</translation> <translation id="146522654774760805">Лозинки и „Автоматско пополнување“</translation> <translation id="1465827627707997754">Парче пица</translation> @@ -2179,7 +2178,6 @@ <translation id="2485394160472549611">Најдобар избор за вас</translation> <translation id="2485422356828889247">Деинсталирај</translation> <translation id="2485681265915754872">Услови за користење на Google Play</translation> -<translation id="2486036712620651117">Лозинки и криптографски клучеви</translation> <translation id="248676429071089168">Повлечете нагоре за да ја преместите страницата надолу</translation> <translation id="2487067538648443797">Додај нов обележувач</translation> <translation id="2489686758589235262">Додели уште 2 прекинувачи</translation> @@ -3902,7 +3900,6 @@ <translation id="3721178866505920080">Повеќе детали за вклучувањето „Проширено вчитување однапред“</translation> <translation id="3722108462506185496">Грешка при стартувањето на услугата за виртуелна машина. Обидете се повторно.</translation> <translation id="3722624153992426516">Примени се упатства од <ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /></translation> -<translation id="3724897774652282549">Пополнување формулар</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Достапни Wi-Fi мрежи</translation> @@ -4335,7 +4332,6 @@ <translation id="3993887353483242788">Извршете синхронизација на <ph name="DEVICE_TYPE" /> за да бидат спремни поставките на кој било уред кога ќе се најавите со вашата сметка на Google. Поставките вклучуваат апликации, поставки, лозинки за Wi-Fi, јазици, тапет, кратенки од тастатура и друго.</translation> <translation id="3994318741694670028">За жал, вашиот компјутер е конфигуриран со деформиран ИД на хардвер. Ова го спречува ChromeOS Flex да ги ажурира најновите безбедносни поправки и вашиот компјутер <ph name="BEGIN_BOLD" />може да е ранлив на напади од злонамерен софтвер<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Отклучете го телефонот и приближете го за отклучување на вашиот <ph name="DEVICE_TYPE" />.</translation> -<translation id="3994522032746736727">Најавете се како <ph name="EMAIL" /></translation> <translation id="3994530503403062649">Лоцирајте ги копчињата на таблетот</translation> <translation id="3994708120330953242">Некои од вашите лозинки беа откриени при упад во податоци. За да ги заштитите вашите сметки, треба да ги промените лозинкиве веднаш.</translation> <translation id="3994878504415702912">&Зумирај</translation> @@ -6606,7 +6602,6 @@ <translation id="5646994841348250879">Изберете сметка за најавување на <ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">Приклучок за микрофон</translation> <translation id="5648166631817621825">Изминатите 7 дена</translation> -<translation id="5650537073531199882">Пополнување формулар</translation> <translation id="5651308944918885595">Достапност на „Споделување во близина“</translation> <translation id="5653154844073528838">Имате <ph name="PRINTER_COUNT" /> зачувани печатачи.</translation> <translation id="5654669866168491665">Дознајте повеќе за сајтовите што можеби нема да функционираат ако се блокирани колачињата од трети страни</translation> @@ -8607,6 +8602,7 @@ <translation id="7113974454301513811">Сега додајте ја тековната картичка во списокот</translation> <translation id="7114054701490058191">Лозинките не се совпаѓаат</translation> <translation id="7114648273807173152">За да ја користите Smart Lock за најавување на вашата сметка на Google, одете во „Поставки > Поврзани уреди > Вашиот телефон > Smart Lock“.</translation> +<translation id="7115051913071512405">Испробај го</translation> <translation id="7115361495406486998">Нема достапни контакти</translation> <translation id="7115731767122970828">Засили сега</translation> <translation id="7116554090938189816">SSL-сертификатот на печатачот е истечен. Рестартирајте го печатачот, па обидете се повторно.</translation>
diff --git a/chrome/app/resources/generated_resources_ml.xtb b/chrome/app/resources/generated_resources_ml.xtb index 6e804b0..628f372 100644 --- a/chrome/app/resources/generated_resources_ml.xtb +++ b/chrome/app/resources/generated_resources_ml.xtb
@@ -666,7 +666,6 @@ <translation id="1464258312790801189">നിങ്ങളുടെ അക്കൗണ്ടുകൾ</translation> <translation id="1464597059227482327">നിങ്ങളുടെ കോൺടാക്റ്റുകളിൽ ഇല്ലാത്ത ഒരു Chromebook-മായാണ് നിങ്ങൾ പങ്കിടുന്നതെങ്കിൽ, Chromebook-ൽ "സമീപമുള്ള ദൃശ്യപരത" ഓണാക്കിയിട്ടുണ്ടെന്ന് ഉറപ്പാക്കുക. “സമീപമുള്ള ദൃശ്യപരത” ഓണാക്കാൻ, താഴെ വലതുവശത്തേക്ക് പോയി “സമീപമുള്ള ദൃശ്യപരത” ഓണാക്കാൻ തിരഞ്ഞെടുക്കുക. <ph name="LINK_BEGIN" />കൂടുതലറിയുക<ph name="LINK_END" /></translation> <translation id="1464781208867302907">ഉപകരണ മുൻഗണനകൾക്ക്, ക്രമീകരണത്തിലേക്ക് പോവുക.</translation> -<translation id="146481294006497945">സംരക്ഷിച്ച പാസ്വേഡുകളില്ല</translation> <translation id="1465176863081977902">ഓഡിയോ വിലാസം പകർത്തുക</translation> <translation id="146522654774760805">പാസ്വേഡുകളും സ്വയമേവ പൂരിപ്പിക്കലും</translation> <translation id="1465827627707997754">പിസ്സാ സ്ലൈസ്</translation> @@ -2162,7 +2161,6 @@ <translation id="2485394160472549611">നിങ്ങൾക്കായി തിരഞ്ഞെടുത്തവയിൽ പ്രധാനപ്പെട്ടവ</translation> <translation id="2485422356828889247">അണ്ഇന്സ്റ്റാള് ചെയ്യുക</translation> <translation id="2485681265915754872">Google Play സേവന നിബന്ധനകൾ</translation> -<translation id="2486036712620651117">പാസ്വേഡുകളും പാസ്കീകളും</translation> <translation id="248676429071089168">പേജ് താഴേക്ക് നീക്കാൻ മുകളിലേക്ക് സ്വൈപ്പ് ചെയ്യുക</translation> <translation id="2487067538648443797">പുതിയ ബുക്ക്മാർക്ക് ചേർക്കുക</translation> <translation id="2489686758589235262">2 സ്വിച്ചുകൾ കൂടി അസൈൻ ചെയ്യുക</translation> @@ -3885,7 +3883,6 @@ <translation id="3721178866505920080">വിപുലീകരിച്ച പ്രീലോഡിംഗ് ഓണാക്കുന്നതിനെ കുറിച്ചുള്ള കൂടുതൽ വിവരങ്ങൾ</translation> <translation id="3722108462506185496">വെർച്വൽ മെഷീൻ സേവനം പ്രവർത്തനം തുടങ്ങുന്നതിൽ പിശക്. വീണ്ടും ശ്രമിക്കുക.</translation> <translation id="3722624153992426516"><ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /> നിർദ്ദേശം ലഭിച്ചു</translation> -<translation id="3724897774652282549">ഫോം പൂരിപ്പിക്കുക</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">ലഭ്യമായ വൈഫൈ നെറ്റ്വർക്കുകൾ</translation> @@ -4317,7 +4314,6 @@ <translation id="3993887353483242788">നിങ്ങളുടെ <ph name="DEVICE_TYPE" /> സമന്വയിപ്പിക്കുക, ഇതുവഴി നിങ്ങൾ Google Account ഉപയോഗിച്ച് സൈൻ ഇൻ ചെയ്യുമ്പോൾ ഏതൊരു ഉപകരണത്തിലും നിങ്ങളുടെ മുൻഗണനകൾ തയ്യാറായിരിക്കും. ആപ്പുകൾ, ക്രമീകരണം, വൈഫൈ പാസ്വേഡുകൾ, ഭാഷകൾ, വാൾപേപ്പർ, കീബോഡ് കുറുക്കുവഴികൾ എന്നിവയും മറ്റും മുൻഗണനകളിൽ ഉൾപ്പെടുന്നു.</translation> <translation id="3994318741694670028">നിർഭാഗ്യവശാൽ, കേടായ ഹാർഡ്വെയർ ഐഡി ഉപയോഗിച്ചാണ് നിങ്ങളുടെ കമ്പ്യൂട്ടർ കോൺഫിഗർ ചെയ്തിരിക്കുന്നത്. ഇത് ഏറ്റവും പുതിയ സുരക്ഷാ പ്രശ്നപരിഹാരമാർഗ്ഗങ്ങൾ അപ്ഡേറ്റ് ചെയ്യുന്നതിൽ നിന്ന് ChromeOS Flex-നെ തടയുന്നു, നിങ്ങളുടെ കമ്പ്യൂട്ടറിൽ <ph name="BEGIN_BOLD" />ദോഷകരമായ ആക്രമണങ്ങളുണ്ടായേക്കാം<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">നിങ്ങളുടെ ഫോൺ അൺലോക്ക് ചെയ്ത്, <ph name="DEVICE_TYPE" /> അൺലോക്ക് ചെയ്യാൻ അടുത്തേക്ക് കൊണ്ടുവരിക.</translation> -<translation id="3994522032746736727"><ph name="EMAIL" /> ആയി സൈൻ ഇൻ ചെയ്യുക</translation> <translation id="3994530503403062649">നിങ്ങളുടെ ടാബ്ലെറ്റിൽ ബട്ടണുകൾ കണ്ടെത്തുക</translation> <translation id="3994708120330953242">നിങ്ങളുടെ പാസ്വേഡുകളിൽ ചിലത് ഡാറ്റാ ലംഘനത്തിൽ കണ്ടെത്തി. നിങ്ങളുടെ അക്കൗണ്ടുകൾ സുരക്ഷിതമാക്കാൻ, ഈ പാസ്വേഡുകൾ ഇപ്പോൾ തന്നെ മാറ്റേണ്ടതുണ്ട്.</translation> <translation id="3994878504415702912">&സൂം ചെയ്യുക</translation> @@ -6588,7 +6584,6 @@ <translation id="5646994841348250879"><ph name="SITE_ETLD_PLUS_ONE" /> -ൽ സൈൻ ഇൻ ചെയ്യാൻ ഒരു അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക</translation> <translation id="5648021990716966815">Mic jack</translation> <translation id="5648166631817621825">കഴിഞ്ഞ 7 ദിവസം</translation> -<translation id="5650537073531199882">ഫോം പൂരിപ്പിക്കുക</translation> <translation id="5651308944918885595">സമീപമുള്ള പങ്കിടൽ കണ്ടെത്തൽ ക്ഷമത</translation> <translation id="5653154844073528838">നിങ്ങൾക്ക് സംരക്ഷിച്ചിരിക്കുന്ന <ph name="PRINTER_COUNT" /> പ്രിന്ററുകളുണ്ട്.</translation> <translation id="5654669866168491665">മൂന്നാം കക്ഷി കുക്കികൾ ബ്ലോക്ക് ചെയ്താൽ പ്രവർത്തിക്കാനിടയില്ലാത്ത സൈറ്റുകളെക്കുറിച്ച് കൂടുതലറിയുക</translation> @@ -8588,6 +8583,7 @@ <translation id="7113974454301513811">ഇപ്പോൾ നിങ്ങളുടെ ലിസ്റ്റിലേക്ക് നിലവിലെ ടാബ് ചേർക്കുക</translation> <translation id="7114054701490058191">പാസ്വേഡുകൾ പൊരുത്തപ്പെടുന്നില്ല</translation> <translation id="7114648273807173152">നിങ്ങളുടെ Google അക്കൗണ്ടിലേക്ക് സൈൻ ഇൻ ചെയ്യാൻ Smart Lock ഉപയോഗിക്കുന്നതിന്, ക്രമീകരണം > കണക്റ്റ് ചെയ്ത ഉപകരണങ്ങൾ > നിങ്ങളുടെ ഫോൺ > Smart Lock എന്നിവയിലേക്ക് പോവുക.</translation> +<translation id="7115051913071512405">അത് പരീക്ഷിച്ചുനോക്കൂ</translation> <translation id="7115361495406486998">ബന്ധപ്പെടാവുന്ന കോൺടാക്റ്റുകളൊന്നുമില്ല</translation> <translation id="7115731767122970828">ഇപ്പോൾ ബൂസ്റ്റ് ചെയ്യുക</translation> <translation id="7116554090938189816">പ്രിന്ററിന്റെ SSL സർട്ടിഫിക്കറ്റ് കാലഹരണപ്പെട്ടു. പ്രിന്റർ റീസ്റ്റാർട്ട് ചെയ്ത് വീണ്ടും ശ്രമിക്കുക.</translation>
diff --git a/chrome/app/resources/generated_resources_mn.xtb b/chrome/app/resources/generated_resources_mn.xtb index 7412cff5..4738012 100644 --- a/chrome/app/resources/generated_resources_mn.xtb +++ b/chrome/app/resources/generated_resources_mn.xtb
@@ -667,7 +667,6 @@ <translation id="1464258312790801189">Таны данс</translation> <translation id="1464597059227482327">Хэрэв та харилцагчдад тань байхгүй Chromebook-тэй хуваалцаж байвал тухайн Chromebook “Ойролцоо харагдац”-ыг асаасан эсэхийг шалгана уу. “Ойролцоох харагдац”-ыг асаахын тулд баруун доод буланг сонгож, дараа нь “Ойролцоо харагдац”-ыг асаахыг сонгоно уу. <ph name="LINK_BEGIN" />Нэмэлт мэдээлэл авах<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Төхөөрөмжийн сонголт хийхийн тулд Тохиргоо руу очно уу.</translation> -<translation id="146481294006497945">Хадгалсан ямар ч нууц үг байхгүй</translation> <translation id="1465176863081977902">Аудио хаягийг хуулах</translation> <translation id="146522654774760805">Нууц үг, автоматаар бөглөх хэсэг</translation> <translation id="1465827627707997754">Зүсэм пицца</translation> @@ -2174,7 +2173,6 @@ <translation id="2485394160472549611">Танд зориулсан шилдэг сонголтууд</translation> <translation id="2485422356828889247">Устгах</translation> <translation id="2485681265915754872">Google Play-н үйлчилгээний нөхцөл</translation> -<translation id="2486036712620651117">Нууц үг, нэвтрэх түлхүүрүүд</translation> <translation id="248676429071089168">Хуудсыг доош зөөхийн тулд дээш шударна уу</translation> <translation id="2487067538648443797">Шинэ хавчуурга нэмэх</translation> <translation id="2489686758589235262">Өөр 2 сэлгүүр оноох</translation> @@ -3897,7 +3895,6 @@ <translation id="3721178866505920080">Урьдчилан ачаалах өргөтгөсөн явцыг асаах тухай нэмэлт мэдээлэл</translation> <translation id="3722108462506185496">Виртуал машины үйлчилгээг эхлүүлэхэд алдаа гарлаа. Дахин оролдоно уу.</translation> <translation id="3722624153992426516"><ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /> зааварчилгаа хүлээн авсан</translation> -<translation id="3724897774652282549">Маягтыг бөглөх</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Боломжтой Wi-Fi сүлжээ</translation> @@ -4329,7 +4326,6 @@ <translation id="3993887353483242788">Та өөрийн <ph name="DEVICE_TYPE" />-г синк хийснээр таны тохиргоо Google Бүртгэлээрээ нэвтрэх үед тань аливаа төхөөрөмж дээр бэлэн байх болно. Тохиргоонд апп, тохиргоо, Wi-Fi-н нууц үг, хэл, дэлгэцийн зураг, товчлуурын шууд холбоос болон бусад зүйл багтдаг.</translation> <translation id="3994318741694670028">Харамсалтай нь таны компьютерыг алдаатай техник хангамжийн ID-р тохируулсан байна. Энэ нь ChromeOS Flex-г хамгийн сүүлийн үеийн аюулгүй байдлын засвараар шинэчлэхээс сэргийлж байгаа бөгөөд таны компьютер <ph name="BEGIN_BOLD" />хортой дайралтуудад өртөж магадгүй<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300"><ph name="DEVICE_TYPE" />-н түгжээг тайлахын тулд утасныхаа түгжээг тайлж, ойртуулна уу.</translation> -<translation id="3994522032746736727"><ph name="EMAIL" />-р нэвтрэх</translation> <translation id="3994530503403062649">Таблетынхаа товчнуудыг олоорой</translation> <translation id="3994708120330953242">Таны зарим нууц үг өгөгдлийн зөрчлөөс олдлоо. Бүртгэлүүдээ хамгаалахын тулд та эдгээр нууц үгийг одоо өөрчлөх хэрэгтэй.</translation> <translation id="3994878504415702912">&Томруулах</translation> @@ -6601,7 +6597,6 @@ <translation id="5646994841348250879"><ph name="SITE_ETLD_PLUS_ONE" />-д нэвтрэх бүртгэл сонгоно уу</translation> <translation id="5648021990716966815">Микрофоны чихэвчний оролт</translation> <translation id="5648166631817621825">Сүүлийн 7 хоног</translation> -<translation id="5650537073531199882">Маягтыг бөглөх</translation> <translation id="5651308944918885595">Ойролцоо хуваалцах онцлогийн илрэх байдал</translation> <translation id="5653154844073528838">Танд хадгалсан <ph name="PRINTER_COUNT" /> хэвлэгч байна.</translation> <translation id="5654669866168491665">Гуравдагч талын күүкинүүдийг блоклох үед ажиллахгүй байж магадгүй сайтуудын талаар нэмэлт мэдээлэл авна уу</translation> @@ -8599,6 +8594,7 @@ <translation id="7113974454301513811">Одоо та одоогийн табыг жагсаалтдаа нэмнэ үү</translation> <translation id="7114054701490058191">Нууц үг таарахгүй байна</translation> <translation id="7114648273807173152">Google бүртгэлдээ нэвтрэх ухаалаг түгжээ ашиглахын тулд Тохиргоо > Холбогдсон төхөөрөмжүүд > Таны утас > Ухаалаг түгжээ хэсэгт очно уу.</translation> +<translation id="7115051913071512405">Үүнийг туршаад үзээрэй.</translation> <translation id="7115361495406486998">Холбогдох боломжгүй харилцагчид</translation> <translation id="7115731767122970828">Одоо идэвхжүүлэх</translation> <translation id="7116554090938189816">Хэвлэгчийн SSL сертификатын хугацаа дууссан. Хэвлэгчийг дахин эхлүүлж, дахин оролдоно уу.</translation>
diff --git a/chrome/app/resources/generated_resources_mr.xtb b/chrome/app/resources/generated_resources_mr.xtb index 5256120..2a5065e 100644 --- a/chrome/app/resources/generated_resources_mr.xtb +++ b/chrome/app/resources/generated_resources_mr.xtb
@@ -667,7 +667,6 @@ <translation id="1464258312790801189">तुमची खाती</translation> <translation id="1464597059227482327">तुम्ही तुमच्या संपर्कामध्ये नसलेल्या Chromebook सह शेअर करत असल्यास, Chromebook मध्ये “Nearby दृश्यमानता” सुरू असल्याची खात्री करा. “Nearby दृश्यमानता” सुरू करण्यासाठी, तळाशी उजवा कोपरा निवडा आणि त्यानंतर “Nearby दृश्यमानता” सुरू करण्यासाठी निवडा <ph name="LINK_BEGIN" />अधिक जाणून घ्या<ph name="LINK_END" /></translation> <translation id="1464781208867302907">डिव्हाइस प्राधान्यांसाठी, सेटिंग्ज वर जा.</translation> -<translation id="146481294006497945">कोणतेही सेव्ह केलेले पासवर्ड नाहीत</translation> <translation id="1465176863081977902">ऑडिओ पत्ता कॉपी करा</translation> <translation id="146522654774760805">पासवर्ड आणि ऑटोफिल</translation> <translation id="1465827627707997754">पिझ्झा स्लाइस</translation> @@ -2177,7 +2176,6 @@ <translation id="2485394160472549611">तुमच्यासाठी सर्वोत्कृष्ट निवडी</translation> <translation id="2485422356828889247">अनइंस्टॉल करा</translation> <translation id="2485681265915754872">Google Play सेवा अटी</translation> -<translation id="2486036712620651117">पासवर्ड आणि पासकी</translation> <translation id="248676429071089168">पेज खाली हलवण्यासाठी वर स्वाइप करा</translation> <translation id="2487067538648443797">नवीन बुकमार्क जोडा</translation> <translation id="2489686758589235262">आणखी दोन स्विच असाइन करा</translation> @@ -3900,7 +3898,6 @@ <translation id="3721178866505920080">विस्तारित प्रीलोड करणे सुरू करण्याबद्दल अधिक माहिती</translation> <translation id="3722108462506185496">व्हर्च्युअल मशीन सेवा सुरू करताना एरर आली. कृपया पुन्हा प्रयत्न करा.</translation> <translation id="3722624153992426516"><ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /> सूचना मिळाली आहे</translation> -<translation id="3724897774652282549">फॉर्म भरा</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">उपलब्ध असलेली वायफाय नेटवर्क</translation> @@ -4333,7 +4330,6 @@ <translation id="3993887353483242788">तुमचे <ph name="DEVICE_TYPE" /> सिंक करा, जेणेकरून तुम्ही तुमचे Google खाते वापरून कोणत्याही डिव्हाइसवर साइन इन कराल, तेव्हा तुमची प्राधान्ये तयार असतील. प्राधान्यांमध्ये अॅप्स, सेटिंग्ज, वाय-फाय पासवर्ड, भाषा, वॉलपेपर, कीबोर्ड शॉर्टकट आणि आणखी बऱ्याच गोष्टींंचा समावेश आहे.</translation> <translation id="3994318741694670028">दुर्दैवाने, तुमचा कॉंप्युटर हा समस्या असलेला हार्डवेअर आयडी वापरून कॉन्फिगर केला गेला आहे. यामुळे ChromeOS Flex वर नवीनतम सुरक्षा निराकरणे अपडेट करणे रोखले जात आहे आणि तुमच्या कॉंप्युटरवर <ph name="BEGIN_BOLD" />दुर्भावनापूर्ण हल्ले होण्याची शक्यता आहे<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">तुमचा फोन अनलॉक करा आणि तुमचे <ph name="DEVICE_TYPE" /> अनलॉक करण्यासाठी तो जवळ आणा.</translation> -<translation id="3994522032746736727"><ph name="EMAIL" /> म्हणून साइन इन करा</translation> <translation id="3994530503403062649">तुमच्या टॅबलेटवरील बटणे शोधा</translation> <translation id="3994708120330953242">तुमचे काही पासवर्ड डेटा भंगामध्ये आढळले. तुमची खाती सुरक्षित करण्यासाठी, तुम्ही आता हे पासवर्ड बदलले पाहिजेत.</translation> <translation id="3994878504415702912">&झूम करा</translation> @@ -6602,7 +6598,6 @@ <translation id="5646994841348250879"><ph name="SITE_ETLD_PLUS_ONE" /> मध्ये साइन इन करण्यासाठी एखादे खाते निवडा</translation> <translation id="5648021990716966815">माइक जॅक</translation> <translation id="5648166631817621825">अखेरच्या 7 दिवसांमधील</translation> -<translation id="5650537073531199882">फॉर्म भरा</translation> <translation id="5651308944918885595">Nearby सह शेअरिंग ची शोधसुलभता</translation> <translation id="5653154844073528838">तुमच्याकडे <ph name="PRINTER_COUNT" /> सेव्ह केलेली प्रिंटर आहेत.</translation> <translation id="5654669866168491665">तृतीय पक्ष कुकी ब्लॉक केल्यावर कदाचित काम करणार नाहीत अशा साइटबद्दल अधिक जाणून घ्या</translation> @@ -8605,6 +8600,7 @@ <translation id="7113974454301513811">आता तुमच्या सूचीमध्ये सध्याचा टॅब जोडा</translation> <translation id="7114054701490058191">पासवर्ड जुळत नाहीत</translation> <translation id="7114648273807173152">तुमच्या Google खात्यामध्ये साइन इन करण्यासाठी Smart Lock वापरण्याकरिता, सेटिंग्ज > कनेक्ट केलेली डिव्हाइस > तुमचा फोन > Smart Lock वर जा.</translation> +<translation id="7115051913071512405">हे वापरून पहा</translation> <translation id="7115361495406486998">कोणत्याही संपर्कांपर्यंत पोहोचू शकत नाही</translation> <translation id="7115731767122970828">आता बूस्ट करा</translation> <translation id="7116554090938189816">प्रिंटर SSL सर्टिफिकेट एक्स्पायर झाले आहे. प्रिंटर रीस्टार्ट करा आणि पुन्हा प्रयत्न करा.</translation>
diff --git a/chrome/app/resources/generated_resources_ms.xtb b/chrome/app/resources/generated_resources_ms.xtb index b1c8b2a..cbbedb77 100644 --- a/chrome/app/resources/generated_resources_ms.xtb +++ b/chrome/app/resources/generated_resources_ms.xtb
@@ -539,6 +539,7 @@ <translation id="1368603372088757436">Linux tidak disokong pada <ph name="DEVICE_TYPE" /> anda. <ph name="LINK_BEGIN" />Ketahui lebih lanjut<ph name="LINK_END" /></translation> <translation id="1370249617397887619">Untuk menggunakan tetapan ini pada peranti anda yang lain, simpan tetapan dalam Google Account anda</translation> <translation id="1370384480654163477">Lihat dan edit fail daripada lawatan terakhir anda pada laman ini:</translation> +<translation id="1372259917802609049">Ralat telah berlaku semasa memadamkan kekangan</translation> <translation id="1372841398847029212">Segerakkan ke akaun anda</translation> <translation id="1373176046406139583">Keterlihatan peranti anda mengawal orang yang boleh berkongsi dengan anda semasa skrin anda dibuka kunci. <ph name="LINK_BEGIN" />Ketahui lebih lanjut<ph name="LINK_END" /></translation> <translation id="1374844444528092021">Sijil yang diperlukan oleh rangkaian "<ph name="NETWORK_NAME" />" sama ada tidak dipasang atau tidak lagi sah. Sila dapatkan sijil baharu dan cuba menyambung semula.</translation> @@ -667,7 +668,6 @@ <translation id="1464258312790801189">Akaun Anda</translation> <translation id="1464597059227482327">Jika anda membuat perkongsian dengan Chromebook yang tiada dalam kenalan anda, pastikan “Keterlihatan berdekatan” pada Chromebook tersebut dihidupkan. Untuk menghidupkan “Keterlihatan berdekatan”, pilih bahagian penjuru kanan sebelah bawah dan pilih untuk menghidupkan “Keterlihatan berdekatan”. <ph name="LINK_BEGIN" />Ketahui lebih lanjut<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Untuk pilihan peranti, pergi ke Tetapan.</translation> -<translation id="146481294006497945">Tiada Kata Laluan yang Disimpan</translation> <translation id="1465176863081977902">S&alin Alamat Audio</translation> <translation id="146522654774760805">Kata laluan dan autolengkap</translation> <translation id="1465827627707997754">Potongan piza</translation> @@ -1490,6 +1490,7 @@ Tindakan ini tidak menjejaskan apl atau kandungan pada peranti lain.</translation> <translation id="2018189721942291407">Tidak pasti sama ada anda perlu mendaftar?</translation> <translation id="2018352199541442911">Maaf, peranti storan luaran anda tidak disokong pada masa ini.</translation> +<translation id="2019213483156307334">Ralat telah berlaku semasa menambahkan kekangan</translation> <translation id="2019718679933488176">&Buka Audio dalam Tab Baharu</translation> <translation id="2020183425253392403">Tunjukkan tetapan alamat rangkaian</translation> <translation id="2020225359413970060">Imbas fail</translation> @@ -2178,7 +2179,6 @@ <translation id="2485394160472549611">Pilihan popular untuk anda</translation> <translation id="2485422356828889247">Nyahpasang</translation> <translation id="2485681265915754872">Syarat perkhidmatan Google Play</translation> -<translation id="2486036712620651117">Kata laluan dan Kunci laluan</translation> <translation id="248676429071089168">Leret ke atas untuk menggerakkan halaman ke bawah</translation> <translation id="2487067538648443797">Tambahkan penanda halaman baharu</translation> <translation id="2489686758589235262">Tetapkan 2 atau beberapa suis</translation> @@ -3157,6 +3157,7 @@ <translation id="3188257591659621405">Fail saya</translation> <translation id="3188465121994729530">Purata Pergerakan</translation> <translation id="3189187154924005138">Kursor besar</translation> +<translation id="3189533916970342007">{PASSWORD_COUNT,plural, =1{1 kata laluan dan item lain disimpan pada peranti ini sahaja. Untuk menggunakan item ini pada peranti anda yang lain, simpan item dalam Google Account anda.}other{{PASSWORD_COUNT} kata laluan dan item lain disimpan pada peranti ini sahaja. Untuk menggunakan item ini pada peranti anda yang lain, simpan item dalam Google Account anda.}}</translation> <translation id="3190558889382726167">Kata laluan yang disimpan</translation> <translation id="3192586965067888278">Terangkan masalah secara terperinci. Maklum balas akan dihantar kepada Google untuk semakan manual oleh jurusemak dan mungkin digunakan untuk meningkatkan atau membangunkan produk dan perkhidmatan Google.</translation> <translation id="3192947282887913208">Fail Audio</translation> @@ -3627,6 +3628,7 @@ <translation id="3537881477201137177">Saiz boleh diubah suai kemudian dalam Tetapan</translation> <translation id="3538066758857505094">Ralat menyahpasang Linux. Sila cuba lagi.</translation> <translation id="3539537154248488260">Togol Inspirasi</translation> +<translation id="3539791442352537591">Ralat telah berlaku semasa menyimpan perubahan keadaan amanah</translation> <translation id="3540173484406326944">Tiada rangkaian melalui <ph name="HOST_DEVICE_NAME" /></translation> <translation id="354060433403403521">Penyesuai AC</translation> <translation id="354068948465830244">Sambungan ini boleh membaca dan mengubah data tapak</translation> @@ -3901,7 +3903,6 @@ <translation id="3721178866505920080">Maklumat lanjut tentang menghidupkan prapemuatan lanjutan</translation> <translation id="3722108462506185496">Ralat semasa memulakan perkhidmatan mesin maya. Sila cuba lagi.</translation> <translation id="3722624153992426516">Arahan <ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /> diterima</translation> -<translation id="3724897774652282549">Isi borang</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Rangkaian Wi-Fi yang tersedia</translation> @@ -4334,7 +4335,6 @@ <translation id="3993887353483242788">Segerakkan <ph name="DEVICE_TYPE" /> anda supaya pilihan anda akan tersedia pada mana-mana peranti apabila anda log masuk dengan Google Account anda. Pilihan termasuk apl, tetapan, kata laluan Wi-Fi, bahasa, kertas dinding, pintasan papan kekunci dan pelbagai lagi.</translation> <translation id="3994318741694670028">Malangnya, komputer anda dikonfigurasi dengan ID perkakasan tidak sempurna. Hal ini menghalang Chrome OS Flex daripada mengemas kini kepada pembetulan keselamatan terbaharu dan komputer anda <ph name="BEGIN_BOLD" />mungkin terdedah kepada serangan berniat jahat<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Buka kunci telefon anda dan rapatkan untuk membuka kunci <ph name="DEVICE_TYPE" /> anda.</translation> -<translation id="3994522032746736727">Log masuk sebagai <ph name="EMAIL" /></translation> <translation id="3994530503403062649">Cari butang pada tablet anda</translation> <translation id="3994708120330953242">Sesetengah kata laluan anda ditemukan dalam pelanggaran data. Untuk melindungi akaun anda, anda harus menukar kata laluan ini sekarang.</translation> <translation id="3994878504415702912">&Zum</translation> @@ -4625,6 +4625,7 @@ <translation id="4220648711404560261">Ralat berlaku semasa pengaktifan.</translation> <translation id="4222917615373664617">Penjejakan harga didayakan. Harga ialah <ph name="CURRENT_PRICE" />.</translation> <translation id="4223404254440398437">Mikrofon tidak dibenarkan</translation> +<translation id="4224541845943007092">Baca dan simpan input papan kekunci daripada bar alamat</translation> <translation id="4225397296022057997">Di semua tapak</translation> <translation id="4228071595943929139">Gunakan alamat e-mel organisasi anda</translation> <translation id="4228209296591583948">{NUM_EXTENSIONS,plural, =1{Sambungan ini tidak dibenarkan}other{Sesetengah sambungan tidak dibenarkan}}</translation> @@ -4817,6 +4818,7 @@ <translation id="4361745360460842907">Buka sebagai tab</translation> <translation id="4363262124589131906">Penyegerakan secara automatik fail baharu dalam My Drive kepada Chromebook ini akan dihentikan</translation> <translation id="4364327530094270451">Tembikai</translation> +<translation id="4364417397164696363">{ITEM_COUNT,plural, =1{1 item disimpan pada peranti ini sahaja. Untuk menggunakan item ini pada peranti anda yang lain, simpan item dalam Google Account anda.}other{{ITEM_COUNT} item disimpan pada peranti ini sahaja. Untuk menggunakan item ini pada peranti anda yang lain, simpan item dalam Google Account anda.}}</translation> <translation id="4364567974334641491"><ph name="APP_NAME" /> berkongsi tetingkap.</translation> <translation id="4364830672918311045">Paparkan pemberitahuan</translation> <translation id="4367971618859387374">Nama paparan</translation> @@ -5739,6 +5741,7 @@ <translation id="5029287942302939687">Kata laluan anda telah ditetapkan</translation> <translation id="5029873138381728058">Gagal menyemak VM</translation> <translation id="503155457707535043">Apl sedang dimuat turun</translation> +<translation id="5031769842769721381">{SELECTED_ITEMS,plural, =0{Alamat}=1{Alamat ({SELECTED_ITEMS})}other{Alamat ({SELECTED_ITEMS})}}</translation> <translation id="5032430150487044192">Tidak dapat membuat Kod QR</translation> <translation id="5033137252639132982">Tidak dibenarkan untuk menggunakan penderia gerakan</translation> <translation id="5035846135112863536">Pilih "Lagi butiran" di bawah untuk mendapatkan maklumat lanjut daripada <ph name="IDENTITY_PROVIDER_ETLD_PLUS_ONE" />.</translation> @@ -6488,6 +6491,7 @@ <translation id="5568069709869097550">Tidak boleh log masuk</translation> <translation id="5568525251731145240">Padamkan data dan kebenaran laman untuk <ph name="SITE_NAME" />, semua laman yang ada dalam laman ini dan apl yang dipasang?</translation> <translation id="5568602038816065197">Laman boleh menggunakan ciri lanjutan daripada mana-mana pencetak yang boleh diakses oleh peranti anda tanpa melalui gesaan Cetak standard</translation> +<translation id="5570149859473005144">{SELECTED_ITEMS,plural, =0{Kata laluan}=1{Kata laluan ({SELECTED_ITEMS})}other{Kata laluan ({SELECTED_ITEMS})}}</translation> <translation id="5571066253365925590">Bluetooth didayakan</translation> <translation id="5571092938913434726">Kawalan Media Global</translation> <translation id="5571832155627049070">Sesuaikan profil anda</translation> @@ -6605,7 +6609,6 @@ <translation id="5646994841348250879">Pilih akaun untuk log masuk ke <ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">Bicu mikrofon</translation> <translation id="5648166631817621825">7 hari lalu</translation> -<translation id="5650537073531199882">Isi Borang</translation> <translation id="5651308944918885595">Kebolehtemuan Kongsi Berdekatan</translation> <translation id="5653154844073528838">Anda mempunyai <ph name="PRINTER_COUNT" /> pencetak yang disimpan.</translation> <translation id="5654669866168491665">Ketahui lebih lanjut tentang laman yang mungkin tidak berfungsi apabila kuki pihak ketiga disekat</translation> @@ -6993,6 +6996,7 @@ <translation id="5941153596444580863">Tambah orang...</translation> <translation id="5941343993301164315">Sila log masuk ke <ph name="TOKEN_NAME" />.</translation> <translation id="5941711191222866238">Minimumkan</translation> +<translation id="5941854976565320351">{PASSWORD_COUNT,plural, =1{1 kata laluan disimpan pada peranti ini sahaja. Untuk menggunakan kata laluan ini pada peranti anda yang lain, simpan kata laluan dalam Google Account anda.}other{{PASSWORD_COUNT} kata laluan disimpan pada peranti ini sahaja. Untuk menggunakan kata laluan ini pada peranti anda yang lain, simpan kata laluan dalam Google Account anda.}}</translation> <translation id="594221546068848596">Cari halaman dengan <ph name="VISUAL_SEARCH_PROVIDER" /></translation> <translation id="5942779427914696408">Keterlihatan peranti</translation> <translation id="5943127421590245687">Pengesahan anda berjaya. Untuk membuka kunci dan memulihkan data setempat anda, sila masukkan kata laluan <ph name="DEVICE_TYPE" /> lama anda.</translation> @@ -8510,6 +8514,7 @@ <translation id="7036706669646341689"><ph name="DISK_SIZE" /> ruang disyorkan untuk Linux. Untuk meningkatkan ruang kosong, padamkan fail daripada peranti anda.</translation> <translation id="7037157058268992880">Terlupa PIN</translation> <translation id="7037509989619051237">Teks ke pratonton</translation> +<translation id="7037633074390821254">Kekangan DNS atau CIDR</translation> <translation id="7038632520572155338">Akses suis</translation> <translation id="7038710352229712897">Tambah Google Account lain untuk <ph name="USER_NAME" /></translation> <translation id="7039326228527141150">Akses peranti USB daripada <ph name="VENDOR_NAME" /></translation> @@ -8605,6 +8610,7 @@ <translation id="7113974454301513811">Tambahkan tab semasa pada senarai anda sekarang</translation> <translation id="7114054701490058191">Kata laluan tidak sepadan</translation> <translation id="7114648273807173152">Untuk menggunakan Smart Lock untuk log masuk ke Google Account anda, pergi ke Tetapan > Peranti disambungkan > Telefon anda > Smart Lock.</translation> +<translation id="7115051913071512405">Cubalah</translation> <translation id="7115361495406486998">Tiada kenalan yang dapat dihubungi</translation> <translation id="7115731767122970828">Tingkatkan sekarang</translation> <translation id="7116554090938189816">Sijil SSL pencetak telah tamat tempoh. Mulakan semula pencetak dan cuba sekali lagi.</translation> @@ -8636,6 +8642,7 @@ <translation id="7134951043985383439">Fail berbahaya dimuat turun</translation> <translation id="7135729336746831607">Hidupkan Bluetooth?</translation> <translation id="7136694880210472378">Jadikan lalai</translation> +<translation id="7137277889990479760">Teruskan sebagai <ph name="EMAIL" /></translation> <translation id="7137771508221868414">Tindakan ini akan memadamkan <ph name="TOTAL_USAGE" /> daripada data yang disimpan oleh laman dan apl yang dipasang</translation> <translation id="7138678301420049075">Lain-lain</translation> <translation id="7139627972753429585"><ph name="APP_NAME" /> sedang menggunakan mikrofon anda</translation> @@ -8757,6 +8764,7 @@ <translation id="7231260028442989757">Lihat, ketepikan dan balas pemberitahuan telefon anda</translation> <translation id="7231347196745816203">Gunakan telefon anda untuk membuka kunci <ph name="DEVICE_TYPE" /> anda.</translation> <translation id="7232750842195536390">Penamaan semula gagal</translation> +<translation id="7232962679391151113">{BOOKMARK_COUNT,plural, =1{1 penanda halaman dan item lain disimpan pada peranti ini sahaja. Untuk menggunakan item ini pada peranti anda yang lain, simpan item dalam Google Account anda.}other{{BOOKMARK_COUNT} penanda halaman dan item lain disimpan pada peranti ini sahaja. Untuk menggunakan item ini pada peranti anda yang lain, simpan item dalam Google Account anda.}}</translation> <translation id="723343421145275488">Cari Imej dengan <ph name="VISUAL_SEARCH_PROVIDER" /></translation> <translation id="7234010996000898150">Membatakan pemulihan Linux</translation> <translation id="7235305658956131898">Apl Android yang dipasang oleh pentadbir peranti anda.</translation> @@ -8883,6 +8891,7 @@ <translation id="7327989755579928735"><ph name="MANAGER" /> telah melumpuhkan penyahpepijatan ADB. Sebaik sahaja anda memulakan semula <ph name="DEVICE_TYPE" />, anda tidak akan dapat memuat sisi apl.</translation> <translation id="7328119182036084494">Disimpan pada <ph name="WEB_DRIVE" /></translation> <translation id="7328162502911382168">(<ph name="COUNT" />)</translation> +<translation id="732845903678043302">{BOOKMARK_COUNT,plural, =1{1 penanda halaman disimpan pada peranti ini sahaja. Untuk menggunakan penanda halaman ini pada peranti anda yang lain, simpan penanda halaman dalam Google Account anda.}other{{BOOKMARK_COUNT} penanda halaman disimpan pada peranti ini sahaja. Untuk menggunakan penanda halaman ini pada peranti anda yang lain, simpan penanda halaman dalam Google Account anda.}}</translation> <translation id="7328867076235380839">Gabungan tidak sah</translation> <translation id="7329154610228416156">Log masuk gagal kerana telah dikonfigurasikan untuk menggunakan URL tidak selamat (<ph name="BLOCKED_URL" />). Sila hubungi pentadbir anda.</translation> <translation id="7330533963640151632">Tetapan <ph name="FEATURE_NAME" /> untuk peranti <ph name="USER_NAME" />, berkongsi menggunakan akaun <ph name="USER_EMAIL" />.</translation> @@ -9214,6 +9223,7 @@ <translation id="7561196759112975576">Sentiasa</translation> <translation id="7561759921596375678">Hidupkan kelantangan</translation> <translation id="7561982940498449837">Tutup menu</translation> +<translation id="7563970324931922582">[placeholder text]</translation> <translation id="756445078718366910">Buka Tetingkap Penyemak Imbas</translation> <translation id="7564847347806291057">Tamatkan proses</translation> <translation id="756503097602602175">Anda boleh mengurus Google Account yang dilog masuk daripada <ph name="LINK_BEGIN" />Tetapan<ph name="LINK_END" />. Kebenaran yang telah anda berikan kepada laman web dan apl boleh digunakan pada semua akaun. Jika anda tidak mahu maklumat akaun anda diakses oleh laman atau apl, anda boleh log masuk ke <ph name="DEVICE_TYPE" /> anda sebagai tetamu atau menyemak imbas web dalam <ph name="LINK_2_BEGIN" />tetingkap Inkognito<ph name="LINK_2_END" />.</translation> @@ -10427,6 +10437,7 @@ <translation id="8398877366907290961">Teruskan juga</translation> <translation id="8399282673057829204">Lihat kata laluan</translation> <translation id="839949601275221554">Peranti mengalami ralat. Sila mulakan semula peranti anda dan cuba lagi.</translation> +<translation id="8399889560226245071">{SELECTED_ITEMS,plural, =0{Penanda halaman}=1{Penanda halaman ({SELECTED_ITEMS})}other{Penanda halaman ({SELECTED_ITEMS})}}</translation> <translation id="8401432541486058167">Sediakan PIN yang dikaitkan dengan kad pintar anda.</translation> <translation id="8403807918453631441"><ph name="BRAND" /> boleh menyemak kata laluan anda yang disimpan</translation> <translation id="8405046151008197676">Dapatkan sorotan daripada kemas kini terbaharu</translation> @@ -10907,6 +10918,7 @@ <translation id="8737966899544698733">Ketepatan Lokasi (Android sahaja)</translation> <translation id="8738418093147087440">Cari mengikut negara, bahasa atau nama input</translation> <translation id="8740086188450289493">Gunakan kata laluan Google Account</translation> +<translation id="874023689350909633">Cubalah</translation> <translation id="8740247629089392745">Anda boleh menyerahkan Chromebook ini kepada <ph name="SUPERVISED_USER_NAME" />. Persediaan hampir selesai, kemudian tibalah masa untuk meneroka.</translation> <translation id="8740672167979365981">Kemaskinian Chrome OS Flex diperlukan</translation> <translation id="8741944563400125534">Panduan persediaan Akses Suis</translation> @@ -11681,6 +11693,7 @@ <translation id="97905529126098460">Tetingkap ini akan ditutup selepas pembatalan selesai.</translation> <translation id="980731642137034229">Butang menu tindakan</translation> <translation id="981121421437150478">Luar talian</translation> +<translation id="982083952953998237">Tambahkan Kekangan</translation> <translation id="98235653036850093">Hai <ph name="PROFILE_NAME" /></translation> <translation id="983192555821071799">Tutup semua tab</translation> <translation id="983531994960412650"><ph name="WINDOW_TITLE" /> - Rakaman kamera dan mikrofon</translation>
diff --git a/chrome/app/resources/generated_resources_my.xtb b/chrome/app/resources/generated_resources_my.xtb index f8a56af4..9b0894d 100644 --- a/chrome/app/resources/generated_resources_my.xtb +++ b/chrome/app/resources/generated_resources_my.xtb
@@ -666,7 +666,6 @@ <translation id="1464258312790801189">သင်၏ အကောင့်များ</translation> <translation id="1464597059227482327">သင်၏အဆက်အသွယ်များတွင် မပါဝင်သော Chromebook အား မျှဝေနေပါက သင့် Chromebook တွင် “အနီးတစ်ဝိုက် မြင်နိုင်မှု” ကိုဖွင့်ထားကြောင်း သေချာပါစေ။ “အနီးတစ်ဝိုက် မြင်နိုင်မှု” ကိုဖွင့်ရန် ညာဘက်အောက်ခြေကို ရွေးပြီး “အနီးတစ်ဝိုက် မြင်နိုင်မှု” ဖွင့်ရန်ကို ရွေးပါ။ <ph name="LINK_BEGIN" />ပိုမိုလေ့လာရန်<ph name="LINK_END" /></translation> <translation id="1464781208867302907">ကိရိယာ သတ်မှတ်ချက်များအတွက် 'ဆက်တင်များ' သို့သွားပါ။</translation> -<translation id="146481294006497945">သိမ်းထားသော စကားဝှက် မရှိပါ</translation> <translation id="1465176863081977902">အသံ၏ လိပ်စာ မိ&တ္တူ ကူးပါ</translation> <translation id="146522654774760805">စကားဝှက်များ၊ အော်တိုဖြည့်ခြင်း</translation> <translation id="1465827627707997754">ပီဇာအပိုင်း</translation> @@ -2176,7 +2175,6 @@ <translation id="2485394160472549611">သင့်အတွက် ထိပ်တန်း လက်ရွေးစင်များ</translation> <translation id="2485422356828889247">ဖြုတ်ရန်</translation> <translation id="2485681265915754872">Google Play ဝန်ဆောင်မှုစည်းမျဉ်းများ</translation> -<translation id="2486036712620651117">စကားဝှက်များ၊ လျှို့ဝှက်ကီးများ</translation> <translation id="248676429071089168">စာမျက်နှာအောက်သို့ ရွှေ့ရန် အပေါ်သို့ ပွတ်ဆွဲပါ</translation> <translation id="2487067538648443797">လိပ်စာအသစ် ထည့်ရန်</translation> <translation id="2489686758589235262">နောက်ထပ် အသွင်တူခလုတ် 2 ခု သတ်မှတ်ရန်</translation> @@ -3900,7 +3898,6 @@ <translation id="3721178866505920080">တိုးချဲ့ထားသော ကြိုဖွင့်ခြင်းကို ဖွင့်သည့်အကြောင်း နောက်ထပ်အချက်အလက်</translation> <translation id="3722108462506185496">ပကတိအသွင်စက် ဝန်ဆောင်မှု စတင်၍မရပါ။ ထပ်စမ်းကြည့်ပါ။</translation> <translation id="3722624153992426516"><ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /> ညွှန်ကြားချက် ရရှိထားသည်</translation> -<translation id="3724897774652282549">ဖောင်ဖြည့်ခြင်း</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">ရနိုင်သော WiFi ကွန်ရက်များ</translation> @@ -4332,7 +4329,6 @@ <translation id="3993887353483242788">Google Account ဖြင့် လက်မှတ်ထိုးဝင်သောအခါ စက်အားလုံးတွင် သင်၏သတ်မှတ်ချက်များ အသင့်ရရှိရန် <ph name="DEVICE_TYPE" /> ကို စင့်ခ်လုပ်နိုင်သည်။ သတ်မှတ်ချက်များတွင် အက်ပ်၊ ဆက်တင်၊ Wi-Fi စကားဝှက်၊ ဘာသာစကား၊ နောက်ခံပုံ၊ လက်ကွက်ဖြတ်လမ်းများ စသည်တို့ ပါဝင်သည်။</translation> <translation id="3994318741694670028">သင့်ကွန်ပျူတာကို ပျက်ယွင်းနေသည့် ဟာ့ဒ်ဝဲ ID ဖြင့် စီစဉ်သတ်မှတ်ထားပါသည်။ ၎င်းက ChromeOS Flex အား နောက်ဆုံးထုတ် လုံခြုံရေးပြင်ဆင်မှုများ အပ်ဒိတ်လုပ်ခြင်းမှ ဟန့်တားလျက်ရှိပြီး သင့်ကွန်ပျူတာသည် <ph name="BEGIN_BOLD" />အန္တရာယ်ရှိသောတိုက်ခိုက်မှုများကို ခုခံနိုင်မည်မဟုတ်ပါ<ph name="END_BOLD" />။</translation> <translation id="3994374631886003300"><ph name="DEVICE_TYPE" /> ကို လော့ခ်ဖွင့်ရန်အတွက် သင့်ဖုန်းကို လော့ခ်ဖွင့်ပြီး အနီးအနားတွင် ထားရှိပါ။</translation> -<translation id="3994522032746736727"><ph name="EMAIL" /> အဖြစ် လက်မှတ်ထိုးဝင်ရန်</translation> <translation id="3994530503403062649">သင့်တက်ဘလက်တွင် ခလုတ်များကို ရှာပါ</translation> <translation id="3994708120330953242">သင့်စကားဝှက်အချို့ကို ဒေတာကျိုးပေါက်မှုတွင် တွေ့သည်။ အကောင့်များလုံခြုံစေရန် ၎င်းတို့ကို ယခုပြောင်းပါ။</translation> <translation id="3994878504415702912">&ဇူးမ်</translation> @@ -6604,7 +6600,6 @@ <translation id="5646994841348250879"><ph name="SITE_ETLD_PLUS_ONE" /> သို့ လက်မှတ်ထိုးဝင်ရန် အကောင့်တစ်ခု ရွေးပါ</translation> <translation id="5648021990716966815">မိုက်ခရိုဖုန်း ဂျက်ပင်</translation> <translation id="5648166631817621825">ပြီးခဲ့သည့် ၇ ရက်</translation> -<translation id="5650537073531199882">ဖောင်ဖြည့်ခြင်း</translation> <translation id="5651308944918885595">'အနီးတစ်ဝိုက် မျှဝေခြင်း' ရှာဖွေတွေ့နိုင်မှု</translation> <translation id="5653154844073528838">သင်သိမ်းဆည်းထားသည့် ပရင်တာ <ph name="PRINTER_COUNT" /> ခု ရှိသည်။</translation> <translation id="5654669866168491665">ပြင်ပကုမ္ပဏီ၏ကွတ်ကီးများကို ပိတ်ထားချိန်၌ အလုပ်မလုပ်နိုင်သည့် ဝဘ်ဆိုက်များအကြောင်း ပိုမိုလေ့လာရန်</translation> @@ -8600,6 +8595,7 @@ <translation id="7113974454301513811">လက်ရှိတဘ်ကို သင့်စာရင်းတွင် ယခုထည့်လိုက်ပါ</translation> <translation id="7114054701490058191">စကားဝှက်များ မတူပါ</translation> <translation id="7114648273807173152">သင့် Google အကောင့်သို့ လက်မှတ်ထိုးဝင်ရာတွင် Smart Lock သုံးရန် 'ဆက်တင်များ > ချိတ်ဆက်ထားသော ကိရိယာများ > သင်၏ဖုန်း > Smart Lock' သို့ သွားပါ။</translation> +<translation id="7115051913071512405">စမ်းကြည့်ပါ</translation> <translation id="7115361495406486998">ဆက်သွယ်နိုင်သော အဆက်အသွယ်များ မရှိပါ</translation> <translation id="7115731767122970828">ယခု မြှင့်တင်ရန်</translation> <translation id="7116554090938189816">ပရင်တာ SSL အသိအမှတ်ပြုလက်မှတ် သက်တမ်းကုန်သွားပြီ။ ပရင်တာကို ပြန်စပြီး ထပ်စမ်းကြည့်ပါ။</translation>
diff --git a/chrome/app/resources/generated_resources_ne.xtb b/chrome/app/resources/generated_resources_ne.xtb index 9c5be89..ab28e669 100644 --- a/chrome/app/resources/generated_resources_ne.xtb +++ b/chrome/app/resources/generated_resources_ne.xtb
@@ -665,7 +665,6 @@ <translation id="1464258312790801189">तपाईंका खाताहरू</translation> <translation id="1464597059227482327">तपाईं आफ्ना कन्ट्याक्टहरूको सूचीमा नभएको Chromebook मा सेयर गर्दै हुनुहुन्छ भने उक्त Chromebook मा "नजिकैका डिभाइसमा देखिने सुविधा" अन गरिएको छ भन्ने कुरा सुनिश्चित गर्नुहोस्। “नजिकैका डिभाइसमा देखिने सुविधा” अन गर्न पुछारको दायाँ कुनामा रहेको बटन चयन गर्नुहोस् अनि “नजिकैका डिभाइसमा देखिने सुविधा” अन गर्ने बटन चयन गर्नुहोस्। <ph name="LINK_BEGIN" />थप जान्नुहोस्<ph name="LINK_END" /></translation> <translation id="1464781208867302907">प्राथमिक यन्त्र सेट गर्न सेटिङमा जानुहोस्।</translation> -<translation id="146481294006497945">कुनै पनि पासवर्ड सेभ गरिएको छैन</translation> <translation id="1465176863081977902">अडियो ठेगाना कपी गर्नुहोस्</translation> <translation id="146522654774760805">पासवर्ड र अटोफिल</translation> <translation id="1465827627707997754">पिज्जाको टुक्रो</translation> @@ -2162,7 +2161,6 @@ <translation id="2485394160472549611">तपाईंका लागि छनौट गरिएका उत्कृष्ट विकल्पहरू</translation> <translation id="2485422356828889247">विस्थापन गर्नुहोस्</translation> <translation id="2485681265915754872">Google Play का सेवाका सर्तहरू</translation> -<translation id="2486036712620651117">पासवर्ड र पासकीहरू</translation> <translation id="248676429071089168">पेज सारेर तल लैजान माथितिर स्वाइप गर्नुहोस्</translation> <translation id="2487067538648443797">नयाँ पुस्तक चिन्ह थप्नुहोस्</translation> <translation id="2489686758589235262">अरू २ वटा स्विच असाइन गर्नुहोस्</translation> @@ -3884,7 +3882,6 @@ <translation id="3721178866505920080">अझ धेरै पेजहरू प्रिलोड गर्ने मोड अन गर्ने तरिकाका बारेमा थप जान्नुहोस्</translation> <translation id="3722108462506185496">भर्चुअल मेसिन सेवा सुरु गर्ने क्रममा त्रुटि भयो। कृपया फेरि प्रयास गर्नुहोस्।</translation> <translation id="3722624153992426516"><ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /> सम्बन्धी निर्देशन प्राप्त भयो</translation> -<translation id="3724897774652282549">फारम भर्नुहोस्</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">उपलब्ध WiFi नेटवर्कहरू</translation> @@ -4316,7 +4313,6 @@ <translation id="3993887353483242788">तपाईंले <ph name="DEVICE_TYPE" /> सिंक गर्नुभयो भने तपाईंले कुनै पनि डिभाइसमा आफ्नो Google खातामार्फत साइन इन गर्दा सो डिभाइसमा तपाईंका प्राथमिकताहरू उपलब्ध हुने छन्। प्राथमिकताअन्तर्गत एप, सेटिङ, Wi-Fi को पासवर्ड, भाषा, वालपेपर, किबोर्डका सर्टकट र अन्य कुराहरू पर्छन्।</translation> <translation id="3994318741694670028">दुर्भाग्यवश, तपाईंको कम्प्युटर गलत हार्डवेयर ID प्रयोग गरी कन्फिगर गरिएको छ। यसले गर्दा ChromeOS Flex मा सुरक्षासम्बन्धी नयाँ समाधानहरू अपडेट गर्न मिल्दैन र तपाईंको कम्प्युटरमा <ph name="BEGIN_BOLD" />हानिकारक आक्रमणहरूको जोखिम हुन सक्छ<ph name="END_BOLD" />।</translation> <translation id="3994374631886003300">आफ्नो फोन अनलक गर्नुहोस् र तपाईंको <ph name="DEVICE_TYPE" /> अनलक गर्न यसलाई नजिक ल्याउनुहोस्।</translation> -<translation id="3994522032746736727"><ph name="EMAIL" /> मार्फत साइन इन गर्नुहोस्</translation> <translation id="3994530503403062649">आफ्नो ट्याब्लेटमा भएका बटनहरूमा क्लिक गर्नुहोस्</translation> <translation id="3994708120330953242">तपाईंका केही पासवर्डहरू चोरी भएका डेटाको सङ्ग्रहमा भेटिए। तपाईंका खाताको सुरक्षार्थ तपाईंले अहिले नै यी पासवर्डहरू बदल्नु पर्छ।</translation> <translation id="3994878504415702912">&जूम गर्नुहोस्</translation> @@ -6587,7 +6583,6 @@ <translation id="5646994841348250879"><ph name="SITE_ETLD_PLUS_ONE" /> मा साइन इन गर्न कुनै खाता छनौट गर्नुहोस्</translation> <translation id="5648021990716966815">माइकको ज्याक</translation> <translation id="5648166631817621825">पछिल्ला ७ दिन</translation> -<translation id="5650537073531199882">फारम भर्नुहोस्</translation> <translation id="5651308944918885595">नजिकैका डिभाइससँग सेयर गर्ने सुविधामा भएको 'भेटिने क्षमता' नामक विकल्प</translation> <translation id="5653154844073528838">तपाईंसँग सुरक्षित गरिएका <ph name="PRINTER_COUNT" /> प्रिन्टरहरू छन्।</translation> <translation id="5654669866168491665">तेस्रो पक्षीय कुकीहरू ब्लक गर्दा काम नगर्न सक्ने साइटहरूका बारेमा थप जान्नुहोस्</translation> @@ -8585,6 +8580,7 @@ <translation id="7113974454301513811">अब आफ्नो सूचीमा हालको ट्याब हाल्नुहोस्</translation> <translation id="7114054701490058191">पासवर्ड मिलेन</translation> <translation id="7114648273807173152">आफ्नो Google खातामा साइन इन गर्नका निम्ति Smart Lock को प्रयोग गर्न सेटिङहरू > कनेक्ट गरिएका डिभाइस > तपाईंको फोन > Smart Lock मा जानुहोस्।</translation> +<translation id="7115051913071512405">यसलाई प्रयास गर्नुहोस्</translation> <translation id="7115361495406486998">कन्ट्याक्टमा Google खाता भएका कोही पनि हुनुहुन्न</translation> <translation id="7115731767122970828">अहिले नै बुस्ट गर्नुहोस्</translation> <translation id="7116554090938189816">प्रिन्टरको SSL प्रमाणपत्रको म्याद सकिएको छ। प्रिन्टर रिस्टार्ट गरेर फेरि प्रयास गर्नुहोस्।</translation>
diff --git a/chrome/app/resources/generated_resources_nl.xtb b/chrome/app/resources/generated_resources_nl.xtb index cc44cb6..7dd6d03 100644 --- a/chrome/app/resources/generated_resources_nl.xtb +++ b/chrome/app/resources/generated_resources_nl.xtb
@@ -666,7 +666,6 @@ <translation id="1464258312790801189">Je accounts</translation> <translation id="1464597059227482327">Als je content deelt met een Chromebook die niet in je contacten staat, zorg je dat 'Dichtbij aan' aanstaat op de Chromebook. Als je 'Dichtbij aan' wilt aanzetten, klik je rechtsonder en zet je 'Dichtbij aan' aan. <ph name="LINK_BEGIN" />Meer informatie<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Ga naar Instellingen voor apparaatvoorkeuren</translation> -<translation id="146481294006497945">Geen opgeslagen wachtwoorden</translation> <translation id="1465176863081977902">Adres van audio k&opiëren</translation> <translation id="146522654774760805">Wachtwoorden en automatisch invullen</translation> <translation id="1465827627707997754">Pizzapunt</translation> @@ -2165,7 +2164,6 @@ <translation id="2485394160472549611">De beste keuzes voor jou</translation> <translation id="2485422356828889247">Installatie ongedaan maken</translation> <translation id="2485681265915754872">Servicevoorwaarden van Google Play</translation> -<translation id="2486036712620651117">Wachtwoorden en toegangssleutels</translation> <translation id="248676429071089168">Swipe omhoog om de pagina omlaag te verplaatsen</translation> <translation id="2487067538648443797">Nieuwe bookmark toevoegen</translation> <translation id="2489686758589235262">Nog 2 schakelaars toewijzen</translation> @@ -3886,7 +3884,6 @@ <translation id="3721178866505920080">Meer informatie over hoe je uitgebreid vooraf laden aanzet</translation> <translation id="3722108462506185496">Fout bij starten van service voor virtuele machines. Probeer het opnieuw.</translation> <translation id="3722624153992426516"><ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" />-instructie ontvangen</translation> -<translation id="3724897774652282549">Formulier invullen</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Beschikbare wifi-netwerken</translation> @@ -4319,7 +4316,6 @@ <translation id="3993887353483242788">Synchroniseer je <ph name="DEVICE_TYPE" /> zodat je voorkeuren beschikbaar zijn op elk apparaat als je inlogt met je Google-account. Voorkeuren omvatten onder andere apps, instellingen, wifi-wachtwoorden, talen, achtergrond en sneltoetsen.</translation> <translation id="3994318741694670028">Je computer is ingesteld met een hardware-ID met een onjuiste notatie. Dit zorgt ervoor dat Chrome OS Flex niet kan worden geüpdatet met de nieuwste beveiligingsoplossingen, waardoor je computer <ph name="BEGIN_BOLD" />kwetsbaar kan zijn voor schadelijke aanvallen<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Ontgrendel je telefoon en plaatst deze dichterbij om je <ph name="DEVICE_TYPE" /> te ontgrendelen.</translation> -<translation id="3994522032746736727">Inloggen als <ph name="EMAIL" /></translation> <translation id="3994530503403062649">Knoppen vinden op je tablet</translation> <translation id="3994708120330953242">Sommige van je wachtwoorden zijn gevonden bij een gegevenslek. Wijzig deze wachtwoorden nu om je accounts te beveiligen.</translation> <translation id="3994878504415702912">&Zoomen</translation> @@ -6585,7 +6581,6 @@ <translation id="5646994841348250879">Kies een account om in te loggen bij <ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">Microfoonaansluiting</translation> <translation id="5648166631817621825">Afgelopen 7 dagen</translation> -<translation id="5650537073531199882">Formulier invullen</translation> <translation id="5651308944918885595">Vindbaarheid voor Dichtbij delen</translation> <translation id="5653154844073528838">Je hebt <ph name="PRINTER_COUNT" /> opgeslagen printers.</translation> <translation id="5654669866168491665">Meer informatie over sites die misschien niet werken als cookies van derden worden geblokkeerd</translation> @@ -8584,6 +8579,7 @@ <translation id="7113974454301513811">Voeg nu het huidige tabblad aan je lijst toe</translation> <translation id="7114054701490058191">Wachtwoorden komen niet overeen</translation> <translation id="7114648273807173152">Als je Smart Lock wilt gebruiken om in te loggen op je Google-account, ga je naar Instellingen > Verbonden apparaten > Je telefoon > Smart Lock.</translation> +<translation id="7115051913071512405">Probeer het uit</translation> <translation id="7115361495406486998">Geen bereikbare contacten</translation> <translation id="7115731767122970828">Nu boosten</translation> <translation id="7116554090938189816">SSL-certificaat voor printer is verlopen. Start de printer opnieuw op en probeer het nog een keer.</translation>
diff --git a/chrome/app/resources/generated_resources_no.xtb b/chrome/app/resources/generated_resources_no.xtb index ba70853..8ae304f 100644 --- a/chrome/app/resources/generated_resources_no.xtb +++ b/chrome/app/resources/generated_resources_no.xtb
@@ -667,7 +667,6 @@ <translation id="1464258312790801189">Kontoene dine</translation> <translation id="1464597059227482327">Hvis du deler med en Chromebook som ikke er i kontaktene dine, må du sørge for at «Nærdeling» er påslått på Chromebooken. For å slå på «Nærdeling», velg nedre høyre hjørne og velg deretter å slå på «Nærdeling». <ph name="LINK_BEGIN" />Finn ut mer<ph name="LINK_END" /></translation> <translation id="1464781208867302907">For enhetspreferanser, gå til Innstillinger.</translation> -<translation id="146481294006497945">Ingen lagrede passord</translation> <translation id="1465176863081977902">K&opiér lydadressen</translation> <translation id="146522654774760805">Passord og autofyll</translation> <translation id="1465827627707997754">Pizzastykke</translation> @@ -2172,7 +2171,6 @@ <translation id="2485394160472549611">Toppvalg for deg</translation> <translation id="2485422356828889247">Avinstaller</translation> <translation id="2485681265915754872">Vilkår for bruk av Google Play</translation> -<translation id="2486036712620651117">Passord og passnøkler</translation> <translation id="248676429071089168">Sveip opp for å flytte siden ned</translation> <translation id="2487067538648443797">Legg til nytt bokmerke</translation> <translation id="2489686758589235262">Tilordne to brytere til</translation> @@ -3895,7 +3893,6 @@ <translation id="3721178866505920080">Mer informasjon om å slå på utvidet forhåndslasting</translation> <translation id="3722108462506185496">Feil ved oppstart av den virtuelle maskinen. Prøv på nytt.</translation> <translation id="3722624153992426516">En <ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" />-instruksjon er mottatt</translation> -<translation id="3724897774652282549">Fyll ut skjemaet</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Tilgjengelige Wifi-nettverk</translation> @@ -4326,7 +4323,6 @@ <translation id="3993887353483242788">Synkroniser <ph name="DEVICE_TYPE" />, slik at preferansene dine er klare på alle enheter når du logger på med Google-kontoen din. Preferanser betyr blant annet apper, innstillinger, wifi-passord, språk, bakgrunnsbilde og hurtigtaster.</translation> <translation id="3994318741694670028">Dessverre er datamaskinen konfigurert med en feilformatert maskinvare-ID. Dette forhindrer ChromeOS Flex fra å ta i bruk de siste sikkerhetsoppdateringene, og datamaskinen <ph name="BEGIN_BOLD" />kan være sårbar for skadelige angrep<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Lås opp telefonen, og hold den nærmere for å låse opp <ph name="DEVICE_TYPE" />-enheten.</translation> -<translation id="3994522032746736727">Logg på som <ph name="EMAIL" /></translation> <translation id="3994530503403062649">Finn knappene på tegnebrettet</translation> <translation id="3994708120330953242">Noen av passordene dine ble funnet i et databrudd. Du bør endre disse passordene nå for å beskytte kontoene dine.</translation> <translation id="3994878504415702912">&Zoom</translation> @@ -6594,7 +6590,6 @@ <translation id="5646994841348250879">Velg en konto for å logge på <ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">Mikrofonkontakt</translation> <translation id="5648166631817621825">Siste 7 dager</translation> -<translation id="5650537073531199882">Fyll ut skjemaet</translation> <translation id="5651308944918885595">Synlighet for nærdeling</translation> <translation id="5653154844073528838">Du har <ph name="PRINTER_COUNT" /> lagrede skrivere.</translation> <translation id="5654669866168491665">Finn ut mer om nettsteder som kanskje ikke fungerer når du blokkerer informasjonskapsler fra tredjeparter</translation> @@ -8594,6 +8589,7 @@ <translation id="7113974454301513811">Legg til den aktive fanen på listen din</translation> <translation id="7114054701490058191">Passordene er ikke like</translation> <translation id="7114648273807173152">For å bruke Smart Lock til å logge på Google-kontoen din, gå til Innstillinger > Tilkoblede enheter > Telefonen din > Smart Lock.</translation> +<translation id="7115051913071512405">Test det</translation> <translation id="7115361495406486998">Ingen kontakter kan nås</translation> <translation id="7115731767122970828">Øk ytelsen nå</translation> <translation id="7116554090938189816">SSL-sertifikatet for skriveren er utløpt. Start skriveren på nytt, og prøv igjen.</translation> @@ -9339,7 +9335,7 @@ <translation id="7660146600670077843">Høyreklikk på en fane, og velg «Legg fanen til i en ny gruppe»</translation> <translation id="7661259717474717992">La nettsteder lagre og lese data i informasjonskapsler</translation> <translation id="7661451191293163002">Kunne ikke anskaffe noe registreringssertifikat.</translation> -<translation id="7662283695561029522">Trykk for å konfigurere</translation> +<translation id="7662283695561029522">Konfigurer</translation> <translation id="7663719505383602579">Mottaker: <ph name="ARC_PROCESS_NAME" /></translation> <translation id="7663774460282684730">Det finnes en hurtigtast</translation> <translation id="7663859337051362114">Legg til eSIM-profil</translation>
diff --git a/chrome/app/resources/generated_resources_or.xtb b/chrome/app/resources/generated_resources_or.xtb index 5a22672..3e253918 100644 --- a/chrome/app/resources/generated_resources_or.xtb +++ b/chrome/app/resources/generated_resources_or.xtb
@@ -666,7 +666,6 @@ <translation id="1464258312790801189">ଆପଣଙ୍କ ଆକାଉଣ୍ଟ</translation> <translation id="1464597059227482327">ଯଦି ଆପଣଙ୍କ ସମ୍ପର୍କରେ ନଥିବା ଏକ Chromebook ସହିତ ଆପଣ ସେୟାର କରୁଛନ୍ତି, Chromebookରେ "Nearby ଭିଜିବିଲିଟୀ" ଚାଲୁ ହୋଇଛି ବୋଲି ସୁନିଶ୍ଚିତ କରନ୍ତୁ। "Nearby ଭିଜିବିଲିଟୀ" ଚାଲୁ କରିବାକୁ, ତଳ ଡାହାଣ କୋଣ ଚୟନ କରନ୍ତୁ ଏବଂ ତା'ପରେ "Nearby ଭିଜିବିଲିଟୀ" ଚାଲୁ କରିବାକୁ ଚୟନ କରନ୍ତୁ।<ph name="LINK_BEGIN" />ଅଧିକ ଶିଖନ୍ତୁ<ph name="LINK_END" /></translation> <translation id="1464781208867302907">ଡିଭାଇସ୍ ପସନ୍ଦଗୁଡ଼ିକ ପାଇଁ ସେଟିଂସ୍କୁ ଯାଆନ୍ତୁ।</translation> -<translation id="146481294006497945">ସେଭ କରାଯାଇଥିବା କୌଣସି ପାସୱାର୍ଡ ନାହିଁ</translation> <translation id="1465176863081977902">&ଅଡିଓ ଠିକଣା କପି କରନ୍ତୁ</translation> <translation id="146522654774760805">ପାସୱାର୍ଡ ଏବଂ ଅଟୋଫିଲ</translation> <translation id="1465827627707997754">ପିଜା ସ୍ଲାଇସ୍</translation> @@ -2163,7 +2162,6 @@ <translation id="2485394160472549611">ଆପଣଙ୍କ ପାଇଁ ଶ୍ରେଷ୍ଠ ପସନ୍ଦଗୁଡ଼ିକ</translation> <translation id="2485422356828889247">ଅନ୍ଇନ୍ଷ୍ଟଲ୍ କରନ୍ତୁ</translation> <translation id="2485681265915754872">Google Play ସେବାର ସର୍ତ୍ତାବଳୀ</translation> -<translation id="2486036712620651117">ପାସୱାର୍ଡ ଏବଂ ପାସକୀ</translation> <translation id="248676429071089168">ପୃଷ୍ଠାକୁ ତଳକୁ ମୁଭ କରିବା ପାଇଁ ଉପରକୁ ସ୍ୱାଇପ କରନ୍ତୁ</translation> <translation id="2487067538648443797">ନୂଆ ବୁକ୍ମାର୍କ ଯୋଗ କରନ୍ତୁ</translation> <translation id="2489686758589235262">ଅଧିକ 2ଟି ସ୍ୱିଚ ଆସାଇନ କରନ୍ତୁ</translation> @@ -3886,7 +3884,6 @@ <translation id="3721178866505920080">ଏକ୍ସଟେଣ୍ଡେଡ ପ୍ରିଲୋଡିଂକୁ ଚାଲୁ କରିବା ବିଷୟରେ ଅଧିକ ସୂଚନା</translation> <translation id="3722108462506185496">ଭର୍ଚୁଆଲ୍ ମେସିନ୍ ସେବା ଆରମ୍ଭ କରିବାରେ ତ୍ରୁଟି। ଦୟାକରି ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ।</translation> <translation id="3722624153992426516"><ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /> ନିର୍ଦ୍ଦେଶ ପ୍ରାପ୍ତ କରାଯାଇଛି</translation> -<translation id="3724897774652282549">ଫର୍ମ ପୂରଣ କରନ୍ତୁ</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">ଉପଲବ୍ଧ ଥିବା ୱାଇଫାଇ ନେଟୱାର୍କଗୁଡ଼ିକ</translation> @@ -4318,7 +4315,6 @@ <translation id="3993887353483242788">ଆପଣଙ୍କ <ph name="DEVICE_TYPE" />କୁ ସିଙ୍କ କରନ୍ତୁ ଯାହା ଫଳରେ ଆପଣ ଆପଣଙ୍କ Google ଆକାଉଣ୍ଟ ମାଧ୍ୟମରେ ସାଇନ ଇନ କଲେ ଯେ କୌଣସି ଡିଭାଇସରେ ଆପଣଙ୍କ ପସନ୍ଦଗୁଡ଼ିକ ପ୍ରସ୍ତୁତ ହୋଇଯିବ। ପସନ୍ଦଗୁଡ଼ିକରେ ଆପ୍ସ, ସେଟିଂସ, ୱାଇ-ଫାଇ ପାସୱାର୍ଡ, ଭାଷା, ୱାଲପେପର, କୀବୋର୍ଡ ସର୍ଟକଟ ଏବଂ ଆହୁରି ଅନେକ କିଛି ଅନ୍ତର୍ଭୁକ୍ତ।</translation> <translation id="3994318741694670028">ଦୁର୍ଭାଗ୍ୟବଶତଃ, ଆପଣଙ୍କ କମ୍ପ୍ୟୁଟରକୁ ଏକ ତ୍ରୁଟିପୂର୍ଣ୍ଣ ହାର୍ଡୱେର IDରେ କନଫିଗର କରାଯାଇଛି। ଏହା ChromeOS Flexରେ ନବୀନତମ ସୁରକ୍ଷା ସମାଧାନଗୁଡ଼ିକୁ ଅପଡେଟ କରିବାରେ ପ୍ରତିରୋଧ କରେ ଏବଂ ଆପଣଙ୍କ କମ୍ପ୍ୟୁଟରକୁ <ph name="BEGIN_BOLD" />କ୍ଷତିକାରକ ଆକ୍ରମଣଗୁଡ଼ିକର ସମ୍ଭାବନା ଥାଇପାରେ<ph name="END_BOLD" />।</translation> <translation id="3994374631886003300">ଆପଣଙ୍କର ଫୋନ୍ ଅନ୍ଲକ୍ କରନ୍ତୁ ଏବଂ ଆପଣଙ୍କର <ph name="DEVICE_TYPE" />କୁ ଅନ୍ଲକ୍ କରିବାକୁ ଏହାକୁ ନିକଟତର କରନ୍ତୁ।</translation> -<translation id="3994522032746736727"><ph name="EMAIL" /> ଭାବେ ସାଇନ ଇନ କରନ୍ତୁ</translation> <translation id="3994530503403062649">ଆପଣଙ୍କ ଟାବଲେଟରେ ବଟନଗୁଡ଼ିକୁ ଖୋଜନ୍ତୁ</translation> <translation id="3994708120330953242">ଆପଣଙ୍କର କିଛି ପାସୱାର୍ଡ ଏକ ଡାଟା ଉଲ୍ଲଙ୍ଘନରେ ମିଳିଛି। ଆପଣଙ୍କ ଆକାଉଣ୍ଟକୁ ସୁରକ୍ଷିତ କରିବାକୁ, ଆପଣ ଏବେ ଏହି ପାସୱାର୍ଡଗୁଡ଼ିକୁ ବଦଳାଇବା ଉଚିତ।</translation> <translation id="3994878504415702912">&ଜୁମ୍</translation> @@ -6586,7 +6582,6 @@ <translation id="5646994841348250879"><ph name="SITE_ETLD_PLUS_ONE" />ରେ ସାଇନ ଇନ କରିବାକୁ ଏକ ଆକାଉଣ୍ଟ ବାଛନ୍ତୁ</translation> <translation id="5648021990716966815">ମାଇକ୍ ଜ୍ୟାକ୍</translation> <translation id="5648166631817621825">ବିଗତ 7 ଦିନ</translation> -<translation id="5650537073531199882">ଫର୍ମ ପୂରଣ କରନ୍ତୁ</translation> <translation id="5651308944918885595">Nearby Share ମାଧ୍ୟମରେ ଡିସ୍କଭରେବିଲିଟି</translation> <translation id="5653154844073528838">ଆପଣଙ୍କ ପାଖରେ <ph name="PRINTER_COUNT" />ଟି ସେଭ୍ କରାଯାଇଥିବା ପ୍ରିଣ୍ଟର୍ ଅଛି।</translation> <translation id="5654669866168491665">ତୃତୀୟ-ପକ୍ଷ କୁକୀଗୁଡ଼ିକୁ ବ୍ଲକ କରିବା ସମୟରେ କାମ କରିନପାରୁଥିବା ସାଇଟଗୁଡ଼ିକ ବିଷୟରେ ଅଧିକ ଜାଣନ୍ତୁ</translation>
diff --git a/chrome/app/resources/generated_resources_pa.xtb b/chrome/app/resources/generated_resources_pa.xtb index a228495..c9a0b4f 100644 --- a/chrome/app/resources/generated_resources_pa.xtb +++ b/chrome/app/resources/generated_resources_pa.xtb
@@ -668,7 +668,6 @@ <translation id="1464258312790801189">ਤੁਹਾਡੇ ਖਾਤੇ</translation> <translation id="1464597059227482327">ਜੇ ਤੁਸੀਂ ਅਜਿਹੀ Chromebook ਨਾਲ ਸਾਂਝਾਕਰਨ ਕਰ ਰਹੇ ਹੋ ਜੋ ਤੁਹਾਡੇ ਸੰਪਰਕਾਂ ਵਿੱਚ ਨਹੀਂ ਹੈ, ਤਾਂ ਪੱਕਾ ਕਰੋ ਕਿ Chromebook ਵਿੱਚ 'ਨਜ਼ਦੀਕੀ ਦਿਖਣਯੋਗਤਾ' ਵਿਸ਼ੇਸ਼ਤਾ ਚਾਲੂ ਹੈ। “ਨਜ਼ਦੀਕੀ ਦਿਖਣਯੋਗਤਾ” ਵਿਸ਼ੇਸ਼ਤਾ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ, ਹੇਠਾਂ ਸੱਜੇ ਕੋਨੇ ਨੂੰ ਚੁਣੋ ਅਤੇ ਫਿਰ “ਨਜ਼ਦੀਕੀ ਦਿਖਣਯੋਗਤਾ” ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ ਚੁਣੋ। <ph name="LINK_BEGIN" />ਹੋਰ ਜਾਣੋ<ph name="LINK_END" /></translation> <translation id="1464781208867302907">ਡੀਵਾਈਸ ਤਰਜੀਹਾਂ ਲਈ, ਸੈਟਿੰਗਾਂ 'ਤੇ ਜਾਓ।</translation> -<translation id="146481294006497945">ਕੋਈ ਰੱਖਿਅਤ ਕੀਤਾ ਪਾਸਵਰਡ ਨਹੀਂ</translation> <translation id="1465176863081977902">ਆਡੀਓ ਪਤਾ ਕਾ&ਪੀ ਕਰੋ</translation> <translation id="146522654774760805">ਪਾਸਵਰਡ ਅਤੇ ਆਟੋਫਿਲ</translation> <translation id="1465827627707997754">ਪੀਜ਼ਾ ਸਲਾਈਸ</translation> @@ -2179,7 +2178,6 @@ <translation id="2485394160472549611">ਤੁਹਾਡੇ ਲਈ ਪ੍ਰਮੁੱਖ ਚੋਣਾਂ</translation> <translation id="2485422356828889247">ਅਣਸਥਾਪਤ ਕਰੋ</translation> <translation id="2485681265915754872">Google Play ਦੀ ਸੇਵਾ ਦੇ ਨਿਯਮ</translation> -<translation id="2486036712620651117">ਪਾਸਵਰਡ ਅਤੇ ਪਾਸਕੀਆਂ</translation> <translation id="248676429071089168">ਪੰਨੇ ਨੂੰ ਹੇਠਾਂ ਲਿਜਾਉਣ ਲਈ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰੋ</translation> <translation id="2487067538648443797">ਨਵਾਂ ਬੁੱਕਮਾਰਕ ਸ਼ਾਮਲ ਕਰੋ</translation> <translation id="2489686758589235262">2 ਹੋਰ ਸਵਿੱਚ ਜ਼ਿੰਮੇ ਲਗਾਓ</translation> @@ -3903,7 +3901,6 @@ <translation id="3721178866505920080">ਵਿਸਤ੍ਰਿਤ ਪ੍ਰੀਲੋਡਿੰਗ ਨੂੰ ਚਾਲੂ ਕਰਨ ਬਾਰੇ ਹੋਰ ਜਾਣਕਾਰੀ</translation> <translation id="3722108462506185496">ਆਭਾਸੀ ਮਸ਼ੀਨ ਸੇਵਾ ਸ਼ੁਰੂ ਕਰਨ ਵਿੱਚ ਗੜਬੜ ਹੋ ਗਈ। ਕਿਰਪਾ ਕਰਕੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।</translation> <translation id="3722624153992426516"><ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /> ਹਿਦਾਇਤ ਪ੍ਰਾਪਤ ਹੋਈ</translation> -<translation id="3724897774652282549">ਫ਼ਾਰਮ ਭਰੋ</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">ਉਪਲਬਧ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ</translation> @@ -4336,7 +4333,6 @@ <translation id="3993887353483242788">ਆਪਣੀ <ph name="DEVICE_TYPE" /> ਨੂੰ ਸਿੰਕ ਕਰੋ, ਤਾਂ ਕਿ ਜਦੋਂ ਤੁਸੀਂ ਆਪਣੇ Google ਖਾਤੇ ਦੀ ਵਰਤੋਂ ਕਰ ਕੇ ਕਿਸੇ ਵੀ ਡੀਵਾਈਸ 'ਤੇ ਸਾਈਨ-ਇਨ ਕਰੋ, ਤਾਂ ਤੁਹਾਡੀਆਂ ਤਰਜੀਹਾਂ ਤਿਆਰ ਹੋਣ। ਤਰਜੀਹਾਂ ਵਿੱਚ ਐਪਾਂ, ਸੈਟਿੰਗਾਂ, ਵਾਈ-ਫਾਈ ਪਾਸਵਰਡ, ਭਾਸ਼ਾਵਾਂ, ਵਾਲਪੇਪਰ, ਕੀ-ਬੋਰਡ ਸ਼ਾਰਟਕੱਟ ਅਤੇ ਹੋਰ ਬਹੁਤ ਕੁਝ ਸ਼ਾਮਲ ਹੈ।</translation> <translation id="3994318741694670028">ਅਫ਼ਸੋਸ, ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਦਾ ਸੰਰੂਪਣ ਕਿਸੇ ਨੁਕਸਦਾਰ ਹਾਰਡਵੇਅਰ ਆਈਡੀ ਨਾਲ ਕੀਤਾ ਗਿਆ ਹੈ। ਇਹ ChromeOS Flex ਨੂੰ ਨਵੀਨਤਮ ਸੁਰੱਖਿਆ ਸੁਧਾਈਆਂ ਨਾਲ ਅੱਪਡੇਟ ਕਰਨ ਤੋਂ ਰੋਕਦਾ ਹੈ ਅਤੇ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਨੂੰ <ph name="BEGIN_BOLD" />ਨੁਕਸਾਨਦੇਹ ਹਮਲਿਆਂ ਤੋਂ ਖਤਰਾ ਹੋ ਸਕਦਾ ਹੈ<ph name="END_BOLD" />।</translation> <translation id="3994374631886003300">ਆਪਣਾ ਫ਼ੋਨ ਅਣਲਾਕ ਕਰੋ ਅਤੇ ਆਪਣੀ <ph name="DEVICE_TYPE" /> ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਲਈ ਇਸਨੂੰ ਨੇੜੇ ਲਿਆਓ।</translation> -<translation id="3994522032746736727"><ph name="EMAIL" /> ਵਜੋਂ ਸਾਈਨ-ਇਨ ਕਰੋ</translation> <translation id="3994530503403062649">ਆਪਣੇ ਟੈਬਲੈੱਟ 'ਤੇ ਬਟਨ ਲੱਭੋ</translation> <translation id="3994708120330953242">ਤੁਹਾਡੇ ਕੁਝ ਪਾਸਵਰਡ ਡਾਟਾ ਉਲੰਘਣਾ ਵਿੱਚ ਮਿਲੇ ਸਨ। ਆਪਣੇ ਖਾਤਿਆਂ ਨੂੰ ਸੁਰੱਖਿਅਤ ਕਰਨ ਲਈ, ਤੁਹਾਨੂੰ ਹੁਣੇ ਇਨ੍ਹਾਂ ਪਾਸਵਰਡਾਂ ਨੂੰ ਬਦਲ ਦੇਣਾ ਚਾਹੀਦਾ ਹੈ।</translation> <translation id="3994878504415702912">&ਜ਼ੂਮ</translation> @@ -6606,7 +6602,6 @@ <translation id="5646994841348250879"><ph name="SITE_ETLD_PLUS_ONE" /> ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਨ ਲਈ ਕੋਈ ਖਾਤਾ ਚੁਣੋ</translation> <translation id="5648021990716966815">ਮਾਈਕ ਜੈਕ</translation> <translation id="5648166631817621825">ਪਿਛਲੇ 7 ਦਿਨ</translation> -<translation id="5650537073531199882">ਫ਼ਾਰਮ ਭਰੋ</translation> <translation id="5651308944918885595">ਨਜ਼ਦੀਕੀ ਸਾਂਝ ਖੋਜਣਯੋਗਤਾ</translation> <translation id="5653154844073528838">ਤੁਹਾਡੇ ਕੋਲ ਰੱਖਿਅਤ ਕੀਤੇ <ph name="PRINTER_COUNT" /> ਪ੍ਰਿੰਟਰ ਹਨ।</translation> <translation id="5654669866168491665">ਤੀਜੀ-ਧਿਰ ਦੀਆਂ ਕੁਕੀਜ਼ ਨੂੰ ਬਲਾਕ ਕਰਨ 'ਤੇ ਕੰਮ ਨਾ ਕਰ ਸਕਣ ਵਾਲੀਆਂ ਸਾਈਟਾਂ ਬਾਰੇ ਹੋਰ ਜਾਣੋ</translation> @@ -8608,6 +8603,7 @@ <translation id="7113974454301513811">ਹੁਣ ਆਪਣੀ ਸੂਚੀ ਵਿੱਚ ਮੋਜੂਦਾ ਟੈਬ ਸ਼ਾਮਲ ਕਰੋ</translation> <translation id="7114054701490058191">ਪਾਸਵਰਡ ਮੇਲ ਨਹੀਂ ਖਾਂਦੇ</translation> <translation id="7114648273807173152">ਆਪਣੇ Google ਖਾਤੇ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਨ ਵਾਸਤੇ ਸਮਾਰਟ ਲਾਕ ਦੀ ਵਰਤੋਂ ਕਰਨ ਲਈ, ਸੈਟਿੰਗਾਂ > ਕਨੈਕਟ ਕੀਤੇ ਡੀਵਾਈਸ > ਤੁਹਾਡਾ ਫ਼ੋਨ > ਸਮਾਰਟ ਲਾਕ 'ਤੇ ਜਾਓ।</translation> +<translation id="7115051913071512405">ਇਸਨੂੰ ਅਜ਼ਮਾਓ</translation> <translation id="7115361495406486998">ਕੋਈ ਸੰਪਰਕ ਪਹੁੰਚਯੋਗ ਨਹੀਂ ਹੈ</translation> <translation id="7115731767122970828">ਹੁਣੇ ਬੂਸਟ ਕਰੋ</translation> <translation id="7116554090938189816">ਪ੍ਰਿੰਟਰ SSL ਪ੍ਰਮਾਣ-ਪੱਤਰ ਦੀ ਮਿਆਦ ਸਮਾਪਤ ਹੋ ਗਈ ਹੈ। ਪ੍ਰਿੰਟਰ ਨੂੰ ਮੁੜ-ਸ਼ੁਰੂ ਕਰ ਕੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।</translation>
diff --git a/chrome/app/resources/generated_resources_pl.xtb b/chrome/app/resources/generated_resources_pl.xtb index 4ada0f7..bee6f4e 100644 --- a/chrome/app/resources/generated_resources_pl.xtb +++ b/chrome/app/resources/generated_resources_pl.xtb
@@ -668,7 +668,6 @@ <translation id="1464258312790801189">Twoje konta</translation> <translation id="1464597059227482327">Jeśli chcesz coś udostępnić użytkownikowi Chromebooka, którego nie masz w kontaktach, upewnij się, że na urządzeniu jest włączona „Widoczność w pobliżu”. Aby włączyć tę opcję, kliknij w prawym dolnym rogu i włącz „Widoczność w pobliżu”. <ph name="LINK_BEGIN" />Więcej informacji<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Aby wyświetlić ustawienia urządzenia, otwórz Ustawienia.</translation> -<translation id="146481294006497945">Brak zapisanych haseł</translation> <translation id="1465176863081977902">K&opiuj adres audio</translation> <translation id="146522654774760805">Hasła i autouzupełnianie</translation> <translation id="1465827627707997754">Kawałek pizzy</translation> @@ -2155,7 +2154,6 @@ <translation id="2485394160472549611">Polecane dla Ciebie</translation> <translation id="2485422356828889247">Odinstaluj</translation> <translation id="2485681265915754872">Warunki korzystania z usługi Google Play</translation> -<translation id="2486036712620651117">Hasła i klucze dostępu</translation> <translation id="248676429071089168">Przesuń palcem w górę, aby przesunąć stronę w dół</translation> <translation id="2487067538648443797">Dodaj nową zakładkę</translation> <translation id="2489686758589235262">Przypisz jeszcze 2 przełączniki</translation> @@ -3872,7 +3870,6 @@ <translation id="3721178866505920080">Więcej informacji o włączaniu rozszerzonego wstępnego wczytywania</translation> <translation id="3722108462506185496">Błąd podczas uruchamiania usługi maszyny wirtualnej. Spróbuj ponownie.</translation> <translation id="3722624153992426516">Otrzymano instrukcję <ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /></translation> -<translation id="3724897774652282549">Wypełnij formularz</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Dostępne sieci Wi-Fi</translation> @@ -4305,7 +4302,6 @@ <translation id="3993887353483242788">Zsynchronizuj to urządzenie (<ph name="DEVICE_TYPE" />), aby Twoje preferencje były dostępne wszędzie tam, gdzie logujesz się na konto Google. Preferencje obejmują m.in. aplikacje, ustawienia, hasła Wi-Fi, języki, tapety i skróty klawiszowe.</translation> <translation id="3994318741694670028">Twój komputer jest skonfigurowany przy użyciu błędnie sformatowanego identyfikatora sprzętu. Uniemożliwia to zaktualizowanie ChromeOS Flex za pomocą najnowszych poprawek zabezpieczeń, a komputer <ph name="BEGIN_BOLD" />może być narażony na szkodliwe ataki<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Aby odblokować system, <ph name="DEVICE_TYPE" /> i odblokowany telefon muszą być bliżej siebie.</translation> -<translation id="3994522032746736727">Zaloguj się jako <ph name="EMAIL" /></translation> <translation id="3994530503403062649">Zlokalizuj przyciski na tablecie</translation> <translation id="3994708120330953242">Niektóre z Twoich haseł zostały ujawnione w wyniku naruszenia bezpieczeństwa danych. Aby zabezpieczyć swoje konta, najlepiej zmień teraz te hasła.</translation> <translation id="3994878504415702912">&Rozmiar tekstu</translation> @@ -6573,7 +6569,6 @@ <translation id="5646994841348250879">Wybierz konto, na które chcesz się zalogować na stronie <ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">Gniazdo mikrofonu</translation> <translation id="5648166631817621825">Ostatnie 7 dni</translation> -<translation id="5650537073531199882">Wypełnij formularz</translation> <translation id="5651308944918885595">Udostępnianie w pobliżu wykrywalność</translation> <translation id="5653154844073528838">Zapisane drukarki: <ph name="PRINTER_COUNT" />.</translation> <translation id="5654669866168491665">Dowiedz się więcej o witrynach, które mogą nie działać, gdy blokujesz pliki cookie innych firm</translation> @@ -8575,6 +8570,7 @@ <translation id="7113974454301513811">Teraz dodaj do listy bieżącą kartę</translation> <translation id="7114054701490058191">Hasła nie są identyczne</translation> <translation id="7114648273807173152">Aby logować się na swoje konto Google przy użyciu funkcji Smart Lock, kliknij Ustawienia > Połączone urządzenia > Twój telefon > Smart Lock.</translation> +<translation id="7115051913071512405">Wypróbuj</translation> <translation id="7115361495406486998">Brak osiągalnych kontaktów</translation> <translation id="7115731767122970828">Zwiększ wydajność</translation> <translation id="7116554090938189816">Certyfikat SSL drukarki wygasł. Uruchom ją ponownie i spróbuj jeszcze raz.</translation>
diff --git a/chrome/app/resources/generated_resources_pt-BR.xtb b/chrome/app/resources/generated_resources_pt-BR.xtb index e17b2a9..aec2d00 100644 --- a/chrome/app/resources/generated_resources_pt-BR.xtb +++ b/chrome/app/resources/generated_resources_pt-BR.xtb
@@ -668,7 +668,6 @@ <translation id="1464258312790801189">Suas contas</translation> <translation id="1464597059227482327">Se você estiver compartilhando com um Chromebook que não está nos seus contatos, a visibilidade do recurso "Compartilhar por proximidade" precisa estar ativada no Chromebook. Para isso, selecione o canto inferior direito e ative a opção "Visibilidade por perto". <ph name="LINK_BEGIN" />Saiba mais<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Para preferências de dispositivo, acesse "Configurações".</translation> -<translation id="146481294006497945">Nenhuma senha salva</translation> <translation id="1465176863081977902">C&opiar endereço do áudio</translation> <translation id="146522654774760805">Senhas e preenchimento automático</translation> <translation id="1465827627707997754">Fatia de pizza</translation> @@ -2179,7 +2178,6 @@ <translation id="2485394160472549611">Principais recomendações para você</translation> <translation id="2485422356828889247">Desinstalar</translation> <translation id="2485681265915754872">Termos de Serviço do Google Play</translation> -<translation id="2486036712620651117">Senhas e chaves de acesso</translation> <translation id="248676429071089168">Deslize para cima para mover a página para baixo</translation> <translation id="2487067538648443797">Adicionar novo favorito</translation> <translation id="2489686758589235262">Atribuir mais dois interruptores</translation> @@ -3902,7 +3900,6 @@ <translation id="3721178866505920080">Mais informações sobre como ativar o pré-carregamento estendido</translation> <translation id="3722108462506185496">Erro ao iniciar o serviço da máquina virtual. Tente novamente.</translation> <translation id="3722624153992426516">Instrução <ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /> recebida</translation> -<translation id="3724897774652282549">Preencha o formulário</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Redes W-Fi disponíveis</translation> @@ -4335,7 +4332,6 @@ <translation id="3993887353483242788">Sincronize o <ph name="DEVICE_TYPE" /> para que suas preferências estejam em qualquer dispositivo em que você fizer login na Conta do Google. As preferências incluem apps, configurações, senhas de Wi-Fi, idiomas, planos de fundo, atalhos do teclado e muito mais.</translation> <translation id="3994318741694670028">Infelizmente, seu computador está configurado com um ID de hardware incorreto. Isso impede que o ChromeOS Flex seja atualizado com as correções de segurança mais recentes e, por isso, ele <ph name="BEGIN_BOLD" />pode ficar vulnerável a ataques maliciosos<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Desbloqueie seu smartphone e aproxime-o para desbloquear o <ph name="DEVICE_TYPE" />.</translation> -<translation id="3994522032746736727">Fazer login como <ph name="EMAIL" /></translation> <translation id="3994530503403062649">Localizar botões no tablet</translation> <translation id="3994708120330953242">Algumas das suas senhas foram encontradas em um vazamento de dados. Para proteger suas contas, mude as senhas imediatamente.</translation> <translation id="3994878504415702912">&Zoom</translation> @@ -6607,7 +6603,6 @@ <translation id="5646994841348250879">Escolha uma conta para fazer login em <ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">Entrada para microfone</translation> <translation id="5648166631817621825">Últimos sete dias</translation> -<translation id="5650537073531199882">Preencha o formulário</translation> <translation id="5651308944918885595">Detecção do Compartilhar por proximidade</translation> <translation id="5653154844073528838">Você tem <ph name="PRINTER_COUNT" /> impressoras salvas.</translation> <translation id="5654669866168491665">Saiba mais sobre sites que podem não funcionar com o bloqueio de cookies de terceiros</translation> @@ -8609,6 +8604,7 @@ <translation id="7113974454301513811">Agora, adicione a guia atual à sua lista</translation> <translation id="7114054701490058191">As senhas não correspondem</translation> <translation id="7114648273807173152">Para usar o Smart Lock para fazer login na sua Conta do Google, acesse "Config." > "Dispositivos conectados" > "Seu smartphone" > "Smart Lock".</translation> +<translation id="7115051913071512405">Experimente</translation> <translation id="7115361495406486998">Não há contatos acessíveis</translation> <translation id="7115731767122970828">Melhorar agora</translation> <translation id="7116554090938189816">O certificado SSL expirou. Reinicie a impressora e tente de novo.</translation>
diff --git a/chrome/app/resources/generated_resources_pt-PT.xtb b/chrome/app/resources/generated_resources_pt-PT.xtb index 437a07cf..b32961c 100644 --- a/chrome/app/resources/generated_resources_pt-PT.xtb +++ b/chrome/app/resources/generated_resources_pt-PT.xtb
@@ -539,6 +539,7 @@ <translation id="1368603372088757436">O Linux não é suportado no seu <ph name="DEVICE_TYPE" />. <ph name="LINK_BEGIN" />Saiba mais<ph name="LINK_END" /></translation> <translation id="1370249617397887619">Para usá-las nos seus outros dispositivos, guarde-as na sua Conta Google</translation> <translation id="1370384480654163477">Veja e edite ficheiros da última vez que visitou este site:</translation> +<translation id="1372259917802609049">Ocorreu um erro ao eliminar a restrição</translation> <translation id="1372841398847029212">Sincronizar com a sua conta</translation> <translation id="1373176046406139583">A visibilidade do dispositivo controla quem pode partilhar consigo enquanto o ecrã está desbloqueado <ph name="LINK_BEGIN" />Saiba mais<ph name="LINK_END" /></translation> <translation id="1374844444528092021">O certificado requerido pela rede "<ph name="NETWORK_NAME" />" não está instalado ou já não é válido. Obtenha um novo certificado e tente ligar novamente.</translation> @@ -666,7 +667,6 @@ <translation id="1464258312790801189">As suas contas</translation> <translation id="1464597059227482327">Se estiver a partilhar com um Chromebook que não está nos seus contactos, certifique-se de que o Chromebook tem a opção "Visibilidade na proximidade" ativada. Para ativar a "Visibilidade na proximidade", selecione o canto inferior direito e, de seguida, ative a opção "Visibilidade próxima". <ph name="LINK_BEGIN" />Saiba mais<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Para ver as preferências do dispositivo, aceda às Definições.</translation> -<translation id="146481294006497945">Não existem palavras-passe guardadas</translation> <translation id="1465176863081977902">C&opiar Endereço do áudio</translation> <translation id="146522654774760805">Palavras-passe e preenchimento automático</translation> <translation id="1465827627707997754">Fatia de piza</translation> @@ -1480,6 +1480,7 @@ Esta ação não afeta apps nem conteúdo noutros dispositivos.</translation> <translation id="2018189721942291407">Não tem a certeza se deve inscrever-se?</translation> <translation id="2018352199541442911">Lamentamos, mas de momento o seu aparelho de armazenamento externo não é suportado.</translation> +<translation id="2019213483156307334">Ocorreu um erro ao adicionar a restrição</translation> <translation id="2019718679933488176">&Abrir áudio num novo separador</translation> <translation id="2020183425253392403">Mostrar definições do endereço de rede</translation> <translation id="2020225359413970060">Analisar ficheiro</translation> @@ -2165,7 +2166,6 @@ <translation id="2485394160472549611">Principais sugestões para si</translation> <translation id="2485422356828889247">Desinstalar</translation> <translation id="2485681265915754872">Termos de Utilização do Google Play</translation> -<translation id="2486036712620651117">Palavras-passe e chaves de acesso</translation> <translation id="248676429071089168">Deslize rapidamente para cima para mover a página para baixo</translation> <translation id="2487067538648443797">Adicionar novo marcador</translation> <translation id="2489686758589235262">Atribuir mais 2 interruptores</translation> @@ -3145,6 +3145,7 @@ <translation id="3188257591659621405">Os meus ficheiros</translation> <translation id="3188465121994729530">Média de movimentações</translation> <translation id="3189187154924005138">Cursor grande</translation> +<translation id="3189533916970342007">{PASSWORD_COUNT,plural, =1{1 palavra-passe e outros itens estão guardados apenas neste dispositivo. Para usá-los nos seus outros dispositivos, guarde-os na sua Conta Google.}other{{PASSWORD_COUNT} palavra-passes e outros itens estão guardados apenas neste dispositivo. Para usá-los nos seus outros dispositivos, guarde-os na sua Conta Google.}}</translation> <translation id="3190558889382726167">Palavra-passe guardada</translation> <translation id="3192586965067888278">Descreva o problema detalhadamente. O feedback vai ser enviado para a Google para revisão humana e pode ser usado para melhorar ou desenvolver produtos e serviços Google.</translation> <translation id="3192947282887913208">Ficheiros de áudio</translation> @@ -3615,6 +3616,7 @@ <translation id="3537881477201137177">Pode ser modificado mais tarde em Definições.</translation> <translation id="3538066758857505094">Ocorreu um erro ao desinstalar o Linux. Tente novamente.</translation> <translation id="3539537154248488260">Ativar/desativar inspiração</translation> +<translation id="3539791442352537591">Ocorreu um erro ao guardar a alteração do estado de confiança</translation> <translation id="3540173484406326944">Sem rede através de <ph name="HOST_DEVICE_NAME" /></translation> <translation id="354060433403403521">Carregador</translation> <translation id="354068948465830244">Permite ler e alterar os dados do site</translation> @@ -3889,7 +3891,6 @@ <translation id="3721178866505920080">Mais informações sobre a ativação do pré-carregamento alargado</translation> <translation id="3722108462506185496">Não foi possível iniciar o serviço da máquina virtual. Tente mais tarde.</translation> <translation id="3722624153992426516">Instrução <ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /> recebida</translation> -<translation id="3724897774652282549">Preencha o formulário</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Redes Wi-Fi disponíveis</translation> @@ -4322,7 +4323,6 @@ <translation id="3993887353483242788">Sincronize o dispositivo <ph name="DEVICE_TYPE" /> para que as suas preferências fiquem prontas em qualquer dispositivo quando iniciar sessão com a sua Conta Google. As preferências incluem apps, definições, palavras-passe do Wi-Fi, idiomas, imagem de fundo, atalhos de teclado e muito mais.</translation> <translation id="3994318741694670028">Infelizmente, o seu computador está configurado com um ID de hardware formatado incorretamente. Este facto impede que o ChromeOS Flex faça a atualização com as últimas correções de segurança e o seu computador <ph name="BEGIN_BOLD" />pode estar vulnerável a ataques maliciosos<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Desbloqueie o telemóvel e aproxime-o para desbloquear o <ph name="DEVICE_TYPE" />.</translation> -<translation id="3994522032746736727">Iniciar sessão como <ph name="EMAIL" /></translation> <translation id="3994530503403062649">Localize os botões no seu tablet</translation> <translation id="3994708120330953242">Algumas das suas palavras-passe foram encontradas numa violação de dados. Para proteger as suas contas, deve alterar já essas palavras-passe.</translation> <translation id="3994878504415702912">&Zoom</translation> @@ -4806,6 +4806,7 @@ <translation id="4361745360460842907">Abrir como separador</translation> <translation id="4363262124589131906">Os novos ficheiros em O meu disco vão deixar de ser sincronizados automaticamente com este Chromebook</translation> <translation id="4364327530094270451">Melão</translation> +<translation id="4364417397164696363">{ITEM_COUNT,plural, =1{1 item está guardado apenas neste dispositivo. Para usá-lo nos seus outros dispositivos, guarde-o na sua Conta Google.}other{{ITEM_COUNT} itens estão guardados apenas neste dispositivo. Para usá-los nos seus outros dispositivos, guarde-os na sua Conta Google.}}</translation> <translation id="4364567974334641491"><ph name="APP_NAME" /> está a partilhar uma janela.</translation> <translation id="4364830672918311045">Apresentar notificações</translation> <translation id="4367971618859387374">Nome a apresentar</translation> @@ -5728,6 +5729,7 @@ <translation id="5029287942302939687">A sua palavra-passe foi definida</translation> <translation id="5029873138381728058">Falha ao verificar VMs</translation> <translation id="503155457707535043">A transferir aplicações…</translation> +<translation id="5031769842769721381">{SELECTED_ITEMS,plural, =0{Moradas}=1{Moradas ({SELECTED_ITEMS})}other{Moradas ({SELECTED_ITEMS})}}</translation> <translation id="5032430150487044192">Não é possível criar o código QR</translation> <translation id="5033137252639132982">Sem autorização para utilizar sensores de movimentos</translation> <translation id="5035846135112863536">Escolha "Mais detalhes" abaixo para receber mais informações de <ph name="IDENTITY_PROVIDER_ETLD_PLUS_ONE" />.</translation> @@ -6477,6 +6479,7 @@ <translation id="5568069709869097550">Não é possível iniciar sessão</translation> <translation id="5568525251731145240">Eliminar os dados e as autorizações do site <ph name="SITE_NAME" />, de todos os sites associados ao mesmo e das apps instaladas?</translation> <translation id="5568602038816065197">Os sites podem usar funcionalidades avançadas de qualquer impressora acessível ao seu dispositivo sem passar pelo pedido de impressão padrão</translation> +<translation id="5570149859473005144">{SELECTED_ITEMS,plural, =0{Palavras-passe}=1{Palavras-passe ({SELECTED_ITEMS})}other{Palavras-passe ({SELECTED_ITEMS})}}</translation> <translation id="5571066253365925590">Bluetooth ativado</translation> <translation id="5571092938913434726">Controlos de multimédia globais</translation> <translation id="5571832155627049070">Personalize o seu perfil</translation> @@ -6595,7 +6598,6 @@ <translation id="5646994841348250879">Escolha uma conta para iniciar sessão em <ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">Entrada para microfone</translation> <translation id="5648166631817621825">Últimos 7 dias</translation> -<translation id="5650537073531199882">Preencha o formulário</translation> <translation id="5651308944918885595">Deteção da funcionalidade Partilhar na proximidade</translation> <translation id="5653154844073528838">Tem <ph name="PRINTER_COUNT" /> impressoras guardadas.</translation> <translation id="5654669866168491665">Saiba mais sobre sites que podem não funcionar com o bloqueio de cookies de terceiros</translation> @@ -6983,6 +6985,7 @@ <translation id="5941153596444580863">Adicionar pessoa...</translation> <translation id="5941343993301164315">Inicie sessão em <ph name="TOKEN_NAME" />.</translation> <translation id="5941711191222866238">Minimizar</translation> +<translation id="5941854976565320351">{PASSWORD_COUNT,plural, =1{1 palavra-passe está guardada apenas neste dispositivo. Para usá-la nos seus outros dispositivos, guarde-a na sua Conta Google.}other{{PASSWORD_COUNT} palavras-passe estão guardadas apenas neste dispositivo. Para usá-los nos seus outros dispositivos, guarde-os na sua Conta Google.}}</translation> <translation id="594221546068848596">Pesquisar página com o <ph name="VISUAL_SEARCH_PROVIDER" /></translation> <translation id="5942779427914696408">Visibilidade do dispositivo</translation> <translation id="5943127421590245687">A validação foi efetuada com êxito. Para desbloquear e restaurar os dados locais, introduza a palavra-passe antiga do <ph name="DEVICE_TYPE" />.</translation> @@ -8500,6 +8503,7 @@ <translation id="7036706669646341689">Recomenda-se <ph name="DISK_SIZE" /> de espaço para o Linux. Para aumentar o espaço livre, elimine ficheiros do dispositivo.</translation> <translation id="7037157058268992880">Esqueci-me do PIN</translation> <translation id="7037509989619051237">Texto para pré-visualização</translation> +<translation id="7037633074390821254">Restrição de DNS ou CIDR</translation> <translation id="7038632520572155338">Acesso por interruptor</translation> <translation id="7038710352229712897">Adicione outra Conta Google para <ph name="USER_NAME" /></translation> <translation id="7039326228527141150">Aceder a dispositivos USB de <ph name="VENDOR_NAME" /></translation> @@ -8595,6 +8599,7 @@ <translation id="7113974454301513811">Agora, adicione o separador atual à sua lista</translation> <translation id="7114054701490058191">As palavras-passe não coincidem</translation> <translation id="7114648273807173152">Para utilizar o Smart Lock para iniciar sessão na sua Conta Google, aceda a Definições > Dispositivos ligados > O seu telemóvel > Smart Lock.</translation> +<translation id="7115051913071512405">Experimente</translation> <translation id="7115361495406486998">Nenhum contacto alcançável</translation> <translation id="7115731767122970828">Otimizar agora</translation> <translation id="7116554090938189816">O certificado SSL da impressora expirou. Reinicie a impressora e tente novamente.</translation> @@ -8747,6 +8752,7 @@ <translation id="7231260028442989757">Veja, ignore e responda às notificações do telemóvel</translation> <translation id="7231347196745816203">Use o telemóvel para desbloquear o <ph name="DEVICE_TYPE" />.</translation> <translation id="7232750842195536390">Falha ao mudar o nome</translation> +<translation id="7232962679391151113">{BOOKMARK_COUNT,plural, =1{1 marcador e outros itens estão guardados apenas neste dispositivo. Para usá-los nos seus outros dispositivos, guarde-os na sua Conta Google.}other{{BOOKMARK_COUNT} marcadores e outros itens estão guardados apenas neste dispositivo. Para usá-los nos seus outros dispositivos, guarde-os na sua Conta Google.}}</translation> <translation id="723343421145275488">Pesquisar imagens com o <ph name="VISUAL_SEARCH_PROVIDER" /></translation> <translation id="7234010996000898150">A cancelar o restauro do Linux…</translation> <translation id="7235305658956131898">App Android instalada pelo administrador do dispositivo.</translation> @@ -8873,6 +8879,7 @@ <translation id="7327989755579928735"><ph name="MANAGER" /> desativou a depuração do ADB. Quando reiniciar o seu dispositivo <ph name="DEVICE_TYPE" />, não poderá fazer sideload de apps.</translation> <translation id="7328119182036084494">Guardado no <ph name="WEB_DRIVE" /></translation> <translation id="7328162502911382168">(<ph name="COUNT" />)</translation> +<translation id="732845903678043302">{BOOKMARK_COUNT,plural, =1{1 marcador está guardado apenas neste dispositivo. Para usá-lo nos seus outros dispositivos, guarde-o na sua Conta Google.}other{{BOOKMARK_COUNT} marcadores estão guardados apenas neste dispositivo. Para usá-los nos seus outros dispositivos, guarde-os na sua Conta Google.}}</translation> <translation id="7328867076235380839">Combinação inválida.</translation> <translation id="7329154610228416156">O início de sessão falhou porque foi configurado para utilizar um URL não seguro (<ph name="BLOCKED_URL" />). Contacte o gestor.</translation> <translation id="7330533963640151632">Definições da funcionalidade <ph name="FEATURE_NAME" /> para o dispositivo de <ph name="USER_NAME" />, a partilhar com a conta <ph name="USER_EMAIL" />.</translation> @@ -10416,6 +10423,7 @@ <translation id="8398877366907290961">Prosseguir</translation> <translation id="8399282673057829204">Ver palavra-passe</translation> <translation id="839949601275221554">O dispositivo detetou um erro. Reinicie o seu dispositivo e tente novamente.</translation> +<translation id="8399889560226245071">{SELECTED_ITEMS,plural, =0{Marcadores}=1{Marcadores ({SELECTED_ITEMS})}other{Marcadores ({SELECTED_ITEMS})}}</translation> <translation id="8401432541486058167">Indique o PIN que está associado ao seu cartão inteligente.</translation> <translation id="8403807918453631441">O <ph name="BRAND" /> consegue verificar as suas palavras-passe quando as guarda</translation> <translation id="8405046151008197676">Obtenha os destaques da atualização mais recente.</translation> @@ -11670,6 +11678,7 @@ <translation id="97905529126098460">Esta janela fecha-se depois de concluído o cancelamento.</translation> <translation id="980731642137034229">Botão menu de ação</translation> <translation id="981121421437150478">Offline</translation> +<translation id="982083952953998237">Adicionar restrições</translation> <translation id="98235653036850093">Olá, <ph name="PROFILE_NAME" /></translation> <translation id="983192555821071799">Fechar todos os separadores</translation> <translation id="983531994960412650"><ph name="WINDOW_TITLE" />: gravação da câmara e do microfone</translation>
diff --git a/chrome/app/resources/generated_resources_ro.xtb b/chrome/app/resources/generated_resources_ro.xtb index 9e7d2dc..0090305e 100644 --- a/chrome/app/resources/generated_resources_ro.xtb +++ b/chrome/app/resources/generated_resources_ro.xtb
@@ -667,7 +667,6 @@ <translation id="1464258312790801189">Conturile dvs.</translation> <translation id="1464597059227482327">Dacă trimiți fișiere unui Chromebook care nu este trecut în agendă, acesta trebuie să aibă Vizibilitatea în apropiere activată. Pentru a activa Vizibilitatea în apropiere, selectează colțul din dreapta jos, apoi selectează Vizibilitatea în apropiere. <ph name="LINK_BEGIN" />Află mai multe<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Pentru preferințe privind dispozitivul, accesează Setările.</translation> -<translation id="146481294006497945">Nu există parole salvate</translation> <translation id="1465176863081977902">C&opiază adresa conținutului audio</translation> <translation id="146522654774760805">Parole și completare automată</translation> <translation id="1465827627707997754">Felie de pizza</translation> @@ -2166,7 +2165,6 @@ <translation id="2485394160472549611">Cele mai bune recomandări pentru tine</translation> <translation id="2485422356828889247">Dezinstalează</translation> <translation id="2485681265915754872">Termeni și condiții Google Play</translation> -<translation id="2486036712620651117">Parole și chei de acces</translation> <translation id="248676429071089168">Glisează în sus pentru a muta pagina în jos</translation> <translation id="2487067538648443797">Adaugă un marcaj nou</translation> <translation id="2489686758589235262">Atribuie încă două comutatoare</translation> @@ -3888,7 +3886,6 @@ <translation id="3721178866505920080">Mai multe informații despre activarea preîncărcării extinse</translation> <translation id="3722108462506185496">A apărut o eroare la pornirea serviciului mașinii virtuale. Încearcă din nou.</translation> <translation id="3722624153992426516">S-a primit instrucțiunea <ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /></translation> -<translation id="3724897774652282549">Completează formularul</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Rețele Wi-Fi disponibile</translation> @@ -4321,7 +4318,6 @@ <translation id="3993887353483242788">Sincronizează dispozitivul <ph name="DEVICE_TYPE" />, iar preferințele tale vor fi disponibile pe orice dispozitiv când te conectezi folosind Contul Google. Preferințele includ aplicații, setări, parole Wi-Fi, limbi, imagini de fundal, comenzi rapide de la tastatură și altele.</translation> <translation id="3994318741694670028">Din păcate, computerul este configurat cu un ID de hardware incorect. Acest lucru împiedică actualizarea sistemului de operare Chrome Flex cu cele mai recente remedieri de securitate, iar computerul <ph name="BEGIN_BOLD" />ar putea fi vulnerabil la atacuri<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Deblochează telefonul și apropie-l mai mult pentru a debloca dispozitivul <ph name="DEVICE_TYPE" />.</translation> -<translation id="3994522032746736727">Conectează-te ca <ph name="EMAIL" /></translation> <translation id="3994530503403062649">Apasă butoanele tabletei</translation> <translation id="3994708120330953242">Unele dintre parolele tale au apărut într-o încălcare a securității datelor. Pentru a-ți securiza conturile, trebuie să schimbi aceste parole acum.</translation> <translation id="3994878504415702912">&Zoom</translation> @@ -6590,7 +6586,6 @@ <translation id="5646994841348250879">Alege un cont pentru a te conecta la <ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">Mufă pentru microfon</translation> <translation id="5648166631817621825">Ultimele 7 zile</translation> -<translation id="5650537073531199882">Completează formularul</translation> <translation id="5651308944918885595">detectabilitate pentru Trimiterea în apropiere</translation> <translation id="5653154844073528838">Ai <ph name="PRINTER_COUNT" /> imprimante salvate.</translation> <translation id="5654669866168491665">Află mai multe despre site-urile care pot să nu funcționeze atunci când blochezi cookie-urile terță parte</translation> @@ -8592,6 +8587,7 @@ <translation id="7113974454301513811">Acum adaugă fila actuală în listă</translation> <translation id="7114054701490058191">Parolele nu corespund</translation> <translation id="7114648273807173152">Pentru a folosi Smart Lock ca să te conectezi la Contul Google, accesează Setări > Dispozitive conectate > Telefon > Smart Lock.</translation> +<translation id="7115051913071512405">Încercați</translation> <translation id="7115361495406486998">Nu sunt disponibile persoane de contact</translation> <translation id="7115731767122970828">Accelerează acum</translation> <translation id="7116554090938189816">Certificatul SSL al imprimantei a expirat. Repornește imprimanta și încearcă din nou.</translation>
diff --git a/chrome/app/resources/generated_resources_ru.xtb b/chrome/app/resources/generated_resources_ru.xtb index 7d8758b..a5e77f0 100644 --- a/chrome/app/resources/generated_resources_ru.xtb +++ b/chrome/app/resources/generated_resources_ru.xtb
@@ -669,7 +669,6 @@ <translation id="1464258312790801189">Аккаунты</translation> <translation id="1464597059227482327">Чтобы обмениваться данными с устройством Chromebook, которого нет в ваших контактах, включите на нем параметр "Широкий доступ". Нажмите на правый нижний угол экрана, чтобы перейти к нужным настройкам. <ph name="LINK_BEGIN" />Подробнее…<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Чтобы изменить параметры устройства, откройте приложение "Настройки".</translation> -<translation id="146481294006497945">Сохраненных паролей нет</translation> <translation id="1465176863081977902">&Копировать URL аудио</translation> <translation id="146522654774760805">Пароли и автозаполнение</translation> <translation id="1465827627707997754">Кусок пиццы</translation> @@ -2167,7 +2166,6 @@ <translation id="2485394160472549611">Персональные рекомендации</translation> <translation id="2485422356828889247">Удалить</translation> <translation id="2485681265915754872">Условия использования Google Play</translation> -<translation id="2486036712620651117">Пароли и ключи доступа</translation> <translation id="248676429071089168">Если провести вверх, страница прокрутится вниз</translation> <translation id="2487067538648443797">Новая закладка</translation> <translation id="2489686758589235262">Назначить ещё два</translation> @@ -3890,7 +3888,6 @@ <translation id="3721178866505920080">Подробнее о том, как включить расширенную предзагрузку</translation> <translation id="3722108462506185496">Не удалось запустить сервис виртуальной машины. Повторите попытку.</translation> <translation id="3722624153992426516">Получена инструкция: <ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /></translation> -<translation id="3724897774652282549">Заполните форму</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Доступные сети Wi-Fi</translation> @@ -4323,7 +4320,6 @@ <translation id="3993887353483242788">Синхронизируйте устройство <ph name="DEVICE_TYPE" />. После этого приложения, настройки, пароли Wi-Fi, языки, обои, сочетания клавиш и другие параметры будут доступны на всех устройствах, на которых выполнен вход в аккаунт Google.</translation> <translation id="3994318741694670028">В настройках компьютера указан неверный аппаратный идентификатор устройства. Chrome OS Flex не сможет устанавливать обновления системы безопасности для защиты компьютера от <ph name="BEGIN_BOLD" />вредоносных атак<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Разблокируйте телефон и поднесите его к устройству <ph name="DEVICE_TYPE" />.</translation> -<translation id="3994522032746736727">Войти как <ph name="EMAIL" /></translation> <translation id="3994530503403062649">Переназначьте кнопки планшета</translation> <translation id="3994708120330953242">Несколько ваших паролей были раскрыты в результате утечки данных. Чтобы защитить свои аккаунты, измените эти пароли прямо сейчас.</translation> <translation id="3994878504415702912">&Размер текста</translation> @@ -6593,7 +6589,6 @@ <translation id="5646994841348250879">Выберите аккаунт для входа на сайт <ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">Микрофонный разъем</translation> <translation id="5648166631817621825">Последние 7 дней</translation> -<translation id="5650537073531199882">Заполнить форму</translation> <translation id="5651308944918885595">Обмен с окружением: параметры видимости</translation> <translation id="5653154844073528838">Сохраненных принтеров: <ph name="PRINTER_COUNT" />.</translation> <translation id="5654669866168491665">Узнайте больше о сайтах, которые могут не работать, когда сторонние файлы cookie заблокированы</translation> @@ -8599,6 +8594,7 @@ <translation id="7113974454301513811">Теперь добавьте текущую вкладку в список</translation> <translation id="7114054701490058191">Пароли не совпадают</translation> <translation id="7114648273807173152">Чтобы использовать Smart Lock для входа в аккаунт Google, нажмите "Настройки > Подключенные устройства > Телефон > Smart Lock".</translation> +<translation id="7115051913071512405">Попробовать</translation> <translation id="7115361495406486998">Нет доступных контактов</translation> <translation id="7115731767122970828">Повысить</translation> <translation id="7116554090938189816">Срок действия SSL-сертификата принтера истек. Перезапустите принтер и повторите попытку.</translation>
diff --git a/chrome/app/resources/generated_resources_si.xtb b/chrome/app/resources/generated_resources_si.xtb index a74bf9c..b80a1f8 100644 --- a/chrome/app/resources/generated_resources_si.xtb +++ b/chrome/app/resources/generated_resources_si.xtb
@@ -667,7 +667,6 @@ <translation id="1464258312790801189">ඔබේ ගිනුම්</translation> <translation id="1464597059227482327">ඔබ ඔබේ සම්බන්ධතාවල නැති Chromebook එකක් සමග බෙදා ගන්නේ නම්, Chromebook එකේ “ළඟ දෘශ්යතාව” සක්රීය කර ඇති බව තහවුරු කර ගන්න. “ළඟ දෘශ්යතාව” සක්රීය කිරීමට පහත දකුණු කොන තෝරා පසුව “ළඟ දෘශ්යතාව” සක්රීය කිරීමට තෝරන්න. <ph name="LINK_BEGIN" />තව දැන ගන්න<ph name="LINK_END" /></translation> <translation id="1464781208867302907">උපාංග මනාප සඳහා, සැකසීම් වෙත යන්න.</translation> -<translation id="146481294006497945">සුරැකි මුරපද නැත</translation> <translation id="1465176863081977902">ශ්රව්ය ලිපිනය පිටපත් කරන්න</translation> <translation id="146522654774760805">මුරපද සහ ස්වයං පිරවීම</translation> <translation id="1465827627707997754">පීසා පෙත්ත</translation> @@ -2167,7 +2166,6 @@ <translation id="2485394160472549611">ඔබ සඳහා ඉහළම තේරීම්</translation> <translation id="2485422356828889247">අස්ථාපනය</translation> <translation id="2485681265915754872">Google Play සේවා නියම</translation> -<translation id="2486036712620651117">මුරපද සහ මුරයතුරු</translation> <translation id="248676429071089168">පිටුව පහළට ගෙන යාමට ඉහළට ස්වයිප් කරන්න</translation> <translation id="2487067538648443797">නව පිටුසන එක් කරන්න</translation> <translation id="2489686758589235262">තවත් ස්විච 2ක් පවරන්න</translation> @@ -3888,7 +3886,6 @@ <translation id="3721178866505920080">දිගු කළ පූර්ව පූරණය ක්රියාත්මක කිරීම පිළිබඳ වැඩිදුර තතු</translation> <translation id="3722108462506185496">අථත්ය යාන්ත්රණ සේවාව ආරම්භ කිරීමේ දෝෂයකි. කරුණාකර නැවත උත්සාහ කරන්න.</translation> <translation id="3722624153992426516"><ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /> උපදෙස් ලැබී ඇත</translation> -<translation id="3724897774652282549">පෝරමය පුරවන්න</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">ලබා ගත හැකි WiFi ජාල</translation> @@ -4322,7 +4319,6 @@ <translation id="3993887353483242788">ඔබගේ Google ගිණුම සමඟ පුරන විට ඔබගේ මනාප ඕනෑම උපාංගයක සුදානම් වන පරිදි ඔබගේ <ph name="DEVICE_TYPE" /> සමමුහුර්ත කරන්න. මනාපවලට යෙදුම්, සැකසීම්, Wi-Fi මුරපද, භාෂා, වෝල්පේපරය, යතුරුපුවරු කෙටි මං සහ තවත් දේ ඇතුළත් වේ.</translation> <translation id="3994318741694670028">අවාසනාවකට, ඔබගේ පරිගණකය විකෘති වූ දෘඪාංග ID එකක් සමගින් වින්යාස කර තිබේ. මෙය ChromeOS Flex නවතම ආරක්ෂක විසඳුම්වලින් යාවත්කාලීන වීම වළක්වන අතර ඔබගේ පරිගණකය <ph name="BEGIN_BOLD" />අනිෂ්ට ප්රහාරවලට ලක් වීමට ඉඩ තිබේ<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">ඔබේ දුරකථනය අගුලු හැර <ph name="DEVICE_TYPE" /> අගුලු හැරීමට එය සමීපයට ගෙන එන්න.</translation> -<translation id="3994522032746736727"><ph name="EMAIL" /> ලෙස පුරන්න</translation> <translation id="3994530503403062649">ඔබේ ටැබ්ලටයේ බොත්තම් සොයා ගන්න</translation> <translation id="3994708120330953242">ඔබේ සමහර මුරපද දත්ත කඩ කිරීමක දී හමු විය. ඔබේ ගිණුම් සුරක්ෂිත කිරීම සඳහා, ඔබ දැන් මෙම මුරපද වෙනස් කළ යුතු වේ.</translation> <translation id="3994878504415702912">විශාලනය (&Z)</translation> @@ -6593,7 +6589,6 @@ <translation id="5646994841348250879"><ph name="SITE_ETLD_PLUS_ONE" /> වෙත පුරන්නට ගිණුමක් තෝරන්න</translation> <translation id="5648021990716966815">මයික් ජැක්කුව</translation> <translation id="5648166631817621825">පසුගිය දින 7</translation> -<translation id="5650537073531199882">පෝරමය තුළ පුරවන්න</translation> <translation id="5651308944918885595">ළඟ බෙදා ගැනීම සොයා ගැනීමේ හැකියාව</translation> <translation id="5653154844073528838">ඔබට සුරැකි මුද්රක <ph name="PRINTER_COUNT" />ක් තිබේ.</translation> <translation id="5654669866168491665">තෙවන පාර්ශ්ව කුකීස් අවහිර කිරීමේ දී ක්රියා නොකරන අඩවි පිළිබඳව තව දැන ගන්න</translation> @@ -8592,6 +8587,7 @@ <translation id="7113974454301513811">දැන් ඔබේ ලැයිස්තුවට වත්මන් පටිත්ත එක් කරන්න</translation> <translation id="7114054701490058191">මුරපද නොගැළපේ</translation> <translation id="7114648273807173152">ඔබේ Google ගිණුමට පුරන්නට Smart Lock භාවිත කිරීමට, සැකසීම් > සම්බන්ධිත උපාංග > ඔබේ දුරකථනය > Smart Lock වෙත යන්න.</translation> +<translation id="7115051913071512405">ඊට උත්සාහ කර බලන්න</translation> <translation id="7115361495406486998">ළඟා විය හැකි සම්බන්ධතා නැත</translation> <translation id="7115731767122970828">දැන් වැඩි කරන්න</translation> <translation id="7116554090938189816">මුද්රකයේ SSL සහතිකය කල් ඉකුත් වී ඇත. මුද්රකය යළි අරඹා නැවත උත්සාහ කරන්න.</translation>
diff --git a/chrome/app/resources/generated_resources_sk.xtb b/chrome/app/resources/generated_resources_sk.xtb index 553baeb..c925db8 100644 --- a/chrome/app/resources/generated_resources_sk.xtb +++ b/chrome/app/resources/generated_resources_sk.xtb
@@ -668,7 +668,6 @@ <translation id="1464258312790801189">Vaše účty</translation> <translation id="1464597059227482327">Ak zdieľate s Chromebookom, ktorý nemáte v kontaktoch, uistite sa, že je v ňom zapnutá viditeľnosť v okolí. Ak chcete zapnúť viditeľnosť v okolí, zvoľte pravý dolný roh a potom výberom zapnite Viditeľnosť v okolí. <ph name="LINK_BEGIN" />Ďalšie informácie<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Predvoľby zariadenia nájdete v Nastaveniach.</translation> -<translation id="146481294006497945">Žiadne uložené heslá</translation> <translation id="1465176863081977902">K&opírovať adresu zvuku</translation> <translation id="146522654774760805">Heslá a automatické dopĺňanie</translation> <translation id="1465827627707997754">Kúsok pizzy</translation> @@ -2167,7 +2166,6 @@ <translation id="2485394160472549611">Výber pre vás</translation> <translation id="2485422356828889247">Odinštalovať</translation> <translation id="2485681265915754872">Zmluvné podmienky služby Google Play</translation> -<translation id="2486036712620651117">Heslá a prístupové kľúče</translation> <translation id="248676429071089168">Ak chcete stránku posunúť nadol, potiahnite nahor</translation> <translation id="2487067538648443797">Pridať novú záložku</translation> <translation id="2489686758589235262">Prideliť dva ďalšie prepínače</translation> @@ -3890,7 +3888,6 @@ <translation id="3721178866505920080">Ďalšie informácie o zapnutí predĺženého prednačítania</translation> <translation id="3722108462506185496">Pri spúšťaní služby virtuálneho počítača sa vyskytla chyba. Skúste to znova.</translation> <translation id="3722624153992426516">Bol prijatý pokyn <ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /></translation> -<translation id="3724897774652282549">Vyplniť formulár</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Dostupné siete Wi‑Fi</translation> @@ -4323,7 +4320,6 @@ <translation id="3993887353483242788">Synchronizujte zariadenie <ph name="DEVICE_TYPE" />, aby ste mali svoje predvoľby k dispozícii vo všetkých zariadeniach, keď sa prihlásite do svojho účtu Google. Predvoľby zahŕňajú aplikácie, nastavenia, heslá Wi‑Fi, jazyky, tapetu, klávesové skratky a viac.</translation> <translation id="3994318741694670028">Váš počítač je žiaľ nakonfigurovaný pomocou poškodeného identifikátora hardvéru. Systému Chrome OS Flex to bráni aktualizovať sa pomocou najnovších opráv zabezpečenia a váš počítač <ph name="BEGIN_BOLD" />môže byť nedostatočne zabezpečený proti škodlivým útokom<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Ak chcete odomknúť zariadenie <ph name="DEVICE_TYPE" />, odomknite svoj telefón a priblížte ho k nemu.</translation> -<translation id="3994522032746736727">Prihlásiť sa ako <ph name="EMAIL" /></translation> <translation id="3994530503403062649">Vyhľadanie tlačidiel tabletu</translation> <translation id="3994708120330953242">Niektoré vaše heslá boli odhalené pri porušení ochrany údajov. V rámci zabezpečenia svojich účtov by ste tieto heslá mali okamžite zmeniť.</translation> <translation id="3994878504415702912">&Lupa</translation> @@ -4614,6 +4610,7 @@ <translation id="4220648711404560261">Počas aktivácie sa vyskytla chyba.</translation> <translation id="4222917615373664617">Sledovanie ceny je povolené. Cena je <ph name="CURRENT_PRICE" />.</translation> <translation id="4223404254440398437">Mikrofón nie je povolený</translation> +<translation id="4224541845943007092">Čítať a ukladať vstup klávesnice z panela s adresou</translation> <translation id="4225397296022057997">Na všetkých weboch</translation> <translation id="4228071595943929139">Použiť e‑mailovú adresu vašej organizácie</translation> <translation id="4228209296591583948">{NUM_EXTENSIONS,plural, =1{Toto rozšírenie nie je povolené}few{Niektoré rozšírenia nie sú povolené}many{Niektoré rozšírenia nie sú povolené}other{Niektoré rozšírenia nie sú povolené}}</translation> @@ -6592,7 +6589,6 @@ <translation id="5646994841348250879">Vyberte účet na prihlásenie na webe <ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">Konektor mikrofónu</translation> <translation id="5648166631817621825">Posledných 7 dní</translation> -<translation id="5650537073531199882">Doplňte do formulára</translation> <translation id="5651308944918885595">Viditeľnosť pri Zdieľaní nablízku</translation> <translation id="5653154844073528838">Máte niekoľko uložených tlačiarní (<ph name="PRINTER_COUNT" />).</translation> <translation id="5654669866168491665">Ďalšie informácie o weboch, ktoré nemusia fungovať pri blokovaní súborov cookie tretích strán</translation> @@ -8596,6 +8592,7 @@ <translation id="7113974454301513811">Teraz pridajte aktuálnu kartu do zoznamu</translation> <translation id="7114054701490058191">Heslá sa nezhodujú</translation> <translation id="7114648273807173152">Do účtu Google sa môžete prihlásiť pomocou funkcie Smart Lock v časti Nastavenia > Pripojené zariadenia > Váš telefón > Smart Lock.</translation> +<translation id="7115051913071512405">Vyskúšajte to</translation> <translation id="7115361495406486998">Žiadne dostupné kontakty</translation> <translation id="7115731767122970828">Zvýšiť</translation> <translation id="7116554090938189816">Certifikát SSL tlačiarne vypršal. Reštartujte tlačiareň a skúste to znova.</translation>
diff --git a/chrome/app/resources/generated_resources_sl.xtb b/chrome/app/resources/generated_resources_sl.xtb index 0d18147..236b8cd 100644 --- a/chrome/app/resources/generated_resources_sl.xtb +++ b/chrome/app/resources/generated_resources_sl.xtb
@@ -670,7 +670,6 @@ <translation id="1464258312790801189">Vaši računi</translation> <translation id="1464597059227482327">Če delite s Chromebookom, ki ni med vašimi stiki, mora biti v njem vklopljena »Vidnost v bližini«. Če želite vklopiti »Vidnost v bližini«, izberite spodnji desni kot in nato izberite »Vidnost v bližini« ter jo vklopite. <ph name="LINK_BEGIN" />Več o tem<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Za nastavitve naprave odprite nastavitve.</translation> -<translation id="146481294006497945">Ni shranjenih gesel</translation> <translation id="1465176863081977902">Kopiraj naslov zvoka</translation> <translation id="146522654774760805">Gesla in samodejno izpolnjevanje</translation> <translation id="1465827627707997754">Rezina pice</translation> @@ -2181,7 +2180,6 @@ <translation id="2485394160472549611">Najboljši predlogi za vas</translation> <translation id="2485422356828889247">Odmeščanje</translation> <translation id="2485681265915754872">Pogoji storitve Google Play</translation> -<translation id="2486036712620651117">Gesla in ključi za dostop</translation> <translation id="248676429071089168">Povlecite navzgor, če želite premakniti stran navzdol</translation> <translation id="2487067538648443797">Dodaj nov zaznamek</translation> <translation id="2489686758589235262">Dodelitev še dveh stikal</translation> @@ -3904,7 +3902,6 @@ <translation id="3721178866505920080">Več informacij o vklopu razširjenega vnaprejšnjega nalaganja</translation> <translation id="3722108462506185496">Napaka pri zagonu storitve navideznega računalnika. Poskusite znova pozneje.</translation> <translation id="3722624153992426516">Prejelo je navodilo: <ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" />.</translation> -<translation id="3724897774652282549">Izpolnjevanje obrazca</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Razpoložljiva omrežja Wi-Fi</translation> @@ -4337,7 +4334,6 @@ <translation id="3993887353483242788">Sinhronizirajte napravo <ph name="DEVICE_TYPE" />, da bodo nastavitve pripravljene v kateri koli napravi, ko se prijavite z računom Google. Nastavitve vključujejo aplikacije, nastavitve, gesla za Wi-Fi, jezike, zaslonska ozadja, bližnjične tipke in drugo.</translation> <translation id="3994318741694670028">Vaš računalnik je konfiguriran s popačenim ID-jem strojne opreme. Zaradi tega ChromeOS Flex ne more namestiti najnovejših varnostnih popravkov in vaš računalnik <ph name="BEGIN_BOLD" />je lahko še bolj izpostavljen zlonamernim napadom<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Odklenite telefon in ga približajte napravi <ph name="DEVICE_TYPE" />, če jo želite odkleniti.</translation> -<translation id="3994522032746736727">Prijavite se kot <ph name="EMAIL" /></translation> <translation id="3994530503403062649">Iskanje gumbov na tabličnem računalniku</translation> <translation id="3994708120330953242">Nekatera vaša gesla so bila najdena v podatkovni kršitvi. Zaradi zavarovanja računov takoj spremenite gesla.</translation> <translation id="3994878504415702912">&Povečaj</translation> @@ -6610,7 +6606,6 @@ <translation id="5646994841348250879">Izberite račun za prijavo v aplikacijo <ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">Vtič za mikrofon</translation> <translation id="5648166631817621825">Zadnjih 7 dni</translation> -<translation id="5650537073531199882">Izpolnjevanje obrazca</translation> <translation id="5651308944918885595">Vidnost deljenja v bližini</translation> <translation id="5653154844073528838">Imate toliko shranjenih tiskalnikov: <ph name="PRINTER_COUNT" />.</translation> <translation id="5654669866168491665">Preberite več o spletnih mestih, ki morda ne delujejo, če blokirate piškotke tretjih oseb</translation> @@ -8616,6 +8611,7 @@ <translation id="7113974454301513811">Zdaj dodajte trenutni zavihek na seznam.</translation> <translation id="7114054701490058191">Gesli se ne ujemata</translation> <translation id="7114648273807173152">Če se želite v račun za Google prijaviti s funkcijo Smart Lock, odprite »Nastavitve > Povezane naprave > Vaš telefon > Smart Lock«.</translation> +<translation id="7115051913071512405">Preskusite</translation> <translation id="7115361495406486998">Ni dosegljivih stikov</translation> <translation id="7115731767122970828">Izboljšaj zdaj</translation> <translation id="7116554090938189816">Potrdilo SSL tiskalnika je poteklo. Tiskalnik zaženite znova in poskusite še enkrat.</translation>
diff --git a/chrome/app/resources/generated_resources_sq.xtb b/chrome/app/resources/generated_resources_sq.xtb index f0883dc1..bce0244d 100644 --- a/chrome/app/resources/generated_resources_sq.xtb +++ b/chrome/app/resources/generated_resources_sq.xtb
@@ -666,7 +666,6 @@ <translation id="1464258312790801189">Llogaritë e tua</translation> <translation id="1464597059227482327">Nëse po ndan me një Chromebook që nuk është në kontaktet e tua, sigurohu që Chromebook ta ketë të aktivizuar "Dukshmërinë në afërsi". Për të aktivizuar "Dukshmërinë në afërsi", zgjidh këndin poshtë djathtas dhe më pas zgjidh që të aktivizosh "Dukshmërinë në afërsi". <ph name="LINK_BEGIN" />Mëso më shumë<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Për preferencat e pajisjes, shko te "Cilësimet".</translation> -<translation id="146481294006497945">Nuk ka asnjë fjalëkalim të ruajtur</translation> <translation id="1465176863081977902">K&opjo adresën e audios</translation> <translation id="146522654774760805">Fjalëkalimet dhe plotësimi automatik</translation> <translation id="1465827627707997754">Fetë pice</translation> @@ -2163,7 +2162,6 @@ <translation id="2485394160472549611">Zgjedhjet kryesore për ty</translation> <translation id="2485422356828889247">Çinstalo</translation> <translation id="2485681265915754872">Kushtet e shërbimit të Google Play</translation> -<translation id="2486036712620651117">Fjalëkalimet dhe çelësat e kalimit</translation> <translation id="248676429071089168">Rrëshqit shpejt lart për ta zhvendosur faqen poshtë</translation> <translation id="2487067538648443797">Shto faqeshënues të ri</translation> <translation id="2489686758589235262">Cakto 2 çelësa të tjerë</translation> @@ -3884,7 +3882,6 @@ <translation id="3721178866505920080">Më shumë informacione për aktivizimin e ngarkimit paraprak të zgjeruar</translation> <translation id="3722108462506185496">Gabim në nisjen e shërbimit të pajisjes virtuale. Provo sërish.</translation> <translation id="3722624153992426516">U mor udhëzimi: <ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /></translation> -<translation id="3724897774652282549">Plotëso formularin</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Rrjetet e ofruara WiFi</translation> @@ -4317,7 +4314,6 @@ <translation id="3993887353483242788">Sinkronizo <ph name="DEVICE_TYPE" /> në mënyrë që preferencat e tua të jenë gati në çdo pajisje kur identifikohesh me "Llogarinë tënde të Google". Te preferencat përfshihen aplikacionet, cilësimet, fjalëkalimet e Wi-Fi, gjuhët, imazhi i sfondit, shkurtoret e tastierës dhe të tjera.</translation> <translation id="3994318741694670028">Fatkeqësisht, kompjuteri yt është konfiguruar me një ID hardueri të keqformuar. Kjo parandalon përditësimin e Chrome OS Flex me rregullimet më të fundit të sigurisë dhe kompjuteri yt <ph name="BEGIN_BOLD" />mund të jetë i cenueshëm ndaj sulmeve keqdashëse<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Shkyçe telefonin dhe afroje më shumë për të shkyçur pajisjen tënde <ph name="DEVICE_TYPE" />.</translation> -<translation id="3994522032746736727">Identifikohu si <ph name="EMAIL" /></translation> <translation id="3994530503403062649">Lokalizo butonat në tabletin tënd</translation> <translation id="3994708120330953242">Disa nga fjalëkalimet e tua janë gjetur në një nxjerrje të paautorizuar të të dhënave. Për të siguruar llogaritë e tua, duhet t'i ndryshosh këto fjalëkalime tani.</translation> <translation id="3994878504415702912">&Zmadho</translation> @@ -6586,7 +6582,6 @@ <translation id="5646994841348250879">Zgjidh një llogari për t'u identifikuar në <ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">Fisha e mikrofonit</translation> <translation id="5648166631817621825">7 ditët e fundit</translation> -<translation id="5650537073531199882">Plotëso formularin</translation> <translation id="5651308944918885595">Zbulueshmëria e "Ndarjes në afërsi"</translation> <translation id="5653154844073528838">Ke <ph name="PRINTER_COUNT" /> printerë të ruajtur.</translation> <translation id="5654669866168491665">Mëso më shumë rreth sajteve që mund të mos funksionojnë kur bllokon kukit e palëve të treta</translation> @@ -8585,6 +8580,7 @@ <translation id="7113974454301513811">Tani shto skedën aktuale në listën tënde</translation> <translation id="7114054701490058191">Fjalëkalimet nuk përputhen</translation> <translation id="7114648273807173152">Për të përdorur Smart Lock për t'u identifikuar në "Llogarinë tënde të Google", shko te Cilësimet > Pajisjet e lidhura > Telefoni yt > Smart Lock.</translation> +<translation id="7115051913071512405">Provoje</translation> <translation id="7115361495406486998">Nuk ka asnjë kontakt të arritshëm</translation> <translation id="7115731767122970828">Optimizoje tani</translation> <translation id="7116554090938189816">Certifikata SSL e printerit ka skaduar. Rinis printerin dhe provo përsëri.</translation>
diff --git a/chrome/app/resources/generated_resources_sr-Latn.xtb b/chrome/app/resources/generated_resources_sr-Latn.xtb index 0c2c0eb..a2b1e89 100644 --- a/chrome/app/resources/generated_resources_sr-Latn.xtb +++ b/chrome/app/resources/generated_resources_sr-Latn.xtb
@@ -541,6 +541,7 @@ <translation id="1368603372088757436">Linux nije podržan na uređaju <ph name="DEVICE_TYPE" />. <ph name="LINK_BEGIN" />Saznajte više<ph name="LINK_END" /></translation> <translation id="1370249617397887619">Da biste ih koristili na drugim uređajima, sačuvajte ih na Google nalogu</translation> <translation id="1370384480654163477">Pregledajte i izmenite fajlove od poslednje posete ovom sajtu:</translation> +<translation id="1372259917802609049">Došlo je do greške pri brisanju ograničenja</translation> <translation id="1372841398847029212">Sinhronizujte sa nalogom</translation> <translation id="1373176046406139583">Podešavanje vidljivosti kontroliše ko može da deli sadržaj sa vama dok je ekran otključan. <ph name="LINK_BEGIN" />Saznajte više<ph name="LINK_END" /></translation> <translation id="1374844444528092021">Sertifikat koji zahteva mreža „<ph name="NETWORK_NAME" />“ ili nije instaliran ili više nije važeći. Nabavite novi sertifikat i pokušajte ponovo da se povežete.</translation> @@ -668,7 +669,6 @@ <translation id="1464258312790801189">Nalozi</translation> <translation id="1464597059227482327">Ako delite sa Chromebook-om, koji nije u kontaktima, uverite se da je na Chromebook-u uključena Vidljivost u blizini. Da biste uključili Vidljivost u blizini, izaberite donji desni ugao, pa uključite Vidljivost u blizini. <ph name="LINK_BEGIN" />Saznajte više<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Da biste pronašli podešavanja uređaja, idite u Podešavanja.</translation> -<translation id="146481294006497945">Nema sačuvanih lozinki</translation> <translation id="1465176863081977902">K&opiraj adresu audio sadržaja</translation> <translation id="146522654774760805">Lozinke i automatsko popunjavanje</translation> <translation id="1465827627707997754">Parče pice</translation> @@ -1478,6 +1478,7 @@ <ph name="LINE_BREAKS2" />To ne utiče na aplikacije niti sadržaj na drugim uređajima.</translation> <translation id="2018189721942291407">Niste sigurni da li treba da se registrujete?</translation> <translation id="2018352199541442911">Žao nam je, spoljni memorijski uređaj trenutno nije podržan.</translation> +<translation id="2019213483156307334">Došlo je do greške pri dodavanju ograničenja</translation> <translation id="2019718679933488176">&Otvori audio snimak na novoj kartici</translation> <translation id="2020183425253392403">Prikaži podešavanja mrežne adrese</translation> <translation id="2020225359413970060">Skeniraj datoteku</translation> @@ -2163,7 +2164,6 @@ <translation id="2485394160472549611">Najbolji izbor za vas</translation> <translation id="2485422356828889247">Deinstaliraj</translation> <translation id="2485681265915754872">Uslovi korišćenja usluge Google Play</translation> -<translation id="2486036712620651117">Lozinke i pristupni ključevi</translation> <translation id="248676429071089168">Prevucite nagore da biste pomerili stranicu nadole</translation> <translation id="2487067538648443797">Dodaj novi obeleživač</translation> <translation id="2489686758589235262">Dodeli još 2 prekidača</translation> @@ -3142,6 +3142,7 @@ <translation id="3188257591659621405">Moje datoteke</translation> <translation id="3188465121994729530">Pokretni prosek</translation> <translation id="3189187154924005138">Veliki kursor</translation> +<translation id="3189533916970342007">{PASSWORD_COUNT,plural, =1{1 lozinka i druge stavke su sačuvane samo na ovom uređaju. Da biste ih koristili na drugim uređajima, sačuvajte ih na Google nalogu.}one{{PASSWORD_COUNT} lozinka i druge stavke su sačuvane samo na ovom uređaju. Da biste ih koristili na drugim uređajima, sačuvajte ih na Google nalogu.}few{{PASSWORD_COUNT} lozinke i druge stavke su sačuvane samo na ovom uređaju. Da biste ih koristili na drugim uređajima, sačuvajte ih na Google nalogu.}other{{PASSWORD_COUNT} lozinki i druge stavke su sačuvane samo na ovom uređaju. Da biste ih koristili na drugim uređajima, sačuvajte ih na Google nalogu.}}</translation> <translation id="3190558889382726167">Lozinka je sačuvana</translation> <translation id="3192586965067888278">Detaljno opišite problem. Povratne informacije se šalju Google-u na pregled od strane ljudi i mogu da se koriste za poboljšanje ili razvoj Google proizvoda i usluga.</translation> <translation id="3192947282887913208">Audio datoteke</translation> @@ -3612,6 +3613,7 @@ <translation id="3537881477201137177">Ovo može da se promeni kasnije u Podešavanjima</translation> <translation id="3538066758857505094">Greška pri deinstaliranju Linux-a. Probajte ponovo.</translation> <translation id="3539537154248488260">Uključite/isključite inspiraciju</translation> +<translation id="3539791442352537591">Došlo je do greške pri čuvanju promene stepena pouzdanosti</translation> <translation id="3540173484406326944">Nema mreže preko: <ph name="HOST_DEVICE_NAME" /></translation> <translation id="354060433403403521">Punjač</translation> <translation id="354068948465830244">Ovo može da čita i menja podatke sajtova</translation> @@ -3886,7 +3888,6 @@ <translation id="3721178866505920080">Više informacija o uključivanju produženog predučitavanja</translation> <translation id="3722108462506185496">Greška pri pokretanju usluge virtuelne mašine. Probajte ponovo.</translation> <translation id="3722624153992426516">Primljeno je uputstvo <ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /></translation> -<translation id="3724897774652282549">Popunite obrazac</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Dostupne WiFi mreže</translation> @@ -4319,7 +4320,6 @@ <translation id="3993887353483242788">Sinhronizujte <ph name="DEVICE_TYPE" /> da bi vaša podešavanja bila spremna na bilo kom uređaju kad se prijavite pomoću Google naloga. Podešavanja obuhvataju aplikacije, postavke, lozinke za WiFi, jezike, pozadinu, tasterske prečice i drugo.</translation> <translation id="3994318741694670028">Nažalost, računar je konfigurisan pomoću pogrešno formatiranog ID-a hardvera. To sprečava da se Chrome OS Flex ažurira najnovijim bezbednosnim ispravkama i računar <ph name="BEGIN_BOLD" />može da bude podložan zlonamernim napadima<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Otključajte telefon i približite ga da biste otključali <ph name="DEVICE_TYPE" />.</translation> -<translation id="3994522032746736727">Prijavi me kao <ph name="EMAIL" /></translation> <translation id="3994530503403062649">Pronađite dugmad na tabletu</translation> <translation id="3994708120330953242">Neke od lozinki su pronađene pri povredi podataka. Da biste zaštitili naloge, treba odmah da promenite te lozinke.</translation> <translation id="3994878504415702912">&Zumiraj</translation> @@ -4802,6 +4802,7 @@ <translation id="4361745360460842907">Otvori kao karticu</translation> <translation id="4363262124589131906">Novi fajlovi u Mom disku će automatski prestati da se sinhronizuju sa ovim Chromebook-om</translation> <translation id="4364327530094270451">Dinja</translation> +<translation id="4364417397164696363">{ITEM_COUNT,plural, =1{1 stavka je sačuvana samo na ovom uređaju. Da biste je koristili na drugim uređajima, sačuvajte je na Google nalogu.}one{{ITEM_COUNT} stavka je sačuvana samo na ovom uređaju. Da biste ih koristili na drugim uređajima, sačuvajte ih na Google nalogu.}few{{ITEM_COUNT} stavke su sačuvane samo na ovom uređaju. Da biste ih koristili na drugim uređajima, sačuvajte ih na Google nalogu.}other{{ITEM_COUNT} stavki je sačuvano samo na ovom uređaju. Da biste ih koristili na drugim uređajima, sačuvajte ih na Google nalogu.}}</translation> <translation id="4364567974334641491"><ph name="APP_NAME" /> deli prozor.</translation> <translation id="4364830672918311045">Prikazuj obaveštenja</translation> <translation id="4367971618859387374">Ime za prikaz</translation> @@ -5724,6 +5725,7 @@ <translation id="5029287942302939687">Lozinka je podešena</translation> <translation id="5029873138381728058">Provera virtuelnih mašina nije uspela</translation> <translation id="503155457707535043">Preuzimanje aplikacija</translation> +<translation id="5031769842769721381">{SELECTED_ITEMS,plural, =0{Adrese}=1{Adrese ({SELECTED_ITEMS})}one{Adrese ({SELECTED_ITEMS})}few{Adrese ({SELECTED_ITEMS})}other{Adrese ({SELECTED_ITEMS})}}</translation> <translation id="5032430150487044192">Pravljenje QR koda nije uspelo</translation> <translation id="5033137252639132982">Nije im dozvoljeno da koriste senzore pokreta</translation> <translation id="5035846135112863536">Izaberite Još detalja ispod da biste pronašli više informacija od: <ph name="IDENTITY_PROVIDER_ETLD_PLUS_ONE" />.</translation> @@ -6471,6 +6473,7 @@ <translation id="5568069709869097550">Ne mogu da se prijavim</translation> <translation id="5568525251731145240">Želite da izbrišete podatke o sajtovima i dozvole za <ph name="SITE_NAME" />, sve podređene sajtove i instalirane aplikacije?</translation> <translation id="5568602038816065197">Sajtovi mogu da koriste napredne funkcije sa bilo kog štampača dostupnog uređaju bez standardnog upita za štampanje</translation> +<translation id="5570149859473005144">{SELECTED_ITEMS,plural, =0{Lozinke}=1{Lozinke ({SELECTED_ITEMS})}one{Lozinke ({SELECTED_ITEMS})}few{Lozinke ({SELECTED_ITEMS})}other{Lozinke ({SELECTED_ITEMS})}}</translation> <translation id="5571066253365925590">Bluetooth je omogućen</translation> <translation id="5571092938913434726">Globalne kontrole za medije</translation> <translation id="5571832155627049070">Prilagodite profil</translation> @@ -6589,7 +6592,6 @@ <translation id="5646994841348250879">Odaberite nalog da biste se prijavili na <ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">Utikač za mikrofon</translation> <translation id="5648166631817621825">Poslednjih 7 dana</translation> -<translation id="5650537073531199882">Popunite obrazac</translation> <translation id="5651308944918885595">Vidljivost za Deljenje u blizini</translation> <translation id="5653154844073528838">Imate sačuvane štampače: <ph name="PRINTER_COUNT" />.</translation> <translation id="5654669866168491665">Saznajte više o sajtovima koji možda neće funkcionisati kada blokirate kolačiće trećih strana</translation> @@ -6977,6 +6979,7 @@ <translation id="5941153596444580863">Dodaj osobu...</translation> <translation id="5941343993301164315">Prijavite se na <ph name="TOKEN_NAME" />.</translation> <translation id="5941711191222866238">Umanji</translation> +<translation id="5941854976565320351">{PASSWORD_COUNT,plural, =1{1 lozinka je sačuvana samo na ovom uređaju. Da biste je koristili na drugim uređajima, sačuvajte je na Google nalogu.}one{{PASSWORD_COUNT} lozinka je sačuvana samo na ovom uređaju. Da biste ih koristili na drugim uređajima, sačuvajte ih na Google nalogu.}few{{PASSWORD_COUNT} lozinke su sačuvane samo na ovom uređaju. Da biste ih koristili na drugim uređajima, sačuvajte ih na Google nalogu.}other{{PASSWORD_COUNT} lozinki je sačuvano samo na ovom uređaju. Da biste ih koristili na drugim uređajima, sačuvajte ih na Google nalogu.}}</translation> <translation id="594221546068848596">Pretraži stranicu pomoću usluge <ph name="VISUAL_SEARCH_PROVIDER" /></translation> <translation id="5942779427914696408">Vidljivost uređaja</translation> <translation id="5943127421590245687">Verifikacija je uspela. Da biste otključali i vratili lokalne podatke, unesite staru lozinku za <ph name="DEVICE_TYPE" />.</translation> @@ -8498,6 +8501,7 @@ <translation id="7036706669646341689">Za Linux se preporučuje <ph name="DISK_SIZE" /> prostora. Da biste oslobodili prostor, izbrišite datoteke sa uređaja.</translation> <translation id="7037157058268992880">Zaboravio/la sam PIN</translation> <translation id="7037509989619051237">Tekst za pregled</translation> +<translation id="7037633074390821254">Ograničenje za DNS ili CIDR</translation> <translation id="7038632520572155338">Pristup pomoću prekidača</translation> <translation id="7038710352229712897">Dodajte još jedan Google nalog za: <ph name="USER_NAME" /></translation> <translation id="7039326228527141150">Pristup USB uređajima prodavca <ph name="VENDOR_NAME" /></translation> @@ -8593,6 +8597,7 @@ <translation id="7113974454301513811">Sada dodajte aktuelnu karticu na listu</translation> <translation id="7114054701490058191">Lozinke se ne podudaraju</translation> <translation id="7114648273807173152">Da biste koristili Smart Lock za prijavljivanje na Google nalog, idite na Podešavanja > Povezani uređaji > Telefon > Smart Lock.</translation> +<translation id="7115051913071512405">Isprobajte</translation> <translation id="7115361495406486998">Nema dostupnih kontakata</translation> <translation id="7115731767122970828">Poboljšaj</translation> <translation id="7116554090938189816">SSL sertifikat štampača je istekao. Restartujte štampač i probajte ponovo.</translation> @@ -8745,6 +8750,7 @@ <translation id="7231260028442989757">Pregledajte i odbacite obaveštenja na telefonu ili odgovorite na njih</translation> <translation id="7231347196745816203">da otključate <ph name="DEVICE_TYPE" /> pomoću telefona</translation> <translation id="7232750842195536390">Promena naziva nije uspela</translation> +<translation id="7232962679391151113">{BOOKMARK_COUNT,plural, =1{1 obeleživač i druge stavke su sačuvani samo na ovom uređaju. Da biste ih koristili na drugim uređajima, sačuvajte ih na Google nalogu.}one{{BOOKMARK_COUNT} obeleživač i druge stavke su sačuvani samo na ovom uređaju. Da biste ih koristili na drugim uređajima, sačuvajte ih na Google nalogu.}few{{BOOKMARK_COUNT} obeleživača i druge stavke su sačuvani samo na ovom uređaju. Da biste ih koristili na drugim uređajima, sačuvajte ih na Google nalogu.}other{{BOOKMARK_COUNT} obeleživača i druge stavke su sačuvani samo na ovom uređaju. Da biste ih koristili na drugim uređajima, sačuvajte ih na Google nalogu.}}</translation> <translation id="723343421145275488">Tražite sliku uz <ph name="VISUAL_SEARCH_PROVIDER" /></translation> <translation id="7234010996000898150">Vraćanje Linux-a se otkazuje</translation> <translation id="7235305658956131898">Android aplikacija koju je instalirao administrator uređaja.</translation> @@ -8871,6 +8877,7 @@ <translation id="7327989755579928735"><ph name="MANAGER" /> je onemogućio ADB otklanjanje grešaka. Kada restartujete <ph name="DEVICE_TYPE" />, nećete moći da učitavate aplikacije sa izvora treće strane.</translation> <translation id="7328119182036084494">Sačuvano je na listi <ph name="WEB_DRIVE" /></translation> <translation id="7328162502911382168">(<ph name="COUNT" />)</translation> +<translation id="732845903678043302">{BOOKMARK_COUNT,plural, =1{1 obeleživač je sačuvan samo na ovom uređaju. Da biste ga koristili na drugim uređajima, sačuvajte ga na Google nalogu.}one{{BOOKMARK_COUNT} obeleživač je sačuvan samo na ovom uređaju. Da biste ih koristili na drugim uređajima, sačuvajte ih na Google nalogu.}few{{BOOKMARK_COUNT} obeleživača su sačuvana samo na ovom uređaju. Da biste ih koristili na drugim uređajima, sačuvajte ih na Google nalogu.}other{{BOOKMARK_COUNT} obeleživača je sačuvano samo na ovom uređaju. Da biste ih koristili na drugim uređajima, sačuvajte ih na Google nalogu.}}</translation> <translation id="7328867076235380839">Nevažeća kombinacija</translation> <translation id="7329154610228416156">Prijavljivanje nije uspelo jer je konfigurisano za korišćenje nebezbednog URL-a (<ph name="BLOCKED_URL" />). Kontaktirajte administratora.</translation> <translation id="7330533963640151632">Podešavanja funkcije <ph name="FEATURE_NAME" /> za uređaj koji koristi <ph name="USER_NAME" />. Deli se pomoću naloga <ph name="USER_EMAIL" />.</translation> @@ -10414,6 +10421,7 @@ <translation id="8398877366907290961">Ipak nastavi</translation> <translation id="8399282673057829204">Prikaži lozinku</translation> <translation id="839949601275221554">Došlo je do greške na uređaju. Restartujte uređaj i probajte ponovo.</translation> +<translation id="8399889560226245071">{SELECTED_ITEMS,plural, =0{Obeleživači}=1{Obeleživači ({SELECTED_ITEMS})}one{Obeleživači ({SELECTED_ITEMS})}few{Obeleživači ({SELECTED_ITEMS})}other{Obeleživači ({SELECTED_ITEMS})}}</translation> <translation id="8401432541486058167">Navedite PIN koji je povezan sa pametnom karticom.</translation> <translation id="8403807918453631441"><ph name="BRAND" /> može da proverava lozinke kada ih sačuvate</translation> <translation id="8405046151008197676">Pogledajte rezime najnovijeg ažuriranja</translation> @@ -11670,6 +11678,7 @@ <translation id="97905529126098460">Ovaj prozor će se zatvoriti kada se otkazivanje dovrši.</translation> <translation id="980731642137034229">Dugme menija sa radnjama</translation> <translation id="981121421437150478">Oflajn</translation> +<translation id="982083952953998237">Dodajte ograničenja</translation> <translation id="98235653036850093">Zdravo, <ph name="PROFILE_NAME" /></translation> <translation id="983192555821071799">Zatvori sve kartice</translation> <translation id="983531994960412650"><ph name="WINDOW_TITLE" /> – Kamera i mikrofon snimaju</translation>
diff --git a/chrome/app/resources/generated_resources_sr.xtb b/chrome/app/resources/generated_resources_sr.xtb index f0cd06f..04e6c111 100644 --- a/chrome/app/resources/generated_resources_sr.xtb +++ b/chrome/app/resources/generated_resources_sr.xtb
@@ -541,6 +541,7 @@ <translation id="1368603372088757436">Linux није подржан на уређају <ph name="DEVICE_TYPE" />. <ph name="LINK_BEGIN" />Сазнајте више<ph name="LINK_END" /></translation> <translation id="1370249617397887619">Да бисте их користили на другим уређајима, сачувајте их на Google налогу</translation> <translation id="1370384480654163477">Прегледајте и измените фајлове од последње посете овом сајту:</translation> +<translation id="1372259917802609049">Дошло је до грешке при брисању ограничења</translation> <translation id="1372841398847029212">Синхронизујте са налогом</translation> <translation id="1373176046406139583">Подешавање видљивости контролише ко може да дели садржај са вама док је екран откључан. <ph name="LINK_BEGIN" />Сазнајте више<ph name="LINK_END" /></translation> <translation id="1374844444528092021">Сертификат који захтева мрежа „<ph name="NETWORK_NAME" />“ или није инсталиран или више није важећи. Набавите нови сертификат и покушајте поново да се повежете.</translation> @@ -668,7 +669,6 @@ <translation id="1464258312790801189">Налози</translation> <translation id="1464597059227482327">Ако делите са Chromebook-ом, који није у контактима, уверите се да је на Chromebook-у укључена Видљивост у близини. Да бисте укључили Видљивост у близини, изаберите доњи десни угао, па укључите Видљивост у близини. <ph name="LINK_BEGIN" />Сазнајте више<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Да бисте пронашли подешавања уређаја, идите у Подешавања.</translation> -<translation id="146481294006497945">Нема сачуваних лозинки</translation> <translation id="1465176863081977902">К&опирај адресу аудио садржаја</translation> <translation id="146522654774760805">Лозинке и аутоматско попуњавање</translation> <translation id="1465827627707997754">Парче пице</translation> @@ -1478,6 +1478,7 @@ <ph name="LINE_BREAKS2" />То не утиче на апликације нити садржај на другим уређајима.</translation> <translation id="2018189721942291407">Нисте сигурни да ли треба да се региструјете?</translation> <translation id="2018352199541442911">Жао нам је, спољни меморијски уређај тренутно није подржан.</translation> +<translation id="2019213483156307334">Дошло је до грешке при додавању ограничења</translation> <translation id="2019718679933488176">&Отвори аудио снимак на новој картици</translation> <translation id="2020183425253392403">Прикажи подешавања мрежне адресе</translation> <translation id="2020225359413970060">Скенирај датотеку</translation> @@ -2163,7 +2164,6 @@ <translation id="2485394160472549611">Најбољи избор за вас</translation> <translation id="2485422356828889247">Деинсталирај</translation> <translation id="2485681265915754872">Услови коришћења услуге Google Play</translation> -<translation id="2486036712620651117">Лозинке и приступни кључеви</translation> <translation id="248676429071089168">Превуците нагоре да бисте померили страницу надоле</translation> <translation id="2487067538648443797">Додај нови обележивач</translation> <translation id="2489686758589235262">Додели још 2 прекидача</translation> @@ -3142,6 +3142,7 @@ <translation id="3188257591659621405">Моје датотеке</translation> <translation id="3188465121994729530">Покретни просек</translation> <translation id="3189187154924005138">Велики курсор</translation> +<translation id="3189533916970342007">{PASSWORD_COUNT,plural, =1{1 лозинка и друге ставке су сачуване само на овом уређају. Да бисте их користили на другим уређајима, сачувајте их на Google налогу.}one{{PASSWORD_COUNT} лозинка и друге ставке су сачуване само на овом уређају. Да бисте их користили на другим уређајима, сачувајте их на Google налогу.}few{{PASSWORD_COUNT} лозинке и друге ставке су сачуване само на овом уређају. Да бисте их користили на другим уређајима, сачувајте их на Google налогу.}other{{PASSWORD_COUNT} лозинки и друге ставке су сачуване само на овом уређају. Да бисте их користили на другим уређајима, сачувајте их на Google налогу.}}</translation> <translation id="3190558889382726167">Лозинка је сачувана</translation> <translation id="3192586965067888278">Детаљно опишите проблем. Повратне информације се шаљу Google-у на преглед од стране људи и могу да се користе за побољшање или развој Google производа и услуга.</translation> <translation id="3192947282887913208">Аудио датотеке</translation> @@ -3612,6 +3613,7 @@ <translation id="3537881477201137177">Ово може да се промени касније у Подешавањима</translation> <translation id="3538066758857505094">Грешка при деинсталирању Linux-а. Пробајте поново.</translation> <translation id="3539537154248488260">Укључите/искључите инспирацију</translation> +<translation id="3539791442352537591">Дошло је до грешке при чувању промене степена поузданости</translation> <translation id="3540173484406326944">Нема мреже преко: <ph name="HOST_DEVICE_NAME" /></translation> <translation id="354060433403403521">Пуњач</translation> <translation id="354068948465830244">Ово може да чита и мења податке сајтова</translation> @@ -3886,7 +3888,6 @@ <translation id="3721178866505920080">Више информација о укључивању продуженог предучитавања</translation> <translation id="3722108462506185496">Грешка при покретању услуге виртуелне машине. Пробајте поново.</translation> <translation id="3722624153992426516">Примљено је упутство <ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /></translation> -<translation id="3724897774652282549">Попуните образац</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Доступне WiFi мреже</translation> @@ -4319,7 +4320,6 @@ <translation id="3993887353483242788">Синхронизујте <ph name="DEVICE_TYPE" /> да би ваша подешавања била спремна на било ком уређају кад се пријавите помоћу Google налога. Подешавања обухватају апликације, поставке, лозинке за WiFi, језике, позадину, тастерске пречице и друго.</translation> <translation id="3994318741694670028">Нажалост, рачунар је конфигурисан помоћу погрешно форматираног ИД-а хардвера. То спречава да се Chrome OS Flex ажурира најновијим безбедносним исправкама и рачунар <ph name="BEGIN_BOLD" />може да буде подложан злонамерним нападима<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Откључајте телефон и приближите га да бисте откључали <ph name="DEVICE_TYPE" />.</translation> -<translation id="3994522032746736727">Пријави ме као <ph name="EMAIL" /></translation> <translation id="3994530503403062649">Пронађите дугмад на таблету</translation> <translation id="3994708120330953242">Неке од лозинки су пронађене при повреди података. Да бисте заштитили налоге, треба одмах да промените те лозинке.</translation> <translation id="3994878504415702912">&Зумирај</translation> @@ -4802,6 +4802,7 @@ <translation id="4361745360460842907">Отвори као картицу</translation> <translation id="4363262124589131906">Нови фајлови у Мом диску ће аутоматски престати да се синхронизују са овим Chromebook-ом</translation> <translation id="4364327530094270451">Диња</translation> +<translation id="4364417397164696363">{ITEM_COUNT,plural, =1{1 ставка је сачувана само на овом уређају. Да бисте је користили на другим уређајима, сачувајте је на Google налогу.}one{{ITEM_COUNT} ставка је сачувана само на овом уређају. Да бисте их користили на другим уређајима, сачувајте их на Google налогу.}few{{ITEM_COUNT} ставке су сачуване само на овом уређају. Да бисте их користили на другим уређајима, сачувајте их на Google налогу.}other{{ITEM_COUNT} ставки је сачувано само на овом уређају. Да бисте их користили на другим уређајима, сачувајте их на Google налогу.}}</translation> <translation id="4364567974334641491"><ph name="APP_NAME" /> дели прозор.</translation> <translation id="4364830672918311045">Приказуј обавештења</translation> <translation id="4367971618859387374">Име за приказ</translation> @@ -5724,6 +5725,7 @@ <translation id="5029287942302939687">Лозинка је подешена</translation> <translation id="5029873138381728058">Провера виртуелних машина није успела</translation> <translation id="503155457707535043">Преузимање апликација</translation> +<translation id="5031769842769721381">{SELECTED_ITEMS,plural, =0{Адресе}=1{Адресе ({SELECTED_ITEMS})}one{Адресе ({SELECTED_ITEMS})}few{Адресе ({SELECTED_ITEMS})}other{Адресе ({SELECTED_ITEMS})}}</translation> <translation id="5032430150487044192">Прављење QR кода није успело</translation> <translation id="5033137252639132982">Није им дозвољено да користе сензоре покрета</translation> <translation id="5035846135112863536">Изаберите Још детаља испод да бисте пронашли више информација од: <ph name="IDENTITY_PROVIDER_ETLD_PLUS_ONE" />.</translation> @@ -6471,6 +6473,7 @@ <translation id="5568069709869097550">Не могу да се пријавим</translation> <translation id="5568525251731145240">Желите да избришете податке о сајтовима и дозволе за <ph name="SITE_NAME" />, све подређене сајтове и инсталиране апликације?</translation> <translation id="5568602038816065197">Сајтови могу да користе напредне функције са било ког штампача доступног уређају без стандардног упита за штампање</translation> +<translation id="5570149859473005144">{SELECTED_ITEMS,plural, =0{Лозинке}=1{Лозинке ({SELECTED_ITEMS})}one{Лозинке ({SELECTED_ITEMS})}few{Лозинке ({SELECTED_ITEMS})}other{Лозинке ({SELECTED_ITEMS})}}</translation> <translation id="5571066253365925590">Bluetooth је омогућен</translation> <translation id="5571092938913434726">Глобалне контроле за медије</translation> <translation id="5571832155627049070">Прилагодите профил</translation> @@ -6589,7 +6592,6 @@ <translation id="5646994841348250879">Одаберите налог да бисте се пријавили на <ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">Утикач за микрофон</translation> <translation id="5648166631817621825">Последњих 7 дана</translation> -<translation id="5650537073531199882">Попуните образац</translation> <translation id="5651308944918885595">Видљивост за Дељење у близини</translation> <translation id="5653154844073528838">Имате сачуване штампаче: <ph name="PRINTER_COUNT" />.</translation> <translation id="5654669866168491665">Сазнајте више о сајтовима који можда неће функционисати када блокирате колачиће трећих страна</translation> @@ -6977,6 +6979,7 @@ <translation id="5941153596444580863">Додај особу...</translation> <translation id="5941343993301164315">Пријавите се на <ph name="TOKEN_NAME" />.</translation> <translation id="5941711191222866238">Умањи</translation> +<translation id="5941854976565320351">{PASSWORD_COUNT,plural, =1{1 лозинка је сачувана само на овом уређају. Да бисте је користили на другим уређајима, сачувајте је на Google налогу.}one{{PASSWORD_COUNT} лозинка је сачувана само на овом уређају. Да бисте их користили на другим уређајима, сачувајте их на Google налогу.}few{{PASSWORD_COUNT} лозинке су сачуване само на овом уређају. Да бисте их користили на другим уређајима, сачувајте их на Google налогу.}other{{PASSWORD_COUNT} лозинки је сачувано само на овом уређају. Да бисте их користили на другим уређајима, сачувајте их на Google налогу.}}</translation> <translation id="594221546068848596">Претражи страницу помоћу услуге <ph name="VISUAL_SEARCH_PROVIDER" /></translation> <translation id="5942779427914696408">Видљивост уређаја</translation> <translation id="5943127421590245687">Верификација је успела. Да бисте откључали и вратили локалне податке, унесите стару лозинку за <ph name="DEVICE_TYPE" />.</translation> @@ -8498,6 +8501,7 @@ <translation id="7036706669646341689">За Linux се препоручује <ph name="DISK_SIZE" /> простора. Да бисте ослободили простор, избришите датотеке са уређаја.</translation> <translation id="7037157058268992880">Заборавио/ла сам PIN</translation> <translation id="7037509989619051237">Текст за преглед</translation> +<translation id="7037633074390821254">Ограничење за DNS или CIDR</translation> <translation id="7038632520572155338">Приступ помоћу прекидача</translation> <translation id="7038710352229712897">Додајте још један Google налог за: <ph name="USER_NAME" /></translation> <translation id="7039326228527141150">Приступ USB уређајима продавца <ph name="VENDOR_NAME" /></translation> @@ -8593,6 +8597,7 @@ <translation id="7113974454301513811">Сада додајте актуелну картицу на листу</translation> <translation id="7114054701490058191">Лозинке се не подударају</translation> <translation id="7114648273807173152">Да бисте користили Smart Lock за пријављивање на Google налог, идите на Подешавања > Повезани уређаји > Телефон > Smart Lock.</translation> +<translation id="7115051913071512405">Испробајте</translation> <translation id="7115361495406486998">Нема доступних контаката</translation> <translation id="7115731767122970828">Побољшај</translation> <translation id="7116554090938189816">SSL сертификат штампача је истекао. Рестартујте штампач и пробајте поново.</translation> @@ -8745,6 +8750,7 @@ <translation id="7231260028442989757">Прегледајте и одбаците обавештења на телефону или одговорите на њих</translation> <translation id="7231347196745816203">да откључате <ph name="DEVICE_TYPE" /> помоћу телефона</translation> <translation id="7232750842195536390">Промена назива није успела</translation> +<translation id="7232962679391151113">{BOOKMARK_COUNT,plural, =1{1 обележивач и друге ставке су сачувани само на овом уређају. Да бисте их користили на другим уређајима, сачувајте их на Google налогу.}one{{BOOKMARK_COUNT} обележивач и друге ставке су сачувани само на овом уређају. Да бисте их користили на другим уређајима, сачувајте их на Google налогу.}few{{BOOKMARK_COUNT} обележивача и друге ставке су сачувани само на овом уређају. Да бисте их користили на другим уређајима, сачувајте их на Google налогу.}other{{BOOKMARK_COUNT} обележивача и друге ставке су сачувани само на овом уређају. Да бисте их користили на другим уређајима, сачувајте их на Google налогу.}}</translation> <translation id="723343421145275488">Тражите слику уз <ph name="VISUAL_SEARCH_PROVIDER" /></translation> <translation id="7234010996000898150">Враћање Linux-а се отказује</translation> <translation id="7235305658956131898">Android апликација коју је инсталирао администратор уређаја.</translation> @@ -8871,6 +8877,7 @@ <translation id="7327989755579928735"><ph name="MANAGER" /> је онемогућио ADB отклањање грешака. Када рестартујете <ph name="DEVICE_TYPE" />, нећете моћи да учитавате апликације са извора треће стране.</translation> <translation id="7328119182036084494">Сачувано је на листи <ph name="WEB_DRIVE" /></translation> <translation id="7328162502911382168">(<ph name="COUNT" />)</translation> +<translation id="732845903678043302">{BOOKMARK_COUNT,plural, =1{1 обележивач је сачуван само на овом уређају. Да бисте га користили на другим уређајима, сачувајте га на Google налогу.}one{{BOOKMARK_COUNT} обележивач је сачуван само на овом уређају. Да бисте их користили на другим уређајима, сачувајте их на Google налогу.}few{{BOOKMARK_COUNT} обележивача су сачувана само на овом уређају. Да бисте их користили на другим уређајима, сачувајте их на Google налогу.}other{{BOOKMARK_COUNT} обележивача је сачувано само на овом уређају. Да бисте их користили на другим уређајима, сачувајте их на Google налогу.}}</translation> <translation id="7328867076235380839">Неважећа комбинација</translation> <translation id="7329154610228416156">Пријављивање није успело јер је конфигурисано за коришћење небезбедног URL-а (<ph name="BLOCKED_URL" />). Контактирајте администратора.</translation> <translation id="7330533963640151632">Подешавања функције <ph name="FEATURE_NAME" /> за уређај који користи <ph name="USER_NAME" />. Дели се помоћу налога <ph name="USER_EMAIL" />.</translation> @@ -10414,6 +10421,7 @@ <translation id="8398877366907290961">Ипак настави</translation> <translation id="8399282673057829204">Прикажи лозинку</translation> <translation id="839949601275221554">Дошло је до грешке на уређају. Рестартујте уређај и пробајте поново.</translation> +<translation id="8399889560226245071">{SELECTED_ITEMS,plural, =0{Обележивачи}=1{Обележивачи ({SELECTED_ITEMS})}one{Обележивачи ({SELECTED_ITEMS})}few{Обележивачи ({SELECTED_ITEMS})}other{Обележивачи ({SELECTED_ITEMS})}}</translation> <translation id="8401432541486058167">Наведите PIN који је повезан са паметном картицом.</translation> <translation id="8403807918453631441"><ph name="BRAND" /> може да проверава лозинке када их сачувате</translation> <translation id="8405046151008197676">Погледајте резиме најновијег ажурирања</translation> @@ -11670,6 +11678,7 @@ <translation id="97905529126098460">Овај прозор ће се затворити када се отказивање доврши.</translation> <translation id="980731642137034229">Дугме менија са радњама</translation> <translation id="981121421437150478">Офлајн</translation> +<translation id="982083952953998237">Додајте ограничења</translation> <translation id="98235653036850093">Здраво, <ph name="PROFILE_NAME" /></translation> <translation id="983192555821071799">Затвори све картице</translation> <translation id="983531994960412650"><ph name="WINDOW_TITLE" /> – Камера и микрофон снимају</translation>
diff --git a/chrome/app/resources/generated_resources_sv.xtb b/chrome/app/resources/generated_resources_sv.xtb index 87584bc..90f99a5 100644 --- a/chrome/app/resources/generated_resources_sv.xtb +++ b/chrome/app/resources/generated_resources_sv.xtb
@@ -667,7 +667,6 @@ <translation id="1464258312790801189">Dina konton</translation> <translation id="1464597059227482327">Om du delar med en Chromebook som inte finns i dina kontakter ska du kontrollera att alternativet för synlighet i närheten har aktiverats på din Chromebook. Du kan aktivera detta genom att välja det nedre högra hörnet och markera Synl. i närheten. <ph name="LINK_BEGIN" />Läs mer<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Öppna Inställningar om du vill visa enhetsinställningarna</translation> -<translation id="146481294006497945">Inga sparade lösenord</translation> <translation id="1465176863081977902">K&opiera ljudadress</translation> <translation id="146522654774760805">Lösenord och autofyll</translation> <translation id="1465827627707997754">Pizzabit</translation> @@ -2178,7 +2177,6 @@ <translation id="2485394160472549611">De bästa valen för dig</translation> <translation id="2485422356828889247">Avinstallera</translation> <translation id="2485681265915754872">Google Plays användarvillkor</translation> -<translation id="2486036712620651117">Lösenord och nycklar</translation> <translation id="248676429071089168">Svep uppåt för att flytta sidan nedåt</translation> <translation id="2487067538648443797">Lägg till ett nytt bokmärke</translation> <translation id="2489686758589235262">Tilldela 2 brytare till</translation> @@ -3901,7 +3899,6 @@ <translation id="3721178866505920080">Mer information om att aktivera utökad inläsning i förväg</translation> <translation id="3722108462506185496">Det gick inte att starta den virtuella maskinen. Försök igen.</translation> <translation id="3722624153992426516"><ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" />-instruktionen har tagits emot</translation> -<translation id="3724897774652282549">Fyll i formuläret</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">Qt</translation> <translation id="3727144509609414201">Tillgängliga wifi-nätverk</translation> @@ -4334,7 +4331,6 @@ <translation id="3993887353483242788">Synkronisera <ph name="DEVICE_TYPE" /> så att inställningarna kan användas på alla enheter där du är inloggad på Google-kontot. Detta gäller bland annat appar, inställningar, wifi-lösenord, språk, bakgrund och kortkommandon.</translation> <translation id="3994318741694670028">Tyvärr är din dator konfigurerad med ett felaktigt hårdvaru-id. Detta förhindrar att ChromeOS Flex uppdateras med de senaste säkerhetskorrigeringarna och datorn <ph name="BEGIN_BOLD" />kan vara sårbar för angrepp<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Lås upp mobilen och håll den närmare din <ph name="DEVICE_TYPE" />.</translation> -<translation id="3994522032746736727">Logga in som <ph name="EMAIL" /></translation> <translation id="3994530503403062649">Hitta knappar på surfplattan</translation> <translation id="3994708120330953242">Vissa av dina lösenord upptäcktes i samband med ett dataintrång. För att skydda dina konton bör du ändra dessa lösenord nu.</translation> <translation id="3994878504415702912">&Zooma in</translation> @@ -6605,7 +6601,6 @@ <translation id="5646994841348250879">Välj ett konto för att logga in på <ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">Mikrofonuttag</translation> <translation id="5648166631817621825">Senaste sju dagarna</translation> -<translation id="5650537073531199882">Fyll i formuläret</translation> <translation id="5651308944918885595">Synlighet för Närdelning</translation> <translation id="5653154844073528838">Du har <ph name="PRINTER_COUNT" /> sparade skrivare.</translation> <translation id="5654669866168491665">Läs mer om webbplatser som kanske inte fungerar när du blockerar tredjepartscookies.</translation> @@ -8605,6 +8600,7 @@ <translation id="7113974454301513811">Lägg till den aktuella fliken i listan</translation> <translation id="7114054701490058191">Lösenorden matchar inte</translation> <translation id="7114648273807173152">Öppna Inställningar > Anslutna enheter > Din mobil > Smart Lock om du vill kunna logga in på Google-kontot med Smart Lock.</translation> +<translation id="7115051913071512405">Testa själv</translation> <translation id="7115361495406486998">Det finns inga kontakter inom räckhåll</translation> <translation id="7115731767122970828">Förbättra nu</translation> <translation id="7116554090938189816">Skrivarens SSL-certifikat har upphört att gälla. Starta om skrivaren och försök igen.</translation>
diff --git a/chrome/app/resources/generated_resources_sw.xtb b/chrome/app/resources/generated_resources_sw.xtb index dd82375..d4d377a 100644 --- a/chrome/app/resources/generated_resources_sw.xtb +++ b/chrome/app/resources/generated_resources_sw.xtb
@@ -667,7 +667,6 @@ <translation id="1464258312790801189">Akaunti Zako</translation> <translation id="1464597059227482327">Iwapo unashiriki na Chromebook ambayo haipo kwenye anwani zako, hakikisha kuwa kipengele cha “Uonekanaji wa karibu” kimewashwa kwenye Chromebook. Ili uwashe kipengele cha “Uonekanaji wa karibu,” chagua kona ya chini kulia kisha uchague washa “Uonekanaji wa karibu.” <ph name="LINK_BEGIN" />Pata maelezo zaidi<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Ili upate mapendeleo ya kifaa, nenda kwenye Mipangilio.</translation> -<translation id="146481294006497945">Hakuna Manenosiri Yaliyohifadhiwa</translation> <translation id="1465176863081977902">Nakili Anwani ya Sauti</translation> <translation id="146522654774760805">Manenosiri na kujaza kiotomatiki</translation> <translation id="1465827627707997754">Kipande cha piza</translation> @@ -2175,7 +2174,6 @@ <translation id="2485394160472549611">Chaguo maarufu unazopendekezewa</translation> <translation id="2485422356828889247">Ondoa</translation> <translation id="2485681265915754872">Sheria na Masharti ya Google Play</translation> -<translation id="2486036712620651117">Manenosiri na Funguo za Siri</translation> <translation id="248676429071089168">Telezesha kidole juu ili usogeze ukurasa chini</translation> <translation id="2487067538648443797">Ongeza alamisho mpya</translation> <translation id="2489686758589235262">Kabidhi swichi zingine mbili</translation> @@ -3898,7 +3896,6 @@ <translation id="3721178866505920080">Maelezo zaidi kuhusu kuwasha upakiaji mapema uliopanuliwa</translation> <translation id="3722108462506185496">Hitilafu imetokea wakati wa kuwasha huduma ya mashine dhahania. Tafadhali jaribu tena baadaye.</translation> <translation id="3722624153992426516">Maagizo ya <ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /> yamepokelewa</translation> -<translation id="3724897774652282549">Jaza fomu</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">Mandhari ya QT</translation> <translation id="3727144509609414201">Mitandao ya WiFi inayopatikana</translation> @@ -4331,7 +4328,6 @@ <translation id="3993887353483242788">Sawazisha <ph name="DEVICE_TYPE" /> yako ili mapendeleo yako yawe tayari kwenye kifaa chochote utakachoingia kwa kutumia Akaunti yako ya Google. Mapendeleo yanajumuisha programu, mipangilio, manenosiri ya Wi-Fi, lugha, mandhari, mikato ya kibodi na zaidi.</translation> <translation id="3994318741694670028">Kwa bahati mbaya, kompyuta yako imewekewa mipangilio na kitambulisho cha maunzi yenye hitilafu. Hali hii huzuia ChromeOS Flex isisasishe marekebisho ya usalama ya hivi karibuni na kompyuta yako <ph name="BEGIN_BOLD" />inaweza kuwa hatarini kutokana na mashambulizi ya hasidi<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Ifungue simu yako na uilete karibu ili ukifungue kifaa chako cha <ph name="DEVICE_TYPE" />.</translation> -<translation id="3994522032746736727">Ingia katika akaunti ukitumia <ph name="EMAIL" /></translation> <translation id="3994530503403062649">Onyesha vitufe kwenye kishikwambi chako</translation> <translation id="3994708120330953242">Baadhi ya manenosiri yako yamepatikana katika tukio la ufichuzi haramu wa data. Ili uimarishe usalama wa akaunti zako, unatakiwa kubadilisha manenosiri haya sasa.</translation> <translation id="3994878504415702912">&Kuza</translation> @@ -6600,7 +6596,6 @@ <translation id="5646994841348250879">Chagua akaunti utakayotumia kuingia katika <ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">Pini ya maikrofoni</translation> <translation id="5648166631817621825">Siku 7 zilizopita</translation> -<translation id="5650537073531199882">Jaza Fomu</translation> <translation id="5651308944918885595">Uwezo wa kutambulika wa kipengele cha Uhamishaji wa Karibu</translation> <translation id="5653154844073528838">Umehifadhi printa <ph name="PRINTER_COUNT" />.</translation> <translation id="5654669866168491665">Pata maelezo zaidi kuhusu tovuti ambazo huenda zisifanye kazi unapozuia vidakuzi vya washirika wengine</translation> @@ -8600,6 +8595,7 @@ <translation id="7113974454301513811">Sasa weka kichupo unachotumia kwenye orodha yako</translation> <translation id="7114054701490058191">Nenosiri halilingani</translation> <translation id="7114648273807173152">Ili utumie Smart Lock kuingia katika Akaunti yako ya Google, nenda kwenye Mipangilio > Vifaa vilivyounganishwa > Simu yako > Smart Lock.</translation> +<translation id="7115051913071512405">Ijaribu</translation> <translation id="7115361495406486998">Hakuna anwani zinazoweza kufikiwa</translation> <translation id="7115731767122970828">Boresha sasa</translation> <translation id="7116554090938189816">Muda wa kutumia cheti cha SSL cha printa umekwisha. Zima kisha uwashe printa na ujaribu tena.</translation>
diff --git a/chrome/app/resources/generated_resources_ta.xtb b/chrome/app/resources/generated_resources_ta.xtb index 8d8c57e..9f010ae 100644 --- a/chrome/app/resources/generated_resources_ta.xtb +++ b/chrome/app/resources/generated_resources_ta.xtb
@@ -667,7 +667,6 @@ <translation id="1464258312790801189">உங்கள் கணக்குகள்</translation> <translation id="1464597059227482327">உங்கள் தொடர்புகளில் இல்லாத Chromebook உடன் பகிர்கிறீர்கள் என்றால் அந்த Chromebookகில் "அருகில் பகிர்தல் தெரிவுநிலை" ஆன் செய்யப்பட்டிருப்பதை உறுதிசெய்துகொள்ளவும். 'அருகில் பகிர்தல் தெரிவுநிலையை' ஆன் செய்ய, கீழ் வலது மூலையில் உள்ள 'அருகில் பகிர்தல் தெரிவுநிலையைத்' தேர்ந்தெடுத்து ஆன் செய்யவும். <ph name="LINK_BEGIN" />மேலும் அறிக<ph name="LINK_END" /></translation> <translation id="1464781208867302907">சாதன விருப்பத்தேர்வுகளைப் பார்க்க அமைப்புகளுக்குச் செல்லுங்கள்.</translation> -<translation id="146481294006497945">சேமித்த கடவுச்சொற்கள் எதுவுமில்லை</translation> <translation id="1465176863081977902">ஆடியோ முகவரியை ந&கலெடு</translation> <translation id="146522654774760805">கடவுச்சொல் & தானாக நிரப்புதல்</translation> <translation id="1465827627707997754">பீட்சா துண்டு</translation> @@ -2178,7 +2177,6 @@ <translation id="2485394160472549611">உங்களுக்கான சிறந்த தேர்வுகள்</translation> <translation id="2485422356828889247">நிறுவல் நீக்கு</translation> <translation id="2485681265915754872">Google Play சேவை விதிமுறைகள்</translation> -<translation id="2486036712620651117">கடவுச்சொற்களும் கடவுச்சாவிகளும்</translation> <translation id="248676429071089168">பக்கத்தைக் கீழே நகர்த்த மேலே ஸ்வைப் செய்யலாம்</translation> <translation id="2487067538648443797">புதிய புத்தகக்குறியைச் சேர்</translation> <translation id="2489686758589235262">மேலும் 2 ஸ்விட்ச்சுகளை ஒதுக்கு</translation> @@ -3901,7 +3899,6 @@ <translation id="3721178866505920080">நீட்டிக்கப்பட்ட முன்கூட்டிய ஏற்றுதல் விருப்பத்தை இயக்குவது குறித்த கூடுதல் தகவல்</translation> <translation id="3722108462506185496">விர்ச்சுவல் மெஷின் சேவையைத் தொடங்கும்போது பிழை ஏற்பட்டது. பிறகு முயலவும்.</translation> <translation id="3722624153992426516"><ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /> வழிமுறை பெறப்பட்டது</translation> -<translation id="3724897774652282549">படிவத்தை நிரப்புங்கள்</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">கிடைக்கக்கூடிய வைஃபை நெட்வொர்க்குகள்</translation> @@ -4334,7 +4331,6 @@ <translation id="3993887353483242788"><ph name="DEVICE_TYPE" /> ஐ ஒத்திசைப்பதால் உங்கள் Google கணக்கின் மூலம் உள்நுழையும் எந்தவொரு சாதனத்திலும் உங்கள் விருப்பத்தேர்வுகள் தயாராக இருக்கும். ஆப்ஸ், வைஃபை கடவுச்சொற்கள், மொழிகள், வால்பேப்பர், கீபோர்டு ஷார்ட்கட்கள் மற்றும் பலவும் விருப்பத்தேர்வுகளில் அடங்கும்.</translation> <translation id="3994318741694670028">எதிர்பாராதவிதமாக, உங்கள் கம்ப்யூட்டர் ஒரு தவறான வன்பொருள் ஐடியுடன் உள்ளமைக்கப்பட்டுள்ளது. இது சமீபத்திய பாதுகாப்புத் திருத்தங்களுடன் ChromeOS Flex புதுப்பிக்கப்படுவதைத் தடுக்கும், மேலும் உங்கள் கம்ப்யூட்டர் <ph name="BEGIN_BOLD" />தீங்கிழைக்கும் தாக்குதல்களின் மூலம் பாதிக்கப்படக்கூடும்<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300"><ph name="DEVICE_TYPE" />ஐ அன்லாக் செய்ய, உங்கள் மொபைலை அன்லாக் செய்து, சாதனத்திற்கு அருகில் எடுத்து வரவும்.</translation> -<translation id="3994522032746736727"><ph name="EMAIL" /> கணக்கில் உள்நுழை</translation> <translation id="3994530503403062649">டேப்லெட்டில் உள்ள பட்டன்களை அமைத்தல்</translation> <translation id="3994708120330953242">உங்களின் சில கடவுச்சொற்கள் தரவு மீறலில் கண்டறியப்பட்டுள்ளன. கணக்குகளைப் பாதுகாக்க இப்போதே கடவுசொற்களை மாற்ற வேண்டும்.</translation> <translation id="3994878504415702912">&பெரிதாக்கு</translation> @@ -6606,7 +6602,6 @@ <translation id="5646994841348250879"><ph name="SITE_ETLD_PLUS_ONE" /> இல் உள்நுழைய ஒரு கணக்கைத் தேர்வுசெய்யுங்கள்</translation> <translation id="5648021990716966815">மைக் ஜாக்</translation> <translation id="5648166631817621825">கடந்த 7 நாட்கள்</translation> -<translation id="5650537073531199882">படிவத்தை நிரப்புங்கள்</translation> <translation id="5651308944918885595">’அருகிலுள்ளவற்றுடன் பகிர்தல்’ அம்சத்தின் கண்டறியத்தக்க நிலை</translation> <translation id="5653154844073528838">உங்களிடம் <ph name="PRINTER_COUNT" /> சேமித்த பிரிண்டர்கள் உள்ளன.</translation> <translation id="5654669866168491665">மூன்றாம் தரப்புக் குக்கீகளைத் தடுக்கும்போது செயல்படாமல் போகக்கூடிய தளங்கள் குறித்து மேலும் தெரிந்துகொள்ளலாம்</translation> @@ -8606,6 +8601,7 @@ <translation id="7113974454301513811">இப்போது தற்போதைய பக்கத்தைப் பட்டியலில் சேர்க்கலாம்</translation> <translation id="7114054701490058191">கடவுச்சொற்கள் பொருந்தவில்லை</translation> <translation id="7114648273807173152">உங்கள் Google கணக்கில் உள்நுழைவதற்கு Smart Lockகைப் பயன்படுத்த, ‘அமைப்புகள்’ > ’இணைக்கப்பட்டுள்ள சாதனங்கள்’ > ’உங்கள் ஃபோன்’ > 'Smart Lock' என்பதற்குச் செல்லவும்.</translation> +<translation id="7115051913071512405">முயற்சிக்கவும்</translation> <translation id="7115361495406486998">தொடர்புகொள்ளக்கூடிய தொடர்புகள் எதுவுமில்லை</translation> <translation id="7115731767122970828">இப்போதே மேம்படுத்து</translation> <translation id="7116554090938189816">பிரிண்டர் SSL சான்றிதழ் காலாவதியாகிவிட்டது. பிரிண்டரை மீண்டும் தொடங்கி முயன்று பார்க்கவும்.</translation>
diff --git a/chrome/app/resources/generated_resources_te.xtb b/chrome/app/resources/generated_resources_te.xtb index 27912f2..1c394833 100644 --- a/chrome/app/resources/generated_resources_te.xtb +++ b/chrome/app/resources/generated_resources_te.xtb
@@ -667,7 +667,6 @@ <translation id="1464258312790801189">మీ ఖాతాలు</translation> <translation id="1464597059227482327">మీరు మీ కాంటాక్ట్లలో లేని Chromebookతో షేర్ చేస్తుంటే, దానిలో సమీప షేరింగ్ విజిబిలిటీ ఫీచర్ ఆన్లో ఉందని నిర్ధారించుకోండి. "సమీప షేరింగ్ విజిబిలిటీ"ని ఆన్ చేయడానికి, దిగువున కుడి మూలను ఎంచుకుని, ఆపై "సమీప విజిబిలిటీ"ని ఆన్ చేయడానికి ఆప్షన్ను ఎంచుకోండి. <ph name="LINK_BEGIN" />మరింత తెలుసుకోండి<ph name="LINK_END" /></translation> <translation id="1464781208867302907">పరికర ప్రాధాన్యతల కోసం, సెట్టింగ్లకు వెళ్లండి.</translation> -<translation id="146481294006497945">సేవ్ చేసిన పాస్వర్డ్లు ఏవీ లేవు</translation> <translation id="1465176863081977902">ఆడియో అడ్రస్ను కా&పీ చేయండి</translation> <translation id="146522654774760805">పాస్వర్డ్లు, ఆటోఫిల్</translation> <translation id="1465827627707997754">పిజ్జా ముక్క</translation> @@ -2176,7 +2175,6 @@ <translation id="2485394160472549611">మీ కోసం ఉత్తమంగా ఎంపిక చేసినవి</translation> <translation id="2485422356828889247">అన్ఇన్స్టాల్ చేయి</translation> <translation id="2485681265915754872">Google Play సర్వీస్ నియమాలు</translation> -<translation id="2486036712620651117">పాస్వర్డ్లు, పాస్-కీలు</translation> <translation id="248676429071089168">పైకి స్వైప్ చేసి, పేజీని కిందికి తరలించండి</translation> <translation id="2487067538648443797">కొత్త బుక్మార్క్ను జోడించండి</translation> <translation id="2489686758589235262">మరో 2 స్విచ్లను అసైన్ చేయండి</translation> @@ -3899,7 +3897,6 @@ <translation id="3721178866505920080">పొడిగించిన ప్రీలోడింగ్ను ఆన్ చేయడం గురించి మరింత సమాచారం</translation> <translation id="3722108462506185496">వర్చువల్ మెషిన్ సేవను ప్రారంభించడంలో ఎర్రర్ ఏర్పడింది. దయచేసి మళ్లీ ట్రై చేయండి.</translation> <translation id="3722624153992426516"><ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /> సూచన అందింది</translation> -<translation id="3724897774652282549">ఫారమ్ను పూరించండి</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">అందుబాటులో ఉన్న Wi-Fi నెట్వర్క్లు</translation> @@ -4332,7 +4329,6 @@ <translation id="3993887353483242788">మీ <ph name="DEVICE_TYPE" />ను సింక్ చేయండి, తద్వారా మీరు మీ Google ఖాతాతో సైన్ ఇన్ చేసినప్పుడు ఏ పరికరంలోనైనా మీ ప్రాధాన్యతలు సిద్ధంగా ఉంటాయి. ప్రాధాన్యతలలో యాప్లు, సెట్టింగ్లు, Wi-Fi పాస్వర్డ్లు, భాషలు, వాల్పేపర్, కీబోర్డ్ షార్ట్కట్లు, మరిన్ని ఉంటాయి.</translation> <translation id="3994318741694670028">దురదృష్టవశాత్తూ, తప్పుగా ఫార్మాట్ చేయబడిన హార్డ్వేర్ IDతో మీ కంప్యూటర్ కాన్ఫిగర్ చేయబడింది. ఇది సెక్యూరిటీ పరిష్కారాలతో అప్డేట్ కాకుండా ChromeOS Flexను నిరోధిస్తుంది, అలాగే మీ కంప్యూటర్ <ph name="BEGIN_BOLD" />హానికరమైన దాడులకు గురి కావచ్చు<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">మీ <ph name="DEVICE_TYPE" />ను అన్లాక్ చేయడానికి, మీ ఫోన్ను అన్లాక్ చేసి దానిని దగ్గరికి తీసుకురండి.</translation> -<translation id="3994522032746736727"><ph name="EMAIL" />గా సైన్ ఇన్ చేయండి</translation> <translation id="3994530503403062649">మీ టాబ్లెట్లో బటన్లను గుర్తించండి</translation> <translation id="3994708120330953242">మీ పాస్వర్డ్లలో కొన్ని డేటా ఉల్లంఘనలో కనుగొనబడ్డాయి. మీ ఖాతాల రక్షణకు ఇప్పుడే ఈ పాస్వర్డ్లను మార్చండి.</translation> <translation id="3994878504415702912">&జూమ్ చేయి</translation> @@ -6602,7 +6598,6 @@ <translation id="5646994841348250879"><ph name="SITE_ETLD_PLUS_ONE" />కు సైన్ ఇన్ చేయడానికి ఖాతాను ఎంచుకోండి</translation> <translation id="5648021990716966815">మైక్ జాక్</translation> <translation id="5648166631817621825">గత 7 రోజులు</translation> -<translation id="5650537073531199882">ఫారమ్ను పూరించండి</translation> <translation id="5651308944918885595">సమీప షేరింగ్ కనిపించగలిగే సామర్థ్యం</translation> <translation id="5653154844073528838">మీరు సేవ్ చేయబడిన <ph name="PRINTER_COUNT" /> ప్రింటర్లు కలిగి ఉన్నారు.</translation> <translation id="5654669866168491665">థర్డ్-పార్టీ కుక్కీలను బ్లాక్ చేసేటప్పుడు కొన్ని సైట్లు పని చేయకపోవచ్చు, అలాంటి సైట్ల గురించి మరింత తెలుసుకోండి</translation> @@ -8602,6 +8597,7 @@ <translation id="7113974454301513811">ఇప్పుడు మీ లిస్ట్కు ప్రస్తుత ట్యాబ్ను జోడించండి</translation> <translation id="7114054701490058191">పాస్వర్డ్లు సరిపోలలేదు</translation> <translation id="7114648273807173152">మీ Google ఖాతాకు సైన్ ఇన్ చేయడం కోసం Smart Lockని ఉపయోగించడానికి, సెట్టింగ్లు > కనెక్ట్ చేసిన పరికరాలు > మీ ఫోన్ > Smart Lockకు వెళ్లండి.</translation> +<translation id="7115051913071512405">దీన్ని ప్రయత్నించు</translation> <translation id="7115361495406486998">అందుబాటులో కాంటాక్ట్లు ఏవీ లేవు</translation> <translation id="7115731767122970828">ఇప్పుడే బూస్ట్ చేయండి</translation> <translation id="7116554090938189816">ప్రింటర్ SSL సర్టిఫికెట్ గడువు ముగిసింది. ప్రింటర్ను రీస్టార్ట్ చేసి, మళ్లీ ట్రై చేయండి.</translation>
diff --git a/chrome/app/resources/generated_resources_th.xtb b/chrome/app/resources/generated_resources_th.xtb index 9a0f15c22..ce32b49 100644 --- a/chrome/app/resources/generated_resources_th.xtb +++ b/chrome/app/resources/generated_resources_th.xtb
@@ -666,7 +666,6 @@ <translation id="1464258312790801189">บัญชีของคุณ</translation> <translation id="1464597059227482327">หากจะแชร์กับ Chromebook ที่ไม่ได้อยู่ในรายชื่อติดต่อของคุณ ให้ตรวจสอบว่า Chromebook เปิด "การมองเห็นใกล้เคียง" อยู่ หากต้องการเปิด "การมองเห็นใกล้เคียง" ให้เลือกมุมขวาล่าง แล้วเลือกเพื่อเปิด "การมองเห็นใกล้เคียง" <ph name="LINK_BEGIN" />ดูข้อมูลเพิ่มเติม<ph name="LINK_END" /></translation> <translation id="1464781208867302907">ไปที่การตั้งค่าเพื่อตั้งค่ากำหนดของอุปกรณ์</translation> -<translation id="146481294006497945">ไม่มีรหัสผ่านที่บันทึกไว้</translation> <translation id="1465176863081977902">คัด&ลอกที่อยู่เสียง</translation> <translation id="146522654774760805">รหัสผ่านและป้อนข้อความอัตโนมัติ</translation> <translation id="1465827627707997754">พิซซ่า 1 ชิ้น</translation> @@ -2165,7 +2164,6 @@ <translation id="2485394160472549611">คัดสรรมาเพื่อคุณ</translation> <translation id="2485422356828889247">ถอนการติดตั้ง</translation> <translation id="2485681265915754872">ข้อกำหนดในการให้บริการของ Google Play</translation> -<translation id="2486036712620651117">รหัสผ่านและพาสคีย์</translation> <translation id="248676429071089168">ปัดขึ้นเพื่อเลื่อนหน้าลง</translation> <translation id="2487067538648443797">เพิ่มบุ๊กมาร์กใหม่</translation> <translation id="2489686758589235262">กำหนดสวิตช์เพิ่มอีก 2 อัน</translation> @@ -3886,7 +3884,6 @@ <translation id="3721178866505920080">ข้อมูลเพิ่มเติมเกี่ยวกับการโหลดล่วงหน้าที่เพิ่มขึ้น</translation> <translation id="3722108462506185496">เกิดข้อผิดพลาดขณะเริ่มบริการเครื่องเสมือน โปรดลองอีกครั้ง</translation> <translation id="3722624153992426516">ได้รับคำสั่ง <ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /> รายการแล้ว</translation> -<translation id="3724897774652282549">กรอกแบบฟอร์ม</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">เครือข่าย Wi-Fi ที่พร้อมใช้งาน</translation> @@ -4319,7 +4316,6 @@ <translation id="3993887353483242788">ซิงค์ <ph name="DEVICE_TYPE" /> เพื่อให้ค่ากำหนดพร้อมใช้งานในอุปกรณ์ทุกเครื่องเมื่อลงชื่อเข้าใช้ด้วยบัญชี Google ค่ากำหนดรวมถึงแอป, การตั้งค่า, รหัสผ่าน Wi-Fi, ภาษา, วอลเปเปอร์, แป้นพิมพ์ลัด และอื่นๆ</translation> <translation id="3994318741694670028">ขออภัย คอมพิวเตอร์ของคุณกำหนดค่าด้วยรหัสฮาร์ดแวร์ที่มีรูปแบบไม่ถูกต้อง ซึ่งทำให้ Chrome OS Flex อัปเดตการแก้ไขปัญหาความปลอดภัยล่าสุดไม่ได้ และคอมพิวเตอร์<ph name="BEGIN_BOLD" />อาจเสี่ยงต่อการโจมตีที่เป็นอันตราย<ph name="END_BOLD" /></translation> <translation id="3994374631886003300">ปลดล็อกโทรศัพท์และนำเข้ามาใกล้ๆ เพื่อปลดล็อก <ph name="DEVICE_TYPE" /></translation> -<translation id="3994522032746736727">ลงชื่อเข้าใช้ด้วย <ph name="EMAIL" /></translation> <translation id="3994530503403062649">ค้นหาปุ่มบนแท็บเล็ต</translation> <translation id="3994708120330953242">พบรหัสผ่านบางรายการของคุณในการละเมิดข้อมูล คุณควรเปลี่ยนรหัสผ่านเหล่านี้ทันทีเพื่อรักษาบัญชีให้ปลอดภัย</translation> <translation id="3994878504415702912">ซู&ม</translation> @@ -6586,7 +6582,6 @@ <translation id="5646994841348250879">เลือกบัญชีที่จะลงชื่อเข้าใช้ <ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">ช่องเสียบไมโครโฟน</translation> <translation id="5648166631817621825">7 วันที่แล้ว</translation> -<translation id="5650537073531199882">กรอกแบบฟอร์ม</translation> <translation id="5651308944918885595">การค้นพบได้ของการแชร์ใกล้เคียง</translation> <translation id="5653154844073528838">คุณมีเครื่องพิมพ์ที่บันทึกไว้ <ph name="PRINTER_COUNT" /> เครื่อง</translation> <translation id="5654669866168491665">ดูข้อมูลเพิ่มเติมเกี่ยวกับเว็บไซต์ที่อาจใช้งานไม่ได้เมื่อบล็อกคุกกี้ของบุคคลที่สาม</translation> @@ -8585,6 +8580,7 @@ <translation id="7113974454301513811">เพิ่มแท็บปัจจุบันลงในรายการ</translation> <translation id="7114054701490058191">รหัสผ่านไม่ตรงกัน</translation> <translation id="7114648273807173152">หากต้องการใช้ Smart Lock ในการลงชื่อเข้าใช้ Google ให้ไปที่การตั้งค่า > อุปกรณ์ที่เชื่อมต่อ > โทรศัพท์ของคุณ > Smart Lock</translation> +<translation id="7115051913071512405">ลองใช้งาน</translation> <translation id="7115361495406486998">ไม่มีรายชื่อติดต่อที่ติดต่อได้</translation> <translation id="7115731767122970828">เพิ่มประสิทธิภาพเลย</translation> <translation id="7116554090938189816">ใบรับรอง SSL ของเครื่องพิมพ์หมดอายุแล้ว รีสตาร์ทเครื่องพิมพ์แล้วลองอีกครั้ง</translation>
diff --git a/chrome/app/resources/generated_resources_tr.xtb b/chrome/app/resources/generated_resources_tr.xtb index 5872530c..25e48759c 100644 --- a/chrome/app/resources/generated_resources_tr.xtb +++ b/chrome/app/resources/generated_resources_tr.xtb
@@ -666,7 +666,6 @@ <translation id="1464258312790801189">Hesaplarınız</translation> <translation id="1464597059227482327">Kişi listenizde yer almayan bir Chromebook ile paylaşımda bulunuyorsanız Chromebook'ta "Yakındakiler görünürlüğü"nün etkinleştirildiğinden emin olun. "Yakındakiler görünürlüğü"nü etkinleştirmek için sağ alt köşeyi ve ardından "Yakındakiler görünürlüğü"nü etkinleştirmeyi seçin. <ph name="LINK_BEGIN" />Daha fazla bilgi<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Cihaz tercihleri için Ayarlar'a gidin.</translation> -<translation id="146481294006497945">Kaydedilen şifre yok</translation> <translation id="1465176863081977902">Ses Adresini K&opyala</translation> <translation id="146522654774760805">Şifreler ve otomatik doldurma</translation> <translation id="1465827627707997754">Pizza dilimi</translation> @@ -2163,7 +2162,6 @@ <translation id="2485394160472549611">Sizin için seçtiklerimiz</translation> <translation id="2485422356828889247">Kaldır</translation> <translation id="2485681265915754872">Google Play hizmet şartları</translation> -<translation id="2486036712620651117">Şifreler ve geçiş anahtarları</translation> <translation id="248676429071089168">Sayfayı aşağı taşımak için yukarı kaydırın</translation> <translation id="2487067538648443797">Yeni yer işareti ekle</translation> <translation id="2489686758589235262">2 anahtar daha ata</translation> @@ -3884,7 +3882,6 @@ <translation id="3721178866505920080">Genişletilmiş önceden yüklemeyi etkinleştirme hakkında daha fazla bilgi</translation> <translation id="3722108462506185496">Sanal makine hizmeti başlatılırken hata oluştu. Lütfen tekrar deneyin.</translation> <translation id="3722624153992426516"><ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /> talimatı alındı</translation> -<translation id="3724897774652282549">Formu doldurun</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Kullanılabilir kablosuz ağlar</translation> @@ -4317,7 +4314,6 @@ <translation id="3993887353483242788"><ph name="DEVICE_TYPE" /> cihazınızı senkronize ederseniz Google Hesabınızla oturum açtığınızda tercihleriniz tüm cihazlarda hazır olur. Uygulamalar, ayarlar, kablosuz ağ şifreleri, diller, duvar kağıdı, klavye kısayolları ve daha fazlası bu tercihlere dahildir.</translation> <translation id="3994318741694670028">Maalesef bilgisayarınız, hatalı oluşturulmuş bir donanım kimliğiyle yapılandırılmış. Bu durum ChromeOS Flex'in en son güvenlik düzeltmeleriyle güncellenmesini engeller ve bilgisayarınız <ph name="BEGIN_BOLD" />kötü niyetli saldırılara<ph name="END_BOLD" /> açık duruma gelebilir.</translation> <translation id="3994374631886003300"><ph name="DEVICE_TYPE" /> cihazınızın kilidini açmak için telefonunuzun kilidini açın ve cihaza yaklaştırın.</translation> -<translation id="3994522032746736727"><ph name="EMAIL" /> olarak oturum aç</translation> <translation id="3994530503403062649">Tabletinizdeki düğmeleri bulun</translation> <translation id="3994708120330953242">Şifrelerinizden bazıları veri ihlaline karıştı. Hesaplarınızın güvenliğini sağlamak için bu şifreleri hemen değiştirmelisiniz.</translation> <translation id="3994878504415702912">Y&aklaştır</translation> @@ -6588,7 +6584,6 @@ <translation id="5646994841348250879">"<ph name="SITE_ETLD_PLUS_ONE" />" uygulamasında oturum açmak için bir hesap seçin</translation> <translation id="5648021990716966815">Mikrofon jakı</translation> <translation id="5648166631817621825">Son 7 gün</translation> -<translation id="5650537073531199882">Formu doldurun</translation> <translation id="5651308944918885595">Yakındakilerle Paylaş bulunabilirliği</translation> <translation id="5653154844073528838">Kaydedilmiş <ph name="PRINTER_COUNT" /> yazıcınız var.</translation> <translation id="5654669866168491665">Üçüncü taraf çerezlerini engellediğinizde çalışmayabilecek siteler hakkında daha fazla bilgi</translation> @@ -8588,6 +8583,7 @@ <translation id="7113974454301513811">Şimdi de mevcut sekmeyi listenize ekleyin</translation> <translation id="7114054701490058191">Şifreler eşleşmiyor</translation> <translation id="7114648273807173152">Smart Lock'ı kullanarak Google Hesabınızda oturum açmak için Ayarlar > Bağlı cihazlar > Telefonunuz > Smart Lock bölümüne gidin.</translation> +<translation id="7115051913071512405">Dene</translation> <translation id="7115361495406486998">Ulaşılabilir kişi yok</translation> <translation id="7115731767122970828">Hemen artır</translation> <translation id="7116554090938189816">Yazıcı SSL sertifikasının süresi doldu. Yazıcıyı yeniden başlatıp tekrar deneyin.</translation>
diff --git a/chrome/app/resources/generated_resources_uk.xtb b/chrome/app/resources/generated_resources_uk.xtb index d5c89eb..9eca967 100644 --- a/chrome/app/resources/generated_resources_uk.xtb +++ b/chrome/app/resources/generated_resources_uk.xtb
@@ -670,7 +670,6 @@ <translation id="1464258312790801189">Ваші облікові записи</translation> <translation id="1464597059227482327">Якщо ви хочете надіслати файли на комп’ютер Chromebook, якого немає в списку ваших контактів, у правому нижньому куті цього комп’ютера ввімкніть опцію "Видимість поблизу". <ph name="LINK_BEGIN" />Докладніше<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Щоб перейти до параметрів пристрою, відкрийте налаштування.</translation> -<translation id="146481294006497945">Немає збережених паролів</translation> <translation id="1465176863081977902">Копіювати адресу аудіо</translation> <translation id="146522654774760805">Паролі й автозаповнення</translation> <translation id="1465827627707997754">Шматок піци</translation> @@ -2181,7 +2180,6 @@ <translation id="2485394160472549611">Найкращі рекомендації для вас</translation> <translation id="2485422356828889247">Видалити</translation> <translation id="2485681265915754872">Умови використання Google Play</translation> -<translation id="2486036712620651117">Паролі й ключі доступу</translation> <translation id="248676429071089168">Проведіть пальцем угору, щоб прокрутити сторінку вниз</translation> <translation id="2487067538648443797">Додати нову закладку</translation> <translation id="2489686758589235262">Призначити ще 2 перемикачі</translation> @@ -3904,7 +3902,6 @@ <translation id="3721178866505920080">Докладніше про те, як увімкнути розширене попереднє завантаження</translation> <translation id="3722108462506185496">Не вдалося запустити віртуальну машину. Спробуйте пізніше.</translation> <translation id="3722624153992426516">Отримано вказівку "<ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" />"</translation> -<translation id="3724897774652282549">Заповнити форму</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Доступні мережі Wi-Fi</translation> @@ -4337,7 +4334,6 @@ <translation id="3993887353483242788">Синхронізуйте свій <ph name="DEVICE_TYPE" />, щоб параметри (такі як додатки, налаштування, паролі Wi-Fi, мови, комбінації клавіш тощо) починали діяти на будь-якому пристрої, коли ви ввійдете в обліковий запис Google.</translation> <translation id="3994318741694670028">На жаль, ваш комп’ютер налаштовано за допомогою ідентифікатора апаратного забезпечення з неправильною структурою. Через це в ОС Chrome Flex не вдається встановити найновіші виправлення системи безпеки, а тому ваш комп’ютер <ph name="BEGIN_BOLD" />може бути вразливим до атак<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Щоб розблокувати пристрій <ph name="DEVICE_TYPE" />, розблокуйте свій телефон і розташуйте його ближче до пристрою.</translation> -<translation id="3994522032746736727">Увійти як <ph name="EMAIL" /></translation> <translation id="3994530503403062649">Знайдіть кнопки на планшеті</translation> <translation id="3994708120330953242">Деякі ваші паролі було розкрито через порушення безпеки даних. Щоб захистити свої облікові записи, потрібно негайно змінити зламані паролі.</translation> <translation id="3994878504415702912">&Масштаб</translation> @@ -6604,7 +6600,6 @@ <translation id="5646994841348250879">Виберіть, через який обліковий запис увійти в додаток <ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">Гніздо для мікрофона</translation> <translation id="5648166631817621825">Останні 7 днів</translation> -<translation id="5650537073531199882">Заповнити форму</translation> <translation id="5651308944918885595">Видимість для функції "Передавання поблизу"</translation> <translation id="5653154844073528838">Збережених принтерів: <ph name="PRINTER_COUNT" />.</translation> <translation id="5654669866168491665">Докладніше про сайти, які можуть не працювати, коли блокуються сторонні файли cookie</translation> @@ -8609,6 +8604,7 @@ <translation id="7113974454301513811">Тепер додайте поточну вкладку в список</translation> <translation id="7114054701490058191">Паролі не збігаються</translation> <translation id="7114648273807173152">Щоб увійти в обліковий запис Google за допомогою Smart Lock, перейдіть у меню "Налаштування" > "Підключені пристрої" > "Телефон" > "Smart Lock".</translation> +<translation id="7115051913071512405">Спробувати</translation> <translation id="7115361495406486998">Немає доступних контактів</translation> <translation id="7115731767122970828">Підвищити</translation> <translation id="7116554090938189816">Строк дії сертифіката SSL принтера минув. Перезапустіть принтер і повторіть спробу.</translation>
diff --git a/chrome/app/resources/generated_resources_ur.xtb b/chrome/app/resources/generated_resources_ur.xtb index dd6e46f..3a5de64d 100644 --- a/chrome/app/resources/generated_resources_ur.xtb +++ b/chrome/app/resources/generated_resources_ur.xtb
@@ -666,7 +666,6 @@ <translation id="1464258312790801189">آپ کے اکاؤنٹس</translation> <translation id="1464597059227482327">اگر آپ کسی Chromebook کے ساتھ اشتراک کر رہے ہیں جو آپ کے رابطوں میں نہیں ہے تو یقینی بنائیں کہ Chromebook میں "قریبی مرئیت" آن ہے۔ "قریبی مرئیت" کو آن کرنے کے لیے، نیچے دائیں کونے کو منتخب کریں اور پھر "قریبی مرئیت" کو آن کرنے کے لیے منتخب کریں۔ <ph name="LINK_BEGIN" />مزید جانیں<ph name="LINK_END" /></translation> <translation id="1464781208867302907">آلہ کی ترجیحات کے لیے، ترتیبات میں جائیں۔</translation> -<translation id="146481294006497945">کوئی محفوظ کردہ پاس ورڈز نہیں</translation> <translation id="1465176863081977902">آڈیو پتہ کا&پی کریں</translation> <translation id="146522654774760805">پاس ورڈز اور آٹو فل</translation> <translation id="1465827627707997754">پزّا سلائس</translation> @@ -2167,7 +2166,6 @@ <translation id="2485394160472549611">آپ کے لیے سرفہرست انتخابات</translation> <translation id="2485422356828889247">ان انسٹال کریں</translation> <translation id="2485681265915754872">Google Play سروس کی شرائط</translation> -<translation id="2486036712620651117">پاس ورڈز اور پاس کیز</translation> <translation id="248676429071089168">صفحہ کو نیچے لے جانے کے لیے اوپر سوائپ کریں</translation> <translation id="2487067538648443797">نیا بُک مارک شامل کریں</translation> <translation id="2489686758589235262">2 مزید سوئچز تفویض کریں</translation> @@ -3888,7 +3886,6 @@ <translation id="3721178866505920080">توسیع شدہ پیشگی لوڈنگ کو آن کرنے کے بارے میں مزید معلومات</translation> <translation id="3722108462506185496">ورچوئل مشین سروس شروع کرنے میں خرابی پیش آ گئی ہے۔ براہ کرم دوبارہ کوشش کریں۔</translation> <translation id="3722624153992426516"><ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /> کی ہدایت موصول ہو گئی</translation> -<translation id="3724897774652282549">فارم پُر کریں</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">دستیاب WiFi نیٹ ورکس</translation> @@ -4321,7 +4318,6 @@ <translation id="3993887353483242788">اپنے <ph name="DEVICE_TYPE" /> کو مطابقت پذیر بنائیں تاکہ جب آپ اپنے Google اکاؤنٹ سے سائن ان کریں تو آپ کی ترجیحات کسی بھی آلہ پر تیار ہوں گی۔ ترجیحات میں ایپس، ترتیبات، Wi-Fi پاس ورڈز، زبانیں، وال پیپر، کی بورڈ شارٹ کٹس وغیرہ شامل ہیں۔</translation> <translation id="3994318741694670028">بدقسمتی سے، آپ کا کمپیوٹر خراب ہارڈ ویئر ID کے ساتھ کنفیگر کیا ہوا ہے۔ یہ ChromeOS Flex کو تازہ ترین سیکیورٹی اصلاحات کے ساتھ اپ ڈیٹ ہونے سے روکتا ہے اور آپ کے کمپیوٹر کو <ph name="BEGIN_BOLD" />نقصان دہ حملوں سے خطرہ ہو سکتا ہے<ph name="END_BOLD" />۔</translation> <translation id="3994374631886003300">اپنا فون غیر مقفل کریں اور اپنا <ph name="DEVICE_TYPE" /> غیر مقفل کرنے کیلئے اسے قریب کریں۔</translation> -<translation id="3994522032746736727"><ph name="EMAIL" /> کے بطور سائن ان کریں</translation> <translation id="3994530503403062649">اپنے ٹیبلیٹ پر بٹنز تلاش کریں</translation> <translation id="3994708120330953242">آپ کے کچھ پاس ورڈز ڈیٹا کی خلاف ورزی میں پائے گئے۔ اپنے اکاؤنٹس کو محفوظ کرنے کیلئے، آپ کو ان پاس ورڈز کو ابھی تبدیل کرنا چاہیے۔</translation> <translation id="3994878504415702912">&زوم</translation> @@ -6589,7 +6585,6 @@ <translation id="5646994841348250879"><ph name="SITE_ETLD_PLUS_ONE" /> میں سائن ان کرنے کے لیے کسی اکاؤنٹ کا انتخاب کریں</translation> <translation id="5648021990716966815">مائیک جیک</translation> <translation id="5648166631817621825">آخری 7 دن</translation> -<translation id="5650537073531199882">فارم پُر کریں</translation> <translation id="5651308944918885595">قریبی آلات کے ساتھ اشتراک کی قابل دریافتگی</translation> <translation id="5653154844073528838">آپ کے پاس <ph name="PRINTER_COUNT" /> محفوظ کردہ پرنٹرز ہیں۔</translation> <translation id="5654669866168491665">ان سائٹس کے بارے میں مزید جانیں جو ہو سکتا ہے کہ فریق ثالث کوکیز کو مسدود کرتے وقت کام نہ کریں</translation> @@ -8588,6 +8583,7 @@ <translation id="7113974454301513811">اب موجودہ ٹیب کو اپنی فہرست میں شامل کریں</translation> <translation id="7114054701490058191">پاس ورڈز مماثل نہیں ہیں</translation> <translation id="7114648273807173152">اپنے Google اکاؤنٹ میں سائن ان کرنے کی خاطر Smart Lock استعمال کرنے کیلئے، ترتیبات > منسلک کردہ آلات > اپنے فون > Smart Lock پر جائیں۔</translation> +<translation id="7115051913071512405">اسے آزمائیں</translation> <translation id="7115361495406486998">کوئی قابل رسائی رابطہ نہیں</translation> <translation id="7115731767122970828">ابھی بوسٹ کریں</translation> <translation id="7116554090938189816">پرنٹر SSL سرٹیفکیٹ کی میعاد ختم ہو گئی ہے۔ پرنٹر ری اسٹارٹ کریں اور دوبارہ کوشش کریں۔</translation>
diff --git a/chrome/app/resources/generated_resources_uz.xtb b/chrome/app/resources/generated_resources_uz.xtb index a17a005d..876d1853 100644 --- a/chrome/app/resources/generated_resources_uz.xtb +++ b/chrome/app/resources/generated_resources_uz.xtb
@@ -667,7 +667,6 @@ <translation id="1464258312790801189">Hisoblar</translation> <translation id="1464597059227482327">Agar kontaktlardan tashqari Chromebook qurilmasiga fayl yuborsangiz, unda Atrofga ochish yuborish funksiyasi yoniqligini tekshiring. “Atrofga ochish” sozlamasini yoqish uchun ekran quyi oʻng chekkasini bosib, “Atrofga ochish” ustiga bosing. <ph name="LINK_BEGIN" />Batafsil<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Qurilma parametrlari Sozlamalar orqali boshqariladi.</translation> -<translation id="146481294006497945">Hech qanday parol saqlanmagan</translation> <translation id="1465176863081977902">Audioning URL manzilini nusxalash</translation> <translation id="146522654774760805">Parollar va avtomatik kiritish</translation> <translation id="1465827627707997754">Pitsa bo‘lagi</translation> @@ -2167,7 +2166,6 @@ <translation id="2485394160472549611">Siz uchun saralanganlar</translation> <translation id="2485422356828889247">O‘chirib tashlash</translation> <translation id="2485681265915754872">Google Play xizmat shartlari</translation> -<translation id="2486036712620651117">Parollar va kodlar</translation> <translation id="248676429071089168">Sahifani pastga varaqlash uchun tepaga suring</translation> <translation id="2487067538648443797">Yangi xatcho‘p qo‘shish</translation> <translation id="2489686758589235262">Yana 2 ta kalit tugma tayinlash</translation> @@ -3888,7 +3886,6 @@ <translation id="3721178866505920080">Kengaytirilgan oldindan yuklashni yoqish haqida batafsil</translation> <translation id="3722108462506185496">Virtual mashina xizmati ishga tushmadi. Qaytadan urining.</translation> <translation id="3722624153992426516"><ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /> koʻrsatmasi qabul qilindi</translation> -<translation id="3724897774652282549">Shaklni toʻldirish</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Mavjud WiFi tarmoqlar</translation> @@ -4321,7 +4318,6 @@ <translation id="3993887353483242788"><ph name="DEVICE_TYPE" /> qurilmangiz sinxronlansa, parametrlaringiz Google hisobingizdan kiritilgan barcha qurilmalaringizga ishlaydi. Bu parametrlarga ilovalar, sozlamalar, Wi-Fi parollar, tillar, fon rasmi, klaviatura sozlamalari va boshqa axborotlar kiradi.</translation> <translation id="3994318741694670028">Kompyuteringiz apparat identifikatori xato sozlangan. Buning natijasida ChromeOS Flex xavfsizlikka oid eng oxirgi tuzatishlar bilan yangilanmaydi va kompyuteringiz <ph name="BEGIN_BOLD" />zararli hujumlardan himoyalanmasligi mumkin<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Telefoningizni qulfdan chiqaring va uni <ph name="DEVICE_TYPE" /> qurilmasiga yaqinlashtiring.</translation> -<translation id="3994522032746736727"><ph name="EMAIL" /> nomidan kirish</translation> <translation id="3994530503403062649">Planshet tugmalarini tayinlash</translation> <translation id="3994708120330953242">Ayrim parollaringiz sizib chiqarilgan axborotlari ichidan topildi. Hisoblaringizni himoyalash uchun ushbu parollarni hoziroq almashtirishingiz kerak.</translation> <translation id="3994878504415702912">&Matn o‘lchami</translation> @@ -6592,7 +6588,6 @@ <translation id="5646994841348250879"><ph name="SITE_ETLD_PLUS_ONE" /> saytiga kirish uchun hisobni tanlang</translation> <translation id="5648021990716966815">Mikrofon teshigi</translation> <translation id="5648166631817621825">Oxirgi 7 kun</translation> -<translation id="5650537073531199882">Shaklni toʻldirish</translation> <translation id="5651308944918885595">Nearby Share ochiqligi</translation> <translation id="5653154844073528838"><ph name="PRINTER_COUNT" /> ta printer saqlangan.</translation> <translation id="5654669866168491665">Begona cookie-fayllarini bloklaganda ishlamasligi mumkin boʻlgan saytlar haqida batafsil</translation> @@ -8591,6 +8586,7 @@ <translation id="7113974454301513811">Endi roʻyxatingizga joriy varaqni kiriting</translation> <translation id="7114054701490058191">Parollar bir-biriga mos kelmadi</translation> <translation id="7114648273807173152">Google hisobingizda Smart Lock himoyasini yoqish uchun Sozlamalar > Ulangan qurilmalar > Telefoningiz > Smart Lock sahifasini oching.</translation> +<translation id="7115051913071512405">Sinab ko‘rish</translation> <translation id="7115361495406486998">Hech qanday kontakt atrofda emas</translation> <translation id="7115731767122970828">Kuchaytirish</translation> <translation id="7116554090938189816">Printerning SSL sertifikati muddati tugagan. Printerni qayta ishga tushiring va yana urining.</translation> @@ -8622,6 +8618,7 @@ <translation id="7134951043985383439">Xavfli fayl yuklab olindi</translation> <translation id="7135729336746831607">Bluetooth yoqilsinmi?</translation> <translation id="7136694880210472378">Birlamchi bo‘lsin</translation> +<translation id="7137277889990479760"><ph name="EMAIL" /> sifatida davom etish</translation> <translation id="7137771508221868414">Oʻrnatilgan ilovalar va saytlar saqlagan <ph name="TOTAL_USAGE" /> maʼlumot oʻchirib tashlanadi</translation> <translation id="7138678301420049075">Boshqa</translation> <translation id="7139627972753429585"><ph name="APP_NAME" /> mikrofoningizni ishlatmoqda</translation> @@ -9200,6 +9197,7 @@ <translation id="7561196759112975576">Har doim</translation> <translation id="7561759921596375678">Tovushni yoqish</translation> <translation id="7561982940498449837">Menyuni yopish</translation> +<translation id="7563970324931922582">[placeholder text]</translation> <translation id="756445078718366910">Brauzer oynasini ochish</translation> <translation id="7564847347806291057">Jarayonni yakunlash</translation> <translation id="756503097602602175">Google hisoblarini <ph name="LINK_BEGIN" />Sozlamalar<ph name="LINK_END" /> orqali boshqarishingiz mumkin. Sayt va ilovalarga berilgan ruxsatlar barcha hisoblarga tatbiq etiladi. Sayt va ilovalarni hisob axborotingizga kirishini istamasangiz, <ph name="DEVICE_TYPE" /> qurilmangizga mehmon sifatida kiring yoki internetda <ph name="LINK_2_BEGIN" />inkognito oynasida<ph name="LINK_2_END" /> ishlang.</translation> @@ -10890,6 +10888,7 @@ <translation id="8737966899544698733">Joylashuv aniqligi (faqat Android uchun)</translation> <translation id="8738418093147087440">Mamlakat, til yoki kiritilgan nom asosida qidirish</translation> <translation id="8740086188450289493">Google hisobi parolini kiriting</translation> +<translation id="874023689350909633">Sinab koʻring</translation> <translation id="8740247629089392745">Endi Chromebookni farzandingizga (<ph name="SUPERVISED_USER_NAME" />) bering. Sozlash yakuniga biroz qoldi, keyin foydalanish mumkin.</translation> <translation id="8740672167979365981">ChromeOS Flex yangilanishi zarur</translation> <translation id="8741944563400125534">Switch Access xizmatini sozlash ustasi</translation>
diff --git a/chrome/app/resources/generated_resources_vi.xtb b/chrome/app/resources/generated_resources_vi.xtb index 51c890a..953db50 100644 --- a/chrome/app/resources/generated_resources_vi.xtb +++ b/chrome/app/resources/generated_resources_vi.xtb
@@ -667,7 +667,6 @@ <translation id="1464258312790801189">Tài khoản của bạn</translation> <translation id="1464597059227482327">Nếu bạn chia sẻ với một Chromebook không có trong danh bạ, hãy đảm bảo Chromebook đó đã bật "Chế độ hiển thị lân cận". Để bật "Chế độ hiển thị lân cận", hãy chọn góc dưới cùng bên phải, rồi chọn bật "Chế độ hiển thị lân cận". <ph name="LINK_BEGIN" />Tìm hiểu thêm<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Để xem các tùy chọn của thiết bị, hãy chuyển đến phần Cài đặt.</translation> -<translation id="146481294006497945">Bạn chưa lưu mật khẩu nào</translation> <translation id="1465176863081977902">S&ao chép địa chỉ âm thanh</translation> <translation id="146522654774760805">Mật khẩu và tự động điền</translation> <translation id="1465827627707997754">Lát pizza</translation> @@ -2178,7 +2177,6 @@ <translation id="2485394160472549611">Nội dung hay nhất chọn lọc riêng cho bạn</translation> <translation id="2485422356828889247">Gỡ cài đặt</translation> <translation id="2485681265915754872">Điều khoản dịch vụ của Google Play</translation> -<translation id="2486036712620651117">Mật khẩu và khoá truy cập</translation> <translation id="248676429071089168">Vuốt lên để di chuyển xuống phía dưới của trang</translation> <translation id="2487067538648443797">Thêm dấu trang mới</translation> <translation id="2489686758589235262">Gán thêm 2 công tắc</translation> @@ -3901,7 +3899,6 @@ <translation id="3721178866505920080">Thông tin bổ sung về cách bật tính năng tải trước mở rộng</translation> <translation id="3722108462506185496">Lỗi khi khởi động dịch vụ máy ảo. Vui lòng thử lại.</translation> <translation id="3722624153992426516">Đã nhận được hướng dẫn <ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /></translation> -<translation id="3724897774652282549">Điền vào biểu mẫu</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">Các mạng WiFi có sẵn</translation> @@ -4334,7 +4331,6 @@ <translation id="3993887353483242788">Đồng bộ <ph name="DEVICE_TYPE" /> để các tuỳ chọn ưu tiên của bạn được áp dụng trên mọi thiết bị khi bạn đăng nhập bằng Tài khoản Google. Có thể kể đến một số tuỳ chọn ưu tiên như ứng dụng, chế độ cài đặt, mật khẩu Wi-Fi, ngôn ngữ, hình nền, phím tắt, v.v.</translation> <translation id="3994318741694670028">Rất tiếc, máy tính của bạn được định cấu hình bằng một mã phần cứng không đúng định dạng. Tình trạng này ngăn ChromeOS Flex cập nhật các bản vá bảo mật mới nhất và máy tính của bạn <ph name="BEGIN_BOLD" />có nguy cơ bị tấn công<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Mở khóa điện thoại và mang điện thoại tới gần hơn để mở khóa <ph name="DEVICE_TYPE" /> của bạn.</translation> -<translation id="3994522032746736727">Đăng nhập bằng <ph name="EMAIL" /></translation> <translation id="3994530503403062649">Tìm các nút trên máy tính bảng của bạn</translation> <translation id="3994708120330953242">Một số mật khẩu bạn lưu đã bị lộ trong một sự cố rò rỉ dữ liệu. Để bảo mật tài khoản của mình, bạn nên thay đổi các mật khẩu này ngay bây giờ.</translation> <translation id="3994878504415702912">Thu &phóng</translation> @@ -6606,7 +6602,6 @@ <translation id="5646994841348250879">Chọn một tài khoản để đăng nhập vào <ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">Giắc cắm micrô</translation> <translation id="5648166631817621825">7 ngày qua</translation> -<translation id="5650537073531199882">Điền vào biểu mẫu</translation> <translation id="5651308944918885595">Khả năng tìm thấy thiết bị Chia sẻ lân cận</translation> <translation id="5653154844073528838">Bạn đã lưu <ph name="PRINTER_COUNT" /> máy in.</translation> <translation id="5654669866168491665">Tìm hiểu thêm về các trang web có thể không hoạt động khi bạn chặn cookie của bên thứ ba</translation> @@ -8608,6 +8603,7 @@ <translation id="7113974454301513811">Bây giờ, hãy thêm thẻ hiện tại vào danh sách của bạn</translation> <translation id="7114054701490058191">Mật khẩu không khớp</translation> <translation id="7114648273807173152">Để đăng nhập vào Tài khoản Google bằng Smart Lock, hãy chuyển đến mục Cài đặt > Thiết bị đã kết nối > Điện thoại của bạn > Smart Lock.</translation> +<translation id="7115051913071512405">Dùng thử</translation> <translation id="7115361495406486998">Không có người liên hệ nào có thể chia sẻ</translation> <translation id="7115731767122970828">Tăng tốc ngay</translation> <translation id="7116554090938189816">Chứng chỉ SSL của máy in đã hết hạn. Khởi động lại máy in rồi thử lại.</translation>
diff --git a/chrome/app/resources/generated_resources_zh-CN.xtb b/chrome/app/resources/generated_resources_zh-CN.xtb index 40dfa3d..0c7d784 100644 --- a/chrome/app/resources/generated_resources_zh-CN.xtb +++ b/chrome/app/resources/generated_resources_zh-CN.xtb
@@ -664,7 +664,6 @@ <translation id="1464258312790801189">您的账号</translation> <translation id="1464597059227482327">如果您的分享对象是一部不在您通讯录中的 Chromebook，请确保该 Chromebook 已开启“附近分享”的高可见度模式。如需开启“附近分享”的高可见度模式，请选择右下角，然后选择开启“附近分享”的高可见度模式。<ph name="LINK_BEGIN" />了解详情<ph name="LINK_END" /></translation> <translation id="1464781208867302907">若想指定设备偏好设置，请转到“设置”页面。</translation> -<translation id="146481294006497945">尚未保存任何密码</translation> <translation id="1465176863081977902">复制音频地址(&O)</translation> <translation id="146522654774760805">密码和自动填充</translation> <translation id="1465827627707997754">披萨片</translation> @@ -2158,7 +2157,6 @@ <translation id="2485394160472549611">为您推荐的首选内容</translation> <translation id="2485422356828889247">卸载</translation> <translation id="2485681265915754872">Google Play 服务条款</translation> -<translation id="2486036712620651117">密码和通行密钥</translation> <translation id="248676429071089168">向上滑动手指可使页面向下移动</translation> <translation id="2487067538648443797">添加新书签</translation> <translation id="2489686758589235262">再分配 2 个开关</translation> @@ -3878,7 +3876,6 @@ <translation id="3721178866505920080">详细了解如何开启扩展预加载功能</translation> <translation id="3722108462506185496">启动虚拟机服务时出错。请重试。</translation> <translation id="3722624153992426516">已收到<ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" />说明</translation> -<translation id="3724897774652282549">填写表单</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">可用的 Wi-Fi 网络</translation> @@ -4310,7 +4307,6 @@ <translation id="3993887353483242788">同步您的 <ph name="DEVICE_TYPE" /> 后，无论是在哪部设备上，您只需登录自己的 Google 账号，便能使用您保存的偏好设置。偏好设置包括应用、设置、Wi-Fi 密码、语言、壁纸、键盘快捷键，等等。</translation> <translation id="3994318741694670028">很遗憾，您的计算机配置了格式错误的硬件 ID。这导致 ChromeOS Flex 无法使用最新的安全修正程序进行更新，以致您的计算机<ph name="BEGIN_BOLD" />很容易遭到恶意攻击<ph name="END_BOLD" />。</translation> <translation id="3994374631886003300">请解锁您的手机并将它靠近您的 <ph name="DEVICE_TYPE" />，以解锁此设备。</translation> -<translation id="3994522032746736727">以 <ph name="EMAIL" /> 的身份登录</translation> <translation id="3994530503403062649">寻找平板电脑按钮</translation> <translation id="3994708120330953242">系统检测到，您的某些密码遭遇了数据泄露。为了保障您的账号安全，建议您立即更改这些密码。</translation> <translation id="3994878504415702912">缩放(&Z)</translation> @@ -6577,7 +6573,6 @@ <translation id="5646994841348250879">选择一个用来登录“<ph name="SITE_ETLD_PLUS_ONE" />”的账号</translation> <translation id="5648021990716966815">麦克风耳机插孔</translation> <translation id="5648166631817621825">过去 7 天</translation> -<translation id="5650537073531199882">填写表单</translation> <translation id="5651308944918885595">“附近分享”功能的设备可侦测性</translation> <translation id="5653154844073528838">您有 <ph name="PRINTER_COUNT" /> 台已保存的打印机。</translation> <translation id="5654669866168491665">详细了解在屏蔽第三方 Cookie 后可能无法正常运行的网站</translation> @@ -8576,6 +8571,7 @@ <translation id="7113974454301513811">现在，将当前标签页添加到您的清单中</translation> <translation id="7114054701490058191">密码不符</translation> <translation id="7114648273807173152">要使用 Smart Lock 登录您的 Google 账号，请依次转到“设置”>“已连接的设备”>“您的手机”>“Smart Lock”。</translation> +<translation id="7115051913071512405">试用</translation> <translation id="7115361495406486998">没有可设为分享对象的联系人</translation> <translation id="7115731767122970828">立即提升</translation> <translation id="7116554090938189816">打印机 SSL 证书已过期。请重启打印机，然后重试。</translation>
diff --git a/chrome/app/resources/generated_resources_zh-HK.xtb b/chrome/app/resources/generated_resources_zh-HK.xtb index 47528a2..78c7bef 100644 --- a/chrome/app/resources/generated_resources_zh-HK.xtb +++ b/chrome/app/resources/generated_resources_zh-HK.xtb
@@ -667,7 +667,6 @@ <translation id="1464258312790801189">您的帳戶</translation> <translation id="1464597059227482327">如果要與未設定為聯絡人的 Chromebook 分享內容，請確認該 Chromebook 已啟用「咫尺共享」分享設定。如要開啟「咫尺共享」分享設定，請選取右下角，然後選取開啟「咫尺共享」分享設定。<ph name="LINK_BEGIN" />瞭解詳情<ph name="LINK_END" /></translation> <translation id="1464781208867302907">如要開啟裝置偏好設定，請前往「設定」。</translation> -<translation id="146481294006497945">未儲存密碼</translation> <translation id="1465176863081977902">複製音效檔案位址(&O)</translation> <translation id="146522654774760805">密碼和自動填入</translation> <translation id="1465827627707997754">一塊薄餅</translation> @@ -2178,7 +2177,6 @@ <translation id="2485394160472549611">推薦精選</translation> <translation id="2485422356828889247">解除安裝</translation> <translation id="2485681265915754872">《Google Play 服務條款》</translation> -<translation id="2486036712620651117">密碼和密鑰</translation> <translation id="248676429071089168">向上滑動即可將頁面向下移動</translation> <translation id="2487067538648443797">新增書籤</translation> <translation id="2489686758589235262">指派另外 2 個按鈕裝置</translation> @@ -3898,7 +3896,6 @@ <translation id="3721178866505920080">更多關於打開延伸預先載入嘅資料</translation> <translation id="3722108462506185496">啟用虛擬機器服務時發生錯誤。請稍後再試。</translation> <translation id="3722624153992426516">已接收「<ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" />」指示</translation> -<translation id="3724897774652282549">填寫表格</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">可用的 Wi-Fi 網絡</translation> @@ -4328,7 +4325,6 @@ <translation id="3993887353483242788">同步 <ph name="DEVICE_TYPE" />，以便在使用 Google 帳戶登入後，將偏好設定同步至任何裝置。偏好設定包括應用程式、設定、Wi-Fi 密碼、語言、桌布、鍵盤快速鍵等。</translation> <translation id="3994318741694670028">抱歉，您的電腦是由格式錯誤的硬件 ID 設定。這導致 ChromeOS Flex 無法使用最新的安全性修正程式進行更新，您的電腦亦可能因此<ph name="BEGIN_BOLD" />容易被惡意攻擊<ph name="END_BOLD" />。</translation> <translation id="3994374631886003300">解鎖手機並靠近您的 <ph name="DEVICE_TYPE" /> 即可解鎖。</translation> -<translation id="3994522032746736727">使用 <ph name="EMAIL" /> 登入</translation> <translation id="3994530503403062649">找出平板電腦按鈕位置</translation> <translation id="3994708120330953242">我們從資料外洩事件中發現部分您儲存的密碼。為確保帳戶安全，您應立即變更這些密碼。</translation> <translation id="3994878504415702912">縮放(&Z)</translation> @@ -6591,7 +6587,6 @@ <translation id="5646994841348250879">選擇用來登入「<ph name="SITE_ETLD_PLUS_ONE" />」的帳戶</translation> <translation id="5648021990716966815">麥克風插孔</translation> <translation id="5648166631817621825">最近 7 天</translation> -<translation id="5650537073531199882">填寫表格</translation> <translation id="5651308944918885595">「咫尺共享」可偵測度</translation> <translation id="5653154844073528838">你有 <ph name="PRINTER_COUNT" /> 部儲存咗嘅打印機。</translation> <translation id="5654669866168491665">進一步了解封鎖第三方 Cookie 嘅時候可能運作唔到嘅網站</translation> @@ -8590,6 +8585,7 @@ <translation id="7113974454301513811">現在，將現有分頁加入清單</translation> <translation id="7114054701490058191">密碼不符</translation> <translation id="7114648273807173152">如要使用 Smart Lock 登入 Google 帳戶，請前往 [設定] > [已連接的裝置] > [您的手機] > [Smart Lock]。</translation> +<translation id="7115051913071512405">試試看</translation> <translation id="7115361495406486998">沒有可用的聯絡人</translation> <translation id="7115731767122970828">立即提升</translation> <translation id="7116554090938189816">打印機 SSL 憑證已過期。請重新啟動打印機，並再試一次。</translation>
diff --git a/chrome/app/resources/generated_resources_zh-TW.xtb b/chrome/app/resources/generated_resources_zh-TW.xtb index 1667f793..a886519 100644 --- a/chrome/app/resources/generated_resources_zh-TW.xtb +++ b/chrome/app/resources/generated_resources_zh-TW.xtb
@@ -666,7 +666,6 @@ <translation id="1464258312790801189">你的帳戶</translation> <translation id="1464597059227482327">如果要與未設為聯絡人的 Chromebook 分享內容，請確認該 Chromebook 已開啟「鄰近分享瀏覽權限」，開啟方式如下：點選右下角並選取「鄰近分享瀏覽權限」。<ph name="LINK_BEGIN" />瞭解詳情<ph name="LINK_END" /></translation> <translation id="1464781208867302907">如要開啟裝置偏好設定選項，請前往「設定」。</translation> -<translation id="146481294006497945">未儲存任何密碼</translation> <translation id="1465176863081977902">複製音訊位址(&O)</translation> <translation id="146522654774760805">密碼和自動填入</translation> <translation id="1465827627707997754">披薩切片</translation> @@ -2165,7 +2164,6 @@ <translation id="2485394160472549611">專屬推薦首選</translation> <translation id="2485422356828889247">解除安裝</translation> <translation id="2485681265915754872">Google Play 服務條款</translation> -<translation id="2486036712620651117">密碼和密碼金鑰</translation> <translation id="248676429071089168">向上滑動即可將頁面向下移動</translation> <translation id="2487067538648443797">新增書籤</translation> <translation id="2489686758589235262">再指派 2 個外接切換裝置</translation> @@ -3885,7 +3883,6 @@ <translation id="3721178866505920080">進一步瞭解如何開啟延伸預先載入模式</translation> <translation id="3722108462506185496">啟用虛擬機器服務時發生錯誤，請再試一次。</translation> <translation id="3722624153992426516">已收到<ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" />的操作說明</translation> -<translation id="3724897774652282549">填寫表單</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">QT</translation> <translation id="3727144509609414201">可用的 WiFi 網路</translation> @@ -4317,7 +4314,6 @@ <translation id="3993887353483242788">將 <ph name="DEVICE_TYPE" /> 同步處理，如此一來，在使用 Google 帳戶登入後，就能將偏好設定同步至任何裝置。偏好設定包含應用程式、設定、Wi-Fi 密碼、語言、桌布、鍵盤快速鍵等。</translation> <translation id="3994318741694670028">很抱歉，你的電腦是由格式錯誤的硬體 ID 所設定。這導致 ChromeOS Flex 無法使用最新的安全性修正程式進行更新，你的電腦也可能因此<ph name="BEGIN_BOLD" />容易遭受惡意攻擊<ph name="END_BOLD" />。</translation> <translation id="3994374631886003300">解除手機的鎖定狀態，並且讓你的手機與 <ph name="DEVICE_TYPE" /> 更靠近，即可進入解鎖模式。</translation> -<translation id="3994522032746736727">以「<ph name="EMAIL" />」身分登入</translation> <translation id="3994530503403062649">點選平板電腦上的按鈕</translation> <translation id="3994708120330953242">你有一些密碼在資料侵害事件中外洩。為保護你的帳戶，建議立即變更這些密碼。</translation> <translation id="3994878504415702912">縮放(&Z)</translation> @@ -6584,7 +6580,6 @@ <translation id="5646994841348250879">選擇用來登入「<ph name="SITE_ETLD_PLUS_ONE" />」的帳戶</translation> <translation id="5648021990716966815">麥克風插孔</translation> <translation id="5648166631817621825">過去 7 天</translation> -<translation id="5650537073531199882">填入表單</translation> <translation id="5651308944918885595">鄰近分享可偵測性</translation> <translation id="5653154844073528838">你有 <ph name="PRINTER_COUNT" /> 台已儲存的印表機。</translation> <translation id="5654669866168491665">進一步瞭解在封鎖第三方 Cookie 的情況下，可能無法運作的網站</translation> @@ -8582,6 +8577,7 @@ <translation id="7113974454301513811">現在，將現有分頁加入清單</translation> <translation id="7114054701490058191">密碼不符</translation> <translation id="7114648273807173152">如要使用 Smart Lock 登入 Google 帳戶，請依序前往 [設定] > [已連接的裝置] > [你的手機] > [Smart Lock]。</translation> +<translation id="7115051913071512405">立即體驗</translation> <translation id="7115361495406486998">沒有可建立連線的聯絡人</translation> <translation id="7115731767122970828">立即提升</translation> <translation id="7116554090938189816">印表機 SSL 憑證已過期。請重新啟動印表機，然後再試一次。</translation>
diff --git a/chrome/app/resources/generated_resources_zu.xtb b/chrome/app/resources/generated_resources_zu.xtb index 3e032de..080b095c 100644 --- a/chrome/app/resources/generated_resources_zu.xtb +++ b/chrome/app/resources/generated_resources_zu.xtb
@@ -668,7 +668,6 @@ <translation id="1464258312790801189">Ama-akhawunti wakho</translation> <translation id="1464597059227482327">Uma wabelana nge-Chromebook engekho koxhumana nabo, qinisekisa ukuthi i-Chromebook “ibonakala eduzane” ivuliwe. Ukuze uvule “Ukubonakala okuseduze,” khetha ikhona elingezansi kwesokudla bese uyakhetha ukuze uvule “Ukubonakala okuseduze.” <ph name="LINK_BEGIN" />Funda kabanzi<ph name="LINK_END" /></translation> <translation id="1464781208867302907">Ngokusebenza kwedivayisi, iya kuzilungiselelo.</translation> -<translation id="146481294006497945">Awekho Amaphasiwedi Alondoloziwe</translation> <translation id="1465176863081977902">K&opisha ikheli lomsindo</translation> <translation id="146522654774760805">Amaphasiwedi nokugcwalisa okuzenzekelayo</translation> <translation id="1465827627707997754">Ucezu lwe-pizza</translation> @@ -2179,7 +2178,6 @@ <translation id="2485394160472549611">Okuphezulu okukhethelwe wena</translation> <translation id="2485422356828889247">Khipha</translation> <translation id="2485681265915754872">Imigomo yesevisi ye-Google Play</translation> -<translation id="2486036712620651117">Amaphasiwedi Nokhiye Bokudlula</translation> <translation id="248676429071089168">Swayiphela phezulu ukuze uhambise ikhasi phansi</translation> <translation id="2487067538648443797">Engeza ibhukhimakhi elisha</translation> <translation id="2489686758589235262">Nikeza amaswishi ama-2 ngaphezulu</translation> @@ -3902,7 +3900,6 @@ <translation id="3721178866505920080">Olunye ulwazi mayelana nokuvula ukulayisha ngaphambilini okunwetshiwe</translation> <translation id="3722108462506185496">Iphutha ukuqalisa isevisi yomshini wokubuka. Sicela uzame futhi.</translation> <translation id="3722624153992426516">Umyalelo we-<ph name="IMPORT_CERTIFICATE__INSTRUCTION_NAME" /> utholiwe</translation> -<translation id="3724897774652282549">Gcwalisa ifomu</translation> <translation id="3726334084188857295"><ph name="SITE_ETLD_PLUS_ONE" /> • <ph name="LAST_USED" /></translation> <translation id="3726965532284929944">I-QT</translation> <translation id="3727144509609414201">Amanethiwekhi we-WiFi atholakalayo</translation> @@ -4334,7 +4331,6 @@ <translation id="3993887353483242788">Vumelanisa i-<ph name="DEVICE_TYPE" /> yakho ukuze okuncanyelwayo kulunge kunoma iyiphi idivayisi uma ungena ngemvume nge-Google Account yakho. Okuncanyelwayo kufaka phakathi ama-app, amasethingi, amaphasiwedi we-Wi-Fi, izilimi, isithombe sangemuva, izinqamuleli zekhibhodi, nokuningi.</translation> <translation id="3994318741694670028">Ngeshwa, ikhompyutha yakho ilungiselelwa nge-ID yehadiwe engasebenzi kahle. Lokhu kuvimbela i-ChromeOS Flex ukuthi ibuyekeze ngokulungiswa kokuvikeleka kwakamuva futhi ikhompyutha yakho <ph name="BEGIN_BOLD" />ingase ibe sengozini yokuhlaselwa okunonya<ph name="END_BOLD" />.</translation> <translation id="3994374631886003300">Vula ifoni yakho bese uyisondeze ukuze uvule i-<ph name="DEVICE_TYPE" /> yakho.</translation> -<translation id="3994522032746736727">Ngena ngemvume njengo-<ph name="EMAIL" /></translation> <translation id="3994530503403062649">Thola izinkinobho ethebhulethini lakho</translation> <translation id="3994708120330953242">Amanye amaphasiwedi akho atholwe ekwephulweni kwesivumelwano sedatha. Ukuze uvikele ama-akhawunti akho, kufanele ushintshe lamaphasiwedi manje.</translation> <translation id="3994878504415702912">Sondeza isithombe</translation> @@ -6606,7 +6602,6 @@ <translation id="5646994841348250879">Khetha i-akhawunti ukuze ungene ngemvume ku-<ph name="SITE_ETLD_PLUS_ONE" /></translation> <translation id="5648021990716966815">Umgodi we-earphone</translation> <translation id="5648166631817621825">Izinsuku zokugcina ezingu-7</translation> -<translation id="5650537073531199882">Gcwalisa ifomu</translation> <translation id="5651308944918885595">Ukutholakala Kokuthumela Eduze</translation> <translation id="5653154844073528838">Unamaphrinta alondoloziwe angu-<ph name="PRINTER_COUNT" />.</translation> <translation id="5654669866168491665">Funda kabanzi mayelana namasayithi okungenzeka angasebenzi uma evimba amakhukhi ongahlangene ngqo</translation> @@ -8607,6 +8602,7 @@ <translation id="7113974454301513811">Manje engeza ithebhu yamanje ohlwini lwakho</translation> <translation id="7114054701490058191">Amaphasiwedi awafani</translation> <translation id="7114648273807173152">Ukuze usebenzise i-Smart Lock ukuze ungene ngemvume ku-akhawunti yakho ye-Google, hamba Kuzilungiselelo > Amadivayisi axhunyiwe > Ifoni yakho > I-Smart Lock.</translation> +<translation id="7115051913071512405">Yizame</translation> <translation id="7115361495406486998">Abekho oxhumana nabo abafinyelelekayo</translation> <translation id="7115731767122970828">Yenza iboost manje</translation> <translation id="7116554090938189816">Isitifiketi se-SSL yephrinta siphelelwe yisikhathi. Qala kabusha iphrinta bese uyazama futhi.</translation>
diff --git a/chrome/app/resources/google_chrome_strings_bs.xtb b/chrome/app/resources/google_chrome_strings_bs.xtb index 25e1b01..0ad48f1f 100644 --- a/chrome/app/resources/google_chrome_strings_bs.xtb +++ b/chrome/app/resources/google_chrome_strings_bs.xtb
@@ -394,6 +394,7 @@ <translation id="5941830788786076944">Postavite Google Chrome kao zadani preglednik</translation> <translation id="5947104538377036631">Prečica Chromea</translation> <translation id="5953954252731207958">Niste je posjetili već neko vrijeme. Chrome je uklonio odobrenje "<ph name="PERMISSION" />"</translation> +<translation id="5980111191913430208">Proširenja, aplikacije i teme iz nepoznatih izvora mogu naštetiti vašem uređaju. Chrome preporučuje da ih instalirate samo s usluge <ph name="IDS_EXTENSION_WEB_STORE_TITLE" /></translation> <translation id="6003112304606738118">Preuzimanje… Preostalo je <ph name="HOURS" /> h</translation> <translation id="6014316319780893079">Pomoću <ph name="BEGIN_LINK" />Chromeovih alata<ph name="END_LINK" /> možete pregledati sigurno i zadržati kontrolu</translation> <translation id="6022659036123304283">Prilagodite Chrome svojim potrebama</translation> @@ -612,6 +613,7 @@ <translation id="842386925677997438">Chromeovi sigurnosni alati</translation> <translation id="8425765582779547329">Radi veće sigurnosti online uz roditeljeve odabire prijavi se u Chrome</translation> <translation id="8428213095426709021">Postavke</translation> +<translation id="8429214465555795676">Da biste nastavili, trebate se prijaviti u Chrome pomoću e-adrese <ph name="EMAIL" />. To osigurava usklađenost s pravilima vaše organizacije.</translation> <translation id="8433638294851456451">Da pošaljete broj s ovog uređaja na svoj Android telefon, prijavite se u Chrome na oba uređaja.</translation> <translation id="8451192282033883849">Vašim računom upravlja <ph name="MANAGER_NAME" />. Vaš administrator može vidjeti i urediti ovaj profil Chrome preglednika i njegove podatke kao što su oznake, historija i lozinke.</translation> <translation id="8496177819998570653">Google upravitelj l&ozinki</translation>
diff --git a/chrome/app/resources/google_chrome_strings_en-GB.xtb b/chrome/app/resources/google_chrome_strings_en-GB.xtb index 8ac4ef3..faf4bd4 100644 --- a/chrome/app/resources/google_chrome_strings_en-GB.xtb +++ b/chrome/app/resources/google_chrome_strings_en-GB.xtb
@@ -394,6 +394,7 @@ <translation id="5941830788786076944">Make Google Chrome the default browser</translation> <translation id="5947104538377036631">Chrome shortcut</translation> <translation id="5953954252731207958">You haven't visited recently. Chrome removed <ph name="PERMISSION" /></translation> +<translation id="5980111191913430208">Extensions, apps and themes from unknown sources can harm your device. Chrome recommends only installing them from the <ph name="IDS_EXTENSION_WEB_STORE_TITLE" /></translation> <translation id="6003112304606738118">Downloading… <ph name="HOURS" /> hour(s) remaining</translation> <translation id="6014316319780893079">With <ph name="BEGIN_LINK" />tools from Chrome<ph name="END_LINK" />, you can browse safely and stay in control</translation> <translation id="6022659036123304283">Make Chrome your own</translation> @@ -612,6 +613,7 @@ <translation id="842386925677997438">Chrome’s safety tools</translation> <translation id="8425765582779547329">To stay safer online with your parent's choices, sign in to Chrome</translation> <translation id="8428213095426709021">Settings</translation> +<translation id="8429214465555795676">To continue, you'll need to sign in to Chrome with <ph name="EMAIL" />. This ensures compliance with your organisation's policies.</translation> <translation id="8433638294851456451">To send a number from here to your Android phone, sign in to Chrome on both devices.</translation> <translation id="8451192282033883849">Your account is managed by <ph name="MANAGER_NAME" />. Your administrator can see and edit this Chrome browser profile and its data like bookmarks, history and passwords.</translation> <translation id="8496177819998570653">Google P&assword Manager</translation>
diff --git a/chrome/app/resources/google_chrome_strings_fa.xtb b/chrome/app/resources/google_chrome_strings_fa.xtb index 836c4b27..dfdf540 100644 --- a/chrome/app/resources/google_chrome_strings_fa.xtb +++ b/chrome/app/resources/google_chrome_strings_fa.xtb
@@ -386,6 +386,7 @@ <translation id="5941830788786076944">Google Chrome مرورگر پیشفرض شود</translation> <translation id="5947104538377036631">میانبر Chrome</translation> <translation id="5953954252731207958">اخیراً بازدیدی نداشتهاید. Chrome <ph name="PERMISSION" /> را برداشت</translation> +<translation id="5980111191913430208">افزونهها، برنامهها، و زمینههای دریافتی از منابع ناشناخته میتوانند به دستگاهتان آسیب برسانند. Chrome توصیه میکند آنها را فقط از <ph name="IDS_EXTENSION_WEB_STORE_TITLE" /> نصب کنید</translation> <translation id="6003112304606738118">درحال بارگیری… <ph name="HOURS" /> ساعت باقی مانده است</translation> <translation id="6014316319780893079">با <ph name="BEGIN_LINK" />ابزارهای Chrome<ph name="END_LINK" />، میتوانید بهطور ایمن مرور کنید و کنترل را دردست بگیرید</translation> <translation id="6022659036123304283">Chrome را برای خود اختصاصی کنید</translation> @@ -604,6 +605,7 @@ <translation id="842386925677997438">ابزارهای ایمنی Chrome</translation> <translation id="8425765582779547329">برای ایمنتر ماندن در فضای آنلاین با کمک انتخابهای ولیتان، به سیستم Chrome وارد شوید</translation> <translation id="8428213095426709021">تنظیمات</translation> +<translation id="8429214465555795676">برای ادامه دادن، باید با <ph name="EMAIL" /> به سیستم Chrome وارد شوید. با این کار، پیروی از خطمشیهای سازمان تضمین میشود.</translation> <translation id="8433638294851456451">برای ارسال شماره از اینجا به تلفن Android خود، در هر دو دستگاه به سیستم Chrome وارد شوید.</translation> <translation id="8451192282033883849"><ph name="MANAGER_NAME" /> حساب شما را مدیریت میکند. سرپرست شما میتواند این نمایه مرورگر Chrome و دادههای آن را (مانند نشانکها، سابقه، و گذرواژهها) ببیند و ویرایش کند.</translation> <translation id="8496177819998570653">مدیر گذرواژه Google</translation>
diff --git a/chrome/app/resources/google_chrome_strings_gu.xtb b/chrome/app/resources/google_chrome_strings_gu.xtb index 7fdc603..3396571 100644 --- a/chrome/app/resources/google_chrome_strings_gu.xtb +++ b/chrome/app/resources/google_chrome_strings_gu.xtb
@@ -394,6 +394,7 @@ <translation id="5941830788786076944">Google Chrome ને ડિફૉલ્ટ બ્રાઉઝર બનાવો</translation> <translation id="5947104538377036631">Chrome શૉર્ટકટ</translation> <translation id="5953954252731207958">તમે તાજેતરમાં આ સાઇટની મુલાકાત લીધી નથી. Chrome દ્વારા <ph name="PERMISSION" />ની પરવાનગી કાઢી નાખવામાં આવી</translation> +<translation id="5980111191913430208">અજાણ્યા સૉર્સ પરના એક્સ્ટેન્શન, ઍપ અને થીમ તમારા ડિવાઇસને નુકસાન પહોંચાડી શકે છે. Chromium તેને <ph name="IDS_EXTENSION_WEB_STORE_TITLE" /> પરથી જ ઇન્સ્ટૉલ કરવાનો સુઝાવ આપે છે</translation> <translation id="6003112304606738118">ડાઉનલોડ કરી રહ્યાં છીએ… <ph name="HOURS" /> કલાક બાકી છે</translation> <translation id="6014316319780893079"><ph name="BEGIN_LINK" />Chromeના ટૂલ<ph name="END_LINK" /> વડે, તમે સલામત રીતે બ્રાઉઝ કરી શકો છો તેમજ નિયંત્રણ જાળવી શકો છો</translation> <translation id="6022659036123304283">Chromeને તમારી જરૂરિયાત અનુરૂપ બનાવો</translation> @@ -612,6 +613,7 @@ <translation id="842386925677997438">Chromeના સલામતી માટેના ટૂલ</translation> <translation id="8425765582779547329">તમારા માતાપિતાની પસંદગીઓ સાથે ઑનલાઇન વધુ સલામત રહેવા માટે, Chromeમાં સાઇન ઇન કરો</translation> <translation id="8428213095426709021">સેટિંગ</translation> +<translation id="8429214465555795676">આગળ વધવા માટે, તમારે <ph name="EMAIL" /> વડે Chromeમાં સાઇન ઇન કરવું જરૂરી રહેશે. આનાથી તમારી સંસ્થાની પૉલિસીઓનું પાલન થતું હોવાની ખાતરી થાય છે.</translation> <translation id="8433638294851456451">અહીંથી તમારા Android ફોન પર નંબર મોકલવા માટે, બન્ને ડિવાઇસ પર Chromeમાં સાઇન ઇન કરો.</translation> <translation id="8451192282033883849"><ph name="MANAGER_NAME" /> દ્વારા તમારું એકાઉન્ટ મેનેજ કરવામાં આવે છે. તમારા ઍડમિનિસ્ટ્રેટર આ Chrome બ્રાઉઝરની પ્રોફાઇલ અને બુકમાર્ક, ઇતિહાસ તથા પાસવર્ડ જેવો તેનો ડેટા જોઈ શકે છે અને તેમાં ફેરફાર કરી શકે છે.</translation> <translation id="8496177819998570653">Google P&assword Manager</translation>
diff --git a/chrome/app/resources/google_chrome_strings_hr.xtb b/chrome/app/resources/google_chrome_strings_hr.xtb index dc4e58b7..b5cb5d2 100644 --- a/chrome/app/resources/google_chrome_strings_hr.xtb +++ b/chrome/app/resources/google_chrome_strings_hr.xtb
@@ -386,6 +386,7 @@ <translation id="5941830788786076944">Neka Google Chrome bude zadani preglednik.</translation> <translation id="5947104538377036631">Prečac za Chrome</translation> <translation id="5953954252731207958">U posljednje vrijeme niste posjećivali web-lokaciju. Chrome je uklonio <ph name="PERMISSION" /></translation> +<translation id="5980111191913430208">Proširenja, aplikacije i teme iz nepoznatih izvora mogu naštetiti vašem uređaju. Chrome preporučuje da ih instalirate samo s usluge <ph name="IDS_EXTENSION_WEB_STORE_TITLE" /></translation> <translation id="6003112304606738118">Preuzimanje... Još <ph name="HOURS" /> h</translation> <translation id="6014316319780893079">Uz <ph name="BEGIN_LINK" />Chromeove alate<ph name="END_LINK" /> možete sigurno pregledavati i zadržati kontrolu</translation> <translation id="6022659036123304283">Prilagodite Chrome sebi</translation> @@ -604,6 +605,7 @@ <translation id="842386925677997438">Chromeovi sigurnosni alati</translation> <translation id="8425765582779547329">Za više sigurnosti online uz postavke koje su odabrali tvoji roditelji, prijavi se na Chrome</translation> <translation id="8428213095426709021">Postavke</translation> +<translation id="8429214465555795676">Da biste nastavili, trebate se prijaviti u Chrome pomoću e-adrese <ph name="EMAIL" />. To osigurava usklađenost s pravilima vaše organizacije.</translation> <translation id="8433638294851456451">Da biste poslali broj s ovog uređaja na svoj Android telefon, prijavite se na Chrome na oba uređaja.</translation> <translation id="8451192282033883849">Vašim računom upravlja <ph name="MANAGER_NAME" />. Vaš administrator može pregledavati i uređivati profil ovog preglednika Chrome i njegove podatke, kao što su oznake, povijest i zaporke.</translation> <translation id="8496177819998570653">Google upravitelj zaporki</translation>
diff --git a/chrome/app/resources/google_chrome_strings_hu.xtb b/chrome/app/resources/google_chrome_strings_hu.xtb index 626d0f9..542d176 100644 --- a/chrome/app/resources/google_chrome_strings_hu.xtb +++ b/chrome/app/resources/google_chrome_strings_hu.xtb
@@ -386,6 +386,7 @@ <translation id="5941830788786076944">A Google Chrome beállítása alapértelmezett böngészőként</translation> <translation id="5947104538377036631">Chrome-parancsikon</translation> <translation id="5953954252731207958">Nem látogatta meg mostanában. A Chrome eltávolította a következőt: <ph name="PERMISSION" />.</translation> +<translation id="5980111191913430208">Az ismeretlen forrásból származó bővítmények, alkalmazások és témák károsíthatják az eszközt. A Chrome azt javasolja, hogy csak a következő helyről telepítse őket: <ph name="IDS_EXTENSION_WEB_STORE_TITLE" />.</translation> <translation id="6003112304606738118">Letöltés… <ph name="HOURS" /> óra van hátra</translation> <translation id="6014316319780893079">A <ph name="BEGIN_LINK" />Chrome eszközeivel<ph name="END_LINK" /> biztonságosan böngészhet, és kézben tarthatja az irányítást</translation> <translation id="6022659036123304283">Tegye személyessé a Chrome-ot</translation> @@ -604,6 +605,7 @@ <translation id="842386925677997438">A Chrome biztonsági eszközei</translation> <translation id="8425765582779547329">Ha szeretnéd, hogy a szülőd által megadott beállításokkal nagyobb biztonságban lehess az interneten, jelentkezz be a Chrome-ba.</translation> <translation id="8428213095426709021">Beállítások</translation> +<translation id="8429214465555795676">A folytatáshoz be kell jelentkeznie a Chrome-ba a következővel: <ph name="EMAIL" />. Ezzel biztosíthatja, hogy megfeleljen a szervezete házirendjeinek.</translation> <translation id="8433638294851456451">Ha innen szeretne számot küldeni Android-telefonjára, jelentkezzen be a Chrome-ba mindkét eszközén.</translation> <translation id="8451192282033883849">Az Ön fiókkezelője: <ph name="MANAGER_NAME" />. Rendszergazdája láthatja és szerkesztheti ezt a Chrome-böngészőprofilt és az adatait (például a könyvjelzőket, az előzményeket és a jelszavakat).</translation> <translation id="8496177819998570653">Google J&elszókezelő</translation>
diff --git a/chrome/app/resources/google_chrome_strings_it.xtb b/chrome/app/resources/google_chrome_strings_it.xtb index 7a9fe9c..7917026 100644 --- a/chrome/app/resources/google_chrome_strings_it.xtb +++ b/chrome/app/resources/google_chrome_strings_it.xtb
@@ -385,6 +385,7 @@ <translation id="5941830788786076944">Imposta Google Chrome come browser predefinito</translation> <translation id="5947104538377036631">Scorciatoia Chrome</translation> <translation id="5953954252731207958">Non hai visitato il sito di recente. Chrome ha rimosso <ph name="PERMISSION" /></translation> +<translation id="5980111191913430208">Estensioni, app e temi da origini sconosciute possono danneggiare il tuo dispositivo. Chrome consiglia di installare questi elementi soltanto dal <ph name="IDS_EXTENSION_WEB_STORE_TITLE" /></translation> <translation id="6003112304606738118">Download in corso… Ore rimanenti: <ph name="HOURS" /></translation> <translation id="6014316319780893079">Con gli <ph name="BEGIN_LINK" />strumenti di Chrome<ph name="END_LINK" /> puoi navigare in sicurezza e tenere tutto sotto controllo</translation> <translation id="6022659036123304283">Personalizza il tuo Chrome</translation> @@ -603,6 +604,7 @@ <translation id="842386925677997438">Strumenti per la sicurezza di Chrome</translation> <translation id="8425765582779547329">Per navigare online in modo più sicuro con le scelte del tuo genitore, accedi a Chrome</translation> <translation id="8428213095426709021">Impostazioni</translation> +<translation id="8429214465555795676">Per continuare, devi accedere a Chrome con <ph name="EMAIL" />. In questo modo viene garantita la conformità ai criteri della tua organizzazione.</translation> <translation id="8433638294851456451">Per inviare un numero da questo dispositivo al tuo telefono Android, accedi a Chrome su entrambi i dispositivi.</translation> <translation id="8451192282033883849">Il tuo account è gestito da <ph name="MANAGER_NAME" />. L'amministratore può vedere e modificare questo profilo del browser Chrome e i relativi dati, come preferiti, cronologia e password.</translation> <translation id="8496177819998570653">Gestore delle p&assword di Google</translation>
diff --git a/chrome/app/resources/google_chrome_strings_km.xtb b/chrome/app/resources/google_chrome_strings_km.xtb index adb0aab..c5c3f45 100644 --- a/chrome/app/resources/google_chrome_strings_km.xtb +++ b/chrome/app/resources/google_chrome_strings_km.xtb
@@ -393,6 +393,7 @@ <translation id="5941830788786076944">ដាក់ Google Chrome ជាកម្មវិធីរុករកលំនាំដើម</translation> <translation id="5947104538377036631">ផ្លូវកាត់ Chrome</translation> <translation id="5953954252731207958">អ្នកមិនបានចូលមើលនាពេលថ្មីៗនេះទេ។ Chrome បានដកការអនុញ្ញាតឱ្យប្រើ<ph name="PERMISSION" />ចេញ</translation> +<translation id="5980111191913430208">កម្មវិធីបន្ថែម កម្មវិធី និងទម្រង់រចនាពីប្រភពដែលមិនស្គាល់អាចបង្កគ្រោះថ្នាក់ដល់ឧបករណ៍របស់អ្នក។ Chrome ណែនាំឱ្យដំឡើងពួកវាតែពី <ph name="IDS_EXTENSION_WEB_STORE_TITLE" /> ប៉ុណ្ណោះ</translation> <translation id="6003112304606738118">កំពុងទាញយក... នៅសល់ <ph name="HOURS" /> ម៉ោងទៀត</translation> <translation id="6014316319780893079">តាមរយៈ<ph name="BEGIN_LINK" />ឧបករណ៍ពី Chrome<ph name="END_LINK" /> អ្នកអាចរុករកដោយសុវត្ថិភាព និងរក្សាការគ្រប់គ្រងបាន</translation> <translation id="6022659036123304283">ធ្វើឱ្យ Chrome ក្លាយជារបស់អ្នក</translation> @@ -611,6 +612,7 @@ <translation id="842386925677997438">ឧបករណ៍សុវត្ថិភាពរបស់ Chrome</translation> <translation id="8425765582779547329">ដើម្បីឱ្យកាន់តែមានសុវត្ថិភាពនៅលើអ៊ីនធឺណិតតាមរយៈជម្រើសរបស់មាតាបិតាអ្នក សូមចូលគណនី Chrome</translation> <translation id="8428213095426709021">ការកំណត់</translation> +<translation id="8429214465555795676">ដើម្បីបន្ត អ្នកនឹងត្រូវចូលគណនី Chrome ដោយប្រើ <ph name="EMAIL" />។ ការធ្វើបែបនេះធានាបាននូវអនុលោមភាពជាមួយគោលការណ៍របស់ស្ថាប័នអ្នក។</translation> <translation id="8433638294851456451">ដើម្បីផ្ញើលេខទូរសព្ទពីទីនេះទៅទូរសព្ទ Android របស់អ្នក សូមចូល Chrome នៅលើឧបករណ៍ទាំងពីរ។</translation> <translation id="8451192282033883849">គណនីរបស់អ្នកស្ថិតក្រោមការគ្រប់គ្រងរបស់ <ph name="MANAGER_NAME" />។ អ្នកគ្រប់គ្រងរបស់អ្នកអាចមើល និងកែកម្រងព័ត៌មានកម្មវិធីរុករកតាមអ៊ីនធឺណិត Chrome នេះ និងទិន្នន័យរបស់វា ដូចជាចំណាំ ប្រវត្តិ និងពាក្យសម្ងាត់។</translation> <translation id="8496177819998570653">កម្មវិធីគ្រប់គ្រង&ពាក្យសម្ងាត់</translation>
diff --git a/chrome/app/resources/google_chrome_strings_lo.xtb b/chrome/app/resources/google_chrome_strings_lo.xtb index 94711e53..9bf9b3b0 100644 --- a/chrome/app/resources/google_chrome_strings_lo.xtb +++ b/chrome/app/resources/google_chrome_strings_lo.xtb
@@ -394,6 +394,7 @@ <translation id="5941830788786076944">ເຮັດ Google Chrome ເປັນບຣາວເຊີມາດຕະຖານ</translation> <translation id="5947104538377036631">ທາງລັດ Chrome</translation> <translation id="5953954252731207958">ທ່ານບໍ່ໄດ້ເຂົ້າເບິ່ງເມື່ອບໍ່ດົນມານີ້. Chrome ໄດ້ລຶບສິດເຂົ້າເຖິງ <ph name="PERMISSION" /> ອອກແລ້ວ</translation> +<translation id="5980111191913430208">ສ່ວນຂະຫຍາຍ, ແອັບ ແລະ ຮູບແບບສີສັນຈາກແຫຼ່ງຂໍ້ມູນທີ່ບໍ່ຮູ້ຈັກອາດເປັນອັນຕະລາຍກັບອຸປະກອນຂອງທ່ານໄດ້. Chrome ແນະນຳໃຫ້ຕິດຕັ້ງພວກມັນຈາກ <ph name="IDS_EXTENSION_WEB_STORE_TITLE" /> ເທົ່ານັ້ນ</translation> <translation id="6003112304606738118">ກຳລັງດາວໂຫຼດ... ຍັງເຫຼືອ <ph name="HOURS" /> ຊົ່ວໂມງ</translation> <translation id="6014316319780893079">ດ້ວຍ <ph name="BEGIN_LINK" />ເຄື່ອງມືຈາກ Chrome<ph name="END_LINK" />, ທ່ານຈະສາມາດທ່ອງເວັບໄດ້ຢ່າງປອດໄພ ແລະ ຄວບຄຸມສິ່ງຕ່າງໆໄດ້</translation> <translation id="6022659036123304283">ເຮັດໃຫ້ Chrome ເປັນຂອງທ່ານ</translation> @@ -612,6 +613,7 @@ <translation id="842386925677997438">ເຄື່ອງມືຄວາມປອດໄພຂອງ Chrome</translation> <translation id="8425765582779547329">ເພື່ອທ່ອງໂລກອອນລາຍຢ່າງປອດໄພຍິ່ງຂຶ້ນດ້ວຍຕົວເລືອກຂອງຜູ້ປົກຄອງຂອງທ່ານ, ໃຫ້ເຂົ້າສູ່ລະບົບໃນ Chrome</translation> <translation id="8428213095426709021">ການຕັ້ງຄ່າ</translation> +<translation id="8429214465555795676">ເພື່ອສືບຕໍ່, ທ່ານຈະຕ້ອງເຂົ້າສູ່ລະບົບ Chrome ດ້ວຍ <ph name="EMAIL" />. ສິ່ງນີ້ເພື່ອໃຫ້ໝັ້ນໃຈວ່າເປັນການປະຕິບັດຕາມນະໂຍບາຍຂອງອົງກອນຂອງທ່ານ.</translation> <translation id="8433638294851456451">ເພື່ອສົ່ງເບີຈາກບ່ອນນີ້ໃຫ້ໂທລະສັບ Android ຂອງທ່ານ, ກະລຸນາເຂົ້າສູ່ລະບົບ Chrome ຢູ່ໃນທັງສອງອຸປະກອນ.</translation> <translation id="8451192282033883849">ບັນຊີຂອງທ່ານແມ່ນຈັດການໂດຍ <ph name="MANAGER_NAME" />. ຜູ້ເບິ່ງແຍງລະບົບຂອງທ່ານສາມາດເບິ່ງ ແລະ ແກ້ໄຂໂປຣໄຟລ໌ໂປຣແກຣມທ່ອງເວັບ Chrome ນີ້ ແລະ ຂໍ້ມູນຂອງມັນໄດ້ ເຊັ່ນ: ບຸກມາກ, ປະຫວັດ ແລະ ລະຫັດຜ່ານ.</translation> <translation id="8496177819998570653">ຕົວຈັດການລະຫັດຜ່ານ Google</translation>
diff --git a/chrome/app/resources/google_chrome_strings_ms.xtb b/chrome/app/resources/google_chrome_strings_ms.xtb index 47696fd..4d3a0ab 100644 --- a/chrome/app/resources/google_chrome_strings_ms.xtb +++ b/chrome/app/resources/google_chrome_strings_ms.xtb
@@ -386,6 +386,7 @@ <translation id="5941830788786076944">Jadikan Google Chrome penyemak imbas lalai</translation> <translation id="5947104538377036631">Pintasan Chrome</translation> <translation id="5953954252731207958">Anda belum melawati laman web ini baru-baru ini. Chrome mengalih keluar <ph name="PERMISSION" /></translation> +<translation id="5980111191913430208">Sambungan, apl dan tema daripada sumber yang tidak diketahui boleh membahayakan peranti anda. Chrome mengesyorkan agar fail dipasang daripada <ph name="IDS_EXTENSION_WEB_STORE_TITLE" /> sahaja</translation> <translation id="6003112304606738118">Memuat turun… <ph name="HOURS" /> jam lagi</translation> <translation id="6014316319780893079">Dengan <ph name="BEGIN_LINK" />alatan daripada Chrome<ph name="END_LINK" />, anda boleh menyemak imbas dengan selamat dan mengekalkan kawalan anda</translation> <translation id="6022659036123304283">Peribadikan Chrome anda</translation> @@ -604,6 +605,7 @@ <translation id="842386925677997438">Alatan keselamatan Chrome</translation> <translation id="8425765582779547329">Untuk kekal lebih selamat dalam talian dengan pilihan ibu/bapa anda, log masuk ke Chrome</translation> <translation id="8428213095426709021">Tetapan</translation> +<translation id="8429214465555795676">Untuk meneruskan proses, anda perlu log masuk ke Chrome dengan <ph name="EMAIL" />. Langkah ini memastikan pematuhan dengan dasar organisasi anda.</translation> <translation id="8433638294851456451">Untuk menghantar nombor dari sini ke telefon Android anda, log masuk ke Chrome pada kedua-dua peranti.</translation> <translation id="8451192282033883849">Akaun anda diurus oleh <ph name="MANAGER_NAME" />. Pentadbir anda boleh melihat dan mengedit profil penyemak imbas Chrome ini dan datanya seperti penanda halaman, sejarah dan kata laluan.</translation> <translation id="8496177819998570653">Google Password Manager</translation>
diff --git a/chrome/app/resources/google_chrome_strings_sk.xtb b/chrome/app/resources/google_chrome_strings_sk.xtb index 47afaaf3..5666078 100644 --- a/chrome/app/resources/google_chrome_strings_sk.xtb +++ b/chrome/app/resources/google_chrome_strings_sk.xtb
@@ -391,6 +391,7 @@ <translation id="5941830788786076944">Nastaviť prehľadávač Google Chrome ako predvolený</translation> <translation id="5947104538377036631">Odkaz na Chrome</translation> <translation id="5953954252731207958">Tento web ste v poslednom čase nenavštívili. Chrome odstránil povolenie <ph name="PERMISSION" />.</translation> +<translation id="5980111191913430208">Rozšírenia, aplikácie a motívy z neznámych zdrojov môžu poškodiť vaše zariadenie. Chrome odporúča ich inštaláciu iba zo zdroja <ph name="IDS_EXTENSION_WEB_STORE_TITLE" />.</translation> <translation id="6003112304606738118">Sťahuje sa… Zostávajúci čas: <ph name="HOURS" /> h</translation> <translation id="6014316319780893079">Pomocou <ph name="BEGIN_LINK" />nástrojov Chromu<ph name="END_LINK" /> môžete bezpečne prehliadať a mať všetko pod kontrolou</translation> <translation id="6022659036123304283">Upravte si Chrome podľa seba</translation> @@ -609,6 +610,7 @@ <translation id="842386925677997438">Bezpečnostné nástroje Chromu</translation> <translation id="8425765582779547329">Ak chceš zvýšiť svoju bezpečnosť na internete pomocou vybraných možností tvojho rodiča, prihlás sa do Chromu</translation> <translation id="8428213095426709021">Nastavenia</translation> +<translation id="8429214465555795676">Ak chcete pokračovať, musíte sa do Chromu prihlásiť účtom <ph name="EMAIL" />. Zaistí sa tým súlad s pravidlami vašej organizácie.</translation> <translation id="8433638294851456451">Ak chcete odtiaľto odoslať číslo do svojho telefónu s Androidom, prihláste sa v oboch zariadeniach do Chromu.</translation> <translation id="8451192282033883849">Váš účet spravuje <ph name="MANAGER_NAME" />. Váš správca si môže zobraziť a upraviť tento profil prehliadača Chrome vrátane jeho údajov, ako sú záložky, história a heslá.</translation> <translation id="8496177819998570653">Správca hesiel Google</translation>
diff --git a/chrome/browser/ash/release_notes/release_notes_storage_unittest.cc b/chrome/browser/ash/release_notes/release_notes_storage_unittest.cc index 16429d4c..dfd8b1f 100644 --- a/chrome/browser/ash/release_notes/release_notes_storage_unittest.cc +++ b/chrome/browser/ash/release_notes/release_notes_storage_unittest.cc
@@ -22,6 +22,7 @@ #include "components/user_manager/scoped_user_manager.h" #include "components/version_info/version_info.h" #include "content/public/test/browser_task_environment.h" +#include "google_apis/gaia/gaia_id.h" #include "testing/gtest/include/gtest/gtest.h" namespace { @@ -49,7 +50,8 @@ if (is_guest_) { builder.SetGuestSession(); } else { - AccountId account_id_ = AccountId::FromUserEmailGaiaId(email_, "12345"); + AccountId account_id_ = + AccountId::FromUserEmailGaiaId(email_, GaiaId("12345")); user_manager_->AddUser(account_id_); builder.SetProfileName(email_);
diff --git a/chrome/browser/enterprise/signin/profile_token_web_signin_interceptor_unittest.cc b/chrome/browser/enterprise/signin/profile_token_web_signin_interceptor_unittest.cc index 2adeb0a..fed3186 100644 --- a/chrome/browser/enterprise/signin/profile_token_web_signin_interceptor_unittest.cc +++ b/chrome/browser/enterprise/signin/profile_token_web_signin_interceptor_unittest.cc
@@ -7,6 +7,7 @@ #include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/test/bind.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile_attributes_entry.h" #include "chrome/browser/profiles/profile_attributes_storage.h" #include "chrome/browser/profiles/profile_manager.h" @@ -174,6 +175,14 @@ EXPECT_EQ(num_profiles_before, num_profiles_after); } +// TODO(https://crbug.com/385383226): Flaky on Mac. +#if BUILDFLAG(IS_MAC) +#define MAYBE_InterceptionCreatesNewProfileIfAccepted \ + DISABLED_InterceptionCreatesNewProfileIfAccepted +#else +#define MAYBE_InterceptionCreatesNewProfileIfAccepted \ + InterceptionCreatesNewProfileIfAccepted +#endif TEST_F(ProfileTokenWebSigninInterceptorTest, InterceptionCreatesNewProfileIfAccepted) { const int num_profiles_before = TestingBrowserProcess::GetGlobal() @@ -203,8 +212,16 @@ EXPECT_EQ(num_profiles_before + 1, num_profiles_after); } +// TODO(https://crbug.com/385383226): Flaky on Mac. +#if BUILDFLAG(IS_MAC) +#define MAYBE_InterceptionCreatesEphemeralProfileIfAcceptedWithNoId \ + DISABLED_InterceptionCreatesEphemeralProfileIfAcceptedWithNoId +#else +#define MAYBE_InterceptionCreatesEphemeralProfileIfAcceptedWithNoId \ + InterceptionCreatesEphemeralProfileIfAcceptedWithNoId +#endif TEST_F(ProfileTokenWebSigninInterceptorTest, - InterceptionCreatesEphemeralProfileIfAcceptedWithNoId) { + MAYBE_InterceptionCreatesEphemeralProfileIfAcceptedWithNoId) { const int num_profiles_before = TestingBrowserProcess::GetGlobal() ->profile_manager() ->GetNumberOfProfiles();
diff --git a/chrome/browser/glic/BUILD.gn b/chrome/browser/glic/BUILD.gn index a23ab90..1ae9809 100644 --- a/chrome/browser/glic/BUILD.gn +++ b/chrome/browser/glic/BUILD.gn
@@ -10,6 +10,7 @@ "glic_page_context_fetcher.h", "glic_pref_names.h", "glic_profile_manager.h", + "glic_tab_indicator_helper.h", "glic_window_controller.h", "guest_util.h", ] @@ -32,6 +33,7 @@ "glic_keyed_service_factory.cc", "glic_page_context_fetcher.cc", "glic_profile_manager.cc", + "glic_tab_indicator_helper.cc", "glic_window_controller.cc", "guest_util.cc", ] @@ -45,6 +47,8 @@ "//chrome/browser:global_features", "//chrome/browser/ui:browser_list", "//chrome/browser/ui:browser_navigator_params_headers", + "//chrome/browser/ui/browser_window:browser_window", + "//chrome/browser/ui/tabs:tab_strip", "//chrome/common", "//components/favicon/content:content", "//components/guest_view/browser",
diff --git a/chrome/browser/glic/glic_tab_indicator_helper.cc b/chrome/browser/glic/glic_tab_indicator_helper.cc new file mode 100644 index 0000000..4e31ae5e --- /dev/null +++ b/chrome/browser/glic/glic_tab_indicator_helper.cc
@@ -0,0 +1,66 @@ +// Copyright 2024 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/browser/glic/glic_tab_indicator_helper.h" + +#include "chrome/browser/glic/glic_keyed_service_factory.h" +#include "chrome/browser/profiles/profile.h" +#include "chrome/browser/ui/browser_window/public/browser_window_interface.h" +#include "chrome/browser/ui/tabs/tab_change_type.h" +#include "chrome/browser/ui/tabs/tab_strip_model.h" +#include "content/public/browser/web_contents.h" + +namespace glic { + +GlicTabIndicatorHelper::GlicTabIndicatorHelper(BrowserWindowInterface* browser) + : browser_(*browser) { + auto* const service = glic::GlicKeyedServiceFactory::GetGlicKeyedService( + browser_->GetProfile()); + SetLastFocusedTab(service->GetFocusedTab()); + change_subscription_ = service->AddFocusedTabChangedCallback( + base::BindRepeating(&GlicTabIndicatorHelper::OnFocusedTabChanged, + base::Unretained(this))); +} + +GlicTabIndicatorHelper::~GlicTabIndicatorHelper() = default; + +void GlicTabIndicatorHelper::SetLastFocusedTab( + const content::WebContents* contents) { + if (contents) { + // GetWeakPtr() isn't const, but we store a const pointer, so this is + // safe. + last_focused_tab_ = + const_cast<content::WebContents*>(contents)->GetWeakPtr(); + } else { + last_focused_tab_.reset(); + } +} + +void GlicTabIndicatorHelper::OnFocusedTabChanged( + const content::WebContents* contents) { + if (contents == last_focused_tab_.get()) { + return; + } + + MaybeUpdateTab(last_focused_tab_.get()); + MaybeUpdateTab(contents); + SetLastFocusedTab(contents); +} + +// Possibly sends an update for the renderer data for the given tab. +void GlicTabIndicatorHelper::MaybeUpdateTab( + const content::WebContents* contents) { + if (!contents) { + return; + } + auto* const model = browser_->GetTabStripModel(); + CHECK(model); + const int index = model->GetIndexOfWebContents(contents); + if (index == TabStripModel::kNoTab) { + return; + } + model->UpdateWebContentsStateAt(index, TabChangeType::kAll); +} + +} // namespace glic
diff --git a/chrome/browser/glic/glic_tab_indicator_helper.h b/chrome/browser/glic/glic_tab_indicator_helper.h new file mode 100644 index 0000000..1b0a777 --- /dev/null +++ b/chrome/browser/glic/glic_tab_indicator_helper.h
@@ -0,0 +1,44 @@ +// Copyright 2024 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CHROME_BROWSER_GLIC_GLIC_TAB_INDICATOR_HELPER_H_ +#define CHROME_BROWSER_GLIC_GLIC_TAB_INDICATOR_HELPER_H_ + +#include "base/callback_list.h" +#include "base/memory/raw_ref.h" +#include "base/memory/weak_ptr.h" + +class BrowserWindowInterface; + +namespace content { +class WebContents; +} + +namespace glic { + +// Tracks the glic focus and ensures that tab indicators are updated when focus +// changes. +class GlicTabIndicatorHelper { + public: + explicit GlicTabIndicatorHelper(BrowserWindowInterface* browser); + ~GlicTabIndicatorHelper(); + + private: + // Sets the last focused tab to `contents`. + void SetLastFocusedTab(const content::WebContents* contents); + + // Updates the given tab if it is in the current tabstrip. + void MaybeUpdateTab(const content::WebContents* contents); + + // Called when the focused tab changes. + void OnFocusedTabChanged(const content::WebContents* contents); + + const raw_ref<BrowserWindowInterface> browser_; + base::WeakPtr<const content::WebContents> last_focused_tab_; + base::CallbackListSubscription change_subscription_; +}; + +} // namespace glic + +#endif // CHROME_BROWSER_GLIC_GLIC_TAB_INDICATOR_HELPER_H_
diff --git a/chrome/browser/google/google_brand.cc b/chrome/browser/google/google_brand.cc index 1a15d9a..60fb71e 100644 --- a/chrome/browser/google/google_brand.cc +++ b/chrome/browser/google/google_brand.cc
@@ -42,12 +42,14 @@ static const base::NoDestructor<std::optional<std::string>> brand_code( []() -> std::optional<std::string> { std::wstring brandw; - if (!GoogleUpdateSettings::GetBrand(&brandw)) + if (!GoogleUpdateSettings::GetBrand(&brandw)) { return std::nullopt; + } return base::WideToASCII(brandw); }()); - if (!brand_code->has_value()) + if (!brand_code->has_value()) { return false; + } brand->assign(**brand_code); return true; } @@ -55,8 +57,9 @@ bool GetReactivationBrand(std::string* brand) { std::wstring brandw; bool ret = GoogleUpdateSettings::GetReactivationBrand(&brandw); - if (ret) + if (ret) { brand->assign(base::WideToASCII(brandw)); + } return ret; } @@ -114,8 +117,9 @@ } // The Chrome enterprise brand code is the only GGR* brand to be non-organic. - if (brand == "GGRV") + if (brand == "GGRV") { return false; + } return base::StartsWith(brand, "EUB", base::CompareCase::SENSITIVE) || base::StartsWith(brand, "EUC", base::CompareCase::SENSITIVE) || @@ -134,8 +138,8 @@ bool IsInternetCafeBrandCode(const std::string& brand) { const char* const kBrands[] = { - "CHIQ", "CHSG", "HLJY", "NTMO", "OOBA", "OOBB", "OOBC", "OOBD", "OOBE", - "OOBF", "OOBG", "OOBH", "OOBI", "OOBJ", "IDCM", + "CHIQ", "CHSG", "HLJY", "NTMO", "OOBA", "OOBB", "OOBC", "OOBD", + "OOBE", "OOBF", "OOBG", "OOBH", "OOBI", "OOBJ", "IDCM", }; return base::Contains(kBrands, brand); }
diff --git a/chrome/browser/google/google_brand_chromeos.cc b/chrome/browser/google/google_brand_chromeos.cc index 7f24583b..a4b3ad2 100644 --- a/chrome/browser/google/google_brand_chromeos.cc +++ b/chrome/browser/google/google_brand_chromeos.cc
@@ -37,16 +37,18 @@ std::string ReadBrandFromFile() { std::string brand; base::FilePath brand_file_path(kRLZBrandFilePath); - if (!base::ReadFileToString(brand_file_path, &brand)) + if (!base::ReadFileToString(brand_file_path, &brand)) { LOG(WARNING) << "Brand code file missing: " << brand_file_path.value(); + } base::TrimWhitespaceASCII(brand, base::TRIM_ALL, &brand); return brand; } // For a valid |brand|, sets the brand code and runs |callback|. void SetBrand(base::OnceClosure callback, const std::string& brand) { - if (!IsBrandValid(brand)) + if (!IsBrandValid(brand)) { return; + } g_browser_process->local_state()->SetString(prefs::kRLZBrand, brand); std::move(callback).Run(); } @@ -67,11 +69,13 @@ DCHECK(!content::BrowserThread::IsThreadInitialized( content::BrowserThread::UI) || content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); - if (g_brand_empty) + if (g_brand_empty) { return std::string(); + } // Unit tests do not have prefs. - if (!g_browser_process->local_state()) + if (!g_browser_process->local_state()) { return std::string(); + } return g_browser_process->local_state()->GetString(prefs::kRLZBrand); } @@ -79,8 +83,9 @@ policy::BrowserPolicyConnectorAsh* connector = g_browser_process->platform_part()->browser_policy_connector_ash(); std::optional<policy::MarketSegment> market_segment; - if (connector->IsDeviceEnterpriseManaged()) + if (connector->IsDeviceEnterpriseManaged()) { market_segment = connector->GetEnterpriseMarketSegment(); + } // The rlz brand code may change over time (e.g. when device goes from // unenrolled to enrolled status in OOBE). Prefer not to save it in pref to // avoid using outdated value.
diff --git a/chrome/browser/google/google_brand_code_map_chromeos_unittest.cc b/chrome/browser/google/google_brand_code_map_chromeos_unittest.cc index 363a209..74f92d12 100644 --- a/chrome/browser/google/google_brand_code_map_chromeos_unittest.cc +++ b/chrome/browser/google/google_brand_code_map_chromeos_unittest.cc
@@ -22,4 +22,4 @@ EXPECT_EQ("AAAA", GetRlzBrandCode("AAAA", policy::MarketSegment::UNKNOWN)); EXPECT_EQ("AAAA", GetRlzBrandCode("AAAA", policy::MarketSegment::EDUCATION)); EXPECT_EQ("AAAA", GetRlzBrandCode("AAAA", policy::MarketSegment::ENTERPRISE)); -} \ No newline at end of file +}
diff --git a/chrome/browser/google/google_update_policy_fetcher_win.cc b/chrome/browser/google/google_update_policy_fetcher_win.cc index feafead6..aa76d49f 100644 --- a/chrome/browser/google/google_update_policy_fetcher_win.cc +++ b/chrome/browser/google/google_update_policy_fetcher_win.cc
@@ -59,8 +59,9 @@ PolicyValueOverrideFunction()) { auto policy_entry = ConvertPolicyStatusValueToPolicyEntry(policy, value_override_function); - if (policy_entry) + if (policy_entry) { policies.Set(policy_name, std::move(*policy_entry)); + } } base::Time DateToTime(DATE date) { @@ -88,13 +89,15 @@ { Microsoft::WRL::ComPtr<IPolicyStatusValue> policy; - if (SUCCEEDED(policy_status->get_lastCheckPeriodMinutes(&policy))) + if (SUCCEEDED(policy_status->get_lastCheckPeriodMinutes(&policy))) { AddPolicy(kAutoUpdateCheckPeriodMinutes, policy.Get(), *policies); + } } { Microsoft::WRL::ComPtr<IPolicyStatusValue> policy; - if (SUCCEEDED(policy_status->get_downloadPreferenceGroupPolicy(&policy))) + if (SUCCEEDED(policy_status->get_downloadPreferenceGroupPolicy(&policy))) { AddPolicy(kDownloadPreference, policy.Get(), *policies); + } } { Microsoft::WRL::ComPtr<IPolicyStatus4> policy_status4; @@ -209,8 +212,9 @@ DATE last_checked_time; last_com_res = policy_status->get_lastCheckedTime(&last_checked_time); - if (SUCCEEDED(last_com_res)) + if (SUCCEEDED(last_com_res)) { state->last_checked_time = DateToTime(last_checked_time); + } return state; } @@ -223,8 +227,9 @@ base::Value GetGoogleUpdatePolicyNames() { base::Value::List names; - for (const auto& key_value : GetGoogleUpdatePolicySchemas()) + for (const auto& key_value : GetGoogleUpdatePolicySchemas()) { names.Append(base::Value(key_value.first)); + } return base::Value(std::move(names)); }
diff --git a/chrome/browser/google/google_update_policy_fetcher_win_util.cc b/chrome/browser/google/google_update_policy_fetcher_win_util.cc index 823655e..41832dc 100644 --- a/chrome/browser/google/google_update_policy_fetcher_win_util.cc +++ b/chrome/browser/google/google_update_policy_fetcher_win_util.cc
@@ -30,10 +30,12 @@ constexpr std::wstring_view kDefaultSource = L"Default"; const auto source = std::wstring_view(source_bstr, ::SysStringLen(source_bstr)); - if (source == kCloudSource) + if (source == kCloudSource) { return policy::POLICY_SOURCE_CLOUD; - if (source == kDefaultSource) + } + if (source == kDefaultSource) { return policy::POLICY_SOURCE_ENTERPRISE_DEFAULT; + } DCHECK_EQ(source, std::wstring_view(L"Group Policy")); return policy::POLICY_SOURCE_PLATFORM; } @@ -51,8 +53,9 @@ } base::win::ScopedBstr source; - if (FAILED(policy->get_source(source.Receive()))) + if (FAILED(policy->get_source(source.Receive()))) { return nullptr; + } auto entry = std::make_unique<policy::PolicyMap::Entry>( policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_MACHINE, @@ -75,7 +78,8 @@ : base::Value(base::AsStringPiece16(conflict_value.Get())), nullptr)); } - if (entry->source == policy::POLICY_SOURCE_ENTERPRISE_DEFAULT) + if (entry->source == policy::POLICY_SOURCE_ENTERPRISE_DEFAULT) { entry->SetIsDefaultValue(); + } return entry; }
diff --git a/chrome/browser/google/google_update_policy_fetcher_win_util.h b/chrome/browser/google/google_update_policy_fetcher_win_util.h index 5af93f4d..5fe599e5 100644 --- a/chrome/browser/google/google_update_policy_fetcher_win_util.h +++ b/chrome/browser/google/google_update_policy_fetcher_win_util.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_GOOGLE_GOOGLE_UPDATE_POLICY_FETCHER_WIN_UTIL_H_ #include <wtypes.h> + #include <memory> #include "base/functional/callback.h"
diff --git a/chrome/browser/google/google_update_settings_posix.cc b/chrome/browser/google/google_update_settings_posix.cc index 88c3894..e1547a388 100644 --- a/chrome/browser/google/google_update_settings_posix.cc +++ b/chrome/browser/google/google_update_settings_posix.cc
@@ -88,8 +88,9 @@ base::FilePath consent_dir; base::PathService::Get(chrome::DIR_USER_DATA, &consent_dir); - if (!base::DirectoryExists(consent_dir)) + if (!base::DirectoryExists(consent_dir)) { return false; + } base::AutoLock lock(g_posix_client_id_lock.Get()); @@ -100,8 +101,9 @@ } const std::string& client_id = g_posix_client_id.Get(); - if (base::PathExists(consent_file) && client_id.empty()) + if (base::PathExists(consent_file) && client_id.empty()) { return true; + } if (!base::WriteFile(consent_file, client_id)) { return false; @@ -118,8 +120,9 @@ auto client_info = std::make_unique<metrics::ClientInfo>(); base::AutoLock lock(g_posix_client_id_lock.Get()); - if (g_posix_client_id.Get().empty()) + if (g_posix_client_id.Get().empty()) { return nullptr; + } client_info->client_id = g_posix_client_id.Get(); return client_info; @@ -130,8 +133,9 @@ void GoogleUpdateSettings::StoreMetricsClientInfo( const metrics::ClientInfo& client_info) { // Make sure that user has consented to send crashes. - if (!GoogleUpdateSettings::GetCollectStatsConsent()) + if (!GoogleUpdateSettings::GetCollectStatsConsent()) { return; + } { // Since user has consented, write the metrics id to the file.
diff --git a/chrome/browser/google/google_update_settings_unittest.cc b/chrome/browser/google/google_update_settings_unittest.cc index 15e34b3..299c96aa 100644 --- a/chrome/browser/google/google_update_settings_unittest.cc +++ b/chrome/browser/google/google_update_settings_unittest.cc
@@ -2,9 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/installer/util/google_update_settings.h" + #include <string> -#include "chrome/installer/util/google_update_settings.h" #include "base/compiler_specific.h" #include "base/files/file_util.h" #include "base/path_service.h"
diff --git a/chrome/browser/google/google_update_win.cc b/chrome/browser/google/google_update_win.cc index b90c236..05ea332 100644 --- a/chrome/browser/google/google_update_win.cc +++ b/chrome/browser/google/google_update_win.cc
@@ -123,14 +123,10 @@ // the default. Ignore errors since an attempt to use Google Update may succeed // regardless. void ConfigureProxyBlanket(IUnknown* interface_pointer) { - ::CoSetProxyBlanket(interface_pointer, - RPC_C_AUTHN_DEFAULT, - RPC_C_AUTHZ_DEFAULT, - COLE_DEFAULT_PRINCIPAL, - RPC_C_AUTHN_LEVEL_PKT_PRIVACY, - RPC_C_IMP_LEVEL_IMPERSONATE, - nullptr, - EOAC_DYNAMIC_CLOAKING); + ::CoSetProxyBlanket( + interface_pointer, RPC_C_AUTHN_DEFAULT, RPC_C_AUTHZ_DEFAULT, + COLE_DEFAULT_PRINCIPAL, RPC_C_AUTHN_LEVEL_PKT_PRIVACY, + RPC_C_IMP_LEVEL_IMPERSONATE, nullptr, EOAC_DYNAMIC_CLOAKING); } // Creates a class factory for a COM Local Server class using the Elevation @@ -141,8 +137,9 @@ REFCLSID class_id, REFIID interface_id, void** interface_ptr) { - if (!interface_ptr) + if (!interface_ptr) { return E_POINTER; + } // For Vista+, need to instantiate the class factory via the elevation // moniker. This ensures that the UAC dialog shows up. @@ -166,8 +163,9 @@ bool install_update_if_possible, gfx::AcceleratedWidget elevation_window, Microsoft::WRL::ComPtr<IGoogleUpdate3Web>* google_update) { - if (g_google_update_factory) + if (g_google_update_factory) { return g_google_update_factory->Run(google_update); + } const CLSID& google_update_clsid = system_level_install ? CLSID_GoogleUpdate3WebSystemClass @@ -180,8 +178,7 @@ // can be done by a normal user with the MachineClass. Newer versions of // GoogleUpdate allow normal users to also install system-level updates // without requiring elevation. - if (!system_level_install || - !install_update_if_possible || + if (!system_level_install || !install_update_if_possible || !IsElevationRequiredForSystemLevelUpdates()) { hresult = ::CoGetClassObject(google_update_clsid, CLSCTX_ALL, nullptr, IID_PPV_ARGS(&class_factory)); @@ -191,8 +188,9 @@ hresult = CoGetClassObjectAsAdmin(elevation_window, google_update_clsid, IID_PPV_ARGS(&class_factory)); } - if (FAILED(hresult)) + if (FAILED(hresult)) { return hresult; + } ConfigureProxyBlanket(class_factory.Get()); @@ -225,15 +223,17 @@ // GOOGLE_UPDATE_ERROR_UPDATING or the value of --simulate-update-error-code. std::optional<UpdateCheckResult> GetSimulatedErrorForDebugging() { const base::CommandLine& cmd_line = *base::CommandLine::ForCurrentProcess(); - if (!cmd_line.HasSwitch(switches::kSimulateUpdateHresult)) + if (!cmd_line.HasSwitch(switches::kSimulateUpdateHresult)) { return std::nullopt; + } uint32_t error_from_string = 0; std::string error_switch_value = cmd_line.GetSwitchValueASCII(switches::kSimulateUpdateHresult); HRESULT hresult = E_FAIL; - if (base::HexStringToUInt(error_switch_value, &error_from_string)) + if (base::HexStringToUInt(error_switch_value, &error_from_string)) { hresult = error_from_string; + } GoogleUpdateErrorCode error_code = GOOGLE_UPDATE_ERROR_UPDATING; error_switch_value = @@ -267,11 +267,10 @@ private: friend class base::DeleteHelper<UpdateCheckDriver>; - UpdateCheckDriver( - const std::string& locale, - bool install_update_if_possible, - gfx::AcceleratedWidget elevation_window, - const base::WeakPtr<UpdateCheckDelegate>& delegate); + UpdateCheckDriver(const std::string& locale, + bool install_update_if_possible, + gfx::AcceleratedWidget elevation_window, + const base::WeakPtr<UpdateCheckDelegate>& delegate); // Invokes a completion or error method on all delegates, as appropriate. ~UpdateCheckDriver(); @@ -501,8 +500,9 @@ DCHECK(result_runner_->RunsTasksInCurrentSequence()); for (const auto& delegate : delegates_) { - if (delegate) + if (delegate) { delegate->OnUpgradeProgress(progress, new_version); + } } } @@ -535,8 +535,9 @@ UpdateCheckResult UpdateCheckDriver::BeginUpdateCheckInternal() { const auto simulated_error = GetSimulatedErrorForDebugging(); - if (simulated_error.has_value()) + if (simulated_error.has_value()) { return simulated_error.value(); + } HRESULT hresult = S_OK; @@ -554,14 +555,16 @@ const GoogleUpdateErrorCode error_code = CanUpdateCurrentChrome(chrome_exe, system_level_install_); - if (error_code != GOOGLE_UPDATE_NO_ERROR) + if (error_code != GOOGLE_UPDATE_NO_ERROR) { return {error_code, E_FAIL}; + } hresult = CreateGoogleUpdate3WebClass(system_level_install_, install_update_if_possible_, elevation_window_, &google_update_); - if (FAILED(hresult)) + if (FAILED(hresult)) { return {GOOGLE_UPDATE_ONDEMAND_CLASS_NOT_FOUND, hresult}; + } ConfigureProxyBlanket(google_update_.Get()); } @@ -575,8 +578,9 @@ Microsoft::WRL::ComPtr<IAppBundleWeb> app_bundle; Microsoft::WRL::ComPtr<IDispatch> dispatch; hresult = google_update_->createAppBundleWeb(&dispatch); - if (FAILED(hresult)) + if (FAILED(hresult)) { return {error_code, hresult}; + } hresult = dispatch.CopyTo(system_level_install_ ? __uuidof(IAppBundleWebSystem) @@ -602,8 +606,9 @@ } hresult = app_bundle->initialize(); - if (FAILED(hresult)) + if (FAILED(hresult)) { return {error_code, hresult}; + } if (elevation_window_) { // Likewise, a failure to set the parent window need not block an update // check. @@ -624,15 +629,17 @@ // an auto update is in progress. hresult = app_bundle_->createInstalledApp(base::win::ScopedBstr(app_guid).Get()); - if (FAILED(hresult)) + if (FAILED(hresult)) { return {error_code, hresult}; + } // Move the IAppBundleWeb reference into a local now so that failures from // this point onward result in it being released. Microsoft::WRL::ComPtr<IAppBundleWeb> app_bundle; app_bundle.Swap(app_bundle_); hresult = app_bundle->get_appWeb(0, &dispatch); - if (FAILED(hresult)) + if (FAILED(hresult)) { return {error_code, hresult}; + } Microsoft::WRL::ComPtr<IAppWeb> app; // Chrome queries for the SxS IIDs first, with a fallback to the legacy IID. @@ -650,8 +657,9 @@ ConfigureProxyBlanket(app.Get()); hresult = app_bundle->checkForUpdate(); - if (FAILED(hresult)) + if (FAILED(hresult)) { return {error_code, hresult}; + } app_bundle_.Swap(app_bundle); app_.Swap(app); } @@ -665,8 +673,9 @@ HRESULT* hresult) const { Microsoft::WRL::ComPtr<IDispatch> dispatch; *hresult = app_->get_currentState(&dispatch); - if (FAILED(*hresult)) + if (FAILED(*hresult)) { return false; + } // Chrome queries for the SxS IIDs first, with a fallback to the legacy IID. // Without this change, marshaling can load the typelib from the wrong hive @@ -684,8 +693,9 @@ ConfigureProxyBlanket(current_state->Get()); LONG value = 0; *hresult = (*current_state)->get_stateValue(&value); - if (FAILED(*hresult)) + if (FAILED(*hresult)) { return false; + } *state_value = static_cast<CurrentState>(value); return true; } @@ -710,8 +720,9 @@ // reason it wasn't possible otherwise. LONG long_value = 0; *hresult = current_state->get_errorCode(&long_value); - if (SUCCEEDED(*hresult)) + if (SUCCEEDED(*hresult)) { *hresult = long_value; + } // Special cases: // - Use a custom error code if Google Update repoted that the update was @@ -729,8 +740,9 @@ } base::win::ScopedBstr message; - if (SUCCEEDED(current_state->get_completionMessage(message.Receive()))) + if (SUCCEEDED(current_state->get_completionMessage(message.Receive()))) { error_string->assign(base::as_u16cstr(message.Get()), message.Length()); + } return true; } @@ -756,8 +768,9 @@ if (state_value == STATE_UPDATE_AVAILABLE && !install_update_if_possible_) { base::win::ScopedBstr version; *upgrade_status = UPGRADE_IS_AVAILABLE; - if (SUCCEEDED(current_state->get_availableVersion(version.Receive()))) + if (SUCCEEDED(current_state->get_availableVersion(version.Receive()))) { new_version->assign(base::as_u16cstr(version.Get()), version.Length()); + } return true; } if (state_value == STATE_INSTALL_COMPLETE) { @@ -793,8 +806,9 @@ case STATE_UPDATE_AVAILABLE: { base::win::ScopedBstr version; - if (SUCCEEDED(current_state->get_availableVersion(version.Receive()))) + if (SUCCEEDED(current_state->get_availableVersion(version.Receive()))) { new_version->assign(base::as_u16cstr(version.Get()), version.Length()); + } break; } @@ -866,15 +880,17 @@ status_ = upgrade_status; update_state_.error_code = GOOGLE_UPDATE_NO_ERROR; html_error_message_.clear(); - if (!new_version.empty()) + if (!new_version.empty()) { update_state_.new_version = new_version; + } update_state_.hresult = S_OK; update_state_.installer_exit_code.reset(); } else if (IsIntermediateState(state, state_value, &new_version, &progress)) { bool got_new_version = update_state_.new_version.empty() && !new_version.empty(); - if (got_new_version) + if (got_new_version) { update_state_.new_version = new_version; + } // Give the caller this status update if it differs from the last one given. if (got_new_version || progress != last_reported_progress_) { last_reported_progress_ = progress; @@ -918,8 +934,8 @@ // Some specific result codes have dedicated messages. if (check_result.hresult == GOOPDATE_E_APP_USING_EXTERNAL_UPDATER) { - html_error_message_ = l10n_util::GetStringUTF16( - IDS_ABOUT_BOX_EXTERNAL_UPDATE_IS_RUNNING); + html_error_message_ = + l10n_util::GetStringUTF16(IDS_ABOUT_BOX_EXTERNAL_UPDATE_IS_RUNNING); return; } @@ -931,8 +947,9 @@ html_error_msg += u": " + base::NumberToString16(*update_state_.installer_exit_code); } - if (system_level_install_) + if (system_level_install_) { html_error_msg += u" -- system level"; + } if (error_string.empty()) { html_error_message_ = l10n_util::GetStringFUTF16( IDS_ABOUT_BOX_ERROR_UPDATE_CHECK_FAILED, html_error_msg); @@ -944,14 +961,12 @@ } // namespace - // Globals --------------------------------------------------------------------- -void BeginUpdateCheck( - const std::string& locale, - bool install_update_if_possible, - gfx::AcceleratedWidget elevation_window, - const base::WeakPtr<UpdateCheckDelegate>& delegate) { +void BeginUpdateCheck(const std::string& locale, + bool install_update_if_possible, + gfx::AcceleratedWidget elevation_window, + const base::WeakPtr<UpdateCheckDelegate>& delegate) { UpdateCheckDriver::RunUpdateCheck(locale, install_update_if_possible, elevation_window, delegate); }
diff --git a/chrome/browser/google/google_update_win.h b/chrome/browser/google/google_update_win.h index 940d2cc..b8d9347 100644 --- a/chrome/browser/google/google_update_win.h +++ b/chrome/browser/google/google_update_win.h
@@ -95,11 +95,10 @@ // which should own any necessary elevation UI. Methods on |delegate| will be // invoked on the caller's thread to provide feedback on the operation, with // messages localized to |locale| if possible. -void BeginUpdateCheck( - const std::string& locale, - bool install_update_if_possible, - gfx::AcceleratedWidget elevation_window, - const base::WeakPtr<UpdateCheckDelegate>& delegate); +void BeginUpdateCheck(const std::string& locale, + bool install_update_if_possible, + gfx::AcceleratedWidget elevation_window, + const base::WeakPtr<UpdateCheckDelegate>& delegate); // The state from a completed update check. struct UpdateState {
diff --git a/chrome/browser/google/google_update_win_unittest.cc b/chrome/browser/google/google_update_win_unittest.cc index df3d03c..af5cac66 100644 --- a/chrome/browser/google/google_update_win_unittest.cc +++ b/chrome/browser/google/google_update_win_unittest.cc
@@ -100,7 +100,7 @@ public ICurrentState { public: BEGIN_COM_MAP(MockCurrentState) - COM_INTERFACE_ENTRY(ICurrentState) + COM_INTERFACE_ENTRY(ICurrentState) END_COM_MAP() MockCurrentState() = default; @@ -137,72 +137,72 @@ } // ICurrentState: - MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, - get_stateValue, - HRESULT(LONG *)); + MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_stateValue, HRESULT(LONG*)); MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_availableVersion, - HRESULT(BSTR *)); + HRESULT(BSTR*)); MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_bytesDownloaded, - HRESULT(ULONG *)); + HRESULT(ULONG*)); MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_totalBytesToDownload, - HRESULT(ULONG *)); + HRESULT(ULONG*)); MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_downloadTimeRemainingMs, - HRESULT(LONG *)); + HRESULT(LONG*)); MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_nextRetryTime, - HRESULT(ULONGLONG *)); + HRESULT(ULONGLONG*)); MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_installProgress, - HRESULT(LONG *)); + HRESULT(LONG*)); MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_installTimeRemainingMs, - HRESULT(LONG *)); + HRESULT(LONG*)); MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_isCanceled, - HRESULT(VARIANT_BOOL *)); - MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, - get_errorCode, - HRESULT(LONG *)); - MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, - get_extraCode1, - HRESULT(LONG *)); + HRESULT(VARIANT_BOOL*)); + MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_errorCode, HRESULT(LONG*)); + MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_extraCode1, HRESULT(LONG*)); MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_completionMessage, - HRESULT(BSTR *)); + HRESULT(BSTR*)); MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_installerResultCode, - HRESULT(LONG *)); + HRESULT(LONG*)); MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_installerResultExtraCode1, - HRESULT(LONG *)); + HRESULT(LONG*)); MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_postInstallLaunchCommandLine, - HRESULT(BSTR *)); + HRESULT(BSTR*)); MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_postInstallUrl, - HRESULT(BSTR *)); + HRESULT(BSTR*)); MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_postInstallAction, - HRESULT(LONG *)); + HRESULT(LONG*)); // IDispatch: MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, GetTypeInfoCount, - HRESULT(UINT *)); + HRESULT(UINT*)); MOCK_METHOD3_WITH_CALLTYPE(STDMETHODCALLTYPE, GetTypeInfo, - HRESULT(UINT, LCID, ITypeInfo **)); + HRESULT(UINT, LCID, ITypeInfo**)); MOCK_METHOD5_WITH_CALLTYPE(STDMETHODCALLTYPE, GetIDsOfNames, - HRESULT(REFIID, LPOLESTR *, UINT, LCID, DISPID *)); + HRESULT(REFIID, LPOLESTR*, UINT, LCID, DISPID*)); MOCK_METHOD8_WITH_CALLTYPE(STDMETHODCALLTYPE, Invoke, - HRESULT(DISPID, REFIID, LCID, WORD, DISPPARAMS *, - VARIANT *, EXCEPINFO *, UINT *)); + HRESULT(DISPID, + REFIID, + LCID, + WORD, + DISPPARAMS*, + VARIANT*, + EXCEPINFO*, + UINT*)); private: std::u16string completion_message_; @@ -214,7 +214,7 @@ class MockApp : public CComObjectRootEx<CComSingleThreadModel>, public IAppWeb { public: BEGIN_COM_MAP(MockApp) - COM_INTERFACE_ENTRY(IAppWeb) + COM_INTERFACE_ENTRY(IAppWeb) END_COM_MAP() MockApp() { @@ -227,33 +227,25 @@ MockApp& operator=(const MockApp&) = delete; // IAppWeb: - MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, - get_appId, - HRESULT(BSTR *)); + MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_appId, HRESULT(BSTR*)); MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_currentVersionWeb, - HRESULT(IDispatch **)); + HRESULT(IDispatch**)); MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_nextVersionWeb, - HRESULT(IDispatch **)); + HRESULT(IDispatch**)); MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, get_command, - HRESULT(BSTR, IDispatch **)); - MOCK_METHOD0_WITH_CALLTYPE(STDMETHODCALLTYPE, - cancel, - HRESULT()); + HRESULT(BSTR, IDispatch**)); + MOCK_METHOD0_WITH_CALLTYPE(STDMETHODCALLTYPE, cancel, HRESULT()); MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_currentState, - HRESULT(IDispatch **)); - MOCK_METHOD0_WITH_CALLTYPE(STDMETHODCALLTYPE, - launch, - HRESULT()); - MOCK_METHOD0_WITH_CALLTYPE(STDMETHODCALLTYPE, - uninstall, - HRESULT()); + HRESULT(IDispatch**)); + MOCK_METHOD0_WITH_CALLTYPE(STDMETHODCALLTYPE, launch, HRESULT()); + MOCK_METHOD0_WITH_CALLTYPE(STDMETHODCALLTYPE, uninstall, HRESULT()); MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_serverInstallDataIndex, - HRESULT(BSTR *)); + HRESULT(BSTR*)); MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, put_serverInstallDataIndex, HRESULT(BSTR)); @@ -261,17 +253,23 @@ // IDispatch: MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, GetTypeInfoCount, - HRESULT(UINT *)); + HRESULT(UINT*)); MOCK_METHOD3_WITH_CALLTYPE(STDMETHODCALLTYPE, GetTypeInfo, - HRESULT(UINT, LCID, ITypeInfo **)); + HRESULT(UINT, LCID, ITypeInfo**)); MOCK_METHOD5_WITH_CALLTYPE(STDMETHODCALLTYPE, GetIDsOfNames, - HRESULT(REFIID, LPOLESTR *, UINT, LCID, DISPID *)); + HRESULT(REFIID, LPOLESTR*, UINT, LCID, DISPID*)); MOCK_METHOD8_WITH_CALLTYPE(STDMETHODCALLTYPE, Invoke, - HRESULT(DISPID, REFIID, LCID, WORD, DISPPARAMS *, - VARIANT *, EXCEPINFO *, UINT *)); + HRESULT(DISPID, + REFIID, + LCID, + WORD, + DISPPARAMS*, + VARIANT*, + EXCEPINFO*, + UINT*)); // Adds a MockCurrentState to the back of the sequence to be returned by the // mock IAppWeb. @@ -288,8 +286,8 @@ mock_state->ExpectCompletionMessage(completion_message); if (installer_result_code != -1) { EXPECT_CALL(*mock_state, get_installerResultCode(_)) - .WillRepeatedly(DoAll(SetArgPointee<0>(installer_result_code), - Return(S_OK))); + .WillRepeatedly( + DoAll(SetArgPointee<0>(installer_result_code), Return(S_OK))); } } @@ -359,7 +357,7 @@ public IAppBundleWeb { public: BEGIN_COM_MAP(MockAppBundle) - COM_INTERFACE_ENTRY(IAppBundleWeb) + COM_INTERFACE_ENTRY(IAppBundleWeb) END_COM_MAP() MockAppBundle() = default; @@ -379,61 +377,51 @@ HRESULT()); MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_displayLanguage, - HRESULT(BSTR *)); + HRESULT(BSTR*)); MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, put_displayLanguage, HRESULT(BSTR)); MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, put_parentHWND, HRESULT(ULONG_PTR)); - MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, - get_length, - HRESULT(int *)); + MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_length, HRESULT(int*)); MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, get_appWeb, - HRESULT(int, IDispatch **)); - MOCK_METHOD0_WITH_CALLTYPE(STDMETHODCALLTYPE, - initialize, - HRESULT()); - MOCK_METHOD0_WITH_CALLTYPE(STDMETHODCALLTYPE, - checkForUpdate, - HRESULT()); - MOCK_METHOD0_WITH_CALLTYPE(STDMETHODCALLTYPE, - download, - HRESULT()); - MOCK_METHOD0_WITH_CALLTYPE(STDMETHODCALLTYPE, - install, - HRESULT()); - MOCK_METHOD0_WITH_CALLTYPE(STDMETHODCALLTYPE, - pause, - HRESULT()); - MOCK_METHOD0_WITH_CALLTYPE(STDMETHODCALLTYPE, - resume, - HRESULT()); - MOCK_METHOD0_WITH_CALLTYPE(STDMETHODCALLTYPE, - cancel, - HRESULT()); + HRESULT(int, IDispatch**)); + MOCK_METHOD0_WITH_CALLTYPE(STDMETHODCALLTYPE, initialize, HRESULT()); + MOCK_METHOD0_WITH_CALLTYPE(STDMETHODCALLTYPE, checkForUpdate, HRESULT()); + MOCK_METHOD0_WITH_CALLTYPE(STDMETHODCALLTYPE, download, HRESULT()); + MOCK_METHOD0_WITH_CALLTYPE(STDMETHODCALLTYPE, install, HRESULT()); + MOCK_METHOD0_WITH_CALLTYPE(STDMETHODCALLTYPE, pause, HRESULT()); + MOCK_METHOD0_WITH_CALLTYPE(STDMETHODCALLTYPE, resume, HRESULT()); + MOCK_METHOD0_WITH_CALLTYPE(STDMETHODCALLTYPE, cancel, HRESULT()); MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, downloadPackage, HRESULT(BSTR, BSTR)); MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_currentState, - HRESULT(VARIANT *)); + HRESULT(VARIANT*)); // IDispatch: MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, GetTypeInfoCount, - HRESULT(UINT *)); + HRESULT(UINT*)); MOCK_METHOD3_WITH_CALLTYPE(STDMETHODCALLTYPE, GetTypeInfo, - HRESULT(UINT, LCID, ITypeInfo **)); + HRESULT(UINT, LCID, ITypeInfo**)); MOCK_METHOD5_WITH_CALLTYPE(STDMETHODCALLTYPE, GetIDsOfNames, - HRESULT(REFIID, LPOLESTR *, UINT, LCID, DISPID *)); + HRESULT(REFIID, LPOLESTR*, UINT, LCID, DISPID*)); MOCK_METHOD8_WITH_CALLTYPE(STDMETHODCALLTYPE, Invoke, - HRESULT(DISPID, REFIID, LCID, WORD, DISPPARAMS *, - VARIANT *, EXCEPINFO *, UINT *)); + HRESULT(DISPID, + REFIID, + LCID, + WORD, + DISPPARAMS*, + VARIANT*, + EXCEPINFO*, + UINT*)); // Returns a MockApp for the given |app_guid| that will be returned by this // instance's get_appWeb method. The returned instance is only valid for use @@ -452,8 +440,7 @@ // successive indices. mock_app->AddRef(); EXPECT_CALL(*this, get_appWeb(0, _)) - .WillOnce(DoAll(SetArgPointee<1>(mock_app), - Return(S_OK))); + .WillOnce(DoAll(SetArgPointee<1>(mock_app), Return(S_OK))); return mock_app; } @@ -465,7 +452,7 @@ public IGoogleUpdate3Web { public: BEGIN_COM_MAP(MockGoogleUpdate) - COM_INTERFACE_ENTRY(IGoogleUpdate3Web) + COM_INTERFACE_ENTRY(IGoogleUpdate3Web) END_COM_MAP() MockGoogleUpdate() = default; @@ -481,17 +468,23 @@ // IDispatch: MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, GetTypeInfoCount, - HRESULT(UINT *)); + HRESULT(UINT*)); MOCK_METHOD3_WITH_CALLTYPE(STDMETHODCALLTYPE, GetTypeInfo, - HRESULT(UINT, LCID, ITypeInfo **)); + HRESULT(UINT, LCID, ITypeInfo**)); MOCK_METHOD5_WITH_CALLTYPE(STDMETHODCALLTYPE, GetIDsOfNames, - HRESULT(REFIID, LPOLESTR *, UINT, LCID, DISPID *)); + HRESULT(REFIID, LPOLESTR*, UINT, LCID, DISPID*)); MOCK_METHOD8_WITH_CALLTYPE(STDMETHODCALLTYPE, Invoke, - HRESULT(DISPID, REFIID, LCID, WORD, DISPPARAMS *, - VARIANT *, EXCEPINFO *, UINT *)); + HRESULT(DISPID, + REFIID, + LCID, + WORD, + DISPPARAMS*, + VARIANT*, + EXCEPINFO*, + UINT*)); // Returns a MockAppBundle that will be returned by this instance's // createAppBundleWeb method. The returned instance is only valid for use in @@ -501,8 +494,7 @@ CComObject<MockAppBundle>* mock_app_bundle = nullptr; EXPECT_EQ(S_OK, CComObject<MockAppBundle>::CreateInstance(&mock_app_bundle)); - EXPECT_CALL(*mock_app_bundle, initialize()) - .WillOnce(Return(S_OK)); + EXPECT_CALL(*mock_app_bundle, initialize()).WillOnce(Return(S_OK)); // Give this instance a ref to the bundle which it will return when created. mock_app_bundle->AddRef(); EXPECT_CALL(*this, createAppBundleWeb(_)) @@ -637,10 +629,12 @@ CComObject<MockAppBundle>* app_bundle = google_update->MakeAppBundle(); CComObject<MockApp>* app = app_bundle->MakeApp(kChromeGuid); - if (mock_app_bundle) + if (mock_app_bundle) { *mock_app_bundle = app_bundle; - if (mock_app) + } + if (mock_app) { *mock_app = app; + } } void TearDown() override { @@ -748,8 +742,7 @@ MakeGoogleUpdateMocks(&mock_app_bundle, nullptr); // checkForUpdate will fail. - EXPECT_CALL(*mock_app_bundle, checkForUpdate()) - .WillOnce(Return(E_FAIL)); + EXPECT_CALL(*mock_app_bundle, checkForUpdate()).WillOnce(Return(E_FAIL)); EXPECT_CALL(mock_update_check_delegate_, OnError(GOOGLE_UPDATE_ONDEMAND_CLASS_REPORTED_ERROR, _, _)); @@ -772,8 +765,7 @@ MakeGoogleUpdateMocks(&mock_app_bundle, &mock_app); // Expect the bundle to be called on to start the update. - EXPECT_CALL(*mock_app_bundle, checkForUpdate()) - .WillOnce(Return(S_OK)); + EXPECT_CALL(*mock_app_bundle, checkForUpdate()).WillOnce(Return(S_OK)); mock_app->PushState(STATE_INIT); mock_app->PushState(STATE_CHECKING_FOR_UPDATE); @@ -800,8 +792,7 @@ MakeGoogleUpdateMocks(&mock_app_bundle, &mock_app); // Expect the bundle to be called on to start the update. - EXPECT_CALL(*mock_app_bundle, checkForUpdate()) - .WillOnce(Return(S_OK)); + EXPECT_CALL(*mock_app_bundle, checkForUpdate()).WillOnce(Return(S_OK)); mock_app->PushState(STATE_INIT); mock_app->PushState(STATE_CHECKING_FOR_UPDATE); @@ -825,8 +816,7 @@ MakeGoogleUpdateMocks(&mock_app_bundle, &mock_app); // Expect the bundle to be called on to start the update. - EXPECT_CALL(*mock_app_bundle, checkForUpdate()) - .WillOnce(Return(S_OK)); + EXPECT_CALL(*mock_app_bundle, checkForUpdate()).WillOnce(Return(S_OK)); mock_app->PushState(STATE_INIT); mock_app->PushState(STATE_CHECKING_FOR_UPDATE); @@ -849,8 +839,7 @@ MakeGoogleUpdateMocks(&mock_app_bundle, &mock_app); // Expect the bundle to be called on to start the update. - EXPECT_CALL(*mock_app_bundle, checkForUpdate()) - .WillOnce(Return(S_OK)); + EXPECT_CALL(*mock_app_bundle, checkForUpdate()).WillOnce(Return(S_OK)); mock_app->PushState(STATE_INIT); mock_app->PushState(STATE_CHECKING_FOR_UPDATE); @@ -872,11 +861,9 @@ MakeGoogleUpdateMocks(&mock_app_bundle, &mock_app); // Expect the bundle to be called on to start the update. - EXPECT_CALL(*mock_app_bundle, checkForUpdate()) - .WillOnce(Return(S_OK)); + EXPECT_CALL(*mock_app_bundle, checkForUpdate()).WillOnce(Return(S_OK)); // Expect the bundle to be called on to start the install. - EXPECT_CALL(*mock_app_bundle, install()) - .WillOnce(Return(S_OK)); + EXPECT_CALL(*mock_app_bundle, install()).WillOnce(Return(S_OK)); mock_app->PushState(STATE_INIT); mock_app->PushState(STATE_CHECKING_FOR_UPDATE); @@ -923,11 +910,9 @@ MakeGoogleUpdateMocks(&mock_app_bundle, &mock_app); // Expect the bundle to be called on to start the update. - EXPECT_CALL(*mock_app_bundle, checkForUpdate()) - .WillOnce(Return(S_OK)); + EXPECT_CALL(*mock_app_bundle, checkForUpdate()).WillOnce(Return(S_OK)); // Expect the bundle to be called on to start the install. - EXPECT_CALL(*mock_app_bundle, install()) - .WillOnce(Return(S_OK)); + EXPECT_CALL(*mock_app_bundle, install()).WillOnce(Return(S_OK)); mock_app->PushState(STATE_INIT); mock_app->PushState(STATE_CHECKING_FOR_UPDATE);
diff --git a/chrome/browser/infobars/infobar_observer.cc b/chrome/browser/infobars/infobar_observer.cc index 8f4c6ac..a690dc54 100644 --- a/chrome/browser/infobars/infobar_observer.cc +++ b/chrome/browser/infobars/infobar_observer.cc
@@ -7,8 +7,9 @@ InfoBarObserver::InfoBarObserver(infobars::InfoBarManager* manager, Type type) : type_(type) { // There may be no |manager| if the browser window is currently closing. - if (manager) + if (manager) { infobar_observation_.Observe(manager); + } } InfoBarObserver::~InfoBarObserver() = default; @@ -16,8 +17,9 @@ void InfoBarObserver::Wait() { // When there is no manager being observed, there is nothing to wait on, so // return immediately. - if (infobar_observation_.IsObserving()) + if (infobar_observation_.IsObserving()) { run_loop_.Run(); + } } void InfoBarObserver::OnInfoBarAdded(infobars::InfoBar* infobar) { @@ -33,13 +35,15 @@ } void InfoBarObserver::OnManagerShuttingDown(infobars::InfoBarManager* manager) { - if (run_loop_.running()) + if (run_loop_.running()) { run_loop_.Quit(); + } DCHECK(infobar_observation_.IsObservingSource(manager)); infobar_observation_.Reset(); } void InfoBarObserver::OnNotified(Type type) { - if (type == type_) + if (type == type_) { run_loop_.Quit(); + } }
diff --git a/chrome/browser/infobars/infobar_responder.h b/chrome/browser/infobars/infobar_responder.h index abb907c..390c6c2 100644 --- a/chrome/browser/infobars/infobar_responder.h +++ b/chrome/browser/infobars/infobar_responder.h
@@ -11,7 +11,7 @@ namespace infobars { class ContentInfoBarManager; class InfoBar; -} +} // namespace infobars class ConfirmInfoBarDelegate; @@ -22,11 +22,7 @@ // The asynchronous response matches how real users will use the infobar. class InfoBarResponder : public infobars::InfoBarManager::Observer { public: - enum AutoResponseType { - ACCEPT, - DENY, - DISMISS - }; + enum AutoResponseType { ACCEPT, DENY, DISMISS }; // The responder will asynchronously perform the requested |response|. InfoBarResponder(infobars::ContentInfoBarManager* infobar_manager,
diff --git a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc index 4cc90abb2..f85a76a 100644 --- a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc +++ b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc
@@ -325,7 +325,6 @@ startup_visibility = metrics::StartupVisibility::kForeground; #endif // BUILDFLAG(IS_ANDROID) - std::string client_id; metrics_state_manager_ = metrics::MetricsStateManager::Create( local_state_, enabled_state_provider_.get(), GetRegistryBackupKey(), user_data_dir, startup_visibility, @@ -337,8 +336,7 @@ switches::kEnableGpuBenchmarking), }, base::BindRepeating(&PostStoreMetricsClientInfo), - base::BindRepeating(&GoogleUpdateSettings::LoadMetricsClientInfo), - client_id); + base::BindRepeating(&GoogleUpdateSettings::LoadMetricsClientInfo)); } return metrics_state_manager_.get(); }
diff --git a/chrome/browser/navigation_predictor/navigation_predictor_preconnect_client.cc b/chrome/browser/navigation_predictor/navigation_predictor_preconnect_client.cc index 8628473..15cb4379 100644 --- a/chrome/browser/navigation_predictor/navigation_predictor_preconnect_client.cc +++ b/chrome/browser/navigation_predictor/navigation_predictor_preconnect_client.cc
@@ -199,15 +199,16 @@ // Set/Reset the timer to fire after the preconnect times out. Add an extra // delay to make sure the preconnect has expired if it wasn't used. timer_.Start( - FROM_HERE, - base::Seconds(base::GetFieldTrialParamByFeatureAsInt( - net::features::kNetUnusedIdleSocketTimeout, - "unused_idle_socket_timeout_seconds", 60)) + - retry_delay, + FROM_HERE, base::Seconds(GetPreconnectInterval()) + retry_delay, base::BindOnce(&NavigationPredictorPreconnectClient::MaybePreconnectNow, base::Unretained(this), preconnects_attempted + 1)); } +int NavigationPredictorPreconnectClient::GetPreconnectInterval() const { + constexpr int kPreconnectIntervalSec = 60; + return preconnect_interval_for_testing_.value_or(kPreconnectIntervalSec); +} + bool NavigationPredictorPreconnectClient::IsSearchEnginePage() const { auto* template_service = TemplateURLServiceFactory::GetForProfile( Profile::FromBrowserContext(browser_context_)); @@ -240,4 +241,8 @@ bool NavigationPredictorPreconnectClient:: enable_preconnects_for_local_ips_for_testing_ = false; +std::optional<int> + NavigationPredictorPreconnectClient::preconnect_interval_for_testing_ = + std::nullopt; + WEB_CONTENTS_USER_DATA_KEY_IMPL(NavigationPredictorPreconnectClient);
diff --git a/chrome/browser/navigation_predictor/navigation_predictor_preconnect_client.h b/chrome/browser/navigation_predictor/navigation_predictor_preconnect_client.h index f2adde8..420808c0 100644 --- a/chrome/browser/navigation_predictor/navigation_predictor_preconnect_client.h +++ b/chrome/browser/navigation_predictor/navigation_predictor_preconnect_client.h
@@ -39,6 +39,10 @@ enable_preconnects_for_local_ips; } + static void SetPreconnectIntervalForTesting(int interval) { + preconnect_interval_for_testing_ = interval; + } + private: friend class content::WebContentsUserData< NavigationPredictorPreconnectClient>; @@ -67,6 +71,8 @@ std::optional<bool> IsPubliclyRoutable( content::NavigationHandle* navigation_handle) const; + int GetPreconnectInterval() const; + // Used to get keyed services. const raw_ptr<content::BrowserContext> browser_context_; @@ -74,6 +80,9 @@ // false. Set to true only for testing. static bool enable_preconnects_for_local_ips_for_testing_; + // Set preconnct interval for testing. + static std::optional<int> preconnect_interval_for_testing_; + // Current visibility state of the web contents. content::Visibility current_visibility_;
diff --git a/chrome/browser/navigation_predictor/navigation_predictor_preconnect_client_browsertest.cc b/chrome/browser/navigation_predictor/navigation_predictor_preconnect_client_browsertest.cc index 8c3a84e..898598f 100644 --- a/chrome/browser/navigation_predictor/navigation_predictor_preconnect_client_browsertest.cc +++ b/chrome/browser/navigation_predictor/navigation_predictor_preconnect_client_browsertest.cc
@@ -177,15 +177,14 @@ class NavigationPredictorPreconnectClientBrowserTestWithUnusedIdleSocketTimeout : public NavigationPredictorPreconnectClientBrowserTest { public: - NavigationPredictorPreconnectClientBrowserTestWithUnusedIdleSocketTimeout() - : NavigationPredictorPreconnectClientBrowserTest() { - feature_list_.InitAndEnableFeatureWithParameters( - net::features::kNetUnusedIdleSocketTimeout, - {{"unused_idle_socket_timeout_seconds", "0"}}); - } + NavigationPredictorPreconnectClientBrowserTestWithUnusedIdleSocketTimeout() = + default; private: - base::test::ScopedFeatureList feature_list_; + void SetUpOnMainThread() override { + NavigationPredictorPreconnectClientBrowserTest::SetUpOnMainThread(); + NavigationPredictorPreconnectClient::SetPreconnectIntervalForTesting(0); + } }; // Test that we preconnect after the last preconnect timed out.
diff --git a/chrome/browser/navigation_predictor/search_engine_preconnector.cc b/chrome/browser/navigation_predictor/search_engine_preconnector.cc index 609cf03..2cda759 100644 --- a/chrome/browser/navigation_predictor/search_engine_preconnector.cc +++ b/chrome/browser/navigation_predictor/search_engine_preconnector.cc
@@ -75,7 +75,6 @@ void SearchEnginePreconnector::PreconnectDSE() { DCHECK(!browser_context_->IsOffTheRecord()); DCHECK(!timer_.IsRunning()); - if (!base::FeatureList::IsEnabled(features::kPreconnectToSearch)) return; @@ -131,10 +130,7 @@ // Set/Reset the timer to fire after the preconnect times out. Add an extra // delay to make sure the preconnect has expired if it wasn't used. timer_.Start(FROM_HERE, - base::Seconds(base::GetFieldTrialParamByFeatureAsInt( - net::features::kNetUnusedIdleSocketTimeout, - "unused_idle_socket_timeout_seconds", 60)) + - retry_delay, + base::Seconds(GetPreconnectIntervalSec()) + retry_delay, base::BindOnce(&SearchEnginePreconnector::PreconnectDSE, base::Unretained(this))); } @@ -157,3 +153,11 @@ return keyed_service && keyed_service->IsBrowserAppLikelyInForeground(); } + +int SearchEnginePreconnector::GetPreconnectIntervalSec() const { + constexpr int kPreconnectIntervalSec = 60; + return preconnect_interval_for_testing_.value_or(kPreconnectIntervalSec); +} + +std::optional<int> SearchEnginePreconnector::preconnect_interval_for_testing_ = + std::nullopt;
diff --git a/chrome/browser/navigation_predictor/search_engine_preconnector.h b/chrome/browser/navigation_predictor/search_engine_preconnector.h index 42302b0..48253f2 100644 --- a/chrome/browser/navigation_predictor/search_engine_preconnector.h +++ b/chrome/browser/navigation_predictor/search_engine_preconnector.h
@@ -38,6 +38,13 @@ // Stops preconnecting to the DSE. Called on app background. void StopPreconnecting(); + // TODO:(crbug.com/384636714): Remove this function and + // `preconnect_interval_for_testing_` once we reintroduce + // `kSearchEnginePreconnectorInterval`. + static void SetPreconnectIntervalForTesting(int interval) { + preconnect_interval_for_testing_ = interval; + } + private: // Preconnects to the default search engine synchronously. Preconnects in // credentialed and uncredentialed mode. @@ -50,6 +57,12 @@ // interacted by the user. bool IsBrowserAppLikelyInForeground() const; + int GetPreconnectIntervalSec() const; + + // TODO:(crbug.com/384636714): Remove this once we reintroduce + // `kSearchEnginePreconnectorInterval`. + static std::optional<int> preconnect_interval_for_testing_; + // Used to get keyed services. const raw_ptr<content::BrowserContext> browser_context_;
diff --git a/chrome/browser/navigation_predictor/search_engine_preconnector_browsertest.cc b/chrome/browser/navigation_predictor/search_engine_preconnector_browsertest.cc index abc3a8383..5375f741 100644 --- a/chrome/browser/navigation_predictor/search_engine_preconnector_browsertest.cc +++ b/chrome/browser/navigation_predictor/search_engine_preconnector_browsertest.cc
@@ -126,15 +126,14 @@ if (PreconnectWithPrivacyModeEnabled()) { feature_list_.InitWithFeaturesAndParameters( {{features::kPreconnectToSearch, {{"startup_delay_ms", "1000000"}}}, - {net::features::kNetUnusedIdleSocketTimeout, - {{"unused_idle_socket_timeout_seconds", "0"}}}, {features::kPreconnectToSearchWithPrivacyModeEnabled, {}}}, {}); } else { feature_list_.InitWithFeaturesAndParameters( - {{features::kPreconnectToSearch, {{"startup_delay_ms", "1000000"}}}, - {net::features::kNetUnusedIdleSocketTimeout, - {{"unused_idle_socket_timeout_seconds", "0"}}}}, + { + {features::kPreconnectToSearch, + {{"startup_delay_ms", "1000000"}}}, + }, {{features::kPreconnectToSearchWithPrivacyModeEnabled}}); } } @@ -142,6 +141,12 @@ bool PreconnectWithPrivacyModeEnabled() const { return GetParam(); } ~SearchEnginePreconnectorNoDelaysBrowserTest() override = default; + + private: + void SetUpOnMainThread() override { + SearchEnginePreconnectorBrowserTest::SetUpOnMainThread(); + SearchEnginePreconnector::SetPreconnectIntervalForTesting(0); + } }; INSTANTIATE_TEST_SUITE_P(All, @@ -409,9 +414,9 @@ public: SearchEnginePreconnectorKeepSocketBrowserTest() { feature_list_.InitWithFeaturesAndParameters( - {{features::kPreconnectToSearch, {{"startup_delay_ms", "1000000"}}}, - {net::features::kNetUnusedIdleSocketTimeout, - {{"unused_idle_socket_timeout_seconds", "60"}}}}, + { + {features::kPreconnectToSearch, {{"startup_delay_ms", "1000000"}}}, + }, {}); } @@ -474,10 +479,10 @@ public: SearchEnginePreconnectorDesktopAutoStartBrowserTest() { feature_list_.InitWithFeaturesAndParameters( - {{features::kPreconnectToSearch, {{"startup_delay_ms", "0"}}}, - {net::features::kNetUnusedIdleSocketTimeout, - {{"unused_idle_socket_timeout_seconds", "0"}}}}, - {}); + {{features::kPreconnectToSearch, {{"startup_delay_ms", "0"}}}}, {}); + // Set the interval before starting the test so that we can test from + // browser start. + SearchEnginePreconnector::SetPreconnectIntervalForTesting(0); } ~SearchEnginePreconnectorDesktopAutoStartBrowserTest() override = default; @@ -498,15 +503,12 @@ if (PreconnectWithPrivacyModeEnabled()) { feature_list_.InitWithFeaturesAndParameters( {{features::kPreconnectToSearch, {{"startup_delay_ms", "1000000"}}}, - {net::features::kNetUnusedIdleSocketTimeout, - {{"unused_idle_socket_timeout_seconds", "60"}}}, {features::kPreconnectToSearchWithPrivacyModeEnabled, {}}}, {}); } else { feature_list_.InitWithFeaturesAndParameters( - {{features::kPreconnectToSearch, {{"startup_delay_ms", "1000000"}}}, - {net::features::kNetUnusedIdleSocketTimeout, - {{"unused_idle_socket_timeout_seconds", "60"}}}}, + {{features::kPreconnectToSearch, + {{"startup_delay_ms", "1000000"}}}}, {{features::kPreconnectToSearchWithPrivacyModeEnabled}}); } } @@ -515,6 +517,12 @@ bool PreconnectWithPrivacyModeEnabled() const { return GetParam(); } ~SearchEnginePreconnectorEnabledOnlyBrowserTest() override = default; + + private: + void SetUpOnMainThread() override { + SearchEnginePreconnectorBrowserTest::SetUpOnMainThread(); + SearchEnginePreconnector::SetPreconnectIntervalForTesting(0); + } }; INSTANTIATE_TEST_SUITE_P(All,
diff --git a/chrome/browser/resources/data_sharing/data_sharing_app.ts b/chrome/browser/resources/data_sharing/data_sharing_app.ts index ef9a948..0f2f833e 100644 --- a/chrome/browser/resources/data_sharing/data_sharing_app.ts +++ b/chrome/browser/resources/data_sharing/data_sharing_app.ts
@@ -134,6 +134,9 @@ loadTimeData.getString('peopleWithAccessSubtitleManageFlow'), [StaticMessageKey.ERROR_DIALOG_CONTENT]: loadTimeData.getString('errorDialogContent'), + [StaticMessageKey.GROUP_FULL_TITLE]: loadTimeData.getString('groupFull'), + [StaticMessageKey.GROUP_FULL_CONTENT]: + loadTimeData.getString('ownerCannotShare'), }, dynamic: { /** Invite flow */
diff --git a/chrome/browser/resources/data_sharing/data_sharing_sdk_types.ts b/chrome/browser/resources/data_sharing/data_sharing_sdk_types.ts index df42726..54e0616 100644 --- a/chrome/browser/resources/data_sharing/data_sharing_sdk_types.ts +++ b/chrome/browser/resources/data_sharing/data_sharing_sdk_types.ts
@@ -121,6 +121,8 @@ OWNER, PEOPLE_WITH_ACCESS, PEOPLE_WITH_ACCESS_SUBTITLE_MANAGE_FLOW, + GROUP_FULL_TITLE, + GROUP_FULL_CONTENT, } export const enum DynamicMessageKey {
diff --git a/chrome/browser/resources/tab_search/BUILD.gn b/chrome/browser/resources/tab_search/BUILD.gn index e643dd7..06e7993 100644 --- a/chrome/browser/resources/tab_search/BUILD.gn +++ b/chrome/browser/resources/tab_search/BUILD.gn
@@ -15,6 +15,7 @@ static_files = [ "alert_indicators/tab_audio_muting_rounded.svg", "alert_indicators/tab_audio_rounded.svg", + "alert_indicators/tab_media_glic_active.svg", "alert_indicators/tab_media_recording.svg", "tab_search.html", ]
diff --git a/chrome/browser/resources/tab_search/alert_indicators/tab_media_glic_active.svg b/chrome/browser/resources/tab_search/alert_indicators/tab_media_glic_active.svg new file mode 100644 index 0000000..a3b213b --- /dev/null +++ b/chrome/browser/resources/tab_search/alert_indicators/tab_media_glic_active.svg
@@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 -960 960 960"><path d="M792-576v-120H672v-72h120q30 0 51 21.15T864-696v120h-72Zm-696 0v-120q0-30 21.15-51T168-768h120v72H168v120H96Zm576 384v-72h120v-120h72v120q0 30-21.15 51T792-192H672Zm-504 0q-30 0-51-21.15T96-264v-120h72v120h120v72H168Zm72-144v-288h480v288H240Zm72-72h336v-144H312v144Zm0 0v-144 144Z"/></svg> \ No newline at end of file
diff --git a/chrome/browser/resources/tab_search/tab_search_item.css b/chrome/browser/resources/tab_search/tab_search_item.css index 02d9437..588742c 100644 --- a/chrome/browser/resources/tab_search/tab_search_item.css +++ b/chrome/browser/resources/tab_search/tab_search_item.css
@@ -14,6 +14,7 @@ :host { --audio-icon-color: var(--color-tab-search-media-icon); + --glic-active-icon-color: var(--color-tab-search-media-glic-active-icon); --media-recording-icon-color: var(--color-tab-search-media-recording-icon); } @@ -150,10 +151,15 @@ } #mediaAlert[class = 'audio-muting'] { --webkit-mask-image: url(alert_indicators/tab_audio_muting_rounded.svg); + -webkit-mask-image: url(alert_indicators/tab_audio_muting_rounded.svg); background-color: var(--audio-icon-color); } +#mediaAlert[class = 'glic-accessing'] { + -webkit-mask-image: url(alert_indicators/tab_media_glic_active.svg); + background-color: var(--glic-active-icon-color); +} + #iconContainer { align-items: center; background: var(--tab-search-favicon-background,
diff --git a/chrome/browser/resources/tab_search/tab_search_item.ts b/chrome/browser/resources/tab_search/tab_search_item.ts index bb2446a..1153990 100644 --- a/chrome/browser/resources/tab_search/tab_search_item.ts +++ b/chrome/browser/resources/tab_search/tab_search_item.ts
@@ -202,6 +202,8 @@ return 'audio-playing'; case TabAlertState.kAudioMuting: return 'audio-muting'; + case TabAlertState.kGlicAccessing: + return 'glic-accessing'; default: return ''; }
diff --git a/chrome/browser/themes/browser_theme_pack.cc b/chrome/browser/themes/browser_theme_pack.cc index af886c7..7420c0c8 100644 --- a/chrome/browser/themes/browser_theme_pack.cc +++ b/chrome/browser/themes/browser_theme_pack.cc
@@ -394,8 +394,7 @@ // if the ImageSkiaRep for the target scale factor isn't available. class ThemeImageSource : public gfx::ImageSkiaSource { public: - explicit ThemeImageSource(const gfx::ImageSkia& source) : source_(source) { - } + explicit ThemeImageSource(const gfx::ImageSkia& source) : source_(source) {} ThemeImageSource(const ThemeImageSource&) = delete; ThemeImageSource& operator=(const ThemeImageSource&) = delete; @@ -403,8 +402,9 @@ ~ThemeImageSource() override = default; gfx::ImageSkiaRep GetImageForScale(float scale) override { - if (source_.HasRepresentation(scale)) + if (source_.HasRepresentation(scale)) { return source_.GetRepresentation(scale); + } const gfx::ImageSkiaRep& rep_100p = source_.GetRepresentation(1.0f); SkBitmap scaled_bitmap = CreateLowQualityResizedBitmap( rep_100p.GetBitmap(), ui::k100Percent, @@ -439,8 +439,9 @@ // Look up the bitmap for |scale factor| in the bitmap map. If found // return it. BitmapMap::const_iterator exact_bitmap_it = bitmap_map_.find(scale_factor); - if (exact_bitmap_it != bitmap_map_.end()) + if (exact_bitmap_it != bitmap_map_.end()) { return gfx::ImageSkiaRep(exact_bitmap_it->second, scale); + } // Look up the raw PNG data for |scale_factor| in the png map. If found, // decode it, store the result in the bitmap map and return it. @@ -466,8 +467,9 @@ available_png_it = png_it; } } - if (available_png_it == png_map_.end()) + if (available_png_it == png_map_.end()) { return gfx::ImageSkiaRep(); + } ui::ResourceScaleFactor available_scale_factor = available_png_it->first; // Look up the bitmap for |available_scale_factor| in the bitmap map. @@ -488,9 +490,7 @@ // Scale the available bitmap to the desired scale factor, store the result // in the bitmap map and return it. SkBitmap scaled_bitmap = CreateLowQualityResizedBitmap( - available_bitmap_it->second, - available_scale_factor, - scale_factor); + available_bitmap_it->second, available_scale_factor, scale_factor); bitmap_map_[scale_factor] = scaled_bitmap; return gfx::ImageSkiaRep(scaled_bitmap, scale); } @@ -577,8 +577,9 @@ void Draw(gfx::Canvas* canvas) override { canvas->DrawColor(background_color_); - if (!bg_image_.isNull()) + if (!bg_image_.isNull()) { canvas->DrawImageInt(bg_image_, 0, 0); + } } private: @@ -625,10 +626,10 @@ } else { // When not using a data_pack, the memory is allocated and must be freed. delete header_; - delete [] tints_; - delete [] colors_; - delete [] display_properties_; - delete [] source_images_; + delete[] tints_; + delete[] colors_; + delete[] display_properties_; + delete[] source_images_; } } @@ -641,8 +642,9 @@ colors_[i].color = color; return; } - if (colors_[i].id == -1 && first_available_color == -1) + if (colors_[i].id == -1 && first_available_color == -1) { first_available_color = i; + } } DCHECK_NE(-1, first_available_color); @@ -652,8 +654,9 @@ void BrowserThemePack::SetColorIfUnspecified(int id, SkColor color) { SkColor temp_color; - if (!GetColor(id, &temp_color)) + if (!GetColor(id, &temp_color)) { SetColor(id, color); + } } void BrowserThemePack::SetTint(int id, color_utils::HSL tint) { @@ -667,8 +670,9 @@ tints_[i].l = tint.l; return; } - if (tints_[i].id == -1 && first_available_index == -1) + if (tints_[i].id == -1 && first_available_index == -1) { first_available_index = i; + } } DCHECK_NE(-1, first_available_index); @@ -687,8 +691,9 @@ display_properties_[i].property = value; return; } - if (display_properties_[i].id == -1 && first_available_index == -1) + if (display_properties_[i].id == -1 && first_available_index == -1) { first_available_index = i; + } } DCHECK_NE(-1, first_available_index); @@ -730,8 +735,9 @@ extension->path(), &file_paths); pack->BuildSourceImagesArray(file_paths); - if (!pack->LoadRawBitmapsTo(file_paths, &pack->images_)) + if (!pack->LoadRawBitmapsTo(file_paths, &pack->images_)) { return; + } pack->AdjustThemePack(); @@ -741,7 +747,8 @@ // static scoped_refptr<BrowserThemePack> BrowserThemePack::BuildFromDataPack( - const base::FilePath& path, const std::string& expected_id) { + const base::FilePath& path, + const std::string& expected_id) { DCHECK_CURRENTLY_ON(BrowserThread::UI); // Allow IO on UI thread due to deep-seated theme design issues. // (see http://crbug.com/80206) @@ -872,8 +879,9 @@ // Always use alternate logo (not colorful one) for all backgrounds except // white. - if (colors.active_tab_color != SK_ColorWHITE) + if (colors.active_tab_color != SK_ColorWHITE) { pack->SetDisplayProperty(TP::NTP_LOGO_ALTERNATE, 1); + } // Don't change frame color for inactive window. pack->SetTint(TP::TINT_FRAME_INACTIVE, {-1, -1, -1}); @@ -1024,20 +1032,23 @@ gfx::Image BrowserThemePack::GetImageNamed(int idr_id) const { PersistentID prs_id = GetPersistentIDByIDR(idr_id); - if (prs_id == PersistentID::kInvalid) + if (prs_id == PersistentID::kInvalid) { return gfx::Image(); + } // Check if the image is cached. ImageCache::const_iterator image_iter = images_.find(prs_id); - if (image_iter != images_.end()) + if (image_iter != images_.end()) { return image_iter->second; + } ThemeImagePngSource::PngMap png_map; for (size_t i = 0; i < scale_factors_.size(); ++i) { scoped_refptr<base::RefCountedMemory> memory = GetRawData(idr_id, scale_factors_[i]); - if (memory.get()) + if (memory.get()) { png_map[scale_factors_[i]] = memory; + } } if (!png_map.empty()) { gfx::ImageSkia image_skia(std::make_unique<ThemeImagePngSource>(png_map), @@ -1073,8 +1084,9 @@ bool BrowserThemePack::HasCustomImage(int idr_id) const { PersistentID prs_id = GetPersistentIDByIDR(idr_id); - if (prs_id == PersistentID::kInvalid) + if (prs_id == PersistentID::kInvalid) { return false; + } SourceImage* img = source_images_; for (; img->id != -1; ++img) { @@ -1138,8 +1150,9 @@ SkColor color; for (const auto& entry : kThemePropertiesMap) { - if (GetColor(entry.property_id, &color)) + if (GetColor(entry.property_id, &color)) { mixer[entry.color_id] = {color}; + } } if (GetColor(TP::COLOR_TOOLBAR_BUTTON_ICON, &color)) { @@ -1255,7 +1268,7 @@ static_assert(__BYTE_ORDER == __LITTLE_ENDIAN, "datapack assumes little endian"); #elif defined(__BIG_ENDIAN__) -// Mac check + // Mac check #error DataPack assumes little endian #endif header_->little_endian = 1; @@ -1308,39 +1321,42 @@ void BrowserThemePack::SetTintsFromJSON(const base::Value::Dict* tints_value) { DCHECK(tints_); - if (!tints_value) + if (!tints_value) { return; + } // Parse the incoming data from |tints_value| into an intermediary structure. std::map<int, color_utils::HSL> temp_tints; for (const auto [key, value] : *tints_value) { - if (!value.is_list()) + if (!value.is_list()) { continue; + } const base::Value::List& tint_list = value.GetList(); - if (tint_list.size() != 3) + if (tint_list.size() != 3) { continue; + } std::optional<double> h = tint_list[0].GetIfDouble(); std::optional<double> s = tint_list[1].GetIfDouble(); std::optional<double> l = tint_list[2].GetIfDouble(); - if (!h || !s || !l) + if (!h || !s || !l) { continue; + } color_utils::HSL hsl = {*h, *s, *l}; MakeHSLShiftValid(&hsl); int id = GetIntForString(key, kTintTable, kTintTableLength); - if (id != -1) + if (id != -1) { temp_tints[id] = hsl; + } } // Copy data from the intermediary data structure to the array. size_t count = 0; - for (std::map<int, color_utils::HSL>::const_iterator it = - temp_tints.begin(); - it != temp_tints.end() && count < kTintTableLength; - ++it, ++count) { + for (std::map<int, color_utils::HSL>::const_iterator it = temp_tints.begin(); + it != temp_tints.end() && count < kTintTableLength; ++it, ++count) { tints_[count].id = it->first; tints_[count].h = it->second.h; tints_[count].s = it->second.s; @@ -1353,8 +1369,9 @@ DCHECK(colors_); std::map<int, SkColor> temp_colors; - if (colors_value) + if (colors_value) { ReadColorsFromJSON(*colors_value, &temp_colors); + } // Copy data from the intermediary data structure to the array. size_t count = 0; @@ -1370,11 +1387,13 @@ std::map<int, SkColor>* temp_colors) { // Parse the incoming data from |colors_value| into an intermediary structure. for (const auto [key, value] : colors_value) { - if (!value.is_list()) + if (!value.is_list()) { continue; + } const base::Value::List& color_list = value.GetList(); - if (!(color_list.size() == 3 || color_list.size() == 4)) + if (!(color_list.size() == 3 || color_list.size() == 4)) { continue; + } SkColor color = SK_ColorWHITE; std::optional<int> r = color_list[0].GetIfInt(); @@ -1403,8 +1422,9 @@ } } - if (!alpha_valid) + if (!alpha_valid) { continue; + } } else { color = SkColorSetRGB(*r, *g, *b); } @@ -1413,13 +1433,15 @@ // We no longer use ntp_section, but to support legacy // themes we still need to use it as a fallback for // ntp_header. - if (!temp_colors->count(TP::COLOR_NTP_HEADER)) + if (!temp_colors->count(TP::COLOR_NTP_HEADER)) { (*temp_colors)[TP::COLOR_NTP_HEADER] = color; + } } else { int id = GetIntForString(key, kOverwritableColorTable, kOverwritableColorTableLength); - if (id != -1) + if (id != -1) { (*temp_colors)[id] = color; + } } } } @@ -1428,8 +1450,9 @@ const base::Value::Dict* display_properties_value) { DCHECK(display_properties_); - if (!display_properties_value) + if (!display_properties_value) { return; + } std::map<int, int> temp_properties; for (const auto [key, value] : *display_properties_value) { @@ -1451,8 +1474,9 @@ break; } case TP::NTP_LOGO_ALTERNATE: { - if (value.is_int()) + if (value.is_int()) { temp_properties[TP::NTP_LOGO_ALTERNATE] = value.GetInt(); + } break; } } @@ -1472,8 +1496,9 @@ const base::Value::Dict* images_value, const base::FilePath& images_path, FilePathMap* file_paths) const { - if (!images_value) + if (!images_value) { return; + } for (const auto [key, value] : *images_value) { if (value.is_dict()) { @@ -1499,8 +1524,9 @@ const base::FilePath& image_path, FilePathMap* file_paths) const { PersistentID id = GetPersistentIDByName(image_name); - if (id != PersistentID::kInvalid) + if (id != PersistentID::kInvalid) { (*file_paths)[id][scale_factor] = image_path; + } } void BrowserThemePack::BuildSourceImagesArray(const FilePathMap& file_paths) { @@ -1511,9 +1537,8 @@ source_images_[file_paths.size()].id = -1; } -bool BrowserThemePack::LoadRawBitmapsTo( - const FilePathMap& file_paths, - ImageCache* image_cache) { +bool BrowserThemePack::LoadRawBitmapsTo(const FilePathMap& file_paths, + ImageCache* image_cache) { // Themes should be loaded on the file thread, not the UI thread. // http://crbug.com/61838 base::ScopedAllowBlocking scoped_allow_blocking; @@ -1539,8 +1564,7 @@ scoped_refptr<base::RefCountedMemory> raw_data( ReadFileData(s2f.second)); if (!raw_data.get() || !raw_data->size()) { - LOG(ERROR) << "Could not load theme image" - << " prs_id=" << prs_id + LOG(ERROR) << "Could not load theme image" << " prs_id=" << prs_id << " scale_factor_enum=" << scale_factor << " file=" << s2f.second.value() << (raw_data.get() ? " (zero size)" : " (read error)"); @@ -1561,8 +1585,9 @@ } } } - if (!is_copyable && !image_skia.isNull()) + if (!is_copyable && !image_skia.isNull()) { (*image_cache)[prs_id] = gfx::Image(image_skia); + } } return true; @@ -1571,8 +1596,9 @@ void BrowserThemePack::CropImages(ImageCache* images) const { for (const auto& image_to_crop : kImagesToCrop) { auto it = images->find(image_to_crop.prs_id); - if (it == images->end()) + if (it == images->end()) { continue; + } gfx::ImageSkia image_skia = it->second.AsImageSkia(); (*images)[image_to_crop.prs_id] = @@ -1648,8 +1674,9 @@ constexpr PersistentID kSrcImageId = PRS::kToolbar; const auto image_it = images->find(kSrcImageId); - if (image_it == images->end()) + if (image_it == images->end()) { return; + } auto image = image_it->second.AsImageSkia(); @@ -1702,17 +1729,20 @@ // does. if (!images->count(src_id)) { // Fall back from inactive overlay to active overlay. - if (src_id == PRS::kFrameOverlayInactive) + if (src_id == PRS::kFrameOverlayInactive) { src_id = PRS::kFrameOverlay; + } // Fall back from inactive incognito to active incognito. - if (src_id == PRS::kFrameIncognitoInactive) + if (src_id == PRS::kFrameIncognitoInactive) { src_id = PRS::kFrameIncognito; + } // For all non-overlay images, fall back to PRS_THEME_FRAME as a last // resort. - if (!images->count(src_id) && src_id != PRS::kFrameOverlay) + if (!images->count(src_id) && src_id != PRS::kFrameOverlay) { src_id = PRS::kFrame; + } } // Note that if the original ID and all the fallbacks are absent, the caller @@ -1780,13 +1810,15 @@ gfx::ImageSkia bg_image; ImageCache::const_iterator bg_img_it = images->find(PRS::kWindowControlBackground); - if (bg_img_it != images->end()) + if (bg_img_it != images->end()) { bg_image = bg_img_it->second.AsImageSkia(); + } SkColor button_bg_color = SK_ColorTRANSPARENT; SkAlpha button_bg_alpha = SK_AlphaTRANSPARENT; - if (GetColor(TP::COLOR_CONTROL_BUTTON_BACKGROUND, &button_bg_color)) + if (GetColor(TP::COLOR_CONTROL_BUTTON_BACKGROUND, &button_bg_color)) { button_bg_alpha = SkColorGetA(button_bg_color); + } button_bg_alpha = WindowFrameUtil::CalculateWindowsCaptionButtonBackgroundAlpha( @@ -1868,8 +1900,9 @@ // Inactive images should be based on the active ones if the active ones // were customized. - if (tab_it == images->end() && entry.fallback_tab_id) + if (tab_it == images->end() && entry.fallback_tab_id) { tab_it = images->find(*entry.fallback_tab_id); + } // Generate background tab images when provided with custom frame or // background tab images; in the former case the theme author may want the @@ -1882,12 +1915,14 @@ GetColor(entry.frame_color_id, &frame_color); gfx::ImageSkia image_to_tint; - if (frame_it != images->end()) + if (frame_it != images->end()) { image_to_tint = (frame_it->second).AsImageSkia(); + } gfx::ImageSkia overlay; - if (tab_it != images->end()) + if (tab_it != images->end()) { overlay = tab_it->second.AsImageSkia(); + } auto source = std::make_unique<TabBackgroundImageSource>( frame_color, image_to_tint, overlay, @@ -1922,8 +1957,9 @@ // Calculate NTP text color based on NTP background. SkColor text_color; if (!GetColor(TP::COLOR_NTP_TEXT, &text_color)) { - if (has_background_image) + if (has_background_image) { background_color = ComputeImageColor(image, image.Height()); + } if (has_background_image || has_background_color) { SetColor(TP::COLOR_NTP_TEXT, @@ -1952,8 +1988,9 @@ // Calculate NTP section border color. SkColor header_color; - if (GetColor(TP::COLOR_NTP_HEADER, &header_color)) + if (GetColor(TP::COLOR_NTP_HEADER, &header_color)) { SetColor(TP::COLOR_NTP_SECTION_BORDER, SkColorSetA(header_color, 0x50)); + } } void BrowserThemePack::RepackImages(const ImageCache& images, @@ -1978,8 +2015,8 @@ } } -void BrowserThemePack::MergeImageCaches( - const ImageCache& source, ImageCache* destination) const { +void BrowserThemePack::MergeImageCaches(const ImageCache& source, + ImageCache* destination) const { for (auto it = source.begin(); it != source.end(); ++it) { (*destination)[it->first] = it->second; } @@ -1994,14 +2031,16 @@ color_utils::HSL BrowserThemePack::GetTintInternal(int id) const { color_utils::HSL hsl; - if (GetTint(id, &hsl)) + if (GetTint(id, &hsl)) { return hsl; + } int original_id = id; - if (id == TP::TINT_FRAME_INCOGNITO) + if (id == TP::TINT_FRAME_INCOGNITO) { original_id = TP::TINT_FRAME; - else if (id == TP::TINT_FRAME_INCOGNITO_INACTIVE) + } else if (id == TP::TINT_FRAME_INCOGNITO_INACTIVE) { original_id = TP::TINT_FRAME_INACTIVE; + } return TP::GetDefaultTint(original_id, original_id != id); } @@ -2009,12 +2048,14 @@ int BrowserThemePack::GetRawIDByPersistentID( PersistentID prs_id, ui::ResourceScaleFactor scale_factor) const { - if (prs_id == PersistentID::kInvalid) + if (prs_id == PersistentID::kInvalid) { return -1; + } for (size_t i = 0; i < scale_factors_.size(); ++i) { - if (scale_factors_[i] == scale_factor) + if (scale_factors_[i] == scale_factor) { return ((PersistentID::kMaxValue + 1) * i) + prs_id; + } } return -1; } @@ -2057,8 +2098,9 @@ break; } } - if (!image_missing) + if (!image_missing) { return; + } // Find available scale factor with highest scale. ui::ResourceScaleFactor available_scale_factor = ui::kScaleFactorNone; @@ -2072,8 +2114,9 @@ } } // If no scale factor is available, we're done. - if (available_scale_factor == ui::kScaleFactorNone) + if (available_scale_factor == ui::kScaleFactorNone) { return; + } // Get bitmap for the available scale factor. int available_raw_id = GetRawIDByPersistentID(prs_id, available_scale_factor); @@ -2087,12 +2130,11 @@ // Fill in all missing scale factors by scaling the available bitmap. for (size_t i = 0; i < scale_factors_.size(); ++i) { int scaled_raw_id = GetRawIDByPersistentID(prs_id, scale_factors_[i]); - if (image_memory_.find(scaled_raw_id) != image_memory_.end()) + if (image_memory_.find(scaled_raw_id) != image_memory_.end()) { continue; - SkBitmap scaled_bitmap = - CreateLowQualityResizedBitmap(available_bitmap, - available_scale_factor, - scale_factors_[i]); + } + SkBitmap scaled_bitmap = CreateLowQualityResizedBitmap( + available_bitmap, available_scale_factor, scale_factors_[i]); std::optional<std::vector<uint8_t>> bitmap_data = gfx::PNGCodec::EncodeBGRASkBitmap(scaled_bitmap, /*discard_transparency=*/false);
diff --git a/chrome/browser/themes/browser_theme_pack.h b/chrome/browser/themes/browser_theme_pack.h index 7d8c20f..cede739a 100644 --- a/chrome/browser/themes/browser_theme_pack.h +++ b/chrome/browser/themes/browser_theme_pack.h
@@ -36,7 +36,7 @@ namespace ui { class ColorProvider; class DataPack; -} +} // namespace ui // An optimized representation of a theme, backed by a mmapped DataPack. // @@ -72,7 +72,8 @@ // operation should be relatively fast, as it should be an mmap() and some // pointer swizzling. Returns NULL on any error attempting to read |path|. static scoped_refptr<BrowserThemePack> BuildFromDataPack( - const base::FilePath& path, const std::string& expected_id); + const base::FilePath& path, + const std::string& expected_id); // Returns whether the specified identifier is one of the images we persist // in the data pack. @@ -125,7 +126,7 @@ typedef base::flat_map<PersistentID, gfx::Image> ImageCache; // The raw PNG memory associated with a certain id. - typedef std::map<int, scoped_refptr<base::RefCountedMemory> > RawImages; + typedef std::map<int, scoped_refptr<base::RefCountedMemory>> RawImages; // The type passed to ui::DataPack::WritePack. typedef std::map<uint16_t, std::string_view> RawDataForWriting; @@ -224,8 +225,7 @@ // Loads the unmodified images packed in the extension to SkBitmaps. Returns // true if all images loaded. - bool LoadRawBitmapsTo(const FilePathMap& file_paths, - ImageCache* image_cache); + bool LoadRawBitmapsTo(const FilePathMap& file_paths, ImageCache* image_cache); // Crops images down to a size such that most of the cropped image will be // displayed in the UI. Cropping is useful because images from custom themes @@ -310,7 +310,7 @@ // NOTE: This structs can only contain primary data types to be reliably // seralized and de-seralized. Not even nested structs will work across // different machines, see crbug.com/988055. -#pragma pack(push,1) +#pragma pack(push, 1) // Header that is written to disk. struct BrowserThemePackHeader { // Numeric version to make sure we're compatible in the future.
diff --git a/chrome/browser/themes/browser_theme_pack_unittest.cc b/chrome/browser/themes/browser_theme_pack_unittest.cc index 315cee9c..cab3c27 100644 --- a/chrome/browser/themes/browser_theme_pack_unittest.cc +++ b/chrome/browser/themes/browser_theme_pack_unittest.cc
@@ -123,8 +123,9 @@ const BrowserThemePack& theme_pack() const { return *theme_pack_; } base::FilePath GetTemporaryPakFile(base::FilePath::StringPieceType name) { - if (dir_.IsValid() || dir_.CreateUniqueTempDir()) + if (dir_.IsValid() || dir_.CreateUniqueTempDir()) { return dir_.GetPath().Append(name); + } ADD_FAILURE() << "Couldn't create temp dir"; return base::FilePath(); } @@ -179,8 +180,9 @@ const std::map<int, SkColor>& color_map) { for (auto it = color_map.begin(); it != color_map.end(); ++it) { SkColor color; - if (!theme_pack_->GetColor(it->first, &color)) + if (!theme_pack_->GetColor(it->first, &color)) { color = GetDefaultColor(it->first); + } EXPECT_EQ(it->second, color) << "Color id = " << it->first; } } @@ -364,9 +366,8 @@ pack->GetImageNamed(IDR_THEME_TAB_BACKGROUND_INCOGNITO).IsEmpty()); EXPECT_FALSE( pack->HasCustomImage(IDR_THEME_TAB_BACKGROUND_INCOGNITO_INACTIVE)); - EXPECT_FALSE( - pack->GetImageNamed(IDR_THEME_TAB_BACKGROUND_INCOGNITO_INACTIVE) - .IsEmpty()); + EXPECT_FALSE(pack->GetImageNamed(IDR_THEME_TAB_BACKGROUND_INCOGNITO_INACTIVE) + .IsEmpty()); // Make sure we don't have phantom data. EXPECT_FALSE(pack->GetTint(TP::TINT_FRAME, &actual)); @@ -570,8 +571,9 @@ } TEST_F(BrowserThemePackTest, ProvideNtpHeaderColor) { - std::string color_json = "{ \"ntp_header\": [120, 120, 120], " - " \"ntp_section\": [190, 190, 190] }"; + std::string color_json = + "{ \"ntp_header\": [120, 120, 120], " + " \"ntp_section\": [190, 190, 190] }"; LoadColorJSON(color_json); std::map<int, SkColor> colors = GetDefaultColorMap(); @@ -603,11 +605,12 @@ TEST_F(BrowserThemePackTest, OutOfRangeColors) { // Ensure colors with out-of-range values are simply ignored. - std::string color_json = "{ \"toolbar\": [0, 20, 40, -1], " - " \"tab_text\": [60, 80, 100, 2], " - " \"tab_background_text\": [120, 140, 160, 47.6], " - " \"bookmark_text\": [256, 0, 0], " - " \"ntp_text\": [0, -100, 100] }"; + std::string color_json = + "{ \"toolbar\": [0, 20, 40, -1], " + " \"tab_text\": [60, 80, 100, 2], " + " \"tab_background_text\": [120, 140, 160, 47.6], " + " \"bookmark_text\": [256, 0, 0], " + " \"ntp_text\": [0, -100, 100] }"; LoadColorJSON(color_json); VerifyColorMap(GetDefaultColorMap()); @@ -617,8 +620,8 @@ std::string tint_json = "{ \"buttons\": [ 0.5, 0.5, 0.5 ] }"; LoadTintJSON(tint_json); - color_utils::HSL expected = { 0.5, 0.5, 0.5 }; - color_utils::HSL actual = { -1, -1, -1 }; + color_utils::HSL expected = {0.5, 0.5, 0.5}; + color_utils::HSL actual = {-1, -1, -1}; EXPECT_TRUE(theme_pack().GetTint(TP::TINT_BUTTONS, &actual)); EXPECT_DOUBLE_EQ(expected.h, actual.h); EXPECT_DOUBLE_EQ(expected.s, actual.s); @@ -626,9 +629,10 @@ } TEST_F(BrowserThemePackTest, CanReadDisplayProperties) { - std::string json = "{ \"ntp_background_alignment\": \"bottom\", " - " \"ntp_background_repeat\": \"repeat-x\", " - " \"ntp_logo_alternate\": 0 }"; + std::string json = + "{ \"ntp_background_alignment\": \"bottom\", " + " \"ntp_background_repeat\": \"repeat-x\", " + " \"ntp_logo_alternate\": 0 }"; LoadDisplayPropertiesJSON(json); int out_val; @@ -646,8 +650,9 @@ } TEST_F(BrowserThemePackTest, CanParsePaths) { - std::string path_json = "{ \"theme_button_background\": \"one\", " - " \"theme_toolbar\": \"two\" }"; + std::string path_json = + "{ \"theme_button_background\": \"one\", " + " \"theme_toolbar\": \"two\" }"; TestFilePathMap out_file_paths; ParseImageNamesJSON(path_json, &out_file_paths); @@ -666,9 +671,10 @@ } TEST_F(BrowserThemePackTest, InvalidPathNames) { - std::string path_json = "{ \"wrong\": [1], " - " \"theme_button_background\": \"one\", " - " \"not_a_thing\": \"blah\" }"; + std::string path_json = + "{ \"wrong\": [1], " + " \"theme_button_background\": \"one\", " + " \"not_a_thing\": \"blah\" }"; TestFilePathMap out_file_paths; ParseImageNamesJSON(path_json, &out_file_paths); @@ -677,22 +683,24 @@ } TEST_F(BrowserThemePackTest, InvalidColors) { - std::string invalid_color = "{ \"toolbar\": [\"dog\", \"cat\", [12]], " - " \"sound\": \"woof\" }"; + std::string invalid_color = + "{ \"toolbar\": [\"dog\", \"cat\", [12]], " + " \"sound\": \"woof\" }"; LoadColorJSON(invalid_color); std::map<int, SkColor> colors = GetDefaultColorMap(); VerifyColorMap(colors); } TEST_F(BrowserThemePackTest, InvalidTints) { - std::string tints = "{ \"buttons\": [ \"dog\", \"cat\", [\"x\"]], " - " \"frame\": [-2, 2, 3]," - " \"frame_incognito_inactive\": [-1, 2, 0.6]," - " \"invalid\": \"entry\" }"; + std::string tints = + "{ \"buttons\": [ \"dog\", \"cat\", [\"x\"]], " + " \"frame\": [-2, 2, 3]," + " \"frame_incognito_inactive\": [-1, 2, 0.6]," + " \"invalid\": \"entry\" }"; LoadTintJSON(tints); // We should ignore completely invalid (non-numeric) tints. - color_utils::HSL actual = { -1, -1, -1 }; + color_utils::HSL actual = {-1, -1, -1}; EXPECT_FALSE(theme_pack().GetTint(TP::TINT_BUTTONS, &actual)); // We should change invalid numeric HSL tint components to the special -1 "no @@ -710,8 +718,9 @@ } TEST_F(BrowserThemePackTest, InvalidDisplayProperties) { - std::string invalid_properties = "{ \"ntp_background_alignment\": [15], " - " \"junk\": [15.3] }"; + std::string invalid_properties = + "{ \"ntp_background_alignment\": [15], " + " \"junk\": [15.3] }"; LoadDisplayPropertiesJSON(invalid_properties); int out_val; @@ -794,9 +803,8 @@ // Part 2: Try to read back the data pack that we just wrote to disk. { - scoped_refptr<BrowserThemePack> pack = - BrowserThemePack::BuildFromDataPack( - file, "mblmlcbknbnfebdfjnolmcapmdofhmme"); + scoped_refptr<BrowserThemePack> pack = BrowserThemePack::BuildFromDataPack( + file, "mblmlcbknbnfebdfjnolmcapmdofhmme"); ASSERT_TRUE(pack.get()); VerifyStarGazing(pack.get()); }
diff --git a/chrome/browser/themes/custom_theme_supplier.h b/chrome/browser/themes/custom_theme_supplier.h index 7d42e2d..b90b5c40d 100644 --- a/chrome/browser/themes/custom_theme_supplier.h +++ b/chrome/browser/themes/custom_theme_supplier.h
@@ -28,7 +28,7 @@ namespace ui { class ColorProvider; class NativeTheme; -} +} // namespace ui // A representation of a theme. All theme properties can be accessed through the // public methods. Subclasses are expected to override all methods which should
diff --git a/chrome/browser/themes/theme_color_policy_handler.cc b/chrome/browser/themes/theme_color_policy_handler.cc index 986784e..13ec28a 100644 --- a/chrome/browser/themes/theme_color_policy_handler.cc +++ b/chrome/browser/themes/theme_color_policy_handler.cc
@@ -49,8 +49,9 @@ const policy::PolicyMap& policies, policy::PolicyErrorMap* errors) { const base::Value* value = nullptr; - if (!CheckAndGetValue(policies, errors, &value)) + if (!CheckAndGetValue(policies, errors, &value)) { return false; + } if (value && !IsValidHexColor(value->GetString())) { errors->AddError(policy_name(), IDS_POLICY_HEX_COLOR_ERROR, @@ -65,8 +66,9 @@ PrefValueMap* prefs) { const base::Value* value = policies.GetValue(policy_name(), base::Value::Type::STRING); - if (!value) + if (!value) { return; + } prefs->SetInteger(prefs::kPolicyThemeColor, HexToSkColor(value->GetString())); }
diff --git a/chrome/browser/themes/theme_helper.cc b/chrome/browser/themes/theme_helper.cc index 43b03f9..e6bb759 100644 --- a/chrome/browser/themes/theme_helper.cc +++ b/chrome/browser/themes/theme_helper.cc
@@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/themes/theme_service.h" - #include "base/feature_list.h" #include "base/no_destructor.h" #include "build/build_config.h" @@ -11,6 +9,7 @@ #include "chrome/browser/themes/browser_theme_pack.h" #include "chrome/browser/themes/custom_theme_supplier.h" #include "chrome/browser/themes/theme_properties.h" +#include "chrome/browser/themes/theme_service.h" #include "chrome/common/chrome_features.h" #include "chrome/grit/theme_resources.h" #include "components/grit/components_scaled_resources.h" @@ -53,12 +52,14 @@ // static bool ThemeHelper::IsDefaultTheme(const CustomThemeSupplier* theme_supplier) { - if (!theme_supplier) + if (!theme_supplier) { return true; + } using Type = ui::ColorProviderKey::ThemeInitializerSupplier::ThemeType; - if (theme_supplier->get_theme_type() != Type::kExtension) + if (theme_supplier->get_theme_type() != Type::kExtension) { return false; + } const std::string& id = theme_supplier->extension_id(); return id == kDefaultThemeID || id == kDefaultThemeGalleryID; @@ -101,12 +102,14 @@ // Check to see whether we should substitute some images. int ntp_alternate = GetDisplayProperty(TP::NTP_LOGO_ALTERNATE, theme_supplier); - if (id == IDR_PRODUCT_LOGO && ntp_alternate != 0) + if (id == IDR_PRODUCT_LOGO && ntp_alternate != 0) { id = IDR_PRODUCT_LOGO_WHITE; + } base::RefCountedMemory* data = nullptr; - if (theme_supplier) + if (theme_supplier) { data = theme_supplier->GetRawData(id, scale_factor); + } if (!data) { data = ui::ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( @@ -122,8 +125,9 @@ const CustomThemeSupplier* theme_supplier) const { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); color_utils::HSL hsl; - if (theme_supplier && theme_supplier->GetTint(id, &hsl)) + if (theme_supplier && theme_supplier->GetTint(id, &hsl)) { return hsl; + } return TP::GetDefaultTint(id, incognito, UseDarkModeColors(theme_supplier)); } @@ -133,8 +137,9 @@ bool incognito, const CustomThemeSupplier* theme_supplier) const { gfx::Image image = GetImageNamed(id, incognito, theme_supplier); - if (image.IsEmpty()) + if (image.IsEmpty()) { return nullptr; + } // TODO(pkotwicz): Remove this const cast. The gfx::Image interface returns // its images const. GetImageSkiaNamed() also should but has many callsites. return const_cast<gfx::ImageSkia*>(image.ToImageSkia()); @@ -168,8 +173,9 @@ bool ThemeHelper::UseDarkModeColors(const CustomThemeSupplier* theme_supplier) { // Dark mode is disabled for custom themes so they apply atop a predictable // state. - if (IsCustomTheme(theme_supplier)) + if (IsCustomTheme(theme_supplier)) { return false; + } return theme_supplier->GetNativeTheme()->ShouldUseDarkColors(); } @@ -181,15 +187,17 @@ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); int adjusted_id = id; if (incognito) { - if (id == IDR_THEME_FRAME) + if (id == IDR_THEME_FRAME) { adjusted_id = IDR_THEME_FRAME_INCOGNITO; - else if (id == IDR_THEME_FRAME_INACTIVE) + } else if (id == IDR_THEME_FRAME_INACTIVE) { adjusted_id = IDR_THEME_FRAME_INCOGNITO_INACTIVE; + } } gfx::Image image; - if (theme_supplier) + if (theme_supplier) { image = theme_supplier->GetImageNamed(adjusted_id); + } if (image.IsEmpty()) { image = ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(
diff --git a/chrome/browser/themes/theme_properties.cc b/chrome/browser/themes/theme_properties.cc index 2e8a16ec..7d4f502 100644 --- a/chrome/browser/themes/theme_properties.cc +++ b/chrome/browser/themes/theme_properties.cc
@@ -171,29 +171,33 @@ // static int ThemeProperties::StringToAlignment(const std::string& alignment) { int alignment_mask = 0; - for (const std::string& component : base::SplitString( - alignment, base::kWhitespaceASCII, - base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY)) { - if (base::EqualsCaseInsensitiveASCII(component, kAlignmentTop)) + for (const std::string& component : + base::SplitString(alignment, base::kWhitespaceASCII, + base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY)) { + if (base::EqualsCaseInsensitiveASCII(component, kAlignmentTop)) { alignment_mask |= ALIGN_TOP; - else if (base::EqualsCaseInsensitiveASCII(component, kAlignmentBottom)) + } else if (base::EqualsCaseInsensitiveASCII(component, kAlignmentBottom)) { alignment_mask |= ALIGN_BOTTOM; - else if (base::EqualsCaseInsensitiveASCII(component, kAlignmentLeft)) + } else if (base::EqualsCaseInsensitiveASCII(component, kAlignmentLeft)) { alignment_mask |= ALIGN_LEFT; - else if (base::EqualsCaseInsensitiveASCII(component, kAlignmentRight)) + } else if (base::EqualsCaseInsensitiveASCII(component, kAlignmentRight)) { alignment_mask |= ALIGN_RIGHT; + } } return alignment_mask; } // static int ThemeProperties::StringToTiling(const std::string& tiling) { - if (base::EqualsCaseInsensitiveASCII(tiling, kTilingRepeatX)) + if (base::EqualsCaseInsensitiveASCII(tiling, kTilingRepeatX)) { return REPEAT_X; - if (base::EqualsCaseInsensitiveASCII(tiling, kTilingRepeatY)) + } + if (base::EqualsCaseInsensitiveASCII(tiling, kTilingRepeatY)) { return REPEAT_Y; - if (base::EqualsCaseInsensitiveASCII(tiling, kTilingRepeat)) + } + if (base::EqualsCaseInsensitiveASCII(tiling, kTilingRepeat)) { return REPEAT; + } // NO_REPEAT is the default choice. return NO_REPEAT; } @@ -204,15 +208,17 @@ std::string vertical_string(kAlignmentCenter); std::string horizontal_string(kAlignmentCenter); - if (alignment & ALIGN_TOP) + if (alignment & ALIGN_TOP) { vertical_string = kAlignmentTop; - else if (alignment & ALIGN_BOTTOM) + } else if (alignment & ALIGN_BOTTOM) { vertical_string = kAlignmentBottom; + } - if (alignment & ALIGN_LEFT) + if (alignment & ALIGN_LEFT) { horizontal_string = kAlignmentLeft; - else if (alignment & ALIGN_RIGHT) + } else if (alignment & ALIGN_RIGHT) { horizontal_string = kAlignmentRight; + } return horizontal_string + " " + vertical_string; } @@ -220,12 +226,15 @@ // static std::string ThemeProperties::TilingToString(int tiling) { // Convert from a TilingProperty back into a string. - if (tiling == REPEAT_X) + if (tiling == REPEAT_X) { return kTilingRepeatX; - if (tiling == REPEAT_Y) + } + if (tiling == REPEAT_Y) { return kTilingRepeatY; - if (tiling == REPEAT) + } + if (tiling == REPEAT) { return kTilingRepeat; + } return kTilingNoRepeat; } @@ -242,23 +251,27 @@ // TINT_BUTTONS is used by ThemeService::GetDefaultColor() for both incognito // and dark mode, and so must be applied to both. - if ((id == TINT_BUTTONS) && (incognito || dark_mode)) + if ((id == TINT_BUTTONS) && (incognito || dark_mode)) { return {-1, 0.57, 0.9605}; // kGoogleGrey700 -> kGoogleGrey100 + } - if ((id == TINT_FRAME) && incognito) + if ((id == TINT_FRAME) && incognito) { return {-1, 0.7, 0.075}; // #DEE1E6 -> kGoogleGrey900 + } if (id == TINT_FRAME_INACTIVE) { // |dark_mode| is only true here when attempting to tint the Windows native // frame color while in dark mode when using OS accent titlebar colors. // The goal in this case is to match the difference between Chrome default // dark mode active and inactive frames as closely as possible without // a hue change. - if (dark_mode) + if (dark_mode) { return {-1, 0.54, 0.567}; // Roughly kGoogleGrey900 -> kGoogleGrey800 + } - if (incognito) + if (incognito) { return {0.57, 0.65, 0.1405}; // #DEE1E6 -> kGoogleGrey800 - return {-1, -1, 0.642}; // #DEE1E6 -> #E7EAED + } + return {-1, -1, 0.642}; // #DEE1E6 -> #E7EAED } return {-1, -1, -1}; @@ -270,13 +283,15 @@ bool dark_mode) { if (incognito) { std::optional<SkColor> incognito_color = GetIncognitoColor(id); - if (incognito_color.has_value()) + if (incognito_color.has_value()) { return incognito_color.value(); + } } if (dark_mode) { std::optional<SkColor> dark_mode_color = GetDarkModeColor(id); - if (dark_mode_color.has_value()) + if (dark_mode_color.has_value()) { return dark_mode_color.value(); + } } return GetLightModeColor(id); }
diff --git a/chrome/browser/themes/theme_properties.h b/chrome/browser/themes/theme_properties.h index 7a8ddb9d..969f4e8e 100644 --- a/chrome/browser/themes/theme_properties.h +++ b/chrome/browser/themes/theme_properties.h
@@ -81,12 +81,7 @@ }; // Background tiling choices. - enum Tiling { - NO_REPEAT = 0, - REPEAT_X = 1, - REPEAT_Y = 2, - REPEAT = 3 - }; + enum Tiling { NO_REPEAT = 0, REPEAT_X = 1, REPEAT_Y = 2, REPEAT = 3 }; // -------------------------------------------------------------------------- // The int value of the properties in NotOverwritableByUserThemeProperties
diff --git a/chrome/browser/themes/theme_service.cc b/chrome/browser/themes/theme_service.cc index 261a45a..1a09e6f 100644 --- a/chrome/browser/themes/theme_service.cc +++ b/chrome/browser/themes/theme_service.cc
@@ -92,15 +92,15 @@ // Writes the theme pack to disk on a separate thread. void WritePackToDiskCallback(BrowserThemePack* pack, const base::FilePath& directory) { - if (g_dont_write_theme_pack_for_testing) + if (g_dont_write_theme_pack_for_testing) { return; + } pack->WriteToDisk(directory.Append(chrome::kThemePackFilename)); } } // namespace - // ThemeService::ThemeObserver ------------------------------------------------ #if BUILDFLAG(ENABLE_EXTENSIONS) @@ -131,8 +131,9 @@ void OnExtensionLoaded(content::BrowserContext* browser_context, const extensions::Extension* extension) override { - if (!extension->is_theme() || theme_service_->UsingPolicyTheme()) + if (!extension->is_theme() || theme_service_->UsingPolicyTheme()) { return; + } bool is_new_version = theme_service_->installed_pending_load_id_ != @@ -141,8 +142,9 @@ theme_service_->installed_pending_load_id_ = ThemeHelper::kDefaultThemeID; // Do not load already loaded theme. - if (!is_new_version && extension->id() == theme_service_->GetThemeID()) + if (!is_new_version && extension->id() == theme_service_->GetThemeID()) { return; + } // Set the new theme during extension load: // This includes: a) installing a new theme, b) enabling a disabled theme. @@ -283,8 +285,9 @@ command_line->GetSwitchValueASCII(switches::kInstallAutogeneratedTheme); std::vector<std::string> rgb = base::SplitString( value, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY); - if (rgb.size() != 3) + if (rgb.size() != 3) { return; + } int r, g, b; base::StringToInt(rgb[0], &r); base::StringToInt(rgb[1], &g); @@ -370,8 +373,9 @@ return; } - if (ready_) + if (ready_) { base::RecordAction(base::UserMetricsAction("Themes_Reset")); + } ClearThemeData(/*clear_ntp_background=*/true); NotifyThemeChanged(); @@ -445,16 +449,18 @@ void ThemeService::RemoveUnusedThemes() { // We do not want to garbage collect themes on startup (|ready_| is false). // Themes will get garbage collected after |kRemoveUnusedThemesStartupDelay|. - if (!profile_ || !ready_) + if (!profile_ || !ready_) { return; + } if (number_of_reinstallers_ != 0 || !building_extension_id_.empty()) { return; } extensions::ExtensionService* service = extensions::ExtensionSystem::Get(profile_)->extension_service(); - if (!service) + if (!service) { return; + } std::string current_theme = GetThemeID(); std::vector<std::string> remove_list; @@ -522,8 +528,9 @@ void ThemeService::BuildAutogeneratedThemeFromColor(SkColor color, bool store_in_prefs) { std::optional<std::string> previous_theme_id; - if (UsingExtensionTheme()) + if (UsingExtensionTheme()) { previous_theme_id = GetThemeID(); + } auto pack = base::MakeRefCounted<BrowserThemePack>( ui::ColorProviderKey::ThemeInitializerSupplier::ThemeType:: @@ -535,8 +542,9 @@ SetThemePrefsForColor(color); // Only disable previous extension theme if new theme is saved to prefs, // otherwise there may be issues (ex. when unsetting managed theme). - if (previous_theme_id.has_value()) + if (previous_theme_id.has_value()) { DisableExtension(previous_theme_id.value()); + } } NotifyThemeChanged(); } @@ -713,12 +721,14 @@ } void ThemeService::ClearThemeData(bool clear_ntp_background) { - if (!ready_) + if (!ready_) { return; + } std::optional<std::string> previous_theme_id; - if (UsingExtensionTheme()) + if (UsingExtensionTheme()) { previous_theme_id = GetThemeID(); + } SwapThemeSupplier(nullptr); ClearThemePrefs(); @@ -731,8 +741,9 @@ // Disable extension after modifying the prefs so that unloading the extension // doesn't trigger |ClearThemeData| again. - if (previous_theme_id.has_value()) + if (previous_theme_id.has_value()) { DisableExtension(previous_theme_id.value()); + } } void ThemeService::InitFromPrefs() { @@ -792,8 +803,9 @@ } // Redraw and notify sync that theme has changed. - for (auto& observer : observers_) + for (auto& observer : observers_) { observer.OnThemeChanged(); + } } void ThemeService::FixInconsistentPreferencesIfNeeded() {} @@ -851,11 +863,13 @@ void ThemeService::SwapThemeSupplier( scoped_refptr<CustomThemeSupplier> theme_supplier) { - if (theme_supplier_) + if (theme_supplier_) { theme_supplier_->StopUsingTheme(); + } theme_supplier_ = theme_supplier; - if (theme_supplier_) + if (theme_supplier_) { theme_supplier_->StartUsingTheme(); + } } void ThemeService::BuildFromExtension(const extensions::Extension* extension, @@ -895,13 +909,15 @@ extensions::ExtensionService* service = extensions::ExtensionSystem::Get(profile_)->extension_service(); - if (!service) + if (!service) { return; + } const auto* extension = extensions::ExtensionRegistry::Get(profile_) ->enabled_extensions() .GetByID(extension_id); - if (!extension) + if (!extension) { return; + } // Schedule the writing of the packed file to disk. extensions::GetExtensionFileTaskRunner()->PostTask( @@ -910,8 +926,9 @@ std::unique_ptr<ThemeService::ThemeReinstaller> reinstaller = BuildReinstallerForCurrentTheme(); std::optional<std::string> previous_theme_id; - if (UsingExtensionTheme()) + if (UsingExtensionTheme()) { previous_theme_id = GetThemeID(); + } SwapThemeSupplier(std::move(pack)); SetThemePrefsForExtension(extension); @@ -927,8 +944,9 @@ base::RecordAction(base::UserMetricsAction("Themes_Installed")); bool can_revert_theme = true; - if (previous_theme_id.has_value()) + if (previous_theme_id.has_value()) { can_revert_theme = DisableExtension(previous_theme_id.value()); + } // Offer to revert to the old theme. if (can_revert_theme && !suppress_infobar && extension->is_theme()) { @@ -946,8 +964,9 @@ // NotifyThemeChanged() isn't triggered in InitFromPrefs() for extension // themes, so it's called here to make sure the browser's theme is updated. - if (UsingExtensionTheme()) + if (UsingExtensionTheme()) { NotifyThemeChanged(); + } } } @@ -995,8 +1014,9 @@ bool ThemeService::DisableExtension(const std::string& extension_id) { extensions::ExtensionService* service = extensions::ExtensionSystem::Get(profile_)->extension_service(); - if (!service) + if (!service) { return false; + } extensions::ExtensionRegistry* registry = extensions::ExtensionRegistry::Get(profile_);
diff --git a/chrome/browser/themes/theme_service_factory.cc b/chrome/browser/themes/theme_service_factory.cc index a7d34da3..7a08fcc 100644 --- a/chrome/browser/themes/theme_service_factory.cc +++ b/chrome/browser/themes/theme_service_factory.cc
@@ -72,8 +72,9 @@ const extensions::Extension* ThemeServiceFactory::GetThemeForProfile( Profile* profile) { ThemeService* theme_service = GetForProfile(profile); - if (!theme_service->UsingExtensionTheme()) + if (!theme_service->UsingExtensionTheme()) { return nullptr; + } return extensions::ExtensionRegistry::Get(profile) ->enabled_extensions()
diff --git a/chrome/browser/ui/accelerator_utils.h b/chrome/browser/ui/accelerator_utils.h index 4c60725..c9f4d29 100644 --- a/chrome/browser/ui/accelerator_utils.h +++ b/chrome/browser/ui/accelerator_utils.h
@@ -10,7 +10,7 @@ namespace ui { class Accelerator; class AcceleratorProvider; -} +} // namespace ui namespace chrome {
diff --git a/chrome/browser/ui/accessibility_util.h b/chrome/browser/ui/accessibility_util.h index bab8b72..ac1785d 100644 --- a/chrome/browser/ui/accessibility_util.h +++ b/chrome/browser/ui/accessibility_util.h
@@ -7,7 +7,6 @@ #include <string> - // Announces |message| as an accessibility alert in the currently active normal // browser window, if there is one. Otherwise, no announcement is made. void AnnounceInActiveBrowser(const std::u16string& message);
diff --git a/chrome/browser/ui/android/autofill/authenticator_selection_dialog_view_android.cc b/chrome/browser/ui/android/autofill/authenticator_selection_dialog_view_android.cc index 9e7f03d..95e61f3 100644 --- a/chrome/browser/ui/android/autofill/authenticator_selection_dialog_view_android.cc +++ b/chrome/browser/ui/android/autofill/authenticator_selection_dialog_view_android.cc
@@ -107,8 +107,9 @@ Java_AuthenticatorSelectionDialogBridge_createAuthenticatorOptionList( env); - for (const auto& option : options) + for (const auto& option : options) { CreateJavaAuthenticatorOptionAndAddToList(env, jlist, option); + } return jlist; }
diff --git a/chrome/browser/ui/android/autofill/authenticator_selection_dialog_view_android.h b/chrome/browser/ui/android/autofill/authenticator_selection_dialog_view_android.h index d342937..484b591e 100644 --- a/chrome/browser/ui/android/autofill/authenticator_selection_dialog_view_android.h +++ b/chrome/browser/ui/android/autofill/authenticator_selection_dialog_view_android.h
@@ -7,6 +7,7 @@ #include <jni.h> #include <stddef.h> + #include <vector> #include "base/android/scoped_java_ref.h"
diff --git a/chrome/browser/ui/android/autofill/autofill_error_dialog_view_android.cc b/chrome/browser/ui/android/autofill/autofill_error_dialog_view_android.cc index dae3cc9a..c251cc3 100644 --- a/chrome/browser/ui/android/autofill/autofill_error_dialog_view_android.cc +++ b/chrome/browser/ui/android/autofill/autofill_error_dialog_view_android.cc
@@ -59,8 +59,9 @@ ui::ViewAndroid* view_android = web_contents->GetNativeView(); DCHECK(view_android); ui::WindowAndroid* window_android = view_android->GetWindowAndroid(); - if (!window_android) + if (!window_android) { return; + } java_object_.Reset(Java_AutofillErrorDialogBridge_create( env, reinterpret_cast<intptr_t>(this), window_android->GetJavaObject()));
diff --git a/chrome/browser/ui/android/autofill/autofill_keyboard_accessory_view_impl.cc b/chrome/browser/ui/android/autofill/autofill_keyboard_accessory_view_impl.cc index 7d3f306..df1a336 100644 --- a/chrome/browser/ui/android/autofill/autofill_keyboard_accessory_view_impl.cc +++ b/chrome/browser/ui/android/autofill/autofill_keyboard_accessory_view_impl.cc
@@ -56,11 +56,13 @@ return false; } ui::ViewAndroid* view_android = controller_->container_view(); - if (!view_android) + if (!view_android) { return false; + } ui::WindowAndroid* window_android = view_android->GetWindowAndroid(); - if (!window_android) + if (!window_android) { return false; // The window might not be attached (yet or anymore). + } Java_AutofillKeyboardAccessoryViewBridge_init( base::android::AttachCurrentThread(), java_object_, reinterpret_cast<intptr_t>(this), window_android->GetJavaObject());
diff --git a/chrome/browser/ui/android/autofill/autofill_keyboard_accessory_view_impl.h b/chrome/browser/ui/android/autofill/autofill_keyboard_accessory_view_impl.h index 1862592..c0ebc11 100644 --- a/chrome/browser/ui/android/autofill/autofill_keyboard_accessory_view_impl.h +++ b/chrome/browser/ui/android/autofill/autofill_keyboard_accessory_view_impl.h
@@ -23,13 +23,13 @@ // A suggestion view that acts as an alternative to the field-attached popup // window. This view appears above the keyboard and spans the width of the // screen, condensing rather than overlaying the content area. -class AutofillKeyboardAccessoryViewImpl - : public AutofillKeyboardAccessoryView { +class AutofillKeyboardAccessoryViewImpl : public AutofillKeyboardAccessoryView { public: explicit AutofillKeyboardAccessoryViewImpl( base::WeakPtr<AutofillKeyboardAccessoryController> controller); - AutofillKeyboardAccessoryViewImpl(const AutofillKeyboardAccessoryViewImpl&) = delete; + AutofillKeyboardAccessoryViewImpl(const AutofillKeyboardAccessoryViewImpl&) = + delete; AutofillKeyboardAccessoryViewImpl& operator=( const AutofillKeyboardAccessoryViewImpl&) = delete;
diff --git a/chrome/browser/ui/android/autofill/autofill_progress_dialog_view_android.h b/chrome/browser/ui/android/autofill/autofill_progress_dialog_view_android.h index 6f5bad3..6835e273 100644 --- a/chrome/browser/ui/android/autofill/autofill_progress_dialog_view_android.h +++ b/chrome/browser/ui/android/autofill/autofill_progress_dialog_view_android.h
@@ -5,13 +5,12 @@ #ifndef CHROME_BROWSER_UI_ANDROID_AUTOFILL_AUTOFILL_PROGRESS_DIALOG_VIEW_ANDROID_H_ #define CHROME_BROWSER_UI_ANDROID_AUTOFILL_AUTOFILL_PROGRESS_DIALOG_VIEW_ANDROID_H_ -#include "components/autofill/core/browser/ui/payments/autofill_progress_dialog_view.h" - #include <jni.h> #include <stddef.h> #include "base/android/scoped_java_ref.h" #include "base/memory/weak_ptr.h" +#include "components/autofill/core/browser/ui/payments/autofill_progress_dialog_view.h" #include "content/public/browser/web_contents.h" namespace autofill {
diff --git a/chrome/browser/ui/android/autofill/card_expiration_date_fix_flow_view_android.cc b/chrome/browser/ui/android/autofill/card_expiration_date_fix_flow_view_android.cc index c4b8b4cc3..aba1862 100644 --- a/chrome/browser/ui/android/autofill/card_expiration_date_fix_flow_view_android.cc +++ b/chrome/browser/ui/android/autofill/card_expiration_date_fix_flow_view_android.cc
@@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/android/autofill/card_expiration_date_fix_flow_view_android.h" + #include <memory> #include <utility> -#include "chrome/browser/ui/android/autofill/card_expiration_date_fix_flow_view_android.h" - #include "chrome/browser/android/resource_mapper.h" #include "components/autofill/core/browser/ui/payments/card_expiration_date_fix_flow_controller.h" #include "components/autofill/core/browser/ui/payments/card_expiration_date_fix_flow_view.h" @@ -75,8 +75,9 @@ } CardExpirationDateFixFlowViewAndroid::~CardExpirationDateFixFlowViewAndroid() { - if (controller_) + if (controller_) { controller_->OnDialogClosed(); + } } } // namespace autofill
diff --git a/chrome/browser/ui/android/autofill/card_name_fix_flow_view_android.cc b/chrome/browser/ui/android/autofill/card_name_fix_flow_view_android.cc index b39ccc3a..f86deb1 100644 --- a/chrome/browser/ui/android/autofill/card_name_fix_flow_view_android.cc +++ b/chrome/browser/ui/android/autofill/card_name_fix_flow_view_android.cc
@@ -42,8 +42,9 @@ void CardNameFixFlowViewAndroid::Show() { auto java_object = GetOrCreateJavaObject(); - if (!java_object) + if (!java_object) { return; + } java_object_.Reset(java_object); @@ -64,18 +65,21 @@ } CardNameFixFlowViewAndroid::~CardNameFixFlowViewAndroid() { - if (controller_) + if (controller_) { controller_->OnConfirmNameDialogClosed(); + } } base::android::ScopedJavaGlobalRef<jobject> CardNameFixFlowViewAndroid::GetOrCreateJavaObject() { - if (java_object_internal_) + if (java_object_internal_) { return java_object_internal_; + } if (web_contents_->GetNativeView() == nullptr || - web_contents_->GetNativeView()->GetWindowAndroid() == nullptr) + web_contents_->GetNativeView()->GetWindowAndroid() == nullptr) { return nullptr; // No window attached (yet or anymore). + } JNIEnv* env = base::android::AttachCurrentThread(); ui::ViewAndroid* view_android = web_contents_->GetNativeView();
diff --git a/chrome/browser/ui/android/autofill/card_unmask_prompt_view_android.cc b/chrome/browser/ui/android/autofill/card_unmask_prompt_view_android.cc index d181f4ed..ef66b575 100644 --- a/chrome/browser/ui/android/autofill/card_unmask_prompt_view_android.cc +++ b/chrome/browser/ui/android/autofill/card_unmask_prompt_view_android.cc
@@ -32,30 +32,33 @@ CardUnmaskPromptViewAndroid::CardUnmaskPromptViewAndroid( CardUnmaskPromptController* controller, content::WebContents* web_contents) - : controller_(controller), web_contents_(web_contents) { -} + : controller_(controller), web_contents_(web_contents) {} CardUnmaskPromptViewAndroid::~CardUnmaskPromptViewAndroid() { - if (controller_) + if (controller_) { controller_->OnUnmaskDialogClosed(); + } } void CardUnmaskPromptViewAndroid::Show() { auto java_object = GetOrCreateJavaObject(); - if (!java_object) + if (!java_object) { return; + } JNIEnv* env = base::android::AttachCurrentThread(); ui::ViewAndroid* view_android = web_contents_->GetNativeView(); - if (view_android == nullptr || view_android->GetWindowAndroid() == nullptr) + if (view_android == nullptr || view_android->GetWindowAndroid() == nullptr) { return; + } Java_CardUnmaskBridge_show(env, java_object, view_android->GetWindowAndroid()->GetJavaObject()); } void CardUnmaskPromptViewAndroid::Dismiss() { - if (!java_object_internal_) + if (!java_object_internal_) { return; + } Java_CardUnmaskBridge_dismiss(base::android::AttachCurrentThread(), java_object_internal_); } @@ -82,8 +85,9 @@ JNIEnv* env, const JavaParamRef<jobject>& obj) { auto java_object = GetOrCreateJavaObject(); - if (!java_object) + if (!java_object) { return; + } controller_->NewCardLinkClicked(); Java_CardUnmaskBridge_update(env, java_object, base::android::ConvertUTF16ToJavaString( @@ -112,8 +116,9 @@ void CardUnmaskPromptViewAndroid::DisableAndWaitForVerification() { auto java_object = GetOrCreateJavaObject(); - if (!java_object) + if (!java_object) { return; + } JNIEnv* env = base::android::AttachCurrentThread(); Java_CardUnmaskBridge_disableAndWaitForVerification(env, java_object); } @@ -122,12 +127,14 @@ const std::u16string& error_message, bool allow_retry) { auto java_object = GetOrCreateJavaObject(); - if (!java_object) + if (!java_object) { return; + } JNIEnv* env = base::android::AttachCurrentThread(); ScopedJavaLocalRef<jstring> message; - if (!error_message.empty()) - message = base::android::ConvertUTF16ToJavaString(env, error_message); + if (!error_message.empty()) { + message = base::android::ConvertUTF16ToJavaString(env, error_message); + } Java_CardUnmaskBridge_verificationFinished(env, java_object, message, allow_retry);
diff --git a/chrome/browser/ui/android/autofill/otp_verification_dialog_view_android.h b/chrome/browser/ui/android/autofill/otp_verification_dialog_view_android.h index c1e4a00d..47fa68d 100644 --- a/chrome/browser/ui/android/autofill/otp_verification_dialog_view_android.h +++ b/chrome/browser/ui/android/autofill/otp_verification_dialog_view_android.h
@@ -5,13 +5,12 @@ #ifndef CHROME_BROWSER_UI_ANDROID_AUTOFILL_OTP_VERIFICATION_DIALOG_VIEW_ANDROID_H_ #define CHROME_BROWSER_UI_ANDROID_AUTOFILL_OTP_VERIFICATION_DIALOG_VIEW_ANDROID_H_ -#include "components/autofill/core/browser/ui/payments/card_unmask_otp_input_dialog_view.h" - #include <jni.h> #include <stddef.h> #include "base/android/scoped_java_ref.h" #include "base/memory/weak_ptr.h" +#include "components/autofill/core/browser/ui/payments/card_unmask_otp_input_dialog_view.h" #include "ui/android/window_android.h" using base::android::JavaParamRef;
diff --git a/chrome/browser/ui/android/autofill/save_update_address_profile_prompt_view_android.cc b/chrome/browser/ui/android/autofill/save_update_address_profile_prompt_view_android.cc index 08decf3..ed13cec5 100644 --- a/chrome/browser/ui/android/autofill/save_update_address_profile_prompt_view_android.cc +++ b/chrome/browser/ui/android/autofill/save_update_address_profile_prompt_view_android.cc
@@ -53,8 +53,9 @@ base::android::ScopedJavaLocalRef<jobject> java_controller = controller->GetJavaObject(); - if (!java_controller) + if (!java_controller) { return false; + } Profile* browser_profile = Profile::FromBrowserContext(web_contents_->GetBrowserContext()); @@ -68,8 +69,9 @@ java_controller, browser_profile->GetJavaObject(), java_autofill_profile, static_cast<jboolean>(is_update), static_cast<jboolean>(is_migration_to_account))); - if (!java_object_) + if (!java_object_) { return false; + } SetContent(controller, IdentityManagerFactory::GetForProfile(browser_profile), is_update);
diff --git a/chrome/browser/ui/android/autofill/snackbar/autofill_snackbar_view_android.cc b/chrome/browser/ui/android/autofill/snackbar/autofill_snackbar_view_android.cc index a3284f3..9e51856 100644 --- a/chrome/browser/ui/android/autofill/snackbar/autofill_snackbar_view_android.cc +++ b/chrome/browser/ui/android/autofill/snackbar/autofill_snackbar_view_android.cc
@@ -35,8 +35,9 @@ controller_->GetWebContents()->GetNativeView(); DCHECK(view_android); ui::WindowAndroid* window_android = view_android->GetWindowAndroid(); - if (!window_android) + if (!window_android) { return; + } java_object_.Reset(Java_AutofillSnackbarController_create( env, reinterpret_cast<intptr_t>(this), window_android->GetJavaObject()));
diff --git a/chrome/browser/ui/android/chrome_http_auth_handler.cc b/chrome/browser/ui/android/chrome_http_auth_handler.cc index c0e5d78..c70d309 100644 --- a/chrome/browser/ui/android/chrome_http_auth_handler.cc +++ b/chrome/browser/ui/android/chrome_http_auth_handler.cc
@@ -110,8 +110,9 @@ std::u16string ChromeHttpAuthHandler::GetMessageBody( JNIEnv* env, const JavaParamRef<jobject>&) { - if (explanation_.empty()) + if (explanation_.empty()) { return authority_; + } return authority_ + u" " + explanation_; }
diff --git a/chrome/browser/ui/android/chrome_javascript_app_modal_dialog_android.cc b/chrome/browser/ui/android/chrome_javascript_app_modal_dialog_android.cc index 55b6d65..3210c91f 100644 --- a/chrome/browser/ui/android/chrome_javascript_app_modal_dialog_android.cc +++ b/chrome/browser/ui/android/chrome_javascript_app_modal_dialog_android.cc
@@ -2,10 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/javascript_dialogs/chrome_javascript_app_modal_dialog_view_factory.h" - #include "base/android/jni_android.h" #include "base/functional/bind.h" +#include "chrome/browser/ui/javascript_dialogs/chrome_javascript_app_modal_dialog_view_factory.h" #include "components/javascript_dialogs/android/app_modal_dialog_view_android.h" #include "components/javascript_dialogs/app_modal_dialog_controller.h" #include "components/javascript_dialogs/app_modal_dialog_manager.h"
diff --git a/chrome/browser/ui/android/device_dialog/chrome_bluetooth_chooser_android_delegate.h b/chrome/browser/ui/android/device_dialog/chrome_bluetooth_chooser_android_delegate.h index 9b1f4e4..9d4eec8 100644 --- a/chrome/browser/ui/android/device_dialog/chrome_bluetooth_chooser_android_delegate.h +++ b/chrome/browser/ui/android/device_dialog/chrome_bluetooth_chooser_android_delegate.h
@@ -5,9 +5,8 @@ #ifndef CHROME_BROWSER_UI_ANDROID_DEVICE_DIALOG_CHROME_BLUETOOTH_CHOOSER_ANDROID_DELEGATE_H_ #define CHROME_BROWSER_UI_ANDROID_DEVICE_DIALOG_CHROME_BLUETOOTH_CHOOSER_ANDROID_DELEGATE_H_ -#include "components/permissions/android/bluetooth_chooser_android_delegate.h" - #include "base/android/scoped_java_ref.h" +#include "components/permissions/android/bluetooth_chooser_android_delegate.h" class Profile;
diff --git a/chrome/browser/ui/android/device_dialog/chrome_bluetooth_scanning_prompt_android_delegate.h b/chrome/browser/ui/android/device_dialog/chrome_bluetooth_scanning_prompt_android_delegate.h index c9c8990f..b719d50 100644 --- a/chrome/browser/ui/android/device_dialog/chrome_bluetooth_scanning_prompt_android_delegate.h +++ b/chrome/browser/ui/android/device_dialog/chrome_bluetooth_scanning_prompt_android_delegate.h
@@ -5,9 +5,8 @@ #ifndef CHROME_BROWSER_UI_ANDROID_DEVICE_DIALOG_CHROME_BLUETOOTH_SCANNING_PROMPT_ANDROID_DELEGATE_H_ #define CHROME_BROWSER_UI_ANDROID_DEVICE_DIALOG_CHROME_BLUETOOTH_SCANNING_PROMPT_ANDROID_DELEGATE_H_ -#include "components/permissions/android/bluetooth_scanning_prompt_android_delegate.h" - #include "base/android/scoped_java_ref.h" +#include "components/permissions/android/bluetooth_scanning_prompt_android_delegate.h" class Profile;
diff --git a/chrome/browser/ui/android/device_dialog/usb_chooser_dialog_android.cc b/chrome/browser/ui/android/device_dialog/usb_chooser_dialog_android.cc index 4d32e56f..0083946 100644 --- a/chrome/browser/ui/android/device_dialog/usb_chooser_dialog_android.cc +++ b/chrome/browser/ui/android/device_dialog/usb_chooser_dialog_android.cc
@@ -100,8 +100,9 @@ std::move(create_java_dialog_callback) .Run(env, window_android, origin_string, helper->GetSecurityLevel(), j_profile_android, reinterpret_cast<intptr_t>(dialog.get()))); - if (dialog->java_dialog_.is_null()) + if (dialog->java_dialog_.is_null()) { return nullptr; + } return dialog; } @@ -122,8 +123,9 @@ } void UsbChooserDialogAndroid::OnOptionsInitialized() { - for (size_t i = 0; i < controller_->NumOptions(); ++i) + for (size_t i = 0; i < controller_->NumOptions(); ++i) { OnOptionAdded(i); + } JNIEnv* env = base::android::AttachCurrentThread(); Java_UsbChooserDialog_setIdleState(env, java_dialog_);
diff --git a/chrome/browser/ui/android/hats/survey_client_android.h b/chrome/browser/ui/android/hats/survey_client_android.h index eab31ce..1801c36 100644 --- a/chrome/browser/ui/android/hats/survey_client_android.h +++ b/chrome/browser/ui/android/hats/survey_client_android.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_ANDROID_HATS_SURVEY_CLIENT_ANDROID_H_ #include <jni.h> + #include <memory> #include <string>
diff --git a/chrome/browser/ui/android/hats/survey_client_android_browsertest.cc b/chrome/browser/ui/android/hats/survey_client_android_browsertest.cc index 0eae643..0c51accde92 100644 --- a/chrome/browser/ui/android/hats/survey_client_android_browsertest.cc +++ b/chrome/browser/ui/android/hats/survey_client_android_browsertest.cc
@@ -2,12 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/android/hats/survey_client_android.h" + #include <memory> #include "base/functional/bind.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/android/hats/hats_service_android.h" -#include "chrome/browser/ui/android/hats/survey_client_android.h" #include "chrome/browser/ui/android/hats/test/test_survey_utils_bridge.h" #include "chrome/browser/ui/hats/hats_service_factory.h" #include "chrome/test/base/chrome_test_utils.h"
diff --git a/chrome/browser/ui/android/hats/test/test_survey_utils_bridge.cc b/chrome/browser/ui/android/hats/test/test_survey_utils_bridge.cc index c88a9ba..9b1da65 100644 --- a/chrome/browser/ui/android/hats/test/test_survey_utils_bridge.cc +++ b/chrome/browser/ui/android/hats/test/test_survey_utils_bridge.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/android/hats/test/test_survey_utils_bridge.h" + #include <string> #include "base/android/jni_android.h"
diff --git a/chrome/browser/ui/android/infobars/autofill_virtual_card_enrollment_infobar.h b/chrome/browser/ui/android/infobars/autofill_virtual_card_enrollment_infobar.h index cb17c55c48..7bcf586 100644 --- a/chrome/browser/ui/android/infobars/autofill_virtual_card_enrollment_infobar.h +++ b/chrome/browser/ui/android/infobars/autofill_virtual_card_enrollment_infobar.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_ANDROID_INFOBARS_AUTOFILL_VIRTUAL_CARD_ENROLLMENT_INFOBAR_H_ #include <jni.h> + #include <memory> #include "components/infobars/android/confirm_infobar.h"
diff --git a/chrome/browser/ui/android/infobars/infobar_container_android.cc b/chrome/browser/ui/android/infobars/infobar_container_android.cc index 03772a7f..9093188 100644 --- a/chrome/browser/ui/android/infobars/infobar_container_android.cc +++ b/chrome/browser/ui/android/infobars/infobar_container_android.cc
@@ -57,8 +57,9 @@ infobars::InfoBarAndroid* android_bar = static_cast<infobars::InfoBarAndroid*>(infobar); - if (android_bar->HasSetJavaInfoBar()) + if (android_bar->HasSetJavaInfoBar()) { return; + } JNIEnv* env = base::android::AttachCurrentThread(); if (Java_InfoBarContainer_hasInfoBars( @@ -99,7 +100,6 @@ android_infobar->CloseJavaInfoBar(); } - // Native JNI methods --------------------------------------------------------- static jlong JNI_InfoBarContainer_Init(JNIEnv* env,
diff --git a/chrome/browser/ui/android/infobars/simple_confirm_infobar_builder.cc b/chrome/browser/ui/android/infobars/simple_confirm_infobar_builder.cc index 0322cd31..4843339 100644 --- a/chrome/browser/ui/android/infobars/simple_confirm_infobar_builder.cc +++ b/chrome/browser/ui/android/infobars/simple_confirm_infobar_builder.cc
@@ -123,7 +123,7 @@ int SimpleConfirmInfoBarDelegate::GetButtons() const { return (primary_str_.empty() ? 0 : BUTTON_OK) | - (secondary_str_.empty() ? 0 : BUTTON_CANCEL); + (secondary_str_.empty() ? 0 : BUTTON_CANCEL); } std::u16string SimpleConfirmInfoBarDelegate::GetButtonLabel(
diff --git a/chrome/browser/ui/android/layouts/scene_layer.cc b/chrome/browser/ui/android/layouts/scene_layer.cc index 7b35de5..1434e835 100644 --- a/chrome/browser/ui/android/layouts/scene_layer.cc +++ b/chrome/browser/ui/android/layouts/scene_layer.cc
@@ -18,8 +18,9 @@ // static SceneLayer* SceneLayer::FromJavaObject(JNIEnv* env, const JavaRef<jobject>& jobj) { - if (jobj.is_null()) + if (jobj.is_null()) { return nullptr; + } return reinterpret_cast<SceneLayer*>(Java_SceneLayer_getNativePtr(env, jobj)); } @@ -36,8 +37,9 @@ SceneLayer::~SceneLayer() { JNIEnv* env = jni_zero::AttachCurrentThread(); ScopedJavaLocalRef<jobject> jobj = weak_java_scene_layer_.get(env); - if (jobj.is_null()) + if (jobj.is_null()) { return; + } Java_SceneLayer_setNativePtr( env, jobj, reinterpret_cast<intptr_t>(static_cast<SceneLayer*>(nullptr)));
diff --git a/chrome/browser/ui/android/login_handler_android.cc b/chrome/browser/ui/android/login_handler_android.cc index 1ececee7..458ab21 100644 --- a/chrome/browser/ui/android/login_handler_android.cc +++ b/chrome/browser/ui/android/login_handler_android.cc
@@ -62,14 +62,15 @@ return true; } else { LOG(WARNING) << "HTTP Authentication failed because TabAndroid is " - "missing"; + "missing"; return false; } } void CloseDialog() override { - if (chrome_http_auth_handler_) + if (chrome_http_auth_handler_) { chrome_http_auth_handler_->CloseDialog(); + } } private:
diff --git a/chrome/browser/ui/android/logo/logo_bridge.cc b/chrome/browser/ui/android/logo/logo_bridge.cc index ecfc69f..2ec5238e 100644 --- a/chrome/browser/ui/android/logo/logo_bridge.cc +++ b/chrome/browser/ui/android/logo/logo_bridge.cc
@@ -45,16 +45,19 @@ ScopedJavaLocalRef<jobject> j_bitmap = gfx::ConvertToJavaBitmap(bitmap); ScopedJavaLocalRef<jstring> j_on_click_url; - if (on_click_url.is_valid()) + if (on_click_url.is_valid()) { j_on_click_url = ConvertUTF8ToJavaString(env, on_click_url.spec()); + } ScopedJavaLocalRef<jstring> j_alt_text; - if (!alt_text.empty()) + if (!alt_text.empty()) { j_alt_text = ConvertUTF8ToJavaString(env, alt_text); + } ScopedJavaLocalRef<jstring> j_animated_url; - if (animated_url.is_valid()) + if (animated_url.is_valid()) { j_animated_url = ConvertUTF8ToJavaString(env, animated_url.spec()); + } return Java_LogoBridge_createLogo(env, j_bitmap, j_on_click_url, j_alt_text, j_animated_url); @@ -64,8 +67,9 @@ ScopedJavaLocalRef<jobject> JNI_LogoBridge_ConvertLogoToJavaObject( JNIEnv* env, const search_provider_logos::Logo* logo) { - if (!logo) + if (!logo) { return ScopedJavaLocalRef<jobject>(); + } return JNI_LogoBridge_MakeJavaLogo( env, logo->image, GURL(logo->metadata.on_click_url), @@ -89,8 +93,9 @@ // seach_provider_logos::LogoObserver: void OnLogoAvailable(const search_provider_logos::Logo* logo, bool from_cache) override { - if (!logo_bridge_) + if (!logo_bridge_) { return; + } JNIEnv* env = base::android::AttachCurrentThread(); ScopedJavaLocalRef<jobject> j_logo =
diff --git a/chrome/browser/ui/android/overlay/overlay_window_android.cc b/chrome/browser/ui/android/overlay/overlay_window_android.cc index 1586ba1..58d76cd7 100644 --- a/chrome/browser/ui/android/overlay/overlay_window_android.cc +++ b/chrome/browser/ui/android/overlay/overlay_window_android.cc
@@ -147,11 +147,13 @@ Java_PictureInPictureActivity_setCameraState(env, java_ref_.get(env), camera_on_); - if (!update_action_timer_->IsRunning()) + if (!update_action_timer_->IsRunning()) { MaybeNotifyVisibleActionsChanged(); + } - if (video_size_.IsEmpty()) + if (video_size_.IsEmpty()) { return; + } Java_PictureInPictureActivity_updateVideoSize( env, java_ref_.get(env), video_size_.width(), video_size_.height()); @@ -195,8 +197,9 @@ void OverlayWindowAndroid::TogglePlayPause(JNIEnv* env, bool toggleOn) { DCHECK(!controller_->IsPlayerActive()); - if (toggleOn == (playback_state_ == PlaybackState::kPaused)) + if (toggleOn == (playback_state_ == PlaybackState::kPaused)) { controller_->TogglePlayPause(); + } } void OverlayWindowAndroid::NextTrack(JNIEnv* env) { @@ -216,13 +219,15 @@ } void OverlayWindowAndroid::ToggleMicrophone(JNIEnv* env, bool toggleOn) { - if (microphone_muted_ == toggleOn) + if (microphone_muted_ == toggleOn) { controller_->ToggleMicrophone(); + } } void OverlayWindowAndroid::ToggleCamera(JNIEnv* env, bool toggleOn) { - if (!camera_on_ == toggleOn) + if (!camera_on_ == toggleOn) { controller_->ToggleCamera(); + } } void OverlayWindowAndroid::HangUp(JNIEnv* env) { @@ -242,8 +247,9 @@ jint width, jint height) { gfx::Size content_size(width, height); - if (bounds_.size() == content_size) + if (bounds_.size() == content_size) { return; + } bounds_.set_size(content_size); surface_layer_->SetBounds(content_size); @@ -267,8 +273,9 @@ } void OverlayWindowAndroid::CloseInternal() { - if (java_ref_.is_uninitialized()) + if (java_ref_.is_uninitialized()) { return; + } DCHECK(window_android_); window_android_->RemoveObserver(this); @@ -308,12 +315,14 @@ } void OverlayWindowAndroid::SetPlaybackState(PlaybackState playback_state) { - if (playback_state_ == playback_state) + if (playback_state_ == playback_state) { return; + } playback_state_ = playback_state; - if (java_ref_.is_uninitialized()) + if (java_ref_.is_uninitialized()) { return; + } JNIEnv* env = base::android::AttachCurrentThread(); Java_PictureInPictureActivity_setPlaybackState(env, java_ref_.get(env), @@ -321,12 +330,14 @@ } void OverlayWindowAndroid::SetMicrophoneMuted(bool muted) { - if (microphone_muted_ == muted) + if (microphone_muted_ == muted) { return; + } microphone_muted_ = muted; - if (java_ref_.is_uninitialized()) + if (java_ref_.is_uninitialized()) { return; + } JNIEnv* env = base::android::AttachCurrentThread(); Java_PictureInPictureActivity_setMicrophoneMuted(env, java_ref_.get(env), @@ -334,12 +345,14 @@ } void OverlayWindowAndroid::SetCameraState(bool turned_on) { - if (camera_on_ == turned_on) + if (camera_on_ == turned_on) { return; + } camera_on_ = turned_on; - if (java_ref_.is_uninitialized()) + if (java_ref_.is_uninitialized()) { return; + } JNIEnv* env = base::android::AttachCurrentThread(); Java_PictureInPictureActivity_setCameraState(env, java_ref_.get(env), @@ -406,8 +419,9 @@ } void OverlayWindowAndroid::MaybeNotifyVisibleActionsChanged() { - if (java_ref_.is_uninitialized()) + if (java_ref_.is_uninitialized()) { return; + } JNIEnv* env = base::android::AttachCurrentThread(); Java_PictureInPictureActivity_updateVisibleActions( @@ -426,10 +440,11 @@ return; } - if (is_visible) + if (is_visible) { visible_actions_.insert(action_code); - else + } else { visible_actions_.erase(action_code); + } if (!update_action_timer_->IsRunning()) { update_action_timer_->Start(
diff --git a/chrome/browser/ui/android/passwords/all_passwords_bottom_sheet_view_impl.cc b/chrome/browser/ui/android/passwords/all_passwords_bottom_sheet_view_impl.cc index 08b3c2c8..3b9ef18 100644 --- a/chrome/browser/ui/android/passwords/all_passwords_bottom_sheet_view_impl.cc +++ b/chrome/browser/ui/android/passwords/all_passwords_bottom_sheet_view_impl.cc
@@ -30,7 +30,6 @@ using base::android::ConvertUTF8ToJavaString; using base::android::JavaParamRef; - AllPasswordsBottomSheetViewImpl::AllPasswordsBottomSheetViewImpl( AllPasswordsBottomSheetController* controller) : controller_(controller) {} @@ -48,8 +47,9 @@ credentials, FocusedFieldType focused_field_type) { auto java_object = GetOrCreateJavaObject(); - if (!java_object) + if (!java_object) { return; + } JNIEnv* env = AttachCurrentThread();
diff --git a/chrome/browser/ui/android/passwords/password_generation_editing_popup_view_android.cc b/chrome/browser/ui/android/passwords/password_generation_editing_popup_view_android.cc index ad1cc370..4a6e4f3 100644 --- a/chrome/browser/ui/android/passwords/password_generation_editing_popup_view_android.cc +++ b/chrome/browser/ui/android/passwords/password_generation_editing_popup_view_android.cc
@@ -30,8 +30,9 @@ void PasswordGenerationEditingPopupViewAndroid::Dismissed( JNIEnv* env, const JavaParamRef<jobject>& obj) { - if (controller_) + if (controller_) { controller_->ViewDestroyed(); + } delete this; } @@ -42,17 +43,20 @@ bool PasswordGenerationEditingPopupViewAndroid::Show() { ui::ViewAndroid* view_android = controller_->container_view(); - if (!view_android) + if (!view_android) { return false; + } popup_ = view_android->AcquireAnchorView(); const ScopedJavaLocalRef<jobject> view = popup_.view(); - if (view.is_null()) + if (view.is_null()) { return false; + } ui::WindowAndroid* window_android = view_android->GetWindowAndroid(); - if (!window_android) + if (!window_android) { return false; + } JNIEnv* env = base::android::AttachCurrentThread(); java_object_.Reset(Java_PasswordGenerationPopupBridge_create( @@ -76,16 +80,19 @@ void PasswordGenerationEditingPopupViewAndroid::UpdateState() {} bool PasswordGenerationEditingPopupViewAndroid::UpdateBoundsAndRedrawPopup() { - if (java_object_.is_null()) + if (java_object_.is_null()) { return false; + } const ScopedJavaLocalRef<jobject> view = popup_.view(); - if (view.is_null()) + if (view.is_null()) { return false; + } ui::ViewAndroid* view_android = controller_->container_view(); - if (!view_android) + if (!view_android) { return false; + } view_android->SetAnchorRect(view, controller_->element_bounds()); JNIEnv* env = base::android::AttachCurrentThread();
diff --git a/chrome/browser/ui/android/plus_addresses/plus_address_creation_controller_android_unittest.cc b/chrome/browser/ui/android/plus_addresses/plus_address_creation_controller_android_unittest.cc index 6e9afcd..90789a43 100644 --- a/chrome/browser/ui/android/plus_addresses/plus_address_creation_controller_android_unittest.cc +++ b/chrome/browser/ui/android/plus_addresses/plus_address_creation_controller_android_unittest.cc
@@ -106,9 +106,7 @@ PlusAddressCreationControllerAndroid::CreateForWebContents(web_contents()); } - void TearDown() override { - ChromeRenderViewHostTestHarness::TearDown(); - } + void TearDown() override { ChromeRenderViewHostTestHarness::TearDown(); } protected: void FastForwardBy(base::TimeDelta delta) {
diff --git a/chrome/browser/ui/android/ssl_client_certificate_selector.cc b/chrome/browser/ui/android/ssl_client_certificate_selector.cc index de69508..603d775d 100644 --- a/chrome/browser/ui/android/ssl_client_certificate_selector.cc +++ b/chrome/browser/ui/android/ssl_client_certificate_selector.cc
@@ -2,11 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ssl/ssl_client_certificate_selector.h" + #include <utility> #include "base/functional/callback.h" #include "base/no_destructor.h" -#include "chrome/browser/ssl/ssl_client_certificate_selector.h" #include "components/browser_ui/client_certificate/android/ssl_client_certificate_request.h" #include "content/public/browser/client_certificate_delegate.h" #include "net/ssl/ssl_private_key.h" @@ -41,4 +42,3 @@ ShowSSLClientCertificateSelectorTestingHook hook) { GetShowSSLClientCertificateSelectorTestingHook() = std::move(hook); } -
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_af.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_af.xtb index def813c..07c82f6 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_af.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_af.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">Jou organisasie het Veiligblaai aangeskakel</translation> <translation id="5620163320393916465">Geen gestoorde wagwoorde nie</translation> <translation id="5620928963363755975">Kry jou lêers en bladsye in Aflaaie vanaf die Meer Opsies-knoppie</translation> -<translation id="562289928968387744">Bestuur reaksies</translation> <translation id="5626134646977739690">Naam:</translation> <translation id="5628604359369369630">Ongelees – vanlyn beskikbaar</translation> <translation id="5631483240431073854">Bestuur oop oortjies</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_am.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_am.xtb index 131100f8..38cdaaa 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_am.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_am.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">ድርጅትዎ የደህንነት አሰሳን አብርቷል</translation> <translation id="5620163320393916465">ምንም የተቀመጡ የይለፍ ቃላት የሉም</translation> <translation id="5620928963363755975">ከተጨማሪ አማራጮች አዝራር ሆነው የእርስዎን ፋይሎች እና ገጾች በውርዶች ውስጥ ያግኙ</translation> -<translation id="562289928968387744">አጸፋ ምላሾችን ያቀናብሩ</translation> <translation id="5626134646977739690">ስም፦</translation> <translation id="5628604359369369630">ያልተነበበ - ከመስመር ውጭ ይገኛል</translation> <translation id="5631483240431073854">ክፍት ትሮችን አስተዳድር</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ar.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ar.xtb index 5fd2e2c..4fc7293 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ar.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ar.xtb
@@ -974,6 +974,7 @@ <translation id="5444999712122199445">الرجوع إلى الموقع الإلكتروني</translation> <translation id="544776284582297024">لفتح علامات تبويب وزيارة صفحات مختلفة في آنٍ واحد، انقر على زر "علامات التبويب المفتوحة".</translation> <translation id="5454166040603940656">مع <ph name="PROVIDER" /></translation> +<translation id="5454215368971121976">عندما يكون جهازك مطويًا، يمكنك تغيير مكان شريط العناوين من خلال تحديد خيار أو النقر عليه مع الاستمرار.</translation> <translation id="5458366071038729214">تظهر هنا المواقع الإلكترونية التي تتابعها.</translation> <translation id="5468068603361015296">هل تريد تنزيل <ph name="FILE_NAME" /> على أي حال؟</translation> <translation id="548278423535722844">فتح في تطبيق الخرائط</translation> @@ -1006,7 +1007,6 @@ <translation id="5619633276517849615">فعّلت مؤسستك ميزة "التصفُّح الآمن"</translation> <translation id="5620163320393916465">ما مِن كلمات مرور محفوظة.</translation> <translation id="5620928963363755975">العثور على الملفات والصفحات في "المحتوى الذي تم تنزيله" من الزر "مزيد من الخيارات"</translation> -<translation id="562289928968387744">إدارة التفاعلات</translation> <translation id="5626134646977739690">الاسم:</translation> <translation id="5628604359369369630">الصفحات غير المقروءة المتاحة بلا إنترنت</translation> <translation id="5631483240431073854">إدارة علامات التبويب المفتوحة</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_as.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_as.xtb index b7f11c6..ca29397 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_as.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_as.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">আপোনাৰ প্ৰতিষ্ঠানে সুৰক্ষিত ব্ৰাউজিং অন কৰিছে</translation> <translation id="5620163320393916465">ছেভ কৰা কোনো পাছৱৰ্ড নাই</translation> <translation id="5620928963363755975">অধিক বিকল্প-ৰ বুটামটো ব্যৱহাৰ কৰি আপোনাৰ ফাইল আৰু পৃষ্ঠাসমূহ ডাউনল’ড-ৰ ভিতৰত পাওক</translation> -<translation id="562289928968387744">প্ৰতিক্ৰিয়া পৰিচালনা কৰক</translation> <translation id="5626134646977739690">নাম:</translation> <translation id="5628604359369369630">নপঢ়া - অফলাইনত উপলব্ধ</translation> <translation id="5631483240431073854">খুলি থোৱা টেব পৰিচালনা কৰক</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_az.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_az.xtb index 7c5be37d..2e8e12a5 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_az.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_az.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">Təşkilat Güvənli Baxışı yandırıb</translation> <translation id="5620163320393916465">Yadda saxlanmış parol yoxdur</translation> <translation id="5620928963363755975">Fayl və səhifələri Digər Seçimlər düyməsindəki Endirilənlər bölməsində tapın</translation> -<translation id="562289928968387744">Reaksiyalarıi idarə edin</translation> <translation id="5626134646977739690">Ad:</translation> <translation id="5628604359369369630">Oxunmayıb - Oflayn əlçatandır</translation> <translation id="5631483240431073854">Açıq tabları idarə edin</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_be.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_be.xtb index ae9a46c..81425f9 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_be.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_be.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">Ваша арганізацыя ўключыла Бяспечны прагляд</translation> <translation id="5620163320393916465">Няма захаваных пароляў</translation> <translation id="5620928963363755975">Знаходзьце файлы і старонкі ў папцы "Спампоўкі" з дапамогай кнопкі "Дадатковыя параметры"</translation> -<translation id="562289928968387744">Кіраваць рэакцыямі</translation> <translation id="5626134646977739690">Назва:</translation> <translation id="5628604359369369630">Непрачытана – Даступна па-за сеткай</translation> <translation id="5631483240431073854">Кіраваць адкрытымі ўкладкамі</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_bg.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_bg.xtb index e454b43..cefe1d8 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_bg.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_bg.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">Организацията ви включи Безопасно сърфиране</translation> <translation id="5620163320393916465">Няма запазени пароли</translation> <translation id="5620928963363755975">Използвайте бутона „Още опции“, за да намерите файловете и страниците си в „Изтегляния“</translation> -<translation id="562289928968387744">Управление на реакциите</translation> <translation id="5626134646977739690">Име:</translation> <translation id="5628604359369369630">Непрочетено – налице офлайн</translation> <translation id="5631483240431073854">Управление на отворените раздели</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_bn.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_bn.xtb index 3b8fc4e..a0b6cda 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_bn.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_bn.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">আপনার সংগঠন Safe Browsing ফিচারটি চালু করেছে</translation> <translation id="5620163320393916465">কোনও পাসওয়ার্ড সেভ করা নেই</translation> <translation id="5620928963363755975">আরও বিকল্প বোতামের ডাউনলোড বিকল্প থেকে আপনার সমস্ত ফাইল ও পৃষ্ঠাগুলি খুঁজে পান</translation> -<translation id="562289928968387744">প্রতিক্রিয়া ম্যানেজ করুন</translation> <translation id="5626134646977739690">নাম:</translation> <translation id="5628604359369369630">পড়া হয়নি - অফলাইনে উপলভ্য</translation> <translation id="5631483240431073854">খোলা ট্যাব ম্যানেজ করুন</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_bs.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_bs.xtb index e592ded..ec54fd5 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_bs.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_bs.xtb
@@ -19,6 +19,7 @@ <translation id="107147699690128016">Ako promijenite ekstenziju fajla, moguće je da će se fajl otvoriti u drugoj aplikaciji i potencijalno predstavljati opasnost po vaš uređaj.</translation> <translation id="1080365971383768617">Lozinke na svim vašim uređajima</translation> <translation id="1082920045291562218">Dijeljenje sa zatvorenom tabelom sažetka povratnih informacija</translation> +<translation id="1087176310396019910">Mogući neželjeni sadržaj</translation> <translation id="1089606299949659462">Pregled je završen!</translation> <translation id="1094555143448724771">Da vidite kartice sa svojih drugih uređaja, sinhronizirajte kartice i historiju</translation> <translation id="1095761715416917775">Provjerite možete li uvijek pristupiti sinhroniziranim podacima</translation> @@ -508,6 +509,7 @@ <translation id="3282568296779691940">Prijava na Chrome</translation> <translation id="3285065882678541460">{TAB_COUNT,plural, =1{<ph name="TAB_GROUPS_PART" />, <ph name="TAB_COUNT_ONE" /> kartica}one{<ph name="TAB_GROUPS_PART" />, <ph name="TAB_COUNT_MANY" /> kartica}few{<ph name="TAB_GROUPS_PART" />, <ph name="TAB_COUNT_MANY" /> kartice}other{<ph name="TAB_GROUPS_PART" />, <ph name="TAB_COUNT_MANY" /> kartica}}</translation> <translation id="3293181007446299124">Vaša historija pregledanja se privatno pohranjuje na vašem uređaju, a izvještaji se šalju s kašnjenjem radi zaštite vašeg identiteta</translation> +<translation id="3301936297336370235">Potvrda prijedloga zaporke</translation> <translation id="3302615849591357577">Vraćanje grupe kartica <ph name="TITLE_OF_GROUP" />, boje <ph name="COLOR_NAME" /> kao nove pozadinske grupe kartica.</translation> <translation id="3303414029551471755">Nastaviti s preuzimanjem sadržaja?</translation> <translation id="3303855915957856445">Nije pronađen nijedan rezultat pretraživanja</translation> @@ -972,6 +974,7 @@ <translation id="5444999712122199445">Vratite se na web lokaciju</translation> <translation id="544776284582297024">Da otvorite kartice i posjećujete različite stranice u isto vrijeme, dodirnite dugme Otvori kartice</translation> <translation id="5454166040603940656">s pružaocem usluge <ph name="PROVIDER" /></translation> +<translation id="5454215368971121976">Kada je uređaj sklopljen, možete odabrati opciju ili dodirnuti i zadržati traku za adresu da promijenite položaj.</translation> <translation id="5458366071038729214">Ovdje ćete pronaći lokacije koje pratite</translation> <translation id="5468068603361015296">Želite li ipak preuzeti fajl <ph name="FILE_NAME" />?</translation> <translation id="548278423535722844">Otvori u aplikacijama za mape</translation> @@ -1004,7 +1007,6 @@ <translation id="5619633276517849615">Vaša organizacija je uključila Sigurno pregledanje</translation> <translation id="5620163320393916465">Nije sačuvana nijedna lozinka</translation> <translation id="5620928963363755975">Pronađite fajlove i stranice u meniju Preuzimanja koristeći dugme Više opcija</translation> -<translation id="562289928968387744">Upravljajte reakcijama</translation> <translation id="5626134646977739690">Naziv:</translation> <translation id="5628604359369369630">Nepročitano – Dostupno offline</translation> <translation id="5631483240431073854">Upravljanje otvorenim karticama</translation> @@ -1136,6 +1138,7 @@ <translation id="6193448654517602979">Odaberite kartice</translation> <translation id="6196315980958524839">Lozinke se pohranjuju u Googleovom Upravitelju lozinki na ovom uređaju.</translation> <translation id="6202812185118613467">Ponovo se prijavite da započnete sinhronizaciju</translation> +<translation id="6204781143409202534">Chrome je otkrio mogući neželjeni sadržaj s domene <ph name="DOMAIN" />.</translation> <translation id="6205314730813004066">Privatnost pri izloženosti oglasima</translation> <translation id="6210748933810148297">Vi niste <ph name="EMAIL" />?</translation> <translation id="6211386937064921208">Pregledanje ove stranice</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ca.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ca.xtb index 2baf2d92..14a92334 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ca.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ca.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">La teva organització ha activat Navegació segura</translation> <translation id="5620163320393916465">No hi ha cap contrasenya desada</translation> <translation id="5620928963363755975">Per veure els teus fitxers i les teves pàgines, toca el botó Més opcions i ves a la secció Baixades</translation> -<translation id="562289928968387744">Gestiona les reaccions</translation> <translation id="5626134646977739690">Nom:</translation> <translation id="5628604359369369630">No llegits - Disponible sense connexió</translation> <translation id="5631483240431073854">Gestiona les pestanyes obertes</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_cs.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_cs.xtb index f6a45dd..9d7983e 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_cs.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_cs.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">Vaše organizace zapnula Bezpečné prohlížení</translation> <translation id="5620163320393916465">Nemáte žádná uložená hesla</translation> <translation id="5620928963363755975">Stažené soubory a stránky můžete najít pomocí tlačítka Další možnosti</translation> -<translation id="562289928968387744">Spravovat reakce</translation> <translation id="5626134646977739690">Jméno:</translation> <translation id="5628604359369369630">Nepřečteno – k dispozici offline</translation> <translation id="5631483240431073854">Spravovat otevřené karty</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_cy.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_cy.xtb index f8495f0..f73a4a2 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_cy.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_cy.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">Mae eich sefydliad wedi troi Pori'n Ddiogel ymlaen</translation> <translation id="5620163320393916465">Nid oes unrhyw gyfrineiriau sydd wedi'u cadw</translation> <translation id="5620928963363755975">Gallwch ddod o hyd i'ch ffeiliau a'ch tudalennau yn Lawrlwythiadau o'r botwm Rhagor o Ddewisiadau</translation> -<translation id="562289928968387744">Rheoli ymatebion</translation> <translation id="5626134646977739690">Enw:</translation> <translation id="5628604359369369630">Heb eu darllen - Ar gael all-lein</translation> <translation id="5631483240431073854">Rheoli tabiau agored</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_da.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_da.xtb index e1e2e85..d8b5248 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_da.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_da.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">Din organisation har aktiveret Beskyttet browsing</translation> <translation id="5620163320393916465">Der er ingen gemte adgangskoder</translation> <translation id="5620928963363755975">Find dine filer og sider i Downloads via knappen Flere valgmuligheder</translation> -<translation id="562289928968387744">Administrer reaktioner</translation> <translation id="5626134646977739690">Navn:</translation> <translation id="5628604359369369630">Ulæst – Tilgængelig offline</translation> <translation id="5631483240431073854">Administrer åbne faner</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_de.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_de.xtb index 37ff548..73e92b6 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_de.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_de.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">Deine Organisation hat Safe Browsing aktiviert</translation> <translation id="5620163320393916465">Keine gespeicherten Passwörter</translation> <translation id="5620928963363755975">Deine Dateien und Seiten findest du durch Auswahl der Schaltfläche "Weitere Optionen" unter "Downloads"</translation> -<translation id="562289928968387744">Reaktionen verwalten</translation> <translation id="5626134646977739690">Name:</translation> <translation id="5628604359369369630">Ungelesen – offline verfügbar</translation> <translation id="5631483240431073854">Geöffnete Tabs verwalten</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_el.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_el.xtb index 6f2e660..a5dbeb96 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_el.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_el.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">Ο οργανισμός σας ενεργοποίησε την Ασφαλή περιήγηση</translation> <translation id="5620163320393916465">Δεν υπάρχουν αποθηκευμένοι κωδικοί πρόσβασης</translation> <translation id="5620928963363755975">Βρείτε τα αρχεία και τις σελίδες σας στις Λήψις από το κουμπί Περισσότερες επιλογές</translation> -<translation id="562289928968387744">Διαχείριση αντιδράσεων</translation> <translation id="5626134646977739690">Όνομα:</translation> <translation id="5628604359369369630">Μη αναγνωσμένα - Διαθέσιμα εκτός σύνδεσης</translation> <translation id="5631483240431073854">Διαχείριση ανοικτών καρτελών</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_en-GB.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_en-GB.xtb index 2799e111..8ac039d0d 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_en-GB.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_en-GB.xtb
@@ -972,6 +972,7 @@ <translation id="5444999712122199445">Go back to site</translation> <translation id="544776284582297024">To open tabs and visit different pages at the same time, tap the open tabs button</translation> <translation id="5454166040603940656">with <ph name="PROVIDER" /></translation> +<translation id="5454215368971121976">When your device is folded, you can choose an option or touch and hold the address bar to change the position.</translation> <translation id="5458366071038729214">You'll find the sites that you follow here</translation> <translation id="5468068603361015296">Do you want to download <ph name="FILE_NAME" /> anyway?</translation> <translation id="548278423535722844">Open in maps app</translation> @@ -1004,7 +1005,6 @@ <translation id="5619633276517849615">Your organisation turned on Safe Browsing</translation> <translation id="5620163320393916465">No saved passwords</translation> <translation id="5620928963363755975">Find your files and pages in Downloads from the More Options button</translation> -<translation id="562289928968387744">Manage reactions</translation> <translation id="5626134646977739690">Name:</translation> <translation id="5628604359369369630">Unread – available offline</translation> <translation id="5631483240431073854">Manage open tabs</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_es-419.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_es-419.xtb index c219d422..6b9eb8b 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_es-419.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_es-419.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">Tu organización activó la Navegación segura</translation> <translation id="5620163320393916465">No hay contraseñas guardadas</translation> <translation id="5620928963363755975">Encuentra tus archivos y páginas en Descargas desde el botón Más opciones</translation> -<translation id="562289928968387744">Administrar reacciones</translation> <translation id="5626134646977739690">Nombre:</translation> <translation id="5628604359369369630">Sin leer - Disponible sin conexión</translation> <translation id="5631483240431073854">Administrar pestañas abiertas</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_es.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_es.xtb index d7a4504..dd704b9 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_es.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_es.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">Tu organización ha activado Navegación segura</translation> <translation id="5620163320393916465">No hay ninguna contraseña guardada</translation> <translation id="5620928963363755975">Encuentra tus archivos y páginas en la sección Descargas con el botón Más opciones</translation> -<translation id="562289928968387744">Gestionar reacciones</translation> <translation id="5626134646977739690">Nombre:</translation> <translation id="5628604359369369630">No leído: disponible sin conexión</translation> <translation id="5631483240431073854">Gestionar pestañas abiertas</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_et.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_et.xtb index 1b4787b..a268212a 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_et.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_et.xtb
@@ -972,6 +972,7 @@ <translation id="5444999712122199445">Tagasi saidile</translation> <translation id="544776284582297024">Vahelehtede avamiseks ja eri lehtede samal ajal külastamiseks puudutage avatud vahelehtede nuppu</translation> <translation id="5454166040603940656">teenusepakkujaga <ph name="PROVIDER" /></translation> +<translation id="5454215368971121976">Kui teie seade on volditud, saate teha valiku või puudutada pikalt aadressiriba, et muuta asendit.</translation> <translation id="5458366071038729214">Jälgitavad saidid leiate siit</translation> <translation id="5468068603361015296">Kas soovite faili <ph name="FILE_NAME" /> ikkagi alla laadida?</translation> <translation id="548278423535722844">Avage kaardirakenduses</translation> @@ -1004,7 +1005,6 @@ <translation id="5619633276517849615">Teie organisatsioon lülitas Google'i ohutu sirvimise sisse</translation> <translation id="5620163320393916465">Salvestatud paroole ei ole</translation> <translation id="5620928963363755975">Leidke oma failid ja lehed jaotisest Allalaadimised, kasutades nuppu Rohkem valikuid</translation> -<translation id="562289928968387744">Reaktsioonide haldamine</translation> <translation id="5626134646977739690">Nimi:</translation> <translation id="5628604359369369630">Lugemata – võrguühenduseta saadaval</translation> <translation id="5631483240431073854">Avatud vahelehtede haldamine</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_eu.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_eu.xtb index 0267c1c..a236b543 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_eu.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_eu.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">Zure erakundeak Arakatze segurua aktibatu du</translation> <translation id="5620163320393916465">Ez dago pasahitzik gordeta</translation> <translation id="5620928963363755975">Bilatu Deskargak atalean dituzun fitxategiak eta orriak Aukera gehiago botoia sakatuta</translation> -<translation id="562289928968387744">Kudeatu erreakzioak</translation> <translation id="5626134646977739690">Izena:</translation> <translation id="5628604359369369630">Irakurri gabeak (konexiorik gabe erabilgarri)</translation> <translation id="5631483240431073854">Kudeatu irekitako fitxak</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fa.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fa.xtb index 8ab4ceeb..caab71f 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fa.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fa.xtb
@@ -972,6 +972,7 @@ <translation id="5444999712122199445">برگشتن به سایت</translation> <translation id="544776284582297024">برای باز کردن برگهها و بازدید همزمان از صفحههای مختلف، روی دکمه «بازکردن برگهها» تکضرب بزنید</translation> <translation id="5454166040603940656">با <ph name="PROVIDER" /></translation> +<translation id="5454215368971121976">وقتی دستگاهتان تاشده است، میتوانید برای تغییر موقعیت گزینهای را انتخاب کنید یا نوار نشانی را طولانی لمس کنید.</translation> <translation id="5458366071038729214">سایتهایی را که دنبال میکنید اینجا پیدا خواهید کرد</translation> <translation id="5468068603361015296">میخواهید <ph name="FILE_NAME" /> درهرصورت بارگیری شود؟</translation> <translation id="548278423535722844">باز کردن در برنامه Maps</translation> @@ -1004,7 +1005,6 @@ <translation id="5619633276517849615">سازمانتان «مرور ایمن» را روشن کرده است</translation> <translation id="5620163320393916465">گذرواژهای ذخیره نشده است</translation> <translation id="5620928963363755975">با استفاده از دکمه «گزینههای بیشتر»، فایلها و صفحههایتان را در «بارگیریها» پیدا کنید</translation> -<translation id="562289928968387744">مدیریت واکنشها</translation> <translation id="5626134646977739690">نام:</translation> <translation id="5628604359369369630">خواندهنشده - دردسترس درحالت آفلاین</translation> <translation id="5631483240431073854">مدیریت کردن برگههای باز</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fi.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fi.xtb index cd58c86..e3dae1c0 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fi.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fi.xtb
@@ -1005,7 +1005,6 @@ <translation id="5619633276517849615">Organisaatiosi on laittanut Selaussuojan päälle</translation> <translation id="5620163320393916465">Ei tallennettuja salasanoja</translation> <translation id="5620928963363755975">Valitse Lisäasetukset ja sitten Lataukset, niin löydät tiedostosi ja sivusi.</translation> -<translation id="562289928968387744">Ylläpidä reaktioita</translation> <translation id="5626134646977739690">Nimi:</translation> <translation id="5628604359369369630">Lukematon – luettavissa ilman verkkoyhteyttä</translation> <translation id="5631483240431073854">Hallitse avoimia välilehtiä</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fil.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fil.xtb index 3b905895..e2e854ce 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fil.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fil.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">In-on ng iyong organisasyon ang Ligtas na Pag-browse</translation> <translation id="5620163320393916465">Walang naka-save na password</translation> <translation id="5620928963363755975">Hanapin ang iyong mga file at page sa Mga Download mula sa button na Higit Pang Opsyon</translation> -<translation id="562289928968387744">Pamahalaan ang mga reaksyon</translation> <translation id="5626134646977739690">Pangalan:</translation> <translation id="5628604359369369630">Hindi pa nabasa - Available offline</translation> <translation id="5631483240431073854">Pamahalaan ang mga nakabukas na tab</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fr-CA.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fr-CA.xtb index bda8c9c9..320b8be 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fr-CA.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fr-CA.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">Votre organisation a activé la Navigation sécurisée</translation> <translation id="5620163320393916465">Aucun mot de passe enregistré</translation> <translation id="5620928963363755975">Trouvez vos fichiers et vos pages dans Téléchargements à partir du bouton Plus d'options</translation> -<translation id="562289928968387744">Gérer les réactions</translation> <translation id="5626134646977739690">Nom :</translation> <translation id="5628604359369369630">Non lus : accessibles hors ligne</translation> <translation id="5631483240431073854">Gérer les onglets ouverts</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fr.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fr.xtb index 7d000f9..07b4e88 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fr.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fr.xtb
@@ -256,7 +256,7 @@ <translation id="2172688499998841696">Les descriptions d'images sont désactivées</translation> <translation id="2172905120685242547">Fermer la fenêtre ?</translation> <translation id="2173302385160625112">Vérifiez votre connexion Internet</translation> -<translation id="2175927920773552910">Code QR</translation> +<translation id="2175927920773552910">QR code</translation> <translation id="2184272387334793084">Connectez-vous pour accéder à vos mots de passe et bien plus sur tous vos appareils</translation> <translation id="218608176142494674">Partage</translation> <translation id="219283042927675668">Onglets dans le groupe</translation> @@ -744,7 +744,7 @@ <translation id="4452411734226507615">Fermer l'onglet <ph name="TAB_TITLE" /></translation> <translation id="4452548195519783679">Ajouté aux favoris dans "<ph name="FOLDER_NAME" />"</translation> <translation id="4460861538906892109">{ITEMS_COUNT,plural, =1{1 favori}one{# favori}other{# favoris}}</translation> -<translation id="4461614516424362539">Lorsque vous associez un autre appareil avec un code QR, celui-ci peut utiliser ce téléphone comme clé de sécurité. Si vous le supprimez, vous devrez scanner à nouveau un code QR pour l'associer.</translation> +<translation id="4461614516424362539">Lorsque vous associez un autre appareil avec un QR code, celui-ci peut utiliser ce téléphone comme clé de sécurité. Si vous le supprimez, vous devrez scanner à nouveau un QR code pour l'associer.</translation> <translation id="4478161224666880173">Vous pouvez utiliser votre compte <ph name="IDENTITY_PROVIDER_ETLD_PLUS_ONE" /> sur ce site. Pour continuer, connectez-vous à <ph name="IDENTITY_PROVIDER_ETLD_PLUS_ONE" />.</translation> <translation id="4479972344484327217">Installation du module <ph name="MODULE" /> pour Chrome…</translation> <translation id="4481181637083926190">{BOOKMARK_COUNT,plural, =1{Favori enregistré dans "<ph name="FOLDER_NAME" />". Il n'est enregistré que sur cet appareil.}one{Favori enregistré dans "<ph name="FOLDER_NAME" />". Il n'est enregistré que sur cet appareil.}other{Favoris enregistrés dans "<ph name="FOLDER_NAME" />". Ils ne sont enregistrés que sur cet appareil.}}</translation> @@ -887,7 +887,7 @@ <translation id="5012253429094023177"><ph name="BEGIN_BOLD1" /><ph name="PROVIDER1" /><ph name="END_BOLD1" /> et <ph name="BEGIN_BOLD2" /><ph name="PROVIDER2" /><ph name="END_BOLD2" /> semblent liés. Assurez-vous de pouvoir faire confiance à <ph name="BEGIN_BOLD3" /><ph name="PROVIDER2" /><ph name="END_BOLD3" /> avant d'utiliser votre mot de passe.</translation> <translation id="5016205925109358554">Serif</translation> <translation id="5017529052065664584">15 dernières minutes</translation> -<translation id="5032430150487044192">Impossible de créer le code QR</translation> +<translation id="5032430150487044192">Impossible de créer le QR code</translation> <translation id="5035846135112863536">Sélectionnez "Plus d'informations" ci-dessous pour obtenir des informations complémentaires auprès de <ph name="IDENTITY_PROVIDER_ETLD_PLUS_ONE" />.</translation> <translation id="5039678609803776426">{TAB_COUNT,plural, =1{<ph name="TAB_COUNT_ONE" /> onglet - <ph name="URL_LIST" />}one{<ph name="TAB_COUNT_MANY" /> onglet - <ph name="URL_LIST" />}other{<ph name="TAB_COUNT_MANY" /> onglets - <ph name="URL_LIST" />}}</translation> <translation id="5040262127954254034">Confidentialité</translation> @@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">Votre organisation a activé la navigation sécurisée</translation> <translation id="5620163320393916465">Aucun mot de passe enregistré</translation> <translation id="5620928963363755975">Recherchez vos fichiers et vos pages dans les téléchargements, à partir du bouton "Plus d'options"</translation> -<translation id="562289928968387744">Gérer les réactions</translation> <translation id="5626134646977739690">Nom :</translation> <translation id="5628604359369369630">Non lu - Disponible hors connexion</translation> <translation id="5631483240431073854">Gérer les onglets ouverts</translation> @@ -1378,7 +1377,7 @@ <translation id="7173114856073700355">Paramètres</translation> <translation id="7173338713290252554">Historique des prix sur le Web</translation> <translation id="7177466738963138057">Vous pourrez modifier le moteur de recherche plus tard dans les paramètres</translation> -<translation id="7177873915659574692">Impossible de créer le code QR, car l'URL comporte plus de <ph name="CHARACTER_LIMIT" /> caractères.</translation> +<translation id="7177873915659574692">Impossible de créer le QR code, car l'URL comporte plus de <ph name="CHARACTER_LIMIT" /> caractères.</translation> <translation id="7180611975245234373">Actualiser</translation> <translation id="7182051712900867547">Utiliser un autre compte</translation> <translation id="7183517696921903380">La feuille de filtrage des applis est ouverte.</translation> @@ -1594,7 +1593,7 @@ <translation id="8084114998886531721">Mot de passe enregistré</translation> <translation id="8084285576995584326">Gérer les données de votre compte Google</translation> <translation id="8084864785646838999">Il est possible qu'une partie de votre historique ne soit pas affichée ici. Pour le voir en intégralité, sélectionnez "Ouvrir tout l'historique Chrome". En outre, votre compte Google conserve peut-être d'autres historiques de navigation sur <ph name="BEGIN_LINK" />myactivity.google.com<ph name="END_LINK" />.</translation> -<translation id="8088176524274673045">Pour partager avec des personnes à proximité, laissez-les scanner ce code QR</translation> +<translation id="8088176524274673045">Pour partager avec des personnes à proximité, laissez-les scanner ce QR code</translation> <translation id="8090732854597034573">Si tu as besoin d'aide, demande à ton parent</translation> <translation id="8101414242770404289">Aucun onglet à partir des <ph name="TIME_PERIOD" /></translation> <translation id="8103578431304235997">Onglet de navigation privée</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_gl.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_gl.xtb index 4bdf6056..90d7c6fd8 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_gl.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_gl.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">A túa organización activou Navegación segura</translation> <translation id="5620163320393916465">Non hai contrasinais gardados</translation> <translation id="5620928963363755975">A través do botón Máis opcións, atopa os ficheiros e as páxinas que descargaches na sección Descargas</translation> -<translation id="562289928968387744">Xestionar reaccións</translation> <translation id="5626134646977739690">Nome:</translation> <translation id="5628604359369369630">Sen ler: dispoñibles sen conexión</translation> <translation id="5631483240431073854">Xestionar as pestanas abertas</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_gu.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_gu.xtb index ad4c1cf..4f638a1 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_gu.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_gu.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">તમારી સંસ્થાએ Safe Browsing ચાલુ કર્યું</translation> <translation id="5620163320393916465">કોઈ સાચવેલો પાસવર્ડ નથી</translation> <translation id="5620928963363755975">ડાઉનલોડમાં વધુ વિકલ્પો બટનની મદદથી તમારી ફાઇલો અને પેજ શોધો</translation> -<translation id="562289928968387744">પ્રતિક્રિયાઓ મેનેજ કરો</translation> <translation id="5626134646977739690">નામ:</translation> <translation id="5628604359369369630">વાંચ્યા વગરનું - ઑફલાઇન ઉપલબ્ધ</translation> <translation id="5631483240431073854">ખુલ્લા ટૅબ મેનેજ કરો</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_hi.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_hi.xtb index d8d7061..421d871 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_hi.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_hi.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">आपके संगठन ने सुरक्षित ब्राउज़िंग की सुविधा चालू की है</translation> <translation id="5620163320393916465">पासवर्ड सेव नहीं किए गए हैं</translation> <translation id="5620928963363755975">ज़्यादा विकल्प बटन से डाउनलोड में जाकर अपनी फ़ाइलें और पेज पाएं</translation> -<translation id="562289928968387744">प्रतिक्रियाओं को मैनेज करें</translation> <translation id="5626134646977739690">नाम:</translation> <translation id="5628604359369369630">यह नहीं पढ़ा गया - ऑफ़लाइन उपलब्ध है</translation> <translation id="5631483240431073854">खुले हुए टैब मैनेज करें</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_hr.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_hr.xtb index 0d07e68..8e4b482 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_hr.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_hr.xtb
@@ -19,6 +19,7 @@ <translation id="107147699690128016">Ako promijenite datotečni nastavak, datoteka bi se mogla otvoriti u nekoj drugoj aplikaciji i mogla bi izložiti vaš uređaj opasnosti.</translation> <translation id="1080365971383768617">Zaporke na svim vašim uređajima</translation> <translation id="1082920045291562218">Zatvoreno je dijeljenje pomoću tablice s povratnim informacijama o sažetku</translation> +<translation id="1087176310396019910">Mogući neželjeni sadržaj</translation> <translation id="1089606299949659462">Pregled je dovršen!</translation> <translation id="1094555143448724771">Kako biste vidjeli kartice s drugih uređaja, sinkronizirajte kartice i povijest</translation> <translation id="1095761715416917775">Pobrinite se da uvijek možete pristupiti sinkroniziranim podacima</translation> @@ -508,6 +509,7 @@ <translation id="3282568296779691940">Prijavite se u Chrome</translation> <translation id="3285065882678541460">{TAB_COUNT,plural, =1{<ph name="TAB_GROUPS_PART" />, <ph name="TAB_COUNT_ONE" /> kartica}one{<ph name="TAB_GROUPS_PART" />, <ph name="TAB_COUNT_MANY" /> kartica}few{<ph name="TAB_GROUPS_PART" />, <ph name="TAB_COUNT_MANY" /> kartice}other{<ph name="TAB_GROUPS_PART" />, <ph name="TAB_COUNT_MANY" /> kartica}}</translation> <translation id="3293181007446299124">Vaša povijest pregledavanja ostaje privatna na vašem uređaju, a izvješća se šalju s odgodom radi zaštite vašeg identiteta</translation> +<translation id="3301936297336370235">Potvrda prijedloga zaporke</translation> <translation id="3302615849591357577">Vratite grupu kartica <ph name="TITLE_OF_GROUP" />, <ph name="COLOR_NAME" /> boja, kao novu pozadinsku grupu kartica.</translation> <translation id="3303414029551471755">Želite li nastaviti s preuzimanjem sadržaja?</translation> <translation id="3303855915957856445">Nisu pronađeni rezultati pretraživanja</translation> @@ -972,6 +974,7 @@ <translation id="5444999712122199445">Natrag na web-lokaciju</translation> <translation id="544776284582297024">Da biste otvorili kartice i istovremeno posjetili različite stranice, dodirnite gumb za otvorene kartice</translation> <translation id="5454166040603940656">uz <ph name="PROVIDER" /></translation> +<translation id="5454215368971121976">Kad je uređaj sklopljen, možete odabrati opciju ili dodirnuti i zadržati pritisak na adresnoj traci da biste promijenili položaj.</translation> <translation id="5458366071038729214">Ovdje ćete pronaći stranice koje pratite</translation> <translation id="5468068603361015296">Želite li ipak preuzeti datoteku <ph name="FILE_NAME" />?</translation> <translation id="548278423535722844">Otvori u aplikaciji za karte</translation> @@ -1004,7 +1007,6 @@ <translation id="5619633276517849615">Vaša organizacija uključila je sigurno pregledavanje</translation> <translation id="5620163320393916465">Nema spremljenih zaporki</translation> <translation id="5620928963363755975">Pronađite svoje datoteke i stranice u Preuzimanjima pomoću gumba Više opcija</translation> -<translation id="562289928968387744">Upravljanje reakcijama</translation> <translation id="5626134646977739690">Naziv:</translation> <translation id="5628604359369369630">Nepročitano – dostupno izvanmrežno</translation> <translation id="5631483240431073854">Upravljajte otvorenim karticama</translation> @@ -1136,6 +1138,7 @@ <translation id="6193448654517602979">Odaberite kartice</translation> <translation id="6196315980958524839">Zaporke se spremaju u Google upravitelj zaporki na ovom uređaju.</translation> <translation id="6202812185118613467">Prijavite se ponovo da biste pokrenuli sinkronizaciju</translation> +<translation id="6204781143409202534">Chrome je otkrio mogući neželjeni sadržaj s domene <ph name="DOMAIN" />.</translation> <translation id="6205314730813004066">Zaštita privatnosti u online oglašavanju</translation> <translation id="6210748933810148297">Niste <ph name="EMAIL" />?</translation> <translation id="6211386937064921208">Pregledavanje ove stranice</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_hu.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_hu.xtb index 303f736..89385c0 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_hu.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_hu.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">Szervezete bekapcsolta a Biztonságos Böngészést</translation> <translation id="5620163320393916465">Nincsenek mentett jelszavak</translation> <translation id="5620928963363755975">A fájlokat és oldalakat a További lehetőségek gomb Letöltések menüpontjában találja meg</translation> -<translation id="562289928968387744">Reakciók kezelése</translation> <translation id="5626134646977739690">Név:</translation> <translation id="5628604359369369630">Olvasatlan (Offline hozzáférhető)</translation> <translation id="5631483240431073854">Megnyitott lapok kezelése</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_hy.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_hy.xtb index cf15c02..2b3f1d0 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_hy.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_hy.xtb
@@ -972,6 +972,7 @@ <translation id="5444999712122199445">Վերադառնալ կայք</translation> <translation id="544776284582297024">Ներդիրներ բացելու և միաժամանակ մի քանի էջեր այցելելու համար սեղմեք «բաց ներդիրներ» կոճակը</translation> <translation id="5454166040603940656"><ph name="PROVIDER" />-ի հետ</translation> +<translation id="5454215368971121976">Երբ ձեր սարքը ծալված է, դուք կարող եք ընտրել տարբերակ կամ հպել հասցեագոտուն և պահել՝ դիրքը փոխելու համար։</translation> <translation id="5458366071038729214">Կայքերը, որոնց հետևում եք, կցուցադրվեն այստեղ</translation> <translation id="5468068603361015296">Միևնույն է ներբեռնե՞լ <ph name="FILE_NAME" /> ֆայլը։</translation> <translation id="548278423535722844">Բացեք Քարտեզներ հավելվածում</translation> @@ -1004,7 +1005,6 @@ <translation id="5619633276517849615">Ձեր կազմակերպությունը միացրել է Անվտանգ դիտարկումը</translation> <translation id="5620163320393916465">Պահված գաղտնաբառեր չկան</translation> <translation id="5620928963363755975">«Այլ տարբերակներ» կոճակի օգնությամբ որոնեք ձեր ֆայլերն ու էջերը «Ներբեռնումներ» պանակում</translation> -<translation id="562289928968387744">Կառավարել արձագանքները</translation> <translation id="5626134646977739690">Անուն՝</translation> <translation id="5628604359369369630">Չկարդացված – Հասանելի է անցանց ռեժիմում</translation> <translation id="5631483240431073854">Կառավարել բացված ներդիրները</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_id.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_id.xtb index 2c62b0a..c401914 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_id.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_id.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">Organisasi Anda mengaktifkan Safe Browsing</translation> <translation id="5620163320393916465">Tidak ada sandi yang tersimpan</translation> <translation id="5620928963363755975">Temukan file dan halaman di Download dari tombol Opsi Lainnya</translation> -<translation id="562289928968387744">Kelola reaksi</translation> <translation id="5626134646977739690">Nama:</translation> <translation id="5628604359369369630">Belum dibaca - Tersedia secara offline</translation> <translation id="5631483240431073854">Kelola tab yang terbuka</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_is.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_is.xtb index 839d9af..7f7544c 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_is.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_is.xtb
@@ -972,6 +972,7 @@ <translation id="5444999712122199445">Fara aftur á vefsvæði</translation> <translation id="544776284582297024">Ýttu á hnappinn „Opna flipa“ til að opna flipa og skoða mismunandi síður samtímis</translation> <translation id="5454166040603940656">hjá <ph name="PROVIDER" /></translation> +<translation id="5454215368971121976">Þegar tækið þitt er samanbrotið geturðu valið valkost eða haldið inni veffangastikunni til að breyta staðsetningunni.</translation> <translation id="5458366071038729214">Hér birtast vefsvæði sem þú fylgir</translation> <translation id="5468068603361015296">Viltu samt sem áður að sækja <ph name="FILE_NAME" />?</translation> <translation id="548278423535722844">Opna í kortaforriti</translation> @@ -1004,7 +1005,6 @@ <translation id="5619633276517849615">Fyrirtækið þitt kveikti á öruggri vefskoðun</translation> <translation id="5620163320393916465">Engin vistuð aðgangsorð</translation> <translation id="5620928963363755975">Þú finnur skrár og síður í Niðurhali undir hnappinum „Fleiri valkostir“</translation> -<translation id="562289928968387744">Stjórna viðbrögðum</translation> <translation id="5626134646977739690">Nafn:</translation> <translation id="5628604359369369630">Ólesið – aðgengilegt án nettengingar</translation> <translation id="5631483240431073854">Stjórna opnum flipum</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_it.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_it.xtb index 3f7ae90..007e873 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_it.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_it.xtb
@@ -19,6 +19,7 @@ <translation id="107147699690128016">Se cambi l'estensione del file, il file potrebbe essere aperto in un'altra applicazione e costituire un pericolo per il dispositivo.</translation> <translation id="1080365971383768617">Password su tutti i tuoi dispositivi</translation> <translation id="1082920045291562218">Condividi con il foglio di feedback sul riepilogo chiuso</translation> +<translation id="1087176310396019910">Possibile spam</translation> <translation id="1089606299949659462">Revisione completata.</translation> <translation id="1094555143448724771">Per vedere le schede degli altri tuoi dispositivi, sincronizza le schede e la cronologia</translation> <translation id="1095761715416917775">Assicurati di poter accedere sempre ai dati sincronizzati</translation> @@ -508,6 +509,7 @@ <translation id="3282568296779691940">Accedi a Chrome</translation> <translation id="3285065882678541460">{TAB_COUNT,plural, =1{<ph name="TAB_GROUPS_PART" />, <ph name="TAB_COUNT_ONE" /> scheda}other{<ph name="TAB_GROUPS_PART" />, <ph name="TAB_COUNT_MANY" /> schede}}</translation> <translation id="3293181007446299124">La cronologia di navigazione rimane privata sul tuo dispositivo e i report vengono inviati in ritardo per proteggere la tua identità</translation> +<translation id="3301936297336370235">Conferma suggerimento password</translation> <translation id="3302615849591357577">Ripristina il gruppo di schede <ph name="TITLE_OF_GROUP" />, colore <ph name="COLOR_NAME" />, come nuovo gruppo di schede in background.</translation> <translation id="3303414029551471755">Procedere al download dei contenuti?</translation> <translation id="3303855915957856445">Nessun risultato di ricerca trovato</translation> @@ -972,6 +974,7 @@ <translation id="5444999712122199445">Torna al sito</translation> <translation id="544776284582297024">Per aprire più schede e visitare pagine diverse contemporaneamente, tocca il pulsante Schede aperte</translation> <translation id="5454166040603940656">con <ph name="PROVIDER" /></translation> +<translation id="5454215368971121976">Quando il dispositivo è chiuso, puoi scegliere un'opzione o toccare e tenere premuta la barra degli indirizzi per cambiare la posizione.</translation> <translation id="5458366071038729214">Qui troverai i siti che segui</translation> <translation id="5468068603361015296">Vuoi comunque scaricare <ph name="FILE_NAME" />?</translation> <translation id="548278423535722844">Apri nell'app di mappe</translation> @@ -1004,7 +1007,6 @@ <translation id="5619633276517849615">La tua organizzazione ha attivato Navigazione sicura</translation> <translation id="5620163320393916465">Nessuna password salvata</translation> <translation id="5620928963363755975">Usa il pulsante Altre opzioni per trovare i tuoi file e le tue pagine nella cartella Download</translation> -<translation id="562289928968387744">Gestisci reazioni</translation> <translation id="5626134646977739690">Nome:</translation> <translation id="5628604359369369630">Da leggere - Disponibili offline</translation> <translation id="5631483240431073854">Gestisci schede aperte</translation> @@ -1136,6 +1138,7 @@ <translation id="6193448654517602979">Seleziona schede</translation> <translation id="6196315980958524839">Le password vengono salvate in Gestore delle password di Google su questo dispositivo</translation> <translation id="6202812185118613467">Accedi di nuovo per avviare la sincronizzazione</translation> +<translation id="6204781143409202534">Chrome ha rilevato possibile spam da <ph name="DOMAIN" />.</translation> <translation id="6205314730813004066">Privacy per gli annunci</translation> <translation id="6210748933810148297">Non sei <ph name="EMAIL" />?</translation> <translation id="6211386937064921208">Visualizzazione dell'anteprima della pagina</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_iw.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_iw.xtb index adce21b..94d1ccf 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_iw.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_iw.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">הארגון שלך הפעיל את הגלישה הבטוחה</translation> <translation id="5620163320393916465">אין סיסמאות שמורות</translation> <translation id="5620928963363755975">איתור הקבצים והדפים שלך ב'הורדות' דרך הלחצן 'אפשרויות נוספות'</translation> -<translation id="562289928968387744">ניהול התגובות</translation> <translation id="5626134646977739690">שם:</translation> <translation id="5628604359369369630">לא נקראו – זמינים במצב אופליין</translation> <translation id="5631483240431073854">ניהול הכרטיסיות הפתוחות</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ja.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ja.xtb index f85e538e..8c85c19 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ja.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ja.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">セーフ ブラウジングは組織によってオンにされています</translation> <translation id="5620163320393916465">保存されているパスワードはありません</translation> <translation id="5620928963363755975">[その他のオプション] から [ダウンロード] を開いて自分のファイルやページを探すことができます</translation> -<translation id="562289928968387744">リアクションを管理</translation> <translation id="5626134646977739690">名前:</translation> <translation id="5628604359369369630">未読 - オフラインで閲覧可能</translation> <translation id="5631483240431073854">開いているタブを管理</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ka.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ka.xtb index 62b6776..816b8e79 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ka.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ka.xtb
@@ -19,6 +19,7 @@ <translation id="107147699690128016">ფაილის გაფართოების შეცვლის შემთხვევაში, ფაილი შეიძლება გაიხსნას სხვა აპლიკაციაში და პოტენციურად შეუქმნას საფრთხე თქვენს მოწყობილობას.</translation> <translation id="1080365971383768617">პაროლები თქვენს ყველა მოწყობილობაზე</translation> <translation id="1082920045291562218">შეჯამებასთან დაკავშირებული გამოხმაურების გაზიარების ფურცელი დახურულია</translation> +<translation id="1087176310396019910">სავარაუდო სპამი</translation> <translation id="1089606299949659462">გადახედვა დასრულდა!</translation> <translation id="1094555143448724771">სხვა მოწყობილობებიდან ჩანართების სანახავად დაასინქრონეთ თქვენი ჩანართები და ისტორია</translation> <translation id="1095761715416917775">ყოველთვის იქონიეთ წვდომა თქვენს სინქრონიზებულ მონაცემებზე</translation> @@ -508,6 +509,7 @@ <translation id="3282568296779691940">შესვლა Chrome-ში</translation> <translation id="3285065882678541460">{TAB_COUNT,plural, =1{<ph name="TAB_GROUPS_PART" />, <ph name="TAB_COUNT_ONE" /> ჩანართი}other{<ph name="TAB_GROUPS_PART" />, <ph name="TAB_COUNT_MANY" /> ჩანართი}}</translation> <translation id="3293181007446299124">თქვენი დათვალიერების ისტორია კონფიდენციალურად ინახება თქვენივე მოწყობილობაზე, ხოლო ანგარიშები დაყოვნებით იგზავნება, თქვენი ვინაობის დაცვის მიზნით</translation> +<translation id="3301936297336370235">პაროლის შემოთავაზების დადასტურება</translation> <translation id="3302615849591357577">ჩანართების ჯგუფის „<ph name="TITLE_OF_GROUP" />“ <ph name="COLOR_NAME" /> ფერის, როგორც ფონური რეჟიმის ჩანართების ახალი ჯგუფის აღდგენა.</translation> <translation id="3303414029551471755">გაგრძელდეს შინაარსის ჩამოტვირთვა?</translation> <translation id="3303855915957856445">ძიების შედეგები ვერ მოიძებნა</translation> @@ -1005,7 +1007,6 @@ <translation id="5619633276517849615">თქვენმა ორგანიზაციამ ჩართო Safe Browsing</translation> <translation id="5620163320393916465">შენახული პაროლები არ არის</translation> <translation id="5620928963363755975">თქვენი ფაილები და გვერდები ხელმისაწვდომია „ჩამოტვირთვების“ სექციაში, რომელზე წვდომაც „დამატებითი ვარიანტების“ ღილაკით შეგიძლიათ</translation> -<translation id="562289928968387744">რეაქციების მართვა</translation> <translation id="5626134646977739690">სახელი:</translation> <translation id="5628604359369369630">წაუკითხავი — ხაზგარეშე რეჟიმში ხელმისაწვდომი</translation> <translation id="5631483240431073854">გახსნილი ჩანართების მართვა</translation> @@ -1137,6 +1138,7 @@ <translation id="6193448654517602979">აირჩიეთ ჩანართები</translation> <translation id="6196315980958524839">პაროლები ინახება Google პაროლების მმართველში მხოლოდ ამ მოწყობილობაზე</translation> <translation id="6202812185118613467">სინქრონიზაციის დასაწყებად ხელახლა შედით სისტემაში</translation> +<translation id="6204781143409202534">Chrome-მა აღმოაჩინა სავარაუდო სპამი <ph name="DOMAIN" />-დან.</translation> <translation id="6205314730813004066">სარეკლამო კონფიდენციალურობა</translation> <translation id="6210748933810148297">არ ხართ <ph name="EMAIL" />?</translation> <translation id="6211386937064921208">მიმდინარეობს ამ გვერდის გადახედვა</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_kk.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_kk.xtb index b1ed7d24..3387d30de 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_kk.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_kk.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">Ұйымыңыз Safe Browsing функциясын қосты.</translation> <translation id="5620163320393916465">Ешқандай құпия сөз сақталмаған.</translation> <translation id="5620928963363755975">"Қосымша опциялар" түймесі арқылы "Жүктеп алулар" ішінен файлдар мен беттерді табыңыз</translation> -<translation id="562289928968387744">Жауап қайтаруды басқару</translation> <translation id="5626134646977739690">Аты:</translation> <translation id="5628604359369369630">Оқылмаған – Офлайн режимде қолжетімді</translation> <translation id="5631483240431073854">Ашық қойындыларды реттеу</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_km.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_km.xtb index e853dad..e9aeb29 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_km.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_km.xtb
@@ -1005,7 +1005,6 @@ <translation id="5619633276517849615">ស្ថាប័នរបស់អ្នកបានបើកការរុករកដោយសុវត្ថិភាព</translation> <translation id="5620163320393916465">គ្មានពាក្យសម្ងាត់ដែលបានរក្សាទុកទេ</translation> <translation id="5620928963363755975">ស្វែងរកឯកសារ និងទំព័ររបស់អ្នកនៅក្នុង ទាញយក ពីប៊ូតុងជម្រើសច្រើនទៀត</translation> -<translation id="562289928968387744">គ្រប់គ្រងប្រតិកម្ម</translation> <translation id="5626134646977739690">ឈ្មោះ៖</translation> <translation id="5628604359369369630">មិនទាន់អាន - អាចប្រើបានពេលគ្មានអ៊ីនធឺណិត</translation> <translation id="5631483240431073854">គ្រប់គ្រងផ្ទាំងដែលបើក</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_kn.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_kn.xtb index 578bc6d..00fea5d 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_kn.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_kn.xtb
@@ -1003,7 +1003,6 @@ <translation id="5619633276517849615">ನಿಮ್ಮ ಸಂಸ್ಥೆಯು ಸುರಕ್ಷಿತ ಬ್ರೌಸಿಂಗ್ ಅನ್ನು ಆನ್ ಮಾಡಿದೆ</translation> <translation id="5620163320393916465">ಉಳಿಸಿದ ಪಾಸ್ವರ್ಡ್ಗಳಿಲ್ಲ</translation> <translation id="5620928963363755975">ಇನ್ನಷ್ಟು ಆಯ್ಕೆಗಳ ಬಟನ್ನಿಂದ ಡೌನ್ಲೋಡ್ ಮಾಡಿದ ನಿಮ್ಮ ಫೈಲ್ಗಳು ಮತ್ತು ಪುಟಗಳನ್ನು ಹುಡುಕಿ</translation> -<translation id="562289928968387744">ನಿರ್ಬಂಧಗಳನ್ನು ನಿರ್ವಹಿಸಿ</translation> <translation id="5626134646977739690">ಹೆಸರು:</translation> <translation id="5628604359369369630">ಓದಿಲ್ಲ - ಆಫ್ಲೈನ್ನಲ್ಲಿ ಲಭ್ಯವಿದೆ</translation> <translation id="5631483240431073854">ತೆರೆದ ಟ್ಯಾಬ್ಗಳನ್ನು ನಿರ್ವಹಿಸಿ</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ko.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ko.xtb index eaf3a659..e16d715 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ko.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ko.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">조직에서 세이프 브라우징을 사용 설정했습니다.</translation> <translation id="5620163320393916465">저장된 비밀번호 없음</translation> <translation id="5620928963363755975">옵션 더보기 버튼을 눌러 다운로드에서 파일 및 페이지를 찾아보세요.</translation> -<translation id="562289928968387744">반응 관리</translation> <translation id="5626134646977739690">이름:</translation> <translation id="5628604359369369630">읽지 않음 - 오프라인에서 사용 가능</translation> <translation id="5631483240431073854">열린 탭 관리</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ky.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ky.xtb index fec28c6e..0be7b5d 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ky.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ky.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">Уюмуңуз Коопсуз серептөөнү күйгүздү</translation> <translation id="5620163320393916465">Сакталган сырсөздөр жок</translation> <translation id="5620928963363755975">"Дагы параметрлер" баскычын басып, файлдар менен барактарды "Жүктөлүп алынгандар" папкасынан таап алсаңыз болот</translation> -<translation id="562289928968387744">Реакцияларды башкаруу</translation> <translation id="5626134646977739690">Аты:</translation> <translation id="5628604359369369630">Окула элек – Оффлайн режиминде жеткиликтүү</translation> <translation id="5631483240431073854">Ачык өтмөктөрдү тескөө</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_lo.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_lo.xtb index 2fcb7dd..4fa1571 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_lo.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_lo.xtb
@@ -19,6 +19,7 @@ <translation id="107147699690128016">ຖ້າທ່ານປ່ຽນແປງນາມສະກຸນໄຟລ໌, ໄຟລ໌ອາດຈະເປີດໃນແອັບພລິເຄຊັນອື່ນ ແລະ ເປັນໄປໄດ້ວ່າອາດຈະເປັນອັນຕະລາຍຕໍ່ກັບອຸປະກອນຂອງທ່ານ.</translation> <translation id="1080365971383768617">ລະຫັດຜ່ານຢູ່ອຸປະກອນທັງໝົດຂອງທ່ານ</translation> <translation id="1082920045291562218">ປິດການແບ່ງປັນກັບຊີດຄຳຕິຊົມສະຫຼຸບແລ້ວ</translation> +<translation id="1087176310396019910">ອາດເປັນສະແປມ</translation> <translation id="1089606299949659462">ກວດສອບສຳເລັດແລ້ວ!</translation> <translation id="1094555143448724771">ເພື່ອເບິ່ງແຖບຈາກອຸປະກອນອື່ນໆຂອງທ່ານ, ໃຫ້ຊິ້ງແຖບ ແລະ ປະຫວັດຂອງທ່ານ</translation> <translation id="1095761715416917775">ກວດໃຫ້ແນ່ໃຈວ່າທ່ານສາມາດເຂົ້າເຖິງຂໍ້ມູນການຊິ້ງຂອງທ່ານໄດ້ທຸກເວລາ</translation> @@ -508,6 +509,7 @@ <translation id="3282568296779691940">ລົງຊື່ເຂົ້າໃຊ້ Chrome</translation> <translation id="3285065882678541460">{TAB_COUNT,plural, =1{<ph name="TAB_GROUPS_PART" />, <ph name="TAB_COUNT_ONE" /> ແຖບ}other{<ph name="TAB_GROUPS_PART" />, <ph name="TAB_COUNT_MANY" /> ແຖບ}}</translation> <translation id="3293181007446299124">ປະຫວັດການທ່ອງເວັບຂອງທ່ານຖືກເກັບຮັກສາໄວ້ເປັນສ່ວນຕົວຢູ່ອຸປະກອນຂອງທ່ານ ແລະ ລາຍງານແມ່ນຖືກສົ່ງແບບໜ່ວງເວລາເພື່ອປົກປ້ອງຕົວຕົນຂອງທ່ານ</translation> +<translation id="3301936297336370235">ການຢືນຢັນການແນະນຳລະຫັດຜ່ານ</translation> <translation id="3302615849591357577">ກູ້ຄືນກຸ່ມແຖບ <ph name="TITLE_OF_GROUP" />, ສີ <ph name="COLOR_NAME" />, ເປັນກຸ່ມແຖບໃໝ່ໃນພື້ນຫຼັງ.</translation> <translation id="3303414029551471755">ສືບຕໍ່ໄປດາວໂຫຼດເນື້ອໃນບໍ?</translation> <translation id="3303855915957856445">ບໍ່ພົບຜົນການຊອກຫາໃດໆ</translation> @@ -1005,7 +1007,6 @@ <translation id="5619633276517849615">ອົງກອນຂອງທ່ານເປີດໃຊ້ Safe Browsing</translation> <translation id="5620163320393916465">ບໍ່ມີລະຫັດຜ່ານທີ່ບັນທຶກໄວ້</translation> <translation id="5620928963363755975">ຊອກຫາໄຟລ໌ ແລະ ໜ້າເວັບຂອງທ່ານໃການດາວໂຫຼດຈາກປຸ່ມຕົວເລືອກເພີ່ມເຕີມ</translation> -<translation id="562289928968387744">ຈັດການການໂຕ້ຕອບ</translation> <translation id="5626134646977739690">ຊື່:</translation> <translation id="5628604359369369630">ຍັງບໍ່ໄດ້ອ່ານ - ອ່ານແບບອອບລາຍໄດ້</translation> <translation id="5631483240431073854">ຈັດການແຖບທີ່ເປີດຢູ່</translation> @@ -1137,6 +1138,7 @@ <translation id="6193448654517602979">ເລືອກແຖບ</translation> <translation id="6196315980958524839">ລະຫັດຜ່ານແມ່ນຖືກບັນທຶກໄປໃສ່ຕົວຈັດການລະຫັດຜ່ານ Google ຢູ່ອຸປະກອນນີ້</translation> <translation id="6202812185118613467">ກັບຄືນເຂົ້າສູ່ລະບົບເພື່ອເລີ່ມຊິ້ງຂໍ້ມູນ</translation> +<translation id="6204781143409202534">Chrome ກວດພົບວ່າອາດເປັນສະແປມຈາກ <ph name="DOMAIN" />.</translation> <translation id="6205314730813004066">ຄວາມເປັນສ່ວນຕົວກ່ຽວກັບໂຄສະນາ</translation> <translation id="6210748933810148297">ບໍ່ແມ່ນ <ph name="EMAIL" /> ບໍ?</translation> <translation id="6211386937064921208">ກຳລັງສະແດງໜ້ານີ້</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_lt.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_lt.xtb index 18c62486..9b3fc97 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_lt.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_lt.xtb
@@ -972,6 +972,7 @@ <translation id="5444999712122199445">Grįžti į svetainę</translation> <translation id="544776284582297024">Norėdami atidaryti skirtukus ir vienu metu lankytis skirtinguose puslapiuose, palieskite mygtuką „Atidaryti skirtukai“</translation> <translation id="5454166040603940656">naudojant <ph name="PROVIDER" /></translation> +<translation id="5454215368971121976">Kai įrenginys užlenktas, galite pasirinkti parinktį arba paliesti ir palaikyti adreso juostą, kad pakeistumėte padėtį.</translation> <translation id="5458366071038729214">Stebimas svetaines rasite čia</translation> <translation id="5468068603361015296">Ar vis tiek norite atsisiųsti „<ph name="FILE_NAME" />“?</translation> <translation id="548278423535722844">Atidaryti Žemėlapių programoje</translation> @@ -1004,7 +1005,6 @@ <translation id="5619633276517849615">Organizacija įjungė Saugų naršymą</translation> <translation id="5620163320393916465">Nėra išsaugotų slaptažodžių</translation> <translation id="5620928963363755975">Suraskite failus ir puslapius „Atsisiuntimų“ skiltyje spustelėję mygtuką „Daugiau parinkčių“</translation> -<translation id="562289928968387744">Tvarkyti reakcijas</translation> <translation id="5626134646977739690">Pavadinimas:</translation> <translation id="5628604359369369630">Neskaityta – pasiekiama neprisijungus</translation> <translation id="5631483240431073854">Tvarkyti atidarytus skirtukus</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_lv.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_lv.xtb index dd2e8fe..baaa26d6 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_lv.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_lv.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">Jūsu organizācija ieslēdza funkciju “Droša pārlūkošana”.</translation> <translation id="5620163320393916465">Nav saglabātu paroļu</translation> <translation id="5620928963363755975">Atrodiet savus failus un lapas sadaļā Lejupielādes, nospiežot pogu Vairāk opciju</translation> -<translation id="562289928968387744">Pārvaldīt reakcijas</translation> <translation id="5626134646977739690">Nosaukums:</translation> <translation id="5628604359369369630">Nelasītas — pieejamas bezsaistē</translation> <translation id="5631483240431073854">Pārvaldīt atvērtās cilnes</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_mk.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_mk.xtb index a53fccb0..738bfb5 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_mk.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_mk.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">Вашата организација вклучи „Безбедно прелистување“</translation> <translation id="5620163320393916465">Нема зачувани лозинки</translation> <translation id="5620928963363755975">Вашите датотеки и страници ќе ги најдете во „Преземања“ преку копчето „Повеќе опции“</translation> -<translation id="562289928968387744">Управувајте со реакциите</translation> <translation id="5626134646977739690">Име:</translation> <translation id="5628604359369369630">Непрочитани - Достапни офлајн</translation> <translation id="5631483240431073854">Управувајте со отворените картички</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ml.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ml.xtb index 89fdde14..de056688 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ml.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ml.xtb
@@ -972,6 +972,7 @@ <translation id="5444999712122199445">സൈറ്റിലേക്ക് മടങ്ങുക</translation> <translation id="544776284582297024">ടാബുകൾ തുറക്കാനും ഒരേ സമയം വ്യത്യസ്ത പേജുകൾ സന്ദർശിക്കാനും 'തുറന്നിരിക്കുന്ന ടാബുകൾ' ബട്ടൺ ടാപ്പ് ചെയ്യുക</translation> <translation id="5454166040603940656"><ph name="PROVIDER" /> എന്നതിനൊപ്പം</translation> +<translation id="5454215368971121976">നിങ്ങളുടെ ഉപകരണം ഫോൾഡ് ചെയ്തിരിക്കുമ്പോൾ, പൊസിഷൻ മാറ്റുന്നതിന് ഒരു ഓപ്ഷൻ തിരഞ്ഞെടുക്കാം അല്ലെങ്കിൽ വിലാസ ബാർ സ്പർശിച്ചുപിടിക്കാം.</translation> <translation id="5458366071038729214">നിങ്ങൾ പിന്തുടരുന്ന സൈറ്റുകൾ ഇവിടെ കാണാം</translation> <translation id="5468068603361015296">നിങ്ങൾക്ക് എന്തായാലും <ph name="FILE_NAME" /> ഡൗൺലോഡ് ചെയ്യണോ?</translation> <translation id="548278423535722844">മാപ്സ് ആപ്പിൽ തുറക്കുക</translation> @@ -1004,7 +1005,6 @@ <translation id="5619633276517849615">നിങ്ങളുടെ സ്ഥാപനം സുരക്ഷിത ബ്രൗസിംഗ് ഓണാക്കി</translation> <translation id="5620163320393916465">സംരക്ഷിച്ച പാസ്വേഡുകളൊന്നുമില്ല</translation> <translation id="5620928963363755975">'കൂടുതൽ ഓപ്ഷനുകൾ' ബട്ടണിൽ നിന്നും, ഡൗൺലോഡുകളിൽ നിന്നും നിങ്ങളുടെ ഫയലുകളും പേജുകളും കണ്ടെത്തുക</translation> -<translation id="562289928968387744">പ്രതികരണങ്ങൾ മാനേജ് ചെയ്യുക</translation> <translation id="5626134646977739690">നാമം:</translation> <translation id="5628604359369369630">വായിക്കാത്തവ - ഓഫ്ലൈനിൽ ലഭ്യമാണ്</translation> <translation id="5631483240431073854">തുറന്ന ടാബുകൾ മാനേജ് ചെയ്യുക</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_mn.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_mn.xtb index f62e153..10d1901 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_mn.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_mn.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">Танай байгууллага Аюулгүй хөтчийг асаасан байна</translation> <translation id="5620163320393916465">Хадгалсан ямар ч нууц үг байхгүй байна</translation> <translation id="5620928963363755975">Файл, хуудсаа Бусад сонголт товчлуурын Таталт хэсгээс хайна уу</translation> -<translation id="562289928968387744">Хариу үйлдлийг удирдах</translation> <translation id="5626134646977739690">Нэр:</translation> <translation id="5628604359369369630">Уншаагүй - Офлайнаар боломжтой</translation> <translation id="5631483240431073854">Нээлттэй табуудыг удирдана уу</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_mr.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_mr.xtb index 7cd1b12..29d5932 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_mr.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_mr.xtb
@@ -972,6 +972,7 @@ <translation id="5444999712122199445">साइटवर परत जा</translation> <translation id="544776284582297024">टॅब उघडण्यासाठी आणि एकाच वेळी वेगवेगळ्या पेजना भेट देण्यासाठी, टॅब उघडा बटणावर टॅप करा</translation> <translation id="5454166040603940656"><ph name="PROVIDER" /> सह</translation> +<translation id="5454215368971121976">तुमचे डिव्हाइस फोल्ड केलेले असताना, तुम्ही स्थान बदलण्यासाठी, पर्याय निवडू शकता किंवा अॅड्रेस बारला स्पर्श करून धरून ठेवू शकता.</translation> <translation id="5458366071038729214">तुम्ही फॉलो करत असलेल्या साइट तुम्हाला येथे दिसतील</translation> <translation id="5468068603361015296">तुम्हाला तरीही <ph name="FILE_NAME" /> डाउनलोड करायची आहे का?</translation> <translation id="548278423535722844">नकाशे ॲपमध्ये उघडा</translation> @@ -1004,7 +1005,6 @@ <translation id="5619633276517849615">तुमच्या संस्थेने सुरक्षित ब्राउझिंग सुरू केले आहे</translation> <translation id="5620163320393916465">सेव्ह केलेले पासवर्ड नाहीत</translation> <translation id="5620928963363755975">तुमच्या फाइल आणि पेज अधिक पर्याय बटणावरील डाउनलोडमध्ये शोधा</translation> -<translation id="562289928968387744">प्रतिक्रिया व्यवस्थापित करा</translation> <translation id="5626134646977739690">नाव:</translation> <translation id="5628604359369369630">न वाचलेले - ऑफलाइन उपलब्ध आहे</translation> <translation id="5631483240431073854">उघडे असलेले टॅब व्यवस्थापित करा</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ms.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ms.xtb index aaca25a..a5ed388 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ms.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ms.xtb
@@ -19,6 +19,7 @@ <translation id="107147699690128016">Jika anda menukar sambungan fail, fail itu mungkin akan dibuka dalam aplikasi lain dan berkemungkinan mendatangkan bahaya kepada peranti anda.</translation> <translation id="1080365971383768617">Kata laluan pada semua peranti anda</translation> <translation id="1082920045291562218">Berkongsi dengan helaian maklum balas ringkasan ditutup</translation> +<translation id="1087176310396019910">Kemungkinan spam</translation> <translation id="1089606299949659462">Semakan selesai!</translation> <translation id="1094555143448724771">Untuk melihat tab daripada peranti anda yang lain, segerakkan tab dan sejarah anda</translation> <translation id="1095761715416917775">Pastikan anda dapat mengakses data penyegerakan anda pada bila-bila masa</translation> @@ -508,6 +509,7 @@ <translation id="3282568296779691940">Log masuk ke Chrome</translation> <translation id="3285065882678541460">{TAB_COUNT,plural, =1{<ph name="TAB_GROUPS_PART" />, <ph name="TAB_COUNT_ONE" /> tab}other{<ph name="TAB_GROUPS_PART" />, <ph name="TAB_COUNT_MANY" /> tab}}</translation> <translation id="3293181007446299124">Sejarah penyemakan imbas anda dipastikan tertutup pada peranti anda dan penghantaran laporan dilengahkan untuk melindungi identiti anda</translation> +<translation id="3301936297336370235">Pengesahan cadangan kata laluan</translation> <translation id="3302615849591357577">Pulihkan kumpulan tab <ph name="TITLE_OF_GROUP" />, warna <ph name="COLOR_NAME" />, sebagai kumpulan tab latar baharu.</translation> <translation id="3303414029551471755">Teruskan memuat turun kandungan?</translation> <translation id="3303855915957856445">Tiada hasil carian ditemui</translation> @@ -1005,7 +1007,6 @@ <translation id="5619633276517849615">Organisasi anda menghidupkan Penyemakan Imbas Selamat</translation> <translation id="5620163320393916465">Tiada kata laluan yang disimpan</translation> <translation id="5620928963363755975">Cari fail dan halaman anda dalam Muat Turun daripada butang Lagi Pilihan</translation> -<translation id="562289928968387744">Urus reaksi</translation> <translation id="5626134646977739690">Nama:</translation> <translation id="5628604359369369630">Belum dibaca - Tersedia di luar talian</translation> <translation id="5631483240431073854">Urus tab terbuka</translation> @@ -1137,6 +1138,7 @@ <translation id="6193448654517602979">Pilih tab</translation> <translation id="6196315980958524839">Kata laluan disimpan pada Google Password Manager pada peranti ini</translation> <translation id="6202812185118613467">Log masuk semula untuk memulakan penyegerakan</translation> +<translation id="6204781143409202534">Chrome mengesan kemungkinan spam daripada <ph name="DOMAIN" />.</translation> <translation id="6205314730813004066">Privasi iklan</translation> <translation id="6210748933810148297">Bukan <ph name="EMAIL" />?</translation> <translation id="6211386937064921208">Memaparkan pratonton halaman ini</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_my.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_my.xtb index 4e09c66..0e6c0682 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_my.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_my.xtb
@@ -972,6 +972,7 @@ <translation id="5444999712122199445">ဝဘ်ဆိုက်သို့ ပြန်သွားရန်</translation> <translation id="544776284582297024">တဘ်များဖွင့်ပြီး စာမျက်နှာအမျိုးမျိုးကို တစ်ချိန်တည်းဝင်ကြည့်ရန်အတွက် တဘ်ဖွင့်ရန်ခလုတ်ကို တို့ပါ</translation> <translation id="5454166040603940656"><ph name="PROVIDER" /> ဖြင့်</translation> +<translation id="5454215368971121976">စက်ပစ္စည်းကို ခေါက်ထားသောအခါ တစ်ခုရွေးချယ်နိုင်သည် (သို့) လိပ်စာဘားကို တည်နေရာပြောင်းရန် တို့ထိ၍ ဖိထားပါ။</translation> <translation id="5458366071038729214">သင်လိုက်ကြည့်သော ဝဘ်ဆိုက်များကို ဤနေရာတွင် တွေ့ရပါမည်</translation> <translation id="5468068603361015296">မည်သို့ပင်ဖြစ်စေ <ph name="FILE_NAME" /> ကို ဒေါင်းလုဒ်လုပ်လိုပါသလား။</translation> <translation id="548278423535722844">မြေပုံအက်ပ်တွင် ဖွင့်ပါ</translation> @@ -1004,7 +1005,6 @@ <translation id="5619633276517849615">သင့်အဖွဲ့အစည်းက ‘ဘေးကင်းလုံခြုံသည့် အသုံးပြုမှု’ ကို ဖွင့်ထားသည်</translation> <translation id="5620163320393916465">သိမ်းထားသော စကားဝှက် မရှိပါ</translation> <translation id="5620928963363755975">သင့်ဖိုင်များနှင့် စာမျက်နှာများကို 'နောက်ထပ်ရွေးချယ်စရာများ' ခလုတ်မှ ဒေါင်းလုဒ်များထဲတွင် ရှာဖွေပါ</translation> -<translation id="562289928968387744">တုံ့ပြန်မှုများကို စီမံရန်</translation> <translation id="5626134646977739690">အမည်:</translation> <translation id="5628604359369369630">မဖတ်ရသေး - အော့ဖ်လိုင်းရနိုင်သည်</translation> <translation id="5631483240431073854">ဖွင့်ထားသည့်တဘ်များ စီမံရန်</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ne.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ne.xtb index 85701c42..c1c0c20 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ne.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ne.xtb
@@ -1003,7 +1003,6 @@ <translation id="5619633276517849615">तपाईंको सङ्गठनले "सुरक्षित ब्राउजिङ" अन गरेको छ</translation> <translation id="5620163320393916465">कुनै पनि पासवर्ड सुरक्षित गरिएको छैन</translation> <translation id="5620928963363755975">थप विकल्पहरू नामक बटनमार्फत डाउनलोडरू नाम फोल्डरमा भएका आफ्ना फाइल र पृष्ठहरू भेट्टाउनुहोस्</translation> -<translation id="562289928968387744">प्रतिक्रियाहरू व्यवस्थापन गर्नुहोस्</translation> <translation id="5626134646977739690">नाम:</translation> <translation id="5628604359369369630">नपढिएको - अफलाइन उपलब्ध छ</translation> <translation id="5631483240431073854">खोलिएका ट्याबहरू व्यवस्थापन गर्नुहोस्</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_nl.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_nl.xtb index 13916d3..f2d53ee 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_nl.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_nl.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">Je organisatie heeft Safe Browsing aangezet</translation> <translation id="5620163320393916465">Geen opgeslagen wachtwoorden</translation> <translation id="5620928963363755975">Vind je bestanden en pagina's in 'Downloads' via de knop 'Meer opties'</translation> -<translation id="562289928968387744">Reacties beheren</translation> <translation id="5626134646977739690">Naam:</translation> <translation id="5628604359369369630">Ongelezen: offline beschikbaar</translation> <translation id="5631483240431073854">Geopende tabbladen beheren</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_no.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_no.xtb index 1f88e39..7742512f 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_no.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_no.xtb
@@ -972,6 +972,7 @@ <translation id="5444999712122199445">Gå tilbake til nettstedet</translation> <translation id="544776284582297024">For å åpne faner og besøke ulike sider samtidig, trykk på åpne faner-knappen</translation> <translation id="5454166040603940656">med <ph name="PROVIDER" /></translation> +<translation id="5454215368971121976">Når enheten er sammenbrettet, kan du velge et alternativ eller trykke og holde på adressefeltet for å endre posisjonen.</translation> <translation id="5458366071038729214">Her finner du nettsteder du følger</translation> <translation id="5468068603361015296">Vil du laste ned <ph name="FILE_NAME" /> likevel?</translation> <translation id="548278423535722844">Åpne i en kartapp</translation> @@ -1004,7 +1005,6 @@ <translation id="5619633276517849615">Organisasjonen din har slått på Safe Browsing</translation> <translation id="5620163320393916465">Ingen lagrede passord</translation> <translation id="5620928963363755975">Du finner filene og sidene dine under Nedlastinger via Flere alternativer-knappen</translation> -<translation id="562289928968387744">Administrer reaksjoner</translation> <translation id="5626134646977739690">Navn:</translation> <translation id="5628604359369369630">Ulest – tilgjengelig uten nett</translation> <translation id="5631483240431073854">Administrer åpne faner</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_or.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_or.xtb index 06fc3c6..5a4ef05 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_or.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_or.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">ଆପଣଙ୍କ ସଂସ୍ଥା ସୁରକ୍ଷିତ ବ୍ରାଉଜିଂ ଚାଲୁ କରିଛି</translation> <translation id="5620163320393916465">କୌଣସି ସେଭ୍ କରାଯାଇଥିବା ପାସୱାର୍ଡ ନାହିଁ</translation> <translation id="5620928963363755975">ଅଧିକ ବିକଳ୍ପ ବଟନ୍ ମଧ୍ୟରେ ଥିବା ଡାଉନ୍ଲୋଡ୍ରୁ ଆପଣଙ୍କର ଫାଇଲ୍ ଏବଂ ପୃଷ୍ଠାଗୁଡ଼ିକୁ ଖୋଜନ୍ତୁ</translation> -<translation id="562289928968387744">ପ୍ରତିକ୍ରିୟାଗୁଡ଼ିକୁ ପରିଚାଳନା କରନ୍ତୁ</translation> <translation id="5626134646977739690">ନାମ:</translation> <translation id="5628604359369369630">ପଢ଼ାଯାଇନଥିବା - ଅଫଲାଇନରେ ଉପଲବ୍ଧ ଅଛି</translation> <translation id="5631483240431073854">ଖୋଲା ଥିବା ଟାବଗୁଡ଼ିକୁ ପରିଚାଳନା କରନ୍ତୁ</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_pa.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_pa.xtb index 204b8714..56a4168 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_pa.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_pa.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">ਤੁਹਾਡੀ ਸੰਸਥਾ ਨੇ ਸੁਰੱਖਿਅਤ ਬ੍ਰਾਊਜ਼ਿੰਗ ਨੂੰ ਚਾਲੂ ਕਰ ਦਿੱਤਾ ਹੈ</translation> <translation id="5620163320393916465">ਕੋਈ ਰੱਖਿਅਤ ਕੀਤੇ ਪਾਸਵਰਡ ਨਹੀਂ</translation> <translation id="5620928963363755975">'ਹੋਰ ਵਿਕਲਪ' ਬਟਨ ਤੋਂ ਡਾਊਨਲੋਡਾਂ ਵਿੱਚ ਆਪਣੀਆਂ ਫ਼ਾਈਲਾਂ ਅਤੇ ਪੰਨਿਆਂ ਨੂੰ ਲੱਭੋ</translation> -<translation id="562289928968387744">ਪ੍ਰਤਿਕਿਰਿਆਵਾਂ ਦਾ ਪ੍ਰਬੰਧਨ ਕਰੋ</translation> <translation id="5626134646977739690">ਨਾਮ:</translation> <translation id="5628604359369369630">ਨਾ-ਪੜ੍ਹਿਆ - ਆਫ਼ਲਾਈਨ ਉਪਲਬਧ ਹੈ</translation> <translation id="5631483240431073854">ਖੁੱਲ੍ਹੀਆਂ ਟੈਬਾਂ ਦਾ ਪ੍ਰਬੰਧਨ ਕਰੋ</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_pl.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_pl.xtb index 0a43470..f094f40c 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_pl.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_pl.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">Twoja organizacja włączyła Bezpieczne przeglądanie</translation> <translation id="5620163320393916465">Brak zapisanych haseł</translation> <translation id="5620928963363755975">Znajdź pliki i strony w Pobranych plikach, używając przycisku Więcej opcji</translation> -<translation id="562289928968387744">Zarządzaj reakcjami</translation> <translation id="5626134646977739690">Nazwa:</translation> <translation id="5628604359369369630">Nieprzeczytane – dostępne offline</translation> <translation id="5631483240431073854">Zarządzaj otwartymi kartami</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_pt-BR.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_pt-BR.xtb index 289f3a3..f088f9d8 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_pt-BR.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_pt-BR.xtb
@@ -1005,7 +1005,6 @@ <translation id="5619633276517849615">Sua organização ativou a Navegação segura</translation> <translation id="5620163320393916465">Nenhuma senha salva</translation> <translation id="5620928963363755975">Procure seus arquivos e páginas em Downloads, usando o botão Mais opções</translation> -<translation id="562289928968387744">Gerenciar reações</translation> <translation id="5626134646977739690">Nome:</translation> <translation id="5628604359369369630">Não lidas - Disponíveis off-line</translation> <translation id="5631483240431073854">Gerenciar guias abertas</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_pt-PT.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_pt-PT.xtb index d3ef3d6..7162087c 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_pt-PT.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_pt-PT.xtb
@@ -19,6 +19,7 @@ <translation id="107147699690128016">Se alterar a extensão do ficheiro, este pode ser aberto numa aplicação diferente e representar um risco para o seu dispositivo.</translation> <translation id="1080365971383768617">Palavras-passe em todos os dispositivos</translation> <translation id="1082920045291562218">Partilhar com página de feedback do resumo fechada</translation> +<translation id="1087176310396019910">Possível spam</translation> <translation id="1089606299949659462">Revisão concluída!</translation> <translation id="1094555143448724771">Para ver os separadores dos seus outros dispositivos, sincronize os separadores e o histórico</translation> <translation id="1095761715416917775">Certifique-se de que pode aceder sempre aos seus dados de sincronização</translation> @@ -508,6 +509,7 @@ <translation id="3282568296779691940">Iniciar sessão no Chrome</translation> <translation id="3285065882678541460">{TAB_COUNT,plural, =1{<ph name="TAB_GROUPS_PART" />, <ph name="TAB_COUNT_ONE" /> separador}other{<ph name="TAB_GROUPS_PART" />, <ph name="TAB_COUNT_MANY" /> separadores}}</translation> <translation id="3293181007446299124">O seu histórico de navegação é mantido no dispositivo e os relatórios são enviados com um atraso para proteger a sua identidade</translation> +<translation id="3301936297336370235">Confirmação de sugestão de palavra-passe</translation> <translation id="3302615849591357577">Restaure o grupo de separadores <ph name="TITLE_OF_GROUP" />, com a cor <ph name="COLOR_NAME" />, como um novo grupo de separadores em segundo plano.</translation> <translation id="3303414029551471755">Quer transferir o conteúdo?</translation> <translation id="3303855915957856445">Não foram encontrados resultados da pesquisa</translation> @@ -1005,7 +1007,6 @@ <translation id="5619633276517849615">A sua organização ativou a Navegação Segura</translation> <translation id="5620163320393916465">Não existem palavras-passe guardadas.</translation> <translation id="5620928963363755975">Encontre os seus ficheiros e páginas nas Transferências através do botão Mais opções.</translation> -<translation id="562289928968387744">Gerir reações</translation> <translation id="5626134646977739690">Nome:</translation> <translation id="5628604359369369630">Não lido – Disponível offline</translation> <translation id="5631483240431073854">Faça a gestão dos separadores abertos</translation> @@ -1137,6 +1138,7 @@ <translation id="6193448654517602979">Selecione separadores</translation> <translation id="6196315980958524839">As palavras-passe são guardadas no Gestor de Palavras-passe da Google neste dispositivo</translation> <translation id="6202812185118613467">Inicie sessão novamente para iniciar a sincronização</translation> +<translation id="6204781143409202534">O Chrome detetou um possível spam de <ph name="DOMAIN" />.</translation> <translation id="6205314730813004066">Privacidade dos anúncios</translation> <translation id="6210748933810148297"><ph name="EMAIL" /> não é o seu email?</translation> <translation id="6211386937064921208">A pré-visualizar esta página…</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ro.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ro.xtb index 94b664d1..653f4366 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ro.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ro.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">Organizația ta a activat Navigarea sigură</translation> <translation id="5620163320393916465">Nu există parole salvate</translation> <translation id="5620928963363755975">Găsește fișierele și paginile în Descărcări folosind butonul Mai multe opțiuni</translation> -<translation id="562289928968387744">Gestionează reacțiile</translation> <translation id="5626134646977739690">Nume:</translation> <translation id="5628604359369369630">Necitită – Disponibilă offline</translation> <translation id="5631483240431073854">Gestionează filele deschise</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ru.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ru.xtb index 8cd1aae8..fdd6b2c 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ru.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ru.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">В вашей организации включен Безопасный просмотр.</translation> <translation id="5620163320393916465">Сохраненных паролей нет</translation> <translation id="5620928963363755975">Чтобы найти скачанные файлы и веб-страницы, нажмите кнопку "Ещё" и выберите соответствующий пункт</translation> -<translation id="562289928968387744">Управление откликами</translation> <translation id="5626134646977739690">Имя:</translation> <translation id="5628604359369369630">Не прочитано – доступно в офлайн-режиме</translation> <translation id="5631483240431073854">Управлять открытыми вкладками</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_si.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_si.xtb index 19d2df6..8471883 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_si.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_si.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">ඔබේ සංවිධානය ආරක්ෂිත බ්රවුස් කිරීම ක්රියාත්මක කර ඇත</translation> <translation id="5620163320393916465">සුරැකි මුරපද නැත</translation> <translation id="5620928963363755975">තවත් විකල්ප බොත්තමෙන් බාගැනීම් තුළ ඔබේ ගොනු සහ පිටු සොයා ගන්න</translation> -<translation id="562289928968387744">ප්රතික්රියා කළමනාකරණය කරන්න</translation> <translation id="5626134646977739690">නම:</translation> <translation id="5628604359369369630">නොකියවන - නොබැඳිව ලබා ගත හැකිය</translation> <translation id="5631483240431073854">විවෘත පටිති කළමනාකරණය කරන්න</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sk.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sk.xtb index 89271e5..5b454ea 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sk.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sk.xtb
@@ -972,6 +972,7 @@ <translation id="5444999712122199445">Prejdite späť na web</translation> <translation id="544776284582297024">Ak chcete otvoriť karty a navštíviť naraz rôzne stránky, klepnite na tlačidlo Otvoriť karty</translation> <translation id="5454166040603940656">s poskytovateľom <ph name="PROVIDER" /></translation> +<translation id="5454215368971121976">Keď je zariadenie zložené, môžete vybrať možnosť alebo pridržaním panela s adresou zmeniť pozíciu.</translation> <translation id="5458366071038729214">Tu nájdete weby, ktoré sledujete</translation> <translation id="5468068603361015296">Chcete aj tak stiahnuť <ph name="FILE_NAME" />?</translation> <translation id="548278423535722844">Otvorte v aplikácii pre mapy</translation> @@ -1004,7 +1005,6 @@ <translation id="5619633276517849615">Vaša organizácia zapla Bezpečné prehliadanie</translation> <translation id="5620163320393916465">Žiadne uložené heslá</translation> <translation id="5620928963363755975">Stiahnuté súbory a stránky nájdete po použití tlačidla Ďalšie možnosti</translation> -<translation id="562289928968387744">Spravovať reakcie</translation> <translation id="5626134646977739690">Názov:</translation> <translation id="5628604359369369630">Neprečítané – k dispozícii offline</translation> <translation id="5631483240431073854">Spravovať otvorené karty</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sl.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sl.xtb index 31a809f..8ea974e 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sl.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sl.xtb
@@ -972,6 +972,7 @@ <translation id="5444999712122199445">Nazaj na spletno mesto</translation> <translation id="544776284582297024">Če želite hkrati odpreti zavihke in obiskati različne strani, se dotaknite gumba za odprte zavihke</translation> <translation id="5454166040603940656">pri ponudniku <ph name="PROVIDER" /></translation> +<translation id="5454215368971121976">Ko je naprava zložena, lahko izberete možnost ali se dotaknete naslovne vrstice in jo pridržite, da spremenite položaj.</translation> <translation id="5458366071038729214">Tukaj boste našli spletna mesta, ki jih spremljate.</translation> <translation id="5468068603361015296">Ali želite vseeno prenesti <ph name="FILE_NAME" />?</translation> <translation id="548278423535722844">Odpiranje v aplikaciji z zemljevidi</translation> @@ -1004,7 +1005,6 @@ <translation id="5619633276517849615">Vaša organizacija je vklopila Varno brskanje</translation> <translation id="5620163320393916465">Ni shranjenih gesel</translation> <translation id="5620928963363755975">Poiščite datoteke in strani v Prenosih z gumbom »Več možnosti«</translation> -<translation id="562289928968387744">Upravljanje odzivov</translation> <translation id="5626134646977739690">Ime:</translation> <translation id="5628604359369369630">Neprebrano – na voljo brez povezave</translation> <translation id="5631483240431073854">Upravljanje odprtih zavihkov</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sq.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sq.xtb index 2a88d06..f49bc99 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sq.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sq.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">Organizata jote ka aktivizuar "Shfletimin e sigurt"</translation> <translation id="5620163320393916465">Nuk ka asnjë fjalëkalim të ruajtur</translation> <translation id="5620928963363755975">Gjej skedarët dhe faqet e tua te "Shkarkimet" nga butoni "Më shumë opsione"</translation> -<translation id="562289928968387744">Menaxho reagimet</translation> <translation id="5626134646977739690">Emri:</translation> <translation id="5628604359369369630">Të palexuara - ofrohen offline</translation> <translation id="5631483240431073854">Menaxho skedat e hapura</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sr-Latn.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sr-Latn.xtb index 48fa627..66fa1cb 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sr-Latn.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sr-Latn.xtb
@@ -19,6 +19,7 @@ <translation id="107147699690128016">Ako promenite ekstenziju datoteke, ona može da se otvori u drugoj aplikaciji i da bude opasna po uređaj.</translation> <translation id="1080365971383768617">Lozinke na svim uređajima</translation> <translation id="1082920045291562218">Deljenje pomoću tabele sa rezimeom povratnih informacija je zatvoreno</translation> +<translation id="1087176310396019910">Mogući nepoželjan sadržaj</translation> <translation id="1089606299949659462">Pregled je završen!</translation> <translation id="1094555143448724771">Da biste videli kartice sa drugih uređaja, sinhronizujte kartice i istoriju</translation> <translation id="1095761715416917775">Uverite se da uvek možete da pristupate sinhronizovanim podacima</translation> @@ -508,6 +509,7 @@ <translation id="3282568296779691940">Prijavljivanje u Chrome</translation> <translation id="3285065882678541460">{TAB_COUNT,plural, =1{<ph name="TAB_GROUPS_PART" />, <ph name="TAB_COUNT_ONE" /> kartica}one{<ph name="TAB_GROUPS_PART" />, <ph name="TAB_COUNT_MANY" /> kartica}few{<ph name="TAB_GROUPS_PART" />, <ph name="TAB_COUNT_MANY" /> kartice}other{<ph name="TAB_GROUPS_PART" />, <ph name="TAB_COUNT_MANY" /> kartica}}</translation> <translation id="3293181007446299124">Istorija pregledanja ostaje privatna na uređaju, a izveštaji se šalju sa kašnjenjem radi zaštite identiteta</translation> +<translation id="3301936297336370235">Potvrda predloga za lozinku</translation> <translation id="3302615849591357577">Vratite grupu kartica <ph name="TITLE_OF_GROUP" />, u boji <ph name="COLOR_NAME" />, kao novu grupu kartica u pozadini.</translation> <translation id="3303414029551471755">Želite li da nastavite sa preuzimanjem sadržaja?</translation> <translation id="3303855915957856445">Nisu pronađeni rezultati pretrage</translation> @@ -1005,7 +1007,6 @@ <translation id="5619633276517849615">Organizacija je uključila Bezbedno pregledanje</translation> <translation id="5620163320393916465">Nema sačuvanih lozinki</translation> <translation id="5620928963363755975">Pronađite datoteke i stranice u Preuzimanjima pomoću dugmeta Još opcija</translation> -<translation id="562289928968387744">Upravljaj reakcijama</translation> <translation id="5626134646977739690">Ime:</translation> <translation id="5628604359369369630">Nije pročitano. Dostupno je oflajn</translation> <translation id="5631483240431073854">Upravljaj otvorenim karticama</translation> @@ -1137,6 +1138,7 @@ <translation id="6193448654517602979">Izaberite kartice</translation> <translation id="6196315980958524839">Lozinke se čuvaju u Google menadžeru lozinki na ovom uređaju</translation> <translation id="6202812185118613467">Ponovo se prijavite da biste započeli sinhronizaciju</translation> +<translation id="6204781143409202534">Chrome je otkrio mogući nepoželjan sadržaj sa domena <ph name="DOMAIN" />.</translation> <translation id="6205314730813004066">Privatnost sa oglasima</translation> <translation id="6210748933810148297">Niste <ph name="EMAIL" />?</translation> <translation id="6211386937064921208">Pregled ove stranice</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sr.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sr.xtb index e2b6df0..48fe61a 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sr.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sr.xtb
@@ -19,6 +19,7 @@ <translation id="107147699690128016">Ако промените екстензију датотеке, она може да се отвори у другој апликацији и да буде опасна по уређај.</translation> <translation id="1080365971383768617">Лозинке на свим уређајима</translation> <translation id="1082920045291562218">Дељење помоћу табеле са резимеом повратних информација је затворено</translation> +<translation id="1087176310396019910">Могући непожељан садржај</translation> <translation id="1089606299949659462">Преглед је завршен!</translation> <translation id="1094555143448724771">Да бисте видели картице са других уређаја, синхронизујте картице и историју</translation> <translation id="1095761715416917775">Уверите се да увек можете да приступате синхронизованим подацима</translation> @@ -508,6 +509,7 @@ <translation id="3282568296779691940">Пријављивање у Chrome</translation> <translation id="3285065882678541460">{TAB_COUNT,plural, =1{<ph name="TAB_GROUPS_PART" />, <ph name="TAB_COUNT_ONE" /> картица}one{<ph name="TAB_GROUPS_PART" />, <ph name="TAB_COUNT_MANY" /> картица}few{<ph name="TAB_GROUPS_PART" />, <ph name="TAB_COUNT_MANY" /> картице}other{<ph name="TAB_GROUPS_PART" />, <ph name="TAB_COUNT_MANY" /> картица}}</translation> <translation id="3293181007446299124">Историја прегледања остаје приватна на уређају, а извештаји се шаљу са кашњењем ради заштите идентитета</translation> +<translation id="3301936297336370235">Потврда предлога за лозинку</translation> <translation id="3302615849591357577">Вратите групу картица <ph name="TITLE_OF_GROUP" />, у боји <ph name="COLOR_NAME" />, као нову групу картица у позадини.</translation> <translation id="3303414029551471755">Желите ли да наставите са преузимањем садржаја?</translation> <translation id="3303855915957856445">Нису пронађени резултати претраге</translation> @@ -1005,7 +1007,6 @@ <translation id="5619633276517849615">Организација је укључила Безбедно прегледање</translation> <translation id="5620163320393916465">Нема сачуваних лозинки</translation> <translation id="5620928963363755975">Пронађите датотеке и странице у Преузимањима помоћу дугмета Још опција</translation> -<translation id="562289928968387744">Управљај реакцијама</translation> <translation id="5626134646977739690">Име:</translation> <translation id="5628604359369369630">Није прочитано. Доступно је офлајн</translation> <translation id="5631483240431073854">Управљај отвореним картицама</translation> @@ -1137,6 +1138,7 @@ <translation id="6193448654517602979">Изаберите картице</translation> <translation id="6196315980958524839">Лозинке се чувају у Google менаџеру лозинки на овом уређају</translation> <translation id="6202812185118613467">Поново се пријавите да бисте започели синхронизацију</translation> +<translation id="6204781143409202534">Chrome је открио могући непожељан садржај са домена <ph name="DOMAIN" />.</translation> <translation id="6205314730813004066">Приватност са огласима</translation> <translation id="6210748933810148297">Нисте <ph name="EMAIL" />?</translation> <translation id="6211386937064921208">Преглед ове странице</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sv.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sv.xtb index 79fc859..5fcaeb3 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sv.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sv.xtb
@@ -1005,7 +1005,6 @@ <translation id="5619633276517849615">Organisationen har aktiverat Säker webbsökning</translation> <translation id="5620163320393916465">Inga sparade lösenord</translation> <translation id="5620928963363755975">Du hittar filerna och sidorna i Nedladdningar via knappen Fler alternativ</translation> -<translation id="562289928968387744">Hantera reaktioner</translation> <translation id="5626134646977739690">Namn:</translation> <translation id="5628604359369369630">Oläst – Tillgänglig offline</translation> <translation id="5631483240431073854">Hantera öppna flikar</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sw.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sw.xtb index fef1e76..356627cb 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sw.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sw.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">Shirika lako limewasha kipengele cha Kuvinjari Salama</translation> <translation id="5620163320393916465">Hakuna manenosiri yaliyohifadhiwa</translation> <translation id="5620928963363755975">Tafuta faili na kurasa zako katika Vipakuliwa kwenye kitufe cha Chaguo Nyingine</translation> -<translation id="562289928968387744">Dhibiti maoni</translation> <translation id="5626134646977739690">Jina:</translation> <translation id="5628604359369369630">Ambazo hujasoma - Zinapatikana nje ya mtandao</translation> <translation id="5631483240431073854">Dhibiti vichupo ulivyofungua</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ta.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ta.xtb index 57a6df0..12fe97f1 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ta.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ta.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">உங்கள் நிறுவனம் பாதுகாப்பு உலாவலை இயக்கியுள்ளது</translation> <translation id="5620163320393916465">சேமித்த கடவுச்சொற்கள் எதுவுமில்லை</translation> <translation id="5620928963363755975">மேலும் விருப்பங்கள் பொத்தானிற்குச் சென்று, பதிவிறக்கங்கள் என்பதில் கோப்புகளையும் பக்கங்களையும் கண்டறியலாம்</translation> -<translation id="562289928968387744">உணர்வு வெளிப்பாடுகளை நிர்வகிக்கலாம்</translation> <translation id="5626134646977739690">பெயர்:</translation> <translation id="5628604359369369630">படிக்காதவை - ஆஃப்லைனில் படிக்கலாம்</translation> <translation id="5631483240431073854">திறந்துள்ள பக்கங்களை நிர்வகிக்கலாம்</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_te.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_te.xtb index e2977266..f69ade3 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_te.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_te.xtb
@@ -1005,7 +1005,6 @@ <translation id="5619633276517849615">మీ సంస్థ సురక్షిత బ్రౌజింగ్ని ఆన్ చేసింది</translation> <translation id="5620163320393916465">సేవ్ చేసిన పాస్వర్డ్లు ఏవీ లేవు</translation> <translation id="5620928963363755975">'మరిన్ని ఆప్షన్లు' బటన్ నొక్కి, డౌన్లోడ్లలో మీ ఫైళ్లు మరియు పేజీలను కనుగొనండి</translation> -<translation id="562289928968387744">ప్రతిస్పందనలను మేనేజ్ చేయండి</translation> <translation id="5626134646977739690">పేరు:</translation> <translation id="5628604359369369630">చదవనివి - ఆఫ్లైన్లో అందుబాటులో ఉన్నాయి</translation> <translation id="5631483240431073854">తెరిచిన ట్యాబ్లను మేనేజ్ చేయండి</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_th.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_th.xtb index 1441eda..5871e0e 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_th.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_th.xtb
@@ -972,6 +972,7 @@ <translation id="5444999712122199445">กลับไปที่เว็บไซต์</translation> <translation id="544776284582297024">หากต้องการเปิดแท็บและเข้าชมหน้าต่างๆ ในเวลาเดียวกัน ให้แตะปุ่มเปิดแท็บ</translation> <translation id="5454166040603940656">กับ <ph name="PROVIDER" /></translation> +<translation id="5454215368971121976">เมื่อพับอุปกรณ์แล้ว คุณสามารถเลือกตัวเลือกหรือแตะแถบที่อยู่ค้างไว้เพื่อเปลี่ยนตำแหน่งได้</translation> <translation id="5458366071038729214">คุณจะเห็นเว็บไซต์ที่ติดตามที่นี่</translation> <translation id="5468068603361015296">คุณต้องการดาวน์โหลด <ph name="FILE_NAME" /> ต่อไปไหม</translation> <translation id="548278423535722844">เปิดในแอปแผนที่</translation> @@ -1004,7 +1005,6 @@ <translation id="5619633276517849615">องค์กรเปิด Google Safe Browsing</translation> <translation id="5620163320393916465">ไม่มีรหัสผ่านที่บันทึกไว้</translation> <translation id="5620928963363755975">หาไฟล์และหน้าในโฟลเดอร์ดาวน์โหลดจากปุ่มตัวเลือกเพิ่มเติม</translation> -<translation id="562289928968387744">จัดการการโต้ตอบ</translation> <translation id="5626134646977739690">ชื่อ:</translation> <translation id="5628604359369369630">ยังไม่อ่าน - อ่านขณะออฟไลน์ได้</translation> <translation id="5631483240431073854">จัดการแท็บที่เปิดอยู่</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_tr.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_tr.xtb index 0fdbc87f..2c609adc 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_tr.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_tr.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">Kuruluşunuz, Güvenli Tarama'yı etkinleştirdi</translation> <translation id="5620163320393916465">Kaydedilen şifre yok</translation> <translation id="5620928963363755975">Diğer Seçenekler düğmesini kullanarak İndirilenler bölümünden dosyalarınızı ve sayfalarınızı bulabilirsiniz</translation> -<translation id="562289928968387744">Tepkileri yönetin</translation> <translation id="5626134646977739690">Adı:</translation> <translation id="5628604359369369630">Okunmadı; Çevrimdışı kullanılabilir</translation> <translation id="5631483240431073854">Açık sekmeleri yönetin</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_uk.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_uk.xtb index 90e2c8c..c501c2f 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_uk.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_uk.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">Адміністратор вашої організації ввімкнув Безпечний перегляд</translation> <translation id="5620163320393916465">Немає збережених паролів</translation> <translation id="5620928963363755975">Знаходьте свої файли та сторінки в розділі "Завантаження", натиснувши кнопку "Більше опцій"</translation> -<translation id="562289928968387744">Керувати реакціями</translation> <translation id="5626134646977739690">Ім'я:</translation> <translation id="5628604359369369630">Непрочитано: доступно в режимі офлайн</translation> <translation id="5631483240431073854">Керувати відкритими вкладками</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ur.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ur.xtb index 5c5e406..c207766 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ur.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ur.xtb
@@ -972,6 +972,7 @@ <translation id="5444999712122199445">سائٹ پر واپس جائیں</translation> <translation id="544776284582297024">ٹیبز کو کھولنے اور ایک ہی وقت میں مختلف صفحات ملاحظہ کرنے کے لئے، ٹیبز بٹن کھولیں پر تھپتھپائیں</translation> <translation id="5454166040603940656"><ph name="PROVIDER" /> کے ساتھ</translation> +<translation id="5454215368971121976">جب آپ کا آلہ فولڈ ہو جاتا ہے تو آپ ایک اختیار منتخب کر سکتے ہیں یا پوزیشن کو تبدیل کرنے کے لیے ایڈریس بار کو ٹچ کر کے دبا کر رکھ سکتے ہیں۔</translation> <translation id="5458366071038729214">آپ جن سائٹس کی پیروی کرتے ہیں وہ آپ کو یہاں ملیں گی</translation> <translation id="5468068603361015296">کیا آپ بہر صورت <ph name="FILE_NAME" /> کو ڈاؤن لوڈ کرنا چاہتے ہیں؟</translation> <translation id="548278423535722844">نقشہ کی ایپ میں کھولیں</translation> @@ -1004,7 +1005,6 @@ <translation id="5619633276517849615">آپ کی تنظیم نے محفوظ براؤزنگ کو آن کر دیا ہے</translation> <translation id="5620163320393916465">کوئی محفوظ کردہ پاس ورڈز نہیں</translation> <translation id="5620928963363755975">مزید اختیارات بٹن سے اپنی فائلیں اور صفحات ڈاؤن لوڈز میں تلاش کریں</translation> -<translation id="562289928968387744">ردعمل کا نظم کریں</translation> <translation id="5626134646977739690">نام:</translation> <translation id="5628604359369369630">نہ پڑھا ہوا - آف لائن دستیاب ہے</translation> <translation id="5631483240431073854">کھلے ٹیبز کا نظم کریں</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_uz.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_uz.xtb index 09af36a..d16737e 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_uz.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_uz.xtb
@@ -1005,7 +1005,6 @@ <translation id="5619633276517849615">Tashkilotingiz tomonidan Saytlarni xavfsiz kezish yoqilgan</translation> <translation id="5620163320393916465">Hech qanday parol saqlanmagan</translation> <translation id="5620928963363755975">“Yuklanmalar” jildidagi fayl va sahiflarni “Boshqa parametrlar” tugmasidan topish mumkin</translation> -<translation id="562289928968387744">Munosabatlarni boshqarish</translation> <translation id="5626134646977739690">Ism:</translation> <translation id="5628604359369369630">Oʻqilmagan – oflayn mavjud</translation> <translation id="5631483240431073854">Ochiq varaqlarni boshqarish</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_vi.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_vi.xtb index 5624484..8cd60e72 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_vi.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_vi.xtb
@@ -1005,7 +1005,6 @@ <translation id="5619633276517849615">Tổ chức của bạn đã bật tính năng Duyệt web an toàn</translation> <translation id="5620163320393916465">Bạn chưa lưu mật khẩu nào</translation> <translation id="5620928963363755975">Tìm tệp và trang của bạn trong Tài nguyên đã tải xuống từ nút Tùy chọn khác</translation> -<translation id="562289928968387744">Quản lý lượt bày tỏ cảm xúc</translation> <translation id="5626134646977739690">Tên:</translation> <translation id="5628604359369369630">Chưa đọc – Có thể đọc khi không có mạng</translation> <translation id="5631483240431073854">Quản lý các thẻ đang mở</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb index 2b9bc7ab..b0772ca 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">贵组织已开启“安全浏览”功能</translation> <translation id="5620163320393916465">尚未保存任何密码</translation> <translation id="5620928963363755975">通过“更多选项”按钮在“下载内容”中查找您的文件和网页</translation> -<translation id="562289928968387744">管理回应</translation> <translation id="5626134646977739690">名字：</translation> <translation id="5628604359369369630">未读 - 可离线阅读</translation> <translation id="5631483240431073854">管理打开的标签页</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-HK.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-HK.xtb index c298b57..548931d 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-HK.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-HK.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">你的機構已開啟「安全瀏覽」功能</translation> <translation id="5620163320393916465">沒有已儲存的密碼</translation> <translation id="5620928963363755975">透過「更多選項」按鈕，喺「下載」主畫面搵您嘅檔案同網頁</translation> -<translation id="562289928968387744">管理回應</translation> <translation id="5626134646977739690">名稱：</translation> <translation id="5628604359369369630">未讀 - 可離線閱讀</translation> <translation id="5631483240431073854">管理開啟的分頁</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-TW.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-TW.xtb index 9b764e7..cdb2c7b 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-TW.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-TW.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">貴機構已開啟安全瀏覽功能</translation> <translation id="5620163320393916465">未儲存任何密碼</translation> <translation id="5620928963363755975">透過「更多選項」按鈕前往「下載」主畫面尋找你的檔案和網頁</translation> -<translation id="562289928968387744">管理回應</translation> <translation id="5626134646977739690">名稱：</translation> <translation id="5628604359369369630">尚未閱讀 - 可離線閱讀</translation> <translation id="5631483240431073854">管理開啟的分頁</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zu.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zu.xtb index 62dc07d..8499cc36 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zu.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zu.xtb
@@ -1004,7 +1004,6 @@ <translation id="5619633276517849615">Inhlangano yakho ivule Ukubhrawuza Okuphephile</translation> <translation id="5620163320393916465">Awekho amaphasiwedi alondoloziwe</translation> <translation id="5620928963363755975">Thola amafayela akho namakhasi ekulandeni kusuka kwinkinobho Izinketho Eziningi</translation> -<translation id="562289928968387744">Phatha ukusabela</translation> <translation id="5626134646977739690">Igama:</translation> <translation id="5628604359369369630">Akufundiwe - Kutholakala ungaxhunyiwe ku-inthanethi</translation> <translation id="5631483240431073854">Phatha amathebhu avuliwe</translation>
diff --git a/chrome/browser/ui/android/tab_contents/chrome_web_contents_view_delegate_android.cc b/chrome/browser/ui/android/tab_contents/chrome_web_contents_view_delegate_android.cc index c74be750..ad12b2a0 100644 --- a/chrome/browser/ui/android/tab_contents/chrome_web_contents_view_delegate_android.cc +++ b/chrome/browser/ui/android/tab_contents/chrome_web_contents_view_delegate_android.cc
@@ -14,8 +14,7 @@ ChromeWebContentsViewDelegateAndroid::ChromeWebContentsViewDelegateAndroid( content::WebContents* web_contents) - : web_contents_(web_contents) { -} + : web_contents_(web_contents) {} ChromeWebContentsViewDelegateAndroid::~ChromeWebContentsViewDelegateAndroid() = default; @@ -32,18 +31,19 @@ const content::ContextMenuParams& params) { // TODO(dtrainor, kouhei): Give WebView a Populator/delegate so it can use // the same context menu code. - ContextMenuHelper* helper = - ContextMenuHelper::FromWebContents(web_contents_); - if (helper) + ContextMenuHelper* helper = ContextMenuHelper::FromWebContents(web_contents_); + if (helper) { helper->ShowContextMenu(render_frame_host, params); + } } void ChromeWebContentsViewDelegateAndroid::DismissContextMenu() { // ContextMenuHelper is a WebContentsUserData, so it will be the same obj used // in #ShowContextMenu(). ContextMenuHelper* helper = ContextMenuHelper::FromWebContents(web_contents_); - if (helper) + if (helper) { helper->DismissContextMenu(); + } } std::unique_ptr<content::WebContentsViewDelegate> CreateWebContentsViewDelegate(
diff --git a/chrome/browser/ui/android/tab_model/android_live_tab_context_wrapper.cc b/chrome/browser/ui/android/tab_model/android_live_tab_context_wrapper.cc index 91369f1..f97de9d 100644 --- a/chrome/browser/ui/android/tab_model/android_live_tab_context_wrapper.cc +++ b/chrome/browser/ui/android/tab_model/android_live_tab_context_wrapper.cc
@@ -105,9 +105,8 @@ int tab_index, bool select, sessions::tab_restore::Type original_session_type) { - auto* live_tab = - AndroidLiveTabContext::AddRestoredTab(tab, tab_index, select, - original_session_type); + auto* live_tab = AndroidLiveTabContext::AddRestoredTab(tab, tab_index, select, + original_session_type); if (tab.group) { TabAndroid* restored_tab = TabAndroid::FromWebContents( static_cast<sessions::ContentLiveTab*>(live_tab)->web_contents());
diff --git a/chrome/browser/ui/android/tab_model/tab_model_list.cc b/chrome/browser/ui/android/tab_model/tab_model_list.cc index 297c9ec..901e2cea 100644 --- a/chrome/browser/ui/android/tab_model/tab_model_list.cc +++ b/chrome/browser/ui/android/tab_model/tab_model_list.cc
@@ -28,8 +28,9 @@ DCHECK(tab_model); tab_model_list_.Get().models_.push_back(tab_model); - for (TabModelListObserver& observer : tab_model_list_.Get().observers_) + for (TabModelListObserver& observer : tab_model_list_.Get().observers_) { observer.OnTabModelAdded(); + } } void TabModelList::RemoveTabModel(TabModel* tab_model) { @@ -39,11 +40,13 @@ TabModelList::iterator remove_tab_model = base::ranges::find(tab_models, tab_model); - if (remove_tab_model != tab_models.end()) + if (remove_tab_model != tab_models.end()) { tab_models.erase(remove_tab_model); + } - for (TabModelListObserver& observer : tab_model_list_.Get().observers_) + for (TabModelListObserver& observer : tab_model_list_.Get().observers_) { observer.OnTabModelRemoved(); + } } void TabModelList::AddObserver(TabModelListObserver* observer) { @@ -60,20 +63,23 @@ // NOTE: If this fails contact dtrainor@. DCHECK(tab); TabModel* model = FindTabModelWithId(tab->GetWindowId()); - if (model) + if (model) { model->HandlePopupNavigation(tab, params); + } } TabModel* TabModelList::GetTabModelForWebContents( content::WebContents* web_contents) { - if (!web_contents) + if (!web_contents) { return nullptr; + } for (TabModel* model : models()) { const size_t tab_count = model->GetTabCount(); for (size_t index = 0; index < tab_count; index++) { - if (web_contents == model->GetWebContentsAt(index)) + if (web_contents == model->GetWebContentsAt(index)) { return model; + } } } @@ -81,14 +87,16 @@ } TabModel* TabModelList::GetTabModelForTabAndroid(TabAndroid* tab_android) { - if (!tab_android) + if (!tab_android) { return nullptr; + } for (TabModel* model : models()) { const size_t tab_count = model->GetTabCount(); for (size_t index = 0; index < tab_count; index++) { - if (tab_android == model->GetTabAt(index)) + if (tab_android == model->GetTabAt(index)) { return model; + } } } @@ -97,8 +105,9 @@ TabModel* TabModelList::FindTabModelWithId(SessionID desired_id) { for (TabModel* model : models()) { - if (model->GetSessionId() == desired_id) + if (model->GetSessionId() == desired_id) { return model; + } } return nullptr; @@ -127,8 +136,9 @@ // TODO(crbug.com/40107157): This function should return true for // incognito CCTs. for (TabModel* model : models()) { - if (model->IsOffTheRecord() && model->GetTabCount() > 0) + if (model->IsOffTheRecord() && model->GetTabCount() > 0) { return true; + } } return false;
diff --git a/chrome/browser/ui/android/toolbar/location_bar_model_android.cc b/chrome/browser/ui/android/toolbar/location_bar_model_android.cc index 90118ee..32cf633f 100644 --- a/chrome/browser/ui/android/toolbar/location_bar_model_android.cc +++ b/chrome/browser/ui/android/toolbar/location_bar_model_android.cc
@@ -72,8 +72,9 @@ bool LocationBarModelAndroid::IsNewTabPage() const { GURL url; - if (!GetURL(&url)) + if (!GetURL(&url)) { return false; + } // Android Chrome has its own Instant NTP page implementation. if (url.SchemeIs(chrome::kChromeNativeScheme) &&
diff --git a/chrome/browser/ui/android/webid/account_selection_view_android.cc b/chrome/browser/ui/android/webid/account_selection_view_android.cc index 9a411cb..87f63f0f7 100644 --- a/chrome/browser/ui/android/webid/account_selection_view_android.cc +++ b/chrome/browser/ui/android/webid/account_selection_view_android.cc
@@ -342,8 +342,8 @@ } void AccountSelectionViewAndroid::CloseModalDialog() { - // Since this is triggered only after the CCT is opened, leaving it out of the metrics - // to focus on cases where a UI cannot be displayed. + // Since this is triggered only after the CCT is opened, leaving it out of the + // metrics to focus on cases where a UI cannot be displayed. if (!MaybeCreateJavaObject(/*rp_mode=*/std::nullopt)) { return; }
diff --git a/chrome/browser/ui/apps/chrome_app_delegate.cc b/chrome/browser/ui/apps/chrome_app_delegate.cc index 75f2f89..918adf8 100644 --- a/chrome/browser/ui/apps/chrome_app_delegate.cc +++ b/chrome/browser/ui/apps/chrome_app_delegate.cc
@@ -110,8 +110,9 @@ // open it. Profile* profile = Profile::FromBrowserContext(source->GetBrowserContext()); DCHECK(profile); - if (!profile) + if (!profile) { return; + } switch (state) { case shell_integration::IS_DEFAULT: OpenURLFromTabInternal(profile, params, @@ -356,8 +357,9 @@ void ChromeAppDelegate::SetWebContentsBlocked( content::WebContents* web_contents, bool blocked) { - if (!blocked) + if (!blocked) { web_contents->Focus(); + } // RenderFrameHost may be NULL during shutdown. content::RenderFrameHost* host = web_contents->GetPrimaryMainFrame(); if (host && host->IsRenderFrameLive()) { @@ -422,6 +424,7 @@ } void ChromeAppDelegate::OnAppTerminating() { - if (!terminating_callback_.is_null()) + if (!terminating_callback_.is_null()) { std::move(terminating_callback_).Run(); + } }
diff --git a/chrome/browser/ui/apps/chrome_app_window_client.cc b/chrome/browser/ui/apps/chrome_app_window_client.cc index a65eb425..3ee0ab7e 100644 --- a/chrome/browser/ui/apps/chrome_app_window_client.cc +++ b/chrome/browser/ui/apps/chrome_app_window_client.cc
@@ -70,10 +70,11 @@ DevToolsWindow* devtools_window = DevToolsWindow::FindDevToolsWindow(agent.get()); - if (devtools_window) + if (devtools_window) { devtools_window->SetLoadCompletedCallback(std::move(callback)); - else + } else { std::move(callback).Run(); + } } bool ChromeAppWindowClient::IsCurrentChannelOlderThanDev() {
diff --git a/chrome/browser/ui/ash/accessibility/accessibility_controller_client.cc b/chrome/browser/ui/ash/accessibility/accessibility_controller_client.cc index 78d7406..a1be7295 100644 --- a/chrome/browser/ui/ash/accessibility/accessibility_controller_client.cc +++ b/chrome/browser/ui/ash/accessibility/accessibility_controller_client.cc
@@ -25,10 +25,11 @@ bool enabled) { DCHECK(context); AutomationManagerAura* manager = AutomationManagerAura::GetInstance(); - if (enabled) + if (enabled) { manager->Enable(); - else + } else { manager->Disable(); + } } } // namespace @@ -44,8 +45,9 @@ void AccessibilityControllerClient::TriggerAccessibilityAlert( ash::AccessibilityAlert alert) { Profile* profile = ProfileManager::GetActiveUserProfile(); - if (!profile) + if (!profile) { return; + } int msg = 0; switch (alert) { @@ -112,16 +114,18 @@ l10n_util::GetStringUTF8(msg)); // After handling the alert, if the alert is screen-off, we should // disable automation manager to handle any following a11y events. - if (alert == ash::AccessibilityAlert::SCREEN_OFF) + if (alert == ash::AccessibilityAlert::SCREEN_OFF) { SetAutomationManagerEnabled(profile, false); + } } } void AccessibilityControllerClient::TriggerAccessibilityAlertWithMessage( const std::string& message) { Profile* profile = ProfileManager::GetActiveUserProfile(); - if (!profile) + if (!profile) { return; + } AutomationManagerAura::GetInstance()->HandleAlert(message); }
diff --git a/chrome/browser/ui/ash/accessibility/ax_tree_source_aura_unittest.cc b/chrome/browser/ui/ash/accessibility/ax_tree_source_aura_unittest.cc index c32b24a7..18fd110 100644 --- a/chrome/browser/ui/ash/accessibility/ax_tree_source_aura_unittest.cc +++ b/chrome/browser/ui/ash/accessibility/ax_tree_source_aura_unittest.cc
@@ -47,8 +47,9 @@ std::vector<raw_ptr<AXAuraObjWrapper, VectorExperimental>> out_children; tree->GetChildren(&out_children); - for (size_t i = 0; i < out_children.size(); ++i) + for (size_t i = 0; i < out_children.size(); ++i) { count += GetSize(out_children[i]); + } return count; } @@ -137,8 +138,9 @@ // Try walking up the tree to the root. AXAuraObjWrapper* test_root = nullptr; for (AXAuraObjWrapper* root_finder = ax_tree.GetParent(content); root_finder; - root_finder = ax_tree.GetParent(root_finder)) + root_finder = ax_tree.GetParent(root_finder)) { test_root = root_finder; + } ASSERT_EQ(ax_tree.GetRoot(), test_root); } @@ -205,8 +207,9 @@ int text_field_update_index = -1; for (size_t i = 0; i < node_count; ++i) { - if (textfield_wrapper->GetUniqueId() == out_update2.nodes[i].id) + if (textfield_wrapper->GetUniqueId() == out_update2.nodes[i].id) { text_field_update_index = i; + } } ASSERT_NE(-1, text_field_update_index);
diff --git a/chrome/browser/ui/ash/accessibility/chrome_accessibility_delegate.cc b/chrome/browser/ui/ash/accessibility/chrome_accessibility_delegate.cc index c83156b..c976b3c 100644 --- a/chrome/browser/ui/ash/accessibility/chrome_accessibility_delegate.cc +++ b/chrome/browser/ui/ash/accessibility/chrome_accessibility_delegate.cc
@@ -32,13 +32,15 @@ } void ChromeAccessibilityDelegate::SaveScreenMagnifierScale(double scale) { - if (MagnificationManager::Get()) + if (MagnificationManager::Get()) { MagnificationManager::Get()->SaveScreenMagnifierScale(scale); + } } double ChromeAccessibilityDelegate::GetSavedScreenMagnifierScale() { - if (MagnificationManager::Get()) + if (MagnificationManager::Get()) { return MagnificationManager::Get()->GetSavedScreenMagnifierScale(); + } return std::numeric_limits<double>::min(); }
diff --git a/chrome/browser/ui/ash/app_access/app_access_notifier.cc b/chrome/browser/ui/ash/app_access/app_access_notifier.cc index cfa16a90..a0142e9 100644 --- a/chrome/browser/ui/ash/app_access/app_access_notifier.cc +++ b/chrome/browser/ui/ash/app_access/app_access_notifier.cc
@@ -56,8 +56,9 @@ name = base::UTF8ToUTF16(update.ShortName()); } }); - if (name.has_value()) + if (name.has_value()) { return name; + } } return std::nullopt; @@ -132,8 +133,9 @@ for (const auto& app_id : *app_id_list) { std::optional<std::u16string> app_name = MapAppIdToShortName( app_id, cap_cache, reg_cache, apps_accessing_sensor); - if (app_name.has_value()) + if (app_name.has_value()) { app_names.push_back(app_name.value()); + } } return app_names; } @@ -245,8 +247,9 @@ std::string app_id) { std::optional<std::u16string> name; auto* registry_cache = GetActiveUserAppRegistryCache(); - if (!registry_cache) + if (!registry_cache) { return name; + } registry_cache->ForEachApp([&app_id, &name](const apps::AppUpdate& update) { if (update.AppId() == app_id) { @@ -291,16 +294,18 @@ AccountId AppAccessNotifier::GetActiveUserAccountId() { auto* manager = user_manager::UserManager::Get(); const user_manager::User* active_user = manager->GetActiveUser(); - if (!active_user) + if (!active_user) { return EmptyAccountId(); + } return active_user->GetAccountId(); } void AppAccessNotifier::CheckActiveUserChanged() { AccountId id = GetActiveUserAccountId(); - if (id == EmptyAccountId() || id == active_user_account_id_) + if (id == EmptyAccountId() || id == active_user_account_id_) { return; + } if (active_user_account_id_ != EmptyAccountId()) { app_capability_access_cache_observation_.Reset();
diff --git a/chrome/browser/ui/ash/app_icon_color_cache/app_icon_color_cache.cc b/chrome/browser/ui/ash/app_icon_color_cache/app_icon_color_cache.cc index 735b8614..37adb75 100644 --- a/chrome/browser/ui/ash/app_icon_color_cache/app_icon_color_cache.cc +++ b/chrome/browser/ui/ash/app_icon_color_cache/app_icon_color_cache.cc
@@ -141,8 +141,9 @@ TRACE_EVENT0("ui", "app_icon_color_cache::{anonynous}::CalculateLightVibrantColor"); const SkBitmap* source = image.bitmap(); - if (!source || source->empty() || source->isNull()) + if (!source || source->empty() || source->isNull()) { return std::nullopt; + } std::vector<color_utils::ColorProfile> color_profiles; color_profiles.emplace_back(color_utils::LumaRange::LIGHT, @@ -155,8 +156,9 @@ // If the best swatch color is transparent, then // CalculateProminentColorsOfBitmap() failed to find a suitable color. - if (best_swatches.empty() || best_swatches[0].color == SK_ColorTRANSPARENT) + if (best_swatches.empty() || best_swatches[0].color == SK_ColorTRANSPARENT) { return std::nullopt; + } return best_swatches[0].color; }
diff --git a/chrome/browser/ui/ash/arc/arc_custom_tab_modal_dialog_host.cc b/chrome/browser/ui/ash/arc/arc_custom_tab_modal_dialog_host.cc index 733fbd2..786588b 100644 --- a/chrome/browser/ui/ash/arc/arc_custom_tab_modal_dialog_host.cc +++ b/chrome/browser/ui/ash/arc/arc_custom_tab_modal_dialog_host.cc
@@ -27,8 +27,9 @@ } ArcCustomTabModalDialogHost::~ArcCustomTabModalDialogHost() { - for (auto& observer : observer_list_) + for (auto& observer : observer_list_) { observer.OnHostDestroying(); + } // |web_contents_| is deleted by the base class, so there's no need to call // WebContentsModalDialogManager::SetDelegate(nullptr) @@ -36,8 +37,9 @@ void ArcCustomTabModalDialogHost::PrimaryMainFrameWasResized( bool width_changed) { - for (auto& observer : observer_list_) + for (auto& observer : observer_list_) { observer.OnPositionRequiresUpdate(); + } } web_modal::WebContentsModalDialogHost*
diff --git a/chrome/browser/ui/ash/arc/arc_open_url_delegate_impl.cc b/chrome/browser/ui/ash/arc/arc_open_url_delegate_impl.cc index f18735d..dc86c1d 100644 --- a/chrome/browser/ui/ash/arc/arc_open_url_delegate_impl.cc +++ b/chrome/browser/ui/ash/arc/arc_open_url_delegate_impl.cc
@@ -261,8 +261,9 @@ } void ArcOpenUrlDelegateImpl::OpenUrlFromArc(const GURL& url) { - if (!url.is_valid()) + if (!url.is_valid()) { return; + } GURL url_to_open = ConvertArcUrlToExternalFileUrlIfNeeded(url); ash::NewWindowDelegate::GetPrimary()->OpenUrl( @@ -278,14 +279,16 @@ // opened through here to be installed in the profile associated with ARC. // |user| may be null if sign-in hasn't happened yet const auto* user = user_manager::UserManager::Get()->GetPrimaryUser(); - if (!user) + if (!user) { return; + } // `profile` may be null if sign-in has happened but the profile isn't loaded // yet. Profile* profile = ash::ProfileHelper::Get()->GetProfileByUser(user); - if (!profile) + if (!profile) { return; + } std::optional<webapps::AppId> app_id = web_app::IsWebAppsCrosapiEnabled() @@ -323,27 +326,32 @@ } ArcAppListPrefs* prefs = ArcAppListPrefs::Get(profile); - if (!prefs) + if (!prefs) { return; + } std::optional<std::string> package_name = apk_web_app_service->GetPackageNameForWebApp(app_id.value()); - if (!package_name.has_value()) + if (!package_name.has_value()) { return; + } ChromeShelfController* chrome_shelf_controller = ChromeShelfController::instance(); - if (!chrome_shelf_controller) + if (!chrome_shelf_controller) { return; + } auto* arc_tracker = chrome_shelf_controller->app_service_app_window_controller() ->app_service_arc_tracker(); - if (!arc_tracker) + if (!arc_tracker) { return; + } - for (const auto& id : prefs->GetAppsForPackage(package_name.value())) + for (const auto& id : prefs->GetAppsForPackage(package_name.value())) { arc_tracker->CloseWindows(id); + } } void ArcOpenUrlDelegateImpl::OpenArcCustomTab( @@ -419,8 +427,9 @@ // |profile| may be null if sign-in has happened but the profile isn't loaded // yet. Profile* profile = ash::ProfileHelper::Get()->GetProfileByUser(user); - if (!profile) + if (!profile) { return; + } webapps::AppId app_id = web_app::GenerateAppId(/*manifest_id=*/std::nullopt, start_url); @@ -433,8 +442,9 @@ }); if (!app_installed) { - if (arc_intent->data) + if (arc_intent->data) { OpenUrlFromArc(*arc_intent->data); + } return; }
diff --git a/chrome/browser/ui/ash/arc/arc_open_url_delegate_impl_browsertest.cc b/chrome/browser/ui/ash/arc/arc_open_url_delegate_impl_browsertest.cc index a1cc514..9d444d6 100644 --- a/chrome/browser/ui/ash/arc/arc_open_url_delegate_impl_browsertest.cc +++ b/chrome/browser/ui/ash/arc/arc_open_url_delegate_impl_browsertest.cc
@@ -106,8 +106,9 @@ ui_test_utils::BrowserChangeObserver browser_opened( nullptr, ui_test_utils::BrowserChangeObserver::ChangeType::kAdded); ArcOpenUrlDelegateImpl::GetForTesting()->OpenChromePageFromArc(page); - if (expected_setting_window) + if (expected_setting_window) { browser_opened.Wait(); + } EXPECT_EQ(expected_setting_window ? 1ul : 0ul, GetNumberOfSettingsWindows());
diff --git a/chrome/browser/ui/ash/assistant/assistant_browser_delegate_impl.cc b/chrome/browser/ui/ash/assistant/assistant_browser_delegate_impl.cc index 2b596b7..d6773778 100644 --- a/chrome/browser/ui/ash/assistant/assistant_browser_delegate_impl.cc +++ b/chrome/browser/ui/ash/assistant/assistant_browser_delegate_impl.cc
@@ -64,8 +64,9 @@ AssistantBrowserDelegateImpl::~AssistantBrowserDelegateImpl() { session_manager::SessionManager::Get()->RemoveObserver(this); - if (identity_manager_) + if (identity_manager_) { identity_manager_->RemoveObserver(this); + } } void AssistantBrowserDelegateImpl::MaybeInit(Profile* profile) { @@ -82,8 +83,9 @@ } DCHECK_EQ(profile_, profile); - if (initialized_) + if (initialized_) { return; + } initialized_ = true; @@ -99,15 +101,17 @@ } void AssistantBrowserDelegateImpl::MaybeStartAssistantOptInFlow() { - if (!initialized_) + if (!initialized_) { return; + } assistant_setup_->MaybeStartAssistantOptInFlow(); } void AssistantBrowserDelegateImpl::OnAppTerminating() { - if (!initialized_) + if (!initialized_) { return; + } ash::assistant::AssistantService::Get()->Shutdown(); } @@ -243,8 +247,9 @@ void AssistantBrowserDelegateImpl::OnExtendedAccountInfoUpdated( const AccountInfo& info) { - if (initialized_) + if (initialized_) { return; + } MaybeInit(profile_); }
diff --git a/chrome/browser/ui/ash/assistant/assistant_browsertest.cc b/chrome/browser/ui/ash/assistant/assistant_browsertest.cc index e3f0097..431ecde 100644 --- a/chrome/browser/ui/ash/assistant/assistant_browsertest.cc +++ b/chrome/browser/ui/ash/assistant/assistant_browsertest.cc
@@ -41,11 +41,11 @@ // Ensures that |value_| is within the range {min_, max_}. If it isn't, this // will print a nice error message. -#define EXPECT_WITHIN_RANGE(min_, value_, max_) \ - ({ \ - EXPECT_TRUE(min_ <= value_ && value_ <= max_) \ - << "Expected " << value_ << " to be within the range " \ - << "{" << min_ << ", " << max_ << "}."; \ +#define EXPECT_WITHIN_RANGE(min_, value_, max_) \ + ({ \ + EXPECT_TRUE(min_ <= value_ && value_ <= max_) \ + << "Expected " << value_ << " to be within the range " << "{" << min_ \ + << ", " << max_ << "}."; \ }) } // namespace @@ -83,8 +83,9 @@ AssistantTestMixin* tester() { return &tester_; } void ShowAssistantUi() { - if (!tester()->IsVisible()) + if (!tester()->IsVisible()) { tester()->PressAssistantKey(); + } // Make sure that the app list bubble finished showing. AppListTestApi().WaitForBubbleWindow( @@ -92,8 +93,9 @@ } void CloseAssistantUi() { - if (tester()->IsVisible()) + if (tester()->IsVisible()) { tester()->PressAssistantKey(); + } } void InitializeBrightness() {
diff --git a/chrome/browser/ui/ash/assistant/assistant_setup.cc b/chrome/browser/ui/ash/assistant/assistant_setup.cc index afa9a36..04a8820 100644 --- a/chrome/browser/ui/ash/assistant/assistant_setup.cc +++ b/chrome/browser/ui/ash/assistant/assistant_setup.cc
@@ -94,8 +94,9 @@ void AssistantSetup::OnAssistantStatusChanged( ash::assistant::AssistantStatus status) { - if (status == ash::assistant::AssistantStatus::NOT_READY) + if (status == ash::assistant::AssistantStatus::NOT_READY) { return; + } SyncSettingsState(); } @@ -115,8 +116,9 @@ void AssistantSetup::OnGetSettingsResponse(const std::string& settings) { ash::assistant::SettingsUi settings_ui; - if (!settings_ui.ParseFromString(settings)) + if (!settings_ui.ParseFromString(settings)) { return; + } // Sync activity control status. if (!settings_ui.has_consent_flow_ui()) {
diff --git a/chrome/browser/ui/ash/assistant/assistant_state_client.cc b/chrome/browser/ui/ash/assistant/assistant_state_client.cc index 188aa39..abff270 100644 --- a/chrome/browser/ui/ash/assistant/assistant_state_client.cc +++ b/chrome/browser/ui/ash/assistant/assistant_state_client.cc
@@ -49,8 +49,9 @@ } void AssistantStateClient::ActiveUserChanged(user_manager::User* active_user) { - if (!active_user) + if (!active_user) { return; + } active_user->AddProfileCreatedObserver( base::BindOnce(&AssistantStateClient::SetProfileByUser, @@ -69,14 +70,16 @@ } void AssistantStateClient::SetProfile(Profile* profile) { - if (profile_ == profile) + if (profile_ == profile) { return; + } profile_ = profile; pref_change_registrar_.reset(); - if (!profile_) + if (!profile_) { return; + } PrefService* prefs = profile->GetPrefs(); pref_change_registrar_ = std::make_unique<PrefChangeRegistrar>();
diff --git a/chrome/browser/ui/ash/assistant/assistant_test_mixin.cc b/chrome/browser/ui/ash/assistant/assistant_test_mixin.cc index f861649..b204839 100644 --- a/chrome/browser/ui/ash/assistant/assistant_test_mixin.cc +++ b/chrome/browser/ui/ash/assistant/assistant_test_mixin.cc
@@ -61,8 +61,9 @@ ~AssistantStatusWaiter() override { state_->RemoveObserver(this); } void RunUntilExpectedStatus() { - if (state_->assistant_status() == expected_status_) + if (state_->assistant_status() == expected_status_) { return; + } // Wait until we're ready or we hit the timeout. base::RunLoop run_loop; @@ -76,8 +77,9 @@ private: void OnAssistantStatusChanged(AssistantStatus status) override { - if (status == expected_status_ && quit_loop_) + if (status == expected_status_ && quit_loop_) { std::move(quit_loop_).Run(); + } } const raw_ptr<AssistantState> state_; @@ -101,13 +103,15 @@ } ~ResponseWaiter() override { - if (parent_view_) + if (parent_view_) { parent_view_->RemoveObserver(this); + } } void RunUntilResponseReceived() { - if (HasResponse()) + if (HasResponse()) { return; + } // Wait until we're ready or we hit the timeout. base::RunLoop run_loop; @@ -127,8 +131,9 @@ void OnViewHierarchyChanged( views::View* observed_view, const views::ViewHierarchyChangedDetails& details) override { - if (quit_loop_ && HasResponse()) + if (quit_loop_ && HasResponse()) { std::move(quit_loop_).Run(); + } } void OnViewIsDeleting(views::View* observed_view) override { @@ -156,8 +161,9 @@ return response_maybe.value() + "\n"; } else { std::stringstream result; - for (views::View* child : view->children()) + for (views::View* child : view->children()) { result << GetResponseTextRecursive(child); + } return result.str(); } } @@ -183,8 +189,9 @@ bool HasResponse() const override { std::string response = GetResponseText(); for (const std::string& expected : expected_responses_) { - if (response.find(expected) != std::string::npos) + if (response.find(expected) != std::string::npos) { return true; + } } return false; } @@ -199,8 +206,9 @@ std::string FormatExpectedResponses() const { std::stringstream result; result << "{\n"; - for (const std::string& expected : expected_responses_) + for (const std::string& expected : expected_responses_) { result << " \"" << expected << "\",\n"; + } result << "}"; return result.str(); } @@ -249,8 +257,9 @@ // ExpectedResponseWaiter overrides: std::optional<std::string> GetResponseTextOfView( views::View* view) const override { - if (view->GetClassName() == class_name_) + if (view->GetClassName() == class_name_) { return static_cast<AssistantUiElementView*>(view)->ToStringForTesting(); + } return std::nullopt; } @@ -269,8 +278,9 @@ } ~CallbackViewHierarchyChangedObserver() override { - if (parent_view_) + if (parent_view_) { parent_view_->RemoveObserver(this); + } } // ViewObserver: @@ -283,8 +293,9 @@ void OnViewIsDeleting(views::View* view) override { DCHECK_EQ(view, parent_view_); - if (parent_view_) + if (parent_view_) { parent_view_->RemoveObserver(this); + } parent_view_ = nullptr; } @@ -504,8 +515,9 @@ // We expect the textual representation of a timers response to be of the form // "<timer1 remaining time in seconds>\n<timer2 remaining time in seconds>..." std::stringstream expected_response; - for (const auto& timer : timers) + for (const auto& timer : timers) { expected_response << timer.InSeconds() << "\n"; + } const base::test::ScopedRunLoopTimeout run_timeout(FROM_HERE, wait_timeout); TypedExpectedResponseWaiter waiter("AssistantTimersElementView",
diff --git a/chrome/browser/ui/ash/assistant/assistant_timers_browsertest.cc b/chrome/browser/ui/ash/assistant/assistant_timers_browsertest.cc index f841beb77..0359f05 100644 --- a/chrome/browser/ui/ash/assistant/assistant_timers_browsertest.cc +++ b/chrome/browser/ui/ash/assistant/assistant_timers_browsertest.cc
@@ -140,8 +140,9 @@ std::vector<views::Label*> labels; FindDescendentsOfClass(FindViewForNotification(notification), &labels); for (auto* label : labels) { - if (label->GetText() == notification->title()) + if (label->GetText() == notification->title()) { return label; + } } return nullptr; } @@ -206,8 +207,9 @@ ~DISABLED_AssistantTimersBrowserTest() override = default; void ShowAssistantUi() { - if (!tester()->IsVisible()) + if (!tester()->IsVisible()) { tester()->PressAssistantKey(); + } AppListTestApi().WaitForBubbleWindow( /*wait_for_opening_animation=*/true); }
diff --git a/chrome/browser/ui/ash/assistant/device_actions.cc b/chrome/browser/ui/ash/assistant/device_actions.cc index bd4ffb32..28abc06 100644 --- a/chrome/browser/ui/ash/assistant/device_actions.cc +++ b/chrome/browser/ui/ash/assistant/device_actions.cc
@@ -85,13 +85,15 @@ } for (const auto& app_id : prefs->GetAppIds()) { std::unique_ptr<ArcAppListPrefs::AppInfo> app_info = prefs->GetApp(app_id); - if (!app_info) + if (!app_info) { continue; + } AndroidAppInfo android_app_info; android_app_info.package_name = app_info->package_name; auto package = prefs->GetPackage(app_info->package_name); - if (package) + if (package) { android_app_info.version = package->package_version; + } android_app_info.localized_app_name = app_info->name; android_app_info.intent = app_info->intent_uri; android_apps_info.push_back(std::move(android_app_info)); @@ -102,8 +104,9 @@ void NotifyAndroidAppListRefreshed( base::ObserverList<ash::assistant::AppListEventSubscriber>* subscribers) { std::vector<AndroidAppInfo> android_apps_info = GetAppsInfo(); - for (auto& subscriber : *subscribers) + for (auto& subscriber : *subscribers) { subscriber.OnAndroidAppListRefreshed(android_apps_info); + } } } // namespace @@ -176,8 +179,9 @@ bool DeviceActions::OpenAndroidApp(const AndroidAppInfo& app_info) { auto status = delegate_->GetAndroidAppStatus(app_info.package_name); - if (status != AppStatus::kAvailable) + if (status != AppStatus::kAvailable) { return false; + } auto* app = ARC_GET_INSTANCE_FOR_METHOD( arc::ArcServiceManager::Get()->arc_bridge_service()->app(), @@ -223,8 +227,9 @@ app_list_subscribers_.AddObserver(subscriber); - if (prefs && !scoped_prefs_observations_.IsObservingSource(prefs)) + if (prefs && !scoped_prefs_observations_.IsObservingSource(prefs)) { scoped_prefs_observations_.AddObservation(prefs); + } } void DeviceActions::RemoveAppListEventSubscriber( @@ -235,8 +240,9 @@ std::optional<std::string> DeviceActions::GetAndroidAppLaunchIntent( const AndroidAppInfo& app_info) { auto status = delegate_->GetAndroidAppStatus(app_info.package_name); - if (status != AppStatus::kAvailable) + if (status != AppStatus::kAvailable) { return std::nullopt; + } return GetLaunchIntent(std::move(app_info)); }
diff --git a/chrome/browser/ui/ash/assistant/device_actions_unittest.cc b/chrome/browser/ui/ash/assistant/device_actions_unittest.cc index 6fe6eeb..211c96a 100644 --- a/chrome/browser/ui/ash/assistant/device_actions_unittest.cc +++ b/chrome/browser/ui/ash/assistant/device_actions_unittest.cc
@@ -77,8 +77,7 @@ ASSERT_EQ(GetAppStatus(kUnregisteredAppName), AppStatus::kUnavailable); } -TEST_F(DeviceActionsTest, UnknownAppShouldBeUnknown) { -} +TEST_F(DeviceActionsTest, UnknownAppShouldBeUnknown) {} TEST_F(DeviceActionsTest, MultipleAppsShouldBeVerifiedCorrectly) { ASSERT_EQ(GetAppStatus(kRegisteredAppName), AppStatus::kAvailable);
diff --git a/chrome/browser/ui/ash/assistant/search_and_assistant_enabled_checker.cc b/chrome/browser/ui/ash/assistant/search_and_assistant_enabled_checker.cc index 30bef54..319b1c19 100644 --- a/chrome/browser/ui/ash/assistant/search_and_assistant_enabled_checker.cc +++ b/chrome/browser/ui/ash/assistant/search_and_assistant_enabled_checker.cc
@@ -77,11 +77,10 @@ void SearchAndAssistantEnabledChecker::SyncSearchAndAssistantState() { auto resource_request = std::make_unique<network::ResourceRequest>(); - resource_request->url = - net::AppendOrReplaceQueryParameter( - GURL(chromeos::assistant::kServiceIdEndpoint), - chromeos::assistant::kPayloadParamName, - chromeos::assistant::kServiceIdRequestPayload); + resource_request->url = net::AppendOrReplaceQueryParameter( + GURL(chromeos::assistant::kServiceIdEndpoint), + chromeos::assistant::kPayloadParamName, + chromeos::assistant::kServiceIdRequestPayload); url_loader_ = network::SimpleURLLoader::Create( std::move(resource_request), kSearchAndAssistantEnabledCheckerNetworkTag); url_loader_->DownloadToString(
diff --git a/chrome/browser/ui/ash/assistant/test_support/fake_s3_server.cc b/chrome/browser/ui/ash/assistant/test_support/fake_s3_server.cc index e87f5759..9dda67d5 100644 --- a/chrome/browser/ui/ash/assistant/test_support/fake_s3_server.cc +++ b/chrome/browser/ui/ash/assistant/test_support/fake_s3_server.cc
@@ -122,8 +122,9 @@ for (int offset = 0; offset + 1 < kMaxAttempts; offset += 2) { port_ = kStartPort + offset; lock_file_ = base::File(GetLockFilePath(), GetFileFlags()); - if (lock_file_.IsValid()) + if (lock_file_.IsValid()) { return; + } } NOTREACHED() << "Failed to find an available port."; }
diff --git a/chrome/browser/ui/ash/assistant/test_support/test_util.h b/chrome/browser/ui/ash/assistant/test_support/test_util.h index 31097c7..711721c6 100644 --- a/chrome/browser/ui/ash/assistant/test_support/test_util.h +++ b/chrome/browser/ui/ash/assistant/test_support/test_util.h
@@ -22,8 +22,9 @@ const std::string& class_name, std::vector<T*>* result) { for (views::View* child : parent->children()) { - if (child->GetClassName() == class_name) + if (child->GetClassName() == class_name) { result->push_back(static_cast<T*>(child)); + } FindDescendentsOfClass(child, class_name, result); } }
diff --git a/chrome/browser/ui/ash/back_gesture/back_gesture_browsertest.cc b/chrome/browser/ui/ash/back_gesture/back_gesture_browsertest.cc index b171639..3253312 100644 --- a/chrome/browser/ui/ash/back_gesture/back_gesture_browsertest.cc +++ b/chrome/browser/ui/ash/back_gesture/back_gesture_browsertest.cc
@@ -63,8 +63,9 @@ void Reset() { received_event_types_.clear(); wait_for_event_ = ui::EventType::kUnknown; - if (run_loop_) + if (run_loop_) { run_loop_->Quit(); + } } private:
diff --git a/chrome/browser/ui/ash/back_gesture/back_gesture_contextual_nudge_delegate.cc b/chrome/browser/ui/ash/back_gesture/back_gesture_contextual_nudge_delegate.cc index feb72e3..53b79af1 100644 --- a/chrome/browser/ui/ash/back_gesture/back_gesture_contextual_nudge_delegate.cc +++ b/chrome/browser/ui/ash/back_gesture/back_gesture_contextual_nudge_delegate.cc
@@ -22,16 +22,18 @@ void BackGestureContextualNudgeDelegate::MaybeStartTrackingNavigation( aura::Window* window) { - if (window == window_) + if (window == window_) { return; + } // Stop tracking the previous window before tracking a new window. StopTrackingNavigation(); BrowserView* browser_view = BrowserView::GetBrowserViewForNativeWindow(window); - if (!browser_view) + if (!browser_view) { return; + } window_ = window; window_->AddObserver(this);
diff --git a/chrome/browser/ui/ash/birch/birch_release_notes_provider.h b/chrome/browser/ui/ash/birch/birch_release_notes_provider.h index 5bc94ad..d0838c4 100644 --- a/chrome/browser/ui/ash/birch/birch_release_notes_provider.h +++ b/chrome/browser/ui/ash/birch/birch_release_notes_provider.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_ASH_BIRCH_BIRCH_RELEASE_NOTES_PROVIDER_H_ #include <optional> + #include "ash/birch/birch_data_provider.h" #include "base/logging.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ui/ash/capture_mode/capture_mode_browsertest.cc b/chrome/browser/ui/ash/capture_mode/capture_mode_browsertest.cc index b0a3239..052e0a3 100644 --- a/chrome/browser/ui/ash/capture_mode/capture_mode_browsertest.cc +++ b/chrome/browser/ui/ash/capture_mode/capture_mode_browsertest.cc
@@ -111,8 +111,9 @@ // aura::WindowObserver: void OnWindowAdded(aura::Window* new_window) override { - if (on_window_added_callback_) + if (on_window_added_callback_) { std::move(on_window_added_callback_).Run(); + } } private:
diff --git a/chrome/browser/ui/ash/capture_mode/chrome_capture_mode_delegate.cc b/chrome/browser/ui/ash/capture_mode/chrome_capture_mode_delegate.cc index 4bbd9f6f..22682f9 100644 --- a/chrome/browser/ui/ash/capture_mode/chrome_capture_mode_delegate.cc +++ b/chrome/browser/ui/ash/capture_mode/chrome_capture_mode_delegate.cc
@@ -145,8 +145,9 @@ void ChromeCaptureModeDelegate::SetIsScreenCaptureLocked(bool locked) { is_screen_capture_locked_ = locked; - if (is_screen_capture_locked_) + if (is_screen_capture_locked_) { InterruptVideoRecordingIfAny(); + } } bool ChromeCaptureModeDelegate::InterruptVideoRecordingIfAny() { @@ -195,8 +196,9 @@ void ChromeCaptureModeDelegate::OpenScreenshotInImageEditor( const base::FilePath& file_path) { Profile* profile = ProfileManager::GetActiveUserProfile(); - if (!profile) + if (!profile) { return; + } ash::SystemAppLaunchParams params; params.launch_paths = {file_path}; @@ -208,8 +210,9 @@ Profile* profile = ProfileManager::GetActiveUserProfile(); // TODO(afakhry): Consider moving |prefs::kUse24HourClock| to ash/public so // we can do this entirely in ash. - if (profile) + if (profile) { return profile->GetPrefs()->GetBoolean(prefs::kUse24HourClock); + } return base::GetHourClockType() == base::k24HourClock; } @@ -285,14 +288,16 @@ bool ChromeCaptureModeDelegate::GetDriveFsMountPointPath( base::FilePath* result) const { - if (!ash::LoginState::Get()->IsUserLoggedIn()) + if (!ash::LoginState::Get()->IsUserLoggedIn()) { return false; + } drive::DriveIntegrationService* integration_service = drive::DriveIntegrationServiceFactory::FindForProfile( ProfileManager::GetActiveUserProfile()); - if (!integration_service || !integration_service->IsMounted()) + if (!integration_service || !integration_service->IsMounted()) { return false; + } *result = integration_service->GetMountPointPath(); return true;
diff --git a/chrome/browser/ui/ash/capture_mode/recording_service_browsertest.cc b/chrome/browser/ui/ash/capture_mode/recording_service_browsertest.cc index c3de6ad..ce608b8 100644 --- a/chrome/browser/ui/ash/capture_mode/recording_service_browsertest.cc +++ b/chrome/browser/ui/ash/capture_mode/recording_service_browsertest.cc
@@ -191,8 +191,9 @@ std::string file_content; EXPECT_TRUE(base::ReadFileToString(path, &file_content)); - if (allow_empty && file_content.empty()) + if (allow_empty && file_content.empty()) { return; + } EXPECT_FALSE(file_content.empty()); EXPECT_TRUE(WebmVerifier().Verify(file_content));
diff --git a/chrome/browser/ui/ash/cast_config/cast_config_controller_media_router.cc b/chrome/browser/ui/ash/cast_config/cast_config_controller_media_router.cc index 74c04103..8234777 100644 --- a/chrome/browser/ui/ash/cast_config/cast_config_controller_media_router.cc +++ b/chrome/browser/ui/ash/cast_config/cast_config_controller_media_router.cc
@@ -36,12 +36,14 @@ std::optional<media_router::MediaRouter*> g_media_router_for_test; Profile* GetProfile() { - if (!user_manager::UserManager::IsInitialized()) + if (!user_manager::UserManager::IsInitialized()) { return nullptr; + } auto* user = user_manager::UserManager::Get()->GetPrimaryUser(); - if (!user) + if (!user) { return nullptr; + } return ash::ProfileHelper::Get()->GetProfileByUser(user); } @@ -54,8 +56,9 @@ } Profile* profile = GetProfile(); - if (!profile || !media_router::MediaRouterEnabled(profile)) + if (!profile || !media_router::MediaRouterEnabled(profile)) { return nullptr; + } auto* router = media_router::MediaRouterFactory::GetApiForBrowserContext(profile); @@ -126,8 +129,9 @@ // The media router adds a MediaSink instance that doesn't have a name. Make // sure to filter that sink out from the UI so it is not rendered, as it // will be a line that only has a icon with no apparent meaning. - if (sink.name().empty()) + if (sink.name().empty()) { continue; + } sinks_.push_back(sink); } @@ -218,8 +222,9 @@ bool CastConfigControllerMediaRouter::HasActiveRoute() const { for (const auto& device : devices_) { - if (device.route.is_local_source && !device.route.title.empty()) + if (device.route.is_local_source && !device.route.title.empty()) { return true; + } } return false; @@ -232,8 +237,9 @@ void CastConfigControllerMediaRouter::RequestDeviceRefresh() { // The media router component isn't ready yet. - if (!device_cache()) + if (!device_cache()) { return; + } // Build the old-style SinkAndRoute set out of the MediaRouter // source/sink/route setup. We first map the existing sinks, and then we @@ -378,8 +384,9 @@ } } - for (auto& observer : observers_) + for (auto& observer : observers_) { observer.OnDevicesUpdated(devices_); + } } #if !defined(OFFICIAL_BUILD)
diff --git a/chrome/browser/ui/ash/clipboard/clipboard_history_browsertest.cc b/chrome/browser/ui/ash/clipboard/clipboard_history_browsertest.cc index 0cb55f68..8d94e2a 100644 --- a/chrome/browser/ui/ash/clipboard/clipboard_history_browsertest.cc +++ b/chrome/browser/ui/ash/clipboard/clipboard_history_browsertest.cc
@@ -99,8 +99,9 @@ void WaitFor(const ui::ClipboardData* clipboard_data) { base::AutoReset scoped_data(&clipboard_data_, clipboard_data); - if (BufferMatchesClipboardData()) + if (BufferMatchesClipboardData()) { return; + } base::ScopedObservation<ui::ClipboardMonitor, ui::ClipboardObserver> clipboard_observer_{this}; @@ -113,8 +114,9 @@ private: // ui::ClipboardObserver: void OnClipboardDataChanged() override { - if (BufferMatchesClipboardData()) + if (BufferMatchesClipboardData()) { run_loop_->Quit(); + } } bool BufferMatchesClipboardData() const { @@ -122,8 +124,9 @@ ui::DataTransferEndpoint data_dst(ui::EndpointType::kClipboardHistory); const auto* clipboard_data = clipboard->GetClipboardData(&data_dst); - if ((clipboard_data == nullptr) != (clipboard_data_ == nullptr)) + if ((clipboard_data == nullptr) != (clipboard_data_ == nullptr)) { return false; + } return clipboard_data == nullptr || *clipboard_data == *clipboard_data_; } @@ -173,14 +176,16 @@ bool VerifyClipboardTextData(const std::initializer_list<std::string>& texts) { const std::list<ash::ClipboardHistoryItem>& items = GetClipboardItems(); - if (items.size() != texts.size()) + if (items.size() != texts.size()) { return false; + } auto items_iter = items.cbegin(); const auto* texts_iter = texts.begin(); while (items_iter != items.cend() && texts_iter != texts.end()) { - if (items_iter->data().text() != *texts_iter) + if (items_iter->data().text() != *texts_iter) { return false; + } ++items_iter; ++texts_iter; } @@ -192,8 +197,9 @@ // If clipboard history is empty, returns whether the clipboard buffer is empty. bool VerifyClipboardBufferAndHistoryInSync() { auto* clipboard = ui::ClipboardNonBacked::GetForCurrentThread(); - if (!clipboard) + if (!clipboard) { return false; + } ui::DataTransferEndpoint data_dst(ui::EndpointType::kClipboardHistory); const auto* const clipboard_data = clipboard->GetClipboardData(&data_dst); @@ -278,8 +284,9 @@ void ShowContextMenuViaAccelerator(bool wait_for_selection) { PressAndRelease(ui::KeyboardCode::VKEY_V, ui::EF_COMMAND_DOWN); - if (!wait_for_selection) + if (!wait_for_selection) { return; + } base::RunLoop run_loop; GetClipboardHistoryController()
diff --git a/chrome/browser/ui/ash/clipboard/clipboard_history_url_title_fetcher_impl.h b/chrome/browser/ui/ash/clipboard/clipboard_history_url_title_fetcher_impl.h index f15583def..30fb5ca 100644 --- a/chrome/browser/ui/ash/clipboard/clipboard_history_url_title_fetcher_impl.h +++ b/chrome/browser/ui/ash/clipboard/clipboard_history_url_title_fetcher_impl.h
@@ -6,7 +6,6 @@ #define CHROME_BROWSER_UI_ASH_CLIPBOARD_CLIPBOARD_HISTORY_URL_TITLE_FETCHER_IMPL_H_ #include "ash/clipboard/clipboard_history_url_title_fetcher.h" - #include "base/task/cancelable_task_tracker.h" class GURL;
diff --git a/chrome/browser/ui/ash/clipboard/clipboard_image_model_factory_impl.cc b/chrome/browser/ui/ash/clipboard/clipboard_image_model_factory_impl.cc index e1ae475..969cf65f 100644 --- a/chrome/browser/ui/ash/clipboard/clipboard_image_model_factory_impl.cc +++ b/chrome/browser/ui/ash/clipboard/clipboard_image_model_factory_impl.cc
@@ -68,8 +68,9 @@ auto iter = base::ranges::find(pending_list_, id, &ClipboardImageModelRequest::Params::id); - if (iter == pending_list_.end()) + if (iter == pending_list_.end()) { return; + } pending_list_.erase(iter); } @@ -84,11 +85,13 @@ // Rendering will not stop if |active_until_empty_| has been set true by a // call to `RenderCurrentPendingRequests()`. - if (active_until_empty_) + if (active_until_empty_) { return; + } - if ((!request_ || !request_->IsModifyingClipboard())) + if ((!request_ || !request_->IsModifyingClipboard())) { return; + } // Stop the currently running request if it is modifying the clipboard. // ClipboardImageModelFactory is `Deactivate()`-ed prior to the user pasting @@ -109,8 +112,9 @@ } void ClipboardImageModelFactoryImpl::StartNextRequest() { - if (pending_list_.empty()) + if (pending_list_.empty()) { active_until_empty_ = false; + } if (pending_list_.empty() || (!active_ && !active_until_empty_) || (request_ && request_->IsRunningRequest())) { @@ -134,8 +138,9 @@ } void ClipboardImageModelFactoryImpl::OnRequestIdle() { - if (!request_) + if (!request_) { return; + } DCHECK(!request_->IsRunningRequest()) << "Running requests should timeout or complete before being cleaned up.";
diff --git a/chrome/browser/ui/ash/clipboard/clipboard_image_model_request.cc b/chrome/browser/ui/ash/clipboard/clipboard_image_model_request.cc index 0b9b039..168144f 100644 --- a/chrome/browser/ui/ash/clipboard/clipboard_image_model_request.cc +++ b/chrome/browser/ui/ash/clipboard/clipboard_image_model_request.cc
@@ -79,8 +79,9 @@ const auto* current_data = clipboard->GetClipboardData(&data_dst); // No need to replace the clipboard contents if the markup is the same. - if (current_data && (html_markup == current_data->markup_data())) + if (current_data && (html_markup == current_data->markup_data())) { return; + } // Put |html_markup| on the clipboard temporarily so it can be pasted into // the WebContents. This is preferable to directly loading |html_markup_| in a @@ -98,8 +99,9 @@ ClipboardImageModelRequest::ScopedClipboardModifier:: ~ScopedClipboardModifier() { - if (!replaced_clipboard_data_) + if (!replaced_clipboard_data_) { return; + } ui::ClipboardNonBacked::GetForCurrentThread()->WriteClipboardData( std::move(replaced_clipboard_data_)); @@ -189,8 +191,9 @@ on_request_finished_callback_.Run(); - if (g_test_params && g_test_params->callback) + if (g_test_params && g_test_params->callback) { g_test_params->callback.Run(ShouldEnableAutoResizeMode()); + } } ClipboardImageModelRequest::Params @@ -220,15 +223,17 @@ // `ResizeDueToAutoResize()` can be called before and/or after // DidStopLoading(). If `DidStopLoading()` has not been called, wait for the // next resize before copying the surface. - if (!web_contents->IsLoading()) + if (!web_contents->IsLoading()) { PostCopySurfaceTask(); + } } void ClipboardImageModelRequest::DidStopLoading() { // `DidStopLoading()` can be called multiple times after a paste. We are only // interested in the initial load of the data URL. - if (did_stop_loading_) + if (did_stop_loading_) { return; + } did_stop_loading_ = true; @@ -274,16 +279,18 @@ } void ClipboardImageModelRequest::OnVisualStateChangeFinished(bool done) { - if (!done) + if (!done) { return; + } scoped_clipboard_modifier_.reset(); PostCopySurfaceTask(); } void ClipboardImageModelRequest::PostCopySurfaceTask() { - if (!deliver_image_model_callback_) + if (!deliver_image_model_callback_) { return; + } // Debounce calls to `CopySurface()`. `DidStopLoading()` and // `ResizeDueToAutoResize()` can be called multiple times in the same task @@ -335,12 +342,14 @@ bool ClipboardImageModelRequest::ShouldEnableAutoResizeMode() const { // Prefer to use the auto resize mode specified by `g_test_params` if any. - if (g_test_params && g_test_params->enforce_auto_resize) + if (g_test_params && g_test_params->enforce_auto_resize) { return *g_test_params->enforce_auto_resize; + } // Use auto resize mode if `bounding_box_size_` is not meaningful. - if (bounding_box_size_.IsEmpty()) + if (bounding_box_size_.IsEmpty()) { return true; + } // Use auto resize mode if the copied web content is too big to render. return !gfx::Rect(kMaxWebContentsSize)
diff --git a/chrome/browser/ui/ash/clipboard/clipboard_util.cc b/chrome/browser/ui/ash/clipboard/clipboard_util.cc index 5ff436bc..d4bee1c 100644 --- a/chrome/browser/ui/ash/clipboard/clipboard_util.cc +++ b/chrome/browser/ui/ash/clipboard/clipboard_util.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/ui/ash/clipboard/clipboard_util.h" #include <stdint.h> + #include <memory> #include <vector>
diff --git a/chrome/browser/ui/ash/desks/desks_client.cc b/chrome/browser/ui/ash/desks/desks_client.cc index 8f41d59..5a41f0f 100644 --- a/chrome/browser/ui/ash/desks/desks_client.cc +++ b/chrome/browser/ui/ash/desks/desks_client.cc
@@ -93,8 +93,9 @@ desk_template->desk_restore_data(); for (const auto& app : desk_restore_data->app_id_to_launch_list()) { - for (const auto& window : app.second) + for (const auto& window : app.second) { window_ids.insert(window.first); + } } return window_ids; @@ -291,8 +292,9 @@ void DesksClient::OnActiveUserSessionChanged(const AccountId& account_id) { Profile* profile = ash::ProfileHelper::Get()->GetProfileByAccountId(account_id); - if (profile == active_profile_ || !IsSupportedProfile(profile)) + if (profile == active_profile_ || !IsSupportedProfile(profile)) { return; + } active_profile_ = profile; DCHECK(active_profile_); @@ -476,8 +478,9 @@ return base::unexpected(DeskActionError::kUnknownError); } std::vector<const ash::Desk*> desks; - for (const auto& desk : desks_controller_->desks()) + for (const auto& desk : desks_controller_->desks()) { desks.push_back(desk.get()); + } return std::move(desks); } @@ -491,10 +494,12 @@ app_restore::RestoreData* restore_data = desk_template->mutable_desk_restore_data(); - if (!restore_data) + if (!restore_data) { return; - if (restore_data->app_id_to_launch_list().empty()) + } + if (restore_data->app_id_to_launch_list().empty()) { return; + } // Make window IDs of the template unique. This is a requirement for launching // templates concurrently since the contained window IDs are used as lookup @@ -554,37 +559,43 @@ std::unique_ptr<std::string> data) { Profile* profile = ash::ProfileHelper::Get()->GetProfileByAccountId(account_id); - if (!data || !IsSupportedProfile(profile)) + if (!data || !IsSupportedProfile(profile)) { return; + } std::string& in_map_data = preconfigured_desk_templates_json_[account_id]; - if (in_map_data == *data) + if (in_map_data == *data) { return; + } in_map_data = *data; - if (profile && profile == active_profile_) + if (profile && profile == active_profile_) { GetDeskModel()->SetPolicyDeskTemplates(*data); + } } void DesksClient::RemovePolicyPreconfiguredTemplate( const AccountId& account_id) { Profile* profile = ash::ProfileHelper::Get()->GetProfileByAccountId(account_id); - if (!IsSupportedProfile(profile)) + if (!IsSupportedProfile(profile)) { return; + } DCHECK(profile); preconfigured_desk_templates_json_.erase(account_id); - if (profile == active_profile_) + if (profile == active_profile_) { GetDeskModel()->RemovePolicyDeskTemplates(); + } } void DesksClient::NotifyMovedSingleInstanceApp(int32_t window_id) { - for (auto& id_to_tracker : template_ids_to_launch_performance_trackers_) + for (auto& id_to_tracker : template_ids_to_launch_performance_trackers_) { id_to_tracker.second->OnMovedSingleInstanceApp(window_id); + } } std::optional<DesksClient::DeskActionError> @@ -723,9 +734,10 @@ // If this is the only desk, we have to create a new desk before we can // remove the current one. - if (!desks_controller_->CanRemoveDesks()) + if (!desks_controller_->CanRemoveDesks()) { desks_controller_->NewDesk( ash::DesksCreationRemovalSource::kEnsureDefaultDesk); + } // Remove the current desk, this will be done without animation. desks_controller_->RemoveDesk( @@ -799,8 +811,9 @@ aura::Window* DesksClient::GetWindowByBrowserSessionId( SessionID browser_session_id) { for (Browser* browser : *BrowserList::GetInstance()) { - if (browser->session_id() == browser_session_id) + if (browser->session_id() == browser_session_id) { return browser->window()->GetNativeWindow(); + } } return nullptr; }
diff --git a/chrome/browser/ui/ash/desks/desks_templates_app_launch_handler.cc b/chrome/browser/ui/ash/desks/desks_templates_app_launch_handler.cc index 398bc90..0b96d57 100644 --- a/chrome/browser/ui/ash/desks/desks_templates_app_launch_handler.cc +++ b/chrome/browser/ui/ash/desks/desks_templates_app_launch_handler.cc
@@ -50,8 +50,9 @@ const std::string& app_id) { const bool app_type_browser = app_restore_data->browser_extra_info.app_type_browser.value_or(false); - if (!app_type_browser) + if (!app_type_browser) { return std::string(); + } const std::optional<std::string>& maybe_app_name = app_restore_data->browser_extra_info.app_name; @@ -182,8 +183,9 @@ // Do not try sending an existing window to the active desk and launch a new // instance. - if (is_multi_instance_window) + if (is_multi_instance_window) { return true; + } const bool should_launch = ash::DesksController::Get()->OnSingleInstanceAppLaunchingFromSavedDesk( @@ -191,8 +193,9 @@ // Notify performance tracker that some tracked windows will be moving. if (!should_launch) { - for (const auto& window : launch_list) + for (const auto& window : launch_list) { NotifyMovedSingleInstanceApp(window.first); + } } return should_launch; @@ -254,8 +257,9 @@ chromeos::ToWindowShowState(*window_state_type); } - if (!current_bounds.IsEmpty()) + if (!current_bounds.IsEmpty()) { create_params.initial_bounds = current_bounds; + } if (type_ == Type::kCoral) { create_params.should_trigger_session_restore = false; @@ -338,8 +342,9 @@ auto* arc_task_handler = ash::app_restore::AppRestoreArcTaskHandlerFactory::GetForProfile( profile()); - if (!arc_task_handler) + if (!arc_task_handler) { return; + } if (auto* launch_handler = arc_task_handler->GetDeskTemplateArcAppQueueRestoreHandler(
diff --git a/chrome/browser/ui/ash/device_scheduled_reboot/reboot_notification_controller.cc b/chrome/browser/ui/ash/device_scheduled_reboot/reboot_notification_controller.cc index 53646f2..d006168f 100644 --- a/chrome/browser/ui/ash/device_scheduled_reboot/reboot_notification_controller.cc +++ b/chrome/browser/ui/ash/device_scheduled_reboot/reboot_notification_controller.cc
@@ -41,8 +41,9 @@ void RebootNotificationController::MaybeShowPendingRebootNotification( const base::Time& reboot_time, base::RepeatingClosure reboot_callback) { - if (!ShouldNotifyUser()) + if (!ShouldNotifyUser()) { return; + } notification_callback_ = std::move(reboot_callback); std::u16string reboot_title = l10n_util::GetStringUTF16(IDS_POLICY_DEVICE_SCHEDULED_REBOOT_TITLE); @@ -68,8 +69,9 @@ void RebootNotificationController::MaybeShowPendingRebootDialog( const base::Time& reboot_time, base::OnceClosure reboot_callback) { - if (!ShouldNotifyUser()) + if (!ShouldNotifyUser()) { return; + } gfx::NativeView parent = ash::Shell::GetContainer(ash::Shell::GetRootWindowForNewWindows(), @@ -81,8 +83,9 @@ } void RebootNotificationController::MaybeShowPostRebootNotification() const { - if (!ShouldNotifyUser()) + if (!ShouldNotifyUser()) { return; + } std::u16string title = l10n_util::GetStringUTF16(IDS_POLICY_DEVICE_POST_REBOOT_TITLE); scoped_refptr<message_center::NotificationDelegate> delegate = @@ -95,8 +98,9 @@ } void RebootNotificationController::CloseRebootNotification() const { - if (!ShouldNotifyUser()) + if (!ShouldNotifyUser()) { return; + } NotificationDisplayService* notification_display_service = NotificationDisplayServiceFactory::GetForProfile( ProfileManager::GetActiveUserProfile()); @@ -144,7 +148,8 @@ std::optional<int> button_index) const { // Only request restart when the button is clicked, i.e. ignore the clicks // on the body of the notification. - if (!button_index) + if (!button_index) { return; + } notification_callback_.Run(); }
diff --git a/chrome/browser/ui/ash/device_scheduled_reboot/scheduled_reboot_dialog.cc b/chrome/browser/ui/ash/device_scheduled_reboot/scheduled_reboot_dialog.cc index 76f168c1..b88072b 100644 --- a/chrome/browser/ui/ash/device_scheduled_reboot/scheduled_reboot_dialog.cc +++ b/chrome/browser/ui/ash/device_scheduled_reboot/scheduled_reboot_dialog.cc
@@ -30,8 +30,9 @@ ScheduledRebootDialog::~ScheduledRebootDialog() { if (dialog_delegate_) { views::Widget* widget = dialog_delegate_->GetWidget(); - if (widget->HasObserver(this)) + if (widget->HasObserver(this)) { widget->RemoveObserver(this); + } widget->CloseNow(); dialog_delegate_ = nullptr; } @@ -77,8 +78,9 @@ } void ScheduledRebootDialog::UpdateWindowTitle() { - if (dialog_delegate_) + if (dialog_delegate_) { dialog_delegate_->SetTitle(BuildTitle()); + } } const std::u16string ScheduledRebootDialog::BuildTitle() const {
diff --git a/chrome/browser/ui/ash/device_scheduled_reboot/scheduled_reboot_dialog_unittest.cc b/chrome/browser/ui/ash/device_scheduled_reboot/scheduled_reboot_dialog_unittest.cc index fd94a95..80fa2d89 100644 --- a/chrome/browser/ui/ash/device_scheduled_reboot/scheduled_reboot_dialog_unittest.cc +++ b/chrome/browser/ui/ash/device_scheduled_reboot/scheduled_reboot_dialog_unittest.cc
@@ -1,9 +1,10 @@ // Copyright 2022 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/ash/device_scheduled_reboot/scheduled_reboot_dialog.h" + #include <memory> -#include "chrome/browser/ui/ash/device_scheduled_reboot/scheduled_reboot_dialog.h" #include "chrome/browser/ui/views/chrome_constrained_window_views_client.h" #include "components/constrained_window/constrained_window_views.h" #include "content/public/test/browser_task_environment.h"
diff --git a/chrome/browser/ui/ash/glanceables/glanceables_classroom_client_impl_unittest.cc b/chrome/browser/ui/ash/glanceables/glanceables_classroom_client_impl_unittest.cc index 1ccfd5a..ee20d72 100644 --- a/chrome/browser/ui/ash/glanceables/glanceables_classroom_client_impl_unittest.cc +++ b/chrome/browser/ui/ash/glanceables/glanceables_classroom_client_impl_unittest.cc
@@ -466,47 +466,46 @@ GlanceablesClassroomClientImpl::CourseWorkType::kStudent; client()->FetchCourseWork( /*course_id=*/"course-123", course_work_type, - base::BindLambdaForTesting( - [&]() { - run_loop.Quit(); + base::BindLambdaForTesting([&]() { + run_loop.Quit(); - GlanceablesClassroomClientImpl::CourseWorkPerCourse& courses_map = - client()->GetCourseWork(course_work_type); + GlanceablesClassroomClientImpl::CourseWorkPerCourse& courses_map = + client()->GetCourseWork(course_work_type); - ASSERT_TRUE(courses_map.contains("course-123")); - auto& course_work_map = courses_map["course-123"]; - ASSERT_EQ(course_work_map.size(), 2u); + ASSERT_TRUE(courses_map.contains("course-123")); + auto& course_work_map = courses_map["course-123"]; + ASSERT_EQ(course_work_map.size(), 2u); - ASSERT_TRUE(course_work_map.contains("course-work-item-1")); - const GlanceablesClassroomCourseWorkItem& course_work_1 = - course_work_map.at("course-work-item-1"); - EXPECT_EQ(course_work_1.title(), "Math assignment"); - EXPECT_EQ(course_work_1.link(), - "https://classroom.google.com/test-link-1"); - EXPECT_FALSE(course_work_1.due()); + ASSERT_TRUE(course_work_map.contains("course-work-item-1")); + const GlanceablesClassroomCourseWorkItem& course_work_1 = + course_work_map.at("course-work-item-1"); + EXPECT_EQ(course_work_1.title(), "Math assignment"); + EXPECT_EQ(course_work_1.link(), + "https://classroom.google.com/test-link-1"); + EXPECT_FALSE(course_work_1.due()); - ASSERT_TRUE(course_work_map.contains("course-work-item-3")); - const GlanceablesClassroomCourseWorkItem& course_work_3 = - course_work_map.at("course-work-item-3"); - EXPECT_EQ(course_work_3.title(), "Math assignment with due date"); - EXPECT_EQ(course_work_3.link(), - "https://classroom.google.com/test-link-3"); - ASSERT_TRUE(course_work_3.due()); - EXPECT_EQ(FormatTimeAsString(course_work_3.due().value()), - "2023-04-25T15:09:25.250Z"); + ASSERT_TRUE(course_work_map.contains("course-work-item-3")); + const GlanceablesClassroomCourseWorkItem& course_work_3 = + course_work_map.at("course-work-item-3"); + EXPECT_EQ(course_work_3.title(), "Math assignment with due date"); + EXPECT_EQ(course_work_3.link(), + "https://classroom.google.com/test-link-3"); + ASSERT_TRUE(course_work_3.due()); + EXPECT_EQ(FormatTimeAsString(course_work_3.due().value()), + "2023-04-25T15:09:25.250Z"); - histogram_tester()->ExpectTotalCount( - "Ash.Glanceables.Api.Classroom.GetCourseWork.Latency", - /*expected_count=*/1); - histogram_tester()->ExpectUniqueSample( - "Ash.Glanceables.Api.Classroom.GetCourseWork.Status", - ApiErrorCode::HTTP_SUCCESS, - /*expected_bucket_count=*/1); - histogram_tester()->ExpectUniqueSample( - "Ash.Glanceables.Api.Classroom.GetCourseWork.PagesCount", - /*sample=*/1, - /*expected_bucket_count=*/1); - })); + histogram_tester()->ExpectTotalCount( + "Ash.Glanceables.Api.Classroom.GetCourseWork.Latency", + /*expected_count=*/1); + histogram_tester()->ExpectUniqueSample( + "Ash.Glanceables.Api.Classroom.GetCourseWork.Status", + ApiErrorCode::HTTP_SUCCESS, + /*expected_bucket_count=*/1); + histogram_tester()->ExpectUniqueSample( + "Ash.Glanceables.Api.Classroom.GetCourseWork.PagesCount", + /*sample=*/1, + /*expected_bucket_count=*/1); + })); run_loop.Run(); } @@ -616,53 +615,51 @@ GlanceablesClassroomClientImpl::CourseWorkType::kTeacher; client()->FetchCourseWork( /*course_id=*/"course-123", course_work_type, - base::BindLambdaForTesting( - [&]() { - run_loop.Quit(); + base::BindLambdaForTesting([&]() { + run_loop.Quit(); - GlanceablesClassroomClientImpl::CourseWorkPerCourse& courses_map = - client()->GetCourseWork(course_work_type); + GlanceablesClassroomClientImpl::CourseWorkPerCourse& courses_map = + client()->GetCourseWork(course_work_type); - ASSERT_TRUE(courses_map.contains("course-123")); - auto& course_work_map = courses_map["course-123"]; - ASSERT_EQ(course_work_map.size(), 3u); + ASSERT_TRUE(courses_map.contains("course-123")); + auto& course_work_map = courses_map["course-123"]; + ASSERT_EQ(course_work_map.size(), 3u); - ASSERT_TRUE(course_work_map.contains("course-work-item-1")); - const GlanceablesClassroomCourseWorkItem& course_work_1 = - course_work_map.at("course-work-item-1"); - EXPECT_EQ(course_work_1.title(), "Math assignment"); - EXPECT_EQ(course_work_1.link(), - "https://classroom.google.com/test-link-1"); - EXPECT_FALSE(course_work_1.due()); - EXPECT_EQ(course_work_1.total_submissions(), 1); - EXPECT_EQ(course_work_1.turned_in_submissions(), 0); - EXPECT_EQ(course_work_1.graded_submissions(), 0); + ASSERT_TRUE(course_work_map.contains("course-work-item-1")); + const GlanceablesClassroomCourseWorkItem& course_work_1 = + course_work_map.at("course-work-item-1"); + EXPECT_EQ(course_work_1.title(), "Math assignment"); + EXPECT_EQ(course_work_1.link(), + "https://classroom.google.com/test-link-1"); + EXPECT_FALSE(course_work_1.due()); + EXPECT_EQ(course_work_1.total_submissions(), 1); + EXPECT_EQ(course_work_1.turned_in_submissions(), 0); + EXPECT_EQ(course_work_1.graded_submissions(), 0); - ASSERT_TRUE(course_work_map.contains("course-work-item-3")); - const GlanceablesClassroomCourseWorkItem& course_work_3 = - course_work_map.at("course-work-item-3"); - EXPECT_EQ(course_work_3.title(), "Math assignment with due date"); - EXPECT_EQ(course_work_3.link(), - "https://classroom.google.com/test-link-3"); - ASSERT_TRUE(course_work_3.due()); - EXPECT_EQ(FormatTimeAsString(course_work_3.due().value()), - "2023-04-25T15:09:25.250Z"); - EXPECT_EQ(course_work_3.total_submissions(), 3); - EXPECT_EQ(course_work_3.turned_in_submissions(), 2); - EXPECT_EQ(course_work_3.graded_submissions(), 1); + ASSERT_TRUE(course_work_map.contains("course-work-item-3")); + const GlanceablesClassroomCourseWorkItem& course_work_3 = + course_work_map.at("course-work-item-3"); + EXPECT_EQ(course_work_3.title(), "Math assignment with due date"); + EXPECT_EQ(course_work_3.link(), + "https://classroom.google.com/test-link-3"); + ASSERT_TRUE(course_work_3.due()); + EXPECT_EQ(FormatTimeAsString(course_work_3.due().value()), + "2023-04-25T15:09:25.250Z"); + EXPECT_EQ(course_work_3.total_submissions(), 3); + EXPECT_EQ(course_work_3.turned_in_submissions(), 2); + EXPECT_EQ(course_work_3.graded_submissions(), 1); - ASSERT_TRUE(course_work_map.contains("course-work-item-4")); - const GlanceablesClassroomCourseWorkItem& course_work_4 = - course_work_map.at("course-work-item-4"); - EXPECT_EQ(course_work_4.title(), - "Math assignment with no submissions"); - EXPECT_EQ(course_work_4.link(), - "https://classroom.google.com/test-link-4"); - EXPECT_FALSE(course_work_4.due()); - EXPECT_EQ(course_work_4.total_submissions(), 0); - EXPECT_EQ(course_work_4.turned_in_submissions(), 0); - EXPECT_EQ(course_work_4.graded_submissions(), 0); - })); + ASSERT_TRUE(course_work_map.contains("course-work-item-4")); + const GlanceablesClassroomCourseWorkItem& course_work_4 = + course_work_map.at("course-work-item-4"); + EXPECT_EQ(course_work_4.title(), "Math assignment with no submissions"); + EXPECT_EQ(course_work_4.link(), + "https://classroom.google.com/test-link-4"); + EXPECT_FALSE(course_work_4.due()); + EXPECT_EQ(course_work_4.total_submissions(), 0); + EXPECT_EQ(course_work_4.turned_in_submissions(), 0); + EXPECT_EQ(course_work_4.graded_submissions(), 0); + })); run_loop.Run(); } @@ -677,24 +674,23 @@ GlanceablesClassroomClientImpl::CourseWorkType::kStudent; client()->FetchCourseWork( /*course_id=*/"course-123", course_work_type, - base::BindLambdaForTesting( - [&]() { - run_loop.Quit(); + base::BindLambdaForTesting([&]() { + run_loop.Quit(); - GlanceablesClassroomClientImpl::CourseWorkPerCourse& courses_map = - client()->GetCourseWork(course_work_type); + GlanceablesClassroomClientImpl::CourseWorkPerCourse& courses_map = + client()->GetCourseWork(course_work_type); - auto& course_work_map = courses_map["course-123"]; - ASSERT_TRUE(course_work_map.empty()); + auto& course_work_map = courses_map["course-123"]; + ASSERT_TRUE(course_work_map.empty()); - histogram_tester()->ExpectTotalCount( - "Ash.Glanceables.Api.Classroom.GetCourseWork.Latency", - /*expected_count=*/1); - histogram_tester()->ExpectUniqueSample( - "Ash.Glanceables.Api.Classroom.GetCourseWork.Status", - ApiErrorCode::HTTP_INTERNAL_SERVER_ERROR, - /*expected_bucket_count=*/1); - })); + histogram_tester()->ExpectTotalCount( + "Ash.Glanceables.Api.Classroom.GetCourseWork.Latency", + /*expected_count=*/1); + histogram_tester()->ExpectUniqueSample( + "Ash.Glanceables.Api.Classroom.GetCourseWork.Status", + ApiErrorCode::HTTP_INTERNAL_SERVER_ERROR, + /*expected_bucket_count=*/1); + })); run_loop.Run(); } @@ -812,46 +808,42 @@ GlanceablesClassroomClientImpl::CourseWorkType::kTeacher; client()->FetchCourseWork( /*course_id=*/"course-123", course_work_type, - base::BindLambdaForTesting( - [&]() { - run_loop.Quit(); + base::BindLambdaForTesting([&]() { + run_loop.Quit(); - GlanceablesClassroomClientImpl::CourseWorkPerCourse& courses_map = - client()->GetCourseWork(course_work_type); + GlanceablesClassroomClientImpl::CourseWorkPerCourse& courses_map = + client()->GetCourseWork(course_work_type); - ASSERT_TRUE(courses_map.contains("course-123")); - auto& course_work_map = courses_map["course-123"]; - ASSERT_EQ(course_work_map.size(), 3u); + ASSERT_TRUE(courses_map.contains("course-123")); + auto& course_work_map = courses_map["course-123"]; + ASSERT_EQ(course_work_map.size(), 3u); - ASSERT_TRUE( - course_work_map.contains("course-work-item-from-page-1")); - const GlanceablesClassroomCourseWorkItem& course_work_1 = - course_work_map.at("course-work-item-from-page-1"); - EXPECT_EQ(course_work_1.total_submissions(), 1); - EXPECT_EQ(course_work_1.turned_in_submissions(), 0); - EXPECT_EQ(course_work_1.graded_submissions(), 0); + ASSERT_TRUE(course_work_map.contains("course-work-item-from-page-1")); + const GlanceablesClassroomCourseWorkItem& course_work_1 = + course_work_map.at("course-work-item-from-page-1"); + EXPECT_EQ(course_work_1.total_submissions(), 1); + EXPECT_EQ(course_work_1.turned_in_submissions(), 0); + EXPECT_EQ(course_work_1.graded_submissions(), 0); - ASSERT_TRUE( - course_work_map.contains("course-work-item-from-page-2")); - const GlanceablesClassroomCourseWorkItem& course_work_2 = - course_work_map.at("course-work-item-from-page-2"); - EXPECT_EQ(course_work_2.total_submissions(), 1); - EXPECT_EQ(course_work_2.turned_in_submissions(), 1); - EXPECT_EQ(course_work_2.graded_submissions(), 0); + ASSERT_TRUE(course_work_map.contains("course-work-item-from-page-2")); + const GlanceablesClassroomCourseWorkItem& course_work_2 = + course_work_map.at("course-work-item-from-page-2"); + EXPECT_EQ(course_work_2.total_submissions(), 1); + EXPECT_EQ(course_work_2.turned_in_submissions(), 1); + EXPECT_EQ(course_work_2.graded_submissions(), 0); - ASSERT_TRUE( - course_work_map.contains("course-work-item-from-page-3")); - const GlanceablesClassroomCourseWorkItem& course_work_3 = - course_work_map.at("course-work-item-from-page-3"); - EXPECT_EQ(course_work_3.total_submissions(), 3); - EXPECT_EQ(course_work_3.turned_in_submissions(), 2); - EXPECT_EQ(course_work_3.graded_submissions(), 1); + ASSERT_TRUE(course_work_map.contains("course-work-item-from-page-3")); + const GlanceablesClassroomCourseWorkItem& course_work_3 = + course_work_map.at("course-work-item-from-page-3"); + EXPECT_EQ(course_work_3.total_submissions(), 3); + EXPECT_EQ(course_work_3.turned_in_submissions(), 2); + EXPECT_EQ(course_work_3.graded_submissions(), 1); - histogram_tester()->ExpectUniqueSample( - "Ash.Glanceables.Api.Classroom.GetCourseWork.PagesCount", - /*sample=*/3, - /*expected_bucket_count=*/1); - })); + histogram_tester()->ExpectUniqueSample( + "Ash.Glanceables.Api.Classroom.GetCourseWork.PagesCount", + /*sample=*/3, + /*expected_bucket_count=*/1); + })); run_loop.Run(); } @@ -966,37 +958,36 @@ GlanceablesClassroomClientImpl::CourseWorkType::kStudent; client()->FetchStudentSubmissions( /*course_id=*/"course-123", /*course_work_id=*/"-", course_work_type, - base::BindLambdaForTesting( - [&]() { - run_loop.Quit(); + base::BindLambdaForTesting([&]() { + run_loop.Quit(); - GlanceablesClassroomClientImpl::CourseWorkPerCourse& courses_map = - client()->GetCourseWork(course_work_type); + GlanceablesClassroomClientImpl::CourseWorkPerCourse& courses_map = + client()->GetCourseWork(course_work_type); - ASSERT_TRUE(courses_map.contains("course-123")); - auto& course_work_map = courses_map["course-123"]; + ASSERT_TRUE(courses_map.contains("course-123")); + auto& course_work_map = courses_map["course-123"]; - ASSERT_EQ(course_work_map.size(), 1u); - ASSERT_TRUE(course_work_map.contains("course-work-1")); + ASSERT_EQ(course_work_map.size(), 1u); + ASSERT_TRUE(course_work_map.contains("course-work-1")); - const auto& course_work = course_work_map.at("course-work-1"); - EXPECT_EQ(course_work.total_submissions(), 7); - EXPECT_EQ(course_work.turned_in_submissions(), 2); - EXPECT_EQ(course_work.graded_submissions(), 1); + const auto& course_work = course_work_map.at("course-work-1"); + EXPECT_EQ(course_work.total_submissions(), 7); + EXPECT_EQ(course_work.turned_in_submissions(), 2); + EXPECT_EQ(course_work.graded_submissions(), 1); - histogram_tester()->ExpectTotalCount( - "Ash.Glanceables.Api.Classroom.GetStudentSubmissions.Latency", - /*expected_count=*/1); - histogram_tester()->ExpectUniqueSample( - "Ash.Glanceables.Api.Classroom.GetStudentSubmissions.Status", - ApiErrorCode::HTTP_SUCCESS, - /*expected_bucket_count=*/1); - histogram_tester()->ExpectUniqueSample( - "Ash.Glanceables.Api.Classroom.GetStudentSubmissions." - "PagesCount", - /*sample=*/1, - /*expected_bucket_count=*/1); - })); + histogram_tester()->ExpectTotalCount( + "Ash.Glanceables.Api.Classroom.GetStudentSubmissions.Latency", + /*expected_count=*/1); + histogram_tester()->ExpectUniqueSample( + "Ash.Glanceables.Api.Classroom.GetStudentSubmissions.Status", + ApiErrorCode::HTTP_SUCCESS, + /*expected_bucket_count=*/1); + histogram_tester()->ExpectUniqueSample( + "Ash.Glanceables.Api.Classroom.GetStudentSubmissions." + "PagesCount", + /*sample=*/1, + /*expected_bucket_count=*/1); + })); run_loop.Run(); } @@ -1011,24 +1002,23 @@ GlanceablesClassroomClientImpl::CourseWorkType::kStudent; client()->FetchStudentSubmissions( /*course_id=*/"course-123", /*course_work_id=*/"-", course_work_type, - base::BindLambdaForTesting( - [&]() { - run_loop.Quit(); + base::BindLambdaForTesting([&]() { + run_loop.Quit(); - GlanceablesClassroomClientImpl::CourseWorkPerCourse& courses_map = - client()->GetCourseWork(course_work_type); + GlanceablesClassroomClientImpl::CourseWorkPerCourse& courses_map = + client()->GetCourseWork(course_work_type); - auto& course_work_map = courses_map["course-123"]; - ASSERT_TRUE(course_work_map.empty()); + auto& course_work_map = courses_map["course-123"]; + ASSERT_TRUE(course_work_map.empty()); - histogram_tester()->ExpectTotalCount( - "Ash.Glanceables.Api.Classroom.GetStudentSubmissions.Latency", - /*expected_count=*/1); - histogram_tester()->ExpectUniqueSample( - "Ash.Glanceables.Api.Classroom.GetStudentSubmissions.Status", - ApiErrorCode::HTTP_INTERNAL_SERVER_ERROR, - /*expected_bucket_count=*/1); - })); + histogram_tester()->ExpectTotalCount( + "Ash.Glanceables.Api.Classroom.GetStudentSubmissions.Latency", + /*expected_count=*/1); + histogram_tester()->ExpectUniqueSample( + "Ash.Glanceables.Api.Classroom.GetStudentSubmissions.Status", + ApiErrorCode::HTTP_INTERNAL_SERVER_ERROR, + /*expected_bucket_count=*/1); + })); run_loop.Run(); } @@ -1165,29 +1155,28 @@ GlanceablesClassroomClientImpl::CourseWorkType::kStudent; client()->FetchStudentSubmissions( /*course_id=*/"course-123", /*course_work_id=*/"-", course_work_type, - base::BindLambdaForTesting( - [&]() { - student_submissions_run_loop.Quit(); + base::BindLambdaForTesting([&]() { + student_submissions_run_loop.Quit(); - GlanceablesClassroomClientImpl::CourseWorkPerCourse& courses_map = - client()->GetCourseWork(course_work_type); + GlanceablesClassroomClientImpl::CourseWorkPerCourse& courses_map = + client()->GetCourseWork(course_work_type); - ASSERT_TRUE(courses_map.contains("course-123")); - auto& course_work_map = courses_map["course-123"]; + ASSERT_TRUE(courses_map.contains("course-123")); + auto& course_work_map = courses_map["course-123"]; - ASSERT_EQ(course_work_map.size(), 1u); - ASSERT_TRUE(course_work_map.contains("course-work-item-1")); + ASSERT_EQ(course_work_map.size(), 1u); + ASSERT_TRUE(course_work_map.contains("course-work-item-1")); - const auto& course_work = course_work_map.at("course-work-item-1"); - EXPECT_EQ(course_work.total_submissions(), 7); - EXPECT_EQ(course_work.turned_in_submissions(), 2); - EXPECT_EQ(course_work.graded_submissions(), 1); + const auto& course_work = course_work_map.at("course-work-item-1"); + EXPECT_EQ(course_work.total_submissions(), 7); + EXPECT_EQ(course_work.turned_in_submissions(), 2); + EXPECT_EQ(course_work.graded_submissions(), 1); - histogram_tester()->ExpectUniqueSample( - "Ash.Glanceables.Api.Classroom.GetStudentSubmissions.Status", - ApiErrorCode::HTTP_SUCCESS, - /*expected_bucket_count=*/1); - })); + histogram_tester()->ExpectUniqueSample( + "Ash.Glanceables.Api.Classroom.GetStudentSubmissions.Status", + ApiErrorCode::HTTP_SUCCESS, + /*expected_bucket_count=*/1); + })); student_submissions_run_loop.Run(); EXPECT_CALL(request_handler(), @@ -1208,34 +1197,33 @@ base::RunLoop course_work_run_loop; client()->FetchCourseWork( /*course_id=*/"course-123", course_work_type, - base::BindLambdaForTesting( - [&]() { - course_work_run_loop.Quit(); + base::BindLambdaForTesting([&]() { + course_work_run_loop.Quit(); - GlanceablesClassroomClientImpl::CourseWorkPerCourse& courses_map = - client()->GetCourseWork(course_work_type); + GlanceablesClassroomClientImpl::CourseWorkPerCourse& courses_map = + client()->GetCourseWork(course_work_type); - ASSERT_TRUE(courses_map.contains("course-123")); - auto& course_work_map = courses_map["course-123"]; + ASSERT_TRUE(courses_map.contains("course-123")); + auto& course_work_map = courses_map["course-123"]; - ASSERT_EQ(course_work_map.size(), 1u); + ASSERT_EQ(course_work_map.size(), 1u); - ASSERT_TRUE(course_work_map.contains("course-work-item-1")); - const GlanceablesClassroomCourseWorkItem& course_work = - course_work_map.at("course-work-item-1"); - EXPECT_EQ(course_work.title(), "Math assignment"); - EXPECT_EQ(course_work.link(), - "https://classroom.google.com/test-link-1"); - EXPECT_FALSE(course_work.due()); - EXPECT_EQ(course_work.total_submissions(), 7); - EXPECT_EQ(course_work.turned_in_submissions(), 2); - EXPECT_EQ(course_work.graded_submissions(), 1); + ASSERT_TRUE(course_work_map.contains("course-work-item-1")); + const GlanceablesClassroomCourseWorkItem& course_work = + course_work_map.at("course-work-item-1"); + EXPECT_EQ(course_work.title(), "Math assignment"); + EXPECT_EQ(course_work.link(), + "https://classroom.google.com/test-link-1"); + EXPECT_FALSE(course_work.due()); + EXPECT_EQ(course_work.total_submissions(), 7); + EXPECT_EQ(course_work.turned_in_submissions(), 2); + EXPECT_EQ(course_work.graded_submissions(), 1); - histogram_tester()->ExpectUniqueSample( - "Ash.Glanceables.Api.Classroom.GetCourseWork.Status", - ApiErrorCode::HTTP_SUCCESS, - /*expected_bucket_count=*/1); - })); + histogram_tester()->ExpectUniqueSample( + "Ash.Glanceables.Api.Classroom.GetCourseWork.Status", + ApiErrorCode::HTTP_SUCCESS, + /*expected_bucket_count=*/1); + })); course_work_run_loop.Run(); }
diff --git a/chrome/browser/ui/ash/global_media_controls/media_notification_provider_impl_unittest.cc b/chrome/browser/ui/ash/global_media_controls/media_notification_provider_impl_unittest.cc index b875cb30e..3f82e86b 100644 --- a/chrome/browser/ui/ash/global_media_controls/media_notification_provider_impl_unittest.cc +++ b/chrome/browser/ui/ash/global_media_controls/media_notification_provider_impl_unittest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/ash/global_media_controls/media_notification_provider_impl.h" + #include <memory> #include "ash/system/media/media_notification_provider_observer.h"
diff --git a/chrome/browser/ui/ash/graduation/graduation_manager_impl_browsertest.cc b/chrome/browser/ui/ash/graduation/graduation_manager_impl_browsertest.cc index 59335350..3177f2f7 100644 --- a/chrome/browser/ui/ash/graduation/graduation_manager_impl_browsertest.cc +++ b/chrome/browser/ui/ash/graduation/graduation_manager_impl_browsertest.cc
@@ -260,8 +260,7 @@ WaitForShelfItemAdd(); EXPECT_TRUE(IsItemPinned(ash::kGraduationAppId)); - EXPECT_EQ(apps::Readiness::kReady, - GetAppReadiness(ash::kGraduationAppId)); + EXPECT_EQ(apps::Readiness::kReady, GetAppReadiness(ash::kGraduationAppId)); } IN_PROC_BROWSER_TEST_F(GraduationManagerTest, @@ -284,8 +283,7 @@ WaitForShelfItemAdd(); EXPECT_TRUE(IsItemPinned(ash::kGraduationAppId)); - EXPECT_EQ(apps::Readiness::kReady, - GetAppReadiness(ash::kGraduationAppId)); + EXPECT_EQ(apps::Readiness::kReady, GetAppReadiness(ash::kGraduationAppId)); } IN_PROC_BROWSER_TEST_F(GraduationManagerTest, PRE_AppPinnedOnEndDate) { @@ -296,8 +294,7 @@ IN_PROC_BROWSER_TEST_F(GraduationManagerTest, AppPinnedOnEndDate) { EXPECT_TRUE(IsItemPinned(ash::kGraduationAppId)); - EXPECT_EQ(apps::Readiness::kReady, - GetAppReadiness(ash::kGraduationAppId)); + EXPECT_EQ(apps::Readiness::kReady, GetAppReadiness(ash::kGraduationAppId)); // Fast forward to the policy enablement end date set in the pre-test. AdvanceTimeBy(base::Days(1)); @@ -305,8 +302,7 @@ // Since this is the last day the app is available, the app should be pinned. EXPECT_TRUE(IsItemPinned(ash::kGraduationAppId)); - EXPECT_EQ(apps::Readiness::kReady, - GetAppReadiness(ash::kGraduationAppId)); + EXPECT_EQ(apps::Readiness::kReady, GetAppReadiness(ash::kGraduationAppId)); } IN_PROC_BROWSER_TEST_F(GraduationManagerTest, AppUnpinnedWhenPolicyUnset) { @@ -349,8 +345,7 @@ IN_PROC_BROWSER_TEST_F(GraduationManagerTest, AppUnpinnedWhenEndDateHasPassed) { EXPECT_TRUE(IsItemPinned(ash::kGraduationAppId)); - EXPECT_EQ(apps::Readiness::kReady, - GetAppReadiness(ash::kGraduationAppId)); + EXPECT_EQ(apps::Readiness::kReady, GetAppReadiness(ash::kGraduationAppId)); // Fast forward to one day past the policy enablement end date set in the // pre-test.
diff --git a/chrome/browser/ui/ash/holding_space/holding_space_browsertest_base.cc b/chrome/browser/ui/ash/holding_space/holding_space_browsertest_base.cc index 9128e68..569d61af 100644 --- a/chrome/browser/ui/ash/holding_space/holding_space_browsertest_base.cc +++ b/chrome/browser/ui/ash/holding_space/holding_space_browsertest_base.cc
@@ -139,8 +139,9 @@ } void HoldingSpaceBrowserTestBase::RequestAndAwaitLockScreen() { - if (session_manager::SessionManager::Get()->IsScreenLocked()) + if (session_manager::SessionManager::Get()->IsScreenLocked()) { return; + } SessionManagerClient::Get()->RequestLockScreen(); SessionStateWaiter(session_manager::SessionState::LOCKED).Wait();
diff --git a/chrome/browser/ui/ash/holding_space/holding_space_client_impl.cc b/chrome/browser/ui/ash/holding_space/holding_space_client_impl.cc index 754b553..f128e4f 100644 --- a/chrome/browser/ui/ash/holding_space/holding_space_client_impl.cc +++ b/chrome/browser/ui/ash/holding_space/holding_space_client_impl.cc
@@ -118,9 +118,8 @@ return GetHoldingSpaceKeyedService(profile_)->AddItemOfType(type, file_path); } -void HoldingSpaceClientImpl::CopyImageToClipboard( - const HoldingSpaceItem& item, - SuccessCallback callback) { +void HoldingSpaceClientImpl::CopyImageToClipboard(const HoldingSpaceItem& item, + SuccessCallback callback) { holding_space_metrics::RecordItemAction( {&item}, holding_space_metrics::ItemAction::kCopy); @@ -334,9 +333,8 @@ GetHoldingSpaceKeyedService(profile_)->RemoveSuggestions(absolute_file_paths); } -void HoldingSpaceClientImpl::ShowItemInFolder( - const HoldingSpaceItem& item, - SuccessCallback callback) { +void HoldingSpaceClientImpl::ShowItemInFolder(const HoldingSpaceItem& item, + SuccessCallback callback) { holding_space_metrics::RecordItemAction( {&item}, holding_space_metrics::ItemAction::kShowInFolder);
diff --git a/chrome/browser/ui/ash/holding_space/holding_space_client_impl.h b/chrome/browser/ui/ash/holding_space/holding_space_client_impl.h index 88b1f41..bb6382511 100644 --- a/chrome/browser/ui/ash/holding_space/holding_space_client_impl.h +++ b/chrome/browser/ui/ash/holding_space/holding_space_client_impl.h
@@ -40,8 +40,7 @@ void RefreshSuggestions() override; void RemoveSuggestions( const std::vector<base::FilePath>& absolute_file_paths) override; - void ShowItemInFolder(const HoldingSpaceItem& item, - SuccessCallback) override; + void ShowItemInFolder(const HoldingSpaceItem& item, SuccessCallback) override; void UnpinItems(const std::vector<const HoldingSpaceItem*>& items) override; private:
diff --git a/chrome/browser/ui/ash/holding_space/holding_space_downloads_delegate.cc b/chrome/browser/ui/ash/holding_space/holding_space_downloads_delegate.cc index c50b8ad..afb75c0 100644 --- a/chrome/browser/ui/ash/holding_space/holding_space_downloads_delegate.cc +++ b/chrome/browser/ui/ash/holding_space/holding_space_downloads_delegate.cc
@@ -372,13 +372,15 @@ // In-progress download items which are dangerous but not malicious can be // kept or discarded by the user via notification. This being the case, such // items have a special secondary text treatment. - if (IsDangerous() && !MightBeMalicious()) + if (IsDangerous() && !MightBeMalicious()) { return cros_tokens::kTextColorWarning; + } // In-progress download items which are dangerous or insecure have a special // secondary text treatment. - if (IsDangerous() || IsInsecure()) + if (IsDangerous() || IsInsecure()) { return cros_tokens::kTextColorAlert; + } return std::nullopt; } @@ -478,8 +480,9 @@ HoldingSpaceDownloadsDelegate::OpenWhenComplete(const HoldingSpaceItem* item) { DCHECK(HoldingSpaceItem::IsDownloadType(item->type())); for (const auto& in_progress_download : in_progress_downloads_) { - if (in_progress_download->GetHoldingSpaceItem() == item) + if (in_progress_download->GetHoldingSpaceItem() == item) { return in_progress_download->OpenWhenComplete(); + } } return ItemLaunchFailureReason::kDownloadNotFound; } @@ -490,8 +493,9 @@ // is not allowed to use ARC, e.g. if the `profile()` is OTR. auto* const arc_file_system_bridge = arc::ArcFileSystemBridge::GetForBrowserContext(profile()); - if (arc_file_system_bridge) + if (arc_file_system_bridge) { arc_file_system_bridge_observation_.Observe(arc_file_system_bridge); + } // Ash Chrome downloads. download_notifier_.AddProfile(profile()); @@ -530,8 +534,9 @@ } // Fail all of `manager`'s downloads. - for (InProgressDownload* in_progress_download : downloads_to_remove) + for (InProgressDownload* in_progress_download : downloads_to_remove) { OnDownloadFailed(in_progress_download); + } } void HoldingSpaceDownloadsDelegate::OnDownloadCreated( @@ -547,8 +552,9 @@ void HoldingSpaceDownloadsDelegate::OnDownloadUpdated( content::DownloadManager* manager, download::DownloadItem* download_item) { - if (!IsInProgress(download_item)) + if (!IsInProgress(download_item)) { return; + } // In the common case, we already created an `InProgressDownload` for // `download_item` in `OnDownloadCreated()`. @@ -567,12 +573,14 @@ void HoldingSpaceDownloadsDelegate::OnMediaStoreUriAdded( const GURL& uri, const arc::mojom::MediaStoreMetadata& metadata) { - if (is_restoring_persistence()) + if (is_restoring_persistence()) { return; + } // Holding space is only interested in download added events. - if (!metadata.is_download()) + if (!metadata.is_download()) { return; + } const auto& download = metadata.get_download(); const base::FilePath& relative_path = download->relative_path; @@ -597,8 +605,9 @@ // is set. In some cases, this requires the user to actively select the target // file path from a selection dialog. Only once file path information is set // should a holding space item be associated with the in-progress download. - if (!in_progress_download->GetFilePath().empty()) + if (!in_progress_download->GetFilePath().empty()) { CreateOrUpdateHoldingSpaceItem(in_progress_download, invalidate_image); + } } void HoldingSpaceDownloadsDelegate::OnDownloadCompleted( @@ -648,8 +657,9 @@ } // May be `nullptr` in tests. - if (!item) + if (!item) { return; + } // Commands. std::vector<HoldingSpaceItem::InProgressCommand> in_progress_commands;
diff --git a/chrome/browser/ui/ash/holding_space/holding_space_file_system_delegate.cc b/chrome/browser/ui/ash/holding_space/holding_space_file_system_delegate.cc index 52215b0..a8f7fee 100644 --- a/chrome/browser/ui/ash/holding_space/holding_space_file_system_delegate.cc +++ b/chrome/browser/ui/ash/holding_space/holding_space_file_system_delegate.cc
@@ -49,8 +49,10 @@ if (drive_integration_service) { base::FilePath absolute_file_path = drive_integration_service->GetMountPointPath(); - if (base::FilePath("/").AppendRelativePath(drive_path, &absolute_file_path)) + if (base::FilePath("/").AppendRelativePath(drive_path, + &absolute_file_path)) { return absolute_file_path; + } } NOTREACHED(); } @@ -59,8 +61,9 @@ arc::ConnectionHolder<arc::mojom::FileSystemInstance, arc::mojom::FileSystemHost>* GetArcFileSystem() { - if (!arc::ArcServiceManager::Get()) + if (!arc::ArcServiceManager::Get()) { return nullptr; + } return arc::ArcServiceManager::Get()->arc_bridge_service()->file_system(); } @@ -116,8 +119,9 @@ // If the target path got deleted while request to add a watcher was in // flight, notify observers of path change immediately. - if (!base::PathExists(file_path)) + if (!base::PathExists(file_path)) { OnFilePathChanged(path_to_watch, /*error=*/false); + } } void RemoveWatch(const base::FilePath& file_path) { @@ -167,8 +171,9 @@ void HoldingSpaceFileSystemDelegate::OnConnectionReady() { // Schedule validity checks for android items. for (auto& item : model()->items()) { - if (!ItemBackedByAndroidFile(item.get())) + if (!ItemBackedByAndroidFile(item.get())) { continue; + } holding_space_util::ValidityRequirement requirements; if (item->type() != HoldingSpaceItem::Type::kPinnedFile) { @@ -193,8 +198,9 @@ // Holding space requires absolute file paths. const base::FilePath absolute_file_path = ConvertDrivePathToAbsoluteFilePath(profile(), change.path); - if (absolute_file_path.empty()) + if (absolute_file_path.empty()) { continue; + } switch (change.type) { case drivefs::mojom::FileChange::Type::kCreate: { @@ -217,10 +223,11 @@ // change is move or a delete will not be known until a `kCreate` change // follows (or is confirmed *not* to follow). When `stable_id` is absent // it is not possible to detect a move. - if (change.stable_id) + if (change.stable_id) { deleted_paths_by_stable_id[change.stable_id] = absolute_file_path; - else + } else { deleted_paths.insert(absolute_file_path); + } break; } case drivefs::mojom::FileChange::Type::kModify: { @@ -233,8 +240,9 @@ // At this point, all `kDelete` changes in `deleted_paths_by_stable_id` are // confirmed to be deletions, having already stripped out all changes that // were actually constituting moves. - for (const auto& deleted_path_by_stable_id : deleted_paths_by_stable_id) + for (const auto& deleted_path_by_stable_id : deleted_paths_by_stable_id) { deleted_paths.insert(deleted_path_by_stable_id.second); + } // Remove any holding space items backed by deleted file paths. model()->RemoveIf(base::BindRepeating( @@ -257,8 +265,9 @@ // Arc file system. auto* const arc_file_system = GetArcFileSystem(); - if (arc_file_system) + if (arc_file_system) { arc_file_system_observer_.Observe(arc_file_system); + } // Drive file system. if (drive::DriveIntegrationService* const service = @@ -272,8 +281,9 @@ // Volume manager. auto* const volume_manager = file_manager::VolumeManager::Get(profile()); - if (volume_manager) + if (volume_manager) { volume_manager_observer_.Observe(volume_manager); + } // Schedule a task to clean up items that belong to volumes that haven't been // mounted in a reasonable amount of time. The primary goal of handling the @@ -302,8 +312,9 @@ } // In-progress items are not subject to validity checks. - if (!item->progress().IsComplete()) + if (!item->progress().IsComplete()) { continue; + } // If the item has not yet been initialized, check whether it's path can be // resolved to a file system URL - failure to do so may indicate that the @@ -320,13 +331,15 @@ // requirement. const GURL file_system_url = holding_space_util::ResolveFileSystemUrl( profile(), item->file().file_path); - if (file_system_url.is_empty()) + if (file_system_url.is_empty()) { continue; + } // Defer validity checks (and initialization) for android files if the ARC // file system connection is not yet ready. - if (arc_file_system_disconnected && ItemBackedByAndroidFile(item)) + if (arc_file_system_disconnected && ItemBackedByAndroidFile(item)) { continue; + } holding_space_util::ValidityRequirement requirements; if (item->type() != HoldingSpaceItem::Type::kPinnedFile) { @@ -339,8 +352,9 @@ void HoldingSpaceFileSystemDelegate::OnHoldingSpaceItemsRemoved( const std::vector<const HoldingSpaceItem*>& items) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); - for (const HoldingSpaceItem* item : items) + for (const HoldingSpaceItem* item : items) { MaybeRemoveWatch(item->file().file_path.DirName()); + } } void HoldingSpaceFileSystemDelegate::OnHoldingSpaceItemUpdated( @@ -349,8 +363,9 @@ DCHECK_CURRENTLY_ON(content::BrowserThread::UI); // In-progress items are not subject to validity checks. - if (item->progress().IsComplete()) + if (item->progress().IsComplete()) { AddWatchForParent(item->file().file_path); + } } void HoldingSpaceFileSystemDelegate::OnHoldingSpaceItemInitialized( @@ -368,8 +383,9 @@ // Check validity of partially initialized items under the volume's mount // path. for (auto& item : model()->items()) { - if (item->IsInitialized()) + if (item->IsInitialized()) { continue; + } if (!volume.mount_path().IsParent(item->file().file_path)) { continue; } @@ -516,8 +532,9 @@ const base::FilePath& trash_location = it.first.Append(it.second.relative_folder_path); for (const auto& [id, file_path] : items_to_move) { - if (trash_location.IsParent(file_path)) + if (trash_location.IsParent(file_path)) { item_ids_to_remove.insert(id); + } } } @@ -533,8 +550,9 @@ // Finally, update the files that have been moved. for (const auto& [id, file_path] : items_to_move) { - if (item_ids_to_remove.count(id)) + if (item_ids_to_remove.count(id)) { continue; + } // File. const GURL file_system_url = @@ -557,8 +575,9 @@ holding_space_util::FilePathWithValidityRequirement requirement) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); pending_file_path_validity_checks_.push_back(std::move(requirement)); - if (file_path_validity_checks_scheduled_) + if (file_path_validity_checks_scheduled_) { return; + } file_path_validity_checks_scheduled_ = true; @@ -599,14 +618,16 @@ const std::vector<base::FilePath>* invalid_paths, const HoldingSpaceItem* item) { // In-progress items are not subject to validity checks. - if (!item->progress().IsComplete()) + if (!item->progress().IsComplete()) { return false; + } // Avoid removing Android files if connection to ARC file system has // been lost (e.g. Android container might have crashed). Validity // checks will be re-run once the file system gets connected. - if (arc_file_system_disconnected && ItemBackedByAndroidFile(item)) + if (arc_file_system_disconnected && ItemBackedByAndroidFile(item)) { return false; + } return base::Contains(*invalid_paths, item->file().file_path); }, @@ -616,8 +637,9 @@ for (auto& item : model()->items()) { // Defer initialization of items backed by android files if the connection // to ARC file system service has been lost. - if (arc_file_system_disconnected && ItemBackedByAndroidFile(item.get())) + if (arc_file_system_disconnected && ItemBackedByAndroidFile(item.get())) { continue; + } if (!item->IsInitialized() && base::Contains(valid_paths, item->file().file_path)) { @@ -657,8 +679,9 @@ item->file().file_path.DirName() == file_path; }); - if (!remove_watch) + if (!remove_watch) { return; + } file_system_watcher_runner_->PostTask( FROM_HERE, base::BindOnce(&FileSystemWatcher::RemoveWatch, @@ -679,8 +702,9 @@ DCHECK_CURRENTLY_ON(content::BrowserThread::UI); model()->RemoveIf(base::BindRepeating( [](Profile* profile, const HoldingSpaceItem* item) { - if (item->IsInitialized()) + if (item->IsInitialized()) { return false; + } // Do not remove items whose path can be resolved to a file system URL. // In this case, the associated mount point has been mounted, but the
diff --git a/chrome/browser/ui/ash/holding_space/holding_space_keyed_service.cc b/chrome/browser/ui/ash/holding_space/holding_space_keyed_service.cc index 8e18a7b..1b4356f 100644 --- a/chrome/browser/ui/ash/holding_space/holding_space_keyed_service.cc +++ b/chrome/browser/ui/ash/holding_space/holding_space_keyed_service.cc
@@ -46,8 +46,9 @@ const HoldingSpaceModel& model, const HoldingSpaceItem* item) { for (const auto& candidate_item : model.items()) { - if (candidate_item.get() == item) + if (candidate_item.get() == item) { continue; + } if (candidate_item->file().file_path == item->file().file_path) { return candidate_item.get(); } @@ -100,8 +101,9 @@ holding_space_prefs::MarkTimeOfFirstAvailability(profile_->GetPrefs()); ProfileManager* const profile_manager = GetProfileManager(); - if (!profile_manager) // May be `nullptr` in tests. + if (!profile_manager) { // May be `nullptr` in tests. return; + } // The associated profile may not be ready yet. If it is, we can immediately // proceed with profile dependent initialization. @@ -115,8 +117,9 @@ } HoldingSpaceKeyedService::~HoldingSpaceKeyedService() { - if (chromeos::PowerManagerClient::Get()) + if (chromeos::PowerManagerClient::Get()) { chromeos::PowerManagerClient::Get()->RemoveObserver(this); + } if (HoldingSpaceController::Get()) { // May be `nullptr` in tests. HoldingSpaceController::Get()->RegisterClientAndModelForUser( @@ -140,8 +143,9 @@ std::vector<std::unique_ptr<HoldingSpaceItem>> items; std::vector<const HoldingSpaceItem*> items_to_record; for (const storage::FileSystemURL& file_system_url : file_system_urls) { - if (ContainsPinnedFile(file_system_url)) + if (ContainsPinnedFile(file_system_url)) { continue; + } items.push_back(HoldingSpaceItem::CreateFileBackedItem( HoldingSpaceItem::Type::kPinnedFile, @@ -159,19 +163,22 @@ GetAlternativeHoldingSpaceItem(holding_space_model_, items.back().get()) .value_or(items.back().get())); - if (file_system_url.type() == storage::kFileSystemTypeDriveFs) + if (file_system_url.type() == storage::kFileSystemTypeDriveFs) { MakeDriveItemAvailableOffline(file_system_url); + } } DCHECK_EQ(items.size(), items_to_record.size()); - if (items.empty()) + if (items.empty()) { return; + } // Mark when the first pin to holding space occurred. If this is not the first // pin to holding space, this will no-op. If this is the first pin, record the // amount of time from first entry to first pin into holding space. - if (holding_space_prefs::MarkTimeOfFirstPin(profile_->GetPrefs())) + if (holding_space_prefs::MarkTimeOfFirstPin(profile_->GetPrefs())) { RecordTimeFromFirstEntryToFirstPin(profile_); + } holding_space_metrics::RecordItemAction( items_to_record, holding_space_metrics::ItemAction::kPin); @@ -190,8 +197,9 @@ for (const storage::FileSystemURL& file_system_url : file_system_urls) { const HoldingSpaceItem* item = holding_space_model_.GetItem( HoldingSpaceItem::Type::kPinnedFile, file_system_url.path()); - if (!item) + if (!item) { continue; + } items.emplace(item->id()); @@ -205,8 +213,9 @@ } DCHECK_EQ(items.size(), items_to_record.size()); - if (items.empty()) + if (items.empty()) { return; + } holding_space_metrics::RecordItemAction( items_to_record, holding_space_metrics::ItemAction::kUnpin); @@ -223,8 +232,9 @@ std::vector<GURL> HoldingSpaceKeyedService::GetPinnedFiles() const { std::vector<GURL> pinned_files; for (const auto& item : holding_space_model_.items()) { - if (item->type() == HoldingSpaceItem::Type::kPinnedFile) + if (item->type() == HoldingSpaceItem::Type::kPinnedFile) { pinned_files.push_back(item->file().file_system_url); + } } return pinned_files; } @@ -320,8 +330,9 @@ /*placeholder_image_skia_resolver=*/base::NullCallback()); } - if (item) + if (item) { items_to_add.push_back(std::move(item)); + } } // Add new items before removing old items to prevent UI from transitioning to @@ -353,8 +364,9 @@ std::unique_ptr<HoldingSpaceItem> item = CreateItemOfType( type, file_path, progress, placeholder_image_skia_resolver); - if (!item) + if (!item) { return base::EmptyString(); + } return AddItem(std::move(item)); } @@ -410,8 +422,9 @@ }); // Observe suspend status - the delegates will be shutdown during suspend. - if (chromeos::PowerManagerClient::Get()) + if (chromeos::PowerManagerClient::Get()) { chromeos::PowerManagerClient::Get()->AddObserver(this); + } InitializeDelegates(); @@ -514,8 +527,9 @@ // Initialize all delegates only after they have been added to our collection. // Delegates should not fire their respective callbacks during construction // but once they have been initialized they are free to do so. - for (auto& delegate : delegates_) + for (auto& delegate : delegates_) { delegate->Init(); + } } void HoldingSpaceKeyedService::ShutdownDelegates() { @@ -527,8 +541,9 @@ void HoldingSpaceKeyedService::OnPersistenceRestored( std::vector<std::unique_ptr<HoldingSpaceItem>> restored_items) { AddItems(std::move(restored_items), /*allow_duplicates=*/false); - for (auto& delegate : delegates_) + for (auto& delegate : delegates_) { delegate->NotifyPersistenceRestored(); + } } void HoldingSpaceKeyedService::MakeDriveItemAvailableOffline( @@ -537,11 +552,13 @@ drive::DriveIntegrationServiceFactory::GetForProfile(profile_); bool drive_fs_mounted = drive_service && drive_service->IsMounted(); - if (!drive_fs_mounted) + if (!drive_fs_mounted) { return; + } - if (!drive_service->GetDriveFsInterface()) + if (!drive_service->GetDriveFsInterface()) { return; + } base::FilePath path; if (drive_service->GetRelativeDrivePath(file_system_url.path(), &path)) { @@ -565,8 +582,9 @@ placeholder_image_skia_resolver) { const GURL file_system_url = holding_space_util::ResolveFileSystemUrl(profile_, file_path); - if (file_system_url.is_empty()) + if (file_system_url.is_empty()) { return nullptr; + } return HoldingSpaceItem::CreateFileBackedItem( type,
diff --git a/chrome/browser/ui/ash/holding_space/holding_space_keyed_service_browsertest.cc b/chrome/browser/ui/ash/holding_space/holding_space_keyed_service_browsertest.cc index a9c0f0b4..73fdff6 100644 --- a/chrome/browser/ui/ash/holding_space/holding_space_keyed_service_browsertest.cc +++ b/chrome/browser/ui/ash/holding_space/holding_space_keyed_service_browsertest.cc
@@ -93,8 +93,9 @@ "%s.txt", base::UnguessableToken::Create().ToString().c_str()))); base::ScopedAllowBlockingForTesting allow_blocking; - if (!base::CreateDirectory(path.DirName())) + if (!base::CreateDirectory(path.DirName())) { return base::FilePath(); + } if (!base::WriteFile(path, /*data=*/std::string())) { return base::FilePath(); } @@ -144,8 +145,9 @@ [&predicate](const auto& item) { return predicate.Run(item.get()); }); DCHECK(item_it != model->items().end()); - if (item_it->get()->IsInitialized()) + if (item_it->get()->IsInitialized()) { return; + } testing::NiceMock<MockHoldingSpaceModelObserver> mock; base::ScopedObservation<HoldingSpaceModel, HoldingSpaceModelObserver> @@ -155,8 +157,9 @@ base::RunLoop run_loop; ON_CALL(mock, OnHoldingSpaceItemInitialized) .WillByDefault([&](const HoldingSpaceItem* item) { - if (item == item_it->get()) + if (item == item_it->get()) { run_loop.Quit(); + } }); ON_CALL(mock, OnHoldingSpaceItemsRemoved) .WillByDefault([&](const std::vector<const HoldingSpaceItem*>& items) { @@ -240,8 +243,9 @@ // InProcessBrowserTest: bool SetUpUserDataDirectory() override { base::FilePath user_data_dir; - if (!base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir)) + if (!base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir)) { return false; + } // Mount test volumes under user data dir to ensure it gets persisted after // PRE test runs.
diff --git a/chrome/browser/ui/ash/holding_space/holding_space_keyed_service_factory.cc b/chrome/browser/ui/ash/holding_space/holding_space_keyed_service_factory.cc index 597f1af4..448a7fa 100644 --- a/chrome/browser/ui/ash/holding_space/holding_space_keyed_service_factory.cc +++ b/chrome/browser/ui/ash/holding_space/holding_space_keyed_service_factory.cc
@@ -71,8 +71,9 @@ Profile* const profile = Profile::FromBrowserContext(context); // Guest sessions are supported but redirect to the primary OTR profile. - if (profile->IsGuestSession()) + if (profile->IsGuestSession()) { return profile->GetPrimaryOTRProfile(/*create_if_needed=*/true); + } // Don't create the service for OTR profiles outside of guest sessions. return profile->IsOffTheRecord() ? nullptr : context; @@ -94,8 +95,9 @@ DCHECK_EQ(profile->IsGuestSession(), profile->IsOffTheRecord()); user_manager::User* user = ProfileHelper::Get()->GetUserByProfile(profile); - if (!user) + if (!user) { return nullptr; + } if (user->GetType() == user_manager::UserType::kKioskApp) { return nullptr;
diff --git a/chrome/browser/ui/ash/holding_space/holding_space_keyed_service_unittest.cc b/chrome/browser/ui/ash/holding_space/holding_space_keyed_service_unittest.cc index 05ac94d..28650bc 100644 --- a/chrome/browser/ui/ash/holding_space/holding_space_keyed_service_unittest.cc +++ b/chrome/browser/ui/ash/holding_space/holding_space_keyed_service_unittest.cc
@@ -1616,10 +1616,9 @@ for (size_t i = 0; i < secondary_holding_space_model->items().size(); ++i) { const auto& item = secondary_holding_space_model->items()[i]; const auto& restored_item = restored_holding_space_items[i]; - EXPECT_EQ(*item, *restored_item) - << "Expected equality of values at index " << i << ":" - << "\n\tActual: " << item->id() - << "\n\rRestored: " << restored_item->id(); + EXPECT_EQ(*item, *restored_item) << "Expected equality of values at index " + << i << ":" << "\n\tActual: " << item->id() + << "\n\rRestored: " << restored_item->id(); } // Verify persisted holding space items. @@ -2240,10 +2239,9 @@ for (size_t i = 0; i < secondary_holding_space_model->items().size(); ++i) { const auto& item = secondary_holding_space_model->items()[i]; const auto& restored_item = restored_holding_space_items[i]; - EXPECT_EQ(*item, *restored_item) - << "Expected equality of values at index " << i << ":" - << "\n\tActual: " << item->id() - << "\n\rRestored: " << restored_item->id(); + EXPECT_EQ(*item, *restored_item) << "Expected equality of values at index " + << i << ":" << "\n\tActual: " << item->id() + << "\n\rRestored: " << restored_item->id(); } // Verify persisted holding space items.
diff --git a/chrome/browser/ui/ash/holding_space/holding_space_metrics_delegate.cc b/chrome/browser/ui/ash/holding_space/holding_space_metrics_delegate.cc index d04c7cb8..2255d69 100644 --- a/chrome/browser/ui/ash/holding_space/holding_space_metrics_delegate.cc +++ b/chrome/browser/ui/ash/holding_space/holding_space_metrics_delegate.cc
@@ -29,14 +29,16 @@ void HoldingSpaceMetricsDelegate::OnHoldingSpaceItemsAdded( const std::vector<const HoldingSpaceItem*>& items) { - if (!is_restoring_persistence()) + if (!is_restoring_persistence()) { RescheduleRecordTotalItemCounts(); + } } void HoldingSpaceMetricsDelegate::OnHoldingSpaceItemsRemoved( const std::vector<const HoldingSpaceItem*>& items) { - if (!is_restoring_persistence()) + if (!is_restoring_persistence()) { RescheduleRecordTotalItemCounts(); + } } void HoldingSpaceMetricsDelegate::RescheduleRecordTotalItemCounts() { @@ -51,8 +53,9 @@ void HoldingSpaceMetricsDelegate::RecordTotalItemCounts() { std::vector<const HoldingSpaceItem*> items; - for (const auto& item : model()->items()) + for (const auto& item : model()->items()) { items.push_back(item.get()); + } holding_space_metrics::RecordTotalItemCounts(items); }
diff --git a/chrome/browser/ui/ash/holding_space/holding_space_persistence_delegate.cc b/chrome/browser/ui/ash/holding_space/holding_space_persistence_delegate.cc index 6740be1..3abb6f0 100644 --- a/chrome/browser/ui/ash/holding_space/holding_space_persistence_delegate.cc +++ b/chrome/browser/ui/ash/holding_space/holding_space_persistence_delegate.cc
@@ -65,21 +65,24 @@ void HoldingSpacePersistenceDelegate::OnHoldingSpaceItemsAdded( const std::vector<const HoldingSpaceItem*>& items) { - if (is_restoring_persistence()) + if (is_restoring_persistence()) { return; + } // Write the new finalized `items` to persistent storage. ScopedListPrefUpdate update(profile()->GetPrefs(), kPersistencePath); for (const HoldingSpaceItem* item : items) { - if (item->progress().IsComplete()) + if (item->progress().IsComplete()) { update->Append(item->Serialize()); + } } } void HoldingSpacePersistenceDelegate::OnHoldingSpaceItemsRemoved( const std::vector<const HoldingSpaceItem*>& items) { - if (is_restoring_persistence()) + if (is_restoring_persistence()) { return; + } // Remove the `items` from persistent storage. ScopedListPrefUpdate update(profile()->GetPrefs(), kPersistencePath); @@ -93,12 +96,14 @@ void HoldingSpacePersistenceDelegate::OnHoldingSpaceItemUpdated( const HoldingSpaceItem* item, const HoldingSpaceItemUpdatedFields& updated_fields) { - if (is_restoring_persistence()) + if (is_restoring_persistence()) { return; + } // Only finalized items are persisted. - if (!item->progress().IsComplete()) + if (!item->progress().IsComplete()) { return; + } // Attempt to find the finalized `item` in persistent storage. ScopedListPrefUpdate update(profile()->GetPrefs(), kPersistencePath); @@ -122,8 +127,9 @@ list.Insert(item_it, base::Value(item->Serialize())); return; } - if (candidate_item->progress().IsComplete()) + if (candidate_item->progress().IsComplete()) { ++item_it; + } } // The finalized `item` should exist in the model and be handled above.
diff --git a/chrome/browser/ui/ash/holding_space/holding_space_suggestions_delegate.cc b/chrome/browser/ui/ash/holding_space/holding_space_suggestions_delegate.cc index 41428fe..6ccf6f1d 100644 --- a/chrome/browser/ui/ash/holding_space/holding_space_suggestions_delegate.cc +++ b/chrome/browser/ui/ash/holding_space/holding_space_suggestions_delegate.cc
@@ -31,8 +31,9 @@ const HoldingSpaceItem* item, std::map<HoldingSpaceItem::Type, std::vector<base::FilePath>>& suggestions_by_type) { - if (item->type() != HoldingSpaceItem::Type::kPinnedFile) + if (item->type() != HoldingSpaceItem::Type::kPinnedFile) { return false; + } for (const auto& [_, suggested_file_paths] : suggestions_by_type) { if (base::Contains(suggested_file_paths, item->file().file_path)) { @@ -127,8 +128,9 @@ FileSuggestionType type) { // A data query on `type` has been sent so it is unnecessary to send a request // again. Return early. - if (base::Contains(pending_fetches_, type)) + if (base::Contains(pending_fetches_, type)) { return; + } // Mark that the query for suggestions of `type` has been sent. pending_fetches_.insert(type); @@ -143,8 +145,9 @@ void HoldingSpaceSuggestionsDelegate::MaybeScheduleUpdateSuggestionsInModel() { // Return early if the task of updating model suggestions has been scheduled. - if (suggestion_update_timer_.IsRunning()) + if (suggestion_update_timer_.IsRunning()) { return; + } suggestion_update_timer_.Start( FROM_HERE, /*delay=*/base::TimeDelta(), @@ -159,8 +162,9 @@ size_t deleted_size = pending_fetches_.erase(type); DCHECK_EQ(1u, deleted_size); - if (!suggestions) + if (!suggestions) { return; + } // Extract file paths from `suggestions`. std::vector<base::FilePath> updated_suggestions(suggestions->size());
diff --git a/chrome/browser/ui/ash/holding_space/holding_space_test_util.cc b/chrome/browser/ui/ash/holding_space/holding_space_test_util.cc index 15dd1a57..2d57dd1 100644 --- a/chrome/browser/ui/ash/holding_space/holding_space_test_util.cc +++ b/chrome/browser/ui/ash/holding_space/holding_space_test_util.cc
@@ -118,8 +118,9 @@ HoldingSpaceModel* model, const std::vector<std::pair<HoldingSpaceItem::Type, base::FilePath>>& expected_suggestions) { - if (GetSuggestionsInModel(*model) == expected_suggestions) + if (GetSuggestionsInModel(*model) == expected_suggestions) { return; + } testing::NiceMock<MockHoldingSpaceModelObserver> mock; base::ScopedObservation<HoldingSpaceModel, HoldingSpaceModelObserver>
diff --git a/chrome/browser/ui/ash/holding_space/holding_space_ui_browsertest.cc b/chrome/browser/ui/ash/holding_space/holding_space_ui_browsertest.cc index 3d7e7da..8bdad4b 100644 --- a/chrome/browser/ui/ash/holding_space/holding_space_ui_browsertest.cc +++ b/chrome/browser/ui/ash/holding_space/holding_space_ui_browsertest.cc
@@ -224,13 +224,15 @@ // Waits for the specified `label` to have the desired `text`. void WaitForText(views::Label* label, const std::u16string& text) { - if (label->GetText() == text) + if (label->GetText() == text) { return; + } base::RunLoop run_loop; auto subscription = label->AddTextChangedCallback(base::BindLambdaForTesting([&]() { - if (label->GetText() == text) + if (label->GetText() == text) { run_loop.Quit(); + } })); run_loop.Run(); } @@ -252,8 +254,9 @@ void SetFilenamesData(const std::vector<base::FilePath> file_paths) { std::vector<ui::FileInfo> filenames; - for (const base::FilePath& file_path : file_paths) + for (const base::FilePath& file_path : file_paths) { filenames.emplace_back(file_path, /*display_name=*/base::FilePath()); + } filenames_data_.emplace(std::move(filenames)); } @@ -263,8 +266,9 @@ constexpr char16_t kFileSystemSourcesType[] = u"fs/sources"; std::stringstream file_system_sources; - for (const GURL& file_system_url : file_system_urls) + for (const GURL& file_system_url : file_system_urls) { file_system_sources << file_system_url.spec() << "\n"; + } base::Pickle pickle; ui::WriteCustomDataToPickle( @@ -306,8 +310,9 @@ /*cursor_offset=*/gfx::Vector2d()); // Payload. - if (filenames_data_) + if (filenames_data_) { data->provider().SetFilenames(filenames_data_.value()); + } if (file_system_sources_data_) { data->provider().SetPickledData( ui::ClipboardFormatType::DataTransferCustomType(), @@ -521,10 +526,11 @@ // Sets data on `sender()` at the storage location specified by test params. void SetSenderData(const std::vector<base::FilePath>& file_paths) { - if (ShouldStoreDataIn(StorageLocationFlag::kFilenames)) + if (ShouldStoreDataIn(StorageLocationFlag::kFilenames)) { sender()->SetFilenamesData(file_paths); - else + } else { sender()->ClearFilenamesData(); + } if (!ShouldStoreDataIn(StorageLocationFlag::kFileSystemSources)) { sender()->ClearFileSystemSourcesData(); @@ -929,8 +935,9 @@ user_interactions.push_back(base::BindOnce(&DoubleClick)); user_interactions.push_back(base::BindOnce(&GestureTap)); user_interactions.push_back(base::BindOnce([](const views::View* view) { - while (!view->HasFocus()) + while (!view->HasFocus()) { PressAndReleaseKey(ui::KeyboardCode::VKEY_TAB); + } PressAndReleaseKey(ui::KeyboardCode::VKEY_RETURN); })); @@ -952,8 +959,9 @@ .WillRepeatedly( [&](wm::ActivationChangeObserver::ActivationReason reason, aura::Window* gained_active, aura::Window* lost_active) { - if (gained_active->GetTitle() == u"Gallery") + if (gained_active->GetTitle() == u"Gallery") { run_loop.Quit(); + } }); run_loop.Run(); @@ -1162,8 +1170,9 @@ // Add enough pinned items for there to be multiple rows in the section. constexpr size_t kNumPinnedItems = 3u; - for (size_t i = 0; i < kNumPinnedItems; ++i) + for (size_t i = 0; i < kNumPinnedItems; ++i) { AddPinnedFile(); + } test_api().Show(); ASSERT_TRUE(test_api().IsShowing()); @@ -1366,8 +1375,9 @@ void TearDownOnMainThread() override { HoldingSpaceUiBrowserTest::TearDownOnMainThread(); - for (auto& observer : download_manager_observers_) + for (auto& observer : download_manager_observers_) { observer.ManagerGoingDown(download_manager_); + } } using AshDownload = testing::NiceMock<download::MockDownloadItem>; @@ -1656,8 +1666,9 @@ }); // Notify observers of the created download. - for (auto& observer : download_manager_observers_) + for (auto& observer : download_manager_observers_) { observer.OnDownloadCreated(download_manager_, ash_download_item.get()); + } return ash_download_item; }
diff --git a/chrome/browser/ui/ash/holding_space/holding_space_util.cc b/chrome/browser/ui/ash/holding_space/holding_space_util.cc index 6bd507e..7a2dc17 100644 --- a/chrome/browser/ui/ash/holding_space/holding_space_util.cc +++ b/chrome/browser/ui/ash/holding_space/holding_space_util.cc
@@ -127,8 +127,9 @@ bool valid = true; const ValidityRequirement& requirement = file_path_with_requirement.second; - if (requirement.must_exist) + if (requirement.must_exist) { valid = result == base::File::Error::FILE_OK; + } if (valid && requirement.must_be_newer_than) { valid = file_info.creation_time > @@ -145,8 +146,9 @@ FilePathList file_paths, PartitionFilePathsByExistenceCallback callback) { FilePathsWithValidityRequirements file_paths_with_requirements; - for (const auto& file_path : file_paths) + for (const auto& file_path : file_paths) { file_paths_with_requirements.push_back({file_path, /*requirements=*/{}}); + } PartitionFilePathsByValidity(profile, file_paths_with_requirements, std::move(callback)); } @@ -168,8 +170,9 @@ auto* invalid_file_paths_ptr = invalid_file_paths.get(); FilePathList file_paths; - for (const auto& file_path_with_requirement : file_paths_with_requirements) + for (const auto& file_path_with_requirement : file_paths_with_requirements) { file_paths.push_back(file_path_with_requirement.first); + } // This `barrier_closure` will be run after verifying the existence of all // `file_paths`. It is expected that both `valid_file_paths` and @@ -190,8 +193,9 @@ FilePathList temp_file_paths; temp_file_paths.swap(*file_paths); for (const auto& file_path : sorted_file_paths) { - if (base::Contains(temp_file_paths, file_path)) + if (base::Contains(temp_file_paths, file_path)) { file_paths->push_back(file_path); + } } }; sort(valid_file_paths.get()); @@ -214,10 +218,11 @@ [](base::FilePath file_path, FilePathList* valid_file_paths, FilePathList* invalid_file_paths, base::RepeatingClosure barrier_closure, bool exists) { - if (exists) + if (exists) { valid_file_paths->push_back(file_path); - else + } else { invalid_file_paths->push_back(file_path); + } barrier_closure.Run(); }, file_path_with_requirement.first, @@ -268,8 +273,9 @@ [](const base::WeakPtr<ThumbnailLoader>& thumbnail_loader, const base::FilePath& file_path, const gfx::Size& size, HoldingSpaceImage::BitmapCallback callback) { - if (thumbnail_loader) + if (thumbnail_loader) { thumbnail_loader->Load({file_path, size}, std::move(callback)); + } }, thumbnail_loader->GetWeakPtr()), /*placeholder_image_skia_resolver=*/ @@ -282,8 +288,9 @@ // When the initial placeholder is being created during // construction, `dark_background` and `is_folder` will be absent. // In that case, don't show a placeholder to minimize jank. - if (!dark_background.has_value() && !is_folder.has_value()) + if (!dark_background.has_value() && !is_folder.has_value()) { return image_util::CreateEmptyImage(size); + } // If an explicit `placeholder_image_skia_resolver` has been // specified, use it to create the appropriate placeholder image. if (!placeholder_image_skia_resolver.is_null()) {
diff --git a/chrome/browser/ui/ash/holding_space/scoped_test_mount_point.cc b/chrome/browser/ui/ash/holding_space/scoped_test_mount_point.cc index b9f2e22..90b79514 100644 --- a/chrome/browser/ui/ash/holding_space/scoped_test_mount_point.cc +++ b/chrome/browser/ui/ash/holding_space/scoped_test_mount_point.cc
@@ -75,10 +75,12 @@ const base::FilePath& relative_path, const std::string& content) { const base::FilePath path = GetRootPath().Append(relative_path); - if (!base::CreateDirectory(path.DirName())) + if (!base::CreateDirectory(path.DirName())) { return base::FilePath(); - if (!base::WriteFile(path, content)) + } + if (!base::WriteFile(path, content)) { return base::FilePath(); + } return path; }
diff --git a/chrome/browser/ui/ash/in_session_auth/in_session_auth_dialog_client.cc b/chrome/browser/ui/ash/in_session_auth/in_session_auth_dialog_client.cc index 2a547e3..37755ad 100644 --- a/chrome/browser/ui/ash/in_session_auth/in_session_auth_dialog_client.cc +++ b/chrome/browser/ui/ash/in_session_auth/in_session_auth_dialog_client.cc
@@ -296,8 +296,9 @@ std::move(pending_auth_state_->callback).Run(false); } else { // TODO(b:241256423): Tell cryptohome to release WebAuthN secret. - if (authenticated_by_password) + if (authenticated_by_password) { OnPasswordAuthSuccess(*user_context_); + } std::move(pending_auth_state_->callback).Run(true); } @@ -309,8 +310,9 @@ ash::quick_unlock::QuickUnlockStorage* quick_unlock_storage = ash::quick_unlock::QuickUnlockFactory::GetForAccountId( user_context.GetAccountId()); - if (quick_unlock_storage) + if (quick_unlock_storage) { quick_unlock_storage->MarkStrongAuth(); + } } void InSessionAuthDialogClient::AuthenticateUserWithFingerprint( @@ -321,8 +323,9 @@ void InSessionAuthDialogClient::OnFingerprintScan( const ::user_data_auth::FingerprintScanResult& result) { - if (!fingerprint_scan_done_callback_) + if (!fingerprint_scan_done_callback_) { return; + } switch (result) { case user_data_auth::FINGERPRINT_SCAN_RESULT_SUCCESS:
diff --git a/chrome/browser/ui/ash/input_method/ime_controller_client_impl.cc b/chrome/browser/ui/ash/input_method/ime_controller_client_impl.cc index 70be4375..a37c50b 100644 --- a/chrome/browser/ui/ash/input_method/ime_controller_client_impl.cc +++ b/chrome/browser/ui/ash/input_method/ime_controller_client_impl.cc
@@ -31,8 +31,9 @@ DCHECK(input_method_manager_); input_method_manager_->AddObserver(this); input_method_manager_->AddImeMenuObserver(this); - if (input_method_manager_->GetImeKeyboard()) + if (input_method_manager_->GetImeKeyboard()) { observation_.Observe(input_method_manager_->GetImeKeyboard()); + } InputMethodMenuManager::GetInstance()->AddObserver(this); // This does not need to send the initial state to ash because that happens @@ -72,23 +73,26 @@ void ImeControllerClientImpl::SwitchToNextIme() { InputMethodManager::State* state = input_method_manager_->GetActiveIMEState().get(); - if (state) + if (state) { state->SwitchToNextInputMethod(); + } } void ImeControllerClientImpl::SwitchToLastUsedIme() { InputMethodManager::State* state = input_method_manager_->GetActiveIMEState().get(); - if (state) + if (state) { state->SwitchToLastUsedInputMethod(); + } } void ImeControllerClientImpl::SwitchImeById(const std::string& id, bool show_message) { InputMethodManager::State* state = input_method_manager_->GetActiveIMEState().get(); - if (state) + if (state) { state->ChangeInputMethod(id, show_message); + } } void ImeControllerClientImpl::ActivateImeMenuItem(const std::string& key) { @@ -98,8 +102,9 @@ void ImeControllerClientImpl::SetCapsLockEnabled(bool caps_enabled) { ash::input_method::ImeKeyboard* keyboard = InputMethodManager::Get()->GetImeKeyboard(); - if (keyboard) + if (keyboard) { keyboard->SetCapsLockEnabled(caps_enabled); + } } void ImeControllerClientImpl::OverrideKeyboardKeyset( @@ -117,8 +122,9 @@ ash::IMECandidateWindowHandlerInterface* cw_handler = ash::IMEBridge::Get()->GetCandidateWindowHandler(); - if (!cw_handler) + if (!cw_handler) { return; + } gfx::Rect anchor_bounds = cw_handler->GetCursorBounds(); if (anchor_bounds == gfx::Rect()) { @@ -140,8 +146,9 @@ Profile* profile, bool show_message) { RefreshIme(); - if (show_message) + if (show_message) { ShowModeIndicator(); + } } // ash::input_method::InputMethodManager::ImeMenuObserver:
diff --git a/chrome/browser/ui/ash/input_method/ime_controller_client_impl_unittest.cc b/chrome/browser/ui/ash/input_method/ime_controller_client_impl_unittest.cc index e8598a29..7436bdd 100644 --- a/chrome/browser/ui/ash/input_method/ime_controller_client_impl_unittest.cc +++ b/chrome/browser/ui/ash/input_method/ime_controller_client_impl_unittest.cc
@@ -77,15 +77,17 @@ const InputMethodDescriptor* GetInputMethodFromId( const std::string& input_method_id) const override { for (const InputMethodDescriptor& descriptor : input_methods_) { - if (input_method_id == descriptor.id()) + if (input_method_id == descriptor.id()) { return &descriptor; + } } return nullptr; } InputMethodDescriptor GetCurrentInputMethod() const override { for (const InputMethodDescriptor& descriptor : input_methods_) { - if (current_ime_id_ == descriptor.id()) + if (current_ime_id_ == descriptor.id()) { return descriptor; + } } return InputMethodUtil::GetFallbackInputMethodDescriptor(); }
diff --git a/chrome/browser/ui/ash/keyboard/chrome_keyboard_bounds_observer.cc b/chrome/browser/ui/ash/keyboard/chrome_keyboard_bounds_observer.cc index c7b42c5..d85ef925 100644 --- a/chrome/browser/ui/ash/keyboard/chrome_keyboard_bounds_observer.cc +++ b/chrome/browser/ui/ash/keyboard/chrome_keyboard_bounds_observer.cc
@@ -32,16 +32,18 @@ content::RenderWidgetHost::GetRenderWidgetHosts()); while (content::RenderWidgetHost* host = hosts->GetNextHost()) { content::RenderWidgetHostView* view = host->GetView(); - if (view && window->Contains(view->GetNativeView())) + if (view && window->Contains(view->GetNativeView())) { return view; + } } return nullptr; } ui::InputMethod* GetCurrentInputMethod() { ash::IMEBridge* bridge = ash::IMEBridge::Get(); - if (bridge && bridge->GetInputContextHandler()) + if (bridge && bridge->GetInputContextHandler()) { return bridge->GetInputContextHandler()->GetInputMethod(); + } return nullptr; } @@ -70,8 +72,9 @@ while (content::RenderWidgetHost* host = hosts->GetNextHost()) { content::RenderWidgetHostView* view = host->GetView(); - if (view) + if (view) { view->NotifyVirtualKeyboardOverlayRect(screen_bounds); + } } } @@ -97,8 +100,9 @@ if (occluded_bounds_in_screen_.IsEmpty()) { while (content::RenderWidgetHost* host = hosts->GetNextHost()) { content::RenderWidgetHostView* view = host->GetView(); - if (view) + if (view) { view->SetInsets(gfx::Insets()); + } } RemoveAllObservedWindows(); return; @@ -111,18 +115,21 @@ content::RenderWidgetHostView* view = host->GetView(); // Can be null, e.g. if the RenderWidget is being destroyed or // the render process crashed. - if (!view) + if (!view) { continue; + } aura::Window* window = view->GetNativeView(); // Added while we determine if RenderWidgetHostViewChildFrame can be // changed to always return a non-null value: https://crbug.com/644726. // If we cannot guarantee a non-null value, then this may need to stay. - if (!window) + if (!window) { continue; + } - if (!ShouldWindowOverscroll(window)) + if (!ShouldWindowOverscroll(window)) { continue; + } UpdateInsets(window, view); AddObservedWindow(window); @@ -132,24 +139,27 @@ // visible. Do this here because the widget bounds change happens before the // occluded bounds are updated. https://crbug.com/937722 ui::InputMethod* ime = GetCurrentInputMethod(); - if (ime && ime->GetTextInputClient()) + if (ime && ime->GetTextInputClient()) { ime->GetTextInputClient()->EnsureCaretNotInRect(occluded_bounds_in_screen_); + } } void ChromeKeyboardBoundsObserver::AddObservedWindow(aura::Window* window) { // Only observe top level widget. views::Widget* widget = views::Widget::GetWidgetForNativeView(window->GetToplevelWindow()); - if (!widget || widget->HasObserver(this)) + if (!widget || widget->HasObserver(this)) { return; + } widget->AddObserver(this); observed_widgets_.insert(widget); } void ChromeKeyboardBoundsObserver::RemoveAllObservedWindows() { - for (views::Widget* widget : observed_widgets_) + for (views::Widget* widget : observed_widgets_) { widget->RemoveObserver(this); + } observed_widgets_.clear(); } @@ -160,19 +170,22 @@ << new_bounds.ToString(); aura::Window* window = widget->GetNativeView(); - if (!ShouldWindowOverscroll(window)) + if (!ShouldWindowOverscroll(window)) { return; + } content::RenderWidgetHostView* host_view = GetHostViewForWindow(window); - if (!host_view) + if (!host_view) { return; // Transition edge case + } UpdateInsets(window, host_view); } void ChromeKeyboardBoundsObserver::OnWidgetDestroying(views::Widget* widget) { - if (widget->HasObserver(this)) + if (widget->HasObserver(this)) { widget->RemoveObserver(this); + } observed_widgets_.erase(widget); } @@ -197,24 +210,27 @@ DVLOG(2) << "SetInsets: " << window->GetName() << " Bounds: " << view_bounds_in_screen.ToString() << " Overlap: " << overlap; - if (overlap > 0 && overlap < view_bounds_in_screen.height()) + if (overlap > 0 && overlap < view_bounds_in_screen.height()) { view->SetInsets(gfx::Insets::TLBR(0, 0, overlap, 0)); - else + } else { view->SetInsets(gfx::Insets()); + } } bool ChromeKeyboardBoundsObserver::ShouldWindowOverscroll( aura::Window* window) { // The virtual keyboard should not overscroll. - if (window->GetToplevelWindow() == keyboard_window_->GetToplevelWindow()) + if (window->GetToplevelWindow() == keyboard_window_->GetToplevelWindow()) { return false; + } // IME windows should not overscroll. extensions::AppWindow* app_window = AppWindowRegistryUtil::GetAppWindowForNativeWindowAnyProfile( window->GetToplevelWindow()); - if (app_window && app_window->is_ime_window()) + if (app_window && app_window->is_ime_window()) { return false; + } return true; }
diff --git a/chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client.cc b/chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client.cc index fefb05bc..3dd12fc 100644 --- a/chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client.cc +++ b/chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client.cc
@@ -120,8 +120,9 @@ keyboard_controller_ = nullptr; } - if (session_manager::SessionManager::Get()) + if (session_manager::SessionManager::Get()) { session_manager::SessionManager::Get()->RemoveObserver(this); + } pref_change_registrar_.reset(); if (keyboard::KeyboardUIController::HasInstance()) { @@ -143,8 +144,9 @@ void ChromeKeyboardControllerClient::NotifyKeyboardLoaded() { DVLOG(1) << "NotifyKeyboardLoaded: " << is_keyboard_loaded_; is_keyboard_loaded_ = true; - for (auto& observer : observers_) + for (auto& observer : observers_) { observer.OnKeyboardLoaded(); + } } keyboard::KeyboardConfig ChromeKeyboardControllerClient::GetKeyboardConfig() { @@ -187,8 +189,9 @@ void ChromeKeyboardControllerClient::ReloadKeyboardIfNeeded() { // |keyboard_controller_| may be null if the keyboard reloads during shutdown. - if (keyboard_controller_) + if (keyboard_controller_) { keyboard_controller_->ReloadKeyboardIfNeeded(); + } } void ChromeKeyboardControllerClient::RebuildKeyboardIfEnabled() { @@ -248,17 +251,20 @@ } GURL ChromeKeyboardControllerClient::GetVirtualKeyboardUrl() { - if (!virtual_keyboard_url_for_test_.is_empty()) + if (!virtual_keyboard_url_for_test_.is_empty()) { return virtual_keyboard_url_for_test_; + } auto* ime_manager = ash::input_method::InputMethodManager::Get(); - if (!ime_manager || !ime_manager->GetActiveIMEState()) + if (!ime_manager || !ime_manager->GetActiveIMEState()) { return GURL(keyboard::kKeyboardURL); + } const GURL& input_view_url = ime_manager->GetActiveIMEState()->GetInputViewUrl(); - if (!input_view_url.is_valid()) + if (!input_view_url.is_valid()) { return GURL(keyboard::kKeyboardURL); + } return input_view_url; } @@ -278,11 +284,13 @@ bool was_enabled = is_keyboard_enabled_; is_keyboard_enabled_ = enabled; - for (auto& observer : observers_) + for (auto& observer : observers_) { observer.OnKeyboardEnabledChanged(is_keyboard_enabled_); + } - if (enabled || !was_enabled) + if (enabled || !was_enabled) { return; + } // When the keyboard becomes disabled, send the onKeyboardClosed event. @@ -306,8 +314,9 @@ // Only notify extensions after the initial config is received. bool notify = !!cached_keyboard_config_; cached_keyboard_config_ = std::move(config); - if (!notify) + if (!notify) { return; + } extensions::VirtualKeyboardAPI* api = extensions::BrowserContextKeyedAPIFactory< extensions::VirtualKeyboardAPI>::Get(GetProfile()); @@ -316,22 +325,25 @@ void ChromeKeyboardControllerClient::OnKeyboardVisibilityChanged(bool visible) { is_keyboard_visible_ = visible; - for (auto& observer : observers_) + for (auto& observer : observers_) { observer.OnKeyboardVisibilityChanged(visible); + } } void ChromeKeyboardControllerClient::OnKeyboardVisibleBoundsChanged( const gfx::Rect& screen_bounds) { DVLOG(1) << "OnKeyboardVisibleBoundsChanged: " << screen_bounds.ToString(); - if (keyboard_contents_) + if (keyboard_contents_) { keyboard_contents_->SetInitialContentsSize(screen_bounds.size()); + } for (auto& observer : observers_) { observer.OnKeyboardVisibleBoundsChanged(screen_bounds); } - if (!GetKeyboardWindow()) + if (!GetKeyboardWindow()) { return; + } Profile* profile = GetProfile(); extensions::EventRouter* router = extensions::EventRouter::Get(profile); @@ -360,11 +372,13 @@ void ChromeKeyboardControllerClient::OnKeyboardOccludedBoundsChanged( const gfx::Rect& screen_bounds) { - if (!GetKeyboardWindow()) + if (!GetKeyboardWindow()) { return; + } DVLOG(1) << "OnKeyboardOccludedBoundsChanged: " << screen_bounds.ToString(); - for (auto& observer : observers_) + for (auto& observer : observers_) { observer.OnKeyboardOccludedBoundsChanged(screen_bounds); + } } void ChromeKeyboardControllerClient::OnLoadKeyboardContentsRequested() { @@ -456,8 +470,9 @@ } Profile* ChromeKeyboardControllerClient::GetProfile() { - if (profile_for_test_) + if (profile_for_test_) { return profile_for_test_; + } // Always use the active profile for generating keyboard events so that any // virtual keyboard extensions associated with the active user are notified.
diff --git a/chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client_test_helper.cc b/chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client_test_helper.cc index 5712b2d9c..2902f67 100644 --- a/chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client_test_helper.cc +++ b/chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client_test_helper.cc
@@ -36,13 +36,15 @@ bool IsKeyboardEnabled() override { return enabled_; } void SetEnableFlag(keyboard::KeyboardEnableFlag flag) override { keyboard_enable_flags_.insert(flag); - for (auto& observer : observers_) + for (auto& observer : observers_) { observer.OnKeyboardEnableFlagsChanged(keyboard_enable_flags_); + } } void ClearEnableFlag(keyboard::KeyboardEnableFlag flag) override { keyboard_enable_flags_.erase(flag); - for (auto& observer : observers_) + for (auto& observer : observers_) { observer.OnKeyboardEnableFlagsChanged(keyboard_enable_flags_); + } } const std::set<keyboard::KeyboardEnableFlag>& GetEnableFlags() override { return keyboard_enable_flags_;
diff --git a/chrome/browser/ui/ash/keyboard/chrome_keyboard_ui.cc b/chrome/browser/ui/ash/keyboard/chrome_keyboard_ui.cc index 448d0cf..4d5d4124 100644 --- a/chrome/browser/ui/ash/keyboard/chrome_keyboard_ui.cc +++ b/chrome/browser/ui/ash/keyboard/chrome_keyboard_ui.cc
@@ -31,8 +31,7 @@ } // namespace ChromeKeyboardUI::ChromeKeyboardUI(content::BrowserContext* context) - : browser_context_(context) { -} + : browser_context_(context) {} ChromeKeyboardUI::~ChromeKeyboardUI() { DCHECK(!keyboard_controller());
diff --git a/chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents.cc b/chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents.cc index 28cd699..a0c24e0 100644 --- a/chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents.cc +++ b/chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents.cc
@@ -198,8 +198,9 @@ void ChromeKeyboardWebContents::SetKeyboardUrl(const GURL& new_url) { GURL old_url = web_contents_->GetURL(); - if (old_url == new_url) + if (old_url == new_url) { return; + } if (old_url.DeprecatedGetOriginAsURL() != new_url.DeprecatedGetOriginAsURL()) { @@ -216,8 +217,9 @@ } void ChromeKeyboardWebContents::SetInitialContentsSize(const gfx::Size& size) { - if (!contents_size_.IsEmpty()) + if (!contents_size_.IsEmpty()) { return; + } gfx::Rect bounds = web_contents_->GetNativeView()->bounds(); bounds.set_size(size); web_contents_->GetNativeView()->SetBounds(bounds); @@ -225,8 +227,9 @@ void ChromeKeyboardWebContents::RenderFrameCreated( content::RenderFrameHost* frame_host) { - if (!frame_host->IsInPrimaryMainFrame()) + if (!frame_host->IsInPrimaryMainFrame()) { return; + } content::HostZoomMap* zoom_map = content::HostZoomMap::GetDefaultForBrowserContext( frame_host->GetBrowserContext()); @@ -236,18 +239,21 @@ void ChromeKeyboardWebContents::DidStopLoading() { // TODO(crbug.com/40577582): Change this to a DCHECK when we change // ReloadKeyboardIfNeeded to also have a callback. - if (!load_callback_.is_null()) + if (!load_callback_.is_null()) { std::move(load_callback_).Run(); + } } void ChromeKeyboardWebContents::OnColorProviderChanged() { - if (!web_contents_) + if (!web_contents_) { return; + } auto* browser_context = web_contents_->GetBrowserContext(); - if (!browser_context) + if (!browser_context) { return; + } auto* router = extensions::EventRouter::Get(browser_context);
diff --git a/chrome/browser/ui/ash/keyboard/keyboard_controller_browsertest.cc b/chrome/browser/ui/ash/keyboard/keyboard_controller_browsertest.cc index 9f550ee7..680cf9f 100644 --- a/chrome/browser/ui/ash/keyboard/keyboard_controller_browsertest.cc +++ b/chrome/browser/ui/ash/keyboard/keyboard_controller_browsertest.cc
@@ -59,8 +59,9 @@ // ChromeKeyboardControllerClient::Observer void OnKeyboardVisibilityChanged(bool visible) override { - if (visible == visible_) + if (visible == visible_) { run_loop_.QuitWhenIdle(); + } } private: @@ -82,8 +83,9 @@ } void Wait() { - if (ChromeKeyboardControllerClient::Get()->is_keyboard_loaded()) + if (ChromeKeyboardControllerClient::Get()->is_keyboard_loaded()) { return; + } run_loop_.Run(); } @@ -141,9 +143,7 @@ ~KeyboardControllerWebContentTest() override = default; - void SetUp() override { - InProcessBrowserTest::SetUp(); - } + void SetUp() override { InProcessBrowserTest::SetUp(); } void TearDown() override { InProcessBrowserTest::TearDown(); }
diff --git a/chrome/browser/ui/ash/keyboard/keyboard_end_to_end_browsertest.cc b/chrome/browser/ui/ash/keyboard/keyboard_end_to_end_browsertest.cc index 55c6229..a3f6c17 100644 --- a/chrome/browser/ui/ash/keyboard/keyboard_end_to_end_browsertest.cc +++ b/chrome/browser/ui/ash/keyboard/keyboard_end_to_end_browsertest.cc
@@ -41,8 +41,9 @@ // ChromeKeyboardControllerClient::Observer void OnKeyboardVisibilityChanged(bool visible) override { - if (visible == visible_) + if (visible == visible_) { run_loop_.QuitWhenIdle(); + } } private:
diff --git a/chrome/browser/ui/ash/media_client/media_client_impl.cc b/chrome/browser/ui/ash/media_client/media_client_impl.cc index 3d1206e..f810427 100644 --- a/chrome/browser/ui/ash/media_client/media_client_impl.cc +++ b/chrome/browser/ui/ash/media_client/media_client_impl.cc
@@ -129,10 +129,12 @@ bool video = indicator->IsCapturingVideo(web_contents); bool audio = indicator->IsCapturingAudio(web_contents); - if (video) + if (video) { *media_state_out |= MediaCaptureState::kVideo; - if (audio) + } + if (audio) { *media_state_out |= MediaCaptureState::kAudio; + } } void GetBrowserMediaCaptureState(const MediaStreamCaptureIndicator* indicator, @@ -145,11 +147,13 @@ TabStripModel* tab_strip_model = (*iter)->tab_strip_model(); for (int i = 0; i < tab_strip_model->count(); ++i) { content::WebContents* web_contents = tab_strip_model->GetWebContentsAt(i); - if (web_contents->GetBrowserContext() != context) + if (web_contents->GetBrowserContext() != context) { continue; + } GetMediaCaptureState(indicator, web_contents, media_state_out); - if (*media_state_out == MediaCaptureState::kAudioVideo) + if (*media_state_out == MediaCaptureState::kAudioVideo) { return; + } } } } @@ -163,8 +167,9 @@ apps.begin(); iter != apps.end(); ++iter) { GetMediaCaptureState(indicator, (*iter)->web_contents(), media_state_out); - if (*media_state_out == MediaCaptureState::kAudioVideo) + if (*media_state_out == MediaCaptureState::kAudioVideo) { return; + } } } @@ -176,18 +181,21 @@ content::WebContents* web_contents = content::WebContents::FromRenderFrameHost(host); // RFH may not have web contents. - if (!web_contents) + if (!web_contents) { continue; + } GetMediaCaptureState(indicator, web_contents, media_state_out); - if (*media_state_out == MediaCaptureState::kAudioVideo) + if (*media_state_out == MediaCaptureState::kAudioVideo) { return; + } } } MediaCaptureState GetMediaCaptureStateOfAllWebContents( content::BrowserContext* context) { - if (!context) + if (!context) { return MediaCaptureState::kNone; + } scoped_refptr<MediaStreamCaptureIndicator> indicator = MediaCaptureDevicesDispatcher::GetInstance() @@ -196,13 +204,15 @@ MediaCaptureState media_state = MediaCaptureState::kNone; // Browser windows GetBrowserMediaCaptureState(indicator.get(), context, &media_state); - if (media_state == MediaCaptureState::kAudioVideo) + if (media_state == MediaCaptureState::kAudioVideo) { return MediaCaptureState::kAudioVideo; + } // App windows GetAppMediaCaptureState(indicator.get(), context, &media_state); - if (media_state == MediaCaptureState::kAudioVideo) + if (media_state == MediaCaptureState::kAudioVideo) { return MediaCaptureState::kAudioVideo; + } // Extensions GetExtensionMediaCaptureState(indicator.get(), context, &media_state); @@ -277,8 +287,9 @@ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); g_media_client = nullptr; - if (media_controller_ && ash::MediaController::Get() == media_controller_) + if (media_controller_ && ash::MediaController::Get() == media_controller_) { media_controller_->SetClient(nullptr); + } MediaCaptureDevicesDispatcher::GetInstance()->RemoveObserver(this); BrowserList::RemoveObserver(this); @@ -354,8 +365,9 @@ } const user_manager::User* primary_user = manager->GetPrimaryUser(); - if (primary_user) + if (primary_user) { capture_states[primary_user->GetAccountId()] |= vm_media_capture_state_; + } media_controller_->NotifyCaptureState(std::move(capture_states)); } @@ -389,10 +401,12 @@ ash::VmCameraMicManager* manager) { using DeviceType = ash::VmCameraMicManager::DeviceType; vm_media_capture_state_ = MediaCaptureState::kNone; - if (manager->IsDeviceActive(DeviceType::kCamera)) + if (manager->IsDeviceActive(DeviceType::kCamera)) { vm_media_capture_state_ |= MediaCaptureState::kVideo; - if (manager->IsDeviceActive(DeviceType::kMic)) + } + if (manager->IsDeviceActive(DeviceType::kMic)) { vm_media_capture_state_ |= MediaCaptureState::kAudio; + } media_controller_->NotifyVmMediaNotificationState( manager->IsNotificationActive( @@ -486,8 +500,9 @@ void MediaClientImpl::DisableCustomMediaKeyHandler( content::BrowserContext* context, ui::MediaKeysListener::Delegate* delegate) { - if (!base::Contains(media_key_delegates_, context)) + if (!base::Contains(media_key_delegates_, context)) { return; + } auto it = media_key_delegates_.find(context); DCHECK_EQ(it->second, delegate); @@ -500,8 +515,9 @@ void MediaClientImpl::UpdateForceMediaClientKeyHandling() { bool enabled = GetCurrentMediaKeyDelegate() != nullptr; - if (enabled == is_forcing_media_client_key_handling_) + if (enabled == is_forcing_media_client_key_handling_) { return; + } is_forcing_media_client_key_handling_ = enabled; @@ -511,8 +527,9 @@ ui::MediaKeysListener::Delegate* MediaClientImpl::GetCurrentMediaKeyDelegate() const { auto it = media_key_delegates_.find(active_context_); - if (it != media_key_delegates_.end()) + if (it != media_key_delegates_.end()) { return it->second; + } return nullptr; } @@ -526,13 +543,15 @@ // This API is used by Chrome apps so we should use the logged in user here. extensions::MediaPlayerAPI* player_api = extensions::MediaPlayerAPI::Get(ProfileManager::GetActiveUserProfile()); - if (!player_api) + if (!player_api) { return; + } extensions::MediaPlayerEventRouter* router = player_api->media_player_event_router(); - if (!router) + if (!router) { return; + } switch (keycode) { case ui::VKEY_MEDIA_NEXT_TRACK:
diff --git a/chrome/browser/ui/ash/multi_user/multi_profile_support.cc b/chrome/browser/ui/ash/multi_user/multi_profile_support.cc index 8b3acae2..774c7d8 100644 --- a/chrome/browser/ui/ash/multi_user/multi_profile_support.cc +++ b/chrome/browser/ui/ash/multi_user/multi_profile_support.cc
@@ -78,8 +78,9 @@ // Remove all app observers. ProfileManager* profile_manager = g_browser_process->profile_manager(); // might be nullptr in unit tests. - if (!profile_manager) + if (!profile_manager) { return; + } std::vector<Profile*> profiles = profile_manager->GetLoadedProfiles(); for (auto it = profiles.begin(); it != profiles.end(); ++it) { @@ -106,8 +107,9 @@ // Add an app window observer & all already running apps. Profile* profile = multi_user_util::GetProfileFromAccountId(current_account_id); - if (profile) + if (profile) { AddUser(profile); + } } void MultiProfileSupport::AddUser(content::BrowserContext* context) { @@ -115,8 +117,9 @@ const AccountId& account_id( multi_user_util::GetAccountIdFromProfile(profile)); if (account_id_to_app_observer_.find(account_id) != - account_id_to_app_observer_.end()) + account_id_to_app_observer_.end()) { return; + } account_id_to_app_observer_[account_id] = std::make_unique<AppObserver>(account_id.GetUserEmail()); @@ -128,21 +131,24 @@ extensions::AppWindowRegistry::Get(profile)->app_windows(); extensions::AppWindowRegistry::AppWindowList::const_iterator it = app_windows.begin(); - for (; it != app_windows.end(); ++it) + for (; it != app_windows.end(); ++it) { account_id_to_app_observer_[account_id]->OnAppWindowAdded(*it); + } // Account all existing browser windows of this user accordingly. for (Browser* browser : *BrowserList::GetInstance()) { - if (browser->profile()->IsSameOrParent(profile)) + if (browser->profile()->IsSameOrParent(profile)) { OnBrowserAdded(browser); + } } } void MultiProfileSupport::OnBrowserAdded(Browser* browser) { // A unit test (e.g. CrashRestoreComplexTest.RestoreSessionForThreeUsers) can // come here with no valid window. - if (!browser->window() || !browser->window()->GetNativeWindow()) + if (!browser->window() || !browser->window()->GetNativeWindow()) { return; + } multi_user_window_manager_->SetWindowOwner( browser->window()->GetNativeWindow(), multi_user_util::GetAccountIdFromProfile(browser->profile())); @@ -187,8 +193,9 @@ ChromeShelfController* chrome_shelf_controller = ChromeShelfController::instance(); // Some unit tests have no ChromeShelfController. - if (!chrome_shelf_controller) + if (!chrome_shelf_controller) { return; + } chrome_shelf_controller->ActiveUserChanged( multi_user_window_manager_->CurrentAccountId()); }
diff --git a/chrome/browser/ui/ash/multi_user/multi_profile_support_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_profile_support_unittest.cc index 1bc996f..fe235cc 100644 --- a/chrome/browser/ui/ash/multi_user/multi_profile_support_unittest.cc +++ b/chrome/browser/ui/ash/multi_user/multi_profile_support_unittest.cc
@@ -107,8 +107,9 @@ std::unique_ptr<Browser> CreateTestBrowser(aura::Window* window, const gfx::Rect& bounds, Browser::CreateParams* params) { - if (!bounds.IsEmpty()) + if (!bounds.IsEmpty()) { window->SetBounds(bounds); + } std::unique_ptr<Browser> browser = chrome::CreateBrowserWithAuraTestWindowForParams(base::WrapUnique(window), params); @@ -186,8 +187,9 @@ // Ensures that a user with the given |account_id| exists. const user_manager::User* EnsureTestUser(const AccountId& account_id) { const user_manager::User* user = fake_user_manager_->FindUser(account_id); - if (user) + if (user) { return user; + } user = fake_user_manager_->AddUser(account_id); ash_test_helper()->test_session_controller_client()->AddUserSession( @@ -325,8 +327,9 @@ std::vector<std::unique_ptr<views::Widget>> MultiProfileSupportTest::SetUpOneWindowEachDeskForUser(AccountId account_id) { - if (!windows_.empty()) + if (!windows_.empty()) { return std::vector<std::unique_ptr<views::Widget>>(); + } std::vector<std::unique_ptr<views::Widget>> widgets; std::vector<int> container_ids = desks_util::GetDesksContainersIds(); TestShellDelegate* test_shell_delegate = @@ -374,8 +377,9 @@ std::string MultiProfileSupportTest::GetStatusImpl(bool follow_transients) { std::string s; for (size_t i = 0; i < windows_.size(); i++) { - if (i) + if (i) { s += ", "; + } if (!window(i)) { s += "D"; continue; @@ -403,8 +407,9 @@ multi_user_window_manager()->GetOwnersOfVisibleWindows(); std::vector<std::string_view> owner_list; - for (auto& owner : owners) + for (auto& owner : owners) { owner_list.push_back(owner.GetUserEmail()); + } return base::JoinString(owner_list, " "); }
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc b/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc index e389baf1..3bc2805 100644 --- a/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc +++ b/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc
@@ -62,8 +62,9 @@ aura::Window* window_, bool accepted, bool no_show_again) { - if (!accepted) + if (!accepted) { return; + } PrefService* pref = ProfileManager::GetActiveUserProfile()->GetPrefs(); pref->SetBoolean(user_manager::prefs::kMultiProfileWarningShowDismissed, @@ -85,8 +86,9 @@ // If this window is not owned, we don't show the menu addition. auto* window_manager = MultiUserWindowManagerHelper::GetWindowManager(); const AccountId& account_id = window_manager->GetWindowOwner(window); - if (!account_id.is_valid() || !window) + if (!account_id.is_valid() || !window) { return model; + } auto* menu = new MultiUserContextMenuChromeos(window); model.reset(menu); int command_id = IDC_VISIT_DESKTOP_OF_LRU_USER_NEXT;
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc index 5a68c65..1380b66 100644 --- a/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc +++ b/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/ash/multi_user/multi_user_context_menu.h" + #include <memory> #include "ash/public/cpp/multi_user_window_manager.h" @@ -14,7 +16,6 @@ #include "base/strings/stringprintf.h" #include "chrome/browser/ash/login/users/fake_chrome_user_manager.h" #include "chrome/browser/ui/ash/multi_user/multi_profile_support.h" -#include "chrome/browser/ui/ash/multi_user/multi_user_context_menu.h" #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_helper.h" #include "chrome/test/base/chrome_ash_test_base.h" #include "components/account_id/account_id.h"
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_util.cc b/chrome/browser/ui/ash/multi_user/multi_user_util.cc index 7471fab..6f6de1c 100644 --- a/chrome/browser/ui/ash/multi_user/multi_user_util.cc +++ b/chrome/browser/ui/ash/multi_user/multi_user_util.cc
@@ -39,8 +39,9 @@ MultiUserWindowManagerHelper* helper = MultiUserWindowManagerHelper::GetInstance(); // We might come here before the helper got created - or in a unit test. - if (!helper) + if (!helper) { return nullptr; + } const AccountId account_id = MultiUserWindowManagerHelper::GetWindowManager()->GetUserPresentingWindow( window); @@ -51,8 +52,9 @@ // There may be no active user in tests. const user_manager::User* active_user = user_manager::UserManager::Get()->GetActiveUser(); - if (!active_user) + if (!active_user) { return true; + } return GetAccountIdFromProfile(profile) == active_user->GetAccountId(); }
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_util_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_util_chromeos_unittest.cc index baf236f1..7e2c14a 100644 --- a/chrome/browser/ui/ash/multi_user/multi_user_util_chromeos_unittest.cc +++ b/chrome/browser/ui/ash/multi_user/multi_user_util_chromeos_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/ash/multi_user/multi_user_util.h" + #include <memory> #include "base/functional/bind.h" @@ -10,7 +12,6 @@ #include "chrome/browser/ash/login/users/fake_chrome_user_manager.h" #include "chrome/browser/signin/identity_manager_factory.h" #include "chrome/browser/signin/identity_test_environment_profile_adaptor.h" -#include "chrome/browser/ui/ash/multi_user/multi_user_util.h" #include "chrome/test/base/chrome_ash_test_base.h" #include "chrome/test/base/testing_profile.h" #include "components/account_id/account_id.h"
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_helper.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_helper.cc index b5ba2f5..3f59da6f 100644 --- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_helper.cc +++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_helper.cc
@@ -46,8 +46,9 @@ bool MultiUserWindowManagerHelper::ShouldShowAvatar(aura::Window* window) { // Session restore can open a window for the first user before the instance // is created. - if (!g_multi_user_window_manager_instance) + if (!g_multi_user_window_manager_instance) { return false; + } // Show the avatar icon if the window is on a different desktop than the // window's owner's desktop. The stub implementation does the right thing @@ -66,8 +67,9 @@ // static void MultiUserWindowManagerHelper::CreateInstanceForTest( const AccountId& account_id) { - if (g_multi_user_window_manager_instance) + if (g_multi_user_window_manager_instance) { DeleteInstance(); + } g_multi_user_window_manager_instance = new MultiUserWindowManagerHelper(account_id); g_multi_user_window_manager_instance->Init(); @@ -76,21 +78,24 @@ // static void MultiUserWindowManagerHelper::CreateInstanceForTest( std::unique_ptr<ash::MultiUserWindowManager> window_manager) { - if (g_multi_user_window_manager_instance) + if (g_multi_user_window_manager_instance) { DeleteInstance(); + } g_multi_user_window_manager_instance = new MultiUserWindowManagerHelper(std::move(window_manager)); g_multi_user_window_manager_instance->Init(); } void MultiUserWindowManagerHelper::Init() { - if (multi_profile_support_) + if (multi_profile_support_) { multi_profile_support_->Init(); + } } void MultiUserWindowManagerHelper::AddUser(content::BrowserContext* profile) { - if (multi_profile_support_) + if (multi_profile_support_) { multi_profile_support_->AddUser(profile); + } } bool MultiUserWindowManagerHelper::IsWindowOnDesktopOfUser( @@ -104,8 +109,7 @@ MultiUserWindowManagerHelper::MultiUserWindowManagerHelper( const AccountId& account_id) : multi_profile_support_( - std::make_unique<MultiProfileSupport>(account_id)) { -} + std::make_unique<MultiProfileSupport>(account_id)) {} MultiUserWindowManagerHelper::MultiUserWindowManagerHelper( std::unique_ptr<ash::MultiUserWindowManager> window_manager)
diff --git a/chrome/browser/ui/ash/multi_user/test_multi_user_window_manager.cc b/chrome/browser/ui/ash/multi_user/test_multi_user_window_manager.cc index 6e8c4e9..b1ddcfcf 100644 --- a/chrome/browser/ui/ash/multi_user/test_multi_user_window_manager.cc +++ b/chrome/browser/ui/ash/multi_user/test_multi_user_window_manager.cc
@@ -48,16 +48,19 @@ // This class is only able to handle one additional window <-> user // association beside the creation parameters. // If no association has yet been requested remember it now. - if (browser_owner_ != account_id) + if (browser_owner_ != account_id) { DCHECK(!created_window_); + } created_window_ = window; created_window_shown_for_ = account_id; - if (browser_window_ == window) + if (browser_window_ == window) { desktop_owner_ = account_id; + } - if (account_id == current_account_id_) + if (account_id == current_account_id_) { return; + } // Change the visibility of the window to update the view recursively. views::Widget* widget = views::Widget::GetWidgetForNativeView(window); @@ -77,10 +80,12 @@ const AccountId& TestMultiUserWindowManager::GetUserPresentingWindow( const aura::Window* window) const { - if (window == browser_window_) + if (window == browser_window_) { return desktop_owner_; - if (created_window_ && window == created_window_) + } + if (created_window_ && window == created_window_) { return created_window_shown_for_; + } // We can come here before the window gets registered. return browser_owner_; }
diff --git a/chrome/browser/ui/ash/network/enrollment_dialog_view.cc b/chrome/browser/ui/ash/network/enrollment_dialog_view.cc index dc9848e..bc6e1b1 100644 --- a/chrome/browser/ui/ash/network/enrollment_dialog_view.cc +++ b/chrome/browser/ui/ash/network/enrollment_dialog_view.cc
@@ -131,8 +131,9 @@ } void EnrollmentDialogView::WindowClosing() { - if (!accepted_) + if (!accepted_) { return; + } NavigateParams params(profile_, GURL(target_uri_), ui::PAGE_TRANSITION_LINK); params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB; params.window_action = NavigateParams::SHOW_WINDOW; @@ -180,8 +181,9 @@ bool EnrollmentDialogAllowed(Profile* profile) { // Enrollment dialog is currently not supported on the sign-in profile. // This also applies to lock screen, - if (ProfileHelper::IsSigninProfile(profile)) + if (ProfileHelper::IsSigninProfile(profile)) { return false; + } LoginState::LoggedInUserType user_type = LoginState::Get()->GetLoggedInUserType();
diff --git a/chrome/browser/ui/ash/network/mobile_data_notifications.cc b/chrome/browser/ui/ash/network/mobile_data_notifications.cc index c6191c46..5ebd71c 100644 --- a/chrome/browser/ui/ash/network/mobile_data_notifications.cc +++ b/chrome/browser/ui/ash/network/mobile_data_notifications.cc
@@ -68,8 +68,9 @@ void MobileDataNotifications::ActiveNetworksChanged( const std::vector<const NetworkState*>& active_networks) { - if (SessionManager::Get()->IsUserSessionBlocked()) + if (SessionManager::Get()->IsUserSessionBlocked()) { return; + } ShowOptionalMobileDataNotificationImpl(active_networks); } @@ -102,8 +103,9 @@ } void MobileDataNotifications::ShowOptionalMobileDataNotification() { - if (SessionManager::Get()->IsUserSessionBlocked()) + if (SessionManager::Get()->IsUserSessionBlocked()) { return; + } NetworkStateHandler::NetworkStateList active_networks; NetworkHandler::Get()->network_state_handler()->GetActiveNetworkListByType( @@ -115,10 +117,12 @@ const std::vector<const NetworkState*>& active_networks) { const NetworkState* first_active_network = nullptr; for (const auto* network : active_networks) { - if (network->IsConnectingState()) + if (network->IsConnectingState()) { return; // Don not show notification while connecting. - if (!first_active_network) + } + if (!first_active_network) { first_active_network = network; + } } if (!first_active_network || first_active_network->type() != shill::kTypeCellular) { @@ -127,8 +131,9 @@ // Check if we've shown this notification before. PrefService* prefs = ProfileManager::GetActiveUserProfile()->GetPrefs(); - if (!prefs->GetBoolean(prefs::kShowMobileDataNotification)) + if (!prefs->GetBoolean(prefs::kShowMobileDataNotification)) { return; + } // Prevent the notification from showing up in the future and stop any running // timers.
diff --git a/chrome/browser/ui/ash/network/mobile_data_notifications_unittest.cc b/chrome/browser/ui/ash/network/mobile_data_notifications_unittest.cc index 8f7796a8..ee8ef54 100644 --- a/chrome/browser/ui/ash/network/mobile_data_notifications_unittest.cc +++ b/chrome/browser/ui/ash/network/mobile_data_notifications_unittest.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/ui/ash/network/mobile_data_notifications.h" #include <gtest/gtest.h> + #include <memory> #include <string> #include <utility>
diff --git a/chrome/browser/ui/ash/network/network_connect_delegate.cc b/chrome/browser/ui/ash/network/network_connect_delegate.cc index 9ade2e2..e3bded7 100644 --- a/chrome/browser/ui/ash/network/network_connect_delegate.cc +++ b/chrome/browser/ui/ash/network/network_connect_delegate.cc
@@ -31,44 +31,50 @@ void NetworkConnectDelegate::ShowNetworkConfigure( const std::string& network_id) { - if (!IsUIAvailable()) + if (!IsUIAvailable()) { return; + } SystemTrayClientImpl::Get()->ShowNetworkConfigure(network_id); } void NetworkConnectDelegate::ShowNetworkSettings( const std::string& network_id) { - if (!IsUIAvailable()) + if (!IsUIAvailable()) { return; + } SystemTrayClientImpl::Get()->ShowNetworkSettings(network_id); } bool NetworkConnectDelegate::ShowEnrollNetwork(const std::string& network_id) { - if (!IsUIAvailable()) + if (!IsUIAvailable()) { return false; + } return ash::enrollment::CreateEnrollmentDialog(network_id); } void NetworkConnectDelegate::ShowMobileSetupDialog( const std::string& network_id) { - if (!IsUIAvailable()) + if (!IsUIAvailable()) { return; + } SystemTrayClientImpl::Get()->ShowSettingsCellularSetup( /*show_psim_flow=*/true); } void NetworkConnectDelegate::ShowCarrierAccountDetail( const std::string& network_id) { - if (!IsUIAvailable()) + if (!IsUIAvailable()) { return; + } ash::cellular_setup::MobileSetupDialog::ShowByNetworkId(network_id); } void NetworkConnectDelegate::ShowPortalSignin( const std::string& network_id, ash::NetworkConnect::Source source) { - if (!IsUIAvailable()) + if (!IsUIAvailable()) { return; + } ash::NetworkPortalSigninController::SigninSource signin_source; switch (source) { case ash::NetworkConnect::Source::kSettings:
diff --git a/chrome/browser/ui/ash/network/network_portal_notification_controller.cc b/chrome/browser/ui/ash/network/network_portal_notification_controller.cc index ce2aa32..8bfec96 100644 --- a/chrome/browser/ui/ash/network/network_portal_notification_controller.cc +++ b/chrome/browser/ui/ash/network/network_portal_notification_controller.cc
@@ -123,8 +123,9 @@ "chrome://net/network_portal_detector"; NetworkPortalNotificationController::NetworkPortalNotificationController() { - if (NetworkHandler::IsInitialized()) // May be null in tests. + if (NetworkHandler::IsInitialized()) { // May be null in tests. NetworkHandler::Get()->network_state_handler()->AddObserver(this); + } DCHECK(session_manager::SessionManager::Get()); session_manager::SessionManager::Get()->AddObserver(this); } @@ -133,8 +134,9 @@ if (NetworkHandler::IsInitialized()) { NetworkHandler::Get()->network_state_handler()->RemoveObserver(this); } - if (session_manager::SessionManager::Get()) + if (session_manager::SessionManager::Get()) { session_manager::SessionManager::Get()->RemoveObserver(this); + } } void NetworkPortalNotificationController::PortalStateChanged(
diff --git a/chrome/browser/ui/ash/network/network_state_notifier.cc b/chrome/browser/ui/ash/network/network_state_notifier.cc index ef71de73..e7edecb 100644 --- a/chrome/browser/ui/ash/network/network_state_notifier.cc +++ b/chrome/browser/ui/ash/network/network_state_notifier.cc
@@ -50,8 +50,9 @@ // Returns true if |shill_error| is known to be a configuration error. bool IsConfigurationError(const std::string& shill_error) { - if (shill_error.empty()) + if (shill_error.empty()) { return false; + } return shill_error == shill::kErrorPinMissing || shill_error == shill::kErrorBadPassphrase || shill_error == shill::kErrorResultInvalidPassphrase || @@ -67,8 +68,9 @@ // Error messages based on |error_name|, not network_state->GetError(). std::u16string GetConnectErrorString(const std::string& error_name) { - if (error_name == NetworkConnectionHandler::kErrorNotFound) + if (error_name == NetworkConnectionHandler::kErrorNotFound) { return l10n_util::GetStringUTF16(IDS_CHROMEOS_NETWORK_ERROR_CONNECT_FAILED); + } if (error_name == NetworkConnectionHandler::kErrorConfigureFailed) { return l10n_util::GetStringUTF16( IDS_CHROMEOS_NETWORK_ERROR_CONFIGURE_FAILED); @@ -92,10 +94,12 @@ const gfx::VectorIcon& GetErrorNotificationVectorIcon( const std::string& network_type) { - if (network_type == shill::kTypeVPN) + if (network_type == shill::kTypeVPN) { return kNotificationVpnIcon; - if (network_type == shill::kTypeCellular) + } + if (network_type == shill::kTypeCellular) { return kNotificationMobileDataOffIcon; + } return kNotificationWifiOffIcon; } @@ -141,8 +145,9 @@ // own error notification. If this is the case, there is no need to show an // additional notification for the failure to connect to the underlying Wi-Fi // network. - if (network_state && !network_state->tether_guid().empty()) + if (network_state && !network_state->tether_guid().empty()) { return false; + } // Otherwise, the connection failed notification should be shown. return true; @@ -177,8 +182,9 @@ "chrome://settings/internet/carrier-unlock"; NetworkStateNotifier::NetworkStateNotifier() { - if (!NetworkHandler::IsInitialized()) + if (!NetworkHandler::IsInitialized()) { return; + } NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler(); network_state_handler_observer_.Observe(handler); NetworkStateHandler::NetworkStateList active_networks; @@ -189,8 +195,9 @@ } NetworkStateNotifier::~NetworkStateNotifier() { - if (!NetworkHandler::IsInitialized()) + if (!NetworkHandler::IsInitialized()) { return; + } NetworkHandler::Get()->network_connection_handler()->RemoveObserver(this); } @@ -199,8 +206,9 @@ const NetworkState* network = NetworkHandler::Get()->network_state_handler()->GetNetworkState( service_path); - if (network && network->type() == shill::kTypeVPN) + if (network && network->type() == shill::kTypeVPN) { connected_vpn_.reset(); + } RemoveConnectNotification(); } @@ -254,8 +262,9 @@ const NetworkState* network = NetworkHandler::Get()->network_state_handler()->GetNetworkState( service_path); - if (network && network->type() == shill::kTypeVPN) + if (network && network->type() == shill::kTypeVPN) { connected_vpn_.reset(); + } } void NetworkStateNotifier::ActiveNetworksChanged( @@ -268,13 +277,15 @@ if (network->type() == shill::kTypeVPN) { // Make sure that if there is an edge case with two active VPNs that we // track the first active one. - if (!active_vpn) + if (!active_vpn) { active_vpn = network; + } } else if (active_non_vpn_network_guid.empty()) { // We are only interested in the "default" (first active) non virtual // network. - if (network->IsConnectingOrConnected()) + if (network->IsConnectingOrConnected()) { active_non_vpn_network_guid = network->guid(); + } } } UpdateVpnConnectionState(active_vpn); @@ -291,10 +302,12 @@ void NetworkStateNotifier::NetworkPropertiesUpdated( const NetworkState* network) { - if (network->type() != shill::kTypeCellular) + if (network->type() != shill::kTypeCellular) { return; - if (network->cellular_out_of_credits()) + } + if (network->cellular_out_of_credits()) { UpdateCellularOutOfCredits(); + } UpdateCellularActivating(network); } @@ -338,8 +351,9 @@ void NetworkStateNotifier::UpdateCellularOutOfCredits() { // Only show the notification once (reset when the primary network changes). - if (did_show_out_of_credits_) + if (did_show_out_of_credits_) { return; + } NetworkStateHandler::NetworkStateList active_networks; NetworkHandler::Get()->network_state_handler()->GetActiveNetworkListByType( @@ -347,10 +361,12 @@ const NetworkState* primary_network = nullptr; for (const auto* network : active_networks) { // Don't display notification if any network is connecting. - if (network->IsConnectingState()) + if (network->IsConnectingState()) { return; - if (!primary_network) + } + if (!primary_network) { primary_network = network; + } } if (!primary_network || @@ -511,8 +527,9 @@ shill::kPreviousErrorProperty); NET_LOG(DEBUG) << "Notify: " << log_id << ": Service.PreviousError: " << shill_error; - if (!NetworkState::ErrorIsValid(shill_error)) + if (!NetworkState::ErrorIsValid(shill_error)) { shill_error.clear(); + } } else { NET_LOG(DEBUG) << "Notify: " << log_id << ": Service.Error: " << shill_error; @@ -524,10 +541,12 @@ << ": Network.GetError(): " << network->GetError() << " shill_connect_error: " << network->shill_connect_error(); - if (shill_error.empty()) + if (shill_error.empty()) { shill_error = network->GetError(); - if (shill_error.empty()) + } + if (shill_error.empty()) { shill_error = network->shill_connect_error(); + } } if (ShillErrorIsIgnored(shill_error)) { @@ -557,8 +576,9 @@ std::optional<std::string> esim_name = network_name_util::GetESimProfileName(cellular_esim_profile_handler, network); - if (esim_name) + if (esim_name) { network_name = *esim_name; + } } if (network_name.empty() && shill_properties) { network_name = shill_property_util::GetNameFromProperties( @@ -642,11 +662,13 @@ } void NetworkStateNotifier::ShowNetworkSettings(const std::string& network_id) { - if (!system_tray_client_) + if (!system_tray_client_) { return; + } const NetworkState* network = GetNetworkStateForGuid(network_id); - if (!network) + if (!network) { return; + } std::string error = network->GetError(); if (!error.empty()) { NET_LOG(ERROR) << "Notify ShowNetworkSettings: " << NetworkId(network) @@ -662,8 +684,9 @@ } void NetworkStateNotifier::ShowSimUnlockSettings() { - if (!system_tray_client_) + if (!system_tray_client_) { return; + } NET_LOG(USER) << "Opening SIM unlock settings"; system_tray_client_->ShowSettingsSimUnlock();
diff --git a/chrome/browser/ui/ash/new_window/chrome_new_window_client.cc b/chrome/browser/ui/ash/new_window/chrome_new_window_client.cc index f8d3b66..c5cc21a 100644 --- a/chrome/browser/ui/ash/new_window/chrome_new_window_client.cc +++ b/chrome/browser/ui/ash/new_window/chrome_new_window_client.cc
@@ -105,8 +105,9 @@ // "chrome://settings/networks/?type=WiFi" returns "networks/?type=WiFi". std::string GetPathAndQuery(const GURL& url) { std::string result = url.path(); - if (!result.empty() && result[0] == '/') + if (!result.empty() && result[0] == '/') { result.erase(0, 1); + } if (url.has_query()) { result += '?'; result += url.query(); @@ -258,8 +259,9 @@ void ChromeNewWindowClient::NewWindow(bool is_incognito, bool should_trigger_session_restore) { - if (is_incognito && !IsIncognitoAllowed()) + if (is_incognito && !IsIncognitoAllowed()) { return; + } Browser* browser = chrome::FindBrowserWithActiveWindow(); Profile* profile = (browser && browser->profile()) @@ -365,8 +367,9 @@ // If the |from| is kUserInteraction, then the page will load with a user // activation. This means it will be able to autoplay media without // restriction. - if (from == OpenUrlFrom::kUserInteraction) + if (from == OpenUrlFrom::kUserInteraction) { navigate_params.was_activated = blink::mojom::WasActivatedOption::kYes; + } Navigate(&navigate_params); @@ -478,14 +481,17 @@ Browser* browser = chrome::FindBrowserWithActiveWindow(); Profile* profile = browser ? browser->profile() : nullptr; - if (!profile) + if (!profile) { profile = ProfileManager::GetActiveUserProfile(); - if (profile->IsOffTheRecord()) + } + if (profile->IsOffTheRecord()) { return; + } sessions::TabRestoreService* service = TabRestoreServiceFactory::GetForProfile(profile); - if (!service) + if (!service) { return; + } if (service->IsLoaded()) { RestoreTabUsingProfile(profile); @@ -572,12 +578,14 @@ ChromeShelfController::instance() ->shelf_model() ->GetAppWindowShelfItemController(shelf_id); - if (!app_controller) + if (!app_controller) { return; + } DCHECK_LE(app_controller->window_count(), 1lu); - if (app_controller->window_count() > 0) + if (app_controller->window_count() > 0) { app_controller->windows().front()->Close(); + } } bool ChromeNewWindowClient::IsCameraAppEnabled() {
diff --git a/chrome/browser/ui/ash/new_window/chrome_new_window_client_browsertest.cc b/chrome/browser/ui/ash/new_window/chrome_new_window_client_browsertest.cc index e6ddfda6..8f664bf2 100644 --- a/chrome/browser/ui/ash/new_window/chrome_new_window_client_browsertest.cc +++ b/chrome/browser/ui/ash/new_window/chrome_new_window_client_browsertest.cc
@@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/browser_process.h" #include "chrome/browser/ui/ash/new_window/chrome_new_window_client.h" #include "chrome/browser/apps/app_service/app_service_proxy.h" #include "chrome/browser/apps/app_service/app_service_proxy_factory.h" #include "chrome/browser/ash/profiles/profile_helper.h" +#include "chrome/browser/browser_process.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/profiles/profile_test_util.h"
diff --git a/chrome/browser/ui/ash/projector/projector_app_client_impl.cc b/chrome/browser/ui/ash/projector/projector_app_client_impl.cc index d70829a2..9c02b764 100644 --- a/chrome/browser/ui/ash/projector/projector_app_client_impl.cc +++ b/chrome/browser/ui/ash/projector/projector_app_client_impl.cc
@@ -100,8 +100,9 @@ void ProjectorAppClientImpl::OnNewScreencastPreconditionChanged( const ash::NewScreencastPrecondition& precondition) { - for (auto& observer : observers_) + for (auto& observer : observers_) { observer.OnNewScreencastPreconditionChanged(precondition); + } } const ash::PendingScreencastContainerSet& @@ -126,18 +127,21 @@ } void ProjectorAppClientImpl::OnSodaInstallProgress(int combined_progress) { - for (auto& observer : observers_) + for (auto& observer : observers_) { observer.OnSodaProgress(combined_progress); + } } void ProjectorAppClientImpl::OnSodaInstallError() { - for (auto& observer : observers_) + for (auto& observer : observers_) { observer.OnSodaError(); + } } void ProjectorAppClientImpl::OnSodaInstalled() { - for (auto& observer : observers_) + for (auto& observer : observers_) { observer.OnSodaInstalled(); + } } void ProjectorAppClientImpl::OpenFeedbackDialog() const { @@ -163,8 +167,9 @@ void ProjectorAppClientImpl::NotifyAppUIActive(bool active) { pending_screencast_manager_.OnAppActiveStatusChanged(active); - if (!active) + if (!active) { screencast_manager_.ResetScopeSuppressDriveNotifications(); + } } void ProjectorAppClientImpl::ToggleFileSyncingNotificationForPaths(
diff --git a/chrome/browser/ui/ash/projector/projector_client_impl.h b/chrome/browser/ui/ash/projector/projector_client_impl.h index 6ac16cb6..30919749 100644 --- a/chrome/browser/ui/ash/projector/projector_client_impl.h +++ b/chrome/browser/ui/ash/projector/projector_client_impl.h
@@ -30,7 +30,6 @@ drive::DriveIntegrationService::Observer, session_manager::SessionManagerObserver { public: - explicit ProjectorClientImpl(ash::ProjectorController* controller); ProjectorClientImpl();
diff --git a/chrome/browser/ui/ash/projector/projector_client_impl_browsertest.cc b/chrome/browser/ui/ash/projector/projector_client_impl_browsertest.cc index 59425b22..7cf44cd 100644 --- a/chrome/browser/ui/ash/projector/projector_client_impl_browsertest.cc +++ b/chrome/browser/ui/ash/projector/projector_client_impl_browsertest.cc
@@ -334,8 +334,9 @@ ProjectorClient* client() { return ProjectorClient::Get(); } std::string GetPolicy() { - if (is_child()) + if (is_child()) { return prefs::kProjectorDogfoodForFamilyLinkEnabled; + } return prefs::kProjectorAllowByPolicy; } @@ -380,8 +381,9 @@ ui_test_utils::BrowserChangeObserver browser_opened( nullptr, ui_test_utils::BrowserChangeObserver::ChangeType::kAdded); client()->OpenProjectorApp(); - if (!is_child()) + if (!is_child()) { browser_opened.Wait(); + } // Verify that Projector App is opened. Browser* app_browser =
diff --git a/chrome/browser/ui/ash/projector/projector_client_impl_unittest.cc b/chrome/browser/ui/ash/projector/projector_client_impl_unittest.cc index da6652d12..5f2ef6e 100644 --- a/chrome/browser/ui/ash/projector/projector_client_impl_unittest.cc +++ b/chrome/browser/ui/ash/projector/projector_client_impl_unittest.cc
@@ -272,11 +272,13 @@ bool IsEqualAvailability(const SpeechRecognitionAvailability& first, const SpeechRecognitionAvailability& second) { - if (first.use_on_device != second.use_on_device) + if (first.use_on_device != second.use_on_device) { return false; + } - if (first.use_on_device) + if (first.use_on_device) { return first.on_device_availability == second.on_device_availability; + } return first.server_based_availability == second.server_based_availability; }
diff --git a/chrome/browser/ui/ash/projector/projector_drivefs_provider.cc b/chrome/browser/ui/ash/projector/projector_drivefs_provider.cc index 4d2d7d6..8cea25f 100644 --- a/chrome/browser/ui/ash/projector/projector_drivefs_provider.cc +++ b/chrome/browser/ui/ash/projector/projector_drivefs_provider.cc
@@ -45,12 +45,14 @@ : on_drivefs_observation_change_(on_drivefs_observation_change) { session_manager::SessionManager* session_manager = session_manager::SessionManager::Get(); - if (session_manager) + if (session_manager) { session_observation_.Observe(session_manager); + } user_manager::UserManager* user_manager = user_manager::UserManager::Get(); - if (user_manager) + if (user_manager) { session_state_observation_.Observe(user_manager); + } } ProjectorDriveFsProvider::~ProjectorDriveFsProvider() = default; @@ -64,14 +66,16 @@ user_manager::User* active_user) { // After user login, the first ActiveUserChanged() might be called before // profile is loaded. - if (active_user->is_profile_created()) + if (active_user->is_profile_created()) { OnProfileSwitch(); + } } void ProjectorDriveFsProvider::OnProfileSwitch() { auto* profile = ProfileManager::GetActiveUserProfile(); - if (!IsProjectorAllowedForProfile(profile)) + if (!IsProjectorAllowedForProfile(profile)) { return; + } on_drivefs_observation_change_.Run(); }
diff --git a/chrome/browser/ui/ash/projector/projector_navigation_throttle_browsertest.cc b/chrome/browser/ui/ash/projector/projector_navigation_throttle_browsertest.cc index 6a8adf4..923d7284 100644 --- a/chrome/browser/ui/ash/projector/projector_navigation_throttle_browsertest.cc +++ b/chrome/browser/ui/ash/projector/projector_navigation_throttle_browsertest.cc
@@ -110,8 +110,9 @@ std::string url = kChromeUIUntrustedProjectorPwaUrl; url += "/"; url += kFilePath; - if (!url_params().empty()) + if (!url_params().empty()) { url += "?" + url_params(); + } GURL gurl(url); // Prior to navigation, there is only one browser available. @@ -159,8 +160,9 @@ // The timestamp corresponds to 21 Jan 2022 10:00:00 GMT in microseconds since // Unix epoch (Jan 1 1970). expected_url += "?timestamp=1642759200000000%20bogo-microseconds"; - if (!url_params().empty()) + if (!url_params().empty()) { expected_url += "&" + url_params(); + } EXPECT_EQ(tab->GetVisibleURL().spec(), expected_url); std::string histogram_name = navigate_from_link()
diff --git a/chrome/browser/ui/ash/projector/projector_soda_installation_controller.cc b/chrome/browser/ui/ash/projector/projector_soda_installation_controller.cc index 69a627b..ff06148 100644 --- a/chrome/browser/ui/ash/projector/projector_soda_installation_controller.cc +++ b/chrome/browser/ui/ash/projector/projector_soda_installation_controller.cc
@@ -26,8 +26,9 @@ inline bool IsLanguageSupported(const speech::LanguageCode languageCode) { auto* soda_installer = speech::SodaInstaller::GetInstance(); for (auto const& language : soda_installer->GetAvailableLanguages()) { - if (speech::GetLanguageCode(language) == languageCode) + if (speech::GetLanguageCode(language) == languageCode) { return true; + } } return false; } @@ -56,8 +57,9 @@ pref_service->SetString(ash::prefs::kProjectorCreationFlowLanguage, language); soda_installer->Init(pref_service, g_browser_process->local_state()); - if (!soda_installer->IsSodaDownloading(languageCode)) + if (!soda_installer->IsSodaDownloading(languageCode)) { soda_installer->InstallLanguage(language, g_browser_process->local_state()); + } } bool ProjectorSodaInstallationController::ShouldDownloadSoda( @@ -75,8 +77,9 @@ void ProjectorSodaInstallationController::OnSodaInstalled( speech::LanguageCode language_code) { // Check that language code matches the selected language for projector. - if (language_code != speech::GetLanguageCode(GetLocale())) + if (language_code != speech::GetLanguageCode(GetLocale())) { return; + } projector_controller_->OnSpeechRecognitionAvailabilityChanged(); app_client_->OnSodaInstalled(); }
diff --git a/chrome/browser/ui/ash/projector/projector_soda_installation_controller_unittest.cc b/chrome/browser/ui/ash/projector/projector_soda_installation_controller_unittest.cc index b118aea..f6831ca 100644 --- a/chrome/browser/ui/ash/projector/projector_soda_installation_controller_unittest.cc +++ b/chrome/browser/ui/ash/projector/projector_soda_installation_controller_unittest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "projector_soda_installation_controller.h" + #include "ash/constants/ash_features.h" #include "ash/constants/ash_pref_names.h" #include "ash/public/cpp/locale_update_controller.h"
diff --git a/chrome/browser/ui/ash/projector/projector_utils.cc b/chrome/browser/ui/ash/projector/projector_utils.cc index e9712ce..2e51a69b 100644 --- a/chrome/browser/ui/ash/projector/projector_utils.cc +++ b/chrome/browser/ui/ash/projector/projector_utils.cc
@@ -38,23 +38,27 @@ bool IsProjectorAllowedForProfile(const Profile* profile) { DCHECK(profile); - if (!IsRealUserProfile(profile)) + if (!IsRealUserProfile(profile)) { return false; + } auto* user = ash::ProfileHelper::Get()->GetUserByProfile(profile); - if (!user) + if (!user) { return false; + } return user->HasGaiaAccount(); } bool IsProjectorAppEnabled(const Profile* profile) { - if (!IsProjectorAllowedForProfile(profile)) + if (!IsProjectorAllowedForProfile(profile)) { return false; + } // Projector for regular consumer users. - if (!profile->GetProfilePolicyConnector()->IsManaged()) + if (!profile->GetProfilePolicyConnector()->IsManaged()) { return true; + } // Projector dogfood for supervised users is controlled by an enterprise // policy. When the feature is out of dogfood phase the policy will be @@ -91,8 +95,9 @@ content::WebContents* web_contents = browser->tab_strip_model()->GetActiveWebContents(); auto* web_ui = web_contents->GetWebUI(); - if (!web_ui) + if (!web_ui) { return; + } if (!web_ui->GetController()->GetAs<ash::UntrustedProjectorUI>()) { // We only want to send files to the Projector SWA. Don't send files to the // wrong trusted context if it navigates away.
diff --git a/chrome/browser/ui/ash/projector/projector_utils_unittest.cc b/chrome/browser/ui/ash/projector/projector_utils_unittest.cc index cfb42caa8..21c1e83a 100644 --- a/chrome/browser/ui/ash/projector/projector_utils_unittest.cc +++ b/chrome/browser/ui/ash/projector/projector_utils_unittest.cc
@@ -46,8 +46,9 @@ // Prevent access to DBus. This switch is reset in case set from test SetUp // due massive usage of InitFromArgv. base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess(); - if (!command_line.HasSwitch(switches::kTestType)) + if (!command_line.HasSwitch(switches::kTestType)) { command_line.AppendSwitch(switches::kTestType); + } switch (user_type) { case user_manager::UserType::kRegular: // fallthrough @@ -124,8 +125,9 @@ RegisterUserProfilePrefs(prefs->registry()); TestingProfile::Builder builder; builder.SetPrefService(std::move(prefs)); - if (is_child()) + if (is_child()) { builder.SetIsSupervisedProfile(); + } builder.OverridePolicyConnectorIsManagedForTesting(is_managed()); profile_ = builder.Build(); }
diff --git a/chrome/browser/ui/ash/session/session_controller_client_impl.cc b/chrome/browser/ui/ash/session/session_controller_client_impl.cc index 591ff07..73f6887 100644 --- a/chrome/browser/ui/ash/session/session_controller_client_impl.cc +++ b/chrome/browser/ui/ash/session/session_controller_client_impl.cc
@@ -81,8 +81,9 @@ uint32_t GetSessionId(const User& user) { const AccountId& account_id = user.GetAccountId(); for (auto& session : SessionManager::Get()->sessions()) { - if (session.user_account_id == account_id) + if (session.user_account_id == account_id) { return session.id; + } } return 0u; @@ -124,15 +125,17 @@ } void DoSwitchUser(const AccountId& account_id, bool switch_user) { - if (switch_user) + if (switch_user) { UserManager::Get()->SwitchActiveUser(account_id); + } } // Callback for the dialog that warns the user about multi-profile, which has // a "never show again" checkbox. void OnAcceptMultiprofilesIntroDialog(bool accept, bool never_show_again) { - if (!accept) + if (!accept) { return; + } PrefService* prefs = ProfileManager::GetActiveUserProfile()->GetPrefs(); prefs->SetBoolean(user_manager::prefs::kMultiProfileNeverShowIntro, @@ -268,8 +271,9 @@ } void SessionControllerClientImpl::ShowMultiProfileLogin() { - if (!IsMultiProfileAvailable()) + if (!IsMultiProfileAvailable()) { return; + } // Only regular non-supervised users could add other users to current session. if (UserManager::Get()->GetActiveUser()->GetType() != @@ -293,8 +297,9 @@ !multi_user_util::GetProfileFromAccountId(user->GetAccountId()) ->GetPrefs() ->GetBoolean(user_manager::prefs::kMultiProfileNeverShowIntro); - if (!show_intro) + if (!show_intro) { break; + } } if (show_intro) { session_controller_->ShowMultiprofilesIntroDialog( @@ -322,8 +327,9 @@ const AccountId& account_id) { Profile* const user_profile = multi_user_util::GetProfileFromAccountId(account_id); - if (!user_profile) + if (!user_profile) { return nullptr; + } return user_profile->GetPrefs(); } @@ -360,8 +366,9 @@ // static bool SessionControllerClientImpl::IsMultiProfileAvailable() { - if (!profiles::IsMultipleProfilesEnabled() || !UserManager::IsInitialized()) + if (!profiles::IsMultipleProfilesEnabled() || !UserManager::IsInitialized()) { return false; + } if (ash::SessionTerminationManager::Get() && ash::SessionTerminationManager::Get()->IsLockedToSingleUser()) { return false; @@ -381,8 +388,10 @@ // order if user session ends up to be pending (due to user profile loading). // TODO(crbug.com/40489520): Get rid of this after refactoring. SendUserSession(*active_user); - if (pending_users_.find(active_user->GetAccountId()) != pending_users_.end()) + if (pending_users_.find(active_user->GetAccountId()) != + pending_users_.end()) { return; + } SendUserSessionOrder(); } @@ -399,8 +408,9 @@ void SessionControllerClientImpl::OnUserImageChanged(const User& user) { // Only sends user session for signed-in user. - if (GetSessionId(user) != 0) + if (GetSessionId(user) != 0) { SendUserSession(user); + } } void SessionControllerClientImpl::OnUserNotAllowed( @@ -436,8 +446,9 @@ // static ash::AddUserSessionPolicy SessionControllerClientImpl::GetAddUserSessionPolicy() { - if (ash::SessionTerminationManager::Get()->IsLockedToSingleUser()) + if (ash::SessionTerminationManager::Get()->IsLockedToSingleUser()) { return ash::AddUserSessionPolicy::ERROR_LOCKED_TO_SINGLE_USER; + } UserManager* const user_manager = UserManager::Get(); if (user_manager->GetUsersAllowedForMultiUserSignIn().empty()) { @@ -459,8 +470,9 @@ // static void SessionControllerClientImpl::DoLockScreen() { - if (!CanLockScreen()) + if (!CanLockScreen()) { return; + } VLOG(1) << "b/228873153 : Requesting screen lock from " "SessionControllerClientImpl"; @@ -471,8 +483,9 @@ void SessionControllerClientImpl::DoSwitchActiveUser( const AccountId& account_id) { // Disallow switching to an already active user since that might crash. - if (account_id == UserManager::Get()->GetActiveUser()->GetAccountId()) + if (account_id == UserManager::Get()->GetActiveUser()->GetAccountId()) { return; + } // |client| may be null in tests. SessionControllerClientImpl* client = SessionControllerClientImpl::Get(); @@ -489,8 +502,9 @@ void SessionControllerClientImpl::DoCycleActiveUser( ash::CycleUserDirection direction) { const UserList& logged_in_users = UserManager::Get()->GetLoggedInUsers(); - if (logged_in_users.size() <= 1) + if (logged_in_users.size() <= 1) { return; + } AccountId account_id = UserManager::Get()->GetActiveUser()->GetAccountId(); @@ -499,19 +513,22 @@ base::ranges::find(logged_in_users, account_id, &User::GetAccountId); // Active user not found. - if (it == logged_in_users.end()) + if (it == logged_in_users.end()) { return; + } // Get the user's email to select, wrapping to the start/end of the list if // necessary. if (direction == ash::CycleUserDirection::NEXT) { - if (++it == logged_in_users.end()) + if (++it == logged_in_users.end()) { account_id = (*logged_in_users.begin())->GetAccountId(); - else + } else { account_id = (*it)->GetAccountId(); + } } else if (direction == ash::CycleUserDirection::PREVIOUS) { - if (it == logged_in_users.begin()) + if (it == logged_in_users.begin()) { it = logged_in_users.end(); + } account_id = (*(--it))->GetAccountId(); } else { NOTREACHED() << "Invalid direction=" << static_cast<int>(direction); @@ -546,8 +563,9 @@ DCHECK(supervised_user_profile_); User* user = ash::ProfileHelper::Get()->GetUserByProfile(supervised_user_profile_); - if (user) + if (user) { SendUserSession(*user); + } } void SessionControllerClientImpl::OnAppTerminating() { @@ -599,8 +617,9 @@ info->add_user_session_policy = GetAddUserSessionPolicy(); info->state = session_manager->session_state(); - if (last_sent_session_info_ && *info == *last_sent_session_info_) + if (last_sent_session_info_ && *info == *last_sent_session_info_) { return; + } last_sent_session_info_ = std::move(info); session_controller_->SetSessionInfo(*last_sent_session_info_); @@ -619,16 +638,18 @@ } auto user_session = UserToUserSession(user); - if (last_sent_user_session_ && *user_session == *last_sent_user_session_) + if (last_sent_user_session_ && *user_session == *last_sent_user_session_) { return; + } last_sent_user_session_ = std::move(user_session); session_controller_->UpdateUserSession(*last_sent_user_session_); if (!pending_users_.empty()) { pending_users_.erase(user.GetAccountId()); - if (pending_users_.empty()) + if (pending_users_.empty()) { SendUserSessionOrder(); + } } } @@ -652,7 +673,7 @@ if (local_state->HasPrefPath(prefs::kSessionLengthLimit)) { session_length_limit = base::Milliseconds( std::clamp(local_state->GetInteger(prefs::kSessionLengthLimit), - kSessionLengthLimitMinMs, kSessionLengthLimitMaxMs)); + kSessionLengthLimitMinMs, kSessionLengthLimitMaxMs)); } base::Time session_start_time; if (local_state->HasPrefPath(prefs::kSessionStartTime)) { @@ -664,8 +685,9 @@ ash::DeviceSettingsService::Get()->device_off_hours_controller(); base::Time off_hours_session_end_time; // Use "OffHours" end time only if the session will be actually terminated. - if (off_hours_controller->IsCurrentSessionAllowedOnlyForOffHours()) + if (off_hours_controller->IsCurrentSessionAllowedOnlyForOffHours()) { off_hours_session_end_time = off_hours_controller->GetOffHoursEndTime(); + } // If |session_length_limit| is zero or |session_start_time| is null then // "SessionLengthLimit" policy is unset.
diff --git a/chrome/browser/ui/ash/session/session_util.cc b/chrome/browser/ui/ash/session/session_util.cc index 3705868..0f53bd53 100644 --- a/chrome/browser/ui/ash/session/session_util.cc +++ b/chrome/browser/ui/ash/session/session_util.cc
@@ -30,8 +30,9 @@ DCHECK(window); auto* window_manager = MultiUserWindowManagerHelper::GetWindowManager(); // Speculative fix for multi-profile crash. crbug.com/661821 - if (!window_manager) + if (!window_manager) { return nullptr; + } const AccountId& account_id = presenting ? window_manager->GetUserPresentingWindow(window)
diff --git a/chrome/browser/ui/ash/session/test_session_controller.cc b/chrome/browser/ui/ash/session/test_session_controller.cc index 38935d40..9173a78 100644 --- a/chrome/browser/ui/ash/session/test_session_controller.cc +++ b/chrome/browser/ui/ash/session/test_session_controller.cc
@@ -14,8 +14,9 @@ void TestSessionController::SetScreenLocked(bool locked) { is_screen_locked_ = locked; - for (auto& observer : observers_) + for (auto& observer : observers_) { observer.OnLockStateChanged(locked); + } } void TestSessionController::SetClient(ash::SessionControllerClient* client) {}
diff --git a/chrome/browser/ui/ash/sharesheet/sharesheet_bubble_view.cc b/chrome/browser/ui/ash/sharesheet/sharesheet_bubble_view.cc index 39b1254..faa4e6d 100644 --- a/chrome/browser/ui/ash/sharesheet/sharesheet_bubble_view.cc +++ b/chrome/browser/ui/ash/sharesheet/sharesheet_bubble_view.cc
@@ -646,8 +646,9 @@ // Scrollview has separators that overlaps with |header_body_separator_| and // |body_footer_separator_| to create a double line when both are visible, so // when scrollview is expanded we hide our separators. - if (header_body_separator_) + if (header_body_separator_) { header_body_separator_->SetVisible(!show_expanded_view_); + } body_footer_separator_->SetVisible(!show_expanded_view_); expanded_view_->SetVisible(show_expanded_view_);
diff --git a/chrome/browser/ui/ash/sharesheet/sharesheet_bubble_view_browsertest.cc b/chrome/browser/ui/ash/sharesheet/sharesheet_bubble_view_browsertest.cc index d277ee9a..0f30559 100644 --- a/chrome/browser/ui/ash/sharesheet/sharesheet_bubble_view_browsertest.cc +++ b/chrome/browser/ui/ash/sharesheet/sharesheet_bubble_view_browsertest.cc
@@ -48,8 +48,9 @@ public: void ShowUi() { views::Widget::Widgets old_widgets; - for (aura::Window* root_window : Shell::GetAllRootWindows()) + for (aura::Window* root_window : Shell::GetAllRootWindows()) { views::Widget::GetAllChildWidgets(root_window, &old_widgets); + } ::sharesheet::SharesheetService* const sharesheet_service = ::sharesheet::SharesheetServiceFactory::GetForProfile( @@ -63,8 +64,9 @@ base::DoNothing()); views::Widget::Widgets new_widgets; - for (aura::Window* root_window : Shell::GetAllRootWindows()) + for (aura::Window* root_window : Shell::GetAllRootWindows()) { views::Widget::GetAllChildWidgets(root_window, &new_widgets); + } views::Widget::Widgets added_widgets; std::set_difference(new_widgets.begin(), new_widgets.end(),
diff --git a/chrome/browser/ui/ash/sharesheet/sharesheet_header_view.cc b/chrome/browser/ui/ash/sharesheet/sharesheet_header_view.cc index ef68643..488c4040 100644 --- a/chrome/browser/ui/ash/sharesheet/sharesheet_header_view.cc +++ b/chrome/browser/ui/ash/sharesheet/sharesheet_header_view.cc
@@ -333,8 +333,9 @@ preview_labels.push_back(std::move(file_label)); } - if (preview_labels.size() == 0) + if (preview_labels.size() == 0) { return; + } int index = 0; int max_lines = std::min(preview_labels.size(), kTextPreviewMaximumLines);
diff --git a/chrome/browser/ui/ash/sharesheet/sharesheet_target_button.cc b/chrome/browser/ui/ash/sharesheet/sharesheet_target_button.cc index d37b0fd..5944dbc 100644 --- a/chrome/browser/ui/ash/sharesheet/sharesheet_target_button.cc +++ b/chrome/browser/ui/ash/sharesheet/sharesheet_target_button.cc
@@ -114,8 +114,9 @@ void SharesheetTargetButton::OnThemeChanged() { views::Button::OnThemeChanged(); - if (!vector_icon_) + if (!vector_icon_) { return; + } // TODO(b/284175205): Convert this to an ImageModel after Jelly launches. auto* color_provider = GetColorProvider();
diff --git a/chrome/browser/ui/ash/shelf/app_service/app_service_app_window_arc_tracker.cc b/chrome/browser/ui/ash/shelf/app_service/app_service_app_window_arc_tracker.cc index 31785490..1efe23a 100644 --- a/chrome/browser/ui/ash/shelf/app_service/app_service_app_window_arc_tracker.cc +++ b/chrome/browser/ui/ash/shelf/app_service/app_service_app_window_arc_tracker.cc
@@ -61,8 +61,9 @@ const std::string& param_key, base::TimeDelta* out) { std::string time_ms_string; - if (!intent.GetExtraParamValue(param_key, &time_ms_string)) + if (!intent.GetExtraParamValue(param_key, &time_ms_string)) { return false; + } int64_t time_ms; if (!base::StringToInt64(time_ms_string, &time_ms)) { @@ -79,8 +80,9 @@ void HandlePlayStoreLaunch(const arc::Intent& intent) { // Don't track initial Play Store launch. We currently shows Play Store in // very rare case in-session provisioning. - if (intent.HasExtraParam(arc::kInitialStartParam)) + if (intent.HasExtraParam(arc::kInitialStartParam)) { return; + } base::TimeDelta launch_time; // This param is injected by |arc:: LaunchAppWithIntent|. @@ -116,14 +118,16 @@ arc::ArcSessionManager* arc_session_manager = arc::ArcSessionManager::Get(); // arc::ArcSessionManager might not be set in tests. - if (arc_session_manager) + if (arc_session_manager) { arc_session_manager->AddObserver(this); + } auto* arc_handler = ash::app_restore::AppRestoreArcTaskHandlerFactory::GetForProfile( observed_profile_); - if (arc_handler) + if (arc_handler) { arc_handler->OnShelfReady(); + } } AppServiceAppWindowArcTracker::~AppServiceAppWindowArcTracker() { @@ -133,8 +137,9 @@ arc::ArcSessionManager* arc_session_manager = arc::ArcSessionManager::Get(); // arc::ArcSessionManager may be released first. - if (arc_session_manager) + if (arc_session_manager) { arc_session_manager->RemoveObserver(this); + } } void AppServiceAppWindowArcTracker::ActiveUserChanged( @@ -146,8 +151,9 @@ if (user_email == primary_user_email) { // Make sure that we created items for all apps, not only which have a // window. - for (const auto& info : task_id_to_arc_app_window_info_) + for (const auto& info : task_id_to_arc_app_window_info_) { AttachControllerToTask(info.first); + } // Update active status. OnTaskSetActive(active_task_id_); @@ -191,30 +197,34 @@ // before OnTaskDestroyed() is called to remove the entry from // |task_id_to_arc_app_window_info_|; ArcAppWindowInfo* info = GetArcAppWindowInfo(window); - if (info) + if (info) { info->set_window(nullptr); + } auto session_id = arc::GetWindowSessionId(window); if (session_id.has_value()) { OnSessionDestroyed(*session_id); session_id_to_arc_app_window_info_.erase(*session_id); - if (session_id == active_session_id_) + if (session_id == active_session_id_) { active_session_id_ = arc::kNoTaskId; + } } } void AppServiceAppWindowArcTracker::CloseWindows(const std::string& app_id) { const std::vector<int> task_ids = GetTaskIdsForApp(app_id); - for (const auto task_id : task_ids) + for (const auto task_id : task_ids) { arc::CloseTask(task_id); + } } void AppServiceAppWindowArcTracker::OnWindowPropertyChanged( aura::Window* window, const void* key, intptr_t old) { - if (key != exo::kApplicationIdKey || old == 0) + if (key != exo::kApplicationIdKey || old == 0) { return; + } const std::string* old_val = reinterpret_cast<std::string*>(old); const auto maybe_session_id = arc::GetSessionIdFromWindowAppId(*old_val); const auto maybe_task_id = arc::GetWindowTaskId(window); @@ -226,19 +236,22 @@ void AppServiceAppWindowArcTracker::OnAppStatesChanged( const std::string& app_id, const ArcAppListPrefs::AppInfo& app_info) { - if (!app_info.ready) + if (!app_info.ready) { OnAppRemoved(app_id); + } } void AppServiceAppWindowArcTracker::OnAppRemoved(const std::string& app_id) { const std::vector<int> task_ids_to_remove = GetTaskIdsForApp(app_id); - for (const auto task_id : task_ids_to_remove) + for (const auto task_id : task_ids_to_remove) { OnTaskDestroyed(task_id); + } DCHECK(GetTaskIdsForApp(app_id).empty()); const std::vector<int> session_ids_to_remove = GetSessionIdsForApp(app_id); - for (const auto session_id : session_ids_to_remove) + for (const auto session_id : session_ids_to_remove) { OnSessionDestroyed(session_id); + } DCHECK(GetSessionIdsForApp(app_id).empty()); } @@ -266,12 +279,14 @@ task_id_to_arc_app_window_info_[task_id]->set_window(it->second->window()); auto it_controller = app_shelf_group_to_controller_map_.find(app_shelf_id); - if (it_controller != app_shelf_group_to_controller_map_.end()) + if (it_controller != app_shelf_group_to_controller_map_.end()) { it_controller->second->RemoveSessionId(it->first); + } session_id_to_arc_app_window_info_.erase(it); - if (session_id == active_session_id_) + if (session_id == active_session_id_) { active_session_id_ = arc::kNoTaskId; + } } else { const std::string arc_app_id = ArcAppListPrefs::GetAppId(package_name, activity_name); @@ -311,8 +326,9 @@ } aura::Window* const window = task_id_it->second->window(); - if (!window) + if (!window) { return; + } // If we found the window, update AppService InstanceRegistry to add the // window information. @@ -335,8 +351,9 @@ uint32_t primary_color, uint32_t status_bar_color) { auto it = task_id_to_arc_app_window_info_.find(task_id); - if (it == task_id_to_arc_app_window_info_.end()) + if (it == task_id_to_arc_app_window_info_.end()) { return; + } // If |icon| is empty, and non-adaptive icon as the default value, don't // call ArcRawIconPngDataToImageSkia, because it might return the default @@ -357,14 +374,16 @@ CHECK_NE(task_id_being_created_, task_id); auto it = task_id_to_arc_app_window_info_.find(task_id); - if (it == task_id_to_arc_app_window_info_.end()) + if (it == task_id_to_arc_app_window_info_.end()) { return; + } if (!it->second->logical_window_id().empty()) { const int other_id = GetTaskIdSharingLogicalWindow(task_id); - if (other_id != arc::kNoTaskId) + if (other_id != arc::kNoTaskId) { task_id_to_arc_app_window_info_[other_id]->set_window_hidden_from_shelf( false); + } } aura::Window* const window = it->second.get()->window(); @@ -404,8 +423,9 @@ return; } - if (task_id == active_task_id_) + if (task_id == active_task_id_) { return; + } auto* helper = app_service_controller_->app_service_instance_helper(); auto it = task_id_to_arc_app_window_info_.find(active_task_id_); @@ -434,18 +454,21 @@ active_task_id_ = task_id; it = task_id_to_arc_app_window_info_.find(active_task_id_); - if (it == task_id_to_arc_app_window_info_.end()) + if (it == task_id_to_arc_app_window_info_.end()) { return; + } ArcAppWindowInfo* const current_arc_app_window_info = it->second.get(); - if (!current_arc_app_window_info || !current_arc_app_window_info->window()) + if (!current_arc_app_window_info || !current_arc_app_window_info->window()) { return; + } aura::Window* const window = current_arc_app_window_info->window(); views::Widget* const widget = views::Widget::GetWidgetForNativeWindow(window); DCHECK(widget); if (widget && widget->IsActive()) { auto* controller = app_service_controller_->ControllerForWindow(window); - if (controller) + if (controller) { controller->SetActiveWindow(window); + } } app_service_controller_->owner()->SetItemStatus( current_arc_app_window_info->shelf_id(), ash::STATUS_RUNNING); @@ -459,18 +482,21 @@ void AppServiceAppWindowArcTracker::AttachControllerToWindow( aura::Window* window) { auto task_or_session_id = arc::GetWindowTaskOrSessionId(window); - if (!task_or_session_id.has_value()) + if (!task_or_session_id.has_value()) { return; + } // System windows are also arc apps. window->SetProperty(chromeos::kAppTypeKey, chromeos::AppType::ARC_APP); - if (*task_or_session_id == arc::kSystemWindowTaskId) + if (*task_or_session_id == arc::kSystemWindowTaskId) { return; + } ArcAppWindowInfo* const info = GetArcAppWindowInfo(window); - if (!info) + if (!info) { return; + } window->SetProperty(ash::kArcPackageNameKey, info->package_name()); window->SetProperty<int>(ash::kShelfItemTypeKey, ash::TYPE_APP); @@ -478,8 +504,9 @@ // Check if we have set the AppWindowBase for this task. If it was a session // window (ARC ghost window) and replace by real task window, function will // returen here. - if (app_service_controller_->GetAppWindow(window)) + if (app_service_controller_->GetAppWindow(window)) { return; + } views::Widget* const widget = views::Widget::GetWidgetForNativeWindow(window); DCHECK(widget); @@ -488,23 +515,27 @@ const auto task_id = arc::GetWindowTaskId(window); const auto session_id = arc::GetWindowSessionId(window); - if (task_id.has_value()) + if (task_id.has_value()) { AttachControllerToTask(*task_id); - else if (session_id.has_value()) + } else if (session_id.has_value()) { AttachControllerToSession(*session_id, *info); + } - if (!info->task_hidden_from_shelf()) + if (!info->task_hidden_from_shelf()) { app_service_controller_->AddWindowToShelf(window, shelf_id); + } AppWindowBase* app_window = app_service_controller_->GetAppWindow(window); - if (app_window) + if (app_window) { app_window->SetDescription(info->title(), info->icon()); + } window->SetProperty(ash::kShelfIDKey, shelf_id.Serialize()); window->SetProperty(ash::kAppIDKey, shelf_id.app_id); window->SetProperty(aura::client::kSkipImeProcessing, true); - if (info->launch_intent().empty()) + if (info->launch_intent().empty()) { return; + } auto intent = arc::Intent::Get(info->launch_intent()); if (!intent) { @@ -512,8 +543,9 @@ return; } - if (info->app_shelf_id().app_id() == arc::kPlayStoreAppId) + if (info->app_shelf_id().app_id() == arc::kPlayStoreAppId) { HandlePlayStoreLaunch(*intent); + } MaybeHandleDeferredLaunch(*intent); } @@ -539,12 +571,14 @@ } ash::ShelfID AppServiceAppWindowArcTracker::GetShelfId(aura::Window* window) { - if (observed_profile_ != app_service_controller_->owner()->profile()) + if (observed_profile_ != app_service_controller_->owner()->profile()) { return ash::ShelfID(); + } ArcAppWindowInfo* info = GetArcAppWindowInfo(window); - if (!info) + if (!info) { return ash::ShelfID(); + } return info->shelf_id(); } @@ -559,12 +593,14 @@ // TODO(crbug.com/40808991): Investigate why `task_id_to_arc_app_window_info_` // doesn't have the `task_id` or why it->second is null. auto it = task_id_to_arc_app_window_info_.find(task_id); - if (it == task_id_to_arc_app_window_info_.end() || !it->second) + if (it == task_id_to_arc_app_window_info_.end() || !it->second) { return; + } ArcAppWindowInfo* const app_window_info = it->second.get(); - if (app_window_info->task_hidden_from_shelf()) + if (app_window_info->task_hidden_from_shelf()) { return; + } const arc::ArcAppShelfId& app_shelf_id = app_window_info->app_shelf_id(); if (base::Contains(app_shelf_group_to_controller_map_, app_shelf_id)) { @@ -625,30 +661,36 @@ } void AppServiceAppWindowArcTracker::OnArcPlayStoreEnabledChanged(bool enabled) { - if (enabled) + if (enabled) { return; + } // If ARC was disabled, close the ghost window. std::vector<int> session_ids; - for (const auto& it : session_id_to_arc_app_window_info_) + for (const auto& it : session_id_to_arc_app_window_info_) { session_ids.push_back(it.first); + } - for (const auto session_id : session_ids) + for (const auto session_id : session_ids) { OnSessionDestroyed(session_id); + } DCHECK(session_id_to_arc_app_window_info_.empty()); } int AppServiceAppWindowArcTracker::GetTaskIdSharingLogicalWindow(int task_id) { auto fixed_it = task_id_to_arc_app_window_info_.find(task_id); - if (fixed_it == task_id_to_arc_app_window_info_.end()) + if (fixed_it == task_id_to_arc_app_window_info_.end()) { return arc::kNoTaskId; - if (fixed_it->second->logical_window_id().empty()) + } + if (fixed_it->second->logical_window_id().empty()) { return arc::kNoTaskId; + } for (auto it = task_id_to_arc_app_window_info_.begin(); it != task_id_to_arc_app_window_info_.end(); it++) { - if (task_id == it->first) + if (task_id == it->first) { continue; + } if (fixed_it->second->logical_window_id() == it->second->logical_window_id() && fixed_it->second->shelf_id() == it->second->shelf_id()) { @@ -663,8 +705,9 @@ std::vector<int> task_ids; for (const auto& it : task_id_to_arc_app_window_info_) { const ArcAppWindowInfo* app_window_info = it.second.get(); - if (app_window_info->app_shelf_id().app_id() == app_id) + if (app_window_info->app_shelf_id().app_id() == app_id) { task_ids.push_back(it.first); + } } return task_ids; @@ -675,8 +718,9 @@ std::vector<int> session_ids; for (const auto& it : session_id_to_arc_app_window_info_) { const ArcAppWindowInfo* app_window_info = it.second.get(); - if (app_window_info->app_shelf_id().app_id() == app_id) + if (app_window_info->app_shelf_id().app_id() == app_id) { session_ids.push_back(it.first); + } } return session_ids; @@ -686,16 +730,18 @@ const std::string& title, const gfx::ImageSkia& icon) { auto it = task_id_to_arc_app_window_info_.find(task_id); - if (it == task_id_to_arc_app_window_info_.end()) + if (it == task_id_to_arc_app_window_info_.end()) { return; + } ArcAppWindowInfo* const info = it->second.get(); DCHECK(info); info->SetDescription(title, icon); AppWindowBase* app_window = app_service_controller_->GetAppWindow(it->second->window()); - if (app_window) + if (app_window) { app_window->SetDescription(title, icon); + } } ArcAppWindowInfo* AppServiceAppWindowArcTracker::GetArcAppWindowInfo( @@ -703,13 +749,15 @@ const auto task_id = arc::GetWindowTaskId(window); if (task_id.has_value()) { auto it = task_id_to_arc_app_window_info_.find(*task_id); - if (it != task_id_to_arc_app_window_info_.end()) + if (it != task_id_to_arc_app_window_info_.end()) { return it->second.get(); + } } const auto session_id = arc::GetWindowSessionId(window); - if (!session_id.has_value()) + if (!session_id.has_value()) { return nullptr; + } // Since OnTaskCreated is async with corresponding aura window create, so in // some cases, the task has beend created but window property in aura window @@ -717,17 +765,20 @@ // session's task created, just return the latest task info. if (base::Contains(session_id_to_task_id_map_, *session_id)) { auto mapped_task_id = session_id_to_task_id_map_[*session_id]; - if (base::Contains(task_id_to_arc_app_window_info_, mapped_task_id)) + if (base::Contains(task_id_to_arc_app_window_info_, mapped_task_id)) { return task_id_to_arc_app_window_info_[mapped_task_id].get(); + } } const std::string* arc_app_id = window->GetProperty(app_restore::kAppIdKey); - if (!arc_app_id || arc_app_id->empty()) + if (!arc_app_id || arc_app_id->empty()) { return nullptr; + } auto session_id_it = session_id_to_arc_app_window_info_.find(*session_id); - if (session_id_it != session_id_to_arc_app_window_info_.end()) + if (session_id_it != session_id_to_arc_app_window_info_.end()) { return session_id_it->second.get(); + } const arc::ArcAppShelfId arc_app_shelf_id = arc::ArcAppShelfId::FromIntentAndAppId(/*intent=*/std::string(), @@ -742,8 +793,9 @@ void AppServiceAppWindowArcTracker::OnSessionDestroyed(int32_t session_id) { auto it = session_id_to_arc_app_window_info_.find(session_id); - if (it == session_id_to_arc_app_window_info_.end()) + if (it == session_id_to_arc_app_window_info_.end()) { return; + } aura::Window* const window = it->second.get()->window(); if (window) { @@ -772,6 +824,7 @@ auto* arc_handler = ash::app_restore::AppRestoreArcTaskHandlerFactory::GetForProfile( observed_profile_); - if (arc_handler && arc_handler->window_handler()) + if (arc_handler && arc_handler->window_handler()) { arc_handler->window_handler()->CloseWindow(session_id); + } }
diff --git a/chrome/browser/ui/ash/shelf/app_service/app_service_app_window_browsertest.cc b/chrome/browser/ui/ash/shelf/app_service/app_service_app_window_browsertest.cc index 6d9e0f5..b19a85ea 100644 --- a/chrome/browser/ui/ash/shelf/app_service/app_service_app_window_browsertest.cc +++ b/chrome/browser/ui/ash/shelf/app_service/app_service_app_window_browsertest.cc
@@ -203,8 +203,9 @@ states.insert(update.State()); } }); - if (states.size() == 1) + if (states.size() == 1) { return *states.begin(); + } return apps::InstanceState::kUnknown; } @@ -412,12 +413,12 @@ app_service_proxy_->InstanceRegistry().GetInstances(app_id).size()); ASSERT_NE(-1, shelf_model()->ItemIndexByAppID(app_id)); - // Now that the app is published, it will have a name based on the window title - EXPECT_EQ( - "foo", - base::UTF16ToUTF8(shelf_model() - ->items()[shelf_model()->ItemIndexByAppID(app_id)] - .title)); + // Now that the app is published, it will have a name based on the window + // title + EXPECT_EQ("foo", base::UTF16ToUTF8( + shelf_model() + ->items()[shelf_model()->ItemIndexByAppID(app_id)] + .title)); widget->CloseNow(); EXPECT_TRUE( @@ -646,8 +647,9 @@ } void StopInstance() { - if (app_instance_) + if (app_instance_) { arc_brige_service()->app()->CloseInstance(app_instance_.get()); + } arc_session_manager()->Shutdown(); }
diff --git a/chrome/browser/ui/ash/shelf/app_service/app_service_app_window_crostini_tracker.cc b/chrome/browser/ui/ash/shelf/app_service/app_service_app_window_crostini_tracker.cc index cf440cf..4606658 100644 --- a/chrome/browser/ui/ash/shelf/app_service/app_service_app_window_crostini_tracker.cc +++ b/chrome/browser/ui/ash/shelf/app_service/app_service_app_window_crostini_tracker.cc
@@ -92,13 +92,15 @@ void AppServiceAppWindowCrostiniTracker::OnWindowVisibilityChanged( aura::Window* window, const std::string& shelf_app_id) { - if (ShouldSkipWindow(window)) + if (ShouldSkipWindow(window)) { return; + } // Handle browser windows. Browser* browser = chrome::FindBrowserWithWindow(window); - if (browser) + if (browser) { return; + } // Currently Crostini can only be used from the primary profile. In the // future, this may be replaced by some way of matching the container that @@ -113,8 +115,9 @@ const std::string& crostini_shelf_app_id = guest_os::GetGuestOsShelfAppId( primary_account_profile, exo::GetShellApplicationId(window), exo::GetShellStartupId(window)); - if (crostini_shelf_app_id.empty()) + if (crostini_shelf_app_id.empty()) { return; + } auto* registry_service = guest_os::GuestOsRegistryServiceFactory::GetForProfile( @@ -154,8 +157,9 @@ // Move the Crostini app window to the right display if necessary. int64_t display_id = crostini_app_display_.GetDisplayIdForAppId(shelf_app_id); - if (display_id == display::kInvalidDisplayId) + if (display_id == display::kInvalidDisplayId) { return; + } display::Display registered_display; if (!display::Screen::GetScreen()->GetDisplayWithDisplayId( @@ -191,13 +195,15 @@ crostini_app_display_.Register(app_id, display_id); // Remove the old permissions and add a permission for every window the app // currently has open. - for (aura::Window* window : activation_permissions_) + for (aura::Window* window : activation_permissions_) { exo::RevokePermissionToActivate(window); + } activation_permissions_.clear(); ash::ShelfModel* model = app_service_controller_->owner()->shelf_model(); int index = model->ItemIndexByAppID(app_id); - if (index >= static_cast<int>(model->items().size()) || index < 0) + if (index >= static_cast<int>(model->items().size()) || index < 0) { return; + } AppWindowShelfItemController* item_controller = model->GetAppWindowShelfItemController(model->items()[index].id); @@ -205,8 +211,9 @@ // Apps run for the first time won't have a launcher controller yet, return // early because they won't have windows either so permissions aren't // necessary. - if (!item_controller) + if (!item_controller) { return; + } for (AppWindowBase* app_window : item_controller->windows()) { exo::GrantPermissionToActivate(app_window->GetNativeWindow(), kSelfActivationTimeout); @@ -216,13 +223,15 @@ std::string AppServiceAppWindowCrostiniTracker::GetShelfAppId( aura::Window* window) const { - if (ShouldSkipWindow(window)) + if (ShouldSkipWindow(window)) { return std::string(); + } // Handle browser windows. Browser* browser = chrome::FindBrowserWithWindow(window); - if (browser) + if (browser) { return std::string(); + } // Currently Crostini can only be used from the primary profile. In the // future, this may be replaced by some way of matching the container that @@ -243,8 +252,9 @@ // InstanceRegistry, call MaybeModifyInstance to check the saved app id and // the expected shelf_app_id, and if they are not consistent, modify the app // id to use `shelf_app_id`. - if (!shelf_app_id.empty()) + if (!shelf_app_id.empty()) { MaybeModifyInstance(primary_account_profile, window, shelf_app_id); + } return shelf_app_id; } @@ -252,8 +262,9 @@ aura::Window* window, const std::string& app_name) { exo::ShellSurfaceBase* surface = exo::GetShellSurfaceBaseForWindow(window); - if (!surface) + if (!surface) { return; + } crostini::ForceCloseWatcher::Watch( std::make_unique<crostini::ShellSurfaceForceCloseDelegate>(surface, app_name)); @@ -267,8 +278,9 @@ DCHECK(proxy); auto& instance_registry = proxy->InstanceRegistry(); std::string old_app_id = instance_registry.GetShelfId(window).app_id; - if (old_app_id.empty() || app_id == old_app_id) + if (old_app_id.empty() || app_id == old_app_id) { return; + } auto* app_service_instance_helper = app_service_controller_->app_service_instance_helper();
diff --git a/chrome/browser/ui/ash/shelf/app_service/app_service_app_window_shelf_controller.cc b/chrome/browser/ui/ash/shelf/app_service/app_service_app_window_shelf_controller.cc index 59521af..ee6ea65 100644 --- a/chrome/browser/ui/ash/shelf/app_service/app_service_app_window_shelf_controller.cc +++ b/chrome/browser/ui/ash/shelf/app_service/app_service_app_window_shelf_controller.cc
@@ -68,8 +68,9 @@ std::string GetAppId(const std::string& id) { const arc::ArcAppShelfId arc_app_shelf_id = arc::ArcAppShelfId::FromString(id); - if (!arc_app_shelf_id.valid() || !arc_app_shelf_id.has_shelf_group_id()) + if (!arc_app_shelf_id.valid() || !arc_app_shelf_id.has_shelf_group_id()) { return id; + } return arc_app_shelf_id.app_id(); } @@ -84,8 +85,9 @@ aura::Env::GetInstance()->AddObserver(this); instance_registry_observation_.Observe(&proxy_->InstanceRegistry()); - if (arc::IsArcAllowedForProfile(owner->profile())) + if (arc::IsArcAllowedForProfile(owner->profile())) { arc_tracker_ = std::make_unique<AppServiceAppWindowArcTracker>(this); + } if (crostini::CrostiniFeatures::Get()->CouldBeAllowed(owner->profile())) { crostini_tracker_ = @@ -117,12 +119,14 @@ AppWindowShelfItemController* AppServiceAppWindowShelfController::ControllerForWindow(aura::Window* window) { - if (!window) + if (!window) { return nullptr; + } auto it = aura_window_to_app_window_.find(window); - if (it == aura_window_to_app_window_.end()) + if (it == aura_window_to_app_window_.end()) { return nullptr; + } AppWindowBase* const app_window = it->second.get(); DCHECK(app_window); @@ -147,8 +151,9 @@ } } app_service_instance_helper_->ActiveUserChanged(); - if (arc_tracker_) + if (arc_tracker_) { arc_tracker_->ActiveUserChanged(user_email); + } } void AppServiceAppWindowShelfController::AdditionalUserAddedToSession( @@ -167,38 +172,45 @@ // is a top level views widget. Tooltips, menus, and other kinds of transient // windows that can't activate are filtered out. if (window->GetType() != aura::client::WINDOW_TYPE_NORMAL || - !window->delegate()) + !window->delegate()) { return; + } views::Widget* widget = views::Widget::GetWidgetForNativeWindow(window); - if (!widget || !widget->is_top_level()) + if (!widget || !widget->is_top_level()) { return; + } observed_windows_.AddObservation(window); - if (arc_tracker_) + if (arc_tracker_) { arc_tracker_->AddCandidateWindow(window); + } } void AppServiceAppWindowShelfController::OnWindowPropertyChanged( aura::Window* window, const void* key, intptr_t old) { - if (arc_tracker_) + if (arc_tracker_) { arc_tracker_->OnWindowPropertyChanged(window, key, old); + } } void AppServiceAppWindowShelfController::OnWindowVisibilityChanged( aura::Window* window, bool visible) { // Skip OnWindowVisibilityChanged for ancestors/descendants. - if (!observed_windows_.IsObservingSource(window)) + if (!observed_windows_.IsObservingSource(window)) { return; + } - if (arc_tracker_) + if (arc_tracker_) { arc_tracker_->HandleWindowVisibilityChanged(window); + } ash::ShelfID shelf_id = GetShelfId(window); - if (shelf_id.IsNull()) + if (shelf_id.IsNull()) { return; + } if (app_service_instance_helper_->IsOpenedInBrowser(GetAppId(shelf_id.app_id), window) || @@ -241,10 +253,12 @@ DCHECK(observed_windows_.IsObservingSource(window)); observed_windows_.RemoveObservation(window); - if (arc_tracker_) + if (arc_tracker_) { arc_tracker_->RemoveCandidateWindow(window); - if (crostini_tracker_) + } + if (crostini_tracker_) { crostini_tracker_->OnWindowDestroying(window); + } // When the window is destroyed, we should search all proxies, because the // window could be teleported from the inactive user, and isn't saved in the @@ -281,8 +295,9 @@ } auto app_window_it = aura_window_to_app_window_.find(window); - if (app_window_it == aura_window_to_app_window_.end()) + if (app_window_it == aura_window_to_app_window_.end()) { return; + } RemoveAppWindowFromShelf(app_window_it->second.get()); @@ -295,8 +310,9 @@ aura::Window* old_active) { AppWindowShelfController::OnWindowActivated(reason, new_active, old_active); - if (arc_tracker_) + if (arc_tracker_) { arc_tracker_->HandleWindowActivatedChanged(new_active); + } if (new_active) { SetWindowActivated(new_active, /*active*/ true); @@ -320,8 +336,9 @@ // anyways. As such, all which is left to do here is to get rid of our own // reference. WindowList::iterator it = base::ranges::find(window_list_, update.Window()); - if (it != window_list_.end()) + if (it != window_list_.end()) { window_list_.erase(it); + } return; } @@ -388,30 +405,34 @@ } int AppServiceAppWindowShelfController::GetActiveTaskId() const { - if (arc_tracker_) + if (arc_tracker_) { return arc_tracker_->active_task_id(); + } return arc::kNoTaskId; } int AppServiceAppWindowShelfController::GetActiveSessionId() const { - if (arc_tracker_) + if (arc_tracker_) { return arc_tracker_->active_session_id(); + } return arc::kNoTaskId; } void AppServiceAppWindowShelfController::UnregisterWindow( aura::Window* window) { auto app_window_it = aura_window_to_app_window_.find(window); - if (app_window_it == aura_window_to_app_window_.end()) + if (app_window_it == aura_window_to_app_window_.end()) { return; + } UnregisterAppWindow(app_window_it->second.get()); } void AppServiceAppWindowShelfController::AddWindowToShelf( aura::Window* window, const ash::ShelfID& shelf_id) { - if (base::Contains(aura_window_to_app_window_, window)) + if (base::Contains(aura_window_to_app_window_, window)) { return; + } // TODO(jamescook): Clean up this block. The code is repetitive. AppWindowBase* app_window; @@ -441,8 +462,9 @@ AppWindowBase* AppServiceAppWindowShelfController::GetAppWindow( aura::Window* window) { - if (!base::Contains(aura_window_to_app_window_, window)) + if (!base::Contains(aura_window_to_app_window_, window)) { return nullptr; + } return aura_window_to_app_window_[window].get(); } @@ -456,12 +478,14 @@ void AppServiceAppWindowShelfController::SetWindowActivated( aura::Window* window, bool active) { - if (!window || !observed_windows_.IsObservingSource(window)) + if (!window || !observed_windows_.IsObservingSource(window)) { return; + } const ash::ShelfID shelf_id = GetShelfId(window); - if (shelf_id.IsNull()) + if (shelf_id.IsNull()) { return; + } if (app_service_instance_helper_->IsOpenedInBrowser(GetAppId(shelf_id.app_id), window) || @@ -482,8 +506,9 @@ // Skip when this window has been handled. This can happen when the window // becomes visible again. auto app_window_it = aura_window_to_app_window_.find(window); - if (app_window_it != aura_window_to_app_window_.end()) + if (app_window_it != aura_window_to_app_window_.end()) { return; + } // For the ARC apps window, AttachControllerToWindow calls AddWindowToShelf, // so we don't need to call AddWindowToShelf again. @@ -527,12 +552,14 @@ void AppServiceAppWindowShelfController::UnregisterAppWindow( AppWindowBase* app_window) { - if (!app_window) + if (!app_window) { return; + } AppWindowShelfItemController* const controller = app_window->controller(); - if (controller) + if (controller) { controller->RemoveWindow(app_window); + } app_window->SetController(nullptr); } @@ -595,14 +622,17 @@ ash::ShelfItemDelegate* delegate) { for (auto& it : aura_window_to_app_window_) { AppWindowBase* app_window = it.second.get(); - if (!app_window) + if (!app_window) { continue; + } - if (arc_tracker_) + if (arc_tracker_) { arc_tracker_->OnItemDelegateDiscarded(app_window->shelf_id(), delegate); + } - if (!app_window || app_window->controller() != delegate) + if (!app_window || app_window->controller() != delegate) { continue; + } VLOG(1) << "Item controller was released externally for the app " << delegate->shelf_id().app_id << "."; @@ -627,27 +657,32 @@ if (crostini_tracker_) { shelf_app_id = crostini_tracker_->GetShelfAppId(window); - if (!shelf_app_id.empty()) + if (!shelf_app_id.empty()) { return ash::ShelfID(shelf_app_id); + } } - if (plugin_vm::IsPluginVmAppWindow(window)) + if (plugin_vm::IsPluginVmAppWindow(window)) { return ash::ShelfID(plugin_vm::kPluginVmShelfAppId); + } ash::ShelfID shelf_id; - if (arc_tracker_) + if (arc_tracker_) { shelf_id = arc_tracker_->GetShelfId(window); + } - if (!shelf_id.IsNull()) + if (!shelf_id.IsNull()) { return shelf_id; + } // If the window exists in InstanceRegistry, get the shelf id from // InstanceRegistry. for (Profile* profile : profile_list_) { auto* proxy = apps::AppServiceProxyFactory::GetForProfile(profile); shelf_id = proxy->InstanceRegistry().GetShelfId(window); - if (!shelf_id.IsNull()) + if (!shelf_id.IsNull()) { break; + } } if (shelf_id.IsNull()) { shelf_id = ash::ShelfID::Deserialize(window->GetProperty(ash::kShelfIDKey)); @@ -692,8 +727,9 @@ for (Profile* it : profile_list_) { apps::AppServiceProxy* proxy = apps::AppServiceProxyFactory::GetForProfile(it); - if (proxy == proxy_) + if (proxy == proxy_) { continue; + } proxy->InstanceRegistry().ForEachInstance( [&other_window, &window, &shelf_id, &browser_context, &helper, ¤t_account_id](const apps::InstanceUpdate& update) { @@ -705,8 +741,9 @@ other_window = update.Window(); } }); - if (other_window) + if (other_window) { break; + } } if (other_window) { MultiUserWindowManagerHelper::GetWindowManager()->ShowWindowForUser(
diff --git a/chrome/browser/ui/ash/shelf/app_service/app_service_app_window_shelf_item_controller.cc b/chrome/browser/ui/ash/shelf/app_service/app_service_app_window_shelf_item_controller.cc index 4df1615..d92e3275 100644 --- a/chrome/browser/ui/ash/shelf/app_service/app_service_app_window_shelf_item_controller.cc +++ b/chrome/browser/ui/ash/shelf/app_service/app_service_app_window_shelf_item_controller.cc
@@ -99,8 +99,9 @@ for (const ui::BaseWindow* window : windows()) { ++command_id; auto* native_window = window->GetNativeWindow(); - if (!filter_predicate.is_null() && !filter_predicate.Run(native_window)) + if (!filter_predicate.is_null() && !filter_predicate.Run(native_window)) { continue; + } extensions::AppWindow* const app_window = app_window_registry->GetAppWindowForNativeWindow(native_window); @@ -121,22 +122,25 @@ app_icon = app_window->GetNativeWindow()->GetProperty( aura::client::kAppIconKey); } - if (app_icon && !app_icon->isNull()) + if (app_icon && !app_icon->isNull()) { image = *app_icon; + } } items.push_back({command_id, app_window->GetTitle(), image}); } - if (!switch_profile) + if (!switch_profile) { return items; + } } return AppMenuItems(); } void AppServiceAppWindowShelfItemController::OnWindowTitleChanged( aura::Window* window) { - if (!IsChromeApp()) + if (!IsChromeApp()) { return; + } ui::BaseWindow* const base_window = GetAppWindow(window, true /*include_hidden*/); @@ -155,13 +159,15 @@ extensions::AppWindow* const app_window = app_window_registry->GetAppWindowForNativeWindow( base_window->GetNativeWindow()); - if (!app_window) + if (!app_window) { continue; + } if (app_window->show_in_shelf()) { const std::u16string title = window->GetTitle(); - if (!title.empty()) + if (!title.empty()) { ChromeShelfController::instance()->SetItemTitle(shelf_id(), title); + } } return; }
diff --git a/chrome/browser/ui/ash/shelf/app_service/app_service_instance_registry_helper.cc b/chrome/browser/ui/ash/shelf/app_service/app_service_instance_registry_helper.cc index 39221d4..7901c9e 100644 --- a/chrome/browser/ui/ash/shelf/app_service/app_service_instance_registry_helper.cc +++ b/chrome/browser/ui/ash/shelf/app_service/app_service_instance_registry_helper.cc
@@ -66,8 +66,9 @@ // on the URL, e.g. google photos, which might cause instance app_id // inconsistent DCHECK error. std::string app_id = GetAppId(old_window); - if (app_id.empty()) + if (app_id.empty()) { app_id = shelf_controller_helper_->GetAppID(old_contents); + } // If app_id is empty, we should not set it as inactive because this is // Chrome's tab. @@ -92,8 +93,9 @@ // on the URL, e.g. google photos, which might cause instance app_id // inconsistent DCHECK error. std::string app_id = GetAppId(window); - if (app_id.empty()) + if (app_id.empty()) { app_id = GetAppId(new_contents); + } // When the user drags a tab to a new browser, or to an other browser, the // top window could be changed, so the relation for the tap window and the @@ -147,8 +149,9 @@ // When the tab is closed, if the window does not exists in the AppService // InstanceRegistry, we don't need to update the status. const std::string app_id = GetAppId(window); - if (app_id.empty()) + if (app_id.empty()) { return; + } RemoveTabWindow(app_id, window); OnInstances(app_id, window, std::string(), apps::InstanceState::kDestroyed); @@ -175,8 +178,9 @@ aura::Window* window, const std::string& launch_id, apps::InstanceState state) { - if (app_id.empty() || !window) + if (app_id.empty() || !window) { return; + } // The window could be teleported from the inactive user's profile to the // current active user, so search all proxies. If the instance is found from a @@ -203,19 +207,22 @@ // Do not try to update window status on shutdown, because during the shutdown // phase, we can't guaranteen the window destroy sequence, and it might cause // crash. - if (browser_shutdown::HasShutdownStarted()) + if (browser_shutdown::HasShutdownStarted()) { return; + } auto* window = GetWindow(contents); - if (!window || !window->GetToplevelWindow()) + if (!window || !window->GetToplevelWindow()) { return; + } // If the app id is changed, call OnTabInserted to remove the old app id in // AppService InstanceRegistry, and insert the new app id. std::string app_id = GetAppId(contents); const std::string old_app_id = GetAppId(window); - if (app_id != old_app_id) + if (app_id != old_app_id) { OnTabInserted(contents); + } // When system startup, session restore creates windows before // ChromeShelfController is created, so windows restored can’t get the @@ -274,15 +281,17 @@ OnInstances(app_constants::kChromeAppId, window, std::string(), CalculateVisibilityState(window, visible)); - if (!base::Contains(browser_window_to_tab_windows_, window)) + if (!base::Contains(browser_window_to_tab_windows_, window)) { return; + } // For Chrome browser app windows, sets the state for each tab window instance // in this browser. for (aura::Window* it : browser_window_to_tab_windows_[window]) { const std::string app_id = GetAppId(it); - if (app_id.empty()) + if (app_id.empty()) { continue; + } OnInstances(app_id, it, std::string(), CalculateVisibilityState(it, visible)); } @@ -320,20 +329,23 @@ OnInstances(app_constants::kChromeAppId, window, std::string(), CalculateActivatedState(window, active)); - if (!base::Contains(browser_window_to_tab_windows_, window)) + if (!base::Contains(browser_window_to_tab_windows_, window)) { return; + } // For the Chrome browser, when the window is activated, the active tab is set // as started, running, visible and active state. if (active) { Browser* browser = chrome::FindBrowserWithWindow(window); - if (!browser) + if (!browser) { return; + } content::WebContents* contents = browser->tab_strip_model()->GetActiveWebContents(); - if (!contents) + if (!contents) { return; + } constexpr auto kState = static_cast<apps::InstanceState>( apps::InstanceState::kStarted | apps::InstanceState::kRunning | @@ -359,8 +371,9 @@ // in this browser. for (aura::Window* it : browser_window_to_tab_windows_[window]) { const std::string app_id = GetAppId(it); - if (app_id.empty()) + if (app_id.empty()) { continue; + } OnInstances(app_id, it, std::string(), CalculateActivatedState(it, active)); } } @@ -400,19 +413,22 @@ const std::string& app_id, aura::Window* window) const { // Windows created by exo with app/startup ids are not browser windows. - if (exo::GetShellApplicationId(window) || exo::GetShellStartupId(window)) + if (exo::GetShellApplicationId(window) || exo::GetShellStartupId(window)) { return false; + } for (Profile* profile : controller_->GetProfileList()) { auto* proxy = apps::AppServiceProxyFactory::GetForProfile(profile); auto app_type = proxy->AppRegistryCache().GetAppType(app_id); - if (app_type == apps::AppType::kUnknown) + if (app_type == apps::AppType::kUnknown) { continue; + } // Skip extensions because the browser controller is responsible for // extension windows. - if (app_type == apps::AppType::kExtension) + if (app_type == apps::AppType::kExtension) { return true; + } if (app_type != apps::AppType::kChromeApp && app_type != apps::AppType::kSystemWeb && @@ -452,8 +468,9 @@ for (Profile* profile : controller_->GetProfileList()) { auto* proxy = apps::AppServiceProxyFactory::GetForProfile(profile); std::string app_id = proxy->InstanceRegistry().GetShelfId(window).app_id; - if (!app_id.empty()) + if (!app_id.empty()) { return app_id; + } } return std::string(); } @@ -461,8 +478,9 @@ std::string AppServiceInstanceRegistryHelper::GetAppId( content::WebContents* contents) const { std::string app_id = shelf_controller_helper_->GetAppID(contents); - if (!app_id.empty()) + if (!app_id.empty()) { return app_id; + } return app_constants::kChromeAppId; } @@ -473,8 +491,9 @@ // If |app_id| is empty, it is a browser tab. Returns the toplevel window in // this case. - if (app_id.empty()) + if (app_id.empty()) { window = window->GetToplevelWindow(); + } return window; } @@ -494,16 +513,18 @@ for (Profile* profile : controller_->GetProfileList()) { auto* proxy = apps::AppServiceProxyFactory::GetForProfile(profile); auto state = proxy->InstanceRegistry().GetState(window); - if (state != apps::InstanceState::kUnknown) + if (state != apps::InstanceState::kUnknown) { return state; + } } return apps::InstanceState::kUnknown; } void AppServiceInstanceRegistryHelper::AddTabWindow(const std::string& app_id, aura::Window* window) { - if (app_id == app_constants::kChromeAppId) + if (app_id == app_constants::kChromeAppId) { return; + } aura::Window* top_level_window = window->GetToplevelWindow(); browser_window_to_tab_windows_[top_level_window].insert(window); @@ -513,20 +534,23 @@ void AppServiceInstanceRegistryHelper::RemoveTabWindow( const std::string& app_id, aura::Window* window) { - if (app_id == app_constants::kChromeAppId) + if (app_id == app_constants::kChromeAppId) { return; + } auto it = tab_window_to_browser_window_.find(window); - if (it == tab_window_to_browser_window_.end()) + if (it == tab_window_to_browser_window_.end()) { return; + } aura::Window* top_level_window = it->second; auto browser_it = browser_window_to_tab_windows_.find(top_level_window); DCHECK(browser_it != browser_window_to_tab_windows_.end()); browser_it->second.erase(window); - if (browser_it->second.empty()) + if (browser_it->second.empty()) { browser_window_to_tab_windows_.erase(browser_it); + } tab_window_to_browser_window_.erase(it); }
diff --git a/chrome/browser/ui/ash/shelf/app_service/app_service_shelf_context_menu.cc b/chrome/browser/ui/ash/shelf/app_service/app_service_shelf_context_menu.cc index a7be8c1..e11ee50f 100644 --- a/chrome/browser/ui/ash/shelf/app_service/app_service_shelf_context_menu.cc +++ b/chrome/browser/ui/ash/shelf/app_service/app_service_shelf_context_menu.cc
@@ -93,8 +93,9 @@ // Remove the ARC shelf group prefix. const arc::ArcAppShelfId arc_shelf_id = arc::ArcAppShelfId::FromString(shelf_id.app_id); - if (arc_shelf_id.valid()) + if (arc_shelf_id.valid()) { return arc_shelf_id.app_id(); + } return shelf_id.app_id; } @@ -171,8 +172,9 @@ int event_flags) { // Place new windows on the same display as the context menu. display::ScopedDisplayForNewWindows scoped_display(display_id()); - if (ExecuteCommonCommand(command_id, event_flags)) + if (ExecuteCommonCommand(command_id, event_flags)) { return; + } switch (command_id) { case ash::SHOW_APP_INFO: @@ -244,8 +246,9 @@ controller()->profile()); const bool scaled = command_id == ash::CROSTINI_USE_LOW_DENSITY; registry_service->SetAppScaled(item().id.app_id, scaled); - if (controller()->IsOpen(item().id)) + if (controller()->IsOpen(item().id)) { crostini::ShowAppRestartDialog(display_id()); + } return; } @@ -318,8 +321,9 @@ } bool AppServiceShelfContextMenu::IsCommandIdEnabled(int command_id) const { - if (command_id < ash::COMMAND_ID_COUNT) + if (command_id < ash::COMMAND_ID_COUNT) { return ShelfContextMenu::IsCommandIdEnabled(command_id); + } if (extensions::ContextMenuMatcher::IsExtensionsCustomCommandId(command_id) && extension_menu_items_) { return extension_menu_items_->IsCommandIdEnabled(command_id); @@ -354,8 +358,9 @@ (app_type_ == apps::AppType::kChromeApp && item().id.app_id == extension_misc::kFilesManagerAppId); - if (build_extension_menu_before_pin) + if (build_extension_menu_before_pin) { BuildExtensionAppShortcutsMenu(menu_model.get()); + } // "New Window" should go above "Pin". if (menu_items.items.size() > index && @@ -410,8 +415,9 @@ return; } - if (!build_extension_menu_before_pin) + if (!build_extension_menu_before_pin) { BuildExtensionAppShortcutsMenu(menu_model.get()); + } // When Crostini generates shelf id with the prefix "crostini:", AppService // can't generate the menu items, because the app_id doesn't match, so add the @@ -588,8 +594,9 @@ extensions::ExtensionRegistry::Get(controller()->profile()) ->GetExtensionById(item().id.app_id, extensions::ExtensionRegistry::EVERYTHING); - if (!extension) + if (!extension) { return extensions::LAUNCH_TYPE_DEFAULT; + } return extensions::GetLaunchType( extensions::ExtensionPrefs::Get(controller()->profile()), extension);
diff --git a/chrome/browser/ui/ash/shelf/app_service/app_service_shelf_context_menu_browsertest.cc b/chrome/browser/ui/ash/shelf/app_service/app_service_shelf_context_menu_browsertest.cc index 8d120b4..f77b81727 100644 --- a/chrome/browser/ui/ash/shelf/app_service/app_service_shelf_context_menu_browsertest.cc +++ b/chrome/browser/ui/ash/shelf/app_service/app_service_shelf_context_menu_browsertest.cc
@@ -106,12 +106,13 @@ ~AppServiceShelfContextMenuWebAppBrowserTest() override = default; const gfx::VectorIcon& GetExpectedLaunchNewIcon(int command_id) { - if (command_id == ash::USE_LAUNCH_TYPE_REGULAR) + if (command_id == ash::USE_LAUNCH_TYPE_REGULAR) { return views::kNewTabIcon; - else if (command_id == ash::USE_LAUNCH_TYPE_WINDOW) + } else if (command_id == ash::USE_LAUNCH_TYPE_WINDOW) { return views::kNewWindowIcon; - else + } else { return views::kOpenIcon; + } } bool IsShortstandEnabled() { return GetParam(); }
diff --git a/chrome/browser/ui/ash/shelf/app_service/exo_app_type_resolver.cc b/chrome/browser/ui/ash/shelf/app_service/exo_app_type_resolver.cc index 2d59657b..768b168 100644 --- a/chrome/browser/ui/ash/shelf/app_service/exo_app_type_resolver.cc +++ b/chrome/browser/ui/ash/shelf/app_service/exo_app_type_resolver.cc
@@ -38,8 +38,9 @@ out_properties_container.SetProperty( chromeos::kShouldHaveHighlightBorderOverlay, true); - if (task_id.has_value()) + if (task_id.has_value()) { out_properties_container.SetProperty(app_restore::kWindowIdKey, *task_id); + } int32_t restore_window_id = 0; if (task_id.has_value()) {
diff --git a/chrome/browser/ui/ash/shelf/app_service/shelf_app_service_app_updater.cc b/chrome/browser/ui/ash/shelf/app_service/shelf_app_service_app_updater.cc index 5bb321a..52f2f60 100644 --- a/chrome/browser/ui/ash/shelf/app_service/shelf_app_service_app_updater.cc +++ b/chrome/browser/ui/ash/shelf/app_service/shelf_app_service_app_updater.cc
@@ -20,8 +20,9 @@ ->AppRegistryCache(); cache->ForEachApp([this](const apps::AppUpdate& update) { - if (update.Readiness() == apps::Readiness::kReady) + if (update.Readiness() == apps::Readiness::kReady) { this->installed_apps_.insert(update.AppId()); + } }); app_registry_cache_observer_.Observe(cache); } @@ -73,8 +74,9 @@ } } - if (update.PolicyIdsChanged()) + if (update.PolicyIdsChanged()) { delegate()->OnAppInstalled(browser_context(), app_id); + } if (update.ShowInShelfChanged()) { if (apps_util::IsDisabled(update.Readiness())) { @@ -91,8 +93,9 @@ return; } - if (update.ShortNameChanged()) + if (update.ShortNameChanged()) { delegate()->OnAppUpdated(browser_context(), app_id, /*reload_icon=*/false); + } } void ShelfAppServiceAppUpdater::OnAppRegistryCacheWillBeDestroyed(
diff --git a/chrome/browser/ui/ash/shelf/app_shortcut_shelf_item_controller.cc b/chrome/browser/ui/ash/shelf/app_shortcut_shelf_item_controller.cc index 7181ebd..8841cdf 100644 --- a/chrome/browser/ui/ash/shelf/app_shortcut_shelf_item_controller.cc +++ b/chrome/browser/ui/ash/shelf/app_shortcut_shelf_item_controller.cc
@@ -70,8 +70,9 @@ DCHECK_NE(TabStripModel::kNoTab, index); int old_index = tab_strip->active_index(); - if (index != old_index) + if (index != old_index) { tab_strip->ActivateTabAt(index); + } return ChromeShelfController::instance()->ActivateWindowOrMinimizeIfActive( browser->window(), index == old_index && allow_minimize); } @@ -86,8 +87,9 @@ base::OnceCallback<T*(const std::vector<raw_ptr<T, VectorExperimental>>&, aura::Window**)> active_item_callback, base::OnceCallback<void(T*)> activate_callback) { - if (items.empty()) + if (items.empty()) { return std::nullopt; + } // Get the active item and associated aura::Window if it exists. aura::Window* active_item_window = nullptr; @@ -132,8 +134,9 @@ registrar_ = &provider->registrar_unsafe(); } } - if (!registrar_) + if (!registrar_) { extension_ = GetExtensionForAppID(app_id, profile); + } } AppMatcher(const AppMatcher&) = delete; @@ -174,8 +177,9 @@ // Apps set to launch in app windows should not match contents running in // tabs. - if (extensions::LaunchesInWindow(browser->profile(), extension_)) + if (extensions::LaunchesInWindow(browser->profile(), extension_)) { return false; + } // There are three ways to identify the association of a URL with this // extension: @@ -202,8 +206,9 @@ // If the browser is a web app window, and the window app id matches, // then the contents match the app. - if (browser->app_controller()) + if (browser->app_controller()) { return browser->app_controller()->app_id() == app_id_; + } // There are three ways to identify the association of a URL with this // web app: @@ -430,10 +435,11 @@ if (app_menu_cached_by_browsers_) { Browser* browser = app_menu_browsers_[command_id]; if (browser) { - if (should_close) + if (should_close) { browser->tab_strip_model()->CloseAllTabs(); - else + } else { activate_browser(browser); + } } } else { // If the web contents was destroyed while the menu was open, then the @@ -460,8 +466,9 @@ void AppShortcutShelfItemController::Close() { // Close all running 'programs' of this type. if (IsWindowedWebApp()) { - for (Browser* browser : GetAppBrowsers(base::NullCallback())) + for (Browser* browser : GetAppBrowsers(base::NullCallback())) { browser->tab_strip_model()->CloseAllTabs(); + } } else { for (content::WebContents* item : GetAppWebContents(base::NullCallback())) { Browser* browser = chrome::FindBrowserWithTab(item); @@ -478,12 +485,14 @@ } void AppShortcutShelfItemController::OnBrowserClosing(Browser* browser) { - if (!app_menu_cached_by_browsers_) + if (!app_menu_cached_by_browsers_) { return; + } // Reset pointers to the closed browser, but leave menu indices intact. auto it = base::ranges::find(app_menu_browsers_, browser); - if (it != app_menu_browsers_.end()) + if (it != app_menu_browsers_.end()) { *it = nullptr; + } } std::vector<raw_ptr<content::WebContents, VectorExperimental>> @@ -502,16 +511,18 @@ std::vector<raw_ptr<content::WebContents, VectorExperimental>> items; // It is possible to come here while an app gets loaded. - if (!matcher.CanMatchWebContents()) + if (!matcher.CanMatchWebContents()) { return items; + } for (Browser* browser : *BrowserList::GetInstance()) { if (!filter_predicate.is_null() && !filter_predicate.Run(browser->window()->GetNativeWindow())) { continue; } - if (!multi_user_util::IsProfileFromActiveUser(browser->profile())) + if (!multi_user_util::IsProfileFromActiveUser(browser->profile())) { continue; + } TabStripModel* tab_strip = browser->tab_strip_model(); for (int index = 0; index < tab_strip->count(); index++) { content::WebContents* web_contents = tab_strip->GetWebContentsAt(index); @@ -534,10 +545,12 @@ !filter_predicate.Run(browser->window()->GetNativeWindow())) { continue; } - if (!multi_user_util::IsProfileFromActiveUser(browser->profile())) + if (!multi_user_util::IsProfileFromActiveUser(browser->profile())) { continue; - if (!IsAppBrowser(browser)) + } + if (!IsAppBrowser(browser)) { continue; + } if (web_app::GetAppIdFromApplicationName(browser->app_name()) == app_id() && browser->tab_strip_model()->GetActiveWebContents()) { @@ -550,8 +563,9 @@ std::optional<ash::ShelfAction> AppShortcutShelfItemController::AdvanceToNextApp( const ItemFilterPredicate& filter_predicate) { - if (!chrome::FindLastActive()) + if (!chrome::FindLastActive()) { return std::nullopt; + } if (IsWindowedWebApp()) { return AdvanceApp(
diff --git a/chrome/browser/ui/ash/shelf/app_window_base.cc b/chrome/browser/ui/ash/shelf/app_window_base.cc index 812ee94..68b15769 100644 --- a/chrome/browser/ui/ash/shelf/app_window_base.cc +++ b/chrome/browser/ui/ash/shelf/app_window_base.cc
@@ -13,14 +13,16 @@ : shelf_id_(shelf_id), widget_(widget) {} AppWindowBase::~AppWindowBase() { - if (controller_) + if (controller_) { controller_->RemoveWindow(this); + } } void AppWindowBase::SetController(AppWindowShelfItemController* controller) { DCHECK(!controller_ || !controller); - if (!controller && controller_) + if (!controller && controller_) { controller_->RemoveWindow(this); + } controller_ = controller; }
diff --git a/chrome/browser/ui/ash/shelf/app_window_shelf_controller.cc b/chrome/browser/ui/ash/shelf/app_window_shelf_controller.cc index 6b441a6..0667774 100644 --- a/chrome/browser/ui/ash/shelf/app_window_shelf_controller.cc +++ b/chrome/browser/ui/ash/shelf/app_window_shelf_controller.cc
@@ -16,8 +16,9 @@ if (ash::Shell::HasInstance() && ash::Shell::Get()->GetPrimaryRootWindow()) { activation_client_ = wm::GetActivationClient(ash::Shell::Get()->GetPrimaryRootWindow()); - if (activation_client_) + if (activation_client_) { activation_client_->AddObserver(this); + } } owner->shelf_model()->AddObserver(this); } @@ -25,8 +26,9 @@ AppWindowShelfController::~AppWindowShelfController() { owner()->shelf_model()->RemoveObserver(this); - if (activation_client_) + if (activation_client_) { activation_client_->RemoveObserver(this); + } } void AppWindowShelfController::OnWindowActivated( @@ -36,14 +38,16 @@ // Make the newly active window the active (first) entry in the controller. AppWindowShelfItemController* new_controller = ControllerForWindow(new_active); - if (new_controller) + if (new_controller) { new_controller->SetActiveWindow(new_active); + } // Mark the old active window's shelf item as running (if different). AppWindowShelfItemController* old_controller = ControllerForWindow(old_active); - if (old_controller && old_controller != new_controller) + if (old_controller && old_controller != new_controller) { owner_->SetItemStatus(old_controller->shelf_id(), ash::STATUS_RUNNING); + } } void AppWindowShelfController::ShelfItemDelegateChanged(
diff --git a/chrome/browser/ui/ash/shelf/app_window_shelf_item_controller.cc b/chrome/browser/ui/ash/shelf/app_window_shelf_item_controller.cc index 930f23f..5569662 100644 --- a/chrome/browser/ui/ash/shelf/app_window_shelf_item_controller.cc +++ b/chrome/browser/ui/ash/shelf/app_window_shelf_item_controller.cc
@@ -45,10 +45,11 @@ auto i = base::ranges::find(windows, window_to_show); if (i != windows.end()) { - if (++i != windows.end()) + if (++i != windows.end()) { window_to_show = *i; - else + } else { window_to_show = windows.front(); + } } if (window_to_show->IsActive()) { // Coming here, only a single window is active. For keyboard activations @@ -79,12 +80,14 @@ void AppWindowShelfItemController::AddWindow(AppWindowBase* app_window) { aura::Window* window = app_window->GetNativeWindow(); - if (window && !observed_windows_.IsObservingSource(window)) + if (window && !observed_windows_.IsObservingSource(window)) { observed_windows_.AddObservation(window); - if (window && window->GetProperty(ash::kHideInShelfKey)) + } + if (window && window->GetProperty(ash::kHideInShelfKey)) { hidden_windows_.push_front(app_window); - else + } else { windows_.push_front(app_window); + } UpdateShelfItemIcon(); } @@ -97,17 +100,20 @@ void AppWindowShelfItemController::RemoveWindow(AppWindowBase* app_window) { DCHECK(app_window); aura::Window* window = app_window->GetNativeWindow(); - if (window && observed_windows_.IsObservingSource(window)) + if (window && observed_windows_.IsObservingSource(window)) { observed_windows_.RemoveObservation(window); - if (app_window == last_active_window_) + } + if (app_window == last_active_window_) { last_active_window_ = nullptr; + } auto iter = base::ranges::find(windows_, app_window); if (iter != windows_.end()) { windows_.erase(iter); } else { iter = base::ranges::find(hidden_windows_, app_window); - if (iter == hidden_windows_.end()) + if (iter == hidden_windows_.end()) { return; + } hidden_windows_.erase(iter); } UpdateShelfItemIcon(); @@ -116,12 +122,14 @@ AppWindowBase* AppWindowShelfItemController::GetAppWindow(aura::Window* window, bool include_hidden) { auto iter = GetFromNativeWindow(window, windows_); - if (iter != windows_.end()) + if (iter != windows_.end()) { return *iter; + } if (include_hidden) { iter = GetFromNativeWindow(window, hidden_windows_); - if (iter != hidden_windows_.end()) + if (iter != hidden_windows_.end()) { return *iter; + } } return nullptr; } @@ -129,8 +137,9 @@ void AppWindowShelfItemController::SetActiveWindow(aura::Window* window) { // If the window is hidden, do not set it as last_active_window AppWindowBase* app_window = GetAppWindow(window, false); - if (app_window) + if (app_window) { last_active_window_ = app_window; + } UpdateShelfItemIcon(); } @@ -198,8 +207,9 @@ ++command_id; aura::Window* window = it->GetNativeWindow(); // Can window be null? - if (!filter_predicate.is_null() && !filter_predicate.Run(window)) + if (!filter_predicate.is_null() && !filter_predicate.Run(window)) { continue; + } auto title = (window && !window->GetTitle().empty()) ? window->GetTitle() : app_title; @@ -212,8 +222,9 @@ // Fall back to the larger app icon. icon = window->GetProperty(aura::client::kAppIconKey); } - if (icon && !icon->isNull()) + if (icon && !icon->isNull()) { image = *icon; + } } items.push_back({command_id, title, image}); } @@ -239,8 +250,9 @@ } void AppWindowShelfItemController::ActivateIndexedApp(size_t index) { - if (index >= windows_.size()) + if (index >= windows_.size()) { return; + } auto it = windows_.begin(); std::advance(it, index); ShowAndActivateOrMinimize(*it, /*allow_minimize=*/windows_.size() == 1); @@ -267,10 +279,12 @@ } AppWindowBase* AppWindowShelfItemController::GetLastActiveWindow() { - if (last_active_window_) + if (last_active_window_) { return last_active_window_; - if (windows_.empty()) + } + if (windows_.empty()) { return nullptr; + } return windows_.front(); }
diff --git a/chrome/browser/ui/ash/shelf/arc_app_shelf_browsertest.cc b/chrome/browser/ui/ash/shelf/arc_app_shelf_browsertest.cc index a698efd..9de2c1d 100644 --- a/chrome/browser/ui/ash/shelf/arc_app_shelf_browsertest.cc +++ b/chrome/browser/ui/ash/shelf/arc_app_shelf_browsertest.cc
@@ -321,8 +321,9 @@ } void StopInstance() { - if (app_instance_) + if (app_instance_) { arc_brige_service()->app()->CloseInstance(app_instance_.get()); + } arc_session_manager()->Shutdown(); }
diff --git a/chrome/browser/ui/ash/shelf/arc_app_shelf_id.cc b/chrome/browser/ui/ash/shelf/arc_app_shelf_id.cc index 1515eb4..0c9d41d2 100644 --- a/chrome/browser/ui/ash/shelf/arc_app_shelf_id.cc +++ b/chrome/browser/ui/ash/shelf/arc_app_shelf_id.cc
@@ -38,8 +38,9 @@ if (base::StartsWith(id, kShelfGroupPrefix, base::CompareCase::SENSITIVE)) { const std::vector<std::string> parts = base::SplitString( id, ":", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY); - if (parts.size() == 3u && crx_file::id_util::IdIsValid(parts[2])) + if (parts.size() == 3u && crx_file::id_util::IdIsValid(parts[2])) { return ArcAppShelfId(parts[1], parts[2]); + } } else if (crx_file::id_util::IdIsValid(id)) { return ArcAppShelfId(std::string(), id); } @@ -49,25 +50,29 @@ // static ArcAppShelfId ArcAppShelfId::FromIntentAndAppId(const std::string& intent, const std::string& app_id) { - if (intent.empty()) + if (intent.empty()) { return ArcAppShelfId(std::string(), app_id); + } auto parsed_intent = Intent::Get(intent); - if (!parsed_intent) + if (!parsed_intent) { return ArcAppShelfId(std::string(), app_id); + } const std::string prefix(kShelfGroupIntentPrefix); for (const auto& param : parsed_intent->extra_params()) { - if (base::StartsWith(param, prefix, base::CompareCase::SENSITIVE)) + if (base::StartsWith(param, prefix, base::CompareCase::SENSITIVE)) { return ArcAppShelfId(param.substr(prefix.length()), app_id); + } } return ArcAppShelfId(std::string(), app_id); } std::string ArcAppShelfId::ToString() const { - if (!has_shelf_group_id()) + if (!has_shelf_group_id()) { return app_id_; + } return base::StringPrintf("%s%s:%s", kShelfGroupPrefix, shelf_group_id_.c_str(), app_id_.c_str()); @@ -75,8 +80,9 @@ bool ArcAppShelfId::operator<(const ArcAppShelfId& other) const { const int compare_group = shelf_group_id_.compare(other.shelf_group_id()); - if (compare_group == 0) + if (compare_group == 0) { return app_id_ < other.app_id(); + } return compare_group < 0; }
diff --git a/chrome/browser/ui/ash/shelf/arc_app_shelf_id_unittest.cc b/chrome/browser/ui/ash/shelf/arc_app_shelf_id_unittest.cc index 79e04b4a8..e929296 100644 --- a/chrome/browser/ui/ash/shelf/arc_app_shelf_id_unittest.cc +++ b/chrome/browser/ui/ash/shelf/arc_app_shelf_id_unittest.cc
@@ -2,9 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/ash/shelf/arc_app_shelf_id.h" + #include <string> -#include "chrome/browser/ui/ash/shelf/arc_app_shelf_id.h" #include "testing/gtest/include/gtest/gtest.h" namespace {
diff --git a/chrome/browser/ui/ash/shelf/arc_app_window.cc b/chrome/browser/ui/ash/shelf/arc_app_window.cc index 7ddaa59..7e7dd26 100644 --- a/chrome/browser/ui/ash/shelf/arc_app_window.cc +++ b/chrome/browser/ui/ash/shelf/arc_app_window.cc
@@ -53,8 +53,9 @@ void ArcAppWindow::SetDescription(const std::string& title, const gfx::ImageSkia& icon) { - if (!title.empty()) + if (!title.empty()) { GetNativeWindow()->SetTitle(base::UTF8ToUTF16(title)); + } if (icon.isNull()) { // Reset custom icon. Switch back to default. SetDefaultAppIcon(); @@ -82,8 +83,9 @@ void ArcAppWindow::Close() { auto task_id = arc::GetWindowTaskId(GetNativeWindow()); - if (task_id.has_value()) + if (task_id.has_value()) { arc::CloseTask(*task_id); + } } void ArcAppWindow::OnAppImageUpdated( @@ -126,7 +128,8 @@ } exo::ShellSurfaceBase* shell_surface = static_cast<exo::ShellSurfaceBase*>( widget()->widget_delegate()->GetContentsView()); - if (!shell_surface) + if (!shell_surface) { return; + } shell_surface->SetIcon(icon); }
diff --git a/chrome/browser/ui/ash/shelf/arc_app_window.h b/chrome/browser/ui/ash/shelf/arc_app_window.h index 16e07a9..d89cbfa2 100644 --- a/chrome/browser/ui/ash/shelf/arc_app_window.h +++ b/chrome/browser/ui/ash/shelf/arc_app_window.h
@@ -30,8 +30,7 @@ class Profile; // A ui::BaseWindow for a chromeos launcher to control ARC applications. -class ArcAppWindow : public AppWindowBase, - public AppIconLoaderDelegate { +class ArcAppWindow : public AppWindowBase, public AppIconLoaderDelegate { public: ArcAppWindow(const arc::ArcAppShelfId& app_shelf_id, views::Widget* widget,
diff --git a/chrome/browser/ui/ash/shelf/arc_app_window_info.cc b/chrome/browser/ui/ash/shelf/arc_app_window_info.cc index 48ec5f52..3f623d6ac 100644 --- a/chrome/browser/ui/ash/shelf/arc_app_window_info.cc +++ b/chrome/browser/ui/ash/shelf/arc_app_window_info.cc
@@ -19,12 +19,14 @@ std::string GetLogicalWindowIdFromIntent(const std::string& launch_intent) { auto intent = arc::Intent::Get(launch_intent); - if (!intent) + if (!intent) { return std::string(); + } const std::string prefix(kLogicalWindowIntentPrefix); for (const auto& param : intent->extra_params()) { - if (base::StartsWith(param, prefix, base::CompareCase::SENSITIVE)) + if (base::StartsWith(param, prefix, base::CompareCase::SENSITIVE)) { return param.substr(prefix.length()); + } } return std::string(); } @@ -53,8 +55,9 @@ title_ = title; // Chrome has custom Play Store icon. Don't overwrite it. - if (app_shelf_id_.app_id() == arc::kPlayStoreAppId) + if (app_shelf_id_.app_id() == arc::kPlayStoreAppId) { return; + } icon_ = icon; } @@ -67,8 +70,9 @@ void ArcAppWindowInfo::UpdateWindowProperties() { aura::Window* const win = window(); - if (!win) + if (!win) { return; + } bool hidden = window_hidden_from_shelf_ || task_hidden_from_shelf_; win->SetProperty(ash::kHideInDeskMiniViewKey, hidden); win->SetProperty(ash::kHideInOverviewKey, hidden); @@ -76,8 +80,9 @@ } void ArcAppWindowInfo::set_window(aura::Window* window) { - if (window_ == window) + if (window_ == window) { return; + } if (window_ && observed_window_.IsObservingSource(window_.get())) { observed_window_.Reset(); @@ -86,8 +91,9 @@ window_ = window; UpdateWindowProperties(); - if (window && !observed_window_.IsObservingSource(window)) + if (window && !observed_window_.IsObservingSource(window)) { observed_window_.Observe(window); + } } aura::Window* ArcAppWindowInfo::ArcAppWindowInfo::window() {
diff --git a/chrome/browser/ui/ash/shelf/arc_playstore_shortcut_shelf_item_controller.cc b/chrome/browser/ui/ash/shelf/arc_playstore_shortcut_shelf_item_controller.cc index 5a277174..5ddb134 100644 --- a/chrome/browser/ui/ash/shelf/arc_playstore_shortcut_shelf_item_controller.cc +++ b/chrome/browser/ui/ash/shelf/arc_playstore_shortcut_shelf_item_controller.cc
@@ -58,7 +58,8 @@ // case this instance of ArcPlaystoreShortcutShelfItemController may be // deleted. If Play Store does not exist at this moment, then let // |playstore_launcher_| wait until it appears. - if (!playstore_launcher->app_launched()) + if (!playstore_launcher->app_launched()) { playstore_launcher_ = std::move(playstore_launcher); + } } }
diff --git a/chrome/browser/ui/ash/shelf/arc_shelf_spinner_item_controller.cc b/chrome/browser/ui/ash/shelf/arc_shelf_spinner_item_controller.cc index 317420d..a2c31ee 100644 --- a/chrome/browser/ui/ash/shelf/arc_shelf_spinner_item_controller.cc +++ b/chrome/browser/ui/ash/shelf/arc_shelf_spinner_item_controller.cc
@@ -29,17 +29,20 @@ window_info_(std::move(window_info)) { arc::ArcSessionManager* arc_session_manager = arc::ArcSessionManager::Get(); // arc::ArcSessionManager might not be set in tests. - if (arc_session_manager) + if (arc_session_manager) { arc_session_manager->AddObserver(this); + } } ArcShelfSpinnerItemController::~ArcShelfSpinnerItemController() { - if (observed_profile_) + if (observed_profile_) { ArcAppListPrefs::Get(observed_profile_)->RemoveObserver(this); + } arc::ArcSessionManager* arc_session_manager = arc::ArcSessionManager::Get(); // arc::ArcSessionManager may be released first. - if (arc_session_manager) + if (arc_session_manager) { arc_session_manager->RemoveObserver(this); + } } void ArcShelfSpinnerItemController::SetHost( @@ -74,8 +77,9 @@ void ArcShelfSpinnerItemController::OnAppStatesChanged( const std::string& arc_app_id, const ArcAppListPrefs::AppInfo& app_info) { - if (app_id() != arc_app_id) + if (app_id() != arc_app_id) { return; + } // App was suspended. Launch is no longer available, close controller. if (app_info.suspended) { @@ -83,14 +87,16 @@ return; } - if (!app_info.ready) + if (!app_info.ready) { return; + } // If this item is created by full restore, we don't need to launch the app, // because the full restore component will launch the app when the app is // ready. - if (IsCreatedByFullRestore()) + if (IsCreatedByFullRestore()) { return; + } // Close() destroys this object, so start launching the app first. @@ -132,8 +138,9 @@ } void ArcShelfSpinnerItemController::OnArcPlayStoreEnabledChanged(bool enabled) { - if (enabled) + if (enabled) { return; + } // If ARC was disabled, remove the deferred launch request. Close(); }
diff --git a/chrome/browser/ui/ash/shelf/browser_shortcut_shelf_item_controller.cc b/chrome/browser/ui/ash/shelf/browser_shortcut_shelf_item_controller.cc index 235d85e..227d1a3 100644 --- a/chrome/browser/ui/ash/shelf/browser_shortcut_shelf_item_controller.cc +++ b/chrome/browser/ui/ash/shelf/browser_shortcut_shelf_item_controller.cc
@@ -57,8 +57,9 @@ BrowserList::BrowserVector active_browsers; for (Browser* browser : *BrowserList::GetInstance()) { // Only include browsers for the active user. - if (!multi_user_util::IsProfileFromActiveUser(browser->profile())) + if (!multi_user_util::IsProfileFromActiveUser(browser->profile())) { continue; + } // Exclude invisible non-minimized browser windows on the active desk. aura::Window* native_window = browser->window()->GetNativeWindow(); @@ -218,8 +219,9 @@ } TabStripModel* tab_strip = browser->tab_strip_model(); - if (browser->is_type_normal()) + if (browser->is_type_normal()) { found_tabbed_browser = true; + } if (!(event_flags & ui::EF_SHIFT_DOWN)) { base::RecordAction(base::UserMetricsAction( "Shelf_BrowserShortcutShelfItem_ShowWindows")); @@ -255,8 +257,9 @@ } // If only windowed applications are open, we return an empty list to // enforce the creation of a new browser. - if (!found_tabbed_browser) + if (!found_tabbed_browser) { return AppMenuItems(); + } app_menu_items_ = std::move(app_menu_items); return items; } @@ -294,8 +297,9 @@ } else { multi_user_util::MoveWindowToCurrentDesktop( browser->window()->GetNativeWindow()); - if (tab_index != kNoTab && tab_strip->ContainsIndex(tab_index)) + if (tab_index != kNoTab && tab_strip->ContainsIndex(tab_index)) { tab_strip->ActivateTabAt(tab_index); + } browser->window()->Show(); browser->window()->Activate(); } @@ -325,8 +329,9 @@ const BrowserList* browser_list = BrowserList::GetInstance(); for (BrowserList::const_iterator it = browser_list->begin(); it != browser_list->end(); ++it) { - if (IsBrowserRepresentedInBrowserList(*it, shelf_model_)) + if (IsBrowserRepresentedInBrowserList(*it, shelf_model_)) { items.push_back(*it); + } } // If there are no suitable browsers we create a new one. if (items.empty()) { @@ -350,13 +355,16 @@ // be used. std::vector<Browser*>::iterator i = base::ranges::find(items, browser); if (i != items.end()) { - if (browser->window()->IsActive()) + if (browser->window()->IsActive()) { browser = (++i == items.end()) ? items[0] : *i; + } } else { browser = chrome::FindTabbedBrowser( ChromeShelfController::instance()->profile(), true); - if (!browser || !IsBrowserRepresentedInBrowserList(browser, shelf_model_)) + if (!browser || + !IsBrowserRepresentedInBrowserList(browser, shelf_model_)) { browser = items[0]; + } } } DCHECK(browser); @@ -366,16 +374,19 @@ } void BrowserShortcutShelfItemController::OnBrowserAdded(Browser* browser) { - if (!ShouldRecordLaunchTime(browser, shelf_model_)) + if (!ShouldRecordLaunchTime(browser, shelf_model_)) { return; + } const BrowserList* browser_list = BrowserList::GetInstance(); for (BrowserList::const_iterator it = browser_list->begin(); it != browser_list->end(); ++it) { - if (*it == browser) + if (*it == browser) { continue; - if (ShouldRecordLaunchTime(*it, shelf_model_)) + } + if (ShouldRecordLaunchTime(*it, shelf_model_)) { return; + } } extensions::ExtensionPrefs::Get(browser->profile()) @@ -386,7 +397,8 @@ DCHECK(browser); // Reset pointers to the closed browser, but leave menu indices intact. for (auto& it : app_menu_items_) { - if (it.first == browser) + if (it.first == browser) { it.first = nullptr; + } } }
diff --git a/chrome/browser/ui/ash/shelf/browser_status_monitor.cc b/chrome/browser/ui/ash/shelf/browser_status_monitor.cc index fc211e3..5586d58d 100644 --- a/chrome/browser/ui/ash/shelf/browser_status_monitor.cc +++ b/chrome/browser/ui/ash/shelf/browser_status_monitor.cc
@@ -40,8 +40,9 @@ Browser* GetBrowserWithTabStripModel(TabStripModel* tab_strip_model) { for (Browser* browser : *BrowserList::GetInstance()) { - if (browser->tab_strip_model() == tab_strip_model) + if (browser->tab_strip_model() == tab_strip_model) { return browser; + } } return nullptr; } @@ -205,8 +206,9 @@ UpdateBrowserItemState(); - if (app_service_instance_helper_) + if (app_service_instance_helper_) { app_service_instance_helper_->OnBrowserRemoved(); + } } void BrowserStatusMonitor::OnTabStripModelChanged( @@ -272,11 +274,13 @@ replace->new_contents); } - if (tab_strip_model->empty()) + if (tab_strip_model->empty()) { return; + } - if (selection.active_tab_changed()) + if (selection.active_tab_changed()) { OnActiveTabChanged(selection.old_contents, selection.new_contents); + } } void BrowserStatusMonitor::AddAppBrowserToShelf(Browser* browser) { @@ -303,8 +307,9 @@ if (iter != browser_to_app_id_map_.end()) { std::string app_id = iter->second; browser_to_app_id_map_.erase(iter); - if (!IsAppBrowserInShelfWithAppId(app_id)) + if (!IsAppBrowserInShelfWithAppId(app_id)) { shelf_controller_->SetAppStatus(app_id, ash::STATUS_CLOSED); + } } } @@ -315,8 +320,9 @@ bool BrowserStatusMonitor::IsAppBrowserInShelfWithAppId( const std::string& app_id) { for (const auto& iter : browser_to_app_id_map_) { - if (iter.second == app_id) + if (iter.second == app_id) { return true; + } } return false; } @@ -373,8 +379,9 @@ AddWebContentsObserver(new_contents); - if (app_service_instance_helper_) + if (app_service_instance_helper_) { app_service_instance_helper_->OnTabReplaced(old_contents, new_contents); + } } void BrowserStatusMonitor::OnTabInserted(TabStripModel* tab_strip_model, @@ -391,16 +398,18 @@ AddWebContentsObserver(contents); - if (app_service_instance_helper_) + if (app_service_instance_helper_) { app_service_instance_helper_->OnTabInserted(contents); + } } void BrowserStatusMonitor::OnTabClosing(content::WebContents* contents) { UpdateAppItemState(contents, true /*remove*/); RemoveWebContentsObserver(contents); - if (app_service_instance_helper_) + if (app_service_instance_helper_) { app_service_instance_helper_->OnTabClosing(contents); + } } void BrowserStatusMonitor::OnTabMoved(TabStripModel* tab_strip_model,
diff --git a/chrome/browser/ui/ash/shelf/chrome_shelf_controller.cc b/chrome/browser/ui/ash/shelf/chrome_shelf_controller.cc index ade034e..ecfc21b 100644 --- a/chrome/browser/ui/ash/shelf/chrome_shelf_controller.cc +++ b/chrome/browser/ui/ash/shelf/chrome_shelf_controller.cc
@@ -133,16 +133,18 @@ TRACE_EVENT0("ui", "chrome_shelf_controller::CreateStandardImageOnWorkerThread"); gfx::ImageSkia standard_image = apps::CreateStandardIconImage(image); - if (!standard_image.isNull()) + if (!standard_image.isNull()) { standard_image.MakeThreadSafe(); + } return standard_image; } // Report shelf buttons initialized to LoginUnlockThroughputRecorder. void ReportInitShelfIconList(const ash::ShelfModel* model) { // Shell is not always initializaed in tests. - if (!ash::Shell::HasInstance()) + if (!ash::Shell::HasInstance()) { return; + } ash::Shell::Get()->login_unlock_throughput_recorder()->InitShelfIconList( model); @@ -151,8 +153,9 @@ // Report shelf buttons updated to LoginUnlockThroughputRecorder. void ReportUpdateShelfIconList(const ash::ShelfModel* model) { // Shell is not always initializaed in tests. - if (!ash::Shell::HasInstance()) + if (!ash::Shell::HasInstance()) { return; + } ash::Shell::Get()->login_unlock_throughput_recorder()->UpdateShelfIconList( model); @@ -266,8 +269,9 @@ // record profile, unless in guest session (where off the record profile is // the right one). profile = ProfileManager::GetActiveUserProfile(); - if (!profile->IsGuestSession() && !profile->IsSystemProfile()) + if (!profile->IsGuestSession() && !profile->IsSystemProfile()) { profile = profile->GetOriginalProfile(); + } } if (chrome::SettingsWindowManager::UseDeprecatedSettingsWindow(profile)) { @@ -409,18 +413,20 @@ void ChromeShelfController::UnpinShelfItemInternal(const ash::ShelfID& id) { const ash::ShelfItem* item = GetItem(id); - if (item && item->status != ash::STATUS_CLOSED) + if (item && item->status != ash::STATUS_CLOSED) { UnpinRunningAppInternal(model_->ItemIndexByID(id)); - else + } else { RemoveShelfItem(id); + } } void ChromeShelfController::SetItemStatusOrRemove(const ash::ShelfID& id, ash::ShelfItemStatus status) { - if (!IsPinned(id) && status == ash::STATUS_CLOSED) + if (!IsPinned(id) && status == ash::STATUS_CLOSED) { RemoveShelfItem(id); - else + } else { SetItemStatus(id, status); + } } bool ChromeShelfController::ShouldSyncItemWithReentrancy( @@ -456,8 +462,9 @@ void ChromeShelfController::Close(const ash::ShelfID& id) { ash::ShelfItemDelegate* delegate = model_->GetShelfItemDelegate(id); - if (!delegate) + if (!delegate) { return; // May happen if menu closed. + } delegate->Close(); } @@ -493,8 +500,9 @@ void ChromeShelfController::UpdateItemImage(const std::string& app_id) { TRACE_EVENT0("ui", "ChromeShelfController::UpdateItemImage"); - if (auto* icon_loader = GetAppIconLoaderForApp(app_id)) + if (auto* icon_loader = GetAppIconLoaderForApp(app_id)) { icon_loader->UpdateImage(app_id); + } } void ChromeShelfController::UpdateAppState(content::WebContents* contents, @@ -533,11 +541,13 @@ for (int i = 0; i < browser->tab_strip_model()->count(); ++i) { content::WebContents* const web_contents = browser->tab_strip_model()->GetWebContentsAt(i); - if (shelf_controller_helper_->GetAppID(web_contents) != app_id) + if (shelf_controller_helper_->GetAppID(web_contents) != app_id) { continue; + } UpdateAppState(web_contents, false /*remove*/); - if (browser->tab_strip_model()->GetActiveWebContents() == web_contents) + if (browser->tab_strip_model()->GetActiveWebContents() == web_contents) { SetShelfIDForBrowserWindowContents(browser, web_contents); + } } } } @@ -588,8 +598,9 @@ // by the new user have already been added to the shelf. shelf_spinner_controller_->ActiveUserChanged(account_id); // Switch the running applications to the new user. - for (auto& controller : app_window_controllers_) + for (auto& controller : app_window_controllers_) { controller->ActiveUserChanged(account_id.GetUserEmail()); + } // Update the user specific shell properties from the new user profile. // Shelf preferences are loaded in ChromeShelfController::AttachProfile. UpdatePinnedAppsFromSync(); @@ -604,8 +615,9 @@ AddAppUpdaterAndIconLoader(profile); // Switch the running applications to the new user. - for (auto& controller : app_window_controllers_) + for (auto& controller : app_window_controllers_) { controller->AdditionalUserAddedToSession(profile); + } } ash::ShelfItemDelegate::AppMenuItems @@ -616,8 +628,9 @@ } std::vector<aura::Window*> ChromeShelfController::GetArcWindows() { - if (app_service_app_window_controller_) + if (app_service_app_window_controller_) { return app_service_app_window_controller_->GetArcWindows(); + } return std::vector<aura::Window*>(); } @@ -632,34 +645,40 @@ content::WebContents* web_contents) const { TRACE_EVENT0("ui", "ChromeShelfController::GetAppMenuIcon"); ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); - if (!web_contents) + if (!web_contents) { return rb.GetImageNamed(IDR_DEFAULT_FAVICON); + } const Profile* profile = Profile::FromBrowserContext(web_contents->GetBrowserContext()); - if (profile->IsIncognitoProfile()) + if (profile->IsIncognitoProfile()) { return rb.GetImageNamed(IDR_ASH_SHELF_LIST_INCOGNITO_BROWSER); + } favicon::FaviconDriver* favicon_driver = favicon::ContentFaviconDriver::FromWebContents(web_contents); gfx::Image result = favicon_driver->GetFavicon(); - if (result.IsEmpty()) + if (result.IsEmpty()) { return rb.GetImageNamed(IDR_DEFAULT_FAVICON); + } return result; } std::u16string ChromeShelfController::GetAppMenuTitle( content::WebContents* web_contents) const { - if (!web_contents) + if (!web_contents) { return l10n_util::GetStringUTF16(IDS_NEW_TAB_TITLE); + } const std::u16string& title = web_contents->GetTitle(); - if (!title.empty()) + if (!title.empty()) { return title; + } if (auto iter = web_contents_to_app_id_.find(web_contents); iter != web_contents_to_app_id_.end()) { std::string app_id = iter->second; const extensions::Extension* extension = GetExtensionForAppID(app_id, profile()); - if (extension) + if (extension) { return base::UTF8ToUTF16(extension->name()); + } } return l10n_util::GetStringUTF16(IDS_NEW_TAB_TITLE); } @@ -744,8 +763,9 @@ } void ChromeShelfController::OnUserProfileReadyToSwitch(Profile* profile) { - if (user_switch_observer_.get()) + if (user_switch_observer_.get()) { user_switch_observer_->OnUserProfileReadyToSwitch(profile); + } } ShelfSpinnerController* ChromeShelfController::GetShelfSpinnerController() { @@ -768,8 +788,9 @@ void ChromeShelfController::SetAppIconLoadersForTest( std::vector<std::unique_ptr<AppIconLoader>>& loaders) { app_icon_loaders_.clear(); - for (auto& loader : loaders) + for (auto& loader : loaders) { app_icon_loaders_[profile_].push_back(std::move(loader)); + } } void ChromeShelfController::SetProfileForTest(Profile* profile) { @@ -792,8 +813,9 @@ void ChromeShelfController::ReplacePinnedItem(const std::string& old_app_id, const std::string& new_app_id) { - if (!model_->IsAppPinned(old_app_id) || model_->IsAppPinned(new_app_id)) + if (!model_->IsAppPinned(old_app_id) || model_->IsAppPinned(new_app_id)) { return; + } const int index = model_->ItemIndexByAppID(old_app_id); ash::ShelfItem item; @@ -810,8 +832,9 @@ void ChromeShelfController::PinAppAtIndex(const std::string& app_id, int target_index) { - if (target_index < 0 || model_->IsAppPinned(app_id)) + if (target_index < 0 || model_->IsAppPinned(app_id)) { return; + } EnsureAppPinnedInModelAtIndex(app_id, /*current_index=*/-1, target_index); } @@ -829,8 +852,9 @@ TRACE_EVENT0("ui", "ChromeShelfController::GetAppIconLoaderForApp"); for (const auto& app_icon_loader : app_icon_loaders_[latest_active_profile_]) { - if (app_icon_loader->CanLoadImageForApp(app_id)) + if (app_icon_loader->CanLoadImageForApp(app_id)) { return app_icon_loader.get(); + } } return nullptr; @@ -911,8 +935,9 @@ item.app_status = app_status; } - if (needs_update) + if (needs_update) { model_->Set(index, item); + } } } @@ -934,8 +959,9 @@ if (item.type == ash::TYPE_APP || item.type == ash::TYPE_PINNED_APP) { if (reload_icon) { AppIconLoader* app_icon_loader = GetAppIconLoaderForApp(app_id); - if (app_icon_loader) + if (app_icon_loader) { app_icon_loader->FetchImage(app_id); + } } bool needs_update = false; @@ -960,8 +986,9 @@ item.package_id = package_id; } - if (needs_update) + if (needs_update) { model_->Set(index, item); + } } } } @@ -971,15 +998,17 @@ const std::string& app_id, bool show_in_shelf) { TRACE_EVENT0("ui", "ChromeShelfController::OnAppShowInShelfChanged"); - if (browser_context != profile()) + if (browser_context != profile()) { return; + } ScopedPinSyncDisabler scoped_pin_sync_disabler = GetScopedPinSyncDisabler(); // If the app should be hidden from shelf, make sure it gets unpinned. if (!show_in_shelf) { - if (IsAppPinned(app_id)) + if (IsAppPinned(app_id)) { UnpinShelfItemInternal(ash::ShelfID(app_id)); + } return; } @@ -998,8 +1027,9 @@ } // The app should not be pinned - nothing left to do. - if (index == -1) + if (index == -1) { return; + } // Update apps icon if applicable. OnAppUpdated(profile(), app_id, /*reload_icon=*/true); @@ -1021,8 +1051,9 @@ // Set the pinned by policy flag. const int final_index = model_->ItemIndexByAppID(app_id); - if (final_index >= 0) + if (final_index >= 0) { UpdatePinnedByPolicyForItemAtIndex(final_index); + } } void ChromeShelfController::OnAppUninstalledPrepared( @@ -1033,8 +1064,9 @@ // outstanding locks which needs to be removed. const Profile* profile = Profile::FromBrowserContext(browser_context); ash::ShelfID shelf_id(app_id); - if (GetItem(shelf_id)) + if (GetItem(shelf_id)) { CloseWindowedAppsFromRemovedExtension(app_id, profile); + } // Some apps may be removed locally. Unpin the item without removing the pin // position from profile preferences. When needed, it is automatically deleted @@ -1197,8 +1229,9 @@ void ChromeShelfController::RememberUnpinnedRunningApplicationOrder() { RunningAppListIds list; for (int i = 0; i < model_->item_count(); i++) { - if (model_->items()[i].type == ash::TYPE_APP) + if (model_->items()[i].type == ash::TYPE_APP) { list.push_back(model_->items()[i].id.app_id); + } } const std::string user_email = multi_user_util::GetAccountIdFromProfile(profile()).GetUserEmail(); @@ -1209,8 +1242,9 @@ const std::string& user_id) { const RunningAppListIdMap::iterator app_id_list = last_used_running_application_order_.find(user_id); - if (app_id_list == last_used_running_application_order_.end()) + if (app_id_list == last_used_running_application_order_.end()) { return; + } // Find the first insertion point for running applications. int running_index = model_->FirstRunningAppIndex(); @@ -1219,8 +1253,9 @@ if (item && item->type == ash::TYPE_APP) { int app_index = model_->ItemIndexByID(item->id); DCHECK_GE(app_index, 0); - if (running_index != app_index) + if (running_index != app_index) { model_->Move(running_index, app_index); + } running_index++; } } @@ -1228,8 +1263,9 @@ void ChromeShelfController::RemoveShelfItem(const ash::ShelfID& id) { const int index = model_->ItemIndexByID(id); - if (index >= 0 && index < model_->item_count()) + if (index >= 0 && index < model_->item_count()) { model_->RemoveItemAt(index); + } ReportUpdateShelfIconList(model_); } @@ -1246,10 +1282,12 @@ DCHECK_EQ(GetItem(shelf_id)->type, ash::TYPE_APP); SetItemType(shelf_id, ash::TYPE_PINNED_APP); int running_index = model_->ItemIndexByID(shelf_id); - if (running_index < index) + if (running_index < index) { --index; - if (running_index != index) + } + if (running_index != index) { model_->Move(running_index, index); + } } void ChromeShelfController::UnpinRunningAppInternal(int index) { @@ -1279,8 +1317,9 @@ for (int i = index + 1; i < max_index; ++i) { const ash::ShelfID& shelf_id_after = model_->items()[i].id; - if (ShouldSyncItem(model_->items()[i])) + if (ShouldSyncItem(model_->items()[i])) { shelf_ids_after.push_back(shelf_id_after); + } } shelf_prefs_->SetPinPosition( @@ -1302,8 +1341,9 @@ // Wait until the initial sync happens. auto* pref_service = PrefServiceSyncableFromProfile(profile()); bool is_syncing = pref_service->AreOsPrefsSyncing(); - if (!is_syncing) + if (!is_syncing) { return; + } // Initialize the local prefs if this is the first time sync has occurred. shelf_prefs_->InitLocalPref(profile()->GetPrefs(), ash::prefs::kShelfAlignmentLocal, @@ -1369,17 +1409,19 @@ /*current_index=*/app_index < model_->item_count() ? app_index : -1, /*target_index=*/index); - if (item_pinned) + if (item_pinned) { ++index; + } } // At second step remove any pin to the right from the current index. while (index < model_->item_count()) { const ash::ShelfItem& item = model_->items()[index]; - if (item.type == ash::TYPE_PINNED_APP) + if (item.type == ash::TYPE_PINNED_APP) { UnpinShelfItemInternal(item.id); - else + } else { ++index; + } } UpdateAppsPinStatesFromPrefs(); @@ -1410,8 +1452,9 @@ // app_id may be kChromeAppId. This happens when sync happens, // but Lacros becomes the primary browser so that the browser // shortcut is unpinned. Do nothing then. - if (app_id == kChromeAppId) + if (app_id == kChromeAppId) { return false; + } // We need to create a new pin for a synced app. std::unique_ptr<ash::ShelfItemDelegate> item_delegate = @@ -1474,8 +1517,9 @@ // list which got deleted already. However - in some situations e.g. // Browser::SwapTabContent there is temporarily no associated browser. // TODO(jamescook): This test may not be necessary anymore. - if (!browser) + if (!browser) { continue; + } return ash::STATUS_RUNNING; } } @@ -1550,8 +1594,9 @@ } while (!browser_to_close.empty()) { TabStripModel* tab_strip = browser_to_close.back()->tab_strip_model(); - if (!tab_strip->empty()) + if (!tab_strip->empty()) { tab_strip->CloseWebContentsAt(0, TabCloseTypes::CLOSE_NONE); + } browser_to_close.pop_back(); } } @@ -1664,8 +1709,9 @@ ash::ShelfID id = model_->items()[index].id; // Fetch the app icon, this may synchronously update the item's image. AppIconLoader* app_icon_loader = GetAppIconLoaderForApp(id.app_id); - if (app_icon_loader) + if (app_icon_loader) { app_icon_loader->FetchImage(id.app_id); + } // Update the item with any other missing Chrome-specific info. // Construct |item| after FetchImage, which might synchronously load an image. @@ -1723,15 +1769,17 @@ } } - if (needs_update) + if (needs_update) { model_->Set(index, item); + } } UpdateForcedPinStateForItemAtIndex(index); // Update the pin position preference as needed. - if (ShouldSyncItemWithReentrancy(item)) + if (ShouldSyncItemWithReentrancy(item)) { SyncPinPosition(item.id); + } ReportUpdateShelfIconList(model_); } @@ -1740,17 +1788,20 @@ const ash::ShelfItem& old_item) { TRACE_EVENT0("ui", "ChromeShelfController::ShelfItemRemoved"); // Remove the pin position from preferences as needed. - if (ShouldSyncItemWithReentrancy(old_item)) + if (ShouldSyncItemWithReentrancy(old_item)) { shelf_prefs_->RemovePinPosition(old_item.id); - if (auto* app_icon_loader = GetAppIconLoaderForApp(old_item.id.app_id)) + } + if (auto* app_icon_loader = GetAppIconLoaderForApp(old_item.id.app_id)) { app_icon_loader->ClearImage(old_item.id.app_id); + } } void ChromeShelfController::ShelfItemMoved(int start_index, int target_index) { // Update the pin position preference as needed. const ash::ShelfItem& item = model_->items()[target_index]; - if (ShouldSyncItemWithReentrancy(item)) + if (ShouldSyncItemWithReentrancy(item)) { SyncPinPosition(item.id); + } } void ChromeShelfController::ShelfItemChanged(int index, @@ -1758,10 +1809,12 @@ TRACE_EVENT0("ui", "ChromeShelfController::ShelfItemChanged"); // Add or remove the pin position from preferences as needed. const ash::ShelfItem& item = model_->items()[index]; - if (!ItemTypeIsPinned(old_item) && ShouldSyncItemWithReentrancy(item)) + if (!ItemTypeIsPinned(old_item) && ShouldSyncItemWithReentrancy(item)) { SyncPinPosition(item.id); - else if (ShouldSyncItemWithReentrancy(old_item) && !ItemTypeIsPinned(item)) + } else if (ShouldSyncItemWithReentrancy(old_item) && + !ItemTypeIsPinned(item)) { shelf_prefs_->RemovePinPosition(old_item.id); + } ReportUpdateShelfIconList(model_); }
diff --git a/chrome/browser/ui/ash/shelf/chrome_shelf_controller_browsertest.cc b/chrome/browser/ui/ash/shelf/chrome_shelf_controller_browsertest.cc index de11278f..809aa0a 100644 --- a/chrome/browser/ui/ash/shelf/chrome_shelf_controller_browsertest.cc +++ b/chrome/browser/ui/ash/shelf/chrome_shelf_controller_browsertest.cc
@@ -173,8 +173,9 @@ for (Browser* browser : *BrowserList::GetInstance()) { std::string browser_app_name = web_app::GetAppIdFromApplicationName(browser->app_name()); - if (browser_app_name == app_name) + if (browser_app_name == app_name) { return browser; + } } return nullptr; } @@ -2320,8 +2321,9 @@ EXPECT_EQ(item_count + 2, shelf_model()->item_count()); // Validates that all items have valid app id. - for (const auto& item : shelf_model()->items()) + for (const auto& item : shelf_model()->items()) { EXPECT_TRUE(crx_file::id_util::IdIsValid(item.id.app_id)); + } // TODO(stevenjb): Test multiprofile on Chrome OS when test support is addded. // crbug.com/230464. @@ -2957,8 +2959,9 @@ private: void OnAppMenuShown() { - if (run_loop_) + if (run_loop_) { std::move(run_loop_)->Quit(); + } } raw_ptr<ash::ShelfView, DanglingUntriaged> shelf_view_ = nullptr;
diff --git a/chrome/browser/ui/ash/shelf/chrome_shelf_controller_unittest.cc b/chrome/browser/ui/ash/shelf/chrome_shelf_controller_unittest.cc index e03f6e2..df41ffad 100644 --- a/chrome/browser/ui/ash/shelf/chrome_shelf_controller_unittest.cc +++ b/chrome/browser/ui/ash/shelf/chrome_shelf_controller_unittest.cc
@@ -258,15 +258,17 @@ } bool ValidateImageIsFullyLoaded(const gfx::ImageSkia& image) { - if (kSizeInDip != image.width() || kSizeInDip != image.height()) + if (kSizeInDip != image.width() || kSizeInDip != image.height()) { return false; + } const std::vector<ui::ResourceScaleFactor>& scale_factors = ui::GetSupportedResourceScaleFactors(); for (const auto scale_factor : scale_factors) { const float scale = ui::GetScaleForResourceScaleFactor(scale_factor); - if (!image.HasRepresentation(scale)) + if (!image.HasRepresentation(scale)) { return false; + } const gfx::ImageSkiaRep& representation = image.GetRepresentation(scale); if (representation.is_null() || @@ -407,8 +409,9 @@ bool IsValidIDForCurrentUser(const std::string& id) const override { for (TabToStringMap::const_iterator i = tab_id_map_.begin(); i != tab_id_map_.end(); ++i) { - if (i->second == id) + if (i->second == id) { return true; + } } return false; } @@ -470,18 +473,21 @@ std::make_unique<apps::App>(apps::AppType::kChromeApp, app_id); app->app_id = app_id; - if (block) + if (block) { app->readiness = apps::Readiness::kDisabledByPolicy; - else + } else { app->readiness = apps::Readiness::kReady; + } - if (pause) + if (pause) { app->paused = true; - else + } else { app->paused = false; + } - if (show_in_shelf.has_value()) + if (show_in_shelf.has_value()) { app->show_in_shelf = show_in_shelf; + } apps.push_back(std::move(app)); @@ -560,8 +566,9 @@ &(apps::AppServiceProxyFactory::GetForProfile(profile()) ->AppRegistryCache())); - if (auto_start_arc_test_) + if (auto_start_arc_test_) { arc_test_.SetUp(profile()); + } // Wait until |extension_system| is signaled as started. base::RunLoop run_loop; @@ -602,8 +609,9 @@ Extension::NO_FLAGS, arc::kPlayStoreAppId, &error); extension_service_->AddExtension(extension_chrome_.get()); - if (StartWebAppProviderForMainProfile()) + if (StartWebAppProviderForMainProfile()) { StartWebAppProvider(profile()); + } } virtual bool StartWebAppProviderForMainProfile() const { return true; } @@ -738,9 +746,7 @@ } // Destroy the controller instance and clear the local pointer. - void ResetShelfController() { - shelf_controller_.reset(); - } + void ResetShelfController() { shelf_controller_.reset(); } // Destroy and recreate the controller; clear and reinitialize the ShelfModel. // Returns a pointer to the uninitialized controller, owned by shell delegate. @@ -855,8 +861,9 @@ syncer::StringOrdinal GeneratePinPosition(int position) { syncer::StringOrdinal ordinal_position = syncer::StringOrdinal::CreateInitialOrdinal(); - for (int i = 0; i < position; ++i) + for (int i = 0; i < position; ++i) { ordinal_position = ordinal_position.CreateAfter(); + } return ordinal_position; } @@ -959,8 +966,9 @@ std::vector<std::string>* app_ids) { app_ids->clear(); for (const auto& item : model_->items()) { - if (item.type == ash::TYPE_PINNED_APP) + if (item.type == ash::TYPE_PINNED_APP) { app_ids->push_back(item.id.app_id); + } } } @@ -971,8 +979,9 @@ std::string GetPinnedAppStatus() { std::string result; for (int i = 0; i < model_->item_count(); i++) { - if (!result.empty()) + if (!result.empty()) { result.append(", "); + } switch (model_->items()[i].type) { case ash::TYPE_APP: { if (IsPlatformApp(model_->items()[i].id)) { @@ -1074,8 +1083,9 @@ // IDs matches the order of associated shelf items in the shelf model. std::vector<std::string> GetAppsShownInShelf() const { std::vector<std::string> app_ids; - for (auto& item : model_->items()) + for (auto& item : model_->items()) { app_ids.push_back(item.id.app_id); + } return app_ids; } @@ -3884,8 +3894,9 @@ std::u16string expected_item_titles[]) { auto items = controller->GetAppMenuItemsForTesting(item); ASSERT_EQ(expected_item_count, items.size()); - for (size_t i = 0; i < expected_item_count; i++) + for (size_t i = 0; i < expected_item_count; i++) { EXPECT_EQ(expected_item_titles[i], items[i].title); + } } // Check that browsers get reflected correctly in the shelf menu. @@ -4953,8 +4964,9 @@ protected: void SetUp() override { - if (GetParam()) + if (GetParam()) { arc::SetArcAlwaysStartWithoutPlayStoreForTesting(); + } // To prevent crash on test exit and pending decode request. ArcAppIcon::DisableSafeDecodingForTesting(); ArcDefaultAppList::UseTestAppsDirectory();
diff --git a/chrome/browser/ui/ash/shelf/chrome_shelf_controller_util.cc b/chrome/browser/ui/ash/shelf/chrome_shelf_controller_util.cc index 506e2d2..dcb4afd 100644 --- a/chrome/browser/ui/ash/shelf/chrome_shelf_controller_util.cc +++ b/chrome/browser/ui/ash/shelf/chrome_shelf_controller_util.cc
@@ -58,8 +58,9 @@ const char* kNoPinAppIds[] = { ash::eche_app::kEcheAppId, }; - if (base::Contains(kNoPinAppIds, app_id)) + if (base::Contains(kNoPinAppIds, app_id)) { return AppListControllerDelegate::NO_PIN; + } const std::optional<std::vector<std::string>> policy_ids = apps_util::GetPolicyIdsFromAppId(profile, app_id); @@ -79,13 +80,15 @@ profile->GetPrefs()->GetList(prefs::kPolicyPinnedLauncherApps); for (const base::Value& policy_dict_entry : policy_apps) { - if (!policy_dict_entry.is_dict()) + if (!policy_dict_entry.is_dict()) { return AppListControllerDelegate::PIN_EDITABLE; + } const std::string* policy_entry = policy_dict_entry.GetDict().FindString( ChromeShelfPrefs::kPinnedAppsPrefAppIDKey); - if (!policy_entry) + if (!policy_entry) { return AppListControllerDelegate::PIN_EDITABLE; + } if (base::Contains(*policy_ids, apps_util::TransformRawPolicyId(*policy_entry))) { @@ -185,14 +188,17 @@ bool IsBrowserRepresentedInBrowserList(Browser* browser, const ash::ShelfModel* model) { // Only Ash desktop browser windows for the active user are represented. - if (!browser || !multi_user_util::IsProfileFromActiveUser(browser->profile())) + if (!browser || + !multi_user_util::IsProfileFromActiveUser(browser->profile())) { return false; + } if (browser->is_type_app() || browser->is_type_app_popup()) { // V1 App popup windows may have their own item. ash::ShelfID id(web_app::GetAppIdFromApplicationName(browser->app_name())); - if (model->ItemByID(id)) + if (model->ItemByID(id)) { return false; + } } return true;
diff --git a/chrome/browser/ui/ash/shelf/chrome_shelf_prefs.cc b/chrome/browser/ui/ash/shelf/chrome_shelf_prefs.cc index 838d133..010f79a5 100644 --- a/chrome/browser/ui/ash/shelf/chrome_shelf_prefs.cc +++ b/chrome/browser/ui/ash/shelf/chrome_shelf_prefs.cc
@@ -207,8 +207,9 @@ // This is required because tablet form factor devices do not sync app // positions and pin preferences. std::string GetShelfDefaultPinLayoutPref() { - if (ash::switches::IsTabletFormFactor()) + if (ash::switches::IsTabletFormFactor()) { return prefs::kShelfDefaultPinLayoutRollsForTabletFormFactor; + } return prefs::kShelfDefaultPinLayoutRolls; } @@ -636,8 +637,9 @@ auto* syncable_service = app_list::AppListSyncableServiceFactory::GetForProfile(profile_); // Some unit tests may not have this service. - if (!syncable_service) + if (!syncable_service) { return; + } syncer::StringOrdinal position_before = app_id_before.empty() ? syncer::StringOrdinal()
diff --git a/chrome/browser/ui/ash/shelf/chrome_shelf_prefs_unittest.cc b/chrome/browser/ui/ash/shelf/chrome_shelf_prefs_unittest.cc index 70d6c052..3c763b0 100644 --- a/chrome/browser/ui/ash/shelf/chrome_shelf_prefs_unittest.cc +++ b/chrome/browser/ui/ash/shelf/chrome_shelf_prefs_unittest.cc
@@ -91,8 +91,9 @@ syncer::StringOrdinal GetPinPosition(const std::string& app_id) override { const SyncItem* item = GetSyncItem(app_id); - if (!item) + if (!item) { return syncer::StringOrdinal(); + } return item->item_pin_ordinal; } @@ -112,8 +113,9 @@ const SyncItem* GetSyncItem(const std::string& id) const override { auto it = item_map_.find(id); - if (it == item_map_.end()) + if (it == item_map_.end()) { return nullptr; + } return it->second.get(); }
diff --git a/chrome/browser/ui/ash/shelf/crostini_app_display.cc b/chrome/browser/ui/ash/shelf/crostini_app_display.cc index 2f1fa82..2f434909 100644 --- a/chrome/browser/ui/ash/shelf/crostini_app_display.cc +++ b/chrome/browser/ui/ash/shelf/crostini_app_display.cc
@@ -29,7 +29,8 @@ int64_t CrostiniAppDisplay::GetDisplayIdForAppId(const std::string& app_id) { auto it = app_id_to_display_id_.find(app_id); - if (it == app_id_to_display_id_.end()) + if (it == app_id_to_display_id_.end()) { return display::Screen::GetScreen()->GetDisplayForNewWindows().id(); + } return it->second; }
diff --git a/chrome/browser/ui/ash/shelf/crostini_app_window.cc b/chrome/browser/ui/ash/shelf/crostini_app_window.cc index ae728cc1..d814b38 100644 --- a/chrome/browser/ui/ash/shelf/crostini_app_window.cc +++ b/chrome/browser/ui/ash/shelf/crostini_app_window.cc
@@ -3,8 +3,8 @@ // found in the LICENSE file. #include "chrome/browser/ui/ash/shelf/crostini_app_window.h" -#include "base/memory/raw_ptr.h" +#include "base/memory/raw_ptr.h" #include "chrome/browser/ash/app_list/app_service/app_service_app_icon_loader.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/app_icon_loader_delegate.h" @@ -43,8 +43,9 @@ const gfx::ImageSkia& image, bool is_placeholder_icon, const std::optional<gfx::ImageSkia>& badge_image) override { - if (!widget_ || !widget_->widget_delegate()) + if (!widget_ || !widget_->widget_delegate()) { return; + } if (mode_ == Mode::kWindowIcon) { widget_->widget_delegate()->SetIcon(ui::ImageModel::FromImageSkia(image));
diff --git a/chrome/browser/ui/ash/shelf/extension_shelf_context_menu.cc b/chrome/browser/ui/ash/shelf/extension_shelf_context_menu.cc index f7cb8af..b14e874 100644 --- a/chrome/browser/ui/ash/shelf/extension_shelf_context_menu.cc +++ b/chrome/browser/ui/ash/shelf/extension_shelf_context_menu.cc
@@ -130,8 +130,9 @@ std::u16string ExtensionShelfContextMenu::GetLabelForCommandId( int command_id) const { - if (command_id == ash::LAUNCH_NEW) + if (command_id == ash::LAUNCH_NEW) { return l10n_util::GetStringUTF16(GetLaunchTypeStringId()); + } return ShelfContextMenu::GetLabelForCommandId(command_id); } @@ -149,8 +150,9 @@ case ash::DEPRECATED_USE_LAUNCH_TYPE_FULLSCREEN: NOTREACHED(); default: - if (command_id < ash::COMMAND_ID_COUNT) + if (command_id < ash::COMMAND_ID_COUNT) { return ShelfContextMenu::IsCommandIdChecked(command_id); + } return (extension_items_ && extension_items_->IsCommandIdChecked(command_id)); } @@ -170,8 +172,9 @@ return IncognitoModePrefs::GetAvailability(profile->GetPrefs()) != policy::IncognitoModeAvailability::kDisabled; default: - if (command_id < ash::COMMAND_ID_COUNT) + if (command_id < ash::COMMAND_ID_COUNT) { return ShelfContextMenu::IsCommandIdEnabled(command_id); + } return (extension_items_ && extension_items_->IsCommandIdEnabled(command_id)); } @@ -185,8 +188,9 @@ void ExtensionShelfContextMenu::ExecuteCommand(int command_id, int event_flags) { - if (ExecuteCommonCommand(command_id, event_flags)) + if (ExecuteCommonCommand(command_id, event_flags)) { return; + } // Place new windows on the same display as the context menu. display::ScopedDisplayForNewWindows scoped_display(display_id()); @@ -253,8 +257,9 @@ GetExtensionForAppID(item().id.app_id, controller()->profile()); // An extension can be unloaded/updated/unavailable at any time. - if (!extension) + if (!extension) { return extensions::LAUNCH_TYPE_DEFAULT; + } return extensions::GetLaunchType( extensions::ExtensionPrefs::Get(controller()->profile()), extension);
diff --git a/chrome/browser/ui/ash/shelf/extension_shelf_context_menu_browsertest.cc b/chrome/browser/ui/ash/shelf/extension_shelf_context_menu_browsertest.cc index 8fd1376..afecec4 100644 --- a/chrome/browser/ui/ash/shelf/extension_shelf_context_menu_browsertest.cc +++ b/chrome/browser/ui/ash/shelf/extension_shelf_context_menu_browsertest.cc
@@ -23,12 +23,13 @@ ~ExtensionShelfContextMenuBrowserTest() override = default; const gfx::VectorIcon& GetExpectedLaunchNewIcon(int command_id) { - if (command_id == ash::USE_LAUNCH_TYPE_REGULAR) + if (command_id == ash::USE_LAUNCH_TYPE_REGULAR) { return views::kNewTabIcon; - else if (command_id == ash::USE_LAUNCH_TYPE_WINDOW) + } else if (command_id == ash::USE_LAUNCH_TYPE_WINDOW) { return views::kNewWindowIcon; - else + } else { return views::kOpenIcon; + } } };
diff --git a/chrome/browser/ui/ash/shelf/shelf_app_updater.h b/chrome/browser/ui/ash/shelf/shelf_app_updater.h index ca2fecc..c16e835 100644 --- a/chrome/browser/ui/ash/shelf/shelf_app_updater.h +++ b/chrome/browser/ui/ash/shelf/shelf_app_updater.h
@@ -14,7 +14,7 @@ class PackageId; class PromiseAppUpdate; class ShortcutUpdate; -} +} // namespace apps namespace content { class BrowserContext;
diff --git a/chrome/browser/ui/ash/shelf/shelf_browsertest.cc b/chrome/browser/ui/ash/shelf/shelf_browsertest.cc index 6713778..b64546b 100644 --- a/chrome/browser/ui/ash/shelf/shelf_browsertest.cc +++ b/chrome/browser/ui/ash/shelf/shelf_browsertest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "ash/shelf/shelf.h" + #include <memory> #include "ash/constants/ash_switches.h" @@ -11,7 +13,6 @@ #include "ash/public/cpp/test/app_list_test_api.h" #include "ash/public/cpp/test/shell_test_api.h" #include "ash/root_window_controller.h" -#include "ash/shelf/shelf.h" #include "ash/shelf/shelf_layout_manager.h" #include "ash/shelf/shelf_layout_manager_observer.h" #include "ash/shell.h"
diff --git a/chrome/browser/ui/ash/shelf/shelf_context_menu.cc b/chrome/browser/ui/ash/shelf/shelf_context_menu.cc index 1df1e52e..6146ea2 100644 --- a/chrome/browser/ui/ash/shelf/shelf_context_menu.cc +++ b/chrome/browser/ui/ash/shelf/shelf_context_menu.cc
@@ -187,10 +187,11 @@ } break; case ash::TOGGLE_PIN: - if (controller_->IsAppPinned(item_.id.app_id)) + if (controller_->IsAppPinned(item_.id.app_id)) { controller_->UnpinAppWithID(item_.id.app_id); - else + } else { controller_->shelf_model()->PinExistingItemWithID(item_.id.app_id); + } break; case ash::UNINSTALL: UninstallApp(controller_->profile(), item_.id.app_id); @@ -205,10 +206,12 @@ int string_id) const { switch (type) { case ash::LAUNCH_NEW: - if (string_id == IDS_APP_LIST_CONTEXT_MENU_NEW_TAB) + if (string_id == IDS_APP_LIST_CONTEXT_MENU_NEW_TAB) { return views::kNewTabIcon; - if (string_id == IDS_APP_LIST_CONTEXT_MENU_NEW_WINDOW) + } + if (string_id == IDS_APP_LIST_CONTEXT_MENU_NEW_WINDOW) { return views::kNewWindowIcon; + } return views::kOpenIcon; case ash::MENU_CLOSE: return views::kCloseIcon; @@ -303,8 +306,9 @@ ash::CommandId type, int string_id) { // Do not include disabled items. - if (!IsCommandIdEnabled(type)) + if (!IsCommandIdEnabled(type)) { return; + } const gfx::VectorIcon& icon = GetCommandIdVectorIcon(type, string_id); if (!icon.is_empty()) {
diff --git a/chrome/browser/ui/ash/shelf/shelf_context_menu_unittest.cc b/chrome/browser/ui/ash/shelf/shelf_context_menu_unittest.cc index 71ffd56c..ebd0833 100644 --- a/chrome/browser/ui/ash/shelf/shelf_context_menu_unittest.cc +++ b/chrome/browser/ui/ash/shelf/shelf_context_menu_unittest.cc
@@ -483,8 +483,9 @@ TEST_F(ShelfContextMenuTest, ArcDeferredShelfContextMenuItemCheck) { std::vector<arc::mojom::AppInfoPtr> apps; apps.reserve(2); - for (int i = 0; i < 2; i++) + for (int i = 0; i < 2; i++) { apps.emplace_back(arc_test().fake_apps()[i]->Clone()); + } SendRefreshAppList(apps); const std::string app_id1 = ArcAppTest::GetAppId(*apps[0]); const std::string app_id2 = ArcAppTest::GetAppId(*apps[1]); @@ -599,8 +600,9 @@ GetContextMenu(item_delegate, primary_id); // Check that every menu item has an icon - for (size_t i = 0; i < menu->GetItemCount(); ++i) + for (size_t i = 0; i < menu->GetItemCount(); ++i) { EXPECT_FALSE(menu->GetIconAt(i).IsEmpty()); + } // Precisely which density option is shown is not important to us, we only // care that one is shown. @@ -652,8 +654,9 @@ GetContextMenu(item_delegate, primary_id); // Check that every menu item has an icon - for (size_t i = 0; i < menu->GetItemCount(); ++i) + for (size_t i = 0; i < menu->GetItemCount(); ++i) { EXPECT_FALSE(menu->GetIconAt(i).IsEmpty()); + } EXPECT_TRUE(IsItemEnabledInMenu(menu.get(), ash::UNINSTALL)); EXPECT_TRUE(IsItemEnabledInMenu(menu.get(), ash::SHOW_APP_INFO));
diff --git a/chrome/browser/ui/ash/shelf/shelf_controller_helper.cc b/chrome/browser/ui/ash/shelf/shelf_controller_helper.cc index ecd9ae3..b3e4584 100644 --- a/chrome/browser/ui/ash/shelf/shelf_controller_helper.cc +++ b/chrome/browser/ui/ash/shelf/shelf_controller_helper.cc
@@ -114,8 +114,9 @@ // static std::u16string ShelfControllerHelper::GetAppTitle(Profile* profile, const std::string& app_id) { - if (app_id.empty()) + if (app_id.empty()) { return std::u16string(); + } // Get the title if the app is an ARC app. ARC shortcuts could call this // function when it's created, so AppService can't be used for ARC shortcuts, @@ -151,13 +152,15 @@ // Get the title for the extension which is not managed by AppService. extensions::ExtensionRegistry* registry = extensions::ExtensionRegistry::Get(profile); - if (!registry) + if (!registry) { return std::u16string(); + } auto* extension = registry->GetExtensionById( app_id, extensions::ExtensionRegistry::EVERYTHING); - if (extension && extension->is_extension()) + if (extension && extension->is_extension()) { return base::UTF8ToUTF16(extension->name()); + } return std::u16string(); } @@ -216,8 +219,9 @@ const std::string& app_id) { ash::AppStatus status = ash::AppStatus::kReady; - if (!apps::AppServiceProxyFactory::IsAppServiceAvailableForProfile(profile)) + if (!apps::AppServiceProxyFactory::IsAppServiceAvailableForProfile(profile)) { return status; + } if (ash::features::ArePromiseIconsEnabled()) { const apps::PromiseApp* promise_app = @@ -333,8 +337,9 @@ bool ShelfControllerHelper::IsValidIDForCurrentUser( const std::string& app_id) const { - if (IsValidIDForArcApp(app_id)) + if (IsValidIDForArcApp(app_id)) { return true; + } return IsValidIDFromAppService(app_id); } @@ -394,13 +399,15 @@ const extensions::Extension* extension = extensions::ExtensionRegistry::Get(profile_)->GetExtensionById( app_id, extensions::ExtensionRegistry::EVERYTHING); - if (!extension) + if (!extension) { return; + } if (!extensions::util::IsAppLaunchableWithoutEnabling(app_id, profile_)) { // Do nothing if there is already a running enable flow. - if (extension_enable_flow_) + if (extension_enable_flow_) { return; + } extension_enable_flow_ = std::make_unique<ExtensionEnableFlow>(profile_, app_id, this);
diff --git a/chrome/browser/ui/ash/shelf/shelf_extension_app_updater.cc b/chrome/browser/ui/ash/shelf/shelf_extension_app_updater.cc index 0ffafc5..daa62d6 100644 --- a/chrome/browser/ui/ash/shelf/shelf_extension_app_updater.cc +++ b/chrome/browser/ui/ash/shelf/shelf_extension_app_updater.cc
@@ -19,38 +19,44 @@ extensions_only_(extensions_only) { StartObservingExtensionRegistry(); - if (extensions_only) + if (extensions_only) { return; + } ArcAppListPrefs* prefs = ArcAppListPrefs::Get(browser_context); - if (prefs) + if (prefs) { prefs->AddObserver(this); + } } ShelfExtensionAppUpdater::~ShelfExtensionAppUpdater() { StopObservingExtensionRegistry(); - if (extensions_only_) + if (extensions_only_) { return; + } ArcAppListPrefs* prefs = ArcAppListPrefs::Get(browser_context()); - if (prefs) + if (prefs) { prefs->RemoveObserver(this); + } } void ShelfExtensionAppUpdater::OnExtensionLoaded( content::BrowserContext* browser_context, const extensions::Extension* extension) { - if (ShouldHandleExtension(extension)) + if (ShouldHandleExtension(extension)) { delegate()->OnAppInstalled(browser_context, extension->id()); + } } void ShelfExtensionAppUpdater::OnExtensionUnloaded( content::BrowserContext* browser_context, const extensions::Extension* extension, extensions::UnloadedExtensionReason reason) { - if (!ShouldHandleExtension(extension)) + if (!ShouldHandleExtension(extension)) { return; + } if (reason == extensions::UnloadedExtensionReason::UNINSTALL) { delegate()->OnAppUninstalledPrepared(browser_context, extension->id(), @@ -65,8 +71,9 @@ content::BrowserContext* browser_context, const extensions::Extension* extension, extensions::UninstallReason reason) { - if (ShouldHandleExtension(extension)) + if (ShouldHandleExtension(extension)) { delegate()->OnAppUninstalled(browser_context, extension->id()); + } } void ShelfExtensionAppUpdater::OnShutdown( @@ -78,8 +85,9 @@ void ShelfExtensionAppUpdater::OnPackageListInitialRefreshed() { const ArcAppListPrefs* prefs = ArcAppListPrefs::Get(browser_context()); const std::vector<std::string> package_names = prefs->GetPackagesFromPrefs(); - for (const auto& package_name : package_names) + for (const auto& package_name : package_names) { UpdateEquivalentApp(package_name); + } } void ShelfExtensionAppUpdater::OnPackageInstalled( @@ -99,8 +107,9 @@ } void ShelfExtensionAppUpdater::StopObservingExtensionRegistry() { - if (!extension_registry_) + if (!extension_registry_) { return; + } extension_registry_->RemoveObserver(this); extension_registry_ = nullptr; } @@ -114,8 +123,9 @@ const std::vector<std::string> extension_ids = extensions::util::GetEquivalentInstalledExtensions(browser_context(), arc_package_name); - for (const auto& iter : extension_ids) + for (const auto& iter : extension_ids) { UpdateApp(iter); + } } bool ShelfExtensionAppUpdater::ShouldHandleExtension(
diff --git a/chrome/browser/ui/ash/shelf/shelf_spinner_controller.cc b/chrome/browser/ui/ash/shelf/shelf_spinner_controller.cc index 5f16e76..583ac1b 100644 --- a/chrome/browser/ui/ash/shelf/shelf_spinner_controller.cc +++ b/chrome/browser/ui/ash/shelf/shelf_spinner_controller.cc
@@ -163,10 +163,11 @@ : owner_(owner) { owner->shelf_model()->AddObserver(this); if (user_manager::UserManager::IsInitialized()) { - if (auto* active_user = user_manager::UserManager::Get()->GetActiveUser()) + if (auto* active_user = user_manager::UserManager::Get()->GetActiveUser()) { current_account_id_ = active_user->GetAccountId(); - else + } else { LOG(ERROR) << "Failed to get active user, UserManager returned null"; + } } else { LOG(ERROR) << "Failed to get active user, UserManager is not initialized"; } @@ -180,8 +181,9 @@ gfx::ImageSkia* image) { DCHECK(image); auto it = app_controller_map_.find(app_id); - if (it == app_controller_map_.end()) + if (it == app_controller_map_.end()) { return; + } *image = gfx::ImageSkia(std::make_unique<SpinningEffectSource>( it->second, *image, owner_->IsAppPinned(app_id)), @@ -189,8 +191,9 @@ } void ShelfSpinnerController::HideSpinner(const std::string& app_id) { - if (!RemoveSpinnerFromControllerMap(app_id)) + if (!RemoveSpinnerFromControllerMap(app_id)) { return; + } const ash::ShelfID shelf_id(app_id); @@ -211,8 +214,9 @@ } void ShelfSpinnerController::CloseSpinner(const std::string& app_id) { - if (!RemoveSpinnerFromControllerMap(app_id)) + if (!RemoveSpinnerFromControllerMap(app_id)) { return; + } owner_->ReplaceWithAppShortcutOrRemove(ash::ShelfID(app_id)); UpdateShelfItemIcon(app_id); @@ -221,8 +225,9 @@ bool ShelfSpinnerController::RemoveSpinnerFromControllerMap( const std::string& app_id) { AppControllerMap::const_iterator it = app_controller_map_.find(app_id); - if (it == app_controller_map_.end()) + if (it == app_controller_map_.end()) { return false; + } const ash::ShelfID shelf_id(app_id); DCHECK_EQ(it->second.controller(), @@ -243,8 +248,9 @@ app_ids_to_close.push_back(app_id_controller_pair.first); } } - for (const auto& app_id : app_ids_to_close) + for (const auto& app_id : app_ids_to_close) { CloseSpinner(app_id); + } } bool ShelfSpinnerController::HasApp(const std::string& app_id) const { @@ -255,8 +261,9 @@ base::TimeDelta ShelfSpinnerController::GetActiveTime( const std::string& app_id) const { AppControllerMap::const_iterator it = app_controller_map_.find(app_id); - if (it == app_controller_map_.end()) + if (it == app_controller_map_.end()) { return base::TimeDelta(); + } return base::Time::Now() - it->second.creation_time(); } @@ -286,8 +293,9 @@ std::pair<std::string, std::unique_ptr<ShelfSpinnerItemController>>> to_show; - for (const auto& app_id : app_controller_map_) + for (const auto& app_id : app_controller_map_) { to_hide.push_back(app_id.first); + } for (auto it = hidden_app_controller_map_.lower_bound(account_id); it != hidden_app_controller_map_.upper_bound(account_id); it++) { to_show.push_back(std::move(it->second)); @@ -297,8 +305,9 @@ hidden_app_controller_map_.lower_bound(account_id), hidden_app_controller_map_.upper_bound(account_id)); - for (const auto& app_id : to_hide) + for (const auto& app_id : to_hide) { HideSpinner(app_id); + } for (auto& app_id_delegate_pair : to_show) { AddSpinnerToShelf(app_id_delegate_pair.first, @@ -313,19 +322,22 @@ } void ShelfSpinnerController::UpdateApps() { - if (app_controller_map_.empty()) + if (app_controller_map_.empty()) { return; + } RegisterNextUpdate(); std::vector<std::string> app_ids_to_close; for (const auto& pair : app_controller_map_) { UpdateShelfItemIcon(pair.first); - if (pair.second.IsFinished()) + if (pair.second.IsFinished()) { app_ids_to_close.emplace_back(pair.first); + } } for (const auto& app_id : app_ids_to_close) { - if (RemoveSpinnerFromControllerMap(app_id)) + if (RemoveSpinnerFromControllerMap(app_id)) { UpdateShelfItemIcon(app_id); + } } } @@ -344,8 +356,9 @@ // We should only apply the spinner controller only over non-active items. const ash::ShelfItem* item = owner_->GetItem(shelf_id); - if (item && item->status != ash::STATUS_CLOSED) + if (item && item->status != ash::STATUS_CLOSED) { return; + } controller->SetHost(weak_ptr_factory_.GetWeakPtr()); ShelfSpinnerItemController* item_controller = controller.get(); @@ -358,8 +371,9 @@ owner_->SetItemStatus(shelf_id, ash::STATUS_RUNNING); } - if (app_controller_map_.empty()) + if (app_controller_map_.empty()) { RegisterNextUpdate(); + } app_controller_map_.emplace(app_id, ShelfSpinnerData(item_controller)); }
diff --git a/chrome/browser/ui/ash/shell_delegate/chrome_shell_delegate.cc b/chrome/browser/ui/ash/shell_delegate/chrome_shell_delegate.cc index 44f57c6..c15f2ef 100644 --- a/chrome/browser/ui/ash/shell_delegate/chrome_shell_delegate.cc +++ b/chrome/browser/ui/ash/shell_delegate/chrome_shell_delegate.cc
@@ -117,8 +117,9 @@ content::WebContents* GetActiveWebContentsForNativeBrowserWindow( gfx::NativeWindow window) { - if (!window) + if (!window) { return nullptr; + } TabStripModel* tab_strip_model = GetTabstripModelForWindowIfAny(window); return tab_strip_model ? tab_strip_model->GetActiveWebContents() : nullptr; @@ -259,16 +260,19 @@ bool ChromeShellDelegate::AllowDefaultTouchActions(gfx::NativeWindow window) { content::WebContents* contents = GetActiveWebContentsForNativeBrowserWindow(window); - if (!contents) + if (!contents) { return true; + } content::RenderWidgetHostView* render_widget_host_view = contents->GetRenderWidgetHostView(); - if (!render_widget_host_view) + if (!render_widget_host_view) { return true; + } content::RenderWidgetHost* render_widget_host = render_widget_host_view->GetRenderWidgetHost(); - if (!render_widget_host) + if (!render_widget_host) { return true; + } std::optional<cc::TouchAction> allowed_touch_action = render_widget_host->GetAllowedTouchAction(); return allowed_touch_action.has_value() @@ -279,12 +283,14 @@ bool ChromeShellDelegate::ShouldWaitForTouchPressAck(gfx::NativeWindow window) { content::WebContents* contents = GetActiveWebContentsForNativeBrowserWindow(window); - if (!contents) + if (!contents) { return false; + } content::RenderWidgetHostView* render_widget_host_view = contents->GetRenderWidgetHostView(); - if (!render_widget_host_view) + if (!render_widget_host_view) { return false; + } return !!render_widget_host_view->GetRenderWidgetHost(); } @@ -307,8 +313,9 @@ ash::multidevice_setup::MultiDeviceSetupService* service = ash::multidevice_setup::MultiDeviceSetupServiceFactory::GetForProfile( ProfileManager::GetPrimaryUserProfile()); - if (service) + if (service) { service->BindMultiDeviceSetup(std::move(receiver)); + } } void ChromeShellDelegate::BindMultiCaptureService( @@ -368,8 +375,9 @@ arc_session_manager->RequestDisable(); } else { // Re-enable ARC if needed. - if (arc::IsArcPlayStoreEnabledForProfile(profile)) + if (arc::IsArcPlayStoreEnabledForProfile(profile)) { arc_session_manager->RequestEnable(); + } } } @@ -398,8 +406,9 @@ } bool ChromeShellDelegate::IsLoggingRedirectDisabled() const { - if (disable_logging_redirect_for_testing.has_value()) + if (disable_logging_redirect_for_testing.has_value()) { return disable_logging_redirect_for_testing.value(); + } return base::CommandLine::ForCurrentProcess()->HasSwitch( switches::kDisableLoggingRedirect); @@ -408,13 +417,15 @@ base::FilePath ChromeShellDelegate::GetPrimaryUserDownloadsFolder() const { const user_manager::User* primary_user = user_manager::UserManager::Get()->GetPrimaryUser(); - if (!primary_user) + if (!primary_user) { return base::FilePath(); + } Profile* user_profile = ash::ProfileHelper::Get()->GetProfileByUser(primary_user); - if (user_profile) + if (user_profile) { return file_manager::util::GetDownloadsFolderForProfile(user_profile); + } return base::FilePath(); } @@ -455,8 +466,9 @@ const extensions::AppWindow* app_window = extensions::AppWindowRegistry::Get(profile) ->GetAppWindowForNativeWindow(window); - if (app_window) + if (app_window) { contents = app_window->web_contents(); + } } }
diff --git a/chrome/browser/ui/ash/system/system_tray_client_impl.cc b/chrome/browser/ui/ash/system/system_tray_client_impl.cc index 65ef1ad6..2db79412 100644 --- a/chrome/browser/ui/ash/system/system_tray_client_impl.cc +++ b/chrome/browser/ui/ash/system/system_tray_client_impl.cc
@@ -123,8 +123,9 @@ } const ash::NetworkState* GetNetworkState(const std::string& network_id) { - if (network_id.empty()) + if (network_id.empty()) { return nullptr; + } return ash::NetworkHandler::Get() ->network_state_handler() ->GetNetworkStateFromGuid(network_id); @@ -151,8 +152,9 @@ apps::AppRegistryCache* GetActiveUserAppRegistryCache() { apps::AppServiceProxyAsh* proxy = GetActiveUserAppServiceProxyAsh(); - if (!proxy) + if (!proxy) { return nullptr; + } return &proxy->AppRegistryCache(); } @@ -184,11 +186,13 @@ ash::ManagementDeviceMode GetManagementDeviceMode( policy::BrowserPolicyConnectorAsh* connector) { - if (!connector->IsDeviceEnterpriseManaged()) + if (!connector->IsDeviceEnterpriseManaged()) { return ash::ManagementDeviceMode::kNone; + } - if (connector->IsKioskEnrolled()) + if (connector->IsKioskEnrolled()) { return ash::ManagementDeviceMode::kKioskSku; + } switch (connector->GetEnterpriseMarketSegment()) { case policy::MarketSegment::UNKNOWN: @@ -261,8 +265,9 @@ user_manager::UserManager::Get()->GetActiveUser(); Profile* profile = user ? ash::ProfileHelper::Get()->GetProfileByUser(user) : nullptr; - if (profile == profile_) + if (profile == profile_) { return; + } policy_observation_.Reset(); @@ -270,8 +275,9 @@ if (profile_) { policy::UserCloudPolicyManagerAsh* manager = profile_->GetUserCloudPolicyManagerAsh(); - if (manager) + if (manager) { policy_observation_.Observe(manager->core()->store()); + } } owner_->UpdateEnterpriseAccountDomainInfo(profile_); } @@ -289,16 +295,18 @@ system_tray_->SetUse24HourClock(clock->ShouldUse24HourClock()); // If an upgrade is available at startup then tell ash about it. - if (UpgradeDetector::GetInstance()->notify_upgrade()) + if (UpgradeDetector::GetInstance()->notify_upgrade()) { HandleUpdateAvailable(); + } // If the device is enterprise managed then send ash the enterprise domain. policy::BrowserPolicyConnectorAsh* policy_connector = g_browser_process->platform_part()->browser_policy_connector_ash(); policy::DeviceCloudPolicyManagerAsh* policy_manager = policy_connector->GetDeviceCloudPolicyManager(); - if (policy_manager) + if (policy_manager) { policy_manager->core()->store()->AddObserver(this); + } UpdateDeviceEnterpriseInfo(); system_tray_->SetClient(this); @@ -313,8 +321,9 @@ g_system_tray_client_instance = nullptr; // This can happen when mocking this class in tests. - if (!system_tray_) + if (!system_tray_) { return; + } system_tray_->SetClient(nullptr); @@ -322,8 +331,9 @@ g_browser_process->platform_part()->browser_policy_connector_ash(); policy::DeviceCloudPolicyManagerAsh* policy_manager = connector->GetDeviceCloudPolicyManager(); - if (policy_manager) + if (policy_manager) { policy_manager->core()->store()->RemoveObserver(this); + } g_browser_process->platform_part()->GetSystemClock()->RemoveObserver(this); UpgradeDetector::GetInstance()->RemoveObserver(this); @@ -536,8 +546,9 @@ void SystemTrayClientImpl::ShowGestureEducationHelp() { base::RecordAction(base::UserMetricsAction("ShowGestureEducationHelp")); Profile* profile = ProfileManager::GetActiveUserProfile(); - if (!profile) + if (!profile) { return; + } ash::SystemAppLaunchParams params; params.url = GURL(chrome::kChromeOSGestureEducationHelpURL); @@ -572,8 +583,9 @@ void SystemTrayClientImpl::ShowNetworkConfigure(const std::string& network_id) { // UI is not available at the lock screen. - if (SessionManager::Get()->IsScreenLocked()) + if (SessionManager::Get()->IsScreenLocked()) { return; + } DCHECK(ash::NetworkHandler::IsInitialized()); const ash::NetworkState* network_state = GetNetworkState(network_id); @@ -602,8 +614,9 @@ // TODO(crbug.com/40134918) Add metrics action recorder std::string page = chromeos::settings::mojom::kCellularNetworksSubpagePath; page += "&showCellularSetup=true"; - if (show_psim_flow) + if (show_psim_flow) { page += "&showPsimFlow=true"; + } ShowSettingsSubPageForActiveUser(page); } @@ -616,8 +629,9 @@ const std::string& extension_id) { Profile* profile = ProfileManager::GetPrimaryUserProfile(); - if (!profile) + if (!profile) { return; + } // Request that the third-party VPN provider show its "add network" dialog. chromeos::VpnServiceFactory::GetForBrowserContext(profile) @@ -667,8 +681,9 @@ const std::string& network_id, bool show_configure) { SessionManager* const session_manager = SessionManager::Get(); - if (session_manager->IsInSecondaryLoginScreen()) + if (session_manager->IsInSecondaryLoginScreen()) { return; + } if (!session_manager->IsSessionStarted()) { ash::InternetDetailDialog::ShowDialog(network_id); return; @@ -699,8 +714,9 @@ page += "&settingId="; page += base::NumberToString(static_cast<int32_t>( chromeos::settings::mojom::Setting::kDisconnectWifiNetwork)); - if (show_configure) + if (show_configure) { page += "&showConfigure=true"; + } } base::RecordAction(base::UserMetricsAction("OpenInternetOptionsDialog")); ShowSettingsSubPageForActiveUser(page); @@ -1019,8 +1035,9 @@ std::make_unique<ash::DeviceEnterpriseInfo>(); } - if (device_enterprise_info == *last_device_enterprise_info_) + if (device_enterprise_info == *last_device_enterprise_info_) { return; + } // Send to ash, which will add an item to the system tray. system_tray_->SetDeviceEnterpriseInfo(device_enterprise_info); @@ -1032,8 +1049,9 @@ profile ? chrome::GetAccountManagerIdentity(profile).value_or(std::string()) : std::string(); - if (account_manager == last_enterprise_account_domain_manager_) + if (account_manager == last_enterprise_account_domain_manager_) { return; + } // Send to ash, which will add an item to the system tray. system_tray_->SetEnterpriseAccountDomainInfo(account_manager);
diff --git a/chrome/browser/ui/ash/system/system_tray_client_impl_browsertest.cc b/chrome/browser/ui/ash/system/system_tray_client_impl_browsertest.cc index 2b14047a..4f7ee43 100644 --- a/chrome/browser/ui/ash/system/system_tray_client_impl_browsertest.cc +++ b/chrome/browser/ui/ash/system/system_tray_client_impl_browsertest.cc
@@ -108,9 +108,7 @@ class EnterpriseManagedTest : public MixinBasedInProcessBrowserTest { public: - EnterpriseManagedTest() { - device_state_.set_skip_initial_policy_setup(true); - } + EnterpriseManagedTest() { device_state_.set_skip_initial_policy_setup(true); } ~EnterpriseManagedTest() override = default; EnterpriseManagedTest(const EnterpriseManagedTest&) = delete; void operator=(const EnterpriseManagedTest&) = delete;
diff --git a/chrome/browser/ui/ash/system/system_tray_client_impl_unittest.cc b/chrome/browser/ui/ash/system/system_tray_client_impl_unittest.cc index 9b0260d..19e20b4ae 100644 --- a/chrome/browser/ui/ash/system/system_tray_client_impl_unittest.cc +++ b/chrome/browser/ui/ash/system/system_tray_client_impl_unittest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/ash/system/system_tray_client_impl.h" + #include <memory> #include "ash/constants/ash_features.h"
diff --git a/chrome/browser/ui/ash/system/system_tray_tray_cast_browsertest_media_router_chromeos.cc b/chrome/browser/ui/ash/system/system_tray_tray_cast_browsertest_media_router_chromeos.cc index f380878d..69820a5 100644 --- a/chrome/browser/ui/ash/system/system_tray_tray_cast_browsertest_media_router_chromeos.cc +++ b/chrome/browser/ui/ash/system/system_tray_tray_cast_browsertest_media_router_chromeos.cc
@@ -175,8 +175,8 @@ VerifyCorrectVisiblityWithSinks) { ShowBubble(); - // The tray defaults to visible. - EXPECT_TRUE(IsTrayVisible()); + // The tray defaults to visible. + EXPECT_TRUE(IsTrayVisible()); std::vector<media_router::MediaSink> zero_sinks; std::vector<media_router::MediaSink> one_sink; @@ -372,7 +372,7 @@ ShowBubble(); - // The tray is always visible. + // The tray is always visible. EXPECT_TRUE(IsTrayVisible()); }
diff --git a/chrome/browser/ui/ash/system_web_apps/system_web_app_ui_utils.cc b/chrome/browser/ui/ash/system_web_apps/system_web_app_ui_utils.cc index 8f67c5e..b731291c 100644 --- a/chrome/browser/ui/ash/system_web_apps/system_web_app_ui_utils.cc +++ b/chrome/browser/ui/ash/system_web_apps/system_web_app_ui_utils.cc
@@ -50,23 +50,27 @@ // We can't launch into certain profiles, and we can't find a suitable // alternative. - if (profile->IsSystemProfile()) + if (profile->IsSystemProfile()) { return nullptr; - if (ProfileHelper::IsSigninProfile(profile)) + } + if (ProfileHelper::IsSigninProfile(profile)) { return nullptr; + } // For a guest sessions, launch into the primary off-the-record profile, which // is used for browsing in guest sessions. We do this because the "original" // profile of the guest session can't create windows. - if (profile->IsGuestSession()) + if (profile->IsGuestSession()) { return profile->GetPrimaryOTRProfile(/*create_if_needed=*/true); + } // We don't support launching SWA in incognito profiles, use the original // profile if an incognito profile is provided (with the exception of guest // session, which is implemented with an incognito profile, thus it is handled // above). - if (profile->IsIncognitoProfile()) + if (profile->IsIncognitoProfile()) { return profile->GetOriginalProfile(); + } // Use the profile provided in other scenarios. return profile; @@ -97,8 +101,9 @@ std::optional<webapps::AppId> app_id = GetAppIdForSystemWebApp(profile, app_type); // TODO(calamity): Decide whether to report app launch failure or CHECK fail. - if (!app_id) + if (!app_id) { return std::nullopt; + } auto* provider = SystemWebAppManager::GetWebAppProvider(profile); DCHECK(provider); @@ -134,8 +139,9 @@ const std::optional<webapps::AppId> app_id = GetAppIdForSystemWebApp(profile_for_launch, type); - if (!app_id) + if (!app_id) { return; + } auto* app_service = apps::AppServiceProxyFactory::GetForProfile(profile_for_launch); @@ -228,12 +234,14 @@ } SystemWebAppManager* swa_manager = SystemWebAppManager::Get(profile); - if (!swa_manager) + if (!swa_manager) { return nullptr; + } auto* provider = web_app::WebAppProvider::GetForLocalAppsUnchecked(profile); - if (!provider) + if (!provider) { return nullptr; + } auto* system_app = swa_manager->GetSystemApp(app_type); @@ -291,8 +299,9 @@ // app install and then provide a valid answer here. std::optional<webapps::AppId> app_id = GetAppIdForSystemWebApp(profile, app_type); - if (!app_id) + if (!app_id) { return nullptr; + } auto* provider = SystemWebAppManager::GetWebAppProvider(profile); DCHECK(provider); @@ -322,8 +331,9 @@ // In case a URL is provided, only allow a browser which shows it. content::WebContents* content = browser->tab_strip_model()->GetActiveWebContents(); - if (!content->GetVisibleURL().EqualsIgnoringRef(url)) + if (!content->GetVisibleURL().EqualsIgnoringRef(url)) { continue; + } } return browser; @@ -352,8 +362,9 @@ gfx::Size GetSystemWebAppMinimumWindowSize(Browser* browser) { DCHECK(browser); - if (browser->app_controller() && browser->app_controller()->system_app()) + if (browser->app_controller() && browser->app_controller()->system_app()) { return browser->app_controller()->system_app()->GetMinimumWindowSize(); + } return gfx::Size(); }
diff --git a/chrome/browser/ui/ash/test/accelerator_metadata_unittest.cc b/chrome/browser/ui/ash/test/accelerator_metadata_unittest.cc index afa0761..55bffad 100644 --- a/chrome/browser/ui/ash/test/accelerator_metadata_unittest.cc +++ b/chrome/browser/ui/ash/test/accelerator_metadata_unittest.cc
@@ -2,10 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/webui/shortcut_customization_ui/backend/accelerator_layout_table.h" - #include <cstddef> +#include "ash/webui/shortcut_customization_ui/backend/accelerator_layout_table.h" #include "base/hash/md5.h" #include "base/hash/md5_boringssl.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/ui/ash/thumbnail_loader/thumbnail_loader.cc b/chrome/browser/ui/ash/thumbnail_loader/thumbnail_loader.cc index ee9d57f..eb82538 100644 --- a/chrome/browser/ui/ash/thumbnail_loader/thumbnail_loader.cc +++ b/chrome/browser/ui/ash/thumbnail_loader/thumbnail_loader.cc
@@ -177,8 +177,9 @@ // Then attempt to match based on `file_path` extension. for (const auto& file_match_pattern : kFileMatchPatterns) { - if (re2::RE2::FullMatch(file_path.Extension(), file_match_pattern.first)) + if (re2::RE2::FullMatch(file_path.Extension(), file_match_pattern.first)) { return true; + } } return false; @@ -231,13 +232,15 @@ callback_(std::move(callback)) {} ~ThumbnailLoaderNativeMessageHost() override { - if (callback_) + if (callback_) { std::move(callback_).Run(""); + } } void OnMessage(const std::string& message) override { - if (response_received_) + if (response_received_) { return; + } response_received_ = true; // Detach the callback from the message host in case the extension closes @@ -448,8 +451,9 @@ const base::UnguessableToken& request_id, const gfx::Size& requested_size, const std::string& data) { - if (!requests_.count(request_id)) + if (!requests_.count(request_id)) { return; + } if (data.empty()) { RespondToRequest(request_id, requested_size, /*bitmap=*/nullptr, @@ -472,8 +476,9 @@ base::File::Error error) { thumbnail_decoders_.erase(request_id); auto request_it = requests_.find(request_id); - if (request_it == requests_.end()) + if (request_it == requests_.end()) { return; + } // To work around cropping limitations of the image loader, we requested a // square image. If requested dimensions were non-square, we need to perform
diff --git a/chrome/browser/ui/ash/thumbnail_loader/thumbnail_loader_browsertest.cc b/chrome/browser/ui/ash/thumbnail_loader/thumbnail_loader_browsertest.cc index 8b98cae9..196bd35f 100644 --- a/chrome/browser/ui/ash/thumbnail_loader/thumbnail_loader_browsertest.cc +++ b/chrome/browser/ui/ash/thumbnail_loader/thumbnail_loader_browsertest.cc
@@ -53,8 +53,9 @@ public: ScopedExternalMountPoint(Profile* profile, const std::string& name) : name_(name) { - if (!temp_dir_.CreateUniqueTempDir()) + if (!temp_dir_.CreateUniqueTempDir()) { return; + } storage::ExternalMountPoints::GetSystemInstance()->RegisterFileSystem( name_, storage::kFileSystemTypeLocal, storage::FileSystemMountOption(),
diff --git a/chrome/browser/ui/ash/wallpaper/test_wallpaper_controller.cc b/chrome/browser/ui/ash/wallpaper/test_wallpaper_controller.cc index f522e1d..c77453bb 100644 --- a/chrome/browser/ui/ash/wallpaper/test_wallpaper_controller.cc +++ b/chrome/browser/ui/ash/wallpaper/test_wallpaper_controller.cc
@@ -31,8 +31,9 @@ void TestWallpaperController::ShowWallpaperImage(const gfx::ImageSkia& image) { current_wallpaper = image; - for (auto& observer : observers_) + for (auto& observer : observers_) { observer.OnWallpaperChanged(); + } } void TestWallpaperController::ClearCounts() { @@ -118,8 +119,9 @@ void TestWallpaperController::SetGooglePhotosDailyRefreshAlbumId( const AccountId& account_id, const std::string& album_id) { - if (!wallpaper_info_) + if (!wallpaper_info_) { wallpaper_info_ = ash::WallpaperInfo(); + } wallpaper_info_->type = ash::WallpaperType::kDailyGooglePhotos; wallpaper_info_->collection_id = album_id; } @@ -343,8 +345,9 @@ void TestWallpaperController::SetDailyRefreshCollectionId( const AccountId& account_id, const std::string& collection_id) { - if (!wallpaper_info_) + if (!wallpaper_info_) { wallpaper_info_ = ash::WallpaperInfo(); + } wallpaper_info_->type = ash::WallpaperType::kDaily; wallpaper_info_->collection_id = collection_id; }
diff --git a/chrome/browser/ui/ash/wallpaper/test_wallpaper_controller.h b/chrome/browser/ui/ash/wallpaper/test_wallpaper_controller.h index f26ad289..2f9d887 100644 --- a/chrome/browser/ui/ash/wallpaper/test_wallpaper_controller.h +++ b/chrome/browser/ui/ash/wallpaper/test_wallpaper_controller.h
@@ -87,8 +87,9 @@ return update_current_wallpaper_layout_layout_; } void add_dedup_key_to_wallpaper_info(const std::string& dedup_key) { - if (wallpaper_info_.has_value()) + if (wallpaper_info_.has_value()) { wallpaper_info_->dedup_key = dedup_key; + } } // ash::WallpaperController:
diff --git a/chrome/browser/ui/ash/wallpaper/wallpaper_controller_client_impl.cc b/chrome/browser/ui/ash/wallpaper/wallpaper_controller_client_impl.cc index a4da9a97..68b30fb 100644 --- a/chrome/browser/ui/ash/wallpaper/wallpaper_controller_client_impl.cc +++ b/chrome/browser/ui/ash/wallpaper/wallpaper_controller_client_impl.cc
@@ -87,8 +87,9 @@ // Returns the type of the user with the specified |id| or kRegular. user_manager::UserType GetUserType(const AccountId& id) { if (user_manager::UserManager::IsInitialized()) { - if (auto* user = user_manager::UserManager::Get()->FindUser(id)) + if (auto* user = user_manager::UserManager::Get()->FindUser(id)) { return user->GetType(); + } } // TODO(b/258750657): Convert this to a DCHECK when tests are fixed. LOG(WARNING) << "No matching user. This should only happen in tests."; @@ -114,8 +115,9 @@ // System salt must be defined at this point. const ash::SystemSaltGetter::RawSalt* salt = salt_getter->GetRawSalt(); - if (!salt) + if (!salt) { LOG(FATAL) << "WallpaperManager HashWallpaperFilesIdStr(): no salt!"; + } std::vector<uint8_t> data = *salt; // Note: The original code in https://codereview.chromium.org/1886653002/ @@ -194,8 +196,9 @@ SessionManager* session_manager = SessionManager::Get(); // SessionManager might not exist in unit tests. - if (session_manager) + if (session_manager) { session_observation_.Observe(session_manager); + } if (user_manager::UserManager::IsInitialized()) { user_manager_observation_.Observe(user_manager::UserManager::Get()); @@ -255,8 +258,9 @@ } // Do not set wallpaper in tests. - if (ash::WizardController::IsZeroDelayEnabled()) + if (ash::WizardController::IsZeroDelayEnabled()) { return; + } // Show the wallpaper of the active user during an user session. if (user_manager::UserManager::Get()->IsUserLoggedIn()) { @@ -283,8 +287,9 @@ void WallpaperControllerClientImpl::SetPolicyWallpaper( const AccountId& account_id, std::unique_ptr<std::string> data) { - if (!data || !IsKnownUser(account_id)) + if (!data || !IsKnownUser(account_id)) { return; + } wallpaper_controller_->SetPolicyWallpaper(account_id, GetUserType(account_id), *data); @@ -322,8 +327,9 @@ void WallpaperControllerClientImpl::RemovePolicyWallpaper( const AccountId& account_id) { - if (!IsKnownUser(account_id)) + if (!IsKnownUser(account_id)) { return; + } wallpaper_controller_->RemovePolicyWallpaper(account_id); } @@ -338,13 +344,15 @@ bool WallpaperControllerClientImpl::IsWallpaperSyncEnabled( const AccountId& account_id) const { Profile* profile = ProfileHelper::Get()->GetProfileByAccountId(account_id); - if (!profile) + if (!profile) { return false; + } syncer::SyncService* sync_service = SyncServiceFactory::GetForProfile(profile); - if (!sync_service) + if (!sync_service) { return false; + } syncer::SyncUserSettings* user_settings = sync_service->GetUserSettings(); return user_settings->IsSyncAllOsTypesEnabled() || profile->GetPrefs()->GetBoolean( @@ -461,8 +469,9 @@ } void WallpaperControllerClientImpl::ShowWallpaperOnLoginScreen() { - if (user_manager::UserManager::Get()->IsUserLoggedIn()) + if (user_manager::UserManager::Get()->IsUserLoggedIn()) { return; + } const user_manager::UserList& users = user_manager::UserManager::Get()->GetUsers();
diff --git a/chrome/browser/ui/ash/wallpaper/wallpaper_controller_client_impl_unittest.cc b/chrome/browser/ui/ash/wallpaper/wallpaper_controller_client_impl_unittest.cc index 1c5c2d4b..5181abe1 100644 --- a/chrome/browser/ui/ash/wallpaper/wallpaper_controller_client_impl_unittest.cc +++ b/chrome/browser/ui/ash/wallpaper/wallpaper_controller_client_impl_unittest.cc
@@ -144,8 +144,9 @@ last_ten.push_back(photo->id); - if (last_ten.size() > 10) + if (last_ten.size() > 10) { last_ten.pop_front(); + } }; for (int i = 0; i < 20; i++) {
diff --git a/chrome/browser/ui/ash/wm/coral_browsertest.cc b/chrome/browser/ui/ash/wm/coral_browsertest.cc index 4705e65..159e6ea 100644 --- a/chrome/browser/ui/ash/wm/coral_browsertest.cc +++ b/chrome/browser/ui/ash/wm/coral_browsertest.cc
@@ -171,17 +171,16 @@ BrowserList* browsers = BrowserList::GetInstance(); ASSERT_EQ(browsers->size(), 4u); // Verify the chrome browser. - EXPECT_TRUE( - base::ranges::any_of(*browsers, [](Browser* browser) { - TabStripModel* tab_strip_model = browser->tab_strip_model(); - return tab_strip_model->count() == 3 && - tab_strip_model->GetWebContentsAt(0)->GetVisibleURL() == - GURL("https://www.reddit.com/") && - tab_strip_model->GetWebContentsAt(1)->GetVisibleURL() == - GURL("https://www.figma.com/") && - tab_strip_model->GetWebContentsAt(2)->GetVisibleURL() == - GURL("https://www.notion.so/"); - })); + EXPECT_TRUE(base::ranges::any_of(*browsers, [](Browser* browser) { + TabStripModel* tab_strip_model = browser->tab_strip_model(); + return tab_strip_model->count() == 3 && + tab_strip_model->GetWebContentsAt(0)->GetVisibleURL() == + GURL("https://www.reddit.com/") && + tab_strip_model->GetWebContentsAt(1)->GetVisibleURL() == + GURL("https://www.figma.com/") && + tab_strip_model->GetWebContentsAt(2)->GetVisibleURL() == + GURL("https://www.notion.so/"); + })); // Verify the PWA. EXPECT_TRUE(base::ranges::any_of(*browsers, [](Browser* browser) {
diff --git a/chrome/browser/ui/aura/accessibility/automation_manager_aura.cc b/chrome/browser/ui/aura/accessibility/automation_manager_aura.cc index 4214f37..1b0327c 100644 --- a/chrome/browser/ui/aura/accessibility/automation_manager_aura.cc +++ b/chrome/browser/ui/aura/accessibility/automation_manager_aura.cc
@@ -82,8 +82,9 @@ if (active_window) { views::AXAuraObjWrapper* focus = cache_->GetOrCreate(active_window); - if (focus) + if (focus) { PostEvent(focus->GetUniqueId(), ax::mojom::Event::kChildrenChanged); + } } if (!automation_event_router_observer_.IsObserving()) { @@ -95,31 +96,35 @@ void AutomationManagerAura::Disable() { enabled_ = false; if (tree_) { - if (automation_event_router_interface_) + if (automation_event_router_interface_) { automation_event_router_interface_->DispatchTreeDestroyedEvent( tree_->tree_id()); + } tree_.reset(); } tree_serializer_.reset(); alert_window_.reset(); cache_ = std::make_unique<views::AXAuraObjCache>(); - if (automation_event_router_observer_.IsObserving()) + if (automation_event_router_observer_.IsObserving()) { automation_event_router_observer_.Reset(); + } } void AutomationManagerAura::OnViewEvent(views::View* view, ax::mojom::Event event_type) { CHECK(view); - if (!enabled_) + if (!enabled_) { return; + } DCHECK(tree_.get()); views::AXAuraObjWrapper* obj = cache_->GetOrCreate(view); - if (!obj) + if (!obj) { return; + } PostEvent(obj->GetUniqueId(), event_type); } @@ -129,14 +134,16 @@ ax::mojom::Event event_type) { CHECK(virtual_view); - if (!enabled_) + if (!enabled_) { return; + } DCHECK(tree_.get()); views::AXAuraObjWrapper* obj = virtual_view->GetOrCreateWrapper(cache_.get()); - if (!obj) + if (!obj) { return; + } PostEvent(obj->GetUniqueId(), event_type); } @@ -155,30 +162,35 @@ void AutomationManagerAura::HandleEvent(ax::mojom::Event event_type, bool from_user) { - if (!enabled_) + if (!enabled_) { return; + } DCHECK(tree_.get()); views::AXAuraObjWrapper* obj = tree_->GetRoot(); - if (!obj) + if (!obj) { return; + } PostEvent(obj->GetUniqueId(), event_type, /*action_request_id=*/-1, /*from_user=*/from_user); } void AutomationManagerAura::HandleAlert(const std::string& text) { - if (!enabled_) + if (!enabled_) { return; + } DCHECK(tree_.get()); - if (alert_window_.get()) + if (alert_window_.get()) { alert_window_->HandleAlert(text); + } } void AutomationManagerAura::PerformAction(const ui::AXActionData& data) { - if (!enabled_) + if (!enabled_) { return; + } DCHECK(tree_.get()); @@ -187,8 +199,9 @@ // Exclude the do default action, which can trigger too many important events // that should not be ignored by clients like focus. - if (data.action == ax::mojom::Action::kDoDefault) + if (data.action == ax::mojom::Action::kDoDefault) { currently_performing_action_ = ax::mojom::Action::kNone; + } // Unlike all of the other actions, a hit test requires determining the // node to perform the action on first. @@ -207,13 +220,15 @@ void AutomationManagerAura::OnChildWindowRemoved( views::AXAuraObjWrapper* parent) { - if (!enabled_) + if (!enabled_) { return; + } DCHECK(tree_.get()); - if (!parent) + if (!parent) { parent = tree_->GetRoot(); + } PostEvent(parent->GetUniqueId(), ax::mojom::Event::kChildrenChanged); } @@ -263,8 +278,9 @@ pending_events_.push_back({id, event_type, action_request_id, currently_performing_action_, from_user}); - if (processing_posted_) + if (processing_posted_) { return; + } processing_posted_ = true; base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask( @@ -274,11 +290,13 @@ void AutomationManagerAura::SendPendingEvents() { processing_posted_ = false; - if (!enabled_) + if (!enabled_) { return; + } - if (!tree_serializer_) + if (!tree_serializer_) { return; + } std::vector<ui::AXTreeUpdate> tree_updates; std::vector<ui::AXEvent> events; @@ -291,11 +309,13 @@ // Some events are important enough where even if their ax obj was // destroyed, they still need to be fired. - if (event_type == ax::mojom::Event::kMenuEnd && !aura_obj) + if (event_type == ax::mojom::Event::kMenuEnd && !aura_obj) { aura_obj = tree_->GetRoot(); + } - if (!aura_obj) + if (!aura_obj) { continue; + } ui::AXTreeUpdate update; if (!tree_serializer_->SerializeChanges(aura_obj, &update)) { @@ -352,13 +372,15 @@ aura::Env::GetInstance()->window_tree_hosts()) { if (display.id() == host->GetDisplayId()) { root_window = host->window(); - if (aura::client::GetFocusClient(root_window)->GetFocusedWindow()) + if (aura::client::GetFocusClient(root_window)->GetFocusedWindow()) { break; + } } } - if (!root_window) + if (!root_window) { return; + } // Convert to the root window's coordinates. gfx::Point point_in_window(action.target_point); @@ -366,8 +388,9 @@ // Determine which aura Window is associated with the target point. aura::Window* window = root_window->GetEventHandlerForPoint(point_in_window); - if (!window) + if (!window) { return; + } // Convert point to local coordinates of the hit window within the root // window. @@ -377,8 +400,9 @@ // Check for a AX node tree in a remote process (e.g. renderer, mojo app). ui::AXTreeID child_ax_tree_id; std::string* child_ax_tree_id_ptr = window->GetProperty(ui::kChildAXTreeID); - if (child_ax_tree_id_ptr) + if (child_ax_tree_id_ptr) { child_ax_tree_id = ui::AXTreeID::FromString(*child_ax_tree_id_ptr); + } // If the window has a child AX tree ID, forward the action to the // associated AXActionHandlerBase. @@ -416,13 +440,15 @@ views::View* root_view = widget->GetRootView(); views::View* hit_view = root_view->GetEventHandlerForPoint(action.target_point); - if (hit_view) + if (hit_view) { obj_to_send_event = cache_->GetOrCreate(hit_view); + } } // Otherwise, fire the event directly on the Window. - if (!obj_to_send_event) + if (!obj_to_send_event) { obj_to_send_event = cache_->GetOrCreate(window); + } if (obj_to_send_event) { PostEvent(obj_to_send_event->GetUniqueId(), action.hit_test_event_to_fire, action.request_id);
diff --git a/chrome/browser/ui/aura/accessibility/automation_manager_aura_browsertest.cc b/chrome/browser/ui/aura/accessibility/automation_manager_aura_browsertest.cc index b8de02a..7309f0a2 100644 --- a/chrome/browser/ui/aura/accessibility/automation_manager_aura_browsertest.cc +++ b/chrome/browser/ui/aura/accessibility/automation_manager_aura_browsertest.cc
@@ -2,10 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/aura/accessibility/automation_manager_aura.h" + #include "base/strings/utf_string_conversions.h" #include "base/task/sequenced_task_runner.h" #include "build/build_config.h" -#include "chrome/browser/ui/aura/accessibility/automation_manager_aura.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" @@ -96,8 +97,9 @@ // has ever been focused, otherwise spins a loop until that node is // focused. void WaitForNodeIdToBeFocused(ui::AXNodeID node_id) { - if (WasNodeIdFocused(node_id)) + if (WasNodeIdFocused(node_id)) { return; + } node_id_to_wait_for_ = node_id; run_loop_->Run(); @@ -115,9 +117,11 @@ } bool WasNodeIdFocused(int node_id) { - for (size_t i = 0; i < focused_node_ids_.size(); i++) - if (node_id == focused_node_ids_[i]) + for (size_t i = 0; i < focused_node_ids_.size(); i++) { + if (node_id == focused_node_ids_[i]) { return true; + } + } return false; } @@ -146,8 +150,9 @@ } } - if (event_type_to_wait_for_ == ax::mojom::Event::kNone) + if (event_type_to_wait_for_ == ax::mojom::Event::kNone) { return; + } for (const ui::AXEvent& event : events) { if (event.event_type == event_type_to_wait_for_ && @@ -496,8 +501,9 @@ SCOPED_TRACE("Cell: " + cell_bounds.ToString()); ui::AXNode* window = cell->parent(); - while (window && window->GetRole() != ax::mojom::Role::kWindow) + while (window && window->GetRole() != ax::mojom::Role::kWindow) { window = window->parent(); + } ASSERT_TRUE(window); gfx::RectF window_bounds = waiter.ax_tree()->GetTreeBounds(window);
diff --git a/chrome/browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.cc b/chrome/browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.cc index 75909f6..85c5498 100644 --- a/chrome/browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.cc +++ b/chrome/browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.cc
@@ -25,16 +25,18 @@ // created during the construction of the WebContents object. The // BookmarkTabHelper is created much later. web_contents_ = contents; - if (!bookmark_tab_helper_) + if (!bookmark_tab_helper_) { bookmark_tab_helper_ = BookmarkTabHelper::FromWebContents(contents); + } } void WebDragBookmarkHandlerAura::OnDragOver() { DCHECK(web_contents_); if (bookmark_tab_helper_ && bookmark_tab_helper_->bookmark_drag_delegate()) { - if (bookmark_drag_data_.is_valid()) + if (bookmark_drag_data_.is_valid()) { bookmark_tab_helper_->bookmark_drag_delegate()->OnDragOver( bookmark_drag_data_); + } } } @@ -49,9 +51,10 @@ void WebDragBookmarkHandlerAura::OnDragEnter() { if (bookmark_tab_helper_ && bookmark_tab_helper_->bookmark_drag_delegate()) { - if (bookmark_drag_data_.is_valid()) + if (bookmark_drag_data_.is_valid()) { bookmark_tab_helper_->bookmark_drag_delegate()->OnDragEnter( bookmark_drag_data_); + } } } @@ -66,8 +69,9 @@ // Focus the target browser. Browser* browser = chrome::FindBrowserWithTab(web_contents_); - if (browser) + if (browser) { browser->window()->Show(); + } } bookmark_drag_data_.Clear(); @@ -75,9 +79,10 @@ void WebDragBookmarkHandlerAura::OnDragLeave() { if (bookmark_tab_helper_ && bookmark_tab_helper_->bookmark_drag_delegate()) { - if (bookmark_drag_data_.is_valid()) + if (bookmark_drag_data_.is_valid()) { bookmark_tab_helper_->bookmark_drag_delegate()->OnDragLeave( bookmark_drag_data_); + } } bookmark_drag_data_.Clear();
diff --git a/chrome/browser/ui/autofill/address_bubbles_controller_interactive_uitest.cc b/chrome/browser/ui/autofill/address_bubbles_controller_interactive_uitest.cc index 8acd824..27f895e 100644 --- a/chrome/browser/ui/autofill/address_bubbles_controller_interactive_uitest.cc +++ b/chrome/browser/ui/autofill/address_bubbles_controller_interactive_uitest.cc
@@ -24,8 +24,7 @@ constexpr char kSuppressedScreenshotError[] = "Screenshot can only run in pixel_tests on Windows."; -class BaseAddressBubblesControllerTest - : public InteractiveBrowserTest { +class BaseAddressBubblesControllerTest : public InteractiveBrowserTest { protected: content::WebContents* web_contents() { return browser()->tab_strip_model()->GetActiveWebContents(); @@ -66,7 +65,7 @@ /////////////////////////////////////////////////////////////////////////////// // SaveAddressProfileTest -class SaveAddressProfileTest: public BaseAddressBubblesControllerTest { +class SaveAddressProfileTest : public BaseAddressBubblesControllerTest { void TriggerBubble() override { autofill_client()->ConfirmSaveAddressProfile( test::GetFullProfile(), nullptr, @@ -156,7 +155,7 @@ /////////////////////////////////////////////////////////////////////////////// // UpdateAddressProfileTest -class UpdateAddressProfileTest: public BaseAddressBubblesControllerTest { +class UpdateAddressProfileTest : public BaseAddressBubblesControllerTest { protected: void TriggerBubble() override { autofill_client()->ConfirmSaveAddressProfile( @@ -235,7 +234,8 @@ /////////////////////////////////////////////////////////////////////////////// // SaveAddressProfileTest -class MigrateToProfileAddressProfileTest: public BaseAddressBubblesControllerTest { +class MigrateToProfileAddressProfileTest + : public BaseAddressBubblesControllerTest { void TriggerBubble() override { autofill_client()->ConfirmSaveAddressProfile( test::GetFullProfile(), nullptr,
diff --git a/chrome/browser/ui/autofill/address_bubbles_controller_unittest.cc b/chrome/browser/ui/autofill/address_bubbles_controller_unittest.cc index ce85716..5cf78cb 100644 --- a/chrome/browser/ui/autofill/address_bubbles_controller_unittest.cc +++ b/chrome/browser/ui/autofill/address_bubbles_controller_unittest.cc
@@ -40,8 +40,7 @@ } AddressBubblesController* controller() { - return AddressBubblesController::FromWebContents( - web_contents()); + return AddressBubblesController::FromWebContents(web_contents()); } protected: @@ -54,8 +53,7 @@ } }; -TEST_F(AddressBubblesControllerTest, - DialogAcceptedInvokesCallback) { +TEST_F(AddressBubblesControllerTest, DialogAcceptedInvokesCallback) { AutofillProfile profile = test::GetFullProfile(); base::MockCallback<AutofillClient::AddressProfileSavePromptCallback> callback; AddressBubblesController::SetUpAndShowSaveOrUpdateAddressBubble( @@ -69,8 +67,7 @@ AutofillClient::AddressPromptUserDecision::kAccepted, std::nullopt); } -TEST_F(AddressBubblesControllerTest, - DialogCancelledInvokesCallback) { +TEST_F(AddressBubblesControllerTest, DialogCancelledInvokesCallback) { AutofillProfile profile = test::GetFullProfile(); base::MockCallback<AutofillClient::AddressProfileSavePromptCallback> callback; AddressBubblesController::SetUpAndShowSaveOrUpdateAddressBubble( @@ -87,8 +84,7 @@ // This is testing that closing all tabs (which effectively destroys the web // contents) will trigger the save callback with kIgnored decions if the users // hasn't interacted with the prompt already. -TEST_F(AddressBubblesControllerTest, - WebContentsDestroyedInvokesCallback) { +TEST_F(AddressBubblesControllerTest, WebContentsDestroyedInvokesCallback) { AutofillProfile profile = test::GetFullProfile(); base::MockCallback<AutofillClient::AddressProfileSavePromptCallback> callback; AddressBubblesController::SetUpAndShowSaveOrUpdateAddressBubble(
diff --git a/chrome/browser/ui/autofill/autofill_bubble_controller_base.cc b/chrome/browser/ui/autofill/autofill_bubble_controller_base.cc index eb270a9..47e954f 100644 --- a/chrome/browser/ui/autofill/autofill_bubble_controller_base.cc +++ b/chrome/browser/ui/autofill/autofill_bubble_controller_base.cc
@@ -30,8 +30,9 @@ void AutofillBubbleControllerBase::OnVisibilityChanged( content::Visibility visibility) { - if (visibility == content::Visibility::HIDDEN) + if (visibility == content::Visibility::HIDDEN) { HideBubble(); + } } void AutofillBubbleControllerBase::WebContentsDestroyed() { @@ -42,8 +43,9 @@ // Page action icons do not exist for Android. #if !BUILDFLAG(IS_ANDROID) Browser* browser = chrome::FindBrowserWithTab(web_contents()); - if (browser) + if (browser) { browser->window()->UpdatePageActionIcon(GetPageActionIconType()); + } #endif // !BUILDFLAG(IS_ANDROID) }
diff --git a/chrome/browser/ui/autofill/autofill_context_menu_manager.h b/chrome/browser/ui/autofill/autofill_context_menu_manager.h index 9e969da..7aaa753 100644 --- a/chrome/browser/ui/autofill/autofill_context_menu_manager.h +++ b/chrome/browser/ui/autofill/autofill_context_menu_manager.h
@@ -123,7 +123,6 @@ // opened on. void ExecuteFallbackForPlusAddressesCommand(AutofillDriver& driver); - // Triggers passwords suggestions on the field that the context menu was // opened on. void ExecuteFallbackForSelectPasswordCommand(AutofillDriver& driver);
diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc b/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc index 9cdf224..7e676e01 100644 --- a/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc +++ b/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc
@@ -597,14 +597,16 @@ view_ = nullptr; } - if (self_deletion_weak_ptr_factory_.HasWeakPtrs()) + if (self_deletion_weak_ptr_factory_.HasWeakPtrs()) { return; + } base::SequencedTaskRunner::GetCurrentDefault()->PostTask( FROM_HERE, base::BindOnce( [](base::WeakPtr<AutofillPopupControllerImpl> weak_this) { - if (weak_this) + if (weak_this) { delete weak_this.get(); + } }, self_deletion_weak_ptr_factory_.GetWeakPtr())); } @@ -620,8 +622,9 @@ } void AutofillPopupControllerImpl::FireControlsChangedEvent(bool is_show) { - if (!accessibility_state_utils::IsScreenReaderEnabled()) + if (!accessibility_state_utils::IsScreenReaderEnabled()) { return; + } // Retrieve the ax tree id associated with the current web contents. ui::AXTreeID tree_id; @@ -633,13 +636,15 @@ // the AXPlatformNode for the web contents. ui::AXPlatformNode* root_platform_node = GetRootAXPlatformNodeForWebContents(); - if (!root_platform_node) + if (!root_platform_node) { return; + } ui::AXPlatformNodeDelegate* root_platform_node_delegate = root_platform_node->GetDelegate(); - if (!root_platform_node_delegate) + if (!root_platform_node_delegate) { return; + } // Now get the target node from its tree ID and node ID. ui::AXPlatformNode* target_node = @@ -672,14 +677,16 @@ } auto* rwhv = web_contents_->GetRenderWidgetHostView(); - if (!rwhv) + if (!rwhv) { return nullptr; + } // RWHV gives us a NativeViewAccessible. gfx::NativeViewAccessible native_view_accessible = rwhv->GetNativeViewAccessible(); - if (!native_view_accessible) + if (!native_view_accessible) { return nullptr; + } // NativeViewAccessible corresponds to an AXPlatformNode. return ui::AXPlatformNode::FromNativeViewAccessible(native_view_accessible);
diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_impl.h b/chrome/browser/ui/autofill/autofill_popup_controller_impl.h index 8ee9ca8..3bf33d0 100644 --- a/chrome/browser/ui/autofill/autofill_popup_controller_impl.h +++ b/chrome/browser/ui/autofill/autofill_popup_controller_impl.h
@@ -65,9 +65,8 @@ // This class is a controller for an AutofillPopupView. It implements // AutofillPopupController to allow calls from AutofillPopupView. The // other, public functions are available to its instantiator. -class AutofillPopupControllerImpl - : public AutofillPopupController, - public ExpandablePopupParentControllerImpl { +class AutofillPopupControllerImpl : public AutofillPopupController, + public ExpandablePopupParentControllerImpl { public: AutofillPopupControllerImpl(const AutofillPopupControllerImpl&) = delete; AutofillPopupControllerImpl& operator=(const AutofillPopupControllerImpl&) =
diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_impl_mac.mm b/chrome/browser/ui/autofill/autofill_popup_controller_impl_mac.mm index 1da57b2..5c9950b 100644 --- a/chrome/browser/ui/autofill/autofill_popup_controller_impl_mac.mm +++ b/chrome/browser/ui/autofill/autofill_popup_controller_impl_mac.mm
@@ -33,8 +33,9 @@ return previous_impl->GetWeakPtr(); } - if (previous.get()) + if (previous.get()) { previous->Hide(SuggestionHidingReason::kViewDestroyed); + } auto* controller = new AutofillPopupControllerImplMac( delegate, web_contents, std::move(controller_common), form_control_ax_id); @@ -78,8 +79,9 @@ void AutofillPopupControllerImplMac::UpdateDataListValues( base::span<const SelectOption> options) { - if (touch_bar_controller_) + if (touch_bar_controller_) { [touch_bar_controller_ invalidateTouchBar]; + } AutofillPopupControllerImpl::UpdateDataListValues(options); // No code below this line!
diff --git a/chrome/browser/ui/autofill/autofill_signin_promo_tab_helper.h b/chrome/browser/ui/autofill/autofill_signin_promo_tab_helper.h index 4520043..68d6336 100644 --- a/chrome/browser/ui/autofill/autofill_signin_promo_tab_helper.h +++ b/chrome/browser/ui/autofill/autofill_signin_promo_tab_helper.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_SIGNIN_PROMO_TAB_HELPER_H_ #include <memory> + #include "base/memory/raw_ptr.h" #include "components/password_manager/core/browser/move_password_to_account_store_helper.h" #include "components/password_manager/core/browser/password_form.h"
diff --git a/chrome/browser/ui/autofill/autofill_suggestion_controller_test_base.h b/chrome/browser/ui/autofill/autofill_suggestion_controller_test_base.h index de9a72b1..ae546dc8 100644 --- a/chrome/browser/ui/autofill/autofill_suggestion_controller_test_base.h +++ b/chrome/browser/ui/autofill/autofill_suggestion_controller_test_base.h
@@ -205,8 +205,8 @@ }; // Below are test versions of `AutofillClient`, `BrowserAutofillManager`, -// `AutofillExternalDelegate` and `AutofillSuggestionController` that are used in the -// fixture above. +// `AutofillExternalDelegate` and `AutofillSuggestionController` that are used +// in the fixture above. class AutofillExternalDelegateForPopupTest : public AutofillExternalDelegate { public:
diff --git a/chrome/browser/ui/autofill/autofill_suggestion_controller_unittest.cc b/chrome/browser/ui/autofill/autofill_suggestion_controller_unittest.cc index a8b0684..3fd6298 100644 --- a/chrome/browser/ui/autofill/autofill_suggestion_controller_unittest.cc +++ b/chrome/browser/ui/autofill/autofill_suggestion_controller_unittest.cc
@@ -283,7 +283,8 @@ nullptr), /*form_control_ax_id=*/0); }; - WeakPtr<AutofillSuggestionController> controller = create_controller(gfx::RectF()); + WeakPtr<AutofillSuggestionController> controller = + create_controller(gfx::RectF()); EXPECT_TRUE(controller); controller->Hide(SuggestionHidingReason::kViewDestroyed); @@ -306,8 +307,9 @@ base::WeakPtr<AutofillSuggestionController> controller3 = create_controller(bounds); EXPECT_EQ(&client().popup_controller(manager()), controller3.get()); - EXPECT_EQ(bounds, static_cast<AutofillSuggestionController*>(controller3.get()) - ->element_bounds()); + EXPECT_EQ(bounds, + static_cast<AutofillSuggestionController*>(controller3.get()) + ->element_bounds()); controller3->Hide(SuggestionHidingReason::kViewDestroyed); client().popup_controller(manager()).DoHide(); @@ -401,7 +403,8 @@ // picture-in-picture window. // TODO(crbug.com/40280362): Implement PIP overlap checks on Android. #if !BUILDFLAG(IS_ANDROID) -TEST_F(AutofillSuggestionControllerTest, CheckBoundsOverlapWithPictureInPicture) { +TEST_F(AutofillSuggestionControllerTest, + CheckBoundsOverlapWithPictureInPicture) { ShowSuggestions(manager(), {SuggestionType::kAddressEntry}); PictureInPictureWindowManager* picture_in_picture_window_manager = PictureInPictureWindowManager::GetInstance(); @@ -468,7 +471,8 @@ // Tests that if the popup is shown, destruction of the WebContents hides the // popup. -TEST_F(AutofillSuggestionControllerTestHidingLogic, HideOnWebContentsDestroyed) { +TEST_F(AutofillSuggestionControllerTestHidingLogic, + HideOnWebContentsDestroyed) { ShowSuggestions(manager(), {SuggestionType::kAddressEntry}); test::GenerateTestAutofillPopup(&manager().external_delegate()); EXPECT_CALL(client().popup_controller(manager()), @@ -478,7 +482,8 @@ // Tests that if the popup is shown in the *main frame*, destruction of the // *main frame* hides the popup. -TEST_F(AutofillSuggestionControllerTestHidingLogic, HideInMainFrameOnDestruction) { +TEST_F(AutofillSuggestionControllerTestHidingLogic, + HideInMainFrameOnDestruction) { ShowSuggestions(manager(), {SuggestionType::kAddressEntry}); test::GenerateTestAutofillPopup(&manager().external_delegate()); EXPECT_CALL(client().popup_controller(manager()), @@ -487,7 +492,8 @@ // Tests that if the popup is shown in the *sub frame*, destruction of the // *sub frame* hides the popup. -TEST_F(AutofillSuggestionControllerTestHidingLogic, HideInSubFrameOnDestruction) { +TEST_F(AutofillSuggestionControllerTestHidingLogic, + HideInSubFrameOnDestruction) { ShowSuggestions(sub_manager(), {SuggestionType::kAddressEntry}); test::GenerateTestAutofillPopup(&sub_manager().external_delegate()); EXPECT_CALL(client().popup_controller(sub_manager()),
diff --git a/chrome/browser/ui/autofill/chrome_autofill_client.h b/chrome/browser/ui/autofill/chrome_autofill_client.h index 5ee686c..623da1e 100644 --- a/chrome/browser/ui/autofill/chrome_autofill_client.h +++ b/chrome/browser/ui/autofill/chrome_autofill_client.h
@@ -28,9 +28,9 @@ #include "components/autofill/core/browser/crowdsourcing/votes_uploader.h" #include "components/autofill/core/browser/filling/filling_product.h" #include "components/autofill/core/browser/integrators/autofill_plus_address_delegate.h" +#include "components/autofill/core/browser/integrators/password_form_classification.h" #include "components/autofill/core/browser/logging/log_manager.h" #include "components/autofill/core/browser/metrics/form_interactions_ukm_logger.h" -#include "components/autofill/core/browser/integrators/password_form_classification.h" #include "components/autofill/core/browser/single_field_fillers/single_field_fill_router.h" #include "components/autofill/core/browser/studies/autofill_ablation_study.h" #include "components/autofill/core/browser/ui/payments/card_unmask_prompt_options.h"
diff --git a/chrome/browser/ui/autofill/delete_address_profile_dialog_controller_impl_interactive_uitest.cc b/chrome/browser/ui/autofill/delete_address_profile_dialog_controller_impl_interactive_uitest.cc index e98c224..bcdeab9 100644 --- a/chrome/browser/ui/autofill/delete_address_profile_dialog_controller_impl_interactive_uitest.cc +++ b/chrome/browser/ui/autofill/delete_address_profile_dialog_controller_impl_interactive_uitest.cc
@@ -2,13 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/autofill/delete_address_profile_dialog_controller_impl.h" - #include <memory> #include "base/callback_list.h" #include "chrome/browser/signin/identity_test_environment_profile_adaptor.h" #include "chrome/browser/sync/sync_service_factory.h" +#include "chrome/browser/ui/autofill/delete_address_profile_dialog_controller_impl.h" #include "chrome/test/interaction/interactive_browser_test.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" #include "components/sync/test/test_sync_service.h"
diff --git a/chrome/browser/ui/autofill/payments/autofill_dialog_models.cc b/chrome/browser/ui/autofill/payments/autofill_dialog_models.cc index c4c43c87..74a6870 100644 --- a/chrome/browser/ui/autofill/payments/autofill_dialog_models.cc +++ b/chrome/browser/ui/autofill/payments/autofill_dialog_models.cc
@@ -36,11 +36,13 @@ base::Time::Exploded now_exploded; AutofillClock::Now().LocalExplode(&now_exploded); - if (additional_year != 0 && additional_year < now_exploded.year) + if (additional_year != 0 && additional_year < now_exploded.year) { years.emplace_back(base::NumberToString16(additional_year)); + } - for (int i = 0; i < kNumberOfExpirationYears; i++) + for (int i = 0; i < kNumberOfExpirationYears; i++) { years.emplace_back(base::NumberToString16(now_exploded.year + i)); + } if (additional_year != 0 && additional_year >= now_exploded.year + kNumberOfExpirationYears) { @@ -75,8 +77,9 @@ } void MonthComboboxModel::SetDefaultIndexByMonth(int month) { - if (month >= 1 && month <= 12) + if (month >= 1 && month <= 12) { default_index_ = static_cast<size_t>(month); + } } std::optional<size_t> MonthComboboxModel::GetDefaultIndex() const {
diff --git a/chrome/browser/ui/autofill/payments/card_unmask_prompt_view_browsertest.cc b/chrome/browser/ui/autofill/payments/card_unmask_prompt_view_browsertest.cc index 8b398b7..bdee33e 100644 --- a/chrome/browser/ui/autofill/payments/card_unmask_prompt_view_browsertest.cc +++ b/chrome/browser/ui/autofill/payments/card_unmask_prompt_view_browsertest.cc
@@ -120,12 +120,14 @@ payments::PaymentsAutofillClient::PaymentsRpcResult GetVerificationResult() const override { - if (expected_failure_temporary_) + if (expected_failure_temporary_) { return payments::PaymentsAutofillClient::PaymentsRpcResult:: kTryAgainFailure; - if (expected_failure_permanent_) + } + if (expected_failure_permanent_) { return payments::PaymentsAutofillClient::PaymentsRpcResult:: kPermanentFailure; + } return payments::PaymentsAutofillClient::PaymentsRpcResult::kSuccess; } @@ -144,8 +146,9 @@ void ShowVerificationResult(const std::u16string verification_message, bool allow_retry) { // It's possible the prompt has been closed. - if (!view()) + if (!view()) { return; + } view()->GotVerificationResult(verification_message, allow_retry); } @@ -180,8 +183,9 @@ void ShowUi(const std::string& name) override { CreditCard card = test::GetMaskedServerCard(); - if (name == kExpiryExpired) + if (name == kExpiryExpired) { card.SetExpirationYear(2016); + } CardUnmaskPromptOptions card_unmask_prompt_options = CardUnmaskPromptOptions(
diff --git a/chrome/browser/ui/autofill/payments/chrome_payments_autofill_client_unittest.cc b/chrome/browser/ui/autofill/payments/chrome_payments_autofill_client_unittest.cc index b72bdb7..7c3f3b212 100644 --- a/chrome/browser/ui/autofill/payments/chrome_payments_autofill_client_unittest.cc +++ b/chrome/browser/ui/autofill/payments/chrome_payments_autofill_client_unittest.cc
@@ -32,7 +32,7 @@ #else // !BUILDFLAG(IS_ANDROID) #include "chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.h" #include "chrome/browser/ui/ui_features.h" // nogncheck -#endif // BUILDFLAG(IS_ANDROID) +#endif // BUILDFLAG(IS_ANDROID) using ::testing::_; using ::testing::AllOf;
diff --git a/chrome/browser/ui/autofill/payments/local_card_migration_bubble_controller_impl.cc b/chrome/browser/ui/autofill/payments/local_card_migration_bubble_controller_impl.cc index 30932fa..6c188f02 100644 --- a/chrome/browser/ui/autofill/payments/local_card_migration_bubble_controller_impl.cc +++ b/chrome/browser/ui/autofill/payments/local_card_migration_bubble_controller_impl.cc
@@ -46,8 +46,9 @@ void LocalCardMigrationBubbleControllerImpl::ShowBubble( base::OnceClosure local_card_migration_bubble_closure) { // Don't show the bubble if it's already visible. - if (bubble_view()) + if (bubble_view()) { return; + } is_reshow_ = false; should_add_strikes_on_bubble_close_ = true; @@ -61,8 +62,9 @@ } void LocalCardMigrationBubbleControllerImpl::ReshowBubble() { - if (bubble_view()) + if (bubble_view()) { return; + } is_reshow_ = true; autofill_metrics::LogLocalCardMigrationBubbleOfferMetric(
diff --git a/chrome/browser/ui/autofill/payments/local_card_migration_bubble_controller_impl.h b/chrome/browser/ui/autofill/payments/local_card_migration_bubble_controller_impl.h index 9a6c966..b4b12f1 100644 --- a/chrome/browser/ui/autofill/payments/local_card_migration_bubble_controller_impl.h +++ b/chrome/browser/ui/autofill/payments/local_card_migration_bubble_controller_impl.h
@@ -76,8 +76,7 @@ // clicking the Continue button. bool should_add_strikes_on_bubble_close_ = true; - base::ObserverList<LocalCardMigrationControllerObserver> - observer_list_; + base::ObserverList<LocalCardMigrationControllerObserver> observer_list_; WEB_CONTENTS_USER_DATA_KEY_DECL(); };
diff --git a/chrome/browser/ui/autofill/payments/local_card_migration_controller_observer.h b/chrome/browser/ui/autofill/payments/local_card_migration_controller_observer.h index 4b63610..180f7d1 100644 --- a/chrome/browser/ui/autofill/payments/local_card_migration_controller_observer.h +++ b/chrome/browser/ui/autofill/payments/local_card_migration_controller_observer.h
@@ -9,7 +9,7 @@ // The observer interface that listens for events in local card migration // related controllers. -class LocalCardMigrationControllerObserver: public base::CheckedObserver { +class LocalCardMigrationControllerObserver : public base::CheckedObserver { public: // Called when the user declined the offer dialog, navigated away with // feedback credit card icon or finished with the feedback dialog.
diff --git a/chrome/browser/ui/autofill/payments/local_card_migration_dialog_controller_impl.cc b/chrome/browser/ui/autofill/payments/local_card_migration_dialog_controller_impl.cc index d0a337f..17d245ba 100644 --- a/chrome/browser/ui/autofill/payments/local_card_migration_dialog_controller_impl.cc +++ b/chrome/browser/ui/autofill/payments/local_card_migration_dialog_controller_impl.cc
@@ -55,8 +55,9 @@ LocalCardMigrationDialogControllerImpl:: ~LocalCardMigrationDialogControllerImpl() { - if (local_card_migration_dialog_) + if (local_card_migration_dialog_) { local_card_migration_dialog_->CloseDialog(); + } observer_list_.Notify( &LocalCardMigrationControllerObserver::OnSourceDestruction, LocalCardMigrationControllerObserver::LocalCardMigrationControllerSource:: @@ -69,8 +70,9 @@ const std::vector<MigratableCreditCard>& migratable_credit_cards, payments::PaymentsAutofillClient::LocalCardMigrationCallback start_migrating_cards_callback) { - if (local_card_migration_dialog_) + if (local_card_migration_dialog_) { local_card_migration_dialog_->CloseDialog(); + } legal_message_lines_ = legal_message_lines; view_state_ = LocalCardMigrationDialogState::kOffered; @@ -93,8 +95,9 @@ const std::vector<MigratableCreditCard>& migratable_credit_cards, payments::PaymentsAutofillClient::MigrationDeleteCardCallback delete_local_card_callback) { - if (local_card_migration_dialog_) + if (local_card_migration_dialog_) { local_card_migration_dialog_->CloseDialog(); + } migratable_credit_cards_ = migratable_credit_cards; tip_message_ = tip_message; @@ -252,8 +255,9 @@ } void LocalCardMigrationDialogControllerImpl::OnDialogClosed() { - if (local_card_migration_dialog_) + if (local_card_migration_dialog_) { local_card_migration_dialog_ = nullptr; + } UpdateLocalCardMigrationIcon(); }
diff --git a/chrome/browser/ui/autofill/payments/local_card_migration_dialog_controller_impl.h b/chrome/browser/ui/autofill/payments/local_card_migration_dialog_controller_impl.h index 2d22357..e56a053 100644 --- a/chrome/browser/ui/autofill/payments/local_card_migration_dialog_controller_impl.h +++ b/chrome/browser/ui/autofill/payments/local_card_migration_dialog_controller_impl.h
@@ -140,8 +140,7 @@ // Contains observer listening to user's interactions with the dialog. The // observer is responsible for setting flow step upon these interactions. - base::ObserverList<LocalCardMigrationControllerObserver> - observer_list_; + base::ObserverList<LocalCardMigrationControllerObserver> observer_list_; WEB_CONTENTS_USER_DATA_KEY_DECL(); };
diff --git a/chrome/browser/ui/autofill/payments/manage_migration_ui_controller.cc b/chrome/browser/ui/autofill/payments/manage_migration_ui_controller.cc index 71a961d..547069de 100644 --- a/chrome/browser/ui/autofill/payments/manage_migration_ui_controller.cc +++ b/chrome/browser/ui/autofill/payments/manage_migration_ui_controller.cc
@@ -90,8 +90,9 @@ break; } } - if (has_server_error) + if (has_server_error) { flow_step_ = LocalCardMigrationFlowStep::MIGRATION_FAILED; + } // Show error dialog when |has_server_error| is true, which indicates // Payments Rpc failure.
diff --git a/chrome/browser/ui/autofill/payments/offer_notification_bubble_controller_impl.cc b/chrome/browser/ui/autofill/payments/offer_notification_bubble_controller_impl.cc index 7a5e43d..0433aab 100644 --- a/chrome/browser/ui/autofill/payments/offer_notification_bubble_controller_impl.cc +++ b/chrome/browser/ui/autofill/payments/offer_notification_bubble_controller_impl.cc
@@ -34,8 +34,9 @@ OfferNotificationBubbleController* OfferNotificationBubbleController::GetOrCreate( content::WebContents* web_contents) { - if (!web_contents) + if (!web_contents) { return nullptr; + } OfferNotificationBubbleControllerImpl::CreateForWebContents(web_contents); return OfferNotificationBubbleControllerImpl::FromWebContents(web_contents); @@ -44,8 +45,9 @@ // static OfferNotificationBubbleController* OfferNotificationBubbleController::Get( content::WebContents* web_contents) { - if (!web_contents) + if (!web_contents) { return nullptr; + } return OfferNotificationBubbleControllerImpl::FromWebContents(web_contents); } @@ -90,8 +92,9 @@ } const CreditCard* OfferNotificationBubbleControllerImpl::GetLinkedCard() const { - if (card_.has_value()) + if (card_.has_value()) { return &(*card_); + } return nullptr; } @@ -169,8 +172,9 @@ DCHECK(IsIconVisible()); - if (card) + if (card) { card_ = *card; + } is_user_gesture_ = false; @@ -183,8 +187,9 @@ void OfferNotificationBubbleControllerImpl::ReshowBubble() { DCHECK(IsIconVisible()); - if (bubble_view()) + if (bubble_view()) { return; + } is_user_gesture_ = true; @@ -214,8 +219,9 @@ bubble_state_ = BubbleState::kShowingIconAndBubble; // Don't show bubble yet if web content is not active (bubble will instead be // shown when web content become visible and active). - if (!IsWebContentsActive()) + if (!IsWebContentsActive()) { return; + } Browser* browser = chrome::FindBrowserWithTab(web_contents()); set_bubble_view(browser->window() @@ -232,8 +238,9 @@ bubble_state_ = BubbleState::kShowingIcon; bubble_shown_timestamp_ = AutofillClock::Now(); - if (observer_for_testing_) + if (observer_for_testing_) { observer_for_testing_->OnBubbleShown(); + } autofill_metrics::LogOfferNotificationBubbleOfferMetric(offer_.GetOfferType(), is_user_gesture_); @@ -241,8 +248,9 @@ bool OfferNotificationBubbleControllerImpl::IsWebContentsActive() { Browser* active_browser = chrome::FindBrowserWithActiveWindow(); - if (!active_browser) + if (!active_browser) { return false; + } return active_browser->tab_strip_model()->GetActiveWebContents() == web_contents();
diff --git a/chrome/browser/ui/autofill/payments/offer_notification_controller_android_browsertest.cc b/chrome/browser/ui/autofill/payments/offer_notification_controller_android_browsertest.cc index c792de4..ab166d0 100644 --- a/chrome/browser/ui/autofill/payments/offer_notification_controller_android_browsertest.cc +++ b/chrome/browser/ui/autofill/payments/offer_notification_controller_android_browsertest.cc
@@ -118,12 +118,14 @@ } void SetShownOffer(int64_t id) { - if (!GetOfferManager()) + if (!GetOfferManager()) { return; + } auto* handler = &(GetOfferManager()->notification_handler_); - if (!handler) + if (!handler) { return; + } handler->ClearShownNotificationIdForTesting(); handler->AddShownNotificationIdForTesting(id);
diff --git a/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc b/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc index 6534c21..be9621f8 100644 --- a/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc +++ b/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc
@@ -72,8 +72,9 @@ // static SaveCardBubbleController* SaveCardBubbleController::GetOrCreate( content::WebContents* web_contents) { - if (!web_contents) + if (!web_contents) { return nullptr; + } SaveCardBubbleControllerImpl::CreateForWebContents(web_contents); return SaveCardBubbleControllerImpl::FromWebContents(web_contents); @@ -82,8 +83,9 @@ // static SaveCardBubbleController* SaveCardBubbleController::Get( content::WebContents* web_contents) { - if (!web_contents) + if (!web_contents) { return nullptr; + } return SaveCardBubbleControllerImpl::FromWebContents(web_contents); } @@ -100,8 +102,9 @@ } // Don't show the bubble if it's already visible. - if (bubble_view()) + if (bubble_view()) { return; + } is_upload_save_ = false; is_reshow_ = false; @@ -116,10 +119,11 @@ ? BubbleType::LOCAL_CVC_SAVE : BubbleType::LOCAL_SAVE; - if (options.show_prompt) + if (options.show_prompt) { ShowBubble(); - else + } else { ShowIconOnly(); + } } void SaveCardBubbleControllerImpl::OfferUploadSave( @@ -135,8 +139,9 @@ } // Don't show the bubble if it's already visible. - if (bubble_view()) + if (bubble_view()) { return; + } is_upload_save_ = true; is_reshow_ = false; @@ -160,10 +165,11 @@ legal_message_lines_ = legal_message_lines; } - if (options_.show_prompt) + if (options_.show_prompt) { ShowBubble(); - else + } else { ShowIconOnly(); + } } // Exists for testing purposes only. @@ -177,8 +183,9 @@ void SaveCardBubbleControllerImpl::ReshowBubble( bool is_triggered_by_user_gesture) { // Don't show the bubble if it's already visible. - if (bubble_view()) + if (bubble_view()) { return; + } is_reshow_ = true; is_triggered_by_user_gesture_ = is_triggered_by_user_gesture; @@ -342,8 +349,9 @@ } Profile* SaveCardBubbleControllerImpl::GetProfile() const { - if (!web_contents()) + if (!web_contents()) { return nullptr; + } return Profile::FromBrowserContext(web_contents()->GetBrowserContext()); }
diff --git a/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl_unittest.cc b/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl_unittest.cc index 553036b..0e0b7b2 100644 --- a/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl_unittest.cc +++ b/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl_unittest.cc
@@ -583,8 +583,7 @@ INSTANTIATE_TEST_SUITE_P(, SaveCardBubbleSingletonTest, - testing::Combine(testing::Bool(), - testing::Bool())); + testing::Combine(testing::Bool(), testing::Bool())); TEST_P(SaveCardBubbleSingletonTest, OnlyOneActiveBubble) { base::HistogramTester histogram_tester;
diff --git a/chrome/browser/ui/autofill/payments/save_payment_icon_controller.cc b/chrome/browser/ui/autofill/payments/save_payment_icon_controller.cc index 5cb6642..eb740e4 100644 --- a/chrome/browser/ui/autofill/payments/save_payment_icon_controller.cc +++ b/chrome/browser/ui/autofill/payments/save_payment_icon_controller.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/autofill/payments/save_payment_icon_controller.h" + #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/ui/autofill/payments/iban_bubble_controller_impl.h" #include "chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.h" @@ -13,8 +14,9 @@ SavePaymentIconController* SavePaymentIconController::Get( content::WebContents* web_contents, int command_id) { - if (!web_contents) + if (!web_contents) { return nullptr; + } if (command_id == IDC_SAVE_CREDIT_CARD_FOR_PAGE) { return SaveCardBubbleControllerImpl::FromWebContents(web_contents);
diff --git a/chrome/browser/ui/autofill/payments/test_card_unmask_prompt_waiter.cc b/chrome/browser/ui/autofill/payments/test_card_unmask_prompt_waiter.cc index 40531854..c0e35cb 100644 --- a/chrome/browser/ui/autofill/payments/test_card_unmask_prompt_waiter.cc +++ b/chrome/browser/ui/autofill/payments/test_card_unmask_prompt_waiter.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/autofill/payments/test_card_unmask_prompt_waiter.h" + #include "base/test/scoped_run_loop_timeout.h" #include "chrome/browser/ui/autofill/payments/card_unmask_prompt_view_tester.h"
diff --git a/chrome/browser/ui/autofill/payments/webauthn_dialog_controller_impl.cc b/chrome/browser/ui/autofill/payments/webauthn_dialog_controller_impl.cc index 411c6ef1..024a0a1 100644 --- a/chrome/browser/ui/autofill/payments/webauthn_dialog_controller_impl.cc +++ b/chrome/browser/ui/autofill/payments/webauthn_dialog_controller_impl.cc
@@ -24,8 +24,9 @@ // WebauthnDialogView::dtor() being called, but the reference to // controller is not reset. Need to reset via WebauthnDialogView::Hide() // to avoid crash. - if (dialog_model_) + if (dialog_model_) { dialog_model_->SetDialogState(WebauthnDialogState::kInactive); + } } void WebauthnDialogControllerImpl::ShowOfferDialog( @@ -50,8 +51,9 @@ } bool WebauthnDialogControllerImpl::CloseDialog() { - if (!dialog_model_) + if (!dialog_model_) { return false; + } dialog_model_->SetDialogState(WebauthnDialogState::kInactive); return true;
diff --git a/chrome/browser/ui/autofill/payments/webauthn_dialog_model.cc b/chrome/browser/ui/autofill/payments/webauthn_dialog_model.cc index 1b9a0f84..7826a2d 100644 --- a/chrome/browser/ui/autofill/payments/webauthn_dialog_model.cc +++ b/chrome/browser/ui/autofill/payments/webauthn_dialog_model.cc
@@ -24,8 +24,9 @@ void WebauthnDialogModel::SetDialogState(WebauthnDialogState state) { state_ = state; SetIllustrationsFromState(); - for (WebauthnDialogModelObserver& observer : observers_) + for (WebauthnDialogModelObserver& observer : observers_) { observer.OnDialogStateChanged(); + } } void WebauthnDialogModel::AddObserver(WebauthnDialogModelObserver* observer) {
diff --git a/chrome/browser/ui/autofill/risk_util.cc b/chrome/browser/ui/autofill/risk_util.cc index e26d4a5..54bace1 100644 --- a/chrome/browser/ui/autofill/risk_util.cc +++ b/chrome/browser/ui/autofill/risk_util.cc
@@ -56,8 +56,9 @@ ui::BaseWindow* GetBaseWindowForWebContents( content::WebContents* web_contents) { Browser* browser = chrome::FindBrowserWithTab(web_contents); - if (browser) + if (browser) { return browser->window(); + } gfx::NativeWindow native_window = web_contents->GetTopLevelNativeWindow(); extensions::AppWindow* app_window =
diff --git a/chrome/browser/ui/autofill/test/test_autofill_bubble_handler.cc b/chrome/browser/ui/autofill/test/test_autofill_bubble_handler.cc index 4e791cf..145eec2 100644 --- a/chrome/browser/ui/autofill/test/test_autofill_bubble_handler.cc +++ b/chrome/browser/ui/autofill/test/test_autofill_bubble_handler.cc
@@ -19,8 +19,9 @@ content::WebContents* web_contents, SaveCardBubbleController* controller, bool is_user_gesture) { - if (!save_card_bubble_view_) + if (!save_card_bubble_view_) { save_card_bubble_view_ = std::make_unique<TestAutofillBubble>(); + } return save_card_bubble_view_.get(); } @@ -49,8 +50,9 @@ content::WebContents* web_contents, OfferNotificationBubbleController* controller, bool is_user_gesture) { - if (!offer_notification_bubble_view_) + if (!offer_notification_bubble_view_) { offer_notification_bubble_view_ = std::make_unique<TestAutofillBubble>(); + } return offer_notification_bubble_view_.get(); }
diff --git a/chrome/browser/ui/blocked_content/chrome_popup_navigation_delegate.cc b/chrome/browser/ui/blocked_content/chrome_popup_navigation_delegate.cc index 9ed5b29..90d78935 100644 --- a/chrome/browser/ui/blocked_content/chrome_popup_navigation_delegate.cc +++ b/chrome/browser/ui/blocked_content/chrome_popup_navigation_delegate.cc
@@ -44,8 +44,9 @@ const blink::mojom::WindowFeatures& window_features, std::optional<WindowOpenDisposition> updated_disposition) { params_.user_gesture = true; - if (updated_disposition) + if (updated_disposition) { params_.disposition = updated_disposition.value(); + } #if BUILDFLAG(IS_ANDROID) TabModelList::HandlePopupNavigation(¶ms_); #else
diff --git a/chrome/browser/ui/blocked_content/framebust_block_tab_helper.cc b/chrome/browser/ui/blocked_content/framebust_block_tab_helper.cc index ffd9234a..c5dff47 100644 --- a/chrome/browser/ui/blocked_content/framebust_block_tab_helper.cc +++ b/chrome/browser/ui/blocked_content/framebust_block_tab_helper.cc
@@ -27,8 +27,9 @@ size_t total_size = blocked_urls_.size(); DCHECK_LT(index, total_size); const GURL& url = blocked_urls_[index]; - if (!callbacks_[index].is_null()) + if (!callbacks_[index].is_null()) { std::move(callbacks_[index]).Run(url, index, total_size); + } web_contents()->OpenURL( content::OpenURLParams(url, content::Referrer(), WindowOpenDisposition::CURRENT_TAB,
diff --git a/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc b/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc index 735dc78..c4989521 100644 --- a/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc +++ b/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc
@@ -219,8 +219,9 @@ new_browser = BrowserList::GetInstance()->GetLastActive(); EXPECT_NE(browser, new_browser); web_contents = new_browser->tab_strip_model()->GetActiveWebContents(); - if (what_to_expect == kExpectNewWindow) + if (what_to_expect == kExpectNewWindow) { EXPECT_TRUE(new_browser->is_type_normal()); + } } else { tab_add.Wait(); new_browser = browser; @@ -602,8 +603,9 @@ ui_test_utils::WaitForAppModalDialog(); ASSERT_TRUE(dialog); #if !BUILDFLAG(IS_MAC) - if (chrome::FindLastActive() != browser()) + if (chrome::FindLastActive() != browser()) { alert_waiter.WaitForActivation(); + } #endif // Verify that after the dialog is closed, the popup is in front again.
diff --git a/chrome/browser/ui/blocked_content/popup_tracker_browsertest.cc b/chrome/browser/ui/blocked_content/popup_tracker_browsertest.cc index 0aa89a48..ee34c9d 100644 --- a/chrome/browser/ui/blocked_content/popup_tracker_browsertest.cc +++ b/chrome/browser/ui/blocked_content/popup_tracker_browsertest.cc
@@ -187,7 +187,8 @@ // OpenURLFromTab goes through a different code path than traditional popups // that use window.open(). Make sure the tracker is created in those cases. // Disabled due to flakiness. See crbug.com/1186441. -IN_PROC_BROWSER_TEST_F(PopupTrackerBrowserTest, DISABLED_ControlClick_HasTracker) { +IN_PROC_BROWSER_TEST_F(PopupTrackerBrowserTest, + DISABLED_ControlClick_HasTracker) { base::HistogramTester tester; const GURL url = embedded_test_server()->GetURL( "/popup_blocker/popup-simulated-click-on-anchor.html"); @@ -230,7 +231,8 @@ } // Disabled due to flakiness. See crbug.com/1186441. -IN_PROC_BROWSER_TEST_F(PopupTrackerBrowserTest, DISABLED_ShiftClick_HasTracker) { +IN_PROC_BROWSER_TEST_F(PopupTrackerBrowserTest, + DISABLED_ShiftClick_HasTracker) { base::HistogramTester tester; const GURL url = embedded_test_server()->GetURL( "/popup_blocker/popup-simulated-click-on-anchor.html"); @@ -568,9 +570,11 @@ // TODO(crbug.com/40730174): Test is flaky on Lacros, Linux Ozone Wayland. #if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) -#define MAYBE_PopupNoRedirect_RedirectCountZero DISABLED_PopupNoRedirect_RedirectCountZero +#define MAYBE_PopupNoRedirect_RedirectCountZero \ + DISABLED_PopupNoRedirect_RedirectCountZero #else -#define MAYBE_PopupNoRedirect_RedirectCountZero PopupNoRedirect_RedirectCountZero +#define MAYBE_PopupNoRedirect_RedirectCountZero \ + PopupNoRedirect_RedirectCountZero #endif IN_PROC_BROWSER_TEST_F(PopupTrackerBrowserTest, MAYBE_PopupNoRedirect_RedirectCountZero) {
diff --git a/chrome/browser/ui/blocked_content/safe_browsing_triggered_popup_blocker_browsertest.cc b/chrome/browser/ui/blocked_content/safe_browsing_triggered_popup_blocker_browsertest.cc index 7020250..7a51f3a 100644 --- a/chrome/browser/ui/blocked_content/safe_browsing_triggered_popup_blocker_browsertest.cc +++ b/chrome/browser/ui/blocked_content/safe_browsing_triggered_popup_blocker_browsertest.cc
@@ -75,8 +75,9 @@ messages_expected.erase(message); continue; } - if (base::Contains(messages_not_expected, message)) + if (base::Contains(messages_not_expected, message)) { ADD_FAILURE() << "Saw anti-expected message: " << message; + } } EXPECT_THAT(messages_expected, ::testing::IsEmpty()) << "Missing expected messages."; @@ -739,8 +740,9 @@ {blocked_content::kAbusiveWarnMessage}, {blocked_content::kAbusiveEnforceMessage}); EXPECT_GE(console_observer.messages().size(), 1u); - for (auto& message : console_observer.messages()) + for (auto& message : console_observer.messages()) { EXPECT_EQ(message.source_frame, web_contents()->GetPrimaryMainFrame()); + } } // Load prerendering and ensure that the source frame for console logs in @@ -759,8 +761,9 @@ {blocked_content::kAbusiveWarnMessage}, {blocked_content::kAbusiveEnforceMessage}); EXPECT_GE(console_observer.messages().size(), 1u); - for (auto& message : console_observer.messages()) + for (auto& message : console_observer.messages()) { EXPECT_EQ(message.source_frame, prerendered_frame_host); + } } // When prerendering activation, OnSafeBrowsingChecksComplete() is not called. // So SubresourceFilterLevel is not set on DidFinishNavigation() and the
diff --git a/chrome/browser/ui/blocked_content/tab_under_navigation_throttle.cc b/chrome/browser/ui/blocked_content/tab_under_navigation_throttle.cc index 50f821e8..0a7263ec 100644 --- a/chrome/browser/ui/blocked_content/tab_under_navigation_throttle.cc +++ b/chrome/browser/ui/blocked_content/tab_under_navigation_throttle.cc
@@ -71,8 +71,9 @@ // Otherwise, it should be safe to avoid creating a throttle in non primary // pages because prerendered pages should not be able to open popups. A // tab-under could therefore never occur within the non-primary page. - if (handle->IsInPrimaryMainFrame()) + if (handle->IsInPrimaryMainFrame()) { return base::WrapUnique(new TabUnderNavigationThrottle(handle)); + } return nullptr; } @@ -105,8 +106,9 @@ // away while in the background. content::WebContents* contents = navigation_handle()->GetWebContents(); const GURL& previous_main_frame_url = contents->GetLastCommittedURL(); - if (previous_main_frame_url.is_empty()) + if (previous_main_frame_url.is_empty()) { return false; + } // Same-site navigations are exempt from tab-under protection. const GURL& target_url = navigation_handle()->GetURL();
diff --git a/chrome/browser/ui/bookmarks/bookmark_bar.h b/chrome/browser/ui/bookmarks/bookmark_bar.h index 53733cf..f7ae840 100644 --- a/chrome/browser/ui/bookmarks/bookmark_bar.h +++ b/chrome/browser/ui/bookmarks/bookmark_bar.h
@@ -22,10 +22,7 @@ // Used when the state changes to indicate if the transition should be // animated. - enum AnimateChangeType { - ANIMATE_STATE_CHANGE, - DONT_ANIMATE_STATE_CHANGE - }; + enum AnimateChangeType { ANIMATE_STATE_CHANGE, DONT_ANIMATE_STATE_CHANGE }; BookmarkBar() = delete; BookmarkBar(const BookmarkBar&) = delete;
diff --git a/chrome/browser/ui/bookmarks/bookmark_browsertest.cc b/chrome/browser/ui/bookmarks/bookmark_browsertest.cc index c78eee27..bc05a51 100644 --- a/chrome/browser/ui/bookmarks/bookmark_browsertest.cc +++ b/chrome/browser/ui/bookmarks/bookmark_browsertest.cc
@@ -104,8 +104,9 @@ } static void CheckAnimation(Browser* browser, base::RunLoop* loop) { - if (!browser->window()->IsBookmarkBarAnimating()) + if (!browser->window()->IsBookmarkBarAnimating()) { loop->Quit(); + } } base::TimeDelta WaitForBookmarkBarAnimationToFinish() { @@ -317,8 +318,9 @@ Browser* regular_browser2 = nullptr; for (Browser* browser_instance : *BrowserList::GetInstance()) { if (browser_instance != incognito_browser && - browser_instance != regular_browser) + browser_instance != regular_browser) { regular_browser2 = browser_instance; + } } // new browser needs to be opened EXPECT_NE(regular_browser2, nullptr); @@ -369,8 +371,9 @@ Browser* incognito_browser2 = nullptr; for (Browser* browser_instance : *BrowserList::GetInstance()) { if (browser_instance != incognito_browser && - browser_instance != regular_browser) + browser_instance != regular_browser) { incognito_browser2 = browser_instance; + } } // new browser needs to be opened EXPECT_NE(incognito_browser2, nullptr);
diff --git a/chrome/browser/ui/bookmarks/bookmark_editor.cc b/chrome/browser/ui/bookmarks/bookmark_editor.cc index 087adeb..943ba63 100644 --- a/chrome/browser/ui/bookmarks/bookmark_editor.cc +++ b/chrome/browser/ui/bookmarks/bookmark_editor.cc
@@ -101,9 +101,9 @@ case EditDetails::EXISTING_NODE: case EditDetails::NEW_URL: dialog_title = (type == EditDetails::EXISTING_NODE && - existing_node->type() == BookmarkNode::FOLDER) ? - IDS_BOOKMARK_FOLDER_EDITOR_WINDOW_TITLE : - IDS_BOOKMARK_EDITOR_TITLE; + existing_node->type() == BookmarkNode::FOLDER) + ? IDS_BOOKMARK_FOLDER_EDITOR_WINDOW_TITLE + : IDS_BOOKMARK_EDITOR_TITLE; break; case EditDetails::NEW_FOLDER: dialog_title = bookmark_data.children.empty() @@ -120,8 +120,9 @@ const BookmarkNode* node) { EditDetails details(EXISTING_NODE); details.existing_node = node; - if (node) + if (node) { details.parent_node = node->parent(); + } return details; } @@ -165,10 +166,12 @@ const BookmarkNode* node = details.existing_node; DCHECK(node); - if (new_parent != node->parent()) + if (new_parent != node->parent()) { model->Move(node, new_parent, new_parent->children().size()); - if (node->is_url()) + } + if (node->is_url()) { model->SetURL(node, new_url, bookmarks::metrics::BookmarkEditSource::kUser); + } model->SetTitle(node, new_title, bookmarks::metrics::BookmarkEditSource::kUser);
diff --git a/chrome/browser/ui/bookmarks/bookmark_stats.cc b/chrome/browser/ui/bookmarks/bookmark_stats.cc index bd47b3f1..6a1b3f5 100644 --- a/chrome/browser/ui/bookmarks/bookmark_stats.cc +++ b/chrome/browser/ui/bookmarks/bookmark_stats.cc
@@ -3,10 +3,10 @@ // found in the LICENSE file. #include "chrome/browser/ui/bookmarks/bookmark_stats.h" -#include "chrome/browser/profiles/profile.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics.h" +#include "chrome/browser/profiles/profile.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/browser/bookmark_node_data.h" @@ -60,8 +60,9 @@ } void RecordBookmarkFolderOpen(BookmarkLaunchLocation location) { - if (IsBookmarkBarLocation(location)) + if (IsBookmarkBarLocation(location)) { base::RecordAction(base::UserMetricsAction("ClickedBookmarkBarFolder")); + } } void RecordBookmarkAppsPageOpen(BookmarkLaunchLocation location) {
diff --git a/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc b/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc index 18221bb..1cb2522 100644 --- a/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc +++ b/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc
@@ -39,8 +39,9 @@ // time the page does. content::NavigationEntry* entry = web_contents->GetController().GetLastCommittedEntry(); - if (entry->IsInitialEntry()) + if (entry->IsInitialEntry()) { entry = web_contents->GetController().GetVisibleEntry(); + } const GURL& url = entry->GetURL(); return NewTabUI::IsNewTab(url) || NewTabPageUI::IsNewTabPageOrigin(url) || NewTabPageThirdPartyUI::IsNewTabPageOrigin(url) || @@ -50,29 +51,34 @@ } // namespace BookmarkTabHelper::~BookmarkTabHelper() { - if (bookmark_model_) + if (bookmark_model_) { bookmark_model_->RemoveObserver(this); + } } bool BookmarkTabHelper::ShouldShowBookmarkBar() const { - if (SadTab::ShouldShow(web_contents()->GetCrashedStatus())) + if (SadTab::ShouldShow(web_contents()->GetCrashedStatus())) { return false; + } - if (!browser_defaults::bookmarks_enabled) + if (!browser_defaults::bookmarks_enabled) { return false; + } Profile* profile = Profile::FromBrowserContext(web_contents()->GetBrowserContext()); #if !BUILDFLAG(IS_CHROMEOS_ASH) - if (profile->IsGuestSession()) + if (profile->IsGuestSession()) { return false; + } #endif PrefService* prefs = profile->GetPrefs(); if (prefs->IsManagedPreference(bookmarks::prefs::kShowBookmarkBar) && - !prefs->GetBoolean(bookmarks::prefs::kShowBookmarkBar)) + !prefs->GetBoolean(bookmarks::prefs::kShowBookmarkBar)) { return false; + } const bool has_bookmarks = bookmark_model_ && bookmark_model_->HasBookmarks(); @@ -106,8 +112,9 @@ bookmark_drag_(nullptr) { bookmark_model_ = BookmarkModelFactory::GetForBrowserContext( web_contents->GetBrowserContext()); - if (bookmark_model_) + if (bookmark_model_) { bookmark_model_->AddObserver(this); + } } void BookmarkTabHelper::UpdateStarredStateForCurrentURL() { @@ -117,13 +124,13 @@ bookmark_model_->IsBookmarked(chrome::GetURLToBookmark(web_contents()))); if (is_starred_ != old_state) { - for (auto& observer : observers_) + for (auto& observer : observers_) { observer.URLStarredChanged(web_contents(), is_starred_); + } } } -void BookmarkTabHelper::BookmarkModelChanged() { -} +void BookmarkTabHelper::BookmarkModelChanged() {} void BookmarkTabHelper::BookmarkModelLoaded(bool ids_reassigned) { UpdateStarredStateForCurrentURL(); @@ -156,15 +163,17 @@ void BookmarkTabHelper::DidStartNavigation( content::NavigationHandle* navigation_handle) { if (!navigation_handle->IsInPrimaryMainFrame() || - navigation_handle->IsSameDocument()) + navigation_handle->IsSameDocument()) { return; + } UpdateStarredStateForCurrentURL(); } void BookmarkTabHelper::DidFinishNavigation( content::NavigationHandle* navigation_handle) { - if (!navigation_handle->IsInPrimaryMainFrame()) + if (!navigation_handle->IsInPrimaryMainFrame()) { return; + } UpdateStarredStateForCurrentURL(); }
diff --git a/chrome/browser/ui/bookmarks/bookmark_tab_helper.h b/chrome/browser/ui/bookmarks/bookmark_tab_helper.h index cd2dc69..d680502 100644 --- a/chrome/browser/ui/bookmarks/bookmark_tab_helper.h +++ b/chrome/browser/ui/bookmarks/bookmark_tab_helper.h
@@ -17,7 +17,7 @@ namespace bookmarks { class BookmarkModel; struct BookmarkNodeData; -} +} // namespace bookmarks namespace content { class WebContents;
diff --git a/chrome/browser/ui/bookmarks/bookmark_unittest.cc b/chrome/browser/ui/bookmarks/bookmark_unittest.cc index 3604422..026abd5 100644 --- a/chrome/browser/ui/bookmarks/bookmark_unittest.cc +++ b/chrome/browser/ui/bookmarks/bookmark_unittest.cc
@@ -51,10 +51,9 @@ std::unique_ptr<content::WebContents> web_contents = content::WebContents::Create( content::WebContents::CreateParams(browser()->profile())); - web_contents->GetController().LoadURL(GURL(url::kAboutBlankURL), - content::Referrer(), - ui::PAGE_TRANSITION_LINK, - std::string()); + web_contents->GetController().LoadURL( + GURL(url::kAboutBlankURL), content::Referrer(), ui::PAGE_TRANSITION_LINK, + std::string()); // Give it a NTP virtual URL. content::NavigationController* controller = &web_contents->GetController();
diff --git a/chrome/browser/ui/bookmarks/bookmark_utils.cc b/chrome/browser/ui/bookmarks/bookmark_utils.cc index de035ca..3810027 100644 --- a/chrome/browser/ui/bookmarks/bookmark_utils.cc +++ b/chrome/browser/ui/bookmarks/bookmark_utils.cc
@@ -142,8 +142,9 @@ GURL GetURLToBookmark(content::WebContents* web_contents) { DCHECK(web_contents); - if (search::IsInstantNTP(web_contents)) + if (search::IsInstantNTP(web_contents)) { return GURL(kChromeUINewTabURL); + } // Users cannot bookmark Reader Mode pages directly, so the bookmark // interaction is as if it were with the original page. if (dom_distiller::url_utils::IsDistilledPage( @@ -158,8 +159,9 @@ GURL* url, std::u16string* title) { GURL u = GetURLToBookmark(web_contents); - if (!u.is_valid()) + if (!u.is_valid()) { return false; + } *url = u; if (dom_distiller::url_utils::IsDistilledPage( web_contents->GetVisibleURL())) { @@ -173,8 +175,9 @@ } // Use "New tab" as title if the current page is NTP even in incognito mode. - if (u == GURL(chrome::kChromeUINewTabURL)) + if (u == GURL(chrome::kChromeUINewTabURL)) { *title = l10n_util::GetStringUTF16(IDS_NEW_TAB_TITLE); + } return true; } @@ -199,8 +202,9 @@ // If username is present, we must not omit the scheme because FixupURL() will // subsequently interpret the username as a scheme. crbug.com/639126 - if (url.has_username()) + if (url.has_username()) { format_types &= ~url_formatter::kFormatUrlOmitHTTP; + } return url_formatter::FormatUrl(url, format_types, base::UnescapeRule::SPACES, nullptr, nullptr, nullptr); @@ -237,22 +241,27 @@ model->client()->IsNodeManaged(node)) { move = ui::DragDropTypes::DRAG_NONE; } - if (node->is_url()) + if (node->is_url()) { return ui::DragDropTypes::DRAG_COPY | ui::DragDropTypes::DRAG_LINK | move; + } return ui::DragDropTypes::DRAG_COPY | move; } DragOperation GetPreferredBookmarkDropOperation(int source_operations, int operations) { int common_ops = (source_operations & operations); - if (!common_ops) + if (!common_ops) { return DragOperation::kNone; - if (ui::DragDropTypes::DRAG_COPY & common_ops) + } + if (ui::DragDropTypes::DRAG_COPY & common_ops) { return DragOperation::kCopy; - if (ui::DragDropTypes::DRAG_LINK & common_ops) + } + if (ui::DragDropTypes::DRAG_LINK & common_ops) { return DragOperation::kLink; - if (ui::DragDropTypes::DRAG_MOVE & common_ops) + } + if (ui::DragDropTypes::DRAG_MOVE & common_ops) { return DragOperation::kMove; + } return DragOperation::kNone; }
diff --git a/chrome/browser/ui/bookmarks/bookmark_utils.h b/chrome/browser/ui/bookmarks/bookmark_utils.h index 441c3675..9cf3819 100644 --- a/chrome/browser/ui/bookmarks/bookmark_utils.h +++ b/chrome/browser/ui/bookmarks/bookmark_utils.h
@@ -23,12 +23,12 @@ class BookmarkNode; class ManagedBookmarkService; struct BookmarkNodeData; -} +} // namespace bookmarks namespace content { class BrowserContext; class WebContents; -} +} // namespace content namespace ui { class DropTargetEvent;
diff --git a/chrome/browser/ui/bookmarks/bookmark_utils_desktop.cc b/chrome/browser/ui/bookmarks/bookmark_utils_desktop.cc index 8a48a2c..1e8f0597 100644 --- a/chrome/browser/ui/bookmarks/bookmark_utils_desktop.cc +++ b/chrome/browser/ui/bookmarks/bookmark_utils_desktop.cc
@@ -88,8 +88,9 @@ // If the node is not a URL, it is a folder. We want to add those of its // children which are URLs. for (const auto& child : node->children()) { - if (child->is_url()) + if (child->is_url()) { AddUrlIfLegal(child->url(), child->id()); + } } } } @@ -99,8 +100,9 @@ // Returns the total number of descendants nodes. int ChildURLCountTotal(const BookmarkNode* node) { const auto count_children = [](int total, const auto& child) { - if (child->is_folder()) + if (child->is_folder()) { total += ChildURLCountTotal(child.get()); + } return total + 1; }; return std::accumulate(node->children().cbegin(), node->children().cend(), 0, @@ -156,8 +158,9 @@ Browser* incognito_browser = nullptr; BookmarkNavigationWrapper nav_wrapper; Profile* profile = nullptr; - if (browser) + if (browser) { profile = browser->profile(); + } bool opening_urls_in_incognito = false; if (profile) { opening_urls_in_incognito = @@ -180,14 +183,17 @@ // depending on the disposition and URL type. Browser* browser_to_use = browser; if (opening_urls_in_incognito && url_allowed_in_incognito) { - if (incognito_browser) + if (incognito_browser) { browser_to_use = incognito_browser; + } } else { - if (regular_browser) + if (regular_browser) { browser_to_use = regular_browser; + } } - if (browser_to_use) + if (browser_to_use) { profile = browser_to_use->profile(); + } NavigateParams params(profile, url_and_id_it->url, ui::PAGE_TRANSITION_AUTO_BOOKMARK); params.disposition = disposition; @@ -200,8 +206,9 @@ } content::WebContents* opened_tab = handle ? handle->GetWebContents() : nullptr; - if (!opened_tab) + if (!opened_tab) { continue; + } if (launch_action.has_value()) { BookmarkStatsTabHelper::CreateForWebContents(opened_tab); @@ -212,8 +219,9 @@ if (url_and_id_it->id != -1) { ChromeNavigationUIData* ui_data = static_cast<ChromeNavigationUIData*>(handle->GetNavigationUIData()); - if (ui_data) + if (ui_data) { ui_data->set_bookmark_id(url_and_id_it->id); + } } bool opening_in_new_window = @@ -267,51 +275,57 @@ std::optional<BookmarkLaunchAction> launch_action) { std::vector<UrlAndId> url_and_ids = GetURLsToOpen( nodes, initial_disposition == WindowOpenDisposition::OFF_THE_RECORD); - auto do_open = [](Browser* browser, std::vector<UrlAndId> url_and_ids_to_open, - WindowOpenDisposition initial_disposition, - std::optional<std::u16string> folder_title, - page_load_metrics::NavigationHandleUserData:: - InitiatorLocation navigation_type, - std::optional<BookmarkLaunchAction> launch_action, - chrome::MessageBoxResult result) { - if (result != chrome::MESSAGE_BOX_RESULT_YES) - return; - const auto opened_web_contents = OpenAllHelper( - browser, std::move(url_and_ids_to_open), initial_disposition, - navigation_type, std::move(launch_action)); - if (folder_title.has_value()) { - TabStripModel* model = browser->tab_strip_model(); - - // Figure out which tabs we actually opened in this browser that aren't - // already in groups. - std::vector<int> tab_indices; - for (int i = 0; i < model->count(); ++i) { - if (base::Contains(opened_web_contents, model->GetWebContentsAt(i)) && - !model->GetTabGroupForTab(i).has_value()) { - tab_indices.push_back(i); + auto do_open = + [](Browser* browser, std::vector<UrlAndId> url_and_ids_to_open, + WindowOpenDisposition initial_disposition, + std::optional<std::u16string> folder_title, + page_load_metrics::NavigationHandleUserData::InitiatorLocation + navigation_type, + std::optional<BookmarkLaunchAction> launch_action, + chrome::MessageBoxResult result) { + if (result != chrome::MESSAGE_BOX_RESULT_YES) { + return; } - } + const auto opened_web_contents = OpenAllHelper( + browser, std::move(url_and_ids_to_open), initial_disposition, + navigation_type, std::move(launch_action)); + if (folder_title.has_value()) { + TabStripModel* model = browser->tab_strip_model(); - if (tab_indices.empty()) - return; + // Figure out which tabs we actually opened in this browser that + // aren't already in groups. + std::vector<int> tab_indices; + for (int i = 0; i < model->count(); ++i) { + if (base::Contains(opened_web_contents, + model->GetWebContentsAt(i)) && + !model->GetTabGroupForTab(i).has_value()) { + tab_indices.push_back(i); + } + } - std::optional<tab_groups::TabGroupId> new_group_id = - model->AddToNewGroup(tab_indices); - if (!new_group_id.has_value()) - return; + if (tab_indices.empty()) { + return; + } - // Use the bookmark folder's title as the group's title. - TabGroup* group = model->group_model()->GetTabGroup(new_group_id.value()); - const tab_groups::TabGroupVisualData* current_visual_data = - group->visual_data(); - tab_groups::TabGroupVisualData new_visual_data( - folder_title.value(), current_visual_data->color(), - current_visual_data->is_collapsed()); - group->SetVisualData(new_visual_data); + std::optional<tab_groups::TabGroupId> new_group_id = + model->AddToNewGroup(tab_indices); + if (!new_group_id.has_value()) { + return; + } - model->OpenTabGroupEditor(new_group_id.value()); - } - }; + // Use the bookmark folder's title as the group's title. + TabGroup* group = + model->group_model()->GetTabGroup(new_group_id.value()); + const tab_groups::TabGroupVisualData* current_visual_data = + group->visual_data(); + tab_groups::TabGroupVisualData new_visual_data( + folder_title.value(), current_visual_data->color(), + current_visual_data->is_collapsed()); + group->SetVisualData(new_visual_data); + + model->OpenTabGroupEditor(new_group_id.value()); + } + }; // Skip the prompt if there are few bookmarks. size_t child_count = url_and_ids.size();
diff --git a/chrome/browser/ui/bookmarks/bookmark_utils_desktop.h b/chrome/browser/ui/bookmarks/bookmark_utils_desktop.h index 5ddc830..8c34f6e7 100644 --- a/chrome/browser/ui/bookmarks/bookmark_utils_desktop.h +++ b/chrome/browser/ui/bookmarks/bookmark_utils_desktop.h
@@ -26,7 +26,7 @@ namespace content { class BrowserContext; class NavigationHandle; -} +} // namespace content namespace chrome {
diff --git a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.cc b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.cc index 0da2387..d3d6e8db 100644 --- a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.cc +++ b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.cc
@@ -40,11 +40,8 @@ Type type; }; -RecentlyUsedFoldersComboModel::Item::Item(const BookmarkNode* node, - Type type) - : node(node), - type(type) { -} +RecentlyUsedFoldersComboModel::Item::Item(const BookmarkNode* node, Type type) + : node(node), type(type) {} RecentlyUsedFoldersComboModel::Item::~Item() = default; @@ -190,8 +187,9 @@ } } if (changed) { - for (ui::ComboboxModelObserver& observer : observers()) + for (ui::ComboboxModelObserver& observer : observers()) { observer.OnComboboxModelChanged(this); + } } } @@ -227,8 +225,9 @@ } } if (changed) { - for (ui::ComboboxModelObserver& observer : observers()) + for (ui::ComboboxModelObserver& observer : observers()) { observer.OnComboboxModelChanged(this); + } } } @@ -253,6 +252,7 @@ void RecentlyUsedFoldersComboModel::RemoveNode(const BookmarkNode* node) { auto it = base::ranges::find(items_, Item(node, Item::TYPE_NODE)); - if (it != items_.end()) + if (it != items_.end()) { items_.erase(it); + } }
diff --git a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h index 7d5b611f..9bd0c3e5 100644 --- a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h +++ b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h
@@ -15,7 +15,7 @@ namespace bookmarks { class BookmarkModel; class BookmarkNode; -} +} // namespace bookmarks // Model for the combobox showing the list of folders to choose from. The // list always contains the Bookmarks Bar, Other Bookmarks and the parent
diff --git a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc index 3a22ac29..fac4248 100644 --- a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc +++ b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc
@@ -70,8 +70,9 @@ RecentlyUsedFoldersComboModel model(bookmark_model.get(), new_node); std::set<std::u16string> items; for (size_t i = 0; i < model.GetItemCount(); ++i) { - if (!model.IsItemSeparatorAt(i)) + if (!model.IsItemSeparatorAt(i)) { EXPECT_EQ(0u, items.count(model.GetItemAt(i))); + } } }
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index 347bf38..e0582db 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc
@@ -342,17 +342,21 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) session_manager::SessionManager* session_manager = session_manager::SessionManager::Get(); - if (!session_manager) + if (!session_manager) { return false; + } // We have to check this way because of CHECK() in UserManager::Get(). - if (!user_manager::UserManager::IsInitialized()) + if (!user_manager::UserManager::IsInitialized()) { return false; + } user_manager::UserManager* user_manager = user_manager::UserManager::Get(); - if (!user_manager->IsLoggedInAsAnyKioskApp()) + if (!user_manager->IsLoggedInAsAnyKioskApp()) { return false; + } if (session_manager->session_state() != - session_manager::SessionState::LOGIN_PRIMARY) + session_manager::SessionState::LOGIN_PRIMARY) { return false; + } return true; #else return false; @@ -529,8 +533,9 @@ // static Browser::CreationStatus Browser::GetCreationStatusForProfile(Profile* profile) { - if (!g_browser_process || g_browser_process->IsShuttingDown()) + if (!g_browser_process || g_browser_process->IsShuttingDown()) { return CreationStatus::kErrorNoProcess; + } if (!IncognitoModePrefs::CanOpenBrowser(profile) || (profile->IsGuestSession() && !profile->IsOffTheRecord()) || @@ -539,8 +544,9 @@ return CreationStatus::kErrorProfileUnsuitable; } - if (IsOnKioskSplashScreen()) + if (IsOnKioskSplashScreen()) { return CreationStatus::kErrorLoadingKiosk; + } return CreationStatus::kOk; } @@ -635,15 +641,17 @@ base::Unretained(this), BOOKMARK_BAR_STATE_CHANGE_PREF_CHANGE)); - if (search::IsInstantExtendedAPIEnabled() && is_type_normal()) + if (search::IsInstantExtendedAPIEnabled() && is_type_normal()) { instant_controller_ = std::make_unique<BrowserInstantController>(this); + } UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_INIT); ProfileMetrics::LogProfileLaunch(profile_); - if (params.skip_window_init_for_testing) + if (params.skip_window_init_for_testing) { return; + } // BrowserWindowFeatures need to be initialized before browser window // creation, so that the features can be used in creating components @@ -656,8 +664,9 @@ params.user_gesture, params.in_tab_dragging); - if (app_controller_) + if (app_controller_) { app_controller_->UpdateCustomTabBarVisibility(false); + } // Create the extension window controller before sending notifications. extension_window_controller_ = @@ -666,8 +675,9 @@ SessionServiceBase* service = GetAppropriateSessionServiceForSessionRestore(this); - if (service) + if (service) { service->WindowOpened(this); + } exclusive_access_manager_ = std::make_unique<ExclusiveAccessManager>( window_->GetExclusiveAccessContext()); @@ -737,13 +747,15 @@ SessionServiceBase* service = GetAppropriateSessionServiceForProfile(this); - if (service) + if (service) { service->WindowClosed(session_id_); + } sessions::TabRestoreService* tab_restore_service = TabRestoreServiceFactory::GetForProfile(profile()); - if (tab_restore_service) + if (tab_restore_service) { tab_restore_service->BrowserClosed(live_tab_context()); + } profile_pref_registrar_.Reset(); @@ -787,8 +799,9 @@ // There may be pending file dialogs, we need to tell them that we've gone // away so they don't try and call back to us. - if (select_file_dialog_.get()) + if (select_file_dialog_.get()) { select_file_dialog_->ListenerDestroyed(); + } } /////////////////////////////////////////////////////////////////////////////// @@ -827,8 +840,9 @@ // Browser, State Storage and Retrieval for UI: GURL Browser::GetNewTabURL() const { - if (app_controller_) + if (app_controller_) { return app_controller_->GetAppNewTabUrl(); + } return GURL(chrome::kChromeUINewTabURL); } @@ -845,8 +859,9 @@ std::u16string Browser::GetWindowTitleForCurrentTab( bool include_app_name) const { - if (!user_title_.empty()) + if (!user_title_.empty()) { return base::UTF8ToUTF16(user_title_); + } // For document picture-in-picture windows, we use the title from the opener // WebContents instead of the picture-in-picture WebContents itself. @@ -913,13 +928,15 @@ content::WebContents* contents = tab_strip_model_->GetActiveWebContents(); // |contents| can be NULL if GetWindowTitleForMenu is called during the // window's creation (before tabs have been added). - if (contents) + if (contents) { title = FormatTitleForDisplay(app_controller_ ? app_controller_->GetTitle() : contents->GetTitle()); + } // If there is no title, leave it empty for apps. - if (title.empty() && (is_type_normal() || is_type_popup())) + if (title.empty() && (is_type_normal() || is_type_popup())) { title = CoreTabHelper::GetDefaultTitle(); + } // Try to elide the title to fit the pixel width. If that will make the title // shorter than the minimum character limit, use a character elided title @@ -964,8 +981,9 @@ } // If there is no title, leave it empty for apps. - if (title.empty() && (is_type_normal() || is_type_popup())) + if (title.empty() && (is_type_normal() || is_type_popup())) { title = CoreTabHelper::GetDefaultTitle(); + } #if BUILDFLAG(IS_MAC) // On Mac, we don't want to suffix the page title with the application name. @@ -1100,8 +1118,9 @@ DCHECK(!IsRelevantToAppSessionService(type_)); SessionService* const session_service = SessionServiceFactory::GetForProfile(profile_); - if (session_service) + if (session_service) { session_service->SetWindowUserTitle(session_id(), user_title); + } } Browser* Browser::GetBrowserForOpeningWebUi() { @@ -1300,8 +1319,9 @@ // session service so that user can restore what was open. SessionServiceBase* service = GetAppropriateSessionServiceForProfile(this); - if (service) + if (service) { service->WindowClosing(session_id()); + } sessions::TabRestoreService* tab_restore_service = TabRestoreServiceFactory::GetForProfile(profile()); @@ -1311,8 +1331,9 @@ notify_restore_service |= is_type_app() || is_type_app_popup(); #endif - if (tab_restore_service && notify_restore_service) + if (tab_restore_service && notify_restore_service) { tab_restore_service->BrowserClosing(live_tab_context()); + } BrowserList::NotifyBrowserCloseStarted(this); @@ -1341,13 +1362,15 @@ // If we're not running a full browser process with a profile manager // (testing), it's ok to close the browser. - if (!g_browser_process->profile_manager()) + if (!g_browser_process->profile_manager()) { return DownloadCloseType::kOk; + } int total_download_count = DownloadCoreService::BlockingShutdownCountAllProfiles(); - if (total_download_count == 0) + if (total_download_count == 0) { return DownloadCloseType::kOk; // No downloads; can definitely close. + } // Figure out how many windows are open total, and associated with this // profile, that are relevant for the ok-to-close decision. @@ -1420,16 +1443,18 @@ void Browser::OpenFile() { // Ignore if there is already a select file dialog. - if (select_file_dialog_) + if (select_file_dialog_) { return; + } base::RecordAction(UserMetricsAction("OpenFile")); select_file_dialog_ = ui::SelectFileDialog::Create( this, std::make_unique<ChromeSelectFilePolicy>( tab_strip_model_->GetActiveWebContents())); - if (!select_file_dialog_) + if (!select_file_dialog_) { return; + } const base::FilePath directory = profile_->last_selected_directory(); // TODO(beng): figure out how to juggle this. @@ -1443,8 +1468,9 @@ } void Browser::UpdateDownloadShelfVisibility(bool visible) { - if (GetStatusBubble()) + if (GetStatusBubble()) { GetStatusBubble()->UpdateDownloadShelfVisibility(visible); + } } bool Browser::CanSaveContents(content::WebContents* web_contents) const { @@ -1453,8 +1479,9 @@ bool Browser::ShouldDisplayFavicon(content::WebContents* web_contents) const { // Remove for all other tabbed web apps. - if (app_controller_ && app_controller_->has_tab_strip()) + if (app_controller_ && app_controller_->has_tab_strip()) { return false; + } // Otherwise, always display the favicon. return true; @@ -1477,8 +1504,9 @@ window()->GetLocationBar()->Revert(); } - if (GetStatusBubble()) + if (GetStatusBubble()) { GetStatusBubble()->Hide(); + } // Update the location bar. This is synchronous. We specifically don't // update the load state since the load hasn't started yet and updating it @@ -1532,15 +1560,17 @@ tab_strip_model, "change", change); switch (change.type()) { case TabStripModelChange::kInserted: { - for (const auto& contents : change.GetInsert()->contents) + for (const auto& contents : change.GetInsert()->contents) { OnTabInsertedAt(contents.contents, contents.index); + } break; } case TabStripModelChange::kRemoved: { for (const auto& contents : change.GetRemove()->contents) { if (contents.remove_reason == - TabStripModelChange::RemoveReason::kDeleted) + TabStripModelChange::RemoveReason::kDeleted) { OnTabClosing(contents.contents); + } OnTabDetached(contents.contents, contents.contents == selection.old_contents); } @@ -1561,14 +1591,17 @@ break; } - if (!selection.active_tab_changed()) + if (!selection.active_tab_changed()) { return; + } - if (selection.old_contents) + if (selection.old_contents) { OnTabDeactivated(selection.old_contents); + } - if (tab_strip_model_->empty()) + if (tab_strip_model_->empty()) { return; + } OnActiveTabChanged( selection.old_contents, selection.new_contents, @@ -1591,8 +1624,9 @@ } else if (change.type == TabGroupChange::kClosed) { sessions::TabRestoreService* tab_restore_service = TabRestoreServiceFactory::GetForProfile(profile()); - if (tab_restore_service) + if (tab_restore_service) { tab_restore_service->GroupClosed(change.group); + } } } @@ -1620,8 +1654,9 @@ DCHECK(!IsRelevantToAppSessionService(type_)); SessionService* const session_service = SessionServiceFactory::GetForProfile(profile_); - if (!session_service) + if (!session_service) { return; + } sessions::SessionTabHelper* const session_tab_helper = sessions::SessionTabHelper::FromWebContents(tab->GetContents()); @@ -1680,8 +1715,9 @@ // Allow failed URLs to stick around in the omnibox on the NTP, but not when // other pages have committed. Profile* profile = Profile::FromBrowserContext(source->GetBrowserContext()); - if (!profile || !source->GetController().GetLastCommittedEntry()) + if (!profile || !source->GetController().GetLastCommittedEntry()) { return false; + } GURL committed_url(source->GetController().GetLastCommittedEntry()->GetURL()); return search::IsNTPOrRelatedURL(committed_url, profile); } @@ -1702,8 +1738,9 @@ // Forward keyboard events to the manager for fullscreen / mouse lock. This // may consume the event (e.g., Esc exits fullscreen mode). // TODO(koz): Write a test for this http://crbug.com/100441. - if (exclusive_access_manager_->HandleUserKeyEvent(event)) + if (exclusive_access_manager_->HandleUserKeyEvent(event)) { return content::KeyboardEventProcessingResult::HANDLED; + } return window()->PreHandleKeyboardEvent(event); } @@ -1723,8 +1760,9 @@ bool Browser::PreHandleGestureEvent(content::WebContents* source, const blink::WebGestureEvent& event) { // Disable pinch zooming in undocked dev tools window due to poor UX. - if (app_name() == DevToolsWindow::kDevToolsApp) + if (app_name() == DevToolsWindow::kDevToolsApp) { return blink::WebInputEvent::IsPinchGestureEventType(event.GetType()); + } return false; } @@ -1758,8 +1796,9 @@ const GURL& resource_url) { // Note: this implementation is a mirror of // ContentSettingsObserver::allowRunningInsecureContent. - if (allowed_per_prefs) + if (allowed_per_prefs) { return true; + } Profile* profile = Profile::FromBrowserContext(web_contents->GetBrowserContext()); @@ -1829,23 +1868,26 @@ } void Browser::OnWindowDidShow() { - if (window_has_shown_) + if (window_has_shown_) { return; + } window_has_shown_ = true; startup_metric_utils::GetBrowser().RecordBrowserWindowDisplay( base::TimeTicks::Now()); // Nothing to do for non-tabbed windows. - if (!is_type_normal()) + if (!is_type_normal()) { return; + } // Show any pending global error bubble. GlobalErrorService* service = GlobalErrorServiceFactory::GetForProfile(profile()); GlobalError* error = service->GetFirstGlobalErrorWithBubbleView(); - if (error) + if (error) { error->ShowBubbleView(this); + } } /////////////////////////////////////////////////////////////////////////////// @@ -1872,8 +1914,9 @@ nav_params.FillNavigateParamsFromOpenURLParams(params); nav_params.source_contents = source; nav_params.tabstrip_add_types = AddTabTypes::ADD_NONE; - if (params.user_gesture) + if (params.user_gesture) { nav_params.window_action = NavigateParams::SHOW_WINDOW; + } bool is_popup = source && blocked_content::ConsiderForPopupBlocking(params.disposition); auto popup_delegate = @@ -1886,8 +1929,9 @@ HostContentSettingsMapFactory::GetForProfile( source->GetBrowserContext())) .release())); - if (!popup_delegate) + if (!popup_delegate) { return nullptr; + } } chrome::ConfigureTabGroupForNavigation(popup_delegate->nav_params()); @@ -1923,12 +1967,14 @@ // state messages while destructing during browser tear-down. Ironically we // can't use IsShuttingDown() because by this point the browser is entirely // removed from the browser list. - if (!command_controller_) + if (!command_controller_) { return; + } // Only update the UI when something visible has changed. - if (changed_flags) + if (changed_flags) { ScheduleUIUpdate(source, changed_flags); + } // We can synchronously update commands since they will only change once per // navigation, so we don't have to worry about flickering. We do, however, @@ -1936,11 +1982,13 @@ // actions in the face of slow-to-commit pages. if (changed_flags & (content::INVALIDATE_TYPE_URL | content::INVALIDATE_TYPE_LOAD | - content::INVALIDATE_TYPE_TAB)) + content::INVALIDATE_TYPE_TAB)) { command_controller_->TabStateChanged(); + } - if (app_controller_) + if (app_controller_) { app_controller_->UpdateCustomTabBarVisibility(true); + } } void Browser::VisibleSecurityStateChanged(WebContents* source) { @@ -2024,8 +2072,9 @@ // A WebContents can ask to activate after it's been removed from the // TabStripModel. See https://crbug.com/1060986 int index = tab_strip_model_->GetIndexOfWebContents(contents); - if (index == TabStripModel::kNoTab) + if (index == TabStripModel::kNoTab) { return; + } tab_strip_model_->ActivateTabAt(index); window_->Activate(); } @@ -2037,8 +2086,9 @@ } void Browser::CloseContents(WebContents* source) { - if (unload_controller_.CanCloseContents(source)) + if (unload_controller_.CanCloseContents(source)) { chrome::CloseWebContents(this, source, true); + } } void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) { @@ -2062,11 +2112,13 @@ } void Browser::UpdateTargetURL(WebContents* source, const GURL& url) { - if (!GetStatusBubble()) + if (!GetStatusBubble()) { return; + } - if (source == tab_strip_model_->GetActiveWebContents()) + if (source == tab_strip_model_->GetActiveWebContents()) { GetStatusBubble()->SetURL(url); + } } void Browser::ContentsMouseEvent(WebContents* source, const ui::Event& event) { @@ -2100,9 +2152,11 @@ void Browser::BeforeUnloadFired(WebContents* web_contents, bool proceed, bool* proceed_to_fire_unload) { - if (is_type_devtools() && DevToolsWindow::HandleBeforeUnload( - web_contents, proceed, proceed_to_fire_unload)) + if (is_type_devtools() && + DevToolsWindow::HandleBeforeUnload(web_contents, proceed, + proceed_to_fire_unload)) { return; + } *proceed_to_fire_unload = unload_controller_.BeforeUnloadFired(web_contents, proceed); @@ -2111,8 +2165,9 @@ bool Browser::ShouldFocusLocationBarByDefault(WebContents* source) { // Navigations in background tabs shouldn't change the focus state of the // omnibox, since it's associated with the foreground tab. - if (source != tab_strip_model_->GetActiveWebContents()) + if (source != tab_strip_model_->GetActiveWebContents()) { return false; + } // This should be based on the pending entry if there is one, so that // back/forward navigations to the NTP are handled. The visible entry can't @@ -2126,8 +2181,9 @@ const GURL& url = entry->GetURL(); const GURL& virtual_url = entry->GetVirtualURL(); - if (virtual_url.SchemeIs(content::kViewSourceScheme)) + if (virtual_url.SchemeIs(content::kViewSourceScheme)) { return false; + } if ((url.SchemeIs(content::kChromeUIScheme) && url.host_piece() == chrome::kChromeUINewTabHost) || @@ -2272,8 +2328,9 @@ void Browser::DidFinishNavigation( content::WebContents* web_contents, content::NavigationHandle* navigation_handle) { - if (web_contents != tab_strip_model_->GetActiveWebContents()) + if (web_contents != tab_strip_model_->GetActiveWebContents()) { return; + } if (navigation_handle->IsInPrimaryMainFrame() && navigation_handle->HasCommitted()) { @@ -2335,8 +2392,9 @@ content::RenderFrameHost* requesting_frame) { // If the tab strip isn't editable then a drag session is in progress, and it // is not safe to enter fullscreen. https://crbug.com/1315080 - if (!tab_strip_model_delegate_->IsTabStripEditable()) + if (!tab_strip_model_delegate_->IsTabStripEditable()) { return false; + } return exclusive_access_manager_->fullscreen_controller() ->CanEnterFullscreenModeForTab(requesting_frame); @@ -2368,16 +2426,18 @@ blink::mojom::DisplayMode Browser::GetDisplayMode( const WebContents* web_contents) { - if (window_->IsFullscreen()) + if (window_->IsFullscreen()) { return blink::mojom::DisplayMode::kFullscreen; + } if (is_type_picture_in_picture()) { return blink::mojom::DisplayMode::kPictureInPicture; } if (is_type_app() || is_type_devtools() || is_type_app_popup()) { - if (app_controller_ && app_controller_->HasMinimalUiButtons()) + if (app_controller_ && app_controller_->HasMinimalUiButtons()) { return blink::mojom::DisplayMode::kMinimalUi; + } if (app_controller_ && app_controller_->AppUsesWindowControlsOverlay() && !web_contents->GetWindowsControlsOverlayRect().IsEmpty()) { @@ -2427,8 +2487,9 @@ const GURL& url, bool user_gesture) { content::BrowserContext* context = requesting_frame->GetBrowserContext(); - if (context->IsOffTheRecord()) + if (context->IsOffTheRecord()) { return; + } auto* web_contents = content::WebContents::FromRenderFrameHost(requesting_frame); @@ -2444,8 +2505,9 @@ custom_handlers::ProtocolHandlerRegistry* registry = ProtocolHandlerRegistryFactory::GetForBrowserContext(context); - if (registry->SilentlyHandleRegisterHandlerRequest(handler)) + if (registry->SilentlyHandleRegisterHandlerRequest(handler)) { return; + } // TODO(carlscab): This should probably be FromFrame() once it becomes // PageSpecificContentSettingsDelegate @@ -2496,8 +2558,9 @@ // user_gesture will be used in case we decide to have confirmation bubble // for user while un-registering the handler. content::BrowserContext* context = requesting_frame->GetBrowserContext(); - if (context->IsOffTheRecord()) + if (context->IsOffTheRecord()) { return; + } ProtocolHandler handler = ProtocolHandler::CreateProtocolHandler( protocol, url, GetProtocolHandlerSecurityLevel(requesting_frame)); @@ -2515,8 +2578,9 @@ bool final_update) { find_in_page::FindTabHelper* find_tab_helper = find_in_page::FindTabHelper::FromWebContents(web_contents); - if (!find_tab_helper) + if (!find_tab_helper) { return; + } find_tab_helper->HandleFindReply(request_id, number_of_matches, selection_rect, active_match_ordinal, @@ -2598,8 +2662,9 @@ int document_cookie, content::RenderFrameHost* subframe_host) const { auto* client = printing::PrintCompositeClient::FromWebContents(web_contents); - if (client) + if (client) { client->PrintCrossProcessSubframe(rect, document_cookie, subframe_host); + } } #endif @@ -2611,8 +2676,9 @@ content::RenderFrameHost* render_frame_host) { auto* client = paint_preview::PaintPreviewClient::FromWebContents(web_contents); - if (client) + if (client) { client->CaptureSubframePaintPreview(guid, rect, render_frame_host); + } } #endif @@ -2659,8 +2725,9 @@ tab_strip_model_->GetActiveWebContents() == web_contents; // If the WebContents is foremost (the active tab in the front-most browser) // and is being unblocked, focus it to make sure that input works again. - if (!blocked && contents_is_active && browser_active) + if (!blocked && contents_is_active && browser_active) { web_contents->Focus(); + } } web_modal::WebContentsModalDialogHost* @@ -2673,8 +2740,9 @@ void Browser::URLStarredChanged(content::WebContents* web_contents, bool starred) { - if (web_contents == tab_strip_model_->GetActiveWebContents()) + if (web_contents == tab_strip_model_->GetActiveWebContents()) { window_->SetStarredState(starred); + } } /////////////////////////////////////////////////////////////////////////////// @@ -2707,8 +2775,9 @@ GURL url = file_info.url.value_or(net::FilePathToFileURL(file_info.local_path)); - if (url.is_empty()) + if (url.is_empty()) { return; + } OpenURL(OpenURLParams(url, Referrer(), WindowOpenDisposition::CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false), @@ -2756,8 +2825,9 @@ if (service) { service->TabInserted(contents); int new_active_index = tab_strip_model_->active_index(); - if (index < new_active_index) + if (index < new_active_index) { service->SetSelectedTabInWindow(session_id(), new_active_index); + } } } @@ -2784,8 +2854,9 @@ exclusive_access_manager_->OnTabClosing(contents); SessionServiceBase* service = GetAppropriateSessionServiceForProfile(this); - if (service) + if (service) { service->TabClosing(contents); + } } void Browser::OnTabDetached(WebContents* contents, bool was_active) { @@ -2835,8 +2906,9 @@ old_contents->GetPrimaryMainFrame()->GetView(); RenderWidgetHostView* new_view = new_contents->GetPrimaryMainFrame()->GetView(); - if (old_view && new_view) + if (old_view && new_view) { new_view->CopyBackgroundColorIfPresentFrom(*old_view); + } } #endif @@ -2855,8 +2927,9 @@ exclusive_access_manager_->OnTabDetachedFromView(old_contents); // If we have any update pending, do it now. - if (chrome_updater_factory_.HasWeakPtrs() && old_contents) + if (chrome_updater_factory_.HasWeakPtrs() && old_contents) { ProcessPendingUIUpdates(); + } // Propagate the profile to the location bar. UpdateToolbar((reason & CHANGE_REASON_REPLACED) == 0); @@ -2917,8 +2990,9 @@ exclusive_access_manager_->OnTabClosing(old_contents); SessionServiceBase* session_service = GetAppropriateSessionServiceForProfile(this); - if (session_service) + if (session_service) { session_service->TabClosing(old_contents); + } OnTabInsertedAt(new_contents, index); if (!new_contents->GetController().IsInitialBlankNavigation()) { @@ -2939,8 +3013,9 @@ void Browser::OnDevToolsAvailabilityChanged() { for (auto& agent_host : content::DevToolsAgentHost::GetAll()) { if (!DevToolsWindow::AllowDevToolsFor(profile_, - agent_host->GetWebContents())) + agent_host->GetWebContents())) { agent_host->ForceDetachAllSessions(); + } } } @@ -2976,8 +3051,10 @@ // TODO(crbug.com/40100269) Figure out a safe way to detach browser delegate // from WebContents when it's removed so this doesn't happen - then put a // DCHECK back here. - if (tab_strip_model_->GetIndexOfWebContents(source) == TabStripModel::kNoTab) + if (tab_strip_model_->GetIndexOfWebContents(source) == + TabStripModel::kNoTab) { return; + } // Do some synchronous updates. if (changed_flags & content::INVALIDATE_TYPE_URL) { @@ -3008,8 +3085,9 @@ } // If the only updates were synchronously handled above, we're done. - if (changed_flags == 0) + if (changed_flags == 0) { return; + } // Save the dirty bits. scheduled_updates_[source] |= changed_flags; @@ -3095,12 +3173,14 @@ } void Browser::RemoveScheduledUpdatesFor(WebContents* contents) { - if (!contents) + if (!contents) { return; + } auto i = scheduled_updates_.find(contents); - if (i != scheduled_updates_.end()) + if (i != scheduled_updates_.end()) { scheduled_updates_.erase(i); + } } /////////////////////////////////////////////////////////////////////////////// @@ -3132,8 +3212,9 @@ SessionService* session_service = SessionServiceFactory::GetForProfileIfExisting(profile()); - if (!service && !session_service) + if (!service && !session_service) { return; + } for (int i = index; i < tab_strip_model_->count(); ++i) { WebContents* web_contents = tab_strip_model_->GetWebContentsAt(i); @@ -3166,20 +3247,23 @@ #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS_ASH) // On Mac and ChromeOS, non-incognito and non-Guest downloads can still // continue after window is closed. - if (!profile_->IsOffTheRecord()) + if (!profile_->IsOffTheRecord()) { return true; + } #endif // If we've prompted, we need to hear from the user before we // can close. - if (cancel_download_confirmation_state_ != NOT_PROMPTED) + if (cancel_download_confirmation_state_ != NOT_PROMPTED) { return cancel_download_confirmation_state_ != WAITING_FOR_RESPONSE; + } int num_downloads_blocking; DownloadCloseType dialog_type = OkToCloseWithInProgressDownloads(&num_downloads_blocking); - if (dialog_type == DownloadCloseType::kOk) + if (dialog_type == DownloadCloseType::kOk) { return true; + } // Closing this window will kill some downloads; prompt to make sure // that's ok. @@ -3274,19 +3358,22 @@ // non-selected tab can corrupt both tabs. if (was_active) { LocationBar* location_bar = window()->GetLocationBar(); - if (location_bar) + if (location_bar) { location_bar->SaveStateToContents(contents); + } } - if (!tab_strip_model_->closing_all()) + if (!tab_strip_model_->closing_all()) { SyncHistoryWithTabs(0); + } } SetAsDelegate(contents, false); RemoveScheduledUpdatesFor(contents); - if (HasFindBarController() && was_active) + if (HasFindBarController() && was_active) { find_bar_controller_->ChangeWebContents(nullptr); + } } void Browser::UpdateWindowForLoadingStateChanged(content::WebContents* source, @@ -3425,8 +3512,9 @@ case TYPE_POPUP: return PopupBrowserSupportsWindowFeature(feature, check_can_support); case TYPE_APP: - if (app_controller_) + if (app_controller_) { return AppBrowserSupportsWindowFeature(feature, check_can_support); + } // TODO(crbug.com/40639933): Change legacy apps to TYPE_APP_POPUP. return AppPopupBrowserSupportsWindowFeature(feature, check_can_support); case TYPE_DEVTOOLS: @@ -3446,13 +3534,15 @@ BookmarkBar::State state = ShouldShowBookmarkBar() ? BookmarkBar::SHOW : BookmarkBar::HIDDEN; - if (state == bookmark_bar_state_) + if (state == bookmark_bar_state_) { return; + } bookmark_bar_state_ = state; - if (!window_) + if (!window_) { return; // This is called from the constructor when window_ is NULL. + } if (reason == BOOKMARK_BAR_STATE_CHANGE_TAB_SWITCH) { // Don't notify BrowserWindow on a tab switch as at the time this is invoked @@ -3469,21 +3559,24 @@ } bool Browser::ShouldShowBookmarkBar() const { - if (profile_->IsGuestSession()) + if (profile_->IsGuestSession()) { return false; + } if (browser_defaults::bookmarks_enabled && profile_->GetPrefs()->GetBoolean(bookmarks::prefs::kShowBookmarkBar) && - !ShouldHideUIForFullscreen()) + !ShouldHideUIForFullscreen()) { return true; + } if (force_show_bookmark_bar_flags_ != ForceShowBookmarkBarFlag::kNone) { return true; } WebContents* web_contents = tab_strip_model_->GetActiveWebContents(); - if (!web_contents) + if (!web_contents) { return false; + } BookmarkTabHelper* bookmark_tab_helper = BookmarkTabHelper::FromWebContents(web_contents); @@ -3498,8 +3591,9 @@ } bool Browser::ShouldStartShutdown() const { - if (IsBrowserClosing()) + if (IsBrowserClosing()) { return false; + } const size_t closing_browsers_count = BrowserList::GetInstance()->currently_closing_browsers().size(); @@ -3514,8 +3608,9 @@ extensions::ExtensionSystem::Get(profile_); if (!opener_url.is_valid() || frame_name.empty() || - !extension_system->is_ready()) + !extension_system->is_ready()) { return false; + } // Only hosted apps have web extents, so this ensures that only hosted apps // can create BackgroundContents. We don't have to check for background @@ -3524,14 +3619,16 @@ const Extension* extension = extensions::ExtensionRegistry::Get(profile_) ->enabled_extensions() .GetHostedAppByURL(opener_url); - if (!extension) + if (!extension) { return false; + } // No BackgroundContents allowed if BackgroundContentsService doesn't exist. BackgroundContentsService* service = BackgroundContentsServiceFactory::GetForProfile(profile_); - if (!service) + if (!service) { return false; + } // Ensure that we're trying to open this from the extension's process. extensions::ProcessMap* process_map = extensions::ProcessMap::Get(profile_); @@ -3567,8 +3664,9 @@ // For non-scriptable background contents, ignore the request altogether, // Note that ShouldCreateBackgroundContents() returning true will also // suppress creation of the normal WebContents. - if (!allow_js_access) + if (!allow_js_access) { return nullptr; + } // For scriptable background pages, if one already exists, close it (even // if it was specified in the manifest). service->DeleteBackgroundContents(existing);
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h index 2a6ce19..0ee8fee 100644 --- a/chrome/browser/ui/browser.h +++ b/chrome/browser/ui/browser.h
@@ -100,7 +100,7 @@ namespace content { class NavigationHandle; class SessionStorageNamespace; -} +} // namespace content namespace extensions { class BrowserExtensionWindowController; @@ -1113,7 +1113,6 @@ // Overridden from ThemeServiceObserver: void OnThemeChanged() override; - // Command and state updating /////////////////////////////////////////////// // Handle changes to tab strip model.
diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc index 25a53aa..a5f8d67 100644 --- a/chrome/browser/ui/browser_browsertest.cc +++ b/chrome/browser/ui/browser_browsertest.cc
@@ -195,8 +195,9 @@ std::u16string WindowCaptionFromPageTitle(const std::u16string& page_title) { #if BUILDFLAG(IS_MAC) // On Mac, we don't want to suffix the page title with the application name. - if (page_title.empty()) + if (page_title.empty()) { return l10n_util::GetStringUTF16(IDS_BROWSER_WINDOW_MAC_TAB_UNTITLED); + } return page_title; #elif BUILDFLAG(IS_CHROMEOS_LACROS) // On Lacros, we don't want to suffix the page title with the application @@ -206,8 +207,9 @@ } return page_title; #else - if (page_title.empty()) + if (page_title.empty()) { return l10n_util::GetStringUTF16(IDS_PRODUCT_NAME); + } return l10n_util::GetStringFUTF16(IDS_BROWSER_WINDOW_TITLE_FORMAT, page_title); @@ -219,8 +221,9 @@ int result = 0; for (content::RenderProcessHost::iterator i( content::RenderProcessHost::AllHostsIterator()); - !i.IsAtEnd(); i.Advance()) + !i.IsAtEnd(); i.Advance()) { ++result; + } return result; } @@ -234,13 +237,16 @@ TabStripModel* tab_strip_model, const TabStripModelChange& change, const TabStripSelectionChange& selection) override { - if (change.type() != TabStripModelChange::kRemoved) + if (change.type() != TabStripModelChange::kRemoved) { return; + } auto* remove = change.GetRemove(); for (const auto& contents : remove->contents) { - if (contents.remove_reason == TabStripModelChange::RemoveReason::kDeleted) + if (contents.remove_reason == + TabStripModelChange::RemoveReason::kDeleted) { closing_count_ += 1; + } } } @@ -306,8 +312,9 @@ } void Resize() { - if (wcv_resize_insets_.IsEmpty()) + if (wcv_resize_insets_.IsEmpty()) { return; + } // Resizing the main browser window by |wcv_resize_insets_| will // automatically resize the WebContentsView by the same amount. // Just resizing WebContentsView directly doesn't work on Linux, because the @@ -391,8 +398,9 @@ extensions::ExtensionRegistry::Get(browser()->profile()); for (const scoped_refptr<const extensions::Extension>& extension : registry->enabled_extensions()) { - if (extension->name() == "App Test") + if (extension->name() == "App Test") { return extension.get(); + } } NOTREACHED(); } @@ -1100,10 +1108,11 @@ // site-per-process mode is enabled or not. content::RenderProcessHost* popup_process = newtab->GetPrimaryMainFrame()->GetProcess(); - if (content::AreAllSitesIsolatedForTesting()) + if (content::AreAllSitesIsolatedForTesting()) { EXPECT_NE(process, popup_process); - else + } else { EXPECT_EQ(process, popup_process); + } // Same thing if the current tab tries to navigate itself. std::string navigate_str = "document.location=\""; @@ -1439,8 +1448,9 @@ // This test verifies we don't crash when closing the last window and the app // menu is showing. IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_CloseWithAppMenuOpen) { - if (browser_defaults::kBrowserAliveWithNoWindows) + if (browser_defaults::kBrowserAliveWithNoWindows) { return; + } // We need a message loop running for menus on windows. base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask( @@ -1480,8 +1490,9 @@ // Find the new browser. Browser* new_browser = nullptr; for (Browser* b : *BrowserList::GetInstance()) { - if (b != browser()) + if (b != browser()) { new_browser = b; + } } ASSERT_TRUE(new_browser); ASSERT_TRUE(new_browser != browser()); @@ -2940,8 +2951,9 @@ embedded_test_server()->RegisterRequestHandler(base::BindLambdaForTesting( [&](const net::test_server::HttpRequest& request) -> std::unique_ptr<net::test_server::HttpResponse> { - if (request.relative_url != "/sometimes-slow") + if (request.relative_url != "/sometimes-slow") { return nullptr; + } DCHECK(got_slow_request) << "Set `got_slow_request` before each navigation request."; return std::make_unique<content::SlowHttpResponse>( @@ -3017,8 +3029,9 @@ embedded_test_server()->RegisterRequestHandler(base::BindLambdaForTesting( [&](const net::test_server::HttpRequest& request) -> std::unique_ptr<net::test_server::HttpResponse> { - if (request.relative_url != "/sometimes-slow") + if (request.relative_url != "/sometimes-slow") { return nullptr; + } DCHECK(got_slow_request) << "Set `got_slow_request` before each navigation request."; return std::make_unique<content::SlowHttpResponse>(
diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc index 816fca4..efdf01aa 100644 --- a/chrome/browser/ui/browser_command_controller.cc +++ b/chrome/browser/ui/browser_command_controller.cc
@@ -150,8 +150,9 @@ void AppInfoDialogClosedCallback(SessionID session_id, views::Widget::ClosedReason closed_reason, bool reload_prompt) { - if (reload_prompt) + if (reload_prompt) { return; + } // If the user clicked on something specific or focus was changed, don't // override the focus. @@ -164,15 +165,17 @@ // (though unlikely) that either the browser or session has been pulled // out from underneath us. Browser* const browser = chrome::FindBrowserWithID(session_id); - if (!browser) + if (!browser) { return; + } // We want to focus the active web contents, which again, might not be the // original web contents (though it should be the vast majority of the time). content::WebContents* const active_contents = browser->tab_strip_model()->GetActiveWebContents(); - if (active_contents) + if (active_contents) { active_contents->Focus(); + } } bool CanOpenFile(Browser* browser) { @@ -183,8 +186,9 @@ PrefService* local_state = g_browser_process->local_state(); // May be null in unit tests. - if (local_state) + if (local_state) { return local_state->GetBoolean(prefs::kAllowFileSelectionDialogs); + } return true; } @@ -266,8 +270,9 @@ // trigger creating it. sessions::TabRestoreService* tab_restore_service = TabRestoreServiceFactory::GetForProfileIfExisting(profile()); - if (tab_restore_service) + if (tab_restore_service) { tab_restore_service->RemoveObserver(this); + } profile_pref_registrar_.RemoveAll(); local_pref_registrar_.RemoveAll(); browser_->tab_strip_model()->RemoveObserver(this); @@ -277,8 +282,9 @@ int command_id, const input::NativeWebKeyboardEvent& event) { // In Apps mode, no keys are reserved. - if (browser_->is_type_app() || browser_->is_type_app_popup()) + if (browser_->is_type_app() || browser_->is_type_app_popup()) { return false; + } #if BUILDFLAG(IS_CHROMEOS_ASH) // On Chrome OS, the top row of keys are mapped to browser actions like @@ -306,8 +312,9 @@ // the commands should be reserved for browser-side handling if the browser // window's toolbar is visible. if (window()->IsToolbarShowing()) { - if (command_id == IDC_FULLSCREEN) + if (command_id == IDC_FULLSCREEN) { return true; + } } else { return is_exit_fullscreen; } @@ -367,8 +374,9 @@ } void BrowserCommandController::FindBarVisibilityChanged() { - if (is_locked_fullscreen_) + if (is_locked_fullscreen_) { return; + } UpdateCloseFindOrStop(); } @@ -423,8 +431,9 @@ // tab. However, Ben says he tried removing this before and got lots of // crashes, e.g. from Windows sending WM_COMMANDs at random times during // window construction. This probably could use closer examination someday. - if (browser_->tab_strip_model()->active_index() == TabStripModel::kNoTab) + if (browser_->tab_strip_model()->active_index() == TabStripModel::kNoTab) { return true; + } DCHECK(command_updater_.IsCommandEnabled(id)) << "Invalid/disabled command " << id; @@ -729,10 +738,11 @@ FindPrevious(browser_); break; case IDC_CLOSE_FIND_OR_STOP: - if (CanCloseFind(browser_)) + if (CanCloseFind(browser_)) { CloseFind(browser_); - else if (IsCommandEnabled(IDC_STOP)) + } else if (IsCommandEnabled(IDC_STOP)) { ExecuteCommand(IDC_STOP); + } break; // Zoom @@ -752,8 +762,9 @@ FocusToolbar(browser_); break; case IDC_FOCUS_LOCATION: - if (!window()->IsLocationBarVisible()) + if (!window()->IsLocationBarVisible()) { break; + } base::RecordAction(base::UserMetricsAction("Accel_Focus_Location")); FocusLocationBar(browser_); break; @@ -1166,8 +1177,9 @@ } bool BrowserCommandController::UpdateCommandEnabled(int id, bool state) { - if (is_locked_fullscreen_) + if (is_locked_fullscreen_) { return false; + } return command_updater_.UpdateCommandEnabled(id, state); } @@ -1224,8 +1236,9 @@ // (like Back & Forward with initial page load) must have their state // initialized here, otherwise they will be forever disabled. - if (is_locked_fullscreen_) + if (is_locked_fullscreen_) { return; + } // Navigation commands const bool can_reload = CanReload(browser_); @@ -1524,8 +1537,9 @@ } void BrowserCommandController::UpdateCommandsForIncognitoAvailability() { - if (is_locked_fullscreen_) + if (is_locked_fullscreen_) { return; + } UpdateSharedCommandsForIncognitoAvailability(&command_updater_, profile()); // Update the new incognito window ActionItem enabled state. Note, this cannot @@ -1579,8 +1593,9 @@ content::WebContents* current_web_contents = browser_->tab_strip_model()->GetActiveWebContents(); - if (!current_web_contents) // May be NULL during tab restore. + if (!current_web_contents) { // May be NULL during tab restore. return; + } // Navigation commands command_updater_.UpdateCommandEnabled(IDC_BACK, CanGoBack(browser_)); @@ -1620,8 +1635,8 @@ command_updater_.UpdateCommandEnabled(IDC_INSTALL_PWA, can_create_web_app); #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) - command_updater_.UpdateCommandEnabled( - IDC_CREATE_SHORTCUT, shortcuts::CanCreateDesktopShortcut(browser_)); + command_updater_.UpdateCommandEnabled( + IDC_CREATE_SHORTCUT, shortcuts::CanCreateDesktopShortcut(browser_)); #else command_updater_.UpdateCommandEnabled(IDC_CREATE_SHORTCUT, can_create_web_app); @@ -1665,8 +1680,9 @@ void BrowserCommandController::UpdateCommandsForZoomState() { content::WebContents* contents = browser_->tab_strip_model()->GetActiveWebContents(); - if (!contents) + if (!contents) { return; + } command_updater_.UpdateCommandEnabled(IDC_ZOOM_PLUS, CanZoomIn(contents)); command_updater_.UpdateCommandEnabled(IDC_ZOOM_NORMAL, CanResetZoom(contents)); @@ -1687,8 +1703,9 @@ } void BrowserCommandController::UpdateCommandsForDevTools() { - if (is_locked_fullscreen_) + if (is_locked_fullscreen_) { return; + } bool dev_tools_enabled = DevToolsWindow::AllowDevToolsFor( profile(), browser_->tab_strip_model()->GetActiveWebContents()); @@ -1709,8 +1726,9 @@ } void BrowserCommandController::UpdateCommandsForBookmarkEditing() { - if (is_locked_fullscreen_) + if (is_locked_fullscreen_) { return; + } command_updater_.UpdateCommandEnabled(IDC_BOOKMARK_THIS_TAB, CanBookmarkCurrentTab(browser_)); @@ -1719,8 +1737,9 @@ } void BrowserCommandController::UpdateCommandsForBookmarkBar() { - if (is_locked_fullscreen_) + if (is_locked_fullscreen_) { return; + } command_updater_.UpdateCommandEnabled( IDC_SHOW_BOOKMARK_BAR, browser_defaults::bookmarks_enabled && @@ -1732,16 +1751,18 @@ } void BrowserCommandController::UpdateCommandsForFileSelectionDialogs() { - if (is_locked_fullscreen_) + if (is_locked_fullscreen_) { return; + } UpdateSaveAsState(); command_updater_.UpdateCommandEnabled(IDC_OPEN_FILE, CanOpenFile(browser_)); } void BrowserCommandController::UpdateCommandsForFullscreenMode() { - if (is_locked_fullscreen_) + if (is_locked_fullscreen_) { return; + } const bool is_fullscreen = window() && window()->IsFullscreen(); const bool show_main_ui = IsShowingMainUI(); @@ -1797,8 +1818,9 @@ command_updater_.UpdateCommandEnabled(IDC_SHOW_APP_MENU, show_main_ui); command_updater_.UpdateCommandEnabled(IDC_SHOW_MANAGEMENT_PAGE, true); - if (base::debug::IsProfilingSupported()) + if (base::debug::IsProfilingSupported()) { command_updater_.UpdateCommandEnabled(IDC_PROFILING_ENABLED, show_main_ui); + } #if !BUILDFLAG(IS_MAC) // Disable toggling into fullscreen mode if disallowed by pref. @@ -1821,8 +1843,9 @@ void BrowserCommandController::UpdateCommandsForHostedAppAvailability() { bool has_toolbar = browser_->is_type_normal() || web_app::AppBrowserController::IsWebApp(browser_); - if (window() && window()->ShouldHideUIForFullscreen()) + if (window() && window()->ShouldHideUIForFullscreen()) { has_toolbar = false; + } command_updater_.UpdateCommandEnabled(IDC_FOCUS_TOOLBAR, has_toolbar); command_updater_.UpdateCommandEnabled(IDC_FOCUS_NEXT_PANE, has_toolbar); command_updater_.UpdateCommandEnabled(IDC_FOCUS_PREVIOUS_PANE, has_toolbar); @@ -1855,8 +1878,9 @@ platform_util::IsBrowserLockedFullscreen(browser_); // Sanity check to make sure this function is called only on state change. DCHECK_NE(is_locked_fullscreen, is_locked_fullscreen_); - if (is_locked_fullscreen == is_locked_fullscreen_) + if (is_locked_fullscreen == is_locked_fullscreen_) { return; + } is_locked_fullscreen_ = is_locked_fullscreen; if (is_locked_fullscreen_) { @@ -1890,8 +1914,9 @@ #endif void BrowserCommandController::UpdatePrintingState() { - if (is_locked_fullscreen_) + if (is_locked_fullscreen_) { return; + } UpdateCommandAndActionEnabled(IDC_PRINT, kActionPrint, CanPrint(browser_)); #if BUILDFLAG(ENABLE_PRINTING) @@ -1901,16 +1926,18 @@ } void BrowserCommandController::UpdateSaveAsState() { - if (is_locked_fullscreen_) + if (is_locked_fullscreen_) { return; + } command_updater_.UpdateCommandEnabled(IDC_SAVE_PAGE, CanSavePage(browser_)); } void BrowserCommandController::UpdateReloadStopState(bool is_loading, bool force) { - if (is_locked_fullscreen_) + if (is_locked_fullscreen_) { return; + } window()->UpdateReloadStopState(is_loading, force); command_updater_.UpdateCommandEnabled(IDC_STOP, is_loading); @@ -1918,8 +1945,9 @@ } void BrowserCommandController::UpdateTabRestoreCommandState() { - if (is_locked_fullscreen_) + if (is_locked_fullscreen_) { return; + } sessions::TabRestoreService* tab_restore_service = TabRestoreServiceFactory::GetForProfile(profile()); @@ -1950,8 +1978,9 @@ } void BrowserCommandController::UpdateCommandsForMediaRouter() { - if (is_locked_fullscreen_) + if (is_locked_fullscreen_) { return; + } UpdateCommandAndActionEnabled(IDC_ROUTE_MEDIA, kActionRouteMedia, CanRouteMedia(browser_));
diff --git a/chrome/browser/ui/browser_command_controller_browsertest.cc b/chrome/browser/ui/browser_command_controller_browsertest.cc index dc70ad4..d031cb9f 100644 --- a/chrome/browser/ui/browser_command_controller_browsertest.cc +++ b/chrome/browser/ui/browser_command_controller_browsertest.cc
@@ -462,7 +462,8 @@ content::WebContents* web_contents = browser()->tab_strip_model()->GetActiveWebContents(); if (!features::IsToolbarPinningEnabled()) { - ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), GURL("chrome://new-tab-page/"))); + ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), + GURL("chrome://new-tab-page/"))); } content::WaitForLoadStop(web_contents); EXPECT_TRUE( @@ -478,7 +479,8 @@ content::WebContents* web_contents = browser()->tab_strip_model()->GetActiveWebContents(); if (!features::IsToolbarPinningEnabled()) { - ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), GURL("chrome://new-tab-page/"))); + ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), + GURL("chrome://new-tab-page/"))); } content::WaitForLoadStop(web_contents); EXPECT_TRUE(
diff --git a/chrome/browser/ui/browser_command_controller_unittest.cc b/chrome/browser/ui/browser_command_controller_unittest.cc index 78b7ed4c..20be64b 100644 --- a/chrome/browser/ui/browser_command_controller_unittest.cc +++ b/chrome/browser/ui/browser_command_controller_unittest.cc
@@ -227,8 +227,9 @@ } TEST_F(BrowserCommandControllerTest, AvatarAcceleratorEnabledOnDesktop) { - if (!profiles::IsMultipleProfilesEnabled()) + if (!profiles::IsMultipleProfilesEnabled()) { return; + } TestingProfileManager* testing_profile_manager = profile_manager(); ProfileManager* profile_manager = testing_profile_manager->profile_manager();
diff --git a/chrome/browser/ui/browser_commands.h b/chrome/browser/ui/browser_commands.h index 263299c..66e38536 100644 --- a/chrome/browser/ui/browser_commands.h +++ b/chrome/browser/ui/browser_commands.h
@@ -30,7 +30,7 @@ namespace content { class NavigationHandle; class WebContents; -} +} // namespace content namespace chrome {
diff --git a/chrome/browser/ui/browser_commands_browsertest.cc b/chrome/browser/ui/browser_commands_browsertest.cc index 5e8628e..c070b34 100644 --- a/chrome/browser/ui/browser_commands_browsertest.cc +++ b/chrome/browser/ui/browser_commands_browsertest.cc
@@ -147,18 +147,21 @@ watcher_vec[i].SetWebContents(tab); } - for (ReloadObserver& watcher : watcher_vec) + for (ReloadObserver& watcher : watcher_vec) { EXPECT_EQ(0, watcher.load_count()); + } // Add two tabs to the selection (the last one created remains selected) and // trigger a reload command on all of them. - for (int i = 0; i < kTabCount - 1; i++) + for (int i = 0; i < kTabCount - 1; i++) { browser()->tab_strip_model()->ToggleSelectionAt(i + 1); + } EXPECT_TRUE(chrome::ExecuteCommand(browser(), IDC_RELOAD)); int load_sum = 0; - for (ReloadObserver& watcher : watcher_vec) + for (ReloadObserver& watcher : watcher_vec) { load_sum += watcher.load_count(); + } EXPECT_EQ(kTabCount, load_sum); } @@ -222,8 +225,9 @@ IN_PROC_BROWSER_TEST_F(BrowserCommandsTest, MoveTabsToNewWindow) { auto AddTabs = [](Browser* browser, unsigned int num_tabs) { - for (unsigned int i = 0; i < num_tabs; ++i) + for (unsigned int i = 0; i < num_tabs; ++i) { chrome::NewTab(browser); + } }; // Single Tab Move to New Window. @@ -255,8 +259,9 @@ IN_PROC_BROWSER_TEST_F(BrowserCommandsTest, MoveToExistingWindow) { auto AddTabs = [](Browser* browser, unsigned int num_tabs) { - for (unsigned int i = 0; i < num_tabs; ++i) + for (unsigned int i = 0; i < num_tabs; ++i) { chrome::NewTab(browser); + } }; // Create another window, and add tabs.
diff --git a/chrome/browser/ui/browser_commands_mac.mm b/chrome/browser/ui/browser_commands_mac.mm index f45ab5ba..a987f826 100644 --- a/chrome/browser/ui/browser_commands_mac.mm +++ b/chrome/browser/ui/browser_commands_mac.mm
@@ -4,9 +4,8 @@ #include "chrome/browser/ui/browser_commands_mac.h" -#include <unistd.h> - #import <Cocoa/Cocoa.h> +#include <unistd.h> #include "base/logging.h" #include "chrome/browser/profiles/profile.h" @@ -46,8 +45,9 @@ void ToggleJavaScriptFromAppleEventsAllowed(Browser* browser) { CGEventRef cg_event = NSApp.currentEvent.CGEvent; - if (!cg_event) + if (!cg_event) { return; + } // If the event is from another process, do not allow it to toggle this // secure setting.
diff --git a/chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc b/chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc index b2665d7..112c9a6 100644 --- a/chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc +++ b/chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc
@@ -43,12 +43,13 @@ void BrowserContentSettingBubbleModelDelegate::ShowContentSettingsPage( ContentSettingsType type) { - if (type == ContentSettingsType::PROTOCOL_HANDLERS) + if (type == ContentSettingsType::PROTOCOL_HANDLERS) { chrome::ShowSettingsSubPage(browser_, chrome::kHandlerSettingsSubPage); - else if (type == ContentSettingsType::COOKIES) + } else if (type == ContentSettingsType::COOKIES) { chrome::ShowSettingsSubPage(browser_, chrome::kCookieSettingsSubPage); - else + } else { chrome::ShowContentSettingsExceptions(browser_, type); + } } void BrowserContentSettingBubbleModelDelegate::ShowLearnMorePage(
diff --git a/chrome/browser/ui/browser_finder.cc b/chrome/browser/ui/browser_finder.cc index d1587ec..220614c 100644 --- a/chrome/browser/ui/browser_finder.cc +++ b/chrome/browser/ui/browser_finder.cc
@@ -125,8 +125,9 @@ return false; } - if ((match_types & kMatchNormal) && !browser->is_type_normal()) + if ((match_types & kMatchNormal) && !browser->is_type_normal()) { return false; + } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) // Note that |browser->window()| might be nullptr in tests. @@ -166,8 +167,9 @@ uint32_t match_types, int64_t display_id = display::kInvalidDisplayId) { for (T i = begin; i != end; ++i) { - if (BrowserMatches(*i, profile, window_feature, match_types, display_id)) + if (BrowserMatches(*i, profile, window_feature, match_types, display_id)) { return *i; + } } return nullptr; } @@ -180,18 +182,23 @@ bool match_not_closing, int64_t display_id = display::kInvalidDisplayId) { BrowserList* browser_list_impl = BrowserList::GetInstance(); - if (!browser_list_impl) + if (!browser_list_impl) { return nullptr; + } uint32_t match_types = kMatchAny; - if (match_tabbed) + if (match_tabbed) { match_types |= kMatchNormal; - if (match_original_profiles) + } + if (match_original_profiles) { match_types |= kMatchOriginalProfile; - if (display_id != display::kInvalidDisplayId) + } + if (display_id != display::kInvalidDisplayId) { match_types |= kMatchDisplayId; + } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) - if (match_current_workspace) + if (match_current_workspace) { match_types |= kMatchCurrentWorkspace; + } #endif if (match_not_closing) { match_types |= kMatchNotClosing; @@ -217,8 +224,9 @@ for (auto i = browser_list_impl->begin(); i != browser_list_impl->end(); ++i) { if (BrowserMatches(*i, profile, Browser::FEATURE_NONE, match_types, - display_id)) + display_id)) { count++; + } } } return count; @@ -254,8 +262,9 @@ std::vector<Browser*> browsers; for (Browser* browser : *BrowserList::GetInstance()) { if (BrowserMatches(browser, profile, Browser::FEATURE_NONE, kMatchNormal, - display::kInvalidDisplayId)) + display::kInvalidDisplayId)) { browsers.emplace_back(browser); + } } return browsers; } @@ -273,18 +282,21 @@ Browser* FindBrowserWithID(SessionID desired_id) { for (Browser* browser : *BrowserList::GetInstance()) { - if (browser->session_id() == desired_id) + if (browser->session_id() == desired_id) { return browser; + } } return nullptr; } Browser* FindBrowserWithWindow(gfx::NativeWindow window) { - if (!window) + if (!window) { return nullptr; + } for (Browser* browser : *BrowserList::GetInstance()) { - if (browser->window() && browser->window()->GetNativeWindow() == window) + if (browser->window() && browser->window()->GetNativeWindow() == window) { return browser; + } } return nullptr; }
diff --git a/chrome/browser/ui/browser_finder_chromeos_unittest.cc b/chrome/browser/ui/browser_finder_chromeos_unittest.cc index 3198b96..5b30025 100644 --- a/chrome/browser/ui/browser_finder_chromeos_unittest.cc +++ b/chrome/browser/ui/browser_finder_chromeos_unittest.cc
@@ -34,8 +34,9 @@ delete; ash::MultiUserWindowManager* GetMultiUserWindowManager() { - if (!MultiUserWindowManagerHelper::GetInstance()) + if (!MultiUserWindowManagerHelper::GetInstance()) { MultiUserWindowManagerHelper::CreateInstanceForTest(test_account_id1_); + } return MultiUserWindowManagerHelper::GetWindowManager(); }
diff --git a/chrome/browser/ui/browser_instant_controller.cc b/chrome/browser/ui/browser_instant_controller.cc index b692e80..a10a3b7 100644 --- a/chrome/browser/ui/browser_instant_controller.cc +++ b/chrome/browser/ui/browser_instant_controller.cc
@@ -49,8 +49,9 @@ int count = tab_model->count(); for (int index = 0; index < count; ++index) { content::WebContents* contents = tab_model->GetWebContentsAt(index); - if (!contents) + if (!contents) { continue; + } GURL site_url = contents->GetPrimaryMainFrame()->GetSiteInstance()->GetSiteURL(); @@ -67,8 +68,9 @@ } } - if (!is_ntp) + if (!is_ntp) { continue; + } // When default search engine is changed navigate to chrome://newtab which // will redirect to the new tab page associated with the search engine.
diff --git a/chrome/browser/ui/browser_instant_controller_unittest.cc b/chrome/browser/ui/browser_instant_controller_unittest.cc index 89dbb0aa..6fc266e 100644 --- a/chrome/browser/ui/browser_instant_controller_unittest.cc +++ b/chrome/browser/ui/browser_instant_controller_unittest.cc
@@ -73,10 +73,12 @@ num_reloads_(0) {} void DidStartNavigation(content::NavigationHandle* navigation) override { - if (navigation->GetReloadType() == content::ReloadType::NONE) + if (navigation->GetReloadType() == content::ReloadType::NONE) { return; - if (*url_ == navigation->GetURL()) + } + if (*url_ == navigation->GetURL()) { num_reloads_++; + } current_url_ = navigation->GetURL(); }
diff --git a/chrome/browser/ui/browser_list.cc b/chrome/browser/ui/browser_list.cc index 4b7e0d3..15baaac 100644 --- a/chrome/browser/ui/browser_list.cc +++ b/chrome/browser/ui/browser_list.cc
@@ -65,16 +65,18 @@ // BrowserList, public: Browser* BrowserList::GetLastActive() const { - if (!browsers_ordered_by_activation_.empty()) + if (!browsers_ordered_by_activation_.empty()) { return *(browsers_ordered_by_activation_.rbegin()); + } return nullptr; } // static BrowserList* BrowserList::GetInstance() { BrowserList** list = &instance_; - if (!*list) + if (!*list) { *list = new BrowserList; + } return *list; } @@ -87,8 +89,9 @@ browser->RegisterKeepAlive(); - for (BrowserListObserver& observer : observers_.Get()) + for (BrowserListObserver& observer : observers_.Get()) { observer.OnBrowserAdded(browser); + } AddBrowserToActiveList(browser); @@ -111,8 +114,9 @@ RemoveBrowserFrom(browser, &browser_list->browsers_); - for (BrowserListObserver& observer : observers_.Get()) + for (BrowserListObserver& observer : observers_.Get()) { observer.OnBrowserRemoved(browser); + } browser->UnregisterKeepAlive(); @@ -161,8 +165,9 @@ BrowserVector browsers_to_close; for (Browser* browser : *BrowserList::GetInstance()) { if (browser->profile()->GetOriginalProfile() == - profile->GetOriginalProfile()) + profile->GetOriginalProfile()) { browsers_to_close.push_back(browser); + } } for (BrowserVector::const_iterator it = browsers_to_close.begin(); @@ -222,8 +227,9 @@ } } - if (on_close_success) + if (on_close_success) { on_close_success.Run(profile_path); + } for (auto& weak_b : browsers_to_close) { // BeforeUnload handlers may close browser windows, so we need to explicitly @@ -259,8 +265,9 @@ weak_browser->ResetTryToCloseWindow(); } } - if (on_close_aborted) + if (on_close_aborted) { on_close_aborted.Run(profile_path); + } } } @@ -291,8 +298,9 @@ Browser* new_last_active = instance->GetLastActive(); if (old_last_active != new_last_active) { - for (BrowserListObserver& observer : observers_.Get()) + for (BrowserListObserver& observer : observers_.Get()) { observer.OnBrowserSetLastActive(new_last_active); + } } } @@ -310,8 +318,9 @@ RemoveBrowserFrom(browser, &instance->browsers_ordered_by_activation_); instance->browsers_ordered_by_activation_.push_back(browser); - for (BrowserListObserver& observer : observers_.Get()) + for (BrowserListObserver& observer : observers_.Get()) { observer.OnBrowserSetLastActive(browser); + } } // static @@ -323,8 +332,9 @@ DCHECK(browser->window()) << "NotifyBrowserNoLongerActive called for a browser with no window set."; - for (BrowserListObserver& observer : observers_.Get()) + for (BrowserListObserver& observer : observers_.Get()) { observer.OnBrowserNoLongerActive(browser); + } } // static @@ -339,15 +349,17 @@ void BrowserList::NotifyBrowserCloseStarted(Browser* browser) { GetInstance()->currently_closing_browsers_.insert(browser); - for (BrowserListObserver& observer : observers_.Get()) + for (BrowserListObserver& observer : observers_.Get()) { observer.OnBrowserClosing(browser); + } } // static bool BrowserList::IsOffTheRecordBrowserActive() { for (Browser* browser : *BrowserList::GetInstance()) { - if (browser->profile()->IsOffTheRecord()) + if (browser->profile()->IsOffTheRecord()) { return true; + } } return false; } @@ -398,6 +410,7 @@ void BrowserList::RemoveBrowserFrom(Browser* browser, BrowserVector* browser_list) { auto remove_browser = base::ranges::find(*browser_list, browser); - if (remove_browser != browser_list->end()) + if (remove_browser != browser_list->end()) { browser_list->erase(remove_browser); + } }
diff --git a/chrome/browser/ui/browser_navigator_browsertest.cc b/chrome/browser/ui/browser_navigator_browsertest.cc index 82d7d55..da364162 100644 --- a/chrome/browser/ui/browser_navigator_browsertest.cc +++ b/chrome/browser/ui/browser_navigator_browsertest.cc
@@ -166,8 +166,9 @@ base::as_byte_span(post_data)); ui_test_utils::NavigateToURL(¶m); - if (!param.navigated_or_inserted_contents) + if (!param.navigated_or_inserted_contents) { return false; + } // Navigate() should have opened the contents in new foreground tab in the // current Browser. @@ -313,10 +314,11 @@ std::optional<content::CreateAndLoadWebContentsObserver> new_tab_observer; std::optional<content::LoadStopObserver> load_stop_observer; if (wait_for_navigation) { - if (expected_contents) + if (expected_contents) { load_stop_observer.emplace(expected_contents); - else + } else { new_tab_observer.emplace(); + } } NavigateParams params(MakeNavigateParams(browser)); @@ -325,10 +327,12 @@ params.window_action = NavigateParams::SHOW_WINDOW; Navigate(¶ms); - if (load_stop_observer) + if (load_stop_observer) { load_stop_observer->Wait(); - if (new_tab_observer) + } + if (new_tab_observer) { new_tab_observer->Wait(); + } return params.browser; }
diff --git a/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc b/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc index 9e49685..d66f07d3 100644 --- a/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc +++ b/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc
@@ -2,12 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/browser_navigator_browsertest.h" + #include "base/command_line.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_navigator.h" -#include "chrome/browser/ui/browser_navigator_browsertest.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_switches.h"
diff --git a/chrome/browser/ui/browser_otr_state_android.cc b/chrome/browser/ui/browser_otr_state_android.cc index f648f56e..8b695cad 100644 --- a/chrome/browser/ui/browser_otr_state_android.cc +++ b/chrome/browser/ui/browser_otr_state_android.cc
@@ -2,9 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/android/tab_model/tab_model_list.h" #include "chrome/browser/ui/browser_otr_state.h" +#include "chrome/browser/ui/android/tab_model/tab_model_list.h" + bool IsOffTheRecordSessionActive() { return TabModelList::IsOffTheRecordSessionActive(); }
diff --git a/chrome/browser/ui/browser_tab_menu_model_delegate.h b/chrome/browser/ui/browser_tab_menu_model_delegate.h index 552aa24..35695fbc 100644 --- a/chrome/browser/ui/browser_tab_menu_model_delegate.h +++ b/chrome/browser/ui/browser_tab_menu_model_delegate.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_BROWSER_TAB_MENU_MODEL_DELEGATE_H_ #include <vector> + #include "base/memory/raw_ptr.h" #include "chrome/browser/ui/tabs/tab_menu_model_delegate.h"
diff --git a/chrome/browser/ui/browser_tab_restorer.cc b/chrome/browser/ui/browser_tab_restorer.cc index f51e184a..8e22e33 100644 --- a/chrome/browser/ui/browser_tab_restorer.cc +++ b/chrome/browser/ui/browser_tab_restorer.cc
@@ -62,8 +62,9 @@ // static void BrowserTabRestorer::CreateIfNecessary(Browser* browser) { DCHECK(browser); - if (browser->profile()->GetUserData(kBrowserTabRestorerKey)) + if (browser->profile()->GetUserData(kBrowserTabRestorerKey)) { return; // Only allow one restore for a given profile at a time. + } // BrowserTabRestorer is deleted at the appropriate time. new BrowserTabRestorer(browser);
diff --git a/chrome/browser/ui/browser_tab_strip_model_delegate.cc b/chrome/browser/ui/browser_tab_strip_model_delegate.cc index b9723d9..87edf78 100644 --- a/chrome/browser/ui/browser_tab_strip_model_delegate.cc +++ b/chrome/browser/ui/browser_tab_strip_model_delegate.cc
@@ -88,8 +88,9 @@ // Enforce that there is an active tab in the strip at all times by forcing // the first web contents to be marked as active. - if (i == 0) + if (i == 0) { item.add_types |= AddTabTypes::ADD_ACTIVE; + } content::WebContents* const raw_web_contents = item.tab.get()->GetContents(); @@ -157,15 +158,17 @@ void BrowserTabStripModelDelegate::MoveGroupToNewWindow( const tab_groups::TabGroupId& group) { TabGroupModel* group_model = browser_->tab_strip_model()->group_model(); - if (!group_model) + if (!group_model) { return; + } gfx::Range range = group_model->GetTabGroup(group)->ListTabs(); std::vector<int> indices; indices.reserve(range.length()); - for (auto i = range.start(); i < range.end(); ++i) + for (auto i = range.start(); i < range.end(); ++i) { indices.push_back(i); + } // chrome:: to disambiguate the free function from // BrowserTabStripModelDelegate::MoveTabsToNewWindow(). @@ -174,8 +177,9 @@ std::optional<SessionID> BrowserTabStripModelDelegate::CreateHistoricalTab( content::WebContents* contents) { - if (!BrowserSupportsHistoricalEntries()) + if (!BrowserSupportsHistoricalEntries()) { return std::nullopt; + } sessions::TabRestoreService* service = TabRestoreServiceFactory::GetForProfile(browser_->profile()); @@ -191,8 +195,9 @@ void BrowserTabStripModelDelegate::CreateHistoricalGroup( const tab_groups::TabGroupId& group) { - if (!BrowserSupportsHistoricalEntries()) + if (!BrowserSupportsHistoricalEntries()) { return; + } sessions::TabRestoreService* service = TabRestoreServiceFactory::GetForProfile(browser_->profile()); @@ -256,8 +261,9 @@ const tab_groups::TabGroupId& group) { sessions::TabRestoreService* service = TabRestoreServiceFactory::GetForProfile(browser_->profile()); - if (service) + if (service) { service->GroupCloseStopped(group); + } } bool BrowserTabStripModelDelegate::RunUnloadListenerBeforeClosing( @@ -277,8 +283,9 @@ security_interstitial_tab_helper = security_interstitials:: SecurityInterstitialTabHelper::FromWebContents(contents); if (security_interstitial_tab_helper && - security_interstitial_tab_helper->IsDisplayingInterstitial()) + security_interstitial_tab_helper->IsDisplayingInterstitial()) { return false; + } return browser_->ShouldDisplayFavicon(contents); } @@ -291,8 +298,9 @@ content::WebContents* web_contents) { ReadingListModel* model = ReadingListModelFactory::GetForBrowserContext(browser_->profile()); - if (!model || !model->loaded()) + if (!model || !model->loaded()) { return; + } chrome::MoveTabToReadLater(browser_, web_contents); }
diff --git a/chrome/browser/ui/browser_tab_strip_tracker.cc b/chrome/browser/ui/browser_tab_strip_tracker.cc index d8529af..e40cfbad 100644 --- a/chrome/browser/ui/browser_tab_strip_tracker.cc +++ b/chrome/browser/ui/browser_tab_strip_tracker.cc
@@ -43,8 +43,9 @@ } void BrowserTabStripTracker::MaybeTrackBrowser(Browser* browser) { - if (!ShouldTrackBrowser(browser)) + if (!ShouldTrackBrowser(browser)) { return; + } TabStripModel* tab_strip_model = browser->tab_strip_model(); tab_strip_model->AddObserver(tab_strip_model_observer_);
diff --git a/chrome/browser/ui/browser_tabrestore.h b/chrome/browser/ui/browser_tabrestore.h index b43269c..3b05dde 100644 --- a/chrome/browser/ui/browser_tabrestore.h +++ b/chrome/browser/ui/browser_tabrestore.h
@@ -22,7 +22,7 @@ namespace sessions { class SerializedNavigationEntry; struct SerializedUserAgentOverride; -} +} // namespace sessions namespace chrome {
diff --git a/chrome/browser/ui/browser_tabstrip.cc b/chrome/browser/ui/browser_tabstrip.cc index 1f84235..f12ba73 100644 --- a/chrome/browser/ui/browser_tabstrip.cc +++ b/chrome/browser/ui/browser_tabstrip.cc
@@ -43,8 +43,9 @@ params.pwa_navigation_capturing_force_off = true; Navigate(¶ms); - if (!params.navigated_or_inserted_contents) + if (!params.navigated_or_inserted_contents) { return nullptr; + } CoreTabHelper* core_tab_helper = CoreTabHelper::FromWebContents(params.navigated_or_inserted_contents); @@ -117,8 +118,9 @@ } void ConfigureTabGroupForNavigation(NavigateParams* nav_params) { - if (!nav_params->source_contents) + if (!nav_params->source_contents) { return; + } if (!nav_params->browser || !nav_params->browser->SupportsWindowFeature( Browser::WindowFeature::FEATURE_TABSTRIP)) { @@ -134,8 +136,9 @@ // If the source tab is not in the current tab strip (e.g. if the current // navigation is in a new window), don't set the group. Groups cannot be // shared across multiple windows. - if (source_index == TabStripModel::kNoTab) + if (source_index == TabStripModel::kNoTab) { return; + } // Do not set the group when the navigation is from bookmarks. if (ui::PageTransitionCoreTypeIs(nav_params->transition,
diff --git a/chrome/browser/ui/browser_window.h b/chrome/browser/ui/browser_window.h index 0845ec4..04680e4 100644 --- a/chrome/browser/ui/browser_window.h +++ b/chrome/browser/ui/browser_window.h
@@ -93,7 +93,7 @@ class ColorProvider; class NativeTheme; class ThemeProvider; -} +} // namespace ui namespace views { class Button;
diff --git a/chrome/browser/ui/browser_window/BUILD.gn b/chrome/browser/ui/browser_window/BUILD.gn index e106205..21c9c1b 100644 --- a/chrome/browser/ui/browser_window/BUILD.gn +++ b/chrome/browser/ui/browser_window/BUILD.gn
@@ -4,6 +4,8 @@ assert(is_win || is_mac || is_linux || is_chromeos) +import("//chrome/common/features.gni") + # This is the public interface for a browser window. Most features in # //chrome/browser depend on this interface, and thus to prevent circular # dependencies this interface should not depend on anything else in //chrome. @@ -15,6 +17,7 @@ ] public_deps = [ "//base", + "//chrome/common:buildflags", "//content/public/browser", "//ui/base:types", ] @@ -44,4 +47,11 @@ "//components/profile_metrics", "//components/saved_tab_groups/public", ] + + if (enable_glic) { + deps += [ + "//chrome/browser/glic", + "//chrome/browser/glic:enabling", + ] + } }
diff --git a/chrome/browser/ui/browser_window/browser_window_features.cc b/chrome/browser/ui/browser_window/browser_window_features.cc index 7b6cc64..733caa7 100644 --- a/chrome/browser/ui/browser_window/browser_window_features.cc +++ b/chrome/browser/ui/browser_window/browser_window_features.cc
@@ -47,6 +47,11 @@ #include "components/profile_metrics/browser_profile_type.h" #include "components/saved_tab_groups/public/features.h" +#if BUILDFLAG(ENABLE_GLIC) +#include "chrome/browser/glic/glic_enabling.h" +#include "chrome/browser/glic/glic_tab_indicator_helper.h" +#endif + namespace { // This is the generic entry point for test code to stub out browser window @@ -117,6 +122,13 @@ tab_declutter_controller_ = std::make_unique<tabs::TabDeclutterController>(browser); } + +#if BUILDFLAG(ENABLE_GLIC) + if (GlicEnabling::IsEnabledByFlags()) { + glic_tab_indicator_helper_ = + std::make_unique<glic::GlicTabIndicatorHelper>(browser); + } +#endif // BUILDFLAG(ENABLE_GLIC) } // The LensOverlayEntryPointController is constructed for all browser types @@ -217,7 +229,8 @@ if (media_router::MediaRouterEnabled(browser_view->browser()->profile())) { cast_browser_controller_ = - std::make_unique<media_router::CastBrowserController>(browser_view->browser()); + std::make_unique<media_router::CastBrowserController>( + browser_view->browser()); } } }
diff --git a/chrome/browser/ui/browser_window/public/browser_window_features.h b/chrome/browser/ui/browser_window/public/browser_window_features.h index 4624d19..573a6524 100644 --- a/chrome/browser/ui/browser_window/public/browser_window_features.h +++ b/chrome/browser/ui/browser_window/public/browser_window_features.h
@@ -8,6 +8,7 @@ #include <memory> #include "base/functional/callback.h" +#include "chrome/common/buildflags.h" class Browser; class BrowserView; @@ -34,6 +35,12 @@ class ProductSpecificationsEntryPointController; } // namespace commerce +#if BUILDFLAG(ENABLE_GLIC) +namespace glic { +class GlicTabIndicatorHelper; +} +#endif + namespace lens { class LensOverlayEntryPointController; } // namespace lens @@ -191,8 +198,11 @@ std::unique_ptr<DataSharingOpenGroupHelper> data_sharing_open_group_helper_; - std::unique_ptr<media_router::CastBrowserController> - cast_browser_controller_; + std::unique_ptr<media_router::CastBrowserController> cast_browser_controller_; + +#if BUILDFLAG(ENABLE_GLIC) + std::unique_ptr<glic::GlicTabIndicatorHelper> glic_tab_indicator_helper_; +#endif }; #endif // CHROME_BROWSER_UI_BROWSER_WINDOW_PUBLIC_BROWSER_WINDOW_FEATURES_H_
diff --git a/chrome/browser/ui/browser_window_state.cc b/chrome/browser/ui/browser_window_state.cc index 1581cc4..8e45cea2 100644 --- a/chrome/browser/ui/browser_window_state.cc +++ b/chrome/browser/ui/browser_window_state.cc
@@ -87,8 +87,9 @@ std::make_unique<ScopedDictPrefUpdate>(prefs, prefs::kAppWindowPlacement); base::Value::Dict* this_app_dict = (*scoped_update)->FindDictByDottedPath(window_name); - if (this_app_dict) + if (this_app_dict) { return *this_app_dict; + } return (*scoped_update) ->SetByDottedPath(window_name, base::Value::Dict()) ->GetDict(); @@ -98,8 +99,9 @@ const std::string& window_name, PrefService* prefs) { DCHECK(!window_name.empty()); - if (prefs->FindPreference(window_name)) + if (prefs->FindPreference(window_name)) { return &prefs->GetDict(window_name); + } const base::Value::Dict& app_windows = prefs->GetDict(prefs::kAppWindowPlacement); @@ -130,14 +132,16 @@ // the session service. This function gets called during initial window // showing, and we don't want to bring in the session service this early. SessionServiceBase* service = GetAppropriateSessionServiceIfExisting(browser); - if (service) + if (service) { service->SetWindowBounds(browser->session_id(), bounds, show_state); + } } void SaveWindowWorkspace(const Browser* browser, const std::string& workspace) { SessionServiceBase* service = GetAppropriateSessionServiceIfExisting(browser); - if (service) + if (service) { service->SetWindowWorkspace(browser->session_id(), workspace); + } } void SaveWindowVisibleOnAllWorkspaces(const Browser* browser,
diff --git a/chrome/browser/ui/certificate_dialogs.cc b/chrome/browser/ui/certificate_dialogs.cc index 2ef34f6e..691bda4 100644 --- a/chrome/browser/ui/certificate_dialogs.cc +++ b/chrome/browser/ui/certificate_dialogs.cc
@@ -159,8 +159,9 @@ Exporter::~Exporter() { // There may be pending file dialogs, we need to tell them that we've gone // away so they don't try and call back to us. - if (select_file_dialog_) + if (select_file_dialog_) { select_file_dialog_->ListenerDestroyed(); + } } void Exporter::FileSelected(const ui::SelectedFileInfo& file, int index) { @@ -174,8 +175,9 @@ switch (index - 1) { case kBase64Chain: - for (const auto& cert : cert_chain_list_) + for (const auto& cert : cert_chain_list_) { data += GetBase64String(cert.get()); + } break; case kDer: data = std::string( @@ -210,8 +212,9 @@ size_t size_hint = 64; bssl::UniquePtr<STACK_OF(CRYPTO_BUFFER)> stack(sk_CRYPTO_BUFFER_new_null()); for (size_t i = start; i < end; ++i) { - if (!bssl::PushToStack(stack.get(), bssl::UpRef(cert_chain_list_[i]))) + if (!bssl::PushToStack(stack.get(), bssl::UpRef(cert_chain_list_[i]))) { return std::string(); + } size_hint += CRYPTO_BUFFER_len(cert_chain_list_[i].get()); } bssl::ScopedCBB cbb;
diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc index a3d5971..ff0885e 100644 --- a/chrome/browser/ui/chrome_pages.cc +++ b/chrome/browser/ui/chrome_pages.cc
@@ -101,8 +101,9 @@ void FocusWebContents(Browser* browser) { auto* const contents = browser->tab_strip_model()->GetActiveWebContents(); - if (contents) + if (contents) { contents->Focus(); + } } // Shows |url| in a tab in |browser|. If a tab is already open to |url|, @@ -348,8 +349,9 @@ void ShowDownloads(Browser* browser) { base::RecordAction(UserMetricsAction("ShowDownloads")); - if (browser->window() && browser->window()->IsDownloadShelfVisible()) + if (browser->window() && browser->window()->IsDownloadShelfVisible()) { browser->window()->GetDownloadShelf()->Close(); + } ShowSingletonTabOverwritingNTP(browser, GURL(kChromeUIDownloadsURL)); } @@ -410,14 +412,17 @@ bool IsTrustedPopupWindowWithScheme(const Browser* browser, const std::string& scheme) { - if (browser->is_type_normal() || !browser->is_trusted_source()) + if (browser->is_type_normal() || !browser->is_trusted_source()) { return false; - if (scheme.empty()) // Any trusted popup window + } + if (scheme.empty()) { // Any trusted popup window return true; + } content::WebContents* web_contents = browser->tab_strip_model()->GetWebContentsAt(0); - if (!web_contents) + if (!web_contents) { return false; + } GURL url(web_contents->GetURL()); return url.SchemeIs(scheme); } @@ -442,8 +447,9 @@ DCHECK(!chromeos::settings::IsOSSettingsSubPage(sub_page)) << sub_page; #endif Browser* browser = chrome::FindTabbedBrowser(profile, false); - if (!browser) + if (!browser) { browser = Browser::Create(Browser::CreateParams(profile, true)); + } ShowSettingsSubPageInTabbedBrowser(browser, sub_page); }
diff --git a/chrome/browser/ui/chrome_select_file_policy.cc b/chrome/browser/ui/chrome_select_file_policy.cc index 890fa28..477931da 100644 --- a/chrome/browser/ui/chrome_select_file_policy.cc +++ b/chrome/browser/ui/chrome_select_file_policy.cc
@@ -47,8 +47,9 @@ DCHECK(g_browser_process); // local_state() can return NULL for tests. - if (!g_browser_process->local_state()) + if (!g_browser_process->local_state()) { return false; + } return !g_browser_process->local_state()->FindPreference( prefs::kAllowFileSelectionDialogs) ||
diff --git a/chrome/browser/ui/chrome_select_file_policy_unittest.cc b/chrome/browser/ui/chrome_select_file_policy_unittest.cc index 63ed81aa..f26a8dd 100644 --- a/chrome/browser/ui/chrome_select_file_policy_unittest.cc +++ b/chrome/browser/ui/chrome_select_file_policy_unittest.cc
@@ -34,8 +34,9 @@ FileSelectionUser() : file_selection_initialisation_in_progress(false) {} ~FileSelectionUser() override { - if (select_file_dialog_.get()) + if (select_file_dialog_.get()) { select_file_dialog_->ListenerDestroyed(); + } } void StartFileSelection() {
diff --git a/chrome/browser/ui/chromeos/magic_boost/magic_boost_card_controller_unittest.cc b/chrome/browser/ui/chromeos/magic_boost/magic_boost_card_controller_unittest.cc index 0e9cdf95..cadd4bf 100644 --- a/chrome/browser/ui/chromeos/magic_boost/magic_boost_card_controller_unittest.cc +++ b/chrome/browser/ui/chromeos/magic_boost/magic_boost_card_controller_unittest.cc
@@ -30,9 +30,9 @@ class MagicBoostCardControllerTest : public ChromeViewsTestBase { public: MagicBoostCardControllerTest() { -// Sets the default functions for the test to create image with the lottie -// resource id. Otherwise there's no `g_parse_lottie_as_still_image_` set in the -// `ResourceBundle`. + // Sets the default functions for the test to create image with the lottie + // resource id. Otherwise there's no `g_parse_lottie_as_still_image_` set in + // the `ResourceBundle`. ui::ResourceBundle::SetLottieParsingFunctions( &lottie::ParseLottieAsStillImage, &lottie::ParseLottieAsThemedStillImage);
diff --git a/chrome/browser/ui/cocoa/accelerator_utils_cocoa.mm b/chrome/browser/ui/cocoa/accelerator_utils_cocoa.mm index a96b4e64..7e551da6 100644 --- a/chrome/browser/ui/cocoa/accelerator_utils_cocoa.mm +++ b/chrome/browser/ui/cocoa/accelerator_utils_cocoa.mm
@@ -2,11 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/accelerator_utils.h" - #import <Cocoa/Cocoa.h> #include "chrome/browser/global_keyboard_shortcuts_mac.h" +#include "chrome/browser/ui/accelerator_utils.h" #include "chrome/browser/ui/cocoa/accelerators_cocoa.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "ui/base/accelerators/accelerator.h" @@ -32,8 +31,9 @@ unichar character; int mac_keycode = ui::MacKeyCodeForWindowsKeyCode( accelerator.key_code(), modifiers, &shifted_character, &character); - if (mac_keycode == -1) + if (mac_keycode == -1) { return false; + } NSString* characters = [NSString stringWithFormat:@"%C", character]; NSString* charactersIgnoringModifiers =
diff --git a/chrome/browser/ui/cocoa/accelerators_cocoa_browsertest.mm b/chrome/browser/ui/cocoa/accelerators_cocoa_browsertest.mm index 108e18b6..e6bf815 100644 --- a/chrome/browser/ui/cocoa/accelerators_cocoa_browsertest.mm +++ b/chrome/browser/ui/cocoa/accelerators_cocoa_browsertest.mm
@@ -2,11 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#import "chrome/browser/ui/cocoa/accelerators_cocoa.h" + #import <Cocoa/Cocoa.h> #include "base/i18n/base_i18n_switches.h" #include "chrome/app/chrome_command_ids.h" -#import "chrome/browser/ui/cocoa/accelerators_cocoa.h" #include "chrome/grit/generated_resources.h" #include "chrome/test/base/in_process_browser_test.h" #include "content/public/test/browser_test.h" @@ -23,8 +24,9 @@ void AddAcceleratorItemsToArray(NSMenu* menu, NSMutableArray* array) { for (NSMenuItem* item in menu.itemArray) { NSMenu* submenu = item.submenu; - if (submenu) + if (submenu) { AddAcceleratorItemsToArray(submenu, array); + } // If the tag or key equivalent is zero, then either this is a macOS menu // item that we don't care about, or it's a chrome accelerator with non @@ -32,8 +34,9 @@ // these, so we just ignore them. Also as of macOS Monterey the AppKit // adds a tag to the Start Dictation... menu item - skip it as well. if (item.tag == 0 || item.keyEquivalent.length == 0 || - item.action == @selector(startDictation:)) + item.action == @selector(startDictation:)) { continue; + } [array addObject:item]; } @@ -58,8 +61,9 @@ if (submenu) { NSMenuItem* result = MenuContainsAccelerator(submenu, key_equivalent, modifier_mask); - if (result) + if (result) { return result; + } } if ([item.keyEquivalent isEqual:key_equivalent]) { @@ -67,13 +71,15 @@ // which are special. if (item.tag == IDC_SELECT_NEXT_TAB || item.tag == IDC_SELECT_PREVIOUS_TAB) { - if (modifier_mask == item.keyEquivalentModifierMask) + if (modifier_mask == item.keyEquivalentModifierMask) { return item; + } continue; } - if (MenuItemHasModifierMask(item, modifier_mask)) + if (MenuItemHasModifierMask(item, modifier_mask)) { return item; + } } } return nil;
diff --git a/chrome/browser/ui/cocoa/applescript/apple_event_util.mm b/chrome/browser/ui/cocoa/applescript/apple_event_util.mm index 8eab9e0..45f24e7 100644 --- a/chrome/browser/ui/cocoa/applescript/apple_event_util.mm +++ b/chrome/browser/ui/cocoa/applescript/apple_event_util.mm
@@ -59,8 +59,8 @@ switch (value.type()) { case base::Value::Type::NONE: - descriptor = [NSAppleEventDescriptor - descriptorWithTypeCode:cMissingValue]; + descriptor = + [NSAppleEventDescriptor descriptorWithTypeCode:cMissingValue]; break; case base::Value::Type::BOOLEAN: {
diff --git a/chrome/browser/ui/cocoa/applescript/apple_event_util_unittest.mm b/chrome/browser/ui/cocoa/applescript/apple_event_util_unittest.mm index 28450a5..fec4ffdb 100644 --- a/chrome/browser/ui/cocoa/applescript/apple_event_util_unittest.mm +++ b/chrome/browser/ui/cocoa/applescript/apple_event_util_unittest.mm
@@ -136,8 +136,9 @@ result += AEDescToString(value_desc); - if (i < list_count - 1) + if (i < list_count - 1) { result += ", "; + } } result += is_record ? " }" : " ]"; @@ -150,7 +151,7 @@ } } -class AppleEventUtilTest : public CocoaTest { }; +class AppleEventUtilTest : public CocoaTest {}; struct TestCase { const char* json_input; @@ -160,69 +161,69 @@ TEST_F(AppleEventUtilTest, ValueToAppleEventDescriptor) { const struct TestCase cases[] = { - { "null", "'msng'", typeType }, - { "-1000", "-1000", typeSInt32 }, - { "0", "0", typeSInt32 }, - { "1000", "1000", typeSInt32 }, - { "-1e100", "-1e+100", typeIEEE64BitFloatingPoint }, - { "0.0", "0", typeIEEE64BitFloatingPoint }, - { "1e100", "1e+100", typeIEEE64BitFloatingPoint }, - { "\"\"", "'utxt'(\"\")", typeUnicodeText }, - { "\"string\"", "'utxt'(\"string\")", typeUnicodeText }, - { "{}", "{ 'usrf':[ ] }", typeAERecord }, - { "[]", "[ ]", typeAEList }, - { "{\"Image\": {" - "\"Width\": 800," - "\"Height\": 600," - "\"Title\": \"View from 15th Floor\"," - "\"Thumbnail\": {" - "\"Url\": \"http://www.example.com/image/481989943\"," - "\"Height\": 125," - "\"Width\": \"100\"" - "}," - "\"IDs\": [116, 943, 234, 38793]" - "}" - "}", - "{ 'usrf':[ 'utxt'(\"Image\"), { 'usrf':[ 'utxt'(\"Height\"), 600, " - "'utxt'(\"IDs\"), [ 116, 943, 234, 38793 ], 'utxt'(\"Thumbnail\"), " - "{ 'usrf':[ 'utxt'(\"Height\"), 125, 'utxt'(\"Url\"), " - "'utxt'(\"http://www.example.com/image/481989943\"), 'utxt'(\"Width\"), " - "'utxt'(\"100\") ] }, 'utxt'(\"Title\"), " - "'utxt'(\"View from 15th Floor\"), 'utxt'(\"Width\"), 800 ] } ] }", - typeAERecord }, - { "[" - "{" - "\"precision\": \"zip\"," - "\"Latitude\": 37.7668," - "\"Longitude\": -122.3959," - "\"Address\": \"\"," - "\"City\": \"SAN FRANCISCO\"," - "\"State\": \"CA\"," - "\"Zip\": \"94107\"," - "\"Country\": \"US\"" - "}," - "{" - "\"precision\": \"zip\"," - "\"Latitude\": 37.371991," - "\"Longitude\": -122.026020," - "\"Address\": \"\"," - "\"City\": \"SUNNYVALE\"," - "\"State\": \"CA\"," - "\"Zip\": \"94085\"," - "\"Country\": \"US\"" - "}" - "]", - "[ { 'usrf':[ 'utxt'(\"Address\"), 'utxt'(\"\"), 'utxt'(\"City\"), " - "'utxt'(\"SAN FRANCISCO\"), 'utxt'(\"Country\"), 'utxt'(\"US\"), " - "'utxt'(\"Latitude\"), 37.7668, 'utxt'(\"Longitude\"), -122.3959, " - "'utxt'(\"State\"), 'utxt'(\"CA\"), 'utxt'(\"Zip\"), 'utxt'(\"94107\"), " - "'utxt'(\"precision\"), 'utxt'(\"zip\") ] }, { 'usrf':[ " - "'utxt'(\"Address\"), 'utxt'(\"\"), 'utxt'(\"City\"), " - "'utxt'(\"SUNNYVALE\"), 'utxt'(\"Country\"), 'utxt'(\"US\"), " - "'utxt'(\"Latitude\"), 37.371991, 'utxt'(\"Longitude\"), -122.02602, " - "'utxt'(\"State\"), 'utxt'(\"CA\"), 'utxt'(\"Zip\"), 'utxt'(\"94085\"), " - "'utxt'(\"precision\"), 'utxt'(\"zip\") ] } ]", - typeAEList }, + {"null", "'msng'", typeType}, + {"-1000", "-1000", typeSInt32}, + {"0", "0", typeSInt32}, + {"1000", "1000", typeSInt32}, + {"-1e100", "-1e+100", typeIEEE64BitFloatingPoint}, + {"0.0", "0", typeIEEE64BitFloatingPoint}, + {"1e100", "1e+100", typeIEEE64BitFloatingPoint}, + {"\"\"", "'utxt'(\"\")", typeUnicodeText}, + {"\"string\"", "'utxt'(\"string\")", typeUnicodeText}, + {"{}", "{ 'usrf':[ ] }", typeAERecord}, + {"[]", "[ ]", typeAEList}, + {"{\"Image\": {" + "\"Width\": 800," + "\"Height\": 600," + "\"Title\": \"View from 15th Floor\"," + "\"Thumbnail\": {" + "\"Url\": \"http://www.example.com/image/481989943\"," + "\"Height\": 125," + "\"Width\": \"100\"" + "}," + "\"IDs\": [116, 943, 234, 38793]" + "}" + "}", + "{ 'usrf':[ 'utxt'(\"Image\"), { 'usrf':[ 'utxt'(\"Height\"), 600, " + "'utxt'(\"IDs\"), [ 116, 943, 234, 38793 ], 'utxt'(\"Thumbnail\"), " + "{ 'usrf':[ 'utxt'(\"Height\"), 125, 'utxt'(\"Url\"), " + "'utxt'(\"http://www.example.com/image/481989943\"), 'utxt'(\"Width\"), " + "'utxt'(\"100\") ] }, 'utxt'(\"Title\"), " + "'utxt'(\"View from 15th Floor\"), 'utxt'(\"Width\"), 800 ] } ] }", + typeAERecord}, + {"[" + "{" + "\"precision\": \"zip\"," + "\"Latitude\": 37.7668," + "\"Longitude\": -122.3959," + "\"Address\": \"\"," + "\"City\": \"SAN FRANCISCO\"," + "\"State\": \"CA\"," + "\"Zip\": \"94107\"," + "\"Country\": \"US\"" + "}," + "{" + "\"precision\": \"zip\"," + "\"Latitude\": 37.371991," + "\"Longitude\": -122.026020," + "\"Address\": \"\"," + "\"City\": \"SUNNYVALE\"," + "\"State\": \"CA\"," + "\"Zip\": \"94085\"," + "\"Country\": \"US\"" + "}" + "]", + "[ { 'usrf':[ 'utxt'(\"Address\"), 'utxt'(\"\"), 'utxt'(\"City\"), " + "'utxt'(\"SAN FRANCISCO\"), 'utxt'(\"Country\"), 'utxt'(\"US\"), " + "'utxt'(\"Latitude\"), 37.7668, 'utxt'(\"Longitude\"), -122.3959, " + "'utxt'(\"State\"), 'utxt'(\"CA\"), 'utxt'(\"Zip\"), 'utxt'(\"94107\"), " + "'utxt'(\"precision\"), 'utxt'(\"zip\") ] }, { 'usrf':[ " + "'utxt'(\"Address\"), 'utxt'(\"\"), 'utxt'(\"City\"), " + "'utxt'(\"SUNNYVALE\"), 'utxt'(\"Country\"), 'utxt'(\"US\"), " + "'utxt'(\"Latitude\"), 37.371991, 'utxt'(\"Longitude\"), -122.02602, " + "'utxt'(\"State\"), 'utxt'(\"CA\"), 'utxt'(\"Zip\"), 'utxt'(\"94085\"), " + "'utxt'(\"precision\"), 'utxt'(\"zip\") ] } ]", + typeAEList}, }; for (size_t i = 0; i < std::size(cases); ++i) {
diff --git a/chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript_browsertest.mm b/chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript_browsertest.mm index e6dfb98..ab3fa88 100644 --- a/chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript_browsertest.mm +++ b/chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript_browsertest.mm
@@ -2,11 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#import "chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript.h" + #import <Foundation/Foundation.h> #include "base/strings/sys_string_conversions.h" #import "chrome/browser/ui/cocoa/applescript/bookmark_applescript_test_utils.h" -#import "chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript.h" #import "chrome/browser/ui/cocoa/applescript/bookmark_item_applescript.h" #import "chrome/browser/ui/cocoa/applescript/constants_applescript.h" #import "chrome/browser/ui/cocoa/applescript/error_applescript.h"
diff --git a/chrome/browser/ui/cocoa/applescript/bookmark_item_applescript_browsertest.mm b/chrome/browser/ui/cocoa/applescript/bookmark_item_applescript_browsertest.mm index 892e7d35..babf602f 100644 --- a/chrome/browser/ui/cocoa/applescript/bookmark_item_applescript_browsertest.mm +++ b/chrome/browser/ui/cocoa/applescript/bookmark_item_applescript_browsertest.mm
@@ -2,12 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#import "chrome/browser/ui/cocoa/applescript/bookmark_item_applescript.h" + #import <Foundation/Foundation.h> #include "base/strings/sys_string_conversions.h" #include "chrome/browser/profiles/profile.h" #import "chrome/browser/ui/cocoa/applescript/bookmark_applescript_test_utils.h" -#import "chrome/browser/ui/cocoa/applescript/bookmark_item_applescript.h" #import "chrome/browser/ui/cocoa/applescript/error_applescript.h" #include "chrome/common/pref_names.h" #include "components/prefs/pref_service.h"
diff --git a/chrome/browser/ui/cocoa/applescript/bookmark_node_applescript.h b/chrome/browser/ui/cocoa/applescript/bookmark_node_applescript.h index aa3daae..ea0279c 100644 --- a/chrome/browser/ui/cocoa/applescript/bookmark_node_applescript.h +++ b/chrome/browser/ui/cocoa/applescript/bookmark_node_applescript.h
@@ -13,7 +13,7 @@ namespace bookmarks { class BookmarkModel; class BookmarkNode; -} +} // namespace bookmarks // Contains all the elements that are common to both a bookmark folder and // bookmark item.
diff --git a/chrome/browser/ui/cocoa/applescript/bookmark_node_applescript.mm b/chrome/browser/ui/cocoa/applescript/bookmark_node_applescript.mm index 7417f83..bdfe27d 100644 --- a/chrome/browser/ui/cocoa/applescript/bookmark_node_applescript.mm +++ b/chrome/browser/ui/cocoa/applescript/bookmark_node_applescript.mm
@@ -28,7 +28,7 @@ // specified like: // // make new bookmark folder with properties {title:"foo"} -@property (nonatomic, copy) NSString* tempTitle; +@property(nonatomic, copy) NSString* tempTitle; @end
diff --git a/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.h b/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.h index 2135613e..9074ec5 100644 --- a/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.h +++ b/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.h
@@ -56,4 +56,4 @@ @end -#endif// CHROME_BROWSER_UI_COCOA_APPLESCRIPT_BROWSERCRAPPLICATION_APPLESCRIPT_H_ +#endif // CHROME_BROWSER_UI_COCOA_APPLESCRIPT_BROWSERCRAPPLICATION_APPLESCRIPT_H_
diff --git a/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.mm b/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.mm index 52ae5202..8f0a0f5 100644 --- a/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.mm +++ b/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.mm
@@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.h" - #include <Foundation/Foundation.h> #include <map> @@ -18,6 +16,7 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" #import "chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript.h" +#import "chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.h" #import "chrome/browser/ui/cocoa/applescript/constants_applescript.h" #import "chrome/browser/ui/cocoa/applescript/error_applescript.h" #import "chrome/browser/ui/cocoa/applescript/window_applescript.h"
diff --git a/chrome/browser/ui/cocoa/applescript/constants_applescript.h b/chrome/browser/ui/cocoa/applescript/constants_applescript.h index bbfc05f..2d0b24a7 100644 --- a/chrome/browser/ui/cocoa/applescript/constants_applescript.h +++ b/chrome/browser/ui/cocoa/applescript/constants_applescript.h
@@ -28,6 +28,6 @@ // To indicate a window in incognito mode. extern NSString* const kIncognitoWindowMode; -} +} // namespace AppleScript #endif // CHROME_BROWSER_UI_COCOA_APPLESCRIPT_CONSTANTS_APPLESCRIPT_H_
diff --git a/chrome/browser/ui/cocoa/applescript/constants_applescript.mm b/chrome/browser/ui/cocoa/applescript/constants_applescript.mm index ef7b5b0d..7e869b0 100644 --- a/chrome/browser/ui/cocoa/applescript/constants_applescript.mm +++ b/chrome/browser/ui/cocoa/applescript/constants_applescript.mm
@@ -17,4 +17,4 @@ NSString* const kNormalWindowMode = @"normal"; NSString* const kIncognitoWindowMode = @"incognito"; -} +} // namespace AppleScript
diff --git a/chrome/browser/ui/cocoa/applescript/element_applescript.h b/chrome/browser/ui/cocoa/applescript/element_applescript.h index beb751e..9ef710e 100644 --- a/chrome/browser/ui/cocoa/applescript/element_applescript.h +++ b/chrome/browser/ui/cocoa/applescript/element_applescript.h
@@ -26,4 +26,4 @@ @end -#endif// CHROME_BROWSER_UI_COCOA_APPLESCRIPT_ELEMENT_APPLESCRIPT_H_ +#endif // CHROME_BROWSER_UI_COCOA_APPLESCRIPT_ELEMENT_APPLESCRIPT_H_
diff --git a/chrome/browser/ui/cocoa/applescript/error_applescript.h b/chrome/browser/ui/cocoa/applescript/error_applescript.h index 34cd1930..5e2818409 100644 --- a/chrome/browser/ui/cocoa/applescript/error_applescript.h +++ b/chrome/browser/ui/cocoa/applescript/error_applescript.h
@@ -36,6 +36,6 @@ // This function sets an error message to the currently executing command. void SetError(Error error_code); -} +} // namespace AppleScript #endif // CHROME_BROWSER_UI_COCOA_APPLESCRIPT_ERROR_APPLESCRIPT_H_
diff --git a/chrome/browser/ui/cocoa/applescript/tab_applescript.mm b/chrome/browser/ui/cocoa/applescript/tab_applescript.mm index 04a30ad9..9c8a7fea 100644 --- a/chrome/browser/ui/cocoa/applescript/tab_applescript.mm +++ b/chrome/browser/ui/cocoa/applescript/tab_applescript.mm
@@ -31,9 +31,9 @@ using content::NavigationController; using content::NavigationEntry; using content::OpenURLParams; +using content::Referrer; using content::RenderFrameHost; using content::RenderViewHost; -using content::Referrer; using content::WebContents; namespace { @@ -46,8 +46,7 @@ NSAppleEventManager* manager = [NSAppleEventManager sharedAppleEventManager]; NSAppleEventDescriptor* reply_event = [manager replyAppleEventForSuspensionID:suspension_id]; - [reply_event setParamDescriptor:result_descriptor - forKeyword:keyDirectObject]; + [reply_event setParamDescriptor:result_descriptor forKeyword:keyDirectObject]; [manager resumeWithSuspensionID:suspension_id]; } @@ -59,7 +58,7 @@ // specified like: // // make new tab with properties {URL:"http://google.com"} -@property (nonatomic, copy) NSString* tempURL; +@property(nonatomic, copy) NSString* tempURL; - (bool)isJavaScriptEnabled;
diff --git a/chrome/browser/ui/cocoa/applescript/tab_applescript_browsertest.mm b/chrome/browser/ui/cocoa/applescript/tab_applescript_browsertest.mm index 59d7920d..8c6e0916 100644 --- a/chrome/browser/ui/cocoa/applescript/tab_applescript_browsertest.mm +++ b/chrome/browser/ui/cocoa/applescript/tab_applescript_browsertest.mm
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#import "chrome/browser/ui/cocoa/applescript/tab_applescript.h" + #import <Foundation/Foundation.h> #include "base/strings/sys_string_conversions.h" @@ -9,7 +11,6 @@ #include "chrome/browser/ui/browser.h" #import "chrome/browser/ui/cocoa/applescript/bookmark_applescript_test_utils.h" #import "chrome/browser/ui/cocoa/applescript/error_applescript.h" -#import "chrome/browser/ui/cocoa/applescript/tab_applescript.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/in_process_browser_test.h"
diff --git a/chrome/browser/ui/cocoa/applescript/window_applescript.mm b/chrome/browser/ui/cocoa/applescript/window_applescript.mm index 6fbebd0..dc238625 100644 --- a/chrome/browser/ui/cocoa/applescript/window_applescript.mm +++ b/chrome/browser/ui/cocoa/applescript/window_applescript.mm
@@ -230,8 +230,7 @@ TabAppleScript* tab = [[TabAppleScript alloc] initWithWebContents:webContents]; - [tab setContainer:self - property:AppleScript::kTabsProperty]; + [tab setContainer:self property:AppleScript::kTabsProperty]; [tabs addObject:tab]; } return tabs;
diff --git a/chrome/browser/ui/cocoa/applescript/window_applescript_browsertest.mm b/chrome/browser/ui/cocoa/applescript/window_applescript_browsertest.mm index d5cd471..7f3b73e 100644 --- a/chrome/browser/ui/cocoa/applescript/window_applescript_browsertest.mm +++ b/chrome/browser/ui/cocoa/applescript/window_applescript_browsertest.mm
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#import "chrome/browser/ui/cocoa/applescript/window_applescript.h" + #import <Foundation/Foundation.h> #import "base/apple/foundation_util.h" @@ -12,7 +14,6 @@ #import "chrome/browser/ui/cocoa/applescript/constants_applescript.h" #import "chrome/browser/ui/cocoa/applescript/error_applescript.h" #import "chrome/browser/ui/cocoa/applescript/tab_applescript.h" -#import "chrome/browser/ui/cocoa/applescript/window_applescript.h" #include "chrome/browser/ui/cocoa/test/run_loop_testing.h" #include "chrome/test/base/in_process_browser_test.h" #include "content/public/test/browser_test.h"
diff --git a/chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm index c1b82add..6fe220c5 100644 --- a/chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm +++ b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm
@@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "extensions/browser/app_window/native_app_window.h" - #import <Cocoa/Cocoa.h> #include <memory> @@ -29,6 +27,7 @@ #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_utils.h" #include "extensions/browser/app_window/app_window_registry.h" +#include "extensions/browser/app_window/native_app_window.h" #include "extensions/common/constants.h" #include "skia/ext/skia_utils_mac.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.cc b/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.cc index 43fe74c..0ccd4cd 100644 --- a/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.cc +++ b/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.cc
@@ -93,16 +93,18 @@ } void QuitWithAppsController::Close(bool by_user) { - if (by_user) + if (by_user) { suppress_for_session_ = true; + } } void QuitWithAppsController::Click(const std::optional<int>& button_index, const std::optional<std::u16string>& reply) { CloseNotification(notification_profile_); - if (!button_index) + if (!button_index) { return; + } if (*button_index == kQuitAllAppsButtonIndex) { AppWindowRegistryUtil::CloseAllAppWindows(); @@ -153,8 +155,9 @@ // Delete any existing notification to ensure this one is shown. If // notification_profile_ is NULL then it must be that no notification has been // added by this class yet. - if (notification_profile_) + if (notification_profile_) { CloseNotification(notification_profile_); + } notification_profile_ = profiles[0]; NotificationDisplayServiceFactory::GetForProfile(notification_profile_) ->Display(NotificationHandler::Type::TRANSIENT, *notification_,
diff --git a/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.mm b/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.mm index b145675..46edd74 100644 --- a/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.mm +++ b/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.mm
@@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h" - #import "base/apple/foundation_util.h" #include "base/command_line.h" #include "base/memory/raw_ptr.h" @@ -22,6 +20,7 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" +#include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/test/browser_test.h"
diff --git a/chrome/browser/ui/cocoa/apps/titlebar_background_view.mm b/chrome/browser/ui/cocoa/apps/titlebar_background_view.mm index dbb32393..daf8df8e 100644 --- a/chrome/browser/ui/cocoa/apps/titlebar_background_view.mm +++ b/chrome/browser/ui/cocoa/apps/titlebar_background_view.mm
@@ -53,10 +53,11 @@ [[NSBezierPath bezierPathWithRoundedRect:roundedRect xRadius:cornerRadius yRadius:cornerRadius] addClip]; - if ([[self window] isMainWindow] || [[self window] isKeyWindow]) + if ([[self window] isMainWindow] || [[self window] isKeyWindow]) { [_color set]; - else + } else { [_inactiveColor set]; + } NSRectFill(rect); }
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h index b611c04..a030d38 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h
@@ -108,7 +108,7 @@ void BuildRootMenu(bool recurse); // Mark the bookmark menu as being invalid. - void InvalidateMenu() { menuIsValid_ = false; } + void InvalidateMenu() { menuIsValid_ = false; } bool IsMenuValid() const { return menuIsValid_; } // Helper for adding the node as a submenu to the menu with the |node|'s title
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm index b674f925..e64d687 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h" + #import <AppKit/AppKit.h> #include "base/strings/sys_string_conversions.h" @@ -14,7 +16,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/bookmarks/bookmark_utils_desktop.h" #include "chrome/browser/ui/browser_list.h" -#include "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h" #include "chrome/grit/generated_resources.h" #include "chrome/grit/theme_resources.h" @@ -38,8 +39,9 @@ [menu setDelegate:nil]; NSArray* items = [menu itemArray]; for (NSMenuItem* item in items) { - if ([item hasSubmenu]) + if ([item hasSubmenu]) { ClearDelegatesFromSubmenu([item submenu]); + } } } @@ -79,8 +81,9 @@ DCHECK_EQ([menu delegate], controller_); if (menu == menu_root_) { - if (!IsMenuValid()) + if (!IsMenuValid()) { BuildRootMenu(recurse); + } return; } @@ -92,8 +95,9 @@ void BookmarkMenuBridge::BuildRootMenu(bool recurse) { BookmarkModel* model = GetBookmarkModel(); - if (!model || !model->loaded()) + if (!model || !model->loaded()) { return; + } if (!folder_image_) { ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); @@ -109,8 +113,9 @@ ManagedBookmarkServiceFactory::GetForProfile(profile_); const BookmarkNode* barNode = model->bookmark_bar_node(); const BookmarkNode* managedNode = managed->managed_node(); - if (!barNode->children().empty() || !managedNode->children().empty()) + if (!barNode->children().empty() || !managedNode->children().empty()) { [menu_root_ addItem:[NSMenuItem separatorItem]]; + } if (!managedNode->children().empty()) { // Most users never see this node, so the image is only loaded if needed. ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); @@ -118,8 +123,9 @@ rb.GetNativeImageNamed(IDR_BOOKMARK_BAR_FOLDER_MANAGED).ToNSImage(); AddNodeAsSubmenu(menu_root_, managedNode, image, recurse); } - if (!barNode->children().empty()) + if (!barNode->children().empty()) { AddNodeToMenu(barNode, menu_root_, recurse); + } // If the "Other Bookmarks" folder has any content, make a submenu for it and // fill it in. @@ -133,8 +139,9 @@ if (!model->mobile_node()->children().empty()) { // Add a separator if we did not already add one due to a non-empty // "Other Bookmarks" folder. - if (model->other_node()->children().empty()) + if (model->other_node()->children().empty()) { [menu_root_ addItem:[NSMenuItem separatorItem]]; + } AddNodeAsSubmenu(menu_root_, model->mobile_node(), folder_image_, recurse); } @@ -173,14 +180,16 @@ void BookmarkMenuBridge::BookmarkNodeChanged(const BookmarkNode* node) { NSMenuItem* item = MenuItemForNode(node); - if (item) + if (item) { ConfigureMenuItem(node, item, true); + } } void BookmarkMenuBridge::BookmarkNodeFaviconChanged(const BookmarkNode* node) { NSMenuItem* item = MenuItemForNode(node); - if (item) + if (item) { ConfigureMenuItem(node, item, false); + } } void BookmarkMenuBridge::BookmarkNodeChildrenReordered( @@ -193,8 +202,9 @@ BookmarkModel* model = GetBookmarkModel(); // In Guest mode, there is no bookmark model. - if (!model) + if (!model) { return; + } bookmark_model_observation_.Observe(model); if (model->loaded()) { @@ -231,15 +241,15 @@ for (NSMenuItem* item in items) { // If there's a submenu, it may have a reference to |controller_|. Ensure // that gets nerfed recursively. - if ([item hasSubmenu]) + if ([item hasSubmenu]) { ClearDelegatesFromSubmenu([item submenu]); + } // Convention: items in the bookmark list which are bookmarks have // an action of openBookmarkMenuItem:. Also, assume all items // with submenus are submenus of bookmarks. if (([item action] == @selector(openBookmarkMenuItem:)) || - [item hasSubmenu] || - [item isSeparatorItem]) { + [item hasSubmenu] || [item isSeparatorItem]) { // This will eventually [obj release] all its kids, if it has any. [menu_root_ removeItem:item]; } else { @@ -262,15 +272,17 @@ // Set a delegate and a tag on the item so that the submenu can be populated // when (and if) Cocoa asks for it. - if (!recurse) + if (!recurse) { [submenu setDelegate:controller_]; + } [items setTag:node->id()]; tag_to_guid_[node->id()] = node->uuid(); [menu addItem:items]; - if (recurse) + if (recurse) { AddNodeToMenu(node, submenu, recurse); + } } // TODO(jrg): limit the number of bookmarks in the menubar? @@ -305,21 +317,24 @@ void BookmarkMenuBridge::ConfigureMenuItem(const BookmarkNode* node, NSMenuItem* item, bool set_title) { - if (set_title) + if (set_title) { [item setTitle:MenuTitleForNode(node)]; + } [item setTarget:controller_]; [item setAction:@selector(openBookmarkMenuItem:)]; [item setTag:node->id()]; tag_to_guid_[node->id()] = node->uuid(); - if (node->is_url()) + if (node->is_url()) { [item setToolTip:[BookmarkMenuCocoaController tooltipForNode:node]]; + } // Check to see if we have a favicon. NSImage* favicon = nil; BookmarkModel* model = GetBookmarkModel(); if (model) { const gfx::Image& image = model->GetFavicon(node); - if (!image.IsEmpty()) + if (!image.IsEmpty()) { favicon = image.ToNSImage(); + } } // If we do not have a loaded favicon, use the default site image instead. if (!favicon) { @@ -330,11 +345,13 @@ } NSMenuItem* BookmarkMenuBridge::MenuItemForNode(const BookmarkNode* node) { - if (!node) + if (!node) { return nil; + } auto it = bookmark_nodes_.find(node); - if (it == bookmark_nodes_.end()) + if (it == bookmark_nodes_.end()) { return nil; + } return it->second; }
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm index b6026f8..984305b 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm
@@ -69,7 +69,7 @@ // derived test classes have access to protected methods. void ClearBookmarkMenu() { bridge_->ClearBookmarkMenu(); } - void InvalidateMenu() { bridge_->InvalidateMenu(); } + void InvalidateMenu() { bridge_->InvalidateMenu(); } bool menu_is_valid() { return bridge_->IsMenuValid(); } void AddNodeToMenu(BookmarkMenuBridge* bridge, @@ -83,12 +83,13 @@ return bridge->MenuItemForNode(node); } - NSMenuItem* AddTestMenuItem(NSMenu *menu, NSString *title, SEL selector) { + NSMenuItem* AddTestMenuItem(NSMenu* menu, NSString* title, SEL selector) { NSMenuItem* item = [[NSMenuItem alloc] initWithTitle:title action:nullptr keyEquivalent:@""]; - if (selector) + if (selector) { [item setAction:selector]; + } [menu addItem:item]; return item; } @@ -184,9 +185,9 @@ const char* short_url = "http://foo/"; const char* long_url = "http://super-duper-long-url--." - "that.cannot.possibly.fit.even-in-80-columns" - "or.be.reasonably-displayed-in-a-menu" - "without.looking-ridiculous.com/"; // 140 chars total + "that.cannot.possibly.fit.even-in-80-columns" + "or.be.reasonably-displayed-in-a-menu" + "without.looking-ridiculous.com/"; // 140 chars total // 3 nodes; middle one has a child, last one has a HUGE URL // Set their titles to be the same as the URLs @@ -214,8 +215,9 @@ // Now confirm we have 1 submenu (the one we added, and not "other") int subs = 0; for (item in [menu_ itemArray]) { - if ([item hasSubmenu]) + if ([item hasSubmenu]) { subs++; + } } EXPECT_EQ(1, subs);
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm index f5e10d5..02e5d10 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm
@@ -37,8 +37,9 @@ NSMenuItem* GetItemWithSubmenu(NSMenu* submenu) { NSArray* parent_items = [[submenu supermenu] itemArray]; for (NSMenuItem* item in parent_items) { - if ([item submenu] == submenu) + if ([item submenu] == submenu) { return item; + } } return nil; } @@ -48,8 +49,9 @@ const BookmarkNode* node) { DCHECK(profile); Browser* browser = chrome::FindTabbedBrowser(profile, true); - if (!browser) + if (!browser) { browser = Browser::Create(Browser::CreateParams(profile, true)); + } OpenURLParams params(node->url(), Referrer(), disposition, ui::PAGE_TRANSITION_AUTO_BOOKMARK, false); browser->OpenURL(params, /*navigation_handle_callback=*/{}); @@ -158,8 +160,9 @@ + (NSString*)tooltipForNode:(const BookmarkNode*)node { NSString* title = base::SysUTF16ToNSString(node->GetTitle()); - if (node->is_folder()) + if (node->is_folder()) { return title; + } std::string urlString = node->url().possibly_invalid_spec(); NSString* url = base::SysUTF8ToNSString(urlString); return cocoa_l10n_util::TooltipForURLAndTitle(url, title);
diff --git a/chrome/browser/ui/cocoa/browser_window_command_handler.h b/chrome/browser/ui/cocoa/browser_window_command_handler.h index da4e8eb..c9a938b 100644 --- a/chrome/browser/ui/cocoa/browser_window_command_handler.h +++ b/chrome/browser/ui/cocoa/browser_window_command_handler.h
@@ -12,7 +12,7 @@ // Implement UserInterfaceItemCommandHandler by validating items using global // chrome:: functions and executing commands with chrome::ExecuteCommand(). @interface BrowserWindowCommandHandler - : NSObject<UserInterfaceItemCommandHandler> + : NSObject <UserInterfaceItemCommandHandler> @end #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COMMAND_HANDLER_H_
diff --git a/chrome/browser/ui/cocoa/browser_window_command_handler.mm b/chrome/browser/ui/cocoa/browser_window_command_handler.mm index 52edb2f..3fce4a6d 100644 --- a/chrome/browser/ui/cocoa/browser_window_command_handler.mm +++ b/chrome/browser/ui/cocoa/browser_window_command_handler.mm
@@ -28,14 +28,16 @@ NSControlStateValue old_state = [menuItem state]; NSControlStateValue new_state = toggled ? NSControlStateValueOn : NSControlStateValueOff; - if (old_state != new_state) + if (old_state != new_state) { [menuItem setState:new_state]; + } } else if (buttonItem) { NSControlStateValue old_state = [buttonItem state]; NSControlStateValue new_state = toggled ? NSControlStateValueOn : NSControlStateValueOff; - if (old_state != new_state) + if (old_state != new_state) { [buttonItem setState:new_state]; + } } } @@ -49,8 +51,9 @@ id sender, NSWindow* window) { NSWindow* targetWindow = window; - if ([sender respondsToSelector:@selector(window)]) + if ([sender respondsToSelector:@selector(window)]) { targetWindow = [sender window]; + } auto* bridge = remote_cocoa::NativeWidgetNSWindowBridge::GetFromNativeWindow( targetWindow); DCHECK(bridge); @@ -76,21 +79,26 @@ DCHECK(bridge); remote_cocoa::mojom::ValidateUserInterfaceItemResultPtr result; - if (!bridge->host()->ValidateUserInterfaceItem([item tag], &result)) + if (!bridge->host()->ValidateUserInterfaceItem([item tag], &result)) { return NO; + } - if (result->set_toggle_state) + if (result->set_toggle_state) { SetToggleState(result->new_toggle_state, item); + } if (NSMenuItem* menuItem = base::apple::ObjCCast<NSMenuItem>(item)) { - if (result->disable_if_has_no_key_equivalent) + if (result->disable_if_has_no_key_equivalent) { result->enable &= !![[menuItem keyEquivalent] length]; + } - if (result->set_hidden_state) + if (result->set_hidden_state) { [menuItem setHidden:result->new_hidden_state]; + } - if (result->new_title) + if (result->new_title) { [menuItem setTitle:base::SysUTF16ToNSString(*result->new_title)]; + } } return result->enable;
diff --git a/chrome/browser/ui/cocoa/browser_window_mac_browsertest.mm b/chrome/browser/ui/cocoa/browser_window_mac_browsertest.mm index 27bae31..b6628111 100644 --- a/chrome/browser/ui/cocoa/browser_window_mac_browsertest.mm +++ b/chrome/browser/ui/cocoa/browser_window_mac_browsertest.mm
@@ -119,6 +119,7 @@ // be a well-formed AX tree. EXPECT_GE(nodes_visited, 10U); - if (HasFailure()) + if (HasFailure()) { ui::PrintNSAXTree(window); + } }
diff --git a/chrome/browser/ui/cocoa/chrome_command_dispatcher_delegate.h b/chrome/browser/ui/cocoa/chrome_command_dispatcher_delegate.h index f79ebaf0..a76ba493 100644 --- a/chrome/browser/ui/cocoa/chrome_command_dispatcher_delegate.h +++ b/chrome/browser/ui/cocoa/chrome_command_dispatcher_delegate.h
@@ -11,7 +11,8 @@ // Implement CommandDispatcherDelegate by intercepting browser window keyboard // shortcuts and executing them with chrome::ExecuteCommand. -@interface ChromeCommandDispatcherDelegate : NSObject<CommandDispatcherDelegate> +@interface ChromeCommandDispatcherDelegate + : NSObject <CommandDispatcherDelegate> @end
diff --git a/chrome/browser/ui/cocoa/chrome_command_dispatcher_delegate.mm b/chrome/browser/ui/cocoa/chrome_command_dispatcher_delegate.mm index 8198632..bcf11ec 100644 --- a/chrome/browser/ui/cocoa/chrome_command_dispatcher_delegate.mm +++ b/chrome/browser/ui/cocoa/chrome_command_dispatcher_delegate.mm
@@ -23,8 +23,9 @@ (ui::AcceleratorManager::HandlerPriority) priority { NSWindow* window = [event window]; - if (!window) + if (!window) { return NO; + } // Logic for handling Views windows. // @@ -101,13 +102,15 @@ return ui::PerformKeyEquivalentResult::kDrop; } - if (!result.found()) + if (!result.found()) { return ui::PerformKeyEquivalentResult::kUnhandled; + } auto* bridge = remote_cocoa::NativeWidgetNSWindowBridge::GetFromNativeWindow(window); - if (bridge == nullptr) + if (bridge == nullptr) { return ui::PerformKeyEquivalentResult::kUnhandled; + } bool will_execute = false; const bool kIsBeforeFirstResponder = true; @@ -123,8 +126,9 @@ // window bridge side. Now that we know the command will be executed by // the window bridge we'll manually flash the menu title. This also causes // VoiceOver to speak the command, which wasn't happening before this change. - if (will_execute) + if (will_execute) { [NSMenu flashMenuForChromeCommand:result.chrome_command]; + } bool was_executed = false; bridge->host()->ExecuteCommand(result.chrome_command,
diff --git a/chrome/browser/ui/cocoa/confirm_quit_panel_controller.mm b/chrome/browser/ui/cocoa/confirm_quit_panel_controller.mm index 9ce7927d..1aeb4e4 100644 --- a/chrome/browser/ui/cocoa/confirm_quit_panel_controller.mm +++ b/chrome/browser/ui/cocoa/confirm_quit_panel_controller.mm
@@ -166,8 +166,7 @@ + (ConfirmQuitPanelController*)sharedController { if (!g_confirmQuitPanelController) { - g_confirmQuitPanelController = - [[ConfirmQuitPanelController alloc] init]; + g_confirmQuitPanelController = [[ConfirmQuitPanelController alloc] init]; } return g_confirmQuitPanelController; }
diff --git a/chrome/browser/ui/cocoa/find_pasteboard_unittest.mm b/chrome/browser/ui/cocoa/find_pasteboard_unittest.mm index 059f0c4..3255f97 100644 --- a/chrome/browser/ui/cocoa/find_pasteboard_unittest.mm +++ b/chrome/browser/ui/cocoa/find_pasteboard_unittest.mm
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#import "ui/base/cocoa/find_pasteboard.h" + #import <Cocoa/Cocoa.h> #include "base/memory/ref_counted.h" @@ -9,7 +11,6 @@ #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" #include "ui/base/clipboard/clipboard_util_mac.h" -#import "ui/base/cocoa/find_pasteboard.h" // A subclass of FindPasteboard that doesn't write to the real find pasteboard. @interface FindPasteboardTesting : FindPasteboard {
diff --git a/chrome/browser/ui/cocoa/first_run_dialog_controller.mm b/chrome/browser/ui/cocoa/first_run_dialog_controller.mm index 7cdca7b..6e0d8b7 100644 --- a/chrome/browser/ui/cocoa/first_run_dialog_controller.mm +++ b/chrome/browser/ui/cocoa/first_run_dialog_controller.mm
@@ -175,8 +175,9 @@ [startChromeButton sizeToFit]; NSRect frame = [startChromeButton frame]; frame.origin.x += oldWidth - NSWidth([startChromeButton frame]); - if (base::i18n::IsRTL()) + if (base::i18n::IsRTL()) { frame.origin.x = kDialogWidth - NSMaxX(frame); + } [startChromeButton setFrame:frame]; }
diff --git a/chrome/browser/ui/cocoa/fullscreen/fullscreen_menubar_tracker.mm b/chrome/browser/ui/cocoa/fullscreen/fullscreen_menubar_tracker.mm index 8c56a16..cc653c92 100644 --- a/chrome/browser/ui/cocoa/fullscreen/fullscreen_menubar_tracker.mm +++ b/chrome/browser/ui/cocoa/fullscreen/fullscreen_menubar_tracker.mm
@@ -35,8 +35,9 @@ GetEventParameter(event, FOUR_CHAR_CODE('rvlf'), typeCGFloat, /*outActualType=*/nullptr, sizeof(CGFloat), /*outActualSize=*/nullptr, &revealFraction); - if (revealFraction > 0.0 && revealFraction < 1.0) + if (revealFraction > 0.0 && revealFraction < 1.0) { [self setMenubarProgress:revealFraction]; + } } else if (GetEventKind(event) == kEventMenuBarShown) { [self setMenubarProgress:1.0]; } else { @@ -115,22 +116,24 @@ // If the menubarFraction increases, check if we are in the right screen // so that the toolbar is not revealed on the wrong screen. - if (![self isMouseOnScreen] && progress > _menubarFraction) + if (![self isMouseOnScreen] && progress > _menubarFraction) { return; + } // Ignore the menubarFraction changes if the Space is inactive. if (!_controller.window.onActiveSpace) { return; } - if (ui::IsCGFloatEqual(progress, 1.0)) + if (ui::IsCGFloatEqual(progress, 1.0)) { _state = FullscreenMenubarState::SHOWN; - else if (ui::IsCGFloatEqual(progress, 0.0)) + } else if (ui::IsCGFloatEqual(progress, 0.0)) { _state = FullscreenMenubarState::HIDDEN; - else if (progress < _menubarFraction) + } else if (progress < _menubarFraction) { _state = FullscreenMenubarState::HIDING; - else if (progress > _menubarFraction) + } else if (progress > _menubarFraction) { _state = FullscreenMenubarState::SHOWING; + } _menubarFraction = progress; [_controller layoutToolbar];
diff --git a/chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_animation_controller.mm b/chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_animation_controller.mm index 25d910e..7f68fe9 100644 --- a/chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_animation_controller.mm +++ b/chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_animation_controller.mm
@@ -55,8 +55,9 @@ content::WebContents* contents, bool in_foreground) { // Don't kickstart the animation if the toolbar is already displayed. - if ([owner_ mustShowFullscreenToolbar]) + if ([owner_ mustShowFullscreenToolbar]) { return; + } if (animation_.IsShowing()) { hide_toolbar_timer_.Reset(); @@ -74,19 +75,22 @@ } void FullscreenToolbarAnimationController::AnimateToolbarIn() { - if (![owner_ isInFullscreen]) + if (![owner_ isInFullscreen]) { return; + } animation_.Reset(animation_start_value_); animation_.Show(); } void FullscreenToolbarAnimationController::AnimateToolbarOutIfPossible() { - if (![owner_ isInFullscreen] || [owner_ mustShowFullscreenToolbar]) + if (![owner_ isInFullscreen] || [owner_ mustShowFullscreenToolbar]) { return; + } - if (animation_.IsClosing()) + if (animation_.IsClosing()) { return; + } animation_.Stop(); animation_.Hide(); @@ -119,8 +123,9 @@ void FullscreenToolbarAnimationController::AnimationEnded( const gfx::Animation* animation) { - if (!web_contents() && animation_.IsShowing()) + if (!web_contents() && animation_.IsShowing()) { StartHideTimerIfPossible(); + } } //////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_controller.mm b/chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_controller.mm index 9d49043..102b270 100644 --- a/chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_controller.mm +++ b/chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_controller.mm
@@ -2,12 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/memory/raw_ptr.h" - #import "chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_controller.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/memory/raw_ptr.h" #include "chrome/browser/profiles/profile.h" #import "chrome/browser/ui/cocoa/fullscreen/fullscreen_menubar_tracker.h" #import "chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_animation_controller.h" @@ -54,8 +53,9 @@ } - (void)enterFullscreenMode { - if (_inFullscreenMode) + if (_inFullscreenMode) { return; + } _inFullscreenMode = YES; _menubarTracker = [[FullscreenMenubarTracker alloc] @@ -65,8 +65,9 @@ } - (void)exitFullscreenMode { - if (!_inFullscreenMode) + if (!_inFullscreenMode) { return; + } _inFullscreenMode = NO; _animationController->StopAnimationAndTimer(); @@ -87,8 +88,9 @@ constexpr CGFloat kHideFraction = 0.0; constexpr CGFloat kShowFraction = 1.0; - if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode)) + if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode)) { return kHideFraction; + } switch (_toolbarStyle) { case FullscreenToolbarStyle::TOOLBAR_PRESENT: @@ -96,11 +98,13 @@ case FullscreenToolbarStyle::TOOLBAR_NONE: return kHideFraction; case FullscreenToolbarStyle::TOOLBAR_HIDDEN: - if (_animationController->IsAnimationRunning()) + if (_animationController->IsAnimationRunning()) { return _animationController->GetToolbarFractionFromProgress(); + } - if ([self mustShowFullscreenToolbar]) + if ([self mustShowFullscreenToolbar]) { return kShowFraction; + } return [_menubarTracker menubarFraction]; } @@ -111,14 +115,17 @@ } - (BOOL)mustShowFullscreenToolbar { - if (!_inFullscreenMode) + if (!_inFullscreenMode) { return NO; + } - if (_toolbarStyle == FullscreenToolbarStyle::TOOLBAR_PRESENT) + if (_toolbarStyle == FullscreenToolbarStyle::TOOLBAR_PRESENT) { return YES; + } - if (_toolbarStyle == FullscreenToolbarStyle::TOOLBAR_NONE) + if (_toolbarStyle == FullscreenToolbarStyle::TOOLBAR_NONE) { return NO; + } return [_menubarTracker state] == FullscreenMenubarState::SHOWN; } @@ -154,8 +161,9 @@ - (BOOL)isFullscreenTransitionInProgress { auto* host = views::NativeWidgetMacNSWindowHost::GetFromNativeWindow([self window]); - if (auto* bridge = host->GetInProcessNSWindowBridge()) + if (auto* bridge = host->GetInProcessNSWindowBridge()) { return bridge->in_fullscreen_transition(); + } DLOG(ERROR) << "TODO(crbug.com/41431787): Support fullscreen " "transitions for RemoteMacViews PWA windows."; return false;
diff --git a/chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_mouse_tracker.mm b/chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_mouse_tracker.mm index 086acef..0f5faf3a 100644 --- a/chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_mouse_tracker.mm +++ b/chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_mouse_tracker.mm
@@ -66,8 +66,9 @@ if (_trackingArea) { // If |trackingArea_|'s rect matches |trackingAreaFrame_|, quit early. - if (NSEqualRects(_trackingAreaFrame, [_trackingArea rect])) + if (NSEqualRects(_trackingAreaFrame, [_trackingArea rect])) { return; + } [self removeTrackingArea]; } @@ -94,8 +95,9 @@ } - (void)removeTrackingArea { - if (!_trackingArea) + if (!_trackingArea) { return; + } // TODO(https://crbug.com/1063417, https://crbug.com/1064911): This DCHECK // is hit when closing a fullscreen window using the traffic lights. This is
diff --git a/chrome/browser/ui/cocoa/handoff_observer.h b/chrome/browser/ui/cocoa/handoff_observer.h index c9c257d..523bcee 100644 --- a/chrome/browser/ui/cocoa/handoff_observer.h +++ b/chrome/browser/ui/cocoa/handoff_observer.h
@@ -5,10 +5,9 @@ #ifndef CHROME_BROWSER_UI_COCOA_HANDOFF_OBSERVER_H_ #define CHROME_BROWSER_UI_COCOA_HANDOFF_OBSERVER_H_ -#include "base/memory/raw_ptr.h" - #import <Cocoa/Cocoa.h> +#include "base/memory/raw_ptr.h" #include "chrome/browser/ui/browser_list_observer.h" #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" #include "content/public/browser/web_contents_observer.h" @@ -16,7 +15,7 @@ namespace content { class Page; class WebContents; -} +} // namespace content class Browser;
diff --git a/chrome/browser/ui/cocoa/handoff_observer.mm b/chrome/browser/ui/cocoa/handoff_observer.mm index bb7b3d9..5fa2bb49 100644 --- a/chrome/browser/ui/cocoa/handoff_observer.mm +++ b/chrome/browser/ui/cocoa/handoff_observer.mm
@@ -30,8 +30,9 @@ } void HandoffObserver::OnBrowserRemoved(Browser* removed_browser) { - if (active_browser_ != removed_browser) + if (active_browser_ != removed_browser) { return; + } SetActiveBrowser(chrome::FindLastActive()); [delegate_ handoffContentsChanged:GetActiveWebContents()]; @@ -41,8 +42,9 @@ TabStripModel* tab_strip_model, const TabStripModelChange& change, const TabStripSelectionChange& selection) { - if (tab_strip_model->empty() || !selection.active_tab_changed()) + if (tab_strip_model->empty() || !selection.active_tab_changed()) { return; + } StartObservingWebContents(selection.new_contents); [delegate_ handoffContentsChanged:GetActiveWebContents()]; @@ -57,8 +59,9 @@ } void HandoffObserver::SetActiveBrowser(Browser* active_browser) { - if (active_browser == active_browser_) + if (active_browser == active_browser_) { return; + } if (active_browser_) { active_browser_->tab_strip_model()->RemoveObserver(this); @@ -70,8 +73,9 @@ if (active_browser_) { active_browser_->tab_strip_model()->AddObserver(this); content::WebContents* web_contents = GetActiveWebContents(); - if (web_contents) + if (web_contents) { StartObservingWebContents(web_contents); + } } } @@ -86,8 +90,9 @@ } content::WebContents* HandoffObserver::GetActiveWebContents() { - if (!active_browser_) + if (!active_browser_) { return nullptr; + } return active_browser_->tab_strip_model()->GetActiveWebContents(); }
diff --git a/chrome/browser/ui/cocoa/history_menu_bridge.h b/chrome/browser/ui/cocoa/history_menu_bridge.h index 54f49bfe..d550572 100644 --- a/chrome/browser/ui/cocoa/history_menu_bridge.h +++ b/chrome/browser/ui/cocoa/history_menu_bridge.h
@@ -32,7 +32,7 @@ namespace { class HistoryMenuBridgeTest; class HistoryMenuBridgeLifetimeTest; -} +} // namespace namespace favicon_base { struct FaviconImageResult;
diff --git a/chrome/browser/ui/cocoa/history_menu_bridge.mm b/chrome/browser/ui/cocoa/history_menu_bridge.mm index 36deb97..0492a1f 100644 --- a/chrome/browser/ui/cocoa/history_menu_bridge.mm +++ b/chrome/browser/ui/cocoa/history_menu_bridge.mm
@@ -5,6 +5,7 @@ #include "chrome/browser/ui/cocoa/history_menu_bridge.h" #include <stddef.h> + #include <string> #include "base/apple/foundation_util.h" @@ -69,8 +70,9 @@ DCHECK(profile_); profile_dir_ = profile_->GetPath(); - if (auto* profile_manager = g_browser_process->profile_manager()) + if (auto* profile_manager = g_browser_process->profile_manager()) { profile_manager_observation_.Observe(profile_manager); + } // Set the static icons in the menu. ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); @@ -86,8 +88,9 @@ // If the profile is incognito, no need to set history and tab restore // services. - if (profile_->IsOffTheRecord()) + if (profile_->IsOffTheRecord()) { return; + } // Check to see if the history service is ready. Because it loads async, it // may not be ready when the Bridge is created. If this happens, register for @@ -143,8 +146,9 @@ NSUInteger added_count = 0; for (const auto& entry : entries) { - if (added_count >= kRecentlyClosedCount) + if (added_count >= kRecentlyClosedCount) { break; + } if (entry->type == sessions::tab_restore::Type::WINDOW) { bool added = AddWindowEntryToMenu( static_cast<sessions::tab_restore::Window*>(entry.get()), menu, @@ -199,8 +203,9 @@ void HistoryMenuBridge::BuildMenu() { // If the history service is ready, use it. Otherwise, a Notification will // force an update when it's loaded. - if (history_service_) + if (history_service_) { CreateMenu(); + } } HistoryMenuBridge::HistoryItem* HistoryMenuBridge::HistoryItemForMenuItem( @@ -234,8 +239,8 @@ } NSMenu* HistoryMenuBridge::HistoryMenu() { - NSMenu* history_menu = [[[NSApp mainMenu] itemWithTag:IDC_HISTORY_MENU] - submenu]; + NSMenu* history_menu = + [[[NSApp mainMenu] itemWithTag:IDC_HISTORY_MENU] submenu]; return history_menu; } @@ -289,8 +294,9 @@ // Add a tooltip if the history item is for a single tab. if (item->tabs.empty()) { - NSString* tooltip = [NSString stringWithFormat:@"%@\n%@", - base::SysUTF16ToNSString(full_title), base::SysUTF8ToNSString(url)]; + NSString* tooltip = [NSString + stringWithFormat:@"%@\n%@", base::SysUTF16ToNSString(full_title), + base::SysUTF8ToNSString(url)]; [item->menu_item setToolTip:tooltip]; } @@ -309,8 +315,9 @@ NSInteger index) { const std::vector<std::unique_ptr<sessions::tab_restore::Tab>>& tabs = window->tabs; - if (tabs.empty()) + if (tabs.empty()) { return false; + } // Create the item for the parent/window. Do not set the title yet because // the actual number of items that are in the menu will not be known until @@ -325,8 +332,9 @@ // Sometimes it is possible for there to not be any subitems for a given // window; if that is the case, do not add the entry to the main menu. - if (added_count == 0) + if (added_count == 0) { return false; + } // Now that the number of tabs that has been added is known, set the title // of the parent menu item. @@ -345,8 +353,9 @@ NSInteger index) { const std::vector<std::unique_ptr<sessions::tab_restore::Tab>>& tabs = group->tabs; - if (tabs.empty()) + if (tabs.empty()) { return false; + } // Create the item for the parent/group. auto item = std::make_unique<HistoryItem>(); @@ -642,8 +651,9 @@ } void HistoryMenuBridge::OnProfileMarkedForPermanentDeletion(Profile* profile) { - if (profile != profile_) + if (profile != profile_) { return; + } ResetMenu(); }
diff --git a/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm b/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm index 5fd16ba..f015420f 100644 --- a/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm +++ b/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm
@@ -66,8 +66,9 @@ MockTRS::Entries CreateSessionEntries( std::initializer_list<sessions::tab_restore::Entry*> entries) { MockTRS::Entries ret; - for (auto* entry : entries) + for (auto* entry : entries) { ret.emplace_back(entry); + } return ret; } @@ -77,8 +78,9 @@ auto* window = new sessions::tab_restore::Window; window->id = SessionID::FromSerializedValue(id); window->tabs.reserve(tabs.size()); - for (auto* tab : tabs) + for (auto* tab : tabs) { window->tabs.emplace_back(std::move(tab)); + } return window; } @@ -90,8 +92,9 @@ group->id = SessionID::FromSerializedValue(id); group->visual_data = visual_data; group->tabs.reserve(tabs.size()); - for (auto* tab : tabs) + for (auto* tab : tabs) { group->tabs.emplace_back(std::move(tab)); + } return group; } @@ -146,8 +149,7 @@ // We are a friend of HistoryMenuBridge (and have access to // protected methods), but none of the classes generated by TEST_F() // are. Wraps common commands. - void ClearMenuSection(NSMenu* menu, - NSInteger tag) { + void ClearMenuSection(NSMenu* menu, NSInteger tag) { bridge_->ClearMenuSection(menu, tag); } @@ -264,7 +266,7 @@ EXPECT_EQ(1, [menu numberOfItems]); EXPECT_NSEQ(@"HEADER", - [[menu itemWithTag:HistoryMenuBridge::kVisitedTitle] title]); + [[menu itemWithTag:HistoryMenuBridge::kVisitedTitle] title]); } // Skip menu items that are not hooked up to |-openHistoryMenuItem:|. @@ -283,9 +285,8 @@ EXPECT_EQ(2, [menu numberOfItems]); EXPECT_NSEQ(@"HEADER", - [[menu itemWithTag:HistoryMenuBridge::kVisitedTitle] title]); - EXPECT_NSEQ(@"TITLE", - [[menu itemAtIndex:1] title]); + [[menu itemWithTag:HistoryMenuBridge::kVisitedTitle] title]); + EXPECT_NSEQ(@"TITLE", [[menu itemAtIndex:1] title]); } // Edge case test for clearing an empty menu. @@ -297,7 +298,7 @@ EXPECT_EQ(1, [menu numberOfItems]); EXPECT_NSEQ(@"HEADER", - [[menu itemWithTag:HistoryMenuBridge::kVisited] title]); + [[menu itemWithTag:HistoryMenuBridge::kVisited] title]); } // Test that AddItemToMenu() properly adds HistoryItem objects as menus. @@ -333,16 +334,18 @@ // Confirm tooltips and confirm they are not trimmed (like the item // name might be). Add tolerance for URL fixer-upping; // e.g. http://foo becomes http://foo/) - EXPECT_GE([[[menu itemAtIndex:0] toolTip] length], (2*short_url.length()-5)); - EXPECT_GE([[[menu itemAtIndex:1] toolTip] length], (2*long_url.length()-5)); + EXPECT_GE([[[menu itemAtIndex:0] toolTip] length], + (2 * short_url.length() - 5)); + EXPECT_GE([[[menu itemAtIndex:1] toolTip] length], + (2 * long_url.length() - 5)); } // Test that the menu is created for a set of simple tabs. TEST_F(HistoryMenuBridgeTest, RecentlyClosedTabs) { std::unique_ptr<MockTRS> trs(new MockTRS(profile())); auto entries{CreateSessionEntries({ - CreateSessionTab(24, "http://google.com", "Google"), - CreateSessionTab(42, "http://apple.com", "Apple"), + CreateSessionTab(24, "http://google.com", "Google"), + CreateSessionTab(42, "http://apple.com", "Apple"), })}; using ::testing::ReturnRef; @@ -375,17 +378,20 @@ TEST_F(HistoryMenuBridgeTest, RecentlyClosedTabsAndWindows) { std::unique_ptr<MockTRS> trs(new MockTRS(profile())); auto entries{CreateSessionEntries({ - CreateSessionTab(24, "http://google.com", "Google"), - CreateSessionWindow(30, { - CreateSessionTab(31, "http://foo.com", "foo"), - CreateSessionTab(32, "http://bar.com", "bar"), - }), - CreateSessionTab(42, "http://apple.com", "Apple"), - CreateSessionWindow(50, { - CreateSessionTab(51, "http://magic.com", "magic"), - CreateSessionTab(52, "http://goats.com", "goats"), - CreateSessionTab(53, "http://teleporter.com", "teleporter"), - }), + CreateSessionTab(24, "http://google.com", "Google"), + CreateSessionWindow(30, + { + CreateSessionTab(31, "http://foo.com", "foo"), + CreateSessionTab(32, "http://bar.com", "bar"), + }), + CreateSessionTab(42, "http://apple.com", "Apple"), + CreateSessionWindow( + 50, + { + CreateSessionTab(51, "http://magic.com", "magic"), + CreateSessionTab(52, "http://goats.com", "goats"), + CreateSessionTab(53, "http://teleporter.com", "teleporter"), + }), })}; using ::testing::ReturnRef;
diff --git a/chrome/browser/ui/cocoa/history_menu_cocoa_controller.mm b/chrome/browser/ui/cocoa/history_menu_cocoa_controller.mm index 5bdd3064..c18a77b 100644 --- a/chrome/browser/ui/cocoa/history_menu_cocoa_controller.mm +++ b/chrome/browser/ui/cocoa/history_menu_cocoa_controller.mm
@@ -36,8 +36,9 @@ void OpenURLForItem(HistoryMenuBridge::HistoryItem node, WindowOpenDisposition disposition, Profile* profile) { - if (!profile) + if (!profile) { return; // Failed to load profile, ignore. + } // If this item can be restored using TabRestoreService, do so. Otherwise, // just load the URL. if (node.session_id.is_valid()) { @@ -51,8 +52,9 @@ // bridge, target the active profile. Without this, history menu items open // in the nearest non-incognito window, or create one. if (auto* active_browser = chrome::FindBrowserWithActiveWindow()) { - if (active_browser->profile()->GetOriginalProfile() == target_profile) + if (active_browser->profile()->GetOriginalProfile() == target_profile) { target_profile = active_browser->profile(); + } } NavigateParams params(target_profile, node.url,
diff --git a/chrome/browser/ui/cocoa/history_overlay_controller.h b/chrome/browser/ui/cocoa/history_overlay_controller.h index 0b63ab4..af202d4 100644 --- a/chrome/browser/ui/cocoa/history_overlay_controller.h +++ b/chrome/browser/ui/cocoa/history_overlay_controller.h
@@ -9,10 +9,7 @@ @class HistoryOverlayView; -enum HistoryOverlayMode { - kHistoryOverlayModeBack, - kHistoryOverlayModeForward -}; +enum HistoryOverlayMode { kHistoryOverlayModeBack, kHistoryOverlayModeForward }; // The HistoryOverlayController manages a view that is inserted atop the web // contents to provide visual feedback when the user is performing history
diff --git a/chrome/browser/ui/cocoa/history_overlay_controller.mm b/chrome/browser/ui/cocoa/history_overlay_controller.mm index bffd920..fe8b8ae 100644 --- a/chrome/browser/ui/cocoa/history_overlay_controller.mm +++ b/chrome/browser/ui/cocoa/history_overlay_controller.mm
@@ -123,9 +123,9 @@ // When tracking the gesture, the height is constant and the alpha value // changes from [0.25, 0.65]. CGFloat height = kShieldHeight; - CGFloat shieldAlpha = std::min(static_cast<CGFloat>(0.65), - std::max(gestureAmount, - static_cast<CGFloat>(0.25))); + CGFloat shieldAlpha = + std::min(static_cast<CGFloat>(0.65), + std::max(gestureAmount, static_cast<CGFloat>(0.25))); // When the gesture is very likely to be completed (90% in this case), grow // the semicircle's height and lock the alpha to 0.75. @@ -140,10 +140,11 @@ frame.origin.y = (NSHeight(parentFrame) / 2) - (height / 2); CGFloat width = std::min(kShieldRadius * gestureAmount, kShieldRadius); - if (_mode == kHistoryOverlayModeForward) + if (_mode == kHistoryOverlayModeForward) { frame.origin.x = NSMaxX(parentFrame) - width; - else if (_mode == kHistoryOverlayModeBack) + } else if (_mode == kHistoryOverlayModeBack) { frame.origin.x = NSMinX(parentFrame) - kShieldWidth + width; + } self.view.frame = frame; _contentView.shieldAlpha = shieldAlpha;
diff --git a/chrome/browser/ui/cocoa/history_overlay_controller_unittest.mm b/chrome/browser/ui/cocoa/history_overlay_controller_unittest.mm index 334c9af7..c17d14c 100644 --- a/chrome/browser/ui/cocoa/history_overlay_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/history_overlay_controller_unittest.mm
@@ -18,9 +18,7 @@ [[test_window() contentView] addSubview:test_view_]; } - NSView* test_view() { - return test_view_; - } + NSView* test_view() { return test_view_; } private: NSView* __strong test_view_;
diff --git a/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.h b/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.h index 8921028..5d0fe53 100644 --- a/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.h +++ b/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.h
@@ -19,7 +19,7 @@ namespace javascript_dialogs { class AppModalDialogController; class AppModalDialogView; -} +} // namespace javascript_dialogs namespace remote_cocoa { class AlertBridge;
diff --git a/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm b/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm index 1e7531d..e3a2b40 100644 --- a/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm +++ b/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm
@@ -111,8 +111,9 @@ case AlertDisposition::SECONDARY_BUTTON: // If the user wants to stay on this page, stop quitting (if a quit is in // progress). - if (controller_->is_before_unload_dialog()) + if (controller_->is_before_unload_dialog()) { chrome_browser_application_mac::CancelTerminate(); + } controller_->OnCancel(check_box_value); break; case AlertDisposition::CLOSE:
diff --git a/chrome/browser/ui/cocoa/keystone_infobar_delegate.cc b/chrome/browser/ui/cocoa/keystone_infobar_delegate.cc index 33e03455..4d3348f 100644 --- a/chrome/browser/ui/cocoa/keystone_infobar_delegate.cc +++ b/chrome/browser/ui/cocoa/keystone_infobar_delegate.cc
@@ -92,14 +92,15 @@ } std::u16string KeystonePromotionInfoBarDelegate::GetMessageText() const { - return l10n_util::GetStringFUTF16(IDS_PROMOTE_INFOBAR_TEXT, - l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); + return l10n_util::GetStringFUTF16( + IDS_PROMOTE_INFOBAR_TEXT, l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); } std::u16string KeystonePromotionInfoBarDelegate::GetButtonLabel( InfoBarButton button) const { - return l10n_util::GetStringUTF16((button == BUTTON_OK) ? - IDS_PROMOTE_INFOBAR_PROMOTE_BUTTON : IDS_PROMOTE_INFOBAR_DONT_ASK_BUTTON); + return l10n_util::GetStringUTF16((button == BUTTON_OK) + ? IDS_PROMOTE_INFOBAR_PROMOTE_BUTTON + : IDS_PROMOTE_INFOBAR_DONT_ASK_BUTTON); } bool KeystonePromotionInfoBarDelegate::Accept() {
diff --git a/chrome/browser/ui/cocoa/profiles/profile_menu_controller.mm b/chrome/browser/ui/cocoa/profiles/profile_menu_controller.mm index f7bf36c..e6ba2ec 100644 --- a/chrome/browser/ui/cocoa/profiles/profile_menu_controller.mm +++ b/chrome/browser/ui/cocoa/profiles/profile_menu_controller.mm
@@ -231,9 +231,10 @@ [self.menu addItem:[NSMenuItem separatorItem]]; - NSMenuItem* item = [self createItemWithTitle: - l10n_util::GetNSStringWithFixup(IDS_PROFILES_MANAGE_BUTTON_LABEL) - action:@selector(editProfile:)]; + NSMenuItem* item = + [self createItemWithTitle:l10n_util::GetNSStringWithFixup( + IDS_PROFILES_MANAGE_BUTTON_LABEL) + action:@selector(editProfile:)]; [self.menu addItem:item]; if (_avatarMenu->ShouldShowAddNewProfileLink()) {
diff --git a/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac.mm b/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac.mm index c2fa932..9b9c0f6 100644 --- a/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac.mm +++ b/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac.mm
@@ -61,28 +61,33 @@ RenderViewContextMenuMac::~RenderViewContextMenuMac() = default; void RenderViewContextMenuMac::ExecuteCommand(int command_id, int event_flags) { - if (command_id == IDC_CONTENT_CONTEXT_LOOK_UP) + if (command_id == IDC_CONTENT_CONTEXT_LOOK_UP) { LookUpInDictionary(); - else + } else { RenderViewContextMenu::ExecuteCommand(command_id, event_flags); + } } bool RenderViewContextMenuMac::IsCommandIdChecked(int command_id) const { - if (text_services_context_menu_.SupportsCommand(command_id)) + if (text_services_context_menu_.SupportsCommand(command_id)) { return text_services_context_menu_.IsCommandIdChecked(command_id); + } - if (command_id == IDC_CONTENT_CONTEXT_LOOK_UP) + if (command_id == IDC_CONTENT_CONTEXT_LOOK_UP) { return false; + } return RenderViewContextMenu::IsCommandIdChecked(command_id); } bool RenderViewContextMenuMac::IsCommandIdEnabled(int command_id) const { - if (text_services_context_menu_.SupportsCommand(command_id)) + if (text_services_context_menu_.SupportsCommand(command_id)) { return text_services_context_menu_.IsCommandIdEnabled(command_id); + } - if (command_id == IDC_CONTENT_CONTEXT_LOOK_UP) + if (command_id == IDC_CONTENT_CONTEXT_LOOK_UP) { return true; + } return RenderViewContextMenu::IsCommandIdEnabled(command_id); } @@ -108,8 +113,9 @@ DCHECK_NE(direction, base::i18n::UNKNOWN_DIRECTION); int command_id = IDC_WRITING_DIRECTION_LTR; - if (direction == base::i18n::RIGHT_TO_LEFT) + if (direction == base::i18n::RIGHT_TO_LEFT) { command_id = IDC_WRITING_DIRECTION_RTL; + } // Note: we get the local render frame host so that the writing mode settings // changes apply to the correct frame. See crbug.com/1129073 for a @@ -159,15 +165,17 @@ menu_model_.InsertSeparatorAt(index++, ui::NORMAL_SEPARATOR); } - if (!params_.selection_text.empty()) + if (!params_.selection_text.empty()) { text_services_context_menu_.AppendToContextMenu(&menu_model_); + } } void RenderViewContextMenuMac::LookUpInDictionary() { content::RenderWidgetHostView* view = GetRenderFrameHost()->GetRenderWidgetHost()->GetView(); - if (view) + if (view) { view->ShowDefinitionForSelection(); + } } int RenderViewContextMenuMac::ParamsForTextDirection(
diff --git a/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac_cocoa.mm b/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac_cocoa.mm index 9070be4..5e266a4 100644 --- a/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac_cocoa.mm +++ b/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac_cocoa.mm
@@ -36,15 +36,17 @@ int command_id) { for (size_t i = 0; i < model->GetItemCount(); ++i) { NSMenuItem* item = [menu itemAtIndex:i]; - if (model->GetCommandIdAt(i) == command_id) + if (model->GetCommandIdAt(i) == command_id) { return item; + } ui::MenuModel* submenu = model->GetSubmenuModelAt(i); if (submenu && [item hasSubmenu]) { NSMenuItem* subitem = GetMenuItemByID(submenu, [item submenu], command_id); - if (subitem) + if (subitem) { return subitem; + } } } return nil; @@ -59,12 +61,12 @@ const content::ContextMenuParams& params, NSView* parent_view) : RenderViewContextMenuMac(render_frame_host, params), - parent_view_(parent_view) { -} + parent_view_(parent_view) {} RenderViewContextMenuMacCocoa::~RenderViewContextMenuMacCocoa() { - if (menu_controller_) + if (menu_controller_) { [menu_controller_ cancel]; + } } void RenderViewContextMenuMacCocoa::Show() { @@ -104,8 +106,9 @@ const std::u16string& title) { NSMenuItem* item = GetMenuItemByID(&menu_model_, [menu_controller_ menu], command_id); - if (!item) + if (!item) { return; + } // Update the returned NSMenuItem directly so we can update it immediately. item.enabled = enabled;
diff --git a/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac_cocoa_browsertest.mm b/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac_cocoa_browsertest.mm index eb81205..afb652a 100644 --- a/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac_cocoa_browsertest.mm +++ b/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac_cocoa_browsertest.mm
@@ -2,11 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/cocoa/renderer_context_menu/chrome_swizzle_services_menu_updater.h" - #include "base/apple/foundation_util.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" +#include "chrome/browser/ui/cocoa/renderer_context_menu/chrome_swizzle_services_menu_updater.h" #include "chrome/browser/ui/extensions/application_launch.h" #include "chrome/test/base/in_process_browser_test.h" #include "content/public/test/browser_test.h"
diff --git a/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac_unittest.mm b/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac_unittest.mm index 0e239ee..745ebd9 100644 --- a/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac_unittest.mm +++ b/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac_unittest.mm
@@ -49,11 +49,13 @@ for (size_t i = 0; i < menu.GetItemCount(); ++i) { if (menu.GetTypeAt(i) == ui::MenuModel::TYPE_SUBMENU) { ui::MenuModel* submenu = menu.GetSubmenuModelAt(i); - if (MenuHasItemWithCommand(*submenu, command)) + if (MenuHasItemWithCommand(*submenu, command)) { return true; + } } - if (menu.GetCommandIdAt(i) == command) + if (menu.GetCommandIdAt(i) == command) { return true; + } } return false; }
diff --git a/chrome/browser/ui/cocoa/scoped_menu_bar_lock.mm b/chrome/browser/ui/cocoa/scoped_menu_bar_lock.mm index 7d28e8a..7a46068 100644 --- a/chrome/browser/ui/cocoa/scoped_menu_bar_lock.mm +++ b/chrome/browser/ui/cocoa/scoped_menu_bar_lock.mm
@@ -12,11 +12,13 @@ @end ScopedMenuBarLock::ScopedMenuBarLock() { - if ([NSMenu instancesRespondToSelector:@selector(_lockMenuPosition)]) + if ([NSMenu instancesRespondToSelector:@selector(_lockMenuPosition)]) { [NSApp.mainMenu _lockMenuPosition]; + } } ScopedMenuBarLock::~ScopedMenuBarLock() { - if ([NSMenu instancesRespondToSelector:@selector(_unlockMenuPosition)]) + if ([NSMenu instancesRespondToSelector:@selector(_unlockMenuPosition)]) { [NSApp.mainMenu _unlockMenuPosition]; + } }
diff --git a/chrome/browser/ui/cocoa/share_menu_controller.mm b/chrome/browser/ui/cocoa/share_menu_controller.mm index cffa3c8..53f09fa2 100644 --- a/chrome/browser/ui/cocoa/share_menu_controller.mm +++ b/chrome/browser/ui/cocoa/share_menu_controller.mm
@@ -96,8 +96,9 @@ for (NSSharingService* service in services) { // Don't include "Add to Reading List". if ([service.name - isEqualToString:NSSharingServiceNameAddToSafariReadingList]) + isEqualToString:NSSharingServiceNameAddToSafariReadingList]) { continue; + } NSMenuItem* item = [self menuItemForService:service]; [menu addItem:item]; }
diff --git a/chrome/browser/ui/cocoa/share_menu_controller_browsertest.mm b/chrome/browser/ui/cocoa/share_menu_controller_browsertest.mm index 969849e..46b7278 100644 --- a/chrome/browser/ui/cocoa/share_menu_controller_browsertest.mm +++ b/chrome/browser/ui/cocoa/share_menu_controller_browsertest.mm
@@ -112,8 +112,9 @@ NSUInteger i = 0; // Ensure there's a menu item for each service besides reading list. for (NSSharingService* service in sharing_services_for_url) { - if ([service isEqual:reading_list_service]) + if ([service isEqual:reading_list_service]) { continue; + } NSMenuItem* menu_item = [menu itemAtIndex:i]; EXPECT_NSEQ(menu_item.representedObject, service); EXPECT_EQ(menu_item.target, static_cast<id>(controller_)); @@ -198,10 +199,11 @@ tester.ExpectBucketCount(histogram_name, true, 2); tester.ExpectTotalCount(histogram_name, 2); - [controller_ - sharingService:service - didFailToShareItems:@[] - error:[NSError errorWithDomain:@"" code:0 userInfo:nil]]; + [controller_ sharingService:service + didFailToShareItems:@[] + error:[NSError errorWithDomain:@"" + code:0 + userInfo:nil]]; tester.ExpectTotalCount(histogram_name, 3); tester.ExpectBucketCount(histogram_name, false, 1); }
diff --git a/chrome/browser/ui/cocoa/simple_message_box_cocoa.mm b/chrome/browser/ui/cocoa/simple_message_box_cocoa.mm index b5d23de..fc01f9c 100644 --- a/chrome/browser/ui/cocoa/simple_message_box_cocoa.mm +++ b/chrome/browser/ui/cocoa/simple_message_box_cocoa.mm
@@ -23,8 +23,9 @@ MessageBoxType type, std::u16string_view checkbox_text) { startup_metric_utils::GetBrowser().SetNonBrowserUIDisplayed(); - if (internal::g_should_skip_message_box_for_test) + if (internal::g_should_skip_message_box_for_test) { return MESSAGE_BOX_RESULT_YES; + } NSAlert* alert = [[NSAlert alloc] init]; alert.messageText = base::SysUTF16ToNSString(message); @@ -48,8 +49,9 @@ } NSInteger result = [alert runModal]; - if (result == NSAlertSecondButtonReturn) + if (result == NSAlertSecondButtonReturn) { return MESSAGE_BOX_RESULT_NO; + } if (!checkbox || (checkbox.state == NSControlStateValueOn)) { return MESSAGE_BOX_RESULT_YES;
diff --git a/chrome/browser/ui/cocoa/status_icons/status_icon_mac.mm b/chrome/browser/ui/cocoa/status_icons/status_icon_mac.mm index f01c4df..ca75cd65 100644 --- a/chrome/browser/ui/cocoa/status_icons/status_icon_mac.mm +++ b/chrome/browser/ui/cocoa/status_icons/status_icon_mac.mm
@@ -23,7 +23,7 @@ - (instancetype)initWithIcon:(StatusIconMac*)icon; - (void)handleClick:(id)sender; -@end // @interface StatusItemController +@end // @interface StatusItemController @implementation StatusItemController
diff --git a/chrome/browser/ui/cocoa/tab_contents/web_contents_view_mac_interactive_uitest.mm b/chrome/browser/ui/cocoa/tab_contents/web_contents_view_mac_interactive_uitest.mm index 4236f67..c7c785d 100644 --- a/chrome/browser/ui/cocoa/tab_contents/web_contents_view_mac_interactive_uitest.mm +++ b/chrome/browser/ui/cocoa/tab_contents/web_contents_view_mac_interactive_uitest.mm
@@ -42,8 +42,9 @@ TabStripModel* tab_strip_model, const TabStripModelChange& change, const TabStripSelectionChange& selection) override { - if (change.type() == TabStripModelChange::kRemoved) + if (change.type() == TabStripModelChange::kRemoved) { run_loop_.Quit(); + } } private:
diff --git a/chrome/browser/ui/cocoa/tab_contents/web_drag_bookmark_handler_mac.mm b/chrome/browser/ui/cocoa/tab_contents/web_drag_bookmark_handler_mac.mm index 156bc7f..bf340208 100644 --- a/chrome/browser/ui/cocoa/tab_contents/web_drag_bookmark_handler_mac.mm +++ b/chrome/browser/ui/cocoa/tab_contents/web_drag_bookmark_handler_mac.mm
@@ -19,8 +19,9 @@ void WebDragBookmarkHandlerMac::DragInitialize(WebContents* contents) { web_contents_ = contents; - if (!bookmark_tab_helper_) + if (!bookmark_tab_helper_) { bookmark_tab_helper_ = BookmarkTabHelper::FromWebContents(contents); + } bookmark_drag_data_.ReadFromClipboard(ui::ClipboardBuffer::kDrag); } @@ -50,8 +51,9 @@ // Focus the target browser. Browser* browser = chrome::FindBrowserWithTab(web_contents_); - if (browser) + if (browser) { browser->window()->Show(); + } } }
diff --git a/chrome/browser/ui/cocoa/tab_menu_bridge.mm b/chrome/browser/ui/cocoa/tab_menu_bridge.mm index 948c30c..b185534 100644 --- a/chrome/browser/ui/cocoa/tab_menu_bridge.mm +++ b/chrome/browser/ui/cocoa/tab_menu_bridge.mm
@@ -94,8 +94,9 @@ } TabMenuBridge::~TabMenuBridge() { - if (model_) + if (model_) { model_->RemoveObserver(this); + } RemoveMenuItems(DynamicMenuItems()); } @@ -151,8 +152,9 @@ } void TabMenuBridge::OnDynamicItemChosen(NSMenuItem* item) { - if (!model_) + if (!model_) { return; + } DCHECK_EQ(item.target, menu_listener_); int index = [menu_item_.submenu indexOfItem:item] - dynamic_items_start_; @@ -174,7 +176,7 @@ const TabStripModelChange::Replace* replace = change.GetReplace(); int menu_index = replace->index + dynamic_items_start_; UpdateItemForWebContents([menu_item_.submenu itemAtIndex:menu_index], - replace->new_contents); + replace -> new_contents); return; } @@ -188,8 +190,9 @@ // Ignore loading state changes - they happen very often during page load and // are used to drive the load spinner, which is not interesting to this menu. - if (change_type == TabChangeType::kLoadingOnly) + if (change_type == TabChangeType::kLoadingOnly) { return; + } int menu_index = index + dynamic_items_start_; @@ -205,8 +208,9 @@ // As such, this code early-outs instead of DCHECKing. The newly-added // WebContents will be picked up later anyway when this object does get // notified of the addition. - if (menu_index < 0 || menu_index >= menu_item_.submenu.numberOfItems) + if (menu_index < 0 || menu_index >= menu_item_.submenu.numberOfItems) { return; + } NSMenuItem* item = [menu_item_.submenu itemAtIndex:menu_index]; UpdateItemForWebContents(item, contents);
diff --git a/chrome/browser/ui/cocoa/tab_menu_bridge_unittest.mm b/chrome/browser/ui/cocoa/tab_menu_bridge_unittest.mm index cdfa2e53..c07988d 100644 --- a/chrome/browser/ui/cocoa/tab_menu_bridge_unittest.mm +++ b/chrome/browser/ui/cocoa/tab_menu_bridge_unittest.mm
@@ -82,8 +82,9 @@ int ModelIndexForTabNamed(const std::string& name) { std::u16string title16 = base::UTF8ToUTF16(name); for (int i = 0; i < model()->count(); ++i) { - if (model()->GetWebContentsAt(i)->GetTitle() == title16) + if (model()->GetWebContentsAt(i)->GetTitle() == title16) { return i; + } } return -1; } @@ -136,8 +137,9 @@ } ASSERT_EQ(actual_titles.size(), titles.size()); - for (int i = 0; i < static_cast<int>(titles.size()); ++i) + for (int i = 0; i < static_cast<int>(titles.size()); ++i) { EXPECT_EQ(actual_titles[i], titles[i]); + } } std::string ActiveTabName() { @@ -149,8 +151,9 @@ // Check the static items too, to make sure none of them are checked. for (int i = 0; i < menu().numberOfItems; ++i) { NSMenuItem* item = [menu() itemAtIndex:i]; - if (item.state == NSControlStateValueOn) + if (item.state == NSControlStateValueOn) { active_items.push_back(base::SysNSStringToUTF8(item.title)); + } } ASSERT_EQ(active_items.size(), 1u);
diff --git a/chrome/browser/ui/cocoa/task_manager_mac.mm b/chrome/browser/ui/cocoa/task_manager_mac.mm index eb4327f..f5b9e9c 100644 --- a/chrome/browser/ui/cocoa/task_manager_mac.mm +++ b/chrome/browser/ui/cocoa/task_manager_mac.mm
@@ -118,8 +118,9 @@ - (void)sortShuffleArray { _viewToModelMap.resize(_tableModel->RowCount()); - for (size_t i = 0; i < _viewToModelMap.size(); ++i) + for (size_t i = 0; i < _viewToModelMap.size(); ++i) { _viewToModelMap[i] = i; + } if (_currentSortDescriptor.sorted_column_id != -1) { task_manager::TaskManagerTableModel* tableModel = _tableModel; @@ -143,15 +144,17 @@ int cmp_result = tableModel->CompareValues( aStart, bStart, currentSortDescriptor.sorted_column_id); - if (!currentSortDescriptor.is_ascending) + if (!currentSortDescriptor.is_ascending) { cmp_result = -cmp_result; + } return cmp_result < 0; }); } _modelToViewMap.resize(_viewToModelMap.size()); - for (size_t i = 0; i < _viewToModelMap.size(); ++i) + for (size_t i = 0; i < _viewToModelMap.size(); ++i) { _modelToViewMap[_viewToModelMap[i]] = i; + } } - (void)reloadData { @@ -177,8 +180,9 @@ // Reload the selection. NSMutableIndexSet* indexSet = [NSMutableIndexSet indexSet]; - for (auto selectedItem : modelSelection) + for (auto selectedItem : modelSelection) { [indexSet addIndex:_modelToViewMap[selectedItem]]; + } [_tableView selectRowIndexes:indexSet byExtendingSelection:NO]; [self adjustSelectionAndEndProcessButton]; @@ -190,8 +194,9 @@ // Adjust for any added rows. for (size_t& selectedItem : modelSelection) { - if (selectedItem >= addedRowIndex) + if (selectedItem >= addedRowIndex) { selectedItem += addedRows; + } } [self reloadDataWithModelSelection:std::move(modelSelection)]; @@ -204,10 +209,11 @@ // Adjust for any removed rows. std::vector<size_t> newModelSelection; for (size_t selectedItem : modelSelection) { - if (selectedItem < removedRowIndex) + if (selectedItem < removedRowIndex) { newModelSelection.push_back(selectedItem); - else if (selectedItem >= removedRowIndex + removedRows) + } else if (selectedItem >= removedRowIndex + removedRows) { newModelSelection.push_back(selectedItem - removedRows); + } } [self reloadDataWithModelSelection:std::move(newModelSelection)]; @@ -249,8 +255,9 @@ - (void)tableWasDoubleClicked:(id)sender { NSInteger row = _tableView.clickedRow; - if (row < 0) + if (row < 0) { return; // Happens e.g. if the table header is double-clicked. + } _tableModel->ActivateTask(_viewToModelMap[row]); } @@ -449,8 +456,9 @@ // column associated with the clicked menu item. - (void)toggleColumn:(NSMenuItem*)item { CHECK([item isKindOfClass:[NSMenuItem class]]); - if (![item isKindOfClass:[NSMenuItem class]]) + if (![item isKindOfClass:[NSMenuItem class]]) { return; + } NSTableColumn* column = item.representedObject; int columnId = column.identifier.intValue; @@ -515,13 +523,15 @@ i = [selection indexLessThanIndex:i]) { int modelIndex = _viewToModelMap[i]; - if (!_tableModel->IsTaskKillable(modelIndex)) + if (!_tableModel->IsTaskKillable(modelIndex)) { allSelectionRowsAreKillableTasks = false; + } size_t groupStart, groupLength; _tableModel->GetRowsGroupRange(modelIndex, &groupStart, &groupLength); - for (size_t j = 0; j < groupLength; ++j) + for (size_t j = 0; j < groupLength; ++j) { [groupIndexes addIndex:_modelToViewMap[groupStart + j]]; + } } [_tableView selectRowIndexes:groupIndexes byExtendingSelection:YES]; @@ -632,8 +642,9 @@ - (void)tableView:(NSTableView*)tableView sortDescriptorsDidChange:(NSArray*)oldDescriptors { - if (_withinSortDescriptorsDidChange) + if (_withinSortDescriptorsDidChange) { return; + } NSSortDescriptor* oldDescriptor = oldDescriptors.firstObject; NSSortDescriptor* newDescriptor = tableView.sortDescriptors.firstObject; @@ -791,8 +802,9 @@ // static void TaskManagerMac::Hide() { - if (instance_) + if (instance_) { [instance_->window_controller_ close]; + } } } // namespace task_manager
diff --git a/chrome/browser/ui/cocoa/task_manager_mac_browsertest.mm b/chrome/browser/ui/cocoa/task_manager_mac_browsertest.mm index 17c7ab1..2c438fa 100644 --- a/chrome/browser/ui/cocoa/task_manager_mac_browsertest.mm +++ b/chrome/browser/ui/cocoa/task_manager_mac_browsertest.mm
@@ -7,6 +7,8 @@ #pragma allow_unsafe_buffers #endif +#include "chrome/browser/ui/cocoa/task_manager_mac.h" + #import <Cocoa/Cocoa.h> #include <Foundation/Foundation.h> #include <stddef.h> @@ -20,7 +22,6 @@ #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/browser/ui/browser_tabstrip.h" -#include "chrome/browser/ui/cocoa/task_manager_mac.h" #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h" #include "chrome/browser/ui/task_manager/task_manager_columns.h" #include "chrome/browser/ui/task_manager/task_manager_table_model.h" @@ -91,8 +92,9 @@ void ClearStoredColumnSettings() const { PrefService* local_state = g_browser_process->local_state(); - if (!local_state) + if (!local_state) { FAIL(); + } local_state->SetDict(prefs::kTaskManagerColumnVisibility, base::Value::Dict()); @@ -119,8 +121,9 @@ std::unique_ptr<TaskManagerTester> tester = TaskManagerTester::Create(base::RepeatingClosure()); for (size_t i = 0; i < tester->GetRowCount(); ++i) { - if (tester->GetTabId(i) == tab_id) + if (tester->GetTabId(i) == tab_id) { return i; + } } return std::nullopt; } @@ -129,8 +132,9 @@ // Tests that all defined columns have a corresponding string IDs for keying // into the user preferences dictionary. IN_PROC_BROWSER_TEST_F(TaskManagerMacTest, AllColumnsHaveStringIds) { - for (size_t i = 0; i < kColumnsSize; ++i) + for (size_t i = 0; i < kColumnsSize; ++i) { EXPECT_NE("", GetColumnIdAsString(kColumns[i].id)); + } } // In the case of no settings stored in the user preferences local store, test @@ -303,8 +307,9 @@ std::vector<content::WebContents*> tabs; for (size_t i = 0; i < tester->GetRowCount(); ++i) { // Filter based on our title. - if (!base::MatchPattern(tester->GetRowTitle(i), pattern)) + if (!base::MatchPattern(tester->GetRowTitle(i), pattern)) { continue; + } content::WebContents* tab = FindWebContentsByTabId(tester->GetTabId(i)); EXPECT_NE(nullptr, tab); tabs.push_back(tab); @@ -405,8 +410,9 @@ std::vector<content::WebContents*> tabs; for (size_t i = 0; i < tester->GetRowCount(); ++i) { // Filter based on our title. - if (!base::MatchPattern(tester->GetRowTitle(i), pattern)) + if (!base::MatchPattern(tester->GetRowTitle(i), pattern)) { continue; + } content::WebContents* tab = FindWebContentsByTabId(tester->GetTabId(i)); EXPECT_NE(nullptr, tab); tabs.push_back(tab);
diff --git a/chrome/browser/ui/cocoa/touchbar/browser_window_default_touch_bar.h b/chrome/browser/ui/cocoa/touchbar/browser_window_default_touch_bar.h index 008d530c..f4f9e78 100644 --- a/chrome/browser/ui/cocoa/touchbar/browser_window_default_touch_bar.h +++ b/chrome/browser/ui/cocoa/touchbar/browser_window_default_touch_bar.h
@@ -13,7 +13,7 @@ // Provides a default touch bar for the browser window. This class implements // the NSTouchBarDelegate and handles the items in the touch bar. -@interface BrowserWindowDefaultTouchBar : NSObject<NSTouchBarDelegate> +@interface BrowserWindowDefaultTouchBar : NSObject <NSTouchBarDelegate> // True is the current page is loading. Used to determine if a stop or reload // button should be provided. @property(nonatomic, assign) BOOL isPageLoading;
diff --git a/chrome/browser/ui/cocoa/touchbar/browser_window_default_touch_bar.mm b/chrome/browser/ui/cocoa/touchbar/browser_window_default_touch_bar.mm index a21c0c4..6669a876 100644 --- a/chrome/browser/ui/cocoa/touchbar/browser_window_default_touch_bar.mm +++ b/chrome/browser/ui/cocoa/touchbar/browser_window_default_touch_bar.mm
@@ -2,14 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/memory/raw_ptr.h" - #import "chrome/browser/ui/cocoa/touchbar/browser_window_default_touch_bar.h" #include <memory> #include "base/functional/bind.h" #include "base/mac/mac_util.h" +#include "base/memory/raw_ptr.h" #include "base/strings/sys_string_conversions.h" #include "build/branding_buildflags.h" #include "chrome/app/chrome_command_ids.h" @@ -163,10 +162,12 @@ void UpdateTouchBar() { [[owner_ controller] invalidateTouchBar]; } void UpdateWebContents(content::WebContents* new_contents) { - if (contents_ == new_contents) + if (contents_ == new_contents) { return; - if (contents_) + } + if (contents_) { BookmarkTabHelper::FromWebContents(contents_)->RemoveObserver(this); + } contents_ = new_contents; @@ -176,8 +177,9 @@ BookmarkTabHelper* bookmark_helper = contents_ ? BookmarkTabHelper::FromWebContents(contents_) : nullptr; - if (bookmark_helper) + if (bookmark_helper) { bookmark_helper->AddObserver(this); + } owner_.isPageLoading = contents_ && contents_->IsLoading(); owner_.isStarred = bookmark_helper && bookmark_helper->is_starred(); @@ -195,10 +197,11 @@ // CommandObserver: void EnabledStateChangedForCommand(int command, bool enabled) override { DCHECK(command == IDC_BACK || command == IDC_FORWARD); - if (command == IDC_BACK) + if (command == IDC_BACK) { owner_.canGoBack = enabled; - else if (command == IDC_FORWARD) + } else if (command == IDC_FORWARD) { owner_.canGoForward = enabled; + } } // TabStripModelObserver: @@ -210,8 +213,9 @@ } void OnBrowserRemoved(Browser* browser) override { - if (browser == owner_.browser) + if (browser == owner_.browser) { owner_.browser = nullptr; + } } // WebContentsObserver: @@ -234,7 +238,7 @@ private: BrowserWindowDefaultTouchBar* __weak owner_; - raw_ptr<Browser> browser_; // Weak. + raw_ptr<Browser> browser_; // Weak. raw_ptr<content::WebContents> contents_; // Weak. // Used to monitor the optional home button pref. @@ -305,8 +309,9 @@ - (NSTouchBarItem*)touchBar:(NSTouchBar*)touchBar makeItemForIdentifier:(NSTouchBarItemIdentifier)identifier { - if (!touchBar) + if (!touchBar) { return nil; + } if ([identifier hasSuffix:kBackForwardTouchId]) { auto* items = @[ @@ -377,8 +382,9 @@ content::WebContents* contents = _browser->tab_strip_model()->GetActiveWebContents(); - if (!contents) + if (!contents) { return nil; + } // Strip the trailing slash. url::Parsed parsed; @@ -471,8 +477,9 @@ } - (void)setBrowser:(Browser*)browser { - if (_browser == browser) + if (_browser == browser) { return; + } _browser = browser; _notificationBridge.reset( _browser ? new TouchBarNotificationBridge(self, _browser) : nullptr); @@ -554,8 +561,9 @@ image = CreateNSImageFromIcon(vector_icons::kSearchIcon); } #endif - if (!image) + if (!image) { image = CreateNSImageFromIcon(vector_icons::kSearchIcon); + } if (!_searchButton) { _searchButton = [NSButton buttonWithTitle:buttonTitle
diff --git a/chrome/browser/ui/cocoa/touchbar/browser_window_default_touch_bar_unittest.mm b/chrome/browser/ui/cocoa/touchbar/browser_window_default_touch_bar_unittest.mm index ec575df..497de63 100644 --- a/chrome/browser/ui/cocoa/touchbar/browser_window_default_touch_bar_unittest.mm +++ b/chrome/browser/ui/cocoa/touchbar/browser_window_default_touch_bar_unittest.mm
@@ -2,12 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/memory/raw_ptr.h" +#import "chrome/browser/ui/cocoa/touchbar/browser_window_default_touch_bar.h" #import <Cocoa/Cocoa.h> #include "base/apple/foundation_util.h" #include "base/mac/mac_util.h" +#include "base/memory/raw_ptr.h" #include "base/strings/sys_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/command_updater.h" @@ -15,7 +16,6 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_command_controller.h" #include "chrome/browser/ui/cocoa/test/cocoa_test_helper.h" -#import "chrome/browser/ui/cocoa/touchbar/browser_window_default_touch_bar.h" #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h" #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/ui/cocoa/touchbar/browser_window_touch_bar_controller.mm b/chrome/browser/ui/cocoa/touchbar/browser_window_touch_bar_controller.mm index 9d873b6..8af0ddc 100644 --- a/chrome/browser/ui/cocoa/touchbar/browser_window_touch_bar_controller.mm +++ b/chrome/browser/ui/cocoa/touchbar/browser_window_touch_bar_controller.mm
@@ -52,8 +52,9 @@ - (NSTouchBar*)makeTouchBar { NSTouchBar* touchBar = [_webTextfieldTouchBar makeTouchBar]; - if (touchBar) + if (touchBar) { return touchBar; + } return [_defaultTouchBar makeTouchBar]; }
diff --git a/chrome/browser/ui/cocoa/touchbar/browser_window_touch_bar_controller_browsertest.mm b/chrome/browser/ui/cocoa/touchbar/browser_window_touch_bar_controller_browsertest.mm index ccabb08..0d634d2 100644 --- a/chrome/browser/ui/cocoa/touchbar/browser_window_touch_bar_controller_browsertest.mm +++ b/chrome/browser/ui/cocoa/touchbar/browser_window_touch_bar_controller_browsertest.mm
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#import "chrome/browser/ui/cocoa/touchbar/browser_window_touch_bar_controller.h" + #import "base/apple/foundation_util.h" #include "base/apple/scoped_objc_class_swizzler.h" #include "chrome/app/chrome_command_ids.h" @@ -12,7 +14,6 @@ #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_window.h" #import "chrome/browser/ui/cocoa/touchbar/browser_window_default_touch_bar.h" -#import "chrome/browser/ui/cocoa/touchbar/browser_window_touch_bar_controller.h" #include "chrome/browser/ui/views/frame/browser_frame_mac.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/common/pref_names.h" @@ -174,8 +175,9 @@ BrowserView* browser_view = BrowserView::GetBrowserViewForNativeWindow(native_window()); EXPECT_TRUE(browser_view); - if (!browser_view) + if (!browser_view) { return nil; + } BrowserFrameMac* browser_frame = static_cast<BrowserFrameMac*>( browser_view->frame()->native_browser_frame());
diff --git a/chrome/browser/ui/cocoa/window_size_autosaver.mm b/chrome/browser/ui/cocoa/window_size_autosaver.mm index 1f735b3..7a6b7b31 100644 --- a/chrome/browser/ui/cocoa/window_size_autosaver.mm +++ b/chrome/browser/ui/cocoa/window_size_autosaver.mm
@@ -108,8 +108,9 @@ } else { std::optional<int> x = windowPrefs.FindInt("x"); std::optional<int> y = windowPrefs.FindInt("y"); - if (!x.has_value() || !y.has_value()) + if (!x.has_value() || !y.has_value()) { return; // Nothing stored. + } // Turn the origin (lower-left) into an upper-left window point. NSPoint upperLeft = NSMakePoint(x.value(), y.value() + NSHeight([_window frame]));
diff --git a/chrome/browser/ui/cocoa/window_size_autosaver_unittest.mm b/chrome/browser/ui/cocoa/window_size_autosaver_unittest.mm index 966beab..8c9eb76f 100644 --- a/chrome/browser/ui/cocoa/window_size_autosaver_unittest.mm +++ b/chrome/browser/ui/cocoa/window_size_autosaver_unittest.mm
@@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import <Cocoa/Cocoa.h> - #import "chrome/browser/ui/cocoa/window_size_autosaver.h" +#import <Cocoa/Cocoa.h> + #include "chrome/browser/ui/cocoa/test/cocoa_test_helper.h" #include "chrome/test/base/browser_with_test_window_test.h" #include "chrome/test/base/testing_profile.h"
diff --git a/chrome/browser/ui/color/chrome_color_id.h b/chrome/browser/ui/color/chrome_color_id.h index 836633d..7437311 100644 --- a/chrome/browser/ui/color/chrome_color_id.h +++ b/chrome/browser/ui/color/chrome_color_id.h
@@ -778,6 +778,7 @@ E_CPONLY(kColorTabSearchImageWindowFrame) \ E_CPONLY(kColorTabSearchMediaIcon) \ E_CPONLY(kColorTabSearchMediaRecordingIcon) \ + E_CPONLY(kColorTabSearchMediaGlicActiveIcon) \ E_CPONLY(kColorTabSearchPrimaryForeground) \ E_CPONLY(kColorTabSearchSecondaryForeground) \ E_CPONLY(kColorTabSearchSelected) \
diff --git a/chrome/browser/ui/color/chrome_color_provider_utils.cc b/chrome/browser/ui/color/chrome_color_provider_utils.cc index 357e9bf..71a95566 100644 --- a/chrome/browser/ui/color/chrome_color_provider_utils.cc +++ b/chrome/browser/ui/color/chrome_color_provider_utils.cc
@@ -15,7 +15,6 @@ #include "chrome/browser/ui/color/chrome_color_id.h" #include "ui/base/buildflags.h" #include "ui/base/ui_base_features.h" - #include "ui/color/color_id_map_macros.inc" std::string ChromeColorIdName(ui::ColorId color_id) { @@ -29,8 +28,9 @@ color_utils::HSL GetThemeTint(int id, const ui::ColorProviderKey& key) { #if !BUILDFLAG(IS_ANDROID) color_utils::HSL hsl; - if (key.custom_theme && key.custom_theme->GetTint(id, &hsl)) + if (key.custom_theme && key.custom_theme->GetTint(id, &hsl)) { return hsl; + } using ThemeType = ui::ColorProviderKey::ThemeInitializerSupplier::ThemeType; const bool is_custom_theme = key.custom_theme &&
diff --git a/chrome/browser/ui/color/linux/native_chrome_color_mixer_linux.cc b/chrome/browser/ui/color/linux/native_chrome_color_mixer_linux.cc index df23429..7a2ff80 100644 --- a/chrome/browser/ui/color/linux/native_chrome_color_mixer_linux.cc +++ b/chrome/browser/ui/color/linux/native_chrome_color_mixer_linux.cc
@@ -29,8 +29,8 @@ const SkColor transform_color = transform.Run(input_color, mixer); const SkColor result_color = SkColorGetA(transform_color) ? transform_color : input_color; - DVLOG(2) << "ColorTransform UseIfNonzeroAlpha:" - << " Input Color: " << ui::SkColorName(input_color) + DVLOG(2) << "ColorTransform UseIfNonzeroAlpha:" << " Input Color: " + << ui::SkColorName(input_color) << " Transform Color: " << ui::SkColorName(transform_color) << " Result Color: " << ui::SkColorName(result_color); return result_color; @@ -50,8 +50,10 @@ color_utils::BlendForMinContrast(toolbar, toolbar, gfx::kGoogleGrey900, kMinContrastRatio) .color; - if (color_utils::GetContrastRatio(separator, toolbar) >= kMinContrastRatio) + if (color_utils::GetContrastRatio(separator, toolbar) >= + kMinContrastRatio) { return separator; + } // If a darker separator didn't give good enough contrast, try a lighter // separator. return color_utils::BlendForMinContrast(toolbar, toolbar, SK_ColorWHITE, @@ -66,8 +68,9 @@ void AddNativeChromeColorMixer(ui::ColorProvider* provider, const ui::ColorProviderKey& key) { - if (key.system_theme == ui::SystemTheme::kDefault) + if (key.system_theme == ui::SystemTheme::kDefault) { return; + } ui::ColorMixer& mixer = provider->AddMixer(); mixer[kColorBookmarkBarSeparator] = {kColorToolbarSeparatorDefault};
diff --git a/chrome/browser/ui/color/material_chrome_color_mixer.cc b/chrome/browser/ui/color/material_chrome_color_mixer.cc index 6104b5b..a4cc512 100644 --- a/chrome/browser/ui/color/material_chrome_color_mixer.cc +++ b/chrome/browser/ui/color/material_chrome_color_mixer.cc
@@ -156,6 +156,7 @@ mixer[kColorTabSearchImageWindowFrame] = {ui::kColorSysInversePrimary}; mixer[kColorTabSearchMediaIcon] = {ui::kColorSysOnSurfaceSubtle}; mixer[kColorTabSearchMediaRecordingIcon] = {ui::kColorSysError}; + mixer[kColorTabSearchMediaGlicActiveIcon] = {ui::kColorSysPrimary}; mixer[kColorTabSearchPrimaryForeground] = {ui::kColorSysOnSurface}; mixer[kColorTabSearchSecondaryForeground] = {ui::kColorSysOnSurfaceSubtle}; mixer[kColorTabSearchSelected] = {ui::kColorSysPrimary};
diff --git a/chrome/browser/ui/color/material_new_tab_page_color_mixer.cc b/chrome/browser/ui/color/material_new_tab_page_color_mixer.cc index a042977..a6d8036b 100644 --- a/chrome/browser/ui/color/material_new_tab_page_color_mixer.cc +++ b/chrome/browser/ui/color/material_new_tab_page_color_mixer.cc
@@ -121,7 +121,8 @@ mixer[kColorSearchboxResultsIconFocusedOutline] = { kColorOmniboxResultsButtonIconSelected}; mixer[kColorSearchboxResultsUrl] = {kColorOmniboxResultsUrl}; - mixer[kColorSearchboxResultsUrlSelected] = {kColorOmniboxResultsUrlSelected}; + mixer[kColorSearchboxResultsUrlSelected] = { + kColorOmniboxResultsUrlSelected}; mixer[kColorSearchboxShadow] = ui::SetAlpha(gfx::kGoogleGrey900, (dark_mode ? /* % opacity */ 0.32 : 0.1) * SK_AlphaOPAQUE); @@ -133,7 +134,8 @@ mixer[kColorSearchboxResultsBackground] = { kColorToolbarBackgroundSubtleEmphasis}; } else { - mixer[kColorSearchboxResultsBackground] = {kColorOmniboxResultsBackground}; + mixer[kColorSearchboxResultsBackground] = { + kColorOmniboxResultsBackground}; } } // LINT.ThenChange(chrome/browser/ui/color/new_tab_page_color_mixer.cc)
diff --git a/chrome/browser/ui/color/new_tab_page_color_mixer.cc b/chrome/browser/ui/color/new_tab_page_color_mixer.cc index 09438ee..0cb1a4b 100644 --- a/chrome/browser/ui/color/new_tab_page_color_mixer.cc +++ b/chrome/browser/ui/color/new_tab_page_color_mixer.cc
@@ -52,8 +52,7 @@ result.l += (1 - result.l) * percent; const SkColor result_color = color_utils::HSLToSkColor(result, SkColorGetA(color)); - DVLOG(2) << "ColorTransform IncreaseLightness:" - << " Percent: " << percent + DVLOG(2) << "ColorTransform IncreaseLightness:" << " Percent: " << percent << " Transform Color: " << ui::SkColorName(color) << " Result Color: " << ui::SkColorName(result_color); return result_color; @@ -228,7 +227,7 @@ /* 90% opacity */ 0.9 * SK_AlphaOPAQUE); mixer[kColorNewTabPageText] = SelectBasedOnDarkInput( element_background_color, gfx::kGoogleGrey200, gfx::kGoogleGrey900); - // Styling for Doodle Share Button. + // Styling for Doodle Share Button. mixer[kColorNewTabPageDoodleShareButtonBackground] = element_background_color; mixer[kColorNewTabPageDoodleShareButtonIcon] = primary_foreground_color; } @@ -321,8 +320,10 @@ mixer[kColorNewTabPageTextLight] = IncreaseLightness(kColorNewTabPageText, 0.40); - mixer[kColorSearchboxAnswerIconBackground] = {SkColorSetRGB(0xD3, 0xE3, 0xFD)}; - mixer[kColorSearchboxAnswerIconForeground] = {SkColorSetRGB(0x04, 0x1E, 0x49)}; + mixer[kColorSearchboxAnswerIconBackground] = { + SkColorSetRGB(0xD3, 0xE3, 0xFD)}; + mixer[kColorSearchboxAnswerIconForeground] = { + SkColorSetRGB(0x04, 0x1E, 0x49)}; mixer[kColorSearchboxBackground] = {SK_ColorWHITE}; mixer[kColorSearchboxBackgroundHovered] = {SK_ColorWHITE}; mixer[kColorSearchboxBorder] = { @@ -339,7 +340,8 @@ kColorSearchboxResultsBackgroundHovered}; mixer[kColorSearchboxResultsActionChip] = {SkColorSetRGB(0xA8, 0xC7, 0xFA)}; - mixer[kColorSearchboxResultsActionChipIcon] = {SkColorSetRGB(0x0B, 0x57, 0xD0)}; + mixer[kColorSearchboxResultsActionChipIcon] = { + SkColorSetRGB(0x0B, 0x57, 0xD0)}; mixer[kColorSearchboxResultsActionChipFocusOutline] = { SkColorSetRGB(0x0B, 0x57, 0xD0)}; mixer[kColorSearchboxResultsDimSelected] = {gfx::kGoogleGrey700};
diff --git a/chrome/browser/ui/color/new_tab_page_color_mixer_unittest.cc b/chrome/browser/ui/color/new_tab_page_color_mixer_unittest.cc index afdf5ff..c60db3d 100644 --- a/chrome/browser/ui/color/new_tab_page_color_mixer_unittest.cc +++ b/chrome/browser/ui/color/new_tab_page_color_mixer_unittest.cc
@@ -28,8 +28,9 @@ ui::ColorMixer& mixer = provider.AddMixer(); mixer[kColorToolbar] = {toolbar_color}; ui::ColorProviderKey key; - if (color_utils::IsDark(toolbar_color)) + if (color_utils::IsDark(toolbar_color)) { key.color_mode = ui::ColorProviderKey::ColorMode::kDark; + } AddNewTabPageColorMixer(&provider, key); EXPECT_EQ(provider.GetColor(kColorToolbar), toolbar_color);
diff --git a/chrome/browser/ui/color/tools/dump_colors.cc b/chrome/browser/ui/color/tools/dump_colors.cc index 0ba9e55..33bd245 100644 --- a/chrome/browser/ui/color/tools/dump_colors.cc +++ b/chrome/browser/ui/color/tools/dump_colors.cc
@@ -45,8 +45,9 @@ std::string SkColorToString(SkColor color) { std::string color_string = ui::SkColorName(color); // Don't use the rgba() representation here. Just fall back to simple hex. - if (color_string.find_first_of("rgb") == 0) + if (color_string.find_first_of("rgb") == 0) { color_string = base::StringPrintf("#%.8x", color); + } // Now format it into the necessary space. return base::StringPrintf("%-*s", int{kColorColumnWidth}, color_string.c_str()); @@ -76,8 +77,9 @@ ui::ColorProviderKey::ContrastMode::kHigh); size_t longest_name = 0; - for (const char* name : enum_names) + for (const char* name : enum_names) { longest_name = std::max(longest_name, strlen(name)); + } ++longest_name; // For trailing space. std::cout << std::setfill(' ') << std::left;
diff --git a/chrome/browser/ui/color/win/native_chrome_color_mixer_win.cc b/chrome/browser/ui/color/win/native_chrome_color_mixer_win.cc index c22cab5..2bb0274 100644 --- a/chrome/browser/ui/color/win/native_chrome_color_mixer_win.cc +++ b/chrome/browser/ui/color/win/native_chrome_color_mixer_win.cc
@@ -84,8 +84,9 @@ auto get_theme_color = [key](int id) -> std::optional<SkColor> { SkColor theme_color; - if (key.custom_theme && key.custom_theme->GetColor(id, &theme_color)) + if (key.custom_theme && key.custom_theme->GetColor(id, &theme_color)) { return theme_color; + } return std::nullopt; }; @@ -199,8 +200,9 @@ int id, const ui::ColorProviderKey& key) const { color_utils::HSL hsl; - if (key.custom_theme && key.custom_theme->GetTint(id, &hsl)) + if (key.custom_theme && key.custom_theme->GetTint(id, &hsl)) { return hsl; + } // Always pass false for |incognito| here since the ColorProvider is treating // incognito mode as dark mode. If this needs to change, that information will // need to propagate into the ColorProviderKey. @@ -347,14 +349,16 @@ mixer[kColorToolbarButtonIcon] = {kColorToolbarText}; const bool platform_high_contrast_ink_drop = base::FeatureList::IsEnabled( views::features::kEnablePlatformHighContrastInkDrop); - if (platform_high_contrast_ink_drop) + if (platform_high_contrast_ink_drop) { mixer[kColorToolbarButtonIconHovered] = {ui::kColorNativeHighlightText}; - else + } else { mixer[kColorToolbarButtonIconHovered] = {kColorToolbarText}; + } mixer[kColorToolbarButtonIconInactive] = {ui::kColorNativeGrayText}; mixer[kColorToolbarContentAreaSeparator] = {kColorToolbarText}; - if (platform_high_contrast_ink_drop) + if (platform_high_contrast_ink_drop) { mixer[kColorToolbarInkDrop] = {ui::kColorNativeHighlight}; + } mixer[kColorToolbarSeparator] = {ui::kColorNativeWindowText}; mixer[kColorToolbarText] = {ui::kColorNativeBtnText}; mixer[kColorToolbarTopSeparatorFrameActive] = {kColorToolbarSeparator};
diff --git a/chrome/browser/ui/commerce/commerce_ui_tab_helper.cc b/chrome/browser/ui/commerce/commerce_ui_tab_helper.cc index 31cabd8..98128fa5 100644 --- a/chrome/browser/ui/commerce/commerce_ui_tab_helper.cc +++ b/chrome/browser/ui/commerce/commerce_ui_tab_helper.cc
@@ -134,8 +134,7 @@ CommerceUiTabHelper::~CommerceUiTabHelper() = default; // static -void CommerceUiTabHelper::RegisterProfilePrefs( - PrefRegistrySimple* registry) { +void CommerceUiTabHelper::RegisterProfilePrefs(PrefRegistrySimple* registry) { registry->RegisterBooleanPref(prefs::kShouldShowPriceTrackFUEBubble, true); } @@ -291,9 +290,9 @@ if (shopping_service_->IsPriceInsightsEligible()) { if (!info->product_cluster_title.empty()) { shopping_service_->GetPriceInsightsInfoForUrl( - url, base::BindOnce( - &CommerceUiTabHelper::HandlePriceInsightsInfoResponse, - weak_ptr_factory_.GetWeakPtr())); + url, + base::BindOnce(&CommerceUiTabHelper::HandlePriceInsightsInfoResponse, + weak_ptr_factory_.GetWeakPtr())); } else { // If we were blocked because of the title, consider it a response of // false. @@ -324,10 +323,10 @@ } // Make sure we have responses from all the relevant features first. - if (!discounts_page_action_controller_->ShouldShowForNavigation() - .has_value()) { - return; - } + if (!discounts_page_action_controller_->ShouldShowForNavigation() + .has_value()) { + return; + } if (shopping_service_->IsPriceInsightsEligible() && !got_insights_response_for_page_) { @@ -506,9 +505,8 @@ void CommerceUiTabHelper::MakeShoppingInsightsSidePanelAvailable() { auto entry = std::make_unique<SidePanelEntry>( SidePanelEntry::Id::kShoppingInsights, - base::BindRepeating( - &CommerceUiTabHelper::CreateShoppingInsightsWebView, - base::Unretained(this))); + base::BindRepeating(&CommerceUiTabHelper::CreateShoppingInsightsWebView, + base::Unretained(this))); side_panel_registry_->Register(std::move(entry)); } @@ -604,11 +602,11 @@ // TODO(b:301440117): Splitting the triggering logic for each icon into // delegates would make this much easier to test. - if (discounts_page_action_controller_->WantsExpandedUi()) { - page_action_to_expand_ = PageActionIconType::kDiscounts; - MaybeRecordShoppingInformationUKM(PageActionIconType::kDiscounts); - return; - } + if (discounts_page_action_controller_->WantsExpandedUi()) { + page_action_to_expand_ = PageActionIconType::kDiscounts; + MaybeRecordShoppingInformationUKM(PageActionIconType::kDiscounts); + return; + } if (ShouldShowProductSpecificationsIconView()) { page_action_to_expand_ = PageActionIconType::kProductSpecifications; @@ -665,8 +663,7 @@ } } -bool CommerceUiTabHelper::ShouldExpandPageActionIcon( - PageActionIconType type) { +bool CommerceUiTabHelper::ShouldExpandPageActionIcon(PageActionIconType type) { // Only allow the requesting icon to expand once. This prevents the icon from // expanding multiple times per page load. if (page_action_to_expand_.has_value() &&
diff --git a/chrome/browser/ui/commerce/commerce_ui_tab_helper.h b/chrome/browser/ui/commerce/commerce_ui_tab_helper.h index 3c339e6..ab5977dc 100644 --- a/chrome/browser/ui/commerce/commerce_ui_tab_helper.h +++ b/chrome/browser/ui/commerce/commerce_ui_tab_helper.h
@@ -59,8 +59,7 @@ SidePanelRegistry* side_panel_registry); ~CommerceUiTabHelper() override; CommerceUiTabHelper(const CommerceUiTabHelper& other) = delete; - CommerceUiTabHelper& operator=(const CommerceUiTabHelper& other) = - delete; + CommerceUiTabHelper& operator=(const CommerceUiTabHelper& other) = delete; static void RegisterProfilePrefs(PrefRegistrySimple* registry);
diff --git a/chrome/browser/ui/commerce/commerce_ui_tab_helper_unittest.cc b/chrome/browser/ui/commerce/commerce_ui_tab_helper_unittest.cc index 361bc329b..a47470a 100644 --- a/chrome/browser/ui/commerce/commerce_ui_tab_helper_unittest.cc +++ b/chrome/browser/ui/commerce/commerce_ui_tab_helper_unittest.cc
@@ -85,8 +85,7 @@ } CommerceUiTabHelperTest(const CommerceUiTabHelperTest&) = delete; - CommerceUiTabHelperTest operator=(const CommerceUiTabHelperTest&) = - delete; + CommerceUiTabHelperTest operator=(const CommerceUiTabHelperTest&) = delete; ~CommerceUiTabHelperTest() override = default; void SetUp() override { @@ -163,8 +162,7 @@ // The price tracking icon shouldn't be available if no image URL was provided // by the shopping service. -TEST_F(CommerceUiTabHelperTest, - TestPriceTrackingIconAvailabilityIfNoImage) { +TEST_F(CommerceUiTabHelperTest, TestPriceTrackingIconAvailabilityIfNoImage) { ASSERT_FALSE(tab_helper_->IsPriceTracking()); AddProductBookmark(bookmark_model_.get(), u"title", GURL(kProductUrl), @@ -189,8 +187,7 @@ // The price tracking state should not update in the helper if there is no image // returbed by the shopping service. -TEST_F(CommerceUiTabHelperTest, - TestPriceTrackingIconAvailabilityWithImage) { +TEST_F(CommerceUiTabHelperTest, TestPriceTrackingIconAvailabilityWithImage) { ASSERT_FALSE(tab_helper_->IsPriceTracking()); AddProductBookmark(bookmark_model_.get(), u"title", GURL(kProductUrl),
diff --git a/chrome/browser/ui/commerce/discounts_page_action_controller_unittest.cc b/chrome/browser/ui/commerce/discounts_page_action_controller_unittest.cc index b8517bb..908d412 100644 --- a/chrome/browser/ui/commerce/discounts_page_action_controller_unittest.cc +++ b/chrome/browser/ui/commerce/discounts_page_action_controller_unittest.cc
@@ -19,7 +19,7 @@ namespace { const char kShoppingURL[] = "https://example.com"; const char kShoppingURLDomain[] = "example.com"; -} +} // namespace class DiscountsPageActionControllerUnittest : public testing::Test { public:
diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc index 3106f37..419e59b 100644 --- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc +++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
@@ -160,8 +160,9 @@ setting = map->GetContentSetting(url, url, type, &info); } - if (out_setting) + if (out_setting) { *out_setting = setting; + } // Prevent creation of content settings for illegal urls like about:blank by // disallowing user management. @@ -194,8 +195,9 @@ size_t num_entries, ContentSettingsType type) { for (size_t i = 0; i < num_entries; ++i) { - if (entries[i].type == type) + if (entries[i].type == type) { return entries[i].id; + } } return 0; } @@ -317,8 +319,9 @@ num_title_ids = std::size(kAccessedTitleIDs); } int title_id = GetIdForContentType(title_ids, num_title_ids, content_type()); - if (title_id) + if (title_id) { set_title(l10n_util::GetStringUTF16(title_id)); + } } void ContentSettingSimpleBubbleModel::SetMessage() { @@ -360,8 +363,9 @@ } int message_id = GetIdForContentType(message_ids, num_message_ids, content_type()); - if (message_id) + if (message_id) { set_message(l10n_util::GetStringUTF16(message_id)); + } } void ContentSettingSimpleBubbleModel::SetManageText() { @@ -385,8 +389,9 @@ }; int custom_link_id = GetIdForContentType(kCustomIDs, std::size(kCustomIDs), content_type()); - if (custom_link_id) + if (custom_link_id) { set_custom_link(l10n_util::GetStringUTF16(custom_link_id)); + } } void ContentSettingSimpleBubbleModel::OnCustomLinkClicked() {} @@ -426,8 +431,9 @@ } void ContentSettingMixedScriptBubbleModel::OnLearnMoreClicked() { - if (delegate()) + if (delegate()) { delegate()->ShowLearnMorePage(content_type()); + } } void ContentSettingMixedScriptBubbleModel::OnCustomLinkClicked() { @@ -445,8 +451,9 @@ // Stop the child frame enumeration if we have reached a fenced frame. // This is correct since fence frames should ignore InsecureContent // setting. - if (frame->IsFencedFrameRoot()) + if (frame->IsFencedFrameRoot()) { return content::RenderFrameHost::FrameIterationAction::kSkipChildren; + } SetAllowRunningInsecureContent(mixed_content_settings, frame); return content::RenderFrameHost::FrameIterationAction::kContinue; }); @@ -516,12 +523,13 @@ radio_group.radio_items = {radio_allow_label, radio_deny_label, radio_ignore_label}; ContentSetting setting = content_settings->pending_protocol_handler_setting(); - if (setting == CONTENT_SETTING_ALLOW) + if (setting == CONTENT_SETTING_ALLOW) { radio_group.default_item = RPH_ALLOW; - else if (setting == CONTENT_SETTING_BLOCK) + } else if (setting == CONTENT_SETTING_BLOCK) { radio_group.default_item = RPH_BLOCK; - else + } else { radio_group.default_item = RPH_IGNORE; + } set_radio_group(radio_group); } @@ -625,8 +633,9 @@ // popup, and the popup PageSpecificContentSettings is unaware of the frame // busting block. Since the popup bubble won't happen without blocking, it's // safe to manually set this. - if (content_type() == ContentSettingsType::POPUPS) + if (content_type() == ContentSettingsType::POPUPS) { allowed = false; + } DCHECK(!allowed || PageSpecificContentSettings::GetForFrame(&GetPage().GetMainDocument()) @@ -722,8 +731,9 @@ void ContentSettingSingleRadioGroup::SetNarrowestContentSetting( ContentSetting setting) { - if (!GetProfile()) + if (!GetProfile()) { return; + } auto* map = HostContentSettingsMapFactory::GetForProfile(GetProfile()); map->SetNarrowestContentSetting(bubble_content().radio_group.url, @@ -898,8 +908,9 @@ auto* helper = blocked_content::PopupBlockerTabHelper::FromWebContents(web_contents); std::map<int32_t, GURL> blocked_popups = helper->GetBlockedPopupRequests(); - for (const auto& blocked_popup : blocked_popups) + for (const auto& blocked_popup : blocked_popups) { AddListItem(CreateUrlListItem(blocked_popup.first, blocked_popup.second)); + } url_list_observation_.Observe(helper->manager()); content_settings::RecordPopupsAction( @@ -1007,8 +1018,9 @@ // on a system level. if (!ShouldShowSystemMediaPermissions()) { // Update the media settings if the radio button selection was changed. - if (selected_item() != bubble_content().radio_group.default_item) + if (selected_item() != bubble_content().radio_group.default_item) { UpdateSettings(radio_item_setting_[selected_item()]); + } } } @@ -1019,8 +1031,9 @@ void ContentSettingMediaStreamBubbleModel::OnManageButtonClicked() { CHECK(CameraAccessed() || MicrophoneAccessed()); - if (!delegate()) + if (!delegate()) { return; + } CommitChanges(); @@ -1088,40 +1101,42 @@ void ContentSettingMediaStreamBubbleModel::SetTitle() { CHECK(CameraAccessed() || MicrophoneAccessed()); int title_id = 0; - if (MicrophoneBlocked() && CameraBlocked()) + if (MicrophoneBlocked() && CameraBlocked()) { title_id = IDS_MICROPHONE_CAMERA_BLOCKED_TITLE; - else if (MicrophoneBlocked()) + } else if (MicrophoneBlocked()) { title_id = IDS_MICROPHONE_BLOCKED_TITLE; - else if (CameraBlocked()) + } else if (CameraBlocked()) { title_id = IDS_CAMERA_BLOCKED_TITLE; - else if (MicrophoneAccessed() && CameraAccessed()) + } else if (MicrophoneAccessed() && CameraAccessed()) { title_id = IDS_MICROPHONE_CAMERA_ALLOWED_TITLE; - else if (MicrophoneAccessed()) + } else if (MicrophoneAccessed()) { title_id = IDS_MICROPHONE_ACCESSED_TITLE; - else if (CameraAccessed()) + } else if (CameraAccessed()) { title_id = IDS_CAMERA_ACCESSED_TITLE; - else + } else { NOTREACHED(); + } set_title(l10n_util::GetStringUTF16(title_id)); } void ContentSettingMediaStreamBubbleModel::SetMessage() { CHECK(CameraAccessed() || MicrophoneAccessed()); int message_id = 0; - if (MicrophoneBlocked() && CameraBlocked()) + if (MicrophoneBlocked() && CameraBlocked()) { message_id = IDS_MICROPHONE_CAMERA_BLOCKED; - else if (MicrophoneBlocked()) + } else if (MicrophoneBlocked()) { message_id = IDS_MICROPHONE_BLOCKED; - else if (CameraBlocked()) + } else if (CameraBlocked()) { message_id = IDS_CAMERA_BLOCKED; - else if (MicrophoneAccessed() && CameraAccessed()) + } else if (MicrophoneAccessed() && CameraAccessed()) { message_id = IDS_MICROPHONE_CAMERA_ALLOWED; - else if (MicrophoneAccessed()) + } else if (MicrophoneAccessed()) { message_id = IDS_MICROPHONE_ACCESSED; - else if (CameraAccessed()) + } else if (CameraAccessed()) { message_id = IDS_CAMERA_ACCESSED; - else + } else { NOTREACHED(); + } set_message(l10n_util::GetStringUTF16(message_id)); } @@ -1141,22 +1156,25 @@ if (network::IsUrlPotentiallyTrustworthy(url)) { radio_item_setting_[0] = CONTENT_SETTING_ALLOW; radio_allow_label_id = IDS_BLOCKED_MEDIASTREAM_CAMERA_ALLOW; - if (MicrophoneAccessed()) + if (MicrophoneAccessed()) { radio_allow_label_id = CameraAccessed() ? IDS_BLOCKED_MEDIASTREAM_MIC_AND_CAMERA_ALLOW : IDS_BLOCKED_MEDIASTREAM_MIC_ALLOW; + } } else { radio_allow_label_id = IDS_BLOCKED_MEDIASTREAM_CAMERA_ASK; - if (MicrophoneAccessed()) + if (MicrophoneAccessed()) { radio_allow_label_id = CameraAccessed() ? IDS_BLOCKED_MEDIASTREAM_MIC_AND_CAMERA_ASK : IDS_BLOCKED_MEDIASTREAM_MIC_ASK; + } } radio_block_label_id = IDS_BLOCKED_MEDIASTREAM_CAMERA_NO_ACTION; - if (MicrophoneAccessed()) + if (MicrophoneAccessed()) { radio_block_label_id = CameraAccessed() ? IDS_BLOCKED_MEDIASTREAM_MIC_AND_CAMERA_NO_ACTION : IDS_BLOCKED_MEDIASTREAM_MIC_NO_ACTION; + } } else { bool has_pan_tilt_zoom_permission_granted = web_contents() @@ -1312,28 +1330,27 @@ web_contents, ContentSettingsType::GEOLOCATION) { SetCustomLink(); - // Get the stored geolocation content setting and the system permission - // state to determine whether geolocation is blocked by a system permission. - // - // The content setting must be read from HostContentSettingsMap. - // PageSpecificContentSettings cannot be used because it combines the - // site-level and system-level permissions, indicating the feature is - // blocked if either the site-level or system-level permission is not - // granted. We need to distinguish these cases to ensure the bubble that - // launches the system dialog is not shown if the site-level permission was - // not granted. - const GURL& url = - web_contents->GetPrimaryMainFrame()->GetLastCommittedURL(); - ContentSetting content_setting = - HostContentSettingsMapFactory::GetForProfile(GetProfile()) - ->GetContentSetting(url, url, ContentSettingsType::GEOLOCATION); - if (content_setting == CONTENT_SETTING_ALLOW && - !system_permission_settings::IsAllowed( - ContentSettingsType::GEOLOCATION)) { - // If the permission is turned off in system preferences, overwrite the - // bubble to enable the user to trigger the system dialog. - InitializeSystemGeolocationPermissionBubble(); - } + // Get the stored geolocation content setting and the system permission + // state to determine whether geolocation is blocked by a system permission. + // + // The content setting must be read from HostContentSettingsMap. + // PageSpecificContentSettings cannot be used because it combines the + // site-level and system-level permissions, indicating the feature is + // blocked if either the site-level or system-level permission is not + // granted. We need to distinguish these cases to ensure the bubble that + // launches the system dialog is not shown if the site-level permission was + // not granted. + const GURL& url = web_contents->GetPrimaryMainFrame()->GetLastCommittedURL(); + ContentSetting content_setting = + HostContentSettingsMapFactory::GetForProfile(GetProfile()) + ->GetContentSetting(url, url, ContentSettingsType::GEOLOCATION); + if (content_setting == CONTENT_SETTING_ALLOW && + !system_permission_settings::IsAllowed( + ContentSettingsType::GEOLOCATION)) { + // If the permission is turned off in system preferences, overwrite the + // bubble to enable the user to trigger the system dialog. + InitializeSystemGeolocationPermissionBubble(); + } } ContentSettingGeolocationBubbleModel::~ContentSettingGeolocationBubbleModel() = @@ -1350,13 +1367,15 @@ } void ContentSettingGeolocationBubbleModel::OnManageButtonClicked() { - if (delegate()) + if (delegate()) { delegate()->ShowContentSettingsPage(ContentSettingsType::GEOLOCATION); + } } void ContentSettingGeolocationBubbleModel::CommitChanges() { - if (show_system_geolocation_bubble_) + if (show_system_geolocation_bubble_) { return; + } ContentSettingSingleRadioGroup::CommitChanges(); } @@ -1366,19 +1385,19 @@ #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) set_title(l10n_util::GetStringUTF16(IDS_GEOLOCATION_TURNED_OFF_IN_OS)); #else - // The system-level location permission is not supported on Linux. - NOTREACHED(); + // The system-level location permission is not supported on Linux. + NOTREACHED(); #endif - clear_message(); - AddListItem(ContentSettingBubbleModel::ListItem( - &vector_icons::kLocationOnIcon, - l10n_util::GetStringUTF16(IDS_GEOLOCATION), - l10n_util::GetStringUTF16(IDS_TURNED_OFF), false, true, 0)); - set_manage_text_style(ContentSettingBubbleModel::ManageTextStyle::kNone); - set_done_button_text(l10n_util::GetStringUTF16(IDS_OPEN_SETTINGS_LINK)); - set_radio_group(RadioGroup()); - show_system_geolocation_bubble_ = true; + clear_message(); + AddListItem(ContentSettingBubbleModel::ListItem( + &vector_icons::kLocationOnIcon, + l10n_util::GetStringUTF16(IDS_GEOLOCATION), + l10n_util::GetStringUTF16(IDS_TURNED_OFF), false, true, 0)); + set_manage_text_style(ContentSettingBubbleModel::ManageTextStyle::kNone); + set_done_button_text(l10n_util::GetStringUTF16(IDS_OPEN_SETTINGS_LINK)); + set_radio_group(RadioGroup()); + show_system_geolocation_bubble_ = true; #endif // BUILDFLAG(OS_LEVEL_GEOLOCATION_PERMISSION_SUPPORTED) } @@ -1586,9 +1605,10 @@ } void ContentSettingDownloadsBubbleModel::OnManageButtonClicked() { - if (delegate()) + if (delegate()) { delegate()->ShowContentSettingsPage( ContentSettingsType::AUTOMATIC_DOWNLOADS); + } } // ContentSettingFramebustBlockBubbleModel ------------------------------------- @@ -1602,8 +1622,9 @@ auto* helper = FramebustBlockTabHelper::FromWebContents(web_contents); // Build the blocked urls list. - for (const auto& blocked_url : helper->blocked_urls()) + for (const auto& blocked_url : helper->blocked_urls()) { AddListItem(CreateUrlListItem(0 /* id */, blocked_url)); + } url_list_observation_.Observe(helper->manager()); } @@ -1640,8 +1661,9 @@ permissions::PermissionRequestManager* manager = permissions::PermissionRequestManager::FromWebContents(web_contents); auto quiet_ui_reason = manager->ReasonForUsingQuietUi(); - if (!quiet_ui_reason) + if (!quiet_ui_reason) { return; + } CHECK_GT(manager->Requests().size(), 0u); DCHECK_EQ(manager->Requests().size(), 1u); const permissions::RequestType request_type = @@ -1840,8 +1862,9 @@ permissions::PermissionRequestManager::FromWebContents(web_contents()); auto quiet_ui_reason = manager->ReasonForUsingQuietUi(); - if (!quiet_ui_reason) + if (!quiet_ui_reason) { return; + } switch (*quiet_ui_reason) { case QuietUiReason::kEnabledInPrefs: case QuietUiReason::kTriggeredByCrowdDeny: @@ -1974,13 +1997,15 @@ void ContentSettingBubbleModel::AddListItem(const ListItem& item) { bubble_content_.list_items.push_back(item); - if (owner_) + if (owner_) { owner_->OnListItemAdded(item); + } } void ContentSettingBubbleModel::RemoveListItem(int index) { - if (owner_) + if (owner_) { owner_->OnListItemRemovedAt(index); + } bubble_content_.list_items.erase(bubble_content_.list_items.begin() + index); }
diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.h b/chrome/browser/ui/content_settings/content_setting_bubble_model.h index 8231c1e..723f93d 100644 --- a/chrome/browser/ui/content_settings/content_setting_bubble_model.h +++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.h
@@ -39,7 +39,7 @@ namespace content { class Page; class WebContents; -} +} // namespace content namespace ui { class Event;
diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model_browsertest.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model_browsertest.cc index e3dbf87..3808e7a 100644 --- a/chrome/browser/ui/content_settings/content_setting_bubble_model_browsertest.cc +++ b/chrome/browser/ui/content_settings/content_setting_bubble_model_browsertest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/content_settings/content_setting_bubble_model.h" + #include <memory> #include <vector> @@ -16,7 +18,6 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_content_setting_bubble_model_delegate.h" #include "chrome/browser/ui/browser_finder.h" -#include "chrome/browser/ui/content_settings/content_setting_bubble_model.h" #include "chrome/browser/ui/content_settings/fake_owner.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/webui_url_constants.h" @@ -324,8 +325,7 @@ }; // Tests that each popup action is counted in the right bucket. -IN_PROC_BROWSER_TEST_F(ContentSettingBubbleModelPopupTest, - PopupsActionsCount){ +IN_PROC_BROWSER_TEST_F(ContentSettingBubbleModelPopupTest, PopupsActionsCount) { GURL url(https_server_->GetURL("/popup_blocker/popup-many.html")); base::HistogramTester histograms; histograms.ExpectTotalCount("ContentSettings.Popups", 0); @@ -333,8 +333,8 @@ ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), url)); histograms.ExpectBucketCount( - "ContentSettings.Popups", - content_settings::POPUPS_ACTION_DISPLAYED_BLOCKED_ICON_IN_OMNIBOX, 1); + "ContentSettings.Popups", + content_settings::POPUPS_ACTION_DISPLAYED_BLOCKED_ICON_IN_OMNIBOX, 1); // Creates the ContentSettingPopupBubbleModel in order to emulate clicks. std::unique_ptr<ContentSettingBubbleModel> model( @@ -345,9 +345,9 @@ std::unique_ptr<FakeOwner> owner = FakeOwner::Create(*model, kDisallowButtonIndex); - histograms.ExpectBucketCount( - "ContentSettings.Popups", - content_settings::POPUPS_ACTION_DISPLAYED_BUBBLE, 1); + histograms.ExpectBucketCount("ContentSettings.Popups", + content_settings::POPUPS_ACTION_DISPLAYED_BUBBLE, + 1); ui::MouseEvent click_event(ui::EventType::kMousePressed, gfx::Point(), gfx::Point(), ui::EventTimeForNow(), @@ -356,18 +356,18 @@ model->OnListItemClicked(0, click_event); histograms.ExpectBucketCount( - "ContentSettings.Popups", - content_settings::POPUPS_ACTION_CLICKED_LIST_ITEM_CLICKED, 1); + "ContentSettings.Popups", + content_settings::POPUPS_ACTION_CLICKED_LIST_ITEM_CLICKED, 1); model->OnManageButtonClicked(); histograms.ExpectBucketCount( - "ContentSettings.Popups", - content_settings::POPUPS_ACTION_CLICKED_MANAGE_POPUPS_BLOCKING, 1); + "ContentSettings.Popups", + content_settings::POPUPS_ACTION_CLICKED_MANAGE_POPUPS_BLOCKING, 1); owner->SetSelectedRadioOptionAndCommit(model->kAllowButtonIndex); histograms.ExpectBucketCount( - "ContentSettings.Popups", - content_settings::POPUPS_ACTION_SELECTED_ALWAYS_ALLOW_POPUPS_FROM, 1); + "ContentSettings.Popups", + content_settings::POPUPS_ACTION_SELECTED_ALWAYS_ALLOW_POPUPS_FROM, 1); histograms.ExpectTotalCount("ContentSettings.Popups", 5); }
diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc index a3363d9f..6c5b653 100644 --- a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc +++ b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc
@@ -101,8 +101,8 @@ }; TEST_F(ContentSettingBubbleModelTest, ImageRadios) { - WebContentsTester::For(web_contents())-> - NavigateAndCommit(GURL("https://www.example.com")); + WebContentsTester::For(web_contents()) + ->NavigateAndCommit(GURL("https://www.example.com")); PageSpecificContentSettings* content_settings = PageSpecificContentSettings::GetForFrame( web_contents()->GetPrimaryMainFrame()); @@ -212,8 +212,8 @@ WebContentsTester::For(web_contents()) ->NavigateAndCommit(GURL("https://www.example.com")); // Required to break dependency on BrowserMainLoop. - MediaCaptureDevicesDispatcher::GetInstance()-> - DisableDeviceEnumerationForTesting(); + MediaCaptureDevicesDispatcher::GetInstance() + ->DisableDeviceEnumerationForTesting(); PageSpecificContentSettings* content_settings = PageSpecificContentSettings::GetForFrame( @@ -251,11 +251,11 @@ TEST_F(ContentSettingBubbleModelTest, BlockedMediastreamMicAndCamera) { // Required to break dependency on BrowserMainLoop. - MediaCaptureDevicesDispatcher::GetInstance()-> - DisableDeviceEnumerationForTesting(); + MediaCaptureDevicesDispatcher::GetInstance() + ->DisableDeviceEnumerationForTesting(); - WebContentsTester::For(web_contents())-> - NavigateAndCommit(GURL("https://www.example.com")); + WebContentsTester::For(web_contents()) + ->NavigateAndCommit(GURL("https://www.example.com")); GURL url = web_contents()->GetLastCommittedURL(); HostContentSettingsMap* host_content_settings_map = @@ -312,11 +312,11 @@ // the bubble is re-opened. TEST_F(ContentSettingBubbleModelTest, MediastreamContentBubble) { // Required to break dependency on BrowserMainLoop. - MediaCaptureDevicesDispatcher::GetInstance()-> - DisableDeviceEnumerationForTesting(); + MediaCaptureDevicesDispatcher::GetInstance() + ->DisableDeviceEnumerationForTesting(); - WebContentsTester::For(web_contents())-> - NavigateAndCommit(GURL("https://www.example.com")); + WebContentsTester::For(web_contents()) + ->NavigateAndCommit(GURL("https://www.example.com")); GURL url = web_contents()->GetLastCommittedURL(); HostContentSettingsMap* host_content_settings_map = @@ -398,8 +398,8 @@ WebContentsTester::For(web_contents()) ->NavigateAndCommit(GURL("https://www.example.com")); // Required to break dependency on BrowserMainLoop. - MediaCaptureDevicesDispatcher::GetInstance()-> - DisableDeviceEnumerationForTesting(); + MediaCaptureDevicesDispatcher::GetInstance() + ->DisableDeviceEnumerationForTesting(); PageSpecificContentSettings* content_settings = PageSpecificContentSettings::GetForFrame( @@ -467,8 +467,8 @@ WebContentsTester::For(web_contents()) ->NavigateAndCommit(GURL("https://www.example.com")); // Required to break dependency on BrowserMainLoop. - MediaCaptureDevicesDispatcher::GetInstance()-> - DisableDeviceEnumerationForTesting(); + MediaCaptureDevicesDispatcher::GetInstance() + ->DisableDeviceEnumerationForTesting(); PageSpecificContentSettings* content_settings = PageSpecificContentSettings::GetForFrame( @@ -537,8 +537,8 @@ WebContentsTester::For(web_contents()) ->NavigateAndCommit(GURL("https://www.example.com")); // Required to break dependency on BrowserMainLoop. - MediaCaptureDevicesDispatcher::GetInstance()-> - DisableDeviceEnumerationForTesting(); + MediaCaptureDevicesDispatcher::GetInstance() + ->DisableDeviceEnumerationForTesting(); PageSpecificContentSettings* content_settings = PageSpecificContentSettings::GetForFrame( @@ -1389,8 +1389,8 @@ } TEST_F(ContentSettingBubbleModelTest, ValidUrl) { - WebContentsTester::For(web_contents())-> - NavigateAndCommit(GURL("https://www.example.com")); + WebContentsTester::For(web_contents()) + ->NavigateAndCommit(GURL("https://www.example.com")); PageSpecificContentSettings* content_settings = PageSpecificContentSettings::GetForFrame( @@ -1407,8 +1407,8 @@ } TEST_F(ContentSettingBubbleModelTest, InvalidUrl) { - WebContentsTester::For(web_contents())-> - NavigateAndCommit(GURL("about:blank")); + WebContentsTester::For(web_contents()) + ->NavigateAndCommit(GURL("about:blank")); PageSpecificContentSettings* content_settings = PageSpecificContentSettings::GetForFrame(
diff --git a/chrome/browser/ui/content_settings/content_setting_image_model.cc b/chrome/browser/ui/content_settings/content_setting_image_model.cc index 84d5715..020817f 100644 --- a/chrome/browser/ui/content_settings/content_setting_image_model.cc +++ b/chrome/browser/ui/content_settings/content_setting_image_model.cc
@@ -276,8 +276,9 @@ const ContentSettingsImageDetails* GetImageDetails(ContentSettingsType type) { for (const ContentSettingsImageDetails& image_details : kImageDetails) { - if (image_details.content_type == type) + if (image_details.content_type == type) { return &image_details; + } } return nullptr; } @@ -533,13 +534,15 @@ PageSpecificContentSettings* content_settings = PageSpecificContentSettings::GetForFrame( web_contents->GetPrimaryMainFrame()); - if (!content_settings) + if (!content_settings) { return false; + } bool is_blocked = content_settings->IsContentBlocked(type); bool is_allowed = content_settings->IsContentAllowed(type); - if (!is_blocked && !is_allowed) + if (!is_blocked && !is_allowed) { return false; + } Profile* profile = Profile::FromBrowserContext(web_contents->GetBrowserContext()); @@ -673,10 +676,12 @@ WebContents* web_contents) { auto* content_settings_delegate = PageSpecificContentSettingsDelegate::FromWebContents(web_contents); - if (!content_settings_delegate) + if (!content_settings_delegate) { return false; - if (content_settings_delegate->pending_protocol_handler().IsEmpty()) + } + if (content_settings_delegate->pending_protocol_handler().IsEmpty()) { return false; + } return true; } @@ -692,8 +697,9 @@ PageSpecificContentSettings* content_settings = PageSpecificContentSettings::GetForFrame( web_contents->GetPrimaryMainFrame()); - if (!content_settings) + if (!content_settings) { return false; + } const bool is_allowed = content_settings->IsContentAllowed(ContentSettingsType::MIDI_SYSEX); @@ -724,8 +730,9 @@ g_browser_process->download_request_limiter(); // DownloadRequestLimiter can be absent in unit_tests. - if (!download_request_limiter) + if (!download_request_limiter) { return false; + } switch (download_request_limiter->GetDownloadUiStatus(web_contents)) { case DownloadRequestLimiter::DOWNLOAD_UI_ALLOWED: @@ -757,13 +764,15 @@ PageSpecificContentSettings* content_settings = PageSpecificContentSettings::GetForFrame( web_contents->GetPrimaryMainFrame()); - if (!content_settings) + if (!content_settings) { return false; + } ContentSettingsType content_type = ContentSettingsType::CLIPBOARD_READ_WRITE; bool blocked = content_settings->IsContentBlocked(content_type); bool allowed = content_settings->IsContentAllowed(content_type); - if (!blocked && !allowed) + if (!blocked && !allowed) { return false; + } SetIcon(ContentSettingsType::CLIPBOARD_READ_WRITE, /*blocked=*/!allowed); set_tooltip(l10n_util::GetStringUTF16( @@ -786,8 +795,9 @@ PageSpecificContentSettings* content_settings = PageSpecificContentSettings::GetForFrame( web_contents->GetPrimaryMainFrame()); - if (!content_settings) + if (!content_settings) { return false; + } state_ = content_settings->GetMicrophoneCameraState(); // If neither the microphone nor the camera stream was accessed then no icon @@ -886,9 +896,10 @@ int id = IDS_CAMERA_BLOCKED; if (IsMicBlockedOnSiteLevel() || IsCameraBlockedOnSiteLevel()) { - if (IsMicAccessed()) + if (IsMicAccessed()) { id = IsCamAccessed() ? IDS_MICROPHONE_CAMERA_BLOCKED : IDS_MICROPHONE_BLOCKED; + } if (IsCamAccessed()) { SetIcon(ContentSettingsType::MEDIASTREAM_CAMERA, /*blocked=*/true); @@ -899,9 +910,10 @@ } else { SetIcon(ContentSettingsType::MEDIASTREAM_CAMERA, /*blocked=*/false); id = IDS_CAMERA_ACCESSED; - if (IsMicAccessed()) + if (IsMicAccessed()) { id = IsCamAccessed() ? IDS_MICROPHONE_CAMERA_ALLOWED : IDS_MICROPHONE_ACCESSED; + } if (IsCamAccessed()) { SetIcon(ContentSettingsType::MEDIASTREAM_CAMERA, /*blocked=*/false); @@ -975,8 +987,10 @@ bool ContentSettingFramebustBlockImageModel::UpdateAndGetVisibility( WebContents* web_contents) { // Early exit if no blocked Framebust. - if (!FramebustBlockTabHelper::FromWebContents(web_contents)->HasBlockedUrls()) + if (!FramebustBlockTabHelper::FromWebContents(web_contents) + ->HasBlockedUrls()) { return false; + } SetFramebustBlockedIcon(); set_explanatory_string_id(IDS_REDIRECT_BLOCKED_TITLE); @@ -1002,14 +1016,16 @@ WebContents* web_contents) { auto* content_settings = PageSpecificContentSettings::GetForFrame( web_contents->GetPrimaryMainFrame()); - if (!content_settings) + if (!content_settings) { return false; + } bool blocked = content_settings->IsContentBlocked(content_type()); bool allowed = content_settings->IsContentAllowed(content_type()); - if (!blocked && !allowed) + if (!blocked && !allowed) { return false; + } HostContentSettingsMap* map = HostContentSettingsMapFactory::GetForProfile( Profile::FromBrowserContext(web_contents->GetBrowserContext())); @@ -1044,8 +1060,10 @@ PageSpecificContentSettings* content_settings = PageSpecificContentSettings::GetForFrame( web_contents->GetPrimaryMainFrame()); - if (!content_settings || !content_settings->IsContentBlocked(content_type())) + if (!content_settings || + !content_settings->IsContentBlocked(content_type())) { return false; + } SetIcon(ContentSettingsType::POPUPS, /*blocked=*/true); set_explanatory_string_id(IDS_BLOCKED_POPUPS_EXPLANATORY_TEXT); set_tooltip(l10n_util::GetStringUTF16(IDS_BLOCKED_POPUPS_TOOLTIP)); @@ -1257,8 +1275,9 @@ std::vector<std::unique_ptr<ContentSettingImageModel>> models = GenerateContentSettingImageModels(); for (size_t i = 0; i < models.size(); ++i) { - if (image_type == models[i]->image_type()) + if (image_type == models[i]->image_type()) { return i; + } } NOTREACHED(); }
diff --git a/chrome/browser/ui/content_settings/content_setting_image_model_browsertest.cc b/chrome/browser/ui/content_settings/content_setting_image_model_browsertest.cc index ceae6d2..e3136b96 100644 --- a/chrome/browser/ui/content_settings/content_setting_image_model_browsertest.cc +++ b/chrome/browser/ui/content_settings/content_setting_image_model_browsertest.cc
@@ -45,12 +45,9 @@ // to the same setting. static constexpr ContentSettingImageModel::ImageType content_settings_to_test[] = { - ImageType::COOKIES, - ImageType::IMAGES, - ImageType::JAVASCRIPT, - ImageType::POPUPS, - ImageType::MIXEDSCRIPT, - ImageType::PROTOCOL_HANDLERS, + ImageType::COOKIES, ImageType::IMAGES, + ImageType::JAVASCRIPT, ImageType::POPUPS, + ImageType::MIXEDSCRIPT, ImageType::PROTOCOL_HANDLERS, ImageType::MIDI_SYSEX, };
diff --git a/chrome/browser/ui/content_settings/content_setting_image_model_states.cc b/chrome/browser/ui/content_settings/content_setting_image_model_states.cc index 7737c90..9c0a64fe 100644 --- a/chrome/browser/ui/content_settings/content_setting_image_model_states.cc +++ b/chrome/browser/ui/content_settings/content_setting_image_model_states.cc
@@ -16,8 +16,9 @@ // static ContentSettingImageModelStates* ContentSettingImageModelStates::Get( content::WebContents* contents) { - if (auto* state = FromWebContents(contents)) + if (auto* state = FromWebContents(contents)) { return state; + } CreateForWebContents(contents); return FromWebContents(contents); }
diff --git a/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc b/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc index ca38c3d..e58d0901 100644 --- a/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc +++ b/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc
@@ -121,7 +121,8 @@ #endif // Enable all sensors just to avoid hardcoding the expected messages // to the motion sensor-specific ones. - features::kGenericSensorExtraClasses}, {}); + features::kGenericSensorExtraClasses}, + {}); } ContentSettingImageModelTest(const ContentSettingImageModelTest&) = delete;
diff --git a/chrome/browser/ui/content_settings/framebust_block_browsertest.cc b/chrome/browser/ui/content_settings/framebust_block_browsertest.cc index 6137a4f8..ce68ca13 100644 --- a/chrome/browser/ui/content_settings/framebust_block_browsertest.cc +++ b/chrome/browser/ui/content_settings/framebust_block_browsertest.cc
@@ -75,8 +75,9 @@ // UrlListManager::Observer: void BlockedUrlAdded(int32_t id, const GURL& blocked_url) override { - if (!blocked_url_added_closure_.is_null()) + if (!blocked_url_added_closure_.is_null()) { std::move(blocked_url_added_closure_).Run(); + } } content::WebContents* GetWebContents() {
diff --git a/chrome/browser/ui/cookie_controls/cookie_controls_service.cc b/chrome/browser/ui/cookie_controls/cookie_controls_service.cc index fda4b340..344aa51 100644 --- a/chrome/browser/ui/cookie_controls/cookie_controls_service.cc +++ b/chrome/browser/ui/cookie_controls/cookie_controls_service.cc
@@ -69,10 +69,12 @@ CookieControlsEnforcement CookieControlsService::GetCookieControlsEnforcement() { auto* pref = profile_->GetPrefs()->FindPreference(prefs::kCookieControlsMode); - if (pref->IsManaged()) + if (pref->IsManaged()) { return CookieControlsEnforcement::kEnforcedByPolicy; - if (pref->IsExtensionControlled()) + } + if (pref->IsExtensionControlled()) { return CookieControlsEnforcement::kEnforcedByExtension; + } if (regular_cookie_settings_->ShouldBlockThirdPartyCookies()) { return CookieControlsEnforcement::kEnforcedByCookieSetting; } @@ -85,13 +87,15 @@ void CookieControlsService::OnThirdPartyCookieBlockingChanged( bool block_third_party_cookies) { - for (Observer& obs : observers_) + for (Observer& obs : observers_) { obs.OnThirdPartyCookieBlockingPrefChanged(); + } } void CookieControlsService::OnThirdPartyCookieBlockingPolicyChanged( const base::Value* previous, const base::Value* current) { - for (Observer& obs : observers_) + for (Observer& obs : observers_) { obs.OnThirdPartyCookieBlockingPolicyChanged(); + } }
diff --git a/chrome/browser/ui/cookie_controls/cookie_controls_service_unittest.cc b/chrome/browser/ui/cookie_controls/cookie_controls_service_unittest.cc index 4191437..67ff2ef 100644 --- a/chrome/browser/ui/cookie_controls/cookie_controls_service_unittest.cc +++ b/chrome/browser/ui/cookie_controls/cookie_controls_service_unittest.cc
@@ -42,15 +42,12 @@ class CookieControlsServiceTest : public ChromeRenderViewHostTestHarness { public: - void SetUp() override { - ChromeRenderViewHostTestHarness::SetUp(); - } + void SetUp() override { ChromeRenderViewHostTestHarness::SetUp(); } void TearDown() override { ChromeRenderViewHostTestHarness::TearDown(); } protected: std::unique_ptr<CookieControlsServiceObserver> observer_; - }; TEST_F(CookieControlsServiceTest, HandleCookieControlsToggleChanged) {
diff --git a/chrome/browser/ui/crypto_module_delegate_nss.cc b/chrome/browser/ui/crypto_module_delegate_nss.cc index ebe2c8a..38a2f92e 100644 --- a/chrome/browser/ui/crypto_module_delegate_nss.cc +++ b/chrome/browser/ui/crypto_module_delegate_nss.cc
@@ -60,10 +60,11 @@ } void ChromeNSSCryptoModuleDelegate::GotPassword(const std::string& password) { - if (!password.empty()) + if (!password.empty()) { password_ = password; - else + } else { cancelled_ = true; + } event_.Signal(); }
diff --git a/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc b/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc index d148cba..a1bdf13 100644 --- a/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc +++ b/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc
@@ -107,8 +107,9 @@ } // namespace void ShowOutdatedUpgradeBubble(Browser* browser, bool auto_update_enabled) { - if (g_upgrade_bubble_is_showing) + if (g_upgrade_bubble_is_showing) { return; + } g_upgrade_bubble_is_showing = true;
diff --git a/chrome/browser/ui/exclusive_access/exclusive_access_manager.cc b/chrome/browser/ui/exclusive_access/exclusive_access_manager.cc index 9d1d9d195..d4d0d64 100644 --- a/chrome/browser/ui/exclusive_access/exclusive_access_manager.cc +++ b/chrome/browser/ui/exclusive_access/exclusive_access_manager.cc
@@ -88,15 +88,17 @@ #endif if (fullscreen_controller_.IsWindowFullscreenForTabOrPending()) { - if (!fullscreen_controller_.IsTabFullscreen()) + if (!fullscreen_controller_.IsTabFullscreen()) { return EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_EXIT_INSTRUCTION; + } if (pointer_lock_controller_.IsPointerLockedSilently()) { return EXCLUSIVE_ACCESS_BUBBLE_TYPE_NONE; } - if (keyboard_lock_controller_.RequiresPressAndHoldEscToExit()) + if (keyboard_lock_controller_.RequiresPressAndHoldEscToExit()) { return EXCLUSIVE_ACCESS_BUBBLE_TYPE_KEYBOARD_LOCK_EXIT_INSTRUCTION; + } if (pointer_lock_controller_.IsPointerLocked()) { return EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_POINTERLOCK_EXIT_INSTRUCTION; @@ -113,11 +115,13 @@ return EXCLUSIVE_ACCESS_BUBBLE_TYPE_POINTERLOCK_EXIT_INSTRUCTION; } - if (fullscreen_controller_.IsExtensionFullscreenOrPending()) + if (fullscreen_controller_.IsExtensionFullscreenOrPending()) { return EXCLUSIVE_ACCESS_BUBBLE_TYPE_EXTENSION_FULLSCREEN_EXIT_INSTRUCTION; + } - if (fullscreen_controller_.IsControllerInitiatedFullscreen() && !app_mode) + if (fullscreen_controller_.IsControllerInitiatedFullscreen() && !app_mode) { return EXCLUSIVE_ACCESS_BUBBLE_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION; + } return EXCLUSIVE_ACCESS_BUBBLE_TYPE_NONE; } @@ -134,8 +138,9 @@ GURL ExclusiveAccessManager::GetExclusiveAccessBubbleURL() const { GURL result = fullscreen_controller_.GetURLForExclusiveAccessBubble(); - if (!result.is_valid()) + if (!result.is_valid()) { result = pointer_lock_controller_.GetURLForExclusiveAccessBubble(); + } return result; }
diff --git a/chrome/browser/ui/exclusive_access/exclusive_access_test.cc b/chrome/browser/ui/exclusive_access/exclusive_access_test.cc index dff12d3a..97943912 100644 --- a/chrome/browser/ui/exclusive_access/exclusive_access_test.cc +++ b/chrome/browser/ui/exclusive_access/exclusive_access_test.cc
@@ -136,10 +136,11 @@ // chose the 'a' key) which means the user/test can just press escape to exit // fullscreen. std::optional<base::flat_set<ui::DomCode>> codes; - if (esc_key_locked) + if (esc_key_locked) { codes = base::flat_set<ui::DomCode>({ui::DomCode::ESCAPE}); - else + } else { codes = base::flat_set<ui::DomCode>({ui::DomCode::US_A}); + } bool success = false; base::RunLoop run_loop;
diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc index 9e6611a5..5ad0178 100644 --- a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
@@ -75,8 +75,9 @@ bool IsAnotherScreen(const WebContents& web_contents, const int64_t display_id) { - if (display_id == display::kInvalidDisplayId) + if (display_id == display::kInvalidDisplayId) { return false; + } return display_id != FullscreenController::GetDisplayId(web_contents); } @@ -262,10 +263,11 @@ return; } - if (!popunder_preventer_) + if (!popunder_preventer_) { popunder_preventer_ = std::make_unique<PopunderPreventer>(web_contents); - else + } else { popunder_preventer_->WillActivateWebContents(web_contents); + } // Keep the current state. |SetTabWithExclusiveAccess| may change the return // value of |IsWindowFullscreenForTabOrPending|. @@ -335,8 +337,9 @@ ExclusiveAccessContext* exclusive_access_context = exclusive_access_manager()->context(); - if (!exclusive_access_context->IsFullscreen()) + if (!exclusive_access_context->IsFullscreen()) { return; + } if (IsFullscreenCausedByTab()) { // Tab Fullscreen -> Normal. @@ -353,8 +356,9 @@ state_prior_to_tab_fullscreen_ == STATE_BROWSER_FULLSCREEN; NotifyTabExclusiveAccessLost(); - if (was_browser_fullscreen) + if (was_browser_fullscreen) { exclusive_access_context->UpdateUIForTabFullscreen(); + } // For Tab Fullscreen -> Browser Fullscreen, enter browser fullscreen on the // display that originated the browser fullscreen prior to the tab fullscreen. @@ -393,8 +397,9 @@ } void FullscreenController::OnTabDetachedFromView(WebContents* old_contents) { - if (!IsFullscreenWithinTab(old_contents)) + if (!IsFullscreenWithinTab(old_contents)) { return; + } // A fullscreen-within-tab view undergoing screen capture has been detached // and is no longer visible to the user. Set it to exactly the WebContents' @@ -407,8 +412,9 @@ // If the view has been detached from the browser window (e.g., to drag a tab // off into a new browser window), return immediately to avoid an unnecessary // resize. - if (!old_contents->GetDelegate()) + if (!old_contents->GetDelegate()) { return; + } // Do nothing if tab capture ended after toggling fullscreen, or a preferred // size was never specified by the capturer. @@ -421,11 +427,12 @@ } void FullscreenController::OnTabClosing(WebContents* web_contents) { - if (IsFullscreenWithinTab(web_contents)) + if (IsFullscreenWithinTab(web_contents)) { web_contents->ExitFullscreen( /* will_cause_resize */ IsFullscreenCausedByTab()); - else + } else { ExclusiveAccessControllerBase::OnTabClosing(web_contents); + } } void FullscreenController::WindowFullscreenStateChanged() { @@ -457,8 +464,9 @@ } void FullscreenController::FullscreenTransitionCompleted() { - if (fullscreen_transition_complete_callback_) + if (fullscreen_transition_complete_callback_) { std::move(fullscreen_transition_complete_callback_).Run(); + } #if DCHECK_IS_ON() if (started_fullscreen_transition_ && IsTabFullscreen()) { DCHECK(exclusive_access_tab()); @@ -476,10 +484,11 @@ void FullscreenController::RunOrDeferUntilTransitionIsComplete( base::OnceClosure callback) { - if (started_fullscreen_transition_) + if (started_fullscreen_transition_) { fullscreen_transition_complete_callback_ = std::move(callback); - else + } else { std::move(callback).Run(); + } } bool FullscreenController::HandleUserPressedEscape() { @@ -491,8 +500,9 @@ return true; } - if (!IsWindowFullscreenForTabOrPending()) + if (!IsWindowFullscreenForTabOrPending()) { return false; + } ExitExclusiveAccessIfNecessary(); base::RecordAction(base::UserMetricsAction("ExitFullscreen_Esc")); @@ -519,23 +529,26 @@ } void FullscreenController::ExitExclusiveAccessToPreviousState() { - if (IsWindowFullscreenForTabOrPending()) + if (IsWindowFullscreenForTabOrPending()) { ExitFullscreenModeForTab(exclusive_access_tab()); - else if (IsFullscreenForBrowser()) + } else if (IsFullscreenForBrowser()) { ExitFullscreenModeInternal(); + } } GURL FullscreenController::GetURLForExclusiveAccessBubble() const { - if (exclusive_access_tab()) + if (exclusive_access_tab()) { return GetRequestingOrigin(); + } return extension_caused_fullscreen_; } void FullscreenController::ExitExclusiveAccessIfNecessary() { - if (IsWindowFullscreenForTabOrPending()) + if (IsWindowFullscreenForTabOrPending()) { ExitFullscreenModeForTab(exclusive_access_tab()); - else + } else { NotifyTabExclusiveAccessLost(); + } } void FullscreenController::PostFullscreenChangeNotification() { @@ -545,8 +558,9 @@ } void FullscreenController::NotifyFullscreenChange() { - for (auto& observer : observer_list_) + for (auto& observer : observer_list_) { observer.OnFullscreenStateChanged(); + } } void FullscreenController::NotifyTabExclusiveAccessLost() { @@ -610,8 +624,9 @@ // Do not enter tab fullscreen if there is no web contents for the // requesting frame (This normally shouldn't happen). DCHECK(web_contents); - if (!web_contents) + if (!web_contents) { return; + } int64_t current_display = GetDisplayId(*web_contents); if (display_id != display::kInvalidDisplayId) { // Check, but do not prompt, for permission to request a specific screen. @@ -631,13 +646,15 @@ tab_fullscreen_target_display_id_ = display_id == display::kInvalidDisplayId ? current_display : display_id; } else { - if (!extension_caused_fullscreen_.is_empty()) + if (!extension_caused_fullscreen_.is_empty()) { url = extension_caused_fullscreen_; + } } fullscreen_start_time_ = base::TimeTicks::Now(); - if (option == BROWSER) + if (option == BROWSER) { base::RecordAction(base::UserMetricsAction("ToggleFullscreen")); + } // TODO(scheib): Record metrics for WITH_TOOLBAR, without counting transitions // from tab fullscreen out to browser with toolbar. @@ -701,8 +718,9 @@ bool FullscreenController::IsFullscreenWithinTab( const WebContents* web_contents) const { - if (is_tab_fullscreen_for_testing_) + if (is_tab_fullscreen_for_testing_) { return true; + } // Note: On Mac, some of the OnTabXXX() methods get called with a nullptr // value @@ -720,8 +738,9 @@ GURL FullscreenController::GetRequestingOrigin() const { DCHECK(exclusive_access_tab()); - if (!requesting_origin_.is_empty()) + if (!requesting_origin_.is_empty()) { return requesting_origin_; + } return exclusive_access_tab()->GetLastCommittedURL(); }
diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller_interactive_browsertest.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller_interactive_browsertest.cc index abc0760..d9c6933 100644 --- a/chrome/browser/ui/exclusive_access/fullscreen_controller_interactive_browsertest.cc +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller_interactive_browsertest.cc
@@ -173,7 +173,8 @@ } void FullscreenControllerInteractiveTest::ToggleTabFullscreen_Internal( - bool enter_fullscreen, bool retry_until_success) { + bool enter_fullscreen, + bool retry_until_success) { WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents(); do { ui_test_utils::FullscreenWaiter waiter( @@ -187,12 +188,12 @@ // Repeat ToggleFullscreenModeForTab until the correct state is entered. // This addresses flakiness on test bots running many fullscreen // tests in parallel. - } while (retry_until_success && - !IsFullscreenForBrowser() && + } while (retry_until_success && !IsFullscreenForBrowser() && browser()->window()->IsFullscreen() != enter_fullscreen); ASSERT_EQ(IsWindowFullscreenForTabOrPending(), enter_fullscreen); - if (!IsFullscreenForBrowser()) + if (!IsFullscreenForBrowser()) { ASSERT_EQ(browser()->window()->IsFullscreen(), enter_fullscreen); + } } // Tests /////////////////////////////////////////////////////////////////////// @@ -202,8 +203,9 @@ TestNewTabExitsFullscreen) { #if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE) // Flaky in Linux interactive_ui_tests_wayland: crbug.com/1200036 - if (ui::OzonePlatform::GetPlatformNameForTest() == "wayland") + if (ui::OzonePlatform::GetPlatformNameForTest() == "wayland") { GTEST_SKIP(); + } #endif ASSERT_TRUE(embedded_test_server()->Start()); @@ -255,8 +257,9 @@ }))); // Lambda may run synchronously on some platforms. If it did not already run, // block until it has. - if (!lambda_called) + if (!lambda_called) { run_loop.Run(); + } EXPECT_TRUE(lambda_called); } @@ -337,8 +340,9 @@ TestTabDoesntExitFullscreenOnSubFrameNavigation) { ASSERT_TRUE(embedded_test_server()->Start()); - GURL url(ui_test_utils::GetTestUrl(base::FilePath( - base::FilePath::kCurrentDirectory), base::FilePath(kSimpleFile))); + GURL url(ui_test_utils::GetTestUrl( + base::FilePath(base::FilePath::kCurrentDirectory), + base::FilePath(kSimpleFile))); GURL url_with_fragment(url.spec() + "#fragment"); ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), url));
diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller_state_interactive_browsertest.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller_state_interactive_browsertest.cc index 3dbc848..12b8edf 100644 --- a/chrome/browser/ui/exclusive_access/fullscreen_controller_state_interactive_browsertest.cc +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller_state_interactive_browsertest.cc
@@ -74,7 +74,6 @@ // Progress of test can be examined via LOG(INFO) << GetAndClearDebugLog(); } - // Individual tests for each pair of state and event --------------------------- // An "empty" test is included as part of each "TEST_EVENT" because it makes @@ -108,7 +107,6 @@ #include "chrome/browser/ui/exclusive_access/fullscreen_controller_state_tests.h" - // Specific one-off tests for known issues ------------------------------------- // Used manually to determine what happens on a platform. @@ -124,7 +122,7 @@ ASSERT_TRUE(InvokeEvent(WINDOW_CHANGE)) << GetAndClearDebugLog(); // Wait, allowing human operator to observe the result. - scoped_refptr<content::MessageLoopRunner> message_loop - = new content::MessageLoopRunner(); + scoped_refptr<content::MessageLoopRunner> message_loop = + new content::MessageLoopRunner(); message_loop->Run(); }
diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller_state_test.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller_state_test.cc index 5c09850..e6d29f4 100644 --- a/chrome/browser/ui/exclusive_access/fullscreen_controller_state_test.cc +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller_state_test.cc
@@ -69,10 +69,10 @@ STATE_TO_BROWSER_FULLSCREEN, // Event TOGGLE_FULLSCREEN // TODO(crbug.com/40951066) Should be a // route back to TAB - STATE_TO_NORMAL, // Event ENTER_TAB_FULLSCREEN - STATE_TO_NORMAL, // Event EXIT_TAB_FULLSCREEN - STATE_TO_NORMAL, // Event BUBBLE_EXIT_LINK - STATE_NORMAL, // Event WINDOW_CHANGE + STATE_TO_NORMAL, // Event ENTER_TAB_FULLSCREEN + STATE_TO_NORMAL, // Event EXIT_TAB_FULLSCREEN + STATE_TO_NORMAL, // Event BUBBLE_EXIT_LINK + STATE_NORMAL, // Event WINDOW_CHANGE }, { // STATE_TO_BROWSER_FULLSCREEN: @@ -134,8 +134,9 @@ for (int source = 0; source < NUM_STATES; ++source) { for (int event = 0; event < NUM_EVENTS; ++event) { if (ShouldSkipStateAndEventPair(static_cast<State>(source), - static_cast<Event>(event))) + static_cast<Event>(event))) { continue; + } State destination = transition_table_[source][event]; state_transitions_[source][destination].event = static_cast<Event>(event); state_transitions_[source][destination].state = destination; @@ -187,12 +188,15 @@ void FullscreenControllerStateTest::TransitionToState(State final_state) { int max_steps = NUM_STATES; - while (max_steps-- && TransitionAStepTowardState(final_state)) + while (max_steps-- && TransitionAStepTowardState(final_state)) { continue; - ASSERT_GE(max_steps, 0) << "TransitionToState was unable to achieve desired " + } + ASSERT_GE(max_steps, 0) + << "TransitionToState was unable to achieve desired " << "target state. TransitionAStepTowardState iterated too many times." << GetAndClearDebugLog(); - ASSERT_EQ(final_state, state_) << "TransitionToState was unable to achieve " + ASSERT_EQ(final_state, state_) + << "TransitionToState was unable to achieve " << "desired target state. TransitionAStepTowardState returned false." << GetAndClearDebugLog(); } @@ -200,12 +204,12 @@ bool FullscreenControllerStateTest::TransitionAStepTowardState( State destination_state) { State source_state = state_; - if (source_state == destination_state) + if (source_state == destination_state) { return false; + } - StateTransitionInfo next = NextTransitionInShortestPath(source_state, - destination_state, - NUM_STATES); + StateTransitionInfo next = + NextTransitionInShortestPath(source_state, destination_state, NUM_STATES); if (next.state == STATE_INVALID) { NOTREACHED() << "TransitionAStepTowardState unable to transition. " << "NextTransitionInShortestPath(" @@ -230,8 +234,9 @@ // When simulating reentrant window change calls, expect the next state // automatically. - if (IsWindowFullscreenStateChangedReentrant()) + if (IsWindowFullscreenStateChangedReentrant()) { next_state = transition_table_[next_state][WINDOW_CHANGE]; + } // Figure out the fullscreen mode expectation. ui_test_utils::FullscreenWaiter::Expectation expectation; @@ -266,9 +271,9 @@ ui_test_utils::FullscreenWaiter waiter(GetBrowser(), expectation); debugging_log_ << " InvokeEvent(" << std::left - << std::setw(kMaxStateNameLength) << GetEventString(event) - << ") to " - << std::setw(kMaxStateNameLength) << GetStateString(next_state); + << std::setw(kMaxStateNameLength) << GetEventString(event) + << ") to " << std::setw(kMaxStateNameLength) + << GetStateString(next_state); state_ = next_state; @@ -291,8 +296,9 @@ // Activating/Deactivating tab fullscreen on a visibly captured tab // should not evoke a state change in the browser window. - if (active_tab->IsBeingVisiblyCaptured()) + if (active_tab->IsBeingVisiblyCaptured()) { state_ = source_state; + } break; } @@ -309,10 +315,11 @@ << GetEventString(event) << GetAndClearDebugLog(); } - if (GetWindowStateString()) + if (GetWindowStateString()) { debugging_log_ << " Window state now " << GetWindowStateString() << "\n"; - else + } else { debugging_log_ << "\n"; + } waiter.Wait(); VerifyWindowState(); @@ -348,7 +355,7 @@ #if BUILDFLAG(IS_MAC) FULLSCREEN_FOR_BROWSER_TRUE, #else - FULLSCREEN_FOR_BROWSER_FALSE, + FULLSCREEN_FOR_BROWSER_FALSE, #endif FULLSCREEN_FOR_TAB_NO_EXPECTATION); break; @@ -369,8 +376,9 @@ Event event1 = static_cast<Event>(event1_int); // Early out if skipping all tests for this state, reduces log noise. - if (ShouldSkipTest(state, event1)) + if (ShouldSkipTest(state, event1)) { continue; + } for (int event2_int = 0; event2_int < NUM_EVENTS; ++event2_int) { for (int event3_int = 0; event3_int < NUM_EVENTS; ++event3_int) { @@ -382,13 +390,15 @@ << GetAndClearDebugLog(); // Then, add an additional event to the sequence. - if (ShouldSkipStateAndEventPair(state_, event2)) + if (ShouldSkipStateAndEventPair(state_, event2)) { continue; + } ASSERT_TRUE(InvokeEvent(event2)) << GetAndClearDebugLog(); // Then, add an additional event to the sequence. - if (ShouldSkipStateAndEventPair(state_, event3)) + if (ShouldSkipStateAndEventPair(state_, event3)) { continue; + } ASSERT_TRUE(InvokeEvent(event3)) << GetAndClearDebugLog(); } } @@ -397,12 +407,12 @@ } FullscreenControllerStateTest::StateTransitionInfo - FullscreenControllerStateTest::NextTransitionInShortestPath( - State source, - State destination, - int search_limit) { - if (search_limit <= 0) +FullscreenControllerStateTest::NextTransitionInShortestPath(State source, + State destination, + int search_limit) { + if (search_limit <= 0) { return StateTransitionInfo(); // Return a default (invalid) state. + } if (state_transitions_[source][destination].state == STATE_INVALID) { // Don't know the next state yet, do a depth first search. @@ -413,8 +423,9 @@ Event event = static_cast<Event>(event_int); State next_state_candidate = transition_table_[source][event]; - if (ShouldSkipStateAndEventPair(source, event)) + if (ShouldSkipStateAndEventPair(source, event)) { continue; + } // Recurse. StateTransitionInfo candidate = NextTransitionInShortestPath( @@ -466,17 +477,16 @@ if (IsWindowFullscreenStateChangedReentrant() && (transition_table_[state][WINDOW_CHANGE] != state)) { debugging_log_ << "\nSkipping reentrant test for transitory source state " - << GetStateString(state) << ".\n"; + << GetStateString(state) << ".\n"; return true; } if (ShouldSkipStateAndEventPair(state, event)) { debugging_log_ << "\nSkipping test due to ShouldSkipStateAndEventPair(" - << GetStateString(state) << ", " - << GetEventString(event) << ").\n"; + << GetStateString(state) << ", " << GetEventString(event) + << ").\n"; LOG(INFO) << "Skipping test due to ShouldSkipStateAndEventPair(" - << GetStateString(state) << ", " - << GetEventString(event) << ")."; + << GetStateString(state) << ", " << GetEventString(event) << ")."; return true; } @@ -485,19 +495,19 @@ void FullscreenControllerStateTest::TestStateAndEvent(State state, Event event) { - if (ShouldSkipTest(state, event)) + if (ShouldSkipTest(state, event)) { return; + } - debugging_log_ << "\nTest transition from state " - << GetStateString(state) - << (IsWindowFullscreenStateChangedReentrant() ? - " with reentrant calls.\n" : ".\n"); + debugging_log_ << "\nTest transition from state " << GetStateString(state) + << (IsWindowFullscreenStateChangedReentrant() + ? " with reentrant calls.\n" + : ".\n"); // Spaced out text to line up with columns printed in InvokeEvent(). debugging_log_ << "First, from " - << GetStateString(state_) << "\n"; - ASSERT_NO_FATAL_FAILURE(TransitionToState(state)) - << GetAndClearDebugLog(); + << GetStateString(state_) << "\n"; + ASSERT_NO_FATAL_FAILURE(TransitionToState(state)) << GetAndClearDebugLog(); debugging_log_ << " Then,\n"; ASSERT_TRUE(InvokeEvent(event)) << GetAndClearDebugLog(); @@ -508,11 +518,13 @@ FullscreenForTabExpectation fullscreen_for_tab) { if (fullscreen_for_browser != FULLSCREEN_FOR_BROWSER_NO_EXPECTATION) { EXPECT_EQ(GetFullscreenController()->IsFullscreenForBrowser(), - !!fullscreen_for_browser) << GetAndClearDebugLog(); + !!fullscreen_for_browser) + << GetAndClearDebugLog(); } if (fullscreen_for_tab != FULLSCREEN_FOR_TAB_NO_EXPECTATION) { EXPECT_EQ(GetFullscreenController()->IsWindowFullscreenForTabOrPending(), - !!fullscreen_for_tab) << GetAndClearDebugLog(); + !!fullscreen_for_tab) + << GetAndClearDebugLog(); if (auto* tab = GetFullscreenController()->exclusive_access_tab()) { content::FullscreenState state = GetFullscreenController()->GetFullscreenState(tab); @@ -534,18 +546,16 @@ std::string FullscreenControllerStateTest::GetTransitionTableAsString() const { std::ostringstream output; output << "transition_table_[NUM_STATES = " << NUM_STATES - << "][NUM_EVENTS = " << NUM_EVENTS - << "] =\n"; + << "][NUM_EVENTS = " << NUM_EVENTS << "] =\n"; for (int state_int = 0; state_int < NUM_STATES; ++state_int) { State state = static_cast<State>(state_int); output << " { // " << GetStateString(state) << ":\n"; for (int event_int = 0; event_int < NUM_EVENTS; ++event_int) { Event event = static_cast<Event>(event_int); - output << " " - << std::left << std::setw(kMaxStateNameLength+1) - << std::string(GetStateString(transition_table_[state][event])) + "," - << "// Event " - << GetEventString(event) << "\n"; + output << " " << std::left << std::setw(kMaxStateNameLength + 1) + << std::string(GetStateString(transition_table_[state][event])) + + "," + << "// Event " << GetEventString(event) << "\n"; } output << " },\n"; } @@ -556,22 +566,19 @@ std::string FullscreenControllerStateTest::GetStateTransitionsAsString() const { std::ostringstream output; output << "state_transitions_[NUM_STATES = " << NUM_STATES - << "][NUM_STATES = " << NUM_STATES << "] =\n"; + << "][NUM_STATES = " << NUM_STATES << "] =\n"; for (int state1_int = 0; state1_int < NUM_STATES; ++state1_int) { State state1 = static_cast<State>(state1_int); output << "{ // " << GetStateString(state1) << ":\n"; for (int state2_int = 0; state2_int < NUM_STATES; ++state2_int) { State state2 = static_cast<State>(state2_int); const StateTransitionInfo& info = state_transitions_[state1][state2]; - output << " { " - << std::left << std::setw(kMaxStateNameLength+1) - << std::string(GetEventString(info.event)) + "," - << std::left << std::setw(kMaxStateNameLength+1) - << std::string(GetStateString(info.state)) + "," - << std::right << std::setw(2) - << info.distance - << " }, // " - << GetStateString(state2) << "\n"; + output << " { " << std::left << std::setw(kMaxStateNameLength + 1) + << std::string(GetEventString(info.event)) + "," << std::left + << std::setw(kMaxStateNameLength + 1) + << std::string(GetStateString(info.state)) + "," << std::right + << std::setw(2) << info.distance << " }, // " + << GetStateString(state2) << "\n"; } output << "},\n"; }
diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller_state_test.h b/chrome/browser/ui/exclusive_access/fullscreen_controller_state_test.h index 3e56d78e..7af71c1 100644 --- a/chrome/browser/ui/exclusive_access/fullscreen_controller_state_test.h +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller_state_test.h
@@ -14,7 +14,9 @@ class FullscreenController; // Utility definition for mapping enum values to strings in switch statements. -#define ENUM_TO_STRING(enum) case enum: return #enum +#define ENUM_TO_STRING(enum) \ + case enum: \ + return #enum // Test fixture used to test Fullscreen Controller through exhaustive sequences // of events in unit and interactive tests. @@ -114,25 +116,23 @@ std::string GetStateTransitionsAsString() const; protected: - // Set of enumerations (created with a helper macro) for _FALSE, _TRUE, and - // _NO_EXPECTATION values to be passed to VerifyWindowStateExpectations(). - #define EXPECTATION_ENUM(enum_name, enum_prefix) \ - enum enum_name { \ - enum_prefix##_FALSE, \ - enum_prefix##_TRUE, \ - enum_prefix##_NO_EXPECTATION \ - } +// Set of enumerations (created with a helper macro) for _FALSE, _TRUE, and +// _NO_EXPECTATION values to be passed to VerifyWindowStateExpectations(). +#define EXPECTATION_ENUM(enum_name, enum_prefix) \ + enum enum_name { \ + enum_prefix##_FALSE, \ + enum_prefix##_TRUE, \ + enum_prefix##_NO_EXPECTATION \ + } EXPECTATION_ENUM(FullscreenForBrowserExpectation, FULLSCREEN_FOR_BROWSER); EXPECTATION_ENUM(FullscreenForTabExpectation, FULLSCREEN_FOR_TAB); // Generated information about the transitions between states. struct StateTransitionInfo { StateTransitionInfo() - : event(EVENT_INVALID), - state(STATE_INVALID), - distance(NUM_STATES) {} - Event event; // The |Event| that will cause the state transition. - State state; // The adjacent |State| transitioned to; not the final state. + : event(EVENT_INVALID), state(STATE_INVALID), distance(NUM_STATES) {} + Event event; // The |Event| that will cause the state transition. + State state; // The adjacent |State| transitioned to; not the final state. int distance; // Steps to final state. NUM_STATES represents unknown. };
diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller_state_unittest.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller_state_unittest.cc index 5127a4e..b72c269 100644 --- a/chrome/browser/ui/exclusive_access/fullscreen_controller_state_unittest.cc +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller_state_unittest.cc
@@ -97,8 +97,9 @@ if (IsFullscreen()) { state_ = TO_NORMAL; - if (IsTransitionReentrant(false)) + if (IsTransitionReentrant(false)) { ChangeWindowFullscreenState(); + } } } @@ -131,10 +132,11 @@ // Most states result in "no operation" intentionally. The tests // assume that all possible states and event pairs can be tested, even // though window managers will not generate all of these. - if (state_ == TO_FULLSCREEN) - state_ = FULLSCREEN; - else if (state_ == TO_NORMAL) - state_ = NORMAL; + if (state_ == TO_FULLSCREEN) { + state_ = FULLSCREEN; + } else if (state_ == TO_NORMAL) { + state_ = NORMAL; + } // Emit a change event from every state to ensure the Fullscreen Controller // handles it in all circumstances. @@ -144,22 +146,27 @@ void FullscreenControllerTestWindow::EnterFullscreen() { bool reentrant = IsTransitionReentrant(true); - if (!IsFullscreen()) + if (!IsFullscreen()) { state_ = TO_FULLSCREEN; + } - if (reentrant) + if (reentrant) { ChangeWindowFullscreenState(); + } } bool FullscreenControllerTestWindow::IsTransitionReentrant( bool new_fullscreen) { bool fullscreen_changed = (new_fullscreen != IsFullscreen()); - if (!fullscreen_changed) + if (!fullscreen_changed) { return false; + } - if (FullscreenControllerStateTest::IsWindowFullscreenStateChangedReentrant()) + if (FullscreenControllerStateTest:: + IsWindowFullscreenStateChangedReentrant()) { return true; + } // BrowserWindowCocoa::EnterFullscreen() and // BrowserWindowCocoa::EnterFullscreenWithToolbar() are reentrant when @@ -253,26 +260,26 @@ void FullscreenControllerStateUnitTest::VerifyWindowState() { switch (state()) { case STATE_NORMAL: - EXPECT_EQ(FullscreenControllerTestWindow::NORMAL, - window_->state()) << GetAndClearDebugLog(); + EXPECT_EQ(FullscreenControllerTestWindow::NORMAL, window_->state()) + << GetAndClearDebugLog(); break; case STATE_BROWSER_FULLSCREEN: case STATE_TAB_FULLSCREEN: case STATE_TAB_BROWSER_FULLSCREEN: - EXPECT_EQ(FullscreenControllerTestWindow::FULLSCREEN, - window_->state()) << GetAndClearDebugLog(); + EXPECT_EQ(FullscreenControllerTestWindow::FULLSCREEN, window_->state()) + << GetAndClearDebugLog(); break; case STATE_TO_NORMAL: - EXPECT_EQ(FullscreenControllerTestWindow::TO_NORMAL, - window_->state()) << GetAndClearDebugLog(); + EXPECT_EQ(FullscreenControllerTestWindow::TO_NORMAL, window_->state()) + << GetAndClearDebugLog(); break; case STATE_TO_BROWSER_FULLSCREEN: case STATE_TO_TAB_FULLSCREEN: - EXPECT_EQ(FullscreenControllerTestWindow::TO_FULLSCREEN, - window_->state()) << GetAndClearDebugLog(); + EXPECT_EQ(FullscreenControllerTestWindow::TO_FULLSCREEN, window_->state()) + << GetAndClearDebugLog(); break; default: @@ -283,7 +290,8 @@ } bool FullscreenControllerStateUnitTest::ShouldSkipStateAndEventPair( - State state, Event event) { + State state, + Event event) { #if BUILDFLAG(IS_MAC) // TODO(scheib) Toggle, Window Event, Toggle, Toggle on Mac as exposed by // test *.STATE_TO_NORMAL__TOGGLE_FULLSCREEN runs interactively and exits to @@ -292,8 +300,9 @@ // http://crbug.com/156968 if ((state == STATE_TO_BROWSER_FULLSCREEN || state == STATE_TO_TAB_FULLSCREEN) && - event == TOGGLE_FULLSCREEN) + event == TOGGLE_FULLSCREEN) { return true; + } #endif return FullscreenControllerStateTest::ShouldSkipStateAndEventPair(state, @@ -321,7 +330,6 @@ // Progress of test can be examined via LOG(INFO) << GetAndClearDebugLog(); } - // Individual tests for each pair of state and event --------------------------- #define TEST_EVENT(state, event) \ @@ -330,12 +338,11 @@ ASSERT_NO_FATAL_FAILURE(TestStateAndEvent(state, event)) \ << GetAndClearDebugLog(); \ } - // Progress of tests can be examined by inserting the following line: - // LOG(INFO) << GetAndClearDebugLog(); } +// Progress of tests can be examined by inserting the following line: +// LOG(INFO) << GetAndClearDebugLog(); } #include "chrome/browser/ui/exclusive_access/fullscreen_controller_state_tests.h" - // Specific one-off tests for known issues ------------------------------------- // TODO(scheib) Toggling Tab fullscreen while pending Tab or @@ -343,11 +350,12 @@ TEST_F(FullscreenControllerStateUnitTest, DISABLED_ToggleTabWhenPendingBrowser) { // Only possible without reentrancy. - if (FullscreenControllerStateTest::IsWindowFullscreenStateChangedReentrant()) + if (FullscreenControllerStateTest:: + IsWindowFullscreenStateChangedReentrant()) { return; + } AddTab(browser(), GURL(url::kAboutBlankURL)); - ASSERT_NO_FATAL_FAILURE( - TransitionToState(STATE_TO_BROWSER_FULLSCREEN)) + ASSERT_NO_FATAL_FAILURE(TransitionToState(STATE_TO_BROWSER_FULLSCREEN)) << GetAndClearDebugLog(); ASSERT_TRUE(InvokeEvent(ENTER_TAB_FULLSCREEN)) << GetAndClearDebugLog(); @@ -359,11 +367,12 @@ // Browser fullscreen is broken currently http://crbug.com/154196 TEST_F(FullscreenControllerStateUnitTest, DISABLED_ToggleTabWhenPendingTab) { // Only possible without reentrancy. - if (FullscreenControllerStateTest::IsWindowFullscreenStateChangedReentrant()) + if (FullscreenControllerStateTest:: + IsWindowFullscreenStateChangedReentrant()) { return; + } AddTab(browser(), GURL(url::kAboutBlankURL)); - ASSERT_NO_FATAL_FAILURE( - TransitionToState(STATE_TO_TAB_FULLSCREEN)) + ASSERT_NO_FATAL_FAILURE(TransitionToState(STATE_TO_TAB_FULLSCREEN)) << GetAndClearDebugLog(); ASSERT_TRUE(InvokeEvent(ENTER_TAB_FULLSCREEN)) << GetAndClearDebugLog(); @@ -386,13 +395,14 @@ for (int state2_int = 0; state2_int < NUM_STATES; ++state2_int) { State state2 = static_cast<State>(state2_int); if (ShouldSkipStateAndEventPair(state1, EVENT_INVALID) || - ShouldSkipStateAndEventPair(state2, EVENT_INVALID)) + ShouldSkipStateAndEventPair(state2, EVENT_INVALID)) { continue; + } // Compute the transition if (NextTransitionInShortestPath(state1, state2, NUM_STATES).state == STATE_INVALID) { LOG(ERROR) << "Should be skipping state transitions for: " - << GetStateString(state1) << " " << GetStateString(state2); + << GetStateString(state1) << " " << GetStateString(state2); } } } @@ -765,8 +775,7 @@ class FullscreenChangeObserver : public content::WebContentsObserver { public: explicit FullscreenChangeObserver(content::WebContents* web_contents) - : WebContentsObserver(web_contents) { - } + : WebContentsObserver(web_contents) {} FullscreenChangeObserver(const FullscreenChangeObserver&) = delete; FullscreenChangeObserver& operator=(const FullscreenChangeObserver&) = delete;
diff --git a/chrome/browser/ui/exclusive_access/fullscreen_interactive_browsertest.cc b/chrome/browser/ui/exclusive_access/fullscreen_interactive_browsertest.cc index 300c56a9..3a006a9 100644 --- a/chrome/browser/ui/exclusive_access/fullscreen_interactive_browsertest.cc +++ b/chrome/browser/ui/exclusive_access/fullscreen_interactive_browsertest.cc
@@ -54,8 +54,9 @@ } void Wait() { - if (!found_value_) + if (!found_value_) { run_loop_.Run(); + } } void WaitForExit() { if (!did_exit_) {
diff --git a/chrome/browser/ui/exclusive_access/keyboard_lock_controller.cc b/chrome/browser/ui/exclusive_access/keyboard_lock_controller.cc index 8fbd2749..a4daa4a 100644 --- a/chrome/browser/ui/exclusive_access/keyboard_lock_controller.cc +++ b/chrome/browser/ui/exclusive_access/keyboard_lock_controller.cc
@@ -136,8 +136,9 @@ // active keyboard lock request which requires press and hold, then we just // return as the simple 'press esc to exit' case is handled by the caller // (which is the ExclusiveAccessManager in this case). - if (!RequiresPressAndHoldEscToExit()) + if (!RequiresPressAndHoldEscToExit()) { return false; + } // Note: This logic handles exiting fullscreen but the UI feedback element is // created and managed by the FullscreenControlHost class. @@ -162,8 +163,9 @@ } void KeyboardLockController::CancelKeyboardLockRequest(WebContents* tab) { - if (tab == exclusive_access_tab()) + if (tab == exclusive_access_tab()) { UnlockKeyboard(); + } } void KeyboardLockController::LockKeyboard( @@ -245,8 +247,9 @@ /*force_update=*/true); esc_keypress_tracker_.clear(); - if (esc_repeat_triggered_for_test_) + if (esc_repeat_triggered_for_test_) { std::move(esc_repeat_triggered_for_test_).Run(); + } } }
diff --git a/chrome/browser/ui/exclusive_access/pointer_lock_controller.cc b/chrome/browser/ui/exclusive_access/pointer_lock_controller.cc index 03c9654..e872284 100644 --- a/chrome/browser/ui/exclusive_access/pointer_lock_controller.cc +++ b/chrome/browser/ui/exclusive_access/pointer_lock_controller.cc
@@ -61,16 +61,18 @@ if (!user_gesture) { web_contents->GotResponseToPointerLockRequest( blink::mojom::PointerLockResult::kRequiresUserGesture); - if (lock_state_callback_for_test_) + if (lock_state_callback_for_test_) { std::move(lock_state_callback_for_test_).Run(); + } return; } if (base::TimeTicks::Now() < last_user_escape_time_ + kEffectiveUserEscapeDuration) { web_contents->GotResponseToPointerLockRequest( blink::mojom::PointerLockResult::kUserRejected); - if (lock_state_callback_for_test_) + if (lock_state_callback_for_test_) { std::move(lock_state_callback_for_test_).Run(); + } return; } } @@ -139,8 +141,9 @@ } void PointerLockController::ExitExclusiveAccessToPreviousState() { - if (lock_state_callback_for_test_) + if (lock_state_callback_for_test_) { std::move(lock_state_callback_for_test_).Run(); + } pointer_lock_state_ = POINTERLOCK_UNLOCKED; SetTabWithExclusiveAccess(nullptr); @@ -153,8 +156,9 @@ void PointerLockController::UnlockPointer() { WebContents* tab = exclusive_access_tab(); - if (!tab) + if (!tab) { return; + } hosts_waiting_for_pointer_lock_permission_prompt_.erase( tab->GetPrimaryMainFrame()->GetGlobalId()); @@ -162,11 +166,13 @@ content::RenderWidgetHostView* pointer_lock_view = nullptr; RenderViewHost* const rvh = exclusive_access_tab()->GetPrimaryMainFrame()->GetRenderViewHost(); - if (rvh) + if (rvh) { pointer_lock_view = rvh->GetWidget()->GetView(); + } - if (pointer_lock_view) + if (pointer_lock_view) { pointer_lock_view->UnlockPointer(); + } } void PointerLockController::LockPointer( @@ -236,8 +242,9 @@ void PointerLockController::OnBubbleHidden( WebContents* web_contents, ExclusiveAccessBubbleHideReason reason) { - if (bubble_hide_callback_for_test_) + if (bubble_hide_callback_for_test_) { bubble_hide_callback_for_test_.Run(reason); + } // Allow silent pointer lock if the bubble has been display for a period of // time and dismissed due to timeout.
diff --git a/chrome/browser/ui/extensions/application_launch.cc b/chrome/browser/ui/extensions/application_launch.cc index 2ce995d..b8e094e 100644 --- a/chrome/browser/ui/extensions/application_launch.cc +++ b/chrome/browser/ui/extensions/application_launch.cc
@@ -102,8 +102,9 @@ void ExtensionEnableFlowFinished() override { const Extension* extension = registry_->enabled_extensions().GetByID(extension_id_); - if (!extension) + if (!extension) { return; + } std::move(callback_).Run(); delete this; } @@ -120,8 +121,9 @@ const Extension* GetExtension(Profile* profile, const apps::AppLaunchParams& params) { - if (params.app_id.empty()) + if (params.app_id.empty()) { return nullptr; + } ExtensionRegistry* registry = ExtensionRegistry::Get(profile); return registry->GetExtensionById( params.app_id, ExtensionRegistry::ENABLED | ExtensionRegistry::DISABLED | @@ -130,11 +132,13 @@ bool IsAllowedToOverrideURL(const extensions::Extension* extension, const GURL& override_url) { - if (extension->web_extent().MatchesURL(override_url)) + if (extension->web_extent().MatchesURL(override_url)) { return true; + } - if (override_url.DeprecatedGetOriginAsURL() == extension->url()) + if (override_url.DeprecatedGetOriginAsURL() == extension->url()) { return true; + } return false; } @@ -172,8 +176,10 @@ Profile* profile, apps::LaunchContainer container, const Extension* extension) { - if (!extension || container != apps::LaunchContainer::kLaunchContainerWindow) + if (!extension || + container != apps::LaunchContainer::kLaunchContainerWindow) { return ui::mojom::WindowShowState::kDefault; + } if (IsRunningInForcedAppMode()) { return ui::mojom::WindowShowState::kFullscreen; @@ -229,8 +235,9 @@ extensions::GetLaunchType(ExtensionPrefs::Get(profile), extension); int add_type = AddTabTypes::ADD_ACTIVE; - if (launch_type == extensions::LAUNCH_TYPE_PINNED) + if (launch_type == extensions::LAUNCH_TYPE_PINNED) { add_type |= AddTabTypes::ADD_PINNED; + } ui::PageTransition transition = ui::PAGE_TRANSITION_AUTO_BOOKMARK; NavigateParams params(browser, url, transition); @@ -515,8 +522,9 @@ void OpenApplicationWithReenablePrompt(Profile* profile, apps::AppLaunchParams&& params) { const Extension* extension = GetExtension(profile, params); - if (!extension) + if (!extension) { return; + } ExtensionService* service = extensions::ExtensionSystem::Get(profile)->extension_service();
diff --git a/chrome/browser/ui/extensions/application_launch.h b/chrome/browser/ui/extensions/application_launch.h index 0c42baa..a4995cea 100644 --- a/chrome/browser/ui/extensions/application_launch.h +++ b/chrome/browser/ui/extensions/application_launch.h
@@ -62,8 +62,7 @@ // and shortcuts that open an installed application. This function // is used to open the former. To open the latter, use // application_launch::OpenApplication(). -content::WebContents* OpenAppShortcutWindow(Profile* profile, - const GURL& url); +content::WebContents* OpenAppShortcutWindow(Profile* profile, const GURL& url); // Whether the extension can be launched by sending a // chrome.app.runtime.onLaunched event.
diff --git a/chrome/browser/ui/extensions/application_launch_browsertest.cc b/chrome/browser/ui/extensions/application_launch_browsertest.cc index 8d13f25..c623023 100644 --- a/chrome/browser/ui/extensions/application_launch_browsertest.cc +++ b/chrome/browser/ui/extensions/application_launch_browsertest.cc
@@ -2,9 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/extensions/application_launch.h" + #include "ash/shell.h" #include "chrome/browser/ui/browser_window.h" -#include "chrome/browser/ui/extensions/application_launch.h" #include "chrome/test/base/in_process_browser_test.h" #include "components/services/app_service/public/cpp/app_launch_util.h" #include "content/public/test/browser_test.h"
diff --git a/chrome/browser/ui/extensions/extension_action_view_controller.cc b/chrome/browser/ui/extensions/extension_action_view_controller.cc index f6276506..2ec425f 100644 --- a/chrome/browser/ui/extensions/extension_action_view_controller.cc +++ b/chrome/browser/ui/extensions/extension_action_view_controller.cc
@@ -109,17 +109,19 @@ GetHoverCardPolicyState(Browser* browser, const extensions::ExtensionId& extension_id) { auto* const model = ToolbarActionsModel::Get(browser->profile()); - if (model->IsActionForcePinned(extension_id)) + if (model->IsActionForcePinned(extension_id)) { return ExtensionActionViewController::HoverCardState::AdminPolicy:: kPinnedByAdmin; + } scoped_refptr<const extensions::Extension> extension = extensions::ExtensionRegistry::Get(browser->profile()) ->enabled_extensions() .GetByID(extension_id); - if (extensions::Manifest::IsPolicyLocation(extension->location())) + if (extensions::Manifest::IsPolicyLocation(extension->location())) { return ExtensionActionViewController::HoverCardState::AdminPolicy:: kInstalledByAdmin; + } return ExtensionActionViewController::HoverCardState::AdminPolicy::kNone; } @@ -202,16 +204,18 @@ ui::ImageModel ExtensionActionViewController::GetIcon( content::WebContents* web_contents, const gfx::Size& size) { - if (!ExtensionIsValid()) + if (!ExtensionIsValid()) { return ui::ImageModel(); + } return ui::ImageModel::FromImageSkia( gfx::ImageSkia(GetIconImageSource(web_contents, size), size)); } std::u16string ExtensionActionViewController::GetActionName() const { - if (!ExtensionIsValid()) + if (!ExtensionIsValid()) { return std::u16string(); + } return base::UTF8ToUTF16(extension_->name()); } @@ -229,13 +233,15 @@ std::u16string ExtensionActionViewController::GetAccessibleName( content::WebContents* web_contents) const { - if (!ExtensionIsValid()) + if (!ExtensionIsValid()) { return std::u16string(); + } // GetAccessibleName() can (surprisingly) be called during browser // teardown. Handle this gracefully. - if (!web_contents) + if (!web_contents) { return base::UTF8ToUTF16(extension()->name()); + } std::u16string action_title = GetActionTitle(web_contents); std::u16string accessible_name = @@ -347,14 +353,16 @@ if (IsShowingPopup()) { // Only call Close() on the popup if it's been shown; otherwise, the popup // will be cleaned up in ShowPopup(). - if (has_opened_popup_) + if (has_opened_popup_) { popup_host_->Close(); + } // We need to do these actions synchronously (instead of closing and then // performing the rest of the cleanup in OnExtensionHostDestroyed()) because // the extension host may close asynchronously, and we need to keep the view // delegate up to date. - if (popup_host_) + if (popup_host_) { OnPopupClosed(); + } } } @@ -365,8 +373,9 @@ ui::MenuModel* ExtensionActionViewController::GetContextMenu( extensions::ExtensionContextMenuModel::ContextMenuSource context_menu_source) { - if (!ExtensionIsValid()) + if (!ExtensionIsValid()) { return nullptr; + } bool is_pinned = ToolbarActionsModel::Get(browser_->profile())->IsActionPinned(GetId()); @@ -396,8 +405,9 @@ } void ExtensionActionViewController::ExecuteUserAction(InvocationSource source) { - if (!ExtensionIsValid()) + if (!ExtensionIsValid()) { return; + } if (!IsEnabled(view_delegate_->GetCurrentWebContents())) { GetPreferredPopupViewController() @@ -409,8 +419,9 @@ view_delegate_->GetCurrentWebContents(); ExtensionActionRunner* action_runner = ExtensionActionRunner::GetForWebContents(web_contents); - if (!action_runner) + if (!action_runner) { return; + } RecordInvocationSource(source); @@ -443,8 +454,9 @@ } void ExtensionActionViewController::UpdateState() { - if (!ExtensionIsValid()) + if (!ExtensionIsValid()) { return; + } view_delegate_->UpdateState(); } @@ -452,15 +464,17 @@ void ExtensionActionViewController::UpdateHoverCard( ToolbarActionView* action_view, ToolbarActionHoverCardUpdateType update_type) { - if (!ExtensionIsValid()) + if (!ExtensionIsValid()) { return; + } extensions_container_->UpdateToolbarActionHoverCard(action_view, update_type); } void ExtensionActionViewController::RegisterCommand() { - if (!ExtensionIsValid()) + if (!ExtensionIsValid()) { return; + } platform_delegate_->RegisterCommand(); } @@ -479,8 +493,9 @@ void ExtensionActionViewController::OnIconUpdated() { // We update the view first, so that if the observer relies on its UI it can // be ready. - if (view_delegate_) + if (view_delegate_) { view_delegate_->UpdateState(); + } } void ExtensionActionViewController::OnExtensionHostDestroyed( @@ -502,8 +517,9 @@ bool ExtensionActionViewController::GetExtensionCommand( extensions::Command* command) const { DCHECK(command); - if (!ExtensionIsValid()) + if (!ExtensionIsValid()) { return false; + } CommandService* command_service = CommandService::Get(browser_->profile()); return command_service->GetExtensionActionCommand( @@ -533,8 +549,9 @@ } bool ExtensionActionViewController::CanHandleAccelerators() const { - if (!ExtensionIsValid()) + if (!ExtensionIsValid()) { return false; + } #if DCHECK_IS_ON() { @@ -614,8 +631,9 @@ // It's possible that the popup should be closed before it finishes opening // (since it can open asynchronously). Check before proceeding. if (!popup_host_) { - if (callback) + if (callback) { std::move(callback).Run(nullptr); + } return; } // NOTE: Today, ShowPopup() always synchronously creates the platform-specific
diff --git a/chrome/browser/ui/extensions/extension_enable_flow.cc b/chrome/browser/ui/extensions/extension_enable_flow.cc index 96094b5..c9e52b81 100644 --- a/chrome/browser/ui/extensions/extension_enable_flow.cc +++ b/chrome/browser/ui/extensions/extension_enable_flow.cc
@@ -62,8 +62,9 @@ extension = registry->terminated_extensions().GetByID(extension_id_); // It's possible (though unlikely) the app could have been uninstalled since // the user clicked on it. - if (!extension) + if (!extension) { return; + } // If the app was terminated, reload it first. service->ReloadExtension(extension_id_); @@ -247,7 +248,8 @@ ->GetSupervisedUserExtensionsDelegate(); CHECK(supervised_user_extensions_delegate); supervised_user_extensions_delegate->AddExtensionApproval(*extension); - supervised_user_extensions_delegate->MaybeRecordPermissionsIncreaseMetrics(*extension); + supervised_user_extensions_delegate->MaybeRecordPermissionsIncreaseMetrics( + *extension); supervised_user_extensions_delegate->RecordExtensionEnablementUmaMetrics( /*enabled=*/true); }
diff --git a/chrome/browser/ui/extensions/extension_installed_bubble_model.cc b/chrome/browser/ui/extensions/extension_installed_bubble_model.cc index 5dc2a1b..70195d27 100644 --- a/chrome/browser/ui/extensions/extension_installed_bubble_model.cc +++ b/chrome/browser/ui/extensions/extension_installed_bubble_model.cc
@@ -27,8 +27,9 @@ Profile* profile) { const auto* info = extensions::ActionInfo::GetExtensionActionInfo(extension); - if (!info) + if (!info) { return std::nullopt; + } auto* service = extensions::CommandService::Get(profile); extensions::Command command; @@ -46,8 +47,9 @@ std::optional<extensions::Command> command, const std::string& keyword) { std::u16string extra; - if (command.has_value()) + if (command.has_value()) { extra = command->accelerator().GetShortcutText(); + } int message_id = 0; if (action && action->type == extensions::ActionInfo::Type::kBrowser) { @@ -64,8 +66,9 @@ message_id = IDS_EXTENSION_INSTALLED_OMNIBOX_KEYWORD_INFO; } - if (!message_id) + if (!message_id) { return std::u16string(); + } return extra.empty() ? l10n_util::GetStringUTF16(message_id) : l10n_util::GetStringFUTF16(message_id, extra); @@ -106,8 +109,9 @@ !extensions::sync_util::IsSyncingExtensionsEnabled(profile) && signin::ShouldShowSyncPromo(*profile); - if (show_how_to_use_) + if (show_how_to_use_) { how_to_use_text_ = MakeHowToUseText(action_info, command, keyword); + } } ExtensionInstalledBubbleModel::~ExtensionInstalledBubbleModel() = default; @@ -120,8 +124,9 @@ gfx::ImageSkia ExtensionInstalledBubbleModel::MakeIconOfSize( const gfx::Size& wanted) const { gfx::Size size(icon_.width(), icon_.height()); - if (size.width() > wanted.width() || size.height() > wanted.height()) + if (size.width() > wanted.width() || size.height() > wanted.height()) { size.SetSize(wanted.width(), wanted.height()); + } return gfx::ImageSkiaOperations::CreateResizedImage( gfx::ImageSkia::CreateFrom1xBitmap(icon_),
diff --git a/chrome/browser/ui/extensions/extension_installed_waiter.cc b/chrome/browser/ui/extensions/extension_installed_waiter.cc index 6e4e264a..052bf5b 100644 --- a/chrome/browser/ui/extensions/extension_installed_waiter.cc +++ b/chrome/browser/ui/extensions/extension_installed_waiter.cc
@@ -24,12 +24,14 @@ void ExtensionInstalledWaiter::SetGivingUpCallbackForTesting( base::RepeatingClosure callback) { - if (g_giving_up_callback) + if (g_giving_up_callback) { delete g_giving_up_callback; - if (!callback.is_null()) + } + if (!callback.is_null()) { g_giving_up_callback = new base::RepeatingClosure(callback); - else + } else { g_giving_up_callback = nullptr; + } } ExtensionInstalledWaiter::ExtensionInstalledWaiter( @@ -45,8 +47,9 @@ } ExtensionInstalledWaiter::~ExtensionInstalledWaiter() { - if (done_callback_ && g_giving_up_callback) + if (done_callback_ && g_giving_up_callback) { g_giving_up_callback->Run(); + } BrowserList::RemoveObserver(this); } @@ -67,8 +70,9 @@ void ExtensionInstalledWaiter::OnExtensionLoaded( content::BrowserContext* browser_context, const extensions::Extension* extension) { - if (extension != extension_.get()) + if (extension != extension_.get()) { return; + } // Only call Wait() after all the other extension observers have had a chance // to run. @@ -82,11 +86,13 @@ content::BrowserContext* browser_context, const extensions::Extension* extension, extensions::UnloadedExtensionReason reason) { - if (extension == extension_.get()) + if (extension == extension_.get()) { delete this; + } } void ExtensionInstalledWaiter::OnBrowserRemoved(Browser* browser) { - if (browser == browser_) + if (browser == browser_) { delete this; + } }
diff --git a/chrome/browser/ui/extensions/extension_installed_waiter_unittest.cc b/chrome/browser/ui/extensions/extension_installed_waiter_unittest.cc index 0911a7391..ca4f107e 100644 --- a/chrome/browser/ui/extensions/extension_installed_waiter_unittest.cc +++ b/chrome/browser/ui/extensions/extension_installed_waiter_unittest.cc
@@ -47,8 +47,9 @@ Browser* test_browser = nullptr) { ExtensionInstalledWaiter::SetGivingUpCallbackForTesting(base::BindRepeating( &ExtensionInstalledWaiterTest::GivingUp, base::Unretained(this))); - if (!test_browser) + if (!test_browser) { test_browser = browser(); + } ExtensionInstalledWaiter::WaitForInstall( extension, test_browser, base::BindOnce(&ExtensionInstalledWaiterTest::Done,
diff --git a/chrome/browser/ui/extensions/extension_settings_overridden_dialog.cc b/chrome/browser/ui/extensions/extension_settings_overridden_dialog.cc index 0b6d944f..66a1c5f 100644 --- a/chrome/browser/ui/extensions/extension_settings_overridden_dialog.cc +++ b/chrome/browser/ui/extensions/extension_settings_overridden_dialog.cc
@@ -87,14 +87,17 @@ default; bool ExtensionSettingsOverriddenDialog::ShouldShow() { - if (params_.controlling_extension_id.empty()) + if (params_.controlling_extension_id.empty()) { return false; + } - if (HasShownFor(profile_, params_.controlling_extension_id)) + if (HasShownFor(profile_, params_.controlling_extension_id)) { return false; + } - if (HasAcknowledgedExtension(params_.controlling_extension_id)) + if (HasAcknowledgedExtension(params_.controlling_extension_id)) { return false; + } const extensions::Extension* extension = extensions::ExtensionRegistry::Get(profile_)
diff --git a/chrome/browser/ui/extensions/extension_settings_overridden_dialog_unittest.cc b/chrome/browser/ui/extensions/extension_settings_overridden_dialog_unittest.cc index a2f0525..c32a0ae 100644 --- a/chrome/browser/ui/extensions/extension_settings_overridden_dialog_unittest.cc +++ b/chrome/browser/ui/extensions/extension_settings_overridden_dialog_unittest.cc
@@ -54,8 +54,9 @@ bool include_extra_perms = true) { extensions::ExtensionBuilder builder(name); builder.SetLocation(location); - if (include_extra_perms) + if (include_extra_perms) { builder.AddAPIPermission("storage"); + } scoped_refptr<const extensions::Extension> extension = builder.Build(); service()->AddExtension(extension.get()); return extension.get();
diff --git a/chrome/browser/ui/extensions/hosted_app_browser_controller.cc b/chrome/browser/ui/extensions/hosted_app_browser_controller.cc index 70c7130..1c1973e7 100644 --- a/chrome/browser/ui/extensions/hosted_app_browser_controller.cc +++ b/chrome/browser/ui/extensions/hosted_app_browser_controller.cc
@@ -71,8 +71,9 @@ #if BUILDFLAG(IS_CHROMEOS) if (apps::AppServiceProxyFactory::IsAppServiceAvailableForProfile( browser()->profile())) { - if (!app_icon_.isNull()) + if (!app_icon_.isNull()) { return ui::ImageModel::FromImageSkia(app_icon_); + } const Extension* extension = GetExtension(); if (extension && @@ -87,25 +88,29 @@ content::WebContents* contents = browser()->tab_strip_model()->GetActiveWebContents(); - if (!contents) + if (!contents) { return GetFallbackAppIcon(); + } extensions::TabHelper* extensions_tab_helper = extensions::TabHelper::FromWebContents(contents); - if (!extensions_tab_helper) + if (!extensions_tab_helper) { return GetFallbackAppIcon(); + } const SkBitmap* icon_bitmap = extensions_tab_helper->GetExtensionAppIcon(); - if (!icon_bitmap) + if (!icon_bitmap) { return GetFallbackAppIcon(); + } return ui::ImageModel::FromImageSkia( gfx::ImageSkia::CreateFrom1xBitmap(*icon_bitmap)); } ui::ImageModel HostedAppBrowserController::GetWindowIcon() const { - if (IsWebApp(browser())) + if (IsWebApp(browser())) { return GetWindowAppIcon(); + } return ui::ImageModel::FromImage(browser()->GetCurrentPageIcon()); } @@ -123,8 +128,9 @@ GURL HostedAppBrowserController::GetAppStartUrl() const { const Extension* extension = GetExtension(); - if (!extension) + if (!extension) { return GURL(); + } return AppLaunchInfo::GetLaunchWebURL(extension); } @@ -132,15 +138,17 @@ bool HostedAppBrowserController::IsUrlInAppScope(const GURL& url) const { const Extension* extension = GetExtension(); - if (!extension) + if (!extension) { return false; + } const std::vector<UrlHandlerInfo>* url_handlers = UrlHandlers::GetUrlHandlers(extension); // We don't have a scope, fall back to same origin check. - if (!url_handlers) + if (!url_handlers) { return IsSameHostAndPort(GetAppStartUrl(), url); + } return UrlHandlers::CanBookmarkAppHandleUrl(extension, url); } @@ -163,12 +171,14 @@ } bool HostedAppBrowserController::CanUserUninstall() const { - if (uninstall_dialog_) + if (uninstall_dialog_) { return false; + } const Extension* extension = GetExtension(); - if (!extension) + if (!extension) { return false; + } return extensions::ExtensionSystem::Get(browser()->profile()) ->management_policy() @@ -178,8 +188,9 @@ void HostedAppBrowserController::Uninstall( webapps::WebappUninstallSource webapp_uninstall_source) { const Extension* extension = GetExtension(); - if (!extension) + if (!extension) { return; + } DCHECK(!uninstall_dialog_); uninstall_dialog_ = ExtensionUninstallDialog::Create( @@ -231,13 +242,15 @@ } void HostedAppBrowserController::OnLoadIcon(apps::IconValuePtr icon_value) { - if (!icon_value || icon_value->icon_type != apps::IconType::kStandard) + if (!icon_value || icon_value->icon_type != apps::IconType::kStandard) { return; + } app_icon_ = icon_value->uncompressed; - if (icon_value->is_placeholder_icon) + if (icon_value->is_placeholder_icon) { LoadAppIcon(false /* allow_placeholder_icon */); + } } } // namespace extensions
diff --git a/chrome/browser/ui/extensions/hosted_app_browsertest.cc b/chrome/browser/ui/extensions/hosted_app_browsertest.cc index 8fa6b88..0c6de4b7 100644 --- a/chrome/browser/ui/extensions/hosted_app_browsertest.cc +++ b/chrome/browser/ui/extensions/hosted_app_browsertest.cc
@@ -137,8 +137,8 @@ constexpr const char kExampleURL[] = "https://www.example.com/empty.html"; enum class AppType { - HOSTED_APP, // Using HostedAppBrowserController - WEB_APP, // Using WebAppBrowserController, WebAppRegistrar + HOSTED_APP, // Using HostedAppBrowserController + WEB_APP, // Using WebAppBrowserController, WebAppRegistrar }; std::string AppTypeParamToString( @@ -857,8 +857,9 @@ // redirects to a platform app. https://crbug.com/721949. IN_PROC_BROWSER_TEST_P(HostedOrWebAppTest, SubframeRedirectsToHostedApp) { // This test only applies to hosted apps. - if (app_type() != AppType::HOSTED_APP) + if (app_type() != AppType::HOSTED_APP) { return; + } ASSERT_TRUE(embedded_test_server()->Start()); @@ -1056,8 +1057,9 @@ WebContents* web_contents = WebContents::FromRenderFrameHost(parent_rfh); content::TestNavigationObserver nav_observer(web_contents, 1); std::string script = "var f = document.createElement('iframe');"; - if (!element_id.empty()) + if (!element_id.empty()) { script += "f.id = '" + element_id + "';"; + } script += "f.src = '" + url.spec() + "';"; script += "document.body.appendChild(f);"; EXPECT_TRUE(ExecJs(parent_rfh, script)); @@ -1202,10 +1204,11 @@ EXPECT_EQ(diff_dir->GetProcess(), app->GetProcess()); EXPECT_EQ(same_site->GetProcess(), app->GetProcess()); EXPECT_NE(isolated->GetProcess(), app->GetProcess()); - if (should_swap_for_cross_site_) + if (should_swap_for_cross_site_) { EXPECT_NE(cross_site->GetProcess(), app->GetProcess()); - else + } else { EXPECT_EQ(cross_site->GetProcess(), app->GetProcess()); + } // The isolated origin iframe's process should be in the ProcessMap, since // the isolated origin is covered by the app's extent. @@ -1214,9 +1217,10 @@ // If we swapped processes for the |cross_site| iframe, its process should // not be on the ProcessMap. - if (should_swap_for_cross_site_) + if (should_swap_for_cross_site_) { EXPECT_FALSE( process_map_->Contains(cross_site->GetProcess()->GetDeprecatedID())); + } // Verify that |same_dir| and |diff_dir| can script each other. // (they should - they have the same origin). @@ -2030,12 +2034,15 @@ bool IsJitDisabledForSite(content::BrowserContext* browser_context, const GURL& site_url) override { - if (site_url.is_empty()) + if (site_url.is_empty()) { return is_jit_disabled_by_default_; - if (site_url.DomainIs("jit-disabled.com")) + } + if (site_url.DomainIs("jit-disabled.com")) { return true; - if (site_url.DomainIs("jit-enabled.com")) + } + if (site_url.DomainIs("jit-enabled.com")) { return false; + } return is_jit_disabled_by_default_; } @@ -2528,10 +2535,9 @@ HostedAppTestWithAutoupgradesDisabled, ::testing::Values(AppType::HOSTED_APP)); -INSTANTIATE_TEST_SUITE_P( - All, - HostedAppProcessModelTest, - ::testing::Values(AppType::HOSTED_APP)); +INSTANTIATE_TEST_SUITE_P(All, + HostedAppProcessModelTest, + ::testing::Values(AppType::HOSTED_APP)); INSTANTIATE_TEST_SUITE_P(All, HostedAppProcessModelFencedFrameTest, @@ -2541,15 +2547,13 @@ HostedAppOriginIsolationTest, ::testing::Values(AppType::HOSTED_APP)); -INSTANTIATE_TEST_SUITE_P( - All, - HostedAppIsolatedOriginTest, - ::testing::Values(AppType::HOSTED_APP)); +INSTANTIATE_TEST_SUITE_P(All, + HostedAppIsolatedOriginTest, + ::testing::Values(AppType::HOSTED_APP)); -INSTANTIATE_TEST_SUITE_P( - All, - HostedAppSitePerProcessTest, - ::testing::Values(AppType::HOSTED_APP)); +INSTANTIATE_TEST_SUITE_P(All, + HostedAppSitePerProcessTest, + ::testing::Values(AppType::HOSTED_APP)); #if BUILDFLAG(ENABLE_PDF) INSTANTIATE_TEST_SUITE_P(All,
diff --git a/chrome/browser/ui/extensions/icon_with_badge_image_source.cc b/chrome/browser/ui/extensions/icon_with_badge_image_source.cc index e35bec7..b0f63d3 100644 --- a/chrome/browser/ui/extensions/icon_with_badge_image_source.cc +++ b/chrome/browser/ui/extensions/icon_with_badge_image_source.cc
@@ -83,8 +83,9 @@ void IconWithBadgeImageSource::SetBadge(std::unique_ptr<Badge> badge) { badge_ = std::move(badge); - if (!badge_ || badge_->text.empty()) + if (!badge_ || badge_->text.empty()) { return; + } // Generate the badge's render text. Make sure it contrasts with the badge // background if it is transparent (also occurs when text color has not yet @@ -112,8 +113,9 @@ // Force the pixel width of badge to be either odd (if the icon width is odd) // or even otherwise. If there is a mismatch you get http://crbug.com/26400. - if (icon_area.width() != 0 && (badge_width % 2 != icon_area.width() % 2)) + if (icon_area.width() != 0 && (badge_width % 2 != icon_area.width() % 2)) { badge_width += 1; + } badge_width = std::max(badge_height, badge_width); // The minimum width for center-aligning the badge. @@ -149,11 +151,13 @@ // TODO(crbug.com/40576276): There should be a cleaner delineation // between what is drawn here and what is handled by the button itself. - if (icon_.IsEmpty()) + if (icon_.IsEmpty()) { return; + } - if (paint_blocked_actions_decoration_) + if (paint_blocked_actions_decoration_) { PaintBlockedActionDecoration(canvas); + } gfx::ImageSkia skia = icon_.AsImageSkia(); gfx::ImageSkiaRep rep = skia.GetRepresentation(canvas->image_scale()); @@ -162,8 +166,9 @@ ScaleImageSkiaRep(rep, extensions::ExtensionAction::ActionIconSize(), canvas->image_scale())); } - if (grayscale_) + if (grayscale_) { skia = gfx::ImageSkiaOperations::CreateHSLShiftedImage(skia, {-1, 0, 0.6}); + } int x_offset = std::floor( (size().width() - extensions::ExtensionAction::ActionIconSize()) / 2.0); @@ -177,8 +182,9 @@ // Paints badge with specified parameters to |canvas|. void IconWithBadgeImageSource::PaintBadge(gfx::Canvas* canvas) { - if (!badge_text_) + if (!badge_text_) { return; + } SkColor background_color = GetBadgeBackgroundColor(badge_.get(), get_color_provider_callback_.Run());
diff --git a/chrome/browser/ui/extensions/icon_with_badge_image_source.h b/chrome/browser/ui/extensions/icon_with_badge_image_source.h index ea97429..e95e8f1 100644 --- a/chrome/browser/ui/extensions/icon_with_badge_image_source.h +++ b/chrome/browser/ui/extensions/icon_with_badge_image_source.h
@@ -16,7 +16,7 @@ namespace gfx { class RenderText; class Size; -} +} // namespace gfx namespace ui { class ColorProvider;
diff --git a/chrome/browser/ui/extensions/mv2_disabled_dialog_controller.cc b/chrome/browser/ui/extensions/mv2_disabled_dialog_controller.cc index e316748..3277494 100644 --- a/chrome/browser/ui/extensions/mv2_disabled_dialog_controller.cc +++ b/chrome/browser/ui/extensions/mv2_disabled_dialog_controller.cc
@@ -204,16 +204,16 @@ ManagementPolicy* policy = ExtensionSystem::Get(browser_->profile())->management_policy(); affected_extensions_info_.erase( - std::remove_if( - affected_extensions_info_.begin(), affected_extensions_info_.end(), - [&](const ExtensionInfo& extension_info) { - const Extension* extension = - extension_registry->disabled_extensions().GetByID( - extension_info.id); - return !extension || - !IsExtensionAffected(*extension, extension_prefs, policy, - dialog_ack_pref); - }), + std::remove_if(affected_extensions_info_.begin(), + affected_extensions_info_.end(), + [&](const ExtensionInfo& extension_info) { + const Extension* extension = + extension_registry->disabled_extensions().GetByID( + extension_info.id); + return !extension || + !IsExtensionAffected(*extension, extension_prefs, + policy, dialog_ack_pref); + }), affected_extensions_info_.end()); // No extensions to show, do nothing.
diff --git a/chrome/browser/ui/extensions/settings_api_bubble_helpers.cc b/chrome/browser/ui/extensions/settings_api_bubble_helpers.cc index 2d324e4..e0504ef9 100644 --- a/chrome/browser/ui/extensions/settings_api_bubble_helpers.cc +++ b/chrome/browser/ui/extensions/settings_api_bubble_helpers.cc
@@ -81,8 +81,9 @@ ExtensionRegistry* registry = ExtensionRegistry::Get(profile); PrefService* profile_prefs = profile->GetPrefs(); // Only acknowledge existing extensions once per profile. - if (profile_prefs->GetBoolean(kDidAcknowledgeExistingNtpExtensions)) + if (profile_prefs->GetBoolean(kDidAcknowledgeExistingNtpExtensions)) { return; + } profile_prefs->SetBoolean(kDidAcknowledgeExistingNtpExtensions, true); ExtensionPrefs* prefs = ExtensionPrefs::Get(profile); @@ -126,31 +127,37 @@ } Browser* browser = chrome::FindBrowserWithTab(web_contents); - if (!browser) + if (!browser) { return; + } std::optional<ExtensionSettingsOverriddenDialog::Params> params = settings_overridden_params::GetSearchOverriddenParams(browser->profile()); - if (!params) + if (!params) { return; + } auto dialog = std::make_unique<ExtensionSettingsOverriddenDialog>( std::move(*params), browser->profile()); - if (!dialog->ShouldShow()) + if (!dialog->ShouldShow()) { return; + } ShowSettingsOverriddenDialog(std::move(dialog), browser); #endif } void MaybeShowExtensionControlledNewTabPage( - Browser* browser, content::WebContents* web_contents) { - if (!g_ntp_post_install_ui_enabled) + Browser* browser, + content::WebContents* web_contents) { + if (!g_ntp_post_install_ui_enabled) { return; + } // Acknowledge existing extensions if necessary. - if (g_acknowledge_existing_ntp_extensions) + if (g_acknowledge_existing_ntp_extensions) { AcknowledgePreExistingNtpExtensions(browser->profile()); + } // Jump through a series of hoops to see if the web contents is pointing to // an extension-controlled NTP. @@ -159,30 +166,35 @@ // one UI option. In the meantime, extra checks don't hurt. content::NavigationEntry* entry = web_contents->GetController().GetVisibleEntry(); - if (!entry) + if (!entry) { return; + } GURL active_url = entry->GetURL(); - if (!active_url.SchemeIs(extensions::kExtensionScheme)) + if (!active_url.SchemeIs(extensions::kExtensionScheme)) { return; // Not a URL that we care about. + } // See if the current active URL matches a transformed NewTab URL. GURL ntp_url(chrome::kChromeUINewTabURL); content::BrowserURLHandler::GetInstance()->RewriteURLIfNecessary( &ntp_url, web_contents->GetBrowserContext()); - if (ntp_url != active_url) + if (ntp_url != active_url) { return; // Not being overridden by an extension. + } Profile* const profile = browser->profile(); std::optional<ExtensionSettingsOverriddenDialog::Params> params = settings_overridden_params::GetNtpOverriddenParams(profile); - if (!params) + if (!params) { return; + } auto dialog = std::make_unique<ExtensionSettingsOverriddenDialog>( std::move(*params), profile); - if (!dialog->ShouldShow()) + if (!dialog->ShouldShow()) { return; + } ShowSettingsOverriddenDialog(std::move(dialog), browser); }
diff --git a/chrome/browser/ui/extensions/settings_api_bubble_helpers.h b/chrome/browser/ui/extensions/settings_api_bubble_helpers.h index cc9021d..6383f31 100644 --- a/chrome/browser/ui/extensions/settings_api_bubble_helpers.h +++ b/chrome/browser/ui/extensions/settings_api_bubble_helpers.h
@@ -54,9 +54,8 @@ // Shows a bubble notifying the user that the new tab page is controlled by an // extension. This bubble is shown only the first time the new tab page is shown // after the controlling extension takes effect. -void MaybeShowExtensionControlledNewTabPage( - Browser* browser, - content::WebContents* web_contents); +void MaybeShowExtensionControlledNewTabPage(Browser* browser, + content::WebContents* web_contents); } // namespace extensions
diff --git a/chrome/browser/ui/extensions/settings_overridden_params_providers.cc b/chrome/browser/ui/extensions/settings_overridden_params_providers.cc index 23163b2..159a481 100644 --- a/chrome/browser/ui/extensions/settings_overridden_params_providers.cc +++ b/chrome/browser/ui/extensions/settings_overridden_params_providers.cc
@@ -125,8 +125,9 @@ const GURL search_url = secondary_search->GenerateSearchURL( template_url_service->search_terms_data()); const GURL origin = search_url.DeprecatedGetOriginAsURL(); - if (google_util::IsGoogleSearchUrl(search_url)) + if (google_util::IsGoogleSearchUrl(search_url)) { return {SecondarySearchInfo::Type::kGoogle, origin}; + } if (!template_url_service->ShowInDefaultList(secondary_search)) { // Found another search engine, but it's not one of the default options. @@ -145,8 +146,9 @@ const GURL ntp_url(chrome::kChromeUINewTabURL); const extensions::Extension* extension = ExtensionWebUI::GetExtensionControllingURL(ntp_url, profile); - if (!extension) + if (!extension) { return std::nullopt; + } // This preference tracks whether users have acknowledged the extension's // control, so that they are not warned twice about the same extension. @@ -217,8 +219,9 @@ GetSearchOverriddenParams(Profile* profile) { const extensions::Extension* extension = extensions::GetExtensionOverridingSearchEngine(profile); - if (!extension) + if (!extension) { return std::nullopt; + } // For historical reasons, the search override preference is the same as the // one we use for the controlled home setting. We continue this so that
diff --git a/chrome/browser/ui/extensions/settings_overridden_params_providers_browsertest.cc b/chrome/browser/ui/extensions/settings_overridden_params_providers_browsertest.cc index 44548ae..8e0a829 100644 --- a/chrome/browser/ui/extensions/settings_overridden_params_providers_browsertest.cc +++ b/chrome/browser/ui/extensions/settings_overridden_params_providers_browsertest.cc
@@ -79,8 +79,9 @@ ASSERT_NE(template_urls.end(), iter); // iter != template_urls.end()); template_url_service->SetUserSelectedDefaultSearchProvider(*iter); - if (new_turl_out) + if (new_turl_out) { *new_turl_out = *iter; + } } TemplateURLService* GetTemplateURLService() {
diff --git a/chrome/browser/ui/fast_checkout/fast_checkout_controller_impl.h b/chrome/browser/ui/fast_checkout/fast_checkout_controller_impl.h index 71d1c9bd..150d9a32 100644 --- a/chrome/browser/ui/fast_checkout/fast_checkout_controller_impl.h +++ b/chrome/browser/ui/fast_checkout/fast_checkout_controller_impl.h
@@ -5,10 +5,9 @@ #ifndef CHROME_BROWSER_UI_FAST_CHECKOUT_FAST_CHECKOUT_CONTROLLER_IMPL_H_ #define CHROME_BROWSER_UI_FAST_CHECKOUT_FAST_CHECKOUT_CONTROLLER_IMPL_H_ -#include "chrome/browser/ui/fast_checkout/fast_checkout_controller.h" - #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" +#include "chrome/browser/ui/fast_checkout/fast_checkout_controller.h" #include "chrome/browser/ui/fast_checkout/fast_checkout_view.h" #include "ui/gfx/native_widget_types.h"
diff --git a/chrome/browser/ui/fast_checkout/fast_checkout_controller_impl_unittest.cc b/chrome/browser/ui/fast_checkout/fast_checkout_controller_impl_unittest.cc index 34fd88c..82b26f3c8 100644 --- a/chrome/browser/ui/fast_checkout/fast_checkout_controller_impl_unittest.cc +++ b/chrome/browser/ui/fast_checkout/fast_checkout_controller_impl_unittest.cc
@@ -86,7 +86,7 @@ CreditCard credit_card1 = autofill::test::GetCreditCard(); CreditCard credit_card2 = autofill::test::GetCreditCard2(); std::vector<const autofill::CreditCard*> credit_cards = {&credit_card1, - &credit_card2}; + &credit_card2}; EXPECT_CALL( mock_view_,
diff --git a/chrome/browser/ui/find_bar/find_bar.h b/chrome/browser/ui/find_bar/find_bar.h index 1e7fbe4..ffce9cf0 100644 --- a/chrome/browser/ui/find_bar/find_bar.h +++ b/chrome/browser/ui/find_bar/find_bar.h
@@ -23,7 +23,7 @@ namespace gfx { class Point; class Range; -} +} // namespace gfx #if BUILDFLAG(IS_MAC) namespace views { @@ -33,12 +33,11 @@ class FindBar { public: - virtual ~FindBar() { } + virtual ~FindBar() {} // Accessor and setter for the FindBarController. virtual FindBarController* GetFindBarController() const = 0; - virtual void SetFindBarController( - FindBarController* find_bar_controller) = 0; + virtual void SetFindBarController(FindBarController* find_bar_controller) = 0; // Shows the find bar. Any previous search string will again be visible. // If |animate| is true, we try to slide the find bar in. @@ -107,7 +106,7 @@ class FindBarTesting { public: - virtual ~FindBarTesting() { } + virtual ~FindBarTesting() {} // Computes the location of the find bar and whether it is fully visible in // its parent window. The return value indicates if the window is visible at
diff --git a/chrome/browser/ui/find_bar/find_bar_controller.cc b/chrome/browser/ui/find_bar/find_bar_controller.cc index 78264dbe..01c1fb5 100644 --- a/chrome/browser/ui/find_bar/find_bar_controller.cc +++ b/chrome/browser/ui/find_bar/find_bar_controller.cc
@@ -52,8 +52,9 @@ return; } - if (has_user_modified_text_) + if (has_user_modified_text_) { return; + } std::u16string selected_text = GetSelectedText(); auto selected_length = selected_text.length(); @@ -67,10 +68,9 @@ // whatever is prefilled (e.g. the selected text or the global pasteboard). // So we set |find_match| to false, which will set up match counts and // highlighting, but not jump to any matches. - find_tab_helper->StartFinding(find_bar_->GetFindText(), - true /* forward_direction */, - false /* case_sensitive */, - false /* find_match */); + find_tab_helper->StartFinding( + find_bar_->GetFindText(), true /* forward_direction */, + false /* case_sensitive */, false /* find_match */); } void FindBarController::EndFindSession( @@ -89,8 +89,9 @@ // tickmarks and highlighting. find_tab_helper->StopFinding(selection_action); - if (result_action == find_in_page::ResultAction::kClear) + if (result_action == find_in_page::ResultAction::kClear) { find_bar_->ClearResults(find_tab_helper->find_result()); + } // When we get dismissed we restore the focus to where it belongs. find_bar_->RestoreSavedFocus(); @@ -113,8 +114,9 @@ find_in_page::FindTabHelper* find_tab_helper = contents ? find_in_page::FindTabHelper::FromWebContents(contents) : nullptr; - if (find_tab_helper) + if (find_tab_helper) { find_tab_observation_.Observe(find_tab_helper); + } // Hide any visible find window from the previous tab if a NULL tab contents // is passed in or if the find UI is not active in the new tab. @@ -145,10 +147,9 @@ // update the results in the findbar. If condition is true due to the find // text being empty, the call to StartFinding will be a harmless no-op. if (find_tab_helper->find_result().number_of_matches() == -1) { - find_tab_helper->StartFinding(find_bar_->GetFindText(), - true /* forward_direction */, - false /* case_sensitive */, - false /* find_match */); + find_tab_helper->StartFinding( + find_bar_->GetFindText(), true /* forward_direction */, + false /* case_sensitive */, false /* find_match */); } } @@ -163,11 +164,11 @@ } find_in_page::FindTabHelper* find_tab_helper = find_in_page::FindTabHelper::FromWebContents(web_contents()); - if (!find_tab_helper->find_ui_active()) + if (!find_tab_helper->find_ui_active()) { return; + } - find_tab_helper->StartFinding(text, - true /* forward_direction */, + find_tab_helper->StartFinding(text, true /* forward_direction */, false /* case_sensitive */, false /* find_match */); } @@ -175,8 +176,9 @@ void FindBarController::OnUserChangedFindText(std::u16string text) { has_user_modified_text_ = !text.empty(); - if (find_bar_platform_helper_) + if (find_bar_platform_helper_) { find_bar_platform_helper_->OnUserChangedFindText(text); + } } //////////////////////////////////////////////////////////////////////////////// @@ -209,8 +211,9 @@ // we're only highlighting results (when first opening the find bar). // See https://crbug.com/1131780 if (!find_tab_helper->find_result().final_update() || - !find_tab_helper->should_find_match()) + !find_tab_helper->should_find_match()) { return; + } const std::u16string& current_search = find_tab_helper->find_text(); @@ -258,8 +261,9 @@ // pasteboard, so we always have the same find text in all find bars. This is // done through the find pasteboard mechanism (see FindBarPlatformHelperMac), // so don't set the text here. - if (find_bar_->HasGlobalFindPasteboard()) + if (find_bar_->HasGlobalFindPasteboard()) { return; + } // Find out what we should show in the find text box. Usually, this will be // the last search in this tab, but if no search has been issued in this tab @@ -267,8 +271,9 @@ find_in_page::FindTabHelper* find_tab_helper = find_in_page::FindTabHelper::FromWebContents(web_contents()); std::u16string find_string = find_tab_helper->find_text(); - if (find_string.empty()) + if (find_string.empty()) { find_string = find_tab_helper->GetInitialSearchText(); + } // Update the find bar with existing results and search text, regardless of // whether or not the find bar is visible, so that if it's subsequently @@ -281,8 +286,9 @@ std::u16string FindBarController::GetSelectedText() { auto* host_view = web_contents()->GetRenderWidgetHostView(); - if (!host_view) + if (!host_view) { return std::u16string(); + } std::u16string selected_text = host_view->GetSelectedText(); // This should be kept in sync with what TextfieldModel::Paste() does, since
diff --git a/chrome/browser/ui/find_bar/find_bar_controller_browsertest.cc b/chrome/browser/ui/find_bar/find_bar_controller_browsertest.cc index d273fdb..7096ae7 100644 --- a/chrome/browser/ui/find_bar/find_bar_controller_browsertest.cc +++ b/chrome/browser/ui/find_bar/find_bar_controller_browsertest.cc
@@ -2,8 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/find_bar/find_bar_controller.h" + +#include "chrome/browser/ui/browser.h" #include "chrome/test/base/in_process_browser_test.h" #include "content/public/test/browser_test.h"
diff --git a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc index 034eddb..1f7c0c8 100644 --- a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc +++ b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
@@ -95,8 +95,9 @@ ->pinned_toolbar_actions_container()); } - bool GetFindBarWindowInfoForBrowser( - Browser* browser, gfx::Point* position, bool* fully_visible) { + bool GetFindBarWindowInfoForBrowser(Browser* browser, + gfx::Point* position, + bool* fully_visible) { const FindBarTesting* find_bar = browser->GetFindBarController()->find_bar()->GetFindBarTesting(); return find_bar->GetFindBarWindowInfo(position, fully_visible); @@ -141,14 +142,12 @@ chrome::Find(browser); gfx::Point position; bool fully_visible = false; - EXPECT_TRUE(GetFindBarWindowInfoForBrowser( - browser, &position, &fully_visible)); + EXPECT_TRUE( + GetFindBarWindowInfoForBrowser(browser, &position, &fully_visible)); EXPECT_TRUE(fully_visible); } - void EnsureFindBoxOpen() { - EnsureFindBoxOpenForBrowser(browser()); - } + void EnsureFindBoxOpen() { EnsureFindBoxOpenForBrowser(browser()); } int FindNext(WebContents* web_contents, int* ordinal) { browser()->GetFindBarController()->Show(true /*find_next*/); @@ -201,8 +200,9 @@ EXPECT_TRUE(fully_visible); // If the Find box has moved then we are done. - if (position.x() != start_x_position) + if (position.x() != start_x_position) { return position.x(); + } } return start_x_position; } @@ -226,23 +226,23 @@ browser()->tab_strip_model()->GetActiveWebContents(); EXPECT_EQ(0u, GetFindBarAudibleAlertsForBrowser(browser())); - EXPECT_EQ(18, FindInPageASCII(web_contents, "g", - kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ(18, + FindInPageASCII(web_contents, "g", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(1, ordinal); - EXPECT_EQ(11, FindInPageASCII(web_contents, "go", - kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ(11, + FindInPageASCII(web_contents, "go", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(1, ordinal); - EXPECT_EQ(4, FindInPageASCII(web_contents, "goo", - kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ(4, + FindInPageASCII(web_contents, "goo", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(1, ordinal); - EXPECT_EQ(3, FindInPageASCII(web_contents, "goog", - kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ(3, + FindInPageASCII(web_contents, "goog", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(1, ordinal); - EXPECT_EQ(2, FindInPageASCII(web_contents, "googl", - kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ( + 2, FindInPageASCII(web_contents, "googl", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(1, ordinal); - EXPECT_EQ(1, FindInPageASCII(web_contents, "google", - kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ( + 1, FindInPageASCII(web_contents, "google", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(1, ordinal); EXPECT_EQ(0u, GetFindBarAudibleAlertsForBrowser(browser())); @@ -258,44 +258,44 @@ EXPECT_EQ(2u, GetFindBarAudibleAlertsForBrowser(browser())); // "Backspace" one, make sure there's no audible alert while backspacing. - EXPECT_EQ(0, FindInPageASCII(web_contents, "google!", - kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ( + 0, FindInPageASCII(web_contents, "google!", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(0, ordinal); EXPECT_EQ(2u, GetFindBarAudibleAlertsForBrowser(browser())); // Negative test (no matches should be found). - EXPECT_EQ(0, FindInPageASCII(web_contents, "Non-existing string", - kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ(0, FindInPageASCII(web_contents, "Non-existing string", kFwd, + kIgnoreCase, &ordinal)); EXPECT_EQ(0, ordinal); // 'horse' only exists in the three right frames. - EXPECT_EQ(3, FindInPageASCII(web_contents, "horse", - kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ( + 3, FindInPageASCII(web_contents, "horse", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(1, ordinal); // 'cat' only exists in the first frame. - EXPECT_EQ(1, FindInPageASCII(web_contents, "cat", - kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ(1, + FindInPageASCII(web_contents, "cat", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(1, ordinal); // Try searching again, should still come up with 1 match. - EXPECT_EQ(1, FindInPageASCII(web_contents, "cat", - kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ(1, + FindInPageASCII(web_contents, "cat", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(1, ordinal); // Try searching backwards, ignoring case, should still come up with 1 match. - EXPECT_EQ(1, FindInPageASCII(web_contents, "CAT", - kBack, kIgnoreCase, &ordinal)); + EXPECT_EQ(1, + FindInPageASCII(web_contents, "CAT", kBack, kIgnoreCase, &ordinal)); EXPECT_EQ(1, ordinal); // Try case sensitive, should NOT find it. - EXPECT_EQ(0, FindInPageASCII(web_contents, "CAT", - kFwd, kCaseSensitive, &ordinal)); + EXPECT_EQ( + 0, FindInPageASCII(web_contents, "CAT", kFwd, kCaseSensitive, &ordinal)); EXPECT_EQ(0, ordinal); // Try again case sensitive, but this time with right case. - EXPECT_EQ(1, FindInPageASCII(web_contents, "dog", - kFwd, kCaseSensitive, &ordinal)); + EXPECT_EQ( + 1, FindInPageASCII(web_contents, "dog", kFwd, kCaseSensitive, &ordinal)); EXPECT_EQ(1, ordinal); // Try non-Latin characters ('Hreggvidur' with 'eth' for 'd' in left frame). @@ -395,8 +395,8 @@ // Do an initial find so the text will be prepopulated for the next one. // This will produce an audible alert. - EXPECT_EQ( - 0, FindInPageASCII(web_contents, "zzz", kFwd, kIgnoreCase, nullptr)); + EXPECT_EQ(0, + FindInPageASCII(web_contents, "zzz", kFwd, kIgnoreCase, nullptr)); EXPECT_EQ(1u, GetFindBarAudibleAlertsForBrowser(browser())); browser()->GetFindBarController()->EndFindSession( find_in_page::SelectionAction::kKeep, find_in_page::ResultAction::kKeep); @@ -458,8 +458,8 @@ browser()->tab_strip_model()->GetActiveWebContents(); ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), GetURL("simple.html"))); - EXPECT_EQ(0, FindInPageASCII(web_contents, "link", kFwd, kIgnoreCase, - nullptr)); + EXPECT_EQ(0, + FindInPageASCII(web_contents, "link", kFwd, kIgnoreCase, nullptr)); browser()->GetFindBarController()->EndFindSession( find_in_page::SelectionAction::kKeep, find_in_page::ResultAction::kKeep); @@ -480,7 +480,8 @@ ui_test_utils::NavigateToURL(browser(), GetURL("specialchar.html"))); const std::wstring search_string = - L"\u4e2d\u65b0\u793e\u8bb0\u8005\u5b8b\u5409\u6cb3\u6444\u4e2d\u65b0\u7f51"; + L"\u4e2d\u65b0\u793e\u8bb0\u8005\u5b8b\u5409\u6cb3\u6444\u4e2d\u65b0" + L"\u7f51"; EXPECT_EQ(0, ui_test_utils::FindInPage(web_contents, WideToUTF16(search_string), kFwd, kIgnoreCase, nullptr, nullptr)); @@ -623,29 +624,24 @@ WebContents* web_contents = browser()->tab_strip_model()->GetActiveWebContents(); int ordinal = 0; - EXPECT_EQ(3, FindInPageASCII(web_contents, "o", - kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ(3, FindInPageASCII(web_contents, "o", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(1, ordinal); - EXPECT_EQ(3, FindInPageASCII(web_contents, "o", - kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ(3, FindInPageASCII(web_contents, "o", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(2, ordinal); - EXPECT_EQ(3, FindInPageASCII(web_contents, "o", - kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ(3, FindInPageASCII(web_contents, "o", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(3, ordinal); // Go back one match. - EXPECT_EQ(3, FindInPageASCII(web_contents, "o", - kBack, kIgnoreCase, &ordinal)); + EXPECT_EQ(3, + FindInPageASCII(web_contents, "o", kBack, kIgnoreCase, &ordinal)); EXPECT_EQ(2, ordinal); - EXPECT_EQ(3, FindInPageASCII(web_contents, "o", - kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ(3, FindInPageASCII(web_contents, "o", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(3, ordinal); // This should wrap to the top. - EXPECT_EQ(3, FindInPageASCII(web_contents, "o", - kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ(3, FindInPageASCII(web_contents, "o", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(1, ordinal); // This should go back to the end. - EXPECT_EQ(3, FindInPageASCII(web_contents, "o", - kBack, kIgnoreCase, &ordinal)); + EXPECT_EQ(3, + FindInPageASCII(web_contents, "o", kBack, kIgnoreCase, &ordinal)); EXPECT_EQ(3, ordinal); } @@ -664,8 +660,8 @@ find_in_page::FindTabHelper::FromWebContents(web_contents); int ordinal = 0; - EXPECT_EQ(4, FindInPageASCII(web_contents, "google", - kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ( + 4, FindInPageASCII(web_contents, "google", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(1, ordinal); // Move the selection to link 1, after searching. @@ -673,8 +669,8 @@ // Do a find-next after the selection. This should move forward // from there to the 3rd instance of 'google'. - EXPECT_EQ(4, FindInPageASCII(web_contents, "google", - kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ( + 4, FindInPageASCII(web_contents, "google", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(3, ordinal); // End the find session. @@ -682,8 +678,7 @@ } // This tests that we start searching after selected text. -IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, - StartSearchAfterSelection) { +IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, StartSearchAfterSelection) { // First we navigate to our test content. ASSERT_TRUE( ui_test_utils::NavigateToURL(browser(), GetURL(kStartAfterSelection))); @@ -698,20 +693,20 @@ // Do a find-next after the selection. This should select the 2nd occurrence // of the word 'find'. - EXPECT_EQ(4, FindInPageASCII(web_contents, "fi", - kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ(4, + FindInPageASCII(web_contents, "fi", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(2, ordinal); // Refine the search, current active match should not change. - EXPECT_EQ(4, FindInPageASCII(web_contents, "find", - kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ(4, + FindInPageASCII(web_contents, "find", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(2, ordinal); // Refine the search to 'findMe'. The first new match is before the current // active match, the second one is after it. This verifies that refining a // search doesn't reset it. - EXPECT_EQ(2, FindInPageASCII(web_contents, "findMe", - kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ( + 2, FindInPageASCII(web_contents, "findMe", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(2, ordinal); } @@ -727,37 +722,28 @@ WebContents* web_contents = browser()->tab_strip_model()->GetActiveWebContents(); int ordinal = 0; - EXPECT_EQ(7, - FindInPageASCII(web_contents, "a", kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ(7, FindInPageASCII(web_contents, "a", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(1, ordinal); - EXPECT_EQ(7, - FindInPageASCII(web_contents, "a", kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ(7, FindInPageASCII(web_contents, "a", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(2, ordinal); - EXPECT_EQ(7, - FindInPageASCII(web_contents, "a", kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ(7, FindInPageASCII(web_contents, "a", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(3, ordinal); - EXPECT_EQ(7, - FindInPageASCII(web_contents, "a", kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ(7, FindInPageASCII(web_contents, "a", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(4, ordinal); // Go back one, which should go back one frame. EXPECT_EQ(7, FindInPageASCII(web_contents, "a", kBack, kIgnoreCase, &ordinal)); EXPECT_EQ(3, ordinal); - EXPECT_EQ(7, - FindInPageASCII(web_contents, "a", kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ(7, FindInPageASCII(web_contents, "a", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(4, ordinal); - EXPECT_EQ(7, - FindInPageASCII(web_contents, "a", kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ(7, FindInPageASCII(web_contents, "a", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(5, ordinal); - EXPECT_EQ(7, - FindInPageASCII(web_contents, "a", kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ(7, FindInPageASCII(web_contents, "a", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(6, ordinal); - EXPECT_EQ(7, - FindInPageASCII(web_contents, "a", kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ(7, FindInPageASCII(web_contents, "a", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(7, ordinal); // Now we should wrap back to frame 1. - EXPECT_EQ(7, - FindInPageASCII(web_contents, "a", kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ(7, FindInPageASCII(web_contents, "a", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(1, ordinal); // Now we should wrap back to frame last frame. EXPECT_EQ(7, @@ -776,22 +762,22 @@ int ordinal = 0; WebContents* web_contents = browser()->tab_strip_model()->GetActiveWebContents(); - EXPECT_EQ(6, FindInPageASCII(web_contents, "goa", - kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ(6, + FindInPageASCII(web_contents, "goa", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(1, ordinal); - EXPECT_EQ(6, FindInPageASCII(web_contents, "goa", - kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ(6, + FindInPageASCII(web_contents, "goa", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(2, ordinal); - EXPECT_EQ(6, FindInPageASCII(web_contents, "goa", - kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ(6, + FindInPageASCII(web_contents, "goa", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(3, ordinal); // Add space to search (should result in no matches). - EXPECT_EQ(0, FindInPageASCII(web_contents, "goa ", - kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ(0, + FindInPageASCII(web_contents, "goa ", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(0, ordinal); // Remove the space, should be back to '3 out of 6') - EXPECT_EQ(6, FindInPageASCII(web_contents, "goa", - kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ(6, + FindInPageASCII(web_contents, "goa", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(3, ordinal); } @@ -813,8 +799,7 @@ browser()->tab_strip_model()->GetActiveWebContents(); ASSERT_TRUE(web_contents); int ordinal = 0; - EXPECT_EQ(8, FindInPageASCII(web_contents, "e", - kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ(8, FindInPageASCII(web_contents, "e", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(1, ordinal); // Then navigate away (to any page). @@ -837,8 +822,8 @@ int ordinal = 0; WebContents* web_contents = browser()->tab_strip_model()->GetActiveWebContents(); - EXPECT_EQ(1, FindInPageASCII(web_contents, "text", - kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ(1, + FindInPageASCII(web_contents, "text", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(1, ordinal); } @@ -868,8 +853,8 @@ EXPECT_EQ(1, FindInPage16(web_contents, u"\u0D24\u0D46", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(1, ordinal); - EXPECT_EQ(0, FindInPageASCII(web_contents, "nostring", - kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ(0, FindInPageASCII(web_contents, "nostring", kFwd, kIgnoreCase, + &ordinal)); EXPECT_EQ(0, ordinal); } @@ -882,9 +867,9 @@ // This used to crash the tab. int ordinal = 0; - EXPECT_EQ(0, FindInPageASCII(browser()->tab_strip_model()-> - GetActiveWebContents(), - "s", kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ( + 0, FindInPageASCII(browser()->tab_strip_model()->GetActiveWebContents(), + "s", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(0, ordinal); } @@ -904,9 +889,9 @@ // This string appears 5 times at the bottom of a long page. If Find restarts // properly after a timeout, it will find 5 matches, not just 1. int ordinal = 0; - EXPECT_EQ(5, FindInPageASCII(browser()->tab_strip_model()-> - GetActiveWebContents(), - "008.xml", kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ( + 5, FindInPageASCII(browser()->tab_strip_model()->GetActiveWebContents(), + "008.xml", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(1, ordinal); } @@ -920,8 +905,8 @@ // If this test hangs on the FindInPage call, then it might be a regression // such as the one found in issue http://crbug.com/70505. int ordinal = 0; - FindInPageASCII(browser()->tab_strip_model()->GetActiveWebContents(), - "a", kFwd, kIgnoreCase, &ordinal); + FindInPageASCII(browser()->tab_strip_model()->GetActiveWebContents(), "a", + kFwd, kIgnoreCase, &ordinal); EXPECT_EQ(1, ordinal); // TODO(finnur): We cannot reliably get the matchcount for this Find call // until we fix issue http://crbug.com/71176. @@ -939,8 +924,8 @@ // Search for a text that exists within a link on the page. int ordinal = 0; - EXPECT_EQ(2, FindInPageASCII(web_contents, "html ", - kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ( + 2, FindInPageASCII(web_contents, "html ", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(1, ordinal); } @@ -1087,8 +1072,8 @@ EXPECT_TRUE(moved_x_coord != start_position.x()); // Search for something guaranteed not to be obscured by the Find box. - EXPECT_EQ(1, FindInPageASCII(web_contents, "Done", - kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ(1, + FindInPageASCII(web_contents, "Done", kFwd, kIgnoreCase, &ordinal)); // Check the position. EXPECT_TRUE(GetFindBarWindowInfo(&position, &fully_visible)); EXPECT_TRUE(fully_visible); @@ -1102,8 +1087,8 @@ EXPECT_TRUE(moved_x_coord != start_position.x()); // Search for an invalid string. - EXPECT_EQ(0, FindInPageASCII(web_contents, "WeirdSearchString", - kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ(0, FindInPageASCII(web_contents, "WeirdSearchString", kFwd, + kIgnoreCase, &ordinal)); // Check the position. EXPECT_TRUE(GetFindBarWindowInfo(&position, &fully_visible)); @@ -1181,8 +1166,8 @@ int ordinal = 0; WebContents* web_contents = browser()->tab_strip_model()->GetActiveWebContents(); - EXPECT_EQ(1, FindInPageASCII(web_contents, "page", - kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ(1, + FindInPageASCII(web_contents, "page", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(1, ordinal); // Simulate what happens when you press F3 for FindNext. Still should show @@ -1217,8 +1202,8 @@ int ordinal = 0; WebContents* web_contents_1 = browser()->tab_strip_model()->GetActiveWebContents(); - EXPECT_EQ(1, FindInPageASCII(web_contents_1, "text", - kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ( + 1, FindInPageASCII(web_contents_1, "text", kFwd, kIgnoreCase, &ordinal)); // Create a second tab. // For some reason we can't use AddSelectedTabWithURL here on ChromeOS. It @@ -1262,8 +1247,8 @@ int ordinal = 0; WebContents* web_contents = browser()->tab_strip_model()->GetActiveWebContents(); - EXPECT_EQ(1, FindInPageASCII(web_contents, "page", - kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ(1, + FindInPageASCII(web_contents, "page", kFwd, kIgnoreCase, &ordinal)); // Open the Find box. EnsureFindBoxOpen(); @@ -1296,8 +1281,8 @@ int ordinal = 0; WebContents* web_contents_1 = browser()->tab_strip_model()->GetActiveWebContents(); - EXPECT_EQ(1, FindInPageASCII(web_contents_1, "page", - kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ( + 1, FindInPageASCII(web_contents_1, "page", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(u"1/1", GetMatchCountText()); // Now create a second tab and load the same page. @@ -1321,8 +1306,9 @@ // search in that tab). IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, PrepopulatePreserveLast) { FindBar* find_bar = browser()->GetFindBarController()->find_bar(); - if (find_bar->HasGlobalFindPasteboard()) + if (find_bar->HasGlobalFindPasteboard()) { return; + } // First we navigate to any page. GURL url = GetURL(kSimple); @@ -1332,8 +1318,8 @@ int ordinal = 0; WebContents* web_contents_1 = browser()->tab_strip_model()->GetActiveWebContents(); - EXPECT_EQ(1, FindInPageASCII(web_contents_1, "page", - kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ( + 1, FindInPageASCII(web_contents_1, "page", kFwd, kIgnoreCase, &ordinal)); // Open the Find box. EnsureFindBoxOpen(); @@ -1384,8 +1370,9 @@ // as prepopulate terms for non-incognito windows. IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, NoIncognitoPrepopulate) { FindBar* find_bar = browser()->GetFindBarController()->find_bar(); - if (find_bar->HasGlobalFindPasteboard()) + if (find_bar->HasGlobalFindPasteboard()) { return; + } // First we navigate to the "simple" test page. GURL url = GetURL(kSimple); @@ -1395,8 +1382,8 @@ int ordinal = 0; WebContents* web_contents_1 = browser()->tab_strip_model()->GetActiveWebContents(); - EXPECT_EQ(1, FindInPageASCII(web_contents_1, "page", - kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ( + 1, FindInPageASCII(web_contents_1, "page", kFwd, kIgnoreCase, &ordinal)); // Open the Find box. EnsureFindBoxOpenForBrowser(browser()); @@ -1424,8 +1411,8 @@ // Search for the word "text" in the incognito tab. WebContents* incognito_tab = incognito_browser->tab_strip_model()->GetActiveWebContents(); - EXPECT_EQ(1, FindInPageASCII(incognito_tab, "text", - kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ( + 1, FindInPageASCII(incognito_tab, "text", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(u"text", GetFindBarTextForBrowser(incognito_browser)); // Close the Find box. @@ -1546,8 +1533,9 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, MAYBE_GlobalPasteBoardClearMatches) { FindBar* find_bar = browser()->GetFindBarController()->find_bar(); - if (!find_bar->HasGlobalFindPasteboard()) + if (!find_bar->HasGlobalFindPasteboard()) { return; + } // First we navigate to any page. GURL url = GetURL(kSimple); @@ -1557,8 +1545,8 @@ int ordinal = 0; WebContents* web_contents_1 = browser()->tab_strip_model()->GetActiveWebContents(); - EXPECT_EQ(1, FindInPageASCII(web_contents_1, "page", - kFwd, kIgnoreCase, &ordinal)); + EXPECT_EQ( + 1, FindInPageASCII(web_contents_1, "page", kFwd, kIgnoreCase, &ordinal)); EnsureFindBoxOpen(); EXPECT_EQ(u"1/1", GetMatchCountText()); @@ -1602,7 +1590,7 @@ ASSERT_TRUE(ui_test_utils::NavigateToURL(browser_incognito, GURL("data:text/plain,barfoofoo"))); WebContents* web_contents_incognito = - browser_incognito->tab_strip_model()->GetActiveWebContents(); + browser_incognito->tab_strip_model()->GetActiveWebContents(); FindInPageASCII(web_contents_incognito, "foo", true, kIgnoreCase, nullptr); EXPECT_EQ(u"foo", GetFindBarTextForBrowser(browser_incognito)); EXPECT_EQ(u"1/2", GetFindBarMatchCountTextForBrowser(browser_incognito));
diff --git a/chrome/browser/ui/find_bar/find_bar_host_interactive_uitest.cc b/chrome/browser/ui/find_bar/find_bar_host_interactive_uitest.cc index cd9cd0f..376c2e2a 100644 --- a/chrome/browser/ui/find_bar/find_bar_host_interactive_uitest.cc +++ b/chrome/browser/ui/find_bar/find_bar_host_interactive_uitest.cc
@@ -79,8 +79,7 @@ // Search for a text that exists within a link on the page. int ordinal = 0; - EXPECT_EQ(1, FindInPageASCII(web_contents, "nk", - true, false, &ordinal)); + EXPECT_EQ(1, FindInPageASCII(web_contents, "nk", true, false, &ordinal)); EXPECT_EQ(1, ordinal); // End the find session, which should set focus to the link. @@ -90,8 +89,7 @@ EXPECT_EQ("link1", FocusedOnPage(web_contents)); // Search for a text that exists within a link on the page. - EXPECT_EQ(1, FindInPageASCII(web_contents, "Google", - true, false, &ordinal)); + EXPECT_EQ(1, FindInPageASCII(web_contents, "Google", true, false, &ordinal)); EXPECT_EQ(1, ordinal); // Move the selection to link 1, after searching.
diff --git a/chrome/browser/ui/find_bar/find_bar_platform_helper_mac.mm b/chrome/browser/ui/find_bar/find_bar_platform_helper_mac.mm index e9aa0bf..df6e914 100644 --- a/chrome/browser/ui/find_bar/find_bar_platform_helper_mac.mm +++ b/chrome/browser/ui/find_bar/find_bar_platform_helper_mac.mm
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#import "chrome/browser/ui/find_bar/find_bar_platform_helper.h" + #import <Foundation/Foundation.h> #include <string> @@ -10,7 +12,6 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/find_bar/find_bar_controller.h" -#import "chrome/browser/ui/find_bar/find_bar_platform_helper.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "components/find_in_page/find_tab_helper.h" #include "components/find_in_page/find_types.h" @@ -71,8 +72,9 @@ for (int i = 0; i < tab_strip_model->count(); ++i) { content::WebContents* web_contents = tab_strip_model->GetWebContentsAt(i); - if (active_web_contents == web_contents) + if (active_web_contents == web_contents) { continue; + } find_in_page::FindTabHelper* find_tab_helper = find_in_page::FindTabHelper::FromWebContents(web_contents); find_tab_helper->StopFinding(find_in_page::SelectionAction::kClear);
diff --git a/chrome/browser/ui/focus_tab_after_navigation_helper.cc b/chrome/browser/ui/focus_tab_after_navigation_helper.cc index 4e044d4c..da10cfc 100644 --- a/chrome/browser/ui/focus_tab_after_navigation_helper.cc +++ b/chrome/browser/ui/focus_tab_after_navigation_helper.cc
@@ -32,41 +32,49 @@ // 3) move the focus before the page starts rendering // (only 1 is a hard-requirement; 2 and 3 seem desirable but there are no // known scenarios where violating these requirements would lead to bugs). - if (ShouldFocusTabContents(navigation)) + if (ShouldFocusTabContents(navigation)) { web_contents()->SetInitialFocus(); + } } bool FocusTabAfterNavigationHelper::ShouldFocusTabContents( content::NavigationHandle* navigation) { // Don't focus content in an inactive window or tab. Browser* browser = chrome::FindBrowserWithTab(web_contents()); - if (!browser) + if (!browser) { return false; - if (!browser->window()->IsActive()) + } + if (!browser->window()->IsActive()) { return false; - if (browser->tab_strip_model()->GetActiveWebContents() != web_contents()) + } + if (browser->tab_strip_model()->GetActiveWebContents() != web_contents()) { return false; + } // Don't focus content after subframe navigations. - if (!navigation->IsInPrimaryMainFrame()) + if (!navigation->IsInPrimaryMainFrame()) { return false; + } // Browser-initiated navigations (e.g. typing in an omnibox) are taken care of // in Browser::UpdateUIForNavigationInTab. See also https://crbug.com/1048591 // for possible regression risks related to returning |true| here. - if (!navigation->IsRendererInitiated()) + if (!navigation->IsRendererInitiated()) { return false; + } // Renderer-initiated navigations shouldn't focus the tab contents, unless the // navigation is leaving the NTP. See also https://crbug.com/1027719. bool started_at_ntp = IsNtpURL(web_contents()->GetLastCommittedURL()); - if (!started_at_ntp) + if (!started_at_ntp) { return false; + } // Navigations initiated via chrome.tabs.update and similar APIs should not // steal focus from the omnibox. See also https://crbug.com/1085779. - if (navigation->GetPageTransition() & ui::PAGE_TRANSITION_FROM_API) + if (navigation->GetPageTransition() & ui::PAGE_TRANSITION_FROM_API) { return false; + } // Rewrite chrome://newtab to compare with the navigation URL. GURL rewritten_ntp_url = web_contents()->GetLastCommittedURL(); @@ -83,8 +91,9 @@ bool FocusTabAfterNavigationHelper::IsNtpURL(const GURL& url) { // TODO(lukasza): https://crbug.com/1034999: Try to avoid special-casing // kChromeUINewTabURL below and covering it via IsNTPOrRelatedURL instead. - if (url == GURL(chrome::kChromeUINewTabURL)) + if (url == GURL(chrome::kChromeUINewTabURL)) { return true; + } Profile* profile = Profile::FromBrowserContext(web_contents()->GetBrowserContext());
diff --git a/chrome/browser/ui/fullscreen_keyboard_browsertest_base.cc b/chrome/browser/ui/fullscreen_keyboard_browsertest_base.cc index eca8f0ff..3a1fb9f 100644 --- a/chrome/browser/ui/fullscreen_keyboard_browsertest_base.cc +++ b/chrome/browser/ui/fullscreen_keyboard_browsertest_base.cc
@@ -112,23 +112,27 @@ } void FullscreenKeyboardBrowserTestBase::WaitForBrowserCount(size_t expected) { - while (GetBrowserCount() != expected) + while (GetBrowserCount() != expected) { base::RunLoop().RunUntilIdle(); + } } void FullscreenKeyboardBrowserTestBase::WaitForTabCount(int expected) { - while (GetTabCount() != expected) + while (GetTabCount() != expected) { base::RunLoop().RunUntilIdle(); + } } void FullscreenKeyboardBrowserTestBase::WaitForActiveTabIndex(int expected) { - while (GetActiveTabIndex() != expected) + while (GetActiveTabIndex() != expected) { base::RunLoop().RunUntilIdle(); + } } void FullscreenKeyboardBrowserTestBase::WaitForInactiveTabIndex(int expected) { - while (GetActiveTabIndex() == expected) + while (GetActiveTabIndex() == expected) { base::RunLoop().RunUntilIdle(); + } } void FullscreenKeyboardBrowserTestBase::StartFullscreenLockPage() { @@ -142,8 +146,9 @@ ASSERT_EQ(2, GetTabCount()); ASSERT_EQ(1U, GetBrowserCount()); - if (!GetEmbeddedTestServer()->Started()) + if (!GetEmbeddedTestServer()->Started()) { ASSERT_TRUE(GetEmbeddedTestServer()->Start()); + } ui_test_utils::NavigateToURLWithDisposition( GetActiveBrowser(), GetEmbeddedTestServer()->GetURL(kFullscreenKeyboardLockHTML),
diff --git a/chrome/browser/ui/global_error/global_error.cc b/chrome/browser/ui/global_error/global_error.cc index 320b750..5ddcc4d 100644 --- a/chrome/browser/ui/global_error/global_error.cc +++ b/chrome/browser/ui/global_error/global_error.cc
@@ -13,7 +13,9 @@ GlobalError::~GlobalError() = default; -GlobalError::Severity GlobalError::GetSeverity() { return SEVERITY_MEDIUM; } +GlobalError::Severity GlobalError::GetSeverity() { + return SEVERITY_MEDIUM; +} ui::ImageModel GlobalError::MenuItemIcon() { return ui::ImageModel::FromVectorIcon(kBrowserToolsErrorIcon, @@ -26,7 +28,9 @@ GlobalErrorWithStandardBubble::~GlobalErrorWithStandardBubble() = default; -bool GlobalErrorWithStandardBubble::HasBubbleView() { return true; } +bool GlobalErrorWithStandardBubble::HasBubbleView() { + return true; +} bool GlobalErrorWithStandardBubble::HasShownBubbleView() { return has_shown_bubble_view_;
diff --git a/chrome/browser/ui/global_error/global_error_browsertest.cc b/chrome/browser/ui/global_error/global_error_browsertest.cc index f2cb4755c..94d11fb 100644 --- a/chrome/browser/ui/global_error/global_error_browsertest.cc +++ b/chrome/browser/ui/global_error/global_error_browsertest.cc
@@ -93,8 +93,9 @@ // GlobalErrorObserver void OnGlobalErrorsChanged() override { - if (service_->GetFirstGlobalErrorWithBubbleView()) + if (service_->GetFirstGlobalErrorWithBubbleView()) { run_loop_.Quit(); + } } void Wait() { run_loop_.Run(); }
diff --git a/chrome/browser/ui/global_error/global_error_service.cc b/chrome/browser/ui/global_error/global_error_service.cc index ef458fe..e172e47 100644 --- a/chrome/browser/ui/global_error/global_error_service.cc +++ b/chrome/browser/ui/global_error/global_error_service.cc
@@ -48,23 +48,25 @@ DCHECK(owned_errors_.find(error) == owned_errors_.end()); all_errors_.erase(base::ranges::find(all_errors_, error)); GlobalErrorBubbleViewBase* bubble = error->GetBubbleView(); - if (bubble) + if (bubble) { bubble->CloseBubbleView(); + } NotifyErrorsChanged(); } GlobalError* GlobalErrorService::GetGlobalErrorByMenuItemCommandID( int command_id) const { for (GlobalError* error : all_errors_) { - if (error->HasMenuItem() && command_id == error->MenuItemCommandID()) + if (error->HasMenuItem() && command_id == error->MenuItemCommandID()) { return error; + } } return nullptr; } -GlobalError* -GlobalErrorService::GetHighestSeverityGlobalErrorWithAppMenuItem() const { +GlobalError* GlobalErrorService::GetHighestSeverityGlobalErrorWithAppMenuItem() + const { GlobalError::Severity highest_severity = GlobalError::SEVERITY_LOW; GlobalError* highest_severity_error = nullptr; @@ -82,13 +84,15 @@ GlobalError* GlobalErrorService::GetFirstGlobalErrorWithBubbleView() const { for (GlobalError* error : all_errors_) { - if (error->HasBubbleView() && !error->HasShownBubbleView()) + if (error->HasBubbleView() && !error->HasShownBubbleView()) { return error; + } } return nullptr; } void GlobalErrorService::NotifyErrorsChanged() { - for (auto& observer : observer_list_) + for (auto& observer : observer_list_) { observer.OnGlobalErrorsChanged(); + } }
diff --git a/chrome/browser/ui/global_error/global_error_service_browsertest.cc b/chrome/browser/ui/global_error/global_error_service_browsertest.cc index 4439f25..0dc0d52 100644 --- a/chrome/browser/ui/global_error/global_error_service_browsertest.cc +++ b/chrome/browser/ui/global_error/global_error_service_browsertest.cc
@@ -22,7 +22,7 @@ // An error that has a bubble view. class BubbleViewError final : public GlobalErrorWithStandardBubble { public: - BubbleViewError() : bubble_view_close_count_(0) { } + BubbleViewError() : bubble_view_close_count_(0) {} BubbleViewError(const BubbleViewError&) = delete; BubbleViewError& operator=(const BubbleViewError&) = delete; @@ -62,10 +62,9 @@ base::WeakPtrFactory<BubbleViewError> weak_ptr_factory_{this}; }; -} // namespace +} // namespace -class GlobalErrorServiceBrowserTest : public InProcessBrowserTest { -}; +class GlobalErrorServiceBrowserTest : public InProcessBrowserTest {}; // Test that showing a error with a bubble view works. IN_PROC_BROWSER_TEST_F(GlobalErrorServiceBrowserTest, ShowBubbleView) {
diff --git a/chrome/browser/ui/global_error/global_error_service_unittest.cc b/chrome/browser/ui/global_error/global_error_service_unittest.cc index 795cb64..9e2c87d 100644 --- a/chrome/browser/ui/global_error/global_error_service_unittest.cc +++ b/chrome/browser/ui/global_error/global_error_service_unittest.cc
@@ -51,9 +51,7 @@ class MenuError : public BaseError { public: explicit MenuError(int command_id, Severity severity) - : command_id_(command_id), - severity_(severity) { - } + : command_id_(command_id), severity_(severity) {} MenuError(const MenuError&) = delete; MenuError& operator=(const MenuError&) = delete; @@ -70,7 +68,7 @@ Severity severity_; }; -} // namespace +} // namespace // Test adding errors to the global error service. TEST(GlobalErrorServiceTest, AddError) {
diff --git a/chrome/browser/ui/global_error/global_error_waiter.cc b/chrome/browser/ui/global_error/global_error_waiter.cc index 3bc69d0..3102591 100644 --- a/chrome/browser/ui/global_error/global_error_waiter.cc +++ b/chrome/browser/ui/global_error/global_error_waiter.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/global_error/global_error_waiter.h" + #include "chrome/browser/ui/global_error/global_error_service_factory.h" namespace test { @@ -15,15 +16,17 @@ GlobalErrorWaiter::~GlobalErrorWaiter() = default; void GlobalErrorWaiter::OnGlobalErrorsChanged() { - if (run_loop_.running()) + if (run_loop_.running()) { run_loop_.Quit(); - else + } else { errors_changed_ = true; + } } void GlobalErrorWaiter::Wait() { - if (!errors_changed_) + if (!errors_changed_) { run_loop_.Run(); + } } } // namespace test
diff --git a/chrome/browser/ui/global_media_controls/cast_media_notification_item.cc b/chrome/browser/ui/global_media_controls/cast_media_notification_item.cc index 8423141..af1325b 100644 --- a/chrome/browser/ui/global_media_controls/cast_media_notification_item.cc +++ b/chrome/browser/ui/global_media_controls/cast_media_notification_item.cc
@@ -142,11 +142,13 @@ } #endif - if (route.media_sink_name().empty()) + if (route.media_sink_name().empty()) { return base::UTF8ToUTF16(route.description()); + } - if (route.description().empty()) + if (route.description().empty()) { return base::UTF8ToUTF16(route.media_sink_name()); + } const char kSeparator[] = " \xC2\xB7 "; // "Middle dot" character. const std::string source_title = @@ -184,8 +186,9 @@ void CastMediaNotificationItem::SetView( media_message_center::MediaNotificationView* view) { view_ = view; - if (view_) + if (view_) { view_->UpdateWithVectorIcon(&vector_icons::kMediaRouterIdleIcon); + } UpdateView(); } @@ -280,8 +283,9 @@ metadata_.artist = new_artist; updated = true; } - if (updated && view_) + if (updated && view_) { view_->UpdateWithMediaMetadata(metadata_); + } } void CastMediaNotificationItem::StopCasting() { @@ -321,8 +325,9 @@ } void CastMediaNotificationItem::ImageDownloader::Download(const GURL& url) { - if (url == url_) + if (url == url_) { return; + } url_ = url; bitmap_fetcher_ = bitmap_fetcher_factory_for_testing_ ? bitmap_fetcher_factory_for_testing_.Run( @@ -341,21 +346,24 @@ } void CastMediaNotificationItem::UpdateView() { - if (!view_) + if (!view_) { return; + } view_->UpdateWithMediaMetadata(metadata_); view_->UpdateWithMediaActions(actions_); view_->UpdateWithMediaSessionInfo(session_info_.Clone()); view_->UpdateWithMediaArtwork( gfx::ImageSkia::CreateFrom1xBitmap(image_downloader_.bitmap())); - if (!media_position_.duration().is_zero()) + if (!media_position_.duration().is_zero()) { view_->UpdateWithMediaPosition(media_position_); + } view_->UpdateWithMuteStatus(is_muted_); view_->UpdateWithVolume(volume_); } void CastMediaNotificationItem::ImageChanged(const SkBitmap& bitmap) { - if (view_) + if (view_) { view_->UpdateWithMediaArtwork(gfx::ImageSkia::CreateFrom1xBitmap(bitmap)); + } }
diff --git a/chrome/browser/ui/global_media_controls/cast_media_notification_producer.cc b/chrome/browser/ui/global_media_controls/cast_media_notification_producer.cc index a4cb528..1dbcb637 100644 --- a/chrome/browser/ui/global_media_controls/cast_media_notification_producer.cc +++ b/chrome/browser/ui/global_media_controls/cast_media_notification_producer.cc
@@ -94,8 +94,9 @@ base::WeakPtr<media_message_center::MediaNotificationItem> CastMediaNotificationProducer::GetMediaItem(const std::string& id) { const auto item_it = items_.find(id); - if (item_it == items_.end()) + if (item_it == items_.end()) { return nullptr; + } return item_it->second.GetWeakPtr(); } @@ -124,8 +125,9 @@ void CastMediaNotificationProducer::OnItemShown( const std::string& id, global_media_controls::MediaItemUI* item_ui) { - if (item_ui) + if (item_ui) { item_ui_observer_set_.Observe(id, item_ui); + } } void CastMediaNotificationProducer::OnDialogDisplayed() { @@ -162,8 +164,9 @@ }); for (const auto& route : routes) { - if (ShouldHideNotification(profile_, route)) + if (ShouldHideNotification(profile_, route)) { continue; + } auto item_it = base::ranges::find(items_, route.media_route_id(), &Items::value_type::first);
diff --git a/chrome/browser/ui/global_media_controls/cast_media_session_controller.cc b/chrome/browser/ui/global_media_controls/cast_media_session_controller.cc index 98ec307c..135af4a 100644 --- a/chrome/browser/ui/global_media_controls/cast_media_session_controller.cc +++ b/chrome/browser/ui/global_media_controls/cast_media_session_controller.cc
@@ -31,8 +31,9 @@ void CastMediaSessionController::Send( media_session::mojom::MediaSessionAction action) { - if (!media_status_) + if (!media_status_) { return; + } switch (action) { case media_session::mojom::MediaSessionAction::kPlay: @@ -84,25 +85,29 @@ // which we seek forward or backward. We must do this because the Cast // receiver only gives an update when the playback state changes (e.g. paused, // seeked), and not when the current position is incremented every second. - if (IsPlaying(media_status_)) + if (IsPlaying(media_status_)) { IncrementCurrentTimeAfterOneSecond(); + } } void CastMediaSessionController::SeekTo(base::TimeDelta time) { - if (!media_status_) + if (!media_status_) { return; + } route_controller_->Seek(time); } void CastMediaSessionController::SetMute(bool mute) { - if (!media_status_) + if (!media_status_) { return; + } route_controller_->SetMute(mute); } void CastMediaSessionController::SetVolume(float volume) { - if (!media_status_) + if (!media_status_) { return; + } route_controller_->SetVolume(volume); } @@ -117,10 +122,12 @@ base::TimeDelta CastMediaSessionController::PutWithinBounds( const base::TimeDelta& time) { - if (time.is_negative() || !media_status_) + if (time.is_negative() || !media_status_) { return base::TimeDelta(); - if (time > media_status_->duration) + } + if (time > media_status_->duration) { return media_status_->duration; + } return time; } @@ -136,11 +143,13 @@ } void CastMediaSessionController::IncrementCurrentTime() { - if (!IsPlaying(media_status_)) + if (!IsPlaying(media_status_)) { return; + } - if (media_status_->current_time < media_status_->duration) + if (media_status_->current_time < media_status_->duration) { IncrementCurrentTimeAfterOneSecond(); + } media_status_->current_time = PutWithinBounds(media_status_->current_time + base::Seconds(1)); }
diff --git a/chrome/browser/ui/global_media_controls/media_notification_device_monitor.cc b/chrome/browser/ui/global_media_controls/media_notification_device_monitor.cc index d620a5a..22cfb11 100644 --- a/chrome/browser/ui/global_media_controls/media_notification_device_monitor.cc +++ b/chrome/browser/ui/global_media_controls/media_notification_device_monitor.cc
@@ -64,12 +64,14 @@ void SystemMonitorDeviceMonitorImpl::OnDevicesChanged( base::SystemMonitor::DeviceType device_type) { - if (!is_monitoring_) + if (!is_monitoring_) { return; + } // TODO(noahrose): Get an issue number for this TODO. Only notify observers in // changes of audio output devices as opposed to audio devices in general. - if (device_type != base::SystemMonitor::DEVTYPE_AUDIO) + if (device_type != base::SystemMonitor::DEVTYPE_AUDIO) { return; + } for (auto& observer : observers_) { observer.OnDevicesChanged(); @@ -87,8 +89,9 @@ task_runner_(base::SingleThreadTaskRunner::GetCurrentDefault()) {} void PollingDeviceMonitorImpl::StartMonitoring() { - if (is_monitoring_) + if (is_monitoring_) { return; + } is_monitoring_ = true; if (!is_task_posted_) { @@ -114,8 +117,9 @@ void PollingDeviceMonitorImpl::PollDeviceProvider() { is_task_posted_ = false; - if (!is_monitoring_) + if (!is_monitoring_) { return; + } device_provider_->GetOutputDeviceDescriptions( base::BindOnce(&PollingDeviceMonitorImpl::OnDeviceDescriptionsRecieved, weak_ptr_factory_.GetWeakPtr())); @@ -123,8 +127,9 @@ void PollingDeviceMonitorImpl::OnDeviceDescriptionsRecieved( media::AudioDeviceDescriptions descriptions) { - if (!is_monitoring_) + if (!is_monitoring_) { return; + } if (!base::ranges::equal(descriptions, device_ids_, std::equal_to<>(), &media::AudioDeviceDescription::unique_id)) {
diff --git a/chrome/browser/ui/global_media_controls/media_notification_device_monitor_unittest.cc b/chrome/browser/ui/global_media_controls/media_notification_device_monitor_unittest.cc index f22b19d86..d0ab904 100644 --- a/chrome/browser/ui/global_media_controls/media_notification_device_monitor_unittest.cc +++ b/chrome/browser/ui/global_media_controls/media_notification_device_monitor_unittest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/global_media_controls/media_notification_device_monitor.h" + #include "base/test/task_environment.h" #include "base/time/time.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/global_media_controls/media_notification_device_provider_impl.cc b/chrome/browser/ui/global_media_controls/media_notification_device_provider_impl.cc index efc249ff..8a4fa64 100644 --- a/chrome/browser/ui/global_media_controls/media_notification_device_provider_impl.cc +++ b/chrome/browser/ui/global_media_controls/media_notification_device_provider_impl.cc
@@ -23,8 +23,9 @@ &media::AudioDeviceDescription::unique_id); // If there is no default device, there is nothing to remove. - if (default_device_it == descriptions.end()) + if (default_device_it == descriptions.end()) { return; + } // If name of the device associated with the default id is known, the default // device description will contain that name prefixed by a localized string. @@ -75,8 +76,9 @@ } MediaNotificationDeviceProviderImpl::~MediaNotificationDeviceProviderImpl() { - if (monitor_) + if (monitor_) { monitor_->RemoveDevicesChangedObserver(this); + } } base::CallbackListSubscription @@ -87,18 +89,21 @@ monitor_->AddDevicesChangedObserver(this); } monitor_->StartMonitoring(); - if (has_device_list_) + if (has_device_list_) { cb.Run(audio_device_descriptions_); + } auto subscription = output_device_callback_list_.Add(std::move(cb)); - if (!has_device_list_) + if (!has_device_list_) { GetDevices(); + } return subscription; } void MediaNotificationDeviceProviderImpl::GetOutputDeviceDescriptions( media::AudioSystem::OnDeviceDescriptionsCallback cb) { - if (!audio_system_) + if (!audio_system_) { audio_system_ = content::CreateAudioSystemForAudioService(); + } audio_system_->GetDeviceDescriptions( /*for_input=*/false, base::BindOnce( @@ -115,8 +120,9 @@ } void MediaNotificationDeviceProviderImpl::GetDevices() { - if (is_querying_for_output_devices_) + if (is_querying_for_output_devices_) { return; + } is_querying_for_output_devices_ = true; GetOutputDeviceDescriptions( base::BindOnce(&MediaNotificationDeviceProviderImpl::NotifySubscribers, @@ -132,6 +138,7 @@ } void MediaNotificationDeviceProviderImpl::OnSubscriberRemoved() { - if (output_device_callback_list_.empty()) + if (output_device_callback_list_.empty()) { monitor_->StopMonitoring(); + } }
diff --git a/chrome/browser/ui/global_media_controls/media_notification_service.cc b/chrome/browser/ui/global_media_controls/media_notification_service.cc index 48ba237..296197c4 100644 --- a/chrome/browser/ui/global_media_controls/media_notification_service.cc +++ b/chrome/browser/ui/global_media_controls/media_notification_service.cc
@@ -180,12 +180,12 @@ base::Unretained(this)), content::MediaSession::GetSourceId(profile)); #if !BUILDFLAG(IS_CHROMEOS) - supplemental_device_picker_producer_ = - std::make_unique<SupplementalDevicePickerProducer>(item_manager_.get()); - item_manager_->AddItemProducer(supplemental_device_picker_producer_.get()); - // On Chrome OS, SetDevicePickerProvider() gets called by Ash via the - // crosapi. - SetDevicePickerProvider(supplemental_device_picker_producer_->PassRemote()); + supplemental_device_picker_producer_ = + std::make_unique<SupplementalDevicePickerProducer>(item_manager_.get()); + item_manager_->AddItemProducer(supplemental_device_picker_producer_.get()); + // On Chrome OS, SetDevicePickerProvider() gets called by Ash via the + // crosapi. + SetDevicePickerProvider(supplemental_device_picker_producer_->PassRemote()); #endif // !BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_CHROMEOS)
diff --git a/chrome/browser/ui/global_media_controls/media_notification_service_unittest.cc b/chrome/browser/ui/global_media_controls/media_notification_service_unittest.cc index 32a9480..111e74b 100644 --- a/chrome/browser/ui/global_media_controls/media_notification_service_unittest.cc +++ b/chrome/browser/ui/global_media_controls/media_notification_service_unittest.cc
@@ -66,9 +66,7 @@ using testing::NiceMock; using testing::Return; -namespace { - -} // namespace +namespace {} // namespace class MediaNotificationServiceTest : public ChromeRenderViewHostTestHarness { public:
diff --git a/chrome/browser/ui/global_media_controls/media_toolbar_button_controller.cc b/chrome/browser/ui/global_media_controls/media_toolbar_button_controller.cc index b8663d86..f68692f 100644 --- a/chrome/browser/ui/global_media_controls/media_toolbar_button_controller.cc +++ b/chrome/browser/ui/global_media_controls/media_toolbar_button_controller.cc
@@ -53,15 +53,17 @@ } if (!item_manager_->HasFrozenItems()) { - if (delegate_display_state_ != DisplayState::kHidden) + if (delegate_display_state_ != DisplayState::kHidden) { delegate_->Hide(); + } delegate_display_state_ = DisplayState::kHidden; return; } if (!item_manager_->HasOpenDialog()) { - if (delegate_display_state_ != DisplayState::kDisabled) + if (delegate_display_state_ != DisplayState::kDisabled) { delegate_->Disable(); + } delegate_display_state_ = DisplayState::kDisabled; } }
diff --git a/chrome/browser/ui/hats/hats_helper.cc b/chrome/browser/ui/hats/hats_helper.cc index e59c7cf..6436f07 100644 --- a/chrome/browser/ui/hats/hats_helper.cc +++ b/chrome/browser/ui/hats/hats_helper.cc
@@ -32,8 +32,9 @@ void HatsHelper::PrimaryPageChanged(content::Page& page) { // Ignore everything except NTP opens. - if (web_contents()->GetLastCommittedURL() != chrome::kChromeUINewTabURL) + if (web_contents()->GetLastCommittedURL() != chrome::kChromeUINewTabURL) { return; + } if (auto* sentiment_service = TrustSafetySentimentServiceFactory::GetForProfile(profile())) {
diff --git a/chrome/browser/ui/hats/trust_safety_sentiment_service.cc b/chrome/browser/ui/hats/trust_safety_sentiment_service.cc index cb00a4e..f4e9109 100644 --- a/chrome/browser/ui/hats/trust_safety_sentiment_service.cc +++ b/chrome/browser/ui/hats/trust_safety_sentiment_service.cc
@@ -246,14 +246,16 @@ void TrustSafetySentimentService::OpenedNewTabPage() { // Explicit early exit for the common path, where the user has not performed // any of the trigger actions. - if (pending_triggers_.size() == 0) + if (pending_triggers_.size() == 0) { return; + } // Reduce the NTPs to open count for all the active triggers. for (auto& area_trigger : pending_triggers_) { auto& trigger = area_trigger.second; - if (trigger.remaining_ntps_to_open > 0) + if (trigger.remaining_ntps_to_open > 0) { trigger.remaining_ntps_to_open--; + } } // Cleanup any triggers which are no longer relevant. This will be every @@ -269,19 +271,22 @@ }); // This may have emptied the set of pending triggers. - if (pending_triggers_.size() == 0) + if (pending_triggers_.size() == 0) { return; + } // A primary OTR profile (incognito) existing will prevent any surveys from // being shown. - if (profile_->HasPrimaryOTRProfile()) + if (profile_->HasPrimaryOTRProfile()) { return; + } // Check if any of the triggers make the user not yet eligible to receive a // survey. for (const auto& area_trigger : pending_triggers_) { - if (ShouldBlockSurvey(area_trigger.second)) + if (ShouldBlockSurvey(area_trigger.second)) { return; + } } // Choose a trigger at random to avoid any order biasing. @@ -316,8 +321,9 @@ // simpler. As interactions with settings (visiting password manager and using // the privacy card) can occur independently, there is also little risk of // starving one interaction. - if (settings_watcher_) + if (settings_watcher_) { return; + } settings_watcher_ = std::make_unique<SettingsWatcher>( web_contents, @@ -379,8 +385,9 @@ void TrustSafetySentimentService::OpenedPasswordManager( content::WebContents* web_contents) { - if (settings_watcher_) + if (settings_watcher_) { return; + } std::map<std::string, bool> product_specific_data = { {"Saved password", false}}; @@ -530,8 +537,9 @@ // Only interested in the primary OTR profile i.e. the one used for incognito // browsing. Non-primary OTR profiles are often used as implementation details // of other features, and are not inherintly relevant to Trust & Safety. - if (off_the_record->GetOTRProfileID() == Profile::OTRProfileID::PrimaryID()) + if (off_the_record->GetOTRProfileID() == Profile::OTRProfileID::PrimaryID()) { observed_profiles_.AddObservation(off_the_record); + } } void TrustSafetySentimentService::OnProfileWillBeDestroyed(Profile* profile) { @@ -601,8 +609,9 @@ web_contents_->GetVisibility() == content::Visibility::VISIBLE && web_contents_->GetLastCommittedURL().host_piece() == chrome::kChromeUISettingsHost; - if (stayed_on_settings) + if (stayed_on_settings) { std::move(success_callback_).Run(); + } std::move(complete_callback_).Run(); } @@ -625,8 +634,9 @@ // Log histogram that verifies infrastructure works as intended. base::UmaHistogramEnumeration( "Feedback.TrustSafetySentiment.CallTriggerOccurred", feature_area); - if (!ProbabilityCheck(feature_area)) + if (!ProbabilityCheck(feature_area)) { return; + } base::UmaHistogramEnumeration("Feedback.TrustSafetySentiment.TriggerOccurred", feature_area);
diff --git a/chrome/browser/ui/hats/trust_safety_sentiment_service_unittest.cc b/chrome/browser/ui/hats/trust_safety_sentiment_service_unittest.cc index 1fce0f6..d76bba5 100644 --- a/chrome/browser/ui/hats/trust_safety_sentiment_service_unittest.cc +++ b/chrome/browser/ui/hats/trust_safety_sentiment_service_unittest.cc
@@ -687,8 +687,9 @@ // Record 2 visits to the NTP so regardless of the random NTP count chosen, // the Privacy Settings trigger will be eligible, but currently blocked by // the presence of an incognito profile. - for (int i = 0; i < 2; i++) + for (int i = 0; i < 2; i++) { service()->OpenedNewTabPage(); + } profile()->DestroyOffTheRecordProfile(otr_profile);
diff --git a/chrome/browser/ui/hid/hid_chooser_controller.cc b/chrome/browser/ui/hid/hid_chooser_controller.cc index f253fb2c..3c4908a 100644 --- a/chrome/browser/ui/hid/hid_chooser_controller.cc +++ b/chrome/browser/ui/hid/hid_chooser_controller.cc
@@ -43,15 +43,18 @@ const device::mojom::HidDeviceInfo& device) { if (filter->device_ids) { if (filter->device_ids->is_vendor()) { - if (filter->device_ids->get_vendor() != device.vendor_id) + if (filter->device_ids->get_vendor() != device.vendor_id) { return false; + } } else if (filter->device_ids->is_vendor_and_product()) { const auto& vendor_and_product = filter->device_ids->get_vendor_and_product(); - if (vendor_and_product->vendor != device.vendor_id) + if (vendor_and_product->vendor != device.vendor_id) { return false; - if (vendor_and_product->product != device.product_id) + } + if (vendor_and_product->product != device.product_id) { return false; + } } } @@ -109,8 +112,9 @@ } HidChooserController::~HidChooserController() { - if (callback_) + if (callback_) { std::move(callback_).Run(std::vector<device::mojom::HidDeviceInfoPtr>()); + } } bool HidChooserController::ShouldShowHelpButton() const { @@ -145,8 +149,9 @@ bool HidChooserController::IsPaired(size_t index) const { DCHECK_LT(index, items_.size()); - if (!chooser_context_) + if (!chooser_context_) { return false; + } DCHECK(base::Contains(device_map_, items_[index])); const auto& device_infos = device_map_.find(items_[index])->second; @@ -178,8 +183,9 @@ bool any_persistent_permission_granted = false; for (auto& device : device_infos) { chooser_context_->GrantDevicePermission(origin_, *device); - if (HidChooserContext::CanStorePersistentEntry(*device)) + if (HidChooserContext::CanStorePersistentEntry(*device)) { any_persistent_permission_granted = true; + } devices.push_back(device->Clone()); } @@ -209,8 +215,9 @@ auto* web_contents = rfh && rfh->IsActive() ? content::WebContents::FromRenderFrameHost(rfh) : nullptr; - if (!web_contents) + if (!web_contents) { return; + } web_contents->OpenURL( content::OpenURLParams( @@ -222,11 +229,13 @@ void HidChooserController::OnDeviceAdded( const device::mojom::HidDeviceInfo& device) { - if (!DisplayDevice(device)) + if (!DisplayDevice(device)) { return; + } - if (AddDeviceInfo(device) && view()) + if (AddDeviceInfo(device) && view()) { view()->OnOptionAdded(items_.size() - 1); + } return; } @@ -234,12 +243,14 @@ const device::mojom::HidDeviceInfo& device) { auto id = PhysicalDeviceIdFromDeviceInfo(device); auto items_it = base::ranges::find(items_, id); - if (items_it == items_.end()) + if (items_it == items_.end()) { return; + } size_t index = std::distance(items_.begin(), items_it); - if (RemoveDeviceInfo(device) && view()) + if (RemoveDeviceInfo(device) && view()) { view()->OnOptionRemoved(index); + } } void HidChooserController::OnDeviceChanged( @@ -247,8 +258,9 @@ bool has_chooser_item = base::Contains(items_, PhysicalDeviceIdFromDeviceInfo(device)); if (!DisplayDevice(device)) { - if (has_chooser_item) + if (has_chooser_item) { OnDeviceRemoved(device); + } return; } @@ -272,17 +284,20 @@ void HidChooserController::OnGotDevices( std::vector<device::mojom::HidDeviceInfoPtr> devices) { for (auto& device : devices) { - if (DisplayDevice(*device)) + if (DisplayDevice(*device)) { AddDeviceInfo(*device); + } } // Listen to HidChooserContext for OnDeviceAdded/Removed events after the // enumeration. - if (chooser_context_) + if (chooser_context_) { observation_.Observe(chooser_context_.get()); + } - if (view()) + if (view()) { view()->OnOptionsInitialized(); + } } bool HidChooserController::DisplayDevice( @@ -328,12 +343,14 @@ bool HidChooserController::FilterMatchesAny( const device::mojom::HidDeviceInfo& device) const { - if (filters_.empty()) + if (filters_.empty()) { return true; + } for (const auto& filter : filters_) { - if (FilterMatch(filter, device)) + if (FilterMatch(filter, device)) { return true; + } } return false; } @@ -341,8 +358,9 @@ bool HidChooserController::IsExcluded( const device::mojom::HidDeviceInfo& device) const { for (const auto& exclusion_filter : exclusion_filters_) { - if (FilterMatch(exclusion_filter, device)) + if (FilterMatch(exclusion_filter, device)) { return true; + } } return false; } @@ -380,8 +398,9 @@ [&device](const device::mojom::HidDeviceInfoPtr& d) { return d->guid == device.guid; }); - if (!device_infos.empty()) + if (!device_infos.empty()) { return false; + } // A device was disconnected. Remove it from the chooser list. device_map_.erase(find_it); std::erase(items_, id);
diff --git a/chrome/browser/ui/hung_plugin_tab_helper.cc b/chrome/browser/ui/hung_plugin_tab_helper.cc index 54e5a8b..ff28bc2 100644 --- a/chrome/browser/ui/hung_plugin_tab_helper.cc +++ b/chrome/browser/ui/hung_plugin_tab_helper.cc
@@ -76,8 +76,9 @@ if (i->second->infobar) { infobars::ContentInfoBarManager* infobar_manager = infobars::ContentInfoBarManager::FromWebContents(web_contents()); - if (infobar_manager) + if (infobar_manager) { infobar_manager->RemoveInfoBar(i->second->infobar); + } } hung_plugins_.erase(i); } @@ -94,17 +95,20 @@ if (found != hung_plugins_.end()) { if (!is_hung) { // Hung plugin became un-hung, close the infobar and delete our info. - if (found->second->infobar && infobar_manager) + if (found->second->infobar && infobar_manager) { infobar_manager->RemoveInfoBar(found->second->infobar); + } hung_plugins_.erase(found); } return; } - if (!infobar_manager) + if (!infobar_manager) { return; - if (!infobar_observations_.IsObservingSource(infobar_manager)) + } + if (!infobar_observations_.IsObservingSource(infobar_manager)) { infobar_observations_.AddObservation(infobar_manager); + } std::u16string plugin_name = content::PluginService::GetInstance()->GetPluginDisplayNameByPath( @@ -173,8 +177,9 @@ void HungPluginTabHelper::ShowBar(int child_id, PluginState* state) { infobars::ContentInfoBarManager* infobar_manager = infobars::ContentInfoBarManager::FromWebContents(web_contents()); - if (!infobar_manager) + if (!infobar_manager) { return; + } DCHECK(!state->infobar); state->infobar = HungPluginInfoBarDelegate::Create(infobar_manager, this,
diff --git a/chrome/browser/ui/hung_renderer/hung_renderer_core.cc b/chrome/browser/ui/hung_renderer/hung_renderer_core.cc index f73e52e..4f64cf8b 100644 --- a/chrome/browser/ui/hung_renderer/hung_renderer_core.cc +++ b/chrome/browser/ui/hung_renderer/hung_renderer_core.cc
@@ -63,8 +63,9 @@ // hosting the previously committed navigation. In such case, the // FindFirstRenderFrameHostMatchingProcess above might not find any matching // frame. - if (!render_frame_host) + if (!render_frame_host) { return GURL(); + } return render_frame_host->GetLastCommittedURL(); } @@ -86,10 +87,11 @@ // initial |results| when it hasn't yet committed a navigation into the hung // process. auto first = base::ranges::find(result, hung_web_contents); - if (first != result.end()) + if (first != result.end()) { std::rotate(result.begin(), first, std::next(first)); - else + } else { result.insert(result.begin(), hung_web_contents); + } return result; } @@ -101,20 +103,23 @@ content::WebContents* affected_web_contents, content::RenderProcessHost* hung_process) { std::u16string page_title = affected_web_contents->GetTitle(); - if (page_title.empty()) + if (page_title.empty()) { page_title = CoreTabHelper::GetDefaultTitle(); + } // TODO(xji): Consider adding a special case if the title text is a URL, // since those should always have LTR directionality. Please refer to // http://crbug.com/6726 for more information. base::i18n::AdjustStringForLocaleDirection(&page_title); if (affected_web_contents->GetPrimaryMainFrame()->GetProcess() == - hung_process) + hung_process) { return page_title; + } GURL hung_url = GetURLOfAnyHungFrame(affected_web_contents, hung_process); - if (!hung_url.is_valid() || !hung_url.has_host()) + if (!hung_url.is_valid() || !hung_url.has_host()) { return page_title; + } // N.B. using just the host here is OK since this is a notification and the // user doesn't need to make a security critical decision about the page in
diff --git a/chrome/browser/ui/hung_renderer/hung_renderer_core.h b/chrome/browser/ui/hung_renderer/hung_renderer_core.h index 0e07fb1..109f505 100644 --- a/chrome/browser/ui/hung_renderer/hung_renderer_core.h +++ b/chrome/browser/ui/hung_renderer/hung_renderer_core.h
@@ -8,7 +8,6 @@ #include <string> #include <vector> - namespace content { class RenderProcessHost; class WebContents;
diff --git a/chrome/browser/ui/intent_picker_tab_helper.cc b/chrome/browser/ui/intent_picker_tab_helper.cc index 2ab151e..75de4aa84 100644 --- a/chrome/browser/ui/intent_picker_tab_helper.cc +++ b/chrome/browser/ui/intent_picker_tab_helper.cc
@@ -165,8 +165,9 @@ void IntentPickerTabHelper::ShowOrHideIcon(content::WebContents* web_contents, bool should_show_icon) { IntentPickerTabHelper* tab_helper = FromWebContents(web_contents); - if (!tab_helper) + if (!tab_helper) { return; + } if (apps::features::ShouldShowLinkCapturingUX()) { tab_helper->current_app_icon_ = ui::ImageModel(); @@ -258,10 +259,11 @@ ui::ImageModel app_icon) { apps[index].icon_model = app_icon; - if (index == apps.size() - 1) + if (index == apps.size() - 1) { std::move(callback).Run(std::move(apps)); - else + } else { LoadAppIcon(std::move(apps), index + 1, std::move(callback)); + } } void IntentPickerTabHelper::LoadAppIcon( @@ -479,8 +481,9 @@ web_app::proto::InstallState::INSTALLED_WITH_OS_INTEGRATION, web_app::proto::InstallState::INSTALLED_WITHOUT_OS_INTEGRATION, }); - if (app_id == local_app_id) + if (app_id == local_app_id) { ShowOrHideIcon(web_contents(), /*should_show_icon=*/false); + } } void IntentPickerTabHelper::OnWebAppInstallManagerDestroyed() {
diff --git a/chrome/browser/ui/intent_picker_tab_helper.h b/chrome/browser/ui/intent_picker_tab_helper.h index 5123518bf..71dcecf 100644 --- a/chrome/browser/ui/intent_picker_tab_helper.h +++ b/chrome/browser/ui/intent_picker_tab_helper.h
@@ -65,7 +65,6 @@ const ui::ImageModel& app_icon() const { return current_app_icon_; } - // Sets a OnceClosure callback which will be called next time the icon is // updated. If include_latest_navigation is true, and the latest navigation // was finished, the callback is called immediately.
diff --git a/chrome/browser/ui/javascript_dialogs/javascript_dialog_browsertest.cc b/chrome/browser/ui/javascript_dialogs/javascript_dialog_browsertest.cc index 1b013e8..e8da9503 100644 --- a/chrome/browser/ui/javascript_dialogs/javascript_dialog_browsertest.cc +++ b/chrome/browser/ui/javascript_dialogs/javascript_dialog_browsertest.cc
@@ -121,9 +121,12 @@ // A subframe shows a dialog. std::string dialog_url = "data:text/html,<script>alert(\"hi\");</script>"; - std::string script = "var iframe = document.createElement('iframe');" - "iframe.src = '" + dialog_url + "';" - "document.body.appendChild(iframe);"; + std::string script = + "var iframe = document.createElement('iframe');" + "iframe.src = '" + + dialog_url + + "';" + "document.body.appendChild(iframe);"; scoped_refptr<content::MessageLoopRunner> runner = new content::MessageLoopRunner; js_helper->SetDialogShownCallbackForTesting(runner->QuitClosure());
diff --git a/chrome/browser/ui/lens/lens_overlay_proto_converter_unittest.cc b/chrome/browser/ui/lens/lens_overlay_proto_converter_unittest.cc index 0658edc..f732200 100644 --- a/chrome/browser/ui/lens/lens_overlay_proto_converter_unittest.cc +++ b/chrome/browser/ui/lens/lens_overlay_proto_converter_unittest.cc
@@ -387,8 +387,8 @@ geometry->mutable_bounding_box()->set_coordinate_type(box.coordinate_type); } - void CreateServerGeometryWithPolygon( - BoundingBoxStruct box, lens::Geometry* geometry) { + void CreateServerGeometryWithPolygon(BoundingBoxStruct box, + lens::Geometry* geometry) { CreateServerGeometry(box, geometry); auto* polygon = geometry->add_segmentation_polygon(); auto* vertex = polygon->add_vertex(); @@ -398,9 +398,8 @@ polygon->set_coordinate_type(lens::NORMALIZED); } - void VerifyGeometriesAreEqual( - lens::Geometry server_geometry, - lens::mojom::GeometryPtr mojo_geometry) { + void VerifyGeometriesAreEqual(lens::Geometry server_geometry, + lens::mojom::GeometryPtr mojo_geometry) { EXPECT_EQ(gfx::PointF(server_geometry.bounding_box().center_x(), server_geometry.bounding_box().center_y()), mojo_geometry->bounding_box->box.origin()); @@ -413,9 +412,9 @@ static_cast<int>(server_geometry.bounding_box().coordinate_type()), static_cast<int>(mojo_geometry->bounding_box->coordinate_type)); - EXPECT_EQ(static_cast<size_t>( - server_geometry.segmentation_polygon().size()), - mojo_geometry->segmentation_polygon.size()); + EXPECT_EQ( + static_cast<size_t>(server_geometry.segmentation_polygon().size()), + mojo_geometry->segmentation_polygon.size()); for (int i = 0; i < server_geometry.segmentation_polygon().size(); i++) { lens::Polygon server_polygon = server_geometry.segmentation_polygon().at(i); @@ -447,7 +446,7 @@ lens::mojom::OverlayObjectPtr mojo_object = mojo_objects.at(i)->Clone(); EXPECT_EQ(server_object.id(), mojo_object->id); VerifyGeometriesAreEqual(server_object.geometry(), - std::move(mojo_object->geometry)); + std::move(mojo_object->geometry)); } } };
diff --git a/chrome/browser/ui/lens/lens_overlay_query_controller.cc b/chrome/browser/ui/lens/lens_overlay_query_controller.cc index f4ed705..63a44a7 100644 --- a/chrome/browser/ui/lens/lens_overlay_query_controller.cc +++ b/chrome/browser/ui/lens/lens_overlay_query_controller.cc
@@ -11,8 +11,8 @@ #include "base/functional/bind.h" #include "base/logging.h" #include "base/rand_util.h" -#include "base/strings/utf_string_conversions.h" #include "base/strings/stringprintf.h" +#include "base/strings/utf_string_conversions.h" #include "base/task/bind_post_task.h" #include "base/task/thread_pool.h" #include "base/time/time.h"
diff --git a/chrome/browser/ui/lens/lens_overlay_side_panel_web_view.cc b/chrome/browser/ui/lens/lens_overlay_side_panel_web_view.cc index a407233..0ca7e07 100644 --- a/chrome/browser/ui/lens/lens_overlay_side_panel_web_view.cc +++ b/chrome/browser/ui/lens/lens_overlay_side_panel_web_view.cc
@@ -22,9 +22,7 @@ SidePanelWebUIViewT) END_METADATA -namespace { - -} // namespace +namespace {} // namespace LensOverlaySidePanelWebView::LensOverlaySidePanelWebView( content::BrowserContext* browser_context,
diff --git a/chrome/browser/ui/lens/test_lens_overlay_query_controller.cc b/chrome/browser/ui/lens/test_lens_overlay_query_controller.cc index 01849079..62de2b8d 100644 --- a/chrome/browser/ui/lens/test_lens_overlay_query_controller.cc +++ b/chrome/browser/ui/lens/test_lens_overlay_query_controller.cc
@@ -180,10 +180,11 @@ } else if (request->has_objects_request() && !request->objects_request().has_image_data() && request->objects_request().has_payload() && - request->objects_request().payload().has_partial_pdf_document()) { + request->objects_request().payload().has_partial_pdf_document()) { // Partial page content upload request. num_partial_page_content_requests_sent_++; - sent_partial_page_content_objects_request_.CopyFrom(request->objects_request()); + sent_partial_page_content_objects_request_.CopyFrom( + request->objects_request()); // The server doesn't send a response to this request, so no need to set // the response string to something meaningful. fake_server_response_string = "";
diff --git a/chrome/browser/ui/lens/test_lens_overlay_query_controller.h b/chrome/browser/ui/lens/test_lens_overlay_query_controller.h index 6824bfab..fecb0a7 100644 --- a/chrome/browser/ui/lens/test_lens_overlay_query_controller.h +++ b/chrome/browser/ui/lens/test_lens_overlay_query_controller.h
@@ -97,8 +97,8 @@ return sent_page_content_objects_request_; } - const lens::LensOverlayObjectsRequest& sent_partial_page_content_objects_request() - const { + const lens::LensOverlayObjectsRequest& + sent_partial_page_content_objects_request() const { return sent_partial_page_content_objects_request_; }
diff --git a/chrome/browser/ui/login/login_handler.cc b/chrome/browser/ui/login/login_handler.cc index 418d96e1..b550029 100644 --- a/chrome/browser/ui/login/login_handler.cc +++ b/chrome/browser/ui/login/login_handler.cc
@@ -87,8 +87,9 @@ password_manager::HttpAuthManager* http_auth_manager = GetHttpAuthManagerForLogin(); - if (http_auth_manager) + if (http_auth_manager) { http_auth_manager->OnPasswordFormDismissed(); + } if (!WasAuthHandled()) { auth_required_callback_.Reset(); @@ -129,8 +130,9 @@ autofill::SavePasswordProgressLogger::STRING_AUTHENTICATION_HANDLED, already_handled); } - if (already_handled) + if (already_handled) { return; + } password_manager::HttpAuthManager* httpauth_manager = GetHttpAuthManagerForLogin(); @@ -161,8 +163,9 @@ } void LoginHandler::CancelAuth(bool notify_others) { - if (WasAuthHandled()) + if (WasAuthHandled()) { return; + } LoginAuthRequiredCallback callback = std::move(auth_required_callback_); @@ -269,8 +272,9 @@ password_manager::PasswordManagerClient* LoginHandler::GetPasswordManagerClientFromWebContent() { - if (!web_contents_) + if (!web_contents_) { return nullptr; + } password_manager::PasswordManagerClient* client = ChromePasswordManagerClient::FromWebContents(web_contents_.get()); return client; @@ -404,8 +408,9 @@ const std::u16string& authority, const std::u16string& explanation, LoginHandler::LoginModelData* login_model_data) { - if (login_model_data) + if (login_model_data) { password_form_ = *login_model_data->form; + } bool success = BuildViewImpl(authority, explanation, login_model_data); if (success) { NotifyAuthNeeded();
diff --git a/chrome/browser/ui/login/login_handler_browsertest.cc b/chrome/browser/ui/login/login_handler_browsertest.cc index bf597c8..0de4671c 100644 --- a/chrome/browser/ui/login/login_handler_browsertest.cc +++ b/chrome/browser/ui/login/login_handler_browsertest.cc
@@ -357,8 +357,7 @@ AuthInfo() = default; - AuthInfo(const std::string& username, - const std::string& password) + AuthInfo(const std::string& username, const std::string& password) : username_(username), password_(password) {} }; @@ -448,7 +447,7 @@ const char kPrefetchAuthPage[] = "/login/prefetch.html"; const char kMultiRealmTestPage[] = "/login/multi_realm.html"; -const int kMultiRealmTestRealmCount = 2; +const int kMultiRealmTestRealmCount = 2; const int kMultiRealmTestAuthRequestsCount = 4; const char kAuthBasicPage[] = "/auth-basic"; @@ -500,8 +499,9 @@ for (bool crash_network_service : {false, true}) { if (crash_network_service) { // Can't crash the network service if it isn't running out of process. - if (!content::IsOutOfProcessNetworkService()) + if (!content::IsOutOfProcessNetworkService()) { return; + } SimulateNetworkServiceCrash(); // Flush the network interface to make sure it notices the crash. @@ -2265,12 +2265,12 @@ scoped_feature_list_.InitWithFeatureStates( {{network::features::kSplitAuthCacheByNetworkIsolationKey, (GetParam() == SplitAuthCacheByNetworkIsolationKey::kTrue)}}); - } + } - void SetUpOnMainThread() override { - SetUpLoginFakes(); - extensions::ExtensionBrowserTest::SetUpOnMainThread(); - } + void SetUpOnMainThread() override { + SetUpLoginFakes(); + extensions::ExtensionBrowserTest::SetUpOnMainThread(); + } ~LoginPromptExtensionBrowserTest() override = default; @@ -2297,8 +2297,9 @@ embedded_test_server()->RegisterRequestHandler(base::BindLambdaForTesting( [&](const net::test_server::HttpRequest& request) -> std::unique_ptr<net::test_server::HttpResponse> { - if (request.relative_url != kSlowResponse) + if (request.relative_url != kSlowResponse) { return nullptr; + } auto response = std::make_unique<SlowAuthResponse>( base::BindLambdaForTesting([&](base::OnceClosure start_response, base::OnceClosure finish_response) { @@ -2450,8 +2451,9 @@ // Serves a Basic Auth challenge. std::unique_ptr<net::test_server::HttpResponse> HandleHttpAuthRequest( const net::test_server::HttpRequest& request) { - if (request.relative_url != kWorkerHttpBasicAuthPath) + if (request.relative_url != kWorkerHttpBasicAuthPath) { return nullptr; + } auto http_response = std::make_unique<net::test_server::BasicHttpResponse>(); http_response->set_code(net::HTTP_UNAUTHORIZED);
diff --git a/chrome/browser/ui/login/login_handler_unittest.cc b/chrome/browser/ui/login/login_handler_unittest.cc index a6b1fa9d..ba96d2b 100644 --- a/chrome/browser/ui/login/login_handler_unittest.cc +++ b/chrome/browser/ui/login/login_handler_unittest.cc
@@ -2,11 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/login/login_handler.h" + #include <stddef.h> #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" -#include "chrome/browser/ui/login/login_handler.h" #include "chrome/browser/ui/login/login_tab_helper.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "content/public/test/mock_navigation_handle.h" @@ -108,8 +109,9 @@ #if BUILDFLAG(IS_ANDROID) extra_text = true; #endif - if (extra_text) + if (extra_text) { str += u" requires a username and password."; + } return str; }
diff --git a/chrome/browser/ui/login/login_navigation_throttle.cc b/chrome/browser/ui/login/login_navigation_throttle.cc index 0bb31973..3fd0cdfc 100644 --- a/chrome/browser/ui/login/login_navigation_throttle.cc +++ b/chrome/browser/ui/login/login_navigation_throttle.cc
@@ -19,21 +19,25 @@ LoginNavigationThrottle::ThrottleCheckResult LoginNavigationThrottle::WillProcessResponse() { - if (navigation_handle()->IsSameDocument()) + if (navigation_handle()->IsSameDocument()) { return PROCEED; - if (!navigation_handle()->IsInPrimaryMainFrame()) + } + if (!navigation_handle()->IsInPrimaryMainFrame()) { return PROCEED; + } LoginTabHelper* helper = LoginTabHelper::FromWebContents(navigation_handle()->GetWebContents()); // The helper may not have been created yet if there was no auth challennge. - if (!helper) + if (!helper) { return PROCEED; + } const net::HttpResponseHeaders* headers = navigation_handle()->GetResponseHeaders(); - if (!headers) + if (!headers) { return PROCEED; + } if (headers->response_code() != net::HTTP_UNAUTHORIZED && headers->response_code() != net::HTTP_PROXY_AUTHENTICATION_REQUIRED) { return PROCEED;
diff --git a/chrome/browser/ui/login/login_tab_helper.cc b/chrome/browser/ui/login/login_tab_helper.cc index 90b4462..b859209 100644 --- a/chrome/browser/ui/login/login_tab_helper.cc +++ b/chrome/browser/ui/login/login_tab_helper.cc
@@ -29,8 +29,9 @@ // response bodies that have subframes or can trigger same-document // navigations. if (!navigation_handle->IsInPrimaryMainFrame() || - navigation_handle->IsSameDocument()) + navigation_handle->IsSameDocument()) { return; + } login_handler_.reset(); }
diff --git a/chrome/browser/ui/managed_ui.cc b/chrome/browser/ui/managed_ui.cc index 3ad8da6..7205a4d 100644 --- a/chrome/browser/ui/managed_ui.cc +++ b/chrome/browser/ui/managed_ui.cc
@@ -168,14 +168,16 @@ bool ShouldDisplayManagedUi(Profile* profile) { #if BUILDFLAG(IS_CHROMEOS_ASH) // Don't show the UI in demo mode. - if (ash::DemoSession::IsDeviceInDemoMode()) + if (ash::DemoSession::IsDeviceInDemoMode()) { return false; + } #endif #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) // Don't show the UI for Family Link accounts. - if (profile->IsChild()) + if (profile->IsChild()) { return false; + } #endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) return enterprise_util::IsBrowserManaged(profile) || @@ -465,8 +467,9 @@ #if BUILDFLAG(IS_CHROMEOS_LACROS) std::optional<std::string> GetSessionManagerIdentity() { - if (!policy::PolicyLoaderLacros::IsMainUserManaged()) + if (!policy::PolicyLoaderLacros::IsMainUserManaged()) { return std::nullopt; + } return policy::PolicyLoaderLacros::main_user_policy_data()->managed_by(); } #endif @@ -474,8 +477,9 @@ std::optional<std::string> GetAccountManagerIdentity(Profile* profile) { if (!policy::ManagementServiceFactory::GetForProfile(profile) ->HasManagementAuthority( - policy::EnterpriseManagementAuthority::CLOUD)) + policy::EnterpriseManagementAuthority::CLOUD)) { return std::nullopt; + } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) if (base::FeatureList::IsEnabled( @@ -490,8 +494,9 @@ const std::optional<std::string> managed_by = policy::GetManagedBy(profile->GetCloudPolicyManager()); - if (managed_by) + if (managed_by) { return *managed_by; + } if (profile->GetProfilePolicyConnector()->IsUsingLocalTestPolicyProvider()) { return "Local Test Policies";
diff --git a/chrome/browser/ui/media_router/cast_dialog_model.cc b/chrome/browser/ui/media_router/cast_dialog_model.cc index 57f40d1..fea3fc73 100644 --- a/chrome/browser/ui/media_router/cast_dialog_model.cc +++ b/chrome/browser/ui/media_router/cast_dialog_model.cc
@@ -14,8 +14,9 @@ std::optional<size_t> CastDialogModel::GetFirstActiveSinkIndex() const { for (size_t i = 0; i < media_sinks_.size(); i++) { - if (!media_sinks_.at(i).route) + if (!media_sinks_.at(i).route) { return i; + } } return std::nullopt; }
diff --git a/chrome/browser/ui/media_router/cast_modes_with_media_sources.cc b/chrome/browser/ui/media_router/cast_modes_with_media_sources.cc index ac146d9..5052f89 100644 --- a/chrome/browser/ui/media_router/cast_modes_with_media_sources.cc +++ b/chrome/browser/ui/media_router/cast_modes_with_media_sources.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/media_router/cast_modes_with_media_sources.h" + #include "base/containers/contains.h" namespace media_router { @@ -24,8 +25,9 @@ if (cast_mode_it != cast_modes_.end()) { auto& sources_for_cast_mode = cast_mode_it->second; sources_for_cast_mode.erase(source); - if (sources_for_cast_mode.empty()) + if (sources_for_cast_mode.empty()) { cast_modes_.erase(cast_mode); + } } } @@ -38,8 +40,9 @@ CastModeSet CastModesWithMediaSources::GetCastModes() const { CastModeSet cast_mode_set; - for (const auto& cast_mode_pair : cast_modes_) + for (const auto& cast_mode_pair : cast_modes_) { cast_mode_set.insert(cast_mode_pair.first); + } return cast_mode_set; }
diff --git a/chrome/browser/ui/media_router/media_route_starter.cc b/chrome/browser/ui/media_router/media_route_starter.cc index 59cc94d9..f2ded47 100644 --- a/chrome/browser/ui/media_router/media_route_starter.cc +++ b/chrome/browser/ui/media_router/media_route_starter.cc
@@ -46,10 +46,12 @@ std::vector<MediaRouteResultCallback> route_result_callbacks, mojom::RoutePresentationConnectionPtr connection, const RouteRequestResult& result) { - if (presentation_callback) + if (presentation_callback) { std::move(presentation_callback).Run(std::move(connection), result); - for (auto& callback : route_result_callbacks) + } + for (auto& callback : route_result_callbacks) { std::move(callback).Run(result); + } } // Gets the profile to use for the `MediaRouteStarter` when there is no @@ -76,8 +78,9 @@ : nullptr), query_result_manager_( std::make_unique<QueryResultManager>(GetMediaRouter())) { - if (presentation_manager_) + if (presentation_manager_) { presentation_manager_->AddObserver(this); + } InitPresentationSources(params.initial_modes); InitMirroringSources(params.initial_modes); InitRemotePlaybackSources(params.initial_modes, params.video_codec, @@ -86,8 +89,9 @@ MediaRouteStarter::~MediaRouteStarter() { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); - if (presentation_manager_) + if (presentation_manager_) { presentation_manager_->RemoveObserver(this); + } // If |start_presentation_context_| still exists, then it means presentation // route request was never attempted. @@ -182,8 +186,9 @@ } bool MediaRouteStarter::GetScreenCapturePermission(MediaCastMode cast_mode) { - if (!RequiresScreenCapturePermission(cast_mode)) + if (!RequiresScreenCapturePermission(cast_mode)) { return true; + } return media_router::GetScreenCapturePermission(); }
diff --git a/chrome/browser/ui/media_router/media_route_starter_unittest.cc b/chrome/browser/ui/media_router/media_route_starter_unittest.cc index 69309d2..c57add5f 100644 --- a/chrome/browser/ui/media_router/media_route_starter_unittest.cc +++ b/chrome/browser/ui/media_router/media_route_starter_unittest.cc
@@ -83,8 +83,9 @@ } ~MockPresentationRequestSourceObserver() override { - if (starter_) + if (starter_) { starter_->RemovePresentationRequestSourceObserver(this); + } } MOCK_METHOD(void, OnSourceUpdated, (std::u16string&)); @@ -348,8 +349,9 @@ media_route_starter()->CreateRouteParameters(sink.id(), cast_mode); EXPECT_TRUE(params); - if (cast_mode == MediaCastMode::DESKTOP_MIRROR) + if (cast_mode == MediaCastMode::DESKTOP_MIRROR) { set_screen_capture_allowed_for_testing(true); + } StartRoute(std::move(params)); }
diff --git a/chrome/browser/ui/media_router/media_router_ui.cc b/chrome/browser/ui/media_router/media_router_ui.cc index af57fed4..f57ce1dd 100644 --- a/chrome/browser/ui/media_router/media_router_ui.cc +++ b/chrome/browser/ui/media_router/media_router_ui.cc
@@ -64,8 +64,9 @@ void MaybeReportCastingSource(MediaCastMode cast_mode, const RouteRequestResult& result) { - if (result.result_code() == mojom::RouteRequestResultCode::OK) + if (result.result_code() == mojom::RouteRequestResultCode::OK) { base::UmaHistogramSparse("MediaRouter.Source.CastingSource", cast_mode); + } } const CastModeSet CreateMediaCastModeSet(const MediaCastMode& cast_mode) { @@ -92,8 +93,9 @@ MediaRouterUI::~MediaRouterUI() { StopObservingMirroringMediaControllerHosts(); - if (media_route_starter_) + if (media_route_starter_) { DetachFromMediaRouteStarter(); + } for (CastDialogController::Observer& observer : observers_) { observer.OnControllerDestroying(); } @@ -265,8 +267,9 @@ // StartCasting(), but it causes Chrome to crash when the desktop picker // dialog is shown, so for now we just don't call it in that case. Move it // back once the problem is resolved. - if (cast_mode != MediaCastMode::DESKTOP_MIRROR) + if (cast_mode != MediaCastMode::DESKTOP_MIRROR) { UpdateSinks(); + } return true; } @@ -281,8 +284,9 @@ } std::vector<MediaSinkWithCastModes> MediaRouterUI::GetEnabledSinks() const { - if (!display_observer_) + if (!display_observer_) { return sinks_; + } // Filter out the wired display sink for the display that the dialog is on. // This is not the best place to do this because MRUI should not perform a @@ -429,20 +433,19 @@ permission_rejected = false; } - std::vector<UIMediaSink> media_sinks; - for (const MediaSinkWithCastModes& sink : GetEnabledSinks()) { - auto route_it = base::ranges::find(routes(), sink.sink.id(), - &MediaRoute::media_sink_id); - const MediaRoute* route = - route_it == routes().end() ? nullptr : &*route_it; - media_sinks.push_back(ConvertToUISink(sink, route, issue_)); - } - model_.set_media_sinks(std::move(media_sinks)); - model_.set_is_permission_rejected(permission_rejected); + std::vector<UIMediaSink> media_sinks; + for (const MediaSinkWithCastModes& sink : GetEnabledSinks()) { + auto route_it = base::ranges::find(routes(), sink.sink.id(), + &MediaRoute::media_sink_id); + const MediaRoute* route = route_it == routes().end() ? nullptr : &*route_it; + media_sinks.push_back(ConvertToUISink(sink, route, issue_)); + } + model_.set_media_sinks(std::move(media_sinks)); + model_.set_is_permission_rejected(permission_rejected); - for (CastDialogController::Observer& observer : observers_) { - observer.OnModelUpdated(model_); - } + for (CastDialogController::Observer& observer : observers_) { + observer.OnModelUpdated(model_); + } } void MediaRouterUI::SendIssueForRouteTimeout( @@ -608,8 +611,10 @@ const std::u16string& presentation_request_source_name, const RouteRequestResult& result) { // If we receive a new route that we aren't expecting, do nothing. - if (!current_route_request_ || route_request_id != current_route_request_->id) + if (!current_route_request_ || + route_request_id != current_route_request_->id) { return; + } const MediaRoute* route = result.route(); if (!route) { @@ -650,8 +655,9 @@ : l10n_util::GetStringFUTF16(IDS_MEDIA_ROUTER_PRESENTATION_CAST_MODE, source_name); model_.set_dialog_header(header_text); - for (CastDialogController::Observer& observer : observers_) + for (CastDialogController::Observer& observer : observers_) { observer.OnModelUpdated(model_); + } } UIMediaSink MediaRouterUI::ConvertToUISink(const MediaSinkWithCastModes& sink, @@ -688,8 +694,9 @@ ? UIMediaSinkState::CONNECTING : UIMediaSinkState::AVAILABLE; } - if (issue && IssueMatches(*issue, ui_sink)) + if (issue && IssueMatches(*issue, ui_sink)) { ui_sink.issue = issue; + } return ui_sink; }
diff --git a/chrome/browser/ui/media_router/media_router_ui_helper.cc b/chrome/browser/ui/media_router/media_router_ui_helper.cc index f3b066f..0daa173 100644 --- a/chrome/browser/ui/media_router/media_router_ui_helper.cc +++ b/chrome/browser/ui/media_router/media_router_ui_helper.cc
@@ -33,8 +33,9 @@ std::string GetExtensionName(const GURL& gurl, extensions::ExtensionRegistry* registry) { - if (gurl.is_empty() || !registry) + if (gurl.is_empty() || !registry) { return std::string(); + } const extensions::Extension* extension = registry->enabled_extensions().GetExtensionOrAppByURL(gurl); @@ -43,11 +44,13 @@ } std::string GetHostFromURL(const GURL& gurl) { - if (gurl.is_empty()) + if (gurl.is_empty()) { return std::string(); + } std::string host = gurl.host(); - if (base::StartsWith(host, "www.", base::CompareCase::INSENSITIVE_ASCII)) + if (base::StartsWith(host, "www.", base::CompareCase::INSENSITIVE_ASCII)) { host = host.substr(4); + } return host; }
diff --git a/chrome/browser/ui/media_router/media_router_ui_service.cc b/chrome/browser/ui/media_router/media_router_ui_service.cc index 71a5b7bc..3955f08 100644 --- a/chrome/browser/ui/media_router/media_router_ui_service.cc +++ b/chrome/browser/ui/media_router/media_router_ui_service.cc
@@ -73,8 +73,9 @@ } void MediaRouterUIService::DisableService() { - for (auto& observer : observers_) + for (auto& observer : observers_) { observer.OnServiceDisabled(); + } action_controller_.reset(); }
diff --git a/chrome/browser/ui/media_router/media_router_ui_service_factory_unittest.cc b/chrome/browser/ui/media_router/media_router_ui_service_factory_unittest.cc index cb59a662..4e0c259 100644 --- a/chrome/browser/ui/media_router/media_router_ui_service_factory_unittest.cc +++ b/chrome/browser/ui/media_router/media_router_ui_service_factory_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/media_router/media_router_ui_service_factory.h" + #include <memory> #include "base/functional/bind.h" @@ -10,7 +12,6 @@ #include "chrome/browser/media/router/media_router_feature.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/media_router/media_router_ui_service.h" -#include "chrome/browser/ui/media_router/media_router_ui_service_factory.h" #include "chrome/browser/ui/toolbar/toolbar_actions_model.h" #include "chrome/browser/ui/toolbar/toolbar_actions_model_factory.h" #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/ui/media_router/media_router_ui_unittest.cc b/chrome/browser/ui/media_router/media_router_ui_unittest.cc index 57448d4b..17bff685 100644 --- a/chrome/browser/ui/media_router/media_router_ui_unittest.cc +++ b/chrome/browser/ui/media_router/media_router_ui_unittest.cc
@@ -71,8 +71,9 @@ } ~MockControllerObserver() override { - if (controller_) + if (controller_) { controller_->RemoveObserver(this); + } } MOCK_METHOD(void, OnModelUpdated, (const CastDialogModel& model), (override)); @@ -191,8 +192,9 @@ web_contents(), _, base::Seconds(60))) .WillOnce(SaveArgWithMove<4>(&callback)); MediaSink sink{CreateCastSink(kSinkId, kSinkName)}; - for (MediaSinksObserver* sinks_observer : media_sinks_observers_) + for (MediaSinksObserver* sinks_observer : media_sinks_observers_) { sinks_observer->OnSinksUpdated({sink}, std::vector<url::Origin>()); + } ui_->StartCasting(kSinkId, MediaCastMode::TAB_MIRROR); Mock::VerifyAndClearExpectations(mock_router_); @@ -220,8 +222,9 @@ *mock_router_, CreateRouteInternal(_, _, _, _, _, base::Seconds(timeout_seconds))) .WillOnce(SaveArgWithMove<4>(&callback)); - for (MediaSinksObserver* sinks_observer : media_sinks_observers_) + for (MediaSinksObserver* sinks_observer : media_sinks_observers_) { sinks_observer->OnSinksUpdated({sink}, std::vector<url::Origin>()); + } ui_->StartCasting(kSinkId, cast_mode); Mock::VerifyAndClearExpectations(mock_router_); @@ -402,8 +405,9 @@ NiceMock<MockControllerObserver> observer(ui_.get()); MediaSink sink{CreateDialSink(kSinkId, kSinkName)}; - for (MediaSinksObserver* sinks_observer : media_sinks_observers_) + for (MediaSinksObserver* sinks_observer : media_sinks_observers_) { sinks_observer->OnSinksUpdated({sink}, std::vector<url::Origin>()); + } // When a request to Cast to a sink is made, its state should become // CONNECTING. @@ -429,8 +433,9 @@ MediaSink sink{CreateDialSink(kSinkId, kSinkName)}; MediaRoute route(kRouteId, MediaSource(kSourceId), kSinkId, "", true); - for (MediaSinksObserver* sinks_observer : media_sinks_observers_) + for (MediaSinksObserver* sinks_observer : media_sinks_observers_) { sinks_observer->OnSinksUpdated({sink}, std::vector<url::Origin>()); + } NotifyUiOnRoutesUpdated({route}); // When a request to stop casting to a sink is made, its state should become @@ -548,8 +553,9 @@ MockControllerObserver observer(ui_.get()); MediaSink sink{CreateCastSink(kSinkId, kSinkName)}; ui_->OnSinksUpdated({{sink, {MediaCastMode::DESKTOP_MIRROR}}}); - for (MediaSinksObserver* sinks_observer : media_sinks_observers_) + for (MediaSinksObserver* sinks_observer : media_sinks_observers_) { sinks_observer->OnSinksUpdated({sink}, std::vector<url::Origin>()); + } EXPECT_CALL(observer, OnModelUpdated(_)) .WillOnce(WithArg<0>([&](const CastDialogModel& model) {
diff --git a/chrome/browser/ui/media_router/presentation_receiver_window_controller.cc b/chrome/browser/ui/media_router/presentation_receiver_window_controller.cc index 58506f1..0d2a68e 100644 --- a/chrome/browser/ui/media_router/presentation_receiver_window_controller.cc +++ b/chrome/browser/ui/media_router/presentation_receiver_window_controller.cc
@@ -143,15 +143,17 @@ void PresentationReceiverWindowController::DidStartNavigation( content::NavigationHandle* handle) { - if (!navigation_policy_.AllowNavigation(handle)) + if (!navigation_policy_.AllowNavigation(handle)) { Terminate(); + } } void PresentationReceiverWindowController::TitleWasSet( content::NavigationEntry* entry) { window_->UpdateWindowTitle(); - if (entry) + if (entry) { title_change_callback_.Run(base::UTF16ToUTF8(entry->GetTitle())); + } } void PresentationReceiverWindowController::NavigationStateChanged(
diff --git a/chrome/browser/ui/media_router/presentation_receiver_window_controller_browsertest.cc b/chrome/browser/ui/media_router/presentation_receiver_window_controller_browsertest.cc index 4512e378..e941382c 100644 --- a/chrome/browser/ui/media_router/presentation_receiver_window_controller_browsertest.cc +++ b/chrome/browser/ui/media_router/presentation_receiver_window_controller_browsertest.cc
@@ -56,14 +56,16 @@ base::FilePath GetResourceFile(base::FilePath::StringPieceType relative_path) { base::FilePath base_dir; - if (!base::PathService::Get(chrome::DIR_TEST_DATA, &base_dir)) + if (!base::PathService::Get(chrome::DIR_TEST_DATA, &base_dir)) { return base::FilePath(); + } base::FilePath full_path = base_dir.Append(kResourcePath).Append(relative_path); { base::ScopedAllowBlockingForTesting scoped_allow_blocking; - if (!PathExists(full_path)) + if (!PathExists(full_path)) { return base::FilePath(); + } } return full_path; }
diff --git a/chrome/browser/ui/media_router/query_result_manager.cc b/chrome/browser/ui/media_router/query_result_manager.cc index e66aa5c5..1821599 100644 --- a/chrome/browser/ui/media_router/query_result_manager.cc +++ b/chrome/browser/ui/media_router/query_result_manager.cc
@@ -40,8 +40,9 @@ // MediaSinksObserver: void OnSinksReceived(const std::vector<MediaSink>& result) override { latest_sink_ids_.clear(); - for (const MediaSink& sink : result) + for (const MediaSink& sink : result) { latest_sink_ids_.push_back(sink.id()); + } result_manager_->SetSinksCompatibleWithSource(cast_mode_, source_, result); result_manager_->NotifyOnResultsUpdated(); @@ -136,8 +137,9 @@ CastModeSet QueryResultManager::GetSupportedCastModes() const { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); CastModeSet modes; - for (const auto& cast_mode_pair : cast_mode_sources_) + for (const auto& cast_mode_pair : cast_mode_sources_) { modes.insert(cast_mode_pair.first); + } return modes; } @@ -147,8 +149,9 @@ MediaSink::Id sink_id) const { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); auto sink_entry = sinks_with_sources_.find(sink_id); - if (sink_entry == sinks_with_sources_.end()) + if (sink_entry == sinks_with_sources_.end()) { return nullptr; + } return GetHighestPrioritySourceForCastModeAndSink(cast_mode, sink_entry->second); } @@ -170,8 +173,9 @@ sinks.push_back(sink_with_cast_modes); } for (const auto& sink : all_sinks_) { - if (!base::Contains(sinks_with_sources_, sink.id())) + if (!base::Contains(sinks_with_sources_, sink.id())) { sinks.push_back(MediaSinkWithCastModes(sink)); + } } return sinks; @@ -181,8 +185,9 @@ MediaCastMode cast_mode, const std::vector<MediaSource>& new_sources) { const auto& cast_mode_it = cast_mode_sources_.find(cast_mode); - if (cast_mode_it == cast_mode_sources_.end()) + if (cast_mode_it == cast_mode_sources_.end()) { return; + } for (const MediaSource& source : cast_mode_it->second) { if (!base::Contains(new_sources, source)) { @@ -211,8 +216,9 @@ const MediaSource& source, const std::vector<MediaSink>& new_sinks) { std::unordered_set<MediaSink::Id> new_sink_ids; - for (const MediaSink& sink : new_sinks) + for (const MediaSink& sink : new_sinks) { new_sink_ids.insert(sink.id()); + } // (1) Iterate through current sink set, remove cast mode from those that // do not appear in latest result. @@ -220,8 +226,9 @@ /* no-op */) { const MediaSink::Id& sink_id = it->first; CastModesWithMediaSources& sources_for_sink = it->second; - if (!base::Contains(new_sink_ids, sink_id)) + if (!base::Contains(new_sink_ids, sink_id)) { sources_for_sink.RemoveSource(cast_mode, source); + } if (sources_for_sink.IsEmpty()) { sinks_with_sources_.erase(it++); } else { @@ -252,12 +259,14 @@ MediaCastMode cast_mode, const CastModesWithMediaSources& sources_for_sink) const { const auto& cast_mode_it = cast_mode_sources_.find(cast_mode); - if (cast_mode_it == cast_mode_sources_.end()) + if (cast_mode_it == cast_mode_sources_.end()) { return nullptr; + } for (const MediaSource& source : cast_mode_it->second) { - if (sources_for_sink.HasSource(cast_mode, source)) + if (sources_for_sink.HasSource(cast_mode, source)) { return std::make_unique<MediaSource>(source.id()); + } } return nullptr; } @@ -277,8 +286,9 @@ void QueryResultManager::NotifyOnResultsUpdated() { std::vector<MediaSinkWithCastModes> sinks = GetSinksWithCastModes(); - for (MediaSinkWithCastModesObserver& observer : observers_) + for (MediaSinkWithCastModesObserver& observer : observers_) { observer.OnSinksUpdated(sinks); + } } } // namespace media_router
diff --git a/chrome/browser/ui/media_router/query_result_manager_unittest.cc b/chrome/browser/ui/media_router/query_result_manager_unittest.cc index 7d0b5e1..deb678f6 100644 --- a/chrome/browser/ui/media_router/query_result_manager_unittest.cc +++ b/chrome/browser/ui/media_router/query_result_manager_unittest.cc
@@ -82,12 +82,14 @@ // Requires that the elements of |expected| are unique. MATCHER_P(VectorSetEquals, expected, "") { - if (expected.size() != arg.size()) + if (expected.size() != arg.size()) { return false; + } for (size_t i = 0; i < expected.size(); ++i) { - if (!base::Contains(arg, expected[i])) + if (!base::Contains(arg, expected[i])) { return false; + } } return true; }
diff --git a/chrome/browser/ui/monogram_utils.cc b/chrome/browser/ui/monogram_utils.cc index b0360d7..f4d7b6f9 100644 --- a/chrome/browser/ui/monogram_utils.cc +++ b/chrome/browser/ui/monogram_utils.cc
@@ -34,13 +34,15 @@ SkColor monogram_color, int size, int offset) { - if (monogram.empty()) + if (monogram.empty()) { return; + } const double kDefaultFontSizeRatio = 0.5; int font_size = static_cast<int>(size * kDefaultFontSizeRatio); - if (font_size <= 0) + if (font_size <= 0) { return; + } gfx::Font::Weight font_weight = gfx::Font::Weight::NORMAL;
diff --git a/chrome/browser/ui/network_profile_bubble.cc b/chrome/browser/ui/network_profile_bubble.cc index 005500e..344b784 100644 --- a/chrome/browser/ui/network_profile_bubble.cc +++ b/chrome/browser/ui/network_profile_bubble.cc
@@ -77,8 +77,9 @@ // static bool NetworkProfileBubble::ShouldCheckNetworkProfile(Profile* profile) { PrefService* prefs = profile->GetPrefs(); - if (prefs->GetInteger(prefs::kNetworkProfileWarningsLeft)) + if (prefs->GetInteger(prefs::kNetworkProfileWarningsLeft)) { return !notification_shown_; + } int64_t last_check = prefs->GetInt64(prefs::kNetworkProfileLastWarningTime); base::TimeDelta time_since_last_check = base::Time::Now() - base::Time::FromTimeT(last_check); @@ -130,8 +131,9 @@ if (base::CreateTemporaryFileInDir(profile_folder, &temp_file) && base::WriteFile(temp_file, ".")) { base::FilePath normalized_temp_file; - if (!base::NormalizeFilePath(temp_file, &normalized_temp_file)) + if (!base::NormalizeFilePath(temp_file, &normalized_temp_file)) { profile_on_network = true; + } } else { RecordUmaEvent(METRIC_CHECK_IO_FAILED); } @@ -174,8 +176,9 @@ void NetworkProfileBubble::NotifyNetworkProfileDetected() { Browser* browser = chrome::FindLastActive(); - if (browser) + if (browser) { ShowNotification(browser); - else + } else { BrowserList::AddObserver(new NetworkProfileBubbleBrowserListObserver()); + } }
diff --git a/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.cc b/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.cc index eecd3c5aa..52f90fe 100644 --- a/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.cc +++ b/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.cc
@@ -77,8 +77,9 @@ } // Tell the history system to remove any saved search term for the search. - if (history_service) + if (history_service) { history_service->DeleteKeywordSearchTermForURL(original_url_); + } // Pretend the user typed this URL, so that navigating to it will be the // default action when it's typed again in the future. @@ -104,8 +105,9 @@ match_(std::move(match)), destination_url_(destination_url), original_url_(original_url) { - if (match_) + if (match_) { DCHECK_EQ(destination_url_, match_->destination_url); + } DCHECK(destination_url_.is_valid()); DCHECK(original_url_.is_valid());
diff --git a/chrome/browser/ui/omnibox/chrome_omnibox_client.cc b/chrome/browser/ui/omnibox/chrome_omnibox_client.cc index 6841169..9d99ac0 100644 --- a/chrome/browser/ui/omnibox/chrome_omnibox_client.cc +++ b/chrome/browser/ui/omnibox/chrome_omnibox_client.cc
@@ -234,8 +234,9 @@ } gfx::Image ChromeOmniboxClient::GetSizedIcon(const gfx::Image& icon) const { - if (icon.IsEmpty()) + if (icon.IsEmpty()) { return icon; + } const int icon_size = GetLayoutConstant(LOCATION_BAR_ICON_SIZE); // In touch mode, icons are 20x20. FaviconCache and ExtensionIconManager both @@ -287,8 +288,9 @@ const TemplateURL* template_url, const AutocompleteMatch& match, WindowOpenDisposition disposition) { - if (template_url->type() != TemplateURL::OMNIBOX_API_EXTENSION) + if (template_url->type() != TemplateURL::OMNIBOX_API_EXTENSION) { return false; + } // Strip the keyword + leading space off the input, but don't exceed // fill_into_edit. An obvious case is that the user may not have entered @@ -373,8 +375,9 @@ FaviconFetchedCallback on_favicon_fetched) { const TemplateURL* const default_provider = GetTemplateURLService()->GetDefaultSearchProvider(); - if (!default_provider) + if (!default_provider) { return gfx::Image(); + } return favicon_cache_.GetFaviconForIconUrl(default_provider->favicon_url(), std::move(on_favicon_fetched)); @@ -383,8 +386,9 @@ gfx::Image ChromeOmniboxClient::GetFaviconForKeywordSearchProvider( const TemplateURL* template_url, FaviconFetchedCallback on_favicon_fetched) { - if (!template_url) + if (!template_url) { return gfx::Image(); + } return favicon_cache_.GetFaviconForIconUrl(template_url->favicon_url(), std::move(on_favicon_fetched)); @@ -417,12 +421,14 @@ // It's possible that there is no current page, for instance if the tab // has been closed or on return from a sleep state. // (http://crbug.com/105689) - if (!CurrentPageExists()) + if (!CurrentPageExists()) { break; + } // Ask for prerendering if the destination URL is different than the // current URL. - if (current_match.destination_url != GetURL()) + if (current_match.destination_url != GetURL()) { DoPrerender(current_match); + } break; case AutocompleteActionPredictor::ACTION_PRECONNECT: DoPreconnect(current_match); @@ -581,8 +587,9 @@ content::WebContents* web_contents = location_bar_->GetWebContents(); // Don't prerender when DevTools is open in this tab. - if (content::DevToolsAgentHost::IsDebuggerAttached(web_contents)) + if (content::DevToolsAgentHost::IsDebuggerAttached(web_contents)) { return; + } // TODO(crbug.com/40208255): Refactor relevant code to reuse common // code, and ensure metrics are correctly recorded. @@ -594,8 +601,9 @@ } void ChromeOmniboxClient::DoPreconnect(const AutocompleteMatch& match) { - if (match.destination_url.SchemeIs(extensions::kExtensionScheme)) + if (match.destination_url.SchemeIs(extensions::kExtensionScheme)) { return; + } auto* loading_predictor = predictors::LoadingPredictorFactory::GetForProfile(profile_); @@ -623,8 +631,9 @@ const AutocompleteMatch& match) { auto shortcuts_backend = ShortcutsBackendFactory::GetForProfile(profile); // Can be null in incognito. - if (!shortcuts_backend) + if (!shortcuts_backend) { return; + } shortcuts_backend->AddOrUpdateShortcut(text, match); }
diff --git a/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc b/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc index 785a62c..d561349 100644 --- a/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc +++ b/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc
@@ -65,8 +65,9 @@ bool OnlyChangeIsFromHTTPToHTTPS(const GURL& origin, const GURL& destination) { // Exit early if possible. if (!origin.SchemeIs(url::kHttpScheme) || - !destination.SchemeIs(url::kHttpsScheme)) + !destination.SchemeIs(url::kHttpsScheme)) { return false; + } GURL::Replacements replace_scheme; replace_scheme.SetSchemeStr(url::kHttpsScheme); @@ -79,8 +80,9 @@ network::mojom::URLLoaderFactory* GetURLLoaderFactory( network::mojom::URLLoaderFactory* loader_factory, Profile* profile) { - if (loader_factory) + if (loader_factory) { return loader_factory; + } return profile->GetDefaultStoragePartition() ->GetURLLoaderFactoryForBrowserProcess() .get(); @@ -208,8 +210,9 @@ void OnURLLoadComplete(std::unique_ptr<std::string> body) { int response_code = -1; - if (loader_->ResponseInfo() && loader_->ResponseInfo()->headers) + if (loader_->ResponseInfo() && loader_->ResponseInfo()->headers) { response_code = loader_->ResponseInfo()->headers->response_code(); + } // We may see ERR_INSUFFICIENT_RESOURCES here even if everything is workable // if the server includes a body in response to a HEAD, as a size limit was // set while fetching. @@ -260,8 +263,9 @@ } ChromeOmniboxNavigationObserver::~ChromeOmniboxNavigationObserver() { - if (!web_contents()) + if (!web_contents()) { return; + } if (fetch_state_ == AlternativeFetchState::kFetchSucceeded) { std::move(show_infobar_).Run(this); } @@ -269,8 +273,9 @@ void ChromeOmniboxNavigationObserver::DidFinishNavigation( content::NavigationHandle* navigation_handle) { - if (navigation_handle->GetNavigationId() != navigation_id_) + if (navigation_handle->GetNavigationId() != navigation_id_) { return; + } // This is the navigation we've started ourselves in the primary main frame // of the WebContents. @@ -307,8 +312,9 @@ // If the omnibox navigation was to a URL (and hence did not involve a // TemplateURL / search at all) or the invoked search engine has been // deleted or otherwise modified, doing nothing is the right thing. - if (template_url == nullptr) + if (template_url == nullptr) { return; + } // If there's any hint that we should keep this search engine around, don't // mess with it. if (template_url_service->ShowInDefaultList(template_url) || @@ -349,8 +355,9 @@ "navigation", navigation, "match", match, "alternative_nav_match", alternative_nav_match); - if (!navigation) + if (!navigation) { return; + } // The observer will be kept alive until both navigation and the loading // fetcher finish. @@ -369,8 +376,9 @@ const AutocompleteMatch& alternative_nav_match, network::mojom::URLLoaderFactory* loader_factory, ShowInfobarCallback show_infobar) { - if (!navigation) + if (!navigation) { return; + } // The observer will be kept alive until both navigation and the loading // fetcher finish.
diff --git a/chrome/browser/ui/omnibox/clipboard_utils.cc b/chrome/browser/ui/omnibox/clipboard_utils.cc index 814f439..a0d2a8b 100644 --- a/chrome/browser/ui/omnibox/clipboard_utils.cc +++ b/chrome/browser/ui/omnibox/clipboard_utils.cc
@@ -40,8 +40,9 @@ clipboard->ReadBookmark(&data_dst, nullptr, &url_str); // pass resulting url string through GURL to normalize GURL url(url_str); - if (url.is_valid()) + if (url.is_valid()) { return OmniboxView::StripJavascriptSchemas(base::UTF8ToUTF16(url.spec())); + } } return std::u16string();
diff --git a/chrome/browser/ui/omnibox/clipboard_utils.h b/chrome/browser/ui/omnibox/clipboard_utils.h index 46e1536..d79fda0 100644 --- a/chrome/browser/ui/omnibox/clipboard_utils.h +++ b/chrome/browser/ui/omnibox/clipboard_utils.h
@@ -9,7 +9,6 @@ #include <string> - // Truncates the clipboard text returned in order to improve performance and // prevent unresponsiveness. For reference, a book is about ~500k characters and // data URLs served by google images are usually 30k characters or less.
diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc index 69fbb9a..a735a1f1 100644 --- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc +++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
@@ -224,8 +224,9 @@ } void SendKeySequence(const ui::KeyboardCode* keys) { - for (; *keys != ui::VKEY_UNKNOWN; ++keys) + for (; *keys != ui::VKEY_UNKNOWN; ++keys) { ASSERT_NO_FATAL_FAILURE(SendKey(*keys, 0)); + } } void ExpectBrowserClosed(Browser* browser, @@ -256,8 +257,9 @@ void WaitForTabOpenOrClose(int expected_tab_count) { int tab_count = browser()->tab_strip_model()->count(); - if (tab_count == expected_tab_count) + if (tab_count == expected_tab_count) { return; + } while (!HasFailure() && browser()->tab_strip_model()->count() != expected_tab_count) { @@ -275,8 +277,9 @@ omnibox_view->controller()->autocomplete_controller(); ASSERT_TRUE(controller); - if (controller->done()) + if (controller->done()) { return; + } ui_test_utils::WaitForAutocompleteDone(browser()); ASSERT_TRUE(controller->done()); @@ -307,8 +310,9 @@ TemplateURLService::TemplateURLVector urls = model->GetTemplateURLs(); for (TemplateURLService::TemplateURLVector::const_iterator i = urls.begin(); i != urls.end(); ++i) { - if ((*i)->prepopulate_id() != 0) + if ((*i)->prepopulate_id() != 0) { model->Remove(*i); + } } } @@ -336,8 +340,9 @@ history_service->AddPageWithDetails(url, base::UTF8ToUTF16(entry.title), entry.visit_count, entry.typed_count, time, false, history::SOURCE_BROWSED); - if (entry.starred) + if (entry.starred) { bookmarks::AddIfNotBookmarked(bookmark_model, url, std::u16string()); + } // Running the task scheduler until idle finishes AddPageWithDetails. content::RunAllTasksUntilIdle(); @@ -355,8 +360,9 @@ } void SetupHostResolver() { - for (size_t i = 0; i < std::size(kBlockedHostnames); ++i) + for (size_t i = 0; i < std::size(kBlockedHostnames); ++i) { host_resolver()->AddSimulatedFailure(kBlockedHostnames[i]); + } } void SetupComponents() { @@ -598,8 +604,9 @@ omnibox_view->controller()->autocomplete_controller()->result().size(); while (omnibox_view->model()->GetPopupSelection().line < size - 1) { ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_DOWN, 0)); - if (omnibox_view->GetText() == u"abc") + if (omnibox_view->GetText() == u"abc") { break; + } } ASSERT_EQ(u"abc", omnibox_view->GetText()); @@ -1392,8 +1399,9 @@ size_t GetSelectionSize(OmniboxView* omnibox_view) { size_t start, end; omnibox_view->GetSelectionBounds(&start, &end); - if (end >= start) + if (end >= start) { return end - start; + } return start - end; } @@ -1463,341 +1471,332 @@ EXPECT_EQ(1u, GetSelectionSize(omnibox_view)); } - base::Value CreateSiteSearchPolicyValue(bool featured) { - base::Value::List policy_value; - policy_value.Append( - base::Value::Dict() - .Set(policy::SiteSearchPolicyHandler::kShortcut, - kSiteSearchPolicyKeyword) - .Set(policy::SiteSearchPolicyHandler::kName, kSiteSearchPolicyName) - .Set(policy::SiteSearchPolicyHandler::kUrl, kSiteSearchPolicyURL) - .Set(policy::SiteSearchPolicyHandler::kFeatured, featured)); - return base::Value(std::move(policy_value)); - } +base::Value CreateSiteSearchPolicyValue(bool featured) { + base::Value::List policy_value; + policy_value.Append( + base::Value::Dict() + .Set(policy::SiteSearchPolicyHandler::kShortcut, + kSiteSearchPolicyKeyword) + .Set(policy::SiteSearchPolicyHandler::kName, kSiteSearchPolicyName) + .Set(policy::SiteSearchPolicyHandler::kUrl, kSiteSearchPolicyURL) + .Set(policy::SiteSearchPolicyHandler::kFeatured, featured)); + return base::Value(std::move(policy_value)); +} // Verifies that keyword search works when `SiteSearchSettings` policy is set. - IN_PROC_BROWSER_TEST_F(OmniboxViewTest, NonFeatured) { - policy::PolicyMap policies; - policies.Set(policy::key::kSiteSearchSettings, - policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, - CreateSiteSearchPolicyValue(/*featured=*/false), nullptr); - policy_provider()->UpdateChromePolicy(policies); +IN_PROC_BROWSER_TEST_F(OmniboxViewTest, NonFeatured) { + policy::PolicyMap policies; + policies.Set(policy::key::kSiteSearchSettings, policy::POLICY_LEVEL_MANDATORY, + policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD, + CreateSiteSearchPolicyValue(/*featured=*/false), nullptr); + policy_provider()->UpdateChromePolicy(policies); - OmniboxView* omnibox_view = nullptr; - ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view)); + OmniboxView* omnibox_view = nullptr; + ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view)); - // Check that new entries have been added to TemplateURLService. - const TemplateURL* turl = - TemplateURLServiceFactory::GetForProfile(browser()->profile()) - ->GetTemplateURLForKeyword(kSiteSearchPolicyKeyword); - ASSERT_TRUE(turl); - EXPECT_EQ(turl->policy_origin(), - TemplateURLData::PolicyOrigin::kSiteSearch); - EXPECT_EQ(turl->short_name(), kSiteSearchPolicyName); - EXPECT_EQ(turl->url(), kSiteSearchPolicyURL); - EXPECT_FALSE(turl->featured_by_policy()); + // Check that new entries have been added to TemplateURLService. + const TemplateURL* turl = + TemplateURLServiceFactory::GetForProfile(browser()->profile()) + ->GetTemplateURLForKeyword(kSiteSearchPolicyKeyword); + ASSERT_TRUE(turl); + EXPECT_EQ(turl->policy_origin(), TemplateURLData::PolicyOrigin::kSiteSearch); + EXPECT_EQ(turl->short_name(), kSiteSearchPolicyName); + EXPECT_EQ(turl->url(), kSiteSearchPolicyURL); + EXPECT_FALSE(turl->featured_by_policy()); - // Trigger keyword hint mode. - ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSiteSearchPolicyKeywordKeys)); - ASSERT_TRUE(omnibox_view->model()->is_keyword_hint()); - ASSERT_EQ(kSiteSearchPolicyKeyword, omnibox_view->model()->keyword()); + // Trigger keyword hint mode. + ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSiteSearchPolicyKeywordKeys)); + ASSERT_TRUE(omnibox_view->model()->is_keyword_hint()); + ASSERT_EQ(kSiteSearchPolicyKeyword, omnibox_view->model()->keyword()); - // Trigger keyword mode. - ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, 0)); - ASSERT_FALSE(omnibox_view->model()->is_keyword_hint()); - ASSERT_EQ(kSiteSearchPolicyKeyword, omnibox_view->model()->keyword()); + // Trigger keyword mode. + ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, 0)); + ASSERT_FALSE(omnibox_view->model()->is_keyword_hint()); + ASSERT_EQ(kSiteSearchPolicyKeyword, omnibox_view->model()->keyword()); - // Input something as search text and perform a search. - ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchTextKeys)); - ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone()); - ASSERT_TRUE(omnibox_view->model()->PopupIsOpen()); + // Input something as search text and perform a search. + ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchTextKeys)); + ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone()); + ASSERT_TRUE(omnibox_view->model()->PopupIsOpen()); - EXPECT_EQ(kSiteSearchPolicyTextURL, omnibox_view->controller() - ->autocomplete_controller() - ->result() - .default_match() - ->destination_url.spec()); - } + EXPECT_EQ(kSiteSearchPolicyTextURL, omnibox_view->controller() + ->autocomplete_controller() + ->result() + .default_match() + ->destination_url.spec()); +} // Verifies that keyword search works when `SiteSearchSettings` policy defines // a featured search engine. - IN_PROC_BROWSER_TEST_F(OmniboxViewTest, Featured) { - policy::PolicyMap policies; - policies.Set(policy::key::kSiteSearchSettings, - policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, - CreateSiteSearchPolicyValue(/*featured=*/true), nullptr); - policy_provider()->UpdateChromePolicy(policies); +IN_PROC_BROWSER_TEST_F(OmniboxViewTest, Featured) { + policy::PolicyMap policies; + policies.Set(policy::key::kSiteSearchSettings, policy::POLICY_LEVEL_MANDATORY, + policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD, + CreateSiteSearchPolicyValue(/*featured=*/true), nullptr); + policy_provider()->UpdateChromePolicy(policies); - OmniboxView* omnibox_view = nullptr; - ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view)); + OmniboxView* omnibox_view = nullptr; + ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view)); - // Check that new entries have been added to TemplateURLService. - const TemplateURL* turl = - TemplateURLServiceFactory::GetForProfile(browser()->profile()) - ->GetTemplateURLForKeyword(kSiteSearchPolicyKeywordWithAtPrefix); - ASSERT_TRUE(turl); - EXPECT_EQ(turl->policy_origin(), - TemplateURLData::PolicyOrigin::kSiteSearch); - EXPECT_EQ(turl->short_name(), kSiteSearchPolicyName); - EXPECT_EQ(turl->url(), kSiteSearchPolicyURL); - EXPECT_TRUE(turl->featured_by_policy()); + // Check that new entries have been added to TemplateURLService. + const TemplateURL* turl = + TemplateURLServiceFactory::GetForProfile(browser()->profile()) + ->GetTemplateURLForKeyword(kSiteSearchPolicyKeywordWithAtPrefix); + ASSERT_TRUE(turl); + EXPECT_EQ(turl->policy_origin(), TemplateURLData::PolicyOrigin::kSiteSearch); + EXPECT_EQ(turl->short_name(), kSiteSearchPolicyName); + EXPECT_EQ(turl->url(), kSiteSearchPolicyURL); + EXPECT_TRUE(turl->featured_by_policy()); - // Trigger keyword hint mode. - ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_2, ui::EF_SHIFT_DOWN)); - ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSiteSearchPolicyKeywordKeys)); - ASSERT_TRUE(omnibox_view->model()->is_keyword_hint()); - ASSERT_EQ(kSiteSearchPolicyKeywordWithAtPrefix, - omnibox_view->model()->keyword()); + // Trigger keyword hint mode. + ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_2, ui::EF_SHIFT_DOWN)); + ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSiteSearchPolicyKeywordKeys)); + ASSERT_TRUE(omnibox_view->model()->is_keyword_hint()); + ASSERT_EQ(kSiteSearchPolicyKeywordWithAtPrefix, + omnibox_view->model()->keyword()); - // Trigger keyword mode. - ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, 0)); - ASSERT_FALSE(omnibox_view->model()->is_keyword_hint()); - ASSERT_EQ(kSiteSearchPolicyKeywordWithAtPrefix, - omnibox_view->model()->keyword()); + // Trigger keyword mode. + ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, 0)); + ASSERT_FALSE(omnibox_view->model()->is_keyword_hint()); + ASSERT_EQ(kSiteSearchPolicyKeywordWithAtPrefix, + omnibox_view->model()->keyword()); - // Input something as search text and perform a search. - ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchTextKeys)); - ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone()); - ASSERT_TRUE(omnibox_view->model()->PopupIsOpen()); + // Input something as search text and perform a search. + ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchTextKeys)); + ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone()); + ASSERT_TRUE(omnibox_view->model()->PopupIsOpen()); - EXPECT_EQ(kSiteSearchPolicyTextURL, omnibox_view->controller() - ->autocomplete_controller() - ->result() - .default_match() - ->destination_url.spec()); - } + EXPECT_EQ(kSiteSearchPolicyTextURL, omnibox_view->controller() + ->autocomplete_controller() + ->result() + .default_match() + ->destination_url.spec()); +} // Verifies that featured search engine is shown with starter pack on "@" state // and that the underlying search works. - IN_PROC_BROWSER_TEST_F(OmniboxViewTest, FeaturedOnArrowDown) { - policy::PolicyMap policies; - policies.Set(policy::key::kSiteSearchSettings, - policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, - CreateSiteSearchPolicyValue(/*featured=*/true), nullptr); - policy_provider()->UpdateChromePolicy(policies); +IN_PROC_BROWSER_TEST_F(OmniboxViewTest, FeaturedOnArrowDown) { + policy::PolicyMap policies; + policies.Set(policy::key::kSiteSearchSettings, policy::POLICY_LEVEL_MANDATORY, + policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD, + CreateSiteSearchPolicyValue(/*featured=*/true), nullptr); + policy_provider()->UpdateChromePolicy(policies); - OmniboxView* omnibox_view = nullptr; - ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view)); + OmniboxView* omnibox_view = nullptr; + ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view)); - // Check that new entries have been added to TemplateURLService. - const TemplateURL* turl = - TemplateURLServiceFactory::GetForProfile(browser()->profile()) - ->GetTemplateURLForKeyword(kSiteSearchPolicyKeywordWithAtPrefix); - ASSERT_TRUE(turl); - EXPECT_EQ(turl->policy_origin(), - TemplateURLData::PolicyOrigin::kSiteSearch); - EXPECT_EQ(turl->short_name(), kSiteSearchPolicyName); - EXPECT_EQ(turl->url(), kSiteSearchPolicyURL); - EXPECT_TRUE(turl->featured_by_policy()); + // Check that new entries have been added to TemplateURLService. + const TemplateURL* turl = + TemplateURLServiceFactory::GetForProfile(browser()->profile()) + ->GetTemplateURLForKeyword(kSiteSearchPolicyKeywordWithAtPrefix); + ASSERT_TRUE(turl); + EXPECT_EQ(turl->policy_origin(), TemplateURLData::PolicyOrigin::kSiteSearch); + EXPECT_EQ(turl->short_name(), kSiteSearchPolicyName); + EXPECT_EQ(turl->url(), kSiteSearchPolicyURL); + EXPECT_TRUE(turl->featured_by_policy()); - // Trigger keyword mode. - ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_2, ui::EF_SHIFT_DOWN)); - ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_DOWN, /*modifiers=*/0)); - ASSERT_FALSE(omnibox_view->model()->is_keyword_hint()); - ASSERT_EQ(kSiteSearchPolicyKeywordWithAtPrefix, - omnibox_view->model()->keyword()); + // Trigger keyword mode. + ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_2, ui::EF_SHIFT_DOWN)); + ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_DOWN, /*modifiers=*/0)); + ASSERT_FALSE(omnibox_view->model()->is_keyword_hint()); + ASSERT_EQ(kSiteSearchPolicyKeywordWithAtPrefix, + omnibox_view->model()->keyword()); - // Input something as search text and perform a search. - ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchTextKeys)); - ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone()); - ASSERT_TRUE(omnibox_view->model()->PopupIsOpen()); + // Input something as search text and perform a search. + ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchTextKeys)); + ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone()); + ASSERT_TRUE(omnibox_view->model()->PopupIsOpen()); - EXPECT_EQ(kSiteSearchPolicyTextURL, omnibox_view->controller() - ->autocomplete_controller() - ->result() - .default_match() - ->destination_url.spec()); + EXPECT_EQ(kSiteSearchPolicyTextURL, omnibox_view->controller() + ->autocomplete_controller() + ->result() + .default_match() + ->destination_url.spec()); +} + +class SearchAggregatorPolicyOmniboxViewTest : public OmniboxViewTest { + public: + SearchAggregatorPolicyOmniboxViewTest() { + scoped_feature_list_.InitAndEnableFeature( + omnibox::kEnableSearchAggregatorPolicy); + } + ~SearchAggregatorPolicyOmniboxViewTest() override = default; + + base::Value CreateEnterpriseSearchAggregatorPolicyValue() { + base::Value::Dict policy_value; + policy_value = base::Value::Dict() + .Set(policy::SearchAggregatorPolicyHandler::kIconUrl, + kSearchAggregatorPolicyIconUrl) + .Set(policy::SearchAggregatorPolicyHandler::kShortcut, + kSearchAggregatorPolicyKeyword) + .Set(policy::SearchAggregatorPolicyHandler::kName, + kSearchAggregatorPolicyName) + .Set(policy::SearchAggregatorPolicyHandler::kSearchUrl, + kSearchAggregatorPolicySearchUrl) + .Set(policy::SearchAggregatorPolicyHandler::kSuggestUrl, + kSearchAggregatorPolicySuggestUrl); + return base::Value(std::move(policy_value)); } - class SearchAggregatorPolicyOmniboxViewTest : public OmniboxViewTest { - public: - SearchAggregatorPolicyOmniboxViewTest() { - scoped_feature_list_.InitAndEnableFeature( - omnibox::kEnableSearchAggregatorPolicy); - } - ~SearchAggregatorPolicyOmniboxViewTest() override = default; + private: + base::test::ScopedFeatureList scoped_feature_list_; +}; - base::Value CreateEnterpriseSearchAggregatorPolicyValue() { - base::Value::Dict policy_value; - policy_value = - base::Value::Dict() - .Set(policy::SearchAggregatorPolicyHandler::kIconUrl, - kSearchAggregatorPolicyIconUrl) - .Set(policy::SearchAggregatorPolicyHandler::kShortcut, - kSearchAggregatorPolicyKeyword) - .Set(policy::SearchAggregatorPolicyHandler::kName, - kSearchAggregatorPolicyName) - .Set(policy::SearchAggregatorPolicyHandler::kSearchUrl, - kSearchAggregatorPolicySearchUrl) - .Set(policy::SearchAggregatorPolicyHandler::kSuggestUrl, - kSearchAggregatorPolicySuggestUrl); - return base::Value(std::move(policy_value)); - } +// Verifies that keyword search works when +// `EnterpriseSearchAggregatorSettings` policy is set. +IN_PROC_BROWSER_TEST_F(SearchAggregatorPolicyOmniboxViewTest, NonFeatured) { + policy::PolicyMap policies; + policies.Set(policy::key::kEnterpriseSearchAggregatorSettings, + policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, + policy::POLICY_SOURCE_CLOUD, + CreateEnterpriseSearchAggregatorPolicyValue(), nullptr); + policy_provider()->UpdateChromePolicy(policies); - private: - base::test::ScopedFeatureList scoped_feature_list_; - }; + OmniboxView* omnibox_view = nullptr; + ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view)); - // Verifies that keyword search works when - // `EnterpriseSearchAggregatorSettings` policy is set. - IN_PROC_BROWSER_TEST_F(SearchAggregatorPolicyOmniboxViewTest, NonFeatured) { - policy::PolicyMap policies; - policies.Set(policy::key::kEnterpriseSearchAggregatorSettings, - policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, - CreateEnterpriseSearchAggregatorPolicyValue(), nullptr); - policy_provider()->UpdateChromePolicy(policies); + // Check that new entries have been added to TemplateURLService. + const TemplateURL* turl = + TemplateURLServiceFactory::GetForProfile(browser()->profile()) + ->GetTemplateURLForKeyword(kSearchAggregatorPolicyKeyword); + ASSERT_TRUE(turl); + EXPECT_EQ(turl->policy_origin(), + TemplateURLData::PolicyOrigin::kSearchAggregator); + EXPECT_EQ(turl->short_name(), kSearchAggregatorPolicyName); + EXPECT_EQ(turl->url(), kSearchAggregatorPolicySearchUrl); + EXPECT_EQ(turl->suggestions_url(), kSearchAggregatorPolicySuggestUrl); + EXPECT_EQ(turl->favicon_url(), kSearchAggregatorPolicyIconUrl); + EXPECT_FALSE(turl->enforced_by_policy()); + EXPECT_FALSE(turl->safe_for_autoreplace()); + EXPECT_FALSE(turl->featured_by_policy()); - OmniboxView* omnibox_view = nullptr; - ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view)); + // Trigger keyword hint mode. + ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchAggregatorPolicyKeywordKeys)); + ASSERT_TRUE(omnibox_view->model()->is_keyword_hint()); + ASSERT_EQ(kSearchAggregatorPolicyKeyword, omnibox_view->model()->keyword()); - // Check that new entries have been added to TemplateURLService. - const TemplateURL* turl = - TemplateURLServiceFactory::GetForProfile(browser()->profile()) - ->GetTemplateURLForKeyword(kSearchAggregatorPolicyKeyword); - ASSERT_TRUE(turl); - EXPECT_EQ(turl->policy_origin(), - TemplateURLData::PolicyOrigin::kSearchAggregator); - EXPECT_EQ(turl->short_name(), kSearchAggregatorPolicyName); - EXPECT_EQ(turl->url(), kSearchAggregatorPolicySearchUrl); - EXPECT_EQ(turl->suggestions_url(), kSearchAggregatorPolicySuggestUrl); - EXPECT_EQ(turl->favicon_url(), kSearchAggregatorPolicyIconUrl); - EXPECT_FALSE(turl->enforced_by_policy()); - EXPECT_FALSE(turl->safe_for_autoreplace()); - EXPECT_FALSE(turl->featured_by_policy()); + // Trigger keyword mode. + ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, 0)); + ASSERT_FALSE(omnibox_view->model()->is_keyword_hint()); + ASSERT_EQ(kSearchAggregatorPolicyKeyword, omnibox_view->model()->keyword()); - // Trigger keyword hint mode. - ASSERT_NO_FATAL_FAILURE( - SendKeySequence(kSearchAggregatorPolicyKeywordKeys)); - ASSERT_TRUE(omnibox_view->model()->is_keyword_hint()); - ASSERT_EQ(kSearchAggregatorPolicyKeyword, omnibox_view->model()->keyword()); + // Input something as search text and perform a search. + ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchTextKeys)); + ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone()); + ASSERT_TRUE(omnibox_view->model()->PopupIsOpen()); - // Trigger keyword mode. - ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, 0)); - ASSERT_FALSE(omnibox_view->model()->is_keyword_hint()); - ASSERT_EQ(kSearchAggregatorPolicyKeyword, omnibox_view->model()->keyword()); + EXPECT_EQ(kSearchAggregatorPolicyTextURL, omnibox_view->controller() + ->autocomplete_controller() + ->result() + .default_match() + ->destination_url.spec()); +} - // Input something as search text and perform a search. - ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchTextKeys)); - ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone()); - ASSERT_TRUE(omnibox_view->model()->PopupIsOpen()); +// Verifies that featured search engine is shown when +// `EnterpriseSearchAggregatorSettings` policy is set. +IN_PROC_BROWSER_TEST_F(SearchAggregatorPolicyOmniboxViewTest, Featured) { + policy::PolicyMap policies; + policies.Set(policy::key::kEnterpriseSearchAggregatorSettings, + policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, + policy::POLICY_SOURCE_CLOUD, + CreateEnterpriseSearchAggregatorPolicyValue(), nullptr); + policy_provider()->UpdateChromePolicy(policies); - EXPECT_EQ(kSearchAggregatorPolicyTextURL, omnibox_view->controller() - ->autocomplete_controller() - ->result() - .default_match() - ->destination_url.spec()); - } + OmniboxView* omnibox_view = nullptr; + ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view)); - // Verifies that featured search engine is shown when - // `EnterpriseSearchAggregatorSettings` policy is set. - IN_PROC_BROWSER_TEST_F(SearchAggregatorPolicyOmniboxViewTest, Featured) { - policy::PolicyMap policies; - policies.Set(policy::key::kEnterpriseSearchAggregatorSettings, - policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, - CreateEnterpriseSearchAggregatorPolicyValue(), nullptr); - policy_provider()->UpdateChromePolicy(policies); + // Check that new entries have been added to TemplateURLService with at + // prefix. + const TemplateURL* turl = + TemplateURLServiceFactory::GetForProfile(browser()->profile()) + ->GetTemplateURLForKeyword( + kSearchAggregatorPolicyKeywordWithAtPrefix); + ASSERT_TRUE(turl); + EXPECT_EQ(turl->policy_origin(), + TemplateURLData::PolicyOrigin::kSearchAggregator); + EXPECT_EQ(turl->short_name(), kSearchAggregatorPolicyName); + EXPECT_EQ(turl->url(), kSearchAggregatorPolicySearchUrl); + EXPECT_EQ(turl->suggestions_url(), kSearchAggregatorPolicySuggestUrl); + EXPECT_EQ(turl->favicon_url(), kSearchAggregatorPolicyIconUrl); + EXPECT_FALSE(turl->enforced_by_policy()); + EXPECT_FALSE(turl->safe_for_autoreplace()); + EXPECT_TRUE(turl->featured_by_policy()); - OmniboxView* omnibox_view = nullptr; - ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view)); + // Trigger keyword hint mode. + ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_2, ui::EF_SHIFT_DOWN)); + ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchAggregatorPolicyKeywordKeys)); + ASSERT_TRUE(omnibox_view->model()->is_keyword_hint()); + ASSERT_EQ(kSearchAggregatorPolicyKeywordWithAtPrefix, + omnibox_view->model()->keyword()); - // Check that new entries have been added to TemplateURLService with at - // prefix. - const TemplateURL* turl = - TemplateURLServiceFactory::GetForProfile(browser()->profile()) - ->GetTemplateURLForKeyword( - kSearchAggregatorPolicyKeywordWithAtPrefix); - ASSERT_TRUE(turl); - EXPECT_EQ(turl->policy_origin(), - TemplateURLData::PolicyOrigin::kSearchAggregator); - EXPECT_EQ(turl->short_name(), kSearchAggregatorPolicyName); - EXPECT_EQ(turl->url(), kSearchAggregatorPolicySearchUrl); - EXPECT_EQ(turl->suggestions_url(), kSearchAggregatorPolicySuggestUrl); - EXPECT_EQ(turl->favicon_url(), kSearchAggregatorPolicyIconUrl); - EXPECT_FALSE(turl->enforced_by_policy()); - EXPECT_FALSE(turl->safe_for_autoreplace()); - EXPECT_TRUE(turl->featured_by_policy()); + // Trigger keyword mode. + ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, 0)); + ASSERT_FALSE(omnibox_view->model()->is_keyword_hint()); + ASSERT_EQ(kSearchAggregatorPolicyKeywordWithAtPrefix, + omnibox_view->model()->keyword()); - // Trigger keyword hint mode. - ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_2, ui::EF_SHIFT_DOWN)); - ASSERT_NO_FATAL_FAILURE( - SendKeySequence(kSearchAggregatorPolicyKeywordKeys)); - ASSERT_TRUE(omnibox_view->model()->is_keyword_hint()); - ASSERT_EQ(kSearchAggregatorPolicyKeywordWithAtPrefix, - omnibox_view->model()->keyword()); + // Input something as search text and perform a search. + ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchTextKeys)); + ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone()); + ASSERT_TRUE(omnibox_view->model()->PopupIsOpen()); - // Trigger keyword mode. - ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, 0)); - ASSERT_FALSE(omnibox_view->model()->is_keyword_hint()); - ASSERT_EQ(kSearchAggregatorPolicyKeywordWithAtPrefix, - omnibox_view->model()->keyword()); + EXPECT_EQ(kSearchAggregatorPolicyTextURL, omnibox_view->controller() + ->autocomplete_controller() + ->result() + .default_match() + ->destination_url.spec()); +} - // Input something as search text and perform a search. - ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchTextKeys)); - ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone()); - ASSERT_TRUE(omnibox_view->model()->PopupIsOpen()); +// Verifies that featured search engine is shown with starter pack on "@" +// state and that the underlying search works when +// `EnterpriseSearchAggregatorSettings` policy is set. +IN_PROC_BROWSER_TEST_F(SearchAggregatorPolicyOmniboxViewTest, + FeaturedOnArrowDown) { + policy::PolicyMap policies; + policies.Set(policy::key::kEnterpriseSearchAggregatorSettings, + policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, + policy::POLICY_SOURCE_CLOUD, + CreateEnterpriseSearchAggregatorPolicyValue(), nullptr); + policy_provider()->UpdateChromePolicy(policies); - EXPECT_EQ(kSearchAggregatorPolicyTextURL, omnibox_view->controller() - ->autocomplete_controller() - ->result() - .default_match() - ->destination_url.spec()); - } + OmniboxView* omnibox_view = nullptr; + ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view)); - // Verifies that featured search engine is shown with starter pack on "@" - // state and that the underlying search works when - // `EnterpriseSearchAggregatorSettings` policy is set. - IN_PROC_BROWSER_TEST_F(SearchAggregatorPolicyOmniboxViewTest, - FeaturedOnArrowDown) { - policy::PolicyMap policies; - policies.Set(policy::key::kEnterpriseSearchAggregatorSettings, - policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, - CreateEnterpriseSearchAggregatorPolicyValue(), nullptr); - policy_provider()->UpdateChromePolicy(policies); + // Check that new entries have been added to TemplateURLService with at + // prefix. + const TemplateURL* turl = + TemplateURLServiceFactory::GetForProfile(browser()->profile()) + ->GetTemplateURLForKeyword( + kSearchAggregatorPolicyKeywordWithAtPrefix); + ASSERT_TRUE(turl); + EXPECT_EQ(turl->policy_origin(), + TemplateURLData::PolicyOrigin::kSearchAggregator); + EXPECT_EQ(turl->short_name(), kSearchAggregatorPolicyName); + EXPECT_EQ(turl->url(), kSearchAggregatorPolicySearchUrl); + EXPECT_EQ(turl->suggestions_url(), kSearchAggregatorPolicySuggestUrl); + EXPECT_EQ(turl->favicon_url(), kSearchAggregatorPolicyIconUrl); + EXPECT_FALSE(turl->enforced_by_policy()); + EXPECT_FALSE(turl->safe_for_autoreplace()); + EXPECT_TRUE(turl->featured_by_policy()); - OmniboxView* omnibox_view = nullptr; - ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view)); + // Trigger keyword mode. + ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_2, ui::EF_SHIFT_DOWN)); + ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, 0)); + ASSERT_FALSE(omnibox_view->model()->is_keyword_hint()); + ASSERT_EQ(kSearchAggregatorPolicyKeywordWithAtPrefix, + omnibox_view->model()->keyword()); - // Check that new entries have been added to TemplateURLService with at - // prefix. - const TemplateURL* turl = - TemplateURLServiceFactory::GetForProfile(browser()->profile()) - ->GetTemplateURLForKeyword( - kSearchAggregatorPolicyKeywordWithAtPrefix); - ASSERT_TRUE(turl); - EXPECT_EQ(turl->policy_origin(), - TemplateURLData::PolicyOrigin::kSearchAggregator); - EXPECT_EQ(turl->short_name(), kSearchAggregatorPolicyName); - EXPECT_EQ(turl->url(), kSearchAggregatorPolicySearchUrl); - EXPECT_EQ(turl->suggestions_url(), kSearchAggregatorPolicySuggestUrl); - EXPECT_EQ(turl->favicon_url(), kSearchAggregatorPolicyIconUrl); - EXPECT_FALSE(turl->enforced_by_policy()); - EXPECT_FALSE(turl->safe_for_autoreplace()); - EXPECT_TRUE(turl->featured_by_policy()); + // Input something as search text and perform a search. + ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchTextKeys)); + ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone()); + ASSERT_TRUE(omnibox_view->model()->PopupIsOpen()); - // Trigger keyword mode. - ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_2, ui::EF_SHIFT_DOWN)); - ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, 0)); - ASSERT_FALSE(omnibox_view->model()->is_keyword_hint()); - ASSERT_EQ(kSearchAggregatorPolicyKeywordWithAtPrefix, - omnibox_view->model()->keyword()); - - // Input something as search text and perform a search. - ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchTextKeys)); - ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone()); - ASSERT_TRUE(omnibox_view->model()->PopupIsOpen()); - - EXPECT_EQ(kSearchAggregatorPolicyTextURL, omnibox_view->controller() - ->autocomplete_controller() - ->result() - .default_match() - ->destination_url.spec()); - } + EXPECT_EQ(kSearchAggregatorPolicyTextURL, omnibox_view->controller() + ->autocomplete_controller() + ->result() + .default_match() + ->destination_url.spec()); +} // Tests for IDN hostnames that contain deviation characters. See // idn_spoof_checker.h for details.
diff --git a/chrome/browser/ui/page_info/chrome_page_info_client.h b/chrome/browser/ui/page_info/chrome_page_info_client.h index d715b81d..30404ad0 100644 --- a/chrome/browser/ui/page_info/chrome_page_info_client.h +++ b/chrome/browser/ui/page_info/chrome_page_info_client.h
@@ -5,12 +5,12 @@ #ifndef CHROME_BROWSER_UI_PAGE_INFO_CHROME_PAGE_INFO_CLIENT_H_ #define CHROME_BROWSER_UI_PAGE_INFO_CHROME_PAGE_INFO_CLIENT_H_ +#include <memory> + #include "components/page_info/android/page_info_client.h" #include "components/page_info/page_info_delegate.h" #include "components/page_info/page_info_ui_delegate.h" -#include <memory> - namespace content { class WebContents; }
diff --git a/chrome/browser/ui/page_info/chrome_page_info_ui_delegate.cc b/chrome/browser/ui/page_info/chrome_page_info_ui_delegate.cc index 47d73f9b..dc6bad2 100644 --- a/chrome/browser/ui/page_info/chrome_page_info_ui_delegate.cc +++ b/chrome/browser/ui/page_info/chrome_page_info_ui_delegate.cc
@@ -155,8 +155,9 @@ #if !BUILDFLAG(IS_ANDROID) bool ChromePageInfoUiDelegate::ShouldShowSiteSettings(int* link_text_id, int* tooltip_text_id) { - if (GetProfile()->IsGuestSession()) + if (GetProfile()->IsGuestSession()) { return false; + } if (web_app::GetLabelIdsForAppManagementLinkInPageInfo( web_contents_, link_text_id, tooltip_text_id)) {
diff --git a/chrome/browser/ui/page_info/chrome_page_info_ui_delegate.h b/chrome/browser/ui/page_info/chrome_page_info_ui_delegate.h index 22e500c..d2b77a1 100644 --- a/chrome/browser/ui/page_info/chrome_page_info_ui_delegate.h +++ b/chrome/browser/ui/page_info/chrome_page_info_ui_delegate.h
@@ -50,8 +50,8 @@ void OpenMoreAboutThisPageUrl(const GURL& url, const ui::Event& event); // If PageInfo should show a link to the site or app's settings page, this - // will return true and set the params to the appropriate resource IDs (IDS_*). - // Otherwise, it will return false. + // will return true and set the params to the appropriate resource IDs + // (IDS_*). Otherwise, it will return false. bool ShouldShowSiteSettings(int* link_text_id, int* tooltip_text_id); // The returned string, if non-empty, should be added as a sublabel that gives
diff --git a/chrome/browser/ui/page_info/page_info_dialog.cc b/chrome/browser/ui/page_info/page_info_dialog.cc index 7c75300..014a154 100644 --- a/chrome/browser/ui/page_info/page_info_dialog.cc +++ b/chrome/browser/ui/page_info/page_info_dialog.cc
@@ -16,17 +16,20 @@ PageInfoClosingCallback closing_callback, bubble_anchor_util::Anchor anchor, std::optional<ContentSettingsType> type) { - if (!web_contents) + if (!web_contents) { return false; + } Browser* browser = chrome::FindBrowserWithTab(web_contents); - if (!browser) + if (!browser) { return false; + } content::NavigationEntry* entry = web_contents->GetController().GetVisibleEntry(); - if (entry->IsInitialEntry()) + if (entry->IsInitialEntry()) { return false; + } auto initialized_callback = GetPageInfoDialogCreatedCallbackForTesting()
diff --git a/chrome/browser/ui/passwords/manage_passwords_ui_controller.cc b/chrome/browser/ui/passwords/manage_passwords_ui_controller.cc index 65a8165..abf83f2 100644 --- a/chrome/browser/ui/passwords/manage_passwords_ui_controller.cc +++ b/chrome/browser/ui/passwords/manage_passwords_ui_controller.cc
@@ -1023,7 +1023,6 @@ password_manager::LogPasswordCheckReferrer(referrer); } - void ManagePasswordsUIController::OnDialogHidden() { dialog_controller_.reset(); if (GetState() == password_manager::ui::CREDENTIAL_REQUEST_STATE) {
diff --git a/chrome/browser/ui/passwords/manage_passwords_ui_controller.h b/chrome/browser/ui/passwords/manage_passwords_ui_controller.h index 7bd6e6d..53c1987 100644 --- a/chrome/browser/ui/passwords/manage_passwords_ui_controller.h +++ b/chrome/browser/ui/passwords/manage_passwords_ui_controller.h
@@ -233,7 +233,6 @@ protected: explicit ManagePasswordsUIController(content::WebContents* web_contents); - // Called when a PasswordForm is autofilled, when a new PasswordForm is // submitted, or when a navigation occurs to update the visibility of the // manage passwords icon and bubble.
diff --git a/chrome/browser/ui/passwords/ui_utils.cc b/chrome/browser/ui/passwords/ui_utils.cc index 05e32a67..d431f36 100644 --- a/chrome/browser/ui/passwords/ui_utils.cc +++ b/chrome/browser/ui/passwords/ui_utils.cc
@@ -190,9 +190,8 @@ bool IsSyncingAutosignSetting(Profile* profile) { const syncer::SyncService* sync_service = SyncServiceFactory::GetForProfile(profile); - return ( - sync_service && - sync_service->GetActiveDataTypes().Has(syncer::PRIORITY_PREFERENCES)); + return (sync_service && + sync_service->GetActiveDataTypes().Has(syncer::PRIORITY_PREFERENCES)); } std::string GetGooglePasswordManagerSubPageURLStr() {
diff --git a/chrome/browser/ui/performance_controls/battery_saver_button_controller.cc b/chrome/browser/ui/performance_controls/battery_saver_button_controller.cc index 9a8c41b..f3c6dd7 100644 --- a/chrome/browser/ui/performance_controls/battery_saver_button_controller.cc +++ b/chrome/browser/ui/performance_controls/battery_saver_button_controller.cc
@@ -32,8 +32,9 @@ } void BatterySaverButtonController::UpdateVisibilityState(bool is_active) { - if (is_active) + if (is_active) { delegate_->Show(); - else + } else { delegate_->Hide(); + } }
diff --git a/chrome/browser/ui/performance_controls/performance_controls_hats_service_unittest.cc b/chrome/browser/ui/performance_controls/performance_controls_hats_service_unittest.cc index cbbadd6..a1762a512 100644 --- a/chrome/browser/ui/performance_controls/performance_controls_hats_service_unittest.cc +++ b/chrome/browser/ui/performance_controls/performance_controls_hats_service_unittest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/performance_controls/performance_controls_hats_service.h" + #include <memory> #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/ui/performance_controls/tab_resource_usage_tab_helper_unittest.cc b/chrome/browser/ui/performance_controls/tab_resource_usage_tab_helper_unittest.cc index eccf9e2..3a36f6e 100644 --- a/chrome/browser/ui/performance_controls/tab_resource_usage_tab_helper_unittest.cc +++ b/chrome/browser/ui/performance_controls/tab_resource_usage_tab_helper_unittest.cc
@@ -15,10 +15,8 @@ class TabResourceUsageTabHelperTest : public ChromeRenderViewHostTestHarness { protected: TabResourceUsageTabHelper* InitializeTabHelper() { - TabResourceUsageTabHelper::CreateForWebContents( - web_contents()); - return TabResourceUsageTabHelper:: - FromWebContents(web_contents()); + TabResourceUsageTabHelper::CreateForWebContents(web_contents()); + return TabResourceUsageTabHelper::FromWebContents(web_contents()); } };
diff --git a/chrome/browser/ui/plus_addresses/plus_address_creation_controller_desktop_unittest.cc b/chrome/browser/ui/plus_addresses/plus_address_creation_controller_desktop_unittest.cc index c05f19c..883a80f 100644 --- a/chrome/browser/ui/plus_addresses/plus_address_creation_controller_desktop_unittest.cc +++ b/chrome/browser/ui/plus_addresses/plus_address_creation_controller_desktop_unittest.cc
@@ -105,9 +105,7 @@ PlusAddressCreationControllerDesktop::CreateForWebContents(web_contents()); } - void TearDown() override { - ChromeRenderViewHostTestHarness::TearDown(); - } + void TearDown() override { ChromeRenderViewHostTestHarness::TearDown(); } PlusAddressCreationControllerDesktop& controller() { return *PlusAddressCreationControllerDesktop::FromWebContents(
diff --git a/chrome/browser/ui/prefs/pref_watcher.cc b/chrome/browser/ui/prefs/pref_watcher.cc index 9e21e02d..34c7b89 100644 --- a/chrome/browser/ui/prefs/pref_watcher.cc +++ b/chrome/browser/ui/prefs/pref_watcher.cc
@@ -164,8 +164,7 @@ local_state_pref_change_registrar_.RemoveAll(); } -void PrefWatcher::OnNativeThemeUpdated( - ui::NativeTheme* observed_theme) { +void PrefWatcher::OnNativeThemeUpdated(ui::NativeTheme* observed_theme) { UpdateRendererPreferences(); } @@ -180,8 +179,9 @@ blink::RendererPreferences prefs; renderer_preferences_util::UpdateFromSystemSettings(&prefs, profile_); - for (auto& watcher : renderer_preference_watchers_) + for (auto& watcher : renderer_preference_watchers_) { watcher->NotifyUpdate(prefs); + } } void PrefWatcher::OnWebPrefChanged(const std::string& pref_name) {
diff --git a/chrome/browser/ui/prefs/pref_watcher.h b/chrome/browser/ui/prefs/pref_watcher.h index 79ce1590d..0dd848e6 100644 --- a/chrome/browser/ui/prefs/pref_watcher.h +++ b/chrome/browser/ui/prefs/pref_watcher.h
@@ -69,7 +69,7 @@ mojo::RemoteSet<blink::mojom::RendererPreferenceWatcher> renderer_preference_watchers_; - base::ScopedObservation<ui::NativeTheme, ui::NativeThemeObserver> + base::ScopedObservation<ui::NativeTheme, ui::NativeThemeObserver> native_theme_observation_{this}; };
diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/prefs/prefs_tab_helper.cc index 5af4110..5dc5362 100644 --- a/chrome/browser/ui/prefs/prefs_tab_helper.cc +++ b/chrome/browser/ui/prefs/prefs_tab_helper.cc
@@ -127,8 +127,9 @@ // Consolas, which looks much better than Courier New. bool ShouldUseAlternateDefaultFixedFont(const std::string& script) { if (!base::StartsWith(script, "courier", - base::CompareCase::INSENSITIVE_ASCII)) + base::CompareCase::INSENSITIVE_ASCII)) { return false; + } UINT smooth_type = 0; SystemParametersInfo(SPI_GETFONTSMOOTHINGTYPE, 0, &smooth_type, 0); return smooth_type == FE_FONTSMOOTHINGCLEARTYPE; @@ -240,25 +241,30 @@ // For Chinese locales, uscript_getCode() just returns USCRIPT_HAN but our // per-script fonts are for USCRIPT_SIMPLIFIED_HAN and // USCRIPT_TRADITIONAL_HAN. - if (locale == "zh-CN") + if (locale == "zh-CN") { return USCRIPT_SIMPLIFIED_HAN; - if (locale == "zh-TW") + } + if (locale == "zh-TW") { return USCRIPT_TRADITIONAL_HAN; + } // For Korean and Japanese, multiple scripts are returned by // |uscript_getCode|, but we're passing a one entry buffer leading // the buffer to be filled by USCRIPT_INVALID_CODE. We need to // hard-code the results for them. - if (locale == "ko") + if (locale == "ko") { return USCRIPT_HANGUL; - if (locale == "ja") + } + if (locale == "ja") { return USCRIPT_JAPANESE; + } UScriptCode code = USCRIPT_INVALID_CODE; UErrorCode err = U_ZERO_ERROR; uscript_getCode(locale.c_str(), &code, 1, &err); - if (U_FAILURE(err)) + if (U_FAILURE(err)) { code = USCRIPT_INVALID_CODE; + } return code; } @@ -293,8 +299,8 @@ const char* path, int default_message_id) { int val = 0; - bool success = base::StringToInt(l10n_util::GetStringUTF8( - default_message_id), &val); + bool success = + base::StringToInt(l10n_util::GetStringUTF8(default_message_id), &val); DCHECK(success); registry->RegisterIntegerPref(path, val); } @@ -394,10 +400,9 @@ : pref_defaults.force_dark_mode_enabled; registry->RegisterBooleanPref(prefs::kWebKitForceDarkModeEnabled, force_dark_mode_enabled); - registry->RegisterStringPref( - prefs::kDefaultCharset, - l10n_util::GetStringUTF8(IDS_DEFAULT_ENCODING), - user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); + registry->RegisterStringPref(prefs::kDefaultCharset, + l10n_util::GetStringUTF8(IDS_DEFAULT_ENCODING), + user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); // Register font prefs that have defaults. std::set<std::string> fonts_with_defaults; @@ -408,8 +413,9 @@ #if BUILDFLAG(IS_WIN) if (pref.pref_name == prefs::kWebKitFixedFontFamily) { if (ShouldUseAlternateDefaultFixedFont( - l10n_util::GetStringUTF8(pref.resource_id))) + l10n_util::GetStringUTF8(pref.resource_id))) { pref.resource_id = IDS_FIXED_FONT_FAMILY_ALT_WIN; + } } #endif @@ -490,8 +496,7 @@ // WebKit know. std::string generic_family; std::string script; - if (pref_names_util::ParseFontNamePrefPath(pref_name, - &generic_family, + if (pref_names_util::ParseFontNamePrefPath(pref_name, &generic_family, &script)) { PrefService* prefs = profile_->GetPrefs(); std::string pref_value = prefs->GetString(pref_name);
diff --git a/chrome/browser/ui/prefs/prefs_tab_helper_browsertest.cc b/chrome/browser/ui/prefs/prefs_tab_helper_browsertest.cc index 0c2702b..c1e104d 100644 --- a/chrome/browser/ui/prefs/prefs_tab_helper_browsertest.cc +++ b/chrome/browser/ui/prefs/prefs_tab_helper_browsertest.cc
@@ -21,8 +21,7 @@ virtual base::FilePath GetPreferencesFilePath() { base::FilePath test_data_directory; base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_directory); - return test_data_directory - .AppendASCII("profiles") + return test_data_directory.AppendASCII("profiles") .AppendASCII("web_prefs") .AppendASCII("Default") .Append(chrome::kPreferencesFilename); @@ -45,8 +44,8 @@ base::FilePath default_pref_file = default_profile.Append(chrome::kPreferencesFilename); if (!base::CopyFile(pref_file, default_pref_file)) { - LOG(ERROR) << "Copy error from " << pref_file.MaybeAsASCII() - << " to " << default_pref_file.MaybeAsASCII(); + LOG(ERROR) << "Copy error from " << pref_file.MaybeAsASCII() << " to " + << default_pref_file.MaybeAsASCII(); return false; } @@ -54,7 +53,9 @@ // Make the copy writable. On POSIX we assume the umask allows files // we create to be writable. if (!::SetFileAttributesW(default_pref_file.value().c_str(), - FILE_ATTRIBUTE_NORMAL)) return false; + FILE_ATTRIBUTE_NORMAL)) { + return false; + } #endif return true; } @@ -65,12 +66,12 @@ IN_PROC_BROWSER_TEST_F(PrefsTabHelperBrowserTest, WebPrefs) { PrefService* prefs = browser()->profile()->GetPrefs(); - EXPECT_TRUE(prefs->FindPreference( - prefs::kWebKitCursiveFontFamily)->IsDefaultValue()); - EXPECT_TRUE(prefs->FindPreference( - prefs::kWebKitSerifFontFamily)->IsDefaultValue()); - EXPECT_TRUE(prefs->FindPreference( - prefs::kWebKitSerifFontFamilyJapanese)->IsDefaultValue()); + EXPECT_TRUE( + prefs->FindPreference(prefs::kWebKitCursiveFontFamily)->IsDefaultValue()); + EXPECT_TRUE( + prefs->FindPreference(prefs::kWebKitSerifFontFamily)->IsDefaultValue()); + EXPECT_TRUE(prefs->FindPreference(prefs::kWebKitSerifFontFamilyJapanese) + ->IsDefaultValue()); EXPECT_EQ("windows-1251", prefs->GetString(prefs::kDefaultCharset)); EXPECT_EQ(16, prefs->GetInteger(prefs::kWebKitDefaultFontSize));
diff --git a/chrome/browser/ui/privacy_sandbox/privacy_sandbox_prompt.cc b/chrome/browser/ui/privacy_sandbox/privacy_sandbox_prompt.cc index 6acad28..014d8ed 100644 --- a/chrome/browser/ui/privacy_sandbox/privacy_sandbox_prompt.cc +++ b/chrome/browser/ui/privacy_sandbox/privacy_sandbox_prompt.cc
@@ -8,5 +8,5 @@ void ShowPrivacySandboxPrompt(Browser* browser, PrivacySandboxService::PromptType prompt_type) { - ShowPrivacySandboxDialog(browser, prompt_type); + ShowPrivacySandboxDialog(browser, prompt_type); }
diff --git a/chrome/browser/ui/privacy_sandbox/privacy_sandbox_prompt_helper.cc b/chrome/browser/ui/privacy_sandbox/privacy_sandbox_prompt_helper.cc index 198de06..8f8cd24 100644 --- a/chrome/browser/ui/privacy_sandbox/privacy_sandbox_prompt_helper.cc +++ b/chrome/browser/ui/privacy_sandbox/privacy_sandbox_prompt_helper.cc
@@ -35,8 +35,9 @@ // Gets the type of prompt that should be displayed for |profile|, this includes // the possibility of no prompt being required. PrivacySandboxService::PromptType GetRequiredPromptType(Profile* profile) { - if (!profile || !profile->IsRegularProfile()) + if (!profile || !profile->IsRegularProfile()) { return PrivacySandboxService::PromptType::kNone; + } auto* privacy_sandbox_service = PrivacySandboxServiceFactory::GetForProfile(profile);
diff --git a/chrome/browser/ui/privacy_sandbox/privacy_sandbox_prompt_helper_browsertest.cc b/chrome/browser/ui/privacy_sandbox/privacy_sandbox_prompt_helper_browsertest.cc index 985ad2f..8d363ba 100644 --- a/chrome/browser/ui/privacy_sandbox/privacy_sandbox_prompt_helper_browsertest.cc +++ b/chrome/browser/ui/privacy_sandbox/privacy_sandbox_prompt_helper_browsertest.cc
@@ -245,11 +245,11 @@ } // TODO(crbug.com/40270789): Debug and re-enable the test. -# if BUILDFLAG(IS_CHROMEOS) -# define MAYBE_PromptOpensOnHistory DISABLED_PromptOpensOnHistory -# else -# define MAYBE_PromptOpensOnHistory PromptOpensOnHistory -# endif +#if BUILDFLAG(IS_CHROMEOS) +#define MAYBE_PromptOpensOnHistory DISABLED_PromptOpensOnHistory +#else +#define MAYBE_PromptOpensOnHistory PromptOpensOnHistory +#endif IN_PROC_BROWSER_TEST_P(PrivacySandboxPromptHelperTestWithParam, MAYBE_PromptOpensOnHistory) { // Check when a navigation to the Chrome history occurs, which is a
diff --git a/chrome/browser/ui/process_singleton_dialog_linux.h b/chrome/browser/ui/process_singleton_dialog_linux.h index 09d26cc..783b70a 100644 --- a/chrome/browser/ui/process_singleton_dialog_linux.h +++ b/chrome/browser/ui/process_singleton_dialog_linux.h
@@ -7,7 +7,6 @@ #include <string> - // Displays an error to the user when the ProcessSingleton cannot acquire the // lock. This runs the message loop itself as the browser message loop has not // started by that point in the startup process.
diff --git a/chrome/browser/ui/qrcode_generator/qrcode_generator_bubble_controller.cc b/chrome/browser/ui/qrcode_generator/qrcode_generator_bubble_controller.cc index 5b93a3c..bc6b4156 100644 --- a/chrome/browser/ui/qrcode_generator/qrcode_generator_bubble_controller.cc +++ b/chrome/browser/ui/qrcode_generator/qrcode_generator_bubble_controller.cc
@@ -37,8 +37,9 @@ // static bool QRCodeGeneratorBubbleController::IsGeneratorAvailable(const GURL& url) { - if (!url.SchemeIsHTTPOrHTTPS()) + if (!url.SchemeIsHTTPOrHTTPS()) { return false; + } // Check policy. if (!IsQRCodeGeneratorEnabledByPolicy()) { @@ -60,8 +61,9 @@ void QRCodeGeneratorBubbleController::ShowBubble(const GURL& url, bool show_back_button) { // Ignore subsequent calls to open the dialog if it already is open. - if (bubble_shown_) + if (bubble_shown_) { return; + } // Check policy. if (!IsQRCodeGeneratorEnabledByPolicy()) { @@ -69,8 +71,9 @@ } Browser* browser = chrome::FindBrowserWithTab(&GetWebContents()); - if (!browser || !browser->window()) + if (!browser || !browser->window()) { return; + } bubble_shown_ = true; qrcode_generator_bubble_ = browser->window()->ShowQRCodeGeneratorBubble(
diff --git a/chrome/browser/ui/recently_audible_helper.cc b/chrome/browser/ui/recently_audible_helper.cc index 6b428035..6eceb94e 100644 --- a/chrome/browser/ui/recently_audible_helper.cc +++ b/chrome/browser/ui/recently_audible_helper.cc
@@ -30,10 +30,12 @@ } bool RecentlyAudibleHelper::WasRecentlyAudible() const { - if (last_audible_time_.is_max()) + if (last_audible_time_.is_max()) { return true; - if (last_audible_time_.is_null()) + } + if (last_audible_time_.is_null()) { return false; + } base::TimeTicks recently_audible_time_limit = last_audible_time_ + kRecentlyAudibleTimeout; return tick_clock_->NowTicks() < recently_audible_time_limit; @@ -48,8 +50,9 @@ : content::WebContentsObserver(contents), content::WebContentsUserData<RecentlyAudibleHelper>(*contents), tick_clock_(GetDefaultTickClock()) { - if (contents->IsCurrentlyAudible()) + if (contents->IsCurrentlyAudible()) { last_audible_time_ = base::TimeTicks::Max(); + } } void RecentlyAudibleHelper::OnAudioStateChanged(bool audible) { @@ -69,8 +72,9 @@ bool was_recently_audible = WasRecentlyAudible(); last_audible_time_ = base::TimeTicks::Max(); recently_audible_timer_.Stop(); - if (!was_recently_audible) + if (!was_recently_audible) { callback_list_.Notify(true); + } } void RecentlyAudibleHelper::OnRecentlyAudibleTimerFired() {
diff --git a/chrome/browser/ui/sad_tab.cc b/chrome/browser/ui/sad_tab.cc index f4a755e..41a4280b 100644 --- a/chrome/browser/ui/sad_tab.cc +++ b/chrome/browser/ui/sad_tab.cc
@@ -51,8 +51,9 @@ static int64_t last_called_ts = 0; base::TimeTicks last_called(base::TimeTicks::UnixEpoch()); - if (last_called_ts) + if (last_called_ts) { last_called = base::TimeTicks::FromInternalValue(last_called_ts); + } bool crashed_recently = (base::TimeTicks().Now() - last_called).InSeconds() < kMaxSecondsSinceLastCrash; @@ -65,8 +66,9 @@ size_t tab_count = 0; for (Browser* browser : *BrowserList::GetInstance()) { tab_count += browser->tab_strip_model()->count(); - if (tab_count > 1U) + if (tab_count > 1U) { break; + } } return (tab_count > 1U); } @@ -100,8 +102,9 @@ } int SadTab::GetTitle() { - if (!is_repeatedly_crashing_) + if (!is_repeatedly_crashing_) { return IDS_SAD_TAB_TITLE; + } switch (kind_) { #if BUILDFLAG(IS_CHROMEOS) case SAD_TAB_KIND_KILLED_BY_OOM: @@ -129,9 +132,10 @@ return IDS_KILLED_TAB_BY_OOM_MESSAGE; #endif case SAD_TAB_KIND_OOM: - if (is_repeatedly_crashing_) + if (is_repeatedly_crashing_) { return AreOtherTabsOpen() ? IDS_SAD_TAB_OOM_MESSAGE_TABS : IDS_SAD_TAB_OOM_MESSAGE_NOTABS; + } return IDS_SAD_TAB_MESSAGE; case SAD_TAB_KIND_CRASHED: case SAD_TAB_KIND_KILLED: @@ -156,8 +160,9 @@ } std::vector<int> SadTab::GetSubMessages() { - if (!is_repeatedly_crashing_) + if (!is_repeatedly_crashing_) { return std::vector<int>(); + } switch (kind_) { #if BUILDFLAG(IS_CHROMEOS) @@ -171,8 +176,9 @@ std::vector<int> message_ids = {IDS_SAD_TAB_RELOAD_RESTART_BROWSER, IDS_SAD_TAB_RELOAD_RESTART_DEVICE}; // Only show Incognito suggestion if not already in Incognito mode. - if (!web_contents_->GetBrowserContext()->IsOffTheRecord()) + if (!web_contents_->GetBrowserContext()->IsOffTheRecord()) { message_ids.insert(message_ids.begin(), IDS_SAD_TAB_RELOAD_INCOGNITO); + } #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) // Note: on macOS, Linux and ChromeOS, the first bullet is either one of // IDS_SAD_TAB_RELOAD_CLOSE_TABS or IDS_SAD_TAB_RELOAD_CLOSE_NOTABS
diff --git a/chrome/browser/ui/sad_tab_helper.cc b/chrome/browser/ui/sad_tab_helper.cc index ed007c03..8133b0db 100644 --- a/chrome/browser/ui/sad_tab_helper.cc +++ b/chrome/browser/ui/sad_tab_helper.cc
@@ -38,25 +38,29 @@ content::WebContentsUserData<SadTabHelper>(*web_contents) {} void SadTabHelper::ReinstallInWebView() { - if (sad_tab_) + if (sad_tab_) { sad_tab_->ReinstallInWebView(); + } } void SadTabHelper::RenderFrameCreated( content::RenderFrameHost* render_frame_host) { - if (content::ShouldSkipEarlyCommitPendingForCrashedFrame()) + if (content::ShouldSkipEarlyCommitPendingForCrashedFrame()) { sad_tab_.reset(); + } } void SadTabHelper::RenderViewReady() { - if (!content::ShouldSkipEarlyCommitPendingForCrashedFrame()) + if (!content::ShouldSkipEarlyCommitPendingForCrashedFrame()) { sad_tab_.reset(); + } } void SadTabHelper::DidFinishNavigation( content::NavigationHandle* navigation_handle) { - if (!content::ShouldSkipEarlyCommitPendingForCrashedFrame()) + if (!content::ShouldSkipEarlyCommitPendingForCrashedFrame()) { return; + } // If the navigation did not commit and we went back to the crashed frame, // reinstall the sad tab, if needed. if (!sad_tab_ && !navigation_handle->HasCommitted() && @@ -70,14 +74,17 @@ // Only show the sad tab if we're not in browser shutdown, so that WebContents // objects that are not in a browser (e.g., HTML dialogs) and thus are // visible do not flash a sad tab page. - if (browser_shutdown::HasShutdownStarted()) + if (browser_shutdown::HasShutdownStarted()) { return; + } - if (sad_tab_) + if (sad_tab_) { return; + } - if (SadTab::ShouldShow(status)) + if (SadTab::ShouldShow(status)) { InstallSadTab(status); + } } void SadTabHelper::InstallSadTab(base::TerminationStatus status) {
diff --git a/chrome/browser/ui/safety_hub/extensions_result.cc b/chrome/browser/ui/safety_hub/extensions_result.cc index ae1c17b..53e09b8 100644 --- a/chrome/browser/ui/safety_hub/extensions_result.cc +++ b/chrome/browser/ui/safety_hub/extensions_result.cc
@@ -43,9 +43,8 @@ // static std::optional<std::unique_ptr<SafetyHubService::Result>> -SafetyHubExtensionsResult::GetResult( - Profile* profile, - bool only_unpublished_extensions = false) { +SafetyHubExtensionsResult::GetResult(Profile* profile, + bool only_unpublished_extensions = false) { extensions::ExtensionRegistry* extension_registry = extensions::ExtensionRegistry::Get(profile); std::set<extensions::ExtensionId> triggering_extensions;
diff --git a/chrome/browser/ui/safety_hub/menu_notification_service.cc b/chrome/browser/ui/safety_hub/menu_notification_service.cc index 785be54..27e4ae4 100644 --- a/chrome/browser/ui/safety_hub/menu_notification_service.cc +++ b/chrome/browser/ui/safety_hub/menu_notification_service.cc
@@ -100,11 +100,11 @@ #if !BUILDFLAG(IS_ANDROID) pref_dict_key_map_.emplace(safety_hub::SafetyHubModuleType::EXTENSIONS, "extensions"); - SetInfoElement(safety_hub::SafetyHubModuleType::EXTENSIONS, - MenuNotificationPriority::LOW, base::Days(10), - base::BindRepeating(&SafetyHubExtensionsResult::GetResult, - profile, true), - stored_notifications); + SetInfoElement( + safety_hub::SafetyHubModuleType::EXTENSIONS, + MenuNotificationPriority::LOW, base::Days(10), + base::BindRepeating(&SafetyHubExtensionsResult::GetResult, profile, true), + stored_notifications); // PasswordStatusCheckService might be null for some profiles and testing. Add // the info item only if the service is available.
diff --git a/chrome/browser/ui/safety_hub/safety_hub_constants.cc b/chrome/browser/ui/safety_hub/safety_hub_constants.cc index 9398095f..e6c5916 100644 --- a/chrome/browser/ui/safety_hub/safety_hub_constants.cc +++ b/chrome/browser/ui/safety_hub/safety_hub_constants.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/safety_hub/safety_hub_constants.h" + #include "base/time/time.h" namespace safety_hub {
diff --git a/chrome/browser/ui/safety_hub/safety_hub_prefs.cc b/chrome/browser/ui/safety_hub/safety_hub_prefs.cc index ed500bb..2d1acecd 100644 --- a/chrome/browser/ui/safety_hub/safety_hub_prefs.cc +++ b/chrome/browser/ui/safety_hub/safety_hub_prefs.cc
@@ -12,7 +12,7 @@ #if !BUILDFLAG(IS_ANDROID) registry->RegisterDictionaryPref( safety_hub_prefs::kBackgroundPasswordCheckTimeAndInterval); -#else // BUILDFLAG(IS_ANDROID) +#else // BUILDFLAG(IS_ANDROID) // TODO(sideyilmaz): Move kBreachedCredentialsCount to safety_hub_prefs.h registry->RegisterIntegerPref(prefs::kBreachedCredentialsCount, -1);
diff --git a/chrome/browser/ui/scoped_tabbed_browser_displayer.cc b/chrome/browser/ui/scoped_tabbed_browser_displayer.cc index 32269711..fb21559 100644 --- a/chrome/browser/ui/scoped_tabbed_browser_displayer.cc +++ b/chrome/browser/ui/scoped_tabbed_browser_displayer.cc
@@ -20,13 +20,15 @@ } ScopedTabbedBrowserDisplayer::~ScopedTabbedBrowserDisplayer() { - if (!browser_) + if (!browser_) { return; + } // Make sure to restore the window, since window()->Show() will not unminimize // it. - if (browser_->window()->IsMinimized()) + if (browser_->window()->IsMinimized()) { browser_->window()->Restore(); + } browser_->window()->Show(); }
diff --git a/chrome/browser/ui/screen_capture_notification_ui_browsertest.cc b/chrome/browser/ui/screen_capture_notification_ui_browsertest.cc index 98565c1..2388da52 100644 --- a/chrome/browser/ui/screen_capture_notification_ui_browsertest.cc +++ b/chrome/browser/ui/screen_capture_notification_ui_browsertest.cc
@@ -32,8 +32,9 @@ on_started_result_ = screen_capture_notification_ui_->OnStarted( base::BindOnce( [](ScreenCaptureNotificationUiBrowserTest* test) { - if (test->run_loop_) + if (test->run_loop_) { test->run_loop_->QuitWhenIdle(); + } }, base::Unretained(this)), content::MediaStreamUI::SourceCallback(),
diff --git a/chrome/browser/ui/screen_capture_notification_ui_stub.cc b/chrome/browser/ui/screen_capture_notification_ui_stub.cc index 3e71255..cc7f102 100644 --- a/chrome/browser/ui/screen_capture_notification_ui_stub.cc +++ b/chrome/browser/ui/screen_capture_notification_ui_stub.cc
@@ -2,9 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/notreached.h" #include "chrome/browser/ui/screen_capture_notification_ui.h" +#include "base/notreached.h" + // Stub implementation of the ScreenCaptureNotificationUI interface. class ScreenCaptureNotificationUIStub : public ScreenCaptureNotificationUI { public:
diff --git a/chrome/browser/ui/search/instant_controller.cc b/chrome/browser/ui/search/instant_controller.cc index a4507c0..78ff8b7 100644 --- a/chrome/browser/ui/search/instant_controller.cc +++ b/chrome/browser/ui/search/instant_controller.cc
@@ -55,14 +55,17 @@ TabStripModel* tab_strip_model, const TabStripModelChange& change, const TabStripSelectionChange& selection) { - if (tab_strip_model->empty() || !selection.active_tab_changed()) + if (tab_strip_model->empty() || !selection.active_tab_changed()) { return; + } - if (selection.old_contents) + if (selection.old_contents) { StopWatchingTab(selection.old_contents); + } - if (selection.new_contents) + if (selection.new_contents) { StartWatchingTab(selection.new_contents); + } } void InstantController::StartWatchingTab(content::WebContents* web_contents) {
diff --git a/chrome/browser/ui/search/new_tab_page_navigation_throttle.cc b/chrome/browser/ui/search/new_tab_page_navigation_throttle.cc index 922d1a41..b3a3a96 100644 --- a/chrome/browser/ui/search/new_tab_page_navigation_throttle.cc +++ b/chrome/browser/ui/search/new_tab_page_navigation_throttle.cc
@@ -46,12 +46,14 @@ NewTabPageNavigationThrottle::WillProcessResponse() { const net::HttpResponseHeaders* headers = navigation_handle()->GetResponseHeaders(); - if (!headers) + if (!headers) { return content::NavigationThrottle::PROCEED; + } int response_code = headers->response_code(); - if (response_code < 400 && response_code != net::HTTP_NO_CONTENT) + if (response_code < 400 && response_code != net::HTTP_NO_CONTENT) { return content::NavigationThrottle::PROCEED; + } return OpenLocalNewTabPage(); }
diff --git a/chrome/browser/ui/search/new_tab_page_navigation_throttle_browsertest.cc b/chrome/browser/ui/search/new_tab_page_navigation_throttle_browsertest.cc index c2723d5..b88a2d0 100644 --- a/chrome/browser/ui/search/new_tab_page_navigation_throttle_browsertest.cc +++ b/chrome/browser/ui/search/new_tab_page_navigation_throttle_browsertest.cc
@@ -90,8 +90,9 @@ // WebContentsObserver overrides: void DidFinishNavigation(content::NavigationHandle* handle) override { - if (handle->GetURL() != instant_ntp_url_) + if (handle->GetURL() != instant_ntp_url_) { return; + } did_finish_ = true; did_commit_ = handle->HasCommitted();
diff --git a/chrome/browser/ui/search/ntp_user_data_logger.cc b/chrome/browser/ui/search/ntp_user_data_logger.cc index 9f47ef21..834644a 100644 --- a/chrome/browser/ui/search/ntp_user_data_logger.cc +++ b/chrome/browser/ui/search/ntp_user_data_logger.cc
@@ -498,8 +498,9 @@ } void NTPUserDataLogger::RecordAction(const char* action) { - if (!action || !DefaultSearchProviderIsGoogle()) + if (!action || !DefaultSearchProviderIsGoogle()) { return; + } base::RecordAction(base::UserMetricsAction(action)); }
diff --git a/chrome/browser/ui/search/omnibox_utils.cc b/chrome/browser/ui/search/omnibox_utils.cc index 4568c135..9614a8b 100644 --- a/chrome/browser/ui/search/omnibox_utils.cc +++ b/chrome/browser/ui/search/omnibox_utils.cc
@@ -18,15 +18,17 @@ } OmniboxView* GetOmniboxView(Browser* browser) { - if (!browser) + if (!browser) { return nullptr; + } return browser->window()->GetLocationBar()->GetOmniboxView(); } void FocusOmnibox(bool focus, content::WebContents* web_contents) { OmniboxView* omnibox_view = GetOmniboxView(web_contents); - if (!omnibox_view) + if (!omnibox_view) { return; + } if (focus) { // This is an invisible focus to support "fakebox" implementations on NTPs
diff --git a/chrome/browser/ui/search/search_ipc_router.cc b/chrome/browser/ui/search/search_ipc_router.cc index e9a94704..9912c44 100644 --- a/chrome/browser/ui/search/search_ipc_router.cc +++ b/chrome/browser/ui/search/search_ipc_router.cc
@@ -29,8 +29,9 @@ content::RenderProcessHost* process_host = render_frame->GetProcess(); const InstantService* instant_service = InstantServiceFactory::GetForProfile( Profile::FromBrowserContext(process_host->GetBrowserContext())); - if (!instant_service) + if (!instant_service) { return false; + } return instant_service->IsInstantProcess(process_host->GetDeprecatedID()); } @@ -129,8 +130,9 @@ void SearchIPCRouter::OnNavigationEntryCommitted() { ++commit_counter_; - if (!embedded_search_client()) + if (!embedded_search_client()) { return; + } embedded_search_client()->SetPageSequenceNumber(commit_counter_); } @@ -145,23 +147,26 @@ void SearchIPCRouter::OmniboxFocusChanged(OmniboxFocusState state, OmniboxFocusChangeReason reason) { - if (!policy_->ShouldSendOmniboxFocusChanged() || !embedded_search_client()) + if (!policy_->ShouldSendOmniboxFocusChanged() || !embedded_search_client()) { return; + } embedded_search_client()->FocusChanged(state, reason); } void SearchIPCRouter::SendMostVisitedInfo( const InstantMostVisitedInfo& most_visited_info) { - if (!policy_->ShouldSendMostVisitedInfo() || !embedded_search_client()) + if (!policy_->ShouldSendMostVisitedInfo() || !embedded_search_client()) { return; + } embedded_search_client()->MostVisitedInfoChanged(most_visited_info); } void SearchIPCRouter::SendNtpTheme(const NtpTheme& theme) { - if (!policy_->ShouldSendNtpTheme() || !embedded_search_client()) + if (!policy_->ShouldSendNtpTheme() || !embedded_search_client()) { return; + } embedded_search_client()->ThemeChanged(theme); } @@ -175,42 +180,50 @@ } void SearchIPCRouter::FocusOmnibox(int page_seq_no, bool focus) { - if (page_seq_no != commit_counter_) + if (page_seq_no != commit_counter_) { return; + } - if (!policy_->ShouldProcessFocusOmnibox(is_active_tab_)) + if (!policy_->ShouldProcessFocusOmnibox(is_active_tab_)) { return; + } delegate_->FocusOmnibox(focus); } void SearchIPCRouter::DeleteMostVisitedItem(int page_seq_no, const GURL& url) { - if (page_seq_no != commit_counter_) + if (page_seq_no != commit_counter_) { return; + } - if (!policy_->ShouldProcessDeleteMostVisitedItem()) + if (!policy_->ShouldProcessDeleteMostVisitedItem()) { return; + } delegate_->OnDeleteMostVisitedItem(url); } void SearchIPCRouter::UndoMostVisitedDeletion(int page_seq_no, const GURL& url) { - if (page_seq_no != commit_counter_) + if (page_seq_no != commit_counter_) { return; + } - if (!policy_->ShouldProcessUndoMostVisitedDeletion()) + if (!policy_->ShouldProcessUndoMostVisitedDeletion()) { return; + } delegate_->OnUndoMostVisitedDeletion(url); } void SearchIPCRouter::UndoAllMostVisitedDeletions(int page_seq_no) { - if (page_seq_no != commit_counter_) + if (page_seq_no != commit_counter_) { return; + } - if (!policy_->ShouldProcessUndoAllMostVisitedDeletions()) + if (!policy_->ShouldProcessUndoAllMostVisitedDeletions()) { return; + } delegate_->OnUndoAllMostVisitedDeletions(); }
diff --git a/chrome/browser/ui/search/search_ipc_router.h b/chrome/browser/ui/search/search_ipc_router.h index ddb532d..8fb7b5e 100644 --- a/chrome/browser/ui/search/search_ipc_router.h +++ b/chrome/browser/ui/search/search_ipc_router.h
@@ -29,7 +29,7 @@ namespace content { class RenderFrameHost; class WebContents; -} +} // namespace content class SearchIPCRouterTest;
diff --git a/chrome/browser/ui/search/search_ipc_router_policy_impl.cc b/chrome/browser/ui/search/search_ipc_router_policy_impl.cc index 0dfceb82..4a49643 100644 --- a/chrome/browser/ui/search/search_ipc_router_policy_impl.cc +++ b/chrome/browser/ui/search/search_ipc_router_policy_impl.cc
@@ -15,8 +15,9 @@ Profile* profile = Profile::FromBrowserContext(web_contents_->GetBrowserContext()); - if (profile) + if (profile) { is_incognito_ = profile->IsOffTheRecord(); + } } SearchIPCRouterPolicyImpl::~SearchIPCRouterPolicyImpl() = default;
diff --git a/chrome/browser/ui/search/search_ipc_router_policy_impl.h b/chrome/browser/ui/search/search_ipc_router_policy_impl.h index 3f466b98..9d60ca6 100644 --- a/chrome/browser/ui/search/search_ipc_router_policy_impl.h +++ b/chrome/browser/ui/search/search_ipc_router_policy_impl.h
@@ -43,9 +43,7 @@ bool ShouldProcessThemeChangeMessages() override; // Used by unit tests. - void set_is_incognito(bool is_incognito) { - is_incognito_ = is_incognito; - } + void set_is_incognito(bool is_incognito) { is_incognito_ = is_incognito; } raw_ptr<content::WebContents> web_contents_; bool is_incognito_;
diff --git a/chrome/browser/ui/search/search_ipc_router_policy_unittest.cc b/chrome/browser/ui/search/search_ipc_router_policy_unittest.cc index 17da99f..6ac755e1 100644 --- a/chrome/browser/ui/search/search_ipc_router_policy_unittest.cc +++ b/chrome/browser/ui/search/search_ipc_router_policy_unittest.cc
@@ -3,7 +3,6 @@ // found in the LICENSE file. #include "chrome/browser/ui/search/search_ipc_router.h" - #include "chrome/browser/ui/search/search_ipc_router_policy_impl.h" #include "chrome/browser/ui/search/search_tab_helper.h" #include "chrome/browser/ui/tabs/tab_strip_model.h"
diff --git a/chrome/browser/ui/search/search_ipc_router_unittest.cc b/chrome/browser/ui/search/search_ipc_router_unittest.cc index 7bb3e8c..46a962e 100644 --- a/chrome/browser/ui/search/search_ipc_router_unittest.cc +++ b/chrome/browser/ui/search/search_ipc_router_unittest.cc
@@ -126,8 +126,7 @@ return browser()->tab_strip_model()->GetActiveWebContents(); } - SearchTabHelper* GetSearchTabHelper( - content::WebContents* web_contents) { + SearchTabHelper* GetSearchTabHelper(content::WebContents* web_contents) { EXPECT_NE(nullptr, web_contents); return SearchTabHelper::FromWebContents(web_contents); }
diff --git a/chrome/browser/ui/search/search_tab_helper.cc b/chrome/browser/ui/search/search_tab_helper.cc index 67b430f5..859dafd 100644 --- a/chrome/browser/ui/search/search_tab_helper.cc +++ b/chrome/browser/ui/search/search_tab_helper.cc
@@ -85,8 +85,9 @@ // Returns true if |contents| are rendered inside an Instant process. bool InInstantProcess(const InstantService* instant_service, content::WebContents* contents) { - if (!instant_service || !contents) + if (!instant_service || !contents) { return false; + } return instant_service->IsInstantProcess( contents->GetPrimaryMainFrame()->GetProcess()->GetDeprecatedID()); @@ -97,10 +98,12 @@ void RecordNewTabLoadTime(content::WebContents* contents) { CoreTabHelper* core_tab_helper = CoreTabHelper::FromWebContents(contents); // CoreTabHelper can be null in unittests. - if (!core_tab_helper) + if (!core_tab_helper) { return; - if (core_tab_helper->new_tab_start_time().is_null()) + } + if (core_tab_helper->new_tab_start_time().is_null()) { return; + } core_tab_helper->set_new_tab_start_time(base::TimeTicks()); } @@ -141,18 +144,21 @@ DCHECK(search::IsInstantExtendedAPIEnabled()); instant_service_ = InstantServiceFactory::GetForProfile(profile()); - if (instant_service_) + if (instant_service_) { instant_service_->AddObserver(this); + } OmniboxTabHelper::CreateForWebContents(web_contents); OmniboxTabHelper::FromWebContents(web_contents)->AddObserver(this); } SearchTabHelper::~SearchTabHelper() { - if (instant_service_) + if (instant_service_) { instant_service_->RemoveObserver(this); - if (auto* helper = OmniboxTabHelper::FromWebContents(&GetWebContents())) + } + if (auto* helper = OmniboxTabHelper::FromWebContents(&GetWebContents())) { helper->RemoveObserver(this); + } } void SearchTabHelper::BindEmbeddedSearchConnecter( @@ -160,19 +166,22 @@ receiver, content::RenderFrameHost* rfh) { auto* web_contents = content::WebContents::FromRenderFrameHost(rfh); - if (!web_contents) + if (!web_contents) { return; + } auto* tab_helper = SearchTabHelper::FromWebContents(web_contents); - if (!tab_helper) + if (!tab_helper) { return; + } tab_helper->ipc_router_.BindEmbeddedSearchConnecter(std::move(receiver), rfh); } void SearchTabHelper::OnTabActivated() { ipc_router_.OnTabActivated(); - if (search::IsInstantNTP(web_contents()) && instant_service_) + if (search::IsInstantNTP(web_contents()) && instant_service_) { instant_service_->OnNewTabPageOpened(); + } CloseNTPCustomizeChromeFeaturePromo(); } @@ -183,11 +192,13 @@ void SearchTabHelper::DidStartNavigation( content::NavigationHandle* navigation_handle) { - if (!navigation_handle->IsInPrimaryMainFrame()) + if (!navigation_handle->IsInPrimaryMainFrame()) { return; + } - if (navigation_handle->IsSameDocument()) + if (navigation_handle->IsSameDocument()) { return; + } if (web_contents()->GetVisibleURL().DeprecatedGetOriginAsURL() == GURL(chrome::kChromeUINewTabURL).DeprecatedGetOriginAsURL()) { @@ -209,8 +220,9 @@ } void SearchTabHelper::TitleWasSet(content::NavigationEntry* entry) { - if (is_setting_title_ || !entry) + if (is_setting_title_ || !entry) { return; + } // Always set the title on the new tab page to be the one from our UI // resources. This check ensures that the title is properly set to the string @@ -240,14 +252,17 @@ void SearchTabHelper::NavigationEntryCommitted( const content::LoadCommittedDetails& load_details) { - if (!load_details.is_main_frame) + if (!load_details.is_main_frame) { return; + } - if (search::IsInstantNTP(web_contents())) + if (search::IsInstantNTP(web_contents())) { ipc_router_.SetInputInProgress(IsInputInProgress()); + } - if (InInstantProcess(instant_service_, web_contents())) + if (InInstantProcess(instant_service_, web_contents())) { ipc_router_.OnNavigationEntryCommitted(); + } } void SearchTabHelper::NtpThemeChanged(NtpTheme theme) { @@ -271,19 +286,22 @@ void SearchTabHelper::OnDeleteMostVisitedItem(const GURL& url) { DCHECK(!url.is_empty()); - if (instant_service_) + if (instant_service_) { instant_service_->DeleteMostVisitedItem(url); + } } void SearchTabHelper::OnUndoMostVisitedDeletion(const GURL& url) { DCHECK(!url.is_empty()); - if (instant_service_) + if (instant_service_) { instant_service_->UndoMostVisitedDeletion(url); + } } void SearchTabHelper::OnUndoAllMostVisitedDeletions() { - if (instant_service_) + if (instant_service_) { instant_service_->UndoAllMostVisitedDeletions(); + } } void SearchTabHelper::OnOmniboxInputStateChanged() { @@ -297,8 +315,9 @@ // Don't send oninputstart/oninputend updates in response to focus changes // if there's a navigation in progress. This prevents Chrome from sending // a spurious oninputend when the user accepts a match in the omnibox. - if (web_contents()->GetController().GetPendingEntry() == nullptr) + if (web_contents()->GetController().GetPendingEntry() == nullptr) { ipc_router_.SetInputInProgress(IsInputInProgress()); + } } Profile* SearchTabHelper::profile() const {
diff --git a/chrome/browser/ui/search/search_tab_helper.h b/chrome/browser/ui/search/search_tab_helper.h index 5382635..35e84610 100644 --- a/chrome/browser/ui/search/search_tab_helper.h +++ b/chrome/browser/ui/search/search_tab_helper.h
@@ -32,7 +32,7 @@ namespace content { class WebContents; struct LoadCommittedDetails; -} +} // namespace content namespace gfx { class Image; @@ -120,9 +120,7 @@ // Called when a user confirms deleting an autocomplete match. Note: might be // called synchronously with accepted = true if this feature is disabled // (which defaults the behavior to silent deletions). - void OnDeleteAutocompleteMatchConfirm( - uint8_t line, - bool accepted); + void OnDeleteAutocompleteMatchConfirm(uint8_t line, bool accepted); void CloseNTPCustomizeChromeFeaturePromo();
diff --git a/chrome/browser/ui/search/third_party_ntp_browsertest.cc b/chrome/browser/ui/search/third_party_ntp_browsertest.cc index 49d9564e..289ac01 100644 --- a/chrome/browser/ui/search/third_party_ntp_browsertest.cc +++ b/chrome/browser/ui/search/third_party_ntp_browsertest.cc
@@ -84,7 +84,8 @@ // process-per-site mode for NTP tabs. It seems desirable to preserve this // behavior going forward. // -// [1] https://chromium.googlesource.com/chromium/src/+/09911bf300f1a419907a9412154760efd0b7abc3/chrome/browser/browsing_instance.cc#55 +// [1] +// https://chromium.googlesource.com/chromium/src/+/09911bf300f1a419907a9412154760efd0b7abc3/chrome/browser/browsing_instance.cc#55 IN_PROC_BROWSER_TEST_F(ThirdPartyNTPBrowserTest, ProcessPerSite) { GURL base_url = https_test_server().GetURL("ntp.com", "/instant_extended.html");
diff --git a/chrome/browser/ui/search_engines/edit_search_engine_controller.cc b/chrome/browser/ui/search_engines/edit_search_engine_controller.cc index af4b8e2c..e8bd02cc 100644 --- a/chrome/browser/ui/search_engines/edit_search_engine_controller.cc +++ b/chrome/browser/ui/search_engines/edit_search_engine_controller.cc
@@ -36,8 +36,9 @@ bool EditSearchEngineController::IsURLValid( const std::string& url_input) const { std::string url = GetFixedUpURL(url_input); - if (url.empty()) + if (url.empty()) { return false; + } // Convert |url| to a TemplateURLRef so we can check its validity even if it // contains replacement strings. We do this by constructing a dummy @@ -49,15 +50,16 @@ const TemplateURLRef& template_ref = t_url.url_ref(); TemplateURLService* service = TemplateURLServiceFactory::GetForProfile(profile_); - if (!template_ref.IsValid(service->search_terms_data())) + if (!template_ref.IsValid(service->search_terms_data())) { return false; + } // If this is going to be the default search engine, it must support // replacement. if (!template_ref.SupportsReplacement(service->search_terms_data()) && - template_url_ && - template_url_ == service->GetDefaultSearchProvider()) + template_url_ && template_url_ == service->GetDefaultSearchProvider()) { return false; + } // Replace any search term with a placeholder string and make sure the // resulting URL is valid. @@ -71,18 +73,20 @@ const std::u16string& keyword_input) const { std::u16string keyword_input_trimmed( base::CollapseWhitespace(keyword_input, true)); - if (keyword_input_trimmed.empty()) + if (keyword_input_trimmed.empty()) { return false; // Do not allow empty keyword. + } // The omnibox doesn't properly handle search keywords with whitespace, // so do not allow such keywords. if (keyword_input_trimmed.find_first_of(base::kWhitespaceUTF16) != - std::u16string::npos) + std::u16string::npos) { return false; + } const TemplateURL* turl_with_keyword = - TemplateURLServiceFactory::GetForProfile(profile_)-> - GetTemplateURLForKeyword(keyword_input_trimmed); + TemplateURLServiceFactory::GetForProfile(profile_) + ->GetTemplateURLForKeyword(keyword_input_trimmed); return (!turl_with_keyword || turl_with_keyword == template_url_); } @@ -137,8 +141,9 @@ const std::string& url_input) const { std::u16string url16; base::TrimWhitespace(base::UTF8ToUTF16(url_input), base::TRIM_ALL, &url16); - if (url16.empty()) + if (url16.empty()) { return std::string(); + } std::string url = TemplateURLRef::DisplayURLToURLRef(url16); // Parse the string as a URL to determine the scheme. If we need to, add the @@ -152,8 +157,9 @@ TemplateURLServiceFactory::GetForProfile(profile_)->search_terms_data())); url::Parsed parts; std::string scheme(url_formatter::SegmentURL(expanded_url, &parts)); - if (!parts.scheme.is_valid()) + if (!parts.scheme.is_valid()) { url.insert(0, scheme + "://"); + } return url; }
diff --git a/chrome/browser/ui/search_engines/keyword_editor_controller.cc b/chrome/browser/ui/search_engines/keyword_editor_controller.cc index c6f15997..9634f49 100644 --- a/chrome/browser/ui/search_engines/keyword_editor_controller.cc +++ b/chrome/browser/ui/search_engines/keyword_editor_controller.cc
@@ -51,8 +51,9 @@ // Don't do anything if the entry didn't change. if ((template_url->short_name() == title) && - (template_url->keyword() == keyword) && (template_url->url() == url)) + (template_url->keyword() == keyword) && (template_url->url() == url)) { return; + } table_model_->ModifyTemplateURL(index.value(), title, keyword, url);
diff --git a/chrome/browser/ui/search_engines/keyword_editor_controller.h b/chrome/browser/ui/search_engines/keyword_editor_controller.h index 1cf89a2..5530293 100644 --- a/chrome/browser/ui/search_engines/keyword_editor_controller.h +++ b/chrome/browser/ui/search_engines/keyword_editor_controller.h
@@ -93,9 +93,7 @@ // Return the TemplateURL corresponding to the |index| in the model. TemplateURL* GetTemplateURL(int index); - TemplateURLTableModel* table_model() { - return table_model_.get(); - } + TemplateURLTableModel* table_model() { return table_model_.get(); } private: raw_ptr<TemplateURLService> url_model_;
diff --git a/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc b/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc index 78da702..980b9fe 100644 --- a/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc +++ b/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc
@@ -49,10 +49,11 @@ model_changed_count_(0) {} void SetUp() override { - if (simulate_load_failure_) + if (simulate_load_failure_) { util_.model()->OnWebDataServiceRequestDone(0, nullptr); - else + } else { util_.VerifyLoad(); + } controller_ = std::make_unique<KeywordEditorController>(&profile_); controller_->table_model()->SetObserver(this); @@ -125,8 +126,9 @@ // Verify the observer was notified. VerifyChanged(); - if (HasFatalFailure()) + if (HasFatalFailure()) { return; + } // Verify the TableModel has the new data. ASSERT_EQ(original_row_count + 1, table_model()->RowCount());
diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc b/chrome/browser/ui/search_engines/search_engine_tab_helper.cc index 8fd09ba..bea3156 100644 --- a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc +++ b/chrome/browser/ui/search_engines/search_engine_tab_helper.cc
@@ -46,15 +46,18 @@ mojo::PendingReceiver<chrome::mojom::OpenSearchDescriptionDocumentHandler> receiver) { // Bind only for outermost main frames. - if (rfh->GetParentOrOuterDocument()) + if (rfh->GetParentOrOuterDocument()) { return; + } auto* web_contents = content::WebContents::FromRenderFrameHost(rfh); - if (!web_contents) + if (!web_contents) { return; + } auto* tab_helper = SearchEngineTabHelper::FromWebContents(web_contents); - if (!tab_helper) + if (!tab_helper) { return; + } tab_helper->osdd_handler_receivers_.Add(tab_helper, std::move(receiver)); } @@ -73,16 +76,18 @@ NavigationEntry* entry) { // Don't autogenerate keywords for pages that are the result of form // submissions. - if (IsFormSubmit(entry)) + if (IsFormSubmit(entry)) { return std::u16string(); + } // We want to use the user typed URL if available since that represents what // the user typed to get here, and fall back on the regular URL if not. GURL url = entry->GetUserTypedURL(); if (!url.is_valid()) { url = entry->GetURL(); - if (!url.is_valid()) + if (!url.is_valid()) { return std::u16string(); + } } // Don't autogenerate keywords for referrers that @@ -121,15 +126,17 @@ // When |page_url| has file: scheme, this method doesn't work because of // http://b/issue?id=863583. For that reason, this doesn't check and allow // urls referring to osdd urls with same schemes. - if (!osdd_url.is_valid() || !osdd_url.SchemeIsHTTPOrHTTPS()) + if (!osdd_url.is_valid() || !osdd_url.SchemeIsHTTPOrHTTPS()) { return; + } Profile* profile = Profile::FromBrowserContext(web_contents()->GetBrowserContext()); if (page_url != web_contents()->GetLastCommittedURL() || !TemplateURLFetcherFactory::GetForProfile(profile) || - profile->IsOffTheRecord()) + profile->IsOffTheRecord()) { return; + } // If the current page is a form submit, find the last page that was not a // form submit and use its url to generate the keyword from. @@ -137,16 +144,19 @@ NavigationEntry* entry = controller.GetLastCommittedEntry(); for (int index = controller.GetLastCommittedEntryIndex(); (index > 0) && IsFormSubmit(entry); - entry = controller.GetEntryAtIndex(index)) + entry = controller.GetEntryAtIndex(index)) { --index; - if (!entry || IsFormSubmit(entry)) + } + if (!entry || IsFormSubmit(entry)) { return; + } // Autogenerate a keyword for the autodetected case; in the other cases we'll // generate a keyword later after fetching the OSDD. std::u16string keyword = GenerateKeywordFromNavigationEntry(entry); - if (keyword.empty()) + if (keyword.empty()) { return; + } auto* frame = web_contents()->GetPrimaryMainFrame(); mojo::Remote<network::mojom::URLLoaderFactory> url_loader_factory; @@ -172,20 +182,23 @@ Profile::FromBrowserContext(web_contents()->GetBrowserContext()); TemplateURLService* url_service = TemplateURLServiceFactory::GetForProfile(profile); - if (url_service && url_service->loaded()) + if (url_service && url_service->loaded()) { url_service->UpdateProviderFavicons(driver->GetActiveURL(), icon_url); + } } void SearchEngineTabHelper::GenerateKeywordIfNecessary( content::NavigationHandle* handle) { if (!handle->IsInPrimaryMainFrame() || - !handle->GetSearchableFormURL().is_valid()) + !handle->GetSearchableFormURL().is_valid()) { return; + } Profile* profile = Profile::FromBrowserContext(web_contents()->GetBrowserContext()); - if (profile->IsOffTheRecord()) + if (profile->IsOffTheRecord()) { return; + } NavigationController& controller = web_contents()->GetController(); int last_index = controller.GetLastCommittedEntryIndex(); @@ -193,18 +206,21 @@ // normally due to a form submit that opened in a new tab. // TODO(brettw) bug 916126: we should support keywords when form submits // happen in new tabs. - if (last_index <= 0) + if (last_index <= 0) { return; + } std::u16string keyword(GenerateKeywordFromNavigationEntry( controller.GetEntryAtIndex(last_index - 1))); - if (keyword.empty()) + if (keyword.empty()) { return; + } TemplateURLService* url_service = TemplateURLServiceFactory::GetForProfile(profile); - if (!url_service) + if (!url_service) { return; + } if (!url_service->loaded()) { url_service->Load(); @@ -212,8 +228,9 @@ } GURL url = handle->GetSearchableFormURL(); - if (!url_service->CanAddAutogeneratedKeyword(keyword, url)) + if (!url_service->CanAddAutogeneratedKeyword(keyword, url)) { return; + } TemplateURLData data; data.SetShortName(keyword);
diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper_browsertest.cc b/chrome/browser/ui/search_engines/search_engine_tab_helper_browsertest.cc index e2b55a6e..ba2b70e 100644 --- a/chrome/browser/ui/search_engines/search_engine_tab_helper_browsertest.cc +++ b/chrome/browser/ui/search_engines/search_engine_tab_helper_browsertest.cc
@@ -39,8 +39,9 @@ std::unique_ptr<HttpResponse> HandleRequest(const std::string& match_path, const std::string& osdd_xml_url, const HttpRequest& request) { - if (!match_path.empty() && request.GetURL().path() != match_path) + if (!match_path.empty() && request.GetURL().path() != match_path) { return nullptr; + } std::string html = base::StringPrintf( "<html>" @@ -84,13 +85,15 @@ testing::AssertionResult VerifyTemplateURLServiceLoad( TemplateURLService* service) { - if (service->loaded()) + if (service->loaded()) { return testing::AssertionSuccess(); + } base::RunLoop runner; TemplateURLServiceObserver observer(service, &runner); runner.Run(); - if (service->loaded()) + if (service->loaded()) { return testing::AssertionSuccess(); + } return testing::AssertionFailure() << "TemplateURLService isn't loaded"; } @@ -141,8 +144,9 @@ class TestSearchEngineTabHelper : public SearchEngineTabHelper { public: static void CreateForWebContents(content::WebContents* contents) { - if (FromWebContents(contents)) + if (FromWebContents(contents)) { return; + } contents->SetUserData( UserDataKey(), std::make_unique<TestSearchEngineTabHelper>(contents)); } @@ -154,8 +158,9 @@ content::NavigationEntry* entry) override { std::u16string keyword = SearchEngineTabHelper::GenerateKeywordFromNavigationEntry(entry); - if (!keyword.empty()) + if (!keyword.empty()) { return keyword; + } const std::u16string kTestKeyword(u"TestKeyword"); return kTestKeyword;
diff --git a/chrome/browser/ui/search_engines/template_url_table_model.cc b/chrome/browser/ui/search_engines/template_url_table_model.cc index 0cef6e0..29257681 100644 --- a/chrome/browser/ui/search_engines/template_url_table_model.cc +++ b/chrome/browser/ui/search_engines/template_url_table_model.cc
@@ -152,8 +152,9 @@ std::move(extension_entries.begin(), extension_entries.end(), std::back_inserter(entries_)); - if (observer_) + if (observer_) { observer_->OnModelChanged(); + } } size_t TemplateURLTableModel::RowCount() { @@ -169,9 +170,10 @@ // since those should always be displayed LTR. Please refer to // http://crbug.com/6726 for more information. base::i18n::AdjustStringForLocaleDirection(&url_short_name); - return (template_url_service_->GetDefaultSearchProvider() == url) ? - l10n_util::GetStringFUTF16(IDS_SEARCH_ENGINES_EDITOR_DEFAULT_ENGINE, - url_short_name) : url_short_name; + return (template_url_service_->GetDefaultSearchProvider() == url) + ? l10n_util::GetStringFUTF16( + IDS_SEARCH_ENGINES_EDITOR_DEFAULT_ENGINE, url_short_name) + : url_short_name; } DCHECK_EQ(IDS_SEARCH_ENGINES_EDITOR_KEYWORD_COLUMN, col_id); @@ -239,8 +241,9 @@ std::optional<size_t> TemplateURLTableModel::IndexOfTemplateURL( const TemplateURL* template_url) { for (auto i = entries_.begin(); i != entries_.end(); ++i) { - if (*i == template_url) + if (*i == template_url) { return static_cast<size_t>(i - entries_.begin()); + } } return std::nullopt; } @@ -253,8 +256,9 @@ TemplateURL* keyword = GetTemplateURL(index); const TemplateURL* current_default = template_url_service_->GetDefaultSearchProvider(); - if (current_default == keyword) + if (current_default == keyword) { return; + } template_url_service_->SetUserSelectedDefaultSearchProvider(keyword, choice_location);
diff --git a/chrome/browser/ui/search_engines/template_url_table_model.h b/chrome/browser/ui/search_engines/template_url_table_model.h index aa6c76f6..b0a2d41 100644 --- a/chrome/browser/ui/search_engines/template_url_table_model.h +++ b/chrome/browser/ui/search_engines/template_url_table_model.h
@@ -32,7 +32,7 @@ // together) and are followed by generated keywords. class TemplateURLTableModel : public ui::TableModel, - TemplateURLServiceObserver { + TemplateURLServiceObserver { public: explicit TemplateURLTableModel(TemplateURLService* template_url_service); @@ -127,5 +127,4 @@ size_t last_other_engine_index_; }; - #endif // CHROME_BROWSER_UI_SEARCH_ENGINES_TEMPLATE_URL_TABLE_MODEL_H_
diff --git a/chrome/browser/ui/send_tab_to_self/send_tab_to_self_toolbar_icon_controller.h b/chrome/browser/ui/send_tab_to_self/send_tab_to_self_toolbar_icon_controller.h index 13d1d13..e6ca8d8 100644 --- a/chrome/browser/ui/send_tab_to_self/send_tab_to_self_toolbar_icon_controller.h +++ b/chrome/browser/ui/send_tab_to_self/send_tab_to_self_toolbar_icon_controller.h
@@ -39,7 +39,6 @@ // BrowserListObserver implementation void OnBrowserSetLastActive(Browser* browser) override; - void AddDelegate(SendTabToSelfToolbarIconControllerDelegate* delegate); void RemoveDelegate(SendTabToSelfToolbarIconControllerDelegate* delegate);
diff --git a/chrome/browser/ui/serial/serial_chooser_controller.cc b/chrome/browser/ui/serial/serial_chooser_controller.cc index 6fca6f4..2726e97 100644 --- a/chrome/browser/ui/serial/serial_chooser_controller.cc +++ b/chrome/browser/ui/serial/serial_chooser_controller.cc
@@ -116,8 +116,9 @@ } SerialChooserController::~SerialChooserController() { - if (callback_) + if (callback_) { RunCallback(/*port=*/nullptr); + } } const device::mojom::SerialPortInfo& SerialChooserController::GetPortForTest( @@ -226,8 +227,9 @@ bool SerialChooserController::IsPaired(size_t index) const { DCHECK_LE(index, ports_.size()); - if (!chooser_context_) + if (!chooser_context_) { return false; + } return chooser_context_->HasPortPermission(origin_, *ports_[index]); } @@ -278,8 +280,9 @@ auto* web_contents = rfh && rfh->IsActive() ? content::WebContents::FromRenderFrameHost(rfh) : nullptr; - if (!web_contents) + if (!web_contents) { return; + } web_contents->OpenURL( content::OpenURLParams( @@ -333,12 +336,14 @@ void SerialChooserController::OnPortAdded( const device::mojom::SerialPortInfo& port) { - if (!DisplayDevice(port)) + if (!DisplayDevice(port)) { return; + } ports_.push_back(port.Clone()); - if (view()) + if (view()) { view()->OnOptionAdded(ports_.size() - 1); + } } void SerialChooserController::OnPortRemoved( @@ -348,8 +353,9 @@ if (it != ports_.end()) { const size_t index = it - ports_.begin(); ports_.erase(it); - if (view()) + if (view()) { view()->OnOptionRemoved(index); + } } } @@ -367,12 +373,14 @@ ports_.clear(); for (auto& port : ports) { - if (DisplayDevice(*port)) + if (DisplayDevice(*port)) { ports_.push_back(std::move(port)); + } } - if (view()) + if (view()) { view()->OnOptionsInitialized(); + } } bool SerialChooserController::DisplayDevice(
diff --git a/chrome/browser/ui/settings_window_manager_browsertest_chromeos.cc b/chrome/browser/ui/settings_window_manager_browsertest_chromeos.cc index ca0d299b..462ea1f94 100644 --- a/chrome/browser/ui/settings_window_manager_browsertest_chromeos.cc +++ b/chrome/browser/ui/settings_window_manager_browsertest_chromeos.cc
@@ -75,8 +75,9 @@ void CloseNonDefaultBrowsers() { std::list<Browser*> browsers_to_close; for (Browser* b : *BrowserList::GetInstance()) { - if (b != browser()) + if (b != browser()) { browsers_to_close.push_back(b); + } } for (std::list<Browser*>::iterator iter = browsers_to_close.begin(); iter != browsers_to_close.end(); ++iter) {
diff --git a/chrome/browser/ui/settings_window_manager_chromeos.cc b/chrome/browser/ui/settings_window_manager_chromeos.cc index 29cab63..e76a0785 100644 --- a/chrome/browser/ui/settings_window_manager_chromeos.cc +++ b/chrome/browser/ui/settings_window_manager_chromeos.cc
@@ -206,8 +206,9 @@ } auto iter = settings_session_map_.find(profile); - if (iter != settings_session_map_.end()) + if (iter != settings_session_map_.end()) { return chrome::FindBrowserWithID(iter->second); + } return nullptr; } @@ -217,8 +218,9 @@ Profile* profile = browser->profile(); if (!UseDeprecatedSettingsWindow(profile)) { - if (!browser->app_controller()) + if (!browser->app_controller()) { return false; + } // TODO(calamity): Determine whether, during startup, we need to wait for // app install and then provide a valid answer here.
diff --git a/chrome/browser/ui/shared_highlighting/shared_highlighting_promo.cc b/chrome/browser/ui/shared_highlighting/shared_highlighting_promo.cc index b801fb7..a07e6dd 100644 --- a/chrome/browser/ui/shared_highlighting/shared_highlighting_promo.cc +++ b/chrome/browser/ui/shared_highlighting/shared_highlighting_promo.cc
@@ -47,8 +47,9 @@ return; } - if (HasTextFragment(validated_url.spec())) + if (HasTextFragment(validated_url.spec())) { CheckExistingSelectors(render_frame_host); + } } void SharedHighlightingPromo::CheckExistingSelectors( @@ -67,8 +68,9 @@ } bool SharedHighlightingPromo::HasTextFragment(std::string url) { - if (url.empty()) + if (url.empty()) { return false; + } return url.find(":~:text=") != std::string::npos; }
diff --git a/chrome/browser/ui/sharing_hub/screenshot/screenshot_captured_bubble_controller.cc b/chrome/browser/ui/sharing_hub/screenshot/screenshot_captured_bubble_controller.cc index 6c73e27c..bdba9ad 100644 --- a/chrome/browser/ui/sharing_hub/screenshot/screenshot_captured_bubble_controller.cc +++ b/chrome/browser/ui/sharing_hub/screenshot/screenshot_captured_bubble_controller.cc
@@ -58,8 +58,9 @@ callback = base::BindOnce( [](base::WeakPtr<content::WebContents> web_contents, const image_editor::ScreenshotCaptureResult& image) { - if (image.image.IsEmpty() || !web_contents) + if (image.image.IsEmpty() || !web_contents) { return; + } sharing_hub::ScreenshotCapturedBubbleController* controller = sharing_hub::ScreenshotCapturedBubbleController::Get( web_contents.get());
diff --git a/chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller_chromeos_impl.cc b/chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller_chromeos_impl.cc index 38b25e9..efade88b 100644 --- a/chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller_chromeos_impl.cc +++ b/chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller_chromeos_impl.cc
@@ -59,8 +59,9 @@ // Ignore subsequent calls to open the Sharesheet if it already is open. This // is especially for the Nearby Share dialog, where clicking outside of it // will not dismiss the dialog. - if (bubble_showing_) + if (bubble_showing_) { return; + } bubble_showing_ = true; ShowSharesheet(browser->window()->GetSharingHubIconButton()); @@ -119,16 +120,18 @@ SharingHubBubbleControllerChromeOsImpl::GetSharesheetService() { Profile* const profile = Profile::FromBrowserContext(GetWebContents().GetBrowserContext()); - if (!profile) + if (!profile) { return nullptr; + } return sharesheet::SharesheetServiceFactory::GetForProfile(profile); } void SharingHubBubbleControllerChromeOsImpl::ShowSharesheetAsh() { sharesheet::SharesheetService* sharesheet_service = GetSharesheetService(); - if (!sharesheet_service) + if (!sharesheet_service) { return; + } apps::IntentPtr intent = apps_util::MakeShareIntent( GetWebContents().GetLastCommittedURL().spec(), @@ -144,13 +147,15 @@ void SharingHubBubbleControllerChromeOsImpl::CloseSharesheetAsh() { sharesheet::SharesheetService* sharesheet_service = GetSharesheetService(); - if (!sharesheet_service) + if (!sharesheet_service) { return; + } sharesheet::SharesheetController* sharesheet_controller = sharesheet_service->GetSharesheetController(parent_window_); - if (!sharesheet_controller) + if (!sharesheet_controller) { return; + } sharesheet_controller->CloseBubble(sharesheet::SharesheetResult::kCancel); } @@ -165,13 +170,15 @@ } void SharingHubBubbleControllerChromeOsImpl::DeselectIcon() { - if (!highlighted_button_tracker_.view()) + if (!highlighted_button_tracker_.view()) { return; + } views::Button* button = views::Button::AsButton(highlighted_button_tracker_.view()); - if (button) + if (button) { button->SetHighlighted(false); + } } SharingHubBubbleControllerChromeOsImpl::SharingHubBubbleControllerChromeOsImpl(
diff --git a/chrome/browser/ui/side_search/side_search_prefs.cc b/chrome/browser/ui/side_search/side_search_prefs.cc index 5f61168..90873d89 100644 --- a/chrome/browser/ui/side_search/side_search_prefs.cc +++ b/chrome/browser/ui/side_search/side_search_prefs.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/side_search/side_search_prefs.h" + #include "components/pref_registry/pref_registry_syncable.h" #include "components/prefs/pref_registry_simple.h"
diff --git a/chrome/browser/ui/singleton_tabs.cc b/chrome/browser/ui/singleton_tabs.cc index d2705747..8e1e375e 100644 --- a/chrome/browser/ui/singleton_tabs.cc +++ b/chrome/browser/ui/singleton_tabs.cc
@@ -97,8 +97,9 @@ // the URL specified in |params|. int GetIndexOfExistingTab(Browser* browser, const NavigateParams& params) { if (params.disposition != WindowOpenDisposition::SINGLETON_TAB && - params.disposition != WindowOpenDisposition::SWITCH_TO_TAB) + params.disposition != WindowOpenDisposition::SWITCH_TO_TAB) { return -1; + } // In case the URL was rewritten by the BrowserURLHandler we need to ensure // that we do not open another URL that will get redirected to the rewritten @@ -156,8 +157,9 @@ // When tab switching, only look at same profile and anonymity level. if (profile == browser->profile() && !browser->is_delete_scheduled()) { int index = GetIndexOfExistingTab(browser, params); - if (index >= 0) + if (index >= 0) { return {browser, index}; + } } } return {nullptr, -1};
diff --git a/chrome/browser/ui/singleton_tabs_unittest.cc b/chrome/browser/ui/singleton_tabs_unittest.cc index da670f3a..037257a 100644 --- a/chrome/browser/ui/singleton_tabs_unittest.cc +++ b/chrome/browser/ui/singleton_tabs_unittest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/singleton_tabs.h" + #include "chrome/browser/ui/browser_navigator_params.h" #include "chrome/test/base/browser_with_test_window_test.h"
diff --git a/chrome/browser/ui/startup/bad_flags_prompt.cc b/chrome/browser/ui/startup/bad_flags_prompt.cc index d128f39c..55dbc77 100644 --- a/chrome/browser/ui/startup/bad_flags_prompt.cc +++ b/chrome/browser/ui/startup/bad_flags_prompt.cc
@@ -232,8 +232,9 @@ const char* flag) { std::string switch_value = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(flag); - if (!switch_value.empty()) + if (!switch_value.empty()) { switch_value = "=" + switch_value; + } ShowBadFlagsInfoBarHelper(web_contents, message_id, std::string("--") + flag + switch_value); }
diff --git a/chrome/browser/ui/startup/credential_provider_signin_dialog_win.cc b/chrome/browser/ui/startup/credential_provider_signin_dialog_win.cc index 197882a..bbc7897 100644 --- a/chrome/browser/ui/startup/credential_provider_signin_dialog_win.cc +++ b/chrome/browser/ui/startup/credential_provider_signin_dialog_win.cc
@@ -168,8 +168,9 @@ void AbortIfPossible() { // If the callback was already called, ignore. - if (!signin_callback_) + if (!signin_callback_) { return; + } // Build a result for the credential provider that includes only the abort // exit code. @@ -230,8 +231,9 @@ // user presses Escape right after finishing the signin process, the // Escape is processed first by AbortIfPossible(), and the signin then // completes before WriteResultToHandleWithKeepAlive() executes. - if (!signin_callback_) + if (!signin_callback_) { return; + } int exit_code; base::Value::Dict signin_result = ParseArgs(args, &exit_code); @@ -314,8 +316,9 @@ base_url, credential_provider::kShowTosSwitch, show_tos_); } - if (email_domains_.empty()) + if (email_domains_.empty()) { return base_url; + } return net::AppendQueryParameter( base_url, credential_provider::kEmailDomainsSigninPromoParameter, @@ -429,8 +432,9 @@ bool CanStartGCPWSignin() { #if BUILDFLAG(CAN_TEST_GCPW_SIGNIN_STARTUP) - if (g_enable_gcpw_signin_during_tests) + if (g_enable_gcpw_signin_during_tests) { return true; + } #endif // BUILDFLAG(CAN_TEST_GCPW_SIGNIN_STARTUP) // Ensure that we are running under a "winlogon" desktop before starting the // gcpw sign in dialog.
diff --git a/chrome/browser/ui/startup/credential_provider_signin_dialog_win_browsertest.cc b/chrome/browser/ui/startup/credential_provider_signin_dialog_win_browsertest.cc index d6e64c28..d883b7f3 100644 --- a/chrome/browser/ui/startup/credential_provider_signin_dialog_win_browsertest.cc +++ b/chrome/browser/ui/startup/credential_provider_signin_dialog_win_browsertest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/startup/credential_provider_signin_dialog_win.h" + #include "base/command_line.h" #include "base/functional/bind.h" #include "base/json/json_reader.h" @@ -10,7 +12,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/startup/buildflags.h" -#include "chrome/browser/ui/startup/credential_provider_signin_dialog_win.h" #include "chrome/browser/ui/startup/credential_provider_signin_dialog_win_test_data.h" #include "chrome/browser/ui/test/test_browser_dialog.h" #include "chrome/credential_provider/common/gcp_strings.h" @@ -34,8 +35,9 @@ idle_closure_(std::move(idle_closure)) {} void DidStopLoading() override { - if (idle_closure_) + if (idle_closure_) { std::move(idle_closure_).Run(); + } } base::OnceClosure idle_closure_; @@ -169,8 +171,9 @@ signin_complete_called_ = true; result_dict_ = std::move(signin_result); - if (signin_complete_closure_) + if (signin_complete_closure_) { std::move(signin_complete_closure_).Run(); + } } IN_PROC_BROWSER_TEST_F(CredentialProviderSigninDialogWinDialogTest,
diff --git a/chrome/browser/ui/startup/credential_provider_signin_dialog_win_test_data.cc b/chrome/browser/ui/startup/credential_provider_signin_dialog_win_test_data.cc index fb328bf..83856987 100644 --- a/chrome/browser/ui/startup/credential_provider_signin_dialog_win_test_data.cc +++ b/chrome/browser/ui/startup/credential_provider_signin_dialog_win_test_data.cc
@@ -3,11 +3,11 @@ // found in the LICENSE file. #include "chrome/browser/ui/startup/credential_provider_signin_dialog_win_test_data.h" -#include "chrome/credential_provider/common/gcp_strings.h" #include <string> #include "base/json/json_writer.h" +#include "chrome/credential_provider/common/gcp_strings.h" const char CredentialProviderSigninDialogTestDataStorage::kInvalidTokenInfoResponse[] = @@ -75,16 +75,21 @@ const std::string& access_token, const std::string& refresh_token) { base::Value::Dict args; - if (!email.empty()) + if (!email.empty()) { args.Set(credential_provider::kKeyEmail, email); - if (!password.empty()) + } + if (!password.empty()) { args.Set(credential_provider::kKeyPassword, password); - if (!id.empty()) + } + if (!id.empty()) { args.Set(credential_provider::kKeyId, id); - if (!refresh_token.empty()) + } + if (!refresh_token.empty()) { args.Set(credential_provider::kKeyRefreshToken, refresh_token); - if (!access_token.empty()) + } + if (!access_token.empty()) { args.Set(credential_provider::kKeyAccessToken, access_token); + } args.Set(credential_provider::kKeyExitCode, credential_provider::kUiecSuccess);
diff --git a/chrome/browser/ui/startup/credential_provider_signin_info_fetcher_win.cc b/chrome/browser/ui/startup/credential_provider_signin_info_fetcher_win.cc index 67a98f2..ade8602 100644 --- a/chrome/browser/ui/startup/credential_provider_signin_info_fetcher_win.cc +++ b/chrome/browser/ui/startup/credential_provider_signin_info_fetcher_win.cc
@@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/startup/credential_provider_signin_info_fetcher_win.h" + #include <memory> #include <utility> #include <vector> -#include "chrome/browser/ui/startup/credential_provider_signin_info_fetcher_win.h" - #include "base/logging.h" #include "base/strings/string_split.h" #include "base/syslog_logging.h"
diff --git a/chrome/browser/ui/startup/credential_provider_signin_info_fetcher_win_unittest.cc b/chrome/browser/ui/startup/credential_provider_signin_info_fetcher_win_unittest.cc index 40af532..48162e7 100644 --- a/chrome/browser/ui/startup/credential_provider_signin_info_fetcher_win_unittest.cc +++ b/chrome/browser/ui/startup/credential_provider_signin_info_fetcher_win_unittest.cc
@@ -4,8 +4,6 @@ #include "chrome/browser/ui/startup/credential_provider_signin_info_fetcher_win.h" -#include "chrome/browser/ui/startup/credential_provider_signin_dialog_win_test_data.h" - #include <string> #include <utility> #include <vector> @@ -16,6 +14,7 @@ #include "base/strings/string_util.h" #include "base/test/bind.h" #include "base/test/task_environment.h" +#include "chrome/browser/ui/startup/credential_provider_signin_dialog_win_test_data.h" #include "google_apis/gaia/gaia_urls.h" #include "google_apis/gaia/oauth2_access_token_fetcher_impl.h" #include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h"
diff --git a/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_browsertest.cc b/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_browsertest.cc index 6cf85ae..ec3160d 100644 --- a/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_browsertest.cc +++ b/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_browsertest.cc
@@ -19,7 +19,7 @@ #include "testing/gtest/include/gtest/gtest.h" class DefaultBrowserPromptBrowserTest : public InProcessBrowserTest { -public: + public: static constexpr char kStudyTestGroupName[] = "test_group_1"; void SetUp() override { @@ -35,9 +35,9 @@ {{}}); } - PrefService *local_state() { return g_browser_process->local_state(); } + PrefService* local_state() { return g_browser_process->local_state(); } -private: + private: base::test::ScopedFeatureList scoped_feature_list; };
diff --git a/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_interactive_uitest.cc b/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_interactive_uitest.cc index 0f49989..798314f 100644 --- a/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_interactive_uitest.cc +++ b/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_interactive_uitest.cc
@@ -28,11 +28,11 @@ namespace { DEFINE_LOCAL_ELEMENT_IDENTIFIER_VALUE(kSecondTabContents); -} // namespace +} // namespace class DefaultBrowserPromptInteractiveTest : public WebUiInteractiveTestMixin<InteractiveBrowserTest> { -public: + public: void SetUp() override { scoped_feature_list_.InitAndEnableFeatureWithParameters( features::kDefaultBrowserPromptRefresh, @@ -44,10 +44,10 @@ InteractiveBrowserTest::SetUp(); } - static base::OnceCallback<bool(AppMenuButton *)> + static base::OnceCallback<bool(AppMenuButton*)> IsAppMenuChipDefaultBrowserPromptShowing(bool showing) { return base::BindOnce( - [](bool showing, AppMenuButton *app_menu_button) { + [](bool showing, AppMenuButton* app_menu_button) { return showing == (app_menu_button->GetText() == l10n_util::GetStringUTF16( IDS_APP_MENU_BUTTON_DEFAULT_PROMPT)); @@ -61,14 +61,14 @@ exists ? EnsurePresent(AppMenuModel::kSetBrowserAsDefaultMenuItem) : EnsureNotPresent(AppMenuModel::kSetBrowserAsDefaultMenuItem), WithView(kToolbarAppMenuButtonElementId, - [](AppMenuButton *app_menu_button) { + [](AppMenuButton* app_menu_button) { app_menu_button->CloseMenu(); })); } - InteractiveTestApi::MultiStep - RemovesAllBrowserDefaultPromptsWhen(InteractiveTestApi::MultiStep steps, - bool preserve_app_menu_item = false) { + InteractiveTestApi::MultiStep RemovesAllBrowserDefaultPromptsWhen( + InteractiveTestApi::MultiStep steps, + bool preserve_app_menu_item = false) { return Steps(WaitForShow(ConfirmInfoBar::kInfoBarElementId), WaitForShow(kToolbarAppMenuButtonElementId), CheckView(kToolbarAppMenuButtonElementId, @@ -86,7 +86,7 @@ DoesAppMenuItemExist(preserve_app_menu_item)); } -private: + private: base::test::ScopedFeatureList scoped_feature_list_; }; @@ -135,7 +135,7 @@ class DefaultBrowserPromptInteractiveTestWithAppMenuDuration : public DefaultBrowserPromptInteractiveTest { -public: + public: void SetUp() override { scoped_feature_list_.InitAndEnableFeatureWithParameters( features::kDefaultBrowserPromptRefresh, @@ -147,7 +147,7 @@ InteractiveBrowserTest::SetUp(); } -private: + private: base::test::ScopedFeatureList scoped_feature_list_; };
diff --git a/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_manager.cc b/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_manager.cc index fa7f7ad5..008c3b9 100644 --- a/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_manager.cc +++ b/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_manager.cc
@@ -27,7 +27,7 @@ namespace { #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) bool ShouldShowPrompts() { - PrefService *local_state = g_browser_process->local_state(); + PrefService* local_state = g_browser_process->local_state(); const int declined_count = local_state->GetInteger(prefs::kDefaultBrowserDeclinedCount); @@ -55,17 +55,17 @@ return (base::Time::Now() - last_declined_time) > reprompt_duration; } #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) -} // namespace +} // namespace // static -DefaultBrowserPromptManager *DefaultBrowserPromptManager::GetInstance() { +DefaultBrowserPromptManager* DefaultBrowserPromptManager::GetInstance() { return base::Singleton<DefaultBrowserPromptManager>::get(); } -void DefaultBrowserPromptManager::AddObserver(Observer *observer) { +void DefaultBrowserPromptManager::AddObserver(Observer* observer) { observers_.AddObserver(observer); } -void DefaultBrowserPromptManager::RemoveObserver(Observer *observer) { +void DefaultBrowserPromptManager::RemoveObserver(Observer* observer) { observers_.RemoveObserver(observer); } @@ -113,7 +113,8 @@ DefaultBrowserPromptManager::~DefaultBrowserPromptManager() = default; void DefaultBrowserPromptManager::CreateInfoBarForWebContents( - content::WebContents *web_contents, Profile *profile) { + content::WebContents* web_contents, + Profile* profile) { // Ensure that an infobar hasn't already been created. CHECK(!infobars_.contains(web_contents)); @@ -129,9 +130,9 @@ infobars_[web_contents] = infobar; - static_cast<ConfirmInfoBarDelegate *>(infobar->delegate())->AddObserver(this); + static_cast<ConfirmInfoBarDelegate*>(infobar->delegate())->AddObserver(this); - auto *infobar_manager = + auto* infobar_manager = infobars::ContentInfoBarManager::FromWebContents(web_contents); infobar_manager->AddObserver(this); } @@ -139,7 +140,7 @@ void DefaultBrowserPromptManager::CloseAllInfoBars() { browser_tab_strip_tracker_.reset(); - for (const auto &infobars_entry : infobars_) { + for (const auto& infobars_entry : infobars_) { infobars_entry.second->owner()->RemoveObserver(this); infobars_entry.second->RemoveSelf(); } @@ -153,7 +154,7 @@ } if (show) { - PrefService *local_state = g_browser_process->local_state(); + PrefService* local_state = g_browser_process->local_state(); base::TimeDelta app_menu_remaining_duration; if (local_state->FindPreference(prefs::kDefaultBrowserFirstShownTime) ->IsDefaultValue()) { @@ -190,7 +191,7 @@ } show_app_menu_prompt_ = show; - for (auto &obs : observers_) { + for (auto& obs : observers_) { obs.OnShowAppMenuPromptChanged(); } } @@ -199,17 +200,18 @@ show_app_menu_item_ = show; } -bool DefaultBrowserPromptManager::ShouldTrackBrowser(Browser *browser) { +bool DefaultBrowserPromptManager::ShouldTrackBrowser(Browser* browser) { return browser->is_type_normal() && !browser->profile()->IsIncognitoProfile() && !browser->profile()->IsGuestSession(); } void DefaultBrowserPromptManager::OnTabStripModelChanged( - TabStripModel *tab_strip_model, const TabStripModelChange &change, - const TabStripSelectionChange &selection) { + TabStripModel* tab_strip_model, + const TabStripModelChange& change, + const TabStripSelectionChange& selection) { if (change.type() == TabStripModelChange::kInserted) { - for (const auto &contents : change.GetInsert()->contents) { + for (const auto& contents : change.GetInsert()->contents) { if (!base::Contains(infobars_, contents.contents)) { CreateInfoBarForWebContents(contents.contents, tab_strip_model->profile()); @@ -218,7 +220,7 @@ } } -void DefaultBrowserPromptManager::OnInfoBarRemoved(infobars::InfoBar *infobar, +void DefaultBrowserPromptManager::OnInfoBarRemoved(infobars::InfoBar* infobar, bool animate) { auto infobars_entry = base::ranges::find( infobars_, infobar, &decltype(infobars_)::value_type::second); @@ -228,7 +230,7 @@ infobar->owner()->RemoveObserver(this); infobars_.erase(infobars_entry); - static_cast<ConfirmInfoBarDelegate *>(infobar->delegate()) + static_cast<ConfirmInfoBarDelegate*>(infobar->delegate()) ->RemoveObserver(this); if (user_initiated_info_bar_close_pending_.has_value()) {
diff --git a/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_manager.h b/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_manager.h index 5593ecc..586e786 100644 --- a/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_manager.h +++ b/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_manager.h
@@ -99,4 +99,4 @@ base::OneShotTimer app_menu_prompt_dismiss_timer_; }; -#endif // CHROME_BROWSER_UI_STARTUP_DEFAULT_BROWSER_PROMPT_DEFAULT_BROWSER_PROMPT_MANAGER_H_ +#endif // CHROME_BROWSER_UI_STARTUP_DEFAULT_BROWSER_PROMPT_DEFAULT_BROWSER_PROMPT_MANAGER_H_
diff --git a/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_manager_unittest.cc b/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_manager_unittest.cc index e422a25..0da7aff 100644 --- a/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_manager_unittest.cc +++ b/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_manager_unittest.cc
@@ -25,23 +25,23 @@ namespace { class DefaultBrowserPromptManagerObserver : public DefaultBrowserPromptManager::Observer { -public: + public: MOCK_METHOD(void, OnShowAppMenuPromptChanged, (), (override)); }; class InfoBarManagerObserver : public infobars::InfoBarManager::Observer { -public: + public: MOCK_METHOD(void, OnInfoBarAdded, (infobars::InfoBar * infobar), (override)); }; -} // namespace +} // namespace class DefaultBrowserPromptManagerTest : public BrowserWithTestWindowTest { -public: + public: DefaultBrowserPromptManagerTest() : BrowserWithTestWindowTest( base::test::TaskEnvironment::TimeSource::MOCK_TIME) {} -protected: + protected: void SetUp() override { BrowserWithTestWindowTest::SetUp(); @@ -67,11 +67,12 @@ void TestShouldShowInfoBarPrompt( std::optional<base::TimeDelta> last_declined_time_delta, - std::optional<int> declined_count, bool expect_infobar_exists) { + std::optional<int> declined_count, + bool expect_infobar_exists) { if (last_declined_time_delta.has_value()) { - local_state()->SetTime(prefs::kDefaultBrowserLastDeclinedTime, - base::Time::Now() - - last_declined_time_delta.value()); + local_state()->SetTime( + prefs::kDefaultBrowserLastDeclinedTime, + base::Time::Now() - last_declined_time_delta.value()); } else { local_state()->ClearPref(prefs::kDefaultBrowserLastDeclinedTime); } @@ -85,7 +86,7 @@ manager()->CloseAllPrompts( DefaultBrowserPromptManager::CloseReason::kAccept); - infobars::ContentInfoBarManager *infobar_manager = + infobars::ContentInfoBarManager* infobar_manager = infobars::ContentInfoBarManager::FromWebContents( browser()->tab_strip_model()->GetWebContentsAt(0)); infobar_observation_.Observe(infobar_manager); @@ -97,11 +98,11 @@ infobar_observation_.Reset(); } - PrefService *local_state() { return g_browser_process->local_state(); } + PrefService* local_state() { return g_browser_process->local_state(); } - DefaultBrowserPromptManager *manager() { return manager_; } + DefaultBrowserPromptManager* manager() { return manager_; } -private: + private: raw_ptr<DefaultBrowserPromptManager> manager_; base::test::ScopedFeatureList scoped_feature_list_; @@ -140,7 +141,7 @@ EnableDefaultBrowserPromptRefreshFeatureWithParams( {{features::kShowDefaultBrowserAppMenuItem.name, "true"}}); - auto *manager = DefaultBrowserPromptManager::GetInstance(); + auto* manager = DefaultBrowserPromptManager::GetInstance(); ASSERT_FALSE(manager->get_show_app_menu_item()); manager->MaybeShowPrompt(); @@ -151,7 +152,7 @@ EnableDefaultBrowserPromptRefreshFeatureWithParams( {{features::kShowDefaultBrowserAppMenuItem.name, "false"}}); - auto *manager = DefaultBrowserPromptManager::GetInstance(); + auto* manager = DefaultBrowserPromptManager::GetInstance(); ASSERT_FALSE(manager->get_show_app_menu_item()); manager->MaybeShowPrompt(); @@ -162,7 +163,7 @@ EnableDefaultBrowserPromptRefreshFeatureWithParams( {{features::kShowDefaultBrowserAppMenuItem.name, "true"}}); - auto *manager = DefaultBrowserPromptManager::GetInstance(); + auto* manager = DefaultBrowserPromptManager::GetInstance(); manager->MaybeShowPrompt(); ASSERT_TRUE(manager->get_show_app_menu_item()); @@ -174,7 +175,7 @@ EnableDefaultBrowserPromptRefreshFeatureWithParams( {{features::kShowDefaultBrowserAppMenuItem.name, "true"}}); - auto *manager = DefaultBrowserPromptManager::GetInstance(); + auto* manager = DefaultBrowserPromptManager::GetInstance(); manager->MaybeShowPrompt(); ASSERT_TRUE(manager->get_show_app_menu_item()); @@ -373,9 +374,9 @@ {features::kRepromptDuration.name, "1d"}}); local_state()->SetTime(prefs::kDefaultBrowserFirstShownTime, base::Time::Now() - base::Seconds(1)); - local_state()->SetTime(prefs::kDefaultBrowserLastDeclinedTime, - base::Time::Now() - base::Days(1) - - base::Microseconds(1)); + local_state()->SetTime( + prefs::kDefaultBrowserLastDeclinedTime, + base::Time::Now() - base::Days(1) - base::Microseconds(1)); local_state()->SetInteger(prefs::kDefaultBrowserDeclinedCount, 1); chrome::startup::default_prompt::MaybeResetAppMenuPromptPrefs(profile()); manager()->MaybeShowPrompt();
diff --git a/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_prefs.cc b/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_prefs.cc index 6373f29d..533cfe1 100644 --- a/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_prefs.cc +++ b/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_prefs.cc
@@ -11,8 +11,8 @@ namespace { bool ShouldShowAppMenuPrompt() { - PrefService *local_state = g_browser_process->local_state(); - const PrefService::Preference *first_shown_time_pref = + PrefService* local_state = g_browser_process->local_state(); + const PrefService::Preference* first_shown_time_pref = local_state->FindPreference(prefs::kDefaultBrowserFirstShownTime); base::Time first_shown_time = local_state->GetTime(prefs::kDefaultBrowserFirstShownTime); @@ -21,24 +21,24 @@ (base::Time::Now() - first_shown_time) < features::kDefaultBrowserAppMenuDuration.Get(); } -} // namespace +} // namespace -void chrome::startup::default_prompt::ResetPromptPrefs(Profile *profile) { +void chrome::startup::default_prompt::ResetPromptPrefs(Profile* profile) { profile->GetPrefs()->ClearPref(prefs::kDefaultBrowserLastDeclined); - PrefService *local_state = g_browser_process->local_state(); + PrefService* local_state = g_browser_process->local_state(); local_state->ClearPref(prefs::kDefaultBrowserLastDeclinedTime); local_state->ClearPref(prefs::kDefaultBrowserDeclinedCount); local_state->ClearPref(prefs::kDefaultBrowserFirstShownTime); } void chrome::startup::default_prompt::UpdatePrefsForDismissedPrompt( - Profile *profile) { + Profile* profile) { base::Time now = base::Time::Now(); profile->GetPrefs()->SetInt64(prefs::kDefaultBrowserLastDeclined, now.ToInternalValue()); - PrefService *local_state = g_browser_process->local_state(); + PrefService* local_state = g_browser_process->local_state(); local_state->SetTime(prefs::kDefaultBrowserLastDeclinedTime, now); local_state->SetInteger( prefs::kDefaultBrowserDeclinedCount, @@ -47,7 +47,7 @@ } void chrome::startup::default_prompt::MaybeResetAppMenuPromptPrefs( - Profile *profile) { + Profile* profile) { if (!base::FeatureList::IsEnabled(features::kDefaultBrowserPromptRefresh) || !features::kShowDefaultBrowserAppMenuChip.Get()) { g_browser_process->local_state()->ClearPref(
diff --git a/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_prefs.h b/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_prefs.h index 2c402dc9..195d7a4 100644 --- a/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_prefs.h +++ b/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_prefs.h
@@ -25,4 +25,4 @@ } // namespace chrome::startup::default_prompt -#endif // CHROME_BROWSER_UI_STARTUP_DEFAULT_BROWSER_PROMPT_DEFAULT_BROWSER_PROMPT_PREFS_H_ +#endif // CHROME_BROWSER_UI_STARTUP_DEFAULT_BROWSER_PROMPT_DEFAULT_BROWSER_PROMPT_PREFS_H_
diff --git a/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_trial.cc b/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_trial.cc index 50d12fb..ce702b5 100644 --- a/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_trial.cc +++ b/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_trial.cc
@@ -12,9 +12,9 @@ // static void DefaultBrowserPromptTrial::MaybeJoinDefaultBrowserPromptCohort() { - PrefService *local_state = g_browser_process->local_state(); + PrefService* local_state = g_browser_process->local_state(); if (!local_state) { - return; // Can be null in unit tests; + return; // Can be null in unit tests; } std::string active_study_group = @@ -31,9 +31,9 @@ // static void DefaultBrowserPromptTrial::EnsureStickToDefaultBrowserPromptCohort() { - PrefService *local_state = g_browser_process->local_state(); + PrefService* local_state = g_browser_process->local_state(); if (!local_state) { - return; // Can be null in unit tests; + return; // Can be null in unit tests; } auto enrolled_study_group = @@ -48,7 +48,7 @@ // static void DefaultBrowserPromptTrial::RegisterSyntheticFieldTrial( - const std::string &group_name) { + const std::string& group_name) { CHECK(!group_name.empty()); ChromeMetricsServiceAccessor::RegisterSyntheticFieldTrial(
diff --git a/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_trial.h b/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_trial.h index 2c86b360..accb87d8 100644 --- a/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_trial.h +++ b/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_trial.h
@@ -31,4 +31,4 @@ static void RegisterSyntheticFieldTrial(const std::string& group_name); }; -#endif // CHROME_BROWSER_UI_STARTUP_DEFAULT_BROWSER_PROMPT_DEFAULT_BROWSER_PROMPT_TRIAL_H_ +#endif // CHROME_BROWSER_UI_STARTUP_DEFAULT_BROWSER_PROMPT_DEFAULT_BROWSER_PROMPT_TRIAL_H_
diff --git a/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_unittest.cc b/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_unittest.cc index ad1f3005..d2409ff 100644 --- a/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_unittest.cc +++ b/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_unittest.cc
@@ -16,7 +16,7 @@ #include "testing/gtest/include/gtest/gtest.h" class DefaultBrowserPromptTest : public testing::Test { -protected: + protected: void SetUp() override { testing_profile_manager = std::make_unique<TestingProfileManager>( TestingBrowserProcess::GetGlobal()); @@ -25,13 +25,13 @@ testing_profile_manager->CreateTestingProfile("Test Profile"); } - PrefService *profile_prefs() { return testing_profile->GetPrefs(); } + PrefService* profile_prefs() { return testing_profile->GetPrefs(); } - Profile *profile() { return testing_profile; } + Profile* profile() { return testing_profile; } - PrefService *local_state() { return g_browser_process->local_state(); } + PrefService* local_state() { return g_browser_process->local_state(); } -private: + private: content::BrowserTaskEnvironment task_environment_{ base::test::TaskEnvironment::TimeSource::MOCK_TIME}; std::unique_ptr<TestingProfileManager> testing_profile_manager;
diff --git a/chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc b/chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc index 6d3683a..c51929f 100644 --- a/chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc +++ b/chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc
@@ -23,8 +23,7 @@ } GoogleApiKeysInfoBarDelegate::GoogleApiKeysInfoBarDelegate() - : ConfirmInfoBarDelegate() { -} + : ConfirmInfoBarDelegate() {} infobars::InfoBarDelegate::InfoBarIdentifier GoogleApiKeysInfoBarDelegate::GetIdentifier() const {
diff --git a/chrome/browser/ui/startup/infobar_utils.cc b/chrome/browser/ui/startup/infobar_utils.cc index 0faf19b..dac3d70 100644 --- a/chrome/browser/ui/startup/infobar_utils.cc +++ b/chrome/browser/ui/startup/infobar_utils.cc
@@ -40,16 +40,18 @@ bool ShouldShowBadFlagsSecurityWarnings() { #if !BUILDFLAG(IS_CHROMEOS) PrefService* local_state = g_browser_process->local_state(); - if (!local_state) + if (!local_state) { return true; + } const auto* pref = local_state->FindPreference( prefs::kCommandLineFlagSecurityWarningsEnabled); DCHECK(pref); // The warnings can only be disabled by policy. Default to show warnings. - if (pref->IsManaged()) + if (pref->IsManaged()) { return pref->GetValue()->GetBool(); + } #endif return true; } @@ -122,9 +124,10 @@ } // Web apps should not display the session restore bubble (crbug.com/1264121) - if (!is_web_app && HasPendingUncleanExit(browser->profile())) + if (!is_web_app && HasPendingUncleanExit(browser->profile())) { SessionCrashedBubble::ShowIfNotOffTheRecordProfile( browser, /*skip_tab_checking=*/false); + } // These info bars are not shown when the browser is being controlled by // automated tests, so that they don't interfere with tests that assume no
diff --git a/chrome/browser/ui/startup/launch_mode_recorder.cc b/chrome/browser/ui/startup/launch_mode_recorder.cc index 9b8f256..e37c969 100644 --- a/chrome/browser/ui/startup/launch_mode_recorder.cc +++ b/chrome/browser/ui/startup/launch_mode_recorder.cc
@@ -74,14 +74,16 @@ // This should be called off the UI thread because it can cause disk access. ArgType GetArgType(const std::wstring& arg) { GURL url(base::AsStringPiece16(arg)); - if (url.is_valid() && !url.SchemeIsFile()) + if (url.is_valid() && !url.SchemeIsFile()) { return ArgType::kProtocol; + } // This handles the case of "chrome.exe foo.html". if (!url.is_valid()) { url = url_formatter::FixupRelativeFile(base::FilePath(), base::FilePath(arg)); - if (!url.is_valid()) + if (!url.is_valid()) { return ArgType::kInvalid; + } } return url.SchemeIsFile() ? ArgType::kFile : ArgType::kProtocol; } @@ -93,8 +95,9 @@ // This can be expensive and shouldn't be called from the UI thread. std::optional<std::wstring> GetShortcutPath( const base::CommandLine& command_line) { - if (command_line.HasSwitch(switches::kSourceShortcut)) + if (command_line.HasSwitch(switches::kSourceShortcut)) { return command_line.GetSwitchValueNative(switches::kSourceShortcut); + } STARTUPINFOW si = {sizeof(si)}; GetStartupInfoW(&si); return si.dwFlags & STARTF_TITLEISLINKNAME @@ -139,8 +142,9 @@ // handler for a file extension or a protocol/url. Then, determine if // Chrome or a web app is handling the argument. std::vector<base::CommandLine::StringType> args = command_line.GetArgs(); - if (args.size() < 1) + if (args.size() < 1) { return is_app_launch ? LaunchMode::kWebAppOther : LaunchMode::kOther; + } auto arg_type = GetArgType(args[0]); if (!is_app_launch) { if (arg_type == ArgType::kFile) { @@ -153,14 +157,17 @@ } } else { // Should we check if single_argument_switch is present? - if (arg_type == ArgType::kFile) + if (arg_type == ArgType::kFile) { return LaunchMode::kWebAppFileTypeHandler; - if (arg_type == ArgType::kProtocol) + } + if (arg_type == ArgType::kProtocol) { return LaunchMode::kWebAppProtocolHandler; + } } } else { - if (shortcut_path.value().empty()) + if (shortcut_path.value().empty()) { return LaunchMode::kShortcutNoName; + } std::optional<int> shortcut_location = GetShortcutLocation(shortcut_path.value()); if (!shortcut_location.has_value()) { @@ -208,8 +215,9 @@ {switches::kNotificationLaunchId, LaunchMode::kWinPlatformNotification}, }; for (const auto& [switch_val, mode] : switch_to_mode) { - if (command_line.HasSwitch(switch_val)) + if (command_line.HasSwitch(switch_val)) { return mode; + } } return std::nullopt; } @@ -231,23 +239,28 @@ return LaunchMode::kMacDockDMGStatusError; } - if (dock_launch_status == dock::ChromeInDockFailure) + if (dock_launch_status == dock::ChromeInDockFailure) { return LaunchMode::kMacDockStatusError; + } - if (dmg_launch_status == DiskImageStatusFailure) + if (dmg_launch_status == DiskImageStatusFailure) { return LaunchMode::kMacDMGStatusError; + } bool dmg_launch = dmg_launch_status == DiskImageStatusTrue; bool dock_launch = dock_launch_status == dock::ChromeInDockTrue; - if (dmg_launch && dock_launch) + if (dmg_launch && dock_launch) { return LaunchMode::kMacDockedDMGLaunch; + } - if (dmg_launch) + if (dmg_launch) { return LaunchMode::kMacUndockedDMGLaunch; + } - if (dock_launch) + if (dock_launch) { return LaunchMode::kMacDockedDiskLaunch; + } return LaunchMode::kMacUndockedDiskLaunch; }
diff --git a/chrome/browser/ui/startup/startup_browser_creator.cc b/chrome/browser/ui/startup/startup_browser_creator.cc index e63c39a..d26f099 100644 --- a/chrome/browser/ui/startup/startup_browser_creator.cc +++ b/chrome/browser/ui/startup/startup_browser_creator.cc
@@ -169,8 +169,9 @@ observed_profiles_.RemoveObservation(profile); launched_profiles_.erase(profile); opened_profiles_.erase(profile); - if (profile == profile_to_activate_) + if (profile == profile_to_activate_) { profile_to_activate_ = nullptr; + } // If this profile was the last launched one without an opened window, // then we may be ready to activate |profile_to_activate_|. MaybeActivateProfile(); @@ -184,8 +185,9 @@ } void AddLaunched(Profile* profile) { - if (!observed_profiles_.IsObservingSource(profile)) + if (!observed_profiles_.IsObservingSource(profile)) { observed_profiles_.AddObservation(profile); + } launched_profiles_.insert(profile); if (chrome::FindBrowserWithProfile(profile)) { // A browser may get opened before we get initialized (e.g., in tests), @@ -202,23 +204,26 @@ bool activated_profile() { return activated_profile_; } void set_profile_to_activate(Profile* profile) { - if (!observed_profiles_.IsObservingSource(profile)) + if (!observed_profiles_.IsObservingSource(profile)) { observed_profiles_.AddObservation(profile); + } profile_to_activate_ = profile; MaybeActivateProfile(); } private: void MaybeActivateProfile() { - if (!profile_to_activate_) + if (!profile_to_activate_) { return; + } // Check that browsers have been opened for all the launched profiles. // Note that browsers opened for profiles that were not added as launched // profiles are simply ignored. auto i = launched_profiles_.begin(); for (; i != launched_profiles_.end(); ++i) { - if (opened_profiles_.find(*i) == opened_profiles_.end()) + if (opened_profiles_.find(*i) == opened_profiles_.end()) { return; + } } // Asynchronous post to give a chance to the last window to completely // open and activate before trying to activate |profile_to_activate_|. @@ -237,8 +242,9 @@ // |profile| may never get launched, e.g., if it only had // incognito Windows and one of them was used to exit Chrome. // So it won't have a browser in that case. - if (browser) + if (browser) { browser->window()->Activate(); + } // No need try to activate this profile again. profile_to_activate_ = nullptr; } @@ -291,8 +297,9 @@ #else // Profile picker startups require explicit user action, profile can't be // readily opened. - if (profile_info.mode == StartupProfileMode::kProfilePicker) + if (profile_info.mode == StartupProfileMode::kProfilePicker) { return false; + } Profile* profile = profile_info.profile; @@ -327,8 +334,9 @@ const base::CommandLine& command_line) { // Skip the profile picker when Chrome is restarted (e.g. after an update) so // that the session can be restored. - if (StartupBrowserCreator::WasRestarted()) + if (StartupBrowserCreator::WasRestarted()) { return StartupProfileModeReason::kWasRestarted; + } // Don't show the picker if a certain profile (or an incognito window in the // default profile) is explicitly requested. @@ -357,13 +365,15 @@ // be paired with switches::kProfileDirectory but it's better to err on the // side of opening the last profile (and maybe fail uninstalling the app // there) than to err on the side of unexpectedly showing the picker UI. - if (command_line.HasSwitch(switches::kUninstallAppId)) + if (command_line.HasSwitch(switches::kUninstallAppId)) { return StartupProfileModeReason::kUninstallApp; + } // Don't show the picker if we want to perform a GCPW Sign In. It will want to // only launch an incognito window. - if (command_line.HasSwitch(credential_provider::kGcpwSigninSwitch)) + if (command_line.HasSwitch(credential_provider::kGcpwSigninSwitch)) { return StartupProfileModeReason::kGcpwSignin; + } // If the browser is launched due to activation on Windows native // notification, the profile id encoded in the notification launch id should @@ -381,8 +391,9 @@ // Don't show the picker if Chrome should be launched without window. This // will also cause a profile to be loaded which Chrome needs for performing // background activity. - if (StartupBrowserCreator::ShouldLoadProfileWithoutWindow(command_line)) + if (StartupBrowserCreator::ShouldLoadProfileWithoutWindow(command_line)) { return StartupProfileModeReason::kLaunchWithoutWindow; + } return ProfilePicker::GetStartupModeReason(); } @@ -428,8 +439,9 @@ // profile picker lives) also exists (or is creatable). // TODO(crbug.com/40205861): Remove unnecessary system profile check here. ProfileManager* profile_manager = g_browser_process->profile_manager(); - if (!profile_manager->GetProfile(ProfileManager::GetSystemProfilePath())) + if (!profile_manager->GetProfile(ProfileManager::GetSystemProfilePath())) { return {.profile = nullptr, .mode = StartupProfileMode::kError}; + } return {.profile = nullptr, .mode = StartupProfileMode::kProfilePicker}; } @@ -443,14 +455,17 @@ // checked again. // TODO(crbug.com/40819749): Investigate minimizing duplicate checks. - if (command_line.HasSwitch(switches::kNoStartupWindow)) + if (command_line.HasSwitch(switches::kNoStartupWindow)) { return true; + } - if (command_line.HasSwitch(switches::kSilentLaunch)) + if (command_line.HasSwitch(switches::kSilentLaunch)) { return true; + } - if (StartupBrowserCreator::ShouldLoadProfileWithoutWindow(command_line)) + if (StartupBrowserCreator::ShouldLoadProfileWithoutWindow(command_line)) { return true; + } #if BUILDFLAG(IS_CHROMEOS) return profile->GetPrefs()->GetBoolean( @@ -474,12 +489,14 @@ return false; } - if (!command_line.HasSwitch(switches::kApp)) + if (!command_line.HasSwitch(switches::kApp)) { return false; + } std::string url_string = command_line.GetSwitchValueASCII(switches::kApp); - if (url_string.empty()) + if (url_string.empty()) { return false; + } #if BUILDFLAG(IS_WIN) // Fix up Windows shortcuts. base::ReplaceSubstringsAfterOffset(&url_string, 0, "\\x", "%"); @@ -510,15 +527,17 @@ const base::FilePath& cur_dir, chrome::startup::IsFirstRun is_first_run, Profile* profile) { - if (!command_line.HasSwitch(switches::kAppId)) + if (!command_line.HasSwitch(switches::kAppId)) { return false; + } std::string app_id = command_line.GetSwitchValueASCII(switches::kAppId); const extensions::Extension* extension = extensions::ExtensionRegistry::Get(profile)->GetInstalledExtension( app_id); - if (!extension) + if (!extension) { return false; + } LaunchAppWithCallback( profile, app_id, command_line, cur_dir, @@ -558,16 +577,16 @@ // Launches a browser by using a dedicated `StartupBrowserCreator`, to avoid // having to rely on the current instance staying alive while this method is // bound as a callback. -void OpenNewWindowForFirstRun( - const base::CommandLine& command_line, - Profile* profile, - const base::FilePath& cur_dir, - const std::vector<GURL>& first_run_urls, - chrome::startup::IsProcessStartup process_startup, - chrome::startup::IsFirstRun is_first_run, - bool proceed) { - if (!proceed) +void OpenNewWindowForFirstRun(const base::CommandLine& command_line, + Profile* profile, + const base::FilePath& cur_dir, + const std::vector<GURL>& first_run_urls, + chrome::startup::IsProcessStartup process_startup, + chrome::startup::IsFirstRun is_first_run, + bool proceed) { + if (!proceed) { return; + } StartupBrowserCreator browser_creator; browser_creator.AddFirstRunTabs(first_run_urls); @@ -660,8 +679,9 @@ void StartupBrowserCreator::AddFirstRunTabs(const std::vector<GURL>& urls) { for (const auto& url : urls) { - if (url.is_valid()) + if (url.is_valid()) { first_run_tabs_.push_back(url); + } } } @@ -708,10 +728,9 @@ // Show the FRE and let `OpenNewWindowForFirstRun()` handle the browser // launch. This `StartupBrowserCreator` will get destroyed when the method // returns so the relevant data is copied over and passed to the callback. - fre_service->OpenFirstRunIfNeeded( - base::BindOnce(&OpenNewWindowForFirstRun, command_line, profile, - cur_dir, first_run_tabs_, process_startup, - is_first_run)); + fre_service->OpenFirstRunIfNeeded(base::BindOnce( + &OpenNewWindowForFirstRun, command_line, profile, cur_dir, + first_run_tabs_, process_startup, is_first_run)); return; } #endif @@ -865,8 +884,9 @@ // behavior (sync promo, welcome page) is consistently invoked. // This applies only if the pref is still at its default and has not been // set by the user, managed prefs or policy. - if (is_first_run && SessionStartupPref::TypeIsDefault(prefs)) + if (is_first_run && SessionStartupPref::TypeIsDefault(prefs)) { pref.type = SessionStartupPref::DEFAULT; + } // The switches::kRestoreLastSession command line switch is used to restore // sessions after a browser self restart (e.g. after a Chrome upgrade). @@ -886,8 +906,9 @@ ->GetProfileAttributesStorage() .GetProfileAttributesWithPath(profile->GetPath()); - if (entry && entry->IsSigninRequired()) + if (entry && entry->IsSigninRequired()) { pref.type = SessionStartupPref::LAST; + } } if ((pref.ShouldRestoreLastSession() && !pref.ShouldOpenUrls()) && (profile->IsGuestSession() || profile->IsOffTheRecord())) { @@ -939,8 +960,9 @@ const base::CommandLine& command_line) { // Don't open any browser windows if the command line indicates "background // mode". - if (command_line.HasSwitch(switches::kNoStartupWindow)) + if (command_line.HasSwitch(switches::kNoStartupWindow)) { return true; + } return false; } @@ -1006,10 +1028,11 @@ extensions::StartupHelper helper; std::string message; std::string error; - if (helper.ValidateCrx(command_line, &error)) + if (helper.ValidateCrx(command_line, &error)) { message = std::string("ValidateCrx Success"); - else + } else { message = std::string("ValidateCrx Failure: ") + error; + } printf("%s\n", message.c_str()); return false; } @@ -1017,8 +1040,9 @@ #if BUILDFLAG(IS_CHROMEOS) // The browser will be launched after the user logs in. - if (command_line.HasSwitch(ash::switches::kLoginManager)) + if (command_line.HasSwitch(ash::switches::kLoginManager)) { silent_launch = true; + } if (IsRunningInForcedAppMode()) { // If we are here, it means the Chrome browser crashed/restarted while in @@ -1176,16 +1200,18 @@ if (command_line.HasSwitch(extensions::switches::kLoadApps) && can_use_profile) { - if (!ProcessLoadApps(command_line, cur_dir, privacy_safe_profile)) + if (!ProcessLoadApps(command_line, cur_dir, privacy_safe_profile)) { return false; + } // Return early here to avoid opening a browser window. // The exception is when there are no browser windows, since we don't want // chrome to shut down. // TODO(jackhou): Do this properly once keep-alive is handled by the // background page of apps. Tracked at http://crbug.com/175381 - if (chrome::GetBrowserCount(privacy_safe_profile) != 0) + if (chrome::GetBrowserCount(privacy_safe_profile) != 0) { return true; + } } // Check for --load-and-launch-app. @@ -1203,8 +1229,9 @@ // chrome to shut down. // TODO(jackhou): Do this properly once keep-alive is handled by the // background page of apps. Tracked at http://crbug.com/175381 - if (chrome::GetBrowserCount(privacy_safe_profile) != 0) + if (chrome::GetBrowserCount(privacy_safe_profile) != 0) { return true; + } } #if BUILDFLAG(IS_WIN) @@ -1255,8 +1282,9 @@ // If GCPW signin dialog fails, returning false here will allow Chrome to // exit gracefully during the launch. - if (!StartGCPWSignin(command_line, incognito_profile)) + if (!StartGCPWSignin(command_line, incognito_profile)) { return false; + } return true; } @@ -1273,8 +1301,9 @@ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) // If Chrome Apps are deprecated and |app_id| is a Chrome App, display the // deprecation UI instead of launching the app. - if (apps::OpenDeprecatedApplicationPrompt(privacy_safe_profile, app_id)) + if (apps::OpenDeprecatedApplicationPrompt(privacy_safe_profile, app_id)) { return true; + } #endif // If |app_id| is a disabled or terminated platform app we handle it // specially here, otherwise it will be handled below. @@ -1327,8 +1356,9 @@ #if !BUILDFLAG(IS_CHROMEOS) // Try a web app launch. if (web_app::startup::MaybeHandleWebAppLaunch( - command_line, cur_dir, privacy_safe_profile, is_first_run)) + command_line, cur_dir, privacy_safe_profile, is_first_run)) { return true; + } #endif LaunchBrowserForLastProfiles(command_line, cur_dir, process_startup, @@ -1356,16 +1386,19 @@ #if !BUILDFLAG(IS_CHROMEOS) // Skip any locked profile. - if (!CanOpenProfileOnStartup({profile, StartupProfileMode::kBrowserWindow})) + if (!CanOpenProfileOnStartup( + {profile, StartupProfileMode::kBrowserWindow})) { continue; + } // Guest profiles should not be reopened on startup. This can happen if // the last used profile was a Guest, but other profiles were also open // when Chrome was closed. In this case, pick a different open profile // to be the active one, since the Guest profile is never added to the // list of open profiles. - if (last_used_profile->IsGuestSession()) + if (last_used_profile->IsGuestSession()) { last_used_profile = profile; + } #endif // Don't launch additional profiles which would only open a new tab @@ -1416,8 +1449,9 @@ base::CommandLine::StringType::const_iterator> tokenizer(path_list, FILE_PATH_LITERAL(",")); - if (!tokenizer.GetNext()) + if (!tokenizer.GetNext()) { return false; + } base::FilePath app_absolute_dir = base::MakeAbsoluteFilePath(base::FilePath(tokenizer.token_piece())); @@ -1713,23 +1747,26 @@ // Return any profile that is not locked. ProfileAttributesEntry* entry = storage->GetProfileAttributesWithPath(profile->GetPath()); - if (!entry || !entry->IsSigninRequired()) + if (!entry || !entry->IsSigninRequired()) { return {profile, StartupProfileMode::kBrowserWindow}; + } } // Couldn't initialize any last opened profiles. Try to show the profile // picker. StartupProfileInfo profile_picker_info = GetProfilePickerStartupProfileInfo(); - if (profile_picker_info.mode != StartupProfileMode::kError) + if (profile_picker_info.mode != StartupProfileMode::kError) { return profile_picker_info; + } // Couldn't show the profile picker either. Try to open any profile that is // not locked. for (ProfileAttributesEntry* entry : storage->GetAllProfilesAttributes()) { if (!entry->IsSigninRequired()) { Profile* profile = profile_manager->GetProfile(entry->GetPath()); - if (profile) + if (profile) { return {profile, StartupProfileMode::kBrowserWindow}; + } } }
diff --git a/chrome/browser/ui/startup/startup_browser_creator.h b/chrome/browser/ui/startup/startup_browser_creator.h index 37957dc..a8c4729 100644 --- a/chrome/browser/ui/startup/startup_browser_creator.h +++ b/chrome/browser/ui/startup/startup_browser_creator.h
@@ -163,13 +163,12 @@ // `restore_tabbed_browser` should only be flipped false by Ash full restore // code path, suppressing restoring a normal browser when there were only PWAs // open in previous session. See crbug.com/1463906. - void LaunchBrowser( - const base::CommandLine& command_line, - Profile* profile, - const base::FilePath& cur_dir, - chrome::startup::IsProcessStartup process_startup, - chrome::startup::IsFirstRun is_first_run, - bool restore_tabbed_browser); + void LaunchBrowser(const base::CommandLine& command_line, + Profile* profile, + const base::FilePath& cur_dir, + chrome::startup::IsProcessStartup process_startup, + chrome::startup::IsFirstRun is_first_run, + bool restore_tabbed_browser); // Launches browser for `last_opened_profiles` if it's not empty. Otherwise, // launches browser for `profile_info`. `restore_tabbed_browser` should
diff --git a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc index c5ac7f6..fd9ef96c 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
@@ -167,8 +167,9 @@ // Find the new browser. Browser* other_browser = nullptr; for (Browser* b : *BrowserList::GetInstance()) { - if (b != browser) + if (b != browser) { other_browser = b; + } } return other_browser; } @@ -235,8 +236,9 @@ } void AllBrowsersClosedWaiter::OnBrowserRemoved(Browser* browser) { - if (chrome::GetTotalBrowserCount() == 0) + if (chrome::GetTotalBrowserCount() == 0) { std::move(quit_closure_).Run(); + } } } // namespace @@ -281,8 +283,9 @@ Browser* FindOneOtherBrowserForProfile(Profile* profile, Browser* not_this_browser) { for (Browser* browser : *BrowserList::GetInstance()) { - if (browser != not_this_browser && browser->profile() == profile) + if (browser != not_this_browser && browser->profile() == profile) { return browser; + } } return nullptr; } @@ -381,9 +384,10 @@ TabStripModel* tab_strip = new_browser->tab_strip_model(); ASSERT_EQ(static_cast<int>(expected_urls.size()), tab_strip->count()); - for (size_t i = 0; i < expected_urls.size(); i++) + for (size_t i = 0; i < expected_urls.size(); i++) { EXPECT_EQ(expected_urls[i], tab_strip->GetWebContentsAt(i)->GetVisibleURL()); + } // The two test_server tabs, despite having the same site, should be in // different SiteInstances. @@ -896,14 +900,13 @@ INSTANTIATE_TEST_SUITE_P( All, StartupBrowserCreatorChromeAppShortcutTest, - ::testing::Values( - ChromeAppDeprecationFeatureValue::kDefault + ::testing::Values(ChromeAppDeprecationFeatureValue::kDefault #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) - , - ChromeAppDeprecationFeatureValue::kEnabledWithNoLaunch, - ChromeAppDeprecationFeatureValue::kDisabled + , + ChromeAppDeprecationFeatureValue::kEnabledWithNoLaunch, + ChromeAppDeprecationFeatureValue::kDisabled #endif - ), + ), ChromeAppDeprecationFeatureValueToString); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) @@ -1022,8 +1025,7 @@ INSTANTIATE_TEST_SUITE_P( All, StartupBrowserCreatorChromeAppShortcutTestWithLaunch, - ::testing::Values( - ChromeAppDeprecationFeatureValue::kEnabledWithNoLaunch), + ::testing::Values(ChromeAppDeprecationFeatureValue::kEnabledWithNoLaunch), ChromeAppDeprecationFeatureValueToString); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) @@ -2454,11 +2456,13 @@ for (auto* profile : profile_manager->GetLoadedProfiles()) { // Don't construct SessionServices for every type just to // shut them down. If they were never created, just skip. - if (SessionServiceFactory::GetForProfileIfExisting(profile)) + if (SessionServiceFactory::GetForProfileIfExisting(profile)) { SessionServiceFactory::ShutdownForProfile(profile); + } - if (AppSessionServiceFactory::GetForProfileIfExisting(profile)) + if (AppSessionServiceFactory::GetForProfileIfExisting(profile)) { AppSessionServiceFactory::ShutdownForProfile(profile); + } } ASSERT_EQ(1u, chrome::GetBrowserCount(browser()->profile())); @@ -2767,8 +2771,9 @@ // There should be 3 browser windows opened at the moment. ASSERT_EQ(3u, chrome::GetBrowserCount(browser()->profile())); for (Browser* b : *BrowserList::GetInstance()) { - if (b != browser() && b != app_browser1) + if (b != browser() && b != app_browser1) { app_browser2 = b; + } } ASSERT_TRUE(app_browser2); EXPECT_TRUE(web_app::AppBrowserController::IsForWebApp(app_browser2, app_id)); @@ -2835,8 +2840,9 @@ // There should be 3 browser windows opened at the moment. ASSERT_EQ(3u, chrome::GetBrowserCount(browser()->profile())); for (Browser* b : *BrowserList::GetInstance()) { - if (b != browser() && b != app_browser1) + if (b != browser() && b != app_browser1) { app_browser2 = b; + } } ASSERT_TRUE(app_browser2); EXPECT_TRUE(web_app::AppBrowserController::IsForWebApp(app_browser2, app_id)); @@ -3544,8 +3550,9 @@ // This should have created a new browser window. Browser* new_browser = FindOneOtherBrowser(browser()); EXPECT_TRUE(new_browser); - if (!new_browser) + if (!new_browser) { return nullptr; + } return infobars::ContentInfoBarManager::FromWebContents( new_browser->tab_strip_model()->GetActiveWebContents()); @@ -3670,8 +3677,9 @@ void SetUpCommandLine(base::CommandLine* command_line) override { StartupBrowserCreatorPickerTestBase::SetUpCommandLine(command_line); - if (content::IsPreTest()) + if (content::IsPreTest()) { return; // Don't apply the test parameters to the PRE test. + } if (GetParam().url_arg) { command_line->AppendArg(GetParam().url_arg->spec());
diff --git a/chrome/browser/ui/startup/startup_browser_creator_corrupt_profiles_browsertest_win.cc b/chrome/browser/ui/startup/startup_browser_creator_corrupt_profiles_browsertest_win.cc index 772bd90..bd129b3 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_corrupt_profiles_browsertest_win.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_corrupt_profiles_browsertest_win.cc
@@ -94,8 +94,9 @@ bool DeleteProfileData(const std::string& basepath) { base::FilePath user_data_dir; - if (!base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir)) + if (!base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir)) { return false; + } base::FilePath dir_to_delete = user_data_dir.AppendASCII(basepath); return base::DirectoryExists(dir_to_delete) && @@ -121,13 +122,12 @@ bool SetUpUserDataDirectoryForDeletedProfileFallbackToUserManager(); void CloseBrowsersSynchronouslyForProfileBasePath( - const std::string& basepath) { + const std::string& basepath) { ProfileManager* profile_manager = g_browser_process->profile_manager(); ASSERT_TRUE(profile_manager); - Profile* profile = - profile_manager->GetProfileByPath( - profile_manager->user_data_dir().AppendASCII(basepath)); + Profile* profile = profile_manager->GetProfileByPath( + profile_manager->user_data_dir().AppendASCII(basepath)); ASSERT_TRUE(profile); base::RunLoop run_loop; @@ -166,16 +166,15 @@ // If control goes here, it means SetUpUserDataDirectory is not handled. // This is okay for PRE_ tests, but not acceptable for main tests. - if (content::IsPreTest()) + if (content::IsPreTest()) { return true; + } ADD_FAILURE() << "SetUpUserDataDirectory is not handled by the test."; return false; } - void TearDownOnMainThread() override { - test_body_has_run_ = true; - } + void TearDownOnMainThread() override { test_body_has_run_ = true; } void TearDown() override { EXPECT_EQ(expect_test_body_to_run_, test_body_has_run_); @@ -211,7 +210,7 @@ } bool StartupBrowserCreatorCorruptProfileTest:: - SetUpUserDataDirectoryForLastOpenedProfileMissing() { + SetUpUserDataDirectoryForLastOpenedProfileMissing() { return DeleteProfileData("Profile 1") && RemoveCreateDirectoryPermissionForUserDataDirectory(); } @@ -256,8 +255,7 @@ bool StartupBrowserCreatorCorruptProfileTest:: SetUpUserDataDirectoryForLastUsedProfileFallbackToUserManager() { - return DeleteProfileData("Default") && - DeleteProfileData("Profile 2") && + return DeleteProfileData("Default") && DeleteProfileData("Profile 2") && RemoveCreateDirectoryPermissionForUserDataDirectory(); } @@ -284,8 +282,7 @@ bool StartupBrowserCreatorCorruptProfileTest:: SetUpUserDataDirectoryForCannotCreateSystemProfile() { - return DeleteProfileData("Default") && - DeleteProfileData("Profile 2") && + return DeleteProfileData("Default") && DeleteProfileData("Profile 2") && RemoveCreateDirectoryPermissionForUserDataDirectory(); } @@ -305,8 +302,7 @@ bool StartupBrowserCreatorCorruptProfileTest:: SetUpUserDataDirectoryForLastUsedProfileFallbackToAnyProfile() { - return DeleteProfileData("Default") && - DeleteProfileData("Profile 2") && + return DeleteProfileData("Default") && DeleteProfileData("Profile 2") && RemoveCreateDirectoryPermissionForUserDataDirectory(); }
diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc index 4cea861..2ede6cf 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -100,8 +100,9 @@ } void UrlsToTabs(const std::vector<GURL>& urls, StartupTabs* tabs) { - for (const GURL& url : urls) + for (const GURL& url : urls) { tabs->emplace_back(url); + } } // Appends the contents of |from| to the end of |to|. @@ -163,8 +164,9 @@ // specified a non-sensical combination of options // ("--kiosk --no_startup_window"); do nothing in that case. Browser* browser = BrowserList::GetInstance()->GetLastActive(); - if (browser) + if (browser) { MaybeToggleFullscreen(browser); + } } Browser* StartupBrowserCreatorImpl::OpenURLsInBrowser( @@ -185,8 +187,9 @@ // If we don't yet have a profile, try to use the one we're given from // |browser|. While we may not end up actually using |browser| (since it // could be a popup window), we can at least use the profile. - if (!profile_ && browser) + if (!profile_ && browser) { profile_ = browser->profile(); + } if (!browser || !browser->is_type_normal()) { CHECK(profile_); @@ -277,8 +280,9 @@ int add_types = first_tab ? AddTabTypes::ADD_ACTIVE : AddTabTypes::ADD_NONE; add_types |= AddTabTypes::ADD_FORCE_INDEX; - if (tab.type == StartupTab::Type::kPinned) + if (tab.type == StartupTab::Type::kPinned) { add_types |= AddTabTypes::ADD_PINNED; + } NavigateParams params(browser, tab.url, ui::PAGE_TRANSITION_AUTO_TOPLEVEL); params.disposition = first_tab ? WindowOpenDisposition::NEW_FOREGROUND_TAB @@ -299,10 +303,11 @@ if (!browser->tab_strip_model()->GetActiveWebContents() && !process_headless_commands) { // TODO(sky): this is a work around for 110909. Figure out why it's needed. - if (!browser->tab_strip_model()->count()) + if (!browser->tab_strip_model()->count()) { chrome::AddTabAt(browser, GURL(), -1, true); - else + } else { browser->tab_strip_model()->ActivateTabAt(0); + } } browser->window()->Show(); @@ -384,14 +389,18 @@ return; } BrowserOpenBehaviorOptions behavior_options = 0; - if (process_startup == chrome::startup::IsProcessStartup::kYes) + if (process_startup == chrome::startup::IsProcessStartup::kYes) { behavior_options |= PROCESS_STARTUP; - if (is_post_crash_launch) + } + if (is_post_crash_launch) { behavior_options |= IS_POST_CRASH_LAUNCH; - if (command_line_->HasSwitch(switches::kOpenInNewWindow)) + } + if (command_line_->HasSwitch(switches::kOpenInNewWindow)) { behavior_options |= HAS_NEW_WINDOW_SWITCH; - if (result.launch_result == LaunchResult::kWithGivenUrls) + } + if (result.launch_result == LaunchResult::kWithGivenUrls) { behavior_options |= HAS_CMD_LINE_TABS; + } BrowserOpenBehavior behavior = DetermineBrowserOpenBehavior( StartupBrowserCreator::GetSessionStartupPref(*command_line_, profile_), @@ -458,13 +467,15 @@ // A similar policy exists for crash recovery launches, to prevent getting the // user stuck in a crash loop. if (is_incognito_or_guest || is_post_crash_launch) { - if (!tabs.empty()) + if (!tabs.empty()) { return {std::move(tabs), launch_result}; + } if (is_post_crash_launch) { tabs = provider.GetPostCrashTabs(has_incompatible_applications); - if (!tabs.empty()) + if (!tabs.empty()) { return {std::move(tabs), launch_result}; + } } return {StartupTabs({StartupTab(GURL(chrome::kChromeUINewTabURL))}), @@ -485,8 +496,9 @@ // including the profile reset tab. StartupTabs distribution_tabs = provider.GetDistributionFirstRunTabs(browser_creator_); - if (!distribution_tabs.empty()) + if (!distribution_tabs.empty()) { return {std::move(distribution_tabs), launch_result}; + } // Whether a first run experience was or will be shown as part of this // startup. @@ -552,8 +564,9 @@ } // Note: there's no session service in incognito or guest mode. - if (!SessionServiceFactory::GetForProfileForSessionRestore(profile_)) + if (!SessionServiceFactory::GetForProfileForSessionRestore(profile_)) { return false; + } bool restore_apps = ShouldRestoreApps(StartupBrowserCreator::WasRestarted(), profile_); @@ -576,13 +589,15 @@ // because we want to avoid a crash restore loop, so we don't // automatically restore after a crash. // Crash restores are triggered via session_crashed_bubble_view.cc - if (ShouldRestoreApps(StartupBrowserCreator::WasRestarted(), profile_)) + if (ShouldRestoreApps(StartupBrowserCreator::WasRestarted(), profile_)) { restore_options |= SessionRestore::RESTORE_APPS; + } browser = SessionRestore::RestoreSession(profile_, nullptr, restore_options, tabs); - if (browser) + if (browser) { return browser; + } } else if (behavior == BrowserOpenBehavior::USE_EXISTING) { browser = chrome::FindTabbedBrowser( profile_, process_startup == chrome::startup::IsProcessStartup::kYes); @@ -629,8 +644,9 @@ if (pref.ShouldRestoreLastSession()) { // Don't perform a session restore on a post-crash launch, as this could // cause a crash loop. - if (!(options & IS_POST_CRASH_LAUNCH)) + if (!(options & IS_POST_CRASH_LAUNCH)) { return BrowserOpenBehavior::SYNCHRONOUS_RESTORE; + } } return BrowserOpenBehavior::NEW; @@ -652,8 +668,9 @@ // Suppress the creation of a new window on Mac when restoring with no windows // if launching Chrome via a login item or the resume feature in OS 10.7+. if (!was_mac_login_or_resume && - (has_create_browser_default || has_create_browser_switch)) + (has_create_browser_default || has_create_browser_switch)) { options |= SessionRestore::ALWAYS_CREATE_TABBED_BROWSER; + } return options; }
diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.h b/chrome/browser/ui/startup/startup_browser_creator_impl.h index ef7f0c80..7eeae4f 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.h +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.h
@@ -26,7 +26,7 @@ namespace base { class CommandLine; class FilePath; -} +} // namespace base namespace internals { GURL GetTriggeredResetSettingsURL();
diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl_unittest.cc b/chrome/browser/ui/startup/startup_browser_creator_impl_unittest.cc index 9f32928..a662669 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_impl_unittest.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_impl_unittest.cc
@@ -40,47 +40,53 @@ StartupTabs GetDistributionFirstRunTabs( StartupBrowserCreator* browser_creator) const override { StartupTabs tabs; - if (options_ & kDistributionFirstRunTabs) + if (options_ & kDistributionFirstRunTabs) { tabs.emplace_back(GURL("https://distribution")); + } return tabs; } StartupTabs GetResetTriggerTabs(Profile* profile) const override { StartupTabs tabs; - if (options_ & kResetTriggerTabs) + if (options_ & kResetTriggerTabs) { tabs.emplace_back(GURL("https://reset-trigger")); + } return tabs; } StartupTabs GetPinnedTabs(const base::CommandLine& command_line_, Profile* profile) const override { StartupTabs tabs; - if (options_ & kPinnedTabs) + if (options_ & kPinnedTabs) { tabs.emplace_back(GURL("https://pinned"), StartupTab::Type::kPinned); + } return tabs; } StartupTabs GetPreferencesTabs(const base::CommandLine& command_line_, Profile* profile) const override { StartupTabs tabs; - if (options_ & kPreferencesTabs) + if (options_ & kPreferencesTabs) { tabs.emplace_back(GURL("https://prefs")); + } return tabs; } StartupTabs GetNewTabPageTabs(const base::CommandLine& command_line_, Profile* profile) const override { StartupTabs tabs; - if (options_ & kNewTabPageTabs) + if (options_ & kNewTabPageTabs) { tabs.emplace_back(GURL("https://new-tab")); + } return tabs; } StartupTabs GetPostCrashTabs( bool has_incompatible_applications) const override { StartupTabs tabs; - if (has_incompatible_applications && (options_ & kPostCrashTabs)) + if (has_incompatible_applications && (options_ & kPostCrashTabs)) { tabs.emplace_back(GURL("https://incompatible-applications")); + } return tabs; } @@ -88,8 +94,9 @@ const base::FilePath& cur_dir, Profile* profile) const override { StartupTabs tabs; - if (options_ & kCommandLineTabs) + if (options_ & kCommandLineTabs) { tabs.emplace_back(GURL("https://cmd-line")); + } return tabs; } @@ -103,8 +110,9 @@ #if !BUILDFLAG(IS_ANDROID) StartupTabs GetNewFeaturesTabs(bool whats_new_enabled) const override { StartupTabs tabs; - if (options_ & kNewFeaturesTabs) + if (options_ & kNewFeaturesTabs) { tabs.emplace_back(GURL("https://whats-new/")); + } return tabs; } @@ -112,8 +120,9 @@ Profile* profile, const StartupTabs& other_startup_tabs) const override { StartupTabs tabs; - if (options_ & kPrivacySandboxTabs) + if (options_ & kPrivacySandboxTabs) { tabs.emplace_back(GURL("https://privacy-sandbox")); + } return tabs; } #endif // !BUILDFLAG(IS_ANDROID) @@ -419,7 +428,7 @@ std::vector<std::string> expected_tab_hosts; #if BUILDFLAG(ENABLE_DICE_SUPPORT) - expected_tab_hosts.emplace_back("new-tab"); + expected_tab_hosts.emplace_back("new-tab"); #else // Onboarding is not supported and has no effect. expected_tab_hosts.emplace_back("whats-new");
diff --git a/chrome/browser/ui/startup/startup_browser_creator_interactive_uitest.cc b/chrome/browser/ui/startup/startup_browser_creator_interactive_uitest.cc index 3fa8a5c..719a104a 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_interactive_uitest.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_interactive_uitest.cc
@@ -77,8 +77,9 @@ {&profile_2, StartupProfileMode::kBrowserWindow}, last_opened_profiles); - while (!browser_creator.ActivatedProfile()) + while (!browser_creator.ActivatedProfile()) { base::RunLoop().RunUntilIdle(); + } Browser* new_browser = nullptr;
diff --git a/chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc b/chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc index 3419dea..d6219b9 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc
@@ -48,8 +48,9 @@ // Find the new browser. for (Browser* b : *BrowserList::GetInstance()) { - if (b != browser) + if (b != browser) { return b; + } } return nullptr;
diff --git a/chrome/browser/ui/startup/startup_tab_provider.cc b/chrome/browser/ui/startup/startup_tab_provider.cc index 9767aafb..95797701 100644 --- a/chrome/browser/ui/startup/startup_tab_provider.cc +++ b/chrome/browser/ui/startup/startup_tab_provider.cc
@@ -82,8 +82,9 @@ // them. // Headless mode also allows chrome:// URLs if the user explicitly allowed it. bool ValidateUrl(const GURL& url) { - if (!url.is_valid()) + if (!url.is_valid()) { return false; + } const GURL settings_url(chrome::kChromeUISettingsURL); bool url_points_to_an_approved_settings_page = false; @@ -166,8 +167,9 @@ StartupTabs StartupTabProviderImpl::GetDistributionFirstRunTabs( StartupBrowserCreator* browser_creator) const { - if (!browser_creator) + if (!browser_creator) { return StartupTabs(); + } StartupTabs tabs = GetInitialPrefsTabsForState( first_run::IsChromeFirstRun(), browser_creator->first_run_tabs_); browser_creator->first_run_tabs_.clear(); @@ -304,8 +306,9 @@ StartupTabs StartupTabProviderImpl::GetResetTriggerTabsForState( bool profile_has_trigger) { StartupTabs tabs; - if (profile_has_trigger) + if (profile_has_trigger) { tabs.emplace_back(GetTriggeredResetSettingsUrl()); + } return tabs; } @@ -314,8 +317,9 @@ const SessionStartupPref& pref, const StartupTabs& pinned_tabs, bool profile_has_other_tabbed_browser) { - if (pref.ShouldRestoreLastSession() || profile_has_other_tabbed_browser) + if (pref.ShouldRestoreLastSession() || profile_has_other_tabbed_browser) { return StartupTabs(); + } return pinned_tabs; } @@ -339,8 +343,9 @@ StartupTabs StartupTabProviderImpl::GetNewTabPageTabsForState( const SessionStartupPref& pref) { StartupTabs tabs; - if (!pref.ShouldRestoreLastSession()) + if (!pref.ShouldRestoreLastSession()) { tabs.emplace_back(GURL(chrome::kChromeUINewTabURL)); + } return tabs; } @@ -348,8 +353,9 @@ StartupTabs StartupTabProviderImpl::GetPostCrashTabsForState( bool has_incompatible_applications) { StartupTabs tabs; - if (has_incompatible_applications) + if (has_incompatible_applications) { AddIncompatibleApplicationsUrl(&tabs); + } return tabs; } @@ -358,8 +364,9 @@ StartupTabs StartupTabProviderImpl::GetNewFeaturesTabsForState( bool whats_new_enabled) { StartupTabs tabs; - if (whats_new_enabled) + if (whats_new_enabled) { tabs.emplace_back(whats_new::GetWebUIStartupURL()); + } return tabs; } @@ -382,8 +389,9 @@ return PrivacySandboxService::IsUrlSuitableForPrompt(tab.url); }); - if (suitable_tab_available) + if (suitable_tab_available) { return tabs; + } // Fallback to using about:blank if the user has customized the NTP. // TODO(crbug.com/40218325): Stop using about:blank and create a dedicated @@ -456,8 +464,9 @@ url = url_formatter::FixupRelativeFile(cur_dir, base::FilePath(arg)); } - if (ValidateUrl(url)) + if (ValidateUrl(url)) { return {CommandLineTabsPresent::kYes, std::move(url)}; + } } return {CommandLineTabsPresent::kNo, GURL()};
diff --git a/chrome/browser/ui/startup/web_app_info_recorder_utils.cc b/chrome/browser/ui/startup/web_app_info_recorder_utils.cc index 9e80187..4dfeedc7 100644 --- a/chrome/browser/ui/startup/web_app_info_recorder_utils.cc +++ b/chrome/browser/ui/startup/web_app_info_recorder_utils.cc
@@ -158,8 +158,9 @@ base::Value GetWebApps::GetOpenWebApps() { base::flat_map<std::string, base::Value::List> open_apps; for (Browser* browser : *BrowserList::GetInstance()) { - if (browser->type() != Browser::Type::TYPE_APP) + if (browser->type() != Browser::Type::TYPE_APP) { continue; + } std::string app_profile_base_name = browser->profile()->GetBaseName().AsUTF8Unsafe(); if (!profile_base_name_.empty() &&
diff --git a/chrome/browser/ui/startup/web_app_startup_utils.cc b/chrome/browser/ui/startup/web_app_startup_utils.cc index a5d4c52..2e9b1ef 100644 --- a/chrome/browser/ui/startup/web_app_startup_utils.cc +++ b/chrome/browser/ui/startup/web_app_startup_utils.cc
@@ -91,8 +91,9 @@ chrome::startup::IsFirstRun is_first_run) { std::string app_id = command_line.GetSwitchValueASCII(switches::kAppId); // There must be a kAppId switch arg in the command line to launch. - if (app_id.empty()) + if (app_id.empty()) { return false; + } // Ensure keep alive registry is available and is not shutting down before // attempting a web apps launch. @@ -149,18 +150,21 @@ ~StartupWebAppCreator() { auto startup_done = std::move(GetStartupDoneCallback()); - if (startup_done) + if (startup_done) { std::move(startup_done).Run(); + } } void Start() { - if (MaybeLaunchProtocolHandler() == LaunchResult::kHandled) + if (MaybeLaunchProtocolHandler() == LaunchResult::kHandled) { return; + } DCHECK(protocol_url_.is_empty()); - if (MaybeLaunchFileHandler() == LaunchResult::kHandled) + if (MaybeLaunchFileHandler() == LaunchResult::kHandled) { return; + } DCHECK(file_launch_infos_.empty()); @@ -174,8 +178,9 @@ void LaunchApp() { if (file_launch_infos_.empty()) { std::optional<GURL> protocol; - if (!protocol_url_.is_empty()) + if (!protocol_url_.is_empty()) { protocol = protocol_url_; + } provider_->scheduler().LaunchApp( app_id_, command_line_, cur_dir_, /*url_handler_launch_url=*/std::nullopt, protocol, @@ -220,8 +225,9 @@ break; } } - if (protocol_url.is_empty()) + if (protocol_url.is_empty()) { return LaunchResult::kNotHandled; + } // Check if the user has already disallowed this app to launch the protocol. // This check takes priority over checking if the protocol is handled @@ -236,8 +242,9 @@ } // Check if this app has registered as a handler for the protocol. - if (!registrar.IsRegisteredLaunchProtocol(app_id_, protocol_url.scheme())) + if (!registrar.IsRegisteredLaunchProtocol(app_id_, protocol_url.scheme())) { return LaunchResult::kNotHandled; + } protocol_url_ = protocol_url; @@ -262,14 +269,16 @@ LaunchResult MaybeLaunchFileHandler() { std::vector<base::FilePath> launch_files = apps::GetLaunchFilesFromCommandLine(command_line_); - if (launch_files.empty()) + if (launch_files.empty()) { return LaunchResult::kNotHandled; + } file_launch_infos_ = provider_->os_integration_manager() .file_handler_manager() .GetMatchingFileHandlerUrls(app_id_, launch_files); - if (file_launch_infos_.empty()) + if (file_launch_infos_.empty()) { return LaunchResult::kNotHandled; + } const WebApp* web_app = provider_->registrar_unsafe().GetAppById(app_id_); DCHECK(web_app); @@ -297,8 +306,9 @@ } void OnPersistUserChoiceCompleted(bool allowed) { - if (allowed) + if (allowed) { LaunchApp(); + } // `this` will be deleted. } @@ -330,8 +340,9 @@ base::WeakPtr<content::WebContents> web_contents, apps::LaunchContainer container) { // The finalization step should only occur for the first app launch. - if (app_window_has_been_launched_) + if (app_window_has_been_launched_) { return; + } FinalizeWebAppLaunch(open_mode_, command_line_, is_first_run_, browser.get(), container); @@ -397,8 +408,9 @@ chrome::startup::IsFirstRun is_first_run, Browser* browser, apps::LaunchContainer container) { - if (!browser) + if (!browser) { return; + } OpenMode mode = OpenMode::kUnknown;
diff --git a/chrome/browser/ui/status_bubble.h b/chrome/browser/ui/status_bubble.h index 5cdff233..3b9dc00 100644 --- a/chrome/browser/ui/status_bubble.h +++ b/chrome/browser/ui/status_bubble.h
@@ -7,7 +7,6 @@ #include <string> - class GURL; ////////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/ui/tab_contents/chrome_web_contents_menu_helper.cc b/chrome/browser/ui/tab_contents/chrome_web_contents_menu_helper.cc index 512b845b..940bacf 100644 --- a/chrome/browser/ui/tab_contents/chrome_web_contents_menu_helper.cc +++ b/chrome/browser/ui/tab_contents/chrome_web_contents_menu_helper.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/tab_contents/chrome_web_contents_menu_helper.h" + #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" @@ -18,8 +19,10 @@ Profile::FromBrowserContext(web_contents->GetBrowserContext()); PrefService* prefs = profile->GetPrefs(); - if (!prefs->GetBoolean(prefs::kDefaultSearchProviderContextMenuAccessAllowed)) + if (!prefs->GetBoolean( + prefs::kDefaultSearchProviderContextMenuAccessAllowed)) { return params; + } content::ContextMenuParams enriched_params = params; // Setting the key implies the menu access is allowed.
diff --git a/chrome/browser/ui/tab_contents/chrome_web_contents_menu_helper_unittest.cc b/chrome/browser/ui/tab_contents/chrome_web_contents_menu_helper_unittest.cc index e419cbe..926cd8f3 100644 --- a/chrome/browser/ui/tab_contents/chrome_web_contents_menu_helper_unittest.cc +++ b/chrome/browser/ui/tab_contents/chrome_web_contents_menu_helper_unittest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/tab_contents/chrome_web_contents_menu_helper.h" + #include "base/memory/raw_ptr.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h b/chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h index 2a6fcea..9db0fbc 100644 --- a/chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h +++ b/chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h
@@ -10,7 +10,7 @@ namespace content { class WebContents; class WebContentsViewDelegate; -} +} // namespace content std::unique_ptr<content::WebContentsViewDelegate> CreateWebContentsViewDelegate( content::WebContents* web_contents);
diff --git a/chrome/browser/ui/tab_contents/chrome_web_contents_view_handle_drop.cc b/chrome/browser/ui/tab_contents/chrome_web_contents_view_handle_drop.cc index 09e6bd9..99b224de 100644 --- a/chrome/browser/ui/tab_contents/chrome_web_contents_view_handle_drop.cc +++ b/chrome/browser/ui/tab_contents/chrome_web_contents_view_handle_drop.cc
@@ -54,8 +54,9 @@ // continues by blocking sub-elements of the list. When everything is blocked, // it implies that no `result.paths_results` is allowed. if (file_indexes_to_block.size() == drop_data.filenames.size()) { - for (size_t i = 0; i < data.paths.size(); ++i) + for (size_t i = 0; i < data.paths.size(); ++i) { result.paths_results[i] = false; + } std::move(callback).Run(std::nullopt); return; @@ -69,14 +70,16 @@ for (size_t i = 0; i < data.paths.size(); ++i) { int parent_index = files_scan_data->expanded_paths_indexes().at(data.paths[i]); - if (file_indexes_to_block.count(parent_index)) + if (file_indexes_to_block.count(parent_index)) { result.paths_results[i] = false; + } } std::vector<ui::FileInfo> final_filenames; for (size_t i = 0; i < drop_data.filenames.size(); ++i) { - if (file_indexes_to_block.count(i)) + if (file_indexes_to_block.count(i)) { continue; + } final_filenames.push_back(std::move(drop_data.filenames[i])); } @@ -162,12 +165,15 @@ data.reason = enterprise_connectors::ContentAnalysisRequest::DRAG_AND_DROP; // Collect the data that needs to be scanned. - if (!drop_data.url_title.empty()) + if (!drop_data.url_title.empty()) { data.text.push_back(base::UTF16ToUTF8(drop_data.url_title)); - if (drop_data.text) + } + if (drop_data.text) { data.text.push_back(base::UTF16ToUTF8(*drop_data.text)); - if (drop_data.html) + } + if (drop_data.html) { data.text.push_back(base::UTF16ToUTF8(*drop_data.html)); + } // `callback` should only run asynchronously when scanning is blocking. content::WebContentsViewDelegate::DropCompletionCallback scan_callback =
diff --git a/chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc b/chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc index 148fa6f..c6f08ee4 100644 --- a/chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc +++ b/chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc
@@ -56,8 +56,9 @@ EXPECT_EQ(0U, CountAllTabs()); // Add some tabs. - for (size_t i = 0; i < 3; ++i) + for (size_t i = 0; i < 3; ++i) { chrome::NewTab(browser2.get()); + } chrome::NewTab(browser3.get()); EXPECT_EQ(4U, CountAllTabs()); @@ -68,8 +69,9 @@ EXPECT_EQ(1U, CountAllTabs()); // Add lots of tabs. - for (size_t i = 0; i < 41; ++i) + for (size_t i = 0; i < 41; ++i) { chrome::NewTab(browser()); + } EXPECT_EQ(42U, CountAllTabs()); // Close all remaining tabs to keep all the destructors happy. @@ -99,21 +101,24 @@ EXPECT_EQ(0U, CountAllTabs()); // Add some tabs. - for (size_t i = 0; i < 3; ++i) + for (size_t i = 0; i < 3; ++i) { chrome::NewTab(browser2.get()); - for (size_t i = 0; i < 2; ++i) + } + for (size_t i = 0; i < 2; ++i) { chrome::NewTab(browser3.get()); + } size_t count = 0; auto& all_tabs = AllTabContentses(); for (auto iterator = all_tabs.begin(), end = all_tabs.end(); iterator != end; ++iterator, ++count) { - if (count < 3) + if (count < 3) { EXPECT_EQ(browser2.get(), iterator.browser()); - else if (count < 5) + } else if (count < 5) { EXPECT_EQ(browser3.get(), iterator.browser()); - else + } else { ADD_FAILURE(); + } } // Close some tabs. @@ -127,10 +132,11 @@ count = 0; for (auto iterator = all_tabs.begin(), end = all_tabs.end(); iterator != end; ++iterator, ++count) { - if (count == 0) + if (count == 0) { EXPECT_EQ(browser3.get(), iterator.browser()); - else + } else { ADD_FAILURE(); + } } // Add one tab back to browser. @@ -153,4 +159,3 @@ browser2->tab_strip_model()->CloseAllTabs(); browser3->tab_strip_model()->CloseAllTabs(); } -
diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc index 5d10dd6..8c59918 100644 --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc
@@ -625,7 +625,7 @@ web_contents, optimization_guide_decider); } } -#else // BUILDFLAG(IS_ANDROID) +#else // BUILDFLAG(IS_ANDROID) if (web_app::AreWebAppsUserInstallable(profile)) { webapps::MLInstallabilityPromoter::CreateForWebContents(web_contents); webapps::AppBannerManagerDesktop::CreateForWebContents(web_contents);
diff --git a/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc b/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc index caf61af..e252fa51 100644 --- a/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc +++ b/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc
@@ -39,18 +39,21 @@ } void MockTabModalConfirmDialogDelegate::OnAccepted() { - if (delegate_) + if (delegate_) { delegate_->OnAccepted(); + } } void MockTabModalConfirmDialogDelegate::OnCanceled() { - if (delegate_) + if (delegate_) { delegate_->OnCanceled(); + } } void MockTabModalConfirmDialogDelegate::OnClosed() { - if (delegate_) + if (delegate_) { delegate_->OnClosed(); + } } TabModalConfirmDialogTest::TabModalConfirmDialogTest()
diff --git a/chrome/browser/ui/tab_modal_confirm_dialog_delegate.cc b/chrome/browser/ui/tab_modal_confirm_dialog_delegate.cc index 54c5e041..5c5a948 100644 --- a/chrome/browser/ui/tab_modal_confirm_dialog_delegate.cc +++ b/chrome/browser/ui/tab_modal_confirm_dialog_delegate.cc
@@ -27,8 +27,9 @@ } void TabModalConfirmDialogDelegate::Cancel() { - if (closing_) + if (closing_) { return; + } // Make sure we won't do anything when another action occurs. closing_ = true; OnCanceled(); @@ -36,8 +37,9 @@ } void TabModalConfirmDialogDelegate::Accept() { - if (closing_) + if (closing_) { return; + } // Make sure we won't do anything when another action occurs. closing_ = true; OnAccepted(); @@ -45,8 +47,9 @@ } void TabModalConfirmDialogDelegate::Close() { - if (closing_) + if (closing_) { return; + } // Make sure we won't do anything when another action occurs. closing_ = true; OnClosed(); @@ -55,8 +58,9 @@ void TabModalConfirmDialogDelegate::LinkClicked( WindowOpenDisposition disposition) { - if (closing_) + if (closing_) { return; + } OnLinkClicked(disposition); } @@ -99,8 +103,9 @@ void TabModalConfirmDialogDelegate::OnClosed() {} void TabModalConfirmDialogDelegate::CloseDialog() { - if (close_delegate_) + if (close_delegate_) { close_delegate_->CloseDialog(); + } } std::optional<int> TabModalConfirmDialogDelegate::GetDefaultDialogButton() {
diff --git a/chrome/browser/ui/tab_sharing/tab_sharing_infobar_delegate.h b/chrome/browser/ui/tab_sharing/tab_sharing_infobar_delegate.h index 33373129..4d75d32 100644 --- a/chrome/browser/ui/tab_sharing/tab_sharing_infobar_delegate.h +++ b/chrome/browser/ui/tab_sharing/tab_sharing_infobar_delegate.h
@@ -20,7 +20,7 @@ namespace infobars { class InfoBarManager; class InfoBar; -} +} // namespace infobars class TabSharingUI;
diff --git a/chrome/browser/ui/tab_ui_helper.cc b/chrome/browser/ui/tab_ui_helper.cc index bbfb9a1c..dca1a48a 100644 --- a/chrome/browser/ui/tab_ui_helper.cc +++ b/chrome/browser/ui/tab_ui_helper.cc
@@ -20,8 +20,9 @@ std::u16string TabUIHelper::GetTitle() const { const std::u16string& contents_title = web_contents()->GetTitle(); - if (!contents_title.empty()) + if (!contents_title.empty()) { return contents_title; + } #if BUILDFLAG(IS_MAC) return l10n_util::GetStringUTF16(IDS_BROWSER_WINDOW_MAC_TAB_UNTITLED); @@ -39,8 +40,9 @@ // We want to hide a background tab's throbber during page load if it is // created by session restore. A restored tab's favicon is already fetched // by |SessionRestoreDelegate|. - if (created_by_session_restore_ && !was_active_at_least_once_) + if (created_by_session_restore_ && !was_active_at_least_once_) { return true; + } return false; }
diff --git a/chrome/browser/ui/tab_ui_helper_browsertest.cc b/chrome/browser/ui/tab_ui_helper_browsertest.cc index cdccfba..20c00bc 100644 --- a/chrome/browser/ui/tab_ui_helper_browsertest.cc +++ b/chrome/browser/ui/tab_ui_helper_browsertest.cc
@@ -2,8 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tab_ui_helper.h" + +#include "chrome/browser/ui/browser.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h"
diff --git a/chrome/browser/ui/tabs/BUILD.gn b/chrome/browser/ui/tabs/BUILD.gn index eee851c..cd2b9c1 100644 --- a/chrome/browser/ui/tabs/BUILD.gn +++ b/chrome/browser/ui/tabs/BUILD.gn
@@ -4,6 +4,8 @@ assert(is_win || is_mac || is_linux || is_chromeos || is_android) +import("//chrome/common/features.gni") + # This is the public interface for tabs in a desktop browser. Most features in # //chrome/browser depend on this interface, and thus to prevent circular # dependencies this interface should not depend on anything else in //chrome. @@ -352,6 +354,13 @@ "//components/tab_groups", "//ui/webui", ] + + if (enable_glic) { + deps += [ + "//chrome/browser/glic", + "//chrome/browser/glic:enabling", + ] + } } # This is a separate component to avoid possible circular deps.
diff --git a/chrome/browser/ui/tabs/existing_base_sub_menu_model.cc b/chrome/browser/ui/tabs/existing_base_sub_menu_model.cc index 5272124..af290290 100644 --- a/chrome/browser/ui/tabs/existing_base_sub_menu_model.cc +++ b/chrome/browser/ui/tabs/existing_base_sub_menu_model.cc
@@ -66,8 +66,9 @@ int command_id = min_command_id_ + 1; for (size_t i = 0; i < menu_item_infos.size(); ++i) { const MenuItemInfo& item = menu_item_infos[i]; - if (command_id > min_command_id_ + static_cast<int>(max_size)) + if (command_id > min_command_id_ + static_cast<int>(max_size)) { break; + } if (item.target_index.has_value()) { command_id_to_target_index_[command_id] = item.target_index.value(); @@ -78,8 +79,9 @@ } } else { // Add a spacing separator to further delineate menu item groupings. - if (i > 0) + if (i > 0) { AddSeparator(ui::SPACING_SEPARATOR); + } AddTitle(item.text); }
diff --git a/chrome/browser/ui/tabs/existing_tab_group_sub_menu_model.cc b/chrome/browser/ui/tabs/existing_tab_group_sub_menu_model.cc index 653d9c8..a898498 100644 --- a/chrome/browser/ui/tabs/existing_tab_group_sub_menu_model.cc +++ b/chrome/browser/ui/tabs/existing_tab_group_sub_menu_model.cc
@@ -67,8 +67,9 @@ if (tab_menu_model_delegate_) { for (Browser* browser : tab_menu_model_delegate_->GetOtherBrowserWindows(/*is_app=*/false)) { - if (browser->tab_strip_model() == model) + if (browser->tab_strip_model() == model) { continue; + } const std::vector<MenuItemInfo> retrieved_menu_item_infos = GetMenuItemsFromModel(browser->tab_strip_model()); menu_item_infos.insert(menu_item_infos.end(), @@ -93,8 +94,9 @@ const std::vector<tab_groups::TabGroupId> ExistingTabGroupSubMenuModel::GetGroupsFromModel(TabStripModel* current_model) { // No model, no group model, no service. - if (!current_model || !current_model->group_model()) + if (!current_model || !current_model->group_model()) { return {}; + } // Add tab groups to `groups` if they differ from our indexes current group. std::vector<tab_groups::TabGroupId> groups; @@ -146,8 +148,9 @@ int context_index, TabMenuModelDelegate* tab_menu_model_delegate) { TabGroupModel* group_model = model->group_model(); - if (!group_model) + if (!group_model) { return false; + } // Look at tab groups in current window for (tab_groups::TabGroupId group : group_model->ListTabGroups()) { @@ -162,12 +165,14 @@ tab_menu_model_delegate->GetOtherBrowserWindows(/*is_app=*/false)) { TabGroupModel* browser_group_model = browser->tab_strip_model()->group_model(); - if (!browser_group_model) + if (!browser_group_model) { continue; + } for (tab_groups::TabGroupId group : browser_group_model->ListTabGroups()) { - if (ShouldShowGroup(model, context_index, group)) + if (ShouldShowGroup(model, context_index, group)) { return true; + } } } } @@ -184,8 +189,9 @@ DCHECK_LE(size_t(target_index), target_index_to_group_mapping_.size()); TabGroupModel* group_model = model()->group_model(); - if (!group_model) + if (!group_model) { return; + } base::RecordAction(base::UserMetricsAction("TabContextMenu_NewTabInGroup")); @@ -212,8 +218,9 @@ } // Do nothing if the browser does not exist. - if (!browser_index.has_value()) + if (!browser_index.has_value()) { return; + } std::vector<int> selected_indices; if (!model()->IsTabSelected(GetContextIndex())) { @@ -258,8 +265,9 @@ int context_index, tab_groups::TabGroupId group) { if (!model->IsTabSelected(context_index)) { - if (group != model->GetTabGroupForTab(context_index)) + if (group != model->GetTabGroupForTab(context_index)) { return true; + } } else { for (int index : model->selection_model().selected_indices()) { if (group != model->GetTabGroupForTab(index)) {
diff --git a/chrome/browser/ui/tabs/existing_tab_group_sub_menu_model.h b/chrome/browser/ui/tabs/existing_tab_group_sub_menu_model.h index 3fd79ab..9618a10c 100644 --- a/chrome/browser/ui/tabs/existing_tab_group_sub_menu_model.h +++ b/chrome/browser/ui/tabs/existing_tab_group_sub_menu_model.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_TABS_EXISTING_TAB_GROUP_SUB_MENU_MODEL_H_ #include <stddef.h> + #include <vector> #include "chrome/browser/ui/tabs/existing_base_sub_menu_model.h"
diff --git a/chrome/browser/ui/tabs/existing_tab_group_sub_menu_model_unittest.cc b/chrome/browser/ui/tabs/existing_tab_group_sub_menu_model_unittest.cc index 84280b6f..2b58efc5 100644 --- a/chrome/browser/ui/tabs/existing_tab_group_sub_menu_model_unittest.cc +++ b/chrome/browser/ui/tabs/existing_tab_group_sub_menu_model_unittest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/tabs/existing_tab_group_sub_menu_model.h" + #include <memory> #include "chrome/browser/ui/browser_list.h" @@ -157,8 +158,9 @@ // order since at this point the only tab that is selected is the grouped tab. // We are unable to deselect this tab first. Doing so creates a state where no // tabs are selected which is not allowed. - for (int i = model_1->count() - 1; i >= 0; --i) + for (int i = model_1->count() - 1; i >= 0; --i) { model_1->ToggleSelectionAt(i); + } const ui::ListSelectionModel::SelectedIndices selection_indices = model_1->selection_model().selected_indices(); @@ -179,8 +181,9 @@ int num_selected = 0; for (int i = 0; i < model_2->count(); ++i) { - if (model_2->IsTabSelected(i)) + if (model_2->IsTabSelected(i)) { ++num_selected; + } } // Expect the number of tabs we moved from model_1 into model_2 is still 3.
diff --git a/chrome/browser/ui/tabs/existing_window_sub_menu_model_chromeos.cc b/chrome/browser/ui/tabs/existing_window_sub_menu_model_chromeos.cc index 4bdd31f..95f0c49 100644 --- a/chrome/browser/ui/tabs/existing_window_sub_menu_model_chromeos.cc +++ b/chrome/browser/ui/tabs/existing_window_sub_menu_model_chromeos.cc
@@ -103,8 +103,9 @@ for (size_t desk = 0; desk < grouped_by_desk_menu_item_infos.size(); ++desk) { const std::vector<MenuItemInfo>& desk_items = grouped_by_desk_menu_item_infos[desk]; - if (desk_items.empty()) + if (desk_items.empty()) { continue; + } // Create a MenuItemInfo for this desk for `desk_name`. std::u16string desk_name;
diff --git a/chrome/browser/ui/tabs/hover_tab_selector.cc b/chrome/browser/ui/tabs/hover_tab_selector.cc index 492b469a..78fdbfb 100644 --- a/chrome/browser/ui/tabs/hover_tab_selector.cc +++ b/chrome/browser/ui/tabs/hover_tab_selector.cc
@@ -22,8 +22,9 @@ // If there is a transition underway already, only start a new // transition (canceling the old one) if the target tab differs. if (weak_factory_.HasWeakPtrs()) { - if (index == tab_transition_tab_index_) + if (index == tab_transition_tab_index_) { return; + } CancelTabTransition(); } // Start a new transition if the target isn't active already.
diff --git a/chrome/browser/ui/tabs/hover_tab_selector.h b/chrome/browser/ui/tabs/hover_tab_selector.h index 6b38612..d1f58a30 100644 --- a/chrome/browser/ui/tabs/hover_tab_selector.h +++ b/chrome/browser/ui/tabs/hover_tab_selector.h
@@ -43,4 +43,3 @@ }; #endif // CHROME_BROWSER_UI_TABS_HOVER_TAB_SELECTOR_H_ -
diff --git a/chrome/browser/ui/tabs/organization/metrics.cc b/chrome/browser/ui/tabs/organization/metrics.cc index ae55c05..b9841323 100644 --- a/chrome/browser/ui/tabs/organization/metrics.cc +++ b/chrome/browser/ui/tabs/organization/metrics.cc
@@ -20,7 +20,7 @@ // Max number of tabs within 3 std deviations of mean. int kMaxLoggedTabs = 115; -} +} // namespace void LogTabStripOrganizationUKM( const TabStripModel* tab_strip_model,
diff --git a/chrome/browser/ui/tabs/organization/tab_organization.cc b/chrome/browser/ui/tabs/organization/tab_organization.cc index decbaf2..ad0a200 100644 --- a/chrome/browser/ui/tabs/organization/tab_organization.cc +++ b/chrome/browser/ui/tabs/organization/tab_organization.cc
@@ -20,7 +20,7 @@ namespace { constexpr int kMinValidTabsForOrganizing = 2; int kNextOrganizationID = 1; -} +} // namespace TabOrganization::TabOrganization( TabDatas tab_datas, @@ -174,8 +174,7 @@ // the tab strip and therefore causes |this| to be deleted. So we keep // a WeakPtr to |this| to detect this case and avoid accessing member // variables, just in case. - base::WeakPtr<TabOrganization> this_weak_ref = - weak_ptr_factory_.GetWeakPtr(); + base::WeakPtr<TabOrganization> this_weak_ref = weak_ptr_factory_.GetWeakPtr(); if (group_id_.has_value()) { CHECK(tab_strip_model->group_model()->ContainsTabGroup(group_id_.value()));
diff --git a/chrome/browser/ui/tabs/organization/tab_organization_service.h b/chrome/browser/ui/tabs/organization/tab_organization_service.h index d91ce464..17669a86 100644 --- a/chrome/browser/ui/tabs/organization/tab_organization_service.h +++ b/chrome/browser/ui/tabs/organization/tab_organization_service.h
@@ -30,9 +30,8 @@ } // Provides an interface for getting Organizations for tabs. -class TabOrganizationService - : public KeyedService, - public TabStripModelObserver { +class TabOrganizationService : public KeyedService, + public TabStripModelObserver { public: using BrowserSessionMap = std::unordered_map<const Browser*,
diff --git a/chrome/browser/ui/tabs/organization/trigger_policies.h b/chrome/browser/ui/tabs/organization/trigger_policies.h index b80855f..6b7ab18 100644 --- a/chrome/browser/ui/tabs/organization/trigger_policies.h +++ b/chrome/browser/ui/tabs/organization/trigger_policies.h
@@ -5,13 +5,12 @@ #ifndef CHROME_BROWSER_UI_TABS_ORGANIZATION_TRIGGER_POLICIES_H_ #define CHROME_BROWSER_UI_TABS_ORGANIZATION_TRIGGER_POLICIES_H_ -#include "chrome/browser/ui/tabs/organization/trigger.h" - #include <memory> #include "base/time/tick_clock.h" #include "base/time/time.h" #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h" +#include "chrome/browser/ui/tabs/organization/trigger.h" namespace content { class BrowserContext;
diff --git a/chrome/browser/ui/tabs/organization/trigger_policies_unittest.cc b/chrome/browser/ui/tabs/organization/trigger_policies_unittest.cc index 9e3476e..f4bcfa2 100644 --- a/chrome/browser/ui/tabs/organization/trigger_policies_unittest.cc +++ b/chrome/browser/ui/tabs/organization/trigger_policies_unittest.cc
@@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <memory> - #include "chrome/browser/ui/tabs/organization/trigger_policies.h" +#include <memory> + #include "base/test/metrics/histogram_tester.h" #include "base/test/simple_test_tick_clock.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/ui/tabs/pinned_tab_codec.cc b/chrome/browser/ui/tabs/pinned_tab_codec.cc index 22407e4..68dc0d5 100644 --- a/chrome/browser/ui/tabs/pinned_tab_codec.cc +++ b/chrome/browser/ui/tabs/pinned_tab_codec.cc
@@ -41,8 +41,9 @@ content::WebContents* web_contents = tab_model->GetWebContentsAt(i); NavigationEntry* entry = web_contents->GetController().GetLastCommittedEntry(); - if (entry) + if (entry) { serialized_tabs.Append(EncodeTab(entry->GetURL())); + } } } @@ -66,8 +67,9 @@ // static void PinnedTabCodec::WritePinnedTabs(Profile* profile) { PrefService* prefs = profile->GetPrefs(); - if (!prefs) + if (!prefs) { return; + } base::Value::List values; for (Browser* browser : *BrowserList::GetInstance()) { @@ -82,30 +84,35 @@ void PinnedTabCodec::WritePinnedTabs(Profile* profile, const StartupTabs& tabs) { PrefService* prefs = profile->GetPrefs(); - if (!prefs) + if (!prefs) { return; + } ScopedListPrefUpdate update(prefs, prefs::kPinnedTabs); base::Value::List& values = update.Get(); values.clear(); - for (const auto& tab : tabs) + for (const auto& tab : tabs) { values.Append(EncodeTab(tab.url)); + } } // static StartupTabs PinnedTabCodec::ReadPinnedTabs(Profile* profile) { PrefService* prefs = profile->GetPrefs(); - if (!prefs) + if (!prefs) { return {}; + } StartupTabs results; for (const auto& serialized_tab : prefs->GetList(prefs::kPinnedTabs)) { - if (!serialized_tab.is_dict()) + if (!serialized_tab.is_dict()) { continue; + } std::optional<StartupTab> tab = DecodeTab(serialized_tab.GetDict()); - if (tab.has_value()) + if (tab.has_value()) { results.push_back(tab.value()); + } } return results;
diff --git a/chrome/browser/ui/tabs/pinned_tab_service.cc b/chrome/browser/ui/tabs/pinned_tab_service.cc index 734b2f0..2eb4dee 100644 --- a/chrome/browser/ui/tabs/pinned_tab_service.cc +++ b/chrome/browser/ui/tabs/pinned_tab_service.cc
@@ -17,8 +17,9 @@ base::BindRepeating(&PinnedTabService::OnClosingAllBrowsersChanged, base::Unretained(this))); - for (Browser* browser : *BrowserList::GetInstance()) + for (Browser* browser : *BrowserList::GetInstance()) { OnBrowserAdded(browser); + } BrowserList::AddObserver(this); } @@ -43,29 +44,34 @@ // * pinned tabs are saved, without the window with the pinned tabs, // over-writing the correct state. // Saving is re-enabled if a new tab or window is opened. - if (closing && TabStripModelObserver::IsObservingAny(this)) + if (closing && TabStripModelObserver::IsObservingAny(this)) { WritePinnedTabsIfNecessary(); + } } void PinnedTabService::OnBrowserAdded(Browser* browser) { - if (browser->profile() != profile_ || !browser->is_type_normal()) + if (browser->profile() != profile_ || !browser->is_type_normal()) { return; + } need_to_write_pinned_tabs_ = true; browser->tab_strip_model()->AddObserver(this); } void PinnedTabService::OnBrowserClosing(Browser* browser) { - if (browser->profile() != profile_ || !browser->is_type_normal()) + if (browser->profile() != profile_ || !browser->is_type_normal()) { return; + } - if (TabStripModelObserver::CountObservedModels(this) == 1) + if (TabStripModelObserver::CountObservedModels(this) == 1) { WritePinnedTabsIfNecessary(); + } } void PinnedTabService::OnBrowserRemoved(Browser* browser) { - if (browser->profile() != profile_ || !browser->is_type_normal()) + if (browser->profile() != profile_ || !browser->is_type_normal()) { return; + } browser->tab_strip_model()->RemoveObserver(this); @@ -74,20 +80,23 @@ // pinned tabs to repopen on the next startup. So we should call // WritePinnedTab() to clear the data. // http://crbug.com/71939 - if (!TabStripModelObserver::IsObservingAny(this)) + if (!TabStripModelObserver::IsObservingAny(this)) { WritePinnedTabsIfNecessary(); + } } void PinnedTabService::OnTabStripModelChanged( TabStripModel* tab_strip_model, const TabStripModelChange& change, const TabStripSelectionChange& selection) { - if (change.type() == TabStripModelChange::kInserted) + if (change.type() == TabStripModelChange::kInserted) { need_to_write_pinned_tabs_ = true; + } } void PinnedTabService::WritePinnedTabsIfNecessary() { - if (need_to_write_pinned_tabs_) + if (need_to_write_pinned_tabs_) { PinnedTabCodec::WritePinnedTabs(profile_); + } need_to_write_pinned_tabs_ = false; }
diff --git a/chrome/browser/ui/tabs/pinned_tab_service_factory.cc b/chrome/browser/ui/tabs/pinned_tab_service_factory.cc index 6a5dc2d5..4346af5 100644 --- a/chrome/browser/ui/tabs/pinned_tab_service_factory.cc +++ b/chrome/browser/ui/tabs/pinned_tab_service_factory.cc
@@ -8,8 +8,7 @@ #include "chrome/browser/ui/tabs/pinned_tab_service.h" // static -PinnedTabService* PinnedTabServiceFactory::GetForProfile( - Profile* profile) { +PinnedTabService* PinnedTabServiceFactory::GetForProfile(Profile* profile) { return static_cast<PinnedTabService*>( GetInstance()->GetServiceForBrowserContext(profile, true)); }
diff --git a/chrome/browser/ui/tabs/pinned_tab_test_utils.cc b/chrome/browser/ui/tabs/pinned_tab_test_utils.cc index 27513b9..e296ab5 100644 --- a/chrome/browser/ui/tabs/pinned_tab_test_utils.cc +++ b/chrome/browser/ui/tabs/pinned_tab_test_utils.cc
@@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <stddef.h> - #include "chrome/browser/ui/tabs/pinned_tab_test_utils.h" +#include <stddef.h> + namespace { std::string TabToString(const StartupTab& tab) { @@ -30,8 +30,9 @@ const std::vector<StartupTab>& values) { std::string result; for (size_t i = 0; i < values.size(); ++i) { - if (i != 0) + if (i != 0) { result += " "; + } result += TabToString(values[i]); } return result;
diff --git a/chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_utils.h b/chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_utils.h index 0eec1a51..02e49fe 100644 --- a/chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_utils.h +++ b/chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_utils.h
@@ -25,7 +25,7 @@ namespace content { class NavigationHandle; class WebContents; -} +} // namespace content namespace tab_groups {
diff --git a/chrome/browser/ui/tabs/tab_collection_storage.cc b/chrome/browser/ui/tabs/tab_collection_storage.cc index 65bcc4e..8ec87d8c 100644 --- a/chrome/browser/ui/tabs/tab_collection_storage.cc +++ b/chrome/browser/ui/tabs/tab_collection_storage.cc
@@ -2,11 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/tabs/tab_collection_storage.h" + #include <memory> #include "base/notimplemented.h" #include "chrome/browser/ui/tabs/tab_collection.h" -#include "chrome/browser/ui/tabs/tab_collection_storage.h" #include "chrome/browser/ui/tabs/tab_model.h" namespace tabs {
diff --git a/chrome/browser/ui/tabs/tab_group.cc b/chrome/browser/ui/tabs/tab_group.cc index 1ca9f6a6..31da1495 100644 --- a/chrome/browser/ui/tabs/tab_group.cc +++ b/chrome/browser/ui/tabs/tab_group.cc
@@ -84,10 +84,11 @@ void TabGroup::RemoveTab() { DCHECK_GT(tab_count_, 0); --tab_count_; - if (tab_count_ == 0) + if (tab_count_ == 0) { controller_->CloseTabGroup(id_); - else + } else { controller_->ChangeTabGroupContents(id_); + } RunTabGroupVisualsChangedCallback(); } @@ -102,8 +103,9 @@ std::optional<int> TabGroup::GetFirstTab() const { for (int i = 0; i < controller_->GetTabCount(); ++i) { - if (controller_->GetTabGroupForTab(i) == id_) + if (controller_->GetTabGroupForTab(i) == id_) { return i; + } } return std::nullopt; @@ -111,8 +113,9 @@ std::optional<int> TabGroup::GetLastTab() const { for (int i = controller_->GetTabCount() - 1; i >= 0; --i) { - if (controller_->GetTabGroupForTab(i) == id_) + if (controller_->GetTabGroupForTab(i) == id_) { return i; + } } return std::nullopt; @@ -120,8 +123,9 @@ gfx::Range TabGroup::ListTabs() const { std::optional<int> maybe_first_tab = GetFirstTab(); - if (!maybe_first_tab) + if (!maybe_first_tab) { return gfx::Range(); + } int first_tab = maybe_first_tab.value(); // Safe to assume GetLastTab() is not nullopt.
diff --git a/chrome/browser/ui/tabs/tab_group_tab_collection.cc b/chrome/browser/ui/tabs/tab_group_tab_collection.cc index 585ec57..9a02346 100644 --- a/chrome/browser/ui/tabs/tab_group_tab_collection.cc +++ b/chrome/browser/ui/tabs/tab_group_tab_collection.cc
@@ -2,11 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/tabs/tab_group_tab_collection.h" + #include <memory> #include <optional> #include "chrome/browser/ui/tabs/tab_collection_storage.h" -#include "chrome/browser/ui/tabs/tab_group_tab_collection.h" #include "chrome/browser/ui/tabs/tab_model.h" #include "components/tab_groups/tab_group_id.h"
diff --git a/chrome/browser/ui/tabs/tab_network_state.cc b/chrome/browser/ui/tabs/tab_network_state.cc index 78cac79..dbb7b0c 100644 --- a/chrome/browser/ui/tabs/tab_network_state.cc +++ b/chrome/browser/ui/tabs/tab_network_state.cc
@@ -13,12 +13,14 @@ if (!contents->ShouldShowLoadingUI()) { content::NavigationEntry* entry = contents->GetController().GetLastCommittedEntry(); - if (entry && (entry->GetPageType() == content::PAGE_TYPE_ERROR)) + if (entry && (entry->GetPageType() == content::PAGE_TYPE_ERROR)) { return TabNetworkState::kError; + } return TabNetworkState::kNone; } - if (contents->IsWaitingForResponse()) + if (contents->IsWaitingForResponse()) { return TabNetworkState::kWaiting; + } return TabNetworkState::kLoading; }
diff --git a/chrome/browser/ui/tabs/tab_strip_model.cc b/chrome/browser/ui/tabs/tab_strip_model.cc index 9312427..aa8e789 100644 --- a/chrome/browser/ui/tabs/tab_strip_model.cc +++ b/chrome/browser/ui/tabs/tab_strip_model.cc
@@ -154,8 +154,9 @@ // static TabGroupModelFactory* TabGroupModelFactory::GetInstance() { - if (!factory_instance) + if (!factory_instance) { factory_instance = new TabGroupModelFactory(); + } return factory_instance; } @@ -220,8 +221,9 @@ contents_data_ = CreateTabContentsDataImpl(); - if (group_model_factory) + if (group_model_factory) { group_model_ = group_model_factory->Create(this); + } scrubbing_metrics_.Init(); } @@ -235,13 +237,15 @@ DCHECK(!tab_strip_ui_was_set_); std::vector<TabStripModelObserver*> new_observers{observer}; - for (auto& old_observer : observers_) + for (auto& old_observer : observers_) { new_observers.push_back(&old_observer); + } observers_.Clear(); - for (auto* new_observer : new_observers) + for (auto* new_observer : new_observers) { observers_.AddObserver(new_observer); + } observer->StartedObserving(TabStripModelObserver::ModelPasskey(), this); tab_strip_ui_was_set_ = true; @@ -492,8 +496,9 @@ } if (empty()) { - for (auto& observer : observers_) + for (auto& observer : observers_) { observer.TabStripEmpty(); + } } } @@ -669,8 +674,9 @@ void TabStripModel::SetTabNeedsAttentionAt(int index, bool attention) { CHECK(ContainsIndex(index)); - for (auto& observer : observers_) + for (auto& observer : observers_) { observer.SetTabNeedsAttentionAt(index, attention); + } } void TabStripModel::CloseAllTabs() { @@ -682,16 +688,18 @@ closing_all_ = true; std::vector<content::WebContents*> closing_tabs; closing_tabs.reserve(count()); - for (int i = count() - 1; i >= 0; --i) + for (int i = count() - 1; i >= 0; --i) { closing_tabs.push_back(GetWebContentsAt(i)); + } CloseTabs(closing_tabs, TabCloseTypes::CLOSE_CREATE_HISTORICAL_TAB); } void TabStripModel::CloseAllTabsInGroup(const tab_groups::TabGroupId& group) { ReentrancyCheck reentrancy_check(&reentrancy_guard_); - if (!group_model_) + if (!group_model_) { return; + } delegate_->WillCloseGroup(group); @@ -703,13 +711,15 @@ tab_group->SetGroupIsClosing(/*is_closing=*/true); gfx::Range tabs_in_group = tab_group->ListTabs(); - if (static_cast<int>(tabs_in_group.length()) == count()) + if (static_cast<int>(tabs_in_group.length()) == count()) { closing_all_ = true; + } std::vector<content::WebContents*> closing_tabs; closing_tabs.reserve(tabs_in_group.length()); - for (uint32_t i = tabs_in_group.end(); i > tabs_in_group.start(); --i) + for (uint32_t i = tabs_in_group.end(); i > tabs_in_group.start(); --i) { closing_tabs.push_back(GetWebContentsAt(i - 1)); + } CloseTabs(closing_tabs, TabCloseTypes::CLOSE_CREATE_HISTORICAL_TAB); } @@ -862,19 +872,22 @@ std::optional<tab_groups::TabGroupId> TabStripModel::GetSurroundingTabGroup( int index) const { - if (!ContainsIndex(index - 1) || !ContainsIndex(index)) + if (!ContainsIndex(index - 1) || !ContainsIndex(index)) { return std::nullopt; + } // If the tab before is not in a group, a tab inserted at |index| // wouldn't be surrounded by one group. std::optional<tab_groups::TabGroupId> group = GetTabGroupForTab(index - 1); - if (!group) + if (!group) { return std::nullopt; + } // If the tab after is in a different (or no) group, a new tab at // |index| isn't surrounded. - if (group != GetTabGroupForTab(index)) + if (group != GetTabGroupForTab(index)) { return std::nullopt; + } return group; } @@ -891,8 +904,9 @@ } bool TabStripModel::ToggleSelectionAt(int index) { - if (!delegate()->IsTabStripEditable()) + if (!delegate()->IsTabStripEditable()) { return false; + } CHECK(ContainsIndex(index)); const size_t index_size_t = static_cast<size_t>(index); ui::ListSelectionModel new_model = selection_model(); @@ -904,8 +918,9 @@ } new_model.RemoveIndexFromSelection(index_size_t); new_model.set_anchor(index_size_t); - if (!new_model.active().has_value() || new_model.active() == index_size_t) + if (!new_model.active().has_value() || new_model.active() == index_size_t) { new_model.set_active(*new_model.selected_indices().begin()); + } } else { new_model.AddIndexToSelection(index_size_t); new_model.set_anchor(index_size_t); @@ -965,8 +980,9 @@ ui::PageTransition transition, int add_types, std::optional<tab_groups::TabGroupId> group) { - for (auto& observer : observers_) + for (auto& observer : observers_) { observer.OnTabWillBeAdded(); + } ReentrancyCheck reentrancy_check(&reentrancy_guard_); @@ -988,13 +1004,15 @@ // The current active index is our opener. If the tab we are adding is not // in a group, set the group of the tab to that of its opener. - if (!group.has_value()) + if (!group.has_value()) { group = GetTabGroupForTab(active_index()); + } } else { // For all other types, respect what was passed to us, normalizing -1s and // values that are too large. - if (index < 0 || index > count()) + if (index < 0 || index > count()) { index = count(); + } } // Prevent the tab from being inserted at an index that would make the group @@ -1007,7 +1025,7 @@ group_model_->GetTabGroup(group.value())->ListTabs(); if (grouped_tabs.length() > 0) { index = std::clamp(index, static_cast<int>(grouped_tabs.start()), - static_cast<int>(grouped_tabs.end())); + static_cast<int>(grouped_tabs.end())); } } else if (GetTabGroupForTab(index - 1) == GetTabGroupForTab(index)) { group = GetTabGroupForTab(index); @@ -1185,15 +1203,17 @@ void TabStripModel::RemoveFromGroup(const std::vector<int>& indices) { ReentrancyCheck reentrancy_check(&reentrancy_guard_); - if (!group_model_) + if (!group_model_) { return; + } std::map<tab_groups::TabGroupId, std::vector<int>> indices_per_tab_group; for (int index : indices) { std::optional<tab_groups::TabGroupId> old_group = GetTabGroupForTab(index); - if (old_group.has_value()) + if (old_group.has_value()) { indices_per_tab_group[old_group.value()].push_back(index); + } } for (const auto& kv : indices_per_tab_group) { @@ -1226,17 +1246,20 @@ bool TabStripModel::IsReadLaterSupportedForAny( const std::vector<int>& indices) { - if (!delegate_->SupportsReadLater()) + if (!delegate_->SupportsReadLater()) { return false; + } ReadingListModel* model = ReadingListModelFactory::GetForBrowserContext(profile_); - if (!model || !model->loaded()) + if (!model || !model->loaded()) { return false; + } for (int index : indices) { if (model->IsUrlSupported( - chrome::GetURLToBookmark(GetWebContentsAt(index)))) + chrome::GetURLToBookmark(GetWebContentsAt(index)))) { return true; + } } return false; } @@ -1248,60 +1271,72 @@ } void TabStripModel::CreateTabGroup(const tab_groups::TabGroupId& group) { - if (!group_model_) + if (!group_model_) { return; + } TabGroupChange change(this, group, TabGroupChange::kCreated); - for (auto& observer : observers_) + for (auto& observer : observers_) { observer.OnTabGroupChanged(change); + } } void TabStripModel::OpenTabGroupEditor(const tab_groups::TabGroupId& group) { - if (!group_model_) + if (!group_model_) { return; + } TabGroupChange change(this, group, TabGroupChange::kEditorOpened); - for (auto& observer : observers_) + for (auto& observer : observers_) { observer.OnTabGroupChanged(change); + } } void TabStripModel::ChangeTabGroupContents( const tab_groups::TabGroupId& group) { - if (!group_model_) + if (!group_model_) { return; + } TabGroupChange change(this, group, TabGroupChange::kContentsChanged); - for (auto& observer : observers_) + for (auto& observer : observers_) { observer.OnTabGroupChanged(change); + } } void TabStripModel::ChangeTabGroupVisuals( const tab_groups::TabGroupId& group, const TabGroupChange::VisualsChange& visuals) { - if (!group_model_) + if (!group_model_) { return; + } TabGroupChange change(this, group, visuals); - for (auto& observer : observers_) + for (auto& observer : observers_) { observer.OnTabGroupChanged(change); + } } void TabStripModel::MoveTabGroup(const tab_groups::TabGroupId& group) { - if (!group_model_) + if (!group_model_) { return; + } TabGroupChange change(this, group, TabGroupChange::kMoved); - for (auto& observer : observers_) + for (auto& observer : observers_) { observer.OnTabGroupChanged(change); + } } void TabStripModel::CloseTabGroup(const tab_groups::TabGroupId& group) { - if (!group_model_) + if (!group_model_) { return; + } TabGroupChange change(this, group, TabGroupChange::kClosed); - for (auto& observer : observers_) + for (auto& observer : observers_) { observer.OnTabGroupChanged(change); + } } std::u16string TabStripModel::GetTitleAt(int index) const { @@ -1350,8 +1385,9 @@ case CommandToggleSiteMuted: { std::vector<int> indices = GetIndicesForCommand(context_index); for (int index : indices) { - if (!GetWebContentsAt(index)->GetLastCommittedURL().is_empty()) + if (!GetWebContentsAt(index)->GetLastCommittedURL().is_empty()) { return true; + } } return false; } @@ -1425,8 +1461,9 @@ // The tab strip may have been modified while the context menu was open, // including closing the tab originally at |context_index|. - if (!ContainsIndex(context_index)) + if (!ContainsIndex(context_index)) { return; + } switch (command_id) { case CommandNewTabToRight: { base::RecordAction(UserMetricsAction("TabContextMenu_NewTab")); @@ -1439,12 +1476,14 @@ case CommandReload: { base::RecordAction(UserMetricsAction("TabContextMenu_Reload")); - if (!delegate_->CanReload()) + if (!delegate_->CanReload()) { break; + } for (int index : GetIndicesForCommand(context_index)) { WebContents* tab = GetWebContentsAt(index); - if (tab) + if (tab) { tab->GetController().Reload(content::ReloadType::NORMAL, true); + } } break; } @@ -1516,36 +1555,37 @@ // context menu, confirm the group deletion first, and then perform the // close, either through the callback provided to confirm, or directly if // the Confirm is allowing a synchronous delete. - base::OnceCallback<void()> callback = base::BindOnce( - [](TabStripModel* model, std::vector<int> indices, - bool pin_indices) { - model->SetTabsPinned(indices, pin_indices); - }, - base::Unretained(this), indices, pin); + base::OnceCallback<void()> callback = base::BindOnce( + [](TabStripModel* model, std::vector<int> indices, bool pin_indices) { + model->SetTabsPinned(indices, pin_indices); + }, + base::Unretained(this), indices, pin); - if (pin && !groups_to_delete.empty()) { - // If the delegate returns false for confirming the destroy of groups - // that means that the user needs to make a decision about the - // destruction first. prevent CloseTabs from being called. - return delegate_->OnRemovingAllTabsFromGroups(groups_to_delete, - std::move(callback)); - } else { - std::move(callback).Run(); - } + if (pin && !groups_to_delete.empty()) { + // If the delegate returns false for confirming the destroy of groups + // that means that the user needs to make a decision about the + // destruction first. prevent CloseTabs from being called. + return delegate_->OnRemovingAllTabsFromGroups(groups_to_delete, + std::move(callback)); + } else { + std::move(callback).Run(); + } break; } case CommandToggleGrouped: { - if (!group_model_) + if (!group_model_) { break; + } std::vector<int> indices = GetIndicesForCommand(context_index); if (WillContextMenuGroup(context_index)) { std::optional<tab_groups::TabGroupId> new_group_id = AddToNewGroup(indices); - if (new_group_id.has_value()) + if (new_group_id.has_value()) { OpenTabGroupEditor(new_group_id.value()); + } } else { std::vector<tab_groups::TabGroupId> groups_to_delete = GetGroupsDestroyedFromRemovingIndices(indices); @@ -1584,8 +1624,9 @@ } case CommandAddToNewGroup: { - if (!group_model_) + if (!group_model_) { break; + } base::RecordAction(UserMetricsAction("TabContextMenu_AddToNewGroup")); @@ -1742,13 +1783,15 @@ void TabStripModel::ExecuteAddToExistingGroupCommand( int context_index, const tab_groups::TabGroupId& group) { - if (!group_model_) + if (!group_model_) { return; + } base::RecordAction(UserMetricsAction("TabContextMenu_AddToExistingGroup")); - if (!ContainsIndex(context_index)) + if (!ContainsIndex(context_index)) { return; + } std::vector<int> indices = GetIndicesForCommand(context_index); @@ -1777,8 +1820,9 @@ int browser_index) { base::RecordAction(UserMetricsAction("TabContextMenu_AddToExistingWindow")); - if (!ContainsIndex(context_index)) + if (!ContainsIndex(context_index)) { return; + } delegate()->MoveToExistingWindow(GetIndicesForCommand(context_index), browser_index); } @@ -1873,26 +1917,30 @@ std::vector<int> indices = GetIndicesForCommand(index); // If all tabs are pinned, then we unpin, otherwise we pin. bool all_pinned = true; - for (size_t i = 0; i < indices.size() && all_pinned; ++i) + for (size_t i = 0; i < indices.size() && all_pinned; ++i) { all_pinned = IsTabPinned(indices[i]); + } return !all_pinned; } bool TabStripModel::WillContextMenuGroup(int index) { - if (!group_model_) + if (!group_model_) { return false; + } std::vector<int> indices = GetIndicesForCommand(index); DCHECK(!indices.empty()); // If all tabs are in the same group, then we ungroup, otherwise we group. std::optional<tab_groups::TabGroupId> group = GetTabGroupForTab(indices[0]); - if (!group.has_value()) + if (!group.has_value()) { return true; + } for (size_t i = 1; i < indices.size(); ++i) { - if (GetTabGroupForTab(indices[i]) != group) + if (GetTabGroupForTab(indices[i]) != group) { return true; + } } return false; } @@ -2013,8 +2061,9 @@ } std::vector<int> TabStripModel::GetIndicesForCommand(int index) const { - if (!IsTabSelected(index)) + if (!IsTabSelected(index)) { return {index}; + } const ui::ListSelectionModel::SelectedIndices& sel = selection_model_.selected_indices(); return std::vector<int>(sel.begin(), sel.end()); @@ -2035,8 +2084,9 @@ // NOTE: callers expect the vector to be sorted in descending order. std::vector<int> indices; for (int i = count() - 1; i > last_unclosed_tab; --i) { - if (i != index && !IsTabPinned(i) && (!is_selected || !IsTabSelected(i))) + if (i != index && !IsTabPinned(i) && (!is_selected || !IsTabSelected(i))) { indices.push_back(i); + } } return indices; } @@ -2053,8 +2103,9 @@ const std::vector<int>& indices) const { std::vector<content::WebContents*> items; items.reserve(indices.size()); - for (int index : indices) + for (int index : indices) { items.push_back(GetTabAtIndex(index)->GetContents()); + } return items; } @@ -2166,15 +2217,17 @@ SendDetachWebContentsNotifications(¬ifications); } - if (!ref) + if (!ref) { return; + } if (closing_all) { // CloseAllTabsStopped is sent with reason kCloseAllCompleted if // closed_all; otherwise kCloseAllCanceled is sent. - for (auto& observer : observers_) + for (auto& observer : observers_) { observer.CloseAllTabsStopped( this, closed_all ? TabStripModelObserver::kCloseAllCompleted : TabStripModelObserver::kCloseAllCanceled); + } } } @@ -2182,8 +2235,9 @@ base::span<content::WebContents* const> items, uint32_t close_types, DetachNotifications* notifications) { - if (items.empty()) + if (items.empty()) { return true; + } for (WebContents* contents : items) { const int index = GetIndexOfWebContents(contents); @@ -2204,16 +2258,18 @@ // closing. base::flat_map<content::RenderProcessHost*, size_t> processes; for (content::WebContents* contents : items) { - if (ShouldRunUnloadListenerBeforeClosing(contents)) + if (ShouldRunUnloadListenerBeforeClosing(contents)) { continue; + } content::RenderProcessHost* process = contents->GetPrimaryMainFrame()->GetProcess(); ++processes[process]; } // Try to fast shutdown the tabs that can close. - for (const auto& pair : processes) + for (const auto& pair : processes) { pair.first->FastShutdownIfPossible(pair.second, false); + } } // We now return to our regularly scheduled shutdown procedure. @@ -2222,8 +2278,9 @@ // The indices of WebContents prior to any modification of the internal state. std::vector<int> original_indices; original_indices.resize(items.size()); - for (size_t i = 0; i < items.size(); ++i) + for (size_t i = 0; i < items.size(); ++i) { original_indices[i] = GetIndexOfWebContents(items[i]); + } std::vector<std::unique_ptr<DetachedTab>> detached_tab; for (size_t i = 0; i < items.size(); ++i) { @@ -2654,8 +2711,9 @@ } void TabStripModel::AddToReadLaterImpl(const std::vector<int>& indices) { - for (int index : indices) + for (int index : indices) { delegate_->AddToReadLater(GetWebContentsAt(index)); + } } void TabStripModel::InsertTabAtIndexImpl( @@ -3051,8 +3109,9 @@ // `GetLastCommittedURL` could return an empty URL if no navigation has // occurred yet. - if (url.is_empty()) + if (url.is_empty()) { continue; + } if (url.SchemeIs(content::kChromeUIScheme)) { // chrome:// URLs don't have content settings but can be muted, so just @@ -3160,8 +3219,9 @@ int TabStripModel::GetTabIndexAfterClosing(int index, int removing_index) const { - if (removing_index < index) + if (removing_index < index) { index = std::max(0, index - 1); + } return index; } @@ -3237,8 +3297,9 @@ int TabStripModel::DetermineInsertionIndex(ui::PageTransition transition, bool foreground) { int tab_count = count(); - if (!tab_count) + if (!tab_count) { return 0; + } if (ui::PageTransitionCoreTypeIs(transition, ui::PAGE_TRANSITION_LINK) && active_index() != -1) { @@ -3251,8 +3312,9 @@ // Figure out the last tab opened by the current tab. const int index = GetIndexOfLastWebContentsOpenedBy(opener, active_index()); // If no such tab exists, simply place next to the current tab. - if (index == TabStripModel::kNoTab) + if (index == TabStripModel::kNoTab) { return active_index() + 1; + } // Normally we'd add the tab immediately after the most recent tab // associated with `opener`. However, if there is a group discontinuity @@ -3261,8 +3323,9 @@ const auto opener_group = GetTabGroupForTab(active_index()); for (int i = active_index() + 1; i <= index; ++i) { // Insert before the first tab that differs in group. - if (GetTabGroupForTab(i) != opener_group) + if (GetTabGroupForTab(i) != opener_group) { return i; + } } // If there is no discontinuity, add after the last tab already associated // with the opener. @@ -3288,11 +3351,13 @@ int removing_index) const { DCHECK(ContainsIndex(removing_index)); - if (removing_index != active_index()) + if (removing_index != active_index()) { return std::nullopt; + } - if (selection_model().size() > 1) + if (selection_model().size() > 1) { return std::nullopt; + } tabs::TabInterface* tab_to_remove_opener = GetOpenerOfTabAt(removing_index); // First see if the index being removed has any "child" tabs. If it does, we @@ -3303,22 +3368,25 @@ DCHECK(tab_to_remove_opener != removed_tab); int index = GetIndexOfNextWebContentsOpenedBy(removed_tab->GetContents(), removing_index); - if (index != TabStripModel::kNoTab && !IsTabCollapsed(index)) + if (index != TabStripModel::kNoTab && !IsTabCollapsed(index)) { return GetTabIndexAfterClosing(index, removing_index); + } if (tab_to_remove_opener && tab_to_remove_opener->GetContents()) { // If the tab has an opener, shift selection to the next tab with the same // opener. index = GetIndexOfNextWebContentsOpenedBy( tab_to_remove_opener->GetContents(), removing_index); - if (index != TabStripModel::kNoTab && !IsTabCollapsed(index)) + if (index != TabStripModel::kNoTab && !IsTabCollapsed(index)) { return GetTabIndexAfterClosing(index, removing_index); + } // If we can't find another tab with the same opener, fall back to the // opener itself. index = GetIndexOfTab(tab_to_remove_opener); - if (index != TabStripModel::kNoTab && !IsTabCollapsed(index)) + if (index != TabStripModel::kNoTab && !IsTabCollapsed(index)) { return GetTabIndexAfterClosing(index, removing_index); + } } // If closing a grouped tab, return a tab that is still in the group, if any. @@ -3328,13 +3396,15 @@ // Match the default behavior below: prefer the tab to the right. const std::optional<tab_groups::TabGroupId> right_group = GetTabGroupForTab(removing_index + 1); - if (current_group == right_group) + if (current_group == right_group) { return removing_index; + } const std::optional<tab_groups::TabGroupId> left_group = GetTabGroupForTab(removing_index - 1); - if (current_group == left_group) + if (current_group == left_group) { return removing_index - 1; + } } // At this point, the tab detaching is either not inside a group, or the last @@ -3342,15 +3412,17 @@ // |GetNextExpandedActiveTab()| will return the index of that tab. std::optional<int> next_available = GetNextExpandedActiveTab(removing_index, std::nullopt); - if (next_available.has_value()) + if (next_available.has_value()) { return GetTabIndexAfterClosing(next_available.value(), removing_index); + } // By default, return the tab on the right, unless this is the last tab. // Reaching this point means there are no other tabs in an uncollapsed group. // The tab at the specified index will become automatically expanded by the // caller. - if (removing_index >= (count() - 1)) + if (removing_index >= (count() - 1)) { return removing_index - 1; + } return removing_index; }
diff --git a/chrome/browser/ui/tabs/tab_strip_model.h b/chrome/browser/ui/tabs/tab_strip_model.h index 2b0e71d..ddfe1a0 100644 --- a/chrome/browser/ui/tabs/tab_strip_model.h +++ b/chrome/browser/ui/tabs/tab_strip_model.h
@@ -1030,7 +1030,8 @@ template <> class ScopedObservation<TabStripModel, TabStripModelObserver> { public: - // Deleting the constructor gives a clear error message traceable back to here. + // Deleting the constructor gives a clear error message traceable back to + // here. explicit ScopedObservation(TabStripModelObserver* observer) = delete; };
diff --git a/chrome/browser/ui/tabs/tab_strip_model_delegate.h b/chrome/browser/ui/tabs/tab_strip_model_delegate.h index d23e071..0141403c 100644 --- a/chrome/browser/ui/tabs/tab_strip_model_delegate.h +++ b/chrome/browser/ui/tabs/tab_strip_model_delegate.h
@@ -47,10 +47,7 @@ /////////////////////////////////////////////////////////////////////////////// class TabStripModelDelegate { public: - enum { - TAB_MOVE_ACTION = 1, - TAB_TEAROFF_ACTION = 2 - }; + enum { TAB_MOVE_ACTION = 1, TAB_TEAROFF_ACTION = 2 }; virtual ~TabStripModelDelegate() = default;
diff --git a/chrome/browser/ui/tabs/tab_strip_model_observer.cc b/chrome/browser/ui/tabs/tab_strip_model_observer.cc index 9bc2836..706e087f 100644 --- a/chrome/browser/ui/tabs/tab_strip_model_observer.cc +++ b/chrome/browser/ui/tabs/tab_strip_model_observer.cc
@@ -216,26 +216,22 @@ void TabStripModelObserver::TabChangedAt(WebContents* contents, int index, - TabChangeType change_type) { -} + TabChangeType change_type) {} void TabStripModelObserver::TabPinnedStateChanged( TabStripModel* tab_strip_model, WebContents* contents, - int index) { -} + int index) {} void TabStripModelObserver::TabBlockedStateChanged(WebContents* contents, - int index) { -} + int index) {} void TabStripModelObserver::TabGroupedStateChanged( std::optional<tab_groups::TabGroupId> group, tabs::TabInterface* tab, int index) {} -void TabStripModelObserver::TabStripEmpty() { -} +void TabStripModelObserver::TabStripEmpty() {} void TabStripModelObserver::TabCloseCancelled( const content::WebContents* contents) {}
diff --git a/chrome/browser/ui/tabs/tab_strip_model_stats_recorder.cc b/chrome/browser/ui/tabs/tab_strip_model_stats_recorder.cc index f2c8dcf3d..18a5857 100644 --- a/chrome/browser/ui/tabs/tab_strip_model_stats_recorder.cc +++ b/chrome/browser/ui/tabs/tab_strip_model_stats_recorder.cc
@@ -54,8 +54,9 @@ TabStripModelStatsRecorder::TabInfo::~TabInfo() = default; void TabStripModelStatsRecorder::TabInfo::UpdateState(TabState new_state) { - if (new_state == current_state_) + if (new_state == current_state_) { return; + } // Avoid state transition from kClosed. // When tab is closed, we receive TabStripModelObserver::TabClosingAt and then @@ -95,8 +96,9 @@ return; } - if (old_contents) + if (old_contents) { TabInfo::Get(old_contents)->UpdateState(TabState::kInactive); + } DCHECK(new_contents); TabInfo* tab_info = TabInfo::Get(new_contents); @@ -106,8 +108,9 @@ // We chose 64 as our bound as 99.5% of the users open <64 tabs. const int kMaxTabHistory = 64; active_tab_history_.insert(active_tab_history_.begin(), new_contents); - if (active_tab_history_.size() > kMaxTabHistory) + if (active_tab_history_.size() > kMaxTabHistory) { active_tab_history_.resize(kMaxTabHistory); + } } void TabStripModelStatsRecorder::OnTabReplaced( @@ -126,16 +129,19 @@ const TabStripSelectionChange& selection) { if (change.type() == TabStripModelChange::kRemoved) { for (const auto& contents : change.GetRemove()->contents) { - if (contents.remove_reason == TabStripModelChange::RemoveReason::kDeleted) + if (contents.remove_reason == + TabStripModelChange::RemoveReason::kDeleted) { OnTabClosing(contents.contents); + } } } else if (change.type() == TabStripModelChange::kReplaced) { auto* replace = change.GetReplace(); OnTabReplaced(replace->old_contents, replace->new_contents); } - if (!selection.active_tab_changed() || tab_strip_model->empty()) + if (!selection.active_tab_changed() || tab_strip_model->empty()) { return; + } OnActiveTabChanged(selection.old_contents, selection.new_contents, selection.reason);
diff --git a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc index 64c1829..c2c65ec 100644 --- a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc +++ b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc
@@ -10,8 +10,6 @@ #pragma allow_unsafe_buffers #endif -#include "chrome/browser/ui/tabs/tab_strip_model.h" - #include <stddef.h> #include <algorithm> @@ -42,6 +40,7 @@ #include "chrome/browser/ui/tabs/tab_group.h" #include "chrome/browser/ui/tabs/tab_group_model.h" #include "chrome/browser/ui/tabs/tab_model.h" +#include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/tabs/tab_strip_user_gesture_details.h" #include "chrome/browser/ui/tabs/tab_utils.h" #include "chrome/browser/ui/tabs/test_tab_strip_model_delegate.h" @@ -239,8 +238,9 @@ void PushMoveState(WebContents* contents, int from_index, int to_index) { const auto tab_index_to_selection_model_index = [](int tab_index) -> std::optional<size_t> { - if (tab_index == TabStripModel::kNoTab) + if (tab_index == TabStripModel::kNoTab) { return std::nullopt; + } DCHECK_GE(tab_index, 0); return static_cast<size_t>(tab_index); }; @@ -323,8 +323,9 @@ } if (selection.active_tab_changed()) { - if (selection.old_contents && selection.selection_changed()) + if (selection.old_contents && selection.selection_changed()) { PushDeactivateState(selection.old_contents, selection.old_model); + } PushActivateState(selection.old_contents, selection.new_contents, selection.new_model.active(), selection.reason); @@ -492,20 +493,23 @@ std::string GetTabStripStateString(const TabStripModel& model) { std::string actual; for (int i = 0; i < model.count(); ++i) { - if (i > 0) + if (i > 0) { actual += " "; + } actual += base::NumberToString(GetID(model.GetWebContentsAt(i))); - if (model.IsTabPinned(i)) + if (model.IsTabPinned(i)) { actual += "p"; + } } return actual; } void PrepareTabs(TabStripModel* model, int tab_count) { - for (int i = 0; i < tab_count; ++i) + for (int i = 0; i < tab_count; ++i) { model->AppendWebContents(CreateWebContentsWithID(i), true); + } } void PrepareTabstripForSelectionTest(TabStripModel* model, @@ -513,8 +517,9 @@ int pinned_count, const std::string& selected_tabs) { PrepareTabs(model, tab_count); - for (int i = 0; i < pinned_count; ++i) + for (int i = 0; i < pinned_count; ++i) { model->SetTabPinned(i, true); + } ui::ListSelectionModel selection_model; for (std::string_view sel : base::SplitStringPiece( @@ -1774,15 +1779,17 @@ tabstrip.GetIndicesClosedByCommand(index, id); std::string result; for (size_t i = 0; i < indices.size(); ++i) { - if (i != 0) + if (i != 0) { result += " "; + } result += base::NumberToString(indices[i]); } return result; }; - for (int i = 0; i < 5; ++i) + for (int i = 0; i < 5; ++i) { tabstrip.AppendWebContents(CreateWebContents(), true); + } EXPECT_EQ("4 3 2 1", indicesClosedAsString(0, TabStripModel::CommandCloseTabsToRight)); @@ -3103,8 +3110,9 @@ TEST_P(TabStripModelTest, CloseSelectedTabs) { TestTabStripModelDelegate delegate; TabStripModel strip(&delegate, profile()); - for (int i = 0; i < 3; ++i) + for (int i = 0; i < 3; ++i) { strip.AppendWebContents(CreateWebContents(), true); + } strip.ToggleSelectionAt(1); strip.CloseSelectedTabs(); EXPECT_EQ(1, strip.count()); @@ -3279,15 +3287,17 @@ TabStripModel* tab_strip_model, const TabStripModelChange& change, const TabStripSelectionChange& selection) override { - if (change.type() != TabStripModelChange::kInserted) + if (change.type() != TabStripModelChange::kInserted) { return; + } for (const auto& contents : change.GetInsert()->contents) { web_modal::WebContentsModalDialogManager* manager = web_modal::WebContentsModalDialogManager::FromWebContents( contents.contents); - if (manager) + if (manager) { manager->SetDelegate(this); + } } } @@ -3299,8 +3309,9 @@ // Removal of tabs from the TabStripModel can cause observer callbacks to // invoke this method. The WebContents may no longer exist in the // TabStripModel. - if (index == TabStripModel::kNoTab) + if (index == TabStripModel::kNoTab) { return; + } tab_strip_model_->SetTabBlocked(index, blocked); } @@ -4483,14 +4494,16 @@ class TabToWindowTestTabStripModelDelegate : public TestTabStripModelDelegate { public: bool CanMoveTabsToWindow(const std::vector<int>& indices) override { - for (int index : indices) + for (int index : indices) { can_move_calls_.push_back(index); + } return true; } void MoveTabsToNewWindow(const std::vector<int>& indices) override { - for (int index : indices) + for (int index : indices) { move_calls_.push_back(index); + } } void MoveGroupToNewWindow(const tab_groups::TabGroupId& group) override {}
diff --git a/chrome/browser/ui/tabs/tab_strip_scrubbing_metrics.cc b/chrome/browser/ui/tabs/tab_strip_scrubbing_metrics.cc index bb3dbd1d..e3f7a8c6 100644 --- a/chrome/browser/ui/tabs/tab_strip_scrubbing_metrics.cc +++ b/chrome/browser/ui/tabs/tab_strip_scrubbing_metrics.cc
@@ -37,11 +37,13 @@ base::TimeDelta tab_switch_delta = base::TimeTicks::Now() - last_tab_switch_timestamp_; if (tab_switch_delta <= kMaxTimeConsideredScrubbing) { - if (user_gesture.type == TabStripUserGestureDetails::GestureType::kMouse) + if (user_gesture.type == + TabStripUserGestureDetails::GestureType::kMouse) { ++tabs_scrubbed_by_mouse_press_count_; - else if (user_gesture.type == - TabStripUserGestureDetails::GestureType::kKeyboard) + } else if (user_gesture.type == + TabStripUserGestureDetails::GestureType::kKeyboard) { ++tabs_scrubbed_by_key_press_count_; + } } } last_tab_switch_timestamp_ = base::TimeTicks::Now();
diff --git a/chrome/browser/ui/tabs/tab_ukm_test_helper.cc b/chrome/browser/ui/tabs/tab_ukm_test_helper.cc index 5c1a5a4..9d9969d9 100644 --- a/chrome/browser/ui/tabs/tab_ukm_test_helper.cc +++ b/chrome/browser/ui/tabs/tab_ukm_test_helper.cc
@@ -3,10 +3,10 @@ // found in the LICENSE file. #include "chrome/browser/ui/tabs/tab_ukm_test_helper.h" -#include "base/memory/raw_ptr.h" #include <sstream> +#include "base/memory/raw_ptr.h" #include "base/ranges/algorithm.h" #include "services/metrics/public/cpp/ukm_source.h" #include "services/metrics/public/mojom/ukm_interface.mojom.h" @@ -40,12 +40,14 @@ const int64_t* metric = ukm::TestUkmRecorder::GetEntryMetric(entry, expected_pair.first); if (expected_pair.second.has_value()) { - if (!metric || *metric != expected_pair.second.value()) + if (!metric || *metric != expected_pair.second.value()) { return false; + } } else { // The metric shouldn't exist. - if (ukm::TestUkmRecorder::EntryHasMetric(entry, expected_pair.first)) + if (ukm::TestUkmRecorder::EntryHasMetric(entry, expected_pair.first)) { return false; + } } } return true; @@ -75,8 +77,9 @@ const std::string& entry_name = pair.first; int num_unexpected_entries = NumNewEntriesRecorded(entry_name); // Could be negative if an expectation has already failed. - if (num_unexpected_entries <= 0) + if (num_unexpected_entries <= 0) { continue; + } ADD_FAILURE() << "Found " << num_unexpected_entries << " unexpected UKM entries at shutdown for: " << entry_name; @@ -85,8 +88,9 @@ ukm_recorder_.GetEntriesByName(entry_name)[first_unexpected_index]; std::ostringstream entry_metrics; - for (const auto& metric : ukm_entry->metrics) + for (const auto& metric : ukm_entry->metrics) { entry_metrics << "\n" << metric.first << ": " << metric.second; + } LOG(ERROR) << "First unexpected entry: " << entry_metrics.str(); } } @@ -104,8 +108,9 @@ // Verify the entry is associated with the correct URL. const ukm::mojom::UkmEntry* entry = entries[num_entries_[entry_name] - 1]; - if (!source_url.is_empty()) + if (!source_url.is_empty()) { ukm_recorder_.ExpectEntrySourceHasUrl(entry, source_url); + } ExpectEntryMetrics(*entry, expected_metrics); } @@ -163,8 +168,9 @@ const GURL& source_url = expected_url_metrics.first; const UkmMetricMap& expected_metrics = expected_url_metrics.second; - if (!source_url.is_empty()) + if (!source_url.is_empty()) { ukm_recorder_.ExpectEntrySourceHasUrl(entry, source_url); + } // Each expected metric should match a named value in the UKM entry. ExpectEntryMetrics(*entry, expected_metrics); @@ -177,8 +183,9 @@ // If a value hasn't been inserted for |entry_name|, the test hasn't checked // for these entries before, so they all count as new. - if (!num_entries_.count(entry_name)) + if (!num_entries_.count(entry_name)) { return current_ukm_entries; + } size_t previous_num_entries = num_entries_.at(entry_name); EXPECT_GE(current_ukm_entries, previous_num_entries);
diff --git a/chrome/browser/ui/tabs/tab_utils.cc b/chrome/browser/ui/tabs/tab_utils.cc index 389a749..4e87fe8 100644 --- a/chrome/browser/ui/tabs/tab_utils.cc +++ b/chrome/browser/ui/tabs/tab_utils.cc
@@ -15,21 +15,29 @@ #include "chrome/browser/ui/tabs/tab_enums.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/vr/vr_tab_helper.h" +#include "chrome/common/buildflags.h" #include "chrome/grit/generated_resources.h" #include "components/content_settings/core/browser/host_content_settings_map.h" #include "content/public/common/content_features.h" #include "content/public/common/url_constants.h" #include "ui/base/l10n/l10n_util.h" +#if BUILDFLAG(ENABLE_GLIC) +#include "chrome/browser/glic/glic_enabling.h" +#include "chrome/browser/glic/glic_keyed_service.h" +#include "chrome/browser/glic/glic_keyed_service_factory.h" +#endif + std::vector<TabAlertState> GetTabAlertStatesForContents( content::WebContents* contents) { std::vector<TabAlertState> states; - if (!contents) + if (!contents) { return states; + } scoped_refptr<MediaStreamCaptureIndicator> indicator = - MediaCaptureDevicesDispatcher::GetInstance()-> - GetMediaStreamCaptureIndicator(); + MediaCaptureDevicesDispatcher::GetInstance() + ->GetMediaStreamCaptureIndicator(); if (indicator.get()) { // Currently we only show the icon and tooltip of the highest-priority // alert on a tab. @@ -39,8 +47,9 @@ indicator->IsCapturingDisplay(contents)) { states.push_back(TabAlertState::DESKTOP_CAPTURING); } - if (indicator->IsBeingMirrored(contents)) + if (indicator->IsBeingMirrored(contents)) { states.push_back(TabAlertState::TAB_CAPTURING); + } if (indicator->IsCapturingAudio(contents) && indicator->IsCapturingVideo(contents)) { @@ -77,27 +86,40 @@ states.push_back(TabAlertState::SERIAL_CONNECTED); } +#if BUILDFLAG(ENABLE_GLIC) + if (GlicEnabling::IsEnabledByFlags() && + glic::GlicKeyedServiceFactory::GetGlicKeyedService( + contents->GetBrowserContext()) + ->GetFocusedTab() == contents) { + states.push_back(TabAlertState::GLIC_ACCESSING); + } +#endif + // Check if VR content is being presented in a headset. // NOTE: This icon must take priority over the audio alert ones // because most VR content has audio and its usage is implied by the VR // icon. - if (vr::VrTabHelper::IsContentDisplayedInHeadset(contents)) + if (vr::VrTabHelper::IsContentDisplayedInHeadset(contents)) { states.push_back(TabAlertState::VR_PRESENTING_IN_HEADSET); + } if (contents->HasPictureInPictureVideo() || - contents->HasPictureInPictureDocument()) + contents->HasPictureInPictureDocument()) { states.push_back(TabAlertState::PIP_PLAYING); + } // Only tabs have a RecentlyAudibleHelper, but this function is abused for // some non-tab WebContents. In that case fall back to using the realtime // notion of audibility. bool audible = contents->IsCurrentlyAudible(); auto* audible_helper = RecentlyAudibleHelper::FromWebContents(contents); - if (audible_helper) + if (audible_helper) { audible = audible_helper->WasRecentlyAudible(); + } if (audible) { - if (contents->IsAudioMuted()) + if (contents->IsAudioMuted()) { states.push_back(TabAlertState::AUDIO_MUTING); + } states.push_back(TabAlertState::AUDIO_PLAYING); } @@ -188,8 +210,9 @@ content::WebContents* web_contents = tab_strip.GetWebContentsAt(index); // Prevent crashes with null WebContents (https://crbug.com/797647). - if (!web_contents) + if (!web_contents) { return false; + } GURL url = web_contents->GetLastCommittedURL(); @@ -212,8 +235,9 @@ bool AreAllSitesMuted(const TabStripModel& tab_strip, const std::vector<int>& indices) { for (int tab_index : indices) { - if (!IsSiteMuted(tab_strip, tab_index)) + if (!IsSiteMuted(tab_strip, tab_index)) { return false; + } } return true; }
diff --git a/chrome/browser/ui/tabs/test_tab_strip_model_delegate.cc b/chrome/browser/ui/tabs/test_tab_strip_model_delegate.cc index 5f36cc99..b8e50ee 100644 --- a/chrome/browser/ui/tabs/test_tab_strip_model_delegate.cc +++ b/chrome/browser/ui/tabs/test_tab_strip_model_delegate.cc
@@ -47,8 +47,7 @@ return true; } -void TestTabStripModelDelegate::DuplicateContentsAt(int index) { -} +void TestTabStripModelDelegate::DuplicateContentsAt(int index) {} void TestTabStripModelDelegate::MoveToExistingWindow( const std::vector<int>& indices,
diff --git a/chrome/browser/ui/task_manager/task_manager_table_model.cc b/chrome/browser/ui/task_manager/task_manager_table_model.cc index 7b7d5de5..932f924b 100644 --- a/chrome/browser/ui/task_manager/task_manager_table_model.cc +++ b/chrome/browser/ui/task_manager/task_manager_table_model.cc
@@ -86,36 +86,42 @@ // Used to sort various column values. template <class T> int ValueCompare(T value1, T value2) { - if (value1 == value2) + if (value1 == value2) { return 0; + } return value1 < value2 ? -1 : 1; } // This forces NaN values to the bottom of the table. template <> int ValueCompare(double value1, double value2) { - if (std::isnan(value1)) + if (std::isnan(value1)) { return std::isnan(value2) ? 0 : -1; - if (std::isnan(value2)) + } + if (std::isnan(value2)) { return 1; - if (value1 == value2) + } + if (value1 == value2) { return 0; + } return value1 < value2 ? -1 : 1; } // This is used to sort process priority. We want the backgrounded process (with // a true value) to come first. int BooleanCompare(bool value1, bool value2) { - if (value1 == value2) + if (value1 == value2) { return 0; + } return value1 ? -1 : 1; } // Used when one or both of the results to compare are unavailable. int OrderUnavailableValue(bool v1, bool v2) { - if (!v1 && !v2) + if (!v1 && !v2) { return 0; + } return v1 ? 1 : -1; } @@ -189,22 +195,25 @@ ~TaskManagerValuesStringifier() = default; std::u16string GetCpuUsageText(double cpu_usage) { - if (std::isnan(cpu_usage)) + if (std::isnan(cpu_usage)) { return n_a_string_; - return base::UTF8ToUTF16(base::StringPrintf(kCpuTextFormatString, - cpu_usage)); + } + return base::UTF8ToUTF16( + base::StringPrintf(kCpuTextFormatString, cpu_usage)); } std::u16string GetStartTimeText(base::Time start_time) { - if (start_time.is_null()) + if (start_time.is_null()) { return n_a_string_; + } return base::TimeFormatShortDateAndTime(start_time); } std::u16string GetCpuTimeText(base::TimeDelta cpu_time) { - if (cpu_time.is_zero()) + if (cpu_time.is_zero()) { return n_a_string_; + } std::u16string duration; return base::TimeDurationFormatWithSeconds( @@ -214,8 +223,9 @@ } std::u16string GetMemoryUsageText(int64_t memory_usage, bool has_duplicates) { - if (memory_usage == -1) + if (memory_usage == -1) { return n_a_string_; + } #if BUILDFLAG(IS_MAC) // System expectation is to show "100 kB", "200 MB", etc. @@ -226,26 +236,29 @@ std::u16string memory_text = base::FormatNumber(memory_usage / 1024); // Adjust number string if necessary. base::i18n::AdjustStringForLocaleDirection(&memory_text); - memory_text = l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_MEM_CELL_TEXT, - memory_text); + memory_text = + l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_MEM_CELL_TEXT, memory_text); #endif // BUILDFLAG(IS_MAC) - if (has_duplicates) + if (has_duplicates) { memory_text += asterisk_string_; + } return memory_text; } std::u16string GetIdleWakeupsText(int idle_wakeups) { - if (idle_wakeups == -1) + if (idle_wakeups == -1) { return n_a_string_; + } return base::FormatNumber(idle_wakeups); } std::u16string GetHardFaultsText(int hard_faults) { - if (hard_faults == -1) + if (hard_faults == -1) { return n_a_string_; + } return base::FormatNumber(hard_faults); } @@ -253,11 +266,13 @@ std::u16string GetNaClPortText(int nacl_port) { // Only called if NaCl debug stub ports are enabled. - if (nacl_port == nacl::kGdbDebugStubPortUnused) + if (nacl_port == nacl::kGdbDebugStubPortUnused) { return n_a_string_; + } - if (nacl_port == nacl::kGdbDebugStubPortUnknown) + if (nacl_port == nacl::kGdbDebugStubPortUnknown) { return unknown_string_; + } return base::NumberToString16(nacl_port); } @@ -269,11 +284,13 @@ } std::u16string GetNetworkUsageText(int64_t network_usage) { - if (network_usage == -1) + if (network_usage == -1) { return n_a_string_; + } - if (network_usage == 0) + if (network_usage == 0) { return zero_string_; + } std::u16string net_byte = ui::FormatSpeed(network_usage); // Force number string to have LTR directionality. @@ -297,8 +314,9 @@ } std::u16string GetKeepaliveCountText(int keepalive_count) const { - if (keepalive_count < 0) + if (keepalive_count < 0) { return n_a_string(); + } return base::NumberToString16(keepalive_count); } @@ -346,14 +364,10 @@ //////////////////////////////////////////////////////////////////////////////// TableSortDescriptor::TableSortDescriptor() - : sorted_column_id(-1), - is_ascending(false) { -} + : sorted_column_id(-1), is_ascending(false) {} TableSortDescriptor::TableSortDescriptor(int col_id, bool ascending) - : sorted_column_id(col_id), - is_ascending(ascending) { -} + : sorted_column_id(col_id), is_ascending(ascending) {} //////////////////////////////////////////////////////////////////////////////// // TaskManagerTableModel: @@ -388,8 +402,9 @@ } std::u16string TaskManagerTableModel::GetText(size_t row, int column) { - if (IsSharedByGroup(column) && !IsTaskFirstInGroup(row)) + if (IsSharedByGroup(column) && !IsTaskFirstInGroup(row)) { return std::u16string(); + } switch (column) { case IDS_TASK_MANAGER_TASK_COLUMN: @@ -455,22 +470,25 @@ case IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN: { blink::WebCacheResourceTypeStats stats; - if (observed_task_manager()->GetWebCacheStats(tasks_[row], &stats)) + if (observed_task_manager()->GetWebCacheStats(tasks_[row], &stats)) { return stringifier_->GetWebCacheStatText(stats.images); + } return stringifier_->n_a_string(); } case IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN: { blink::WebCacheResourceTypeStats stats; - if (observed_task_manager()->GetWebCacheStats(tasks_[row], &stats)) + if (observed_task_manager()->GetWebCacheStats(tasks_[row], &stats)) { return stringifier_->GetWebCacheStatText(stats.scripts); + } return stringifier_->n_a_string(); } case IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN: { blink::WebCacheResourceTypeStats stats; - if (observed_task_manager()->GetWebCacheStats(tasks_[row], &stats)) + if (observed_task_manager()->GetWebCacheStats(tasks_[row], &stats)) { return stringifier_->GetWebCacheStatText(stats.css_style_sheets); + } return stringifier_->n_a_string(); } @@ -488,8 +506,7 @@ case IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN: { int64_t v8_allocated, v8_used; - if (observed_task_manager()->GetV8Memory(tasks_[row], - &v8_allocated, + if (observed_task_manager()->GetV8Memory(tasks_[row], &v8_allocated, &v8_used)) { return stringifier_->FormatAllocatedAndUsedMemory(v8_allocated, v8_used); @@ -498,16 +515,17 @@ } case IDS_TASK_MANAGER_NACL_DEBUG_STUB_PORT_COLUMN: - if (!is_nacl_debugging_flag_enabled_) + if (!is_nacl_debugging_flag_enabled_) { return stringifier_->disabled_nacl_debugging_string(); + } return stringifier_->GetNaClPortText( observed_task_manager()->GetNaClDebugStubPort(tasks_[row])); case IDS_TASK_MANAGER_PROCESS_PRIORITY_COLUMN: return observed_task_manager()->IsTaskOnBackgroundedProcess(tasks_[row]) - ? stringifier_->backgrounded_string() - : stringifier_->foregrounded_string(); + ? stringifier_->backgrounded_string() + : stringifier_->foregrounded_string(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: { @@ -532,8 +550,7 @@ observed_task_manager()->GetIcon(tasks_[row])); } -void TaskManagerTableModel::SetObserver( - ui::TableModelObserver* observer) { +void TaskManagerTableModel::SetObserver(ui::TableModelObserver* observer) { table_model_observer_ = observer; } @@ -622,8 +639,9 @@ observed_task_manager()->GetWebCacheStats(tasks_[row1], &stats1); bool row2_stats_valid = observed_task_manager()->GetWebCacheStats(tasks_[row2], &stats2); - if (!row1_stats_valid || !row2_stats_valid) + if (!row1_stats_valid || !row2_stats_valid) { return OrderUnavailableValue(row1_stats_valid, row2_stats_valid); + } switch (column_id) { case IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN: @@ -640,23 +658,21 @@ case IDS_TASK_MANAGER_VIDEO_MEMORY_COLUMN: { bool has_duplicates; - return ValueCompare( - observed_task_manager()->GetGpuMemoryUsage(tasks_[row1], - &has_duplicates), - observed_task_manager()->GetGpuMemoryUsage(tasks_[row2], - &has_duplicates)); + return ValueCompare(observed_task_manager()->GetGpuMemoryUsage( + tasks_[row1], &has_duplicates), + observed_task_manager()->GetGpuMemoryUsage( + tasks_[row2], &has_duplicates)); } case IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN: { int64_t allocated1, allocated2, used1, used2; - bool row1_valid = observed_task_manager()->GetV8Memory(tasks_[row1], - &allocated1, - &used1); - bool row2_valid = observed_task_manager()->GetV8Memory(tasks_[row2], - &allocated2, - &used2); - if (!row1_valid || !row2_valid) + bool row1_valid = observed_task_manager()->GetV8Memory( + tasks_[row1], &allocated1, &used1); + bool row2_valid = observed_task_manager()->GetV8Memory( + tasks_[row2], &allocated2, &used2); + if (!row1_valid || !row2_valid) { return OrderUnavailableValue(row1_valid, row2_valid); + } return ValueCompare(allocated1, allocated2); } @@ -749,16 +765,17 @@ } auto index = base::ranges::find(tasks_, id); - if (index == tasks_.end()) + if (index == tasks_.end()) { return; + } auto removed_index = static_cast<size_t>(index - tasks_.begin()); tasks_.erase(index); - if (table_model_observer_) + if (table_model_observer_) { table_model_observer_->OnItemsRemoved(removed_index, 1); + } } -void TaskManagerTableModel::OnTasksRefreshed( - const TaskIdList& task_ids) { +void TaskManagerTableModel::OnTasksRefreshed(const TaskIdList& task_ids) { tasks_ = task_ids; FilterTaskList(tasks_); OnRefresh(); @@ -884,10 +901,11 @@ NOTREACHED(); } - if (needs_refresh) + if (needs_refresh) { AddRefreshType(type); - else + } else { RemoveRefreshType(type); + } } bool TaskManagerTableModel::IsTaskKillable(size_t row_index) const { @@ -895,8 +913,9 @@ } void TaskManagerTableModel::RetrieveSavedColumnsSettingsAndUpdateTable() { - if (!g_browser_process->local_state()) + if (!g_browser_process->local_state()) { return; + } const base::Value::Dict& dictionary = g_browser_process->local_state()->GetDict( @@ -912,8 +931,9 @@ const int col_id = kColumns[i].id; const std::string col_id_key(GetColumnIdAsString(col_id)); - if (col_id_key.empty()) + if (col_id_key.empty()) { continue; + } bool col_visibility = dictionary.FindBoolByDottedPath(col_id_key) .value_or(kColumns[i].default_visibility); @@ -935,8 +955,9 @@ void TaskManagerTableModel::StoreColumnsSettings() { PrefService* local_state = g_browser_process->local_state(); - if (!local_state) + if (!local_state) { return; + } ScopedDictPrefUpdate dict_update(local_state, prefs::kTaskManagerColumnVisibility); @@ -970,8 +991,9 @@ TaskId task_id = observed_task_manager()->GetTaskIdForWebContents(web_contents); auto index = base::ranges::find(tasks_, task_id); - if (index == tasks_.end()) + if (index == tasks_.end()) { return std::nullopt; + } return static_cast<size_t>(index - tasks_.begin()); } @@ -996,8 +1018,9 @@ // the task manager, we must invoke TableModelObserver::OnModelChanged() which // in turn will invoke TableView::NumRowsChanged(). This will adjust the // vertical scrollbar correctly. crbug.com/570966. - if (table_model_observer_) + if (table_model_observer_) { table_model_observer_->OnModelChanged(); + } } void TaskManagerTableModel::StopUpdating() { @@ -1005,21 +1028,25 @@ } void TaskManagerTableModel::OnRefresh() { - if (table_model_observer_) + if (table_model_observer_) { table_model_observer_->OnItemsChanged(0, RowCount()); + } } bool TaskManagerTableModel::IsTaskFirstInGroup(size_t row_index) const { - if (row_index == 0) + if (row_index == 0) { return true; + } if (observed_task_manager()->GetProcessId(tasks_[row_index - 1]) != - observed_task_manager()->GetProcessId(tasks_[row_index])) + observed_task_manager()->GetProcessId(tasks_[row_index])) { return true; + } if (observed_task_manager()->IsRunningInVM(tasks_[row_index - 1]) != - observed_task_manager()->IsRunningInVM(tasks_[row_index])) + observed_task_manager()->IsRunningInVM(tasks_[row_index])) { return true; + } return false; }
diff --git a/chrome/browser/ui/test/browser_ui_browsertest.cc b/chrome/browser/ui/test/browser_ui_browsertest.cc index 09f1e83..fe96b2d 100644 --- a/chrome/browser/ui/test/browser_ui_browsertest.cc +++ b/chrome/browser/ui/test/browser_ui_browsertest.cc
@@ -3,7 +3,6 @@ // found in the LICENSE file. #include "chrome/browser/ui/test/browser_ui_test_base.h" - #include "testing/gtest/include/gtest/gtest.h" using BrowserUiTest = BrowserUiTestBase;
diff --git a/chrome/browser/ui/test/browser_ui_interactive_uitest.cc b/chrome/browser/ui/test/browser_ui_interactive_uitest.cc index 452f7b7..987f167 100644 --- a/chrome/browser/ui/test/browser_ui_interactive_uitest.cc +++ b/chrome/browser/ui/test/browser_ui_interactive_uitest.cc
@@ -3,7 +3,6 @@ // found in the LICENSE file. #include "chrome/browser/ui/test/browser_ui_test_base.h" - #include "testing/gtest/include/gtest/gtest.h" using BrowserInteractiveUiTest = BrowserUiTestBase;
diff --git a/chrome/browser/ui/test/pixel_test_configuration_mixin.cc b/chrome/browser/ui/test/pixel_test_configuration_mixin.cc index cf3ef9f..b2001ba 100644 --- a/chrome/browser/ui/test/pixel_test_configuration_mixin.cc +++ b/chrome/browser/ui/test/pixel_test_configuration_mixin.cc
@@ -2,9 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/test/pixel_test_configuration_mixin.h" + #include <string> -#include "chrome/browser/ui/test/pixel_test_configuration_mixin.h" #include "ui/base/ui_base_switches.h" PixelTestConfigurationMixin::PixelTestConfigurationMixin(
diff --git a/chrome/browser/ui/test/popup_multiscreen_interactive_uitest.cc b/chrome/browser/ui/test/popup_multiscreen_interactive_uitest.cc index f2b2a111..3400f68 100644 --- a/chrome/browser/ui/test/popup_multiscreen_interactive_uitest.cc +++ b/chrome/browser/ui/test/popup_multiscreen_interactive_uitest.cc
@@ -63,16 +63,14 @@ content::WebContents* web_contents = browser()->tab_strip_model()->GetActiveWebContents(); ASSERT_TRUE(NavigateToURL(web_contents, - embedded_test_server()->GetURL("/simple.html"))); + embedded_test_server()->GetURL("/simple.html"))); EXPECT_TRUE(WaitForRenderFrameReady(web_contents->GetPrimaryMainFrame())); if (ShouldTestWindowManagement()) { SetUpWindowManagement(browser()); } } - void TearDownOnMainThread() override { - virtual_display_util_.reset(); - } + void TearDownOnMainThread() override { virtual_display_util_.reset(); } protected: bool ShouldTestWindowManagement() { return GetParam(); } @@ -190,7 +188,8 @@ target_display.work_area().y()); { SCOPED_TRACE( - testing::Message() << "\n" + testing::Message() + << "\n" << "script: " << open_script << " " << move_script << "\n" << "opener: " << browser()->window()->GetBounds().ToString() << " popup: " << popup->window()->GetBounds().ToString());
diff --git a/chrome/browser/ui/test/test_app_window_icon_observer.cc b/chrome/browser/ui/test/test_app_window_icon_observer.cc index 4caf78a..dfbfc35 100644 --- a/chrome/browser/ui/test/test_app_window_icon_observer.cc +++ b/chrome/browser/ui/test/test_app_window_icon_observer.cc
@@ -24,8 +24,9 @@ TestAppWindowIconObserver::~TestAppWindowIconObserver() { extensions::AppWindowRegistry::Get(context_)->RemoveObserver(this); - for (aura::Window* window : windows_) + for (aura::Window* window : windows_) { window->RemoveObserver(this); + } } void TestAppWindowIconObserver::WaitForIconUpdate() { @@ -70,8 +71,9 @@ void TestAppWindowIconObserver::OnWindowPropertyChanged(aura::Window* window, const void* key, intptr_t old) { - if (key != aura::client::kAppIconKey) + if (key != aura::client::kAppIconKey) { return; + } std::string app_icon_hash; const gfx::ImageSkia* image = window->GetProperty(aura::client::kAppIconKey); @@ -97,8 +99,9 @@ app_icon_hash = base::MD5DigestToBase16(digest); } - if (app_icon_hash == last_app_icon_hash_map_[window]) + if (app_icon_hash == last_app_icon_hash_map_[window]) { return; + } last_app_icon_hash_map_[window] = app_icon_hash; ++icon_updates_;
diff --git a/chrome/browser/ui/test/test_browser_dialog.cc b/chrome/browser/ui/test/test_browser_dialog.cc index a693d7f..22dc6353 100644 --- a/chrome/browser/ui/test/test_browser_dialog.cc +++ b/chrome/browser/ui/test/test_browser_dialog.cc
@@ -50,10 +50,11 @@ private: void CloseWidget(bool async) { - if (async) + if (async) { widget_->Close(); - else + } else { widget_->CloseNow(); + } } raw_ptr<views::Widget, AcrossTasksDanglingUntriaged> widget_; @@ -88,8 +89,9 @@ // Force pending layouts of all existing widgets. This ensures any // anchor Views are in the correct position. - for (views::Widget* widget : widgets_) + for (views::Widget* widget : widgets_) { widget->LayoutRootViewIfNecessary(); + } // Get the list of added dialog widgets. Ignore non-dialog widgets, including // those added by tests to anchor dialogs and the browser's status bubble. @@ -135,11 +137,13 @@ LOG(INFO) << "VerifyUi(): Pixel compare failed."; return false; } - if (is_active) + if (is_active) { dialog_widget->Activate(); + } - if (!should_verify_dialog_bounds_) + if (!should_verify_dialog_bounds_) { return true; + } // Verify that the dialog's dimensions do not exceed the display's work area // bounds, which may be smaller than its bounds(), e.g. in the case of the @@ -199,8 +203,9 @@ void TestBrowserDialog::UpdateWidgets() { widgets_.clear(); #if BUILDFLAG(IS_CHROMEOS_ASH) - for (aura::Window* root_window : ash::Shell::GetAllRootWindows()) + for (aura::Window* root_window : ash::Shell::GetAllRootWindows()) { views::Widget::GetAllChildWidgets(root_window, &widgets_); + } #elif defined(TOOLKIT_VIEWS) widgets_ = views::test::WidgetTest::GetAllWidgets(); #else
diff --git a/chrome/browser/ui/test/test_browser_ui.cc b/chrome/browser/ui/test/test_browser_ui.cc index afe777d..f5b793c 100644 --- a/chrome/browser/ui/test/test_browser_ui.cc +++ b/chrome/browser/ui/test/test_browser_ui.cc
@@ -181,10 +181,11 @@ #endif // BUILDFLAG(IS_WIN) ShowUi(NameFromTestCase()); ASSERT_TRUE(VerifyUi()); - if (IsInteractiveUi()) + if (IsInteractiveUi()) { WaitForUserDismissal(); - else + } else { DismissUi(); + } } bool TestBrowserUi::IsInteractiveUi() const {
diff --git a/chrome/browser/ui/test/test_confirm_bubble_model.cc b/chrome/browser/ui/test/test_confirm_bubble_model.cc index 248975e..06f3a9f 100644 --- a/chrome/browser/ui/test/test_confirm_bubble_model.cc +++ b/chrome/browser/ui/test/test_confirm_bubble_model.cc
@@ -16,12 +16,12 @@ : model_deleted_(model_deleted), accept_clicked_(accept_clicked), cancel_clicked_(cancel_clicked), - link_clicked_(link_clicked) { -} + link_clicked_(link_clicked) {} TestConfirmBubbleModel::~TestConfirmBubbleModel() { - if (model_deleted_) + if (model_deleted_) { *model_deleted_ = true; + } } std::u16string TestConfirmBubbleModel::GetTitle() const { @@ -38,13 +38,15 @@ } void TestConfirmBubbleModel::Accept() { - if (accept_clicked_) + if (accept_clicked_) { *accept_clicked_ = true; + } } void TestConfirmBubbleModel::Cancel() { - if (cancel_clicked_) + if (cancel_clicked_) { *cancel_clicked_ = true; + } } std::u16string TestConfirmBubbleModel::GetLinkText() const { @@ -52,6 +54,7 @@ } void TestConfirmBubbleModel::OpenHelpPage() { - if (link_clicked_) + if (link_clicked_) { *link_clicked_ = true; + } }
diff --git a/chrome/browser/ui/test/test_infobar.cc b/chrome/browser/ui/test/test_infobar.cc index 2eb1965b..b733a8f9 100644 --- a/chrome/browser/ui/test/test_infobar.cc +++ b/chrome/browser/ui/test/test_infobar.cc
@@ -67,8 +67,9 @@ std::optional<TestInfoBar::InfoBars> TestInfoBar::GetNewInfoBars() const { const infobars::ContentInfoBarManager* infobar_manager = GetInfoBarManager(); - if (!infobar_manager) + if (!infobar_manager) { return std::nullopt; + } const auto& infobars = infobar_manager->infobars(); if ((infobars.size() < starting_infobars_.size()) || !std::equal(starting_infobars_.begin(), starting_infobars_.end(),
diff --git a/chrome/browser/ui/thumbnails/background_thumbnail_video_capturer.cc b/chrome/browser/ui/thumbnails/background_thumbnail_video_capturer.cc index 7220e420..7373910 100644 --- a/chrome/browser/ui/thumbnails/background_thumbnail_video_capturer.cc +++ b/chrome/browser/ui/thumbnails/background_thumbnail_video_capturer.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/ui/thumbnails/background_thumbnail_video_capturer.h" #include <stdint.h> + #include <utility> #include "base/metrics/histogram_macros.h" @@ -28,24 +29,27 @@ } BackgroundThumbnailVideoCapturer::~BackgroundThumbnailVideoCapturer() { - if (video_capturer_) + if (video_capturer_) { Stop(); + } } void BackgroundThumbnailVideoCapturer::Start( const ThumbnailCaptureInfo& capture_info) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - if (video_capturer_) + if (video_capturer_) { return; + } content::RenderWidgetHostView* const source_view = contents_->GetPrimaryMainFrame() ->GetRenderViewHost() ->GetWidget() ->GetView(); - if (!source_view) + if (!source_view) { return; + } capture_info_ = capture_info; @@ -76,8 +80,9 @@ void BackgroundThumbnailVideoCapturer::Stop() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - if (!video_capturer_) + if (!video_capturer_) { return; + } video_capturer_->Stop(); video_capturer_.reset();
diff --git a/chrome/browser/ui/thumbnails/thumbnail_capture_driver.cc b/chrome/browser/ui/thumbnails/thumbnail_capture_driver.cc index b9ec455..ed0a40a 100644 --- a/chrome/browser/ui/thumbnails/thumbnail_capture_driver.cc +++ b/chrome/browser/ui/thumbnails/thumbnail_capture_driver.cc
@@ -45,8 +45,9 @@ } void ThumbnailCaptureDriver::GotFrame() { - if (capture_state_ == CaptureState::kCooldown) + if (capture_state_ == CaptureState::kCooldown) { captured_cooldown_frame_ = true; + } } void ThumbnailCaptureDriver::SetCapturePermittedByScheduler(bool scheduled) { @@ -67,8 +68,9 @@ if (!scheduled_) { client_->StopCapture(); - if (capture_state_ < CaptureState::kHaveFinalCapture) + if (capture_state_ < CaptureState::kHaveFinalCapture) { capture_state_ = CaptureState::kNoCapture; + } return; } @@ -178,8 +180,9 @@ } void ThumbnailCaptureDriver::OnCooldownEnded() { - if (capture_state_ < CaptureState::kCooldown) + if (capture_state_ < CaptureState::kCooldown) { return; + } if (!captured_cooldown_frame_ && cooldown_retry_count_ < kMaxCooldownRetries) {
diff --git a/chrome/browser/ui/thumbnails/thumbnail_image.cc b/chrome/browser/ui/thumbnails/thumbnail_image.cc index 207b7cd..8396ddf 100644 --- a/chrome/browser/ui/thumbnails/thumbnail_image.cc +++ b/chrome/browser/ui/thumbnails/thumbnail_image.cc
@@ -32,8 +32,9 @@ } ThumbnailImage::Delegate::~Delegate() { - if (thumbnail_) + if (thumbnail_) { thumbnail_->delegate_ = nullptr; + } } ThumbnailImage::ThumbnailImage(Delegate* delegate, CompressedThumbnailData data) @@ -46,8 +47,9 @@ ThumbnailImage::~ThumbnailImage() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - if (delegate_) + if (delegate_) { delegate_->thumbnail_ = nullptr; + } } ThumbnailImage::CaptureReadiness ThumbnailImage::GetCaptureReadiness() const { @@ -62,8 +64,9 @@ subscribers_.insert(subscribers_.end(), subscription.get()); // Notify |delegate_| if this is the first subscriber. - if (subscribers_.size() == 1) + if (subscribers_.size() == 1) { delegate_->ThumbnailImageBeingObservedChanged(true); + } return subscription; } @@ -86,8 +89,9 @@ void ThumbnailImage::ClearData() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - if (!data_ && thumbnail_id_.is_zero()) + if (!data_ && thumbnail_id_.is_zero()) { return; + } // If there was stored data we should notify observers that it was // cleared. Otherwise, a bitmap was assigned but never compressed so @@ -110,13 +114,15 @@ } void ThumbnailImage::RequestCompressedThumbnailData() { - if (data_) + if (data_) { NotifyCompressedDataObservers(data_); + } } size_t ThumbnailImage::GetCompressedDataSizeInBytes() const { - if (!data_) + if (!data_) { return 0; + } return data_->data.size(); } @@ -127,8 +133,9 @@ // If the image is stale (a new thumbnail was assigned or the // thumbnail was cleared after AssignSkBitmap), ignore it. if (thumbnail_id != thumbnail_id_) { - if (async_operation_finished_callback_) + if (async_operation_finished_callback_) { async_operation_finished_callback_.Run(); + } return; } @@ -158,8 +165,9 @@ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); if (!data_) { - if (async_operation_finished_callback_) + if (async_operation_finished_callback_) { async_operation_finished_callback_.Run(); + } return false; } return base::ThreadPool::PostTaskAndReplyWithResult( @@ -174,13 +182,15 @@ void ThumbnailImage::NotifyUncompressedDataObservers(base::Token thumbnail_id, gfx::ImageSkia image) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - if (async_operation_finished_callback_) + if (async_operation_finished_callback_) { async_operation_finished_callback_.Run(); + } // If the image is stale (a new thumbnail was assigned or the // thumbnail was cleared after AssignSkBitmap), ignore it. - if (thumbnail_id != thumbnail_id_) + if (thumbnail_id != thumbnail_id_) { return; + } for (Subscription* subscription : subscribers_) { auto size_hint = subscription->size_hint_; @@ -197,8 +207,9 @@ CompressedThumbnailData data) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); for (Subscription* subscription : subscribers_) { - if (subscription->compressed_image_callback_) + if (subscription->compressed_image_callback_) { subscription->compressed_image_callback_.Run(data); + } } } @@ -281,6 +292,7 @@ subscribers_.pop_back(); // If that was the last subscriber, tell |delegate_| (if it still exists). - if (delegate_ && subscribers_.empty()) + if (delegate_ && subscribers_.empty()) { delegate_->ThumbnailImageBeingObservedChanged(false); + } }
diff --git a/chrome/browser/ui/thumbnails/thumbnail_image_unittest.cc b/chrome/browser/ui/thumbnails/thumbnail_image_unittest.cc index 0eaab69..2d051713 100644 --- a/chrome/browser/ui/thumbnails/thumbnail_image_unittest.cc +++ b/chrome/browser/ui/thumbnails/thumbnail_image_unittest.cc
@@ -36,8 +36,9 @@ void Reset() { called_ = false; } void Wait() { - if (called_) + if (called_) { return; + } base::RunLoop run_loop; quit_closure_ = run_loop.QuitClosure(); @@ -46,8 +47,9 @@ private: void HandleCallback() { - if (quit_closure_) + if (quit_closure_) { std::move(quit_closure_).Run(); + } called_ = true; }
diff --git a/chrome/browser/ui/thumbnails/thumbnail_readiness_tracker.cc b/chrome/browser/ui/thumbnails/thumbnail_readiness_tracker.cc index 9518345..e26a51d 100644 --- a/chrome/browser/ui/thumbnails/thumbnail_readiness_tracker.cc +++ b/chrome/browser/ui/thumbnails/thumbnail_readiness_tracker.cc
@@ -13,16 +13,18 @@ bool NavigationShouldInvalidateThumbnail( content::NavigationHandle* navigation) { // Ignore subframe navigations. - if (!navigation->IsInPrimaryMainFrame()) + if (!navigation->IsInPrimaryMainFrame()) { return false; + } // Some navigations change the tab URL but don't create a new // document. They aren't considered loading; onload is never triggered // after they complete. They shouldn't affect the thumbnail. // // See crbug.com/1120940 for why this is necessary. - if (navigation->IsSameDocument()) + if (navigation->IsSameDocument()) { return false; + } return true; } @@ -41,8 +43,9 @@ void ThumbnailReadinessTracker::DidStartNavigation( content::NavigationHandle* navigation_handle) { - if (!NavigationShouldInvalidateThumbnail(navigation_handle)) + if (!NavigationShouldInvalidateThumbnail(navigation_handle)) { return; + } pending_navigation_ = navigation_handle; UpdateReadiness(Readiness::kNotReady); @@ -52,14 +55,16 @@ content::NavigationHandle* navigation_handle) { // Only respond to the last navigation handled by DidStartNavigation. // Others may be unimportant or outdated. - if (navigation_handle != pending_navigation_) + if (navigation_handle != pending_navigation_) { return; + } pending_navigation_ = nullptr; UpdateReadiness(Readiness::kReadyForInitialCapture); - if (last_readiness_ > Readiness::kReadyForInitialCapture) + if (last_readiness_ > Readiness::kReadyForInitialCapture) { return; + } UpdateReadiness(Readiness::kReadyForInitialCapture); } @@ -82,12 +87,14 @@ } void ThumbnailReadinessTracker::UpdateReadiness(Readiness readiness) { - if (readiness == last_readiness_) + if (readiness == last_readiness_) { return; + } // If the WebContents is closing, it shouldn't be captured. - if (web_contents()->IsBeingDestroyed()) + if (web_contents()->IsBeingDestroyed()) { readiness = Readiness::kNotReady; + } last_readiness_ = readiness; callback_.Run(readiness);
diff --git a/chrome/browser/ui/thumbnails/thumbnail_scheduler_impl.cc b/chrome/browser/ui/thumbnails/thumbnail_scheduler_impl.cc index 02bb9b85..f958af6 100644 --- a/chrome/browser/ui/thumbnails/thumbnail_scheduler_impl.cc +++ b/chrome/browser/ui/thumbnails/thumbnail_scheduler_impl.cc
@@ -50,8 +50,9 @@ TabCapturer* tab, TabCapturePriority priority) { TabNode* const node = GetTabNode(tab); - if (node->data.priority == priority) + if (node->data.priority == priority) { return; + } const TabSchedulingData old_data = node->data; node->data.priority = priority; @@ -68,8 +69,9 @@ // First, move the tab node to the correct list and update the // capturing counts. - if (tab_node->next()) + if (tab_node->next()) { tab_node->RemoveFromList(); + } if (tab_node->is_capturing) { switch (old_data.priority) { case TabCapturePriority::kNone:
diff --git a/chrome/browser/ui/thumbnails/thumbnail_scheduler_impl_unittest.cc b/chrome/browser/ui/thumbnails/thumbnail_scheduler_impl_unittest.cc index a373093..4c62235 100644 --- a/chrome/browser/ui/thumbnails/thumbnail_scheduler_impl_unittest.cc +++ b/chrome/browser/ui/thumbnails/thumbnail_scheduler_impl_unittest.cc
@@ -43,19 +43,22 @@ protected: void AddTabsToScheduler() { - for (FakeTabCapturer& tab : tabs_) + for (FakeTabCapturer& tab : tabs_) { scheduler_.AddTab(&tab); + } } void RemoveTabsFromScheduler() { - for (FakeTabCapturer& tab : tabs_) + for (FakeTabCapturer& tab : tabs_) { scheduler_.RemoveTab(&tab); + } } std::vector<bool> TabScheduledStates() { std::vector<bool> states; - for (const auto& tab : tabs_) + for (const auto& tab : tabs_) { states.push_back(tab.capture_permitted()); + } return states; }
diff --git a/chrome/browser/ui/thumbnails/thumbnail_tab_helper.cc b/chrome/browser/ui/thumbnails/thumbnail_tab_helper.cc index 7fd4224..4e09640 100644 --- a/chrome/browser/ui/thumbnails/thumbnail_tab_helper.cc +++ b/chrome/browser/ui/thumbnails/thumbnail_tab_helper.cc
@@ -147,8 +147,9 @@ // Tells our scheduling logic that a frame was received. void OnFrameCaptured(CaptureType capture_type) { - if (capture_type == CaptureType::kVideoFrame) + if (capture_type == CaptureType::kVideoFrame) { capture_driver_.GotFrame(); + } } bool is_ready() const { @@ -312,8 +313,9 @@ std::optional<uint64_t> frame_id) { // Failed requests will return an empty bitmap. In tests this can be triggered // on threads other than the UI thread. - if (bitmap.drawsNothing()) + if (bitmap.drawsNothing()) { return; + } DCHECK_CURRENTLY_ON(content::BrowserThread::UI); @@ -327,13 +329,15 @@ void ThumbnailTabHelper::StartVideoCapture() { content::RenderWidgetHostView* const source_view = state_->GetView(); - if (!source_view) + if (!source_view) { return; + } const float scale_factor = source_view->GetDeviceScaleFactor(); const gfx::Size source_size = source_view->GetViewBounds().size(); - if (source_size.IsEmpty()) + if (source_size.IsEmpty()) { return; + } last_frame_capture_info_ = GetInitialCaptureInfo( source_size, scale_factor, /* include_scrollbars_in_capture */ true); @@ -375,15 +379,18 @@ // Round up to make sure any scrollbar pixls are eliminated. It's better to // lose a single pixel of content than having a single pixel of scrollbar. const int scrollbar_size = std::ceil(scale_factor * scrollbar_size_dip); - if (source_size.width() - scrollbar_size > smallest_dimension) + if (source_size.width() - scrollbar_size > smallest_dimension) { capture_info.scrollbar_insets.set_right(scrollbar_size); - if (source_size.height() - scrollbar_size > smallest_dimension) + } + if (source_size.height() - scrollbar_size > smallest_dimension) { capture_info.scrollbar_insets.set_bottom(scrollbar_size); + } // Calculate the region to copy from. capture_info.copy_rect = gfx::Rect(source_size); - if (!include_scrollbars_in_capture) + if (!include_scrollbars_in_capture) { capture_info.copy_rect.Inset(capture_info.scrollbar_insets); + } // Compute minimum sizes for multiple uses of the thumbnail - currently, // tablet tabstrip previews and tab hover card preview images.
diff --git a/chrome/browser/ui/toasts/toast_controller.h b/chrome/browser/ui/toasts/toast_controller.h index c834541..8195288 100644 --- a/chrome/browser/ui/toasts/toast_controller.h +++ b/chrome/browser/ui/toasts/toast_controller.h
@@ -32,7 +32,7 @@ namespace toasts { enum class ToastCloseReason; class ToastView; -} +} // namespace toasts namespace ui { class MenuModel;
diff --git a/chrome/browser/ui/toolbar/app_menu_icon_controller.cc b/chrome/browser/ui/toolbar/app_menu_icon_controller.cc index 2fa93f1..337426cf 100644 --- a/chrome/browser/ui/toolbar/app_menu_icon_controller.cc +++ b/chrome/browser/ui/toolbar/app_menu_icon_controller.cc
@@ -120,8 +120,9 @@ // update. This can happen for beta and stable channels once the VERY_LOW // annoyance level is reached. auto severity = SeverityFromUpgradeLevel(is_unstable_channel_, level); - if (severity != Severity::NONE) + if (severity != Severity::NONE) { return {IconType::UPGRADE_NOTIFICATION, severity}; + } } if (GlobalErrorServiceFactory::GetForProfile(profile_)
diff --git a/chrome/browser/ui/toolbar/app_menu_model_interactive_uitest.cc b/chrome/browser/ui/toolbar/app_menu_model_interactive_uitest.cc index 8fb2d14..aab9f3b 100644 --- a/chrome/browser/ui/toolbar/app_menu_model_interactive_uitest.cc +++ b/chrome/browser/ui/toolbar/app_menu_model_interactive_uitest.cc
@@ -364,16 +364,16 @@ // a corresponding menu item entry for installation, as well as the default // install icon next to them. auto VerifyDiyAppMenuItemViews() { - const ui::ImageModel icon_image = ui::ImageModel::FromVectorIcon( - kInstallDesktopChromeRefreshIcon, ui::kColorMenuIcon, - ui::SimpleMenuModel::kDefaultIconSize); - return Steps( - EnsurePresent(AppMenuModel::kInstallAppItem), - CheckViewProperty( - AppMenuModel::kInstallAppItem, &views::MenuItemView::title, - l10n_util::GetStringUTF16(IDS_INSTALL_DIY_TO_OS_LAUNCH_SURFACE)), - CheckViewProperty(AppMenuModel::kInstallAppItem, - &views::MenuItemView::GetIcon, icon_image)); + const ui::ImageModel icon_image = ui::ImageModel::FromVectorIcon( + kInstallDesktopChromeRefreshIcon, ui::kColorMenuIcon, + ui::SimpleMenuModel::kDefaultIconSize); + return Steps( + EnsurePresent(AppMenuModel::kInstallAppItem), + CheckViewProperty( + AppMenuModel::kInstallAppItem, &views::MenuItemView::title, + l10n_util::GetStringUTF16(IDS_INSTALL_DIY_TO_OS_LAUNCH_SURFACE)), + CheckViewProperty(AppMenuModel::kInstallAppItem, + &views::MenuItemView::GetIcon, icon_image)); } AppBannerManager* GetManager() { @@ -388,10 +388,10 @@ // so we do a 1:1 comparison. auto CompareIcons() { return base::BindLambdaForTesting([&](views::MenuItemView* item_view) { - EXPECT_TRUE(item_view->GetIcon().IsImage()); - EXPECT_EQ( - GetMidColorFromBitmap(item_view->GetIcon().GetImage().AsBitmap()), - GetAppIconColorBasedOnBannerData()); + EXPECT_TRUE(item_view->GetIcon().IsImage()); + EXPECT_EQ( + GetMidColorFromBitmap(item_view->GetIcon().GetImage().AsBitmap()), + GetAppIconColorBasedOnBannerData()); }); }
diff --git a/chrome/browser/ui/toolbar/app_menu_model_unittest.cc b/chrome/browser/ui/toolbar/app_menu_model_unittest.cc index bb216f1..f154907f 100644 --- a/chrome/browser/ui/toolbar/app_menu_model_unittest.cc +++ b/chrome/browser/ui/toolbar/app_menu_model_unittest.cc
@@ -163,8 +163,9 @@ // Testing overrides to ui::SimpleMenuModel::Delegate: bool IsCommandIdChecked(int command_id) const override { bool val = AppMenuModel::IsCommandIdChecked(command_id); - if (val) + if (val) { checked_count_++; + } return val; } @@ -223,8 +224,9 @@ // Note: the second item in the menu may be a separator if the browser // supports showing upgrade status in the app menu. size_t item_index = 1; - if (model.GetTypeAt(item_index) == ui::MenuModel::TYPE_SEPARATOR) + if (model.GetTypeAt(item_index) == ui::MenuModel::TYPE_SEPARATOR) { ++item_index; + } model.ActivatedAt(item_index); EXPECT_TRUE(model.IsEnabledAt(item_index)); // Make sure to use the index that is not separator in all configurations.
diff --git a/chrome/browser/ui/toolbar/back_forward_menu_model.cc b/chrome/browser/ui/toolbar/back_forward_menu_model.cc index 299ae76b..1de94f01 100644 --- a/chrome/browser/ui/toolbar/back_forward_menu_model.cc +++ b/chrome/browser/ui/toolbar/back_forward_menu_model.cc
@@ -69,22 +69,26 @@ size_t BackForwardMenuModel::GetItemCount() const { size_t items = GetHistoryItemCount(); - if (items == 0) + if (items == 0) { return items; + } size_t chapter_stops = 0; // Next, we count ChapterStops, if any. - if (items == kMaxHistoryItems) + if (items == kMaxHistoryItems) { chapter_stops = GetChapterStopCount(items); + } - if (chapter_stops) + if (chapter_stops) { items += chapter_stops + 1; // Chapter stops also need a separator. + } // If the current mode is incognito, "Show Full History" should not be // visible. - if (!ShouldShowFullHistoryBeVisible()) + if (!ShouldShowFullHistoryBeVisible()) { return items; + } // If the menu is not empty, add two positions in the end // for a separator and a "Show Full History" item. @@ -107,12 +111,14 @@ std::u16string BackForwardMenuModel::GetLabelAt(size_t index) const { // Return label "Show Full History" for the last item of the menu. - if (ShouldShowFullHistoryBeVisible() && index == GetItemCount() - 1) + if (ShouldShowFullHistoryBeVisible() && index == GetItemCount() - 1) { return l10n_util::GetStringUTF16(IDS_HISTORY_SHOWFULLHISTORY_LINK); + } // Return an empty string for a separator. - if (IsSeparator(index)) + if (IsSeparator(index)) { return std::u16string(); + } // Return the entry title, escaping any '&' characters and eliding it if it's // super long. @@ -145,8 +151,9 @@ } ui::ImageModel BackForwardMenuModel::GetIconAt(size_t index) const { - if (!ItemHasIcon(index)) + if (!ItemHasIcon(index)) { return ui::ImageModel(); + } // Return icon of "Show Full History" for the last item of the menu. if (ShouldShowFullHistoryBeVisible() && index == GetItemCount() - 1) { @@ -278,8 +285,9 @@ // We either are in ChapterStop area, or at the end of the list (the "Show // Full History" link). size_t chapter_stops = GetChapterStopCount(history_items); - if (chapter_stops == 0) + if (chapter_stops == 0) { return false; // We must have reached the "Show Full History" link. + } // Otherwise, look to see if we have reached the separator for the // chapter-stops. If not, this is a chapter stop. return index == history_items + 1 + chapter_stops; @@ -292,15 +300,17 @@ void BackForwardMenuModel::FetchFavicon(NavigationEntry* entry) { // If the favicon has already been requested for this menu, don't do // anything. - if (base::Contains(requested_favicons_, entry->GetUniqueID())) + if (base::Contains(requested_favicons_, entry->GetUniqueID())) { return; + } requested_favicons_.insert(entry->GetUniqueID()); favicon::FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(browser_->profile(), ServiceAccessType::EXPLICIT_ACCESS); - if (!favicon_service) + if (!favicon_service) { return; + } favicon_service->GetFaviconImageForPageURL( entry->GetURL(), @@ -312,15 +322,17 @@ void BackForwardMenuModel::OnFavIconDataAvailable( int navigation_entry_unique_id, const favicon_base::FaviconImageResult& image_result) { - if (image_result.image.IsEmpty()) + if (image_result.image.IsEmpty()) { return; + } // Find the current model_index for the unique id. NavigationEntry* entry = nullptr; size_t model_index = 0; for (size_t i = 0; i + 1 < GetItemCount(); ++i) { - if (IsSeparator(i)) + if (IsSeparator(i)) { continue; + } if (GetNavigationEntry(i)->GetUniqueID() == navigation_entry_unique_id) { model_index = i; entry = GetNavigationEntry(i); @@ -347,8 +359,9 @@ size_t BackForwardMenuModel::GetHistoryItemCount() const { WebContents* contents = GetWebContents(); - if (!contents) + if (!contents) { return 0; + } size_t items = contents->GetController().GetCurrentEntryIndex(); if (model_type_ == ModelType::kForward) { @@ -360,16 +373,18 @@ } size_t BackForwardMenuModel::GetChapterStopCount(size_t history_items) const { - if (history_items != kMaxHistoryItems) + if (history_items != kMaxHistoryItems) { return 0; + } WebContents* contents = GetWebContents(); size_t current_entry = contents->GetController().GetCurrentEntryIndex(); const bool forward = model_type_ == ModelType::kForward; size_t chapter_id = current_entry; - if (!forward && chapter_id < history_items) + if (!forward && chapter_id < history_items) { return 0; + } chapter_id = forward ? (chapter_id + history_items) : (chapter_id - history_items); @@ -377,8 +392,9 @@ do { const std::optional<size_t> index = GetIndexOfNextChapterStop(chapter_id, forward); - if (!index.has_value()) + if (!index.has_value()) { break; + } chapter_id = index.value(); ++chapter_stops; } while (chapter_stops < kMaxChapterStops); @@ -391,13 +407,15 @@ bool forward) const { // We want to advance over the current chapter stop, so we add one. // We don't need to do this when direction is backwards. - if (forward) + if (forward) { start_from++; + } NavigationController& controller = GetWebContents()->GetController(); const size_t max_count = controller.GetEntryCount(); - if (start_from >= max_count) + if (start_from >= max_count) { return std::nullopt; // Out of bounds. + } NavigationEntry* start_entry = controller.GetEntryAtIndex(start_from); const GURL& url = start_entry->GetURL(); @@ -412,8 +430,9 @@ // When going forwards we return the entry before the entry that has a // different domain. for (size_t i = start_from + 1; i < max_count; ++i) { - if (!same_domain_func(i)) + if (!same_domain_func(i)) { return i - 1; + } } // Last entry is always considered a chapter stop. return max_count - 1; @@ -422,8 +441,9 @@ // When going backwards we return the first entry we find that has a // different domain. for (size_t i = start_from; i > 0; --i) { - if (!same_domain_func(i - 1)) + if (!same_domain_func(i - 1)) { return i - 1; + } } // We have reached the beginning without finding a chapter stop. return std::nullopt; @@ -434,14 +454,16 @@ size_t skip) const { WebContents* contents = GetWebContents(); size_t entry = contents->GetController().GetCurrentEntryIndex(); - if (!forward && entry < offset) + if (!forward && entry < offset) { return std::nullopt; + } entry = forward ? (entry + offset) : (entry - offset); for (size_t i = 0; i <= skip; ++i) { const std::optional<size_t> index = GetIndexOfNextChapterStop(entry, forward); - if (!index.has_value()) + if (!index.has_value()) { return std::nullopt; + } entry = index.value(); } @@ -477,16 +499,19 @@ const size_t current_index = contents->GetController().GetCurrentEntryIndex(); const bool forward = model_type_ == ModelType::kForward; - if (!forward && current_index <= index) + if (!forward && current_index <= index) { return std::nullopt; + } return forward ? (current_index + index + 1) : (current_index - (index + 1)); } - if (index == history_items) + if (index == history_items) { return std::nullopt; // Don't translate the separator for history items. + } - if (index >= history_items + 1 + GetChapterStopCount(history_items)) + if (index >= history_items + 1 + GetChapterStopCount(history_items)) { return std::nullopt; // This is beyond the last chapter stop so we abort. + } // This menu item is a chapter stop located between the two separators. return FindChapterStop(history_items, model_type_ == ModelType::kForward, @@ -509,10 +534,11 @@ std::optional<size_t> index) const { DCHECK(!action.empty()); std::string metric_string; - if (model_type_ == ModelType::kForward) + if (model_type_ == ModelType::kForward) { metric_string += "ForwardMenu_"; - else + } else { metric_string += "BackMenu_"; + } metric_string += action; if (index.has_value()) { // +1 is for historical reasons (indices used to start at 1).
diff --git a/chrome/browser/ui/toolbar/back_forward_menu_model.h b/chrome/browser/ui/toolbar/back_forward_menu_model.h index 3ff8e91d..151ad14 100644 --- a/chrome/browser/ui/toolbar/back_forward_menu_model.h +++ b/chrome/browser/ui/toolbar/back_forward_menu_model.h
@@ -28,7 +28,7 @@ namespace content { class NavigationEntry; class WebContents; -} +} // namespace content /////////////////////////////////////////////////////////////////////////////// //
diff --git a/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc b/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc index fbf7c920..3c08e907 100644 --- a/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc +++ b/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc
@@ -92,17 +92,19 @@ size_t c = std::min(BackForwardMenuModel::kMaxChapterStops, chapter_stops); EXPECT_EQ(h, model->GetHistoryItemCount()); EXPECT_EQ(c, model->GetChapterStopCount(h)); - if (h > 0) + if (h > 0) { h += 2; // Separator and View History link. - if (c > 0) + } + if (c > 0) { ++c; + } EXPECT_EQ(h + c, model->GetItemCount()); } void LoadURLAndUpdateState(const char* url, const char* title) { NavigateAndCommit(GURL(url)); - web_contents()->UpdateTitleForEntry( - controller().GetLastCommittedEntry(), base::UTF8ToUTF16(title)); + web_contents()->UpdateTitleForEntry(controller().GetLastCommittedEntry(), + base::UTF8ToUTF16(title)); } // Navigate back or forward the given amount and commits the entry (which @@ -165,8 +167,7 @@ EXPECT_EQ(0u, forward_model->GetItemCount()); EXPECT_EQ(u"C2", back_model->GetLabelAt(0)); EXPECT_EQ(u"A1", back_model->GetLabelAt(6)); - EXPECT_EQ(back_model->GetShowFullHistoryLabel(), - back_model->GetLabelAt(8)); + EXPECT_EQ(back_model->GetShowFullHistoryLabel(), back_model->GetLabelAt(8)); EXPECT_TRUE(back_model->ItemHasCommand(0)); EXPECT_TRUE(back_model->ItemHasCommand(6)); @@ -197,8 +198,7 @@ EXPECT_EQ(5u, forward_model->GetItemCount()); EXPECT_EQ(u"B1", back_model->GetLabelAt(0)); EXPECT_EQ(u"A1", back_model->GetLabelAt(3)); - EXPECT_EQ(back_model->GetShowFullHistoryLabel(), - back_model->GetLabelAt(5)); + EXPECT_EQ(back_model->GetShowFullHistoryLabel(), back_model->GetLabelAt(5)); EXPECT_EQ(u"C1", forward_model->GetLabelAt(0)); EXPECT_EQ(u"C3", forward_model->GetLabelAt(2)); EXPECT_EQ(forward_model->GetShowFullHistoryLabel(), @@ -259,17 +259,16 @@ EXPECT_EQ(0u, forward_model->GetItemCount()); EXPECT_EQ(u"K1", back_model->GetLabelAt(0)); EXPECT_EQ(back_model->GetShowFullHistoryLabel(), - back_model->GetLabelAt(BackForwardMenuModel::kMaxHistoryItems + 1 + - chapter_stop_offset)); + back_model->GetLabelAt(BackForwardMenuModel::kMaxHistoryItems + 1 + + chapter_stop_offset)); // Test for out of bounds (beyond Show Full History). EXPECT_FALSE(back_model->ItemHasCommand( BackForwardMenuModel::kMaxHistoryItems + chapter_stop_offset + 2)); - EXPECT_TRUE(back_model->ItemHasCommand( - BackForwardMenuModel::kMaxHistoryItems - 1)); - EXPECT_TRUE(back_model->IsSeparator( - BackForwardMenuModel::kMaxHistoryItems)); + EXPECT_TRUE( + back_model->ItemHasCommand(BackForwardMenuModel::kMaxHistoryItems - 1)); + EXPECT_TRUE(back_model->IsSeparator(BackForwardMenuModel::kMaxHistoryItems)); NavigateToIndex(0); @@ -278,8 +277,8 @@ EXPECT_EQ(0u, back_model->GetItemCount()); EXPECT_EQ(u"A2", forward_model->GetLabelAt(0)); EXPECT_EQ(forward_model->GetShowFullHistoryLabel(), - forward_model->GetLabelAt(BackForwardMenuModel::kMaxHistoryItems + 1 + - chapter_stop_offset)); + forward_model->GetLabelAt(BackForwardMenuModel::kMaxHistoryItems + + 1 + chapter_stop_offset)); // Out of bounds EXPECT_FALSE(forward_model->ItemHasCommand( @@ -287,8 +286,8 @@ EXPECT_TRUE(forward_model->ItemHasCommand( BackForwardMenuModel::kMaxHistoryItems - 1)); - EXPECT_TRUE(forward_model->IsSeparator( - BackForwardMenuModel::kMaxHistoryItems)); + EXPECT_TRUE( + forward_model->IsSeparator(BackForwardMenuModel::kMaxHistoryItems)); } TEST_F(BackFwdMenuModelTest, ChapterStops) { @@ -421,13 +420,12 @@ ValidateModel(forward_model.get(), BackForwardMenuModel::kMaxHistoryItems, 0); // Go forward (still no chapter stop) NavigationSimulator::GoForward(web_contents()); - ValidateModel(forward_model.get(), - BackForwardMenuModel::kMaxHistoryItems - 1, 0); + ValidateModel(forward_model.get(), BackForwardMenuModel::kMaxHistoryItems - 1, + 0); // Go back two (one chapter stop should show up) NavigationSimulator::GoBack(web_contents()); NavigationSimulator::GoBack(web_contents()); - ValidateModel(forward_model.get(), - BackForwardMenuModel::kMaxHistoryItems, 1); + ValidateModel(forward_model.get(), BackForwardMenuModel::kMaxHistoryItems, 1); // Go to beginning. NavigateToIndex(0); @@ -445,7 +443,7 @@ // Empty string indicates item is a separator. EXPECT_EQ(std::u16string(), forward_model->GetLabelAt(index + 1)); EXPECT_EQ(forward_model->GetShowFullHistoryLabel(), - forward_model->GetLabelAt(index + 2)); + forward_model->GetLabelAt(index + 2)); // If we advance one we should still see the same chapter stop at the end. NavigationSimulator::GoForward(web_contents());
diff --git a/chrome/browser/ui/toolbar/bookmark_sub_menu_model.cc b/chrome/browser/ui/toolbar/bookmark_sub_menu_model.cc index 0e4adb1..8d06cfc1 100644 --- a/chrome/browser/ui/toolbar/bookmark_sub_menu_model.cc +++ b/chrome/browser/ui/toolbar/bookmark_sub_menu_model.cc
@@ -55,11 +55,11 @@ SetElementIdentifierAt(GetIndexOfCommandId(IDC_SHOW_BOOKMARK_BAR).value(), kShowBookmarkBarMenuItem); - AddItemWithStringId(IDC_SHOW_BOOKMARK_SIDE_PANEL, - IDS_SHOW_BOOKMARK_SIDE_PANEL); - SetElementIdentifierAt( - GetIndexOfCommandId(IDC_SHOW_BOOKMARK_SIDE_PANEL).value(), - kShowBookmarkSidePanelItem); + AddItemWithStringId(IDC_SHOW_BOOKMARK_SIDE_PANEL, + IDS_SHOW_BOOKMARK_SIDE_PANEL); + SetElementIdentifierAt( + GetIndexOfCommandId(IDC_SHOW_BOOKMARK_SIDE_PANEL).value(), + kShowBookmarkSidePanelItem); AddItemWithStringId(IDC_SHOW_BOOKMARK_MANAGER, IDS_BOOKMARK_MANAGER); @@ -67,43 +67,42 @@ AddItemWithStringId(IDC_IMPORT_SETTINGS, IDS_IMPORT_SETTINGS_MENU_LABEL); #endif + AddSeparator(ui::NORMAL_SEPARATOR); + + reading_list_sub_menu_model_ = + std::make_unique<ReadingListSubMenuModel>(delegate()); + AddSubMenuWithStringIdAndIcon( + IDC_READING_LIST_MENU, IDS_READING_LIST_MENU, + reading_list_sub_menu_model_.get(), + ui::ImageModel::FromVectorIcon(kReadingListIcon)); + SetElementIdentifierAt(GetIndexOfCommandId(IDC_READING_LIST_MENU).value(), + kReadingListMenuItem); + + if (base::FeatureList::IsEnabled(commerce::kProductSpecifications) && + base::FeatureList::IsEnabled(commerce::kCompareManagementInterface)) { AddSeparator(ui::NORMAL_SEPARATOR); - reading_list_sub_menu_model_ = - std::make_unique<ReadingListSubMenuModel>(delegate()); + compare_sub_menu_model_ = + std::make_unique<commerce::CompareSubMenuModel>(delegate()); AddSubMenuWithStringIdAndIcon( - IDC_READING_LIST_MENU, IDS_READING_LIST_MENU, - reading_list_sub_menu_model_.get(), - ui::ImageModel::FromVectorIcon(kReadingListIcon)); - SetElementIdentifierAt(GetIndexOfCommandId(IDC_READING_LIST_MENU).value(), - kReadingListMenuItem); + IDC_COMPARE_MENU, IDS_COMPARE_MENU_LABEL, compare_sub_menu_model_.get(), + ui::ImageModel::FromVectorIcon(kCompareIcon, ui::kColorMenuIcon, 16)); + SetElementIdentifierAt(GetIndexOfCommandId(IDC_COMPARE_MENU).value(), + kCompareMenuItem); + } - if (base::FeatureList::IsEnabled(commerce::kProductSpecifications) && - base::FeatureList::IsEnabled(commerce::kCompareManagementInterface)) { - AddSeparator(ui::NORMAL_SEPARATOR); - - compare_sub_menu_model_ = - std::make_unique<commerce::CompareSubMenuModel>(delegate()); - AddSubMenuWithStringIdAndIcon( - IDC_COMPARE_MENU, IDS_COMPARE_MENU_LABEL, - compare_sub_menu_model_.get(), - ui::ImageModel::FromVectorIcon(kCompareIcon, ui::kColorMenuIcon, 16)); - SetElementIdentifierAt(GetIndexOfCommandId(IDC_COMPARE_MENU).value(), - kCompareMenuItem); + auto set_icon = [this](int command_id, const gfx::VectorIcon& vector_icon) { + auto index = GetIndexOfCommandId(command_id); + if (index) { + SetIcon(index.value(), ui::ImageModel::FromVectorIcon( + vector_icon, ui::kColorMenuIcon, 16)); } + }; - auto set_icon = [this](int command_id, const gfx::VectorIcon& vector_icon) { - auto index = GetIndexOfCommandId(command_id); - if (index) { - SetIcon(index.value(), ui::ImageModel::FromVectorIcon( - vector_icon, ui::kColorMenuIcon, 16)); - } - }; - - set_icon(IDC_BOOKMARK_THIS_TAB, kBookmarksListsMenuIcon); - set_icon(IDC_BOOKMARK_ALL_TABS, kBookmarkAllTabsChromeRefreshIcon); - set_icon(IDC_SHOW_BOOKMARK_BAR, kToolbarChromeRefreshIcon); - set_icon(IDC_SHOW_BOOKMARK_MANAGER, kBookmarksManagerIcon); - set_icon(IDC_SHOW_BOOKMARK_SIDE_PANEL, kBookmarksSidePanelRefreshIcon); - set_icon(IDC_IMPORT_SETTINGS, kMenuBookChromeRefreshIcon); + set_icon(IDC_BOOKMARK_THIS_TAB, kBookmarksListsMenuIcon); + set_icon(IDC_BOOKMARK_ALL_TABS, kBookmarkAllTabsChromeRefreshIcon); + set_icon(IDC_SHOW_BOOKMARK_BAR, kToolbarChromeRefreshIcon); + set_icon(IDC_SHOW_BOOKMARK_MANAGER, kBookmarksManagerIcon); + set_icon(IDC_SHOW_BOOKMARK_SIDE_PANEL, kBookmarksSidePanelRefreshIcon); + set_icon(IDC_IMPORT_SETTINGS, kMenuBookChromeRefreshIcon); }
diff --git a/chrome/browser/ui/toolbar/cast/cast_contextual_menu.cc b/chrome/browser/ui/toolbar/cast/cast_contextual_menu.cc index a4a53e4..3ad31a7 100644 --- a/chrome/browser/ui/toolbar/cast/cast_contextual_menu.cc +++ b/chrome/browser/ui/toolbar/cast/cast_contextual_menu.cc
@@ -43,16 +43,15 @@ } CastContextualMenu::CastContextualMenu(Browser* browser, - bool shown_by_policy, - Observer* observer) + bool shown_by_policy, + Observer* observer) : browser_(browser), observer_(observer), shown_by_policy_(shown_by_policy) {} CastContextualMenu::~CastContextualMenu() = default; -std::unique_ptr<ui::SimpleMenuModel> -CastContextualMenu::CreateMenuModel() { +std::unique_ptr<ui::SimpleMenuModel> CastContextualMenu::CreateMenuModel() { auto menu_model = std::make_unique<ui::SimpleMenuModel>(this); menu_model->AddItemWithStringId(IDC_MEDIA_ROUTER_ABOUT, IDS_MEDIA_ROUTER_ABOUT); @@ -119,8 +118,7 @@ return true; } -void CastContextualMenu::ExecuteCommand(int command_id, - int event_flags) { +void CastContextualMenu::ExecuteCommand(int command_id, int event_flags) { const char kAboutPageUrl[] = "https://www.google.com/chrome/devices/chromecast/"; const char kCastHelpCenterPageUrl[] =
diff --git a/chrome/browser/ui/toolbar/cast/cast_contextual_menu.h b/chrome/browser/ui/toolbar/cast/cast_contextual_menu.h index 930a624..6e78b42 100644 --- a/chrome/browser/ui/toolbar/cast/cast_contextual_menu.h +++ b/chrome/browser/ui/toolbar/cast/cast_contextual_menu.h
@@ -25,16 +25,15 @@ // Creates an instance for a Cast toolbar icon shown in the toolbar. // |observer| must outlive the context menu. static std::unique_ptr<CastContextualMenu> Create(Browser* browser, - Observer* observer); + Observer* observer); // Constructor called by the static Create* methods above and tests. CastContextualMenu(Browser* browser, - bool shown_by_policy, - Observer* observer); + bool shown_by_policy, + Observer* observer); CastContextualMenu(const CastContextualMenu&) = delete; - CastContextualMenu& operator=(const CastContextualMenu&) = - delete; + CastContextualMenu& operator=(const CastContextualMenu&) = delete; ~CastContextualMenu() override; @@ -42,18 +41,13 @@ std::unique_ptr<ui::SimpleMenuModel> CreateMenuModel(); private: - FRIEND_TEST_ALL_PREFIXES(CastContextualMenuUnitTest, - ToggleCloudServicesItem); - FRIEND_TEST_ALL_PREFIXES(CastContextualMenuUnitTest, - ShowCloudServicesDialog); + FRIEND_TEST_ALL_PREFIXES(CastContextualMenuUnitTest, ToggleCloudServicesItem); + FRIEND_TEST_ALL_PREFIXES(CastContextualMenuUnitTest, ShowCloudServicesDialog); FRIEND_TEST_ALL_PREFIXES(CastContextualMenuUnitTest, ToggleAlwaysShowIconItem); - FRIEND_TEST_ALL_PREFIXES(CastContextualMenuUnitTest, - ToggleMediaRemotingItem); - FRIEND_TEST_ALL_PREFIXES(CastContextualMenuUnitTest, - ActionShownByPolicy); - FRIEND_TEST_ALL_PREFIXES(CastContextualMenuUnitTest, - NotifyActionController); + FRIEND_TEST_ALL_PREFIXES(CastContextualMenuUnitTest, ToggleMediaRemotingItem); + FRIEND_TEST_ALL_PREFIXES(CastContextualMenuUnitTest, ActionShownByPolicy); + FRIEND_TEST_ALL_PREFIXES(CastContextualMenuUnitTest, NotifyActionController); // Gets or sets the "Always show icon" option. bool GetAlwaysShowActionPref() const;
diff --git a/chrome/browser/ui/toolbar/cast/cast_contextual_menu_unittest.cc b/chrome/browser/ui/toolbar/cast/cast_contextual_menu_unittest.cc index 06421fc..768c4e8 100644 --- a/chrome/browser/ui/toolbar/cast/cast_contextual_menu_unittest.cc +++ b/chrome/browser/ui/toolbar/cast/cast_contextual_menu_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/toolbar/cast/cast_contextual_menu.h" + #include <memory> #include <utility> @@ -16,7 +18,6 @@ #include "chrome/browser/ui/media_router/media_router_ui_service.h" #include "chrome/browser/ui/media_router/media_router_ui_service_factory.h" #include "chrome/browser/ui/toolbar/cast/cast_toolbar_button_controller.h" -#include "chrome/browser/ui/toolbar/cast/cast_contextual_menu.h" #include "chrome/browser/ui/toolbar/cast/mock_cast_toolbar_button_controller.h" #include "chrome/grit/branded_strings.h" #include "chrome/grit/generated_resources.h" @@ -39,8 +40,9 @@ bool HasCommandId(ui::MenuModel* menu_model, int command_id) { for (size_t i = 0; i < menu_model->GetItemCount(); ++i) { - if (menu_model->GetCommandIdAt(i) == command_id) + if (menu_model->GetCommandIdAt(i) == command_id) { return true; + } } return false; } @@ -53,8 +55,7 @@ profile, std::move(controller)); } -class MockCastContextualMenuObserver - : public CastContextualMenu::Observer { +class MockCastContextualMenuObserver : public CastContextualMenu::Observer { public: MOCK_METHOD(void, OnContextMenuShown, ()); MOCK_METHOD(void, OnContextMenuHidden, ()); @@ -65,10 +66,9 @@ class CastContextualMenuUnitTest : public BrowserWithTestWindowTest { public: CastContextualMenuUnitTest() = default; - CastContextualMenuUnitTest(const CastContextualMenuUnitTest&) = + CastContextualMenuUnitTest(const CastContextualMenuUnitTest&) = delete; + CastContextualMenuUnitTest& operator=(const CastContextualMenuUnitTest&) = delete; - CastContextualMenuUnitTest& operator=( - const CastContextualMenuUnitTest&) = delete; ~CastContextualMenuUnitTest() override = default; void SetUp() override { @@ -171,8 +171,8 @@ CreateBrowser(profile()->GetPrimaryOTRProfile(/*create_if_needed=*/true), Browser::TYPE_NORMAL, false, window.get())); - CastContextualMenu incognito_menu(incognito_browser.get(), - kShownByPolicy, &observer_); + CastContextualMenu incognito_menu(incognito_browser.get(), kShownByPolicy, + &observer_); EXPECT_TRUE( incognito_menu.CreateMenuModel() ->GetIndexOfCommandId(IDC_MEDIA_TOOLBAR_CONTEXT_REPORT_CAST_ISSUE) @@ -234,8 +234,8 @@ TEST_F(CastContextualMenuUnitTest, NotifyActionController) { EXPECT_CALL(observer_, OnContextMenuShown()); - auto menu = std::make_unique<CastContextualMenu>( - browser(), kShownByUser, &observer_); + auto menu = + std::make_unique<CastContextualMenu>(browser(), kShownByUser, &observer_); std::unique_ptr<ui::SimpleMenuModel> model = menu->CreateMenuModel(); menu->OnMenuWillShow(model.get());
diff --git a/chrome/browser/ui/toolbar/cast/cast_toolbar_button_controller.cc b/chrome/browser/ui/toolbar/cast/cast_toolbar_button_controller.cc index 9ffe4f2..834f2973 100644 --- a/chrome/browser/ui/toolbar/cast/cast_toolbar_button_controller.cc +++ b/chrome/browser/ui/toolbar/cast/cast_toolbar_button_controller.cc
@@ -9,8 +9,8 @@ #include "base/ranges/algorithm.h" #include "chrome/browser/media/router/media_router_feature.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/ui/browser_window/public/browser_window_features.h" #include "chrome/browser/ui/browser_finder.h" +#include "chrome/browser/ui/browser_window/public/browser_window_features.h" #include "chrome/browser/ui/ui_features.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/media_router/cast_browser_controller.h" @@ -40,8 +40,9 @@ const PrefService::Preference* pref = profile->GetPrefs()->FindPreference(prefs::kShowCastIconInToolbar); bool show = false; - if (pref->IsManaged() && pref->GetValue()->is_bool()) + if (pref->IsManaged() && pref->GetValue()->is_bool()) { show = pref->GetValue()->GetBool(); + } return show; } @@ -93,17 +94,20 @@ void CastToolbarButtonController::OnDialogShown() { dialog_count_++; MaybeToggleIconVisibility(); - for (Observer& observer : observers_) + for (Observer& observer : observers_) { observer.ActivateIcon(); + } } void CastToolbarButtonController::OnDialogHidden() { DCHECK_GT(dialog_count_, 0u); - if (dialog_count_) + if (dialog_count_) { dialog_count_--; + } if (dialog_count_ == 0) { - for (Observer& observer : observers_) + for (Observer& observer : observers_) { observer.DeactivateIcon(); + } // Call MaybeToggleIconVisibility() asynchronously, so that the action icon // doesn't get hidden until we have a chance to show a context menu. content::GetUIThreadTaskRunner({})->PostTask( @@ -198,10 +202,12 @@ } if (ShouldEnableAction()) { - for (Observer& observer : observers_) + for (Observer& observer : observers_) { observer.ShowIcon(); + } } else { - for (Observer& observer : observers_) + for (Observer& observer : observers_) { observer.HideIcon(); + } } }
diff --git a/chrome/browser/ui/toolbar/cast/cast_toolbar_button_controller.h b/chrome/browser/ui/toolbar/cast/cast_toolbar_button_controller.h index dad262a8..98651260 100644 --- a/chrome/browser/ui/toolbar/cast/cast_toolbar_button_controller.h +++ b/chrome/browser/ui/toolbar/cast/cast_toolbar_button_controller.h
@@ -20,10 +20,9 @@ // Controller for the Cast toolbar icon that determines when to show and hide // icon. There should be one instance of this class per profile, and it should // only be used on the UI thread. -class CastToolbarButtonController - : public media_router::IssuesObserver, - public media_router::MediaRoutesObserver, - public CastContextualMenu::Observer{ +class CastToolbarButtonController : public media_router::IssuesObserver, + public media_router::MediaRoutesObserver, + public CastContextualMenu::Observer { public: // TODO(takumif): CastToolbarIcon is the only Observer implementation. // Observer should be renamed to make it clear that it is responsible for
diff --git a/chrome/browser/ui/toolbar/cast/cast_toolbar_button_controller_unittest.cc b/chrome/browser/ui/toolbar/cast/cast_toolbar_button_controller_unittest.cc index c4510da..ca8069c2 100644 --- a/chrome/browser/ui/toolbar/cast/cast_toolbar_button_controller_unittest.cc +++ b/chrome/browser/ui/toolbar/cast/cast_toolbar_button_controller_unittest.cc
@@ -2,13 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/toolbar/cast/cast_toolbar_button_controller.h" + #include <memory> #include <string> #include "base/run_loop.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/media/router/media_router_feature.h" -#include "chrome/browser/ui/toolbar/cast/cast_toolbar_button_controller.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/browser_with_test_window_test.h" #include "components/media_router/browser/test/mock_media_router.h"
diff --git a/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_model.h b/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_model.h index 77f4824b..b10e253 100644 --- a/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_model.h +++ b/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_model.h
@@ -7,6 +7,7 @@ #include <string> #include <vector> + #include "base/memory/raw_ref.h" #include "components/version_info/channel.h"
diff --git a/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_prefs.cc b/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_prefs.cc index f792842f..4016b13 100644 --- a/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_prefs.cc +++ b/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_prefs.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/toolbar/chrome_labs/chrome_labs_prefs.h" + #include "components/pref_registry/pref_registry_syncable.h" #include "components/prefs/pref_registry_simple.h"
diff --git a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc index 4cc4eda0..c9ebace 100644 --- a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc +++ b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
@@ -66,8 +66,9 @@ bool ChromeLocationBarModelDelegate::GetURL(GURL* url) const { DCHECK(url); content::NavigationEntry* entry = GetNavigationEntry(); - if (!entry || entry->IsInitialEntry()) + if (!entry || entry->IsInitialEntry()) { return false; + } *url = entry->GetVirtualURL(); return true; @@ -91,24 +92,28 @@ // of view-source:chrome://newtab, which should display its URL despite what // chrome://newtab says. content::NavigationEntry* entry = GetNavigationEntry(); - if (!entry || entry->IsInitialEntry()) + if (!entry || entry->IsInitialEntry()) { return true; + } security_interstitials::SecurityInterstitialTabHelper* security_interstitial_tab_helper = security_interstitials::SecurityInterstitialTabHelper:: FromWebContents(GetActiveWebContents()); if (security_interstitial_tab_helper && - security_interstitial_tab_helper->IsDisplayingInterstitial()) + security_interstitial_tab_helper->IsDisplayingInterstitial()) { return security_interstitial_tab_helper->ShouldDisplayURL(); + } LoginTabHelper* login_tab_helper = LoginTabHelper::FromWebContents(GetActiveWebContents()); - if (login_tab_helper && login_tab_helper->IsShowingPrompt()) + if (login_tab_helper && login_tab_helper->IsShowingPrompt()) { return login_tab_helper->ShouldDisplayURL(); + } - if (entry->IsViewSourceMode()) + if (entry->IsViewSourceMode()) { return true; + } const auto is_ntp = [](const GURL& url) { return url.SchemeIs(content::kChromeUIScheme) && @@ -116,8 +121,9 @@ }; GURL url = entry->GetURL(); - if (is_ntp(entry->GetVirtualURL()) || is_ntp(url)) + if (is_ntp(entry->GetVirtualURL()) || is_ntp(url)) { return false; + } Profile* profile = GetProfile(); return !profile || !search::IsInstantNTPURL(url, profile); @@ -161,8 +167,9 @@ scoped_refptr<net::X509Certificate> ChromeLocationBarModelDelegate::GetCertificate() const { content::NavigationEntry* entry = GetNavigationEntry(); - if (!entry || entry->IsInitialEntry()) + if (!entry || entry->IsInitialEntry()) { return scoped_refptr<net::X509Certificate>(); + } return entry->GetSSL().certificate; } @@ -197,15 +204,18 @@ bool ChromeLocationBarModelDelegate::IsNewTabPage() const { content::NavigationEntry* const entry = GetNavigationEntry(); - if (!entry || entry->IsInitialEntry()) + if (!entry || entry->IsInitialEntry()) { return false; + } Profile* const profile = GetProfile(); - if (!profile) + if (!profile) { return false; + } - if (!search::DefaultSearchProviderIsGoogle(profile)) + if (!search::DefaultSearchProviderIsGoogle(profile)) { return false; + } GURL ntp_url(chrome::kChromeUINewTabPageURL); return ntp_url.scheme_piece() == entry->GetURL().scheme_piece() && @@ -218,8 +228,9 @@ bool ChromeLocationBarModelDelegate::IsHomePage(const GURL& url) const { Profile* const profile = GetProfile(); - if (!profile) + if (!profile) { return false; + } return url.spec() == profile->GetPrefs()->GetString(prefs::kHomePage); }
diff --git a/chrome/browser/ui/toolbar/test_toolbar_action_view_controller.cc b/chrome/browser/ui/toolbar/test_toolbar_action_view_controller.cc index 7230dfa3..f228d0a 100644 --- a/chrome/browser/ui/toolbar/test_toolbar_action_view_controller.cc +++ b/chrome/browser/ui/toolbar/test_toolbar_action_view_controller.cc
@@ -141,6 +141,7 @@ } void TestToolbarActionViewController::UpdateDelegate() { - if (delegate_) + if (delegate_) { delegate_->UpdateState(); + } }
diff --git a/chrome/browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.cc b/chrome/browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.cc index 96b00ff..123565ac 100644 --- a/chrome/browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.cc +++ b/chrome/browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.cc
@@ -35,9 +35,10 @@ } std::unique_ptr<ToolbarActionsBarBubbleDelegate::ExtraViewInfo> GetExtraViewInfo() override { - if (parent_->info_) + if (parent_->info_) { return std::make_unique<ToolbarActionsBarBubbleDelegate::ExtraViewInfo>( *parent_->info_); + } return nullptr; } std::string GetAnchorActionId() override { return parent_->action_id_; }
diff --git a/chrome/browser/ui/toolbar/toolbar_actions_model.cc b/chrome/browser/ui/toolbar/toolbar_actions_model.cc index b5f462a5..7d47d28 100644 --- a/chrome/browser/ui/toolbar/toolbar_actions_model.cc +++ b/chrome/browser/ui/toolbar/toolbar_actions_model.cc
@@ -96,8 +96,9 @@ // We don't want to add the same extension twice. It may have already been // added by EXTENSION_BROWSER_ACTION_VISIBILITY_CHANGED below, if the user // hides the browser action and then disables and enables the extension. - if (!HasAction(extension->id()) && ShouldAddExtension(extension)) + if (!HasAction(extension->id()) && ShouldAddExtension(extension)) { AddAction(extension->id()); + } } void ToolbarActionsModel::OnExtensionUnloaded( @@ -169,16 +170,18 @@ extension_management_observation_.Observe(management); actions_initialized_ = true; - for (Observer& observer : observers_) + for (Observer& observer : observers_) { observer.OnToolbarModelInitialized(); + } } bool ToolbarActionsModel::ShouldAddExtension( const extensions::Extension* extension) { // In incognito mode, don't add any extensions that aren't incognito-enabled. if (profile_->IsOffTheRecord() && - !extensions::util::IsIncognitoEnabled(extension->id(), profile_)) + !extensions::util::IsIncognitoEnabled(extension->id(), profile_)) { return false; + } // In this case, we don't care about the browser action visibility, because // we want to show each extension regardless. @@ -191,8 +194,9 @@ action_ids_.insert(action_id); - for (Observer& observer : observers_) + for (Observer& observer : observers_) { observer.OnToolbarActionAdded(action_id); + } UpdatePinnedActionIds(); } @@ -200,13 +204,15 @@ void ToolbarActionsModel::RemoveAction(const ActionId& action_id) { const bool did_erase = action_ids_.erase(action_id) > 0; // TODO(devlin): Can we DCHECK did_erase? - if (!did_erase) + if (!did_erase) { return; + } UpdatePinnedActionIds(); - for (Observer& observer : observers_) + for (Observer& observer : observers_) { observer.OnToolbarActionRemoved(action_id); + } } const std::u16string ToolbarActionsModel::GetExtensionName( @@ -297,8 +303,9 @@ // stored_pinned_actions, which force-pinned actions aren't; so, always keep // them 'to the right' of other actions. Remove this guard if we ever add // force-pinned actions to the pref. - if (IsActionForcePinned(action_id)) + if (IsActionForcePinned(action_id)) { return; + } // If pinned actions are empty, we're going to have a real bad time (with // out Keep this a hard CHECK (not a DCHECK). @@ -313,8 +320,9 @@ size_t current_index_on_toolbar = current_position_on_toolbar - pinned_action_ids_.begin(); - if (current_index_on_toolbar == target_index) + if (current_index_on_toolbar == target_index) { return; + } bool is_left_to_right_move = target_index > current_index_on_toolbar; @@ -409,10 +417,11 @@ void ToolbarActionsModel::InitializeActionList() { CHECK(action_ids_.empty()); // We shouldn't have any actions yet. - if (profile_->IsOffTheRecord()) + if (profile_->IsOffTheRecord()) { IncognitoPopulate(); - else + } else { Populate(); + } // Set |pinned_action_ids_| directly to avoid notifying observers that they // have changed even though they haven't. @@ -449,8 +458,9 @@ extension_registry_->enabled_extensions(); for (const scoped_refptr<const extensions::Extension>& extension : extensions) { - if (!ShouldAddExtension(extension.get())) + if (!ShouldAddExtension(extension.get())) { continue; + } action_ids_.insert(extension->id()); } } @@ -500,16 +510,19 @@ void ToolbarActionsModel::UpdatePinnedActionIds() { // If extensions are not ready, defer to later Populate() call. - if (!actions_initialized_) + if (!actions_initialized_) { return; + } std::vector<ActionId> pinned_extensions = GetFilteredPinnedActionIds(); - if (pinned_extensions == pinned_action_ids_) + if (pinned_extensions == pinned_action_ids_) { return; + } pinned_action_ids_ = pinned_extensions; - for (Observer& observer : observers_) + for (Observer& observer : observers_) { observer.OnToolbarPinnedActionsChanged(); + } } std::vector<ToolbarActionsModel::ActionId> @@ -527,8 +540,9 @@ // startup so that we don't keep saving stale IDs. std::vector<ActionId> filtered_action_ids; for (auto& action_id : pinned) { - if (HasAction(action_id)) + if (HasAction(action_id)) { filtered_action_ids.push_back(action_id); + } } return filtered_action_ids; }
diff --git a/chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc b/chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc index 2ce54a9..19d064c 100644 --- a/chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc +++ b/chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc
@@ -314,8 +314,9 @@ bool ToolbarActionsModelUnitTest::ModelHasActionForId( const std::string& id) const { for (const auto& toolbar_action_id : toolbar_model_->action_ids()) { - if (toolbar_action_id == id) + if (toolbar_action_id == id) { return true; + } } return false; }
diff --git a/chrome/browser/ui/translate/partial_translate_bubble_model_impl.cc b/chrome/browser/ui/translate/partial_translate_bubble_model_impl.cc index 39568a45..d16dbbb 100644 --- a/chrome/browser/ui/translate/partial_translate_bubble_model_impl.cc +++ b/chrome/browser/ui/translate/partial_translate_bubble_model_impl.cc
@@ -97,10 +97,11 @@ // Luxembourgish uses a leading space and is the only one of these languages // supported by Translate in Chrome. Given this, specific localization is not // handled, but could be in the future if more languages are included. - if (source_text_truncated_) + if (source_text_truncated_) { target_text_ = text + u"…"; - else + } else { target_text_ = text; + } } std::u16string PartialTranslateBubbleModelImpl::GetTargetText() const { @@ -171,10 +172,11 @@ // If the selected text was truncated, strip the trailing ellipses before // sending for translation. std::u16string source_text = GetSourceText(); - if (source_text_truncated_) + if (source_text_truncated_) { request.selection_text = source_text.substr(0, source_text.size() - 1); - else + } else { request.selection_text = source_text; + } request.selection_encoding = web_contents->GetEncoding(); std::string source_language_code = GetSourceLanguageCode();
diff --git a/chrome/browser/ui/translate/translate_bubble_factory.cc b/chrome/browser/ui/translate/translate_bubble_factory.cc index 96cc2a0..e078774 100644 --- a/chrome/browser/ui/translate/translate_bubble_factory.cc +++ b/chrome/browser/ui/translate/translate_bubble_factory.cc
@@ -20,8 +20,9 @@ translate::TranslateErrors error_type, bool is_user_gesture) { // |window| might be null when testing. - if (!window) + if (!window) { return ShowTranslateBubbleResult::BROWSER_WINDOW_NOT_VALID; + } return window->ShowTranslateBubble(web_contents, step, source_language, target_language, error_type, is_user_gesture);
diff --git a/chrome/browser/ui/translate/translate_bubble_model_impl.cc b/chrome/browser/ui/translate/translate_bubble_model_impl.cc index cf93aff..9704326 100644 --- a/chrome/browser/ui/translate/translate_bubble_model_impl.cc +++ b/chrome/browser/ui/translate/translate_bubble_model_impl.cc
@@ -24,8 +24,9 @@ DCHECK_NE(VIEW_STATE_TARGET_LANGUAGE, view_state); current_view_state_ = view_state; - if (GetViewState() != TranslateBubbleModel::VIEW_STATE_BEFORE_TRANSLATE) + if (GetViewState() != TranslateBubbleModel::VIEW_STATE_BEFORE_TRANSLATE) { translate_executed_ = true; + } } TranslateBubbleModelImpl::~TranslateBubbleModelImpl() = default; @@ -162,8 +163,9 @@ // the UI shown. https://crbug.com/1114868. ui_delegate_->OnUIClosedByUser(); - if (!translate_executed_) + if (!translate_executed_) { ui_delegate_->TranslationDeclined(translation_declined_); + } } bool TranslateBubbleModelImpl::IsPageTranslatedInCurrentLanguages() const {
diff --git a/chrome/browser/ui/translate/translate_bubble_model_impl.h b/chrome/browser/ui/translate/translate_bubble_model_impl.h index e57ce49..fb5a3f7 100644 --- a/chrome/browser/ui/translate/translate_bubble_model_impl.h +++ b/chrome/browser/ui/translate/translate_bubble_model_impl.h
@@ -14,7 +14,7 @@ namespace translate { class TranslateUIDelegate; class TranslateUILanguagesManager; -} +} // namespace translate // The standard implementation of TranslateBubbleModel. class TranslateBubbleModelImpl : public TranslateBubbleModel {
diff --git a/chrome/browser/ui/translate/translate_bubble_test_utils.h b/chrome/browser/ui/translate/translate_bubble_test_utils.h index 7f4c1b13..c0eb70c 100644 --- a/chrome/browser/ui/translate/translate_bubble_test_utils.h +++ b/chrome/browser/ui/translate/translate_bubble_test_utils.h
@@ -7,7 +7,6 @@ #include <string> - class TranslateBubbleModel; class Browser;
diff --git a/chrome/browser/ui/uma_browsing_activity_observer.cc b/chrome/browser/ui/uma_browsing_activity_observer.cc index 89379fa8..3b8ed77 100644 --- a/chrome/browser/ui/uma_browsing_activity_observer.cc +++ b/chrome/browser/ui/uma_browsing_activity_observer.cc
@@ -78,8 +78,9 @@ void UMABrowsingActivityObserver::LogTimeBeforeUpdate() const { const base::Time upgrade_detected_time = UpgradeDetector::GetInstance()->upgrade_detected_time(); - if (upgrade_detected_time.is_null()) + if (upgrade_detected_time.is_null()) { return; + } const base::TimeDelta time_since_upgrade = base::Time::Now() - upgrade_detected_time; constexpr int kMaxDays = 30;
diff --git a/chrome/browser/ui/unload_controller.cc b/chrome/browser/ui/unload_controller.cc index 828eff1..8d70e55 100644 --- a/chrome/browser/ui/unload_controller.cc +++ b/chrome/browser/ui/unload_controller.cc
@@ -50,8 +50,9 @@ bool UnloadController::CanCloseContents(content::WebContents* contents) { // Don't try to close the tab when the whole browser is being closed, since // that avoids the fast shutdown path where we just kill all the renderers. - if (is_attempting_to_close_browser_) + if (is_attempting_to_close_browser_) { ClearUnloadState(contents, true); + } if (!web_app::IsTabClosable( browser_->tab_strip_model(), @@ -97,8 +98,9 @@ // close if it's beforeunload event has already fired which will happen due // to the interception of it's content's beforeunload. if (browser_->is_type_devtools() && - DevToolsWindow::HasFiredBeforeUnloadEventForDevToolsBrowser(browser_)) + DevToolsWindow::HasFiredBeforeUnloadEventForDevToolsBrowser(browser_)) { return false; + } // If there's a devtools window attached to |contents|, // we would like devtools to call its own beforeunload handlers first, @@ -140,8 +142,9 @@ } if (!is_attempting_to_close_browser_) { - if (!proceed) + if (!proceed) { contents->SetClosedByUserGesture(false); + } return proceed; } @@ -235,8 +238,9 @@ } void UnloadController::ResetTryToCloseWindow() { - if (!is_calling_before_unload_handlers()) + if (!is_calling_before_unload_handlers()) { return; + } CancelWindowClose(); } @@ -279,8 +283,9 @@ DevToolsWindow::OnPageCloseCanceled(*it); } tabs_needing_unload_fired_.clear(); - if (is_calling_before_unload_handlers()) + if (is_calling_before_unload_handlers()) { std::move(on_close_confirmed_).Run(false); + } is_attempting_to_close_browser_ = false; chrome::OnClosingAllBrowsers(false); @@ -309,20 +314,24 @@ std::vector<content::WebContents*> old_contents; if (change.type() == TabStripModelChange::kInserted) { - for (const auto& contents : change.GetInsert()->contents) + for (const auto& contents : change.GetInsert()->contents) { new_contents.push_back(contents.contents); + } } else if (change.type() == TabStripModelChange::kReplaced) { new_contents.push_back(change.GetReplace()->new_contents); old_contents.push_back(change.GetReplace()->old_contents); } else if (change.type() == TabStripModelChange::kRemoved) { - for (const auto& contents : change.GetRemove()->contents) + for (const auto& contents : change.GetRemove()->contents) { old_contents.push_back(contents.contents); + } } - for (auto* contents : old_contents) + for (auto* contents : old_contents) { TabDetachedImpl(contents); - for (auto* contents : new_contents) + } + for (auto* contents : new_contents) { TabAttachedImpl(contents); + } } void UnloadController::TabStripEmpty() { @@ -341,8 +350,9 @@ } void UnloadController::TabDetachedImpl(content::WebContents* contents) { - if (is_attempting_to_close_browser_) + if (is_attempting_to_close_browser_) { ClearUnloadState(contents, false); + } // TODO(crbug.com/40054609): This CHECK is only in place to diagnose a UAF // bug. This is both used to confirm that a WebContents* isn't being removed // from this set, and also if that hypothesis is correct turns a UAF into a @@ -391,8 +401,9 @@ // we would like devtools to call its own beforeunload handlers first, // and then call beforeunload handlers for |web_contents|. // See DevToolsWindow::InterceptPageBeforeUnload for details. - if (!DevToolsWindow::InterceptPageBeforeUnload(web_contents)) + if (!DevToolsWindow::InterceptPageBeforeUnload(web_contents)) { web_contents->DispatchBeforeUnload(false /* auto_cancel */); + } } else { ClearUnloadState(web_contents, true); } @@ -404,10 +415,12 @@ // Reset |on_close_confirmed_| in case the callback tests // |is_calling_before_unload_handlers()|, we want to return that calling // is complete. - if (tabs_needing_unload_fired_.empty()) + if (tabs_needing_unload_fired_.empty()) { on_close_confirmed_.Reset(); - if (!skip_beforeunload) + } + if (!skip_beforeunload) { on_close_confirmed.Run(true); + } return; } CHECK(!tabs_needing_unload_fired_.empty()); @@ -457,8 +470,9 @@ ProcessPendingTabs(false); } else { // Do not post a new task if there is already any. - if (weak_factory_.HasWeakPtrs()) + if (weak_factory_.HasWeakPtrs()) { return; + } base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask( FROM_HERE, base::BindOnce(&UnloadController::ProcessPendingTabs, weak_factory_.GetWeakPtr(), false));
diff --git a/chrome/browser/ui/unload_controller_browsertest.cc b/chrome/browser/ui/unload_controller_browsertest.cc index 9c2846c..db09ad0 100644 --- a/chrome/browser/ui/unload_controller_browsertest.cc +++ b/chrome/browser/ui/unload_controller_browsertest.cc
@@ -83,12 +83,15 @@ // Flaky on IS_CHROMEOS. crbug.com/369817361 #if BUILDFLAG(IS_CHROMEOS) -#define MAYBE_PreventCloseEnforcedByPolicyTabbedAppShallBeClosable DISABLED_PreventCloseEnforcedByPolicyTabbedAppShallBeClosable +#define MAYBE_PreventCloseEnforcedByPolicyTabbedAppShallBeClosable \ + DISABLED_PreventCloseEnforcedByPolicyTabbedAppShallBeClosable #else -#define MAYBE_PreventCloseEnforcedByPolicyTabbedAppShallBeClosable PreventCloseEnforcedByPolicyTabbedAppShallBeClosable +#define MAYBE_PreventCloseEnforcedByPolicyTabbedAppShallBeClosable \ + PreventCloseEnforcedByPolicyTabbedAppShallBeClosable #endif -IN_PROC_BROWSER_TEST_F(UnloadControllerPreventCloseTest, - MAYBE_PreventCloseEnforcedByPolicyTabbedAppShallBeClosable) { +IN_PROC_BROWSER_TEST_F( + UnloadControllerPreventCloseTest, + MAYBE_PreventCloseEnforcedByPolicyTabbedAppShallBeClosable) { const absl::Cleanup policy_cleanup = [this] { SetPolicies(/*web_app_settings=*/"[]", /*web_app_install_force_list=*/"[]"); };
diff --git a/chrome/browser/ui/url_identity_unittest.cc b/chrome/browser/ui/url_identity_unittest.cc index 4a7be33b..fe77d275 100644 --- a/chrome/browser/ui/url_identity_unittest.cc +++ b/chrome/browser/ui/url_identity_unittest.cc
@@ -106,36 +106,36 @@ TEST_F(UrlIdentityTest, AllowlistedTypesAreAllowed) { std::string extension_id(kTestExtensionId); std::vector<TestCase> test_cases = { - {GURL("http://example.com"), - {Type::kDefault}, - {}, - { - .type = Type::kDefault, - .name = u"http://example.com", - }}, + {GURL("http://example.com"), + {Type::kDefault}, + {}, + { + .type = Type::kDefault, + .name = u"http://example.com", + }}, #if BUILDFLAG(ENABLE_EXTENSIONS) - {GURL(kTestIsolatedWebAppUrl), - {Type::kIsolatedWebApp}, - {}, - { - .type = Type::kIsolatedWebApp, - .name = u"Test IWA Name", - }}, - {extensions::Extension::GetBaseURLFromExtensionId(extension_id), - {Type::kChromeExtension}, - {}, - { - .type = Type::kChromeExtension, - .name = u"Test Extension 1", - }}, + {GURL(kTestIsolatedWebAppUrl), + {Type::kIsolatedWebApp}, + {}, + { + .type = Type::kIsolatedWebApp, + .name = u"Test IWA Name", + }}, + {extensions::Extension::GetBaseURLFromExtensionId(extension_id), + {Type::kChromeExtension}, + {}, + { + .type = Type::kChromeExtension, + .name = u"Test Extension 1", + }}, #endif // BUILDFLAG(ENABLE_EXTENSIONS) - {GURL("file:///tmp/index.html"), - {Type::kFile}, - {}, - { - .type = Type::kFile, - .name = u"file:///tmp/index.html", - }}, + {GURL("file:///tmp/index.html"), + {Type::kFile}, + {}, + { + .type = Type::kFile, + .name = u"file:///tmp/index.html", + }}, }; for (const auto& test_case : test_cases) {
diff --git a/chrome/browser/ui/user_education/low_usage_help_controller.cc b/chrome/browser/ui/user_education/low_usage_help_controller.cc index aabd79a..dd25f55 100644 --- a/chrome/browser/ui/user_education/low_usage_help_controller.cc +++ b/chrome/browser/ui/user_education/low_usage_help_controller.cc
@@ -18,7 +18,7 @@ namespace { const void* const kLowUsageHelpControllerKey = &kLowUsageHelpControllerKey; constexpr base::TimeDelta kRetryDelay = base::Seconds(1); -} +} // namespace LowUsageHelpController::LowUsageHelpController(Profile* profile) : profile_(profile) {
diff --git a/chrome/browser/ui/views/accelerator_table.cc b/chrome/browser/ui/views/accelerator_table.cc index 1f64b624..821e56d 100644 --- a/chrome/browser/ui/views/accelerator_table.cc +++ b/chrome/browser/ui/views/accelerator_table.cc
@@ -299,9 +299,10 @@ // contains Ctrl+Alt keys but we don't enable those for the public. #if DCHECK_IS_ON() constexpr int kCtrlAlt = ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN; - for (auto& mapping : *accelerators) + for (auto& mapping : *accelerators) { DCHECK((mapping.modifiers & kCtrlAlt) != kCtrlAlt) << "Accelerators with Ctrl+Alt are reserved by Windows."; + } #endif if (base::FeatureList::IsEnabled(features::kUIDebugTools)) {
diff --git a/chrome/browser/ui/views/accelerator_table_unittest.cc b/chrome/browser/ui/views/accelerator_table_unittest.cc index c47fefc2..9d0f046 100644 --- a/chrome/browser/ui/views/accelerator_table_unittest.cc +++ b/chrome/browser/ui/views/accelerator_table_unittest.cc
@@ -27,8 +27,9 @@ struct Cmp { bool operator()(const AcceleratorMapping& lhs, const AcceleratorMapping& rhs) const { - if (lhs.keycode != rhs.keycode) + if (lhs.keycode != rhs.keycode) { return lhs.keycode < rhs.keycode; + } return lhs.modifiers < rhs.modifiers; // Do not check |command_id|. } @@ -85,8 +86,9 @@ TEST(AcceleratorTableTest, CheckDuplicatedAcceleratorsAsh) { base::flat_set<AcceleratorMapping, Cmp> accelerators(GetAcceleratorList()); for (const ash::AcceleratorData& ash_entry : ash::kAcceleratorData) { - if (!ash_entry.trigger_on_press) + if (!ash_entry.trigger_on_press) { continue; // kAcceleratorMap does not have any release accelerators. + } // A few shortcuts are defined in the browser as well as in ash so that web // contents can consume them. http://crbug.com/309915, 370019, 412435, // 321568. @@ -175,8 +177,6 @@ } }; - - // Verify that the shortcuts for DevTools are enabled. TEST_F(GetAcceleratorListTest, DevToolsAreEnabled) { // Verify there is a mapping that is associated to IDC_DEV_TOOLS_TOGGLE.
diff --git a/chrome/browser/ui/views/accelerator_table_unittest_mac.mm b/chrome/browser/ui/views/accelerator_table_unittest_mac.mm index d2af2ba..e854a57 100644 --- a/chrome/browser/ui/views/accelerator_table_unittest_mac.mm +++ b/chrome/browser/ui/views/accelerator_table_unittest_mac.mm
@@ -23,14 +23,18 @@ for (const auto& e : table) { int modifiers = 0; - if (e.command_key) + if (e.command_key) { modifiers |= ui::EF_COMMAND_DOWN; - if (e.shift_key) + } + if (e.shift_key) { modifiers |= ui::EF_SHIFT_DOWN; - if (e.cntrl_key) + } + if (e.cntrl_key) { modifiers |= ui::EF_CONTROL_DOWN; - if (e.opt_key) + } + if (e.opt_key) { modifiers |= ui::EF_ALT_DOWN; + } for (const auto& accelerator_entry : accelerators) { unichar character; @@ -55,8 +59,9 @@ // have any modifiers, and thus cannot be interpreted as macOS // keyEquivalents. TEST(AcceleratorTableTest, CheckMacOSAccelerators) { - for (const auto& entry : GetAcceleratorList()) + for (const auto& entry : GetAcceleratorList()) { EXPECT_EQ(0, entry.modifiers); + } } // Verifies that we're not processing any duplicate accelerators in
diff --git a/chrome/browser/ui/views/accelerator_utils_aura.cc b/chrome/browser/ui/views/accelerator_utils_aura.cc index a908bd5..13ee574 100644 --- a/chrome/browser/ui/views/accelerator_utils_aura.cc +++ b/chrome/browser/ui/views/accelerator_utils_aura.cc
@@ -28,8 +28,9 @@ const std::vector<AcceleratorMapping> accelerators = GetAcceleratorList(); for (const auto& entry : accelerators) { if (entry.keycode == accelerator.key_code() && - entry.modifiers == accelerator.modifiers()) + entry.modifiers == accelerator.modifiers()) { return true; + } } return false;
diff --git a/chrome/browser/ui/views/accessibility/accessibility_focus_highlight.cc b/chrome/browser/ui/views/accessibility/accessibility_focus_highlight.cc index af7add46..f8fb3d842 100644 --- a/chrome/browser/ui/views/accessibility/accessibility_focus_highlight.cc +++ b/chrome/browser/ui/views/accessibility/accessibility_focus_highlight.cc
@@ -105,8 +105,9 @@ } AccessibilityFocusHighlight::~AccessibilityFocusHighlight() { - if (compositor_ && compositor_->HasAnimationObserver(this)) + if (compositor_ && compositor_->HasAnimationObserver(this)) { compositor_->RemoveAnimationObserver(this); + } } // static @@ -139,8 +140,9 @@ SkColor theme_color = color_provider->GetColor(ui::kColorFocusableBorderFocused); - if (theme_color == SK_ColorTRANSPARENT || use_default_color_for_testing_) + if (theme_color == SK_ColorTRANSPARENT || use_default_color_for_testing_) { return color_provider->GetColor(kColorFocusHighlightDefault); + } return theme_color; #endif @@ -195,17 +197,20 @@ display::Screen::GetScreen()->GetDisplayMatching(layer_bounds); ui::Compositor* compositor = root_layer->GetCompositor(); if (compositor != compositor_) { - if (compositor_ && compositor_->HasAnimationObserver(this)) + if (compositor_ && compositor_->HasAnimationObserver(this)) { compositor_->RemoveAnimationObserver(this); + } compositor_ = compositor; - if (compositor_ && !compositor_->HasAnimationObserver(this)) + if (compositor_ && !compositor_->HasAnimationObserver(this)) { compositor_->AddAnimationObserver(this); + } } } void AccessibilityFocusHighlight::RemoveLayer() { - if (no_fade_for_testing_) + if (no_fade_for_testing_) { return; + } layer_.reset(); if (compositor_) { @@ -244,15 +249,17 @@ // the active one. // TODO(crbug.com/40758630): Even if this BrowserView is active, it doesn't // necessarily own the node we're about to highlight. - if (!browser_view_->IsActive() && !skip_activation_check_for_testing_) + if (!browser_view_->IsActive() && !skip_activation_check_for_testing_) { return; + } // Get the bounds of the focused node from the web page. gfx::Rect node_bounds = details.node_bounds_in_screen; // This happens if e.g. we focus on <body>. Don't show a confusing highlight. - if (node_bounds.IsEmpty()) + if (node_bounds.IsEmpty()) { return; + } // Convert it to the local coordinates of this BrowserView's widget. node_bounds.Offset(-gfx::ToFlooredVector2d(browser_view_->GetWidget() @@ -328,8 +335,9 @@ base::TimeDelta time_since_focus_move) { float opacity = 1.0f; - if (no_fade_for_testing_) + if (no_fade_for_testing_) { return opacity; + } if (time_since_layer_create < fade_in_time_) { // We're fading in. @@ -347,14 +355,16 @@ } void AccessibilityFocusHighlight::OnAnimationStep(base::TimeTicks timestamp) { - if (!layer_) + if (!layer_) { return; + } // It's quite possible for the first 1 or 2 animation frames to be // for a timestamp that's earlier than the time we received the // focus change, so we just treat those as a delta of zero. - if (timestamp < layer_created_time_) + if (timestamp < layer_created_time_) { timestamp = layer_created_time_; + } // The time since the layer was created is used for fading in. base::TimeDelta time_since_layer_create = timestamp - layer_created_time_;
diff --git a/chrome/browser/ui/views/accessibility/accessibility_focus_highlight_browsertest.cc b/chrome/browser/ui/views/accessibility/accessibility_focus_highlight_browsertest.cc index 3df2a95..6ce6431 100644 --- a/chrome/browser/ui/views/accessibility/accessibility_focus_highlight_browsertest.cc +++ b/chrome/browser/ui/views/accessibility/accessibility_focus_highlight_browsertest.cc
@@ -73,8 +73,9 @@ int count = 0; for (int x = 0; x < bitmap.width(); ++x) { for (int y = 0; y < bitmap.height(); ++y) { - if (ColorsApproximatelyEqual(color, bitmap.getColor(x, y))) + if (ColorsApproximatelyEqual(color, bitmap.getColor(x, y))) { count++; + } } } return count * 100.0f / (bitmap.width() * bitmap.height());
diff --git a/chrome/browser/ui/views/accessibility/accessibility_util.cc b/chrome/browser/ui/views/accessibility/accessibility_util.cc index 4d2193c0..50b98e4 100644 --- a/chrome/browser/ui/views/accessibility/accessibility_util.cc +++ b/chrome/browser/ui/views/accessibility/accessibility_util.cc
@@ -12,8 +12,10 @@ void AnnounceInActiveBrowser(const std::u16string& message) { Browser* const browser = BrowserList::GetInstance()->GetLastActive(); - if (!browser || !browser->is_type_normal() || !browser->window()->IsActive()) + if (!browser || !browser->is_type_normal() || + !browser->window()->IsActive()) { return; + } BrowserView::GetBrowserViewForBrowser(browser) ->GetViewAccessibility()
diff --git a/chrome/browser/ui/views/accessibility/browser_accessibility_uitest_auralinux.cc b/chrome/browser/ui/views/accessibility/browser_accessibility_uitest_auralinux.cc index 243afed..4dda046 100644 --- a/chrome/browser/ui/views/accessibility/browser_accessibility_uitest_auralinux.cc +++ b/chrome/browser/ui/views/accessibility/browser_accessibility_uitest_auralinux.cc
@@ -123,8 +123,9 @@ static AtkObject* FindParentFrame(AtkObject* object) { while (object) { - if (atk_object_get_role(object) == ATK_ROLE_FRAME) + if (atk_object_get_role(object) == ATK_ROLE_FRAME) { return object; + } object = atk_object_get_parent(object); }
diff --git a/chrome/browser/ui/views/accessibility/caption_bubble_context_views.cc b/chrome/browser/ui/views/accessibility/caption_bubble_context_views.cc index caf18047..1b28568c8 100644 --- a/chrome/browser/ui/views/accessibility/caption_bubble_context_views.cc +++ b/chrome/browser/ui/views/accessibility/caption_bubble_context_views.cc
@@ -57,25 +57,30 @@ } void CaptionBubbleContextViews::Activate() { - if (!web_contents_) + if (!web_contents_) { return; + } // Activate the web contents and the browser window that the web contents is // in. Order matters: web contents needs to be active in order for the widget // getter to work. Browser* browser = chrome::FindBrowserWithTab(web_contents_); - if (!browser) + if (!browser) { return; + } TabStripModel* tab_strip_model = browser->tab_strip_model(); - if (!tab_strip_model) + if (!tab_strip_model) { return; + } int index = tab_strip_model->GetIndexOfWebContents(web_contents_); - if (index == TabStripModel::kNoTab) + if (index == TabStripModel::kNoTab) { return; + } tab_strip_model->ActivateTabAt(index); views::Widget* context_widget = views::Widget::GetTopLevelWidgetForNativeView( web_contents_->GetNativeView()); - if (context_widget) + if (context_widget) { context_widget->Activate(); + } } bool CaptionBubbleContextViews::IsActivatable() const { @@ -84,8 +89,9 @@ std::unique_ptr<CaptionBubbleSessionObserver> CaptionBubbleContextViews::GetCaptionBubbleSessionObserver() { - if (web_contents_observer_) + if (web_contents_observer_) { return std::move(web_contents_observer_); + } return nullptr; }
diff --git a/chrome/browser/ui/views/accessibility/caption_bubble_context_views.h b/chrome/browser/ui/views/accessibility/caption_bubble_context_views.h index 41cd438c..5c86777 100644 --- a/chrome/browser/ui/views/accessibility/caption_bubble_context_views.h +++ b/chrome/browser/ui/views/accessibility/caption_bubble_context_views.h
@@ -5,11 +5,10 @@ #ifndef CHROME_BROWSER_UI_VIEWS_ACCESSIBILITY_CAPTION_BUBBLE_CONTEXT_VIEWS_H_ #define CHROME_BROWSER_UI_VIEWS_ACCESSIBILITY_CAPTION_BUBBLE_CONTEXT_VIEWS_H_ -#include "chrome/browser/accessibility/caption_bubble_context_browser.h" - #include <string> #include "base/memory/raw_ptr.h" +#include "chrome/browser/accessibility/caption_bubble_context_browser.h" namespace content { class WebContents;
diff --git a/chrome/browser/ui/views/accessibility/caption_bubble_session_observer_views.cc b/chrome/browser/ui/views/accessibility/caption_bubble_session_observer_views.cc index bf53346..a36f2e5a 100644 --- a/chrome/browser/ui/views/accessibility/caption_bubble_session_observer_views.cc +++ b/chrome/browser/ui/views/accessibility/caption_bubble_session_observer_views.cc
@@ -37,8 +37,9 @@ } void CaptionBubbleSessionObserverViews::WebContentsDestroyed() { - if (end_session_callback_) + if (end_session_callback_) { end_session_callback_.Run(web_contents_id_); + } } void CaptionBubbleSessionObserverViews::SetEndSessionCallback(
diff --git a/chrome/browser/ui/views/accessibility/caption_bubble_session_observer_views.h b/chrome/browser/ui/views/accessibility/caption_bubble_session_observer_views.h index fe4584e..6896e3c 100644 --- a/chrome/browser/ui/views/accessibility/caption_bubble_session_observer_views.h +++ b/chrome/browser/ui/views/accessibility/caption_bubble_session_observer_views.h
@@ -6,7 +6,6 @@ #define CHROME_BROWSER_UI_VIEWS_ACCESSIBILITY_CAPTION_BUBBLE_SESSION_OBSERVER_VIEWS_H_ #include "components/live_caption/caption_bubble_session_observer.h" - #include "content/public/browser/web_contents_observer.h" namespace content {
diff --git a/chrome/browser/ui/views/accessibility/navigation_accessibility_uitest_win.cc b/chrome/browser/ui/views/accessibility/navigation_accessibility_uitest_win.cc index 505adcc..82e671cd 100644 --- a/chrome/browser/ui/views/accessibility/navigation_accessibility_uitest_win.cc +++ b/chrome/browser/ui/views/accessibility/navigation_accessibility_uitest_win.cc
@@ -61,14 +61,13 @@ DWORD event_thread, DWORD event_time); - static void CALLBACK WinEventHookThunk( - HWINEVENTHOOK handle, - DWORD event, - HWND hwnd, - LONG obj_id, - LONG child_id, - DWORD event_thread, - DWORD event_time); + static void CALLBACK WinEventHookThunk(HWINEVENTHOOK handle, + DWORD event, + HWND hwnd, + LONG obj_id, + LONG child_id, + DWORD event_thread, + DWORD event_time); struct EventInfo { DWORD event; @@ -86,17 +85,14 @@ // static WinAccessibilityEventMonitor* WinAccessibilityEventMonitor::instance_ = NULL; -WinAccessibilityEventMonitor::WinAccessibilityEventMonitor( - UINT event_min, UINT event_max) { +WinAccessibilityEventMonitor::WinAccessibilityEventMonitor(UINT event_min, + UINT event_max) { CHECK(!instance_) << "There can be only one instance of" << " WinAccessibilityEventMonitor at a time."; instance_ = this; win_event_hook_handle_ = SetWinEventHook( - event_min, - event_max, - NULL, - &WinAccessibilityEventMonitor::WinEventHookThunk, - GetCurrentProcessId(), + event_min, event_max, NULL, + &WinAccessibilityEventMonitor::WinEventHookThunk, GetCurrentProcessId(), 0, // Hook all threads WINEVENT_OUTOFCONTEXT); } @@ -106,12 +102,11 @@ instance_ = NULL; } -void WinAccessibilityEventMonitor::WaitForNextEvent( - DWORD* out_event, - HWND* out_hwnd, - UINT* out_role, - UINT* out_state, - std::string* out_name) { +void WinAccessibilityEventMonitor::WaitForNextEvent(DWORD* out_event, + HWND* out_hwnd, + UINT* out_role, + UINT* out_state, + std::string* out_name) { if (event_queue_.empty()) { loop_runner_ = new content::MessageLoopRunner(); loop_runner_->Run(); @@ -130,52 +125,55 @@ child_variant.Receive())); base::win::ScopedVariant role_variant; - if (S_OK == acc_obj->get_accRole(child_variant, role_variant.Receive())) + if (S_OK == acc_obj->get_accRole(child_variant, role_variant.Receive())) { *out_role = V_I4(role_variant.ptr()); - else + } else { *out_role = 0; + } base::win::ScopedVariant state_variant; - if (S_OK == acc_obj->get_accState(child_variant, state_variant.Receive())) + if (S_OK == acc_obj->get_accState(child_variant, state_variant.Receive())) { *out_state = V_I4(state_variant.ptr()); - else + } else { *out_state = 0; + } base::win::ScopedBstr name_bstr; HRESULT hr = acc_obj->get_accName(child_variant, name_bstr.Receive()); - if (S_OK == hr) + if (S_OK == hr) { *out_name = base::WideToUTF8(name_bstr.Get()); - else + } else { *out_name = ""; + } } -void WinAccessibilityEventMonitor::OnWinEventHook( - HWINEVENTHOOK handle, - DWORD event, - HWND hwnd, - LONG obj_id, - LONG child_id, - DWORD event_thread, - DWORD event_time) { +void WinAccessibilityEventMonitor::OnWinEventHook(HWINEVENTHOOK handle, + DWORD event, + HWND hwnd, + LONG obj_id, + LONG child_id, + DWORD event_thread, + DWORD event_time) { EventInfo event_info; event_info.event = event; event_info.hwnd = hwnd; event_info.obj_id = obj_id; event_info.child_id = child_id; event_queue_.push_back(event_info); - if (loop_runner_.get()) + if (loop_runner_.get()) { loop_runner_->Quit(); + } } // static -void CALLBACK WinAccessibilityEventMonitor::WinEventHookThunk( - HWINEVENTHOOK handle, - DWORD event, - HWND hwnd, - LONG obj_id, - LONG child_id, - DWORD event_thread, - DWORD event_time) { +void CALLBACK +WinAccessibilityEventMonitor::WinEventHookThunk(HWINEVENTHOOK handle, + DWORD event, + HWND hwnd, + LONG obj_id, + LONG child_id, + DWORD event_thread, + DWORD event_time) { if (instance_) { instance_->OnWinEventHook(handle, event, hwnd, obj_id, child_id, event_thread, event_time); @@ -198,10 +196,8 @@ void SendKeyPress(ui::KeyboardCode key) { gfx::NativeWindow native_window = browser()->window()->GetNativeWindow(); - ASSERT_NO_FATAL_FAILURE( - ASSERT_TRUE( - ui_test_utils::SendKeyPressToWindowSync( - native_window, key, false, false, false, false))); + ASSERT_NO_FATAL_FAILURE(ASSERT_TRUE(ui_test_utils::SendKeyPressToWindowSync( + native_window, key, false, false, false, false))); } private: @@ -226,10 +222,11 @@ GURL main_url(embedded_test_server()->GetURL("/english_page.html")); OmniboxViewViews* omnibox_view = - BrowserView::GetBrowserViewForBrowser(browser())-> - toolbar()->location_bar()->omnibox_view(); - omnibox_view->SetUserText(base::UTF8ToUTF16(main_url.spec()), - false); + BrowserView::GetBrowserViewForBrowser(browser()) + ->toolbar() + ->location_bar() + ->omnibox_view(); + omnibox_view->SetUserText(base::UTF8ToUTF16(main_url.spec()), false); WinAccessibilityEventMonitor monitor(EVENT_OBJECT_FOCUS, EVENT_OBJECT_FOCUS); SendKeyPress(ui::VKEY_RETURN); @@ -242,12 +239,8 @@ std::string name; monitor.WaitForNextEvent(&event, &hwnd, &role, &state, &name); - LOG(INFO) << "Got event: " - << " event=" << event - << " hwnd=" << hwnd - << " role=" << role - << " state=" << state - << " name=" << name; + LOG(INFO) << "Got event: " << " event=" << event << " hwnd=" << hwnd + << " role=" << role << " state=" << state << " name=" << name; // We should get only focus events. EXPECT_EQ(static_cast<DWORD>(EVENT_OBJECT_FOCUS), event);
diff --git a/chrome/browser/ui/views/accessibility/non_accessible_image_view.h b/chrome/browser/ui/views/accessibility/non_accessible_image_view.h index fd1d9970..62c6844a 100644 --- a/chrome/browser/ui/views/accessibility/non_accessible_image_view.h +++ b/chrome/browser/ui/views/accessibility/non_accessible_image_view.h
@@ -18,7 +18,6 @@ NonAccessibleImageView(const NonAccessibleImageView&) = delete; NonAccessibleImageView& operator=(const NonAccessibleImageView&) = delete; ~NonAccessibleImageView() override; - }; #endif // CHROME_BROWSER_UI_VIEWS_ACCESSIBILITY_NON_ACCESSIBLE_IMAGE_VIEW_H_
diff --git a/chrome/browser/ui/views/accessibility/theme_tracking_non_accessible_image_view.h b/chrome/browser/ui/views/accessibility/theme_tracking_non_accessible_image_view.h index 7ad5c37..e9887666 100644 --- a/chrome/browser/ui/views/accessibility/theme_tracking_non_accessible_image_view.h +++ b/chrome/browser/ui/views/accessibility/theme_tracking_non_accessible_image_view.h
@@ -35,7 +35,6 @@ ThemeTrackingNonAccessibleImageView& operator=( const ThemeTrackingNonAccessibleImageView&) = delete; ~ThemeTrackingNonAccessibleImageView() override; - }; #endif // CHROME_BROWSER_UI_VIEWS_ACCESSIBILITY_THEME_TRACKING_NON_ACCESSIBLE_IMAGE_VIEW_H_
diff --git a/chrome/browser/ui/views/apps/app_dialog/app_dialog_view_browsertest.cc b/chrome/browser/ui/views/apps/app_dialog/app_dialog_view_browsertest.cc index 37ac85a..036be6f 100644 --- a/chrome/browser/ui/views/apps/app_dialog/app_dialog_view_browsertest.cc +++ b/chrome/browser/ui/views/apps/app_dialog/app_dialog_view_browsertest.cc
@@ -159,10 +159,11 @@ EXPECT_TRUE(state_is_set); } else { - if (name == "pause_close") + if (name == "pause_close") { ActiveView(name)->Close(); - else + } else { ActiveView(name)->AcceptDialog(); + } } }
diff --git a/chrome/browser/ui/views/apps/app_dialog/app_pause_dialog_view.cc b/chrome/browser/ui/views/apps/app_dialog/app_pause_dialog_view.cc index 1b0164b..b3a0242 100644 --- a/chrome/browser/ui/views/apps/app_dialog/app_pause_dialog_view.cc +++ b/chrome/browser/ui/views/apps/app_dialog/app_pause_dialog_view.cc
@@ -64,8 +64,9 @@ AppPauseDialogView::~AppPauseDialogView() { g_app_pause_dialog_view = nullptr; - if (closed_callback_) + if (closed_callback_) { std::move(closed_callback_).Run(); + } } // static
diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_container.h b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_container.h index 9e1a7d0..e61c70d 100644 --- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_container.h +++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_container.h
@@ -13,7 +13,7 @@ namespace views { class DialogDelegateView; class View; -} +} // namespace views // Creates a new native dialog of the given |size| containing |view| with a // close button and draggable titlebar.
diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views_unittest.cc b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views_unittest.cc index e8cc4ef..1425d78 100644 --- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views_unittest.cc +++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views_unittest.cc
@@ -175,8 +175,9 @@ } void CloseAppInfo() { - if (widget_) + if (widget_) { widget_->CloseNow(); + } base::RunLoop().RunUntilIdle(); DCHECK(!widget_); }
diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel_unittest.cc b/chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel_unittest.cc index d379b3e..7a5075b 100644 --- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel_unittest.cc +++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel_unittest.cc
@@ -93,8 +93,7 @@ EXPECT_TRUE(VerifyTwoPermissionMessages( panel.app_->permissions_data(), l10n_util::GetStringUTF8(IDS_EXTENSION_PROMPT_WARNING_DESKTOP_CAPTURE), - l10n_util::GetStringUTF8(IDS_EXTENSION_PROMPT_WARNING_SERIAL), - false)); + l10n_util::GetStringUTF8(IDS_EXTENSION_PROMPT_WARNING_SERIAL), false)); } // Tests that an app's optional permissions are detected and converted to
diff --git a/chrome/browser/ui/views/apps/app_window_desktop_window_tree_host_win.cc b/chrome/browser/ui/views/apps/app_window_desktop_window_tree_host_win.cc index a38f1ea..0c1b0a5f 100644 --- a/chrome/browser/ui/views/apps/app_window_desktop_window_tree_host_win.cc +++ b/chrome/browser/ui/views/apps/app_window_desktop_window_tree_host_win.cc
@@ -20,8 +20,7 @@ views::DesktopNativeWidgetAura* desktop_native_widget_aura) : DesktopWindowTreeHostWin(app_window->widget(), desktop_native_widget_aura), - app_window_(app_window) { -} + app_window_(app_window) {} AppWindowDesktopWindowTreeHostWin::~AppWindowDesktopWindowTreeHostWin() = default;
diff --git a/chrome/browser/ui/views/apps/app_window_easy_resize_window_targeter.cc b/chrome/browser/ui/views/apps/app_window_easy_resize_window_targeter.cc index 9b4f764f..d2dd14c 100644 --- a/chrome/browser/ui/views/apps/app_window_easy_resize_window_targeter.cc +++ b/chrome/browser/ui/views/apps/app_window_easy_resize_window_targeter.cc
@@ -24,8 +24,9 @@ // window. Since maximized and fullscreen windows can't be resized anyway, // skip EasyResizeWindowTargeter so that the web contents receive all mouse // events. - if (native_app_window_->IsMaximized() || native_app_window_->IsFullscreen()) + if (native_app_window_->IsMaximized() || native_app_window_->IsFullscreen()) { return WindowTargeter::GetHitTestRects(window, rect_mouse, rect_touch); + } return EasyResizeWindowTargeter::GetHitTestRects(window, rect_mouse, rect_touch);
diff --git a/chrome/browser/ui/views/apps/app_window_native_widget_mac.mm b/chrome/browser/ui/views/apps/app_window_native_widget_mac.mm index e6081f5..29b28cea 100644 --- a/chrome/browser/ui/views/apps/app_window_native_widget_mac.mm +++ b/chrome/browser/ui/views/apps/app_window_native_widget_mac.mm
@@ -15,8 +15,7 @@ AppWindowNativeWidgetMac::AppWindowNativeWidgetMac( views::Widget* widget, extensions::NativeAppWindow* native_app_window) - : NativeWidgetMac(widget), native_app_window_(native_app_window) { -} + : NativeWidgetMac(widget), native_app_window_(native_app_window) {} AppWindowNativeWidgetMac::~AppWindowNativeWidgetMac() = default;
diff --git a/chrome/browser/ui/views/apps/chrome_app_window_client_views_aura.cc b/chrome/browser/ui/views/apps/chrome_app_window_client_views_aura.cc index 83cada1..e03bc30 100644 --- a/chrome/browser/ui/views/apps/chrome_app_window_client_views_aura.cc +++ b/chrome/browser/ui/views/apps/chrome_app_window_client_views_aura.cc
@@ -2,10 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/apps/chrome_app_window_client.h" - #include <memory> +#include "chrome/browser/ui/apps/chrome_app_window_client.h" #include "chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.h" // static
diff --git a/chrome/browser/ui/views/apps/chrome_app_window_client_views_chromeos.cc b/chrome/browser/ui/views/apps/chrome_app_window_client_views_chromeos.cc index 7c394a4..e7083d4c 100644 --- a/chrome/browser/ui/views/apps/chrome_app_window_client_views_chromeos.cc +++ b/chrome/browser/ui/views/apps/chrome_app_window_client_views_chromeos.cc
@@ -3,7 +3,6 @@ // found in the LICENSE file. #include "chrome/browser/ui/apps/chrome_app_window_client.h" - #include "chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.h" // static
diff --git a/chrome/browser/ui/views/apps/chrome_app_window_client_views_mac.mm b/chrome/browser/ui/views/apps/chrome_app_window_client_views_mac.mm index 7944bb3..ee65eef 100644 --- a/chrome/browser/ui/views/apps/chrome_app_window_client_views_mac.mm +++ b/chrome/browser/ui/views/apps/chrome_app_window_client_views_mac.mm
@@ -3,7 +3,6 @@ // found in the LICENSE file. #include "chrome/browser/ui/apps/chrome_app_window_client.h" - #include "chrome/browser/ui/views/apps/chrome_native_app_window_views_mac.h" // static
diff --git a/chrome/browser/ui/views/apps/chrome_app_window_client_views_win.cc b/chrome/browser/ui/views/apps/chrome_app_window_client_views_win.cc index 7307786..9081e13 100644 --- a/chrome/browser/ui/views/apps/chrome_app_window_client_views_win.cc +++ b/chrome/browser/ui/views/apps/chrome_app_window_client_views_win.cc
@@ -3,7 +3,6 @@ // found in the LICENSE file. #include "chrome/browser/ui/apps/chrome_app_window_client.h" - #include "chrome/browser/ui/views/apps/chrome_native_app_window_views_win.h" // static
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc index 4df2d102..bf24ab5d 100644 --- a/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc +++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc
@@ -108,8 +108,7 @@ void ChromeNativeAppWindowViews::OnBeforeWidgetInit( const AppWindow::CreateParams& create_params, views::Widget::InitParams* init_params, - views::Widget* widget) { -} + views::Widget* widget) {} void ChromeNativeAppWindowViews::InitializeDefaultWindow( const AppWindow::CreateParams& create_params) { @@ -126,11 +125,13 @@ // transparency and has no standard frame, don't show a shadow for it. // TODO(skuhne): If we run into an application which should have a shadow // but does not have, a new attribute has to be added. - if (IsFrameless()) + if (IsFrameless()) { init_params.shadow_type = views::Widget::InitParams::ShadowType::kNone; + } } - if (create_params.always_on_top) + if (create_params.always_on_top) { init_params.z_order = ui::ZOrderLevel::kFloatingWindow; + } init_params.visible_on_all_workspaces = create_params.visible_on_all_workspaces; @@ -170,8 +171,9 @@ } #if BUILDFLAG(IS_CHROMEOS) - if (create_params.is_ime_window) + if (create_params.is_ime_window) { return; + } #endif // Register accelarators supported by app windows. @@ -225,10 +227,12 @@ ui::mojom::WindowShowState ChromeNativeAppWindowViews::GetRestoredState() const { - if (IsMaximized()) + if (IsMaximized()) { return ui::mojom::WindowShowState::kMaximized; - if (IsFullscreen()) + } + if (IsFullscreen()) { return ui::mojom::WindowShowState::kFullscreen; + } return ui::mojom::WindowShowState::kNormal; } @@ -266,8 +270,9 @@ base_image.AsImageSkia(), GetAppIconImage().AsImageSkia())); } - if (!custom_image.IsEmpty()) + if (!custom_image.IsEmpty()) { return ui::ImageModel::FromImage(custom_image); + } EnsureAppIconCreated(); return ui::ImageModel::FromImage(GetAppIconImage()); } @@ -285,8 +290,8 @@ std::unique_ptr<views::NonClientFrameView> ChromeNativeAppWindowViews::CreateNonClientFrameView(views::Widget* widget) { - return (IsFrameless() || has_frame_color_) ? - CreateNonStandardAppFrame() : CreateStandardDesktopAppFrame(); + return (IsFrameless() || has_frame_color_) ? CreateNonStandardAppFrame() + : CreateStandardDesktopAppFrame(); } bool ChromeNativeAppWindowViews::WidgetHasHitTestMask() const { @@ -360,8 +365,9 @@ std::unique_ptr<SkRegion> region; if (shape_rects_) { region = std::make_unique<SkRegion>(); - for (const gfx::Rect& input_rect : *shape_rects_) + for (const gfx::Rect& input_rect : *shape_rects_) { region->op(gfx::RectToSkIRect(input_rect), SkRegion::kUnion_Op); + } } shape_ = std::move(region); OnWidgetHasHitTestMaskChanged(); @@ -409,8 +415,9 @@ } void ChromeNativeAppWindowViews::EnsureAppIconCreated() { - if (app_icon_ && app_icon_->IsValid()) + if (app_icon_ && app_icon_->IsValid()) { return; + } // To avoid recursive call, reset the smart pointer. It will be checked in // OnIconUpdated to determine if this is a real update or the initial callback @@ -424,8 +431,9 @@ void ChromeNativeAppWindowViews::OnIconUpdated( extensions::ChromeAppIcon* icon) { - if (!app_icon_) + if (!app_icon_) { return; + } DCHECK_EQ(app_icon_.get(), icon); UpdateWindowIcon(); }
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc index 60c1a8d..dc3a54ce 100644 --- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc +++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc
@@ -87,8 +87,9 @@ ui::mojom::WindowShowState ChromeNativeAppWindowViewsAura::GetRestoredState() const { // First normal states are checked. - if (IsMaximized()) + if (IsMaximized()) { return ui::mojom::WindowShowState::kMaximized; + } if (IsFullscreen()) { return ui::mojom::WindowShowState::kFullscreen; }
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc index 8bf5470..79b0c2c 100644 --- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc +++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc
@@ -246,8 +246,9 @@ ui::ImageModel ChromeNativeAppWindowViewsAuraAsh::GetWindowIcon() { TRACE_EVENT0("ui", "ChromeNativeAppWindowViewsAuraAsh::GetWindowIcon"); const ui::ImageModel& image = ChromeNativeAppWindowViews::GetWindowIcon(); - if (image.IsEmpty()) + if (image.IsEmpty()) { return ui::ImageModel(); + } DCHECK(image.IsImage()); const gfx::ImageSkia image_skia = image.Rasterize(nullptr); @@ -256,8 +257,9 @@ } bool ChromeNativeAppWindowViewsAuraAsh::ShouldRemoveStandardFrame() { - if (IsFrameless()) + if (IsFrameless()) { return true; + } return HasFrameColor(); } @@ -280,8 +282,9 @@ gfx::Rect ChromeNativeAppWindowViewsAuraAsh::GetRestoredBounds() const { gfx::Rect* bounds = GetNativeWindow()->GetProperty(ash::kRestoreBoundsOverrideKey); - if (bounds && !bounds->IsEmpty()) + if (bounds && !bounds->IsEmpty()) { return *bounds; + } return ChromeNativeAppWindowViewsAura::GetRestoredBounds(); } @@ -301,8 +304,9 @@ ash::kRestoreWindowStateTypeOverrideKey)); is_fullscreen = restore_state == ui::mojom::WindowShowState::kFullscreen; } else { - if (IsMaximized()) + if (IsMaximized()) { return ui::mojom::WindowShowState::kMaximized; + } is_fullscreen = IsFullscreen(); } @@ -330,8 +334,9 @@ const gfx::Point& p, ui::mojom::MenuSourceType source_type) { menu_model_ = CreateMultiUserContextMenu(GetNativeWindow()); - if (!menu_model_) + if (!menu_model_) { return; + } // Only show context menu if point is in caption. gfx::Point point_in_view_coords(p); @@ -358,8 +363,9 @@ std::unique_ptr<views::NonClientFrameView> ChromeNativeAppWindowViewsAuraAsh::CreateNonClientFrameView( views::Widget* widget) { - if (IsFrameless()) + if (IsFrameless()) { return CreateNonStandardAppFrame(); + } window_state_observation_.Observe(ash::WindowState::Get(GetNativeWindow())); @@ -372,8 +378,7 @@ UpdateImmersiveMode(); if (HasFrameColor()) { - custom_frame_view->SetFrameColors(ActiveFrameColor(), - InactiveFrameColor()); + custom_frame_view->SetFrameColors(ActiveFrameColor(), InactiveFrameColor()); } return custom_frame_view; @@ -502,8 +507,9 @@ } void ChromeNativeAppWindowViewsAuraAsh::OnExclusiveAccessUserInput() { - if (exclusive_access_bubble_) + if (exclusive_access_bubble_) { exclusive_access_bubble_->OnUserInput(); + } } content::WebContents* @@ -578,10 +584,11 @@ // WindowState saves restore bounds *after* changing the property, and // enabling immersive mode will change the current bounds before the old // bounds can be saved. - if (window_state->IsFullscreen()) + if (window_state->IsFullscreen()) { app_window()->OSFullscreen(); - else + } else { app_window()->OnNativeWindowChanged(); + } } } @@ -589,8 +596,9 @@ aura::Window* window, const void* key, intptr_t old) { - if (key != aura::client::kShowStateKey) + if (key != aura::client::kShowStateKey) { return; + } auto new_state = window->GetProperty(aura::client::kShowStateKey); @@ -628,12 +636,14 @@ bool ChromeNativeAppWindowViewsAuraAsh::ShouldEnableImmersiveMode() const { // No immersive mode for forced fullscreen or frameless windows. - if (app_window()->IsForcedFullscreen() || IsFrameless()) + if (app_window()->IsForcedFullscreen() || IsFrameless()) { return false; + } // Always use immersive mode when fullscreen is set by the OS. - if (app_window()->IsOsFullscreen()) + if (app_window()->IsOsFullscreen()) { return true; + } // Windows in tablet mode which are resizable have their title bars // hidden in ash for more size, so enable immersive mode so users @@ -663,8 +673,9 @@ gfx::Image ChromeNativeAppWindowViewsAuraAsh::GetAppIconImage() { TRACE_EVENT0("ui", "ChromeNativeAppWindowViewsAuraAsh::GetAppIconImage"); - if (!app_icon_image_skia_.isNull()) + if (!app_icon_image_skia_.isNull()) { return gfx::Image(app_icon_image_skia_); + } return ChromeNativeAppWindowViews::GetAppIconImage(); } @@ -698,11 +709,13 @@ void ChromeNativeAppWindowViewsAuraAsh::OnLoadIcon( apps::IconValuePtr icon_value) { TRACE_EVENT0("ui", "ChromeNativeAppWindowViewsAuraAsh::OnLoadIcon"); - if (!icon_value || icon_value->icon_type != apps::IconType::kStandard) + if (!icon_value || icon_value->icon_type != apps::IconType::kStandard) { return; + } app_icon_image_skia_ = icon_value->uncompressed; - if (icon_value->is_placeholder_icon) + if (icon_value->is_placeholder_icon) { LoadAppIcon(false /* allow_placeholder_icon */); + } }
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.h b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.h index 22c7a82a..ef868f1 100644 --- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.h +++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.h
@@ -32,7 +32,7 @@ namespace gfx { class ImageSkia; class RoundedCornersF; -} +} // namespace gfx namespace ui { class MenuModel;
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash_browsertest.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash_browsertest.cc index 69a5684..c670a8c 100644 --- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash_browsertest.cc +++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash_browsertest.cc
@@ -44,8 +44,9 @@ ViewBoundsChangeWaiter& operator=(const ViewBoundsChangeWaiter&) = delete; static void VerifyY(views::View* view, int y) { - if (y != view->bounds().y()) + if (y != view->bounds().y()) { ViewBoundsChangeWaiter(view).run_loop_.Run(); + } EXPECT_EQ(y, view->bounds().y()); }
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_mac.mm b/chrome/browser/ui/views/apps/chrome_native_app_window_views_mac.mm index f691eac..782b95d5 100644 --- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_mac.mm +++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_mac.mm
@@ -86,8 +86,9 @@ bool NSWindowIsMaximized(NSWindow* window) { // -[NSWindow isZoomed] only works if the zoom button is enabled. - if ([[window standardWindowButton:NSWindowZoomButton] isEnabled]) + if ([[window standardWindowButton:NSWindowZoomButton] isEnabled]) { return [window isZoomed]; + } // We don't attempt to distinguish between a window that has been explicitly // maximized versus one that has just been dragged by the user to fill the @@ -145,28 +146,33 @@ } gfx::Rect ChromeNativeAppWindowViewsMac::GetRestoredBounds() const { - if (NSWindowIsMaximized(GetNativeWindow().GetNativeNSWindow())) + if (NSWindowIsMaximized(GetNativeWindow().GetNativeNSWindow())) { return gfx::ScreenRectFromNSRect(bounds_before_maximize_); + } return ChromeNativeAppWindowViews::GetRestoredBounds(); } void ChromeNativeAppWindowViewsMac::Maximize() { - if (IsFullscreen()) + if (IsFullscreen()) { return; + } NSWindow* window = GetNativeWindow().GetNativeNSWindow(); - if (!NSWindowIsMaximized(window)) + if (!NSWindowIsMaximized(window)) { [window setFrame:[[window screen] visibleFrame] display:YES animate:YES]; + } - if (IsMinimized()) + if (IsMinimized()) { [window deminiaturize:nil]; + } } void ChromeNativeAppWindowViewsMac::Restore() { NSWindow* window = GetNativeWindow().GetNativeNSWindow(); - if (NSWindowIsMaximized(window)) + if (NSWindowIsMaximized(window)) { [window setFrame:bounds_before_maximize_ display:YES animate:YES]; + } ChromeNativeAppWindowViews::Restore(); } @@ -176,8 +182,9 @@ Profile::FromBrowserContext(app_window()->browser_context()); AppShimHost* shim_host = apps::AppShimManager::Get()->FindHost( profile, app_window()->extension_id()); - if (!shim_host) + if (!shim_host) { return; + } shim_host->GetAppShim()->SetUserAttention( flash ? chrome::mojom::AppShimAttentionType::kCritical : chrome::mojom::AppShimAttentionType::kCancel);
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc index 4db5703..146b1e2 100644 --- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc +++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc
@@ -57,8 +57,9 @@ ChromeNativeAppWindowViewsAura::InitializeDefaultWindow(create_params); const extensions::Extension* extension = app_window()->GetExtension(); - if (!extension) + if (!extension) { return; + } std::string app_name = web_app::GenerateApplicationNameFromAppId(extension->id()); @@ -71,8 +72,9 @@ ui::win::SetAppIdForWindow(app_model_id_, hwnd); web_app::UpdateRelaunchDetailsForApp(profile, extension, hwnd); - if (!create_params.alpha_enabled) + if (!create_params.alpha_enabled) { EnsureCaptionStyleSet(); + } } std::unique_ptr<views::NonClientFrameView>
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.h b/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.h index f35610de..6530290 100644 --- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.h +++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.h
@@ -29,8 +29,7 @@ AppWindowFrameViewWin* frame_view() { return frame_view_; } private: - void OnShortcutInfoLoaded( - const web_app::ShortcutInfo& shortcut_info); + void OnShortcutInfoLoaded(const web_app::ShortcutInfo& shortcut_info); HWND GetNativeAppWindowHWND() const; void EnsureCaptionStyleSet();
diff --git a/chrome/browser/ui/views/apps/native_app_window_frame_view_mac.mm b/chrome/browser/ui/views/apps/native_app_window_frame_view_mac.mm index fd21dfb..d707c370 100644 --- a/chrome/browser/ui/views/apps/native_app_window_frame_view_mac.mm +++ b/chrome/browser/ui/views/apps/native_app_window_frame_view_mac.mm
@@ -20,17 +20,20 @@ NativeAppWindowFrameViewMac::~NativeAppWindowFrameViewMac() = default; int NativeAppWindowFrameViewMac::NonClientHitTest(const gfx::Point& point) { - if (!bounds().Contains(point)) + if (!bounds().Contains(point)) { return HTNOWHERE; + } - if (GetWidget()->IsFullscreen()) + if (GetWidget()->IsFullscreen()) { return HTCLIENT; + } // Check for possible draggable region in the client area for the frameless // window. SkRegion* draggable_region = native_app_window_->GetDraggableRegion(); - if (draggable_region && draggable_region->contains(point.x(), point.y())) + if (draggable_region && draggable_region->contains(point.x(), point.y())) { return HTCAPTION; + } return HTCLIENT; }
diff --git a/chrome/browser/ui/views/apps/shaped_app_window_targeter.cc b/chrome/browser/ui/views/apps/shaped_app_window_targeter.cc index c5fed7d..d72c2250 100644 --- a/chrome/browser/ui/views/apps/shaped_app_window_targeter.cc +++ b/chrome/browser/ui/views/apps/shaped_app_window_targeter.cc
@@ -16,8 +16,9 @@ std::unique_ptr<aura::WindowTargeter::HitTestRects> ShapedAppWindowTargeter::GetExtraHitTestShapeRects(aura::Window* target) const { - if (!app_window_->shape_rects()) + if (!app_window_->shape_rects()) { return nullptr; + } auto shape_rects = std::make_unique<aura::WindowTargeter::HitTestRects>( *app_window_->shape_rects());
diff --git a/chrome/browser/ui/views/autofill/address_bubbles_icon_view.cc b/chrome/browser/ui/views/autofill/address_bubbles_icon_view.cc index e1d102e..06ba57d 100644 --- a/chrome/browser/ui/views/autofill/address_bubbles_icon_view.cc +++ b/chrome/browser/ui/views/autofill/address_bubbles_icon_view.cc
@@ -35,8 +35,7 @@ AddressBubblesIconView::~AddressBubblesIconView() = default; -views::BubbleDialogDelegate* AddressBubblesIconView::GetBubble() - const { +views::BubbleDialogDelegate* AddressBubblesIconView::GetBubble() const { AddressBubblesIconController* controller = GetController(); if (!controller) { return nullptr; @@ -62,8 +61,8 @@ UpdateTooltipText(); } -std::u16string -AddressBubblesIconView::GetTextForTooltipAndAccessibleName() const { +std::u16string AddressBubblesIconView::GetTextForTooltipAndAccessibleName() + const { AddressBubblesIconController* controller = GetController(); if (!controller) { // If the controller is nullptr, the tab has been closed already, and the @@ -82,8 +81,7 @@ return vector_icons::kLocationOnChromeRefreshIcon; } -AddressBubblesIconController* -AddressBubblesIconView::GetController() const { +AddressBubblesIconController* AddressBubblesIconView::GetController() const { return AddressBubblesIconController::Get(GetWebContents()); }
diff --git a/chrome/browser/ui/views/autofill/address_bubbles_icon_view.h b/chrome/browser/ui/views/autofill/address_bubbles_icon_view.h index 0937b9b..c2418e3 100644 --- a/chrome/browser/ui/views/autofill/address_bubbles_icon_view.h +++ b/chrome/browser/ui/views/autofill/address_bubbles_icon_view.h
@@ -23,10 +23,8 @@ CommandUpdater* command_updater, IconLabelBubbleView::Delegate* icon_label_bubble_delegate, PageActionIconView::Delegate* page_action_icon_delegate); - AddressBubblesIconView(const AddressBubblesIconView&) = - delete; - AddressBubblesIconView& operator=( - const AddressBubblesIconView&) = delete; + AddressBubblesIconView(const AddressBubblesIconView&) = delete; + AddressBubblesIconView& operator=(const AddressBubblesIconView&) = delete; ~AddressBubblesIconView() override; // PageActionIconView:
diff --git a/chrome/browser/ui/views/autofill/payments/autofill_error_dialog_view_native_views.cc b/chrome/browser/ui/views/autofill/payments/autofill_error_dialog_view_native_views.cc index 06910753..78bd7496 100644 --- a/chrome/browser/ui/views/autofill/payments/autofill_error_dialog_view_native_views.cc +++ b/chrome/browser/ui/views/autofill/payments/autofill_error_dialog_view_native_views.cc
@@ -58,8 +58,9 @@ } views::View* AutofillErrorDialogViewNativeViews::GetContentsView() { - if (!children().empty()) + if (!children().empty()) { return this; + } auto* layout = SetLayoutManager(std::make_unique<views::BoxLayout>( views::BoxLayout::Orientation::kHorizontal, gfx::Insets(),
diff --git a/chrome/browser/ui/views/autofill/payments/autofill_error_dialog_view_native_views_browsertest.cc b/chrome/browser/ui/views/autofill/payments/autofill_error_dialog_view_native_views_browsertest.cc index e35cc0f..6ce20e79 100644 --- a/chrome/browser/ui/views/autofill/payments/autofill_error_dialog_view_native_views_browsertest.cc +++ b/chrome/browser/ui/views/autofill/payments/autofill_error_dialog_view_native_views_browsertest.cc
@@ -61,10 +61,9 @@ autofill_error_dialog_controller_ = std::make_unique<AutofillErrorDialogControllerImpl>( autofill_error_dialog_context); - autofill_error_dialog_controller_->Show( - base::BindOnce(&CreateAndShowAutofillErrorDialog, - base::Unretained(controller()), - base::Unretained(contents()))); + autofill_error_dialog_controller_->Show(base::BindOnce( + &CreateAndShowAutofillErrorDialog, base::Unretained(controller()), + base::Unretained(contents()))); } AutofillErrorDialogViewNativeViews* GetDialogViews() { @@ -74,8 +73,9 @@ base::WeakPtr<AutofillErrorDialogView> dialog_view = autofill_error_dialog_controller_->autofill_error_dialog_view(); - if (!dialog_view) + if (!dialog_view) { return nullptr; + } return static_cast<AutofillErrorDialogViewNativeViews*>(dialog_view.get()); }
diff --git a/chrome/browser/ui/views/autofill/payments/autofill_progress_dialog_views_browsertest.cc b/chrome/browser/ui/views/autofill/payments/autofill_progress_dialog_views_browsertest.cc index 9340174..29d554c 100644 --- a/chrome/browser/ui/views/autofill/payments/autofill_progress_dialog_views_browsertest.cc +++ b/chrome/browser/ui/views/autofill/payments/autofill_progress_dialog_views_browsertest.cc
@@ -63,8 +63,9 @@ base::WeakPtr<AutofillProgressDialogView> dialog_view = controller()->autofill_progress_dialog_view(); - if (!dialog_view) + if (!dialog_view) { return nullptr; + } return static_cast<AutofillProgressDialogViews*>(dialog_view.get()); }
diff --git a/chrome/browser/ui/views/autofill/payments/card_unmask_authentication_selection_dialog_browsertest.cc b/chrome/browser/ui/views/autofill/payments/card_unmask_authentication_selection_dialog_browsertest.cc index 41ca666..d5360919 100644 --- a/chrome/browser/ui/views/autofill/payments/card_unmask_authentication_selection_dialog_browsertest.cc +++ b/chrome/browser/ui/views/autofill/payments/card_unmask_authentication_selection_dialog_browsertest.cc
@@ -42,13 +42,15 @@ } CardUnmaskAuthenticationSelectionDialogView* GetDialog() { - if (!controller()) + if (!controller()) { return nullptr; + } CardUnmaskAuthenticationSelectionDialog* dialog_view = controller()->GetDialogViewForTesting(); - if (!dialog_view) + if (!dialog_view) { return nullptr; + } return static_cast<CardUnmaskAuthenticationSelectionDialogView*>( dialog_view);
diff --git a/chrome/browser/ui/views/autofill/payments/card_unmask_otp_input_dialog_browsertest.cc b/chrome/browser/ui/views/autofill/payments/card_unmask_otp_input_dialog_browsertest.cc index 764fd1a..07eacbc 100644 --- a/chrome/browser/ui/views/autofill/payments/card_unmask_otp_input_dialog_browsertest.cc +++ b/chrome/browser/ui/views/autofill/payments/card_unmask_otp_input_dialog_browsertest.cc
@@ -49,8 +49,9 @@ base::WeakPtr<CardUnmaskOtpInputDialogView> dialog_view = controller_->GetDialogViewForTesting(); - if (!dialog_view) + if (!dialog_view) { return nullptr; + } return static_cast<CardUnmaskOtpInputDialogViews*>(dialog_view.get()); }
diff --git a/chrome/browser/ui/views/autofill/payments/card_unmask_otp_input_dialog_views.cc b/chrome/browser/ui/views/autofill/payments/card_unmask_otp_input_dialog_views.cc index 4086d718..7a6ef9ae 100644 --- a/chrome/browser/ui/views/autofill/payments/card_unmask_otp_input_dialog_views.cc +++ b/chrome/browser/ui/views/autofill/payments/card_unmask_otp_input_dialog_views.cc
@@ -134,8 +134,9 @@ void CardUnmaskOtpInputDialogViews::ContentsChanged( views::Textfield* sender, const std::u16string& new_contents) { - if (otp_input_textfield_->GetInvalid()) + if (otp_input_textfield_->GetInvalid()) { HideInvalidState(); + } SetButtonEnabled( ui::mojom::DialogButton::kOk,
diff --git a/chrome/browser/ui/views/autofill/payments/card_unmask_otp_input_dialog_views.h b/chrome/browser/ui/views/autofill/payments/card_unmask_otp_input_dialog_views.h index e2b192f..3e1225b 100644 --- a/chrome/browser/ui/views/autofill/payments/card_unmask_otp_input_dialog_views.h +++ b/chrome/browser/ui/views/autofill/payments/card_unmask_otp_input_dialog_views.h
@@ -5,12 +5,11 @@ #ifndef CHROME_BROWSER_UI_VIEWS_AUTOFILL_PAYMENTS_CARD_UNMASK_OTP_INPUT_DIALOG_VIEWS_H_ #define CHROME_BROWSER_UI_VIEWS_AUTOFILL_PAYMENTS_CARD_UNMASK_OTP_INPUT_DIALOG_VIEWS_H_ -#include "components/autofill/core/browser/ui/payments/card_unmask_otp_input_dialog_view.h" - #include <string> #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" +#include "components/autofill/core/browser/ui/payments/card_unmask_otp_input_dialog_view.h" #include "ui/views/controls/styled_label.h" #include "ui/views/controls/textfield/textfield_controller.h" #include "ui/views/window/dialog_delegate.h"
diff --git a/chrome/browser/ui/views/autofill/payments/local_card_migration_bubble_views.cc b/chrome/browser/ui/views/autofill/payments/local_card_migration_bubble_views.cc index f9a929ab..0c763ea 100644 --- a/chrome/browser/ui/views/autofill/payments/local_card_migration_bubble_views.cc +++ b/chrome/browser/ui/views/autofill/payments/local_card_migration_bubble_views.cc
@@ -158,8 +158,9 @@ void LocalCardMigrationBubbleViews::OnWidgetDestroying(views::Widget* widget) { LocationBarBubbleDelegateView::OnWidgetDestroying(widget); - if (!widget->IsClosed()) + if (!widget->IsClosed()) { return; + } DCHECK_NE(widget->closed_reason(), views::Widget::ClosedReason::kCancelButtonClicked); }
diff --git a/chrome/browser/ui/views/autofill/payments/local_card_migration_uitest.cc b/chrome/browser/ui/views/autofill/payments/local_card_migration_uitest.cc index 21b0c79..47219c36 100644 --- a/chrome/browser/ui/views/autofill/payments/local_card_migration_uitest.cc +++ b/chrome/browser/ui/views/autofill/payments/local_card_migration_uitest.cc
@@ -295,23 +295,27 @@ } void OnDecideToRequestLocalCardMigration() override { - if (event_waiter_) + if (event_waiter_) { event_waiter_->OnEvent(DialogEvent::REQUESTED_LOCAL_CARD_MIGRATION); + } } void OnReceivedGetUploadDetailsResponse() override { - if (event_waiter_) + if (event_waiter_) { event_waiter_->OnEvent(DialogEvent::RECEIVED_GET_UPLOAD_DETAILS_RESPONSE); + } } void OnSentMigrateCardsRequest() override { - if (event_waiter_) + if (event_waiter_) { event_waiter_->OnEvent(DialogEvent::SENT_MIGRATE_CARDS_REQUEST); + } } void OnReceivedMigrateCardsResponse() override { - if (event_waiter_) + if (event_waiter_) { event_waiter_->OnEvent(DialogEvent::RECEIVED_MIGRATE_CARDS_RESPONSE); + } } CreditCard SaveLocalCard(std::string card_number, @@ -325,8 +329,9 @@ "1"); local_card.set_guid("00000000-0000-0000-0000-" + card_number.substr(0, 12)); local_card.set_record_type(CreditCard::RecordType::kLocalCard); - if (set_nickname) + if (set_nickname) { local_card.SetNickname(u"card nickname"); + } AddTestCreditCard(GetProfile(0), local_card); return local_card; @@ -461,8 +466,9 @@ local_card_migration_bubble_controller_impl = LocalCardMigrationBubbleControllerImpl::FromWebContents( GetActiveWebContents()); - if (!local_card_migration_bubble_controller_impl) + if (!local_card_migration_bubble_controller_impl) { return nullptr; + } return static_cast<LocalCardMigrationBubbleViews*>( local_card_migration_bubble_controller_impl ->local_card_migration_bubble_view()); @@ -473,8 +479,9 @@ local_card_migration_dialog_controller_impl = LocalCardMigrationDialogControllerImpl::FromWebContents( GetActiveWebContents()); - if (!local_card_migration_dialog_controller_impl) + if (!local_card_migration_dialog_controller_impl) { return nullptr; + } return static_cast<LocalCardMigrationDialogView*>( local_card_migration_dialog_controller_impl ->local_card_migration_dialog_view());
diff --git a/chrome/browser/ui/views/autofill/payments/manage_saved_iban_bubble_view.h b/chrome/browser/ui/views/autofill/payments/manage_saved_iban_bubble_view.h index d7c77b53..88e7c4e70 100644 --- a/chrome/browser/ui/views/autofill/payments/manage_saved_iban_bubble_view.h +++ b/chrome/browser/ui/views/autofill/payments/manage_saved_iban_bubble_view.h
@@ -38,7 +38,6 @@ void WindowClosing() override; private: - IbanBubbleController* controller() const { return controller_; } // Attributes IDs to the dialog's DialogDelegate-supplied buttons. This is
diff --git a/chrome/browser/ui/views/autofill/payments/offer_notification_bubble_views_test_base.cc b/chrome/browser/ui/views/autofill/payments/offer_notification_bubble_views_test_base.cc index ff310d1..ba4abef 100644 --- a/chrome/browser/ui/views/autofill/payments/offer_notification_bubble_views_test_base.cc +++ b/chrome/browser/ui/views/autofill/payments/offer_notification_bubble_views_test_base.cc
@@ -91,8 +91,9 @@ } void OfferNotificationBubbleViewsTestBase::OnBubbleShown() { - if (event_waiter_) + if (event_waiter_) { event_waiter_->OnEvent(DialogEvent::BUBBLE_SHOWN); + } } std::unique_ptr<AutofillOfferData> @@ -106,8 +107,9 @@ int64_t offer_id = 4444; base::Time expiry = AutofillClock::Now() + base::Days(2); std::vector<GURL> merchant_origins; - for (auto url : domains) + for (auto url : domains) { merchant_origins.emplace_back(url.DeprecatedGetOriginAsURL()); + } GURL offer_details_url; DisplayStrings display_strings; std::vector<int64_t> eligible_instrument_ids = {kCreditCardInstrumentId}; @@ -124,8 +126,9 @@ int64_t offer_id = 5555; base::Time expiry = AutofillClock::Now() + base::Days(2); std::vector<GURL> merchant_origins; - for (auto url : domains) + for (auto url : domains) { merchant_origins.emplace_back(url.DeprecatedGetOriginAsURL()); + } DisplayStrings display_strings; display_strings.value_prop_text = GetDefaultTestValuePropText(); display_strings.see_details_text = GetDefaultTestSeeDetailsText();
diff --git a/chrome/browser/ui/views/autofill/payments/save_card_bubble_views.cc b/chrome/browser/ui/views/autofill/payments/save_card_bubble_views.cc index 52f962c..7cc5a6bb 100644 --- a/chrome/browser/ui/views/autofill/payments/save_card_bubble_views.cc +++ b/chrome/browser/ui/views/autofill/payments/save_card_bubble_views.cc
@@ -94,8 +94,9 @@ // Use a custom title container if offering to upload a server card. // Done when this view is added to the widget, so the bubble frame // view is guaranteed to exist. - if (!controller_->IsUploadSave()) + if (!controller_->IsUploadSave()) { return; + } GetBubbleFrameView()->SetTitleView( std::make_unique<TitleWithIconAfterLabelView>( @@ -252,11 +253,13 @@ void SaveCardBubbleViews::AssignIdsToDialogButtons() { auto* ok_button = GetOkButton(); - if (ok_button) + if (ok_button) { ok_button->SetID(DialogViewId::OK_BUTTON); + } auto* cancel_button = GetCancelButton(); - if (cancel_button) + if (cancel_button) { cancel_button->SetID(DialogViewId::CANCEL_BUTTON); + } } void SaveCardBubbleViews::Init() {
diff --git a/chrome/browser/ui/views/autofill/payments/save_card_bubble_views_browsertest.cc b/chrome/browser/ui/views/autofill/payments/save_card_bubble_views_browsertest.cc index 12ada9d6..c66a671 100644 --- a/chrome/browser/ui/views/autofill/payments/save_card_bubble_views_browsertest.cc +++ b/chrome/browser/ui/views/autofill/payments/save_card_bubble_views_browsertest.cc
@@ -158,8 +158,7 @@ ~SaveCardBubbleViewsFullFormBrowserTest() override = default; protected: - SaveCardBubbleViewsFullFormBrowserTest() : SyncTest(SINGLE_CLIENT) { - } + SaveCardBubbleViewsFullFormBrowserTest() : SyncTest(SINGLE_CLIENT) {} class TestAutofillManager : public BrowserAutofillManager { public: @@ -240,13 +239,13 @@ } void TearDownOnMainThread() override { - if (!closed_all_tabs_) { - GetSaveCardIconView()->RemovePageIconViewObserver(this); - // credit_card_save_manager() will be null if the active web contents - // have changed since the test began. - if (credit_card_save_manager()) { - credit_card_save_manager()->SetEventObserverForTesting(nullptr); - } + if (!closed_all_tabs_) { + GetSaveCardIconView()->RemovePageIconViewObserver(this); + // credit_card_save_manager() will be null if the active web contents + // have changed since the test began. + if (credit_card_save_manager()) { + credit_card_save_manager()->SetEventObserverForTesting(nullptr); + } } SyncTest::TearDownOnMainThread(); } @@ -266,50 +265,58 @@ // CreditCardSaveManager::ObserverForTest: void OnOfferLocalSave() override { - if (event_waiter_) + if (event_waiter_) { event_waiter_->OnEvent(DialogEvent::OFFERED_LOCAL_SAVE); + } } // CreditCardSaveManager::ObserverForTest: void OnOfferUploadSave() override { - if (event_waiter_) + if (event_waiter_) { event_waiter_->OnEvent(DialogEvent::OFFERED_UPLOAD_SAVE); + } } // CreditCardSaveManager::ObserverForTest: void OnDecideToRequestUploadSave() override { - if (event_waiter_) + if (event_waiter_) { event_waiter_->OnEvent(DialogEvent::REQUESTED_UPLOAD_SAVE); + } } // CreditCardSaveManager::ObserverForTest: void OnReceivedGetUploadDetailsResponse() override { - if (event_waiter_) + if (event_waiter_) { event_waiter_->OnEvent(DialogEvent::RECEIVED_GET_UPLOAD_DETAILS_RESPONSE); + } } // CreditCardSaveManager::ObserverForTest: void OnSentUploadCardRequest() override { - if (event_waiter_) + if (event_waiter_) { event_waiter_->OnEvent(DialogEvent::SENT_UPLOAD_CARD_REQUEST); + } } // CreditCardSaveManager::ObserverForTest: void OnReceivedUploadCardResponse() override { - if (event_waiter_) + if (event_waiter_) { event_waiter_->OnEvent(DialogEvent::RECEIVED_UPLOAD_CARD_RESPONSE); + } } // CreditCardSaveManager::ObserverForTest: void OnShowCardSavedFeedback() override { - if (event_waiter_) + if (event_waiter_) { event_waiter_->OnEvent(DialogEvent::SHOW_CARD_SAVED_FEEDBACK); + } } // CreditCardSaveManager::ObserverForTest: void OnStrikeChangeComplete() override { - if (event_waiter_) + if (event_waiter_) { event_waiter_->OnEvent(DialogEvent::STRIKE_CHANGE_COMPLETE); + } } void OnWidgetShown(views::Widget* widget) { @@ -320,8 +327,9 @@ // PageActionIconViewObserver: void OnPageActionIconViewShown(PageActionIconView* view) override { - if (event_waiter_) + if (event_waiter_) { event_waiter_->OnEvent(DialogEvent::ICON_SHOWN); + } } inline views::Combobox* month_input() { @@ -725,12 +733,14 @@ SaveCardBubbleControllerImpl::CreateForWebContents(GetActiveWebContents()); SaveCardBubbleControllerImpl* save_card_bubble_controller = SaveCardBubbleControllerImpl::FromWebContents(GetActiveWebContents()); - if (!save_card_bubble_controller) + if (!save_card_bubble_controller) { return nullptr; + } AutofillBubbleBase* save_card_bubble_view = save_card_bubble_controller->GetPaymentBubbleView(); - if (!save_card_bubble_view) + if (!save_card_bubble_view) { return nullptr; + } return static_cast<SaveCardBubbleViews*>(save_card_bubble_view); } @@ -797,9 +807,8 @@ // Tests the upload save bubble. Ensures that clicking the [Save] button // does not close the bubble, causes a loading throbber to appear and hides the // other dialog buttons. -IN_PROC_BROWSER_TEST_F( - SaveCardBubbleViewsFullFormBrowserTest, - Upload_ClickingSave_ShowsLoadingView) { +IN_PROC_BROWSER_TEST_F(SaveCardBubbleViewsFullFormBrowserTest, + Upload_ClickingSave_ShowsLoadingView) { ASSERT_TRUE(SetupSync()); FillForm(); @@ -822,9 +831,8 @@ // Tests the local save bubble. Ensures that clicking the [Save] button // closes the bubble. -IN_PROC_BROWSER_TEST_F( - SaveCardBubbleViewsFullFormBrowserTest, - Local_ClickingSave_ClosesBubble) { +IN_PROC_BROWSER_TEST_F(SaveCardBubbleViewsFullFormBrowserTest, + Local_ClickingSave_ClosesBubble) { FillForm(); SubmitFormAndWaitForCardLocalSaveBubble(); @@ -840,9 +848,8 @@ // Tests that when the bubble view is created while the controller is in an // UPLOAD_IN_PROGRESS state, the loading view will be shown. -IN_PROC_BROWSER_TEST_F( - SaveCardBubbleViewsFullFormBrowserTest, - Upload_InProgress_ShowsLoadingView) { +IN_PROC_BROWSER_TEST_F(SaveCardBubbleViewsFullFormBrowserTest, + Upload_InProgress_ShowsLoadingView) { ASSERT_TRUE(SetupSync()); FillForm();
diff --git a/chrome/browser/ui/views/autofill/payments/save_card_offer_bubble_views.cc b/chrome/browser/ui/views/autofill/payments/save_card_offer_bubble_views.cc index f09ed61..70bd7965 100644 --- a/chrome/browser/ui/views/autofill/payments/save_card_offer_bubble_views.cc +++ b/chrome/browser/ui/views/autofill/payments/save_card_offer_bubble_views.cc
@@ -288,7 +288,8 @@ view->AddChildView(CreateRequestExpirationDateView()); } - if (std::unique_ptr<views::View> legal_message_view = CreateLegalMessageView()) { + if (std::unique_ptr<views::View> legal_message_view = + CreateLegalMessageView()) { legal_message_view->SetID(DialogViewId::LEGAL_MESSAGE_VIEW); view->AddChildView(std::move(legal_message_view)); } @@ -414,8 +415,9 @@ } void SaveCardOfferBubbleViews::LinkClicked(const GURL& url) { - if (controller()) + if (controller()) { controller()->OnLegalMessageLinkClicked(url); + } } void SaveCardOfferBubbleViews::ShowThrobber() {
diff --git a/chrome/browser/ui/views/autofill/payments/save_iban_bubble_view.h b/chrome/browser/ui/views/autofill/payments/save_iban_bubble_view.h index 8eaa74f..4d989122 100644 --- a/chrome/browser/ui/views/autofill/payments/save_iban_bubble_view.h +++ b/chrome/browser/ui/views/autofill/payments/save_iban_bubble_view.h
@@ -56,7 +56,6 @@ const std::u16string& new_contents) override; protected: - virtual void CreateMainContentView(); IbanBubbleController* controller() const { return controller_; }
diff --git a/chrome/browser/ui/views/autofill/payments/save_payment_method_and_virtual_card_enroll_confirmation_bubble_views.cc b/chrome/browser/ui/views/autofill/payments/save_payment_method_and_virtual_card_enroll_confirmation_bubble_views.cc index 036641c0..df1ac034 100644 --- a/chrome/browser/ui/views/autofill/payments/save_payment_method_and_virtual_card_enroll_confirmation_bubble_views.cc +++ b/chrome/browser/ui/views/autofill/payments/save_payment_method_and_virtual_card_enroll_confirmation_bubble_views.cc
@@ -47,7 +47,8 @@ } } -void SavePaymentMethodAndVirtualCardEnrollConfirmationBubbleViews::AddedToWidget() { +void SavePaymentMethodAndVirtualCardEnrollConfirmationBubbleViews:: + AddedToWidget() { if (ui_params_.is_success) { auto image_view = std::make_unique<ThemeTrackingNonAccessibleImageView>( ui::ImageModel::FromVectorIcon(kSaveCardAndVcnSuccessConfirmationIcon), @@ -67,11 +68,13 @@ } std::u16string -SavePaymentMethodAndVirtualCardEnrollConfirmationBubbleViews::GetWindowTitle() const { +SavePaymentMethodAndVirtualCardEnrollConfirmationBubbleViews::GetWindowTitle() + const { return ui_params_.title_text; } -void SavePaymentMethodAndVirtualCardEnrollConfirmationBubbleViews::WindowClosing() { +void SavePaymentMethodAndVirtualCardEnrollConfirmationBubbleViews:: + WindowClosing() { if (!controller_hide_callback_.is_null()) { std::move(controller_hide_callback_) .Run(GetPaymentsUiClosedReasonFromWidget(GetWidget()));
diff --git a/chrome/browser/ui/views/autofill/payments/save_payment_method_and_virtual_card_enroll_confirmation_bubble_views.h b/chrome/browser/ui/views/autofill/payments/save_payment_method_and_virtual_card_enroll_confirmation_bubble_views.h index 0caf83f..8d08ecf 100644 --- a/chrome/browser/ui/views/autofill/payments/save_payment_method_and_virtual_card_enroll_confirmation_bubble_views.h +++ b/chrome/browser/ui/views/autofill/payments/save_payment_method_and_virtual_card_enroll_confirmation_bubble_views.h
@@ -24,9 +24,11 @@ SavePaymentMethodAndVirtualCardEnrollConfirmationUiParams ui_params); SavePaymentMethodAndVirtualCardEnrollConfirmationBubbleViews( - const SavePaymentMethodAndVirtualCardEnrollConfirmationBubbleViews&) = delete; + const SavePaymentMethodAndVirtualCardEnrollConfirmationBubbleViews&) = + delete; SavePaymentMethodAndVirtualCardEnrollConfirmationBubbleViews& operator=( - const SavePaymentMethodAndVirtualCardEnrollConfirmationBubbleViews&) = delete; + const SavePaymentMethodAndVirtualCardEnrollConfirmationBubbleViews&) = + delete; // AutofillBubbleBase: void Hide() override;
diff --git a/chrome/browser/ui/views/autofill/payments/save_payment_method_and_virtual_card_enroll_confirmation_bubble_views_interactive_uitest.cc b/chrome/browser/ui/views/autofill/payments/save_payment_method_and_virtual_card_enroll_confirmation_bubble_views_interactive_uitest.cc index 72cd2bb..2388760b 100644 --- a/chrome/browser/ui/views/autofill/payments/save_payment_method_and_virtual_card_enroll_confirmation_bubble_views_interactive_uitest.cc +++ b/chrome/browser/ui/views/autofill/payments/save_payment_method_and_virtual_card_enroll_confirmation_bubble_views_interactive_uitest.cc
@@ -56,7 +56,8 @@ } SavePaymentMethodAndVirtualCardEnrollConfirmationBubbleViews* BubbleView() { - return static_cast<SavePaymentMethodAndVirtualCardEnrollConfirmationBubbleViews*>( + return static_cast< + SavePaymentMethodAndVirtualCardEnrollConfirmationBubbleViews*>( GetController()->GetPaymentBubbleView()); } @@ -211,7 +212,8 @@ } SavePaymentMethodAndVirtualCardEnrollConfirmationBubbleViews* BubbleView() { - return static_cast<SavePaymentMethodAndVirtualCardEnrollConfirmationBubbleViews*>( + return static_cast< + SavePaymentMethodAndVirtualCardEnrollConfirmationBubbleViews*>( GetController()->GetVirtualCardBubbleView()); }
diff --git a/chrome/browser/ui/views/autofill/payments/virtual_card_enroll_bubble_views.cc b/chrome/browser/ui/views/autofill/payments/virtual_card_enroll_bubble_views.cc index 00d99a9..caed488 100644 --- a/chrome/browser/ui/views/autofill/payments/virtual_card_enroll_bubble_views.cc +++ b/chrome/browser/ui/views/autofill/payments/virtual_card_enroll_bubble_views.cc
@@ -83,8 +83,9 @@ } void VirtualCardEnrollBubbleViews::OnDialogDeclined() { - if (controller_) + if (controller_) { controller_->OnDeclineButton(); + } } void VirtualCardEnrollBubbleViews::AddedToWidget() {
diff --git a/chrome/browser/ui/views/autofill/payments/webauthn_dialog_browsertest.cc b/chrome/browser/ui/views/autofill/payments/webauthn_dialog_browsertest.cc index 5f285a88..dd42f6a 100644 --- a/chrome/browser/ui/views/autofill/payments/webauthn_dialog_browsertest.cc +++ b/chrome/browser/ui/views/autofill/payments/webauthn_dialog_browsertest.cc
@@ -2,9 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/autofill/payments/webauthn_dialog.h" + #include "base/functional/callback_helpers.h" #include "base/run_loop.h" -#include "chrome/browser/ui/autofill/payments/webauthn_dialog.h" #include "chrome/browser/ui/autofill/payments/webauthn_dialog_controller_impl.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" @@ -42,8 +43,9 @@ } WebauthnDialogView* GetWebauthnDialogView() { - if (!controller()) + if (!controller()) { return nullptr; + } WebauthnDialog* dialog = controller()->dialog(); if (!dialog) { @@ -55,8 +57,9 @@ WebauthnDialogControllerImpl* controller() { if (!browser() || !browser()->tab_strip_model() || - !browser()->tab_strip_model()->GetActiveWebContents()) + !browser()->tab_strip_model()->GetActiveWebContents()) { return nullptr; + } return WebauthnDialogControllerImpl::GetForPage( web_contents()->GetPrimaryPage());
diff --git a/chrome/browser/ui/views/autofill/popup/popup_row_factory_utils_unittest.cc b/chrome/browser/ui/views/autofill/popup/popup_row_factory_utils_unittest.cc index d79e492..7914f50 100644 --- a/chrome/browser/ui/views/autofill/popup/popup_row_factory_utils_unittest.cc +++ b/chrome/browser/ui/views/autofill/popup/popup_row_factory_utils_unittest.cc
@@ -92,7 +92,6 @@ // A test fixture for testing the creation of rows that contain a button. class PopupRowFactoryUtilsRowWithButtonTest : public PopupRowFactoryUtilsTest { public: - void ShowAutocompleteSuggestion() { ShowSuggestion( Suggestion(u"Some entry", SuggestionType::kAutocompleteEntry));
diff --git a/chrome/browser/ui/views/autofill/popup/popup_view_utils.cc b/chrome/browser/ui/views/autofill/popup/popup_view_utils.cc index 3411f3b..61f2288e 100644 --- a/chrome/browser/ui/views/autofill/popup/popup_view_utils.cc +++ b/chrome/browser/ui/views/autofill/popup/popup_view_utils.cc
@@ -50,9 +50,9 @@ int visible_width = std::clamp(element_bounds.right(), content_area_bounds.x(), - content_area_bounds.right()) - + content_area_bounds.right()) - std::clamp(element_bounds.x(), content_area_bounds.x(), - content_area_bounds.right()); + content_area_bounds.right()); return visible_width > 3 * BubbleBorder::kVisibleArrowRadius; } @@ -109,10 +109,10 @@ const gfx::Rect& element_bounds, gfx::Rect* popup_bounds) { int top_growth_end = std::clamp(element_bounds.y(), content_area_bounds.y(), - content_area_bounds.bottom()); + content_area_bounds.bottom()); int bottom_growth_start = std::clamp(element_bounds.bottom(), content_area_bounds.y(), - content_area_bounds.bottom()); + content_area_bounds.bottom()); int top_available = top_growth_end - content_area_bounds.y(); int bottom_available = content_area_bounds.bottom() - bottom_growth_start;
diff --git a/chrome/browser/ui/views/autofill/save_address_profile_view.cc b/chrome/browser/ui/views/autofill/save_address_profile_view.cc index 5d53d3b6..d0637553 100644 --- a/chrome/browser/ui/views/autofill/save_address_profile_view.cc +++ b/chrome/browser/ui/views/autofill/save_address_profile_view.cc
@@ -266,8 +266,9 @@ // do that here. This will clear out |controller_|'s reference to |this|. Note // that WindowClosing() happens only after the _asynchronous_ Close() task // posted in CloseBubble() completes, but we need to fix references sooner. - if (controller_) + if (controller_) { controller_->OnBubbleClosed(); + } controller_ = nullptr; }
diff --git a/chrome/browser/ui/views/autofill/update_address_profile_view.cc b/chrome/browser/ui/views/autofill/update_address_profile_view.cc index 9fd59a91..5cc8548f 100644 --- a/chrome/browser/ui/views/autofill/update_address_profile_view.cc +++ b/chrome/browser/ui/views/autofill/update_address_profile_view.cc
@@ -73,8 +73,9 @@ const std::u16string& value = are_new_values ? diff_entry.first_value : diff_entry.second_value; // Don't add rows for empty original values. - if (value.empty()) + if (value.empty()) { continue; + } views::View* value_row = view->AddChildView(std::make_unique<views::View>()); value_row->SetLayoutManager(std::make_unique<views::FlexLayout>()) @@ -308,8 +309,9 @@ // do that here. This will clear out |controller_|'s reference to |this|. Note // that WindowClosing() happens only after the _asynchronous_ Close() task // posted in CloseBubble() completes, but we need to fix references sooner. - if (controller_) + if (controller_) { controller_->OnBubbleClosed(); + } controller_ = nullptr; }
diff --git a/chrome/browser/ui/views/autofill/update_address_profile_view.h b/chrome/browser/ui/views/autofill/update_address_profile_view.h index 7a8818c3..e54b56ba 100644 --- a/chrome/browser/ui/views/autofill/update_address_profile_view.h +++ b/chrome/browser/ui/views/autofill/update_address_profile_view.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_AUTOFILL_UPDATE_ADDRESS_PROFILE_VIEW_H_ #include <memory> + #include "base/memory/raw_ptr.h" #include "chrome/browser/ui/autofill/autofill_bubble_base.h" #include "chrome/browser/ui/autofill/update_address_bubble_controller.h"
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc index 8a3b332b..da47ec7 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
@@ -1580,8 +1580,7 @@ // TODO(crbug.com/40947483): Flaky on Windows. #if BUILDFLAG(IS_WIN) -#define MAYBE_MenuStaysVisibleAfterDelete \ - DISABLED_MenuStaysVisibleAfterDelete +#define MAYBE_MenuStaysVisibleAfterDelete DISABLED_MenuStaysVisibleAfterDelete #else #define MAYBE_MenuStaysVisibleAfterDelete MenuStaysVisibleAfterDelete #endif @@ -1737,10 +1736,10 @@ // TODO(crbug.com/40947483): Flaky on Windows. #if BUILDFLAG(IS_WIN) #define MAYBE_BookmarkBarViewTest18_SiblingMenu \ - DISABLED_BookmarkBarViewTest18_SiblingMenu + DISABLED_BookmarkBarViewTest18_SiblingMenu #else #define MAYBE_BookmarkBarViewTest18_SiblingMenu \ - BookmarkBarViewTest18_SiblingMenu + BookmarkBarViewTest18_SiblingMenu #endif VIEW_TEST(BookmarkBarViewTest18, MAYBE_BookmarkBarViewTest18_SiblingMenu) @@ -1801,10 +1800,10 @@ // TODO(crbug.com/40947483): Flaky on Windows. #if BUILDFLAG(IS_WIN) #define MAYBE_BookmarkBarViewTest19_SiblingMenu \ - DISABLED_BookmarkBarViewTest19_SiblingMenu + DISABLED_BookmarkBarViewTest19_SiblingMenu #else #define MAYBE_BookmarkBarViewTest19_SiblingMenu \ - BookmarkBarViewTest19_SiblingMenu + BookmarkBarViewTest19_SiblingMenu #endif VIEW_TEST(BookmarkBarViewTest19, MAYBE_BookmarkBarViewTest19_SiblingMenu) @@ -2258,10 +2257,10 @@ // TODO(crbug.com/40947483): Flaky on Windows. #if BUILDFLAG(IS_WIN) #define MAYBE_MiddleClickOnFolderOpensAllBookmarks \ - DISABLED_MiddleClickOnFolderOpensAllBookmarks + DISABLED_MiddleClickOnFolderOpensAllBookmarks #else #define MAYBE_MiddleClickOnFolderOpensAllBookmarks \ - MiddleClickOnFolderOpensAllBookmarks + MiddleClickOnFolderOpensAllBookmarks #endif VIEW_TEST(BookmarkBarViewTest27, MAYBE_MiddleClickOnFolderOpensAllBookmarks) @@ -2293,10 +2292,10 @@ // TODO(crbug.com/40947483): Flaky on Windows. #if BUILDFLAG(IS_WIN) #define MAYBE_ClickWithModifierOnFolderOpensAllBookmarks \ - DISABLED_ClickWithModifierOnFolderOpensAllBookmarks + DISABLED_ClickWithModifierOnFolderOpensAllBookmarks #else #define MAYBE_ClickWithModifierOnFolderOpensAllBookmarks \ - ClickWithModifierOnFolderOpensAllBookmarks + ClickWithModifierOnFolderOpensAllBookmarks #endif VIEW_TEST(BookmarkBarViewTest28,
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc index d390ea2..a5ed376 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc
@@ -99,8 +99,9 @@ for (size_t i = 0; i < test_helper_->GetBookmarkButtonCount() && test_helper_->GetBookmarkButton(i)->GetVisible(); ++i) { - if (i != 0) + if (i != 0) { result += " "; + } result += base::UTF16ToASCII(test_helper_->GetBookmarkButton(i)->GetText()); } @@ -168,8 +169,7 @@ *profile->GetPrefs(), *search_engine_choice_service, std::make_unique<SearchTermsData>(), nullptr /* KeywordWebDataService */, - nullptr /* TemplateURLServiceClient */, base::RepeatingClosure() - ); + nullptr /* TemplateURLServiceClient */, base::RepeatingClosure()); } };
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc index d8b0572d..ee005240 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
@@ -217,9 +217,10 @@ BookmarkModelFactory::GetForBrowserContext(browser_->profile()); const bookmarks::BookmarkNode* node = model->GetMostRecentlyAddedUserNodeForURL(url_); - if (node) + if (node) { model->Remove(node, bookmarks::metrics::BookmarkEditSource::kUser, FROM_HERE); + } return true; } @@ -229,8 +230,9 @@ } void OnWindowClosing() { - if (should_apply_edits_) + if (should_apply_edits_) { ApplyEdits(); + } bookmark_bubble_ = nullptr; if (close_callback_) { @@ -286,8 +288,9 @@ BookmarkModelFactory::GetForBrowserContext(browser_->profile()); const bookmarks::BookmarkNode* node = model->GetMostRecentlyAddedUserNodeForURL(url_); - if (!node) + if (!node) { return; + } const std::u16string new_title = dialog_model()->GetTextfieldByUniqueId(kBookmarkNameFieldId)->text(); if (new_title != node->GetTitle()) { @@ -334,8 +337,9 @@ Browser* browser, const GURL& url, bool already_bookmarked) { - if (bookmark_bubble_) + if (bookmark_bubble_) { return; + } #if !BUILDFLAG(IS_CHROMEOS_ASH) BubbleSignInPromoDelegate* const delegate_ptr = delegate.get(); #endif // !BUILDFLAG(IS_CHROMEOS_ASH) @@ -446,8 +450,9 @@ dialog_model_builder.Build(), anchor_view, views::BubbleBorder::TOP_RIGHT); bookmark_bubble_ = bubble.get(); - if (highlighted_button) + if (highlighted_button) { bubble->SetHighlightedButton(highlighted_button); + } if (ShouldShowShoppingCollectionFootnote(profile, bookmark_model, bookmark_node)) { @@ -475,8 +480,9 @@ // static void BookmarkBubbleView::Hide() { - if (bookmark_bubble_) + if (bookmark_bubble_) { bookmark_bubble_->GetWidget()->Close(); + } } // static
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h index d6bcbbf..c508170 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h
@@ -30,7 +30,7 @@ class BubbleDialogDelegate; class Button; class View; -} +} // namespace views DECLARE_ELEMENT_IDENTIFIER_VALUE(kBookmarkBubbleOkButtonId); DECLARE_ELEMENT_IDENTIFIER_VALUE(kBookmarkFolderFieldId);
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view_browsertest.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view_browsertest.cc index c8b0017c..d66a6df9 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view_browsertest.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view_browsertest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h" + #include "base/command_line.h" #include "base/memory/raw_ptr.h" #include "base/strings/utf_string_conversions.h" @@ -17,7 +19,6 @@ #include "chrome/browser/ui/commerce/mock_commerce_ui_tab_helper.h" #include "chrome/browser/ui/test/test_browser_dialog.h" #include "chrome/browser/ui/ui_features.h" -#include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h" #include "chrome/common/chrome_switches.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/browser/bookmark_utils.h"
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view_unittest.cc index 89784b38..a1418cb3 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view_unittest.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view_unittest.cc
@@ -53,7 +53,7 @@ namespace { const char kTestBookmarkURL[] = "http://www.google.com"; -} // namespace +} // namespace class BookmarkBubbleViewTestBase : public BrowserWithTestWindowTest { public:
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_context_menu.cc b/chrome/browser/ui/views/bookmarks/bookmark_context_menu.cc index 57b57398..f758efb 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_context_menu.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu.cc
@@ -79,11 +79,13 @@ void BookmarkContextMenu::RunMenuAt(const gfx::Point& point, ui::mojom::MenuSourceType source_type) { - if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode)) + if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode)) { return; + } - if (!PreRunCallback().is_null()) + if (!PreRunCallback().is_null()) { std::move(PreRunCallback()).Run(); + } // width/height don't matter here. menu_runner_->RunMenuAt(parent_widget_, nullptr, @@ -115,8 +117,9 @@ } void BookmarkContextMenu::OnMenuClosed(views::MenuItemView* menu) { - if (observer_) + if (observer_) { observer_->OnContextMenuClosed(); + } } //////////////////////////////////////////////////////////////////////////////// @@ -131,11 +134,13 @@ int command_id, const std::vector<raw_ptr<const BookmarkNode, VectorExperimental>>& bookmarks) { - if (observer_ && IsRemoveBookmarksCommand(command_id)) + if (observer_ && IsRemoveBookmarksCommand(command_id)) { observer_->WillRemoveBookmarks(bookmarks); + } } void BookmarkContextMenu::DidExecuteCommand(int command_id) { - if (observer_ && IsRemoveBookmarksCommand(command_id)) + if (observer_ && IsRemoveBookmarksCommand(command_id)) { observer_->DidRemoveBookmarks(); + } }
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_context_menu.h b/chrome/browser/ui/views/bookmarks/bookmark_context_menu.h index fa8bd4a..1d9c8e64 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_context_menu.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu.h
@@ -17,7 +17,7 @@ namespace views { class MenuRunner; class Widget; -} +} // namespace views // Observer for the BookmarkContextMenu. class BookmarkContextMenuObserver {
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc index 4571fe8..6ba90e9 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc
@@ -165,10 +165,8 @@ controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW)); EXPECT_TRUE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO)); EXPECT_TRUE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_REMOVE)); - EXPECT_TRUE( - controller.IsCommandEnabled(IDC_BOOKMARK_BAR_ADD_NEW_BOOKMARK)); - EXPECT_TRUE( - controller.IsCommandEnabled(IDC_BOOKMARK_BAR_NEW_FOLDER)); + EXPECT_TRUE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_ADD_NEW_BOOKMARK)); + EXPECT_TRUE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_NEW_FOLDER)); } // Tests the enabled state of the menus when supplied a vector with multiple @@ -185,10 +183,8 @@ controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW)); EXPECT_TRUE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO)); EXPECT_TRUE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_REMOVE)); - EXPECT_TRUE( - controller.IsCommandEnabled(IDC_BOOKMARK_BAR_ADD_NEW_BOOKMARK)); - EXPECT_TRUE( - controller.IsCommandEnabled(IDC_BOOKMARK_BAR_NEW_FOLDER)); + EXPECT_TRUE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_ADD_NEW_BOOKMARK)); + EXPECT_TRUE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_NEW_FOLDER)); } // Tests the enabled state of the menus when supplied an vector with a single @@ -205,10 +201,8 @@ EXPECT_FALSE( controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO)); EXPECT_TRUE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_REMOVE)); - EXPECT_TRUE( - controller.IsCommandEnabled(IDC_BOOKMARK_BAR_ADD_NEW_BOOKMARK)); - EXPECT_TRUE( - controller.IsCommandEnabled(IDC_BOOKMARK_BAR_NEW_FOLDER)); + EXPECT_TRUE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_ADD_NEW_BOOKMARK)); + EXPECT_TRUE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_NEW_FOLDER)); } // Tests the enabled state of the menus when supplied a vector with multiple @@ -226,10 +220,8 @@ EXPECT_FALSE( controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO)); EXPECT_TRUE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_REMOVE)); - EXPECT_TRUE( - controller.IsCommandEnabled(IDC_BOOKMARK_BAR_ADD_NEW_BOOKMARK)); - EXPECT_TRUE( - controller.IsCommandEnabled(IDC_BOOKMARK_BAR_NEW_FOLDER)); + EXPECT_TRUE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_ADD_NEW_BOOKMARK)); + EXPECT_TRUE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_NEW_FOLDER)); } // Tests the enabled state of the menus when supplied a vector with multiple @@ -246,10 +238,8 @@ controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW)); EXPECT_TRUE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO)); EXPECT_TRUE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_REMOVE)); - EXPECT_TRUE( - controller.IsCommandEnabled(IDC_BOOKMARK_BAR_ADD_NEW_BOOKMARK)); - EXPECT_TRUE( - controller.IsCommandEnabled(IDC_BOOKMARK_BAR_NEW_FOLDER)); + EXPECT_TRUE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_ADD_NEW_BOOKMARK)); + EXPECT_TRUE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_NEW_FOLDER)); } // Tests the enabled state of open incognito.
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.cc b/chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.cc index 7604c9d..cb42699 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.cc
@@ -247,8 +247,9 @@ // BookmarkNodeFaviconChanged() will never be called (e.g unfortunate // bookmark deletion timing) and we intentionally leak at most one request // in these cases which will clean up next drag. - if (!drag_node->is_favicon_loaded()) + if (!drag_node->is_favicon_loaded()) { return; + } icon = ui::ImageModel::FromImage(image); } else { @@ -290,8 +291,9 @@ // The Run() call above could have spun a nested message loop resulting in // our deletion. Be sure to avoid double-free. - if (weak_this) + if (weak_this) { delete this; + } } base::WeakPtr<BookmarkDragHelper> GetWeakPtr() { @@ -359,8 +361,9 @@ DoBookmarkDragCallback do_drag_callback) { DCHECK(!params.nodes.empty()); static base::NoDestructor<base::WeakPtr<BookmarkDragHelper>> g_drag_helper; - if (*g_drag_helper) + if (*g_drag_helper) { delete g_drag_helper->get(); + } DCHECK(!*g_drag_helper);
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc index 9445ac53..6dc61f3 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc
@@ -106,27 +106,31 @@ BookmarkEditorView::~BookmarkEditorView() { // The tree model is deleted before the view. Reset the model otherwise the // tree will reference a deleted model. - if (tree_view_) + if (tree_view_) { tree_view_->SetModel(nullptr); + } bb_model_->RemoveObserver(this); } bool BookmarkEditorView::IsDialogButtonEnabled( ui::mojom::DialogButton button) const { if (button == ui::mojom::DialogButton::kOk) { - if (!bb_model_->loaded()) + if (!bb_model_->loaded()) { return false; + } - if (details_.GetNodeType() != BookmarkNode::FOLDER) + if (details_.GetNodeType() != BookmarkNode::FOLDER) { return GetInputURL().is_valid(); + } } return true; } gfx::Size BookmarkEditorView::CalculatePreferredSize( const views::SizeBounds& available_size) const { - if (!show_tree_) + if (!show_tree_) { return views::View::CalculatePreferredSize(available_size); + } return gfx::Size(views::Widget::GetLocalizedContentsSize( IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS, @@ -134,8 +138,7 @@ } void BookmarkEditorView::OnTreeViewSelectionChanged( - views::TreeView* tree_view) { -} + views::TreeView* tree_view) {} bool BookmarkEditorView::CanEdit(views::TreeView* tree_view, ui::TreeModelNode* node) { @@ -151,7 +154,7 @@ bool BookmarkEditorView::HandleKeyEvent(views::Textfield* sender, const ui::KeyEvent& key_event) { - return false; + return false; } bool BookmarkEditorView::IsCommandIdChecked(int command_id) const { @@ -192,8 +195,9 @@ void BookmarkEditorView::Show(gfx::NativeWindow parent) { constrained_window::CreateBrowserModalDialogViews(this, parent); UserInputChanged(); - if (show_tree_ && bb_model_->loaded()) + if (show_tree_ && bb_model_->loaded()) { ExpandAndSelect(); + } GetWidget()->Show(); // Select all the text in the name Textfield. title_tf_->SelectAll(true); @@ -206,8 +210,9 @@ const gfx::Point& point, ui::mojom::MenuSourceType source_type) { DCHECK_EQ(tree_view_, source); - if (!tree_view_->GetActiveNode()) + if (!tree_view_->GetActiveNode()) { return; + } running_menu_for_root_ = (tree_model_->GetParent(tree_view_->GetActiveNode()) == tree_model_->GetRoot()); @@ -333,19 +338,22 @@ layout->SetFlexForView(scroll_view, 1); } - if (!show_tree_ || bb_model_->loaded()) + if (!show_tree_ || bb_model_->loaded()) { Reset(); + } } void BookmarkEditorView::Reset() { if (!show_tree_) { - if (parent()) + if (parent()) { UserInputChanged(); + } return; } - if (new_folder_button_) + if (new_folder_button_) { new_folder_button_->SetEnabled(true); + } // Do this first, otherwise when we invoke SetModel with the real one // tree_view will try to invoke something on the model we just deleted. @@ -358,13 +366,15 @@ context_menu_runner_.reset(); - if (parent()) + if (parent()) { ExpandAndSelect(); + } } GURL BookmarkEditorView::GetInputURL() const { - if (details_.GetNodeType() == BookmarkNode::FOLDER) + if (details_.GetNodeType() == BookmarkNode::FOLDER) { return GURL(); + } return url_formatter::FixupURL(base::UTF16ToUTF8(url_tf_->GetText()), std::string()); } @@ -403,18 +413,21 @@ for (const BookmarkNode* node : expanded_nodes) { EditorNode* editor_node = FindNodeWithID(tree_model_->GetRoot(), node->id()); - if (editor_node) + if (editor_node) { tree_view_->Expand(editor_node); + } } const BookmarkNode* to_select = details_.parent_node; - if (details_.type == EditDetails::EXISTING_NODE) + if (details_.type == EditDetails::EXISTING_NODE) { to_select = details_.existing_node->parent(); + } int64_t folder_id_to_select = to_select->id(); EditorNode* b_node = FindNodeWithID(tree_model_->GetRoot(), folder_id_to_select); - if (!b_node) + if (!b_node) { b_node = tree_model_->GetRoot()->children().front().get(); // Bookmark bar. + } tree_view_->SetSelectedNode(b_node); } @@ -461,12 +474,14 @@ BookmarkEditorView::EditorNode* BookmarkEditorView::FindNodeWithID( BookmarkEditorView::EditorNode* node, int64_t id) { - if (node->value == id) + if (node->value == id) { return node; + } for (const auto& child : node->children()) { EditorNode* result = FindNodeWithID(child.get(), id); - if (result) + if (result) { return result; + } } return nullptr; } @@ -475,8 +490,9 @@ DCHECK(bb_model_->loaded()); if (!parent) { - if (tree_view_) + if (tree_view_) { tree_view_->CommitEdit(); + } if (show_tree_) { parent = tree_model_->AsNode(tree_view_->GetSelectedNode()); @@ -523,8 +539,9 @@ BookmarkEditorView::EditorNode* b_node, BookmarkEditorView::EditorNode* parent_b_node, const BookmarkNode** parent_bb_node) { - if (parent_b_node == b_node) + if (parent_b_node == b_node) { *parent_bb_node = bb_node; + } for (const auto& child_b_node : b_node->children()) { const BookmarkNode* child_bb_node = nullptr; if (child_b_node->value == 0) { @@ -552,8 +569,9 @@ void BookmarkEditorView::UpdateExpandedNodes( EditorNode* editor_node, BookmarkExpandedStateTracker::Nodes* expanded_nodes) { - if (!tree_view_->IsExpanded(editor_node)) + if (!tree_view_->IsExpanded(editor_node)) { return; + } // The root is 0. if (editor_node->value != 0) { @@ -561,8 +579,9 @@ bookmarks::GetBookmarkNodeByID(bb_model_, editor_node->value)); } - for (const auto& child : editor_node->children()) + for (const auto& child : editor_node->children()) { UpdateExpandedNodes(child.get(), expanded_nodes); + } } ui::SimpleMenuModel* BookmarkEditorView::GetMenuModel() { @@ -581,8 +600,9 @@ base::OnceCallback<bool(const bookmarks::BookmarkNode* node)> non_empty_folder_confirmation_cb) { EditorNode* node = tree_model_->AsNode(tree_view_->GetActiveNode()); - if (!node) + if (!node) { return; + } const int64_t bookmark_node_id = node->value; if (bookmark_node_id != 0) { const BookmarkNode* b_node = @@ -611,8 +631,9 @@ void BookmarkEditorView::EditorTreeModel::SetTitle( ui::TreeModelNode* node, const std::u16string& title) { - if (!title.empty()) + if (!title.empty()) { ui::TreeNodeModel<EditorNode>::SetTitle(node, title); + } } BEGIN_METADATA(BookmarkEditorView)
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h index d1e3fb1..79298a7e 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h
@@ -31,7 +31,7 @@ class LabelButton; class MenuRunner; class TreeView; -} +} // namespace views class BookmarkEditorViewTest; class GURL;
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc index 4501d744..0273e60 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc
@@ -84,20 +84,20 @@ } void SetURLText(const std::u16string& text) { - if (editor_->details_.type != BookmarkEditor::EditDetails::NEW_FOLDER) + if (editor_->details_.type != BookmarkEditor::EditDetails::NEW_FOLDER) { editor_->url_tf_->SetText(text); + } } std::u16string GetURLText() const { - if (editor_->details_.type != BookmarkEditor::EditDetails::NEW_FOLDER) + if (editor_->details_.type != BookmarkEditor::EditDetails::NEW_FOLDER) { return editor_->url_tf_->GetText(); + } return std::u16string(); } - void ApplyEdits() { - editor_->ApplyEdits(); - } + void ApplyEdits() { editor_->ApplyEdits(); } void ApplyEdits(BookmarkEditorView::EditorNode* node) { editor_->ApplyEdits(node); @@ -113,14 +113,13 @@ } bool URLTFHasParent() { - if (editor_->details_.type == BookmarkEditor::EditDetails::NEW_FOLDER) + if (editor_->details_.type == BookmarkEditor::EditDetails::NEW_FOLDER) { return false; + } return editor_->url_tf_->parent(); } - void ExpandAndSelect() { - editor_->ExpandAndSelect(); - } + void ExpandAndSelect() { editor_->ExpandAndSelect(); } void DeleteNode(base::OnceCallback<bool(const bookmarks::BookmarkNode* node)> non_empty_folder_confirmation_cb) {
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc index a55c4b28..1cd2972 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc
@@ -42,8 +42,9 @@ menu_delegate_->SetActiveMenu(node, start_child_index); int run_type = 0; - if (for_drop) + if (for_drop) { run_type |= views::MenuRunner::FOR_DROP; + } menu_runner_ = std::make_unique<views::MenuRunner>( base::WrapUnique<MenuItemView>(menu_delegate_->menu()), run_type); } @@ -94,7 +95,8 @@ } bool BookmarkMenuController::ShouldExecuteCommandWithoutClosingMenu( - int id, const ui::Event& e) { + int id, + const ui::Event& e) { return menu_delegate_->ShouldExecuteCommandWithoutClosingMenu(id, e); } @@ -126,8 +128,9 @@ DropPosition position, const ui::DropTargetEvent& event) { auto drop_cb = menu_delegate_->GetDropCallback(menu, position, event); - if (for_drop_) + if (for_drop_) { delete this; + } return drop_cb; } @@ -162,15 +165,17 @@ views::MenuAnchorPosition* anchor, bool* has_mnemonics, views::MenuButton** button) { - if (!bookmark_bar_ || for_drop_) + if (!bookmark_bar_ || for_drop_) { return nullptr; + } gfx::Point bookmark_bar_loc(screen_point); views::View::ConvertPointFromScreen(bookmark_bar_, &bookmark_bar_loc); size_t start_index; const BookmarkNode* node = bookmark_bar_->GetNodeForButtonAtModelIndex( bookmark_bar_loc, &start_index); - if (!node || !node->is_folder()) + if (!node || !node->is_folder()) { return nullptr; + } menu_delegate_->SetActiveMenu(node, start_index); *button = bookmark_bar_->GetMenuButtonForNode(node); @@ -188,19 +193,22 @@ } void BookmarkMenuController::BookmarkModelChanged() { - if (!menu_delegate_->is_mutating_model()) + if (!menu_delegate_->is_mutating_model()) { menu()->Cancel(); + } } bool BookmarkMenuController::ShouldTryPositioningBesideAnchor() const { - // The bookmark menu appears from the bookmark bar, which has a set of buttons positioned next to - // each other; if the bookmark menu appears beside its anchor button, it will likely overlay the - // adjacent bookmark button, which prevents easy scrubbing through the bookmark bar's menus. + // The bookmark menu appears from the bookmark bar, which has a set of buttons + // positioned next to each other; if the bookmark menu appears beside its + // anchor button, it will likely overlay the adjacent bookmark button, which + // prevents easy scrubbing through the bookmark bar's menus. return false; } BookmarkMenuController::~BookmarkMenuController() { menu_delegate_->GetBookmarkModel()->RemoveObserver(this); - if (observer_) + if (observer_) { observer_->BookmarkMenuControllerDeleted(this); + } }
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h index 6915f17b..413e3eb 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h
@@ -32,7 +32,7 @@ class MenuItemView; class MenuRunner; class Widget; -} +} // namespace views // BookmarkMenuController is responsible for showing a menu of bookmarks, // each item in the menu represents a bookmark.
diff --git a/chrome/browser/ui/views/bookmarks/saved_tab_groups/saved_tab_group_button.h b/chrome/browser/ui/views/bookmarks/saved_tab_groups/saved_tab_group_button.h index 10f92b37..9b4d40f 100644 --- a/chrome/browser/ui/views/bookmarks/saved_tab_groups/saved_tab_group_button.h +++ b/chrome/browser/ui/views/bookmarks/saved_tab_groups/saved_tab_group_button.h
@@ -36,11 +36,10 @@ METADATA_HEADER(SavedTabGroupButton, views::MenuButton) public: - SavedTabGroupButton( - const SavedTabGroup& group, - PressedCallback callback, - Browser* browser, - bool animations_enabled = true); + SavedTabGroupButton(const SavedTabGroup& group, + PressedCallback callback, + Browser* browser, + bool animations_enabled = true); SavedTabGroupButton(const SavedTabGroupButton&) = delete; SavedTabGroupButton& operator=(const SavedTabGroupButton&) = delete;
diff --git a/chrome/browser/ui/views/bookmarks/saved_tab_groups/saved_tab_group_interactive_uitest.cc b/chrome/browser/ui/views/bookmarks/saved_tab_groups/saved_tab_group_interactive_uitest.cc index 8b0198c65..f67b0a2 100644 --- a/chrome/browser/ui/views/bookmarks/saved_tab_groups/saved_tab_group_interactive_uitest.cc +++ b/chrome/browser/ui/views/bookmarks/saved_tab_groups/saved_tab_group_interactive_uitest.cc
@@ -474,20 +474,20 @@ AddTabAtIndex(0, GURL(url::kAboutBlankURL), ui::PAGE_TRANSITION_TYPED)); ASSERT_EQ(2, browser()->tab_strip_model()->count()); - browser()->tab_strip_model()->AddToNewGroup({0}); + browser()->tab_strip_model()->AddToNewGroup({0}); - RunTestSequence( - FinishTabstripAnimations(), ShowBookmarksBar(), - PressButton(kToolbarAppMenuButtonElementId), - WaitForShow(AppMenuModel::kTabGroupsMenuItem), - SelectMenuItem(AppMenuModel::kTabGroupsMenuItem), - SelectMenuItem(STGEverythingMenu::kTabGroup), - EnsurePresent(STGEverythingMenu::kOpenGroup), - EnsurePresent(SavedTabGroupUtils::kMoveGroupToNewWindowMenuItem), - EnsurePresent(SavedTabGroupUtils::kToggleGroupPinStateMenuItem), - EnsurePresent(SavedTabGroupUtils::kDeleteGroupMenuItem), - EnsurePresent(SavedTabGroupUtils::kTabsTitleItem), - EnsurePresent(SavedTabGroupUtils::kTab)); + RunTestSequence( + FinishTabstripAnimations(), ShowBookmarksBar(), + PressButton(kToolbarAppMenuButtonElementId), + WaitForShow(AppMenuModel::kTabGroupsMenuItem), + SelectMenuItem(AppMenuModel::kTabGroupsMenuItem), + SelectMenuItem(STGEverythingMenu::kTabGroup), + EnsurePresent(STGEverythingMenu::kOpenGroup), + EnsurePresent(SavedTabGroupUtils::kMoveGroupToNewWindowMenuItem), + EnsurePresent(SavedTabGroupUtils::kToggleGroupPinStateMenuItem), + EnsurePresent(SavedTabGroupUtils::kDeleteGroupMenuItem), + EnsurePresent(SavedTabGroupUtils::kTabsTitleItem), + EnsurePresent(SavedTabGroupUtils::kTab)); } IN_PROC_BROWSER_TEST_P(SavedTabGroupInteractiveTest,
diff --git a/chrome/browser/ui/views/borealis/borealis_beta_badge.h b/chrome/browser/ui/views/borealis/borealis_beta_badge.h index 39ba4f3..7078339 100644 --- a/chrome/browser/ui/views/borealis/borealis_beta_badge.h +++ b/chrome/browser/ui/views/borealis/borealis_beta_badge.h
@@ -14,7 +14,6 @@ METADATA_HEADER(BorealisBetaBadge, views::View) public: - BorealisBetaBadge(); ~BorealisBetaBadge() override;
diff --git a/chrome/browser/ui/views/borealis/borealis_disallowed_dialog_browsertest.cc b/chrome/browser/ui/views/borealis/borealis_disallowed_dialog_browsertest.cc index bce22ad..fe117ef 100644 --- a/chrome/browser/ui/views/borealis/borealis_disallowed_dialog_browsertest.cc +++ b/chrome/browser/ui/views/borealis/borealis_disallowed_dialog_browsertest.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ash/borealis/borealis_features.h" #include "chrome/browser/ui/views/borealis/borealis_disallowed_dialog.h" +#include "chrome/browser/ash/borealis/borealis_features.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/test/test_browser_dialog.h" #include "content/public/test/browser_test.h"
diff --git a/chrome/browser/ui/views/borealis/borealis_launch_error_dialog.cc b/chrome/browser/ui/views/borealis/borealis_launch_error_dialog.cc index a5d7fd1..69449c8 100644 --- a/chrome/browser/ui/views/borealis/borealis_launch_error_dialog.cc +++ b/chrome/browser/ui/views/borealis/borealis_launch_error_dialog.cc
@@ -186,20 +186,20 @@ profile, chromeos::settings::mojom::kStorageSubpagePath); } else if (failure_ == FailureType::FAILURE_RETRY) { base::SequencedTaskRunner::GetCurrentDefault()->PostTask( - FROM_HERE, base::BindOnce( - [](Profile* profile) { - // Technically "retry" should re-do whatever the user - // originally tried. For simplicity we just retry the - // client app. - ::borealis::BorealisServiceFactory::GetForProfile( - profile) - ->AppLauncher() - .Launch(::borealis::kClientAppId, - ::borealis::BorealisLaunchSource:: - kErrorDialogRetryButton, - base::DoNothing()); - }, - profile)); + FROM_HERE, + base::BindOnce( + [](Profile* profile) { + // Technically "retry" should re-do whatever the user + // originally tried. For simplicity we just retry the + // client app. + ::borealis::BorealisServiceFactory::GetForProfile(profile) + ->AppLauncher() + .Launch(::borealis::kClientAppId, + ::borealis::BorealisLaunchSource:: + kErrorDialogRetryButton, + base::DoNothing()); + }, + profile)); } }
diff --git a/chrome/browser/ui/views/browser_commands_views.cc b/chrome/browser/ui/views/browser_commands_views.cc index a3d6840..fb18a77 100644 --- a/chrome/browser/ui/views/browser_commands_views.cc +++ b/chrome/browser/ui/views/browser_commands_views.cc
@@ -27,13 +27,15 @@ #if defined(USE_AURA) wm::ActivationClient* client = wm::GetActivationClient( browser->window()->GetNativeWindow()->GetRootWindow()); - if (!client) + if (!client) { return nullptr; + } gfx::NativeWindow active_window = client->GetActiveWindow(); #elif BUILDFLAG(IS_MAC) NSWindow* active_window = platform_util::GetActiveWindow(); - if (!active_window) + if (!active_window) { return nullptr; + } #endif views::Widget* widget = @@ -46,14 +48,16 @@ std::optional<int> GetKeyboardFocusedTabIndex(const Browser* browser) { BrowserView* view = BrowserView::GetBrowserViewForBrowser(browser); - if (view && view->tabstrip()) + if (view && view->tabstrip()) { return view->tabstrip()->GetFocusedTabIndex(); + } return std::nullopt; } void ExecuteUIDebugCommand(int id, const Browser* browser) { - if (!base::FeatureList::IsEnabled(features::kUIDebugTools)) + if (!base::FeatureList::IsEnabled(features::kUIDebugTools)) { return; + } switch (id) { case IDC_DEBUG_TOGGLE_TABLET_MODE: {
diff --git a/chrome/browser/ui/views/bubble/webui_bubble_dialog_view.cc b/chrome/browser/ui/views/bubble/webui_bubble_dialog_view.cc index c1358edda..be8f11e 100644 --- a/chrome/browser/ui/views/bubble/webui_bubble_dialog_view.cc +++ b/chrome/browser/ui/views/bubble/webui_bubble_dialog_view.cc
@@ -113,8 +113,9 @@ } void WebUIBubbleDialogView::ClearContentsWrapper() { - if (!contents_wrapper_) + if (!contents_wrapper_) { return; + } DCHECK_EQ(this, contents_wrapper_->GetHost().get()); DCHECK_EQ(web_view_->web_contents(), contents_wrapper_->web_contents()); web_view_->SetWebContents(nullptr); @@ -224,8 +225,9 @@ } gfx::Rect WebUIBubbleDialogView::GetAnchorRect() const { - if (bubble_anchor_) + if (bubble_anchor_) { return bubble_anchor_.value(); + } return BubbleDialogDelegateView::GetAnchorRect(); }
diff --git a/chrome/browser/ui/views/bubble/webui_bubble_manager.cc b/chrome/browser/ui/views/bubble/webui_bubble_manager.cc index 62090cb..e446bda 100644 --- a/chrome/browser/ui/views/bubble/webui_bubble_manager.cc +++ b/chrome/browser/ui/views/bubble/webui_bubble_manager.cc
@@ -44,8 +44,9 @@ bool WebUIBubbleManager::ShowBubble(const std::optional<gfx::Rect>& anchor, views::BubbleBorder::Arrow arrow, ui::ElementIdentifier identifier) { - if (bubble_view_) + if (bubble_view_) { return false; + } cache_timer_->Stop(); @@ -73,8 +74,9 @@ BrowserList::GetInstance()->GetLastActive()->tab_strip_model()); } - if (identifier) + if (identifier) { bubble_view_->SetProperty(views::kElementIdentifierKey, identifier); + } if (GetContentsWrapper()->is_ready_to_show()) { GetContentsWrapper()->ShowUI(); @@ -84,8 +86,9 @@ } void WebUIBubbleManager::CloseBubble() { - if (!bubble_view_) + if (!bubble_view_) { return; + } DCHECK(bubble_view_->GetWidget()); bubble_view_->GetWidget()->CloseWithReason( views::Widget::ClosedReason::kUnspecified); @@ -126,11 +129,13 @@ } void WebUIBubbleManager::ResetContentsWrapper() { - if (!cached_contents_wrapper_) + if (!cached_contents_wrapper_) { return; + } - if (bubble_view_) + if (bubble_view_) { CloseBubble(); + } DCHECK(!cached_contents_wrapper_->GetHost()); cached_contents_wrapper_.reset(); }
diff --git a/chrome/browser/ui/views/bubble_anchor_util_views.cc b/chrome/browser/ui/views/bubble_anchor_util_views.cc index 1b609be6..8adb106d 100644 --- a/chrome/browser/ui/views/bubble_anchor_util_views.cc +++ b/chrome/browser/ui/views/bubble_anchor_util_views.cc
@@ -73,8 +73,9 @@ // Fall back to menu button. views::Button* app_menu_button = browser_view->toolbar_button_provider()->GetAppMenuButton(); - if (!app_menu_button || !app_menu_button->IsDrawn()) + if (!app_menu_button || !app_menu_button->IsDrawn()) { return {}; + } // The app menu button is not visible when immersive mode is enabled and the // title bar is not revealed. So return null anchor configuration.
diff --git a/chrome/browser/ui/views/bubble_anchor_util_views.h b/chrome/browser/ui/views/bubble_anchor_util_views.h index 827b9ce8..67a80b0 100644 --- a/chrome/browser/ui/views/bubble_anchor_util_views.h +++ b/chrome/browser/ui/views/bubble_anchor_util_views.h
@@ -12,7 +12,7 @@ namespace views { class Button; class View; -} +} // namespace views class Browser;
diff --git a/chrome/browser/ui/views/certificate_selector.cc b/chrome/browser/ui/views/certificate_selector.cc index cba49a2..3a8ddeed 100644 --- a/chrome/browser/ui/views/certificate_selector.cc +++ b/chrome/browser/ui/views/certificate_selector.cc
@@ -245,16 +245,18 @@ net::ClientCertIdentity* CertificateSelector::GetSelectedCert() const { const std::optional<size_t> selected = table_->GetFirstSelectedRow(); - if (!selected.has_value()) + if (!selected.has_value()) { return nullptr; + } DCHECK_LT(selected.value(), identities_.size()); return identities_[selected.value()].get(); } bool CertificateSelector::Accept() { const std::optional<size_t> selected = table_->GetFirstSelectedRow(); - if (!selected.has_value()) + if (!selected.has_value()) { return false; + } DCHECK_LT(selected.value(), identities_.size()); AcceptCertificate(std::move(identities_[selected.value()])); @@ -277,8 +279,9 @@ void CertificateSelector::ViewCertButtonPressed() { net::ClientCertIdentity* const cert = GetSelectedCert(); - if (!cert) + if (!cert) { return; + } ShowCertificateViewerForClientAuth(web_contents_, web_contents_->GetTopLevelNativeWindow(), cert->certificate()); @@ -289,8 +292,9 @@ } void CertificateSelector::OnDoubleClick() { - if (GetSelectedCert()) + if (GetSelectedCert()) { AcceptDialog(); + } } BEGIN_METADATA(CertificateSelector)
diff --git a/chrome/browser/ui/views/certificate_selector.h b/chrome/browser/ui/views/certificate_selector.h index bbbbe0d..d97628fe 100644 --- a/chrome/browser/ui/views/certificate_selector.h +++ b/chrome/browser/ui/views/certificate_selector.h
@@ -23,7 +23,7 @@ class LabelButton; class TableView; class View; -} +} // namespace views namespace ui { class TableModel;
diff --git a/chrome/browser/ui/views/certificate_selector_browsertest.cc b/chrome/browser/ui/views/certificate_selector_browsertest.cc index 46cb8b2..e09c2a27 100644 --- a/chrome/browser/ui/views/certificate_selector_browsertest.cc +++ b/chrome/browser/ui/views/certificate_selector_browsertest.cc
@@ -36,8 +36,9 @@ TestCertificateSelector& operator=(const TestCertificateSelector&) = delete; ~TestCertificateSelector() override { - if (!on_destroy_.is_null()) + if (!on_destroy_.is_null()) { std::move(on_destroy_).Run(); + } } void Init() { @@ -46,13 +47,15 @@ void AcceptCertificate( std::unique_ptr<net::ClientCertIdentity> identity) override { - if (accepted_) + if (accepted_) { *accepted_ = true; + } } bool Cancel() override { - if (canceled_) + if (canceled_) { *canceled_ = true; + } return CertificateSelector::Cancel(); }
diff --git a/chrome/browser/ui/views/certificate_selector_dialog_browsertest.cc b/chrome/browser/ui/views/certificate_selector_dialog_browsertest.cc index ccbfc54..baf96e1 100644 --- a/chrome/browser/ui/views/certificate_selector_dialog_browsertest.cc +++ b/chrome/browser/ui/views/certificate_selector_dialog_browsertest.cc
@@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/views/certificate_selector.h" - #include <memory> #include <string> @@ -11,6 +9,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/test/test_browser_dialog.h" +#include "chrome/browser/ui/views/certificate_selector.h" #include "chrome/grit/generated_resources.h" #include "content/public/test/browser_test.h" #include "net/cert/x509_certificate.h"
diff --git a/chrome/browser/ui/views/certificate_viewer_mac_views.mm b/chrome/browser/ui/views/certificate_viewer_mac_views.mm index ce372a38..86aec7a 100644 --- a/chrome/browser/ui/views/certificate_viewer_mac_views.mm +++ b/chrome/browser/ui/views/certificate_viewer_mac_views.mm
@@ -2,9 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/certificate_viewer.h" - #include "base/logging.h" +#include "chrome/browser/certificate_viewer.h" #include "components/remote_cocoa/browser/window.h" #include "components/remote_cocoa/common/native_widget_ns_window.mojom.h"
diff --git a/chrome/browser/ui/views/certificate_viewer_win.cc b/chrome/browser/ui/views/certificate_viewer_win.cc index d5fdaf80..58b559f 100644 --- a/chrome/browser/ui/views/certificate_viewer_win.cc +++ b/chrome/browser/ui/views/certificate_viewer_win.cc
@@ -68,8 +68,9 @@ // Perhaps this should show an error instead of silently failing, but it's // probably not even possible to get here with a cert that can't be // converted to a CERT_CONTEXT. - if (!cert_list) + if (!cert_list) { return; + } CRYPTUI_VIEWCERTIFICATE_STRUCT view_info = {0}; view_info.dwSize = sizeof(view_info); @@ -81,8 +82,9 @@ view_info.cStores = 1; view_info.rghStores = &cert_store; - if (mock_certificate_viewer_for_testing) + if (mock_certificate_viewer_for_testing) { return; + } BOOL properties_changed; ::CryptUIDlgViewCertificate(&view_info, &properties_changed);
diff --git a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc index 969bf97..0ea4a6e4 100644 --- a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc +++ b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
@@ -90,8 +90,9 @@ void ChromeBrowserMainExtraPartsViews::ToolkitInitialized() { // The delegate needs to be set before any UI is created so that windows // display the correct icon. - if (!views::ViewsDelegate::GetInstance()) + if (!views::ViewsDelegate::GetInstance()) { views_delegate_ = std::make_unique<ChromeViewsDelegate>(); + } SetConstrainedWindowViewsClient(CreateChromeConstrainedWindowViewsClient()); @@ -101,15 +102,17 @@ // TODO(pkasting): Try to move ViewsDelegate creation here as well; // see https://crbug.com/691894#c1 - if (!views::LayoutProvider::Get()) + if (!views::LayoutProvider::Get()) { layout_provider_ = ChromeLayoutProvider::CreateLayoutProvider(); + } } void ChromeBrowserMainExtraPartsViews::PreCreateThreads() { #if defined(USE_AURA) && !BUILDFLAG(IS_CHROMEOS_ASH) // The Screen instance may already be set in tests. - if (!display::Screen::GetScreen()) + if (!display::Screen::GetScreen()) { screen_ = views::CreateDesktopScreen(); + } #endif } @@ -136,20 +139,23 @@ // On the Linux desktop, we want to prevent the user from logging in as root, // so that we don't destroy the profile. Now that we have some minimal ui // initialized, check to see if we're running as root and bail if we are. - if (geteuid() != 0) + if (geteuid() != 0) { return; + } // Allow running inside an unprivileged user namespace. In that case, the // root directory will be owned by an unmapped UID and GID (although this // may not be the case if a chroot is also being used). struct stat st; - if (stat("/", &st) == 0 && st.st_uid != 0) + if (stat("/", &st) == 0 && st.st_uid != 0) { return; + } const base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess(); - if (command_line.HasSwitch(sandbox::policy::switches::kNoSandbox)) + if (command_line.HasSwitch(sandbox::policy::switches::kNoSandbox)) { return; + } std::u16string title = l10n_util::GetStringFUTF16( IDS_REFUSE_TO_RUN_AS_ROOT, l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
diff --git a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h index 201c9ac..794d1949 100644 --- a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h +++ b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h
@@ -17,7 +17,7 @@ #if BUILDFLAG(USE_DBUS) class DarkModeManagerLinux; #endif -} +} // namespace ui // Extra parts, which are used by both Ozone/X11/Wayland and inherited by the // non-ozone X11 extra parts.
diff --git a/chrome/browser/ui/views/chrome_javascript_app_modal_view_factory_views.cc b/chrome/browser/ui/views/chrome_javascript_app_modal_view_factory_views.cc index b169371..cc58a303 100644 --- a/chrome/browser/ui/views/chrome_javascript_app_modal_view_factory_views.cc +++ b/chrome/browser/ui/views/chrome_javascript_app_modal_view_factory_views.cc
@@ -2,13 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/javascript_dialogs/chrome_javascript_app_modal_dialog_view_factory.h" - #include <memory> #include "build/build_config.h" #include "chrome/browser/ui/blocked_content/popunder_preventer.h" #include "chrome/browser/ui/javascript_dialogs/chrome_app_modal_dialog_manager_delegate.h" +#include "chrome/browser/ui/javascript_dialogs/chrome_javascript_app_modal_dialog_view_factory.h" #include "chrome/browser/ui/views/javascript_app_modal_event_blocker.h" #include "components/constrained_window/constrained_window_views.h" #include "components/javascript_dialogs/app_modal_dialog_controller.h"
diff --git a/chrome/browser/ui/views/chrome_layout_provider.cc b/chrome/browser/ui/views/chrome_layout_provider.cc index b4eb494..7d806136 100644 --- a/chrome/browser/ui/views/chrome_layout_provider.cc +++ b/chrome/browser/ui/views/chrome_layout_provider.cc
@@ -90,8 +90,9 @@ DCHECK_GE(metric, views::VIEWS_DISTANCE_START); DCHECK_LT(metric, views::VIEWS_DISTANCE_MAX); - if (metric < views::VIEWS_DISTANCE_END) + if (metric < views::VIEWS_DISTANCE_END) { return LayoutProvider::GetDistanceMetric(metric); + } switch (static_cast<ChromeDistanceMetric>(metric)) { case DISTANCE_CONTENT_LIST_VERTICAL_SINGLE: @@ -203,8 +204,9 @@ int ChromeLayoutProvider::GetSnappedDialogWidth(int min_width) const { for (int snap_point : {kSmallDialogWidth, kMediumDialogWidth, kLargeDialogWidth}) { - if (min_width <= snap_point) + if (min_width <= snap_point) { return snap_point; + } } return ((min_width + 15) / 16) * 16;
diff --git a/chrome/browser/ui/views/chrome_typography_provider.cc b/chrome/browser/ui/views/chrome_typography_provider.cc index c09f02cd..02101453 100644 --- a/chrome/browser/ui/views/chrome_typography_provider.cc +++ b/chrome/browser/ui/views/chrome_typography_provider.cc
@@ -157,8 +157,9 @@ int style) const { // Body text styles are the same as for labels. if (context == views::style::CONTEXT_DIALOG_BODY_TEXT || - context == CONTEXT_DIALOG_BODY_TEXT_SMALL) + context == CONTEXT_DIALOG_BODY_TEXT_SMALL) { context = views::style::CONTEXT_LABEL; + } // Monospaced styles have the same colors as their normal counterparts. if (style == views::style::STYLE_PRIMARY_MONOSPACED) {
diff --git a/chrome/browser/ui/views/chrome_views_delegate.cc b/chrome/browser/ui/views/chrome_views_delegate.cc index 68977a7..160a7c0 100644 --- a/chrome/browser/ui/views/chrome_views_delegate.cc +++ b/chrome/browser/ui/views/chrome_views_delegate.cc
@@ -40,8 +40,9 @@ namespace { Profile* GetProfileForWindow(const views::Widget* window) { - if (!window) + if (!window) { return nullptr; + } return reinterpret_cast<Profile*>( window->GetNativeWindowProperty(Profile::kProfileKey)); } @@ -87,8 +88,9 @@ const gfx::Rect& bounds, ui::mojom::WindowShowState show_state) { PrefService* prefs = GetPrefsForWindow(window); - if (!prefs) + if (!prefs) { return; + } std::unique_ptr<ScopedDictPrefUpdate> pref_update; base::Value::Dict& window_preferences = @@ -116,8 +118,9 @@ gfx::Rect* bounds, ui::mojom::WindowShowState* show_state) const { PrefService* prefs = g_browser_process->local_state(); - if (!prefs) + if (!prefs) { return false; + } DCHECK(prefs->FindPreference(window_name)); const base::Value::Dict& dictionary = prefs->GetDict(window_name); @@ -125,8 +128,9 @@ std::optional<int> top = dictionary.FindInt("top"); std::optional<int> right = dictionary.FindInt("right"); std::optional<int> bottom = dictionary.FindInt("bottom"); - if (!left || !top || !right || !bottom) + if (!left || !top || !right || !bottom) { return false; + } bounds->SetRect(*left, *top, *right - *left, *bottom - *top); @@ -204,13 +208,15 @@ // If we already have a native_widget, we don't have to try to come // up with one. - if (params->native_widget) + if (params->native_widget) { return; + } if (!native_widget_factory().is_null()) { params->native_widget = native_widget_factory().Run(*params, delegate); - if (params->native_widget) + if (params->native_widget) { return; + } } params->native_widget = CreateNativeWidget(params, delegate);
diff --git a/chrome/browser/ui/views/chrome_views_delegate_ash.cc b/chrome/browser/ui/views/chrome_views_delegate_ash.cc index 7474b09..a1912ee 100644 --- a/chrome/browser/ui/views/chrome_views_delegate_ash.cc +++ b/chrome/browser/ui/views/chrome_views_delegate_ash.cc
@@ -2,14 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/views/chrome_views_delegate.h" - #include "ash/public/cpp/accelerators.h" #include "ash/shell.h" #include "base/functional/bind.h" #include "base/task/current_thread.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/ui/ash/capture_mode/chrome_capture_mode_delegate.h" +#include "chrome/browser/ui/views/chrome_views_delegate.h" #include "ui/display/display.h" #include "ui/display/screen.h" @@ -64,13 +63,15 @@ // The context should be associated with a root window. If the context has a // null root window (e.g. the context window has no parent) it will trigger // the fallback case below. https://crbug.com/828626 https://crrev.com/230793 - if (params->context) + if (params->context) { params->context = params->context->GetRootWindow(); + } // Ash requires a parent or a context that it can use to look up a root window // to find a WindowParentingClient. - if (!params->parent && !params->context) + if (!params->parent && !params->context) { params->context = ash::Shell::GetRootWindowForNewWindows(); + } // By returning null Widget creates the default NativeWidget implementation, // which for Chrome OS is NativeWidgetAura.
diff --git a/chrome/browser/ui/views/chrome_views_delegate_linux.cc b/chrome/browser/ui/views/chrome_views_delegate_linux.cc index 090caca..9fc4b34 100644 --- a/chrome/browser/ui/views/chrome_views_delegate_linux.cc +++ b/chrome/browser/ui/views/chrome_views_delegate_linux.cc
@@ -93,8 +93,9 @@ // // TODO(thomasanderson,crbug.com/784010): Consider using the // _UNITY_SHELL wm hint when support for Ubuntu Trusty is dropped. - if (!maximized) + if (!maximized) { return false; + } static bool is_desktop_environment_unity = IsDesktopEnvironmentUnity(); return is_desktop_environment_unity; }
diff --git a/chrome/browser/ui/views/chrome_views_delegate_win.cc b/chrome/browser/ui/views/chrome_views_delegate_win.cc index 6ae07eb..ebb4396 100644 --- a/chrome/browser/ui/views/chrome_views_delegate_win.cc +++ b/chrome/browser/ui/views/chrome_views_delegate_win.cc
@@ -41,16 +41,19 @@ if (!::IsWindow(taskbar)) { APPBARDATA taskbar_data = {sizeof(APPBARDATA), 0, 0, 0}; unsigned int taskbar_state = SHAppBarMessage(ABM_GETSTATE, &taskbar_data); - if (!(taskbar_state & ABS_AUTOHIDE)) + if (!(taskbar_state & ABS_AUTOHIDE)) { return false; + } taskbar_data.hWnd = ::FindWindow(L"Shell_TrayWnd", NULL); - if (!::IsWindow(taskbar_data.hWnd)) + if (!::IsWindow(taskbar_data.hWnd)) { return false; + } SHAppBarMessage(ABM_GETTASKBARPOS, &taskbar_data); - if (taskbar_data.uEdge == edge) + if (taskbar_data.uEdge == edge) { taskbar = taskbar_data.hWnd; + } } // There is a potential race condition here: @@ -72,16 +75,18 @@ // window style on the taskbar, as starting from Windows 7, the topmost // style is always set. We don't support XP and Vista anymore. if (::IsWindow(taskbar)) { - if (MonitorFromWindow(taskbar, MONITOR_DEFAULTTONEAREST) == monitor) + if (MonitorFromWindow(taskbar, MONITOR_DEFAULTTONEAREST) == monitor) { return true; + } // In some cases like when the autohide taskbar is on the left of the // secondary monitor, the MonitorFromWindow call above fails to return the // correct monitor the taskbar is on. We fallback to MonitorFromPoint for // the cursor position in that case, which seems to work well. POINT cursor_pos = {0}; GetCursorPos(&cursor_pos); - if (MonitorFromPoint(cursor_pos, MONITOR_DEFAULTTONEAREST) == monitor) + if (MonitorFromPoint(cursor_pos, MONITOR_DEFAULTTONEAREST) == monitor) { return true; + } } return false; } @@ -90,14 +95,18 @@ DCHECK(monitor); int edges = 0; - if (MonitorHasAutohideTaskbarForEdge(ABE_LEFT, monitor)) + if (MonitorHasAutohideTaskbarForEdge(ABE_LEFT, monitor)) { edges |= views::ViewsDelegate::EDGE_LEFT; - if (MonitorHasAutohideTaskbarForEdge(ABE_TOP, monitor)) + } + if (MonitorHasAutohideTaskbarForEdge(ABE_TOP, monitor)) { edges |= views::ViewsDelegate::EDGE_TOP; - if (MonitorHasAutohideTaskbarForEdge(ABE_RIGHT, monitor)) + } + if (MonitorHasAutohideTaskbarForEdge(ABE_RIGHT, monitor)) { edges |= views::ViewsDelegate::EDGE_RIGHT; - if (MonitorHasAutohideTaskbarForEdge(ABE_BOTTOM, monitor)) + } + if (MonitorHasAutohideTaskbarForEdge(ABE_BOTTOM, monitor)) { edges |= views::ViewsDelegate::EDGE_BOTTOM; + } return edges; } @@ -153,8 +162,9 @@ // in us thinking there is no auto-hide edges. By returning at least one edge // we don't initially go fullscreen until we figure out the real auto-hide // edges. - if (!appbar_autohide_edge_map_.count(monitor)) + if (!appbar_autohide_edge_map_.count(monitor)) { appbar_autohide_edge_map_[monitor] = EDGE_BOTTOM; + } // We use the SHAppBarMessage API to get the taskbar autohide state. This API // spins a modal loop which could cause callers to be reentered. To avoid @@ -179,8 +189,9 @@ int returned_edges, int edges) { appbar_autohide_edge_map_[monitor] = edges; - if (returned_edges == edges) + if (returned_edges == edges) { return; + } base::AutoReset<bool> in_callback_setter(&in_autohide_edges_callback_, true); std::move(callback).Run();
diff --git a/chrome/browser/ui/views/chrome_web_dialog_view.cc b/chrome/browser/ui/views/chrome_web_dialog_view.cc index 7c9636e..2af0ce8 100644 --- a/chrome/browser/ui/views/chrome_web_dialog_view.cc +++ b/chrome/browser/ui/views/chrome_web_dialog_view.cc
@@ -35,8 +35,9 @@ views::Widget* widget = new views::Widget; widget->Init(std::move(params)); - if (show) + if (show) { widget->Show(); + } return widget->GetNativeWindow(); } @@ -66,13 +67,15 @@ #endif // If the corner radius is specified, set it to |views::DialogDelegate|. - if (extra_params && extra_params->corner_radius) + if (extra_params && extra_params->corner_radius) { view->set_corner_radius(*(extra_params->corner_radius)); + } views::Widget::InitParams params( views::Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET); - if (extra_params) + if (extra_params) { params = std::move(*extra_params); + } params.delegate = view; params.parent = parent; #if BUILDFLAG(IS_CHROMEOS_ASH)
diff --git a/chrome/browser/ui/views/close_bubble_on_tab_activation_helper.cc b/chrome/browser/ui/views/close_bubble_on_tab_activation_helper.cc index c837fc0a..e8d1fc3 100644 --- a/chrome/browser/ui/views/close_bubble_on_tab_activation_helper.cc +++ b/chrome/browser/ui/views/close_bubble_on_tab_activation_helper.cc
@@ -25,13 +25,15 @@ TabStripModel* tab_strip_model, const TabStripModelChange& change, const TabStripSelectionChange& selection) { - if (tab_strip_model->empty() || !selection.active_tab_changed()) + if (tab_strip_model->empty() || !selection.active_tab_changed()) { return; + } if (owner_bubble_) { views::Widget* bubble_widget = owner_bubble_->GetWidget(); - if (bubble_widget) + if (bubble_widget) { bubble_widget->Close(); + } owner_bubble_ = nullptr; } }
diff --git a/chrome/browser/ui/views/color_provider_browser_helper.cc b/chrome/browser/ui/views/color_provider_browser_helper.cc index 5aa5ebe..3669c804 100644 --- a/chrome/browser/ui/views/color_provider_browser_helper.cc +++ b/chrome/browser/ui/views/color_provider_browser_helper.cc
@@ -14,8 +14,9 @@ TabStripModel* tab_strip_model, const TabStripModelChange& change, const TabStripSelectionChange& selection) { - if (change.type() != TabStripModelChange::kInserted) + if (change.type() != TabStripModelChange::kInserted) { return; + } for (const auto& contents : change.GetInsert()->contents) { DCHECK(tab_strip_model->ContainsIndex(contents.index)); contents.contents->SetColorProviderSource(
diff --git a/chrome/browser/ui/views/commerce/price_insights_icon_view_browsertest.cc b/chrome/browser/ui/views/commerce/price_insights_icon_view_browsertest.cc index 2e8eb28..063dcc9 100644 --- a/chrome/browser/ui/views/commerce/price_insights_icon_view_browsertest.cc +++ b/chrome/browser/ui/views/commerce/price_insights_icon_view_browsertest.cc
@@ -32,8 +32,7 @@ public: PriceInsightsIconViewBrowserTest() { MockCommerceUiTabHelper::ReplaceFactory(); - test_features_.InitWithFeatures( - {commerce::kPriceInsights}, {}); + test_features_.InitWithFeatures({commerce::kPriceInsights}, {}); } // UiBrowserTest:
diff --git a/chrome/browser/ui/views/commerce/price_insights_icon_view_interactive_uitest.cc b/chrome/browser/ui/views/commerce/price_insights_icon_view_interactive_uitest.cc index 2a856cb..47fb36b 100644 --- a/chrome/browser/ui/views/commerce/price_insights_icon_view_interactive_uitest.cc +++ b/chrome/browser/ui/views/commerce/price_insights_icon_view_interactive_uitest.cc
@@ -2,15 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/test/scoped_feature_list.h" -#include "chrome/browser/ui/views/commerce/price_insights_icon_view.h" - #include "base/test/metrics/histogram_tester.h" +#include "base/test/scoped_feature_list.h" #include "chrome/browser/commerce/shopping_service_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_element_identifiers.h" #include "chrome/browser/ui/commerce/commerce_ui_tab_helper.h" #include "chrome/browser/ui/commerce/mock_commerce_ui_tab_helper.h" +#include "chrome/browser/ui/views/commerce/price_insights_icon_view.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/interactive_test_utils.h" #include "chrome/test/base/ui_test_utils.h"
diff --git a/chrome/browser/ui/views/commerce/price_tracking_icon_view.cc b/chrome/browser/ui/views/commerce/price_tracking_icon_view.cc index 3862d88..ee4532c 100644 --- a/chrome/browser/ui/views/commerce/price_tracking_icon_view.cc +++ b/chrome/browser/ui/views/commerce/price_tracking_icon_view.cc
@@ -145,8 +145,9 @@ return false; } auto* web_contents = GetWebContents(); - if (!web_contents) + if (!web_contents) { return false; + } auto* tab_helper = tabs::TabInterface::GetFromContents(web_contents) ->GetTabFeatures() ->commerce_ui_tab_helper(); @@ -210,8 +211,9 @@ } void PriceTrackingIconView::EnablePriceTracking(bool enable) { - if (IsPriceTracking() == enable) + if (IsPriceTracking() == enable) { return; + } if (enable && ShouldShowFirstUseExperienceBubble()) { profile_->GetPrefs()->SetBoolean(prefs::kShouldShowPriceTrackFUEBubble, @@ -251,17 +253,17 @@ } void PriceTrackingIconView::SetVisualState(bool enable) { - icon_ = enable ? &omnibox::kPriceTrackingEnabledRefreshIcon - : &omnibox::kPriceTrackingDisabledRefreshIcon; + icon_ = enable ? &omnibox::kPriceTrackingEnabledRefreshIcon + : &omnibox::kPriceTrackingDisabledRefreshIcon; // TODO(meiliang@): Confirm with UXW on the tooltip string. If this expected, // we can return label()->GetText() instead. - GetViewAccessibility().SetName(l10n_util::GetStringUTF16( - enable ? IDS_OMNIBOX_TRACKING_PRICE : IDS_OMNIBOX_TRACK_PRICE)); + GetViewAccessibility().SetName(l10n_util::GetStringUTF16( + enable ? IDS_OMNIBOX_TRACKING_PRICE : IDS_OMNIBOX_TRACK_PRICE)); - SetLabel(l10n_util::GetStringUTF16(enable ? IDS_OMNIBOX_TRACKING_PRICE - : IDS_OMNIBOX_TRACK_PRICE)); - SetBackgroundVisibility(BackgroundVisibility::kWithLabel); - UpdateIconImage(); + SetLabel(l10n_util::GetStringUTF16(enable ? IDS_OMNIBOX_TRACKING_PRICE + : IDS_OMNIBOX_TRACK_PRICE)); + SetBackgroundVisibility(BackgroundVisibility::kWithLabel); + UpdateIconImage(); } void PriceTrackingIconView::OnPriceTrackingServerStateUpdated(bool success) { @@ -273,8 +275,9 @@ } bool PriceTrackingIconView::IsPriceTracking() const { - if (!GetWebContents()) + if (!GetWebContents()) { return false; + } auto* tab_helper = tabs::TabInterface::GetFromContents(GetWebContents()) ->GetTabFeatures()
diff --git a/chrome/browser/ui/views/commerce/price_tracking_icon_view_browsertest.cc b/chrome/browser/ui/views/commerce/price_tracking_icon_view_browsertest.cc index 5492502..c4d2ce6 100644 --- a/chrome/browser/ui/views/commerce/price_tracking_icon_view_browsertest.cc +++ b/chrome/browser/ui/views/commerce/price_tracking_icon_view_browsertest.cc
@@ -2,12 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/views/commerce/price_tracking_icon_view.h" + #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_element_identifiers.h" #include "chrome/browser/ui/page_action/page_action_icon_type.h" #include "chrome/browser/ui/test/test_browser_ui.h" -#include "chrome/browser/ui/views/commerce/price_tracking_icon_view.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/location_bar/location_bar_view.h" #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
diff --git a/chrome/browser/ui/views/commerce/price_tracking_icon_view_interactive_uitest.cc b/chrome/browser/ui/views/commerce/price_tracking_icon_view_interactive_uitest.cc index f66b826..72696401 100644 --- a/chrome/browser/ui/views/commerce/price_tracking_icon_view_interactive_uitest.cc +++ b/chrome/browser/ui/views/commerce/price_tracking_icon_view_interactive_uitest.cc
@@ -352,7 +352,7 @@ CheckView(kPriceTrackingChipElementId, base::BindOnce([](PriceTrackingIconView* view) { return view->GetVectorIcon().name == - omnibox::kPriceTrackingDisabledRefreshIcon.name; + omnibox::kPriceTrackingDisabledRefreshIcon.name; })), PressButton(kPriceTrackingChipElementId), WaitForShow(kPriceTrackingBubbleDialogId)); @@ -373,7 +373,7 @@ CheckView(kPriceTrackingChipElementId, base::BindOnce([](PriceTrackingIconView* view) { return view->GetVectorIcon().name == - omnibox::kPriceTrackingEnabledRefreshIcon.name; + omnibox::kPriceTrackingEnabledRefreshIcon.name; }))); } @@ -576,7 +576,7 @@ CheckView(kPriceTrackingChipElementId, base::BindOnce([](PriceTrackingIconView* view) { return view->GetVectorIcon().name == - omnibox::kPriceTrackingDisabledRefreshIcon.name; + omnibox::kPriceTrackingDisabledRefreshIcon.name; })), PressButton(kPriceTrackingChipElementId), @@ -590,7 +590,7 @@ CheckView(kPriceTrackingChipElementId, base::BindOnce([](PriceTrackingIconView* view) { return view->GetVectorIcon().name == - omnibox::kPriceTrackingDisabledRefreshIcon.name; + omnibox::kPriceTrackingDisabledRefreshIcon.name; })), EnsureNotPresent(kPriceTrackingBubbleDialogId)); }
diff --git a/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc b/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc index ab62f878..412b7d6 100644 --- a/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc +++ b/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc
@@ -137,22 +137,26 @@ const input::NativeWebKeyboardEvent& event) override { // Forward shortcut keys in dialog to our initiator's delegate. // http://crbug.com/104586 - if (!initiator_web_contents_) + if (!initiator_web_contents_) { return false; + } auto* delegate = initiator_web_contents_->GetDelegate(); - if (!delegate) + if (!delegate) { return false; + } return delegate->HandleKeyboardEvent(initiator_web_contents_.get(), event); } void ResizeDueToAutoResize(content::WebContents* source, const gfx::Size& new_size) override { - if (source != web_view_->GetWebContents()) + if (source != web_view_->GetWebContents()) { return; + } - if (!initiator_web_contents_) + if (!initiator_web_contents_) { return; + } // views::WebView is only a delegate for a WebContents it creates itself via // views::WebView::GetWebContents(). ConstrainedDialogWebView's constructor @@ -428,8 +432,9 @@ } void ConstrainedDialogWebView::WindowClosing() { - if (!impl_->closed_via_webui()) + if (!impl_->closed_via_webui()) { GetWebDialogDelegate()->OnDialogClosed(std::string()); + } } views::Widget* ConstrainedDialogWebView::GetWidget() {
diff --git a/chrome/browser/ui/views/constrained_window_views_browsertest.cc b/chrome/browser/ui/views/constrained_window_views_browsertest.cc index 1120adfb..0753083 100644 --- a/chrome/browser/ui/views/constrained_window_views_browsertest.cc +++ b/chrome/browser/ui/views/constrained_window_views_browsertest.cc
@@ -242,8 +242,8 @@ // On Mac, animations cause this test to be flaky. dialog->GetWidget()->SetVisibilityChangedAnimationsEnabled(false); EXPECT_TRUE(dialog->GetWidget()->IsVisible()); - EXPECT_TRUE(ui_test_utils::SendKeyPressSync(browser(), ui::VKEY_ESCAPE, - false, false, false, false)); + EXPECT_TRUE(ui_test_utils::SendKeyPressSync(browser(), ui::VKEY_ESCAPE, false, + false, false, false)); content::RunAllPendingInMessageLoop(); EXPECT_EQ(nullptr, tracker.view()); }
diff --git a/chrome/browser/ui/views/content_setting_bubble_contents.cc b/chrome/browser/ui/views/content_setting_bubble_contents.cc index bdf6461c..58cee3c 100644 --- a/chrome/browser/ui/views/content_setting_bubble_contents.cc +++ b/chrome/browser/ui/views/content_setting_bubble_contents.cc
@@ -205,8 +205,9 @@ // As TableLayout can't remove rows, we have to rebuild it entirely. ResetLayout(); - for (auto& row : list_item_views_) + for (auto& row : list_item_views_) { AddRowToLayout(row); + } } void ContentSettingBubbleContents::ListItemContainer::ResetLayout() { @@ -224,8 +225,9 @@ auto* scroll_view = views::ScrollView::GetScrollViewForContents(this); // When this function is called from the constructor, the view has not yet // been placed into a ScrollView. - if (scroll_view) + if (scroll_view) { scroll_view->ClipHeightTo(-1, -1); + } } void ContentSettingBubbleContents::ListItemContainer::AddRowToLayout( @@ -339,15 +341,17 @@ int ContentSettingBubbleContents::GetSelectedRadioOption() { for (RadioGroup::const_iterator i(radio_group_.begin()); i != radio_group_.end(); ++i) { - if ((*i)->GetChecked()) + if ((*i)->GetChecked()) { return i - radio_group_.begin(); + } } NOTREACHED(); } std::u16string ContentSettingBubbleContents::GetWindowTitle() const { - if (!content_setting_bubble_model_) + if (!content_setting_bubble_model_) { return std::u16string(); + } return content_setting_bubble_model_->bubble_content().title; } @@ -539,8 +543,9 @@ // invoke a separate management UI related to the dialog content. if (ShouldShowManageButton(bubble_content)) { std::u16string title = bubble_content.manage_text; - if (title.empty()) + if (title.empty()) { title = l10n_util::GetStringUTF16(IDS_MANAGE); + } auto manage_button = std::make_unique<views::MdTextButton>( base::BindRepeating( [](ContentSettingBubbleContents* bubble) { @@ -556,16 +561,19 @@ manage_button_ = manage_button.get(); extra_views.push_back(std::move(manage_button)); } - if (extra_views.empty()) + if (extra_views.empty()) { return nullptr; - if (extra_views.size() == 1) + } + if (extra_views.size() == 1) { return std::move(extra_views.front()); + } auto container = std::make_unique<views::View>(); container->SetLayoutManager(std::make_unique<views::BoxLayout>( views::BoxLayout::Orientation::kHorizontal, gfx::Insets(), layout->GetDistanceMetric(views::DISTANCE_RELATED_CONTROL_HORIZONTAL))); - for (auto& extra_view : extra_views) + for (auto& extra_view : extra_views) { container->AddChildView(std::move(extra_view)); + } return container; } @@ -590,8 +598,9 @@ void ContentSettingBubbleContents::OnVisibilityChanged( content::Visibility visibility) { - if (visibility == content::Visibility::HIDDEN) + if (visibility == content::Visibility::HIDDEN) { GetWidget()->Close(); + } } void ContentSettingBubbleContents::WebContentsDestroyed() {
diff --git a/chrome/browser/ui/views/content_setting_bubble_contents_interactive_uitest.cc b/chrome/browser/ui/views/content_setting_bubble_contents_interactive_uitest.cc index 4f793ba..5a7b88f 100644 --- a/chrome/browser/ui/views/content_setting_bubble_contents_interactive_uitest.cc +++ b/chrome/browser/ui/views/content_setting_bubble_contents_interactive_uitest.cc
@@ -2,10 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/views/content_setting_bubble_contents.h" - #include "base/memory/raw_ptr.h" #include "base/ranges/algorithm.h" +#include "chrome/browser/ui/views/content_setting_bubble_contents.h" #include "chrome/browser/ui/views/location_bar/location_bar_view.h" #include "chrome/browser/ui/views/toolbar/toolbar_view.h" #include "chrome/test/base/in_process_browser_test.h" @@ -56,16 +55,18 @@ class BubbleWidgetObserver : public views::WidgetObserver { public: explicit BubbleWidgetObserver(views::Widget* widget) : widget_(widget) { - if (!widget_) + if (!widget_) { return; + } widget_->AddObserver(this); } ~BubbleWidgetObserver() override { CleanupWidget(); } void WaitForClose() { - if (!widget_) + if (!widget_) { return; + } run_loop_ = std::make_unique<base::RunLoop>(); run_loop_->Run(); } @@ -73,13 +74,15 @@ // views::WidgetObserver: void OnWidgetDestroyed(views::Widget* widget) override { CleanupWidget(); - if (run_loop_) + if (run_loop_) { run_loop_->Quit(); + } } void CleanupWidget() { - if (!widget_) + if (!widget_) { return; + } widget_->RemoveObserver(this); widget_ = nullptr; }
diff --git a/chrome/browser/ui/views/content_test_utils.h b/chrome/browser/ui/views/content_test_utils.h index 07c6fccc..fbbece43d 100644 --- a/chrome/browser/ui/views/content_test_utils.h +++ b/chrome/browser/ui/views/content_test_utils.h
@@ -5,7 +5,6 @@ #ifndef CHROME_BROWSER_UI_VIEWS_CONTENT_TEST_UTILS_H_ #define CHROME_BROWSER_UI_VIEWS_CONTENT_TEST_UTILS_H_ - namespace content { class WebContents; }
diff --git a/chrome/browser/ui/views/controls/hover_button.cc b/chrome/browser/ui/views/controls/hover_button.cc index c464414..dd42748 100644 --- a/chrome/browser/ui/views/controls/hover_button.cc +++ b/chrome/browser/ui/views/controls/hover_button.cc
@@ -95,12 +95,9 @@ } // namespace -HoverButton::HoverButton(PressedCallback callback, const std::u16string& text) - : views::LabelButton( - base::BindRepeating(&HoverButton::OnPressed, base::Unretained(this)), - text, - views::style::CONTEXT_BUTTON), - callback_(std::move(callback)) { +HoverButton::HoverButton() + : views::LabelButton(base::BindRepeating(&HoverButton::OnPressed, + base::Unretained(this))) { SetButtonController(std::make_unique<HoverButtonController>( this, std::make_unique<views::Button::DefaultButtonControllerDelegate>(this))); @@ -128,6 +125,12 @@ views::ButtonController::NotifyAction::kOnRelease); } +HoverButton::HoverButton(PressedCallback callback, const std::u16string& text) + : HoverButton() { + SetCallback(std::move(callback)); + SetText(text); +} + HoverButton::HoverButton(PressedCallback callback, const ui::ImageModel& icon, const std::u16string& text) @@ -234,6 +237,12 @@ HoverButton::~HoverButton() = default; +void HoverButton::SetCallback(PressedCallback callback) { + // TODO(pkasting): Why does HoverButton have its own callback -- to disable + // special handling of the label? Can we remove this member and override? + callback_ = std::move(callback); +} + gfx::Size HoverButton::CalculatePreferredSize( const views::SizeBounds& available_size) const { if (label_wrapper_) { @@ -278,8 +287,9 @@ void HoverButton::SetSubtitleTextStyle(int text_context, views::style::TextStyle text_style) { - if (!subtitle()) + if (!subtitle()) { return; + } subtitle()->SetTextContext(text_context); subtitle()->SetTextStyle(text_style); @@ -358,8 +368,9 @@ } views::View* HoverButton::GetTooltipHandlerForPoint(const gfx::Point& point) { - if (!HitTestPoint(point)) + if (!HitTestPoint(point)) { return nullptr; + } // Let the secondary control handle it if it has a tooltip. if (secondary_view_) {
diff --git a/chrome/browser/ui/views/controls/hover_button.h b/chrome/browser/ui/views/controls/hover_button.h index ac8d426..d1dd30a1d 100644 --- a/chrome/browser/ui/views/controls/hover_button.h +++ b/chrome/browser/ui/views/controls/hover_button.h
@@ -45,6 +45,8 @@ public: enum Style { STYLE_PROMINENT, STYLE_ERROR }; + HoverButton(); + // Creates a single line hover button with no icon. HoverButton(PressedCallback callback, const std::u16string& text); @@ -75,6 +77,7 @@ ~HoverButton() override; // views::LabelButton: + void SetCallback(PressedCallback callback) override; gfx::Size CalculatePreferredSize( const views::SizeBounds& available_size) const override; void SetBorder(std::unique_ptr<views::Border> b) override;
diff --git a/chrome/browser/ui/views/controls/rich_hover_button.cc b/chrome/browser/ui/views/controls/rich_hover_button.cc index 3253ea1..c09258e 100644 --- a/chrome/browser/ui/views/controls/rich_hover_button.cc +++ b/chrome/browser/ui/views/controls/rich_hover_button.cc
@@ -4,7 +4,11 @@ #include "chrome/browser/ui/views/controls/rich_hover_button.h" -#include "base/strings/string_util.h" +#include <memory> +#include <string_view> +#include <utility> + +#include "base/strings/strcat.h" #include "chrome/browser/ui/views/accessibility/non_accessible_image_view.h" #include "chrome/browser/ui/views/chrome_layout_provider.h" #include "chrome/browser/ui/views/chrome_typography.h" @@ -24,16 +28,15 @@ namespace { -std::unique_ptr<views::ImageView> CreateIconView( - const ui::ImageModel& icon_image) { - auto icon = std::make_unique<NonAccessibleImageView>(); - icon->SetImage(icon_image); +std::unique_ptr<views::ImageView> CreateIconView(ui::ImageModel icon) { + auto view = std::make_unique<NonAccessibleImageView>(); + view->SetImage(std::move(icon)); // Make sure hovering over the icon also hovers the `RichHoverButton`. - icon->SetCanProcessEventsWithinSubtree(false); + view->SetCanProcessEventsWithinSubtree(false); // Don't cover |icon| when the ink drops are being painted. - icon->SetPaintToLayer(); - icon->layer()->SetFillsBoundsOpaquely(false); - return icon; + view->SetPaintToLayer(); + view->layer()->SetFillsBoundsOpaquely(false); + return view; } // TODO(crbug.com/355018927): Remove this when we implement in views::Label. @@ -64,62 +67,92 @@ } // namespace -RichHoverButton::RichHoverButton( - views::Button::PressedCallback callback, - const ui::ImageModel& main_image_icon, - const std::u16string& title_text, - const std::u16string& subtitle_text, - std::optional<ui::ImageModel> action_image_icon, - std::optional<ui::ImageModel> state_icon) - : HoverButton(std::move(callback), std::u16string()) { - label()->SetHandlesTooltips(false); - - // TODO(pkasting): This class should subclass Button, not HoverButton. +RichHoverButton::RichHoverButton() { image_container_view()->SetProperty(views::kViewIgnoredByLayoutKey, true); + label()->SetHandlesTooltips(false); label()->SetProperty(views::kViewIgnoredByLayoutKey, true); ink_drop_container()->SetProperty(views::kViewIgnoredByLayoutKey, true); - SetBorder( - views::CreateEmptyBorder(ChromeLayoutProvider::Get()->GetInsetsMetric( - ChromeInsetsMetric::INSETS_PAGE_INFO_HOVER_BUTTON))); + start_ = children().size(); - AddChildView(CreateIconView(main_image_icon)); - auto title_label = std::make_unique<views::Label>(); - title_label->SetTextContext(views::style::CONTEXT_DIALOG_BODY_TEXT); - - title_ = AddChildView(std::move(title_label)); - title_->SetHorizontalAlignment(gfx::ALIGN_LEFT); - title_->SetCanProcessEventsWithinSubtree(false); - title_->SetTextStyle(views::style::STYLE_BODY_3_MEDIUM); - - // State icon is optional and column is created only when it is set. - if (state_icon.has_value()) { - state_icon_ = AddChildView(CreateIconView(state_icon.value())); - } - - if (action_image_icon.has_value()) { - AddChildView(CreateIconView(action_image_icon.value())); - } else { - // Fill the cell with an empty view at column 5. - AddChildView(std::make_unique<views::View>()); - } + views::Builder<RichHoverButton>(this) + .SetBorder( + views::CreateEmptyBorder(ChromeLayoutProvider::Get()->GetInsetsMetric( + ChromeInsetsMetric::INSETS_PAGE_INFO_HOVER_BUTTON))) + // Main icon placeholder. + .AddChild(views::Builder<views::View>()) + // Title. + .AddChild(views::Builder<views::Label>() + .CopyAddressTo(&title_) + .SetTextContext(views::style::CONTEXT_DIALOG_BODY_TEXT) + .SetTextStyle(views::style::STYLE_BODY_3_MEDIUM) + .SetHorizontalAlignment(gfx::ALIGN_LEFT) + .SetCanProcessEventsWithinSubtree(false)) + // Action icon placeholder. + .AddChild(views::Builder<views::View>()) + .BuildChildren(); custom_view_row_start_ = children().size(); RecreateLayout(); +} +RichHoverButton::RichHoverButton(views::Button::PressedCallback callback, + ui::ImageModel icon, + std::u16string_view title_text, + std::u16string_view subtitle_text, + ui::ImageModel action_icon, + ui::ImageModel state_icon) + : RichHoverButton() { + SetCallback(std::move(callback)); + SetIcon(std::move(icon)); SetTitleText(title_text); + SetStateIcon(std::move(state_icon)); + SetActionIcon(std::move(action_icon)); SetSubtitleText(subtitle_text); } RichHoverButton::~RichHoverButton() = default; -void RichHoverButton::SetTitleText(const std::u16string& title_text) { - title_->SetText(title_text); +ui::ImageModel RichHoverButton::GetIcon() const { + return icon_ ? icon_->GetImageModel() : ui::ImageModel(); +} + +void RichHoverButton::SetIcon(ui::ImageModel icon) { + SetIconMember(icon_, start_, std::move(icon), true); +} + +std::u16string_view RichHoverButton::GetTitleText() const { + return title_->GetText(); +} + +void RichHoverButton::SetTitleText(std::u16string_view title_text) { + title_->SetText(std::u16string(title_text)); UpdateAccessibleName(); } -void RichHoverButton::SetSubtitleText(const std::u16string& subtitle_text) { +ui::ImageModel RichHoverButton::GetStateIcon() const { + return state_icon_ ? state_icon_->GetImageModel() : ui::ImageModel(); +} + +void RichHoverButton::SetStateIcon(ui::ImageModel state_icon) { + SetIconMember(state_icon_, start_ + 2, std::move(state_icon), false); +} + +ui::ImageModel RichHoverButton::GetActionIcon() const { + return action_icon_ ? action_icon_->GetImageModel() : ui::ImageModel(); +} + +void RichHoverButton::SetActionIcon(ui::ImageModel action_icon) { + SetIconMember(action_icon_, start_ + (state_icon_ ? 3 : 2), + std::move(action_icon), true); +} + +std::u16string_view RichHoverButton::GetSubtitleText() const { + return subtitle_ ? subtitle_->GetText() : std::u16string_view(); +} + +void RichHoverButton::SetSubtitleText(std::u16string_view subtitle_text) { if (subtitle_text.empty()) { subtitle_ = nullptr; for (const auto& v : subtitle_row_views_) { @@ -136,19 +169,26 @@ std::make_unique<SubtitleLabelWrapper>(std::move(subtitle)))); subtitle_->SetTextStyle(views::style::STYLE_BODY_5); subtitle_->SetEnabledColorId(ui::kColorLabelForegroundSecondary); - subtitle_->SetMultiLine(true); + subtitle_->SetMultiLine(subtitle_multiline_); subtitle_->SetHorizontalAlignment(gfx::ALIGN_LEFT); subtitle_->SetAutoColorReadabilityEnabled(false); base::Extend(subtitle_row_views_, AddFillerViews(children().size())); } - subtitle_->SetText(subtitle_text); + subtitle_->SetText(std::u16string(subtitle_text)); } RecreateLayout(); UpdateAccessibleName(); } -void RichHoverButton::SetSubtitleMultiline(bool is_multiline) { - subtitle_->SetMultiLine(is_multiline); +bool RichHoverButton::GetSubtitleMultiline() const { + return subtitle_multiline_; +} + +void RichHoverButton::SetSubtitleMultiline(bool subtitle_multiline) { + subtitle_multiline_ = subtitle_multiline; + if (subtitle_) { + subtitle_->SetMultiLine(subtitle_multiline); + } } void RichHoverButton::SetTitleTextStyleAndColor(int style, @@ -165,14 +205,6 @@ } } -const views::Label* RichHoverButton::GetTitleViewForTesting() const { - return title_; -} - -const views::Label* RichHoverButton::GetSubTitleViewForTesting() const { - return subtitle_; -} - void RichHoverButton::OnBoundsChanged(const gfx::Rect& previous_bounds) { return Button::OnBoundsChanged(previous_bounds); } @@ -187,6 +219,33 @@ return Button::CalculatePreferredSize(available_size); } +void RichHoverButton::SetIconMember(raw_ptr<views::ImageView>& icon_member, + size_t child_index, + ui::ImageModel icon, + bool use_placeholder) { + if (icon.IsEmpty()) { + if (icon_member) { + icon_member = nullptr; + RemoveChildViewT(children()[child_index]); + if (use_placeholder) { + AddChildViewAt(std::make_unique<views::View>(), child_index); + } else { + RecreateLayout(); + } + } + } else if (!icon_member) { + if (use_placeholder) { + RemoveChildViewT(children()[child_index]); + } + icon_member = AddChildViewAt(CreateIconView(std::move(icon)), child_index); + if (!use_placeholder) { + RecreateLayout(); + } + } else { + icon_member->SetImage(std::move(icon)); + } +} + void RichHoverButton::RecreateLayout() { const int icon_label_spacing = ChromeLayoutProvider::Get()->GetDistanceMetric( DISTANCE_RICH_HOVER_BUTTON_ICON_HORIZONTAL); @@ -236,12 +295,11 @@ } void RichHoverButton::UpdateAccessibleName() { - const std::u16string title_text = title_->GetText(); - const std::u16string accessible_name = - subtitle_ == nullptr - ? title_text - : base::JoinString({title_text, subtitle_->GetText()}, u"\n"); - HoverButton::GetViewAccessibility().SetName(accessible_name); + const std::u16string_view title_text = GetTitleText(); + const std::u16string_view subtitle_text = GetSubtitleText(); + HoverButton::GetViewAccessibility().SetName( + subtitle_text.empty() ? std::u16string(title_text) + : base::StrCat({title_text, u"\n", subtitle_text})); } std::vector<raw_ptr<views::View>> RichHoverButton::AddFillerViews( @@ -255,4 +313,10 @@ } BEGIN_METADATA(RichHoverButton) +ADD_PROPERTY_METADATA(ui::ImageModel, Icon) +ADD_PROPERTY_METADATA(std::u16string_view, TitleText) +ADD_PROPERTY_METADATA(ui::ImageModel, StateIcon) +ADD_PROPERTY_METADATA(ui::ImageModel, ActionIcon) +ADD_PROPERTY_METADATA(std::u16string_view, SubtitleText) +ADD_PROPERTY_METADATA(bool, SubtitleMultiline) END_METADATA
diff --git a/chrome/browser/ui/views/controls/rich_hover_button.h b/chrome/browser/ui/views/controls/rich_hover_button.h index cbfaa4e..828e346 100644 --- a/chrome/browser/ui/views/controls/rich_hover_button.h +++ b/chrome/browser/ui/views/controls/rich_hover_button.h
@@ -5,14 +5,13 @@ #ifndef CHROME_BROWSER_UI_VIEWS_CONTROLS_RICH_HOVER_BUTTON_H_ #define CHROME_BROWSER_UI_VIEWS_CONTROLS_RICH_HOVER_BUTTON_H_ -#include <algorithm> -#include <string> +#include <string_view> #include <vector> #include "base/containers/extend.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/ui/views/controls/hover_button.h" -#include "ui/views/layout/table_layout.h" +#include "ui/views/metadata/view_factory.h" namespace test { class PageInfoBubbleViewTestApi; @@ -23,6 +22,7 @@ } // namespace ui namespace views { +class ImageView; class Label; class View; } // namespace views @@ -44,24 +44,36 @@ METADATA_HEADER(RichHoverButton, HoverButton) public: - RichHoverButton( - views::Button::PressedCallback callback, - const ui::ImageModel& main_image_icon, - const std::u16string& title_text, - const std::u16string& subtitle_text, - std::optional<ui::ImageModel> action_image_icon = std::nullopt, - std::optional<ui::ImageModel> state_icon = std::nullopt); + RichHoverButton(); + RichHoverButton(views::Button::PressedCallback callback, + ui::ImageModel icon, + std::u16string_view title_text, + std::u16string_view subtitle_text, + ui::ImageModel action_icon = ui::ImageModel(), + ui::ImageModel state_icon = ui::ImageModel()); RichHoverButton(const RichHoverButton&) = delete; RichHoverButton& operator=(const RichHoverButton&) = delete; ~RichHoverButton() override; - void SetTitleText(const std::u16string& title_text); + ui::ImageModel GetIcon() const; + void SetIcon(ui::ImageModel icon); - void SetSubtitleText(const std::u16string& subtitle_text); + std::u16string_view GetTitleText() const; + void SetTitleText(std::u16string_view title_text); - void SetSubtitleMultiline(bool is_multiline); + ui::ImageModel GetStateIcon() const; + void SetStateIcon(ui::ImageModel state_icon); + + ui::ImageModel GetActionIcon() const; + void SetActionIcon(ui::ImageModel action_icon); + + std::u16string_view GetSubtitleText() const; + void SetSubtitleText(std::u16string_view subtitle_text); + + bool GetSubtitleMultiline() const; + void SetSubtitleMultiline(bool subtitle_multiline); // TODO(crbug.com/40281048): Remove; at least color, and possibly both of // these, should instead be computed automatically from a single context value @@ -88,9 +100,8 @@ base::Extend(custom_view_row_views_, AddFillerViews(start)); } else { CHECK_GT(custom_view_row_views_.size(), 1u); - const size_t index = *GetIndexOf(custom_view_row_views_[1]); RemoveChildViewT(custom_view_row_views_[1]); - view = AddChildViewAt(std::move(custom_view), index); + view = AddChildViewAt(std::move(custom_view), custom_view_row_start_ + 1); custom_view_row_views_[1] = view; } @@ -98,9 +109,6 @@ return view; } - const views::Label* GetTitleViewForTesting() const; - const views::Label* GetSubTitleViewForTesting() const; - protected: // HoverButton: void OnBoundsChanged(const gfx::Rect& previous_bounds) override; @@ -109,27 +117,58 @@ const views::SizeBounds& available_size) const override; private: - // Recreates the table layout, which must be done any time the custom view - // changes between empty and non-empty (since its row is not filled with - // placeholder `View`s when absent). + // Updates the image at `icon_member`, which corresponds to child + // `child_index`, to be `icon`. If `icon` is empty, the member will be set to + // null. If `use_placeholder` is true, empty `View`s are inserted (instead of + // nothing) when the provided image is empty, to avoid changing the columns of + // items in the table. + void SetIconMember(raw_ptr<views::ImageView>& icon_member, + size_t child_index, + ui::ImageModel icon, + bool use_placeholder); + + // Recreates the table layout, which must be done any time the custom view or + // subtitle change between empty and non-empty (since those rows are not + // filled with placeholder `View`s when absent). // TODO(pkasting): This class should lay out using box, not table, with // top-aligned children, and add enough padding to the // icons/custom view/subtitle to properly align with the title. That would // obviate the need to recreate the layout after construction. void RecreateLayout(); + // Recomputes the accessible name, which is affected by both labels. void UpdateAccessibleName(); - // Add filler views for state icon (if set) and action icon columns. Used for + // Adds filler views for state icon (if set) and action icon columns. Used for // the table rows after the first one. std::vector<raw_ptr<views::View>> AddFillerViews(size_t start); - raw_ptr<views::Label> title_ = nullptr; + size_t start_; + // `ImageView` pointers and `subtitle` are non-null only if present. + raw_ptr<views::ImageView> icon_ = nullptr; + raw_ptr<views::Label> title_; // Never null. raw_ptr<views::ImageView> state_icon_ = nullptr; + raw_ptr<views::ImageView> action_icon_ = nullptr; size_t custom_view_row_start_; std::vector<raw_ptr<views::View>> custom_view_row_views_; std::vector<raw_ptr<views::View>> subtitle_row_views_; raw_ptr<views::Label> subtitle_ = nullptr; + bool subtitle_multiline_ = true; }; +BEGIN_VIEW_BUILDER(, RichHoverButton, HoverButton) +VIEW_BUILDER_PROPERTY(ui::ImageModel, Icon) +VIEW_BUILDER_PROPERTY(std::u16string_view, TitleText) +VIEW_BUILDER_PROPERTY(ui::ImageModel, StateIcon) +VIEW_BUILDER_PROPERTY(ui::ImageModel, ActionIcon) +VIEW_BUILDER_PROPERTY(std::u16string_view, SubtitleText) +VIEW_BUILDER_PROPERTY(bool, SubtitleMultiline) +VIEW_BUILDER_METHOD(SetTitleTextStyleAndColor, int, ui::ColorId) +VIEW_BUILDER_METHOD(SetSubtitleTextStyleAndColor, int, ui::ColorId) +VIEW_BUILDER_TEMPLATED_PROPERTY(<typename T>, CustomView, std::unique_ptr<T>) + +END_VIEW_BUILDER + +DEFINE_VIEW_BUILDER(, RichHoverButton) + #endif // CHROME_BROWSER_UI_VIEWS_CONTROLS_RICH_HOVER_BUTTON_H_
diff --git a/chrome/browser/ui/views/create_application_shortcut_view.cc b/chrome/browser/ui/views/create_application_shortcut_view.cc index 083370ee..05ad12f7 100644 --- a/chrome/browser/ui/views/create_application_shortcut_view.cc +++ b/chrome/browser/ui/views/create_application_shortcut_view.cc
@@ -109,8 +109,9 @@ base::BindOnce(&CreateChromeApplicationShortcutView::OnDialogAccepted, base::Unretained(this))); auto canceled = [](CreateChromeApplicationShortcutView* dialog) { - if (!dialog->close_callback_.is_null()) + if (!dialog->close_callback_.is_null()) { std::move(dialog->close_callback_).Run(false); + } }; SetCancelCallback(base::BindOnce(canceled, base::Unretained(this))); SetCloseCallback(base::BindOnce(canceled, base::Unretained(this))); @@ -158,17 +159,19 @@ provider->GetDistanceMetric(views::DISTANCE_RELATED_CONTROL_VERTICAL))); AddChildView(std::move(create_shortcuts_label)); desktop_check_box_ = AddChildView(std::move(desktop_check_box)); - if (menu_check_box) + if (menu_check_box) { menu_check_box_ = AddChildView(std::move(menu_check_box)); - if (pin_to_taskbar_checkbox) + } + if (pin_to_taskbar_checkbox) { quick_launch_check_box_ = AddChildView(std::move(pin_to_taskbar_checkbox)); + } } gfx::Size CreateChromeApplicationShortcutView::CalculatePreferredSize( const views::SizeBounds& available_size) const { static const int kDialogWidth = 360; - int height = GetLayoutManager()->GetPreferredHeightForWidth(this, - kDialogWidth); + int height = + GetLayoutManager()->GetPreferredHeightForWidth(this, kDialogWidth); return gfx::Size(kDialogWidth, height); } @@ -178,8 +181,9 @@ return true; // It's always possible to cancel out of creating a shortcut. } - if (!shortcut_info_) + if (!shortcut_info_) { return false; // Dialog's not ready because app info hasn't been loaded. + } // One of the three location checkboxes must be checked: return desktop_check_box_->GetChecked() || @@ -194,12 +198,14 @@ void CreateChromeApplicationShortcutView::OnDialogAccepted() { DCHECK(IsDialogButtonEnabled(ui::mojom::DialogButton::kOk)); - if (!close_callback_.is_null()) + if (!close_callback_.is_null()) { std::move(close_callback_).Run(/*success=*/shortcut_info_ != nullptr); + } // Shortcut can't be created because app info hasn't been loaded. - if (!shortcut_info_) + if (!shortcut_info_) { return; + } web_app::ShortcutLocations creation_locations; creation_locations.on_desktop = desktop_check_box_->GetChecked();
diff --git a/chrome/browser/ui/views/critical_notification_bubble_view.cc b/chrome/browser/ui/views/critical_notification_bubble_view.cc index 0a0c6cb2..183fdc5 100644 --- a/chrome/browser/ui/views/critical_notification_bubble_view.cc +++ b/chrome/browser/ui/views/critical_notification_bubble_view.cc
@@ -117,8 +117,9 @@ // the user selects, for example, "Stay on this page" during an // onbeforeunload handler. PrefService* prefs = g_browser_process->local_state(); - if (prefs->HasPrefPath(prefs::kRestartLastSessionOnShutdown)) + if (prefs->HasPrefPath(prefs::kRestartLastSessionOnShutdown)) { prefs->ClearPref(prefs::kRestartLastSessionOnShutdown); + } } void CriticalNotificationBubbleView::OnDialogAccepted() { @@ -150,8 +151,9 @@ void CriticalNotificationBubbleView::ViewHierarchyChanged( const views::ViewHierarchyChangedDetails& details) { - if (details.is_add && details.child == this) + if (details.is_add && details.child == this) { NotifyAccessibilityEvent(ax::mojom::Event::kAlert, true); + } } BEGIN_METADATA(CriticalNotificationBubbleView)
diff --git a/chrome/browser/ui/views/crostini/crostini_ansible_software_config_view.cc b/chrome/browser/ui/views/crostini/crostini_ansible_software_config_view.cc index 5b129104..f6d11fc 100644 --- a/chrome/browser/ui/views/crostini/crostini_ansible_software_config_view.cc +++ b/chrome/browser/ui/views/crostini/crostini_ansible_software_config_view.cc
@@ -155,8 +155,9 @@ const std::vector<std::string>& status_lines) { // Pass if this isn't for the current dialog. LOG(ERROR) << "Progress: " << status_lines.back(); - if (container_id != container_id_) + if (container_id != container_id_) { return; + } progress_label_->SetText(base::UTF8ToUTF16(status_lines.back())); OnStateChanged(); } @@ -165,15 +166,17 @@ const guest_os::GuestId& container_id, bool success) { // Pass if this isn't for the current dialog. - if (container_id != container_id_) + if (container_id != container_id_) { return; + } DCHECK_EQ(state_, State::CONFIGURING); if (!success) { - if (content::GetNetworkConnectionTracker()->IsOffline()) + if (content::GetNetworkConnectionTracker()->IsOffline()) { state_ = State::ERROR_OFFLINE; - else + } else { state_ = State::ERROR; + } OnStateChanged(); return; @@ -201,8 +204,9 @@ SetButtonLabel(ui::mojom::DialogButton::kCancel, l10n_util::GetStringUTF16(IDS_APP_CANCEL)); DialogModelChanged(); - if (GetWidget()) + if (GetWidget()) { GetWidget()->SetSize(GetWidget()->non_client_view()->GetPreferredSize()); + } } BEGIN_METADATA(CrostiniAnsibleSoftwareConfigView)
diff --git a/chrome/browser/ui/views/crostini/crostini_ansible_software_config_view_browsertest.cc b/chrome/browser/ui/views/crostini/crostini_ansible_software_config_view_browsertest.cc index ceaaf4c4..d3f64aa 100644 --- a/chrome/browser/ui/views/crostini/crostini_ansible_software_config_view_browsertest.cc +++ b/chrome/browser/ui/views/crostini/crostini_ansible_software_config_view_browsertest.cc
@@ -398,10 +398,11 @@ browser()->profile()->GetPrefs()->GetFilePath( crostini::prefs::kCrostiniAnsiblePlaybookFilePath), base::BindLambdaForTesting([&](bool success) { - if (done_once) + if (done_once) { run_loop()->Quit(); - else + } else { done_once = true; + } })); ansible_management_service()->ConfigureContainer( @@ -409,10 +410,11 @@ browser()->profile()->GetPrefs()->GetFilePath( crostini::prefs::kCrostiniAnsiblePlaybookFilePath), base::BindLambdaForTesting([&](bool success) { - if (done_once) + if (done_once) { run_loop()->Quit(); - else + } else { done_once = true; + } })); run_loop()->Run(); EXPECT_TRUE(HasNoView(container1));
diff --git a/chrome/browser/ui/views/crostini/crostini_force_close_view.h b/chrome/browser/ui/views/crostini/crostini_force_close_view.h index 93f74dc..55d86b6 100644 --- a/chrome/browser/ui/views/crostini/crostini_force_close_view.h +++ b/chrome/browser/ui/views/crostini/crostini_force_close_view.h
@@ -5,13 +5,13 @@ #ifndef CHROME_BROWSER_UI_VIEWS_CROSTINI_CROSTINI_FORCE_CLOSE_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_CROSTINI_CROSTINI_FORCE_CLOSE_VIEW_H_ +#include <string> + #include "base/functional/callback.h" #include "ui/base/metadata/metadata_header_macros.h" #include "ui/gfx/native_widget_types.h" #include "ui/views/bubble/bubble_dialog_delegate_view.h" -#include <string> - namespace views { class Widget; }
diff --git a/chrome/browser/ui/views/crostini/crostini_package_install_failure_view_browsertest.cc b/chrome/browser/ui/views/crostini/crostini_package_install_failure_view_browsertest.cc index 2d0cc84..7365444c 100644 --- a/chrome/browser/ui/views/crostini/crostini_package_install_failure_view_browsertest.cc +++ b/chrome/browser/ui/views/crostini/crostini_package_install_failure_view_browsertest.cc
@@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/test/test_browser_dialog.h" - -#include "chrome/browser/ui/views/crostini/crostini_dialogue_browser_test_util.h" #include "chrome/browser/ui/views/crostini/crostini_package_install_failure_view.h" + +#include "chrome/browser/ui/test/test_browser_dialog.h" +#include "chrome/browser/ui/views/crostini/crostini_dialogue_browser_test_util.h" #include "content/public/test/browser_test.h" namespace crostini {
diff --git a/chrome/browser/ui/views/crostini/crostini_uninstaller_view.cc b/chrome/browser/ui/views/crostini/crostini_uninstaller_view.cc index 92b46c9..aa31597 100644 --- a/chrome/browser/ui/views/crostini/crostini_uninstaller_view.cc +++ b/chrome/browser/ui/views/crostini/crostini_uninstaller_view.cc
@@ -140,8 +140,9 @@ // or the dialog being closed. The simplest way to prevent metrics being // erroneously logged for user cancellation is to only record the first // metric. - if (has_logged_result_) + if (has_logged_result_) { return; + } base::UmaHistogramEnumeration(kCrostiniUninstallResultHistogram, result, UninstallResult::kCount);
diff --git a/chrome/browser/ui/views/crypto_module_password_dialog_view.cc b/chrome/browser/ui/views/crypto_module_password_dialog_view.cc index d361922f..cf04e06 100644 --- a/chrome/browser/ui/views/crypto_module_password_dialog_view.cc +++ b/chrome/browser/ui/views/crypto_module_password_dialog_view.cc
@@ -82,8 +82,7 @@ switch (reason) { case kCryptoModulePasswordCertEnrollment: text = l10n_util::GetStringFUTF8( - IDS_CRYPTO_MODULE_AUTH_DIALOG_TEXT_CERT_ENROLLMENT, - slot16, + IDS_CRYPTO_MODULE_AUTH_DIALOG_TEXT_CERT_ENROLLMENT, slot16, hostname16); break; case kCryptoModulePasswordClientAuth:
diff --git a/chrome/browser/ui/views/crypto_module_password_dialog_view.h b/chrome/browser/ui/views/crypto_module_password_dialog_view.h index d541577..92f6199 100644 --- a/chrome/browser/ui/views/crypto_module_password_dialog_view.h +++ b/chrome/browser/ui/views/crypto_module_password_dialog_view.h
@@ -17,7 +17,7 @@ namespace views { class Label; class Textfield; -} +} // namespace views class CryptoModulePasswordDialogView : public views::DialogDelegateView, public views::TextfieldController {
diff --git a/chrome/browser/ui/views/desktop_capture/desktop_media_list_controller.cc b/chrome/browser/ui/views/desktop_capture/desktop_media_list_controller.cc index 415c8d2..6508bad 100644 --- a/chrome/browser/ui/views/desktop_capture/desktop_media_list_controller.cc +++ b/chrome/browser/ui/views/desktop_capture/desktop_media_list_controller.cc
@@ -98,8 +98,9 @@ dialog_window_id_ = dialog_window_id; // Defer calling StartUpdating on media lists with a delegated source list // until the first time they are focused. - if (!media_list_->IsSourceListDelegated()) + if (!media_list_->IsSourceListDelegated()) { StartUpdatingInternal(); + } } void DesktopMediaListController::StartUpdatingInternal() { @@ -109,11 +110,13 @@ } void DesktopMediaListController::FocusView() { - if (view_) + if (view_) { view_->RequestFocus(); + } - if (media_list_->IsSourceListDelegated() && !is_updating_) + if (media_list_->IsSourceListDelegated() && !is_updating_) { StartUpdatingInternal(); + } media_list_->FocusList(); } @@ -137,8 +140,9 @@ } void DesktopMediaListController::SetCanReselect(bool can_reselect) { - if (can_reselect_ == can_reselect) + if (can_reselect_ == can_reselect) { return; + } can_reselect_ = can_reselect; dialog_->OnCanReselectChanged(this); } @@ -163,8 +167,9 @@ } void DesktopMediaListController::ClearSelection() { - if (view_) + if (view_) { view_->ClearSelection(); + } } void DesktopMediaListController::OnSourceListLayoutChanged() { @@ -176,8 +181,9 @@ } void DesktopMediaListController::AcceptSource() { - if (GetSelection()) + if (GetSelection()) { dialog_->AcceptSource(); + } } void DesktopMediaListController::AcceptSpecificSource(
diff --git a/chrome/browser/ui/views/desktop_capture/desktop_media_list_view.cc b/chrome/browser/ui/views/desktop_capture/desktop_media_list_view.cc index bdc71f6..56c8eba 100644 --- a/chrome/browser/ui/views/desktop_capture/desktop_media_list_view.cc +++ b/chrome/browser/ui/views/desktop_capture/desktop_media_list_view.cc
@@ -110,8 +110,9 @@ for (int y = 0;; y += (height + item_spacing_)) { for (int x = 0, col = 0; col < active_style_->columns; ++col, x += (width + item_spacing_)) { - if (i == children().end()) + if (i == children().end()) { return; + } (*i++)->SetBounds(x + horizontal_margins_, y + vertical_margins_, width, height); } @@ -137,8 +138,9 @@ return false; } - if (position_increment == 0) + if (position_increment == 0) { return false; + } views::View* selected = GetSelectedView(); views::View* new_selected = nullptr; @@ -153,14 +155,16 @@ (index + position_increment) > (children().size() - 1)) { new_index = children().size() - 1; } - if (index != new_index) + if (index != new_index) { new_selected = children()[new_index]; + } } else if (!children().empty()) { new_selected = children().front(); } - if (new_selected) + if (new_selected) { new_selected->RequestFocus(); + } return true; } @@ -186,8 +190,9 @@ const DesktopMediaList::Source& source = controller_->GetSource(index); // We are going to have a second item, apply the generic style. - if (children().size() == 1) + if (children().size() == 1) { SetStyle(&generic_style_); + } DesktopMediaSourceView* source_view = new DesktopMediaSourceView(this, source.id, *active_style_); @@ -201,16 +206,18 @@ // detecting this, we load the default icon from resource. if (icon_image.isNull()) { aura::Window* window = DesktopMediaID::GetNativeWindowById(source.id); - if (window) + if (window) { icon_image = LoadDefaultIcon(window); + } } #endif source_view->SetIcon(icon_image); } AddChildViewAt(source_view, index); - if ((children().size() - 1) % active_style_->columns == 0) + if ((children().size() - 1) % active_style_->columns == 0) { controller_->OnSourceListLayoutChanged(); + } PreferredSizeChanged(); } @@ -223,15 +230,18 @@ RemoveChildView(view); delete view; - if (was_selected) + if (was_selected) { OnSelectionChanged(); + } - if (children().size() % active_style_->columns == 0) + if (children().size() % active_style_->columns == 0) { controller_->OnSourceListLayoutChanged(); + } // Apply single-item styling when the second source is removed. - if (children().size() == 1) + if (children().size() == 1) { SetStyle(&single_style_); + } PreferredSizeChanged(); } @@ -261,8 +271,9 @@ // If the SourceList is delegated, we will only have one (or zero), sources. // As long as we have one source, select it once we get notified that the user // made a selection in the delegated source list. - if (!children().empty()) + if (!children().empty()) { children().front()->RequestFocus(); + } } void DesktopMediaListView::SetStyle(DesktopMediaSourceViewStyle* style) {
diff --git a/chrome/browser/ui/views/desktop_capture/desktop_media_pane_view.cc b/chrome/browser/ui/views/desktop_capture/desktop_media_pane_view.cc index bfdc9ba..f041d7c 100644 --- a/chrome/browser/ui/views/desktop_capture/desktop_media_pane_view.cc +++ b/chrome/browser/ui/views/desktop_capture/desktop_media_pane_view.cc
@@ -21,7 +21,7 @@ #if BUILDFLAG(IS_MAC) : type_(type) #endif - { +{ layout_ = SetLayoutManager(std::make_unique<views::BoxLayout>( views::BoxLayout::Orientation::kVertical, gfx::Insets(0)));
diff --git a/chrome/browser/ui/views/desktop_capture/desktop_media_permission_pane_view_mac.mm b/chrome/browser/ui/views/desktop_capture/desktop_media_permission_pane_view_mac.mm index 947bdde..b22f6857 100644 --- a/chrome/browser/ui/views/desktop_capture/desktop_media_permission_pane_view_mac.mm +++ b/chrome/browser/ui/views/desktop_capture/desktop_media_permission_pane_view_mac.mm
@@ -156,14 +156,13 @@ button_layout->set_main_axis_alignment( views::BoxLayout::MainAxisAlignment::kCenter); // Unretained safe because button is (transitively) owned by `this`. - button_ = - button_container->AddChildView(std::make_unique<views::MdTextButton>( - base::BindRepeating( - &DesktopMediaPermissionPaneViewMac:: - OpenScreenRecordingSettingsPane, - base::Unretained(this)), - l10n_util::GetStringUTF16( - IDS_DESKTOP_MEDIA_PICKER_PERMISSION_BUTTON_MAC))); + button_ = button_container->AddChildView(std::make_unique< + views::MdTextButton>( + base::BindRepeating( + &DesktopMediaPermissionPaneViewMac::OpenScreenRecordingSettingsPane, + base::Unretained(this)), + l10n_util::GetStringUTF16( + IDS_DESKTOP_MEDIA_PICKER_PERMISSION_BUTTON_MAC))); button_->SetStyle(ui::ButtonStyle::kProminent); }
diff --git a/chrome/browser/ui/views/desktop_capture/desktop_media_permission_pane_view_mac_unittest.mm b/chrome/browser/ui/views/desktop_capture/desktop_media_permission_pane_view_mac_unittest.mm index 7d55909..5c7ae91 100644 --- a/chrome/browser/ui/views/desktop_capture/desktop_media_permission_pane_view_mac_unittest.mm +++ b/chrome/browser/ui/views/desktop_capture/desktop_media_permission_pane_view_mac_unittest.mm
@@ -2,10 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/views/desktop_capture/desktop_media_permission_pane_view_mac.h" + #include "base/test/mock_callback.h" #include "base/test/task_environment.h" #include "chrome/browser/ui/views/chrome_layout_provider.h" -#include "chrome/browser/ui/views/desktop_capture/desktop_media_permission_pane_view_mac.h" #include "testing/gtest/include/gtest/gtest.h" using base::test::TaskEnvironment;
diff --git a/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc b/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc index 883678c..fe2347d4 100644 --- a/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc +++ b/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc
@@ -401,8 +401,9 @@ RegisterDeleteDelegateCallback(base::BindOnce( [](DesktopMediaPickerDialogView* dialog) { // If the dialog is being closed then notify the parent about it. - if (dialog->parent_) + if (dialog->parent_) { dialog->parent_->NotifyDialogResult(DesktopMediaID()); + } }, this)); @@ -675,8 +676,9 @@ } void DesktopMediaPickerDialogView::TabSelectedAt(int index) { - if (previously_selected_category_ == index) + if (previously_selected_category_ == index) { return; + } ConfigureUIForNewPane(index); categories_[previously_selected_category_].controller->HideView(); categories_[index].controller->FocusView(); @@ -984,8 +986,9 @@ RecordSourceCountsUma(); RecordTabDiscardedStatusUma(source); - if (parent_) + if (parent_) { parent_->NotifyDialogResult(source); + } // Return true to close the window. return true; @@ -1087,8 +1090,9 @@ // working it's way back to us after we've switched controllers. If that's the // case, then the state will be updated the next time that controller is // active, but we shouldn't update it just now. - if (controller != GetSelectedController() || !reselect_button_) + if (controller != GetSelectedController() || !reselect_button_) { return; + } reselect_button_->SetEnabled(controller->can_reselect()); } @@ -1169,8 +1173,9 @@ DesktopMediaPickerManager::Get()->OnHideDialog(); - if (callback_.is_null()) + if (callback_.is_null()) { return; + } // Notify the |callback_| asynchronously because it may need to destroy // DesktopMediaPicker.
diff --git a/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views_browsertest.cc b/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views_browsertest.cc index 9e15bcd..c519326 100644 --- a/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views_browsertest.cc +++ b/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views_browsertest.cc
@@ -45,13 +45,15 @@ if (override_source_lists_.empty()) { sources = CreateDefaultSourceLists(); } else { - for (auto& source : override_source_lists_) + for (auto& source : override_source_lists_) { sources.push_back(std::move(source)); + } } std::vector<FakeDesktopMediaList*> source_lists; - for (const auto& source : sources) + for (const auto& source : sources) { source_lists.push_back(static_cast<FakeDesktopMediaList*>(source.get())); + } DesktopMediaPicker::Params picker_params{ DesktopMediaPicker::Params::RequestSource::kUnknown}; @@ -63,8 +65,9 @@ picker_->Show(picker_params, std::move(sources), DesktopMediaPicker::DoneCallback()); - if (after_show_callback_) + if (after_show_callback_) { std::move(after_show_callback_).Run(source_lists); + } } protected:
diff --git a/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views_test_api.cc b/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views_test_api.cc index a7c91d39..630ae90 100644 --- a/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views_test_api.cc +++ b/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views_test_api.cc
@@ -33,8 +33,9 @@ source_view->RequestFocus(); } else { GetTableView()->RequestFocus(); - if (select) + if (select) { GetTableView()->Select(index); + } } } @@ -51,8 +52,9 @@ size_t index, bool double_click) { int flags = ui::EF_LEFT_MOUSE_BUTTON; - if (double_click) + if (double_click) { flags |= ui::EF_IS_DOUBLE_CLICK; + } views::View* source_view = GetSourceAtIndex(index); if (source_view) { source_view->OnMousePressed( @@ -119,8 +121,9 @@ bool DesktopMediaPickerViewsTestApi::HasSourceAtIndex(size_t index) const { const views::TableView* table = GetTableView(); - if (table) + if (table) { return base::checked_cast<size_t>(table->GetRowCount()) > index; + } return !!GetSourceAtIndex(index); } @@ -176,15 +179,17 @@ const views::View* DesktopMediaPickerViewsTestApi::GetSourceAtIndex( size_t index) const { views::View* list = picker_->dialog_->GetSelectedController()->view_; - if (IsDesktopMediaTabList(list) || index >= list->children().size()) + if (IsDesktopMediaTabList(list) || index >= list->children().size()) { return nullptr; + } return list->children()[index]; } views::View* DesktopMediaPickerViewsTestApi::GetSourceAtIndex(size_t index) { views::View* list = picker_->dialog_->GetSelectedController()->view_; - if (IsDesktopMediaTabList(list) || index >= list->children().size()) + if (IsDesktopMediaTabList(list) || index >= list->children().size()) { return nullptr; + } return list->children()[index]; }
diff --git a/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views_unittest.cc b/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views_unittest.cc index 9252d1c..8cc8dd4 100644 --- a/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views_unittest.cc +++ b/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views_unittest.cc
@@ -179,8 +179,9 @@ } void TearDown() override { - if (GetPickerDialogView()) + if (GetPickerDialogView()) { GetPickerDialogView()->GetWidget()->CloseNow(); + } widget_destroyed_waiter_->Wait(); DesktopMediaPickerManager::Get()->RemoveObserver(&observer_); } @@ -763,8 +764,9 @@ // The dialog's height should not change when going from zero sources to nine // sources. - for (int i = 0; i < 9; i++) + for (int i = 0; i < 9; i++) { AddTabSource(); + } EXPECT_EQ(GetDialogHeight(), initial_size); // The dialog's height should be fixed and equal to the equivalent of ten @@ -775,15 +777,17 @@ EXPECT_EQ(GetDialogHeight(), initial_size); // And then it shouldn't change when going to a larger number of sources. - for (int i = 0; i < 50; i++) + for (int i = 0; i < 50; i++) { AddTabSource(); + } EXPECT_EQ(GetDialogHeight(), initial_size); // And then it shouldn't change when going from a large number of sources (in // this case 61) to a larger number, because the ScrollView should scroll // large numbers of sources. - for (int i = 0; i < 50; i++) + for (int i = 0; i < 50; i++) { AddTabSource(); + } EXPECT_EQ(GetDialogHeight(), initial_size); }
diff --git a/chrome/browser/ui/views/desktop_capture/desktop_media_source_view.cc b/chrome/browser/ui/views/desktop_capture/desktop_media_source_view.cc index 1182a6c..5a13010 100644 --- a/chrome/browser/ui/views/desktop_capture/desktop_media_source_view.cc +++ b/chrome/browser/ui/views/desktop_capture/desktop_media_source_view.cc
@@ -51,9 +51,7 @@ DesktopMediaListView* parent, DesktopMediaID source_id, DesktopMediaSourceViewStyle style) - : parent_(parent), - source_id_(source_id), - selected_(false) { + : parent_(parent), source_id_(source_id), selected_(false) { icon_view_ = AddChildView(std::make_unique<views::ImageView>()); image_view_ = AddChildView(std::make_unique<RoundedCornerImageView>()); label_ = AddChildView(std::make_unique<views::Label>()); @@ -87,8 +85,9 @@ } void DesktopMediaSourceView::SetSelected(bool selected) { - if (selected == selected_) + if (selected == selected_) { return; + } selected_ = selected; if (selected) { @@ -132,8 +131,9 @@ } void DesktopMediaSourceView::ClearSelection() { - if (!GetSelected()) + if (!GetSelected()) { return; + } SetSelected(false); parent_->OnSelectionChanged(); } @@ -141,15 +141,17 @@ views::View* DesktopMediaSourceView::GetSelectedViewForGroup(int group) { Views neighbours; parent()->GetViewsInGroup(group, &neighbours); - if (neighbours.empty()) + if (neighbours.empty()) { return nullptr; + } for (auto i(neighbours.begin()); i != neighbours.end(); ++i) { DCHECK(views::IsViewClass<DesktopMediaSourceView>(*i)); DesktopMediaSourceView* source_view = static_cast<DesktopMediaSourceView*>(*i); - if (source_view->selected_) + if (source_view->selected_) { return source_view; + } } return nullptr; }
diff --git a/chrome/browser/ui/views/desktop_capture/desktop_media_tab_list.cc b/chrome/browser/ui/views/desktop_capture/desktop_media_tab_list.cc index 64fd3c3..568db1e4 100644 --- a/chrome/browser/ui/views/desktop_capture/desktop_media_tab_list.cc +++ b/chrome/browser/ui/views/desktop_capture/desktop_media_tab_list.cc
@@ -193,8 +193,9 @@ void TabListViewObserver::OnKeyDown(ui::KeyboardCode virtual_keycode) { DCHECK_CURRENTLY_ON(BrowserThread::UI); - if (virtual_keycode == ui::VKEY_RETURN) + if (virtual_keycode == ui::VKEY_RETURN) { controller_->AcceptSource(); + } } std::unique_ptr<views::ScrollView> CreateScrollViewWithTable( @@ -351,8 +352,9 @@ std::optional<content::DesktopMediaID> DesktopMediaTabList::GetSelection() { DCHECK_CURRENTLY_ON(BrowserThread::UI); std::optional<size_t> row = table_->GetFirstSelectedRow(); - if (!row.has_value()) + if (!row.has_value()) { return std::nullopt; + } return controller_->GetSource(row.value()).id; }
diff --git a/chrome/browser/ui/views/desktop_capture/desktop_media_tab_list_unittest.cc b/chrome/browser/ui/views/desktop_capture/desktop_media_tab_list_unittest.cc index cda77697..1fe0ba02 100644 --- a/chrome/browser/ui/views/desktop_capture/desktop_media_tab_list_unittest.cc +++ b/chrome/browser/ui/views/desktop_capture/desktop_media_tab_list_unittest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/views/desktop_capture/desktop_media_tab_list.h" + #include "base/memory/raw_ptr.h" #include "base/time/time.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/views/device_chooser_browsertest.cc b/chrome/browser/ui/views/device_chooser_browsertest.cc index 6821e53..5c275edb 100644 --- a/chrome/browser/ui/views/device_chooser_browsertest.cc +++ b/chrome/browser/ui/views/device_chooser_browsertest.cc
@@ -37,10 +37,11 @@ void ShowChooser(const std::string& test_name, Browser* browser, std::unique_ptr<permissions::ChooserController> controller) { - if (base::EndsWith(test_name, "Modal", base::CompareCase::SENSITIVE)) + if (base::EndsWith(test_name, "Modal", base::CompareCase::SENSITIVE)) { ShowChooserModal(browser, std::move(controller)); - else + } else { ShowChooserBubble(browser, std::move(controller)); + } } } // namespace
diff --git a/chrome/browser/ui/views/device_chooser_content_view.cc b/chrome/browser/ui/views/device_chooser_content_view.cc index 00cf2767..954251b 100644 --- a/chrome/browser/ui/views/device_chooser_content_view.cc +++ b/chrome/browser/ui/views/device_chooser_content_view.cc
@@ -185,8 +185,9 @@ } int level = chooser_controller_->GetSignalStrengthLevel(row); - if (level == -1) + if (level == -1) { return ui::ImageModel(); + } static constexpr std::array kSignalStrengthLevelImageIds{ IDR_SIGNAL_0_BAR, IDR_SIGNAL_1_BAR, IDR_SIGNAL_2_BAR, IDR_SIGNAL_3_BAR, @@ -233,8 +234,9 @@ ShowReScanButton(enabled); } - if (GetWidget() && GetWidget()->GetRootView()) + if (GetWidget() && GetWidget()->GetRootView()) { GetWidget()->GetRootView()->DeprecatedLayoutImmediately(); + } } void DeviceChooserContentView::OnAdapterAuthorizationChanged(bool authorized) { @@ -257,13 +259,15 @@ UpdateTableView(); } - if (refreshing) + if (refreshing) { ShowThrobber(); - else + } else { ShowReScanButton(/*enable=*/true); + } - if (GetWidget() && GetWidget()->GetRootView()) + if (GetWidget() && GetWidget()->GetRootView()) { GetWidget()->GetRootView()->DeprecatedLayoutImmediately(); + } } std::u16string DeviceChooserContentView::GetWindowTitle() const { @@ -408,8 +412,9 @@ } void DeviceChooserContentView::ShowThrobber() { - if (re_scan_button_) + if (re_scan_button_) { re_scan_button_->SetVisible(false); + } throbber_->SetVisible(true); throbber_label_->SetVisible(true);
diff --git a/chrome/browser/ui/views/device_chooser_content_view.h b/chrome/browser/ui/views/device_chooser_content_view.h index d0783e1..c1cfa48 100644 --- a/chrome/browser/ui/views/device_chooser_content_view.h +++ b/chrome/browser/ui/views/device_chooser_content_view.h
@@ -23,7 +23,7 @@ class TableView; class TableViewObserver; class Throbber; -} +} // namespace views // A bubble or dialog view for choosing among several options in a table. // Used for WebUSB/WebBluetooth device selection for Chrome and extensions.
diff --git a/chrome/browser/ui/views/device_signals_consent/consent_dialog_browsertest.cc b/chrome/browser/ui/views/device_signals_consent/consent_dialog_browsertest.cc index 69571953..8ad5cc5 100644 --- a/chrome/browser/ui/views/device_signals_consent/consent_dialog_browsertest.cc +++ b/chrome/browser/ui/views/device_signals_consent/consent_dialog_browsertest.cc
@@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/views/device_signals_consent/consent_dialog_coordinator.h" - #include "base/strings/utf_string_conversions.h" #include "base/test/scoped_feature_list.h" #include "base/values.h" @@ -13,6 +11,7 @@ #include "chrome/browser/profiles/profile_attributes_storage.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/views/device_signals_consent/consent_dialog_coordinator.h" #include "chrome/grit/generated_resources.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/testing_browser_process.h"
diff --git a/chrome/browser/ui/views/devtools_process_observer.cc b/chrome/browser/ui/views/devtools_process_observer.cc index e3a56485..a057349 100644 --- a/chrome/browser/ui/views/devtools_process_observer.cc +++ b/chrome/browser/ui/views/devtools_process_observer.cc
@@ -23,26 +23,30 @@ void DevtoolsProcessObserver::BrowserChildProcessLaunchedAndConnected( const content::ChildProcessData& data) { - if (data.process_type == content::PROCESS_TYPE_GPU) + if (data.process_type == content::PROCESS_TYPE_GPU) { tracing_agent_->set_gpu_pid(data.GetProcess().Pid()); + } } void DevtoolsProcessObserver::BrowserChildProcessHostDisconnected( const content::ChildProcessData& data) { - if (data.process_type == content::PROCESS_TYPE_GPU) + if (data.process_type == content::PROCESS_TYPE_GPU) { tracing_agent_->set_gpu_pid(base::kNullProcessId); + } } void DevtoolsProcessObserver::BrowserChildProcessCrashed( const content::ChildProcessData& data, const content::ChildProcessTerminationInfo& info) { - if (data.process_type == content::PROCESS_TYPE_GPU) + if (data.process_type == content::PROCESS_TYPE_GPU) { tracing_agent_->set_gpu_pid(base::kNullProcessId); + } } void DevtoolsProcessObserver::BrowserChildProcessKilled( const content::ChildProcessData& data, const content::ChildProcessTerminationInfo& info) { - if (data.process_type == content::PROCESS_TYPE_GPU) + if (data.process_type == content::PROCESS_TYPE_GPU) { tracing_agent_->set_gpu_pid(base::kNullProcessId); + } }
diff --git a/chrome/browser/ui/views/download/bubble/download_bubble_interactive_uitest.cc b/chrome/browser/ui/views/download/bubble/download_bubble_interactive_uitest.cc index e3eed4e1..9f0ba2b4 100644 --- a/chrome/browser/ui/views/download/bubble/download_bubble_interactive_uitest.cc +++ b/chrome/browser/ui/views/download/bubble/download_bubble_interactive_uitest.cc
@@ -247,9 +247,7 @@ #if BUILDFLAG(IS_MAC) auto EnterImmersiveFullscreen() { - return [&]() { - ui_test_utils::ToggleFullscreenModeAndWait(browser()); - }; + return [&]() { ui_test_utils::ToggleFullscreenModeAndWait(browser()); }; } auto IsInImmersiveFullscreen() {
diff --git a/chrome/browser/ui/views/download/bubble/download_bubble_row_view.cc b/chrome/browser/ui/views/download/bubble/download_bubble_row_view.cc index 46fc105..abe7c82 100644 --- a/chrome/browser/ui/views/download/bubble/download_bubble_row_view.cc +++ b/chrome/browser/ui/views/download/bubble/download_bubble_row_view.cc
@@ -694,8 +694,9 @@ return true; } - if (!drag_start_point_) + if (!drag_start_point_) { drag_start_point_ = event.location(); + } if (!dragging_) { dragging_ = ExceededDragThreshold(event.location() - *drag_start_point_); } else if ((info_->model()->GetState() == download::DownloadItem::COMPLETE) &&
diff --git a/chrome/browser/ui/views/download/download_danger_prompt_views.cc b/chrome/browser/ui/views/download/download_danger_prompt_views.cc index d4b3746..c775259 100644 --- a/chrome/browser/ui/views/download/download_danger_prompt_views.cc +++ b/chrome/browser/ui/views/download/download_danger_prompt_views.cc
@@ -84,9 +84,7 @@ download::DownloadItem* item, Profile* profile, OnDone done) - : download_(item), - profile_(profile), - done_(std::move(done)) { + : download_(item), profile_(profile), done_(std::move(done)) { // Note that this prompt is asking whether to cancel a dangerous download, so // the accept path is titled "Cancel". SetButtonLabel(ui::mojom::DialogButton::kOk, @@ -125,8 +123,9 @@ } DownloadDangerPromptViews::~DownloadDangerPromptViews() { - if (download_) + if (download_) { download_->RemoveObserver(this); + } } // DownloadDangerPrompt methods: @@ -236,8 +235,9 @@ download_->RemoveObserver(this); download_ = nullptr; } - if (done) + if (done) { std::move(done).Run(action); + } } BEGIN_METADATA(DownloadDangerPromptViews)
diff --git a/chrome/browser/ui/views/download/download_item_view.cc b/chrome/browser/ui/views/download/download_item_view.cc index c624f5c..0b082fe 100644 --- a/chrome/browser/ui/views/download/download_item_view.cc +++ b/chrome/browser/ui/views/download/download_item_view.cc
@@ -203,8 +203,9 @@ void StyleFilename(views::StyledLabel& label, size_t pos, size_t len) { // Ensure the label contains a nonempty filename. - if ((pos == std::u16string::npos) || (len == 0)) + if ((pos == std::u16string::npos) || (len == 0)) { return; + } views::StyledLabel::RangeStyleInfo style; style.text_style = GetFilenameStyle(label); @@ -282,8 +283,9 @@ base::Milliseconds(30), base::BindRepeating( [](DownloadItemView* view) { - if (view->model_->PercentComplete() < 0) + if (view->model_->PercentComplete() < 0) { view->SchedulePaint(); + } }, base::Unretained(this))), accessible_alert_(accessible_alert), @@ -399,8 +401,9 @@ const int text_width = text_end - text_x; const int file_name_height = file_name_label_->GetLineHeight(); int text_height = file_name_height; - if (!status_label_->GetText().empty()) + if (!status_label_->GetText().empty()) { text_height += status_label_->GetLineHeight(); + } file_name_label_->SetBounds(text_x, CenterY(text_height), text_width, file_name_height); @@ -423,8 +426,9 @@ {save_button_, discard_button_, scan_button_, open_now_button_, review_button_}) { button->SetBoundsRect(button_bounds); - if (button->GetVisible()) + if (button->GetVisible()) { button_bounds.set_x(button_bounds.right() + kSaveDiscardButtonPadding); + } } } } @@ -433,11 +437,13 @@ // Handle drag (file copy) operations. // Mouse should not activate us in dangerous mode. - if (has_warning_label(mode_)) + if (has_warning_label(mode_)) { return true; + } - if (!drag_start_point_) + if (!drag_start_point_) { drag_start_point_ = event.location(); + } if (!dragging_) { dragging_ = ExceededDragThreshold(event.location() - *drag_start_point_); } else if ((model_->GetState() == download::DownloadItem::COMPLETE) && @@ -456,8 +462,9 @@ void DownloadItemView::OnMouseCaptureLost() { // Mouse should not activate us in dangerous mode. - if (mode_ != download::DownloadItemMode::kNormal) + if (mode_ != download::DownloadItemMode::kNormal) { return; + } if (dragging_) { // Starting a drag results in a MouseCaptureLost. @@ -518,8 +525,9 @@ StyleFilename(*file_name_label_, filename_offset, filename.length()); const auto reenable = [](base::WeakPtr<DownloadItemView> view) { - if (!view) + if (!view) { return; + } view->SetEnabled(true); auto* label = view->file_name_label_.get(); label->SetTextStyle(views::style::STYLE_PRIMARY); @@ -637,8 +645,9 @@ DCHECK_EQ(download::DownloadItemMode::kNormal, mode_); // Loop back and forth five times. double start = 0, end = 5; - if (model_->GetState() == download::DownloadItem::INTERRUPTED) + if (model_->GetState() == download::DownloadItem::INTERRUPTED) { std::swap(start, end); + } const double value = gfx::Tween::DoubleValueBetween( complete_animation_.GetCurrentValue(), start, end); const double opacity = std::sin((value + 0.5) * std::numbers::pi) / 2 + 0.5; @@ -662,8 +671,9 @@ const int offset = (progress_bounds.height() - file_icon->height()) / 2; cc::PaintFlags flags; // Use an alpha to make the image look disabled. - if (!GetEnabled()) + if (!GetEnabled()) { flags.setAlphaf(120.0f / 255.0f); + } canvas->DrawImageInt(*file_icon, progress_x + offset, progress_y + offset, flags); } @@ -705,8 +715,9 @@ } void DownloadItemView::SetMode(download::DownloadItemMode mode) { - if (mode_ == mode && mode != download::DownloadItemMode::kNormal) + if (mode_ == mode && mode != download::DownloadItemMode::kNormal) { return; + } mode_ = mode; UpdateFilePathAndIcons(); UpdateLabels(); @@ -763,8 +774,9 @@ // is the case, there's nothing to do. const base::FilePath file_path = model_->GetTargetFilePath(); if ((model_->GetState() != download::DownloadItem::COMPLETE) && - (file_path_ == file_path)) + (file_path_ == file_path)) { return; + } file_path_ = file_path; cancelable_task_tracker_.TryCancelAll(); @@ -774,8 +786,9 @@ void DownloadItemView::StartLoadIcons() { // The correct scale_factor is set only in the AddedToWidget() - if (!GetWidget()) + if (!GetWidget()) { return; + } // The small icon is not stored directly, but will be requested in other // functions, so ask the icon manager to load it so it's cached. IconManager* const im = g_browser_process->icon_manager(); @@ -888,8 +901,9 @@ // For determinate progress, this function is called each time more data is // received, which should result in updating the progress indicator. - if (model_->PercentComplete() > 0) + if (model_->PercentComplete() > 0) { SchedulePaint(); + } return; } @@ -928,8 +942,9 @@ const std::u16string& accessible_alert_text) { views::ViewAccessibility& ax = accessible_alert_->GetViewAccessibility(); ax.SetRole(ax::mojom::Role::kAlert); - if (!accessible_alert_text.empty()) + if (!accessible_alert_text.empty()) { ax.SetName(accessible_alert_text, ax::mojom::NameFrom::kAttribute); + } if (announce_accessible_alert_soon_ || !accessible_alert_timer_.IsRunning()) { AnnounceAccessibleAlert(); accessible_alert_timer_.Reset(); @@ -947,8 +962,9 @@ std::u16string DownloadItemView::GetInProgressAccessibleAlertText() const { // If opening when complete or there is a warning, use the full status text. - if (model_->GetOpenWhenComplete() || has_warning_label(mode_)) + if (model_->GetOpenWhenComplete() || has_warning_label(mode_)) { return CalculateAccessibleName(); + } return model_->GetInProgressAccessibleAlertText(); } @@ -1083,8 +1099,9 @@ STYLE_GREEN}; } constexpr int kDangerous = IDS_PROMPT_DOWNLOAD_DEEP_SCANNED_OPENED_DANGEROUS; - if (type == DangerType::DOWNLOAD_DANGER_TYPE_DEEP_SCANNED_OPENED_DANGEROUS) + if (type == DangerType::DOWNLOAD_DANGER_TYPE_DEEP_SCANNED_OPENED_DANGEROUS) { return {l10n_util::GetStringUTF16(kDangerous), STYLE_RED}; + } const std::u16string text = model_->GetStatusTextForLabel(status_label_->font_list(), kTextWidth); @@ -1092,18 +1109,23 @@ } gfx::Size DownloadItemView::GetButtonSize() const { - if (mode_ == download::DownloadItemMode::kDeepScanning) + if (mode_ == download::DownloadItemMode::kDeepScanning) { return open_now_button_->GetPreferredSize(); + } gfx::Size size; - if (discard_button_->GetVisible()) + if (discard_button_->GetVisible()) { size.SetToMax(discard_button_->GetPreferredSize()); - if (save_button_->GetVisible()) + } + if (save_button_->GetVisible()) { size.SetToMax(save_button_->GetPreferredSize()); - if (scan_button_->GetVisible()) + } + if (scan_button_->GetVisible()) { size.SetToMax(scan_button_->GetPreferredSize()); - if (review_button_->GetVisible()) + } + if (review_button_->GetVisible()) { size.SetToMax(review_button_->GetPreferredSize()); + } return size; } @@ -1134,13 +1156,15 @@ // Return 200 if that much width is sufficient to fit |label| on one line. int width = 200; - if (lines_for_width(width) < 2) + if (lines_for_width(width) < 2) { return width; + } // Find an upper bound width sufficient to fit |label| on two lines. int min_width = 1, max_width; - for (max_width = width; lines_for_width(max_width) > 2; max_width *= 2) + for (max_width = width; lines_for_width(max_width) > 2; max_width *= 2) { min_width = max_width; + } // Binary-search for the smallest width that fits on two lines. // TODO(pkasting): Can use std::iota_view() when C++20 is available. @@ -1151,8 +1175,9 @@ } void DownloadItemView::SetDropdownPressed(bool pressed) { - if (dropdown_pressed_ == pressed) + if (dropdown_pressed_ == pressed) { return; + } dropdown_pressed_ = pressed; dropdown_button_->SetHighlighted(dropdown_pressed_); UpdateDropdownButtonImage();
diff --git a/chrome/browser/ui/views/download/download_shelf_context_menu_view.cc b/chrome/browser/ui/views/download/download_shelf_context_menu_view.cc index e95b74b..8393e5fe 100644 --- a/chrome/browser/ui/views/download/download_shelf_context_menu_view.cc +++ b/chrome/browser/ui/views/download/download_shelf_context_menu_view.cc
@@ -60,10 +60,11 @@ // The menu's alignment is determined based on the UI layout. Position position; - if (base::i18n::IsRTL()) + if (base::i18n::IsRTL()) { position = Position::kTopRight; - else + } else { position = Position::kTopLeft; + } menu_runner_->RunMenuAt(parent_widget, nullptr, rect, position, source_type); } @@ -78,15 +79,17 @@ close_time_ = base::TimeTicks::Now(); // This must be run before clearing |menu_runner_| who owns the reference. - if (!on_menu_closed_callback.is_null()) + if (!on_menu_closed_callback.is_null()) { on_menu_closed_callback.Run(); + } menu_runner_.reset(); } void DownloadShelfContextMenuView::OnMenuWillShow(ui::SimpleMenuModel* source) { - if (on_menu_will_show_callback_) + if (on_menu_will_show_callback_) { std::move(on_menu_will_show_callback_).Run(); + } } void DownloadShelfContextMenuView::ExecuteCommand(int command_id,
diff --git a/chrome/browser/ui/views/download/download_shelf_context_menu_view.h b/chrome/browser/ui/views/download/download_shelf_context_menu_view.h index 15aa5eb..c7d6293 100644 --- a/chrome/browser/ui/views/download/download_shelf_context_menu_view.h +++ b/chrome/browser/ui/views/download/download_shelf_context_menu_view.h
@@ -22,7 +22,7 @@ namespace views { class MenuRunner; class Widget; -} +} // namespace views class DownloadBubbleUIController;
diff --git a/chrome/browser/ui/views/download/download_shelf_view.cc b/chrome/browser/ui/views/download/download_shelf_view.cc index f3394da8..2dc16b7 100644 --- a/chrome/browser/ui/views/download/download_shelf_view.cc +++ b/chrome/browser/ui/views/download/download_shelf_view.cc
@@ -137,8 +137,9 @@ adjust_size(close_button_); adjust_size(show_all_view_); // Add one download view to the preferred size. - if (!download_views_.empty()) + if (!download_views_.empty()) { adjust_size(download_views_.front()); + } prefsize.Enlarge(0, kTopPadding); return gfx::Tween::SizeValueBetween(shelf_animation_.GetCurrentValue(), @@ -207,16 +208,18 @@ } void DownloadShelfView::AnimationEnded(const gfx::Animation* animation) { - if (animation != &shelf_animation_) + if (animation != &shelf_animation_) { return; + } const bool shown = shelf_animation_.IsShowing(); parent_->SetDownloadShelfVisible(shown); // If the shelf was explicitly closed by the user, there are further steps to // take to complete closing. - if (shown || is_hidden()) + if (shown || is_hidden()) { return; + } // Remove all completed downloads. for (size_t i = 0; i < download_views_.size();) { @@ -240,8 +243,9 @@ // TODO(crbug.com/41390999): Fix AccessiblePaneView::SetVisible() or // FocusManager to make this unnecessary. auto* focus_manager = GetFocusManager(); - if (focus_manager && Contains(focus_manager->GetFocusedView())) + if (focus_manager && Contains(focus_manager->GetFocusedView())) { parent_->contents_web_view()->RequestFocus(); + } SetVisible(false); } @@ -263,10 +267,11 @@ CHECK(i != download_views_.end(), base::NotFatalUntil::M130); download_views_.erase(i); RemoveChildViewT(view); - if (download_views_.empty()) + if (download_views_.empty()) { Close(); - else + } else { AutoClose(); + } InvalidateLayout(); } @@ -293,8 +298,9 @@ // we already have this many download views, one is removed. // TODO(pkasting): Maybe this should use a min width instead. constexpr size_t kMaxDownloadViews = 15; - if (download_views_.size() > kMaxDownloadViews) + if (download_views_.size() > kMaxDownloadViews) { RemoveDownloadView(download_views_.front()); + } new_item_animation_.Reset(); new_item_animation_.Show();
diff --git a/chrome/browser/ui/views/download/download_shelf_view.h b/chrome/browser/ui/views/download/download_shelf_view.h index 4c844e45..39feeef 100644 --- a/chrome/browser/ui/views/download/download_shelf_view.h +++ b/chrome/browser/ui/views/download/download_shelf_view.h
@@ -27,7 +27,7 @@ namespace views { class ImageButton; class MdTextButton; -} +} // namespace views // DownloadShelfView is a view that contains individual views for each download, // as well as a close button and a link to show all downloads.
diff --git a/chrome/browser/ui/views/elevation_icon_setter.cc b/chrome/browser/ui/views/elevation_icon_setter.cc index fd9c934..ae9fca7 100644 --- a/chrome/browser/ui/views/elevation_icon_setter.cc +++ b/chrome/browser/ui/views/elevation_icon_setter.cc
@@ -20,20 +20,21 @@ #include "ui/gfx/icon_util.h" #endif - // Helpers -------------------------------------------------------------------- namespace { #if BUILDFLAG(IS_WIN) SkBitmap GetElevationIcon() { - if (!base::win::UserAccountControlIsEnabled()) + if (!base::win::UserAccountControlIsEnabled()) { return SkBitmap(); + } - SHSTOCKICONINFO icon_info = { sizeof(SHSTOCKICONINFO) }; + SHSTOCKICONINFO icon_info = {sizeof(SHSTOCKICONINFO)}; if (FAILED(SHGetStockIconInfo(SIID_SHIELD, SHGSI_ICON | SHGSI_SMALLICON, - &icon_info))) + &icon_info))) { return SkBitmap(); + } SkBitmap icon = IconUtil::CreateSkBitmapFromHICON( icon_info.hIcon, @@ -45,7 +46,6 @@ } // namespace - // ElevationIconSetter -------------------------------------------------------- ElevationIconSetter::ElevationIconSetter(views::LabelButton* button)
diff --git a/chrome/browser/ui/views/event_utils.cc b/chrome/browser/ui/views/event_utils.cc index 0acc03e2..9c878f8 100644 --- a/chrome/browser/ui/views/event_utils.cc +++ b/chrome/browser/ui/views/event_utils.cc
@@ -9,8 +9,8 @@ namespace event_utils { bool IsPossibleDispositionEvent(const ui::Event& event) { - return event.IsMouseEvent() && (event.flags() & - (ui::EF_LEFT_MOUSE_BUTTON | ui::EF_MIDDLE_MOUSE_BUTTON)); + return event.IsMouseEvent() && (event.flags() & (ui::EF_LEFT_MOUSE_BUTTON | + ui::EF_MIDDLE_MOUSE_BUTTON)); } } // namespace event_utils
diff --git a/chrome/browser/ui/views/exclusive_access_bubble_views.cc b/chrome/browser/ui/views/exclusive_access_bubble_views.cc index b2808cb..333cfd1 100644 --- a/chrome/browser/ui/views/exclusive_access_bubble_views.cc +++ b/chrome/browser/ui/views/exclusive_access_bubble_views.cc
@@ -192,13 +192,15 @@ } void ExclusiveAccessBubbleViews::RepositionIfVisible() { - if (IsVisible()) + if (IsVisible()) { UpdateBounds(); + } } void ExclusiveAccessBubbleViews::HideImmediately() { - if (!IsShowing() && !popup_->IsVisible()) + if (!IsShowing() && !popup_->IsVisible()) { return; + } RunHideCallbackIfNeeded(ExclusiveAccessBubbleHideReason::kInterrupted); @@ -280,8 +282,9 @@ void ExclusiveAccessBubbleViews::AnimationEnded( const gfx::Animation* animation) { - if (animation_->IsShowing()) + if (animation_->IsShowing()) { GetView()->NotifyAccessibilityEvent(ax::mojom::Event::kAlert, true); + } AnimationProgressed(animation); } @@ -327,8 +330,9 @@ } void ExclusiveAccessBubbleViews::Show() { - if (animation_->IsShowing()) + if (animation_->IsShowing()) { return; + } animation_->SetSlideDuration(base::Milliseconds(350)); animation_->Show(); }
diff --git a/chrome/browser/ui/views/exclusive_access_bubble_views.h b/chrome/browser/ui/views/exclusive_access_bubble_views.h index 63d247d7..341cdce 100644 --- a/chrome/browser/ui/views/exclusive_access_bubble_views.h +++ b/chrome/browser/ui/views/exclusive_access_bubble_views.h
@@ -20,7 +20,7 @@ namespace views { class View; class Widget; -} +} // namespace views class SubtleNotificationView; @@ -67,7 +67,6 @@ void UpdateViewContent(ExclusiveAccessBubbleType bubble_type); - // Returns the desired rect for the popup window in screen coordinates. gfx::Rect GetPopupRect() const;
diff --git a/chrome/browser/ui/views/extensions/browser_action_drag_data.cc b/chrome/browser/ui/views/extensions/browser_action_drag_data.cc index 496de13..4e6214e 100644 --- a/chrome/browser/ui/views/extensions/browser_action_drag_data.cc +++ b/chrome/browser/ui/views/extensions/browser_action_drag_data.cc
@@ -18,7 +18,7 @@ // The MIME type for the clipboard format for BrowserActionDragData. const char kClipboardFormatString[] = "chromium/x-browser-actions"; -} +} // namespace BrowserActionDragData::BrowserActionDragData() : profile_(nullptr), index_(static_cast<size_t>(-1)) {} @@ -46,8 +46,8 @@ return profile_ == profile; } -void BrowserActionDragData::Write( - Profile* profile, ui::OSExchangeData* data) const { +void BrowserActionDragData::Write(Profile* profile, + ui::OSExchangeData* data) const { DCHECK(data); base::Pickle data_pickle; WriteToPickle(profile, &data_pickle); @@ -92,16 +92,19 @@ base::PickleIterator data_iterator(*pickle); const char* tmp; - if (!data_iterator.ReadBytes(&tmp, sizeof(profile_))) + if (!data_iterator.ReadBytes(&tmp, sizeof(profile_))) { return false; + } memcpy(&profile_, tmp, sizeof(profile_)); - if (!data_iterator.ReadString(&id_)) + if (!data_iterator.ReadString(&id_)) { return false; + } uint64_t index; - if (!data_iterator.ReadUInt64(&index)) + if (!data_iterator.ReadUInt64(&index)) { return false; + } index_ = static_cast<size_t>(index); return true;
diff --git a/chrome/browser/ui/views/extensions/expandable_container_view.cc b/chrome/browser/ui/views/extensions/expandable_container_view.cc index 87bbf97b..4eb088f 100644 --- a/chrome/browser/ui/views/extensions/expandable_container_view.cc +++ b/chrome/browser/ui/views/extensions/expandable_container_view.cc
@@ -41,8 +41,9 @@ } void ExpandableContainerView::DetailsView::SetExpanded(bool expanded) { - if (expanded == expanded_) + if (expanded == expanded_) { return; + } expanded_ = expanded; SetVisible(expanded_); OnPropertyChanged(&expanded_, views::kPropertyEffectsPaint);
diff --git a/chrome/browser/ui/views/extensions/extension_action_platform_delegate_views.cc b/chrome/browser/ui/views/extensions/extension_action_platform_delegate_views.cc index 37a38f6..dbbce22 100644 --- a/chrome/browser/ui/views/extensions/extension_action_platform_delegate_views.cc +++ b/chrome/browser/ui/views/extensions/extension_action_platform_delegate_views.cc
@@ -47,8 +47,9 @@ void ExtensionActionPlatformDelegateViews::RegisterCommand() { // If we've already registered, do nothing. - if (action_keybinding_) + if (action_keybinding_) { return; + } extensions::Command extension_command; views::FocusManager* focus_manager = @@ -63,8 +64,9 @@ void ExtensionActionPlatformDelegateViews::UnregisterCommand() { // If we've already unregistered, do nothing. - if (!action_keybinding_) + if (!action_keybinding_) { return; + } views::FocusManager* focus_manager = GetDelegateViews()->GetFocusManagerForAccelerator(); @@ -90,11 +92,13 @@ void ExtensionActionPlatformDelegateViews::OnExtensionCommandAdded( const std::string& extension_id, const extensions::Command& command) { - if (extension_id != controller_->extension()->id()) + if (extension_id != controller_->extension()->id()) { return; // Not this action's extension. + } - if (!extensions::Command::IsActionRelatedCommand(command.command_name())) + if (!extensions::Command::IsActionRelatedCommand(command.command_name())) { return; + } RegisterCommand(); } @@ -102,15 +106,18 @@ void ExtensionActionPlatformDelegateViews::OnExtensionCommandRemoved( const std::string& extension_id, const extensions::Command& command) { - if (extension_id != controller_->extension()->id()) + if (extension_id != controller_->extension()->id()) { return; + } - if (!extensions::Command::IsActionRelatedCommand(command.command_name())) + if (!extensions::Command::IsActionRelatedCommand(command.command_name())) { return; + } extensions::Command extension_command; - if (controller_->GetExtensionCommand(&extension_command)) + if (controller_->GetExtensionCommand(&extension_command)) { return; // Command has not been removed. + } UnregisterCommand(); }
diff --git a/chrome/browser/ui/views/extensions/extension_action_test_helper_aura.cc b/chrome/browser/ui/views/extensions/extension_action_test_helper_aura.cc index e2ab766..7b4cdf26 100644 --- a/chrome/browser/ui/views/extensions/extension_action_test_helper_aura.cc +++ b/chrome/browser/ui/views/extensions/extension_action_test_helper_aura.cc
@@ -16,8 +16,9 @@ aura::Window* GetPopupAuraWindow(aura::Window* current) { DCHECK(current); - while (current && (current->GetType() != aura::client::WINDOW_TYPE_POPUP)) + while (current && (current->GetType() != aura::client::WINDOW_TYPE_POPUP)) { current = current->parent(); + } return current; } @@ -30,8 +31,9 @@ // aura::WindowObserver: void OnWindowVisibilityChanged(aura::Window* window, bool visible) override { - if (popup_window_ == window && visible) + if (popup_window_ == window && visible) { run_loop_->QuitWhenIdle(); + } } private:
diff --git a/chrome/browser/ui/views/extensions/extension_context_menu_controller.cc b/chrome/browser/ui/views/extensions/extension_context_menu_controller.cc index ab74a566..c3ddeab 100644 --- a/chrome/browser/ui/views/extensions/extension_context_menu_controller.cc +++ b/chrome/browser/ui/views/extensions/extension_context_menu_controller.cc
@@ -38,8 +38,9 @@ ui::MenuModel* model = controller_->GetContextMenu(context_menu_source_); // It's possible the action doesn't have a context menu. - if (!model) + if (!model) { return; + } int run_types = views::MenuRunner::HAS_MNEMONICS | views::MenuRunner::CONTEXT_MENU;
diff --git a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc index 619891b..0a230d79 100644 --- a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc +++ b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc
@@ -390,13 +390,15 @@ // If the prompt is related to requesting an extension, set the default button // to OK. if (prompt_->type() == - ExtensionInstallPrompt::PromptType::EXTENSION_REQUEST_PROMPT) + ExtensionInstallPrompt::PromptType::EXTENSION_REQUEST_PROMPT) { default_button = static_cast<int>(ui::mojom::DialogButton::kOk); + } // When we require parent permission next, we // set the default button to OK. - if (prompt_->requires_parent_permission()) + if (prompt_->requires_parent_permission()) { default_button = static_cast<int>(ui::mojom::DialogButton::kOk); + } SetModalType(ui::mojom::ModalType::kWindow); set_fixed_width(views::LayoutProvider::Get()->GetDistanceMetric( @@ -430,8 +432,9 @@ } ExtensionInstallDialogView::~ExtensionInstallDialogView() { - if (done_callback_) + if (done_callback_) { OnDialogCanceled(); + } } ExtensionInstallPromptShowParams* @@ -628,8 +631,9 @@ CHECK(prompt_); CHECK(prompt_->extension()); // Close the dialog if the extension is uninstalled. - if (extension->id() != prompt_->extension()->id()) + if (extension->id() != prompt_->extension()->id()) { return; + } CloseDialog(); } @@ -711,8 +715,9 @@ header_label->SetHorizontalAlignment(gfx::ALIGN_LEFT); extension_info_container->AddChildView(header_label); - if (section.contents_view) + if (section.contents_view) { extension_info_container->AddChildView(section.contents_view.release()); + } } // Add separate section for user justification. This section isn't added to
diff --git a/chrome/browser/ui/views/extensions/extension_install_dialog_view_browsertest.cc b/chrome/browser/ui/views/extensions/extension_install_dialog_view_browsertest.cc index f28d04ce..f14a11c 100644 --- a/chrome/browser/ui/views/extensions/extension_install_dialog_view_browsertest.cc +++ b/chrome/browser/ui/views/extensions/extension_install_dialog_view_browsertest.cc
@@ -169,8 +169,8 @@ std::u16string permission_string(u"Test"); PermissionMessages permissions; for (int i = 0; i < 20; i++) { - permissions.push_back(PermissionMessage(permission_string, - PermissionIDSet())); + permissions.push_back( + PermissionMessage(permission_string, PermissionIDSet())); } std::unique_ptr<ExtensionInstallPrompt::Prompt> prompt = CreatePrompt(ExtensionInstallPrompt::PERMISSIONS_PROMPT); @@ -191,8 +191,8 @@ std::u16string permission_string( u"Read and modify your data on *.facebook.com"); PermissionMessages permissions; - permissions.push_back(PermissionMessage(permission_string, - PermissionIDSet())); + permissions.push_back( + PermissionMessage(permission_string, PermissionIDSet())); std::unique_ptr<ExtensionInstallPrompt::Prompt> prompt = CreatePrompt(ExtensionInstallPrompt::PERMISSIONS_PROMPT); prompt->AddPermissionMessages(permissions); @@ -375,8 +375,9 @@ TabStripModel* tab_strip_model, const TabStripModelChange& change, const TabStripSelectionChange& selection) override { - if (change.type() != TabStripModelChange::kInserted) + if (change.type() != TabStripModelChange::kInserted) { return; + } for (const auto& contents : change.GetInsert()->contents) { // Note: GetVisibleURL() is used instead of GetLastCommittedURL() for @@ -442,13 +443,15 @@ // The invoke UI tests can either directly set permission messages to easily // test different potential edge cases, or use a proper permission set which // goes through the standard flow to generate the messages. - if (permission_set_) + if (permission_set_) { prompt->AddPermissionSet(*permission_set_); - else + } else { prompt->AddPermissionMessages(permission_messages_); + } - if (from_webstore_) + if (from_webstore_) { prompt->SetWebstoreData("69,420", true, 2.5, 37, "37"); + } ExtensionInstallDialogView::SetInstallButtonDelayForTesting(0); auto* web_contents = browser()->tab_strip_model()->GetActiveWebContents(); @@ -527,8 +530,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionInstallDialogViewInteractiveBrowserTest, InvokeUi_ManyPermissions) { - for (int i = 0; i < 20; i++) + for (int i = 0; i < 20; i++) { AddPermission("Example permission"); + } ShowAndVerifyUi(); }
diff --git a/chrome/browser/ui/views/extensions/extension_install_friction_dialog_view_browsertest.cc b/chrome/browser/ui/views/extensions/extension_install_friction_dialog_view_browsertest.cc index d56c1a6..0d5b57b8 100644 --- a/chrome/browser/ui/views/extensions/extension_install_friction_dialog_view_browsertest.cc +++ b/chrome/browser/ui/views/extensions/extension_install_friction_dialog_view_browsertest.cc
@@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <string> - #include "chrome/browser/ui/views/extensions/extension_install_friction_dialog_view.h" +#include <string> + #include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/extensions/extension_browsertest.h" @@ -138,8 +138,9 @@ TabStripModel* tab_strip_model, const TabStripModelChange& change, const TabStripSelectionChange& selection) override { - if (change.type() != TabStripModelChange::kInserted) + if (change.type() != TabStripModelChange::kInserted) { return; + } GURL learn_more_url(chrome::kCwsEnhancedSafeBrowsingLearnMoreURL); for (const auto& contents : change.GetInsert()->contents) {
diff --git a/chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc b/chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc index 106f2e0c..6cb20f4c 100644 --- a/chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc +++ b/chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc
@@ -70,8 +70,9 @@ ExtensionsToolbarContainer* const container = browser_view->toolbar_button_provider() ->GetExtensionsToolbarContainer(); - if (container) + if (container) { reference_view = container->GetViewForId(model->extension_id()); + } } else if (model->anchor_to_omnibox()) { reference_view = browser_view->GetLocationBarView()->location_icon_view(); } @@ -201,8 +202,9 @@ views::BoxLayout::CrossAxisAlignment::kStart); SetLayoutManager(std::move(layout)); - if (model_->show_how_to_use()) + if (model_->show_how_to_use()) { AddChildView(CreateLabel(model_->GetHowToUseText())); + } if (model_->show_key_binding()) { auto* manage_shortcut = AddChildView(std::make_unique<views::Link>(
diff --git a/chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc b/chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc index e76f269..23d28c1 100644 --- a/chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc +++ b/chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc
@@ -31,8 +31,9 @@ const extensions::Extension* extension, const std::string& command_name) { // This object only handles named commands, not browser/page actions. - if (ShouldIgnoreCommand(command_name)) + if (ShouldIgnoreCommand(command_name)) { return; + } extensions::CommandService* command_service = extensions::CommandService::Get(profile_); @@ -40,16 +41,17 @@ // which are handled elsewhere). ui::CommandMap commands; if (!command_service->GetNamedCommands( - extension->id(), - extensions::CommandService::ACTIVE, - extensions::CommandService::REGULAR, - &commands)) + extension->id(), extensions::CommandService::ACTIVE, + extensions::CommandService::REGULAR, &commands)) { return; + } ui::CommandMap::const_iterator iter = commands.begin(); for (; iter != commands.end(); ++iter) { - if (!command_name.empty() && (iter->second.command_name() != command_name)) + if (!command_name.empty() && + (iter->second.command_name() != command_name)) { continue; - const ui::Accelerator &accelerator = iter->second.accelerator(); + } + const ui::Accelerator& accelerator = iter->second.accelerator(); if (!IsAcceleratorRegistered(accelerator)) { focus_manager_->RegisterAccelerator(accelerator, kExtensionAcceleratorPriority, this);
diff --git a/chrome/browser/ui/views/extensions/extension_popup.cc b/chrome/browser/ui/views/extensions/extension_popup.cc index 4782d4b..a38995b 100644 --- a/chrome/browser/ui/views/extensions/extension_popup.cc +++ b/chrome/browser/ui/views/extensions/extension_popup.cc
@@ -106,11 +106,13 @@ ExtensionPopup::~ExtensionPopup() { // The ExtensionPopup may close before it was ever shown. If so, indicate such // through the callback. - if (shown_callback_) + if (shown_callback_) { std::move(shown_callback_).Run(nullptr); + } - if (g_last_popup_for_testing == this) + if (g_last_popup_for_testing == this) { g_last_popup_for_testing = nullptr; + } } gfx::Size ExtensionPopup::CalculatePreferredSize( @@ -219,22 +221,25 @@ TabStripModel* tab_strip_model, const TabStripModelChange& change, const TabStripSelectionChange& selection) { - if (!tab_strip_model->empty() && selection.active_tab_changed()) + if (!tab_strip_model->empty() && selection.active_tab_changed()) { CloseDeferredIfNecessary(); + } } void ExtensionPopup::DevToolsAgentHostAttached( content::DevToolsAgentHost* agent_host) { DCHECK(host_); - if (host_->host_contents() == agent_host->GetWebContents()) + if (host_->host_contents() == agent_host->GetWebContents()) { show_action_ = PopupShowAction::kShowAndInspect; + } } void ExtensionPopup::DevToolsAgentHostDetached( content::DevToolsAgentHost* agent_host) { DCHECK(host_); - if (host_->host_contents() == agent_host->GetWebContents()) + if (host_->host_contents() == agent_host->GetWebContents()) { show_action_ = PopupShowAction::kShow; + } } ExtensionPopup::ExtensionPopup( @@ -316,8 +321,9 @@ DevToolsOpenedByAction::kContextMenuInspect); } - if (shown_callback_) + if (shown_callback_) { std::move(shown_callback_).Run(host_.get()); + } } void ExtensionPopup::CloseUnlessBlockedByInspectionOrJSDialog() {
diff --git a/chrome/browser/ui/views/extensions/extension_popup.h b/chrome/browser/ui/views/extensions/extension_popup.h index 327fce7..f779ff7 100644 --- a/chrome/browser/ui/views/extensions/extension_popup.h +++ b/chrome/browser/ui/views/extensions/extension_popup.h
@@ -27,13 +27,13 @@ namespace content { class BrowserContext; class DevToolsAgentHost; -} +} // namespace content namespace extensions { class Extension; class ExtensionViewHost; enum class UnloadedExtensionReason; -} +} // namespace extensions // The bubble used for hosting a browser-action popup provided by an extension. class ExtensionPopup : public views::BubbleDialogDelegateView,
diff --git a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc b/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc index dcd9b0f04..1daf59f 100644 --- a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc +++ b/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc
@@ -62,8 +62,9 @@ : extensions::ExtensionUninstallDialog(profile, parent, delegate) {} ExtensionUninstallDialogViews::~ExtensionUninstallDialogViews() { - if (dialog_model_) + if (dialog_model_) { dialog_model_->host()->Close(); + } DCHECK(!dialog_model_); } @@ -143,8 +144,9 @@ } void ExtensionUninstallDialogViews::DialogClosing() { - if (!dialog_model_) + if (!dialog_model_) { return; + } dialog_model_ = nullptr; OnDialogClosed(CLOSE_ACTION_CANCELED); }
diff --git a/chrome/browser/ui/views/extensions/extension_view_views.cc b/chrome/browser/ui/views/extensions/extension_view_views.cc index 7ea83fb..690f5a2 100644 --- a/chrome/browser/ui/views/extensions/extension_view_views.cc +++ b/chrome/browser/ui/views/extensions/extension_view_views.cc
@@ -67,10 +67,11 @@ content::RenderWidgetHostView* host_view = host_->main_frame_host()->GetView(); if (host_view) { - if (is_visible) + if (is_visible) { host_view->Show(); - else + } else { host_view->Hide(); + } } } } @@ -80,8 +81,9 @@ } void ExtensionViewViews::SetMinimumSize(const gfx::Size& minimum_size) { - if (minimum_size_ && minimum_size_.value() == minimum_size) + if (minimum_size_ && minimum_size_.value() == minimum_size) { return; + } minimum_size_ = minimum_size; OnPropertyChanged(&minimum_size_, views::kPropertyEffectsPreferredSizeChanged); @@ -139,8 +141,9 @@ // ExtensionPopup delegates showing the view to OnLoaded(). ExtensionDialog // handles visibility directly. - if (GetVisible()) + if (GetVisible()) { return; + } SetVisible(true); ResizeDueToAutoResize(web_contents(), pending_preferred_size_);
diff --git a/chrome/browser/ui/views/extensions/extensions_dialogs_browsertest.h b/chrome/browser/ui/views/extensions/extensions_dialogs_browsertest.h index 2dab829..468630bd 100644 --- a/chrome/browser/ui/views/extensions/extensions_dialogs_browsertest.h +++ b/chrome/browser/ui/views/extensions/extensions_dialogs_browsertest.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSIONS_DIALOGS_BROWSERTEST_H_ #include <string> + #include "base/memory/scoped_refptr.h" #include "chrome/browser/ui/test/test_browser_dialog.h"
diff --git a/chrome/browser/ui/views/extensions/extensions_menu_coordinator.h b/chrome/browser/ui/views/extensions/extensions_menu_coordinator.h index b41283d..82ba895b 100644 --- a/chrome/browser/ui/views/extensions/extensions_menu_coordinator.h +++ b/chrome/browser/ui/views/extensions/extensions_menu_coordinator.h
@@ -15,7 +15,7 @@ namespace views { class BubbleDialogDelegate; class Widget; -} +} // namespace views // Handles the lifetime and showing/hidden state of the extensions menu bubble. class ExtensionsMenuCoordinator : public views::ViewObserver {
diff --git a/chrome/browser/ui/views/extensions/extensions_menu_item_unittest.cc b/chrome/browser/ui/views/extensions/extensions_menu_item_unittest.cc index 6b493787..a7f9547 100644 --- a/chrome/browser/ui/views/extensions/extensions_menu_item_unittest.cc +++ b/chrome/browser/ui/views/extensions/extensions_menu_item_unittest.cc
@@ -2,14 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/views/extensions/extensions_menu_item_view.h" - #include "base/memory/raw_ptr.h" #include "base/strings/utf_string_conversions.h" #include "base/test/metrics/user_action_tester.h" #include "build/build_config.h" #include "chrome/browser/ui/toolbar/test_toolbar_action_view_controller.h" #include "chrome/browser/ui/views/extensions/extensions_menu_button.h" +#include "chrome/browser/ui/views/extensions/extensions_menu_item_view.h" #include "chrome/browser/ui/views/extensions/extensions_toolbar_unittest.h" #include "chrome/browser/ui/views/hover_button_controller.h" #include "chrome/browser/ui/views/native_widget_factory.h"
diff --git a/chrome/browser/ui/views/extensions/extensions_menu_site_permissions_page_view_interactive_uitest.cc b/chrome/browser/ui/views/extensions/extensions_menu_site_permissions_page_view_interactive_uitest.cc index 0c60c0e2..d4da932 100644 --- a/chrome/browser/ui/views/extensions/extensions_menu_site_permissions_page_view_interactive_uitest.cc +++ b/chrome/browser/ui/views/extensions/extensions_menu_site_permissions_page_view_interactive_uitest.cc
@@ -2,11 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/views/extensions/extensions_menu_site_permissions_page_view.h" - #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/views/extensions/extensions_menu_coordinator.h" +#include "chrome/browser/ui/views/extensions/extensions_menu_site_permissions_page_view.h" #include "chrome/browser/ui/views/extensions/extensions_menu_view_controller.h" #include "chrome/browser/ui/views/extensions/extensions_toolbar_button.h" #include "chrome/browser/ui/views/extensions/extensions_toolbar_container.h"
diff --git a/chrome/browser/ui/views/extensions/extensions_menu_site_permissions_page_view_unittest.cc b/chrome/browser/ui/views/extensions/extensions_menu_site_permissions_page_view_unittest.cc index abeba416..0790134 100644 --- a/chrome/browser/ui/views/extensions/extensions_menu_site_permissions_page_view_unittest.cc +++ b/chrome/browser/ui/views/extensions/extensions_menu_site_permissions_page_view_unittest.cc
@@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/views/extensions/extensions_menu_main_page_view.h" +#include "chrome/browser/ui/views/extensions/extensions_menu_site_permissions_page_view.h" #include "base/feature_list.h" #include "chrome/browser/extensions/chrome_test_extension_loader.h" #include "chrome/browser/extensions/permissions/scripting_permissions_modifier.h" #include "chrome/browser/extensions/permissions/site_permissions_helper.h" #include "chrome/browser/ui/views/extensions/extensions_menu_coordinator.h" -#include "chrome/browser/ui/views/extensions/extensions_menu_site_permissions_page_view.h" +#include "chrome/browser/ui/views/extensions/extensions_menu_main_page_view.h" #include "chrome/browser/ui/views/extensions/extensions_menu_view_controller.h" #include "chrome/browser/ui/views/extensions/extensions_request_access_button.h" #include "chrome/browser/ui/views/extensions/extensions_toolbar_button.h"
diff --git a/chrome/browser/ui/views/extensions/extensions_menu_test_util.cc b/chrome/browser/ui/views/extensions/extensions_menu_test_util.cc index 856b6b5f..9aeaf603 100644 --- a/chrome/browser/ui/views/extensions/extensions_menu_test_util.cc +++ b/chrome/browser/ui/views/extensions/extensions_menu_test_util.cc
@@ -3,9 +3,9 @@ // found in the LICENSE file. #include "chrome/browser/ui/views/extensions/extensions_menu_test_util.h" + #include "base/containers/flat_set.h" #include "base/memory/raw_ptr.h" - #include "base/numerics/safe_conversions.h" #include "base/ranges/algorithm.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/views/extensions/extensions_menu_view.cc b/chrome/browser/ui/views/extensions/extensions_menu_view.cc index 58b09e5..510e8d3 100644 --- a/chrome/browser/ui/views/extensions/extensions_menu_view.cc +++ b/chrome/browser/ui/views/extensions/extensions_menu_view.cc
@@ -126,8 +126,9 @@ } ExtensionsMenuView::~ExtensionsMenuView() { - if (!g_allow_testing_dialogs) + if (!g_allow_testing_dialogs) { DCHECK_EQ(g_extensions_dialog, this); + } g_extensions_dialog = nullptr; extensions_menu_items_.clear(); @@ -138,8 +139,9 @@ void ExtensionsMenuView::Populate() { // The actions for the profile haven't been initialized yet. We'll call in // again once they have. - if (!toolbar_model_->actions_initialized()) + if (!toolbar_model_->actions_initialized()) { return; + } DCHECK(children().empty()) << "Populate() can only be called once!"; @@ -192,8 +194,9 @@ AddChildView(std::move(footer)); // Add menu items for each extension. - for (const auto& id : toolbar_model_->action_ids()) + for (const auto& id : toolbar_model_->action_ids()) { CreateAndInsertNewItem(id); + } SortMenuItemsByName(); UpdateSectionVisibility(); @@ -215,47 +218,46 @@ extension_buttons->SetBorder( views::CreateEmptyBorder(gfx::Insets::VH(0, dialog_insets.left()))); - auto create_section = - [&extension_buttons](Section* section) { - auto container = std::make_unique<views::View>(); - section->container = container.get(); - container->SetLayoutManager(std::make_unique<views::BoxLayout>( - views::BoxLayout::Orientation::kVertical)); + auto create_section = [&extension_buttons](Section* section) { + auto container = std::make_unique<views::View>(); + section->container = container.get(); + container->SetLayoutManager(std::make_unique<views::BoxLayout>( + views::BoxLayout::Orientation::kVertical)); - // Add an emphasized short header explaining the section. - auto header = std::make_unique<views::Label>( - l10n_util::GetStringUTF16(section->header_string_id), - ChromeTextContext::CONTEXT_DIALOG_BODY_TEXT_SMALL, - views::style::STYLE_EMPHASIZED); - header->SetHorizontalAlignment(gfx::ALIGN_LEFT); - header->SetBorder(views::CreateEmptyBorder( - gfx::Insets::TLBR(ChromeLayoutProvider::Get()->GetDistanceMetric( - DISTANCE_CONTROL_LIST_VERTICAL), - 0, 0, 0))); - container->AddChildView(std::move(header)); + // Add an emphasized short header explaining the section. + auto header = std::make_unique<views::Label>( + l10n_util::GetStringUTF16(section->header_string_id), + ChromeTextContext::CONTEXT_DIALOG_BODY_TEXT_SMALL, + views::style::STYLE_EMPHASIZED); + header->SetHorizontalAlignment(gfx::ALIGN_LEFT); + header->SetBorder(views::CreateEmptyBorder( + gfx::Insets::TLBR(ChromeLayoutProvider::Get()->GetDistanceMetric( + DISTANCE_CONTROL_LIST_VERTICAL), + 0, 0, 0))); + container->AddChildView(std::move(header)); - // Add longer text that explains the section in more detail. - auto description = std::make_unique<views::Label>( - l10n_util::GetStringUTF16(section->description_string_id), - ChromeTextContext::CONTEXT_DIALOG_BODY_TEXT_SMALL, - views::style::STYLE_PRIMARY); - description->SetMultiLine(true); - description->SetHorizontalAlignment(gfx::ALIGN_LEFT); - container->AddChildView(std::move(description)); + // Add longer text that explains the section in more detail. + auto description = std::make_unique<views::Label>( + l10n_util::GetStringUTF16(section->description_string_id), + ChromeTextContext::CONTEXT_DIALOG_BODY_TEXT_SMALL, + views::style::STYLE_PRIMARY); + description->SetMultiLine(true); + description->SetHorizontalAlignment(gfx::ALIGN_LEFT); + container->AddChildView(std::move(description)); - // Add a (currently empty) section for the menu items of the section. - auto menu_items = std::make_unique<views::View>(); - menu_items->SetLayoutManager(std::make_unique<views::BoxLayout>( - views::BoxLayout::Orientation::kVertical)); - section->menu_items = menu_items.get(); - container->AddChildView(std::move(menu_items)); + // Add a (currently empty) section for the menu items of the section. + auto menu_items = std::make_unique<views::View>(); + menu_items->SetLayoutManager(std::make_unique<views::BoxLayout>( + views::BoxLayout::Orientation::kVertical)); + section->menu_items = menu_items.get(); + container->AddChildView(std::move(menu_items)); - // Start off with the section invisible. We'll update it as we add items - // if necessary. - container->SetVisible(false); + // Start off with the section invisible. We'll update it as we add items + // if necessary. + container->SetVisible(false); - extension_buttons->AddChildView(std::move(container)); - }; + extension_buttons->AddChildView(std::move(container)); + }; create_section(&has_access_); create_section(&wants_access_); @@ -285,17 +287,20 @@ void ExtensionsMenuView::SortMenuItemsByName() { auto sort_section = [](Section* section) { - if (section->menu_items->children().empty()) + if (section->menu_items->children().empty()) { return; + } std::vector<ExtensionMenuItemView*> menu_item_views; - for (views::View* view : section->menu_items->children()) + for (views::View* view : section->menu_items->children()) { menu_item_views.push_back(GetAsMenuItemView(view)); + } std::sort(menu_item_views.begin(), menu_item_views.end(), &CompareExtensionMenuItemViews); - for (size_t i = 0; i < menu_item_views.size(); ++i) + for (size_t i = 0; i < menu_item_views.size(); ++i) { section->menu_items->ReorderChildView(menu_item_views[i], i); + } }; sort_section(&has_access_); @@ -335,8 +340,9 @@ void ExtensionsMenuView::UpdateSectionVisibility() { auto update_section = [](Section* section) { bool should_be_visible = !section->menu_items->children().empty(); - if (section->container->GetVisible() != should_be_visible) + if (section->container->GetVisible() != should_be_visible) { section->container->SetVisible(should_be_visible); + } }; update_section(&has_access_); @@ -351,25 +357,26 @@ content::WebContents* const web_contents = browser_->tab_strip_model()->GetActiveWebContents(); - auto move_children_between_sections_if_necessary = [this, web_contents]( - Section* section) { - // Note: Collect the views to move separately, so that we don't change the - // children of the view during iteration. - std::vector<ExtensionMenuItemView*> views_to_move; - for (views::View* view : section->menu_items->children()) { - auto* menu_item = GetAsMenuItemView(view); - auto site_interaction = - menu_item->view_controller()->GetSiteInteraction(web_contents); - if (site_interaction == section->site_interaction) - continue; - views_to_move.push_back(menu_item); - } + auto move_children_between_sections_if_necessary = + [this, web_contents](Section* section) { + // Note: Collect the views to move separately, so that we don't change + // the children of the view during iteration. + std::vector<ExtensionMenuItemView*> views_to_move; + for (views::View* view : section->menu_items->children()) { + auto* menu_item = GetAsMenuItemView(view); + auto site_interaction = + menu_item->view_controller()->GetSiteInteraction(web_contents); + if (site_interaction == section->site_interaction) { + continue; + } + views_to_move.push_back(menu_item); + } - for (ExtensionMenuItemView* menu_item : views_to_move) { - section->menu_items->RemoveChildView(menu_item); - InsertMenuItem(menu_item); - } - }; + for (ExtensionMenuItemView* menu_item : views_to_move) { + section->menu_items->RemoveChildView(menu_item); + InsertMenuItem(menu_item); + } + }; move_children_between_sections_if_necessary(&has_access_); move_children_between_sections_if_necessary(&wants_access_); @@ -515,8 +522,9 @@ // static void ExtensionsMenuView::Hide() { - if (IsShowing()) + if (IsShowing()) { g_extensions_dialog->GetWidget()->Close(); + } } // static @@ -532,8 +540,9 @@ GetExtensionsMenuViewForTesting()->GetSectionForSiteInteraction( site_interaction); std::vector<ExtensionMenuItemView*> menu_item_views; - for (views::View* view : section->menu_items->children()) + for (views::View* view : section->menu_items->children()) { menu_item_views.push_back(GetAsMenuItemView(view)); + } return menu_item_views; }
diff --git a/chrome/browser/ui/views/extensions/extensions_menu_view_unittest.cc b/chrome/browser/ui/views/extensions/extensions_menu_view_unittest.cc index 11bbb03..f3d51c34 100644 --- a/chrome/browser/ui/views/extensions/extensions_menu_view_unittest.cc +++ b/chrome/browser/ui/views/extensions/extensions_menu_view_unittest.cc
@@ -163,8 +163,9 @@ #else const bool is_visible = action->GetVisible(); #endif - if (is_visible) + if (is_visible) { result.push_back(action); + } } } return result; @@ -309,8 +310,9 @@ } TEST_F(ExtensionsMenuViewUnitTest, PinnedExtensionLayout) { - for (int i = 0; i < 3; i++) + for (int i = 0; i < 3; i++) { InstallExtensionAndLayout(base::StringPrintf("Test %d", i)); + } for (ExtensionMenuItemView* menu_item : extensions_menu()->extensions_menu_items_for_testing()) { ClickPinButton(menu_item); @@ -409,8 +411,9 @@ // Since the extension is removed it's no longer visible on the toolbar or in // the menu. - for (views::View* child : extensions_container()->children()) + for (views::View* child : extensions_container()->children()) { EXPECT_FALSE(views::IsViewClass<ToolbarActionView>(child)); + } EXPECT_EQ(0u, extensions_menu()->extensions_menu_items_for_testing().size()); }
diff --git a/chrome/browser/ui/views/extensions/extensions_toolbar_button.cc b/chrome/browser/ui/views/extensions/extensions_toolbar_button.cc index 219ba039..5ba35fa 100644 --- a/chrome/browser/ui/views/extensions/extensions_toolbar_button.cc +++ b/chrome/browser/ui/views/extensions/extensions_toolbar_button.cc
@@ -130,8 +130,9 @@ // size and the preferred button size. const gfx::Size current_size = size(); - if (current_size.IsEmpty()) + if (current_size.IsEmpty()) { return; + } const int icon_size = GetIconSize(); gfx::Insets new_insets; if (icon_size < current_size.width()) {
diff --git a/chrome/browser/ui/views/extensions/extensions_toolbar_container.cc b/chrome/browser/ui/views/extensions/extensions_toolbar_container.cc index 3de09db..219bbaf 100644 --- a/chrome/browser/ui/views/extensions/extensions_toolbar_container.cc +++ b/chrome/browser/ui/views/extensions/extensions_toolbar_container.cc
@@ -209,10 +209,12 @@ // be modified by closing them. std::vector<views::Widget*> widgets; widgets.reserve(anchored_widgets_.size()); - for (const auto& anchored_widget : anchored_widgets_) + for (const auto& anchored_widget : anchored_widgets_) { widgets.push_back(anchored_widget.widget); - for (auto* widget : widgets) + } + for (auto* widget : widgets) { widget->Close(); + } // The widgets should close synchronously (resulting in OnWidgetClosing()), // so |anchored_widgets_| should now be empty. DCHECK(anchored_widgets_.empty()); @@ -393,8 +395,9 @@ void ExtensionsToolbarContainer::UpdateAllIcons() { UpdateControlsVisibility(); - for (const auto& action : actions_) + for (const auto& action : actions_) { action->UpdateState(); + } if (close_side_panel_button_) { close_side_panel_button_->UpdateIcon(); @@ -438,10 +441,11 @@ void ExtensionsToolbarContainer::HideExtensionsMenu() { if (base::FeatureList::IsEnabled( - extensions_features::kExtensionsMenuAccessControl)) + extensions_features::kExtensionsMenuAccessControl)) { extensions_menu_coordinator_->Hide(); - else + } else { ExtensionsMenuView::Hide(); + } } bool ExtensionsToolbarContainer::ShouldForceVisibility( @@ -457,8 +461,9 @@ } for (const auto& anchored_widget : anchored_widgets_) { - if (anchored_widget.extension_id == extension_id) + if (anchored_widget.extension_id == extension_id) { return true; + } } return false; @@ -467,8 +472,9 @@ void ExtensionsToolbarContainer::UpdateIconVisibility( const std::string& extension_id) { ToolbarActionView* const action_view = GetViewForId(extension_id); - if (!action_view) + if (!action_view) { return; + } // Popped out action uses a flex rule that causes it to always be visible // regardless of space; default for actions is to drop out when there is @@ -489,8 +495,9 @@ views::MinimumFlexSizeRule::kPreferredSnapToZero; BrowserView* const browser_view = BrowserView::GetBrowserViewForBrowser(browser_); - if (browser_view->IsWindowControlsOverlayEnabled()) + if (browser_view->IsWindowControlsOverlayEnabled()) { min_flex_rule = views::MinimumFlexSizeRule::kPreferred; + } // In compact/auto hide mode, the icon can still drop out, but receives // precedence over other actions. @@ -543,8 +550,9 @@ ToolbarActionViewController* ExtensionsToolbarContainer::GetActionForId( const std::string& action_id) { for (const auto& action : actions_) { - if (action->GetId() == action_id) + if (action->GetId() == action_id) { return action.get(); + } } return nullptr; } @@ -562,8 +570,8 @@ HideActivePopup(); #endif - extension_with_open_context_menu_id_ = action_id; - UpdateIconVisibility(extension_with_open_context_menu_id_.value()); + extension_with_open_context_menu_id_ = action_id; + UpdateIconVisibility(extension_with_open_context_menu_id_.value()); } void ExtensionsToolbarContainer::OnContextMenuClosedFromToolbar() { @@ -598,15 +606,17 @@ // Container should become visible if |popup_owner_| and may lose visibility // if not |popup_owner_|. Visibility must be maintained during layout // animations. - if (popup_owner_) + if (popup_owner_) { UpdateContainerVisibility(); - else + } else { UpdateContainerVisibilityAfterAnimation(); + } } void ExtensionsToolbarContainer::HideActivePopup() { - if (popup_owner_) + if (popup_owner_) { popup_owner_->HidePopup(); + } DCHECK(!popup_owner_); UpdateContainerVisibilityAfterAnimation(); } @@ -634,8 +644,9 @@ const std::string& action_id, ShowPopupCallback callback) { // Don't override another popup, and only show in the active window. - if (popped_out_action_ || !browser_->window()->IsActive()) + if (popped_out_action_ || !browser_->window()->IsActive()) { return false; + } ToolbarActionViewController* action = GetActionForId(action_id); DCHECK(action); @@ -773,8 +784,9 @@ auto it = base::ranges::find( model_->pinned_action_ids(), sender, [this](const std::string& action_id) { return GetViewForId(action_id); }); - if (it == model_->pinned_action_ids().cend()) + if (it == model_->pinned_action_ids().cend()) { return false; + } // TODO(crbug.com/40808374): Force-pinned extensions are not draggable. return !model_->IsActionForcePinned(*it); @@ -802,13 +814,15 @@ int ExtensionsToolbarContainer::OnDragUpdated( const ui::DropTargetEvent& event) { BrowserActionDragData data; - if (!data.Read(event.data())) + if (!data.Read(event.data())) { return ui::DragDropTypes::DRAG_NONE; + } // Check if there is an extension for the dragged icon (e.g. an extension can // be de deleted while dragging its icon). - if (!GetActionForId(data.id())) + if (!GetActionForId(data.id())) { return ui::DragDropTypes::DRAG_NONE; + } size_t before_icon = 0; // Figure out where to display the icon during dragging transition. @@ -840,8 +854,9 @@ } void ExtensionsToolbarContainer::OnDragExited() { - if (!drop_info_) + if (!drop_info_) { return; + } const ToolbarActionsModel::ActionId dragged_extension_id = drop_info_->action_id; @@ -852,8 +867,9 @@ views::View::DropCallback ExtensionsToolbarContainer::GetDropCallback( const ui::DropTargetEvent& event) { BrowserActionDragData data; - if (!data.Read(event.data())) + if (!data.Read(event.data())) { return base::NullCallback(); + } auto action_id = std::move(drop_info_->action_id); auto index = drop_info_->index; @@ -897,12 +913,14 @@ auto it = base::ranges::find( model_->pinned_action_ids(), GetViewForId(id), [this](const std::string& action_id) { return GetViewForId(action_id); }); - if (it == model_->pinned_action_ids().cend()) + if (it == model_->pinned_action_ids().cend()) { return; + } ToolbarActionView* extension_view = GetViewForId(*it); - if (!extension_view) + if (!extension_view) { return; + } extension_view->SetImageModel( views::Button::STATE_NORMAL, @@ -915,37 +933,45 @@ // Layout animation does not handle host view visibility changing; requires // resetting. - if (was_visible != GetVisible()) + if (was_visible != GetVisible()) { GetAnimatingLayoutManager()->ResetLayout(); + } - if (!was_visible && GetVisible() && GetOnVisibleCallbackForTesting()) + if (!was_visible && GetVisible() && GetOnVisibleCallbackForTesting()) { std::move(GetOnVisibleCallbackForTesting()).Run(); + } } bool ExtensionsToolbarContainer::ShouldContainerBeVisible() const { // The container (and extensions-menu button) should not be visible if we have // no extensions. - if (!HasAnyExtensions()) + if (!HasAnyExtensions()) { return false; + } // All other display modes are constantly visible. - if (display_mode_ != DisplayMode::kAutoHide) + if (display_mode_ != DisplayMode::kAutoHide) { return true; + } - if (GetAnimatingLayoutManager()->is_animating()) + if (GetAnimatingLayoutManager()->is_animating()) { return true; + } // Is menu showing. - if (GetExtensionsButton()->GetExtensionsMenuShowing()) + if (GetExtensionsButton()->GetExtensionsMenuShowing()) { return true; + } // Is extension pop out is showing. - if (popped_out_action_) + if (popped_out_action_) { return true; + } // Is extension pop up showing. - if (popup_owner_) + if (popup_owner_) { return true; + } return false; } @@ -1015,8 +1041,9 @@ } content::WebContents* web_contents = GetCurrentWebContents(); - if (!web_contents) + if (!web_contents) { return; + } bool is_restricted_url = model_->IsRestrictedUrl(web_contents->GetLastCommittedURL());
diff --git a/chrome/browser/ui/views/extensions/extensions_toolbar_container_unittest.cc b/chrome/browser/ui/views/extensions/extensions_toolbar_container_unittest.cc index 2012b3d..736b1a1c 100644 --- a/chrome/browser/ui/views/extensions/extensions_toolbar_container_unittest.cc +++ b/chrome/browser/ui/views/extensions/extensions_toolbar_container_unittest.cc
@@ -110,8 +110,9 @@ base::ranges::find(actions, extension_id, [](ToolbarActionView* action) { return action->view_controller()->GetId(); }); - if (it == actions.end()) + if (it == actions.end()) { return nullptr; + } return *it; }
diff --git a/chrome/browser/ui/views/extensions/extensions_toolbar_interactive_uitest.cc b/chrome/browser/ui/views/extensions/extensions_toolbar_interactive_uitest.cc index 303228d..f80cd16 100644 --- a/chrome/browser/ui/views/extensions/extensions_toolbar_interactive_uitest.cc +++ b/chrome/browser/ui/views/extensions/extensions_toolbar_interactive_uitest.cc
@@ -167,8 +167,9 @@ std::vector<ToolbarActionView*> views; for (views::View* view : GetExtensionsToolbarContainerForBrowser(browser)->children()) { - if (views::IsViewClass<ToolbarActionView>(view)) + if (views::IsViewClass<ToolbarActionView>(view)) { views.push_back(static_cast<ToolbarActionView*>(view)); + } } return views; }
diff --git a/chrome/browser/ui/views/extensions/extensions_toolbar_unittest.cc b/chrome/browser/ui/views/extensions/extensions_toolbar_unittest.cc index c02497d..e62d6cb 100644 --- a/chrome/browser/ui/views/extensions/extensions_toolbar_unittest.cc +++ b/chrome/browser/ui/views/extensions/extensions_toolbar_unittest.cc
@@ -232,8 +232,9 @@ #else const bool is_visible = action->GetVisible(); #endif - if (is_visible) + if (is_visible) { result.push_back(action); + } } } return result;
diff --git a/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc b/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc index 2cc258d..d9a288b3 100644 --- a/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc +++ b/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc
@@ -111,8 +111,9 @@ } MediaGalleriesDialogViews::~MediaGalleriesDialogViews() { - if (!ControllerHasWebContents()) + if (!ControllerHasWebContents()) { delete contents_; + } } void MediaGalleriesDialogViews::AcceptDialogForTesting() { @@ -199,8 +200,9 @@ InitChildViews(); contents_->DeprecatedLayoutImmediately(); - if (ControllerHasWebContents()) + if (ControllerHasWebContents()) { DialogModelChanged(); + } } bool MediaGalleriesDialogViews::AddOrUpdateGallery( @@ -287,8 +289,9 @@ void MediaGalleriesDialogViews::ButtonPressed(base::RepeatingClosure closure) { confirm_available_ = true; - if (ControllerHasWebContents()) + if (ControllerHasWebContents()) { DialogModelChanged(); + } closure.Run(); }
diff --git a/chrome/browser/ui/views/extensions/media_galleries_dialog_views.h b/chrome/browser/ui/views/extensions/media_galleries_dialog_views.h index 3c0e1b8a5..7a2fc5ee 100644 --- a/chrome/browser/ui/views/extensions/media_galleries_dialog_views.h +++ b/chrome/browser/ui/views/extensions/media_galleries_dialog_views.h
@@ -20,7 +20,7 @@ class LabelButton; class MenuRunner; class Widget; -} +} // namespace views class MediaGalleryCheckboxView; @@ -69,10 +69,9 @@ // Adds a checkbox or updates an existing checkbox. Returns true if a new one // was added. - bool AddOrUpdateGallery( - const MediaGalleriesDialogController::Entry& gallery, - views::View* container, - int trailing_vertical_space); + bool AddOrUpdateGallery(const MediaGalleriesDialogController::Entry& gallery, + views::View* container, + int trailing_vertical_space); void ShowContextMenu(const gfx::Point& point, ui::mojom::MenuSourceType source_type,
diff --git a/chrome/browser/ui/views/extensions/media_galleries_dialog_views_unittest.cc b/chrome/browser/ui/views/extensions/media_galleries_dialog_views_unittest.cc index 1fce9bf..2ea2362a 100644 --- a/chrome/browser/ui/views/extensions/media_galleries_dialog_views_unittest.cc +++ b/chrome/browser/ui/views/extensions/media_galleries_dialog_views_unittest.cc
@@ -52,10 +52,8 @@ std::vector<std::u16string> headers; headers.push_back(std::u16string()); headers.push_back(u"header2"); - ON_CALL(controller_, GetSectionHeaders()). - WillByDefault(Return(headers)); - EXPECT_CALL(controller_, GetSectionEntries(_)). - Times(AnyNumber()); + ON_CALL(controller_, GetSectionHeaders()).WillByDefault(Return(headers)); + EXPECT_CALL(controller_, GetSectionEntries(_)).Times(AnyNumber()); } void TearDown() override { @@ -101,8 +99,8 @@ MediaGalleriesDialogController::Entry(MakePrefInfoForTesting(1), true)); attached_permissions.push_back( MediaGalleriesDialogController::Entry(MakePrefInfoForTesting(2), false)); - EXPECT_CALL(*controller(), GetSectionEntries(0)). - WillRepeatedly(Return(attached_permissions)); + EXPECT_CALL(*controller(), GetSectionEntries(0)) + .WillRepeatedly(Return(attached_permissions)); MediaGalleriesDialogViews dialog(controller()); EXPECT_EQ(2U, dialog.checkbox_map_.size()); @@ -120,8 +118,8 @@ MediaGalleriesDialogController::Entries attached_permissions; attached_permissions.push_back( MediaGalleriesDialogController::Entry(MakePrefInfoForTesting(1), true)); - EXPECT_CALL(*controller(), GetSectionEntries(0)). - WillRepeatedly(Return(attached_permissions)); + EXPECT_CALL(*controller(), GetSectionEntries(0)) + .WillRepeatedly(Return(attached_permissions)); std::unique_ptr<views::Widget> widget = CreateTestWidget(views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET); @@ -143,8 +141,8 @@ MediaGalleriesDialogViews dialog(controller()); MediaGalleriesDialogController::Entries attached_permissions; - EXPECT_CALL(*controller(), GetSectionEntries(0)). - WillRepeatedly(ReturnPointee(&attached_permissions)); + EXPECT_CALL(*controller(), GetSectionEntries(0)) + .WillRepeatedly(ReturnPointee(&attached_permissions)); EXPECT_TRUE(dialog.checkbox_map_.empty()); @@ -170,8 +168,8 @@ MediaGalleriesDialogViews dialog(controller()); MediaGalleriesDialogController::Entries attached_permissions; - EXPECT_CALL(*controller(), GetSectionEntries(0)). - WillRepeatedly(ReturnPointee(&attached_permissions)); + EXPECT_CALL(*controller(), GetSectionEntries(0)) + .WillRepeatedly(ReturnPointee(&attached_permissions)); EXPECT_TRUE(dialog.checkbox_map_.empty());
diff --git a/chrome/browser/ui/views/extensions/media_gallery_checkbox_view.cc b/chrome/browser/ui/views/extensions/media_gallery_checkbox_view.cc index ed4cc8f..ca7154fa 100644 --- a/chrome/browser/ui/views/extensions/media_gallery_checkbox_view.cc +++ b/chrome/browser/ui/views/extensions/media_gallery_checkbox_view.cc
@@ -29,13 +29,15 @@ SetBorder(views::CreateEmptyBorder(gfx::Insets::TLBR(0, dialog_insets.left(), trailing_vertical_space, dialog_insets.right()))); - if (menu_controller) + if (menu_controller) { set_context_menu_controller(menu_controller); + } checkbox_ = AddChildView(std::make_unique<views::Checkbox>( pref_info.GetGalleryDisplayName(), views::Button::PressedCallback())); - if (menu_controller) + if (menu_controller) { checkbox_->set_context_menu_controller(menu_controller); + } checkbox_->SetElideBehavior(gfx::ELIDE_MIDDLE); std::u16string tooltip_text = pref_info.GetGalleryTooltip(); checkbox_->SetTooltipText(tooltip_text); @@ -43,8 +45,9 @@ std::u16string details = pref_info.GetGalleryAdditionalDetails(); secondary_text_ = AddChildView(std::make_unique<views::Label>( details, views::style::CONTEXT_LABEL, views::style::STYLE_SECONDARY)); - if (menu_controller) + if (menu_controller) { secondary_text_->set_context_menu_controller(menu_controller); + } secondary_text_->SetVisible(details.length() > 0); secondary_text_->SetElideBehavior(gfx::ELIDE_HEAD); secondary_text_->SetTooltipText(tooltip_text); @@ -57,8 +60,9 @@ void MediaGalleryCheckboxView::Layout(PassKey) { LayoutSuperclass<views::BoxLayoutView>(this); - if (GetPreferredSize().width() <= GetLocalBounds().width()) + if (GetPreferredSize().width() <= GetLocalBounds().width()) { return; + } // If box layout doesn't fit, do custom layout. The secondary text should take // up at most half of the space and the checkbox can take up whatever is left. @@ -67,8 +71,9 @@ secondary_text_ ->GetPreferredSize(views::SizeBounds(secondary_text_->width(), {})) .width(); - if (!secondary_text_->GetVisible()) + if (!secondary_text_->GetVisible()) { secondary_text_width = 0; + } gfx::Rect area = GetContentsBounds();
diff --git a/chrome/browser/ui/views/external_protocol_dialog.cc b/chrome/browser/ui/views/external_protocol_dialog.cc index 94b76bd..ee1e845 100644 --- a/chrome/browser/ui/views/external_protocol_dialog.cc +++ b/chrome/browser/ui/views/external_protocol_dialog.cc
@@ -40,8 +40,9 @@ std::u16string GetMessageTextForOrigin( const std::optional<url::Origin>& origin) { - if (!origin || origin->opaque()) + if (!origin || origin->opaque()) { return l10n_util::GetStringUTF16(IDS_EXTERNAL_PROTOCOL_MESSAGE); + } return l10n_util::GetStringFUTF16( IDS_EXTERNAL_PROTOCOL_MESSAGE_WITH_INITIATING_ORIGIN, url_formatter::FormatOriginForSecurityDisplay(*origin));
diff --git a/chrome/browser/ui/views/external_protocol_dialog_browsertest.cc b/chrome/browser/ui/views/external_protocol_dialog_browsertest.cc index e050cb38..0e7fd50 100644 --- a/chrome/browser/ui/views/external_protocol_dialog_browsertest.cc +++ b/chrome/browser/ui/views/external_protocol_dialog_browsertest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/views/external_protocol_dialog.h" + #include <memory> #include <string> @@ -10,7 +12,6 @@ #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/test/test_browser_dialog.h" -#include "chrome/browser/ui/views/external_protocol_dialog.h" #include "chrome/browser/ui/views/external_protocol_dialog_test_harness.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h"
diff --git a/chrome/browser/ui/views/eye_dropper/eye_dropper_browsertest.cc b/chrome/browser/ui/views/eye_dropper/eye_dropper_browsertest.cc index 68f63ed..1dc044db 100644 --- a/chrome/browser/ui/views/eye_dropper/eye_dropper_browsertest.cc +++ b/chrome/browser/ui/views/eye_dropper/eye_dropper_browsertest.cc
@@ -47,8 +47,9 @@ bool VerifyUi() override { #if BUILDFLAG(IS_WIN) - if (!eye_dropper_) + if (!eye_dropper_) { return false; + } views::Widget* widget = static_cast<eye_dropper::EyeDropperView*>(eye_dropper_.get())
diff --git a/chrome/browser/ui/views/file_system_access/file_system_access_browsertest.cc b/chrome/browser/ui/views/file_system_access/file_system_access_browsertest.cc index dda3c5e..939bef04 100644 --- a/chrome/browser/ui/views/file_system_access/file_system_access_browsertest.cc +++ b/chrome/browser/ui/views/file_system_access/file_system_access_browsertest.cc
@@ -1141,8 +1141,9 @@ content::RenderFrameHost* CreateFencedFrame( content::RenderFrameHost* fenced_frame_parent, const GURL& url) { - if (fenced_frame_helper_) + if (fenced_frame_helper_) { return fenced_frame_helper_->CreateFencedFrame(fenced_frame_parent, url); + } // FencedFrameTestHelper only supports the MPArch version of fenced // frames. So need to maually create a fenced frame for the ShadowDOM
diff --git a/chrome/browser/ui/views/file_system_access/file_system_access_icon_view.cc b/chrome/browser/ui/views/file_system_access/file_system_access_icon_view.cc index b73451ea..7f0202de 100644 --- a/chrome/browser/ui/views/file_system_access/file_system_access_icon_view.cc +++ b/chrome/browser/ui/views/file_system_access/file_system_access_icon_view.cc
@@ -69,8 +69,9 @@ SetVisible(has_write_access_ || show_read_indicator); - if (has_write_access_ != had_write_access) + if (has_write_access_ != had_write_access) { UpdateIconImage(); + } GetViewAccessibility().SetName( has_write_access_ ? l10n_util::GetStringUTF16( @@ -80,8 +81,9 @@ // If icon isn't visible, a bubble shouldn't be shown either. Close it if // it was still open. - if (!GetVisible()) + if (!GetVisible()) { FileSystemAccessUsageBubbleView::CloseCurrentBubble(); + } } void FileSystemAccessIconView::OnExecuting(ExecuteSource execute_source) { @@ -111,8 +113,8 @@ } const gfx::VectorIcon& FileSystemAccessIconView::GetVectorIcon() const { - return has_write_access_ ? kFileSaveChromeRefreshIcon - : vector_icons::kInsertDriveFileOutlineIcon; + return has_write_access_ ? kFileSaveChromeRefreshIcon + : vector_icons::kInsertDriveFileOutlineIcon; } BEGIN_METADATA(FileSystemAccessIconView)
diff --git a/chrome/browser/ui/views/file_system_access/file_system_access_usage_bubble_view.cc b/chrome/browser/ui/views/file_system_access/file_system_access_usage_bubble_view.cc index 2d78ccc..bc2f424 100644 --- a/chrome/browser/ui/views/file_system_access/file_system_access_usage_bubble_view.cc +++ b/chrome/browser/ui/views/file_system_access/file_system_access_usage_bubble_view.cc
@@ -181,8 +181,9 @@ button->SetToggledTooltipText( l10n_util::GetStringUTF16(IDS_FILE_SYSTEM_ACCESS_USAGE_COLLAPSE)); expand_collapse_button_ = label_container->AddChildView(std::move(button)); - if (model->RowCount() < 3) + if (model->RowCount() < 3) { expand_collapse_button_->SetVisible(false); + } int preferred_width = label_container->GetPreferredSize().width(); AddChildView(std::move(label_container)); @@ -286,8 +287,9 @@ std::u16string FileSystemAccessUsageBubbleView::FilePathListModel::GetTooltip( size_t row) { - if (row < files_.size()) + if (row < files_.size()) { return files_[row].LossyDisplayName(); + } return directories_[row - files_.size()].LossyDisplayName(); } @@ -307,8 +309,9 @@ base::UserMetricsAction("NativeFileSystemAPI.OpenedBubble")); Browser* browser = chrome::FindBrowserWithTab(web_contents); - if (!browser) + if (!browser) { return; + } ToolbarButtonProvider* button_provider = BrowserView::GetBrowserViewForBrowser(browser)->toolbar_button_provider(); @@ -341,8 +344,9 @@ // static void FileSystemAccessUsageBubbleView::CloseCurrentBubble() { - if (bubble_) + if (bubble_) { bubble_->CloseBubble(); + } } // static @@ -391,8 +395,9 @@ const { Browser* browser = chrome::FindBrowserWithTab(web_contents()); // Don't crash if the web_contents is destroyed/unloaded. - if (!browser) + if (!browser) { return {}; + } return BrowserView::GetBrowserViewForBrowser(browser) ->toolbar_button_provider() @@ -470,14 +475,16 @@ base::RecordAction( base::UserMetricsAction("NativeFileSystemAPI.RevokePermissions")); - if (!web_contents()) + if (!web_contents()) { return; + } content::BrowserContext* profile = web_contents()->GetBrowserContext(); auto* context = FileSystemAccessPermissionContextFactory::GetForProfileIfExists(profile); - if (!context) + if (!context) { return; + } context->RevokeGrants(origin_); } @@ -485,8 +492,9 @@ void FileSystemAccessUsageBubbleView::WindowClosing() { // |bubble_| can be a new bubble by this point (as Close(); doesn't // call this right away). Only set to nullptr when it's this bubble. - if (bubble_ == this) + if (bubble_ == this) { bubble_ = nullptr; + } } void FileSystemAccessUsageBubbleView::CloseBubble() {
diff --git a/chrome/browser/ui/views/find_bar_host.cc b/chrome/browser/ui/views/find_bar_host.cc index 614be06c..38fe5a0 100644 --- a/chrome/browser/ui/views/find_bar_host.cc +++ b/chrome/browser/ui/views/find_bar_host.cc
@@ -112,15 +112,17 @@ (2 * kMinFindWndDistanceFromSelection)); // If we moved it off-screen to the right, we won't move it at all. - if (new_pos.x() + new_pos.width() > dialog_bounds.width()) + if (new_pos.x() + new_pos.width() > dialog_bounds.width()) { new_pos = view_location; // Reset. + } } else { new_pos.set_x(avoid_overlapping_rect.x() - new_pos.width() - kMinFindWndDistanceFromSelection); // If we moved it off-screen to the left, we won't move it at all. - if (new_pos.x() < 0) + if (new_pos.x() < 0) { new_pos = view_location; // Reset. + } } } @@ -189,8 +191,7 @@ focus_tracker_.reset(); } -bool FindBarHost::MaybeForwardKeyEventToWebpage( - const ui::KeyEvent& key_event) { +bool FindBarHost::MaybeForwardKeyEventToWebpage(const ui::KeyEvent& key_event) { switch (key_event.key_code()) { case ui::VKEY_DOWN: case ui::VKEY_UP: @@ -199,16 +200,18 @@ break; case ui::VKEY_HOME: case ui::VKEY_END: - if (key_event.IsControlDown()) + if (key_event.IsControlDown()) { break; + } [[fallthrough]]; default: return false; } content::WebContents* contents = find_bar_controller_->web_contents(); - if (!contents) + if (!contents) { return false; + } // Make sure we don't have a text field element interfering with keyboard // input. Otherwise Up and Down arrow key strokes get eaten. "Nom Nom Nom". @@ -337,18 +340,20 @@ void FindBarHost::UpdateUIForFindResult( const find_in_page::FindNotificationDetails& result, const std::u16string& find_text) { - if (!find_text.empty()) + if (!find_text.empty()) { view_->UpdateForResult(result, find_text); - else + } else { view_->ClearMatchCount(); + } // We now need to check if the window is obscuring the search results. MoveWindowIfNecessaryWithRect(result.selection_rect()); // Once we find a match we no longer want to keep track of what had // focus. EndFindSession will then set the focus to the page content. - if (result.number_of_matches() > 0) + if (result.number_of_matches() > 0) { focus_tracker_.reset(); + } } void FindBarHost::AudibleAlert() { @@ -435,18 +440,22 @@ bool FindBarHost::GetFindBarWindowInfo(gfx::Point* position, bool* fully_visible) const { if (!find_bar_controller_) { - if (position) + if (position) { *position = gfx::Point(); - if (fully_visible) + } + if (fully_visible) { *fully_visible = false; + } return false; } gfx::Rect window_rect = host_->GetWindowBoundsInScreen(); - if (position) + if (position) { *position = window_rect.origin(); - if (fully_visible) + } + if (fully_visible) { *fully_visible = is_visible_ && !animation_->is_animating(); + } return true; } @@ -471,8 +480,9 @@ // is registered with this object. So to handle that case, we need to bail out // if there is no controller. const FindBarController* const controller = GetFindBarController(); - if (!controller) + if (!controller) { return std::u16string(); + } return l10n_util::GetStringFUTF16( IDS_FIND_IN_PAGE_ACCESSIBLE_TITLE, browser_view_->browser()->GetWindowTitleForCurrentTab(false)); @@ -503,13 +513,15 @@ // don't check this, then SetDialogPosition below will end up making the Find // Bar visible. content::WebContents* web_contents = find_bar_controller_->web_contents(); - if (!web_contents) + if (!web_contents) { return; + } find_in_page::FindTabHelper* find_tab_helper = find_in_page::FindTabHelper::FromWebContents(web_contents); - if (!find_tab_helper || !find_tab_helper->find_ui_active()) + if (!find_tab_helper || !find_tab_helper->find_ui_active()) { return; + } gfx::Rect new_pos = GetDialogPosition(selection_rect); SetDialogPosition(new_pos); @@ -521,8 +533,9 @@ void FindBarHost::SaveFocusTracker() { auto* web_contents = find_bar_controller_->web_contents(); - if (!web_contents) + if (!web_contents) { return; + } if (focus_tracker_) { focus_tracker_->SetFocusManager(nullptr); @@ -533,8 +546,9 @@ void FindBarHost::RestoreOrCreateFocusTracker() { auto* web_contents = find_bar_controller_->web_contents(); - if (!web_contents) + if (!web_contents) { return; + } std::unique_ptr<views::ExternalFocusTracker> focus_tracker = FindBarHostHelper::CreateOrGetFromWebContents(web_contents)
diff --git a/chrome/browser/ui/views/find_bar_host_unittest_util_views.cc b/chrome/browser/ui/views/find_bar_host_unittest_util_views.cc index bef199bc..33b846c 100644 --- a/chrome/browser/ui/views/find_bar_host_unittest_util_views.cc +++ b/chrome/browser/ui/views/find_bar_host_unittest_util_views.cc
@@ -2,10 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/find_bar/find_bar_host_unittest_util.h" - #include "build/build_config.h" #include "build/buildflag.h" +#include "chrome/browser/ui/find_bar/find_bar_host_unittest_util.h" #include "chrome/browser/ui/views/find_bar_host.h" #include "ui/base/ui_base_features.h"
diff --git a/chrome/browser/ui/views/find_bar_view.cc b/chrome/browser/ui/views/find_bar_view.cc index c8be5ca..5fa4fa1 100644 --- a/chrome/browser/ui/views/find_bar_view.cc +++ b/chrome/browser/ui/views/find_bar_view.cc
@@ -112,8 +112,9 @@ } void SetResult(const find_in_page::FindNotificationDetails& result) { - if (last_result_ && result == *last_result_) + if (last_result_ && result == *last_result_) { return; + } last_result_ = result; // TODO(crbug.com/40939931): Get NO_RESULTS to be announced under Orca and @@ -408,8 +409,9 @@ const gfx::Rect focus_area(find_text_edge, find_previous_button_->y(), find_previous_button_->x() - find_text_edge, find_previous_button_->height()); - if (!GetMirroredRect(focus_area).Contains(event.location())) + if (!GetMirroredRect(focus_area).Contains(event.location())) { return false; + } find_text_->RequestFocus(); return true; } @@ -437,8 +439,9 @@ #if !BUILDFLAG(IS_WIN) GetWidget()->GetInputMethod()->SetVirtualKeyboardVisibilityIfEnabled(true); #endif - if (!find_text_->GetText().empty()) + if (!find_text_->GetText().empty()) { find_text_->SelectAll(true); + } } //////////////////////////////////////////////////////////////////////////////// @@ -447,11 +450,13 @@ bool FindBarView::HandleKeyEvent(views::Textfield* sender, const ui::KeyEvent& key_event) { // If the dialog is not visible, there is no reason to process keyboard input. - if (!find_bar_host_ || !find_bar_host_->IsVisible()) + if (!find_bar_host_ || !find_bar_host_->IsVisible()) { return false; + } - if (find_bar_host_->MaybeForwardKeyEventToWebpage(key_event)) + if (find_bar_host_->MaybeForwardKeyEventToWebpage(key_event)) { return true; // Handled, we are done! + } if (key_event.key_code() == ui::VKEY_RETURN && key_event.type() == ui::EventType::kKeyPressed) { @@ -465,8 +470,7 @@ // Search forwards for enter, backwards for shift-enter. find_tab_helper->StartFinding( find_string, !key_event.IsShiftDown() /* forward_direction */, - false /* case_sensitive */, - true /* find_match */); + false /* case_sensitive */, true /* find_match */); } return true; } @@ -477,8 +481,9 @@ void FindBarView::OnAfterUserAction(views::Textfield* sender) { // The composition text wouldn't be what the user is really looking for. // We delay the search until the user commits the composition text. - if (!sender->IsIMEComposing() && sender->GetText() != last_searched_text_) + if (!sender->IsIMEComposing() && sender->GetText() != last_searched_text_) { Find(sender->GetText()); + } } void FindBarView::OnAfterPaste() { @@ -496,8 +501,9 @@ // We must guard against a NULL web_contents, which can happen if the text // in the Find box is changed right after the tab is destroyed. Otherwise, it // can lead to crashes, as exposed by automation testing in issue 8048. - if (!web_contents) + if (!web_contents) { return; + } find_in_page::FindTabHelper* find_tab_helper = find_in_page::FindTabHelper::FromWebContents(web_contents); @@ -513,8 +519,9 @@ } void FindBarView::FindNext(bool reverse) { - if (!find_bar_host_) + if (!find_bar_host_) { return; + } if (!find_text_->GetText().empty()) { find_in_page::FindTabHelper* find_tab_helper = find_in_page::FindTabHelper::FromWebContents( @@ -527,8 +534,9 @@ } void FindBarView::EndFindSession() { - if (!find_bar_host_) + if (!find_bar_host_) { return; + } find_bar_host_->GetFindBarController()->EndFindSession( find_in_page::SelectionAction::kKeep, find_in_page::ResultAction::kKeep); }
diff --git a/chrome/browser/ui/views/find_bar_view.h b/chrome/browser/ui/views/find_bar_view.h index 21607161..12e9d5e 100644 --- a/chrome/browser/ui/views/find_bar_view.h +++ b/chrome/browser/ui/views/find_bar_view.h
@@ -32,7 +32,7 @@ class Painter; class Separator; class Textfield; -} +} // namespace views //////////////////////////////////////////////////////////////////////////////// //
diff --git a/chrome/browser/ui/views/find_bar_views_interactive_uitest.cc b/chrome/browser/ui/views/find_bar_views_interactive_uitest.cc index cea2aa7..656b827 100644 --- a/chrome/browser/ui/views/find_bar_views_interactive_uitest.cc +++ b/chrome/browser/ui/views/find_bar_views_interactive_uitest.cc
@@ -184,8 +184,9 @@ find_in_page::FindNotificationDetails WaitForFinalFindResult() { while (true) { auto details = WaitForFindResult(); - if (details.final_update()) + if (details.final_update()) { return details; + } } } }; @@ -651,22 +652,22 @@ browser()->GetFindBarController()->Show(); // Search for "a". - ASSERT_TRUE(ui_test_utils::SendKeyPressSync( - browser(), ui::VKEY_A, false, false, false, false)); + ASSERT_TRUE(ui_test_utils::SendKeyPressSync(browser(), ui::VKEY_A, false, + false, false, false)); // We should find "a" here. EXPECT_EQ(u"a", GetFindBarText()); // Delete "a". - ASSERT_TRUE(ui_test_utils::SendKeyPressSync( - browser(), ui::VKEY_BACK, false, false, false, false)); + ASSERT_TRUE(ui_test_utils::SendKeyPressSync(browser(), ui::VKEY_BACK, false, + false, false, false)); // Validate we have cleared the text. EXPECT_EQ(std::u16string(), GetFindBarText()); // Close the Find box. - ASSERT_TRUE(ui_test_utils::SendKeyPressSync( - browser(), ui::VKEY_ESCAPE, false, false, false, false)); + ASSERT_TRUE(ui_test_utils::SendKeyPressSync(browser(), ui::VKEY_ESCAPE, false, + false, false, false)); // Show the Find bar. browser()->GetFindBarController()->Show(); @@ -676,12 +677,12 @@ EXPECT_EQ(std::u16string(), GetFindBarText()); // Close the Find box. - ASSERT_TRUE(ui_test_utils::SendKeyPressSync( - browser(), ui::VKEY_ESCAPE, false, false, false, false)); + ASSERT_TRUE(ui_test_utils::SendKeyPressSync(browser(), ui::VKEY_ESCAPE, false, + false, false, false)); // Press F3 to trigger FindNext. - ASSERT_TRUE(ui_test_utils::SendKeyPressSync( - browser(), ui::VKEY_F3, false, false, false, false)); + ASSERT_TRUE(ui_test_utils::SendKeyPressSync(browser(), ui::VKEY_F3, false, + false, false, false)); // After the Find box has been reopened, it should still have no prepopulate // value. @@ -756,14 +757,14 @@ browser()->GetFindBarController()->Show(); // Search for "link". - ASSERT_TRUE(ui_test_utils::SendKeyPressSync( - browser(), ui::VKEY_L, false, false, false, false)); - ASSERT_TRUE(ui_test_utils::SendKeyPressSync( - browser(), ui::VKEY_I, false, false, false, false)); - ASSERT_TRUE(ui_test_utils::SendKeyPressSync( - browser(), ui::VKEY_N, false, false, false, false)); - ASSERT_TRUE(ui_test_utils::SendKeyPressSync( - browser(), ui::VKEY_K, false, false, false, false)); + ASSERT_TRUE(ui_test_utils::SendKeyPressSync(browser(), ui::VKEY_L, false, + false, false, false)); + ASSERT_TRUE(ui_test_utils::SendKeyPressSync(browser(), ui::VKEY_I, false, + false, false, false)); + ASSERT_TRUE(ui_test_utils::SendKeyPressSync(browser(), ui::VKEY_N, false, + false, false, false)); + ASSERT_TRUE(ui_test_utils::SendKeyPressSync(browser(), ui::VKEY_K, false, + false, false, false)); content::RunUntilInputProcessed(host); EXPECT_EQ(u"link", GetFindBarText()); @@ -771,8 +772,8 @@ ui_test_utils::UrlLoadObserver observer(GURL("about:blank")); // Send Ctrl-Enter, should cause navigation to about:blank. - ASSERT_TRUE(ui_test_utils::SendKeyPressSync( - browser(), ui::VKEY_RETURN, true, false, false, false)); + ASSERT_TRUE(ui_test_utils::SendKeyPressSync(browser(), ui::VKEY_RETURN, true, + false, false, false)); observer.Wait(); } @@ -797,18 +798,18 @@ // sending keystrokes like this is required. Also note that the text must // contain a space. browser()->GetFindBarController()->Show(); - ASSERT_TRUE(ui_test_utils::SendKeyPressSync( - browser(), ui::VKEY_A, false, false, false, false)); - ASSERT_TRUE(ui_test_utils::SendKeyPressSync( - browser(), ui::VKEY_SPACE, false, false, false, false)); - ASSERT_TRUE(ui_test_utils::SendKeyPressSync( - browser(), ui::VKEY_L, false, false, false, false)); - ASSERT_TRUE(ui_test_utils::SendKeyPressSync( - browser(), ui::VKEY_I, false, false, false, false)); - ASSERT_TRUE(ui_test_utils::SendKeyPressSync( - browser(), ui::VKEY_N, false, false, false, false)); - ASSERT_TRUE(ui_test_utils::SendKeyPressSync( - browser(), ui::VKEY_K, false, false, false, false)); + ASSERT_TRUE(ui_test_utils::SendKeyPressSync(browser(), ui::VKEY_A, false, + false, false, false)); + ASSERT_TRUE(ui_test_utils::SendKeyPressSync(browser(), ui::VKEY_SPACE, false, + false, false, false)); + ASSERT_TRUE(ui_test_utils::SendKeyPressSync(browser(), ui::VKEY_L, false, + false, false, false)); + ASSERT_TRUE(ui_test_utils::SendKeyPressSync(browser(), ui::VKEY_I, false, + false, false, false)); + ASSERT_TRUE(ui_test_utils::SendKeyPressSync(browser(), ui::VKEY_N, false, + false, false, false)); + ASSERT_TRUE(ui_test_utils::SendKeyPressSync(browser(), ui::VKEY_K, false, + false, false, false)); EXPECT_EQ(u"a link", GetFindBarText()); browser()->GetFindBarController()->EndFindSession(
diff --git a/chrome/browser/ui/views/first_run_dialog.cc b/chrome/browser/ui/views/first_run_dialog.cc index 60f07554..c61c7756 100644 --- a/chrome/browser/ui/views/first_run_dialog.cc +++ b/chrome/browser/ui/views/first_run_dialog.cc
@@ -39,14 +39,16 @@ // Don't show first run dialog when running in headless mode since this // would effectively block the UI because there is no one to interact with // the dialog. - if (headless::IsHeadlessMode()) + if (headless::IsHeadlessMode()) { return; + } #if BUILDFLAG(IS_MAC) - if (base::FeatureList::IsEnabled(features::kViewsFirstRunDialog)) + if (base::FeatureList::IsEnabled(features::kViewsFirstRunDialog)) { ShowFirstRunDialogViews(); - else + } else { ShowFirstRunDialogCocoa(); + } #else ShowFirstRunDialogViews(); #endif @@ -116,8 +118,9 @@ ChangeMetricsReportingState(report_crashes_->GetChecked()); - if (make_default_->GetChecked()) + if (make_default_->GetChecked()) { shell_integration::SetAsDefaultBrowser(); + } Done(); return true;
diff --git a/chrome/browser/ui/views/flying_indicator.cc b/chrome/browser/ui/views/flying_indicator.cc index 810a825..9074888 100644 --- a/chrome/browser/ui/views/flying_indicator.cc +++ b/chrome/browser/ui/views/flying_indicator.cc
@@ -107,26 +107,31 @@ // Kill the callback before deleting the widget so we don't call it. done_callback_.Reset(); scoped_observation_.Reset(); - if (widget_) + if (widget_) { widget_->Close(); + } } void FlyingIndicator::OnWidgetDestroyed(views::Widget* widget) { - if (widget != widget_) + if (widget != widget_) { return; + } DCHECK(scoped_observation_.IsObserving()); scoped_observation_.Reset(); widget_ = nullptr; animation_.Stop(); - if (done_callback_) + if (done_callback_) { std::move(done_callback_).Run(); + } } void FlyingIndicator::AnimationProgressed(const gfx::Animation* animation) { - if (!widget_) + if (!widget_) { return; - if (animation_.current_part_index() > 1U && done_callback_) + } + if (animation_.current_part_index() > 1U && done_callback_) { std::move(done_callback_).Run(); + } // The steps of the animation are: // 0. Grow and fade the bubble in, centered on the originating point. @@ -175,8 +180,9 @@ void FlyingIndicator::AnimationEnded(const gfx::Animation* animation) { // We need to close the widget, but that can be an asynchronous event, so call // |done_callback_| and remove our listeners and reference to the widget. - if (done_callback_) + if (done_callback_) { std::move(done_callback_).Run(); + } if (widget_) { DCHECK(scoped_observation_.IsObserving()); scoped_observation_.Reset();
diff --git a/chrome/browser/ui/views/frame/app_menu_button.cc b/chrome/browser/ui/views/frame/app_menu_button.cc index c8df8fb..831612f 100644 --- a/chrome/browser/ui/views/frame/app_menu_button.cc +++ b/chrome/browser/ui/views/frame/app_menu_button.cc
@@ -47,8 +47,9 @@ } void AppMenuButton::CloseMenu() { - if (menu_) + if (menu_) { menu_->CloseMenu(); + } menu_.reset(); }
diff --git a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host.h b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host.h index cc23187..e87d3767 100644 --- a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host.h +++ b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host.h
@@ -14,7 +14,7 @@ namespace internal { class NativeWidgetDelegate; } -} +} // namespace views // Interface to a platform specific browser frame implementation. The object // implementing this interface will also implement views::DesktopWindowTreeHost. @@ -36,5 +36,4 @@ virtual bool UsesNativeSystemMenu() const = 0; }; - #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_WINDOW_TREE_HOST_H_
diff --git a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.cc b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.cc index c51f308b..01673da 100644 --- a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.cc +++ b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.cc
@@ -123,8 +123,9 @@ std::string VirtualDesktopHelper::GetWorkspace() { DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); - if (!workspace_.has_value()) + if (!workspace_.has_value()) { workspace_ = initial_workspace_; + } return workspace_.value_or(std::string()); } @@ -155,13 +156,15 @@ // If GetWindowDesktopId() fails, |workspace| will be empty, and it's most // likely that the current value of |workspace_| is still correct, so don't // overwrite it. - if (workspace.empty()) + if (workspace.empty()) { return; + } bool workspace_changed = workspace != workspace_.value_or(std::string()); workspace_ = workspace; - if (workspace_changed) + if (workspace_changed) { std::move(callback).Run(); + } } void VirtualDesktopHelper::InitImpl(HWND hwnd, @@ -191,14 +194,16 @@ HWND hwnd, Microsoft::WRL::ComPtr<IVirtualDesktopManager> virtual_desktop_manager) { DCHECK(!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); - if (!virtual_desktop_manager) + if (!virtual_desktop_manager) { return std::string(); + } GUID workspace_guid; HRESULT hr = virtual_desktop_manager->GetWindowDesktopId(hwnd, &workspace_guid); - if (FAILED(hr) || workspace_guid == GUID_NULL) + if (FAILED(hr) || workspace_guid == GUID_NULL) { return std::string(); + } LPOLESTR workspace_widestr; StringFromCLSID(workspace_guid, &workspace_widestr); @@ -247,7 +252,7 @@ // BrowserDesktopWindowTreeHostWin, BrowserDesktopWindowTreeHost implementation: views::DesktopWindowTreeHost* - BrowserDesktopWindowTreeHostWin::AsDesktopWindowTreeHost() { +BrowserDesktopWindowTreeHostWin::AsDesktopWindowTreeHost() { return this; } @@ -279,10 +284,11 @@ !virtual_desktop_helper_->GetInitialWorkspaceRemembered()) { // If |virtual_desktop_helper_| has an empty workspace, kick off an update, // which will eventually call OnHostWorkspaceChanged. - if (virtual_desktop_helper_->GetWorkspace().empty()) + if (virtual_desktop_helper_->GetWorkspace().empty()) { UpdateWorkspace(); - else + } else { OnHostWorkspaceChanged(); + } } DesktopWindowTreeHostWin::Show(show_state, restore_bounds); } @@ -316,8 +322,9 @@ gfx::Insets* insets, HMONITOR monitor) const { // Always use default insets for opaque frame. - if (!ShouldUseNativeFrame()) + if (!ShouldUseNativeFrame()) { return false; + } // Use default insets for popups and apps, unless we are custom drawing the // titlebar. @@ -362,8 +369,9 @@ // Instead, we use that function below to tell us whether the frame is // currently native or opaque. if (!GetWidget()->client_view() || !browser_view_->GetIsNormalType() || - !DesktopWindowTreeHostWin::ShouldUseNativeFrame()) + !DesktopWindowTreeHostWin::ShouldUseNativeFrame()) { return false; + } // Don't extend the glass in at all if it won't be visible. if (!ShouldUseNativeFrame() || GetWidget()->IsFullscreen() || @@ -414,8 +422,9 @@ LRESULT* result) { switch (message) { case WM_ACTIVATE: - if (LOWORD(w_param) != WA_INACTIVE) + if (LOWORD(w_param) != WA_INACTIVE) { minimize_button_metrics_.OnHWNDActivated(); + } return false; case WM_ENDSESSION: chrome::SessionEnding(); @@ -424,8 +433,8 @@ GetSystemMenu()->UpdateStates(); return true; } - return DesktopWindowTreeHostWin::PreHandleMSG( - message, w_param, l_param, result); + return DesktopWindowTreeHostWin::PreHandleMSG(message, w_param, l_param, + result); } void BrowserDesktopWindowTreeHostWin::PostHandleMSG(UINT message, @@ -461,8 +470,9 @@ case WM_DWMCOLORIZATIONCOLORCHANGED: { // The activation border may have changed color. views::NonClientView* non_client_view = GetWidget()->non_client_view(); - if (non_client_view) + if (non_client_view) { non_client_view->SchedulePaint(); + } break; } } @@ -491,18 +501,21 @@ } bool BrowserDesktopWindowTreeHostWin::ShouldUseNativeFrame() const { - if (!views::DesktopWindowTreeHostWin::ShouldUseNativeFrame()) + if (!views::DesktopWindowTreeHostWin::ShouldUseNativeFrame()) { return false; + } // This function can get called when the Browser window is closed i.e. in the // context of the BrowserView destructor. - if (!browser_view_->browser()) + if (!browser_view_->browser()) { return false; + } // We don't theme popup or app windows, so regardless of whether or not a // theme is active for normal browser windows, we don't want to use the custom // frame for popups/apps. - if (!browser_view_->GetIsNormalType()) + if (!browser_view_->GetIsNormalType()) { return true; + } // Otherwise, we use the native frame when we're told we should by the theme // provider (e.g. no custom theme is active). return GetWidget()->GetThemeProvider()->ShouldUseNativeFrame(); @@ -554,8 +567,9 @@ // BrowserDesktopWindowTreeHostWin, private: void BrowserDesktopWindowTreeHostWin::UpdateWorkspace() { - if (!virtual_desktop_helper_) + if (!virtual_desktop_helper_) { return; + } virtual_desktop_helper_->UpdateWindowDesktopId( GetHWND(), base::BindOnce(&BrowserDesktopWindowTreeHostWin::OnHostWorkspaceChanged, @@ -564,22 +578,25 @@ SkBitmap GetBadgedIconBitmapForProfile(Profile* profile) { std::unique_ptr<gfx::ImageFamily> family = GetAppIconImageFamily(); - if (!family) + if (!family) { return SkBitmap(); + } SkBitmap app_icon_bitmap = family ->CreateExact(profiles::kShortcutIconSizeWin, profiles::kShortcutIconSizeWin) .AsBitmap(); - if (app_icon_bitmap.isNull()) + if (app_icon_bitmap.isNull()) { return SkBitmap(); + } ProfileAttributesEntry* entry = g_browser_process->profile_manager() ->GetProfileAttributesStorage() .GetProfileAttributesWithPath(profile->GetPath()); - if (!entry) + if (!entry) { return SkBitmap(); + } SkBitmap avatar_bitmap_2x = profiles::GetWin2xAvatarImage(entry); return profiles::GetBadgedWinIconBitmapForAvatar(app_icon_bitmap, @@ -607,11 +624,11 @@ // static BrowserDesktopWindowTreeHost* - BrowserDesktopWindowTreeHost::CreateBrowserDesktopWindowTreeHost( - views::internal::NativeWidgetDelegate* native_widget_delegate, - views::DesktopNativeWidgetAura* desktop_native_widget_aura, - BrowserView* browser_view, - BrowserFrame* browser_frame) { +BrowserDesktopWindowTreeHost::CreateBrowserDesktopWindowTreeHost( + views::internal::NativeWidgetDelegate* native_widget_delegate, + views::DesktopNativeWidgetAura* desktop_native_widget_aura, + BrowserView* browser_view, + BrowserFrame* browser_frame) { return new BrowserDesktopWindowTreeHostWin(native_widget_delegate, desktop_native_widget_aura, browser_view, browser_frame);
diff --git a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.h b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.h index b71747d2..3aeaea8 100644 --- a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.h +++ b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.h
@@ -31,7 +31,7 @@ namespace views { class DesktopNativeWidgetAura; class NativeMenuWin; -} +} // namespace views class BrowserDesktopWindowTreeHostWin : public BrowserDesktopWindowTreeHost,
diff --git a/chrome/browser/ui/views/frame/browser_frame.cc b/chrome/browser/ui/views/frame/browser_frame.cc index e3aa84f1..806679c 100644 --- a/chrome/browser/ui/views/frame/browser_frame.cc +++ b/chrome/browser/ui/views/frame/browser_frame.cc
@@ -376,8 +376,9 @@ // which reorders the browsers such that the ones in the current // workspace appear before ones in other workspaces. auto workspace = display::Screen::GetScreen()->GetCurrentWorkspace(); - if (!workspace.empty()) + if (!workspace.empty()) { BrowserList::MoveBrowsersInWorkspaceToFront(workspace); + } #endif Widget::OnNativeWidgetWorkspaceChanged(); } @@ -463,16 +464,19 @@ } void BrowserFrame::SetTabDragKind(TabDragKind tab_drag_kind) { - if (tab_drag_kind_ == tab_drag_kind) + if (tab_drag_kind_ == tab_drag_kind) { return; + } - if (native_browser_frame_) + if (native_browser_frame_) { native_browser_frame_->TabDraggingKindChanged(tab_drag_kind); + } bool was_dragging_any = tab_drag_kind_ != TabDragKind::kNone; bool is_dragging_any = tab_drag_kind != TabDragKind::kNone; - if (was_dragging_any != is_dragging_any) + if (was_dragging_any != is_dragging_any) { browser_view_->TabDraggingStatusChanged(is_dragging_any); + } tab_drag_kind_ = tab_drag_kind; }
diff --git a/chrome/browser/ui/views/frame/browser_frame_ash.cc b/chrome/browser/ui/views/frame/browser_frame_ash.cc index dd58691b..dbc3a7fc 100644 --- a/chrome/browser/ui/views/frame/browser_frame_ash.cc +++ b/chrome/browser/ui/views/frame/browser_frame_ash.cc
@@ -85,8 +85,9 @@ // Turn on auto window management if we don't need an explicit bounds. // This way the requested bounds are honored. - if (!browser->bounds_overridden() && !browser->is_session_restore()) + if (!browser->bounds_overridden() && !browser->is_session_restore()) { SetWindowAutoManaged(); + } } BrowserFrameAsh::~BrowserFrameAsh() = default; @@ -154,8 +155,9 @@ } } - if (!used_window_state_restore_bounds) + if (!used_window_state_restore_bounds) { *bounds = GetWidget()->GetRestoredBounds(); + } *show_state = window->GetProperty(aura::client::kShowStateKey); } @@ -257,6 +259,7 @@ void BrowserFrameAsh::SetWindowAutoManaged() { // For browser window in Chrome OS, we should only enable the auto window // management logic for tabbed browser. - if (browser_view_->browser()->is_type_normal()) + if (browser_view_->browser()->is_type_normal()) { GetNativeWindow()->SetProperty(ash::kWindowPositionManagedTypeKey, true); + } }
diff --git a/chrome/browser/ui/views/frame/browser_frame_browsertest.cc b/chrome/browser/ui/views/frame/browser_frame_browsertest.cc index 83262f3..e13e1403 100644 --- a/chrome/browser/ui/views/frame/browser_frame_browsertest.cc +++ b/chrome/browser/ui/views/frame/browser_frame_browsertest.cc
@@ -63,8 +63,9 @@ views::Widget::InitParams* params, views::internal::NativeWidgetDelegate* delegate) override { ChromeViewsDelegate::OnBeforeWidgetInit(params, delegate); - if (params->name == "BrowserFrame") + if (params->name == "BrowserFrame") { EXPECT_FALSE(params->bounds.IsEmpty()); + } } };
diff --git a/chrome/browser/ui/views/frame/browser_frame_header_chromeos.cc b/chrome/browser/ui/views/frame/browser_frame_header_chromeos.cc index a226566..4f4af0b 100644 --- a/chrome/browser/ui/views/frame/browser_frame_header_chromeos.cc +++ b/chrome/browser/ui/views/frame/browser_frame_header_chromeos.cc
@@ -69,11 +69,13 @@ bounds.width(), bounds.height(), 1.0f, SkTileMode::kRepeat, SkTileMode::kMirror); } - if (!frame_overlay_image.isNull()) + if (!frame_overlay_image.isNull()) { canvas->DrawImageInt(frame_overlay_image, 0, 0); + } - if (blending_required) + if (blending_required) { canvas->Restore(); + } } // Returns the frame path with the given |bounds| and |corner_radius|
diff --git a/chrome/browser/ui/views/frame/browser_frame_mac.mm b/chrome/browser/ui/views/frame/browser_frame_mac.mm index ad9fe12..b540a7a 100644 --- a/chrome/browser/ui/views/frame/browser_frame_mac.mm +++ b/chrome/browser/ui/views/frame/browser_frame_mac.mm
@@ -48,8 +48,9 @@ AppShimHost* GetHostForBrowser(Browser* browser) { auto* const shim_manager = apps::AppShimManager::Get(); - if (!shim_manager) + if (!shim_manager) { return nullptr; + } return shim_manager->GetHostForRemoteCocoaBrowser(browser); } @@ -341,8 +342,9 @@ WindowOpenDisposition window_open_disposition, bool is_before_first_responder) { if (!WillExecuteCommand(command, window_open_disposition, - is_before_first_responder)) + is_before_first_responder)) { return false; + } Browser* browser = browser_view_->browser(); @@ -374,8 +376,9 @@ params->titlebar_appears_transparent = true; // Hosted apps draw their own window title. - if (browser_view_->GetIsWebAppType()) + if (browser_view_->GetIsWebAppType()) { params->window_title_hidden = true; + } } else { params->window_class = remote_cocoa::mojom::WindowClass::kDefault; } @@ -395,8 +398,9 @@ remote_cocoa::ApplicationHost* BrowserFrameMac::GetRemoteCocoaApplicationHost() { - if (auto* host = GetHostForBrowser(browser_view_->browser())) + if (auto* host = GetHostForBrowser(browser_view_->browser())) { return host->GetRemoteCocoaApplicationHost(); + } return nullptr; }
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc index df0978f..38939aea 100644 --- a/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc +++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc
@@ -45,7 +45,6 @@ // static constexpr int BrowserNonClientFrameView::kMinimumDragHeight; - BrowserNonClientFrameView::BrowserNonClientFrameView(BrowserFrame* frame, BrowserView* browser_view) : frame_(frame), browser_view_(browser_view) { @@ -54,16 +53,18 @@ // The profile manager may by null in tests. if (g_browser_process->profile_manager()) { - g_browser_process->profile_manager()-> - GetProfileAttributesStorage().AddObserver(this); + g_browser_process->profile_manager() + ->GetProfileAttributesStorage() + .AddObserver(this); } } BrowserNonClientFrameView::~BrowserNonClientFrameView() { // The profile manager may by null in tests. if (g_browser_process->profile_manager()) { - g_browser_process->profile_manager()-> - GetProfileAttributesStorage().RemoveObserver(this); + g_browser_process->profile_manager() + ->GetProfileAttributesStorage() + .RemoveObserver(this); } } @@ -72,10 +73,11 @@ } void BrowserNonClientFrameView::OnFullscreenStateChanged() { - if (frame_->IsFullscreen()) + if (frame_->IsFullscreen()) { browser_view_->HideDownloadShelf(); - else + } else { browser_view_->UnhideDownloadShelf(); + } } bool BrowserNonClientFrameView::CaptionButtonsOnLeadingEdge() const { @@ -112,8 +114,9 @@ // the frame; but to detect this we'd need to do some kind of aligned // rendering comparison, which seems not worth it. const ui::ThemeProvider* tp = GetThemeProvider(); - if (tp->HasCustomImage(bg_id.value())) + if (tp->HasCustomImage(bg_id.value())) { return true; + } // Inactive tab background images are copied from the active ones, so in the // inactive case, check the active image as well. @@ -121,8 +124,9 @@ const int active_id = browser_view_->GetIncognito() ? IDR_THEME_TAB_BACKGROUND_INCOGNITO : IDR_THEME_TAB_BACKGROUND; - if (tp->HasCustomImage(active_id)) + if (tp->HasCustomImage(active_id)) { return true; + } } // The tab image is a tinted version of the frame image. Tabs are visible @@ -171,9 +175,9 @@ const bool active = ShouldPaintAsActive(active_state); const int active_id = incognito ? IDR_THEME_TAB_BACKGROUND_INCOGNITO : IDR_THEME_TAB_BACKGROUND; - const int inactive_id = - incognito ? IDR_THEME_TAB_BACKGROUND_INCOGNITO_INACTIVE - : IDR_THEME_TAB_BACKGROUND_INACTIVE; + const int inactive_id = incognito + ? IDR_THEME_TAB_BACKGROUND_INCOGNITO_INACTIVE + : IDR_THEME_TAB_BACKGROUND_INACTIVE; const int id = active ? active_id : inactive_id; // tp->HasCustomImage() will only return true if the supplied ID has been @@ -197,8 +201,9 @@ // nothing if the window is not visible. So even if we've already gotten the // up-to-date decoration, we need to run the update procedure again here when // the window becomes visible. - if (is_visible) + if (is_visible) { OnProfileAvatarChanged(base::FilePath()); + } } gfx::Insets BrowserNonClientFrameView::RestoredMirroredFrameBorderInsets() @@ -248,8 +253,9 @@ gfx::ImageSkia BrowserNonClientFrameView::GetFrameOverlayImage( BrowserFrameActiveState active_state) const { - if (browser_view_->GetIncognito() || !browser_view_->GetIsNormalType()) + if (browser_view_->GetIncognito() || !browser_view_->GetIsNormalType()) { return gfx::ImageSkia(); + } const ui::ThemeProvider* tp = GetThemeProvider(); const int frame_overlay_image_id = ShouldPaintAsActive(active_state) @@ -308,8 +314,9 @@ } int BrowserNonClientFrameView::GetSystemMenuY() const { - if (!browser_view()->GetTabStripVisible()) + if (!browser_view()->GetTabStripVisible()) { return GetTopInset(false); + } return GetBoundsForTabStripRegion( browser_view()->tab_strip_region_view()->GetMinimumSize()) .bottom() -
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_chromeos.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_chromeos.cc index d15f802..420673c5 100644 --- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_chromeos.cc +++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_chromeos.cc
@@ -89,8 +89,9 @@ ui::Layer* GetNativeViewLayer(views::WebView* web_view) { if (web_view) { if (views::NativeViewHost* holder = web_view->holder(); holder) { - if (aura::Window* native_view = holder->native_view(); native_view) + if (aura::Window* native_view = holder->native_view(); native_view) { return native_view->layer(); + } } } return nullptr; @@ -100,8 +101,9 @@ content::RenderWidgetHost* GetRenderWidgetHost(views::WebView* web_view) { if (web_view) { if (auto* web_contents = web_view->GetWebContents(); web_contents) { - if (auto* rvh = web_contents->GetRenderViewHost(); rvh) + if (auto* rvh = web_contents->GetRenderViewHost(); rvh) { return rvh->GetWidget(); + } } } return nullptr; @@ -140,8 +142,9 @@ BrowserNonClientFrameViewChromeOS::~BrowserNonClientFrameViewChromeOS() { ImmersiveModeController* immersive_controller = browser_view()->immersive_mode_controller(); - if (immersive_controller) + if (immersive_controller) { immersive_controller->RemoveObserver(this); + } if (profile_indicator_icon_) { RemoveChildViewT(std::exchange(profile_indicator_icon_, nullptr)); @@ -281,8 +284,9 @@ } void BrowserNonClientFrameViewChromeOS::UpdateThrobber(bool running) { - if (window_icon_) + if (window_icon_) { window_icon_->Update(); + } } bool BrowserNonClientFrameViewChromeOS::CanUserExitFullscreen() const { @@ -299,8 +303,9 @@ const SkColor active_caption_color = views::FrameCaptionButton::GetButtonColor(frame_color); - if (ShouldPaintAsActive(active_state)) + if (ShouldPaintAsActive(active_state)) { return active_caption_color; + } const float inactive_alpha_ratio = views::FrameCaptionButton::GetInactiveButtonColorAlphaRatio(); @@ -310,12 +315,14 @@ SkColor BrowserNonClientFrameViewChromeOS::GetFrameColor( BrowserFrameActiveState active_state) const { - if (!UsePackagedAppHeaderStyle(browser_view()->browser())) + if (!UsePackagedAppHeaderStyle(browser_view()->browser())) { return BrowserNonClientFrameView::GetFrameColor(active_state); + } std::optional<SkColor> color; - if (browser_view()->GetIsWebAppType()) + if (browser_view()->GetIsWebAppType()) { color = browser_view()->browser()->app_controller()->GetThemeColor(); + } SkColor fallback_color = chromeos::kDefaultFrameColor; @@ -331,8 +338,9 @@ void BrowserNonClientFrameViewChromeOS::UpdateMinimumSize() { gfx::Size current_min_size = GetMinimumSize(); - if (last_minimum_size_ == current_min_size) + if (last_minimum_size_ == current_min_size) { return; + } last_minimum_size_ = current_min_size; GetWidget()->OnSizeConstraintsChanged(); @@ -373,8 +381,9 @@ gfx::Rect tabstrip_shadow_bounds(browser_view()->tabstrip()->bounds()); constexpr int kTabShadowHeight = 4; tabstrip_shadow_bounds.set_height(kTabShadowHeight); - if (tabstrip_shadow_bounds.Contains(client_point)) + if (tabstrip_shadow_bounds.Contains(client_point)) { return HTCAPTION; + } } return hit_test; @@ -393,13 +402,15 @@ } void BrowserNonClientFrameViewChromeOS::UpdateWindowIcon() { - if (window_icon_) + if (window_icon_) { window_icon_->SchedulePaint(); + } } void BrowserNonClientFrameViewChromeOS::UpdateWindowTitle() { - if (!frame()->IsFullscreen() && frame_header_) + if (!frame()->IsFullscreen() && frame_header_) { frame_header_->SchedulePaintForTitle(); + } frame()->GetNativeWindow()->SetProperty( chromeos::kWindowOverviewTitleKey, @@ -410,11 +421,13 @@ void BrowserNonClientFrameViewChromeOS::SizeConstraintsChanged() {} void BrowserNonClientFrameViewChromeOS::OnPaint(gfx::Canvas* canvas) { - if (!GetShouldPaint()) + if (!GetShouldPaint()) { return; + } - if (frame_header_) + if (frame_header_) { frame_header_->PaintHeader(canvas); + } } void BrowserNonClientFrameViewChromeOS::UpdateBorderlessModeEnabled() { @@ -432,15 +445,18 @@ // The header must be laid out before computing |painted_height| because the // computation of |painted_height| for app and popup windows depends on the // position of the window controls. - if (frame_header_) + if (frame_header_) { frame_header_->LayoutHeader(); + } int painted_height = GetTopInset(false); - if (browser_view()->GetTabStripVisible()) + if (browser_view()->GetTabStripVisible()) { painted_height += browser_view()->tabstrip()->GetPreferredSize().height(); + } - if (frame_header_) + if (frame_header_) { frame_header_->SetHeaderHeightForPainting(painted_height); + } if (profile_indicator_icon_) { LayoutProfileIndicator(); @@ -466,8 +482,9 @@ Browser* browser = browser_view()->browser(); if (ash::IsSystemWebApp(browser)) { gfx::Size minimum_size = ash::GetSystemWebAppMinimumWindowSize(browser); - if (!minimum_size.IsEmpty()) + if (!minimum_size.IsEmpty()) { return minimum_size; + } } // The minimum size of a borderless window is only limited by the window's @@ -551,8 +568,9 @@ } views::View::Views BrowserNonClientFrameViewChromeOS::GetChildrenInZOrder() { - if (frame()->ShouldDrawFrameHeader() && frame_header_) + if (frame()->ShouldDrawFrameHeader() && frame_header_) { return frame_header_->GetAdjustedChildrenInZOrder(this); + } return BrowserNonClientFrameView::GetChildrenInZOrder(); } @@ -604,8 +622,9 @@ // For example, rotating from landscape display to portrait display layout // should update snap icons from left/right arrows to upward/downward arrows // for top and bottom snaps. - if ((changed_metrics & DISPLAY_METRIC_ROTATION) && frame_header_) + if ((changed_metrics & DISPLAY_METRIC_ROTATION) && frame_header_) { frame_header_->InvalidateLayout(); + } } void BrowserNonClientFrameViewChromeOS::OnTabletModeToggled(bool enabled) { @@ -650,16 +669,19 @@ InvalidateLayout(); // Can be null in tests. - if (frame()->client_view()) + if (frame()->client_view()) { frame()->client_view()->InvalidateLayout(); - if (frame()->GetRootView()) + } + if (frame()->GetRootView()) { frame()->GetRootView()->DeprecatedLayoutImmediately(); + } } bool BrowserNonClientFrameViewChromeOS::ShouldTabIconViewAnimate() const { // Web apps use their app icon and shouldn't show a throbber. - if (browser_view()->GetIsWebAppType()) + if (browser_view()->GetIsWebAppType()) { return false; + } // This function is queried during the creation of the window as the // TabIconView we host is initialized, so we need to null check the selected @@ -699,14 +721,16 @@ // May have to hide caption buttons while in fullscreen mode, or show them // when exiting fullscreen. - if (enter_fullscreen || exit_fullscreen) + if (enter_fullscreen || exit_fullscreen) { ResetWindowControls(); + } // The client view (in particular the tab strip) has different layout in // restored vs. maximized/fullscreen. Invalidate the layout because the // window bounds may not have changed. https://crbug.com/1342414 - if (frame()->client_view()) + if (frame()->client_view()) { frame()->client_view()->InvalidateLayout(); + } } if (key == chromeos::kWindowStateTypeKey) { @@ -719,11 +743,13 @@ const bool enter_floated = IsFloated(); const bool exit_floated = static_cast<chromeos::WindowStateType>(old) == chromeos::WindowStateType::kFloated; - if (!enter_floated && !exit_floated) + if (!enter_floated && !exit_floated) { return; + } - if (frame_header_) + if (frame_header_) { frame_header_->OnFloatStateChanged(); + } if (!display::Screen::GetScreen()->InTabletMode()) { return; @@ -742,8 +768,9 @@ return; } - if (!frame_header_) + if (!frame_header_) { return; + } if (key == aura::client::kShowStateKey) { frame_header_->OnShowStateChanged( @@ -808,8 +835,9 @@ UpdateProfileIcons(); - if (frame_header_) + if (frame_header_) { frame_header_->SetPaintAsActive(ShouldPaintAsActive()); + } } void BrowserNonClientFrameViewChromeOS::OnProfileAvatarChanged( @@ -874,29 +902,33 @@ int BrowserNonClientFrameViewChromeOS::GetTabStripRightInset() const { int inset = 0; - if (GetShowCaptionButtonsWhenNotInOverview()) + if (GetShowCaptionButtonsWhenNotInOverview()) { inset += caption_button_container_->GetPreferredSize().width(); + } return inset; } bool BrowserNonClientFrameViewChromeOS::GetShouldPaint() const { // Floated windows show their frame as they need to be dragged or hidden. - if (IsFloated()) + if (IsFloated()) { return true; + } #if BUILDFLAG(ENABLE_WEBUI_TAB_STRIP) // Normal windows that have a WebUI-based tab strip do not need a browser // frame as no tab strip is drawn on top of the browser frame. - if (UseWebUITabStrip()) + if (UseWebUITabStrip()) { return false; + } #endif // BUILDFLAG(ENABLE_WEBUI_TAB_STRIP) // We need to paint when the top-of-window views are revealed in immersive // fullscreen. ImmersiveModeController* immersive_mode_controller = browser_view()->immersive_mode_controller(); - if (immersive_mode_controller->IsEnabled()) + if (immersive_mode_controller->IsEnabled()) { return immersive_mode_controller->IsRevealed(); + } return !frame()->IsFullscreen(); } @@ -946,18 +978,21 @@ // between multi-user sessions. Note that you can't teleport an incognito // window. Browser* browser = browser_view()->browser(); - if (browser->profile()->IsIncognitoProfile()) + if (browser->profile()->IsIncognitoProfile()) { return false; + } - if (browser->is_type_popup()) + if (browser->is_type_popup()) { return false; + } #if BUILDFLAG(ENABLE_WEBUI_TAB_STRIP) // TODO(http://crbug.com/1059514): This check shouldn't be necessary. Provide // an appropriate affordance for the profile icon with the webUI tabstrip and // remove this block. - if (!browser_view()->GetTabStripVisible()) + if (!browser_view()->GetTabStripVisible()) { return false; + } #endif // BUILDFLAG(ENABLE_WEBUI_TAB_STRIP) return MultiUserWindowManagerHelper::ShouldShowAvatar( @@ -985,8 +1020,9 @@ } } else if (profile_indicator_icon_) { RemoveChildViewT(std::exchange(profile_indicator_icon_, nullptr)); - if (root_view) + if (root_view) { root_view->DeprecatedLayoutImmediately(); + } } } @@ -1035,14 +1071,16 @@ bool BrowserNonClientFrameViewChromeOS::GetHideCaptionButtonsForFullscreen() const { - if (!frame()->IsFullscreen()) + if (!frame()->IsFullscreen()) { return false; + } auto* immersive_controller = browser_view()->immersive_mode_controller(); // In fullscreen view, but not in immersive mode. Hide the caption buttons. - if (!immersive_controller || !immersive_controller->IsEnabled()) + if (!immersive_controller || !immersive_controller->IsEnabled()) { return true; + } return immersive_controller->ShouldHideTopViews(); } @@ -1054,31 +1092,36 @@ window->SetProperty(chromeos::kFrameInactiveColorKey, GetFrameColor(BrowserFrameActiveState::kInactive)); - if (frame_header_) + if (frame_header_) { frame_header_->UpdateFrameColors(); + } } void BrowserNonClientFrameViewChromeOS::MaybeAnimateThemeChanged() { - if (!browser_view()) + if (!browser_view()) { return; + } Browser* browser = browser_view()->browser(); - if (!browser) + if (!browser) { return; + } // Theme change events are only animated for system web apps which explicitly // request the behavior. bool animate_theme_change_for_swa = ash::IsSystemWebApp(browser) && browser->app_controller()->system_app()->ShouldAnimateThemeChanges(); - if (!animate_theme_change_for_swa) + if (!animate_theme_change_for_swa) { return; + } views::WebView* web_view = browser_view()->contents_web_view(); ui::Layer* layer = GetNativeViewLayer(web_view); content::RenderWidgetHost* render_widget_host = GetRenderWidgetHost(web_view); - if (!layer || !render_widget_host) + if (!layer || !render_widget_host) { return; + } // Immediately hide the layer associated with the `contents_web_view()` native // view so that repainting of the web contents (which is janky) is hidden from @@ -1093,13 +1136,15 @@ theme_changed_animation_callback_.Reset(base::BindOnce( [](const base::WeakPtr<BrowserNonClientFrameViewChromeOS>& self, base::TimeTicks theme_changed_time, bool success) { - if (!self || !self->browser_view()) + if (!self || !self->browser_view()) { return; + } views::WebView* web_view = self->browser_view()->contents_web_view(); ui::Layer* layer = GetNativeViewLayer(web_view); - if (!layer) + if (!layer) { return; + } // Delay animating the layer back in at least until the // `chromeos::DefaultFrameHeader` has had a chance to complete its own
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_mac.mm b/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_mac.mm index 25d0a79d9..f07b0b5 100644 --- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_mac.mm +++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_mac.mm
@@ -3,7 +3,6 @@ // found in the LICENSE file. #include "chrome/browser/ui/views/frame/browser_non_client_frame_view_mac.h" - #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h"
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_mac.mm b/chrome/browser/ui/views/frame/browser_non_client_frame_view_mac.mm index 2caa0467..09a8990 100644 --- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_mac.mm +++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_mac.mm
@@ -56,8 +56,9 @@ FullscreenToolbarStyle GetUserPreferredToolbarStyle(bool always_show) { // In Kiosk mode, we don't show top Chrome UI. - if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode)) + if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode)) { return FullscreenToolbarStyle::TOOLBAR_NONE; + } return always_show ? FullscreenToolbarStyle::TOOLBAR_PRESENT : FullscreenToolbarStyle::TOOLBAR_HIDDEN; } @@ -317,8 +318,7 @@ return false; } -void BrowserNonClientFrameViewMac::UpdateThrobber(bool running) { -} +void BrowserNonClientFrameViewMac::UpdateThrobber(bool running) {} void BrowserNonClientFrameViewMac::PaintAsActiveChanged() { UpdateCaptionButtonPlaceholderContainerBackground(); @@ -355,8 +355,9 @@ int BrowserNonClientFrameViewMac::NonClientHitTest(const gfx::Point& point) { int super_component = BrowserNonClientFrameView::NonClientHitTest(point); - if (super_component != HTNOWHERE) + if (super_component != HTNOWHERE) { return super_component; + } // BrowserView::NonClientHitTest will return HTNOWHERE for points that hit // the native title bar. On Mac, we need to explicitly return HTCAPTION for @@ -385,9 +386,10 @@ gfx::Size BrowserNonClientFrameViewMac::GetMinimumSize() const { gfx::Size client_size = frame()->client_view()->GetMinimumSize(); - if (browser_view()->browser()->is_type_normal()) + if (browser_view()->browser()->is_type_normal()) { client_size.SetToMax( browser_view()->tab_strip_region_view()->GetMinimumSize()); + } // macOS apps generally don't allow their windows to get shorter than a // certain height, which empirically seems to be related to their *minimum* @@ -443,13 +445,15 @@ auto* theme_service = ThemeServiceFactory::GetForProfile(browser_view()->browser()->profile()); - if (!theme_service->UsingSystemTheme()) + if (!theme_service->UsingSystemTheme()) { PaintThemedFrame(canvas); + } } void BrowserNonClientFrameViewMac::Layout(PassKey) { - if (browser_view()->IsWindowControlsOverlayEnabled()) + if (browser_view()->IsWindowControlsOverlayEnabled()) { LayoutWindowControlsOverlay(); + } LayoutSuperclass<NonClientFrameView>(this); } @@ -499,14 +503,16 @@ if (@available(macos 12.0.1, *)) { id screen = [GetWidget()->GetNativeWindow().GetNativeNSWindow() screen]; NSEdgeInsets insets = [screen safeAreaInsets]; - if (insets.top != 0) + if (insets.top != 0) { menu_bar_height = 0; + } } CGFloat title_bar_height = NSHeight([NSWindow frameRectForContentRect:NSZeroRect styleMask:NSWindowStyleMaskTitled]); - if (browser_view()->UsesImmersiveFullscreenMode()) + if (browser_view()->UsesImmersiveFullscreenMode()) { return menu_bar_height == 0 ? 0 : menu_bar_height + title_bar_height; + } return [[fullscreen_toolbar_controller_ menubarTracker] menubarFraction] * (menu_bar_height + title_bar_height); }
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_mac_browsertest.mm b/chrome/browser/ui/views/frame/browser_non_client_frame_view_mac_browsertest.mm index 16473d0..6abdf10 100644 --- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_mac_browsertest.mm +++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_mac_browsertest.mm
@@ -58,8 +58,9 @@ // Runs a loop until a text change is observed (unless one has // already been observed, in which case it returns immediately). void Wait() { - if (observed_change_) + if (observed_change_) { return; + } run_loop_.Run(); } @@ -67,8 +68,9 @@ private: void OnTextChanged() { observed_change_ = true; - if (run_loop_.running()) + if (run_loop_.running()) { run_loop_.Quit(); + } } bool observed_change_ = false;
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index 5f57604..18a0160d 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -429,10 +429,12 @@ views::Widget::Widgets widgets; views::Widget::GetAllChildWidgets(parent_widget->GetNativeView(), &widgets); for (views::Widget* widget : widgets) { - if (widget == parent_widget) + if (widget == parent_widget) { continue; - if (widget->IsModal()) + } + if (widget->IsModal()) { return true; + } } return false; } @@ -470,8 +472,9 @@ // // BrowserView's layout logic still applies in this case. To ensure // it is used, we must invalidate BrowserView's layout. - if (browser_view_) + if (browser_view_) { browser_view_->InvalidateLayout(); + } } private: @@ -534,8 +537,9 @@ #if BUILDFLAG(IS_CHROMEOS) // For Chrome OS only, trusted windows (apps and settings) do not show a // window icon, crbug.com/119411. Child windows (i.e. popups) do show an icon. - if (browser->is_trusted_source() || app_uses_window_controls_overlay) + if (browser->is_trusted_source() || app_uses_window_controls_overlay) { return false; + } #else if (app_uses_tabbed) { return false; @@ -553,10 +557,11 @@ auto* contents = model->GetWebContentsAt(i); auto* helper = RecentlyAudibleHelper::FromWebContents(contents); if (helper && helper->WasRecentlyAudible()) { - if (contents->IsAudioMuted()) + if (contents->IsAudioMuted()) { *any_tab_playing_muted_audio = true; - else + } else { *any_tab_playing_audio = true; + } } } } @@ -1206,8 +1211,9 @@ // // Lastly note that this function can be called during construction of // Browser, at which point browser->window() might return nullptr. - if (!browser->window() || !browser->window()->GetNativeWindow()) + if (!browser->window() || !browser->window()->GetNativeWindow()) { return nullptr; + } return GetBrowserViewForNativeWindow(browser->window()->GetNativeWindow()); } @@ -1231,8 +1237,9 @@ const gfx::Rect bounding_box = toolbar_button_provider_->GetFindBarBoundingBox( contents_bounds.bottom()); - if (!bounding_box.IsEmpty()) + if (!bounding_box.IsEmpty()) { return bounding_box; + } } contents_bounds.Inset(gfx::Insets::TLBR(0, 0, 0, gfx::scrollbar_size())); @@ -1293,12 +1300,14 @@ bool BrowserView::ShouldDrawTabStrip() const { // Return false if this window does not normally display a tabstrip or if the // tabstrip is currently hidden, e.g. because we're in fullscreen. - if (!browser_->SupportsWindowFeature(Browser::FEATURE_TABSTRIP)) + if (!browser_->SupportsWindowFeature(Browser::FEATURE_TABSTRIP)) { return false; + } #if BUILDFLAG(ENABLE_WEBUI_TAB_STRIP) - if (WebUITabStripContainerView::UseTouchableTabStrip(browser_.get())) + if (WebUITabStripContainerView::UseTouchableTabStrip(browser_.get())) { return false; + } #endif // BUILDFLAG(ENABLE_WEBUI_TAB_STRIP) // Return false if the tabstrip has not yet been created (by InitViews()), @@ -1329,13 +1338,15 @@ // the key window. Thus, we provide the default Mac accelerator for each // CommandId, which is static. This may be inaccurate, but is at least // sufficiently well defined for Views to use. - if (GetDefaultMacAcceleratorForCommandId(cmd_id, accelerator)) + if (GetDefaultMacAcceleratorForCommandId(cmd_id, accelerator)) { return true; + } #else // We retrieve the accelerator information for standard accelerators // for cut, copy and paste. - if (GetStandardAcceleratorForCommandId(cmd_id, accelerator)) + if (GetStandardAcceleratorForCommandId(cmd_id, accelerator)) { return true; + } #endif // Else, we retrieve the accelerator information from the accelerator table. for (const auto& it : accelerator_table_) { @@ -1382,8 +1393,9 @@ } float BrowserView::GetTopControlsSlideBehaviorShownRatio() const { - if (top_controls_slide_controller_) + if (top_controls_slide_controller_) { return top_controls_slide_controller_->GetShownRatio(); + } return 1.f; } @@ -1419,8 +1431,9 @@ // Only set |restore_focus_on_activation_| when it is not set so that restore // focus on activation only happen once for the very first Show() call. - if (!restore_focus_on_activation_.has_value()) + if (!restore_focus_on_activation_.has_value()) { restore_focus_on_activation_ = true; + } frame_->Show(); @@ -1516,8 +1529,9 @@ bool BrowserView::IsOnCurrentWorkspace() const { // In tests, the native window can be nullptr. gfx::NativeWindow native_win = GetNativeWindow(); - if (!native_win) + if (!native_win) { return true; + } #if BUILDFLAG(IS_CHROMEOS) return chromeos::DesksHelper::Get(native_win) @@ -1525,13 +1539,15 @@ #elif BUILDFLAG(IS_WIN) std::optional<bool> on_current_workspace = native_win->GetHost()->on_current_workspace(); - if (on_current_workspace.has_value()) + if (on_current_workspace.has_value()) { return on_current_workspace.value(); + } // If the window is not cloaked, it is not on another desktop because // windows on another virtual desktop are always cloaked. - if (!gfx::IsWindowCloaked(native_win->GetHost()->GetAcceleratedWidget())) + if (!gfx::IsWindowCloaked(native_win->GetHost()->GetAcceleratedWidget())) { return true; + } Microsoft::WRL::ComPtr<IVirtualDesktopManager> virtual_desktop_manager; if (!SUCCEEDED(::CoCreateInstance(_uuidof(VirtualDesktopManager), nullptr, @@ -1551,8 +1567,9 @@ void BrowserView::SetTopControlsShownRatio(content::WebContents* web_contents, float ratio) { - if (top_controls_slide_controller_) + if (top_controls_slide_controller_) { top_controls_slide_controller_->SetShownRatio(web_contents, ratio); + } } bool BrowserView::DoBrowserControlsShrinkRendererSize( @@ -1608,8 +1625,9 @@ web_app_window_title_->SetText(GetWindowTitle()); InvalidateLayout(); } - if (!loading_animation_timer_.IsRunning() && CanChangeWindowIcon()) + if (!loading_animation_timer_.IsRunning() && CanChangeWindowIcon()) { frame_->UpdateWindowIcon(); + } } void BrowserView::BookmarkBarStateChanged( @@ -1733,8 +1751,9 @@ PageActionIconView* star_icon = toolbar_button_provider_->GetPageActionIconView( PageActionIconType::kBookmarkStar); - if (star_icon) + if (star_icon) { star_icon->SetActive(is_starred); + } } void BrowserView::OnActiveTabChanged(content::WebContents* old_contents, @@ -1789,8 +1808,9 @@ // read out to screen readers, even if focus doesn't actually change. GetWidget()->GetFocusManager()->ClearFocus(); } - if (loading_bar_) + if (loading_bar_) { loading_bar_->SetWebContents(nullptr); + } contents_web_view_->SetWebContents(nullptr); devtools_web_view_->SetWebContents(nullptr); } @@ -1808,8 +1828,9 @@ auto* app_banner_manager = webapps::AppBannerManager::FromWebContents(new_contents); // May be null in unit tests. - if (app_banner_manager) + if (app_banner_manager) { ObserveAppBannerManager(app_banner_manager); + } UpdateUIForContents(new_contents); RevealTabStripIfNeeded(); @@ -1835,12 +1856,14 @@ } web_contents_close_handler_->ActiveTabChanged(); - if (loading_bar_) + if (loading_bar_) { loading_bar_->SetWebContents(new_contents); + } contents_web_view_->SetWebContents(new_contents); SadTabHelper* sad_tab_helper = SadTabHelper::FromWebContents(new_contents); - if (sad_tab_helper) + if (sad_tab_helper) { sad_tab_helper->ReinstallInWebView(); + } // The second layout update should be no-op. It will just set the // DevTools WebContents. @@ -1860,8 +1883,9 @@ TranslateBubbleController* translate_bubble_controller = TranslateBubbleController::FromWebContents(old_contents); - if (translate_bubble_controller) + if (translate_bubble_controller) { translate_bubble_controller->CloseBubble(); + } } // This is only done once when the app is first opened so that there is only @@ -1874,8 +1898,9 @@ void BrowserView::OnTabDetached(content::WebContents* contents, bool was_active) { DCHECK(contents); - if (!was_active) + if (!was_active) { return; + } // This is to unsubscribe the Window Management permission subscriber. if (window_management_subscription_id_) { @@ -1891,8 +1916,9 @@ // freed. This is because the focus manager performs some operations // on the selected WebContents when it is removed. web_contents_close_handler_->ActiveTabChanged(); - if (loading_bar_) + if (loading_bar_) { loading_bar_->SetWebContents(nullptr); + } contents_web_view_->SetWebContents(nullptr); infobar_container_->ChangeInfoBarManager(nullptr); app_banner_manager_observation_.Reset(); @@ -1937,8 +1963,9 @@ const int height_diff = size.height() - GetContentsSize().height(); // Resizing the window may be expensive, so only do it if the size is wrong. - if (width_diff == 0 && height_diff == 0) + if (width_diff == 0 && height_diff == 0) { return; + } gfx::Rect bounds = GetBounds(); bounds.set_width(bounds.width() + width_diff); @@ -2082,14 +2109,16 @@ } void BrowserView::OnExclusiveAccessUserInput() { - if (exclusive_access_bubble_.get()) + if (exclusive_access_bubble_.get()) { exclusive_access_bubble_->OnUserInput(); + } } bool BrowserView::ShouldHideUIForFullscreen() const { // Immersive mode needs UI for the slide-down top panel. - if (immersive_mode_controller_->IsEnabled()) + if (immersive_mode_controller_->IsEnabled()) { return false; + } return frame_->GetFrameView()->ShouldHideTopUIForFullscreen(); } @@ -2112,8 +2141,9 @@ void BrowserView::RestoreFocus() { WebContents* selected_web_contents = GetActiveWebContents(); - if (selected_web_contents) + if (selected_web_contents) { selected_web_contents->RestoreFocus(); + } } void BrowserView::FullscreenStateChanging() { @@ -2228,11 +2258,13 @@ // even if the widget doens't have a focus. Either cases, we need to ignore // this when the browser window isn't active. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) - if (!IsActive()) + if (!IsActive()) { return; + } #endif - if (!IsLocationBarVisible()) + if (!IsLocationBarVisible()) { return; + } LocationBarView* location_bar = GetLocationBarView(); location_bar->FocusLocation(is_user_initiated); @@ -2254,8 +2286,9 @@ void BrowserView::UpdateToolbar(content::WebContents* contents) { // We may end up here during destruction. - if (toolbar_) + if (toolbar_) { toolbar_->Update(contents); + } } bool BrowserView::UpdateToolbarSecurityState() { @@ -2268,14 +2301,16 @@ } void BrowserView::UpdateCustomTabBarVisibility(bool visible, bool animate) { - if (toolbar_) + if (toolbar_) { toolbar_->UpdateCustomTabBarVisibility(visible, animate); + } } void BrowserView::ResetToolbarTabState(content::WebContents* contents) { // We may end up here during destruction. - if (toolbar_) + if (toolbar_) { toolbar_->ResetTabState(contents); + } } void BrowserView::FocusToolbar() { @@ -2297,18 +2332,21 @@ } void BrowserView::ToolbarSizeChanged(bool is_animating) { - if (is_animating) + if (is_animating) { contents_web_view_->SetFastResize(true); + } UpdateUIForContents(GetActiveWebContents()); // Do nothing if we're currently participating in a tab dragging process. The // fast resize bit will be reset and the web contents will get re-layed out // after the tab dragging ends. - if (frame()->tab_drag_kind() != TabDragKind::kNone) + if (frame()->tab_drag_kind() != TabDragKind::kNone) { return; + } - if (is_animating) + if (is_animating) { contents_web_view_->SetFastResize(false); + } // When transitioning from animating to not animating we need to make sure the // contents_container_ gets layed out. If we don't do this and the bounds @@ -2323,11 +2361,13 @@ // standalone style title bar when infobars are visible. Update the enabled // state of WCO when the size of the toolbar changes since this indicates // that the visibility of the infobar may have changed. - if (AppUsesWindowControlsOverlay()) + if (AppUsesWindowControlsOverlay()) { UpdateWindowControlsOverlayEnabled(); + } - if (AppUsesBorderlessMode()) + if (AppUsesBorderlessMode()) { UpdateBorderlessModeEnabled(); + } } void BrowserView::TabDraggingStatusChanged(bool is_dragging) { @@ -2429,8 +2469,9 @@ should_show = false; } - if (IsImmersiveModeEnabled()) + if (IsImmersiveModeEnabled()) { should_show = false; + } #if BUILDFLAG(IS_MAC) // On macOS, when in fullscreen mode, window controls (the menu bar, title @@ -2443,8 +2484,9 @@ } #endif - if (should_show == should_show_window_controls_overlay_toggle_) + if (should_show == should_show_window_controls_overlay_toggle_) { return; + } DCHECK(AppUsesWindowControlsOverlay()); should_show_window_controls_overlay_toggle_ = should_show; @@ -2488,8 +2530,9 @@ window_management_permission_granted_ = borderless_mode_enabled; } - if (borderless_mode_enabled == borderless_mode_enabled_) + if (borderless_mode_enabled == borderless_mode_enabled_) { return; + } borderless_mode_enabled_ = borderless_mode_enabled; if (web_app_frame_toolbar()) { @@ -2604,11 +2647,13 @@ } void BrowserView::FocusInactivePopupForAccessibility() { - if (ActivateFirstInactiveBubbleForAccessibility()) + if (ActivateFirstInactiveBubbleForAccessibility()) { return; + } - if (!infobar_container_->children().empty()) + if (!infobar_container_->children().empty()) { infobar_container_->SetPaneFocusAndFocusDefault(); + } } void BrowserView::FocusAppMenu() { @@ -2651,8 +2696,9 @@ return true; } - if (GetLocationBarView()->ActivateFirstInactiveBubbleForAccessibility()) + if (GetLocationBarView()->ActivateFirstInactiveBubbleForAccessibility()) { return true; + } // TODO: this fixes crbug.com/1042010 and crbug.com/1052676, but a more // general solution should be desirable to find any bubbles anchored in the @@ -2678,8 +2724,9 @@ // A PermissionPromptBubbleView will explicitly return nullptr due to // crbug.com/619429. In that case, we explicitly focus the cancel button. - if (!focusable) + if (!focusable) { focusable = bubble->GetCancelButton(); + } if (focusable) { focusable->RequestFocus(); @@ -2705,8 +2752,9 @@ } void BrowserView::TryNotifyWindowBoundsChanged(const gfx::Rect& widget_bounds) { - if (interactive_resize_in_progress_ || last_widget_bounds_ == widget_bounds) + if (interactive_resize_in_progress_ || last_widget_bounds_ == widget_bounds) { return; + } last_widget_bounds_ = widget_bounds; @@ -2850,8 +2898,9 @@ } void BrowserView::MaybeShowWebUITabStripIPH() { - if (!webui_tab_strip_) + if (!webui_tab_strip_) { return; + } MaybeShowStartupFeaturePromo(feature_engagement::kIPHWebUITabStripFeature); } @@ -2887,16 +2936,21 @@ } bool BrowserView::IsBookmarkBarVisible() const { - if (!browser_->SupportsWindowFeature(Browser::FEATURE_BOOKMARKBAR)) + if (!browser_->SupportsWindowFeature(Browser::FEATURE_BOOKMARKBAR)) { return false; - if (!bookmark_bar_view_) + } + if (!bookmark_bar_view_) { return false; - if (!bookmark_bar_view_->parent()) + } + if (!bookmark_bar_view_->parent()) { return false; - if (bookmark_bar_view_->GetPreferredSize().height() == 0) + } + if (bookmark_bar_view_->GetPreferredSize().height() == 0) { return false; - if (immersive_mode_controller_->ShouldHideTopViews()) + } + if (immersive_mode_controller_->ShouldHideTopViews()) { return false; + } if (immersive_mode_controller_->IsEnabled() && !immersive_mode_controller_->IsRevealed()) { return false; @@ -2924,8 +2978,9 @@ } } #endif - if (immersive_mode_controller_->ShouldHideTopViews()) + if (immersive_mode_controller_->ShouldHideTopViews()) { return false; + } // It's possible to reach here before we've been notified of being added to a // widget, so |toolbar_| is still null. Return false in this case so callers // don't assume they can access the toolbar yet. @@ -3169,8 +3224,9 @@ PageActionIconView* icon_view = toolbar_button_provider()->GetPageActionIconView( PageActionIconType::kSharingHub); - if (icon_view) + if (icon_view) { bubble->SetHighlightedButton(icon_view); + } views::BubbleDialogDelegateView::CreateBubble(bubble); // This is always triggered due to a user gesture, c.f. method documentation. @@ -3198,8 +3254,9 @@ ->GetLanguageState() ->SetTranslateEnabled(true); - if (IsMinimized()) + if (IsMinimized()) { return ShowTranslateBubbleResult::BROWSER_WINDOW_MINIMIZED; + } views::Button* translate_icon = toolbar_button_provider()->GetPageActionIconView( @@ -3282,8 +3339,9 @@ DownloadBubbleUIController* BrowserView::GetDownloadBubbleUIController() { DCHECK(toolbar_button_provider_); - if (auto* download_button = toolbar_button_provider_->GetDownloadButton()) + if (auto* download_button = toolbar_button_provider_->GetDownloadButton()) { return download_button->bubble_controller(); + } return nullptr; } @@ -3312,8 +3370,9 @@ } void BrowserView::ShowAppMenu() { - if (!toolbar_button_provider_->GetAppMenuButton()) + if (!toolbar_button_provider_->GetAppMenuButton()) { return; + } // Keep the top-of-window views revealed as long as the app menu is visible. std::unique_ptr<ImmersiveRevealedLock> revealed_lock = @@ -3335,8 +3394,9 @@ views::FocusManager* focus_manager = GetFocusManager(); DCHECK(focus_manager); - if (focus_manager->shortcut_handling_suspended()) + if (focus_manager->shortcut_handling_suspended()) { return content::KeyboardEventProcessingResult::NOT_HANDLED; + } ui::Accelerator accelerator = ui::GetAcceleratorFromNativeWebKeyboardEvent(event); @@ -3370,15 +3430,17 @@ content::KeyboardEventProcessingResult result = frame_->PreHandleKeyboardEvent(event); - if (result != content::KeyboardEventProcessingResult::NOT_HANDLED) + if (result != content::KeyboardEventProcessingResult::NOT_HANDLED) { return result; + } int id; if (!FindCommandIdForAccelerator(accelerator, &id)) { // |accelerator| is not a browser command, it may be handled by ash (e.g. // F4-F10). Report if we handled it. - if (focus_manager->ProcessAccelerator(accelerator)) + if (focus_manager->ProcessAccelerator(accelerator)) { return content::KeyboardEventProcessingResult::HANDLED; + } // Otherwise, it's not an accelerator. return content::KeyboardEventProcessingResult::NOT_HANDLED; } @@ -3404,8 +3466,9 @@ } bool BrowserView::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) { - if (frame_->HandleKeyboardEvent(event)) + if (frame_->HandleKeyboardEvent(event)) { return true; + } return unhandled_keyboard_event_handler_.HandleKeyboardEvent( event, GetFocusManager()); @@ -3470,19 +3533,22 @@ WebContents* contents = browser_->tab_strip_model()->GetActiveWebContents(); if (contents) { void (WebContents::*method)(); - if (command_id == IDC_CUT) + if (command_id == IDC_CUT) { method = &content::WebContents::Cut; - else if (command_id == IDC_COPY) + } else if (command_id == IDC_COPY) { method = &content::WebContents::Copy; - else + } else { method = &content::WebContents::Paste; - if (DoCutCopyPasteForWebContents(contents, method)) + } + if (DoCutCopyPasteForWebContents(contents, method)) { return; + } WebContents* devtools = DevToolsWindow::GetInTabWebContents(contents, nullptr); - if (devtools && DoCutCopyPasteForWebContents(devtools, method)) + if (devtools && DoCutCopyPasteForWebContents(devtools, method)) { return; + } } // Any Views which want to handle the clipboard commands in the Chrome menu @@ -3526,14 +3592,17 @@ // When the selected tab changes, elements in the omnibox can change, which // can change its preferred size. Re-lay-out the toolbar to reflect the // possible change. - if (selection.selection_changed()) + if (selection.selection_changed()) { toolbar_->InvalidateLayout(); + } - if (loading_bar_) + if (loading_bar_) { loading_bar_->SetWebContents(GetActiveWebContents()); + } - if (change.type() != TabStripModelChange::kInserted) + if (change.type() != TabStripModelChange::kInserted) { return; + } for ([[maybe_unused]] const auto& contents : change.GetInsert()->contents) { #if defined(USE_AURA) @@ -3569,8 +3638,9 @@ void BrowserView::CloseAllTabsStopped(TabStripModel* tab_strip_model, CloseAllStoppedReason reason) { - if (reason == kCloseAllCanceled) + if (reason == kCloseAllCanceled) { web_contents_close_handler_->CloseAllTabsCanceled(); + } } /////////////////////////////////////////////////////////////////////////////// @@ -3643,8 +3713,9 @@ views::Widget* tab_modal = views::ViewAccessibilityUtils::GetFocusedChildWidgetForAccessibility( this); - if (tab_modal) + if (tab_modal) { return tab_modal->widget_delegate()->GetAccessibleWindowTitle(); + } return GetAccessibleWindowTitleForChannelAndProfile(chrome::GetChannel(), browser_->profile()); @@ -3657,10 +3728,11 @@ // like playing audio or network error. int active_index = browser_->tab_strip_model()->active_index(); std::u16string title; - if (active_index > -1) + if (active_index > -1) { title = GetAccessibleTabLabel(active_index, /* include_app_name */ false); - else + } else { title = browser_->GetWindowTitleForCurrentTab(false /* include_app_name */); + } // Add the name of the browser, unless this is an app window. if (browser()->is_type_normal() || browser()->is_type_popup()) { @@ -3738,12 +3810,14 @@ } // Tab is pinned. - if (tabstrip_->IsTabPinned(tabstrip_->tab_at(index))) + if (tabstrip_->IsTabPinned(tabstrip_->tab_at(index))) { title = l10n_util::GetStringFUTF16(IDS_TAB_AX_LABEL_PINNED_FORMAT, title); + } // Tab has crashed. - if (tabstrip_->IsTabCrashed(index)) + if (tabstrip_->IsTabCrashed(index)) { return l10n_util::GetStringFUTF16(IDS_TAB_AX_LABEL_CRASHED_FORMAT, title); + } // Network error interstitial. if (tabstrip_->TabHasNetworkError(index)) { @@ -3859,16 +3933,18 @@ results.push_back(contents_web_view_->holder()); #if BUILDFLAG(ENABLE_WEBUI_TAB_STRIP) - if (webui_tab_strip_) + if (webui_tab_strip_) { results.push_back(webui_tab_strip_->GetNativeViewHost()); + } #endif // BUILDFLAG(ENABLE_WEBUI_TAB_STRIP) return results; } void BrowserView::ReparentTopContainerForEndOfImmersive() { - if (top_container()->parent() == this) + if (top_container()->parent() == this) { return; + } overlay_view_->SetVisible(false); top_container()->DestroyLayer(); @@ -3879,17 +3955,19 @@ void BrowserView::EnsureFocusOrder() { // We want the infobar to come before the content pane, but after the bookmark // bar (if present) or top container (i.e. toolbar, again if present). - if (bookmark_bar_view_ && bookmark_bar_view_->parent() == this) + if (bookmark_bar_view_ && bookmark_bar_view_->parent() == this) { infobar_container_->InsertAfterInFocusList(bookmark_bar_view_.get()); - else if (top_container_->parent() == this) + } else if (top_container_->parent() == this) { infobar_container_->InsertAfterInFocusList(top_container_); + } // We want the download shelf to come after the contents container (which also // contains the debug console, etc.) This prevents it from intruding into the // focus order, but makes it easily accessible by using SHIFT-TAB (reverse // focus traversal) from the toolbar/omnibox. - if (download_shelf_ && contents_container_) + if (download_shelf_ && contents_container_) { download_shelf_->GetView()->InsertAfterInFocusList(contents_container_); + } #if DCHECK_IS_ON() // Make sure we didn't create any cycles in the focus order. @@ -3899,15 +3977,18 @@ bool BrowserView::CanChangeWindowIcon() const { // The logic of this function needs to be same as GetWindowIcon(). - if (browser_->is_type_devtools()) + if (browser_->is_type_devtools()) { return false; - if (browser_->app_controller()) + } + if (browser_->app_controller()) { return true; + } #if BUILDFLAG(IS_CHROMEOS) // On ChromeOS, the tabbed browser always use a static image for the window // icon. See GetWindowIcon(). - if (browser_->is_type_normal()) + if (browser_->is_type_normal()) { return false; + } #endif return true; } @@ -3931,12 +4012,14 @@ #if BUILDFLAG(IS_CHROMEOS) // For Chrome OS only, trusted windows (apps and settings) do not show a // title, crbug.com/119411. Child windows (i.e. popups) do show a title. - if (browser_->is_trusted_source() || AppUsesWindowControlsOverlay()) + if (browser_->is_trusted_source() || AppUsesWindowControlsOverlay()) { return false; + } #elif BUILDFLAG(IS_WIN) // On Windows in touch mode we display a window title. - if (WebUITabStripContainerView::UseTouchableTabStrip(browser())) + if (WebUITabStripContainerView::UseTouchableTabStrip(browser())) { return true; + } #endif return browser_->SupportsWindowFeature(Browser::FEATURE_TITLEBAR); @@ -3958,13 +4041,15 @@ ui::ImageModel BrowserView::GetWindowIcon() { // Use the default icon for devtools. - if (browser_->is_type_devtools()) + if (browser_->is_type_devtools()) { return ui::ImageModel(); + } // Hosted apps always show their app icon. web_app::AppBrowserController* app_controller = browser()->app_controller(); - if (app_controller) + if (app_controller) { return app_controller->GetWindowIcon(); + } #if BUILDFLAG(IS_CHROMEOS) ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); @@ -3974,13 +4059,15 @@ auto* window = GetNativeWindow(); int override_window_icon_resource_id = window ? window->GetProperty(ash::kOverrideWindowIconResourceIdKey) : -1; - if (override_window_icon_resource_id >= 0) + if (override_window_icon_resource_id >= 0) { return ui::ImageModel::FromImage( rb.GetImageNamed(override_window_icon_resource_id)); + } #endif - if (!browser_->is_type_normal()) + if (!browser_->is_type_normal()) { return ui::ImageModel::FromImage(browser_->GetCurrentPageIcon()); + } return ui::ImageModel(); } @@ -3989,8 +4076,9 @@ // Translate WM_APPCOMMAND command ids into a command id that the browser // knows how to handle. int command_id_from_app_command = GetCommandIDForAppCommandID(command_id); - if (command_id_from_app_command != -1) + if (command_id_from_app_command != -1) { command_id = command_id_from_app_command; + } return chrome::ExecuteCommand(browser_.get(), command_id); } @@ -4017,8 +4105,9 @@ // Invert the transformation done in GetSavedWindowPlacement(). gfx::Size client_size = frame_->GetFrameView()->GetBoundsForClientView().size(); - if (IsToolbarVisible()) + if (IsToolbarVisible()) { client_size.Enlarge(0, -toolbar_->GetPreferredSize().height()); + } saved_bounds.set_size(client_size); } chrome::SaveWindowPlacement(browser_.get(), saved_bounds, show_state); @@ -4172,8 +4261,9 @@ // BrowserView. By destroying here we ensure all said classes are valid. // Note: The BrowserViewTest tests rely on the contents being destroyed in the // order that they were present in the tab strip. - while (browser()->tab_strip_model()->count()) + while (browser()->tab_strip_model()->count()) { browser()->tab_strip_model()->DetachAndDeleteWebContentsAt(0); + } // Destroy the fullscreen control host, as it observes the native window. fullscreen_control_host_.reset(); } @@ -4188,8 +4278,9 @@ // Set initial focus change on the first activation if there is no // modal dialog. - if (!WidgetHasChildModalDialog(GetWidget())) + if (!WidgetHasChildModalDialog(GetWidget())) { RestoreFocus(); + } } browser_->DidBecomeActive(); @@ -4225,11 +4316,13 @@ } void BrowserView::OnWindowBeginUserBoundsChange() { - if (interactive_resize_in_progress_) + if (interactive_resize_in_progress_) { return; + } WebContents* web_contents = GetActiveWebContents(); - if (!web_contents) + if (!web_contents) { return; + } interactive_resize_in_progress_ = true; } @@ -4251,15 +4344,17 @@ // tabstrip_->DestroyDragController(); // status_bubble_ may be null if this is invoked during construction. - if (status_bubble_.get()) + if (status_bubble_.get()) { status_bubble_->Reposition(); + } BookmarkBubbleView::Hide(); // Close the omnibox popup, if any. LocationBarView* location_bar_view = GetLocationBarView(); - if (location_bar_view) + if (location_bar_view) { location_bar_view->GetOmniboxView()->CloseOmniboxPopup(); + } } views::Widget* BrowserView::GetWidget() { @@ -4275,8 +4370,9 @@ const tab_search::mojom::TabOrganizationFeature organization_feature) { // Do not spawn the bubble if using the WebUITabStrip. #if BUILDFLAG(ENABLE_WEBUI_TAB_STRIP) - if (WebUITabStripContainerView::UseTouchableTabStrip(browser_.get())) + if (WebUITabStripContainerView::UseTouchableTabStrip(browser_.get())) { return; + } #endif // BUILDFLAG(ENABLE_WEBUI_TAB_STRIP) if (auto* tab_search_host = GetTabSearchBubbleHost()) { @@ -4285,13 +4381,15 @@ } void BrowserView::CloseTabSearchBubble() { - if (auto* tab_search_host = GetTabSearchBubbleHost()) + if (auto* tab_search_host = GetTabSearchBubbleHost()) { tab_search_host->CloseTabSearchBubble(); + } } void BrowserView::RevealTabStripIfNeeded() { - if (!immersive_mode_controller_->IsEnabled()) + if (!immersive_mode_controller_->IsEnabled()) { return; + } std::unique_ptr<ImmersiveRevealedLock> revealer = immersive_mode_controller_->GetRevealedLock( @@ -4311,8 +4409,9 @@ // invisible or has no focusable children, it will be automatically // skipped. #if BUILDFLAG(ENABLE_WEBUI_TAB_STRIP) - if (webui_tab_strip_) + if (webui_tab_strip_) { panes->push_back(webui_tab_strip_); + } #endif // If activity indicators or a permission request chip is visible, it must be // in the first position in the pane traversal order to be easily accessible @@ -4337,22 +4436,29 @@ } panes->push_back(toolbar_button_provider_->GetAsAccessiblePaneView()); - if (tab_strip_region_view_) + if (tab_strip_region_view_) { panes->push_back(tab_strip_region_view_); - if (toolbar_ && toolbar_->custom_tab_bar()) + } + if (toolbar_ && toolbar_->custom_tab_bar()) { panes->push_back(toolbar_->custom_tab_bar()); - if (bookmark_bar_view_.get()) + } + if (bookmark_bar_view_.get()) { panes->push_back(bookmark_bar_view_.get()); - if (infobar_container_) + } + if (infobar_container_) { panes->push_back(infobar_container_); - if (download_shelf_) + } + if (download_shelf_) { panes->push_back(download_shelf_->GetView()); - if (unified_side_panel_) + } + if (unified_side_panel_) { panes->push_back(unified_side_panel_); + } // TODO(crbug.com/40119836): Implement for mac. panes->push_back(contents_web_view_); - if (devtools_web_view_->GetVisible()) + if (devtools_web_view_->GetVisible()) { panes->push_back(devtools_web_view_); + } } bool BrowserView::ShouldDescendIntoChildForEventHandling( @@ -4411,8 +4517,9 @@ views::CloseRequestResult BrowserView::OnWindowCloseRequested() { // You cannot close a frame for which there is an active originating drag // session. - if (tabstrip_ && !tabstrip_->IsTabStripCloseable()) + if (tabstrip_ && !tabstrip_->IsTabStripCloseable()) { return views::CloseRequestResult::kCannotClose; + } // Give beforeunload handlers, the user, or policy the chance to cancel the // close before we hide the window below. @@ -4464,15 +4571,17 @@ void BrowserView::Layout(PassKey) { TRACE_EVENT0("ui", "BrowserView::Layout"); - if (!initialized_ || in_process_fullscreen_) + if (!initialized_ || in_process_fullscreen_) { return; + } // Allow only a single layout operation once top controls sliding begins. if (top_controls_slide_controller_ && top_controls_slide_controller_->IsEnabled() && top_controls_slide_controller_->IsTopControlsSlidingInProgress()) { - if (did_first_layout_while_top_controls_are_sliding_) + if (did_first_layout_while_top_controls_are_sliding_) { return; + } did_first_layout_while_top_controls_are_sliding_ = true; } else { did_first_layout_while_top_controls_are_sliding_ = false; @@ -4527,8 +4636,9 @@ // BrowserView may be added to a widget more than once if the user changes // themes after starting the browser. Do not re-initialize BrowserView in // this case. - if (initialized_) + if (initialized_) { return; + } views::ClientView::AddedToWidget(); @@ -4593,8 +4703,9 @@ // This browser view may already have a custom button provider set (e.g the // hosted app frame). - if (!toolbar_button_provider_) + if (!toolbar_button_provider_) { SetToolbarButtonProvider(toolbar_); + } frame_->OnBrowserViewInitViewsComplete(); frame_->GetFrameView()->UpdateMinimumSize(); @@ -4678,8 +4789,9 @@ bool BrowserView::CanDrop(const ui::OSExchangeData& data) { #if BUILDFLAG(ENABLE_WEBUI_TAB_STRIP) - if (!webui_tab_strip_) + if (!webui_tab_strip_) { return false; + } return WebUITabStripContainerView::IsDraggedTab(data); #else return false; @@ -4688,10 +4800,12 @@ void BrowserView::OnDragEntered(const ui::DropTargetEvent& event) { #if BUILDFLAG(ENABLE_WEBUI_TAB_STRIP) - if (!webui_tab_strip_) + if (!webui_tab_strip_) { return; - if (WebUITabStripContainerView::IsDraggedTab(event.data())) + } + if (WebUITabStripContainerView::IsDraggedTab(event.data())) { webui_tab_strip_->OpenForTabDrag(); + } #endif // BUILDFLAG(ENABLE_WEBUI_TAB_STRIP) } @@ -4702,8 +4816,9 @@ int command_id; // Though AcceleratorManager should not send unknown |accelerator| to us, it's // still possible the command cannot be executed now. - if (!FindCommandIdForAccelerator(accelerator, &command_id)) + if (!FindCommandIdForAccelerator(accelerator, &command_id)) { return false; + } UpdateAcceleratorMetrics(accelerator, command_id); return chrome::ExecuteCommand(browser_.get(), command_id, @@ -4746,8 +4861,9 @@ } GetBrowserViewLayout()->set_webui_tab_strip(webui_tab_strip_); GetBrowserViewLayout()->set_loading_bar(loading_bar_); - if (toolbar_) + if (toolbar_) { toolbar_->UpdateForWebUITabStrip(); + } #endif // BUILDFLAG(ENABLE_WEBUI_TAB_STRIP) } @@ -4801,8 +4917,9 @@ bool BrowserView::MaybeShowBookmarkBar(WebContents* contents) { const bool show_bookmark_bar = contents && browser_->SupportsWindowFeature(Browser::FEATURE_BOOKMARKBAR); - if (!show_bookmark_bar && !bookmark_bar_view_.get()) + if (!show_bookmark_bar && !bookmark_bar_view_.get()) { return false; + } if (!bookmark_bar_view_.get()) { bookmark_bar_view_ = std::make_unique<BookmarkBarView>(browser_.get(), this); @@ -4835,8 +4952,9 @@ // Check for updates to the desired size. if (bookmark_bar_view_->GetPreferredSize().height() != - bookmark_bar_view_->height()) + bookmark_bar_view_->height()) { needs_layout = true; + } return needs_layout; } @@ -4894,8 +5012,9 @@ size_t contents_index = contents_container_->GetIndexOf(contents_web_view_).value(); bool devtools_is_on_top = devtools_index > contents_index; - if (strategy.hide_inspected_contents() != devtools_is_on_top) + if (strategy.hide_inspected_contents() != devtools_is_on_top) { contents_container_->ReorderChildView(contents_web_view_, devtools_index); + } } DevToolsDockedPlacement new_placement = GetDevToolsDockedPlacement( @@ -4917,8 +5036,9 @@ // TODO(jamescook): This function always returns true. Remove it and figure // out when layout is actually required. needs_layout |= MaybeShowInfoBar(contents); - if (needs_layout) + if (needs_layout) { DeprecatedLayoutImmediately(); + } } void BrowserView::PrepareFullscreen(bool fullscreen) { @@ -5022,8 +5142,9 @@ // Adjust restored bounds to be on-screen, in case the original // screen was disconnected or repositioned during fullscreen. view->frame()->SetBoundsConstrained(bounds); - if (maximize) + if (maximize) { view->Maximize(); + } } }, weak_ptr_factory_.GetWeakPtr(), bounds_to_restore, was_maximized); @@ -5039,8 +5160,9 @@ } } frame_->SetFullscreen(fullscreen); - if (!fullscreen && restore_pre_fullscreen_bounds_callback_) + if (!fullscreen && restore_pre_fullscreen_bounds_callback_) { std::move(restore_pre_fullscreen_bounds_callback_).Run(); + } #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) } @@ -5142,8 +5264,9 @@ void BrowserView::UpdateAcceleratorMetrics(const ui::Accelerator& accelerator, int command_id) { const ui::KeyboardCode key_code = accelerator.key_code(); - if (command_id == IDC_HELP_PAGE_VIA_KEYBOARD && key_code == ui::VKEY_F1) + if (command_id == IDC_HELP_PAGE_VIA_KEYBOARD && key_code == ui::VKEY_F1) { base::RecordAction(UserMetricsAction("ShowHelpTabViaF1")); + } if (command_id == IDC_BOOKMARK_THIS_TAB) { UMA_HISTOGRAM_ENUMERATION("Bookmarks.EntryPoint", @@ -5153,8 +5276,9 @@ browser_->SupportsWindowFeature(Browser::FEATURE_TABSTRIP)) { TabStripModel* const model = browser_->tab_strip_model(); const auto group_id = model->GetTabGroupForTab(model->active_index()); - if (group_id.has_value()) + if (group_id.has_value()) { base::RecordAction(base::UserMetricsAction("Accel_NewTabInGroup")); + } } if (command_id == IDC_NEW_INCOGNITO_WINDOW) { @@ -5175,35 +5299,40 @@ // on Chrome OS. switch (command_id) { case IDC_BACK: - if (key_code == ui::VKEY_BROWSER_BACK) + if (key_code == ui::VKEY_BROWSER_BACK) { base::RecordAction(UserMetricsAction("Accel_Back_F1")); - else if (key_code == ui::VKEY_LEFT) + } else if (key_code == ui::VKEY_LEFT) { base::RecordAction(UserMetricsAction("Accel_Back_Left")); + } break; case IDC_FORWARD: - if (key_code == ui::VKEY_BROWSER_FORWARD) + if (key_code == ui::VKEY_BROWSER_FORWARD) { base::RecordAction(UserMetricsAction("Accel_Forward_F2")); - else if (key_code == ui::VKEY_RIGHT) + } else if (key_code == ui::VKEY_RIGHT) { base::RecordAction(UserMetricsAction("Accel_Forward_Right")); + } break; case IDC_RELOAD: case IDC_RELOAD_BYPASSING_CACHE: - if (key_code == ui::VKEY_R) + if (key_code == ui::VKEY_R) { base::RecordAction(UserMetricsAction("Accel_Reload_R")); - else if (key_code == ui::VKEY_BROWSER_REFRESH) + } else if (key_code == ui::VKEY_BROWSER_REFRESH) { base::RecordAction(UserMetricsAction("Accel_Reload_F3")); + } break; case IDC_FOCUS_LOCATION: - if (key_code == ui::VKEY_D) + if (key_code == ui::VKEY_D) { base::RecordAction(UserMetricsAction("Accel_FocusLocation_D")); - else if (key_code == ui::VKEY_L) + } else if (key_code == ui::VKEY_L) { base::RecordAction(UserMetricsAction("Accel_FocusLocation_L")); + } break; case IDC_FOCUS_SEARCH: - if (key_code == ui::VKEY_E) + if (key_code == ui::VKEY_E) { base::RecordAction(UserMetricsAction("Accel_FocusSearch_E")); - else if (key_code == ui::VKEY_K) + } else if (key_code == ui::VKEY_K) { base::RecordAction(UserMetricsAction("Accel_FocusSearch_K")); + } break; default: // Do nothing. @@ -5423,8 +5552,9 @@ // If another browser is app modal, flash and activate the modal browser. javascript_dialogs::AppModalDialogController* active_dialog = javascript_dialogs::AppModalDialogQueue::GetInstance()->active_dialog(); - if (!active_dialog) + if (!active_dialog) { return; + } Browser* modal_browser = chrome::FindBrowserWithTab(active_dialog->web_contents()); @@ -5440,12 +5570,14 @@ const ui::Accelerator& accelerator, int* command_id) const { auto iter = accelerator_table_.find(accelerator); - if (iter == accelerator_table_.end()) + if (iter == accelerator_table_.end()) { return false; + } *command_id = iter->second; - if (accelerator.IsRepeat() && !IsCommandRepeatable(*command_id)) + if (accelerator.IsRepeat() && !IsCommandRepeatable(*command_id)) { return false; + } return true; } @@ -5471,17 +5603,20 @@ } void BrowserView::UnhideDownloadShelf() { - if (download_shelf_) + if (download_shelf_) { download_shelf_->Unhide(); + } } void BrowserView::HideDownloadShelf() { - if (download_shelf_) + if (download_shelf_) { download_shelf_->Hide(); + } StatusBubble* status_bubble = GetStatusBubble(); - if (status_bubble) + if (status_bubble) { status_bubble->Hide(); + } } bool BrowserView::CanUserEnterFullscreen() const { @@ -5534,8 +5669,9 @@ void BrowserView::OnImmersiveRevealStarted() { AppMenuButton* app_menu_button = toolbar_button_provider()->GetAppMenuButton(); - if (app_menu_button) + if (app_menu_button) { app_menu_button->CloseMenu(); + } top_container()->SetPaintToLayer(); top_container()->layer()->SetFillsBoundsOpaquely(false);
diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h index 46fb69a..2cbb3f4c 100644 --- a/chrome/browser/ui/views/frame/browser_view.h +++ b/chrome/browser/ui/views/frame/browser_view.h
@@ -991,8 +991,7 @@ // If the Window Placement experiment is enabled, fullscreen may be requested // on a particular display. In that case, |display_id| is the display's id; // otherwise, display::kInvalidDisplayId indicates no display is specified. - void ProcessFullscreen(bool fullscreen, - int64_t display_id); + void ProcessFullscreen(bool fullscreen, int64_t display_id); // Request the underlying platform to make the window fullscreen. void RequestFullscreen(bool fullscreen, int64_t display_id);
diff --git a/chrome/browser/ui/views/frame/browser_view_browsertest.cc b/chrome/browser/ui/views/frame/browser_view_browsertest.cc index 5d7f744..4bcf652 100644 --- a/chrome/browser/ui/views/frame/browser_view_browsertest.cc +++ b/chrome/browser/ui/views/frame/browser_view_browsertest.cc
@@ -120,8 +120,7 @@ public: TestWebContentsObserver(content::WebContents* source, content::WebContents* other) - : content::WebContentsObserver(source), - other_(other) {} + : content::WebContentsObserver(source), other_(other) {} TestWebContentsObserver(const TestWebContentsObserver&) = delete; TestWebContentsObserver& operator=(const TestWebContentsObserver&) = delete; @@ -274,8 +273,7 @@ class BookmarkBarViewObserverImpl : public BookmarkBarViewObserver { public: - BookmarkBarViewObserverImpl() : change_count_(0) { - } + BookmarkBarViewObserverImpl() : change_count_(0) {} BookmarkBarViewObserverImpl(const BookmarkBarViewObserverImpl&) = delete; BookmarkBarViewObserverImpl& operator=(const BookmarkBarViewObserverImpl&) = @@ -403,8 +401,9 @@ #if BUILDFLAG(IS_WIN) ASSERT_TRUE(ax_node); #else - if (!ax_node) + if (!ax_node) { return; + } #endif // There is no dialog, but the browser UI should be visible. So we expect the
diff --git a/chrome/browser/ui/views/frame/browser_view_focus_uitest.cc b/chrome/browser/ui/views/frame/browser_view_focus_uitest.cc index 457c64d..c41e3a0 100644 --- a/chrome/browser/ui/views/frame/browser_view_focus_uitest.cc +++ b/chrome/browser/ui/views/frame/browser_view_focus_uitest.cc
@@ -3,14 +3,13 @@ // found in the LICENSE file. #include "base/memory/raw_ptr.h" -#include "chrome/browser/ui/views/frame/browser_view.h" - #include "build/build_config.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/view_ids.h" +#include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/interactive_test_utils.h" #include "chrome/test/base/ui_test_utils.h" @@ -127,11 +126,13 @@ views::View* focused_now) override {} void OnDidChangeFocus(views::View* focused_before, views::View* focused_now) override { - if (focused_now) - if (!views::IsViewClass<views::WebView>(focused_now)) + if (focused_now) { + if (!views::IsViewClass<views::WebView>(focused_now)) { // Focused views could be destroyed. Track what we want to test for when // OnDidChangeFocus is called. has_focused_on_non_webview_ = true; + } + } focus_change_count++; }
diff --git a/chrome/browser/ui/views/frame/browser_view_interactive_uitest.cc b/chrome/browser/ui/views/frame/browser_view_interactive_uitest.cc index 8e1d096b..795989d0 100644 --- a/chrome/browser/ui/views/frame/browser_view_interactive_uitest.cc +++ b/chrome/browser/ui/views/frame/browser_view_interactive_uitest.cc
@@ -151,8 +151,9 @@ #else // In immersive fullscreen mode, the top view should show up; otherwise, it // always hides. - if (browser_view->immersive_mode_controller()->IsEnabled()) + if (browser_view->immersive_mode_controller()->IsEnabled()) { top_view_in_browser_fullscreen = true; + } #endif EXPECT_EQ(top_view_in_browser_fullscreen, browser_view->GetTabStripVisible()); // The 'Always Show Bookmarks Bar' should be enabled if top view is shown. @@ -229,8 +230,9 @@ // If the bookmark bar is not showing, enable showing it so that we can check // its state. - if (!browser_view->IsBookmarkBarVisible()) + if (!browser_view->IsBookmarkBarVisible()) { chrome::ToggleBookmarkBar(browser()); + } #if BUILDFLAG(IS_MAC) // Disable showing toolbar in fullscreen mode to make its behavior similar to // other platforms. @@ -287,16 +289,18 @@ // This event is asynchronous, it is emitted as a response to a system window // event. It is possible that we haven't received it yet when we run this test // and we need to explicitly wait for it. - if (ax_observer_.GetCount(ax::mojom::Event::kWindowActivated) == 0) + if (ax_observer_.GetCount(ax::mojom::Event::kWindowActivated) == 0) { ax_observer_.WaitForEvent(ax::mojom::Event::kWindowActivated); + } ASSERT_EQ(1, ax_observer_.GetCount(ax::mojom::Event::kWindowActivated)); // Create a new browser window and wait for event again. ui_test_utils::NavigateToURLWithDisposition( browser(), GURL(url::kAboutBlankURL), WindowOpenDisposition::NEW_WINDOW, ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER); - if (ax_observer_.GetCount(ax::mojom::Event::kWindowActivated) == 1) + if (ax_observer_.GetCount(ax::mojom::Event::kWindowActivated) == 1) { ax_observer_.WaitForEvent(ax::mojom::Event::kWindowActivated); + } ASSERT_EQ(2, ax_observer_.GetCount(ax::mojom::Event::kWindowActivated)); } #endif
diff --git a/chrome/browser/ui/views/frame/browser_view_layout.cc b/chrome/browser/ui/views/frame/browser_view_layout.cc index 38064da..c364e30 100644 --- a/chrome/browser/ui/views/frame/browser_view_layout.cc +++ b/chrome/browser/ui/views/frame/browser_view_layout.cc
@@ -215,8 +215,7 @@ immersive_mode_controller_(immersive_mode_controller), contents_separator_(contents_separator), tab_strip_(tab_strip), - dialog_host_(std::make_unique<WebContentsModalDialogHostViews>(this)) { -} + dialog_host_(std::make_unique<WebContentsModalDialogHostViews>(this)) {} BrowserViewLayout::~BrowserViewLayout() = default; @@ -255,8 +254,9 @@ ? toolbar_->GetMinimumSize() : gfx::Size()); gfx::Size bookmark_bar_size; - if (has_bookmarks_bar) + if (has_bookmarks_bar) { bookmark_bar_size = bookmark_bar_->GetMinimumSize(); + } gfx::Size infobar_container_size(infobar_container_->GetMinimumSize()); // TODO(pkotwicz): Adjust the minimum height for the find bar. @@ -331,8 +331,9 @@ // If the point is within the top_area_rect but not the titlebar_area_rect, // then it must be in the window controls overlay. if (top_area_rect.Contains(point_in_browser_view_coords) && - !titlebar_area_rect.Contains(point_in_browser_view_coords)) + !titlebar_area_rect.Contains(point_in_browser_view_coords)) { return HTNOWHERE; + } } // Determine if the TabStrip exists and is capable of being clicked on. We @@ -341,8 +342,9 @@ // See if the mouse pointer is within the bounds of the TabStripRegionView. gfx::Point test_point(point); if (ConvertedHitTest(parent, tab_strip_region_view_, &test_point)) { - if (tab_strip_region_view_->IsPositionInWindowCaption(test_point)) + if (tab_strip_region_view_->IsPositionInWindowCaption(test_point)) { return HTCAPTION; + } return HTCLIENT; } @@ -474,8 +476,9 @@ // |top_container_| in immersive fullscreen. ExclusiveAccessBubbleViews* exclusive_access_bubble = delegate_->GetExclusiveAccessBubble(); - if (exclusive_access_bubble) + if (exclusive_access_bubble) { exclusive_access_bubble->RepositionIfVisible(); + } // Adjust any hosted dialogs if the browser's dialog hosting bounds changed. const gfx::Rect dialog_bounds(dialog_host_->GetDialogPosition(gfx::Size()), @@ -617,8 +620,9 @@ int BrowserViewLayout::LayoutWebUITabStrip(int top) { TRACE_EVENT0("ui", "BrowserViewLayout::LayoutWebUITabStrip"); - if (!webui_tab_strip_) + if (!webui_tab_strip_) { return top; + } if (!webui_tab_strip_->GetVisible()) { webui_tab_strip_->SetBoundsRect(gfx::Rect()); return top; @@ -667,8 +671,9 @@ top += separator_height; } else { SetViewVisibility(contents_separator_, false); - if (loading_bar_) + if (loading_bar_) { SetViewVisibility(loading_bar_, false); + } } return LayoutInfoBar(top); @@ -758,8 +763,9 @@ side_panel_visible_on_right); } - if (!side_panel || !side_panel->GetVisible()) + if (!side_panel || !side_panel->GetVisible()) { return; + } DCHECK(side_panel == unified_side_panel_); bool is_right_aligned = @@ -862,8 +868,9 @@ // during an immersive fullscreen reveal. int height = 0; for (views::View* child : top_container_->children()) { - if (child->GetVisible()) + if (child->GetVisible()) { height = std::max(height, child->bounds().bottom()); + } } // Ensure that the top container view reaches the topmost view in the
diff --git a/chrome/browser/ui/views/frame/browser_view_layout_unittest.cc b/chrome/browser/ui/views/frame/browser_view_layout_unittest.cc index 248d975e..eca8869 100644 --- a/chrome/browser/ui/views/frame/browser_view_layout_unittest.cc +++ b/chrome/browser/ui/views/frame/browser_view_layout_unittest.cc
@@ -42,9 +42,7 @@ void set_should_draw_tab_strip(bool visible) { should_draw_tab_strip_ = visible; } - void set_toolbar_visible(bool visible) { - toolbar_visible_ = visible; - } + void set_toolbar_visible(bool visible) { toolbar_visible_ = visible; } void set_bookmark_bar_visible(bool visible) { bookmark_bar_visible_ = visible; }
diff --git a/chrome/browser/ui/views/frame/browser_view_unittest.cc b/chrome/browser/ui/views/frame/browser_view_unittest.cc index 19310287..3dd1fb8 100644 --- a/chrome/browser/ui/views/frame/browser_view_unittest.cc +++ b/chrome/browser/ui/views/frame/browser_view_unittest.cc
@@ -715,8 +715,7 @@ gfx::Point header_offset; views::View::ConvertPointToTarget( - browser_view(), - browser_view()->frame()->non_client_view()->frame_view(), + browser_view(), browser_view()->frame()->non_client_view()->frame_view(), &header_offset); // The position of the bottom of the header (the bar with the window
diff --git a/chrome/browser/ui/views/frame/browser_window_factory.cc b/chrome/browser/ui/views/frame/browser_window_factory.cc index 466f645..503a8e6 100644 --- a/chrome/browser/ui/views/frame/browser_window_factory.cc +++ b/chrome/browser/ui/views/frame/browser_window_factory.cc
@@ -47,15 +47,18 @@ BrowserFrame* browser_frame = nullptr; #if BUILDFLAG(IS_CHROMEOS) view = new BrowserViewAsh(std::move(browser)); - if (view->browser()->is_type_custom_tab()) + if (view->browser()->is_type_custom_tab()) { browser_frame = new CustomTabBrowserFrame(view); + } #else view = new BrowserView(std::move(browser)); #endif - if (!browser_frame) + if (!browser_frame) { browser_frame = new BrowserFrame(view); - if (in_tab_dragging) + } + if (in_tab_dragging) { browser_frame->SetTabDragKind(TabDragKind::kAllTabs); + } browser_frame->InitBrowserFrame(); #if BUILDFLAG(IS_MAC)
diff --git a/chrome/browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc b/chrome/browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc index 04a2831..f7ba14d8 100644 --- a/chrome/browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc +++ b/chrome/browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc
@@ -114,17 +114,15 @@ base::win::ScopedPropVariant prop_var; // The relaunch name should be the extension name. - EXPECT_EQ(S_OK, - pps->GetValue(PKEY_AppUserModel_RelaunchDisplayNameResource, - prop_var.Receive())); + EXPECT_EQ(S_OK, pps->GetValue(PKEY_AppUserModel_RelaunchDisplayNameResource, + prop_var.Receive())); EXPECT_EQ(VT_LPWSTR, prop_var.get().vt); EXPECT_EQ(base::UTF8ToWide(extension->name()), prop_var.get().pwszVal); prop_var.Reset(); // The relaunch command should specify the profile and the app id. - EXPECT_EQ( - S_OK, - pps->GetValue(PKEY_AppUserModel_RelaunchCommand, prop_var.Receive())); + EXPECT_EQ(S_OK, pps->GetValue(PKEY_AppUserModel_RelaunchCommand, + prop_var.Receive())); EXPECT_EQ(VT_LPWSTR, prop_var.get().vt); base::CommandLine cmd_line( base::CommandLine::FromString(prop_var.get().pwszVal)); @@ -138,9 +136,8 @@ base::FilePath web_app_dir = web_app::GetOsIntegrationResourcesDirectoryForApp( browser->profile()->GetPath(), extension->id(), GURL()); - EXPECT_EQ(S_OK, - pps->GetValue(PKEY_AppUserModel_RelaunchIconResource, - prop_var.Receive())); + EXPECT_EQ(S_OK, pps->GetValue(PKEY_AppUserModel_RelaunchIconResource, + prop_var.Receive())); EXPECT_EQ(VT_LPWSTR, prop_var.get().vt); EXPECT_EQ( AddIdToIconPath(web_app::internals::GetIconFilePath( @@ -176,8 +173,9 @@ // If multiprofile mode is not enabled, we can't test the behavior when there // are multiple profiles. - if (!profiles::IsMultipleProfilesEnabled()) + if (!profiles::IsMultipleProfilesEnabled()) { return; + } // Two profile case. Both profile names should be shown. ProfileManager* profile_manager = g_browser_process->profile_manager(); @@ -224,8 +222,9 @@ // Find the new browser. Browser* app_browser = nullptr; for (Browser* b : *BrowserList::GetInstance()) { - if (b != browser()) + if (b != browser()) { app_browser = b; + } } ASSERT_TRUE(app_browser); ASSERT_TRUE(app_browser != browser());
diff --git a/chrome/browser/ui/views/frame/browser_window_property_manager_win.h b/chrome/browser/ui/views/frame/browser_window_property_manager_win.h index 4567c40..dfc90ac 100644 --- a/chrome/browser/ui/views/frame/browser_window_property_manager_win.h +++ b/chrome/browser/ui/views/frame/browser_window_property_manager_win.h
@@ -33,7 +33,6 @@ PrefChangeRegistrar profile_pref_registrar_; raw_ptr<const BrowserView> view_; const HWND hwnd_; - }; #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_WINDOW_PROPERTY_MANAGER_WIN_H_
diff --git a/chrome/browser/ui/views/frame/contents_layout_manager.cc b/chrome/browser/ui/views/frame/contents_layout_manager.cc index 1fe9a3e8..993c019 100644 --- a/chrome/browser/ui/views/frame/contents_layout_manager.cc +++ b/chrome/browser/ui/views/frame/contents_layout_manager.cc
@@ -17,8 +17,9 @@ void ContentsLayoutManager::SetContentsResizingStrategy( const DevToolsContentsResizingStrategy& strategy) { - if (strategy_.Equals(strategy)) + if (strategy_.Equals(strategy)) { return; + } strategy_.CopyFrom(strategy); InvalidateHost(true); @@ -39,8 +40,8 @@ gfx::Rect new_devtools_bounds; gfx::Rect new_contents_bounds; - ApplyDevToolsContentsResizingStrategy(strategy_, container_size, - &new_devtools_bounds, &new_contents_bounds); + ApplyDevToolsContentsResizingStrategy( + strategy_, container_size, &new_devtools_bounds, &new_contents_bounds); // DevTools cares about the specific position, so we have to compensate RTL // layout here.
diff --git a/chrome/browser/ui/views/frame/contents_web_view.cc b/chrome/browser/ui/views/frame/contents_web_view.cc index f4f145ae..6dced24 100644 --- a/chrome/browser/ui/views/frame/contents_web_view.cc +++ b/chrome/browser/ui/views/frame/contents_web_view.cc
@@ -29,8 +29,7 @@ kContentsWebViewElementId); ContentsWebView::ContentsWebView(content::BrowserContext* browser_context) - : views::WebView(browser_context), - status_bubble_(nullptr) { + : views::WebView(browser_context), status_bubble_(nullptr) { SetProperty(views::kElementIdentifierKey, kContentsWebViewElementId); #if BUILDFLAG(ENABLE_GLIC) glic_border_ = AddChildView(std::make_unique<glic::BorderView>()); @@ -55,8 +54,9 @@ void ContentsWebView::SetStatusBubble(StatusBubbleViews* status_bubble) { status_bubble_ = status_bubble; DCHECK(!status_bubble_ || status_bubble_->base_view() == this); - if (status_bubble_) + if (status_bubble_) { status_bubble_->Reposition(); + } OnPropertyChanged(&status_bubble_, views::kPropertyEffectsNone); } @@ -66,8 +66,9 @@ void ContentsWebView::SetBackgroundVisible(bool background_visible) { background_visible_ = background_visible; - if (GetWidget()) + if (GetWidget()) { UpdateBackgroundColor(); + } } void ContentsWebView::SetBackgroundRadii(const gfx::RoundedCornersF& radii) { @@ -86,8 +87,9 @@ } void ContentsWebView::OnVisibleBoundsChanged() { - if (status_bubble_) + if (status_bubble_) { status_bubble_->Reposition(); + } } void ContentsWebView::OnThemeChanged() { @@ -96,8 +98,9 @@ } void ContentsWebView::OnLetterboxingChanged() { - if (GetWidget()) + if (GetWidget()) { UpdateBackgroundColor(); + } } void ContentsWebView::UpdateBackgroundColor() { @@ -138,8 +141,9 @@ } void ContentsWebView::CloneWebContentsLayer() { - if (!web_contents()) + if (!web_contents()) { return; + } #if defined(USE_AURA) // We don't need to clone the layers on non-Aura (Mac), because closing an // NSWindow does not animate. @@ -171,8 +175,9 @@ void ContentsWebView::RenderViewReady() { // Set the background color to be the theme's ntp background on startup. - if (GetWidget()) + if (GetWidget()) { UpdateBackgroundColor(); + } WebView::RenderViewReady(); }
diff --git a/chrome/browser/ui/views/frame/dbus_appmenu.cc b/chrome/browser/ui/views/frame/dbus_appmenu.cc index a0682e60..3d74204 100644 --- a/chrome/browser/ui/views/frame/dbus_appmenu.cc +++ b/chrome/browser/ui/views/frame/dbus_appmenu.cc
@@ -158,8 +158,9 @@ int command, std::vector<std::pair<ui::MenuModel*, size_t>>* menu_items) { for (size_t i = 0; i < menu->GetItemCount(); ++i) { - if (menu->GetCommandIdAt(i) == command) + if (menu->GetCommandIdAt(i) == command) { menu_items->push_back({menu, i}); + } if (menu->GetTypeAt(i) == ui::SimpleMenuModel::ItemType::TYPE_SUBMENU) { FindMenuItemsForCommandAux(menu->GetSubmenuModelAt(i), command, menu_items); @@ -216,18 +217,21 @@ auto* registrar = DbusAppmenuRegistrar::GetInstance(); registrar->OnMenuBarDestroyed(this); - if (!initialized_) + if (!initialized_) { return; + } registrar->bus()->UnregisterExportedObject(dbus::ObjectPath(GetPath())); - for (int command : observed_commands_) + for (int command : observed_commands_) { chrome::RemoveCommandObserver(browser_, command, this); + } pref_change_registrar_.RemoveAll(); - if (tab_restore_service_) + if (tab_restore_service_) { tab_restore_service_->RemoveObserver(this); + } BrowserList::RemoveObserver(this); } @@ -303,12 +307,14 @@ continue; } - if (command_id == IDC_SHOW_BOOKMARK_BAR) + if (command_id == IDC_SHOW_BOOKMARK_BAR) { menu->AddCheckItemWithStringId(command_id, command.str_id); - else + } else { menu->AddItemWithStringId(command_id, command.str_id); - if (command_id < kLastChromeCommand) + } + if (command_id < kLastChromeCommand) { RegisterCommandObserver(command_id); + } } root_menu_->AddSubMenu(kSubmenu, l10n_util::GetStringUTF16(string_id), menu); return menu; @@ -331,8 +337,9 @@ std::u16string title = item->title; std::string url_string = item->url.possibly_invalid_spec(); - if (title.empty()) + if (title.empty()) { title = base::UTF8ToUTF16(url_string); + } gfx::ElideString(title, kMaximumMenuWidthInChars, &title); int command_id = NextCommandId(); @@ -381,8 +388,9 @@ for (size_t i = 0; i < visited_list.size() && i < kMostVisitedCount; ++i) { const history::MostVisitedURL& visited = visited_list[i]; - if (visited.url.spec().empty()) + if (visited.url.spec().empty()) { break; // This is the signal that there are no more real visited sites. + } auto item = std::make_unique<HistoryItem>(); item->title = visited.title; @@ -391,8 +399,9 @@ AddHistoryItemToMenu(std::move(item), history_menu_, index++); } - if (menu_service_) + if (menu_service_) { menu_service_->MenuLayoutUpdated(history_menu_); + } } void DbusAppmenu::OnBookmarkBarVisibilityChanged() { @@ -401,8 +410,9 @@ } void DbusAppmenu::RebuildProfilesMenu() { - while (profiles_menu_->GetTypeAt(0) != ui::MenuModel::TYPE_SEPARATOR) + while (profiles_menu_->GetTypeAt(0) != ui::MenuModel::TYPE_SEPARATOR) { profiles_menu_->RemoveItemAt(0); + } profile_commands_.clear(); // Don't call avatar_menu_->GetActiveProfileIndex() as the as the index might @@ -414,16 +424,18 @@ std::u16string title = item.name; gfx::ElideString(title, kMaximumMenuWidthInChars, &title); - if (item.active) + if (item.active) { active_profile_index_ = i; + } int command = NextCommandId(); profile_commands_[command] = i; profiles_menu_->InsertCheckItemAt(i, command, title); } - if (menu_service_) + if (menu_service_) { menu_service_->MenuLayoutUpdated(profiles_menu_); + } } int DbusAppmenu::ClearHistoryMenuSection(int header_command_id) { @@ -438,24 +450,27 @@ } void DbusAppmenu::RegisterCommandObserver(int command) { - if (command > kLastChromeCommand) + if (command > kLastChromeCommand) { return; + } // Keep track of which commands are already registered to avoid // registering them twice. const bool inserted = observed_commands_.insert(command).second; - if (!inserted) + if (!inserted) { return; + } chrome::AddCommandObserver(browser_, command, this); } int DbusAppmenu::NextCommandId() { do { - if (last_command_id_ == std::numeric_limits<int>::max()) + if (last_command_id_ == std::numeric_limits<int>::max()) { last_command_id_ = kFirstUnreservedCommandId; - else + } else { last_command_id_++; + } } while (base::Contains(history_items_, last_command_id_) || base::Contains(profile_commands_, last_command_id_)); return last_command_id_; @@ -502,8 +517,9 @@ static_cast<sessions::tab_restore::Window*>(entry); auto& tabs = window->tabs; - if (tabs.empty()) + if (tabs.empty()) { continue; + } std::u16string title = l10n_util::GetPluralStringFUTF16( IDS_RECENTLY_CLOSED_WINDOW, tabs.size()); @@ -520,8 +536,9 @@ static_cast<sessions::tab_restore::Group*>(entry); auto& tabs = group->tabs; - if (tabs.empty()) + if (tabs.empty()) { continue; + } std::u16string title; if (group->visual_data.title().empty()) { @@ -558,12 +575,14 @@ } bool DbusAppmenu::IsCommandIdEnabled(int command_id) const { - if (command_id <= kLastChromeCommand) + if (command_id <= kLastChromeCommand) { return chrome::IsCommandEnabled(browser_, command_id); + } // There is no active profile in Guest mode, in which case the action // buttons should be disabled. - if (command_id == kTagProfileEdit || command_id == kTagProfileCreate) + if (command_id == kTagProfileEdit || command_id == kTagProfileCreate) { return active_profile_index_ >= 0; + } return command_id != kTagRecentlyClosed && command_id != kTagMostVisited; } @@ -598,12 +617,14 @@ } void DbusAppmenu::OnMenuWillShow(ui::SimpleMenuModel* source) { - if (source != history_menu_ || tab_restore_service_) + if (source != history_menu_ || tab_restore_service_) { return; + } tab_restore_service_ = TabRestoreServiceFactory::GetForProfile(profile_); - if (!tab_restore_service_) + if (!tab_restore_service_) { return; + } tab_restore_service_->LoadTabsFromLastSession(); tab_restore_service_->AddObserver(this);
diff --git a/chrome/browser/ui/views/frame/dbus_appmenu_registrar.cc b/chrome/browser/ui/views/frame/dbus_appmenu_registrar.cc index 620d695..36466d1 100644 --- a/chrome/browser/ui/views/frame/dbus_appmenu_registrar.cc +++ b/chrome/browser/ui/views/frame/dbus_appmenu_registrar.cc
@@ -34,8 +34,9 @@ void DbusAppmenuRegistrar::OnMenuBarCreated(DbusAppmenu* menu) { // Make sure insertion succeeds, we should not already be tracking `menu`. CHECK(menus_.insert({menu, kUninitialized}).second); - if (service_has_owner_) + if (service_has_owner_) { InitializeMenu(menu); + } } void DbusAppmenuRegistrar::OnMenuBarDestroyed(DbusAppmenu* menu) { @@ -93,8 +94,9 @@ DCHECK(base::Contains(menus_, menu)); DCHECK(menus_[menu] == kInitializing); menus_[menu] = success ? kInitializeSucceeded : kInitializeFailed; - if (success && service_has_owner_) + if (success && service_has_owner_) { RegisterMenu(menu); + } } void DbusAppmenuRegistrar::OnNameOwnerChanged( @@ -107,8 +109,9 @@ DbusAppmenu* menu = pair.first; switch (pair.second) { case kUninitialized: - if (service_has_owner_) + if (service_has_owner_) { InitializeMenu(menu); + } break; case kInitializing: // Wait for Initialize() to finish. @@ -117,14 +120,16 @@ // Don't try to recover. break; case kInitializeSucceeded: - if (service_has_owner_) + if (service_has_owner_) { RegisterMenu(menu); + } break; case kRegistered: - if (service_has_owner_) + if (service_has_owner_) { RegisterMenu(menu); - else + } else { menus_[menu] = kInitializeSucceeded; + } break; } }
diff --git a/chrome/browser/ui/views/frame/desktop_browser_frame_aura.cc b/chrome/browser/ui/views/frame/desktop_browser_frame_aura.cc index da21a23..93b88f9 100644 --- a/chrome/browser/ui/views/frame/desktop_browser_frame_aura.cc +++ b/chrome/browser/ui/views/frame/desktop_browser_frame_aura.cc
@@ -25,9 +25,8 @@ /////////////////////////////////////////////////////////////////////////////// // DesktopBrowserFrameAura, public: -DesktopBrowserFrameAura::DesktopBrowserFrameAura( - BrowserFrame* browser_frame, - BrowserView* browser_view) +DesktopBrowserFrameAura::DesktopBrowserFrameAura(BrowserFrame* browser_frame, + BrowserView* browser_view) : views::DesktopNativeWidgetAura(browser_frame), browser_view_(browser_view), browser_frame_(browser_frame), @@ -52,10 +51,7 @@ views::Widget::InitParams params) { browser_desktop_window_tree_host_ = BrowserDesktopWindowTreeHost::CreateBrowserDesktopWindowTreeHost( - browser_frame_, - this, - browser_view_, - browser_frame_); + browser_frame_, this, browser_view_, browser_frame_); params.desktop_window_tree_host = browser_desktop_window_tree_host_->AsDesktopWindowTreeHost(); DesktopNativeWidgetAura::InitNativeWidget(std::move(params)); @@ -63,8 +59,7 @@ visibility_controller_ = std::make_unique<wm::VisibilityController>(); aura::client::SetVisibilityClient(GetNativeView()->GetRootWindow(), visibility_controller_.get()); - wm::SetChildWindowVisibilityChangesAnimated( - GetNativeView()->GetRootWindow()); + wm::SetChildWindowVisibilityChangesAnimated(GetNativeView()->GetRootWindow()); } void DesktopBrowserFrameAura::OnOcclusionStateChanged( @@ -111,12 +106,13 @@ gfx::Rect* bounds, ui::mojom::WindowShowState* show_state) const { *bounds = GetWidget()->GetRestoredBounds(); - if (IsMaximized()) + if (IsMaximized()) { *show_state = ui::mojom::WindowShowState::kMaximized; - else if (IsMinimized()) + } else if (IsMinimized()) { *show_state = ui::mojom::WindowShowState::kMinimized; - else + } else { *show_state = ui::mojom::WindowShowState::kNormal; + } } content::KeyboardEventProcessingResult
diff --git a/chrome/browser/ui/views/frame/desktop_browser_frame_aura_linux.h b/chrome/browser/ui/views/frame/desktop_browser_frame_aura_linux.h index 4c13214..6da3b5e 100644 --- a/chrome/browser/ui/views/frame/desktop_browser_frame_aura_linux.h +++ b/chrome/browser/ui/views/frame/desktop_browser_frame_aura_linux.h
@@ -5,10 +5,9 @@ #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_BROWSER_FRAME_AURA_LINUX_H_ #define CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_BROWSER_FRAME_AURA_LINUX_H_ +#include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/ui/views/frame/desktop_browser_frame_aura.h" - -#include "base/gtest_prod_util.h" #include "components/prefs/pref_member.h" class BrowserDesktopWindowTreeHostLinux;
diff --git a/chrome/browser/ui/views/frame/immersive_mode_browser_view_test.cc b/chrome/browser/ui/views/frame/immersive_mode_browser_view_test.cc index 83cc9f44f9..c65a85a 100644 --- a/chrome/browser/ui/views/frame/immersive_mode_browser_view_test.cc +++ b/chrome/browser/ui/views/frame/immersive_mode_browser_view_test.cc
@@ -193,8 +193,9 @@ {IDC_SELECT_TAB_0, 0}, {IDC_SELECT_NEXT_TAB, 1}, {IDC_SELECT_PREVIOUS_TAB, 0}}; - for (const auto& datum : test_data) + for (const auto& datum : test_data) { tester.RunCommand(datum.command, datum.expected_index); + } } // This test does not make sense for the webUI tabstrip, since the window layout
diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller.h b/chrome/browser/ui/views/frame/immersive_mode_controller.h index fd8e0223..e125ba4 100644 --- a/chrome/browser/ui/views/frame/immersive_mode_controller.h +++ b/chrome/browser/ui/views/frame/immersive_mode_controller.h
@@ -14,7 +14,7 @@ namespace gfx { class Rect; class Size; -} +} // namespace gfx namespace views { class Widget; @@ -38,10 +38,7 @@ // Currently, immersive mode is only available for Chrome OS and macOS. class ImmersiveModeController { public: - enum AnimateReveal { - ANIMATE_REVEAL_YES, - ANIMATE_REVEAL_NO - }; + enum AnimateReveal { ANIMATE_REVEAL_YES, ANIMATE_REVEAL_NO }; class Observer { public:
diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller_chromeos.cc b/chrome/browser/ui/views/frame/immersive_mode_controller_chromeos.cc index fdfb2bf..ac89ab01 100644 --- a/chrome/browser/ui/views/frame/immersive_mode_controller_chromeos.cc +++ b/chrome/browser/ui/views/frame/immersive_mode_controller_chromeos.cc
@@ -102,8 +102,9 @@ int ImmersiveModeControllerChromeos::GetTopContainerVerticalOffset( const gfx::Size& top_container_size) const { - if (!IsEnabled()) + if (!IsEnabled()) { return 0; + } return static_cast<int>(top_container_size.height() * (visible_fraction_ - 1)); @@ -130,8 +131,9 @@ void ImmersiveModeControllerChromeos::OnWidgetActivationChanged( views::Widget* widget, bool active) { - if (browser_view_->GetSupportsTabStrip()) + if (browser_view_->GetSupportsTabStrip()) { return; + } if (!display::Screen::GetScreen()->InTabletMode()) { return; @@ -188,15 +190,17 @@ void ImmersiveModeControllerChromeos::OnImmersiveRevealStarted() { visible_fraction_ = 0; - for (Observer& observer : observers_) + for (Observer& observer : observers_) { observer.OnImmersiveRevealStarted(); + } } void ImmersiveModeControllerChromeos::OnImmersiveRevealEnded() { visible_fraction_ = 0; browser_view_->contents_web_view()->holder()->SetHitTestTopInset(0); - for (Observer& observer : observers_) + for (Observer& observer : observers_) { observer.OnImmersiveRevealEnded(); + } } void ImmersiveModeControllerChromeos::OnImmersiveFullscreenEntered() { @@ -207,14 +211,16 @@ void ImmersiveModeControllerChromeos::OnImmersiveFullscreenExited() { browser_view_->contents_web_view()->holder()->SetHitTestTopInset(0); - for (Observer& observer : observers_) + for (Observer& observer : observers_) { observer.OnImmersiveFullscreenExited(); + } } void ImmersiveModeControllerChromeos::SetVisibleFraction( double visible_fraction) { - if (visible_fraction_ == visible_fraction) + if (visible_fraction_ == visible_fraction) { return; + } // Sets the top inset only when the top-of-window views is fully visible. This // means some gesture may not be recognized well during the animation, but @@ -253,8 +259,9 @@ } void ImmersiveModeControllerChromeos::OnFullscreenStateChanged() { - if (!controller_.IsEnabled()) + if (!controller_.IsEnabled()) { return; + } // Auto hide the shelf in immersive browser fullscreen. bool in_tab_fullscreen = browser_view_->browser()
diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller_factory_views.cc b/chrome/browser/ui/views/frame/immersive_mode_controller_factory_views.cc index bb4351f..c7eea6a 100644 --- a/chrome/browser/ui/views/frame/immersive_mode_controller_factory_views.cc +++ b/chrome/browser/ui/views/frame/immersive_mode_controller_factory_views.cc
@@ -2,9 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/views/frame/immersive_mode_controller_stub.h" - #include "build/build_config.h" +#include "chrome/browser/ui/views/frame/immersive_mode_controller_stub.h" #if BUILDFLAG(IS_CHROMEOS) #include "chrome/browser/ui/views/frame/immersive_mode_controller_chromeos.h"
diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller_mac.mm b/chrome/browser/ui/views/frame/immersive_mode_controller_mac.mm index 769365fe8..75277770 100644 --- a/chrome/browser/ui/views/frame/immersive_mode_controller_mac.mm +++ b/chrome/browser/ui/views/frame/immersive_mode_controller_mac.mm
@@ -72,8 +72,9 @@ : controller_(std::move(controller)) {} ImmersiveModeControllerMac::RevealedLock::~RevealedLock() { - if (auto* controller = controller_.get()) + if (auto* controller = controller_.get()) { controller->LockDestroyed(); + } } ImmersiveModeControllerMac::ImmersiveModeControllerMac(bool separate_tab_strip) @@ -195,8 +196,9 @@ // Notify BrowserView about the fullscreen exit so that the top container // can be reparented, otherwise it might be destroyed along with the // overlay widget. - for (Observer& observer : observers_) + for (Observer& observer : observers_) { observer.OnImmersiveFullscreenExited(); + } // Rollback the view shuffling from enablement. MoveChildren(browser_view_->overlay_widget(), browser_view_->GetWidget()); @@ -328,8 +330,9 @@ views::View* focused_now) { if (browser_view_->top_container()->Contains(focused_now) || browser_view_->tab_overlay_view()->Contains(focused_now)) { - if (!focus_lock_) + if (!focus_lock_) { focus_lock_ = GetRevealedLock(ANIMATE_REVEAL_NO); + } } else { focus_lock_.reset(); }
diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller_mac_interactive_uitest.mm b/chrome/browser/ui/views/frame/immersive_mode_controller_mac_interactive_uitest.mm index 52d88e1..94a0882a 100644 --- a/chrome/browser/ui/views/frame/immersive_mode_controller_mac_interactive_uitest.mm +++ b/chrome/browser/ui/views/frame/immersive_mode_controller_mac_interactive_uitest.mm
@@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/views/frame/immersive_mode_controller_mac.h" - #import <Cocoa/Cocoa.h> #include <tuple> @@ -15,6 +13,7 @@ #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h" #include "chrome/browser/ui/find_bar/find_bar_host_unittest_util.h" #include "chrome/browser/ui/views/frame/browser_view.h" +#include "chrome/browser/ui/views/frame/immersive_mode_controller_mac.h" #include "chrome/browser/ui/views/frame/top_container_view.h" #include "chrome/common/chrome_features.h" #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller_stub.cc b/chrome/browser/ui/views/frame/immersive_mode_controller_stub.cc index 72452e2..85bc767 100644 --- a/chrome/browser/ui/views/frame/immersive_mode_controller_stub.cc +++ b/chrome/browser/ui/views/frame/immersive_mode_controller_stub.cc
@@ -6,8 +6,7 @@ #include "base/notreached.h" -void ImmersiveModeControllerStub::Init(BrowserView* browser_view) { -} +void ImmersiveModeControllerStub::Init(BrowserView* browser_view) {} void ImmersiveModeControllerStub::SetEnabled(bool enabled) { NOTREACHED(); @@ -36,8 +35,7 @@ } void ImmersiveModeControllerStub::OnFindBarVisibleBoundsChanged( - const gfx::Rect& new_visible_bounds_in_screen) { -} + const gfx::Rect& new_visible_bounds_in_screen) {} bool ImmersiveModeControllerStub::ShouldStayImmersiveAfterExitingFullscreen() { return false;
diff --git a/chrome/browser/ui/views/frame/immersive_mode_tester.cc b/chrome/browser/ui/views/frame/immersive_mode_tester.cc index 230c61a..91461a0 100644 --- a/chrome/browser/ui/views/frame/immersive_mode_tester.cc +++ b/chrome/browser/ui/views/frame/immersive_mode_tester.cc
@@ -66,8 +66,9 @@ reveal_started_ = false; reveal_ended_ = true; EXPECT_FALSE(GetBrowserView()->immersive_mode_controller()->IsRevealed()); - if (reveal_loop_ && reveal_loop_->running()) + if (reveal_loop_ && reveal_loop_->running()) { reveal_loop_->Quit(); + } } void ImmersiveModeTester::OnImmersiveModeControllerDestroyed() {
diff --git a/chrome/browser/ui/views/frame/immersive_mode_tester.h b/chrome/browser/ui/views/frame/immersive_mode_tester.h index 439722a..cc84d70 100644 --- a/chrome/browser/ui/views/frame/immersive_mode_tester.h +++ b/chrome/browser/ui/views/frame/immersive_mode_tester.h
@@ -48,10 +48,11 @@ class WebUiTabStripOverrideTest : public BaseTest { public: WebUiTabStripOverrideTest() { - if (kEnabled) + if (kEnabled) { feature_override_.InitAndEnableFeature(features::kWebUITabStrip); - else + } else { feature_override_.InitAndDisableFeature(features::kWebUITabStrip); + } } ~WebUiTabStripOverrideTest() override = default;
diff --git a/chrome/browser/ui/views/frame/minimize_button_metrics_win.cc b/chrome/browser/ui/views/frame/minimize_button_metrics_win.cc index 52f894fa..47965e8 100644 --- a/chrome/browser/ui/views/frame/minimize_button_metrics_win.cc +++ b/chrome/browser/ui/views/frame/minimize_button_metrics_win.cc
@@ -123,8 +123,9 @@ if (titlebar_info.rgrect[2].left == titlebar_info.rgrect[2].right || (titlebar_info.rgstate[2] & (STATE_SYSTEM_INVISIBLE | STATE_SYSTEM_OFFSCREEN | - STATE_SYSTEM_UNAVAILABLE))) + STATE_SYSTEM_UNAVAILABLE))) { return 0; + } minimize_button_corner = {titlebar_info.rgrect[2].left, 0}; } @@ -156,8 +157,9 @@ // CacheMinimizeButtonDelta() for more details. DCHECK(cached_minimize_button_x_delta_); - if (base::i18n::IsRTL()) + if (base::i18n::IsRTL()) { return cached_minimize_button_x_delta_; + } RECT client_rect = {0}; GetClientRect(hwnd_, &client_rect); @@ -166,8 +168,9 @@ int MinimizeButtonMetrics::GetAndCacheMinimizeButtonOffsetX() const { const int minimize_button_offset = GetMinimizeButtonOffsetForWindow(); - if (minimize_button_offset <= 0) + if (minimize_button_offset <= 0) { return 0; + } if (base::i18n::IsRTL()) { cached_minimize_button_x_delta_ = minimize_button_offset;
diff --git a/chrome/browser/ui/views/frame/native_browser_frame_factory.cc b/chrome/browser/ui/views/frame/native_browser_frame_factory.cc index 212047eb..c85cc86 100644 --- a/chrome/browser/ui/views/frame/native_browser_frame_factory.cc +++ b/chrome/browser/ui/views/frame/native_browser_frame_factory.cc
@@ -17,8 +17,9 @@ NativeBrowserFrame* NativeBrowserFrameFactory::CreateNativeBrowserFrame( BrowserFrame* browser_frame, BrowserView* browser_view) { - if (!factory) + if (!factory) { factory = new NativeBrowserFrameFactory; + } return factory->Create(browser_frame, browser_view); }
diff --git a/chrome/browser/ui/views/frame/native_browser_frame_factory_aura.cc b/chrome/browser/ui/views/frame/native_browser_frame_factory_aura.cc index 8f7b609..f3b0523 100644 --- a/chrome/browser/ui/views/frame/native_browser_frame_factory_aura.cc +++ b/chrome/browser/ui/views/frame/native_browser_frame_factory_aura.cc
@@ -2,9 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/views/frame/native_browser_frame_factory.h" - #include "chrome/browser/ui/views/frame/desktop_browser_frame_aura.h" +#include "chrome/browser/ui/views/frame/native_browser_frame_factory.h" NativeBrowserFrame* NativeBrowserFrameFactory::Create( BrowserFrame* browser_frame,
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc index 82fd4ba..60896a20 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
@@ -91,8 +91,9 @@ ~CaptionButtonBackgroundImageSource() override = default; void Draw(gfx::Canvas* canvas) override { - if (bg_image_.isNull()) + if (bg_image_.isNull()) { return; + } gfx::ScopedCanvas scoped_canvas(canvas); @@ -232,8 +233,9 @@ } #if BUILDFLAG(IS_WIN) - if (browser_view()->AppUsesWindowControlsOverlay()) + if (browser_view()->AppUsesWindowControlsOverlay()) { UpdateCaptionButtonToolTipsForWindowControlsOverlay(); + } #endif } @@ -261,8 +263,9 @@ } void OpaqueBrowserFrameView::UpdateThrobber(bool running) { - if (window_icon_) + if (window_icon_) { window_icon_->Update(); + } } void OpaqueBrowserFrameView::WindowControlsOverlayEnabledChanged() { @@ -311,11 +314,13 @@ int OpaqueBrowserFrameView::NonClientHitTest(const gfx::Point& point) { int super_component = BrowserNonClientFrameView::NonClientHitTest(point); - if (super_component != HTNOWHERE) + if (super_component != HTNOWHERE) { return super_component; + } - if (!bounds().Contains(point)) + if (!bounds().Contains(point)) { return HTNOWHERE; + } int frame_component = frame()->client_view()->NonClientHitTest(point); @@ -325,15 +330,18 @@ gfx::Rect sysmenu_rect(GetIconBounds()); // In maximized mode we extend the rect to the screen corner to take // advantage of Fitts' Law. - if (IsFrameCondensed()) + if (IsFrameCondensed()) { sysmenu_rect.SetRect(0, 0, sysmenu_rect.right(), sysmenu_rect.bottom()); + } sysmenu_rect = GetMirroredRect(sysmenu_rect); - if (sysmenu_rect.Contains(point)) + if (sysmenu_rect.Contains(point)) { return HTSYSMENU; + } } - if (frame_component != HTNOWHERE) + if (frame_component != HTNOWHERE) { return frame_component; + } // BrowserView covers the frame view when Window Controls Overlay is enabled. // The native window that encompasses Web Contents gets the mouse events meant @@ -343,18 +351,23 @@ (HitTestCaptionButton(minimize_button_, point) || HitTestCaptionButton(maximize_button_, point) || HitTestCaptionButton(restore_button_, point) || - HitTestCaptionButton(close_button_, point))) + HitTestCaptionButton(close_button_, point))) { return HTCLIENT; + } // Then see if the point is within any of the window controls. - if (HitTestCaptionButton(close_button_, point)) + if (HitTestCaptionButton(close_button_, point)) { return HTCLOSE; - if (HitTestCaptionButton(restore_button_, point)) + } + if (HitTestCaptionButton(restore_button_, point)) { return HTMAXBUTTON; - if (HitTestCaptionButton(maximize_button_, point)) + } + if (HitTestCaptionButton(maximize_button_, point)) { return HTMAXBUTTON; - if (HitTestCaptionButton(minimize_button_, point)) + } + if (HitTestCaptionButton(minimize_button_, point)) { return HTMINBUTTON; + } if (browser_view()->IsWindowControlsOverlayEnabled() && caption_button_placeholder_container_ && @@ -391,8 +404,9 @@ SkPath* window_mask) { DCHECK(window_mask); - if (IsFrameCondensed()) + if (IsFrameCondensed()) { return; + } views::GetDefaultWindowMask(size, window_mask); } @@ -406,8 +420,9 @@ } void OpaqueBrowserFrameView::UpdateWindowIcon() { - if (window_icon_) + if (window_icon_) { window_icon_->SchedulePaint(); + } } void OpaqueBrowserFrameView::UpdateWindowTitle() { @@ -534,11 +549,11 @@ GetBoundsForTabStripRegion(GetTabstripMinimumSize()).bottom() - GetLayoutConstant(TABSTRIP_TOOLBAR_OVERLAP)); } - gfx::Rect web_app_toolbar_bounds = GetBoundsForWebAppFrameToolbar( - browser_view()->GetWebAppFrameToolbarPreferredSize()); - if (!web_app_toolbar_bounds.IsEmpty()) { - top_height = std::max(top_height, web_app_toolbar_bounds.bottom()); - } + gfx::Rect web_app_toolbar_bounds = GetBoundsForWebAppFrameToolbar( + browser_view()->GetWebAppFrameToolbarPreferredSize()); + if (!web_app_toolbar_bounds.IsEmpty()) { + top_height = std::max(top_height, web_app_toolbar_bounds.bottom()); + } return top_height; } @@ -592,8 +607,9 @@ // views::View: void OpaqueBrowserFrameView::OnPaint(gfx::Canvas* canvas) { TRACE_EVENT0("views.frame", "OpaqueBrowserFrameView::OnPaint"); - if (frame()->IsFullscreen()) + if (frame()->IsFullscreen()) { return; // Nothing is visible, so don't bother to paint. + } const bool active = ShouldPaintAsActive(); SkColor frame_color = GetFrameColor(BrowserFrameActiveState::kUseCurrent); @@ -623,10 +639,11 @@ } } - if (IsFrameCondensed()) + if (IsFrameCondensed()) { PaintMaximizedFrameBorder(canvas); - else + } else { PaintRestoredFrameBorder(canvas); + } // The window icon and title are painted by their respective views. /* TODO(pkasting): If this window is active, we should also draw a drop @@ -638,8 +655,9 @@ // Custom tab bar mode draws the toolbar as a unified part of the titlebar, so // it shouldn't have a client edge. - if (!browser_view()->toolbar()->custom_tab_bar()) + if (!browser_view()->toolbar()->custom_tab_bar()) { PaintClientEdge(canvas); + } } /////////////////////////////////////////////////////////////////////////////// @@ -748,8 +766,9 @@ const gfx::ImageSkia* bg_image = tp->GetImageSkiaNamed(IDR_THEME_WINDOW_CONTROL_BACKGROUND); - if (!bg_image) + if (!bg_image) { return gfx::ImageSkia(); + } const bool is_rtl = base::i18n::IsRTL(); const int bg_x_offset = CalculateCaptionButtonBackgroundXOffset(view_id); @@ -789,11 +808,13 @@ bool OpaqueBrowserFrameView::GetShowWindowTitleBar() const { // Do not show the custom title bar if the system title bar option is enabled. - if (!frame()->UseCustomFrame()) + if (!frame()->UseCustomFrame()) { return false; + } - if (frame()->IsFullscreen()) + if (frame()->IsFullscreen()) { return false; + } // Do not show caption buttons if the window manager is forcefully providing a // title bar (e.g., in Ubuntu Unity, if the window is maximized). @@ -835,8 +856,9 @@ layout_->CalculateClientAreaBounds(width(), height()); // In maximized mode, the only edge to draw is the top one, so we're done. - if (IsFrameCondensed()) + if (IsFrameCondensed()) { return; + } int y = client_bounds.y(); const gfx::Rect toolbar_bounds = browser_view()->toolbar()->bounds();
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view_browsertest.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view_browsertest.cc index eb75bf3..3ba4663 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view_browsertest.cc +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view_browsertest.cc
@@ -111,8 +111,9 @@ #if BUILDFLAG(IS_LINUX) DCHECK(is_opaque_browser_frame_view); #else - if (!is_opaque_browser_frame_view) + if (!is_opaque_browser_frame_view) { return false; + } #endif opaque_browser_frame_view_ = @@ -140,10 +141,11 @@ #endif ThemeService* theme_service = ThemeServiceFactory::GetForProfile(browser()->profile()); - if (theme_mode == ThemeMode::kSystem) + if (theme_mode == ThemeMode::kSystem) { theme_service->UseSystemTheme(); - else + } else { theme_service->UseDefaultTheme(); + } ASSERT_EQ(theme_service->UsingDefaultTheme(), theme_mode == ThemeMode::kDefault); } @@ -336,8 +338,9 @@ bool is_opaque_browser_frame_view = views::IsViewClass<OpaqueBrowserFrameView>(frame_view); - if (!is_opaque_browser_frame_view) + if (!is_opaque_browser_frame_view) { return false; + } opaque_browser_frame_view_ = static_cast<OpaqueBrowserFrameView*>(frame_view); @@ -371,8 +374,9 @@ IN_PROC_BROWSER_TEST_F(WebAppOpaqueBrowserFrameViewWindowControlsOverlayTest, CaptionButtonsTooltip) { - if (!InstallAndLaunchWebAppWithWindowControlsOverlay()) + if (!InstallAndLaunchWebAppWithWindowControlsOverlay()) { GTEST_SKIP() << "Skip test if it is not a OpaqueBrowserFrameView"; + } auto* minimize_button = static_cast<const views::Button*>( opaque_browser_frame_view_->GetViewByID(VIEW_ID_MINIMIZE_BUTTON)); @@ -412,8 +416,9 @@ IN_PROC_BROWSER_TEST_F(WebAppOpaqueBrowserFrameViewWindowControlsOverlayTest, CaptionButtonHitTest) { - if (!InstallAndLaunchWebAppWithWindowControlsOverlay()) + if (!InstallAndLaunchWebAppWithWindowControlsOverlay()) { GTEST_SKIP() << "Skip test if it is not a OpaqueBrowserFrameView"; + } opaque_browser_frame_view_->GetWidget()->LayoutRootViewIfNecessary();
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc index 5c82d24..031c1a5 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc
@@ -122,8 +122,9 @@ // Ensure that we can, at minimum, hold our window controls and a tab strip. int top_width = minimum_size_for_buttons_; - if (delegate_->IsTabStripVisible()) + if (delegate_->IsTabStripVisible()) { top_width += delegate_->GetTabstripMinimumSize().width(); + } min_size.set_width(std::max(min_size.width(), top_width)); // Account for the frame. @@ -154,14 +155,16 @@ int OpaqueBrowserFrameViewLayout::FrameTopBorderThickness(bool restored) const { int thickness = FrameBorderInsets(restored).top(); - if ((restored || !delegate_->IsFrameCondensed()) && thickness > 0) + if ((restored || !delegate_->IsFrameCondensed()) && thickness > 0) { thickness += NonClientExtraTopThickness(); + } return thickness; } int OpaqueBrowserFrameViewLayout::NonClientTopHeight(bool restored) const { - if (!delegate_->ShouldShowWindowTitle()) + if (!delegate_->ShouldShowWindowTitle()) { return FrameTopBorderThickness(restored); + } // Adding 2px of vertical padding puts at least 1 px of space on the top and // bottom of the element. @@ -230,8 +233,9 @@ views::NonClientFrameView::kFrameShadowThickness : 0; } - if (forced_window_caption_spacing_ >= 0) + if (forced_window_caption_spacing_ >= 0) { return forced_window_caption_spacing_; + } } return 0; } @@ -239,15 +243,17 @@ void OpaqueBrowserFrameViewLayout::SetWindowControlsOverlayEnabled( bool enabled, views::View* host) { - if (enabled == is_window_controls_overlay_enabled_) + if (enabled == is_window_controls_overlay_enabled_) { return; + } is_window_controls_overlay_enabled_ = enabled; for (const raw_ptr<views::Button>& button : {minimize_button_, maximize_button_, restore_button_, close_button_}) { - if (!button) + if (!button) { continue; + } if (is_window_controls_overlay_enabled_) { // Move button to top of hierarchy to ensure that it receives events @@ -317,8 +323,9 @@ } } - for (const auto& button_id : buttons_not_shown) + for (const auto& button_id : buttons_not_shown) { HideButton(button_id); + } } void OpaqueBrowserFrameViewLayout::LayoutTitleBar() { @@ -369,8 +376,9 @@ if (window_icon_) { SetViewVisibility(window_icon_, should_show_icon); - if (should_show_icon) + if (should_show_icon) { window_icon_->SetBoundsRect(window_icon_bounds_); + } } if (window_title_) { @@ -635,10 +643,11 @@ placed_trailing_button_ = false; LayoutWindowControls(); - if (is_window_controls_overlay_enabled_) + if (is_window_controls_overlay_enabled_) { LayoutTitleBarForWindowControlsOverlay(host); - else + } else { LayoutTitleBar(); + } // Any buttons/icon/title were laid out based on the frame border thickness, // but the tabstrip bounds need to be based on the non-client border thickness
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h index 707226e0..9f7a0c0 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h
@@ -19,7 +19,7 @@ namespace views { class Button; class Label; -} +} // namespace views // Calculates the position of the widgets in the opaque browser frame view. // @@ -136,14 +136,10 @@ // the other overrides. gfx::Size GetMinimumSize(const views::View* host) const override; - protected: // Whether a specific button should be inserted on the leading or trailing // side. - enum ButtonAlignment { - ALIGN_LEADING, - ALIGN_TRAILING - }; + enum ButtonAlignment { ALIGN_LEADING, ALIGN_TRAILING }; struct TopAreaPadding { int leading;
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h index 56865b3..b35c6e1 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h
@@ -16,7 +16,7 @@ namespace gfx { class Size; class Rect; -} +} // namespace gfx // Delegate interface to control layout decisions without having to depend on // Browser{,Frame,View}.
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc index 776b1f73..2475e56 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc
@@ -188,8 +188,9 @@ } int CaptionY() const { - return delegate_->IsMaximized() ? - 0 : views::NonClientFrameView::kFrameShadowThickness; + return delegate_->IsMaximized() + ? 0 + : views::NonClientFrameView::kFrameShadowThickness; } int CaptionLeft() const { @@ -226,8 +227,9 @@ maximized ? 0 : OpaqueBrowserFrameViewLayout::kFrameBorderThickness; int close_width = kCloseButtonWidth + (maximized ? kMaximizedExtraCloseWidth : 0); - int close_x = caption_buttons_on_left ? - frame_thickness : (kWindowWidth - frame_thickness - close_width); + int close_x = caption_buttons_on_left + ? frame_thickness + : (kWindowWidth - frame_thickness - close_width); EXPECT_EQ(close_x, close_button_->x()); EXPECT_EQ(CaptionY(), close_button_->y()); EXPECT_EQ(close_width, close_button_->width()); @@ -235,20 +237,23 @@ EXPECT_TRUE(close_button_->GetVisible()); views::ImageButton* visible_button = maximize_button_; views::ImageButton* hidden_button = restore_button_; - if (maximized) + if (maximized) { std::swap(visible_button, hidden_button); - if (caption_buttons_on_left) + } + if (caption_buttons_on_left) { EXPECT_EQ(minimize_button_->bounds().right(), visible_button->x()); - else + } else { EXPECT_EQ(close_button_->x(), visible_button->bounds().right()); + } EXPECT_EQ(close_button_->y(), visible_button->y()); EXPECT_EQ(kMaximizeButtonWidth, visible_button->width()); EXPECT_EQ(close_button_->height(), visible_button->height()); EXPECT_TRUE(visible_button->GetVisible()); - if (caption_buttons_on_left) + if (caption_buttons_on_left) { EXPECT_EQ(close_button_->bounds().right(), minimize_button_->x()); - else + } else { EXPECT_EQ(visible_button->x(), minimize_button_->bounds().right()); + } EXPECT_EQ(visible_button->y(), minimize_button_->y()); EXPECT_EQ(kMinimizeButtonWidth, minimize_button_->width()); EXPECT_EQ(visible_button->height(), minimize_button_->height());
diff --git a/chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc b/chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc index 961b599..dc6b96a 100644 --- a/chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc
@@ -455,10 +455,10 @@ CONTEXT_OMNIBOX_PRIMARY, views::style::STYLE_PRIMARY); location_icon_view_ = top_bar_container_view_->AddChildView( std::make_unique<LocationIconView>(font_list, this, this)); - // The PageInfo icon should be 8px from the left of the window and 4px from - // the right of the origin. - location_icon_view_->SetProperty(views::kMarginsKey, - gfx::Insets::TLBR(0, 8, 0, 4)); + // The PageInfo icon should be 8px from the left of the window and 4px from + // the right of the origin. + location_icon_view_->SetProperty(views::kMarginsKey, + gfx::Insets::TLBR(0, 8, 0, 4)); // For file URLs, we want to elide the tail, since the file name and/or query // part of the file URL can be made to look like an origin for spoofing. For @@ -499,8 +499,9 @@ constexpr ContentSettingImageModel::ImageType kContentSettingImageOrder[] = { ContentSettingImageModel::ImageType::MEDIASTREAM}; std::vector<std::unique_ptr<ContentSettingImageModel>> models; - for (auto type : kContentSettingImageOrder) + for (auto type : kContentSettingImageOrder) { models.push_back(ContentSettingImageModel::CreateForContentType(type)); + } // Creates the content setting views based on the models. for (auto& model : models) { @@ -746,13 +747,15 @@ int window_component = GetHTComponentForFrame( point, ResizeBorderInsets(), kResizeAreaCornerSize, kResizeAreaCornerSize, GetWidget()->widget_delegate()->CanResize()); - if (window_component != HTNOWHERE) + if (window_component != HTNOWHERE) { return window_component; + } // Allow interacting with the web contents. int frame_component = frame()->client_view()->NonClientHitTest(point); - if (frame_component != HTNOWHERE) + if (frame_component != HTNOWHERE) { return frame_component; + } return HTCAPTION; } @@ -793,8 +796,9 @@ color_provider->GetColor(kColorPipWindowTopBarBackground)); window_title_->SetEnabledColor( color_provider->GetColor(kColorPipWindowForeground)); - for (ContentSettingImageView* view : content_setting_views_) + for (ContentSettingImageView* view : content_setting_views_) { view->SetIconColor(color_provider->GetColor(kColorPipWindowForeground)); + } #if !BUILDFLAG(IS_LINUX) // On Linux the top bar background will be drawn in OnPaint(). @@ -973,8 +977,9 @@ bool PictureInPictureBrowserFrameView::ShowPageInfoDialog() { content::WebContents* contents = GetWebContents(); - if (!contents) + if (!contents) { return false; + } views::BubbleDialogDelegateView* bubble = PageInfoBubbleView::CreatePageInfoBubble( @@ -1002,21 +1007,21 @@ ui::ImageModel PictureInPictureBrowserFrameView::GetLocationIcon( LocationIconView::Delegate::IconFetchedCallback on_icon_fetched) const { - // If we're animating between colors, use the current color value. - if (current_foreground_color_.has_value()) { - return ui::ImageModel::FromVectorIcon( - location_bar_model_->GetVectorIcon(), *current_foreground_color_, - kWindowIconImageSize); - } - - ui::ColorId foreground_color_id = - (top_bar_color_animation_.GetCurrentValue() == 0) - ? kColorPipWindowForegroundInactive - : kColorPipWindowForeground; - + // If we're animating between colors, use the current color value. + if (current_foreground_color_.has_value()) { return ui::ImageModel::FromVectorIcon(location_bar_model_->GetVectorIcon(), - foreground_color_id, + *current_foreground_color_, kWindowIconImageSize); + } + + ui::ColorId foreground_color_id = + (top_bar_color_animation_.GetCurrentValue() == 0) + ? kColorPipWindowForegroundInactive + : kColorPipWindowForeground; + + return ui::ImageModel::FromVectorIcon(location_bar_model_->GetVectorIcon(), + foreground_color_id, + kWindowIconImageSize); } std::optional<ui::ColorId> @@ -1106,8 +1111,8 @@ for (ContentSettingImageView* view : content_setting_views_) { view->SetIconColor(color); } - current_foreground_color_ = color; - location_icon_view_->Update(/*suppress_animations=*/false); + current_foreground_color_ = color; + location_icon_view_->Update(/*suppress_animations=*/false); return; }
diff --git a/chrome/browser/ui/views/frame/system_menu_model_builder.cc b/chrome/browser/ui/views/frame/system_menu_model_builder.cc index 7703f34..609d282 100644 --- a/chrome/browser/ui/views/frame/system_menu_model_builder.cc +++ b/chrome/browser/ui/views/frame/system_menu_model_builder.cc
@@ -63,10 +63,11 @@ void SystemMenuModelBuilder::BuildMenu(ui::SimpleMenuModel* model) { // We add the menu items in reverse order so that insertion_index never needs // to change. - if (browser()->is_type_normal()) + if (browser()->is_type_normal()) { BuildSystemMenuForBrowserWindow(model); - else + } else { BuildSystemMenuForAppOrPopupWindow(model); + } } void SystemMenuModelBuilder::BuildSystemMenuForBrowserWindow( @@ -177,8 +178,9 @@ void SystemMenuModelBuilder::AppendMoveToDesksMenu(ui::SimpleMenuModel* model) { gfx::NativeWindow window = menu_delegate_.browser()->window()->GetNativeWindow(); - if (!chromeos::MoveToDesksMenuDelegate::ShouldShowMoveToDesksMenu(window)) + if (!chromeos::MoveToDesksMenuDelegate::ShouldShowMoveToDesksMenu(window)) { return; + } model->AddSeparator(ui::NORMAL_SEPARATOR); move_to_desks_model_ = std::make_unique<chromeos::MoveToDesksMenuModel>( @@ -205,15 +207,17 @@ } // Don't show the menu for incognito windows. - if (browser()->profile()->IsOffTheRecord()) + if (browser()->profile()->IsOffTheRecord()) { return; + } // To show the menu we need at least two logged in users. user_manager::UserManager* user_manager = user_manager::UserManager::Get(); const user_manager::UserList logged_in_users = user_manager->GetLRULoggedInUsers(); - if (logged_in_users.size() <= 1u) + if (logged_in_users.size() <= 1u) { return; + } // If this does not belong to a profile or there is no window, or the window // is not owned by anyone, we don't show the menu addition. @@ -222,8 +226,9 @@ multi_user_util::GetAccountIdFromProfile(browser()->profile()); aura::Window* window = browser()->window()->GetNativeWindow(); if (!account_id.is_valid() || !window || - !window_manager->GetWindowOwner(window).is_valid()) + !window_manager->GetWindowOwner(window).is_valid()) { return; + } model->AddSeparator(ui::NORMAL_SEPARATOR); int command_id = IDC_VISIT_DESKTOP_OF_LRU_USER_NEXT;
diff --git a/chrome/browser/ui/views/frame/system_menu_model_delegate.cc b/chrome/browser/ui/views/frame/system_menu_model_delegate.cc index 3e3e167..beab0d7 100644 --- a/chrome/browser/ui/views/frame/system_menu_model_delegate.cc +++ b/chrome/browser/ui/views/frame/system_menu_model_delegate.cc
@@ -28,9 +28,7 @@ SystemMenuModelDelegate::SystemMenuModelDelegate( ui::AcceleratorProvider* provider, Browser* browser) - : provider_(provider), - browser_(browser) { -} + : provider_(provider), browser_(browser) {} SystemMenuModelDelegate::~SystemMenuModelDelegate() = default;
diff --git a/chrome/browser/ui/views/frame/system_web_app_non_client_frame_view_browsertest.cc b/chrome/browser/ui/views/frame/system_web_app_non_client_frame_view_browsertest.cc index 71ba217..0c498ab 100644 --- a/chrome/browser/ui/views/frame/system_web_app_non_client_frame_view_browsertest.cc +++ b/chrome/browser/ui/views/frame/system_web_app_non_client_frame_view_browsertest.cc
@@ -2,10 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" - #include "ash/webui/system_apps/public/system_web_app_type.h" #include "chrome/browser/ash/system_web_apps/test_support/system_web_app_browsertest_base.h" +#include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/web_apps/frame_toolbar/web_app_frame_toolbar_view.h" #include "chrome/browser/ui/web_applications/test/web_app_browsertest_util.h"
diff --git a/chrome/browser/ui/views/frame/tab_strip_region_view_interactive_uitest.cc b/chrome/browser/ui/views/frame/tab_strip_region_view_interactive_uitest.cc index ebbbb3b..22b47e42 100644 --- a/chrome/browser/ui/views/frame/tab_strip_region_view_interactive_uitest.cc +++ b/chrome/browser/ui/views/frame/tab_strip_region_view_interactive_uitest.cc
@@ -32,9 +32,7 @@ const TabStripRegionViewBrowserBaseTest&) = delete; ~TabStripRegionViewBrowserBaseTest() override = default; - void SetUp() override { - InProcessBrowserTest::SetUp(); - } + void SetUp() override { InProcessBrowserTest::SetUp(); } void AppendTab() { chrome::AddTabAt(browser(), GURL(), -1, false); } @@ -95,8 +93,9 @@ const auto move_forward_over_tab = [&](Tab* tab) { // When skipping over tabs two right presses are needed if the close button // is showing. - if (tab->showing_close_button_for_testing()) + if (tab->showing_close_button_for_testing()) { press_right(); + } press_right(); }; @@ -139,8 +138,9 @@ const auto move_back_to_tab = [&](Tab* tab) { // When skipping back to the previous tab two left presses are needed if the // close button is showing. - if (tab->showing_close_button_for_testing()) + if (tab->showing_close_button_for_testing()) { press_left(); + } press_left(); }; @@ -198,14 +198,14 @@ EXPECT_TRUE(tab_0->HasFocus()); #if !BUILDFLAG(IS_WIN) - EXPECT_TRUE(tab_strip_region_view()->AcceleratorPressed( - tab_strip_region_view()->end_key())); - EXPECT_TRUE(tab_search_button()->HasFocus()); + EXPECT_TRUE(tab_strip_region_view()->AcceleratorPressed( + tab_strip_region_view()->end_key())); + EXPECT_TRUE(tab_search_button()->HasFocus()); #endif // !BUILDFLAG(IS_WIN) - EXPECT_TRUE(tab_strip_region_view()->AcceleratorPressed( - tab_strip_region_view()->home_key())); - EXPECT_TRUE(tab_0->HasFocus()); + EXPECT_TRUE(tab_strip_region_view()->AcceleratorPressed( + tab_strip_region_view()->home_key())); + EXPECT_TRUE(tab_0->HasFocus()); } }
diff --git a/chrome/browser/ui/views/frame/test_with_browser_view.cc b/chrome/browser/ui/views/frame/test_with_browser_view.cc index 8b8ead0..5d42073 100644 --- a/chrome/browser/ui/views/frame/test_with_browser_view.cc +++ b/chrome/browser/ui/views/frame/test_with_browser_view.cc
@@ -54,8 +54,7 @@ std::make_unique<ChromeTemplateURLServiceClient>( HistoryServiceFactory::GetForProfile( profile, ServiceAccessType::EXPLICIT_ACCESS)), - base::RepeatingClosure() - ); + base::RepeatingClosure()); } std::unique_ptr<KeyedService> CreateAutocompleteClassifier(
diff --git a/chrome/browser/ui/views/frame/toolbar_button_provider.h b/chrome/browser/ui/views/frame/toolbar_button_provider.h index 7eb7744..ea90b32e 100644 --- a/chrome/browser/ui/views/frame/toolbar_button_provider.h +++ b/chrome/browser/ui/views/frame/toolbar_button_provider.h
@@ -21,12 +21,12 @@ namespace gfx { class Rect; class Size; -} +} // namespace gfx namespace views { class AccessiblePaneView; class View; -} +} // namespace views // An interface implemented by a view contains and provides access to toolbar // buttons in a BrowserView.
diff --git a/chrome/browser/ui/views/frame/top_container_loading_bar.cc b/chrome/browser/ui/views/frame/top_container_loading_bar.cc index 08680cb..276fefb3 100644 --- a/chrome/browser/ui/views/frame/top_container_loading_bar.cc +++ b/chrome/browser/ui/views/frame/top_container_loading_bar.cc
@@ -55,15 +55,17 @@ } void LoadingBarView::FinishLoading() { - if (!is_shown_when_not_animating_) + if (!is_shown_when_not_animating_) { return; + } SetLoadingProgress(1.0); is_shown_when_not_animating_ = false; } void LoadingBarView::SetLoadingProgress(double loading_progress) { - if (loading_progress <= target_loading_progress_) + if (loading_progress <= target_loading_progress_) { return; + } start_loading_progress_ = GetDisplayedLoadingProgress(); target_loading_progress_ = loading_progress; animation_.SetCurrentValue(0.0);
diff --git a/chrome/browser/ui/views/frame/top_controls_slide_controller_chromeos.cc b/chrome/browser/ui/views/frame/top_controls_slide_controller_chromeos.cc index a6d279b..19dc669 100644 --- a/chrome/browser/ui/views/frame/top_controls_slide_controller_chromeos.cc +++ b/chrome/browser/ui/views/frame/top_controls_slide_controller_chromeos.cc
@@ -64,8 +64,9 @@ } content::NavigationEntry* entry = contents->GetController().GetVisibleEntry(); - if (!entry || entry->GetPageType() != content::PAGE_TYPE_NORMAL) + if (!entry || entry->GetPageType() != content::PAGE_TYPE_NORMAL) { return cc::BrowserControlsState::kShown; + } const GURL& url = entry->GetURL(); if (url.SchemeIs(content::kChromeUIScheme) || @@ -75,8 +76,9 @@ } Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext()); - if (profile && search::IsNTPOrRelatedURL(url, profile)) + if (profile && search::IsNTPOrRelatedURL(url, profile)) { return cc::BrowserControlsState::kShown; + } auto* helper = SecurityStateTabHelper::FromWebContents(contents); switch (helper->GetSecurityLevel()) { @@ -96,8 +98,9 @@ // Keep top-chrome visible while a permission bubble is visible. auto* permission_manager = permissions::PermissionRequestManager::FromWebContents(contents); - if (permission_manager && permission_manager->IsRequestInProgress()) + if (permission_manager && permission_manager->IsRequestInProgress()) { return cc::BrowserControlsState::kShown; + } return cc::BrowserControlsState::kBoth; } @@ -108,16 +111,19 @@ DCHECK(contents); content::RenderFrameHost* main_frame = contents->GetPrimaryMainFrame(); - if (!main_frame) + if (!main_frame) { return; + } auto* rvh = main_frame->GetRenderViewHost(); - if (!rvh) + if (!rvh) { return; + } auto* widget = rvh->GetWidget(); - if (!widget) + if (!widget) { return; + } widget->SynchronizeVisualProperties(); } @@ -145,8 +151,9 @@ SynchronizeVisualProperties(web_contents); auto* permission_manager = permissions::PermissionRequestManager::FromWebContents(web_contents); - if (permission_manager) + if (permission_manager) { permission_manager->AddObserver(this); + } } TopControlsSlideTabObserver(const TopControlsSlideTabObserver&) = delete; @@ -156,8 +163,9 @@ ~TopControlsSlideTabObserver() override { auto* permission_manager = permissions::PermissionRequestManager::FromWebContents(web_contents()); - if (permission_manager) + if (permission_manager) { permission_manager->RemoveObserver(this); + } } float shown_ratio() const { return shown_ratio_; } @@ -165,8 +173,9 @@ void SetShownRatio(float ratio, bool sliding_or_scrolling_in_progress) { shown_ratio_ = ratio; - if (!sliding_or_scrolling_in_progress) + if (!sliding_or_scrolling_in_progress) { UpdateDoBrowserControlsShrinkRendererSize(); + } } void UpdateDoBrowserControlsShrinkRendererSize() { @@ -216,8 +225,9 @@ // Even if a non-editable node gets focused, if top-chrome is fully shown, // we should also update the browser controls state constraints so that // top-chrome is able to be hidden again. - if (details->is_editable_node || shown_ratio_ == 1.f) + if (details->is_editable_node || shown_ratio_ == 1.f) { UpdateBrowserControlsStateShown(/*animate=*/true); + } } // PermissionRequestManager::Observer: @@ -302,8 +312,9 @@ browser_view_->browser()->tab_strip_model()->RemoveObserver(this); - if (observed_omni_box_) + if (observed_omni_box_) { observed_omni_box_->RemoveObserver(this); + } } bool TopControlsSlideControllerChromeOS::IsEnabled() const { @@ -319,8 +330,9 @@ float ratio) { DCHECK(contents); - if (pause_updates_) + if (pause_updates_) { return; + } // Make sure the value tracked per tab is always updated even when sliding is // disabled, so that we're always synchronized with the renderer. @@ -352,11 +364,13 @@ // Skip |shown_ratio_| update if the changes are not from the active // WebContents. - if (contents != browser_view_->GetActiveWebContents()) + if (contents != browser_view_->GetActiveWebContents()) { return; + } - if (shown_ratio_ == ratio) + if (shown_ratio_ == ratio) { return; + } shown_ratio_ = ratio; @@ -380,8 +394,9 @@ bool TopControlsSlideControllerChromeOS::DoBrowserControlsShrinkRendererSize( const content::WebContents* contents) const { - if (!IsEnabled()) + if (!IsEnabled()) { return false; + } auto* tab_observer = GetTabSlideObserverForWebContents(contents); return tab_observer && tab_observer->shrink_renderer_size(); @@ -389,8 +404,9 @@ void TopControlsSlideControllerChromeOS::SetTopControlsGestureScrollInProgress( bool in_progress) { - if (is_gesture_scrolling_in_progress_ == in_progress) + if (is_gesture_scrolling_in_progress_ == in_progress) { return; + } is_gesture_scrolling_in_progress_ = in_progress; @@ -402,8 +418,9 @@ pause_updates_ = false; } - if (!IsEnabled()) + if (!IsEnabled()) { return; + } if (is_gesture_scrolling_in_progress_) { // Once gesture scrolling starts, the renderer is expected to @@ -469,8 +486,9 @@ contents.contents, this)); } } else if (change.type() == TabStripModelChange::kRemoved) { - for (const auto& contents : change.GetRemove()->contents) + for (const auto& contents : change.GetRemove()->contents) { observed_tabs_.erase(contents.contents); + } } else if (change.type() == TabStripModelChange::kReplaced) { auto* replace = change.GetReplace(); observed_tabs_.erase(replace->old_contents); @@ -480,8 +498,9 @@ replace->new_contents, this)); } - if (tab_strip_model->empty() || !selection.active_tab_changed()) + if (tab_strip_model->empty() || !selection.active_tab_changed()) { return; + } content::WebContents* new_active_contents = selection.new_contents; DCHECK(observed_tabs_.count(new_active_contents)); @@ -502,11 +521,13 @@ void TopControlsSlideControllerChromeOS::OnDisplayMetricsChanged( const display::Display& display, uint32_t changed_metrics) { - if (!IsEnabled()) + if (!IsEnabled()) { return; + } - if (!is_sliding_in_progress_ || !is_gesture_scrolling_in_progress_) + if (!is_sliding_in_progress_ || !is_gesture_scrolling_in_progress_) { return; + } // If any of the below display metrics changes while both sliding and gesture // scrolling are in progress, we force-set the top controls to be fully shown, @@ -524,8 +545,9 @@ display::DisplayObserver::DISPLAY_METRIC_PRIMARY | display::DisplayObserver::DISPLAY_METRIC_MIRROR_STATE; - if ((changed_metrics & kCheckedMetrics) == 0) + if ((changed_metrics & kCheckedMetrics) == 0) { return; + } if (browser_view_->GetNativeWindow()->GetHost()->GetDisplayId() != display.id()) { @@ -533,8 +555,9 @@ } content::WebContents* active_contents = browser_view_->GetActiveWebContents(); - if (!active_contents) + if (!active_contents) { return; + } update_state_after_gesture_scrolling_ends_ = true; { @@ -571,8 +594,9 @@ bool animate) { web_contents = web_contents ? web_contents : browser_view_->GetActiveWebContents(); - if (!web_contents) + if (!web_contents) { return; + } // If the omnibox is focused, then the top controls should be constrained to // remain fully shown until the omnibox is blurred. @@ -604,14 +628,16 @@ } void TopControlsSlideControllerChromeOS::OnEnabledStateChanged(bool new_state) { - if (new_state == is_enabled_) + if (new_state == is_enabled_) { return; + } is_enabled_ = new_state; content::WebContents* active_contents = browser_view_->GetActiveWebContents(); - if (!active_contents) + if (!active_contents) { return; + } if (!new_state && shown_ratio_ < 1.f) { // We should never set the shown ratio immediately here, rather ask the @@ -832,12 +858,14 @@ DCHECK(!is_sliding_in_progress_); content::WebContents* active_contents = browser_view_->GetActiveWebContents(); - if (!active_contents) + if (!active_contents) { return; + } auto* tab_observer = GetTabSlideObserverForWebContents(active_contents); - if (tab_observer) + if (tab_observer) { tab_observer->UpdateDoBrowserControlsShrinkRendererSize(); + } } TopControlsSlideTabObserver*
diff --git a/chrome/browser/ui/views/frame/top_controls_slide_controller_chromeos_browsertest.cc b/chrome/browser/ui/views/frame/top_controls_slide_controller_chromeos_browsertest.cc index f449518..235cc77 100644 --- a/chrome/browser/ui/views/frame/top_controls_slide_controller_chromeos_browsertest.cc +++ b/chrome/browser/ui/views/frame/top_controls_slide_controller_chromeos_browsertest.cc
@@ -232,8 +232,9 @@ "ratio."; waiting_for_shown_ratio_ = ratio; - if (CheckRatio()) + if (CheckRatio()) { return; + } // Use kNestableTasksAllowed to make it possible to wait inside a posted // task. @@ -250,8 +251,9 @@ if (!controller_->IsTopControlsGestureScrollInProgress() && cc::MathUtil::IsWithinEpsilon(controller_->GetShownRatio(), waiting_for_shown_ratio_)) { - if (run_loop_) + if (run_loop_) { run_loop_->Quit(); + } return true; } @@ -287,14 +289,16 @@ void OnShownRatioChanged(float shown_ratio) override {} void OnGestureScrollInProgressChanged(bool in_progress) override { - if (in_progress == waited_for_in_progress_state_ && run_loop_) + if (in_progress == waited_for_in_progress_state_ && run_loop_) { std::move(run_loop_)->Quit(); + } } void WaitForInProgressState(bool in_progress_state) { if (controller_->IsTopControlsGestureScrollInProgress() == - in_progress_state) + in_progress_state) { return; + } waited_for_in_progress_state_ = in_progress_state; // Use kNestableTasksAllowed to make it possible to wait inside a posted @@ -908,8 +912,9 @@ // views::ViewObserver: void OnViewBoundsChanged(views::View* observed_view) override { view_bounds_changed_ = true; - if (run_loop_) + if (run_loop_) { run_loop_->Quit(); + } } private: @@ -1182,21 +1187,25 @@ // TestControllerObserver: void OnShownRatioChanged(float shown_ratio) override { seen_intermediate_ratios_ |= shown_ratio > 0.0 && shown_ratio < 1.f; - if (!seen_intermediate_ratios_) + if (!seen_intermediate_ratios_) { return; + } - if (on_intermediate_ratio_callback_) + if (on_intermediate_ratio_callback_) { std::move(on_intermediate_ratio_callback_).Run(); + } - if (run_loop_) + if (run_loop_) { run_loop_->Quit(); + } } void OnGestureScrollInProgressChanged(bool in_progress) override {} void Wait() { - if (seen_intermediate_ratios_) + if (seen_intermediate_ratios_) { return; + } run_loop_ = std::make_unique<base::RunLoop>( base::RunLoop::Type::kNestableTasksAllowed);
diff --git a/chrome/browser/ui/views/frame/web_contents_close_handler.cc b/chrome/browser/ui/views/frame/web_contents_close_handler.cc index ee0d8f5..bd8e81c 100644 --- a/chrome/browser/ui/views/frame/web_contents_close_handler.cc +++ b/chrome/browser/ui/views/frame/web_contents_close_handler.cc
@@ -8,26 +8,25 @@ WebContentsCloseHandler::WebContentsCloseHandler( WebContentsCloseHandlerDelegate* delegate) - : delegate_(delegate), - in_close_(false), - tab_changed_after_clone_(false) { -} + : delegate_(delegate), in_close_(false), tab_changed_after_clone_(false) {} WebContentsCloseHandler::~WebContentsCloseHandler() = default; void WebContentsCloseHandler::TabInserted() { // Tests may end up reviving a TabStrip that is empty. - if (!in_close_) + if (!in_close_) { return; + } in_close_ = false; delegate_->DestroyClonedLayer(); } void WebContentsCloseHandler::ActiveTabChanged() { - if (in_close_) + if (in_close_) { tab_changed_after_clone_ = true; - else + } else { delegate_->DestroyClonedLayer(); + } } void WebContentsCloseHandler::WillCloseAllTabs() {
diff --git a/chrome/browser/ui/views/frame/web_contents_close_handler_unittest.cc b/chrome/browser/ui/views/frame/web_contents_close_handler_unittest.cc index be2d2e1..fe7ade8 100644 --- a/chrome/browser/ui/views/frame/web_contents_close_handler_unittest.cc +++ b/chrome/browser/ui/views/frame/web_contents_close_handler_unittest.cc
@@ -24,9 +24,7 @@ ~MockWebContentsCloseHandlerDelegate() override = default; - void Clear() { - got_clone_ = got_destroy_ = false; - } + void Clear() { got_clone_ = got_destroy_ = false; } bool got_clone() const { return got_clone_; } void clear_got_clone() { got_clone_ = false; } @@ -57,9 +55,7 @@ ~WebContentsCloseHandlerTest() override = default; protected: - bool IsTimerRunning() const { - return close_handler_.timer_.IsRunning(); - } + bool IsTimerRunning() const { return close_handler_.timer_.IsRunning(); } MockWebContentsCloseHandlerDelegate close_handler_delegate_; WebContentsCloseHandler close_handler_;
diff --git a/chrome/browser/ui/views/frame/webui_tab_strip_container_view.cc b/chrome/browser/ui/views/frame/webui_tab_strip_container_view.cc index 352d0d6..2f91a52b 100644 --- a/chrome/browser/ui/views/frame/webui_tab_strip_container_view.cc +++ b/chrome/browser/ui/views/frame/webui_tab_strip_container_view.cc
@@ -171,10 +171,12 @@ // up nor down. std::optional<WebUITabStripDragDirection> DragDirectionFromSwipe( const ui::GestureEvent* event) { - if (event->details().swipe_down()) + if (event->details().swipe_down()) { return WebUITabStripDragDirection::kDown; - if (event->details().swipe_up()) + } + if (event->details().swipe_up()) { return WebUITabStripDragDirection::kUp; + } return std::nullopt; } @@ -242,27 +244,34 @@ // ui::EventHandler: void OnEvent(ui::Event* event) override { - if (!enabled_) + if (!enabled_) { return; - if (!event->IsLocatedEvent()) + } + if (!event->IsLocatedEvent()) { return; + } ui::LocatedEvent* located_event = event->AsLocatedEvent(); - if (!EventTypeCanCloseTabStrip(located_event->type())) + if (!EventTypeCanCloseTabStrip(located_event->type())) { return; + } const gfx::Point event_location_in_screen = located_event->target()->GetScreenLocation(*located_event); - if (!content_area_->GetBoundsInScreen().Contains(event_location_in_screen)) + if (!content_area_->GetBoundsInScreen().Contains( + event_location_in_screen)) { return; + } // The event may intersect both the content area's bounds and the // top container's bounds. In this case, the top container is // occluding the web content so we shouldn't close. This happens in // immersive mode while the top container is revealed. For more info see // https://crbug.com/1112028 - if (top_container_->GetBoundsInScreen().Contains(event_location_in_screen)) + if (top_container_->GetBoundsInScreen().Contains( + event_location_in_screen)) { return; + } located_event->StopPropagation(); close_callback_.Run(TabStripUICloseAction::kTapInTabContent); @@ -270,10 +279,12 @@ // views::ViewObserver: void OnViewFocused(views::View* observed_view) override { - if (observed_view != omnibox_) + if (observed_view != omnibox_) { return; - if (!enabled_) + } + if (!enabled_) { return; + } close_callback_.Run(TabStripUICloseAction::kOmniboxFocusedOrNewTabOpened); } @@ -291,23 +302,28 @@ } void OnViewAddedToWidget(views::View* observed_view) override { - if (observed_view != content_area_) + if (observed_view != content_area_) { return; - if (pretarget_handler_added_) + } + if (pretarget_handler_added_) { return; + } aura::Window* const native_view = content_area_->GetWidget()->GetNativeView(); - if (native_view) + if (native_view) { native_view->RemovePreTargetHandler(this); + } } void OnViewRemovedFromWidget(views::View* observed_view) override { - if (observed_view != content_area_) + if (observed_view != content_area_) { return; + } aura::Window* const native_view = content_area_->GetWidget()->GetNativeView(); - if (native_view) + if (native_view) { native_view->RemovePreTargetHandler(this); + } pretarget_handler_added_ = false; } @@ -534,8 +550,9 @@ } void WebUITabStripContainerView::OpenForTabDrag() { - if (GetVisible() && !animation_.IsClosing()) + if (GetVisible() && !animation_.IsClosing()) { return; + } RecordTabStripUIOpenHistogram(TabStripUIOpenAction::kTabDraggedIntoWindow); SetContainerTargetVisibility(true, WebUITabStripOpenCloseReason::kOther); @@ -565,8 +582,9 @@ } void WebUITabStripContainerView::FinishAnimationForTesting() { - if (!animation_.is_animating()) + if (!animation_.is_animating()) { return; + } const bool target = animation_.IsShowing(); animation_.SetCurrentValue(target ? 1.0 : 0.0); animation_.End(); @@ -585,8 +603,9 @@ bool WebUITabStripContainerView::CanStartDragToOpen( WebUITabStripDragDirection direction) const { // If we're already in a drag, then we can always continue dragging. - if (current_drag_height_) + if (current_drag_height_) { return true; + } return direction == (GetVisible() ? WebUITabStripDragDirection::kUp : WebUITabStripDragDirection::kDown); } @@ -604,14 +623,15 @@ current_drag_height_ = std::clamp(*current_drag_height_ + height_delta, 0.0f, - static_cast<float>(GetPreferredSize().height())); + static_cast<float>(GetPreferredSize().height())); PreferredSizeChanged(); } void WebUITabStripContainerView::EndDragToOpen( std::optional<WebUITabStripDragDirection> fling_direction) { - if (!current_drag_height_) + if (!current_drag_height_) { return; + } const int final_drag_height = *current_drag_height_; current_drag_height_ = std::nullopt; @@ -663,8 +683,9 @@ bool target_visible, WebUITabStripOpenCloseReason reason) { if (target_visible) { - if (web_view_->GetWebContents()->IsCrashed()) + if (web_view_->GetWebContents()->IsCrashed()) { InitializeWebView(); + } immersive_revealed_lock_ = browser_view_->immersive_mode_controller()->GetRevealedLock( @@ -728,8 +749,9 @@ const gfx::Animation* animation) { DCHECK_EQ(&animation_, animation); PreferredSizeChanged(); - if (animation_.GetCurrentValue() == 0.0) + if (animation_.GetCurrentValue() == 0.0) { SetVisible(false); + } } void WebUITabStripContainerView::AnimationProgressed( @@ -741,8 +763,9 @@ gfx::Point point, std::unique_ptr<ui::MenuModel> menu_model, base::RepeatingClosure on_menu_closed_callback) { - if (!web_view_->GetWebContents()) + if (!web_view_->GetWebContents()) { return; + } ConvertPointToScreen(this, &point); context_menu_model_ = std::move(menu_model); int menu_runner_flags = @@ -760,8 +783,9 @@ } void WebUITabStripContainerView::CloseContextMenu() { - if (!context_menu_runner_) + if (!context_menu_runner_) { return; + } context_menu_runner_->Cancel(); } @@ -777,9 +801,10 @@ } void WebUITabStripContainerView::HideEditDialogForGroup() { - if (editor_bubble_widget_) + if (editor_bubble_widget_) { editor_bubble_widget_->CloseWithReason( BrowserFrame::ClosedReason::kUnspecified); + } } TabStripUILayout WebUITabStripContainerView::GetLayout() { @@ -864,8 +889,9 @@ // replaceable with PreferredSizeChanged. InvalidateLayout(); - if (TabStripUI* tab_strip_ui = GetTabStripUI(web_view_->GetWebContents())) + if (TabStripUI* tab_strip_ui = GetTabStripUI(web_view_->GetWebContents())) { tab_strip_ui->LayoutChanged(); + } } } @@ -880,8 +906,9 @@ } void WebUITabStripContainerView::OnWidgetDestroying(views::Widget* widget) { - if (widget != editor_bubble_widget_) + if (widget != editor_bubble_widget_) { return; + } scoped_widget_observation_.Reset(); editor_bubble_widget_ = nullptr; @@ -892,8 +919,9 @@ // front-end so the correct HTML element receives focus. bool received_focus = AccessiblePaneView::SetPaneFocusAndFocusDefault(); TabStripUI* tab_strip_ui = GetTabStripUI(web_view_->GetWebContents()); - if (received_focus && tab_strip_ui) + if (received_focus && tab_strip_ui) { tab_strip_ui->ReceivedKeyboardFocus(); + } return received_focus; }
diff --git a/chrome/browser/ui/views/frame/webui_tab_strip_container_view_unittest.cc b/chrome/browser/ui/views/frame/webui_tab_strip_container_view_unittest.cc index 479f8bb54..8dc737e 100644 --- a/chrome/browser/ui/views/frame/webui_tab_strip_container_view_unittest.cc +++ b/chrome/browser/ui/views/frame/webui_tab_strip_container_view_unittest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/views/frame/webui_tab_strip_container_view.h" + #include <utility> #include "base/functional/bind.h"
diff --git a/chrome/browser/ui/views/frame/webui_tab_strip_field_trial.cc b/chrome/browser/ui/views/frame/webui_tab_strip_field_trial.cc index f530a440..185d80b59 100644 --- a/chrome/browser/ui/views/frame/webui_tab_strip_field_trial.cc +++ b/chrome/browser/ui/views/frame/webui_tab_strip_field_trial.cc
@@ -53,23 +53,26 @@ } WebUITabStripFieldTrial::WebUITabStripFieldTrial() { - if (!DeviceIsTabletModeCapable()) + if (!DeviceIsTabletModeCapable()) { return; + } base::FeatureList* const feature_list = base::FeatureList::GetInstance(); if (feature_list->IsFeatureOverriddenFromCommandLine( - features::kWebUITabStrip.name)) + features::kWebUITabStrip.name)) { return; + } const char* group_name; - if (!feature_list->IsFeatureOverridden(features::kWebUITabStrip.name)) + if (!feature_list->IsFeatureOverridden(features::kWebUITabStrip.name)) { group_name = "Default"; - else if (base::FeatureList::IsEnabled(features::kWebUITabStrip)) + } else if (base::FeatureList::IsEnabled(features::kWebUITabStrip)) { group_name = "Enabled"; - else + } else { group_name = "Disabled"; + } ChromeMetricsServiceAccessor::RegisterSyntheticFieldTrial( "WebUITabStripOnTablets", group_name);
diff --git a/chrome/browser/ui/views/frame/windows_caption_button.cc b/chrome/browser/ui/views/frame/windows_caption_button.cc index d8000f80..680c892 100644 --- a/chrome/browser/ui/views/frame/windows_caption_button.cc +++ b/chrome/browser/ui/views/frame/windows_caption_button.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/views/frame/windows_caption_button.h" + #include <memory> #include "base/numerics/safe_conversions.h" @@ -134,11 +135,12 @@ } SkAlpha alpha; - if (GetState() == STATE_PRESSED) + if (GetState() == STATE_PRESSED) { alpha = pressed_alpha; - else + } else { alpha = gfx::Tween::IntValueBetween(hover_animation().GetCurrentValue(), SK_AlphaTRANSPARENT, hovered_alpha); + } canvas->FillRect(bounds, SkColorSetA(base_color, alpha)); }
diff --git a/chrome/browser/ui/views/fullscreen_control/fullscreen_control_host.cc b/chrome/browser/ui/views/fullscreen_control/fullscreen_control_host.cc index 956a0b85..de9a017 100644 --- a/chrome/browser/ui/views/fullscreen_control/fullscreen_control_host.cc +++ b/chrome/browser/ui/views/fullscreen_control/fullscreen_control_host.cc
@@ -101,14 +101,15 @@ } void FullscreenControlHost::OnEvent(const ui::Event& event) { - if (event.IsKeyEvent()) + if (event.IsKeyEvent()) { OnKeyEvent(*event.AsKeyEvent()); - else if (event.IsMouseEvent()) + } else if (event.IsMouseEvent()) { OnMouseEvent(*event.AsMouseEvent()); - else if (event.IsTouchEvent()) + } else if (event.IsTouchEvent()) { OnTouchEvent(*event.AsTouchEvent()); - else if (event.IsGestureEvent()) + } else if (event.IsGestureEvent()) { OnGestureEvent(*event.AsGestureEvent()); + } } void FullscreenControlHost::OnKeyEvent(const ui::KeyEvent& event) { @@ -138,8 +139,9 @@ if (!exclusive_access_manager->fullscreen_controller() ->IsWindowFullscreenForTabOrPending()) { key_press_delay_timer_.Stop(); - if (IsVisible() && input_entry_method_ == InputEntryMethod::KEYBOARD) + if (IsVisible() && input_entry_method_ == InputEntryMethod::KEYBOARD) { Hide(true); + } return; } @@ -156,14 +158,16 @@ base::Unretained(this), InputEntryMethod::KEYBOARD)); } else if (event.type() == ui::EventType::kKeyReleased) { key_press_delay_timer_.Stop(); - if (IsVisible() && input_entry_method_ == InputEntryMethod::KEYBOARD) + if (IsVisible() && input_entry_method_ == InputEntryMethod::KEYBOARD) { Hide(true); + } } } void FullscreenControlHost::OnMouseEvent(const ui::MouseEvent& event) { - if (!IsExitUiEnabled()) + if (!IsExitUiEnabled()) { return; + } if (event.type() != ui::EventType::kMouseMoved || IsAnimating() || (input_entry_method_ != InputEntryMethod::NOT_ACTIVE && @@ -183,8 +187,9 @@ if (IsExitUiNeeded()) { if (IsVisible()) { - if (event.y() >= CalculateCursorBufferHeight()) + if (event.y() >= CalculateCursorBufferHeight()) { Hide(true); + } } else { DCHECK_EQ(InputEntryMethod::NOT_ACTIVE, input_entry_method_); if (!in_mouse_cooldown_mode_ && @@ -193,10 +198,11 @@ // F11 with the cursor on the top of the screen) then we suppress the // fullscreen control host and just put it in cooldown mode. const auto* bubble = browser_view_->exclusive_access_bubble(); - if (bubble && bubble->IsShowing()) + if (bubble && bubble->IsShowing()) { in_mouse_cooldown_mode_ = true; - else + } else { ShowForInputEntryMethod(InputEntryMethod::MOUSE); + } } else if (in_mouse_cooldown_mode_ && event.y() >= CalculateCursorBufferHeight()) { in_mouse_cooldown_mode_ = false; @@ -208,8 +214,9 @@ } void FullscreenControlHost::OnTouchEvent(const ui::TouchEvent& event) { - if (input_entry_method_ != InputEntryMethod::TOUCH) + if (input_entry_method_ != InputEntryMethod::TOUCH) { return; + } DCHECK(IsVisible()); @@ -220,8 +227,9 @@ } void FullscreenControlHost::OnGestureEvent(const ui::GestureEvent& event) { - if (!IsExitUiEnabled()) + if (!IsExitUiEnabled()) { return; + } if (event.type() == ui::EventType::kGestureLongPress && IsExitUiNeeded() && !IsVisible()) { @@ -230,8 +238,9 @@ } void FullscreenControlHost::Hide(bool animate) { - if (IsPopupCreated()) + if (IsPopupCreated()) { GetPopup()->Hide(animate); + } } bool FullscreenControlHost::IsVisible() const { @@ -263,8 +272,9 @@ InputEntryMethod input_entry_method) { input_entry_method_ = input_entry_method; auto* bubble = browser_view_->exclusive_access_bubble(); - if (bubble) + if (bubble) { bubble->HideImmediately(); + } GetPopup()->Show(browser_view_->GetClientAreaBoundsInScreen()); // Exit cooldown mode in case the exit UI is triggered by a different method. @@ -281,8 +291,9 @@ StartPopupTimeout(InputEntryMethod::TOUCH, kTouchPopupTimeout); } - if (on_popup_visibility_changed_) + if (on_popup_visibility_changed_) { std::move(on_popup_visibility_changed_).Run(); + } } void FullscreenControlHost::StartPopupTimeout( @@ -298,8 +309,9 @@ InputEntryMethod expected_input_method) { if (IsVisible() && !IsAnimating() && input_entry_method_ == expected_input_method) { - if (input_entry_method_ == InputEntryMethod::MOUSE) + if (input_entry_method_ == InputEntryMethod::MOUSE) { in_mouse_cooldown_mode_ = true; + } Hide(true); } }
diff --git a/chrome/browser/ui/views/fullscreen_mac_browsertest.cc b/chrome/browser/ui/views/fullscreen_mac_browsertest.cc index 4e424d1..a50c354 100644 --- a/chrome/browser/ui/views/fullscreen_mac_browsertest.cc +++ b/chrome/browser/ui/views/fullscreen_mac_browsertest.cc
@@ -2,11 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/fullscreen_util_mac.h" - #include "base/test/scoped_feature_list.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" +#include "chrome/browser/ui/fullscreen_util_mac.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/frame/top_container_view.h" #include "chrome/common/chrome_features.h"
diff --git a/chrome/browser/ui/views/global_media_controls/media_dialog_ui_for_test.cc b/chrome/browser/ui/views/global_media_controls/media_dialog_ui_for_test.cc index 4cdd557..d9e4edd 100644 --- a/chrome/browser/ui/views/global_media_controls/media_dialog_ui_for_test.cc +++ b/chrome/browser/ui/views/global_media_controls/media_dialog_ui_for_test.cc
@@ -86,32 +86,36 @@ void OnMediaDialogClosed() override {} [[nodiscard]] bool WaitForDialogOpened() { - if (MediaDialogView::IsShowing()) + if (MediaDialogView::IsShowing()) { return true; + } waiting_for_dialog_opened_ = true; Wait(); return MediaDialogView::IsShowing(); } [[nodiscard]] bool WaitForButtonShown() { - if (button_->GetVisible()) + if (button_->GetVisible()) { return true; + } waiting_for_button_shown_ = true; Wait(); return button_->GetVisible(); } [[nodiscard]] bool WaitForButtonHidden() { - if (!button_->GetVisible()) + if (!button_->GetVisible()) { return true; + } waiting_for_button_hidden_ = true; Wait(); return !button_->GetVisible(); } void WaitForDialogToContainText(const std::u16string& text) { - if (DialogContainsText(text)) + if (DialogContainsText(text)) { return; + } waiting_for_dialog_to_contain_text_ = true; expected_text_ = text; @@ -121,8 +125,9 @@ } void WaitForItemCount(int count) { - if (GetItemCount() == count) + if (GetItemCount() == count) { return; + } waiting_for_item_count_ = true; expected_item_count_ = count; @@ -132,8 +137,9 @@ } void WaitForPictureInPictureButtonVisibility(bool visible) { - if (CheckPictureInPictureButtonVisibility(visible)) + if (CheckPictureInPictureButtonVisibility(visible)) { return; + } waiting_for_pip_visibility_changed_ = true; expected_pip_visibility_ = visible; @@ -144,41 +150,48 @@ private: void CheckDialogForText() { - if (!waiting_for_dialog_to_contain_text_) + if (!waiting_for_dialog_to_contain_text_) { return; + } - if (!DialogContainsText(expected_text_)) + if (!DialogContainsText(expected_text_)) { return; + } waiting_for_dialog_to_contain_text_ = false; MaybeStopWaiting(); } void CheckItemCount() { - if (!waiting_for_item_count_) + if (!waiting_for_item_count_) { return; + } - if (GetItemCount() != expected_item_count_) + if (GetItemCount() != expected_item_count_) { return; + } waiting_for_item_count_ = false; MaybeStopWaiting(); } void CheckPictureInPictureButton() { - if (!waiting_for_pip_visibility_changed_) + if (!waiting_for_pip_visibility_changed_) { return; + } - if (!CheckPictureInPictureButtonVisibility(expected_pip_visibility_)) + if (!CheckPictureInPictureButtonVisibility(expected_pip_visibility_)) { return; + } waiting_for_pip_visibility_changed_ = false; MaybeStopWaiting(); } void MaybeStopWaiting() { - if (!run_loop_) + if (!run_loop_) { return; + } if (!waiting_for_dialog_opened_ && !waiting_for_button_shown_ && !waiting_for_dialog_to_contain_text_ && !waiting_for_item_count_ &&
diff --git a/chrome/browser/ui/views/global_media_controls/media_dialog_ui_for_test.h b/chrome/browser/ui/views/global_media_controls/media_dialog_ui_for_test.h index 35f65fc0..542e4a29 100644 --- a/chrome/browser/ui/views/global_media_controls/media_dialog_ui_for_test.h +++ b/chrome/browser/ui/views/global_media_controls/media_dialog_ui_for_test.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_GLOBAL_MEDIA_CONTROLS_MEDIA_DIALOG_UI_FOR_TEST_H_ #include <string> + #include "base/functional/callback.h" namespace global_media_controls {
diff --git a/chrome/browser/ui/views/global_media_controls/media_dialog_view.h b/chrome/browser/ui/views/global_media_controls/media_dialog_view.h index e0bcbcd..e6a941f 100644 --- a/chrome/browser/ui/views/global_media_controls/media_dialog_view.h +++ b/chrome/browser/ui/views/global_media_controls/media_dialog_view.h
@@ -51,7 +51,6 @@ public speech::SodaInstaller::Observer { METADATA_HEADER(MediaDialogView, views::BubbleDialogDelegateView) public: - MediaDialogView(const MediaDialogView&) = delete; MediaDialogView& operator=(const MediaDialogView&) = delete;
diff --git a/chrome/browser/ui/views/global_media_controls/media_dialog_view_interactive_browsertest.cc b/chrome/browser/ui/views/global_media_controls/media_dialog_view_interactive_browsertest.cc index 423076b..5fc8e9ed 100644 --- a/chrome/browser/ui/views/global_media_controls/media_dialog_view_interactive_browsertest.cc +++ b/chrome/browser/ui/views/global_media_controls/media_dialog_view_interactive_browsertest.cc
@@ -109,8 +109,9 @@ } media_router::LoggerImpl* GetLogger() override { - if (!logger_) + if (!logger_) { logger_ = std::make_unique<media_router::LoggerImpl>(); + } return logger_.get(); } @@ -232,8 +233,9 @@ } void WaitForEnterPictureInPicture() { - if (GetActiveWebContents()->HasPictureInPictureVideo()) + if (GetActiveWebContents()->HasPictureInPictureVideo()) { return; + } content::MediaStartStopObserver observer( GetActiveWebContents(), @@ -242,8 +244,9 @@ } void WaitForExitPictureInPicture() { - if (!GetActiveWebContents()->HasPictureInPictureVideo()) + if (!GetActiveWebContents()->HasPictureInPictureVideo()) { return; + } content::MediaStartStopObserver observer( GetActiveWebContents(), @@ -353,8 +356,9 @@ // Returns true if |target| exists in |base|'s forward focus chain bool ViewFollowsInFocusChain(views::View* base, views::View* target) { for (views::View* cur = base; cur; cur = cur->GetNextFocusableView()) { - if (cur == target) + if (cur == target) { return true; + } } return false; } @@ -994,18 +998,13 @@ feature_list_.InitWithFeaturesAndParameters( content::GetBasicBackForwardCacheFeatureForTesting({ #if BUILDFLAG(IS_ANDROID) - {features::kBackForwardCache, - { - { "process_binding_strength", - "NORMAL" } - }}, + {features::kBackForwardCache, + { + { "process_binding_strength", + "NORMAL" } + }}, #endif - { - features::kBackForwardCacheMediaSessionService, { - {} - } - } - }), + {features::kBackForwardCacheMediaSessionService, {{}}}}), content::GetDefaultDisabledBackForwardCacheFeaturesForTesting()); }
diff --git a/chrome/browser/ui/views/global_media_controls/media_item_ui_footer_view.cc b/chrome/browser/ui/views/global_media_controls/media_item_ui_footer_view.cc index 562e3d8..bbe2187 100644 --- a/chrome/browser/ui/views/global_media_controls/media_item_ui_footer_view.cc +++ b/chrome/browser/ui/views/global_media_controls/media_item_ui_footer_view.cc
@@ -81,8 +81,9 @@ } void DeviceEntryButton::UpdateImage() { - if (!icon_) + if (!icon_) { return; + } SetImageModel(views::Button::ButtonState::STATE_NORMAL, ui::ImageModel::FromVectorIcon(*icon_, foreground_color_, @@ -105,8 +106,9 @@ gfx::Insets::VH(0, ChromeLayoutProvider::Get()->GetDistanceMetric( views::DISTANCE_RELATED_BUTTON_HORIZONTAL))); - if (stop_casting_callback.is_null()) + if (stop_casting_callback.is_null()) { return; + } // |this| owns the DeviceEntryButton, so base::Unretained is safe here. AddChildView(std::make_unique<DeviceEntryButton>( @@ -163,8 +165,9 @@ } overflow_button_->SetVisible(false); - if (GetPreferredSize().width() > GetContentsBounds().width()) + if (GetPreferredSize().width() > GetContentsBounds().width()) { overflow_button_->SetVisible(true); + } LayoutSuperclass<views::View>(this); } @@ -185,13 +188,15 @@ } void MediaItemUIFooterView::OnDeviceSelected(int tag) { - if (delegate_) + if (delegate_) { delegate_->OnDeviceSelected(tag); + } } void MediaItemUIFooterView::OnOverflowButtonClicked() { - if (!delegate_) + if (!delegate_) { return; + } delegate_->OnDropdownButtonClicked(); overflow_button_->SetIcon(delegate_->IsDeviceSelectorExpanded()
diff --git a/chrome/browser/ui/views/global_media_controls/media_item_ui_footer_view_unittest.cc b/chrome/browser/ui/views/global_media_controls/media_item_ui_footer_view_unittest.cc index 35f6235..e15b088 100644 --- a/chrome/browser/ui/views/global_media_controls/media_item_ui_footer_view_unittest.cc +++ b/chrome/browser/ui/views/global_media_controls/media_item_ui_footer_view_unittest.cc
@@ -85,8 +85,9 @@ std::vector<views::View*> GetVisibleItems() { std::vector<views::View*> item; for (views::View* view : get_view()->children()) { - if (view->GetVisible() && view->width() > 0) + if (view->GetVisible() && view->width() > 0) { item.push_back(view); + } } return item; } @@ -146,8 +147,9 @@ EXPECT_CALL(*delegate(), OnDeviceSelected(0)); EXPECT_CALL(*delegate(), OnDeviceSelected(1)); - for (auto* view : visible_items) + for (auto* view : visible_items) { SimulateButtonClicked(view); + } } TEST_F(MediaItemUIFooterViewTest, OverflowButton) {
diff --git a/chrome/browser/ui/views/global_media_controls/media_item_ui_legacy_cast_footer_view.cc b/chrome/browser/ui/views/global_media_controls/media_item_ui_legacy_cast_footer_view.cc index b4a9fbbc..0fe77c8 100644 --- a/chrome/browser/ui/views/global_media_controls/media_item_ui_legacy_cast_footer_view.cc +++ b/chrome/browser/ui/views/global_media_controls/media_item_ui_legacy_cast_footer_view.cc
@@ -73,8 +73,9 @@ void MediaItemUILegacyCastFooterView::OnColorsChanged(SkColor foreground, SkColor background) { - if (foreground == foreground_color_ && background == background_color_) + if (foreground == foreground_color_ && background == background_color_) { return; + } foreground_color_ = foreground; background_color_ = background;
diff --git a/chrome/browser/ui/views/global_media_controls/media_toolbar_button_view.cc b/chrome/browser/ui/views/global_media_controls/media_toolbar_button_view.cc index dc70575..fe02da6 100644 --- a/chrome/browser/ui/views/global_media_controls/media_toolbar_button_view.cc +++ b/chrome/browser/ui/views/global_media_controls/media_toolbar_button_view.cc
@@ -111,8 +111,8 @@ // attempt to display an IPH at this point would have simply failed, so this // is not a behavioral change (see crbug.com/1291170). if (browser_->window() && captions::IsLiveCaptionFeatureSupported()) { - browser_->window()->MaybeShowFeaturePromo( - feature_engagement::kIPHLiveCaptionFeature); + browser_->window()->MaybeShowFeaturePromo( + feature_engagement::kIPHLiveCaptionFeature); } observers_.Notify(&MediaToolbarButtonObserver::OnMediaButtonEnabled);
diff --git a/chrome/browser/ui/views/hats/hats_next_web_dialog.cc b/chrome/browser/ui/views/hats/hats_next_web_dialog.cc index 8622cff..6da0f39e 100644 --- a/chrome/browser/ui/views/hats/hats_next_web_dialog.cc +++ b/chrome/browser/ui/views/hats/hats_next_web_dialog.cc
@@ -437,10 +437,12 @@ // Append any Product Specific Data to the query. This will be interpreted // by the wrapper website and provided to the HaTS backend service. base::Value::Dict dict; - for (const auto& field_value : product_specific_bits_data_) + for (const auto& field_value : product_specific_bits_data_) { dict.Set(field_value.first, field_value.second ? "true" : "false"); - for (const auto& field_value : product_specific_string_data_) + } + for (const auto& field_value : product_specific_string_data_) { dict.Set(field_value.first, field_value.second); + } std::string product_specific_data_json; base::JSONWriter::Write(dict, &product_specific_data_json);
diff --git a/chrome/browser/ui/views/hover_button_controller.cc b/chrome/browser/ui/views/hover_button_controller.cc index 504fbd9..999c003b 100644 --- a/chrome/browser/ui/views/hover_button_controller.cc +++ b/chrome/browser/ui/views/hover_button_controller.cc
@@ -31,8 +31,9 @@ bool HoverButtonController::OnMousePressed(const ui::MouseEvent& event) { DCHECK(notify_action() == views::ButtonController::NotifyAction::kOnRelease); - if (button()->GetRequestFocusOnPress()) + if (button()->GetRequestFocusOnPress()) { button()->RequestFocus(); + } if (callback()) { views::InkDrop::Get(button())->AnimateToState( views::InkDropState::ACTION_PENDING,
diff --git a/chrome/browser/ui/views/hung_renderer_view.cc b/chrome/browser/ui/views/hung_renderer_view.cc index 99e02bfb..6e33964 100644 --- a/chrome/browser/ui/views/hung_renderer_view.cc +++ b/chrome/browser/ui/views/hung_renderer_view.cc
@@ -87,8 +87,9 @@ widget_observation_.Observe(render_widget_host_.get()); // The world is different. - if (observer_) + if (observer_) { observer_->OnModelChanged(); + } } void HungPagesTableModel::Reset() { @@ -98,13 +99,15 @@ render_widget_host_ = nullptr; // Inform the table model observers that we cleared the model. - if (observer_) + if (observer_) { observer_->OnModelChanged(); + } } void HungPagesTableModel::RestartHangMonitorTimeout() { - if (hang_monitor_restarter_) + if (hang_monitor_restarter_) { hang_monitor_restarter_.Run(); + } } /////////////////////////////////////////////////////////////////////////////// @@ -161,13 +164,15 @@ // Clean up tab_observers_ and notify our observer. size_t index = 0; for (; index < tab_observers_.size(); ++index) { - if (tab_observers_[index].get() == tab) + if (tab_observers_[index].get() == tab) { break; + } } DCHECK(index < tab_observers_.size()); tab_observers_.erase(tab_observers_.begin() + index); - if (observer_) + if (observer_) { observer_->OnItemsRemoved(index, 1); + } // Notify the delegate. delegate_->TabDestroyed(); @@ -186,8 +191,9 @@ void HungPagesTableModel::WebContentsObserverImpl::RenderFrameHostChanged( content::RenderFrameHost* old_host, content::RenderFrameHost* new_host) { - if (!new_host->IsInPrimaryMainFrame()) + if (!new_host->IsInPrimaryMainFrame()) { return; + } // If |new_host| is currently responsive dismiss this dialog, otherwise // let the model know the tab has been updated. Updating the tab will @@ -234,11 +240,13 @@ WebContents* contents, content::RenderWidgetHost* render_widget_host, base::RepeatingClosure hang_monitor_restarter) { - if (logging::DialogsAreSuppressed()) + if (logging::DialogsAreSuppressed()) { return; + } - if (IsShowingForWebContents(contents)) + if (IsShowingForWebContents(contents)) { return; + } // Only show for WebContents in a browser window. if (!chrome::FindBrowserWithTab(contents)) { @@ -265,13 +273,15 @@ void HungRendererDialogView::Hide( WebContents* contents, content::RenderWidgetHost* render_widget_host) { - if (logging::DialogsAreSuppressed()) + if (logging::DialogsAreSuppressed()) { return; + } DialogHolder* dialog_holder = static_cast<DialogHolder*>( contents->GetUserData(&kDialogHolderUserDataKey)); - if (dialog_holder) + if (dialog_holder) { dialog_holder->dialog->EndDialog(render_widget_host); + } } // static @@ -344,8 +354,9 @@ WebContents* contents) { DialogHolder* dialog_holder = static_cast<DialogHolder*>( contents->GetUserData(&kDialogHolderUserDataKey)); - if (dialog_holder) + if (dialog_holder) { return dialog_holder->dialog; + } return nullptr; }
diff --git a/chrome/browser/ui/views/hung_renderer_view_browsertest.cc b/chrome/browser/ui/views/hung_renderer_view_browsertest.cc index 86b32a7..050eade8 100644 --- a/chrome/browser/ui/views/hung_renderer_view_browsertest.cc +++ b/chrome/browser/ui/views/hung_renderer_view_browsertest.cc
@@ -44,8 +44,9 @@ model->tab_observers_.push_back( std::make_unique<HungPagesTableModel::WebContentsObserverImpl>( model, web_contents)); - if (model->observer_) + if (model->observer_) { model->observer_->OnModelChanged(); + } dialog->UpdateLabels(); }
diff --git a/chrome/browser/ui/views/incognito_clear_browsing_data_dialog.cc b/chrome/browser/ui/views/incognito_clear_browsing_data_dialog.cc index 3ac5ebf..1efeddf 100644 --- a/chrome/browser/ui/views/incognito_clear_browsing_data_dialog.cc +++ b/chrome/browser/ui/views/incognito_clear_browsing_data_dialog.cc
@@ -59,10 +59,11 @@ AddChildView(std::move(image_view)); // Set bubble regarding to the type. - if (type == kHistoryDisclaimerBubble) + if (type == kHistoryDisclaimerBubble) { SetDialogForHistoryDisclaimerBubbleType(); - else + } else { SetDialogForDefaultBubbleType(); + } } void IncognitoClearBrowsingDataDialog::SetDialogForDefaultBubbleType() {
diff --git a/chrome/browser/ui/views/incognito_clear_browsing_data_dialog_coordinator.cc b/chrome/browser/ui/views/incognito_clear_browsing_data_dialog_coordinator.cc index caa20ec0..1cf20c62 100644 --- a/chrome/browser/ui/views/incognito_clear_browsing_data_dialog_coordinator.cc +++ b/chrome/browser/ui/views/incognito_clear_browsing_data_dialog_coordinator.cc
@@ -15,8 +15,9 @@ ~IncognitoClearBrowsingDataDialogCoordinator() { // Forcefully close the Widget if it hasn't been closed by the time the // browser is torn down to avoid dangling references. - if (IsShowing()) + if (IsShowing()) { bubble_tracker_.view()->GetWidget()->CloseNow(); + } } void IncognitoClearBrowsingDataDialogCoordinator::Show(
diff --git a/chrome/browser/ui/views/infobars/alternate_nav_infobar_view.cc b/chrome/browser/ui/views/infobars/alternate_nav_infobar_view.cc index c6e8c4c..903da95 100644 --- a/chrome/browser/ui/views/infobars/alternate_nav_infobar_view.cc +++ b/chrome/browser/ui/views/infobars/alternate_nav_infobar_view.cc
@@ -16,7 +16,6 @@ #include "ui/views/controls/label.h" #include "ui/views/controls/link.h" - // AlternateNavInfoBarDelegate ------------------------------------------------- // static @@ -25,7 +24,6 @@ return std::make_unique<AlternateNavInfoBarView>(std::move(delegate)); } - // AlternateNavInfoBarView ----------------------------------------------------- AlternateNavInfoBarView::AlternateNavInfoBarView( @@ -62,12 +60,14 @@ available_width - used_width); if (last_label_width < last_label->GetMinimumSize().width()) { last_label_width = 0; - if (!labels->empty()) + if (!labels->empty()) { labels->back()->SetText(labels->back()->GetText() + gfx::kEllipsisUTF16); + } } last_label->SetSize(gfx::Size(last_label_width, last_label->height())); - if (!labels->empty()) + if (!labels->empty()) { ElideLabels(labels, available_width - last_label_width); + } } void AlternateNavInfoBarView::Layout(PassKey) {
diff --git a/chrome/browser/ui/views/infobars/confirm_infobar.cc b/chrome/browser/ui/views/infobars/confirm_infobar.cc index 70a1e41d..929a33e 100644 --- a/chrome/browser/ui/views/infobars/confirm_infobar.cc +++ b/chrome/browser/ui/views/infobars/confirm_infobar.cc
@@ -125,17 +125,21 @@ } void ConfirmInfoBar::OkButtonPressed() { - if (!owner()) + if (!owner()) { return; // We're closing; don't call anything, it might access the owner. - if (GetDelegate()->Accept()) + } + if (GetDelegate()->Accept()) { RemoveSelf(); + } } void ConfirmInfoBar::CancelButtonPressed() { - if (!owner()) + if (!owner()) { return; // We're closing; don't call anything, it might access the owner. - if (GetDelegate()->Cancel()) + } + if (GetDelegate()->Cancel()) { RemoveSelf(); + } } ConfirmInfoBarDelegate* ConfirmInfoBar::GetDelegate() {
diff --git a/chrome/browser/ui/views/infobars/confirm_infobar.h b/chrome/browser/ui/views/infobars/confirm_infobar.h index 42dafdb..fea6e5b 100644 --- a/chrome/browser/ui/views/infobars/confirm_infobar.h +++ b/chrome/browser/ui/views/infobars/confirm_infobar.h
@@ -13,7 +13,7 @@ namespace views { class Label; class MdTextButton; -} +} // namespace views // An infobar that shows a message, up to two optional buttons, and an optional, // right-aligned link. This is commonly used to do things like:
diff --git a/chrome/browser/ui/views/infobars/infobar_view.cc b/chrome/browser/ui/views/infobars/infobar_view.cc index ac92b78c..f7a916a 100644 --- a/chrome/browser/ui/views/infobars/infobar_view.cc +++ b/chrome/browser/ui/views/infobars/infobar_view.cc
@@ -73,7 +73,6 @@ } // namespace - // InfoBarView ---------------------------------------------------------------- DEFINE_CLASS_ELEMENT_IDENTIFIER_VALUE(InfoBarView, kInfoBarElementId); @@ -152,8 +151,9 @@ } const int content_minimum_width = GetContentMinimumWidth(); - if (content_minimum_width > 0) + if (content_minimum_width > 0) { start_x += spacing + content_minimum_width; + } if (close_button_) { const gfx::Insets close_button_spacing = GetCloseButtonSpacing(); @@ -174,12 +174,14 @@ int width = 0; const int spacing = GetElementSpacing(); - if (icon_) + if (icon_) { width += spacing + icon_->width(); + } const int content_width = GetContentMinimumWidth(); - if (content_width) + if (content_width) { width += spacing + content_width; + } const int trailing_space = close_button_ ? GetCloseButtonSpacing().width() + close_button_->width() @@ -318,14 +320,16 @@ // false); in this case the second SetFocusManager() call will silently no-op. SetFocusManager(nullptr); - if (!animate) + if (!animate) { return; + } // Do not restore focus (and active state with it) if some other top-level // window became active. views::Widget* widget = GetWidget(); - if (!widget || widget->IsActive()) + if (!widget || widget->IsActive()) { FocusLastFocusedExternalView(); + } } void InfoBarView::PlatformSpecificOnHeightRecalculated() { @@ -336,8 +340,9 @@ // static void InfoBarView::AssignWidthsSorted(Views* views, int available_width) { - if (views->empty()) + if (views->empty()) { return; + } gfx::Size back_view_size(views->back()->GetPreferredSize()); back_view_size.set_width( std::min(back_view_size.width(), @@ -358,15 +363,18 @@ } void InfoBarView::LinkClicked(const ui::Event& event) { - if (!owner()) + if (!owner()) { return; // We're closing; don't call anything, it might access the owner. - if (delegate()->LinkClicked(ui::DispositionFromEventFlags(event.flags()))) + } + if (delegate()->LinkClicked(ui::DispositionFromEventFlags(event.flags()))) { RemoveSelf(); + } } void InfoBarView::CloseButtonPressed() { - if (!owner()) + if (!owner()) { return; // We're closing; don't call anything, it might access the owner. + } delegate()->InfoBarDismissed(); RemoveSelf(); }
diff --git a/chrome/browser/ui/views/intent_picker_bubble_view.cc b/chrome/browser/ui/views/intent_picker_bubble_view.cc index e2bf0fa8..19436f9d 100644 --- a/chrome/browser/ui/views/intent_picker_bubble_view.cc +++ b/chrome/browser/ui/views/intent_picker_bubble_view.cc
@@ -172,8 +172,9 @@ bool IsGroupFocusTraversable() const override { return false; } views::View* GetSelectedViewForGroup(int group) override { - if (group != kGridItemGroupId) + if (group != kGridItemGroupId) { return nullptr; + } Views siblings = parent()->children(); auto it = base::ranges::find_if(siblings, [](views::View* v) { @@ -184,8 +185,9 @@ } void OnFocus() override { Button::OnFocus(); - if (select_on_focus_) + if (select_on_focus_) { selected_callback_.Run(false); + } } bool HandleAccessibleAction(const ui::AXActionData& action_data) override { if (action_data.action == ax::mojom::Action::kFocus) { @@ -345,8 +347,9 @@ : LabelButton(std::move(callback), base::UTF8ToUTF16(std::string_view(display_name))) { SetHorizontalAlignment(gfx::ALIGN_LEFT); - if (!icon_model.IsEmpty()) + if (!icon_model.IsEmpty()) { SetImageModel(views::ImageButton::STATE_NORMAL, icon_model); + } auto* provider = ChromeLayoutProvider::Get(); SetBorder(views::CreateEmptyBorder(gfx::Insets::VH( provider->GetDistanceMetric(DISTANCE_CONTENT_LIST_VERTICAL_MULTI), @@ -520,8 +523,9 @@ anchor_view, bubble_type, std::move(app_info), std::move(intent_picker_cb), web_contents, show_stay_in_chrome, show_remember_selection, initiating_origin); - if (highlighted_button) + if (highlighted_button) { intent_picker_bubble_->SetHighlightedButton(highlighted_button); + } intent_picker_bubble_->Initialize(); views::Widget* widget = views::BubbleDialogDelegateView::CreateBubble(intent_picker_bubble_); @@ -550,8 +554,9 @@ // static void IntentPickerBubbleView::CloseCurrentBubble() { - if (intent_picker_bubble_) + if (intent_picker_bubble_) { intent_picker_bubble_->CloseBubble(); + } } void IntentPickerBubbleView::CloseBubble() { @@ -776,14 +781,16 @@ } void IntentPickerBubbleView::UpdateCheckboxState(size_t index) { - if (!remember_selection_checkbox_) + if (!remember_selection_checkbox_) { return; + } auto selected_app_type = app_info_[index].type; bool should_enable = selected_app_type != apps::PickerEntryType::kDevice; // Reset the checkbox state to the default unchecked if becomes disabled. - if (!should_enable) + if (!should_enable) { remember_selection_checkbox_->SetChecked(false); + } remember_selection_checkbox_->SetEnabled(should_enable); } @@ -791,8 +798,9 @@ // This is called asynchronously during OnWidgetDestroying, at which point // intent_picker_bubble_ may have already been cleared or set to something // else. - if (intent_picker_bubble_ == this) + if (intent_picker_bubble_ == this) { intent_picker_bubble_ = nullptr; + } } BEGIN_METADATA(IntentPickerBubbleView)
diff --git a/chrome/browser/ui/views/intent_picker_bubble_view_browsertest.cc b/chrome/browser/ui/views/intent_picker_bubble_view_browsertest.cc index ed50f67..76a61a6 100644 --- a/chrome/browser/ui/views/intent_picker_bubble_view_browsertest.cc +++ b/chrome/browser/ui/views/intent_picker_bubble_view_browsertest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/views/intent_picker_bubble_view.h" + #include <string> #include "base/functional/bind.h" @@ -17,7 +19,6 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/frame/toolbar_button_provider.h" -#include "chrome/browser/ui/views/intent_picker_bubble_view.h" #include "chrome/browser/ui/views/location_bar/intent_chip_button.h" #include "chrome/browser/ui/views/page_action/page_action_icon_view.h" #include "chrome/browser/ui/views/web_apps/web_app_link_capturing_test_utils.h"
diff --git a/chrome/browser/ui/views/intent_picker_bubble_view_unittest.cc b/chrome/browser/ui/views/intent_picker_bubble_view_unittest.cc index 56c27e6..c4be576 100644 --- a/chrome/browser/ui/views/intent_picker_bubble_view_unittest.cc +++ b/chrome/browser/ui/views/intent_picker_bubble_view_unittest.cc
@@ -56,9 +56,9 @@ using AppInfo = apps::IntentPickerAppInfo; using BubbleType = apps::IntentPickerBubbleType; -using content::WebContents; using content::OpenURLParams; using content::Referrer; +using content::WebContents; class IntentPickerBubbleViewTest : public TestWithBrowserView { public: @@ -73,8 +73,9 @@ void TearDown() override { // Make sure the bubble is destroyed before the profile to avoid a crash. - if (bubble_) + if (bubble_) { bubble_->GetWidget()->CloseNow(); + } TestWithBrowserView::TearDown(); } @@ -90,8 +91,9 @@ anchor_view_ = browser_view->toolbar()->AddChildView(std::make_unique<views::View>()); - if (use_icons) + if (use_icons) { FillAppListWithDummyIcons(); + } // We create |web_contents| since the Bubble UI has an Observer that // depends on this, otherwise it wouldn't work. @@ -131,8 +133,9 @@ ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); ui::ImageModel dummy_icon_model = ui::ImageModel::FromImage(rb.GetImageNamed(IDR_CLOSE)); - for (auto& app : app_info_) + for (auto& app : app_info_) { app.icon_model = dummy_icon_model; + } } views::Button* GetButtonAtIndex(size_t index) {
diff --git a/chrome/browser/ui/views/javascript_app_modal_event_blocker_aura.cc b/chrome/browser/ui/views/javascript_app_modal_event_blocker_aura.cc index 9589fe3d..bcacd74 100644 --- a/chrome/browser/ui/views/javascript_app_modal_event_blocker_aura.cc +++ b/chrome/browser/ui/views/javascript_app_modal_event_blocker_aura.cc
@@ -2,9 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/views/javascript_app_modal_event_blocker.h" - #include "chrome/browser/ui/views/frame/browser_view.h" +#include "chrome/browser/ui/views/javascript_app_modal_event_blocker.h" #include "ui/aura/env.h" #include "ui/aura/window.h" #include "ui/events/event.h" @@ -16,8 +15,9 @@ // Returns the toplevel window for the deepest transient ancestor of |window|. aura::Window* GetTopmostTransientParent(aura::Window* window) { aura::Window* topmost = wm::GetToplevelWindow(window); - while (topmost && wm::GetTransientParent(topmost)) + while (topmost && wm::GetTransientParent(topmost)) { topmost = wm::GetToplevelWindow(wm::GetTransientParent(topmost)); + } return topmost; } @@ -54,16 +54,18 @@ // clicking the modal window itself). aura::Window* window = GetTopmostTransientParent(static_cast<aura::Window*>(target)); - if (!window) + if (!window) { return false; + } BrowserView* browser_view = BrowserView::GetBrowserViewForNativeWindow(window); return browser_view && browser_view != browser_view_with_modal_dialog_; } void JavascriptAppModalEventBlockerAura::OnKeyEvent(ui::KeyEvent* event) { - if (ShouldStopPropagationTo(event->target())) + if (ShouldStopPropagationTo(event->target())) { event->StopPropagation(); + } } void JavascriptAppModalEventBlockerAura::OnMouseEvent(ui::MouseEvent* event) { @@ -77,8 +79,9 @@ } void JavascriptAppModalEventBlockerAura::OnScrollEvent(ui::ScrollEvent* event) { - if (ShouldStopPropagationTo(event->target())) + if (ShouldStopPropagationTo(event->target())) { event->StopPropagation(); + } } void JavascriptAppModalEventBlockerAura::OnTouchEvent(ui::TouchEvent* event) {
diff --git a/chrome/browser/ui/views/javascript_tab_modal_dialog_view_views.cc b/chrome/browser/ui/views/javascript_tab_modal_dialog_view_views.cc index e430d19..aa8fd007 100644 --- a/chrome/browser/ui/views/javascript_tab_modal_dialog_view_views.cc +++ b/chrome/browser/ui/views/javascript_tab_modal_dialog_view_views.cc
@@ -99,9 +99,10 @@ // Remove the force-close callback to indicate that we were closed as a // result of user action. dialog->dialog_force_closed_callback_ = base::OnceClosure(); - if (dialog->dialog_callback_) + if (dialog->dialog_callback_) { std::move(dialog->dialog_callback_) .Run(true, dialog->message_box_view_->GetInputText()); + } }, base::Unretained(this))); SetCancelCallback(base::BindOnce( @@ -109,8 +110,9 @@ // Remove the force-close callback to indicate that we were closed as a // result of user action. dialog->dialog_force_closed_callback_ = base::OnceClosure(); - if (dialog->dialog_callback_) + if (dialog->dialog_callback_) { std::move(dialog->dialog_callback_).Run(false, std::u16string()); + } }, base::Unretained(this))); RegisterWindowWillCloseCallback(base::BindOnce( @@ -120,15 +122,17 @@ dialog->scoped_tab_modal_ui_.reset(); // If the force-close callback still exists at this point we're not // closed due to a user action (would've been caught in Accept/Cancel). - if (dialog->dialog_force_closed_callback_) + if (dialog->dialog_force_closed_callback_) { std::move(dialog->dialog_force_closed_callback_).Run(); + } }, base::Unretained(this))); message_box_view_ = new views::MessageBoxView( message_text, /* detect_directionality = */ true); - if (dialog_type == content::JAVASCRIPT_DIALOG_TYPE_PROMPT) + if (dialog_type == content::JAVASCRIPT_DIALOG_TYPE_PROMPT) { message_box_view_->SetPromptField(default_prompt_text); + } SetLayoutManager(std::make_unique<views::FillLayout>()); AddChildView(message_box_view_.get());
diff --git a/chrome/browser/ui/views/javascript_tab_modal_dialog_view_views_browsertest.cc b/chrome/browser/ui/views/javascript_tab_modal_dialog_view_views_browsertest.cc index 590883b..0e6fb3b 100644 --- a/chrome/browser/ui/views/javascript_tab_modal_dialog_view_views_browsertest.cc +++ b/chrome/browser/ui/views/javascript_tab_modal_dialog_view_views_browsertest.cc
@@ -2,9 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/views/javascript_tab_modal_dialog_view_views.h" + #include "base/functional/bind.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/ui/views/javascript_tab_modal_dialog_view_views.h" #include "chrome/test/base/in_process_browser_test.h" #include "content/public/test/browser_test.h" #include "ui/views/accessibility/view_accessibility.h"
diff --git a/chrome/browser/ui/views/layout_provider_unittest.cc b/chrome/browser/ui/views/layout_provider_unittest.cc index 7d3bffd..093c1a9c 100644 --- a/chrome/browser/ui/views/layout_provider_unittest.cc +++ b/chrome/browser/ui/views/layout_provider_unittest.cc
@@ -463,8 +463,9 @@ for (; latin_height_threshold > 0; --latin_height_threshold) { if (kOmniboxDesiredSize - base_font_size != GetFontSizeDeltaBoundedByAvailableHeight(latin_height_threshold, - kOmniboxDesiredSize)) + kOmniboxDesiredSize)) { break; + } } // The threshold should always be the same, but the value depends on font // metrics. Check for some sane value. This should only change if Roboto
diff --git a/chrome/browser/ui/views/location_bar/content_setting_image_view.cc b/chrome/browser/ui/views/location_bar/content_setting_image_view.cc index 5059000..c3ce7b6 100644 --- a/chrome/browser/ui/views/location_bar/content_setting_image_view.cc +++ b/chrome/browser/ui/views/location_bar/content_setting_image_view.cc
@@ -112,8 +112,9 @@ std::optional<ViewID> view_id = GetViewID(content_setting_image_model_->image_type()); - if (view_id) + if (view_id) { SetID(*view_id); + } // Because this view is focusable, it should always have an accessible name, // even if an announcement is not to be made. @@ -224,11 +225,13 @@ } void ContentSettingImageView::SetIconColor(std::optional<SkColor> color) { - if (icon_color_ == color) + if (icon_color_ == color) { return; + } icon_color_ = color; - if (content_setting_image_model_->is_visible()) + if (content_setting_image_model_->is_visible()) { UpdateImage(); + } OnPropertyChanged(&icon_color_, views::kPropertyEffectsNone); } @@ -306,15 +309,17 @@ } views::Widget* ContentSettingImageView::GetBubbleWidgetForTesting() const { - if (!bubble_view_) + if (!bubble_view_) { return nullptr; + } return bubble_view_->GetWidget(); } void ContentSettingImageView::OnWidgetDestroying(views::Widget* widget) { - if (!bubble_view_ || bubble_view_->GetWidget() != widget) + if (!bubble_view_ || bubble_view_->GetWidget() != widget) { return; + } #if BUILDFLAG(IS_MAC) if (content_setting_image_model_->image_type() == @@ -335,8 +340,9 @@ void ContentSettingImageView::UpdateImage() { gfx::Image icon = content_setting_image_model_->GetIcon(icon_color_.value_or( color_utils::DeriveDefaultIconColor(GetForegroundColor()))); - if (!icon.IsEmpty()) + if (!icon.IsEmpty()) { SetImageModel(ui::ImageModel::FromImage(icon)); + } } void ContentSettingImageView::AnimationEnded(const gfx::Animation* animation) {
diff --git a/chrome/browser/ui/views/location_bar/cookie_controls/cookie_controls_bubble_view_impl.cc b/chrome/browser/ui/views/location_bar/cookie_controls/cookie_controls_bubble_view_impl.cc index 1e95a90..3c88012 100644 --- a/chrome/browser/ui/views/location_bar/cookie_controls/cookie_controls_bubble_view_impl.cc +++ b/chrome/browser/ui/views/location_bar/cookie_controls/cookie_controls_bubble_view_impl.cc
@@ -30,7 +30,7 @@ views::View* anchor_view, content::WebContents* web_contents, OnCloseBubbleCallback callback) - : LocationBarBubbleDelegateView(anchor_view, web_contents,true), + : LocationBarBubbleDelegateView(anchor_view, web_contents, true), callback_(std::move(callback)) { SetShowCloseButton(true); SetButtons(static_cast<int>(ui::mojom::DialogButton::kNone));
diff --git a/chrome/browser/ui/views/location_bar/custom_tab_bar_view.cc b/chrome/browser/ui/views/location_bar/custom_tab_bar_view.cc index d171b21..35ed66e 100644 --- a/chrome/browser/ui/views/location_bar/custom_tab_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/custom_tab_bar_view.cc
@@ -66,8 +66,9 @@ auto* tab_helper = security_interstitials::SecurityInterstitialTabHelper::FromWebContents( contents); - if (tab_helper && tab_helper->IsDisplayingInterstitial()) + if (tab_helper && tab_helper->IsDisplayingInterstitial()) { return tab_helper->ShouldDisplayURL(); + } return true; } @@ -162,15 +163,17 @@ } void Update(const std::u16string title, const std::u16string location) { - if (title_label_) + if (title_label_) { title_label_->SetText(title); + } location_label_->SetText(location); location_label_->SetVisible(!location.empty()); } void SetColors(SkColor background_color) { - if (title_label_) + if (title_label_) { title_label_->SetBackgroundColor(background_color); + } location_label_->SetBackgroundColor(background_color); } @@ -370,8 +373,9 @@ void CustomTabBarView::TabChangedAt(content::WebContents* contents, int index, TabChangeType change_type) { - if (delegate_->GetWebContents() == contents) + if (delegate_->GetWebContents() == contents) { UpdateContents(); + } } void CustomTabBarView::UpdateContents() { @@ -379,12 +383,14 @@ // be animating out and it looks messy. web_app::AppBrowserController* const app_controller = browser_->app_controller(); - if (app_controller && !app_controller->ShouldShowCustomTabBar()) + if (app_controller && !app_controller->ShouldShowCustomTabBar()) { return; + } content::WebContents* contents = delegate_->GetWebContents(); - if (!contents) + if (!contents) { return; + } content::NavigationEntry* entry = contents->GetController().GetVisibleEntry(); std::u16string title, location; @@ -516,8 +522,9 @@ // else), we should refocus the location bar. This lets the user tab into the // "You should reload this page" infobar rather than dumping them back out // into a stale webpage. - if (!reload_prompt) + if (!reload_prompt) { return; + } if (closed_reason != views::Widget::ClosedReason::kEscKeyPressed && closed_reason != views::Widget::ClosedReason::kCloseButtonClicked) { return;
diff --git a/chrome/browser/ui/views/location_bar/custom_tab_bar_view.h b/chrome/browser/ui/views/location_bar/custom_tab_bar_view.h index 1cd95d2..8c9a17d 100644 --- a/chrome/browser/ui/views/location_bar/custom_tab_bar_view.h +++ b/chrome/browser/ui/views/location_bar/custom_tab_bar_view.h
@@ -25,7 +25,7 @@ class FlexLayout; class MenuRunner; class ImageButton; -} +} // namespace views class BrowserView; class CustomTabBarTitleOriginView;
diff --git a/chrome/browser/ui/views/location_bar/custom_tab_bar_view_browsertest.cc b/chrome/browser/ui/views/location_bar/custom_tab_bar_view_browsertest.cc index c1f4f22f..c200749 100644 --- a/chrome/browser/ui/views/location_bar/custom_tab_bar_view_browsertest.cc +++ b/chrome/browser/ui/views/location_bar/custom_tab_bar_view_browsertest.cc
@@ -51,8 +51,9 @@ // Run a loop, blocking until a tab has the title |target_title|. void Wait() { - if (seen_target_title_) + if (seen_target_title_) { return; + } awaiter_.Run(); } @@ -65,8 +66,9 @@ contents->GetController().GetVisibleEntry(); std::u16string title = entry ? entry->GetTitle() : std::u16string(); - if (title != target_title_) + if (title != target_title_) { return; + } seen_target_title_ = true; awaiter_.Quit(); @@ -157,8 +159,9 @@ : content::WebContentsObserver(contents), install_interstitial_(true) {} void DidFinishNavigation(content::NavigationHandle* handle) override { - if (!install_interstitial_) + if (!install_interstitial_) { return; + } security_interstitials::SecurityInterstitialTabHelper:: AssociateBlockingPage(handle, @@ -185,7 +188,6 @@ ~CustomTabBarViewBrowserTest() override = default; protected: - void SetUpCommandLine(base::CommandLine* command_line) override { web_app::WebAppBrowserTestBase::SetUpCommandLine(command_line); // Browser will both run and display insecure content.
diff --git a/chrome/browser/ui/views/location_bar/find_bar_icon.cc b/chrome/browser/ui/views/location_bar/find_bar_icon.cc index 82da71b1..446bc7a 100644 --- a/chrome/browser/ui/views/location_bar/find_bar_icon.cc +++ b/chrome/browser/ui/views/location_bar/find_bar_icon.cc
@@ -33,8 +33,9 @@ void FindBarIcon::SetActive(bool activate, bool should_animate) { if (activate == (views::InkDrop::Get(this)->GetInkDrop()->GetTargetInkDropState() == - views::InkDropState::ACTIVATED)) + views::InkDropState::ACTIVATED)) { return; + } if (activate) { if (should_animate) { views::InkDrop::Get(this)->AnimateToState(views::InkDropState::ACTIVATED, @@ -61,8 +62,9 @@ void FindBarIcon::UpdateImpl() { // |browser_->window()| may return nullptr because Update() is called while // BrowserWindow is being constructed. - if (!browser_->window() || !browser_->HasFindBarController()) + if (!browser_->window() || !browser_->HasFindBarController()) { return; + } const bool was_visible = GetVisible(); SetVisible(browser_->GetFindBarController()->find_bar()->IsFindBarVisible());
diff --git a/chrome/browser/ui/views/location_bar/icon_label_bubble_view_unittest.cc b/chrome/browser/ui/views/location_bar/icon_label_bubble_view_unittest.cc index dbd740cd..309cd34 100644 --- a/chrome/browser/ui/views/location_bar/icon_label_bubble_view_unittest.cc +++ b/chrome/browser/ui/views/location_bar/icon_label_bubble_view_unittest.cc
@@ -79,10 +79,12 @@ State state() const { const double kOpenFraction = double{kOpenTimeMS} / kAnimationDurationMS; double state = static_cast<double>(value_) / kNumberOfSteps; - if (state < kOpenFraction) + if (state < kOpenFraction) { return GROWING; - if (state > (1.0 - kOpenFraction)) + } + if (state > (1.0 - kOpenFraction)) { return SHRINKING; + } return STEADY; } @@ -220,8 +222,9 @@ break; } case TestIconLabelBubbleView::State::STEADY: { - if (steady_reached_) + if (steady_reached_) { EXPECT_EQ(previous_width_, width()); + } EXPECT_EQ(initial_image_x_, GetImageContainerBounds().x()); EXPECT_LT(GetImageContainerBounds().right(), width()); EXPECT_TRUE(IsLabelVisible()); @@ -231,10 +234,12 @@ break; } case TestIconLabelBubbleView::State::SHRINKING: { - if (shrinking_reached_) + if (shrinking_reached_) { EXPECT_LE(width(), previous_width_); - if (minimum_size_reached_) + } + if (minimum_size_reached_) { EXPECT_EQ(previous_width_, width()); + } EXPECT_GE(GetImageContainerBounds().x(), 0); if (width() <= initial_image_x_ + kImageSize) { @@ -249,8 +254,9 @@ EXPECT_LT(GetLabelBounds().right(), width()); } shrinking_reached_ = true; - if (width() == kImageSize) + if (width() == kImageSize) { minimum_size_reached_ = true; + } break; } }
diff --git a/chrome/browser/ui/views/location_bar/intent_chip_button.cc b/chrome/browser/ui/views/location_bar/intent_chip_button.cc index 1f4d767..c2a2bdf 100644 --- a/chrome/browser/ui/views/location_bar/intent_chip_button.cc +++ b/chrome/browser/ui/views/location_bar/intent_chip_button.cc
@@ -78,8 +78,9 @@ } bool IntentChipButton::GetShowChip() const { - if (delegate_->ShouldHidePageActionIcons()) + if (delegate_->ShouldHidePageActionIcons()) { return false; + } auto* tab_helper = GetTabHelper(); return tab_helper && tab_helper->should_show_icon(); @@ -105,13 +106,15 @@ } IntentPickerTabHelper* IntentChipButton::GetTabHelper() const { - if (browser_->profile()->IsOffTheRecord()) + if (browser_->profile()->IsOffTheRecord()) { return nullptr; + } content::WebContents* web_contents = delegate_->GetWebContentsForPageActionIconView(); - if (!web_contents) + if (!web_contents) { return nullptr; + } return IntentPickerTabHelper::FromWebContents(web_contents); }
diff --git a/chrome/browser/ui/views/location_bar/intent_picker_view.cc b/chrome/browser/ui/views/location_bar/intent_picker_view.cc index 4582f6a3..a3053997 100644 --- a/chrome/browser/ui/views/location_bar/intent_picker_view.cc +++ b/chrome/browser/ui/views/location_bar/intent_picker_view.cc
@@ -42,8 +42,9 @@ SetVisible(GetShowIcon()); - if (was_visible && !GetVisible()) + if (was_visible && !GetVisible()) { IntentPickerBubbleView::CloseCurrentBubble(); + } } void IntentPickerView::OnExecuting( @@ -63,12 +64,14 @@ } bool IntentPickerView::GetShowIcon() const { - if (browser_->profile()->IsOffTheRecord()) + if (browser_->profile()->IsOffTheRecord()) { return false; + } content::WebContents* web_contents = GetWebContents(); - if (!web_contents) + if (!web_contents) { return false; + } IntentPickerTabHelper* tab_helper = IntentPickerTabHelper::FromWebContents(web_contents);
diff --git a/chrome/browser/ui/views/location_bar/location_bar_bubble_delegate_view.cc b/chrome/browser/ui/views/location_bar/location_bar_bubble_delegate_view.cc index 69de032..2887918 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_bubble_delegate_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_bubble_delegate_view.cc
@@ -149,8 +149,9 @@ void LocationBarBubbleDelegateView::OnVisibilityChanged( content::Visibility visibility) { - if (visibility == content::Visibility::HIDDEN) + if (visibility == content::Visibility::HIDDEN) { CloseBubble(); + } } void LocationBarBubbleDelegateView::WebContentsDestroyed() { @@ -182,8 +183,9 @@ void LocationBarBubbleDelegateView::AdjustForFullscreen( const gfx::Rect& screen_bounds) { - if (GetAnchorView()) + if (GetAnchorView()) { return; + } const int kBubblePaddingFromScreenEdge = 20; int horizontal_offset = width() / 2 + kBubblePaddingFromScreenEdge;
diff --git a/chrome/browser/ui/views/location_bar/location_bar_layout.cc b/chrome/browser/ui/views/location_bar/location_bar_layout.cc index e0be8eb..1bd87db7 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_layout.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_layout.cc
@@ -91,8 +91,9 @@ bool first_item = true; for (const auto& decoration : decorations_) { // Autocollapsing decorations are ignored in this pass. - if (first_item && !decoration->auto_collapse) + if (first_item && !decoration->auto_collapse) { *entry_width -= decoration->edge_item_padding; + } if (!first_item) { *entry_width -= decoration->intra_item_padding; } @@ -135,8 +136,9 @@ if (decoration->auto_collapse) { // Try preferred size, if it fails try minimum size, if it fails collapse. decoration->computed_width = decoration->view->GetPreferredSize().width(); - if (decoration->computed_width + padding > *available_width) + if (decoration->computed_width + padding > *available_width) { decoration->computed_width = decoration->view->GetMinimumSize().width(); + } if (decoration->computed_width + padding > *available_width) { decoration->computed_width = 0; decoration->view->SetVisible(false); @@ -154,10 +156,12 @@ decoration->view->SetBounds(x, decoration->y, decoration->computed_width, decoration->height); bounds->set_width(bounds->width() - padding - decoration->computed_width); - if (position_ == Position::kLeftEdge) + if (position_ == Position::kLeftEdge) { bounds->set_x(bounds->x() + padding + decoration->computed_width); + } } bounds->set_width(bounds->width() - item_edit_padding_); - if (position_ == Position::kLeftEdge) + if (position_ == Position::kLeftEdge) { bounds->set_x(bounds->x() + item_edit_padding_); + } }
diff --git a/chrome/browser/ui/views/location_bar/location_bar_util.cc b/chrome/browser/ui/views/location_bar/location_bar_util.cc index ebcad44..9f46d19 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_util.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_util.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/views/location_bar/location_bar_util.h" + #include "base/feature_list.h" #include "chrome/browser/ui/color/chrome_color_id.h" #include "components/omnibox/common/omnibox_features.h" @@ -18,7 +19,6 @@ void ConfigureInkDropForRefresh2023(views::View* const view, const ChromeColorIds hover_color_id, const ChromeColorIds ripple_color_id) { - views::InkDrop::Get(view)->SetMode(views::InkDropHost::InkDropMode::ON); views::InkDrop::Get(view)->SetLayerRegion(views::LayerRegion::kAbove);
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc index 3fec6d3..5325919 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -508,8 +508,9 @@ void LocationBarView::SetImePrefixAutocompletion(const std::u16string& text) { DCHECK(OmniboxPrefixRichAutocompletionEnabled() || text.empty()); - if (OmniboxPrefixRichAutocompletionEnabled()) + if (OmniboxPrefixRichAutocompletionEnabled()) { SetOmniboxAdjacentText(ime_prefix_autocomplete_view_, text); + } } std::u16string LocationBarView::GetImePrefixAutocompletion() const { @@ -528,8 +529,9 @@ void LocationBarView::SetOmniboxAdditionalText(const std::u16string& text) { DCHECK(OmniboxFieldTrial::IsRichAutocompletionEnabled() || text.empty()); - if (!OmniboxFieldTrial::RichAutocompletionShowAdditionalText()) + if (!OmniboxFieldTrial::RichAutocompletionShowAdditionalText()) { return; + } std::u16string adjusted_text; if (!text.empty()) { @@ -553,8 +555,9 @@ void LocationBarView::SetOmniboxAdjacentText(views::Label* label, const std::u16string& text) { - if (text == label->GetText()) + if (text == label->GetText()) { return; + } label->SetText(text); label->SetVisible(!text.empty()); OnPropertyChanged(&label, views::kPropertyEffectsLayout); @@ -633,8 +636,9 @@ gfx::Size LocationBarView::GetMinimumSize() const { const int height = GetLayoutConstant(LOCATION_BAR_HEIGHT); - if (!IsInitialized()) + if (!IsInitialized()) { return gfx::Size(0, height); + } const int inset_width = GetInsets().width(); const int padding = GetLayoutConstant(LOCATION_BAR_ELEMENT_PADDING); @@ -658,8 +662,9 @@ gfx::Size LocationBarView::CalculatePreferredSize( const views::SizeBounds& available_size) const { const int height = GetLayoutConstant(LOCATION_BAR_HEIGHT); - if (!IsInitialized()) + if (!IsInitialized()) { return gfx::Size(0, height); + } const int inset_width = GetInsets().width(); const int padding = GetLayoutConstant(LOCATION_BAR_ELEMENT_PADDING); @@ -677,17 +682,20 @@ // how much visual clutter users are experiencing on a regular basis, // especially as we add more indicators to the bar. int width = inset_width + omnibox_width; - if (leading_width > 0) + if (leading_width > 0) { width += leading_width + padding; - if (trailing_width > 0) + } + if (trailing_width > 0) { width += trailing_width + padding; + } return gfx::Size(width, height); } void LocationBarView::Layout(PassKey) { - if (!IsInitialized()) + if (!IsInitialized()) { return; + } selected_keyword_view_->SetVisible(false); @@ -758,8 +766,9 @@ icon_left += icon_keyword_indent; text_left += text_keyword_indent; } - if (show_overriding_permission_chip) + if (show_overriding_permission_chip) { text_left += text_overriding_permission_chip_indent; + } LocationBarLayout leading_decorations(LocationBarLayout::Position::kLeftEdge, text_left); @@ -940,8 +949,9 @@ }; // A helper to request from `reserve_width()` the width needed for `label`. const auto reserve_label_width = [&](views::Label* label) { - if (!label || !label->GetVisible()) + if (!label || !label->GetVisible()) { return 0; + } int text_width = gfx::GetStringWidth(label->GetText(), label->font_list()); return reserve_width(text_width + label->GetInsets().width()); @@ -960,8 +970,9 @@ // `view`. int current_x = location_bounds.x(); const auto position_view = [&](views::View* view, int width) { - if (!view || !view->GetVisible()) + if (!view || !view->GetVisible()) { return; + } view->SetBounds(current_x, location_bounds.y(), width, location_bounds.height()); current_x = view->bounds().right(); @@ -981,8 +992,9 @@ views::View::OnThemeChanged(); // ToolbarView::Init() adds |this| to the view hierarchy before initializing, // which will trigger an early theme change. - if (!IsInitialized()) + if (!IsInitialized()) { return; + } const SkColor icon_color = GetColorProvider()->GetColor(kColorOmniboxActionIcon); @@ -1005,8 +1017,9 @@ } void LocationBarView::Update(WebContents* contents) { - if (contents) + if (contents) { page_action_icon_controller_->UpdateWebContents(contents); + } RefreshContentSettingViews(); @@ -1015,13 +1028,15 @@ location_icon_view_->Update(/*suppress_animations=*/contents, omnibox_view_->model()->PopupIsOpen()); - if (intent_chip_) + if (intent_chip_) { intent_chip_->Update(); + } - if (contents) + if (contents) { omnibox_view_->OnTabChanged(contents); - else + } else { omnibox_view_->Update(); + } if (merchant_trust_chip_controller_) { merchant_trust_chip_controller_->UpdateWebContents(contents); @@ -1034,8 +1049,9 @@ if (contents && !IsEditingOrEmpty()) { auto* permission_request_manager = permissions::PermissionRequestManager::FromWebContents(contents); - if (permission_request_manager->CanRestorePrompt()) + if (permission_request_manager->CanRestorePrompt()) { permission_request_manager->RestorePrompt(); + } } } @@ -1114,13 +1130,15 @@ } bool LocationBarView::ShouldHidePageActionIcons() const { - if (!omnibox_view_) + if (!omnibox_view_) { return false; + } // When the user is typing in the omnibox, the page action icons are no longer // associated with the current omnibox text, so hide them. - if (omnibox_view_->model()->user_input_in_progress()) + if (omnibox_view_->model()->user_input_in_progress()) { return true; + } // Also hide them if the popup is open for any other reason, e.g. ZeroSuggest. // The page action icons are not relevant to the displayed suggestions. @@ -1171,11 +1189,13 @@ int LocationBarView::GetMinimumLeadingWidth() const { // If the keyword bubble is showing, the view can collapse completely. - if (ShouldShowKeywordBubble()) + if (ShouldShowKeywordBubble()) { return 0; + } - if (location_icon_view_->GetShowText()) + if (location_icon_view_->GetShowText()) { return location_icon_view_->GetMinimumLabelTextWidth(); + } return GetLayoutConstant(LOCATION_BAR_ELEMENT_PADDING) + location_icon_view_->GetMinimumSize().width(); @@ -1350,8 +1370,9 @@ // else), we should refocus the location bar. This lets the user tab into the // "You should reload this page" infobar rather than dumping them back out // into a stale webpage. - if (!reload_prompt) + if (!reload_prompt) { return; + } if (closed_reason != views::Widget::ClosedReason::kEscKeyPressed && closed_reason != views::Widget::ClosedReason::kCloseButtonClicked) { return; @@ -1385,12 +1406,14 @@ } bool LocationBarView::TestContentSettingImagePressed(size_t index) { - if (index >= content_setting_views_.size()) + if (index >= content_setting_views_.size()) { return false; + } views::View* image_view = content_setting_views_[index]; - if (!image_view->GetVisible()) + if (!image_view->GetVisible()) { return false; + } image_view->OnKeyPressed( ui::KeyEvent(ui::EventType::kKeyPressed, ui::VKEY_SPACE, ui::EF_NONE)); @@ -1414,8 +1437,9 @@ void LocationBarView::OnVisibleBoundsChanged() { OmniboxPopupView* popup = GetOmniboxPopupView(); - if (popup->IsOpen()) + if (popup->IsOpen()) { popup->UpdatePopupAppearance(); + } } void LocationBarView::OnFocus() { @@ -1425,8 +1449,9 @@ } void LocationBarView::OnPaintBorder(gfx::Canvas* canvas) { - if (!is_popup_mode_) + if (!is_popup_mode_) { return; // The border is painted by our Background. + } gfx::Rect bounds(GetContentsBounds()); const SkColor border_color = @@ -1539,8 +1564,9 @@ UpdateWithoutTabRestore(); // The focus ring may be hidden or shown when the popup visibility changes. - if (views::FocusRing::Get(this)) + if (views::FocusRing::Get(this)) { views::FocusRing::Get(this)->SchedulePaint(); + } // We indent the textfield when the popup is open to align to suggestions. omnibox_view_->NotifyAccessibilityEvent(ax::mojom::Event::kControlsChanged, @@ -1552,8 +1578,9 @@ } void LocationBarView::OnOmniboxFocused() { - if (views::FocusRing::Get(this)) + if (views::FocusRing::Get(this)) { views::FocusRing::Get(this)->SchedulePaint(); + } // Only show hover animation in unfocused steady state. Since focusing // the omnibox is intentional, snapping is better than transitioning here. @@ -1562,16 +1589,18 @@ } void LocationBarView::OnOmniboxBlurred() { - if (views::FocusRing::Get(this)) + if (views::FocusRing::Get(this)) { views::FocusRing::Get(this)->SchedulePaint(); + } RefreshBackground(); } void LocationBarView::OnOmniboxHovered(bool is_hovering) { if (is_hovering) { // Only show the hover animation when omnibox is in unfocused steady state. - if (!omnibox_view_->HasFocus()) + if (!omnibox_view_->HasFocus()) { hover_animation_.Show(); + } } else { hover_animation_.Hide(); } @@ -1582,14 +1611,17 @@ CONTEXT_OMNIBOX_PRIMARY, views::style::STYLE_PRIMARY); location_icon_view_->SetFontList(font_list); omnibox_view_->SetFontList(font_list); - if (OmniboxPrefixRichAutocompletionEnabled()) + if (OmniboxPrefixRichAutocompletionEnabled()) { ime_prefix_autocomplete_view_->SetFontList(font_list); + } ime_inline_autocomplete_view_->SetFontList(font_list); - if (OmniboxFieldTrial::RichAutocompletionShowAdditionalText()) + if (OmniboxFieldTrial::RichAutocompletionShowAdditionalText()) { omnibox_additional_text_view_->SetFontList(font_list); + } selected_keyword_view_->SetFontList(font_list); - for (ContentSettingImageView* view : content_setting_views_) + for (ContentSettingImageView* view : content_setting_views_) { view->SetFontList(font_list); + } page_action_icon_controller_->SetFontList(font_list); location_icon_view_->Update(/*suppress_animations=*/false, omnibox_view_->model()->PopupIsOpen()); @@ -1644,12 +1676,14 @@ bool LocationBarView::ShowPageInfoDialog() { WebContents* contents = GetWebContents(); - if (!contents) + if (!contents) { return false; + } content::NavigationEntry* entry = contents->GetController().GetVisibleEntry(); - if (entry->IsInitialEntry()) + if (entry->IsInitialEntry()) { return false; + } DCHECK(GetWidget());
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view_browsertest.cc b/chrome/browser/ui/views/location_bar/location_bar_view_browsertest.cc index c5ae285..c2d5dfb 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view_browsertest.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view_browsertest.cc
@@ -201,8 +201,9 @@ // so it's not possible to test the leading side). views::View* omnibox_view_views = GetLocationBarView()->omnibox_view(); for (views::View* child : GetLocationBarView()->children()) { - if (child != omnibox_view_views) + if (child != omnibox_view_views) { child->SetVisible(false); + } } views::test::RunScheduledLayout(GetLocationBarView()); @@ -226,8 +227,9 @@ views::Label* ime_inline_autocomplete_view = GetLocationBarView()->ime_inline_autocomplete_view_; for (views::View* child : GetLocationBarView()->children()) { - if (child != omnibox_view_views) + if (child != omnibox_view_views) { child->SetVisible(false); + } } omnibox_view_views->SetText(u"谷"); GetLocationBarView()->SetImeInlineAutocompletion(u"歌");
diff --git a/chrome/browser/ui/views/location_bar/location_icon_view.cc b/chrome/browser/ui/views/location_bar/location_icon_view.cc index 7fd6224..256fb1ac 100644 --- a/chrome/browser/ui/views/location_bar/location_icon_view.cc +++ b/chrome/browser/ui/views/location_bar/location_icon_view.cc
@@ -183,8 +183,9 @@ } bool LocationIconView::GetShowText() const { - if (delegate_->IsEditingOrEmpty()) + if (delegate_->IsEditingOrEmpty()) { return false; + } const auto* location_bar_model = delegate_->GetLocationBarModel(); const GURL& url = location_bar_model->GetURL(); @@ -203,15 +204,18 @@ } std::u16string LocationIconView::GetText() const { - if (delegate_->IsEditingOrEmpty()) + if (delegate_->IsEditingOrEmpty()) { return std::u16string(); + } if (delegate_->GetLocationBarModel()->GetURL().SchemeIs( - content::kChromeUIScheme)) + content::kChromeUIScheme)) { return l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME); + } - if (delegate_->GetLocationBarModel()->GetURL().SchemeIs(url::kFileScheme)) + if (delegate_->GetLocationBarModel()->GetURL().SchemeIs(url::kFileScheme)) { return l10n_util::GetStringUTF16(IDS_OMNIBOX_FILE); + } if (delegate_->GetLocationBarModel()->GetURL().SchemeIs( dom_distiller::kDomDistillerScheme)) { @@ -228,23 +232,26 @@ extensions::ui_util::GetEnabledExtensionNameForUrl( delegate_->GetLocationBarModel()->GetURL(), delegate_->GetWebContents()->GetBrowserContext()); - if (!extension_name.empty()) + if (!extension_name.empty()) { return extension_name; + } } return delegate_->GetLocationBarModel()->GetSecureDisplayText(); } bool LocationIconView::GetAnimateTextVisibilityChange() const { - if (delegate_->IsEditingOrEmpty()) + if (delegate_->IsEditingOrEmpty()) { return false; + } SecurityLevel level = GetSecurityLevel(); // Do not animate transitions from WARNING to DANGEROUS, since // the transition can look confusing/messy. if (level == SecurityLevel::DANGEROUS && - last_update_security_level_ == SecurityLevel::WARNING) + last_update_security_level_ == SecurityLevel::WARNING) { return false; + } return (level == SecurityLevel::DANGEROUS || level == SecurityLevel::WARNING); } @@ -252,12 +259,13 @@ SetLabel(GetText()); bool should_show = GetShowText(); - if (!GetAnimateTextVisibilityChange() || suppress_animations) + if (!GetAnimateTextVisibilityChange() || suppress_animations) { ResetSlideAnimation(should_show); - else if (should_show) + } else if (should_show) { AnimateIn(std::nullopt); - else + } else { AnimateOut(); + } } void LocationIconView::SetAccessibleProperties(bool is_initialization) { @@ -314,31 +322,31 @@ } #endif - if (!icon.IsEmpty()) + if (!icon.IsEmpty()) { SetImageModel(icon); + } } void LocationIconView::UpdateBackground() { - CHECK(GetColorProvider()); - const std::u16string& display_text = GetText(); - const bool is_text_dangerous = - display_text == l10n_util::GetStringUTF16(IDS_DANGEROUS_VERBOSE_STATE); + CHECK(GetColorProvider()); + const std::u16string& display_text = GetText(); + const bool is_text_dangerous = + display_text == l10n_util::GetStringUTF16(IDS_DANGEROUS_VERBOSE_STATE); - const ui::ColorId id = - delegate_->GetLocationIconBackgroundColorOverride().value_or( - is_text_dangerous ? kColorOmniboxSecurityChipDangerousBackground - : kColorOmniboxIconBackground); + const ui::ColorId id = + delegate_->GetLocationIconBackgroundColorOverride().value_or( + is_text_dangerous ? kColorOmniboxSecurityChipDangerousBackground + : kColorOmniboxIconBackground); - SetBackgroundColor(GetColorProvider()->GetColor(id)); + SetBackgroundColor(GetColorProvider()->GetColor(id)); - if (is_text_dangerous) { - ConfigureInkDropForRefresh2023(this, - kColorOmniboxSecurityChipInkDropHover, - kColorOmniboxSecurityChipInkDropRipple); - } else { - ConfigureInkDropForRefresh2023(this, kColorOmniboxIconHover, - kColorOmniboxIconPressed); - } + if (is_text_dangerous) { + ConfigureInkDropForRefresh2023(this, kColorOmniboxSecurityChipInkDropHover, + kColorOmniboxSecurityChipInkDropRipple); + } else { + ConfigureInkDropForRefresh2023(this, kColorOmniboxIconHover, + kColorOmniboxIconPressed); + } } void LocationIconView::OnIconFetched(const gfx::Image& image) { @@ -396,12 +404,14 @@ } bool LocationIconView::IsTriggerableEvent(const ui::Event& event) { - if (delegate_->IsEditingOrEmpty()) + if (delegate_->IsEditingOrEmpty()) { return false; + } if (event.IsMouseEvent()) { - if (event.AsMouseEvent()->IsOnlyMiddleMouseButton()) + if (event.AsMouseEvent()->IsOnlyMiddleMouseButton()) { return false; + } } else if (event.IsGestureEvent() && event.type() != ui::EventType::kGestureTap) { return false; @@ -415,23 +425,23 @@ // child views in the location bar have the same height. The visible height of // the bubble should be smaller, so use an empty border to shrink down the // content bounds so the background gets painted correctly. - gfx::Insets insets = GetLayoutInsets(LOCATION_BAR_PAGE_INFO_ICON_PADDING); - if (ShouldShowLabel()) { - SecurityLevel level = GetSecurityLevel(); - if (level == security_state::DANGEROUS) { - // Extra space between the left edge and label. - const int kLeftHorizontalPadding = 6; - // Extra space between the label and right edge. - const int kRightHorizontalPadding = 10; - insets.set_left(kLeftHorizontalPadding); - insets.set_right(kRightHorizontalPadding); - } else { - // An extra space between chip's label and right edge. - const int kExtraRightPadding = 4; - insets.set_right(insets.right() + kExtraRightPadding); - } + gfx::Insets insets = GetLayoutInsets(LOCATION_BAR_PAGE_INFO_ICON_PADDING); + if (ShouldShowLabel()) { + SecurityLevel level = GetSecurityLevel(); + if (level == security_state::DANGEROUS) { + // Extra space between the left edge and label. + const int kLeftHorizontalPadding = 6; + // Extra space between the label and right edge. + const int kRightHorizontalPadding = 10; + insets.set_left(kLeftHorizontalPadding); + insets.set_right(kRightHorizontalPadding); + } else { + // An extra space between chip's label and right edge. + const int kExtraRightPadding = 4; + insets.set_right(insets.right() + kExtraRightPadding); } - SetBorder(views::CreateEmptyBorder(insets)); + } + SetBorder(views::CreateEmptyBorder(insets)); } gfx::Size LocationIconView::GetMinimumSizeForPreferredSize(
diff --git a/chrome/browser/ui/views/location_bar/location_icon_view_interactive_uitest.cc b/chrome/browser/ui/views/location_bar/location_icon_view_interactive_uitest.cc index d0df0737..8753aa8 100644 --- a/chrome/browser/ui/views/location_bar/location_icon_view_interactive_uitest.cc +++ b/chrome/browser/ui/views/location_bar/location_icon_view_interactive_uitest.cc
@@ -2,11 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/views/location_bar/location_icon_view.h" - #include "build/build_config.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/location_bar/location_bar_view.h" +#include "chrome/browser/ui/views/location_bar/location_icon_view.h" #include "chrome/browser/ui/views/page_action/page_action_icon_view.h" #include "chrome/browser/ui/views/page_info/page_info_bubble_view.h" #include "chrome/browser/ui/views/toolbar/toolbar_view.h" @@ -82,8 +81,8 @@ translate::TranslateErrors::NONE, true); PageActionIconView* icon_view = - browser_view->toolbar_button_provider() - ->GetPageActionIconView(PageActionIconType::kTranslate); + browser_view->toolbar_button_provider()->GetPageActionIconView( + PageActionIconType::kTranslate); ASSERT_TRUE(icon_view); EXPECT_TRUE(icon_view->GetVisible());
diff --git a/chrome/browser/ui/views/location_bar/location_icon_view_unittest.cc b/chrome/browser/ui/views/location_bar/location_icon_view_unittest.cc index df3796c..40bf9b1 100644 --- a/chrome/browser/ui/views/location_bar/location_icon_view_unittest.cc +++ b/chrome/browser/ui/views/location_bar/location_icon_view_unittest.cc
@@ -99,8 +99,9 @@ std::u16string secure_display_text = std::u16string(); if (level == security_state::SecurityLevel::DANGEROUS || - level == security_state::SecurityLevel::WARNING) + level == security_state::SecurityLevel::WARNING) { secure_display_text = u"Insecure"; + } location_bar_model()->set_secure_display_text(secure_display_text); }
diff --git a/chrome/browser/ui/views/location_bar/merchant_trust_chip_button_interactive_uitest.cc b/chrome/browser/ui/views/location_bar/merchant_trust_chip_button_interactive_uitest.cc index 114f4da..4927618 100644 --- a/chrome/browser/ui/views/location_bar/merchant_trust_chip_button_interactive_uitest.cc +++ b/chrome/browser/ui/views/location_bar/merchant_trust_chip_button_interactive_uitest.cc
@@ -259,9 +259,7 @@ WaitForShow(PageInfoMerchantTrustContentView::kElementIdForTesting), CheckView( PageInfoMerchantTrustContentView::kViewReviewsId, - [](RichHoverButton* button) { - return button->GetTitleViewForTesting()->GetText(); - }, + [](RichHoverButton* button) { return button->GetTitleText(); }, u"View all 23 reviews"), // Press the "View all reviews" button. PressButton(PageInfoMerchantTrustContentView::kViewReviewsId),
diff --git a/chrome/browser/ui/views/location_bar/omnibox_chip_button.cc b/chrome/browser/ui/views/location_bar/omnibox_chip_button.cc index 28babd89..6dc55d5 100644 --- a/chrome/browser/ui/views/location_bar/omnibox_chip_button.cc +++ b/chrome/browser/ui/views/location_bar/omnibox_chip_button.cc
@@ -123,8 +123,9 @@ } void OmniboxChipButton::AnimationEnded(const gfx::Animation* animation) { - if (animation != animation_.get()) + if (animation != animation_.get()) { return; + } OnAnimationValueMaybeChanged(); @@ -202,10 +203,10 @@ } int OmniboxChipButton::GetIconSize() const { - // Mimic the sizing for other trailing icons. - return GetLayoutConstant((theme_ == OmniboxChipTheme::kIconStyle) - ? LOCATION_BAR_TRAILING_ICON_SIZE - : LOCATION_BAR_CHIP_ICON_SIZE); + // Mimic the sizing for other trailing icons. + return GetLayoutConstant((theme_ == OmniboxChipTheme::kIconStyle) + ? LOCATION_BAR_TRAILING_ICON_SIZE + : LOCATION_BAR_CHIP_ICON_SIZE); } void OmniboxChipButton::AddObserver(Observer* observer) {
diff --git a/chrome/browser/ui/views/location_bar/selected_keyword_view.cc b/chrome/browser/ui/views/location_bar/selected_keyword_view.cc index 061a291c..171ffe4 100644 --- a/chrome/browser/ui/views/location_bar/selected_keyword_view.cc +++ b/chrome/browser/ui/views/location_bar/selected_keyword_view.cc
@@ -134,13 +134,15 @@ void SelectedKeywordView::OnThemeChanged() { IconLabelBubbleView::OnThemeChanged(); - if (!using_custom_image_) + if (!using_custom_image_) { SetCustomImage(gfx::Image()); + } } void SelectedKeywordView::SetKeyword(const std::u16string& keyword) { - if (keyword_ == keyword) + if (keyword_ == keyword) { return; + } keyword_ = keyword; OnPropertyChanged(&keyword_, views::kPropertyEffectsNone);
diff --git a/chrome/browser/ui/views/location_bar/selected_keyword_view_interactive_uitest.cc b/chrome/browser/ui/views/location_bar/selected_keyword_view_interactive_uitest.cc index 1632884..7a0bfb9 100644 --- a/chrome/browser/ui/views/location_bar/selected_keyword_view_interactive_uitest.cc +++ b/chrome/browser/ui/views/location_bar/selected_keyword_view_interactive_uitest.cc
@@ -2,12 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/views/location_bar/selected_keyword_view.h" - #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/location_bar/location_bar_view.h" +#include "chrome/browser/ui/views/location_bar/selected_keyword_view.h" #include "chrome/browser/ui/views/toolbar/toolbar_view.h" #include "chrome/test/base/interactive_test_utils.h" #include "chrome/test/base/ui_test_utils.h"
diff --git a/chrome/browser/ui/views/location_bar/star_view.cc b/chrome/browser/ui/views/location_bar/star_view.cc index 201b544..c25715f 100644 --- a/chrome/browser/ui/views/location_bar/star_view.cc +++ b/chrome/browser/ui/views/location_bar/star_view.cc
@@ -107,8 +107,8 @@ } const gfx::VectorIcon& StarView::GetVectorIcon() const { - return GetActive() ? omnibox::kStarActiveChromeRefreshIcon - : omnibox::kStarChromeRefreshIcon; + return GetActive() ? omnibox::kStarActiveChromeRefreshIcon + : omnibox::kStarChromeRefreshIcon; } std::u16string StarView::GetTextForTooltipAndAccessibleName() const {
diff --git a/chrome/browser/ui/views/location_bar/star_view_interactive_uitest.cc b/chrome/browser/ui/views/location_bar/star_view_interactive_uitest.cc index 8dce4187..6bfda32 100644 --- a/chrome/browser/ui/views/location_bar/star_view_interactive_uitest.cc +++ b/chrome/browser/ui/views/location_bar/star_view_interactive_uitest.cc
@@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/views/location_bar/star_view.h" - #include "base/command_line.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" @@ -14,6 +12,7 @@ #include "chrome/browser/ui/ui_features.h" #include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h" #include "chrome/browser/ui/views/frame/browser_view.h" +#include "chrome/browser/ui/views/location_bar/star_view.h" #include "chrome/browser/ui/views/page_action/page_action_icon_view.h" #include "chrome/browser/ui/views/toolbar/toolbar_view.h" #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/ui/views/location_bar/zoom_bubble_view.cc b/chrome/browser/ui/views/location_bar/zoom_bubble_view.cc index 5c958a3..b921f38 100644 --- a/chrome/browser/ui/views/location_bar/zoom_bubble_view.cc +++ b/chrome/browser/ui/views/location_bar/zoom_bubble_view.cc
@@ -211,11 +211,13 @@ Browser* browser = chrome::FindBrowserWithTab(web_contents); // |web_contents| could have been unloaded if a tab gets closed and a mouse // event arrives before the zoom icon gets hidden. - if (!browser) + if (!browser) { return; + } - if (RefreshBubbleIfShowing(web_contents)) + if (RefreshBubbleIfShowing(web_contents)) { return; + } // If the bubble is already showing but in a different tab, the current // bubble must be closed and a new one created. @@ -233,13 +235,15 @@ // If the zoom change was initiated by an extension, capture the relevent // information from it. - if (client) + if (client) { zoom_bubble_->SetExtensionInfo(client->extension()); + } ParentToBrowser(browser, zoom_bubble_, anchor_view, web_contents); - if (!anchor_view && IsBrowserFullscreen(browser)) + if (!anchor_view && IsBrowserFullscreen(browser)) { zoom_bubble_->AdjustForFullscreen(browser->window()->GetBounds()); + } // Do not announce hotkey for refocusing inactive Zoom bubble as it // disappears after a short timeout. @@ -250,8 +254,9 @@ // static bool ZoomBubbleView::RefreshBubbleIfShowing( const content::WebContents* web_contents) { - if (!CanRefresh(web_contents)) + if (!CanRefresh(web_contents)) { return false; + } DCHECK_EQ(web_contents, zoom_bubble_->web_contents()); zoom_bubble_->Refresh(); @@ -262,21 +267,24 @@ // static bool ZoomBubbleView::CanRefresh(const content::WebContents* web_contents) { // Can't refresh when there's not already a bubble for this tab. - if (!zoom_bubble_ || (zoom_bubble_->web_contents() != web_contents)) + if (!zoom_bubble_ || (zoom_bubble_->web_contents() != web_contents)) { return false; + } Browser* browser = chrome::FindBrowserWithTab(web_contents); if (!browser || - (zoom_bubble_->GetAnchorView() != GetAnchorViewForBrowser(browser))) + (zoom_bubble_->GetAnchorView() != GetAnchorViewForBrowser(browser))) { return false; + } const extensions::ExtensionZoomRequestClient* client = GetExtensionZoomRequestClient(web_contents); // Allow refreshes when the client won't create its own bubble; otherwise // the existing bubble would show the wrong zoom value. - if (client && client->ShouldSuppressBubble()) + if (client && client->ShouldSuppressBubble()) { return true; + } // Allow refreshes when the existing bubble has the same attribution for // the zoom change, so only the label needs updating. @@ -286,8 +294,9 @@ // static void ZoomBubbleView::CloseCurrentBubble() { - if (zoom_bubble_) + if (zoom_bubble_) { zoom_bubble_->CloseBubble(); + } } // static @@ -313,20 +322,23 @@ SetButtons(static_cast<int>(ui::mojom::DialogButton::kNone)); SetNotifyEnterExitOnChild(true); - if (immersive_mode_controller_) + if (immersive_mode_controller_) { immersive_mode_controller_->AddObserver(this); + } UseCompactMargins(); } ZoomBubbleView::~ZoomBubbleView() { - if (immersive_mode_controller_) + if (immersive_mode_controller_) { immersive_mode_controller_->RemoveObserver(this); + } } std::u16string ZoomBubbleView::GetAccessibleWindowTitle() const { Browser* browser = GetBrowser(); - if (!browser) + if (!browser) { return {}; + } return BrowserView::GetBrowserViewForBrowser(browser) ->toolbar_button_provider() ->GetPageActionIconView(PageActionIconType::kZoom) @@ -342,8 +354,9 @@ LocationBarBubbleDelegateView::OnBlur(); const views::FocusManager* focus_manager = GetFocusManager(); - if (focus_manager && Contains(focus_manager->GetFocusedView())) + if (focus_manager && Contains(focus_manager->GetFocusedView())) { return; + } StartTimerIfNecessary(); } @@ -360,14 +373,16 @@ } void ZoomBubbleView::OnKeyEvent(ui::KeyEvent* event) { - if (!zoom_bubble_ || !zoom_bubble_->auto_close_) + if (!zoom_bubble_ || !zoom_bubble_->auto_close_) { return; + } const views::FocusManager* focus_manager = GetFocusManager(); - if (focus_manager && Contains(focus_manager->GetFocusedView())) + if (focus_manager && Contains(focus_manager->GetFocusedView())) { StopTimer(); - else + } else { StartTimerIfNecessary(); + } } void ZoomBubbleView::OnMouseEntered(const ui::MouseEvent& event) { @@ -476,8 +491,9 @@ // |zoom_bubble_| can be a new bubble by this point (as Close(); doesn't // call this right away). Only set to nullptr when it's this bubble. bool this_bubble = zoom_bubble_ == this; - if (this_bubble) + if (this_bubble) { zoom_bubble_ = nullptr; + } UpdateZoomIconVisibility(); } @@ -533,8 +549,9 @@ if (!has_default_sized_icon) { const extensions::ActionInfo* action = extensions::ActionInfo::GetExtensionActionInfo(extension); - if (!action || action->default_icon.empty()) + if (!action || action->default_icon.empty()) { return; // Out of options. + } icons = &action->default_icon; icon_size = icons->map().begin()->first; @@ -571,13 +588,15 @@ // may also be destroyed: the call to WindowClosing() may be triggered by // parent window destruction tearing down its child windows. Browser* browser = chrome::FindBrowserWithID(session_id_); - if (browser && browser->window()) + if (browser && browser->window()) { browser->window()->UpdatePageActionIcon(PageActionIconType::kZoom); + } } void ZoomBubbleView::StartTimerIfNecessary() { - if (!auto_close_) + if (!auto_close_) { return; + } auto_close_timer_.Start(FROM_HERE, auto_close_duration_, this, &ZoomBubbleView::CloseBubble);
diff --git a/chrome/browser/ui/views/login_handler_views.cc b/chrome/browser/ui/views/login_handler_views.cc index 58e7e3e..e7bf32f 100644 --- a/chrome/browser/ui/views/login_handler_views.cc +++ b/chrome/browser/ui/views/login_handler_views.cc
@@ -103,16 +103,18 @@ l10n_util::GetStringUTF16(IDS_LOGIN_DIALOG_OK_BUTTON_LABEL)); SetAcceptCallback(base::BindOnce( [](Dialog* dialog) { - if (!dialog->handler_) + if (!dialog->handler_) { return; + } dialog->handler_->SetAuth(dialog->login_view_->GetUsername(), dialog->login_view_->GetPassword()); }, base::Unretained(this))); SetCancelCallback(base::BindOnce( [](Dialog* dialog) { - if (!dialog->handler_) + if (!dialog->handler_) { return; + } dialog->handler_->CancelAuth(/*notify_others=*/true); }, base::Unretained(this))); @@ -134,8 +136,9 @@ void CloseDialog() { handler_ = nullptr; // The hosting widget may have been freed. - if (widget_) + if (widget_) { widget_->Close(); + } } // views::DialogDelegate: @@ -148,8 +151,9 @@ void WindowClosing() override { // Reference is no longer valid. widget_ = nullptr; - if (handler_) + if (handler_) { handler_->CancelAuth(/*notify_others=*/true); + } } views::View* GetInitiallyFocusedView() override { @@ -166,8 +170,9 @@ private: ~Dialog() override { - if (handler_) + if (handler_) { handler_->OnDialogDestroyed(); + } } raw_ptr<LoginHandlerViews> handler_;
diff --git a/chrome/browser/ui/views/login_view.cc b/chrome/browser/ui/views/login_view.cc index 11c2ac0..86a19a2 100644 --- a/chrome/browser/ui/views/login_view.cc +++ b/chrome/browser/ui/views/login_view.cc
@@ -95,8 +95,9 @@ } LoginView::~LoginView() { - if (http_auth_manager_) + if (http_auth_manager_) { http_auth_manager_->DetachObserver(this); + } } const std::u16string& LoginView::GetUsername() const {
diff --git a/chrome/browser/ui/views/media_preview/camera_preview/camera_mediator.cc b/chrome/browser/ui/views/media_preview/camera_preview/camera_mediator.cc index 211f116..43ccdb70 100644 --- a/chrome/browser/ui/views/media_preview/camera_preview/camera_mediator.cc +++ b/chrome/browser/ui/views/media_preview/camera_preview/camera_mediator.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/views/media_preview/camera_preview/camera_mediator.h" + #include "base/functional/bind.h" #include "chrome/browser/media/prefs/capture_device_ranking.h" #include "content/public/browser/video_capture_service.h"
diff --git a/chrome/browser/ui/views/media_router/app_menu_test_api_views.cc b/chrome/browser/ui/views/media_router/app_menu_test_api_views.cc index c2f4338b1..0aa9ae8c 100644 --- a/chrome/browser/ui/views/media_router/app_menu_test_api_views.cc +++ b/chrome/browser/ui/views/media_router/app_menu_test_api_views.cc
@@ -3,11 +3,10 @@ // found in the LICENSE file. #include "base/memory/raw_ptr.h" -#include "chrome/browser/ui/views/media_router/app_menu_test_api.h" - #include "build/build_config.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/views/frame/browser_view.h" +#include "chrome/browser/ui/views/media_router/app_menu_test_api.h" #include "chrome/browser/ui/views/toolbar/app_menu.h" #include "chrome/browser/ui/views/toolbar/browser_app_menu_button.h" #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
diff --git a/chrome/browser/ui/views/media_router/cast_browser_controller.h b/chrome/browser/ui/views/media_router/cast_browser_controller.h index e0d5b4d5..a04a38b 100644 --- a/chrome/browser/ui/views/media_router/cast_browser_controller.h +++ b/chrome/browser/ui/views/media_router/cast_browser_controller.h
@@ -21,18 +21,15 @@ class MediaRouter; class LoggerImpl; -// TODO(crbug.com/376495209): Add comments for methods and members of this class. -// Controller for the Cast toolbar icon. There should be one instance of this -// class per browser. -class CastBrowserController : - public IssuesObserver, - public MediaRoutesObserver, - public MirroringMediaControllerHost::Observer { - +// TODO(crbug.com/376495209): Add comments for methods and members of this +// class. Controller for the Cast toolbar icon. There should be one instance of +// this class per browser. +class CastBrowserController : public IssuesObserver, + public MediaRoutesObserver, + public MirroringMediaControllerHost::Observer { public: explicit CastBrowserController(Browser* browser); - CastBrowserController(Browser* browser, - MediaRouter* media_router); + CastBrowserController(Browser* browser, MediaRouter* media_router); CastBrowserController(const CastBrowserController&) = delete; CastBrowserController& operator=(const CastBrowserController&) = delete; ~CastBrowserController() override;
diff --git a/chrome/browser/ui/views/media_router/cast_dialog_access_code_cast_button.cc b/chrome/browser/ui/views/media_router/cast_dialog_access_code_cast_button.cc index 04c2f9a0..352f2c94 100644 --- a/chrome/browser/ui/views/media_router/cast_dialog_access_code_cast_button.cc +++ b/chrome/browser/ui/views/media_router/cast_dialog_access_code_cast_button.cc
@@ -48,15 +48,17 @@ bool CastDialogAccessCodeCastButton::OnMousePressed( const ui::MouseEvent& event) { - if (event.IsRightMouseButton()) + if (event.IsRightMouseButton()) { return true; + } return HoverButton::OnMousePressed(event); } void CastDialogAccessCodeCastButton::OnMouseReleased( const ui::MouseEvent& event) { - if (event.IsRightMouseButton()) + if (event.IsRightMouseButton()) { return; + } return HoverButton::OnMouseReleased(event); }
diff --git a/chrome/browser/ui/views/media_router/cast_dialog_metrics.cc b/chrome/browser/ui/views/media_router/cast_dialog_metrics.cc index 0a48f202..e634fb9 100644 --- a/chrome/browser/ui/views/media_router/cast_dialog_metrics.cc +++ b/chrome/browser/ui/views/media_router/cast_dialog_metrics.cc
@@ -135,8 +135,9 @@ CastDialogMetrics::~CastDialogMetrics() = default; void CastDialogMetrics::OnSinksLoaded(const base::Time& sinks_load_time) { - if (!sinks_load_time_.is_null()) + if (!sinks_load_time_.is_null()) { return; + } MediaRouterMetrics::RecordCastDialogLoaded(sinks_load_time - initialization_time_); sinks_load_time_ = sinks_load_time; @@ -161,8 +162,9 @@ void CastDialogMetrics::MaybeRecordActivationLocationAndCastMode( MediaCastMode cast_mode) { - if (activation_location_and_cast_mode_recorded_) + if (activation_location_and_cast_mode_recorded_) { return; + } UMA_HISTOGRAM_ENUMERATION( "MediaRouter.Ui.Dialog.ActivationLocationAndCastMode", GetActivationLocationAndCastMode(activation_location_, cast_mode,
diff --git a/chrome/browser/ui/views/media_router/cast_dialog_sink_button.cc b/chrome/browser/ui/views/media_router/cast_dialog_sink_button.cc index 7b1b42b0..0f3d3aa 100644 --- a/chrome/browser/ui/views/media_router/cast_dialog_sink_button.cc +++ b/chrome/browser/ui/views/media_router/cast_dialog_sink_button.cc
@@ -131,14 +131,16 @@ } bool CastDialogSinkButton::OnMousePressed(const ui::MouseEvent& event) { - if (event.IsRightMouseButton()) + if (event.IsRightMouseButton()) { return true; + } return HoverButton::OnMousePressed(event); } void CastDialogSinkButton::OnMouseReleased(const ui::MouseEvent& event) { - if (event.IsRightMouseButton()) + if (event.IsRightMouseButton()) { return; + } HoverButton::OnMouseReleased(event); } @@ -151,8 +153,9 @@ : views::InkDropHost::InkDropMode::OFF); // If the button has a state other than AVAILABLE (e.g. CONNECTED), there is // no need to change the status or the icon. - if (sink_.state != UIMediaSinkState::AVAILABLE) + if (sink_.state != UIMediaSinkState::AVAILABLE) { return; + } ui::ImageModel icon; if (GetEnabled()) { @@ -169,8 +172,9 @@ } static_cast<views::ImageView*>(icon_view())->SetImage(icon); - if (GetWidget()) + if (GetWidget()) { UpdateTitleTextStyle(); + } } void CastDialogSinkButton::UpdateTitleTextStyle() { @@ -212,8 +216,9 @@ } void CastDialogSinkButton::OnBlur() { - if (sink_.state == UIMediaSinkState::CONNECTED) + if (sink_.state == UIMediaSinkState::CONNECTED) { RestoreStatusText(); + } } void CastDialogSinkButton::OnThemeChanged() {
diff --git a/chrome/browser/ui/views/media_router/cast_dialog_view.cc b/chrome/browser/ui/views/media_router/cast_dialog_view.cc index 55521da..172fa44 100644 --- a/chrome/browser/ui/views/media_router/cast_dialog_view.cc +++ b/chrome/browser/ui/views/media_router/cast_dialog_view.cc
@@ -122,9 +122,10 @@ // If access code casting is enabled, the sources button needs to be enabled // so that user can set the source before invoking the access code casting // flow. - if (sources_button_) + if (sources_button_) { sources_button_->SetEnabled(!model.media_sinks().empty() || IsAccessCodeCastingEnabled()); + } dialog_title_ = model.dialog_header(); MaybeSizeToContents(); @@ -185,8 +186,9 @@ } void CastDialogView::ShowAccessCodeCastDialog() { - if (!controller_) + if (!controller_) { return; + } CastModeSet cast_mode_set; switch (selected_source_) { @@ -206,8 +208,9 @@ } void CastDialogView::MaybeShowAccessCodeCastButton() { - if (!IsAccessCodeCastingEnabled()) + if (!IsAccessCodeCastingEnabled()) { return; + } auto callback = base::BindRepeating(&CastDialogView::ShowAccessCodeCastDialog, base::Unretained(this)); @@ -217,8 +220,9 @@ } void CastDialogView::ShowNoSinksView() { - if (no_sinks_view_) + if (no_sinks_view_) { return; + } ResetViews(); no_sinks_view_ = AddChildView(std::make_unique<CastDialogNoSinksView>( profile_, /*permission_rejected*/ false)); @@ -235,8 +239,9 @@ } void CastDialogView::ShowScrollView() { - if (scroll_view_) + if (scroll_view_) { return; + } ResetViews(); scroll_view_ = AddChildView(std::make_unique<views::ScrollView>()); constexpr int kSinkButtonHeight = 56; @@ -348,8 +353,9 @@ } void CastDialogView::SinkPressed(size_t index) { - if (!controller_) + if (!controller_) { return; + } selected_sink_index_ = index; // sink() may get invalidated during CastDialogController::StartCasting() @@ -416,8 +422,9 @@ void CastDialogView::MaybeSizeToContents() { // The widget may be null if this is called while the dialog is opening. - if (GetWidget()) + if (GetWidget()) { SizeToContents(); + } } std::optional<MediaCastMode> CastDialogView::GetCastModeToUse( @@ -426,14 +433,17 @@ // supported and selected. switch (selected_source_) { case SourceType::kTab: - if (base::Contains(sink.cast_modes, PRESENTATION)) + if (base::Contains(sink.cast_modes, PRESENTATION)) { return std::make_optional<MediaCastMode>(PRESENTATION); - if (base::Contains(sink.cast_modes, TAB_MIRROR)) + } + if (base::Contains(sink.cast_modes, TAB_MIRROR)) { return std::make_optional<MediaCastMode>(TAB_MIRROR); + } break; case SourceType::kDesktop: - if (base::Contains(sink.cast_modes, DESKTOP_MIRROR)) + if (base::Contains(sink.cast_modes, DESKTOP_MIRROR)) { return std::make_optional<MediaCastMode>(DESKTOP_MIRROR); + } break; } return std::nullopt;
diff --git a/chrome/browser/ui/views/media_router/media_remoting_dialog_view.cc b/chrome/browser/ui/views/media_router/media_remoting_dialog_view.cc index 81f8c11..8882868 100644 --- a/chrome/browser/ui/views/media_router/media_remoting_dialog_view.cc +++ b/chrome/browser/ui/views/media_router/media_remoting_dialog_view.cc
@@ -61,8 +61,9 @@ } void MediaRemotingDialogCoordinatorViews::Hide() { - if (IsShowing()) + if (IsShowing()) { tracker_.view()->GetWidget()->Close(); + } } bool MediaRemotingDialogCoordinatorViews::IsShowing() const {
diff --git a/chrome/browser/ui/views/media_router/presentation_receiver_window_factory.cc b/chrome/browser/ui/views/media_router/presentation_receiver_window_factory.cc index e17eac1..993b8cb 100644 --- a/chrome/browser/ui/views/media_router/presentation_receiver_window_factory.cc +++ b/chrome/browser/ui/views/media_router/presentation_receiver_window_factory.cc
@@ -2,12 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/media_router/presentation_receiver_window.h" - #include <memory> #include "base/check.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/ui/media_router/presentation_receiver_window.h" #include "chrome/browser/ui/media_router/presentation_receiver_window_delegate.h" #include "chrome/browser/ui/views/media_router/presentation_receiver_window_frame.h" #include "chrome/browser/ui/views/media_router/presentation_receiver_window_view.h"
diff --git a/chrome/browser/ui/views/media_router/presentation_receiver_window_view.cc b/chrome/browser/ui/views/media_router/presentation_receiver_window_view.cc index 6fe0b063..5446048a 100644 --- a/chrome/browser/ui/views/media_router/presentation_receiver_window_view.cc +++ b/chrome/browser/ui/views/media_router/presentation_receiver_window_view.cc
@@ -397,19 +397,22 @@ bool PresentationReceiverWindowView::GetAcceleratorForCommandId( int command_id, ui::Accelerator* accelerator) const { - if (command_id != IDC_FULLSCREEN) + if (command_id != IDC_FULLSCREEN) { return false; + } *accelerator = fullscreen_accelerator_; return true; } void PresentationReceiverWindowView::OnFullscreenChanged() { const bool fullscreen = IsFullscreen(); - if (!fullscreen) + if (!fullscreen) { exclusive_access_bubble_.reset(); + } location_bar_view_->SetVisible(!fullscreen); - if (fullscreen == (location_bar_view_->height() > 0)) + if (fullscreen == (location_bar_view_->height() > 0)) { DeprecatedLayoutImmediately(); + } } BEGIN_METADATA(PresentationReceiverWindowView)
diff --git a/chrome/browser/ui/views/media_router/presentation_receiver_window_view_browsertest.cc b/chrome/browser/ui/views/media_router/presentation_receiver_window_view_browsertest.cc index fb0ddb5a..5ae6c87d 100644 --- a/chrome/browser/ui/views/media_router/presentation_receiver_window_view_browsertest.cc +++ b/chrome/browser/ui/views/media_router/presentation_receiver_window_view_browsertest.cc
@@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/memory/raw_ptr.h" #include "chrome/browser/ui/views/media_router/presentation_receiver_window_view.h" #include "base/functional/callback.h" +#include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" @@ -55,8 +55,9 @@ // PresentationReceiverWindowDelegate overrides. void WindowClosed() final { - if (closed_callback_) + if (closed_callback_) { std::move(closed_callback_).Run(); + } } content::WebContents* web_contents() const final { return web_contents_.get(); @@ -153,8 +154,9 @@ void OnViewVisibilityChanged(views::View* observed_view) { bool fullscreen = !observed_view->GetVisible(); EXPECT_EQ(fullscreen, receiver_view_->IsFullscreen()); - if (fullscreen == (await_type_ == AwaitType::kIntoFullscreen)) + if (fullscreen == (await_type_ == AwaitType::kIntoFullscreen)) { std::move(fullscreen_callback_).Run(); + } } const raw_ptr<PresentationReceiverWindowView> receiver_view_;
diff --git a/chrome/browser/ui/views/media_router/web_contents_display_observer_view.cc b/chrome/browser/ui/views/media_router/web_contents_display_observer_view.cc index 9010a9e..518aaa6 100644 --- a/chrome/browser/ui/views/media_router/web_contents_display_observer_view.cc +++ b/chrome/browser/ui/views/media_router/web_contents_display_observer_view.cc
@@ -39,8 +39,9 @@ } WebContentsDisplayObserverView::~WebContentsDisplayObserverView() { - if (widget_) + if (widget_) { widget_->RemoveObserver(this); + } BrowserList::RemoveObserver(this); CHECK(!WidgetObserver::IsInObserverList()); } @@ -50,8 +51,9 @@ // into another window. We update the widget to observe, if necessary. // If |web_contents_| or |widget_| is null, then we no longer have WebContents // to observe. - if (!web_contents_ || !widget_) + if (!web_contents_ || !widget_) { return; + } views::Widget* new_widget = views::Widget::GetWidgetForNativeWindow( web_contents_->GetTopLevelNativeWindow()); @@ -66,8 +68,9 @@ } void WebContentsDisplayObserverView::OnWidgetDestroying(views::Widget* widget) { - if (widget_) + if (widget_) { widget_->RemoveObserver(this); + } widget_ = nullptr; } @@ -88,8 +91,9 @@ void WebContentsDisplayObserverView::CheckForDisplayChange() { display::Display new_display = GetDisplayNearestWidget(); - if (new_display.id() == display_.id()) + if (new_display.id() == display_.id()) { return; + } display_ = new_display; callback_.Run();
diff --git a/chrome/browser/ui/views/media_router/web_contents_display_observer_view_unittest.cc b/chrome/browser/ui/views/media_router/web_contents_display_observer_view_unittest.cc index 89b95a8..de539ee 100644 --- a/chrome/browser/ui/views/media_router/web_contents_display_observer_view_unittest.cc +++ b/chrome/browser/ui/views/media_router/web_contents_display_observer_view_unittest.cc
@@ -2,11 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/views/media_router/web_contents_display_observer_view.h" + #include <memory> #include <utility> #include "base/functional/bind.h" -#include "chrome/browser/ui/views/media_router/web_contents_display_observer_view.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "content/public/browser/web_contents.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/chrome/browser/ui/views/menu_controller_interactive_uitest.cc b/chrome/browser/ui/views/menu_controller_interactive_uitest.cc index 73827e48..8d20acfc 100644 --- a/chrome/browser/ui/views/menu_controller_interactive_uitest.cc +++ b/chrome/browser/ui/views/menu_controller_interactive_uitest.cc
@@ -8,7 +8,7 @@ #include "ui/views/controls/menu/menu_item_view.h" #include "ui/views/controls/menu/submenu_view.h" -template<ui::KeyboardCode KEYCODE, int EXPECTED_COMMAND> +template <ui::KeyboardCode KEYCODE, int EXPECTED_COMMAND> class MenuControllerMnemonicTest : public MenuTestBase { public: MenuControllerMnemonicTest() = default; @@ -51,7 +51,7 @@ // Pressing the mnemonic for a menu item should execute the command for that // menu item. -typedef MenuControllerMnemonicTest<ui::VKEY_DIVIDE,1> +typedef MenuControllerMnemonicTest<ui::VKEY_DIVIDE, 1> MenuControllerMnemonicTestMnemonicMatch; #if BUILDFLAG(IS_MAC) @@ -67,13 +67,13 @@ // Pressing a key which matches the first letter of the menu item's title // should execute the command for that menu item. -typedef MenuControllerMnemonicTest<ui::VKEY_T,2> +typedef MenuControllerMnemonicTest<ui::VKEY_T, 2> MenuControllerMnemonicTestTitleMatch; VIEW_TEST(MenuControllerMnemonicTestTitleMatch, MAYBE_TitleMatch) // Pressing an arbitrary key should not execute any commands. -typedef MenuControllerMnemonicTest<ui::VKEY_A,0> +typedef MenuControllerMnemonicTest<ui::VKEY_A, 0> MenuControllerMnemonicTestNoMatch; VIEW_TEST(MenuControllerMnemonicTestNoMatch, NoMatch)
diff --git a/chrome/browser/ui/views/menu_item_view_interactive_uitest.cc b/chrome/browser/ui/views/menu_item_view_interactive_uitest.cc index 5ef1a35..c1f07b5 100644 --- a/chrome/browser/ui/views/menu_item_view_interactive_uitest.cc +++ b/chrome/browser/ui/views/menu_item_view_interactive_uitest.cc
@@ -105,12 +105,13 @@ ASSERT_FALSE(submenu->IsShowing()); ASSERT_EQ(3u, submenu->GetMenuItems().size()); - if (SELECT_INDEX == INSERT_INDEX) + if (SELECT_INDEX == INSERT_INDEX) { ASSERT_EQ(1000, last_command()); - else if (SELECT_INDEX < INSERT_INDEX) + } else if (SELECT_INDEX < INSERT_INDEX) { ASSERT_EQ(SELECT_INDEX + 1, last_command()); - else + } else { ASSERT_EQ(SELECT_INDEX, last_command()); + } LOG(ERROR) << "\nDone\n"; Done(); @@ -282,10 +283,11 @@ ASSERT_FALSE(submenu->IsShowing()); ASSERT_EQ(2u, submenu->GetMenuItems().size()); - if (SELECT_INDEX < REMOVE_INDEX) + if (SELECT_INDEX < REMOVE_INDEX) { ASSERT_EQ(SELECT_INDEX + 1, last_command()); - else + } else { ASSERT_EQ(SELECT_INDEX + 2, last_command()); + } Done(); }
diff --git a/chrome/browser/ui/views/menu_model_adapter_test.cc b/chrome/browser/ui/views/menu_model_adapter_test.cc index ec36e7e..e22415a 100644 --- a/chrome/browser/ui/views/menu_model_adapter_test.cc +++ b/chrome/browser/ui/views/menu_model_adapter_test.cc
@@ -90,9 +90,7 @@ ~SubMenuModel() override = default; - bool showing() const { - return showing_; - } + bool showing() const { return showing_; } private: // ui::MenuModel implementation. @@ -128,9 +126,7 @@ ~TopMenuModel() override = default; - bool IsSubmenuShowing() { - return sub_menu_model_.showing(); - } + bool IsSubmenuShowing() { return sub_menu_model_.showing(); } private: // ui::MenuModel implementation.
diff --git a/chrome/browser/ui/views/menu_test_base.h b/chrome/browser/ui/views/menu_test_base.h index 231b8e6..df007ad1 100644 --- a/chrome/browser/ui/views/menu_test_base.h +++ b/chrome/browser/ui/views/menu_test_base.h
@@ -18,7 +18,7 @@ namespace views { class MenuItemView; class MenuRunner; -} +} // namespace views // This is a convenience base class for menu related tests to provide some // common functionality. @@ -54,13 +54,9 @@ // Generate a keypress and run |next| once the event has been processed. void KeyPress(ui::KeyboardCode keycode, base::OnceClosure next); - views::MenuItemView* menu() { - return menu_; - } + views::MenuItemView* menu() { return menu_; } - int last_command() const { - return last_command_; - } + int last_command() const { return last_command_; } protected: views::MenuRunner* menu_runner() { return menu_runner_.get(); }
diff --git a/chrome/browser/ui/views/menu_view_drag_and_drop_test.cc b/chrome/browser/ui/views/menu_view_drag_and_drop_test.cc index 305c0e47..64f0b36e 100644 --- a/chrome/browser/ui/views/menu_view_drag_and_drop_test.cc +++ b/chrome/browser/ui/views/menu_view_drag_and_drop_test.cc
@@ -320,8 +320,8 @@ return true; } -void MenuViewDragAndDropTest::WriteDragData( - views::MenuItemView* sender, ui::OSExchangeData* data) { +void MenuViewDragAndDropTest::WriteDragData(views::MenuItemView* sender, + ui::OSExchangeData* data) { data->SetString(kTestTopLevelDragData); }
diff --git a/chrome/browser/ui/views/message_box_dialog.cc b/chrome/browser/ui/views/message_box_dialog.cc index 65d5379..99d22fc 100644 --- a/chrome/browser/ui/views/message_box_dialog.cc +++ b/chrome/browser/ui/views/message_box_dialog.cc
@@ -71,8 +71,9 @@ static bool g_message_box_is_showing_sync = false; // To avoid showing another MessageBoxDialog when one is already pending. // Otherwise, this might lead to a stack overflow due to infinite runloops. - if (g_message_box_is_showing_sync) + if (g_message_box_is_showing_sync) { return chrome::MESSAGE_BOX_RESULT_NO; + } base::AutoReset<bool> is_showing(&g_message_box_is_showing_sync, true); chrome::MessageBoxResult result = chrome::MESSAGE_BOX_RESULT_NO; @@ -244,8 +245,9 @@ } #endif - if (!active) + if (!active) { GetWidget()->Close(); + } } void MessageBoxDialog::OnWidgetDestroying(views::Widget* widget) { @@ -296,13 +298,15 @@ // Only MESSAGE_BOX_TYPE_QUESTION has a Cancel button. if (type_ == chrome::MESSAGE_BOX_TYPE_QUESTION) { std::u16string cancel_text(no_text); - if (cancel_text.empty()) + if (cancel_text.empty()) { cancel_text = l10n_util::GetStringUTF16(IDS_CANCEL); + } SetButtonLabel(ui::mojom::DialogButton::kCancel, cancel_text); } - if (!checkbox_text.empty()) + if (!checkbox_text.empty()) { message_box_view_->SetCheckBoxLabel(std::u16string(checkbox_text)); + } } MessageBoxDialog::~MessageBoxDialog() {
diff --git a/chrome/browser/ui/views/native_widget_factory.cc b/chrome/browser/ui/views/native_widget_factory.cc index 61ef7b6..aa45289d 100644 --- a/chrome/browser/ui/views/native_widget_factory.cc +++ b/chrome/browser/ui/views/native_widget_factory.cc
@@ -20,8 +20,9 @@ gfx::NativeWindow parent_or_context = params->parent ? params->parent : params->context; Profile* profile = nullptr; - if (parent_or_context) + if (parent_or_context) { profile = GetThemeProfileForWindow(parent_or_context); + } views::NativeWidget* native_widget = nullptr; aura::Window* window = nullptr; if (type == NativeWidgetType::DESKTOP_NATIVE_WIDGET_AURA ||
diff --git a/chrome/browser/ui/views/notifications/request_pin_view_chromeos.cc b/chrome/browser/ui/views/notifications/request_pin_view_chromeos.cc index 884442b..7380b38 100644 --- a/chrome/browser/ui/views/notifications/request_pin_view_chromeos.cc +++ b/chrome/browser/ui/views/notifications/request_pin_view_chromeos.cc
@@ -68,8 +68,9 @@ } bool RequestPinView::Accept() { - if (!textfield_->GetEnabled()) + if (!textfield_->GetEnabled()) { return true; + } DCHECK(!textfield_->GetText().empty()); DCHECK(!locked_); @@ -95,13 +96,15 @@ case ui::mojom::DialogButton::kCancel: return true; case ui::mojom::DialogButton::kOk: - if (locked_) + if (locked_) { return false; + } // Not locked but the |textfield_| is not enabled. It's just a // notification to the user and [OK] button can be used to close the // dialog. - if (!textfield_->GetEnabled()) + if (!textfield_->GetEnabled()) { return true; + } return textfield_->GetText().size() > 0; case ui::mojom::DialogButton::kNone: return true; @@ -192,8 +195,9 @@ void RequestPinView::SetAcceptInput(bool accept_input) { textfield_->SetEnabled(accept_input); - if (accept_input) + if (accept_input) { textfield_->RequestFocus(); + } } void RequestPinView::SetErrorMessage(
diff --git a/chrome/browser/ui/views/omnibox/omnibox_match_cell_view.cc b/chrome/browser/ui/views/omnibox/omnibox_match_cell_view.cc index 9f901a64..fa80e4e 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_match_cell_view.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_match_cell_view.cc
@@ -165,8 +165,9 @@ *description_max_width = std::min(description_width, available_width); // If the description is empty, contents can get the full available width. - if (!description_width) + if (!description_width) { return; + } // If we want to display the description, we need to reserve enough space for // the separator. @@ -406,8 +407,9 @@ // Usually, answer images are square. But if that's not the case, setting // answer_image_view_ size proportional to the image size preserves // the aspect ratio. - if (width == height) + if (width == height) { return; + } const int max = std::max(width, height); width = kUniformRowHeightIconSize * width / max; height = kUniformRowHeightIconSize * height / max; @@ -570,8 +572,9 @@ // This number is independent of other layout numbers; i.e., it's not meant to // align with any other UI; it's just arbitrarily chosen by UX. Hence, it's // not derived from other matches' `indent` below. - if (layout_style_ == LayoutStyle::IPH_SUGGESTION) + if (layout_style_ == LayoutStyle::IPH_SUGGESTION) { return 2; + } // The entity, answer, and icon images are horizontally centered within their // bounds. So their center-line will be at `image_x+kImageBoundsWidth/2`. This @@ -605,8 +608,9 @@ // Answers don't have an icon, and their text needs to line up with the icons // of other suggestions, so they need a smaller indent. - if (layout_style_ == LayoutStyle::HISTORY_EMBEDDING_ANSWER) + if (layout_style_ == LayoutStyle::HISTORY_EMBEDDING_ANSWER) { return 18; + } // For normal matches, the gap between the left edge of this view and the // left edge of its favicon or answer image. @@ -617,8 +621,9 @@ // to have inner padding, so the gap between the left edge of this // `OmniboxMatchCellView` and the IPH icon/text is actually larger than // `indent`. - if (layout_style_ == LayoutStyle::IPH_SUGGESTION) + if (layout_style_ == LayoutStyle::IPH_SUGGESTION) { indent -= kIphOffset; + } return indent; }
diff --git a/chrome/browser/ui/views/omnibox/omnibox_mouse_enter_exit_handler.cc b/chrome/browser/ui/views/omnibox/omnibox_mouse_enter_exit_handler.cc index 6bee5f5..06eae9d 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_mouse_enter_exit_handler.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_mouse_enter_exit_handler.cc
@@ -12,8 +12,9 @@ : enter_exit_callback_(enter_exit_callback) {} OmniboxMouseEnterExitHandler::~OmniboxMouseEnterExitHandler() { - for (views::View* view : observed_views_) + for (views::View* view : observed_views_) { view->RemovePreTargetHandler(this); + } } void OmniboxMouseEnterExitHandler::ObserveMouseEnterExitOn(views::View* view) {
diff --git a/chrome/browser/ui/views/omnibox/omnibox_suggestion_button_row_view.cc b/chrome/browser/ui/views/omnibox/omnibox_suggestion_button_row_view.cc index 007735f..8a0dcb0 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_suggestion_button_row_view.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_suggestion_button_row_view.cc
@@ -81,8 +81,9 @@ ~OmniboxSuggestionRowChip() override = default; void SetThemeState(OmniboxPartState theme_state) { - if (theme_state_ == theme_state) + if (theme_state_ == theme_state) { return; + } theme_state_ = theme_state; OnThemeChanged(); } @@ -163,8 +164,9 @@ ~OmniboxSuggestionRowButton() override = default; void SetThemeState(OmniboxPartState theme_state) { - if (theme_state_ == theme_state) + if (theme_state_ == theme_state) { return; + } theme_state_ = theme_state; OnThemeChanged(); } @@ -260,8 +262,9 @@ RemoveAllChildViews(); // Skip remaining code that depends on `match()`. - if (!HasMatch()) + if (!HasMatch()) { return; + } // For all of these buttons, the visibility is set from `UpdateFromModel()`. // The Keyword and Pedal buttons also get their text from there, since the @@ -388,18 +391,21 @@ void OmniboxSuggestionButtonRowView::SetThemeState( OmniboxPartState theme_state) { - if (embeddings_chip_) + if (embeddings_chip_) { embeddings_chip_->SetThemeState(theme_state); - if (keyword_button_) + } + if (keyword_button_) { keyword_button_->SetThemeState(theme_state); + } for (const auto& action_button : action_buttons_) { action_button->SetThemeState(theme_state); } } views::Button* OmniboxSuggestionButtonRowView::GetActiveButton() const { - if (!HasMatch()) + if (!HasMatch()) { return nullptr; + } std::vector<OmniboxSuggestionRowButton*> buttons{keyword_button_}; buttons.insert(buttons.end(), action_buttons_.begin(), action_buttons_.end());
diff --git a/chrome/browser/ui/views/omnibox/omnibox_text_view.cc b/chrome/browser/ui/views/omnibox/omnibox_text_view.cc index fed57767..d960feb 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_text_view.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_text_view.cc
@@ -133,15 +133,17 @@ void OmniboxTextView::OnPaint(gfx::Canvas* canvas) { View::OnPaint(canvas); - if (!render_text_) + if (!render_text_) { return; + } render_text_->SetDisplayRect(GetContentsBounds()); render_text_->Draw(canvas); } void OmniboxTextView::ApplyTextColor(ui::ColorId id) { - if (GetText().empty()) + if (GetText().empty()) { return; + } render_text_->SetColor(GetColorProvider()->GetColor(id)); SchedulePaint(); } @@ -168,8 +170,9 @@ const std::u16string& new_text, const ACMatchClassifications& classifications) { if (GetText() == new_text && cached_classifications_ && - classifications == *cached_classifications_) + classifications == *cached_classifications_) { return; + } cached_classifications_ = std::make_unique<ACMatchClassifications>(classifications); @@ -240,14 +243,16 @@ void OmniboxTextView::ReapplyStyling() { // No work required if there are no preexisting styles. - if (!cached_classifications_) + if (!cached_classifications_) { return; + } const size_t text_length = GetText().length(); for (size_t i = 0; i < cached_classifications_->size(); ++i) { const size_t text_start = (*cached_classifications_)[i].offset; - if (text_start >= text_length) + if (text_start >= text_length) { break; + } const size_t text_end = (i < (cached_classifications_->size() - 1)) @@ -256,8 +261,9 @@ const gfx::Range current_range(text_start, text_end); // Calculate style-related data. - if ((*cached_classifications_)[i].style & ACMatchClassification::MATCH) + if ((*cached_classifications_)[i].style & ACMatchClassification::MATCH) { render_text_->ApplyWeight(gfx::Font::Weight::BOLD, current_range); + } const bool selected = result_view_->GetThemeState() == OmniboxPartState::SELECTED;
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc index 8efe5a78..81dbc6a 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
@@ -361,8 +361,9 @@ // Only select all when we have focus. If we don't have focus, selecting // all is unnecessary since the selection will change on regaining focus. - if (model()->has_focus()) + if (model()->has_focus()) { SelectAll(true); + } } else { // If the text is unchanged, we still need to re-emphasize the text, as the // security state may be different from before the Update. @@ -389,8 +390,9 @@ // between the OmniboxEditModel, which handles setting the omnibox match, and // LocationBarView. Perhaps, if we decide to launch rich autocompletion we'll // consider alternatives. - if (location_bar_view_) + if (location_bar_view_) { location_bar_view_->SetOmniboxAdditionalText(additional_text); + } } void OmniboxViewViews::EnterKeywordModeForDefaultSearchProvider() { @@ -409,8 +411,9 @@ size_t OmniboxViewViews::GetAllSelectionsLength() const { size_t sum = 0; - for (auto s : GetRenderText()->GetAllSelections()) + for (auto s : GetRenderText()->GetAllSelections()) { sum += s.length(); + } return sum; } @@ -444,13 +447,15 @@ const bool omnibox_already_focused = HasFocus(); - if (is_user_initiated) + if (is_user_initiated) { model()->Unelide(); + } RequestFocus(); - if (omnibox_already_focused) + if (omnibox_already_focused) { model()->ClearKeyword(); + } // If the user initiated the focus, then we always select-all, even if the // omnibox is already focused. This can happen if the user pressed Ctrl+L @@ -465,12 +470,14 @@ // finishes loading and then does a renderer-initiated focus, performing // a select-all here would surprisingly overwrite the user's first few // typed characters. https://crbug.com/924935. - if (is_user_initiated || !omnibox_already_focused) + if (is_user_initiated || !omnibox_already_focused) { SelectAll(true); + } // |is_user_initiated| is true for focus events from keyboard accelerators. - if (is_user_initiated) + if (is_user_initiated) { model()->StartZeroSuggestRequest(); + } // Restore caret visibility if focus is explicitly requested. This is // necessary because if we already have invisible focus, the RequestFocus() @@ -598,8 +605,9 @@ if (location_bar_view_) { ui::InputMethod* input_method = location_bar_view_->GetWidget()->GetInputMethod(); - if (input_method && input_method->IsInputLocaleCJK()) + if (input_method && input_method->IsInputLocaleCJK()) { return ui::TEXT_INPUT_TYPE_SEARCH; + } } #endif // BUILDFLAG(IS_WIN) return ui::TEXT_INPUT_TYPE_URL; @@ -702,8 +710,9 @@ DCHECK(!ranges.empty()); SetSelectedRange(ranges[0]); - for (size_t i = 1; i < ranges.size(); i++) + for (size_t i = 1; i < ranges.size(); i++) { AddSecondarySelectedRange(ranges[i]); + } UpdateAccessibleTextSelection(); } @@ -755,11 +764,13 @@ bool OmniboxViewViews::HandleEarlyTabActions(const ui::KeyEvent& event) { // This must run before accelerator handling invokes a focus change on tab. // Note the parallel with SkipDefaultKeyEventProcessing above. - if (!views::FocusManager::IsTabTraversalKeyEvent(event)) + if (!views::FocusManager::IsTabTraversalKeyEvent(event)) { return false; + } - if (!model()->PopupIsOpen()) + if (!model()->PopupIsOpen()) { return false; + } model()->OnTabPressed(event.IsShiftDown()); @@ -779,11 +790,13 @@ const gfx::Range range(caret_pos); SetTextAndSelectedRanges(text, {range}); - if (update_popup) + if (update_popup) { UpdatePopup(); + } - if (notify_text_changed) + if (notify_text_changed) { TextChanged(); + } } void OmniboxViewViews::SetCaretPos(size_t caret_pos) { @@ -808,8 +821,9 @@ // depending on whether or not the caret is visible, we have to resend a // "focused" notification. Remove this once we get rid of the concept of // "invisible focus". - if (location_bar_view_) + if (location_bar_view_) { location_bar_view_->OnOmniboxFocused(); + } } void OmniboxViewViews::OnTemporaryTextMaybeChanged( @@ -817,8 +831,9 @@ const AutocompleteMatch& match, bool save_original_selection, bool notify_text_changed) { - if (save_original_selection) + if (save_original_selection) { saved_temporary_selection_ = GetRenderText()->GetAllSelections(); + } // SetWindowTextAndCaretPos will fire the accessibility notification, // so do not also generate redundant notification here. @@ -834,8 +849,9 @@ std::vector<gfx::Range> selections, const std::u16string& prefix_autocompletion, const std::u16string& inline_autocompletion) { - if (display_text == GetText()) + if (display_text == GetText()) { return; + } if (!IsIMEComposing()) { SetTextAndSelectedRanges(display_text, selections); @@ -868,8 +884,9 @@ } void OmniboxViewViews::ClearAccessibilityLabel() { - if (friendly_suggestion_text_.empty()) + if (friendly_suggestion_text_.empty()) { return; + } friendly_suggestion_text_.clear(); friendly_suggestion_text_prefix_length_ = 0; @@ -919,8 +936,9 @@ // If everything is selected, the user likely does not intend to edit the URL. // But if the Home key is pressed, the user probably does want to interact // with the beginning of the URL - in which case we unelide. - if (IsSelectAll() && gesture != UnelisionGesture::HOME_KEY_PRESSED) + if (IsSelectAll() && gesture != UnelisionGesture::HOME_KEY_PRESSED) { return false; + } // Get the original selection bounds so we can adjust it later. size_t start, end; @@ -929,8 +947,9 @@ // Try to unelide. Early exit if there's no unelisions to perform. const std::u16string original_text = GetText(); const std::u16string original_selected_text = GetSelectedText(); - if (!model()->Unelide()) + if (!model()->Unelide()) { return false; + } // Find the length of the prefix that was chopped off to form the elided URL. // This simple logic only works because we elide only prefixes from the full @@ -961,10 +980,12 @@ // the new selection spans to the beginning of the unelided URL too. // i.e. google.com/maps => https://www.google.com/maps // ^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^ - if (start != 0) + if (start != 0) { start += offset; - if (end != 0) + } + if (end != 0) { end += offset; + } } else { start += offset; end += offset; @@ -1018,10 +1039,11 @@ // But we still need to call EmphasizeURLComponents() to make sure the text // attributes are updated correctly. if (something_changed && - (state_changes.text_differs || state_changes.keyword_differs)) + (state_changes.text_differs || state_changes.keyword_differs)) { TextChanged(); - else if (state_changes.selection_differs) + } else if (state_changes.selection_differs) { EmphasizeURLComponents(); + } return something_changed; } @@ -1051,14 +1073,16 @@ } void OmniboxViewViews::ShowVirtualKeyboardIfEnabled() { - if (auto* input_method = GetInputMethod()) + if (auto* input_method = GetInputMethod()) { input_method->SetVirtualKeyboardVisibilityIfEnabled(true); + } } void OmniboxViewViews::HideImeIfNeeded() { if (auto* input_method = GetInputMethod()) { - if (auto* keyboard = input_method->GetVirtualKeyboardController()) + if (auto* keyboard = input_method->GetVirtualKeyboardController()) { keyboard->DismissVirtualKeyboard(); + } } } @@ -1070,20 +1094,23 @@ void OmniboxViewViews::SetEmphasis(bool emphasize, const gfx::Range& range) { const SkColor color = GetColorProvider()->GetColor( emphasize ? kColorOmniboxText : kColorOmniboxTextDimmed); - if (range.IsValid()) + if (range.IsValid()) { ApplyColor(color, range); - else + } else { SetColor(color); + } } void OmniboxViewViews::OnMouseMoved(const ui::MouseEvent& event) { - if (location_bar_view_) + if (location_bar_view_) { location_bar_view_->OnOmniboxHovered(true); + } } void OmniboxViewViews::OnMouseExited(const ui::MouseEvent& event) { - if (location_bar_view_) + if (location_bar_view_) { location_bar_view_->OnOmniboxHovered(false); + } } bool OmniboxViewViews::IsItemForCommandIdDynamic(int command_id) const { @@ -1100,16 +1127,18 @@ ? std::u16string() : GetClipboardText(/*notify_if_restricted=*/false); - if (clipboard_text.empty()) + if (clipboard_text.empty()) { return l10n_util::GetStringUTF16(IDS_PASTE_AND_GO_EMPTY); + } std::u16string selection_text = gfx::TruncateString( clipboard_text, kMaxSelectionTextLength, gfx::WORD_BREAK); AutocompleteMatch match; model()->ClassifyString(clipboard_text, &match, nullptr); - if (AutocompleteMatch::IsSearchType(match.type)) + if (AutocompleteMatch::IsSearchType(match.type)) { return l10n_util::GetStringFUTF16(IDS_PASTE_AND_SEARCH, selection_text); + } // To ensure the search and url strings began to truncate at the exact same // number of characters, the pixel width at which the url begins to elide is @@ -1158,14 +1187,16 @@ // Show on-focus suggestions if either: // - The textfield doesn't already have focus. // - Or if the textfield is empty, to cover the NTP ZeroSuggest case. - if (event.IsOnlyLeftMouseButton() && (!HasFocus() || GetText().empty())) + if (event.IsOnlyLeftMouseButton() && (!HasFocus() || GetText().empty())) { model()->StartZeroSuggestRequest(); + } const bool handled = views::Textfield::OnMousePressed(event); // Reset next double click length - if (event.GetClickCount() == 1) + if (event.GetClickCount() == 1) { next_double_click_selection_len_ = 0; + } if (!select_all_on_mouse_release_) { if (UnapplySteadyStateElisions(UnelisionGesture::OTHER)) { @@ -1218,8 +1249,9 @@ return true; } - if (HasTextBeingDragged()) + if (HasTextBeingDragged()) { CloseOmniboxPopup(); + } const bool handled = views::Textfield::OnMouseDragged(event); @@ -1249,8 +1281,9 @@ // Make an unelision check on mouse release. This handles the drag selection // case, in which we defer uneliding until mouse release. - if (UnapplySteadyStateElisions(UnelisionGesture::MOUSE_RELEASE)) + if (UnapplySteadyStateElisions(UnelisionGesture::MOUSE_RELEASE)) { TextChanged(); + } } void OmniboxViewViews::OnGestureEvent(ui::GestureEvent* event) { @@ -1270,8 +1303,9 @@ // Show on-focus suggestions if either: // - The textfield is taking focus. // - The textfield is focused but empty, to cover the NTP ZeroSuggest case. - if (gesture_should_take_focus || (HasFocus() && GetText().empty())) + if (gesture_should_take_focus || (HasFocus() && GetText().empty())) { model()->StartZeroSuggestRequest(); + } views::Textfield::OnGestureEvent(event); @@ -1308,8 +1342,9 @@ bool OmniboxViewViews::HandleAccessibleAction( const ui::AXActionData& action_data) { - if (GetReadOnly()) + if (GetReadOnly()) { return Textfield::HandleAccessibleAction(action_data); + } if (action_data.action == ax::mojom::Action::kSetValue) { SetUserText(base::UTF8ToUTF16(action_data.value), true); @@ -1368,8 +1403,9 @@ UpdateAccessibleTextOffsetsIfNeeded(); #endif // BUILDFLAG(SUPPORTS_AX_TEXT_OFFSETS) - if (location_bar_view_) + if (location_bar_view_) { location_bar_view_->OnOmniboxFocused(); + } } void OmniboxViewViews::OnBlur() { @@ -1454,9 +1490,10 @@ } bool OmniboxViewViews::IsCommandIdEnabled(int command_id) const { - if (command_id == Textfield::kPaste) + if (command_id == Textfield::kPaste) { return !GetReadOnly() && !GetClipboardText(/*notify_if_restricted=*/false).empty(); + } if (command_id == IDC_PASTE_AND_GO) { return !GetReadOnly() && !IsClipboardDataMarkedAsConfidential() && model()->CanPasteAndGo( @@ -1529,8 +1566,9 @@ base::AutoReset<bool> show_rejection_ui(&show_rejection_ui_if_any_, true); - if (!IsTextEditCommandEnabled(command)) + if (!IsTextEditCommandEnabled(command)) { return; + } switch (command) { case ui::TextEditCommand::MOVE_UP: @@ -1599,16 +1637,18 @@ if (event.type() == ui::EventType::kKeyReleased) { // The omnibox contents may change while the control key is pressed. - if (event.key_code() == ui::VKEY_CONTROL) + if (event.key_code() == ui::VKEY_CONTROL) { model()->OnControlKeyChanged(false); + } return false; } // Skip processing of [Alt]+<num-pad digit> Unicode alt key codes. // Otherwise, if num-lock is off, the events are handled as [Up], [Down], etc. - if (event.IsUnicodeKeyCode()) + if (event.IsUnicodeKeyCode()) { return false; + } // Show a notification if the clipboard is restricted by the rules of the // data leak prevention policy. This state is used by the @@ -1659,8 +1699,9 @@ case ui::VKEY_UP: // Shift-up is handled by the text field class to enable text selection. - if (shift) + if (shift) { return false; + } if (IsTextEditCommandEnabled(ui::TextEditCommand::MOVE_UP)) { ExecuteTextEditCommand(ui::TextEditCommand::MOVE_UP); @@ -1670,8 +1711,9 @@ case ui::VKEY_DOWN: // Shift-down is handled by the text field class to enable text selection. - if (shift) + if (shift) { return false; + } if (IsTextEditCommandEnabled(ui::TextEditCommand::MOVE_DOWN)) { ExecuteTextEditCommand(ui::TextEditCommand::MOVE_DOWN); @@ -1680,14 +1722,16 @@ break; case ui::VKEY_PRIOR: - if (control || alt || shift || GetReadOnly()) + if (control || alt || shift || GetReadOnly()) { return false; + } model()->OnUpOrDownPressed(false, true); return true; case ui::VKEY_NEXT: - if (control || alt || shift || GetReadOnly()) + if (control || alt || shift || GetReadOnly()) { return false; + } model()->OnUpOrDownPressed(true, true); return true; @@ -1711,8 +1755,9 @@ // No extra handling is needed in keyword search mode, if there is a // non-empty selection, or if the cursor is not leading the text. if (model()->is_keyword_hint() || model()->keyword().empty() || - HasSelection() || GetCursorPosition() != 0) + HasSelection() || GetCursorPosition() != 0) { return false; + } model()->ClearKeyword(); return true; @@ -1820,8 +1865,9 @@ if (write_url) { gfx::Image favicon; std::u16string title = selected_text; - if (IsSelectAll()) + if (IsSelectAll()) { model()->GetDataForURLExport(&url, &title, &favicon); + } button_drag_utils::SetURLAndDragImage(url, title, favicon.AsImageSkia(), nullptr, data); data->SetURL(url, title); @@ -1834,8 +1880,9 @@ bool write_url; model()->AdjustTextForCopy(GetSelectedRange().GetMin(), &selected_text, &url, &write_url); - if (write_url) + if (write_url) { *drag_operations |= ui::DragDropTypes::DRAG_LINK; + } } void OmniboxViewViews::AppendDropFormats( @@ -1923,8 +1970,9 @@ base::TimeTicks start_time) { // Track the commit to completion. This state is necessary to ensure the ended // event we get is the one we're waiting for (and not for a previous paint). - if (latency_histogram_state_ == COMPOSITING_COMMIT) + if (latency_histogram_state_ == COMPOSITING_COMMIT) { latency_histogram_state_ = COMPOSITING_STARTED; + } } void OmniboxViewViews::OnDidPresentCompositorFrame( @@ -1975,8 +2023,9 @@ } SetUserText(text); - if (!HasFocus()) + if (!HasFocus()) { RequestFocus(); + } SelectAll(false); output_drag_op = DragOperation::kCopy; } @@ -2019,8 +2068,9 @@ // placeholders are not dim to draw attention to the omnibox and because the // omnibox is unfocused so there's less risk of confusion with user input. // Null in tests. - if (!GetColorProvider()) + if (!GetColorProvider()) { return; + } set_placeholder_text_color(GetColorProvider()->GetColor( model()->keyword_placeholder().empty() ? kColorOmniboxText : kColorOmniboxTextDimmed));
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc index 69bd3959..d7ce37a 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc
@@ -121,8 +121,9 @@ // Move the mouse to the center of the browser window and left-click. void ClickBrowserWindowCenter() { ASSERT_TRUE(ui_test_utils::SendMouseMoveSync( - BrowserView::GetBrowserViewForBrowser( - browser())->GetBoundsInScreen().CenterPoint())); + BrowserView::GetBrowserViewForBrowser(browser()) + ->GetBoundsInScreen() + .CenterPoint())); ASSERT_TRUE(ui_test_utils::SendMouseEventsSync(ui_controls::LEFT, ui_controls::DOWN)); ASSERT_TRUE( @@ -138,8 +139,9 @@ ASSERT_TRUE(ui_test_utils::SendMouseMoveSync(press_location)); ASSERT_TRUE(ui_test_utils::SendMouseEventsSync(button, ui_controls::DOWN)); - if (press_location != release_location) + if (press_location != release_location) { ASSERT_TRUE(ui_test_utils::SendMouseMoveSync(release_location)); + } ASSERT_TRUE(ui_test_utils::SendMouseEventsSync(button, ui_controls::UP)); } @@ -265,11 +267,13 @@ EXPECT_FALSE(omnibox_view->IsSelectAll()); // Clicking in the omnibox should take focus and select all text. - const gfx::Rect omnibox_bounds = BrowserView::GetBrowserViewForBrowser( - browser())->GetViewByID(VIEW_ID_OMNIBOX)->GetBoundsInScreen(); + const gfx::Rect omnibox_bounds = + BrowserView::GetBrowserViewForBrowser(browser()) + ->GetViewByID(VIEW_ID_OMNIBOX) + ->GetBoundsInScreen(); const gfx::Point click_location = omnibox_bounds.CenterPoint(); - ASSERT_NO_FATAL_FAILURE(Click(ui_controls::LEFT, - click_location, click_location)); + ASSERT_NO_FATAL_FAILURE( + Click(ui_controls::LEFT, click_location, click_location)); EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX)); EXPECT_TRUE(omnibox_view->IsSelectAll()); @@ -279,33 +283,34 @@ EXPECT_FALSE(omnibox_view->IsSelectAll()); // Clicking in the omnibox again should take focus and select all text again. - ASSERT_NO_FATAL_FAILURE(Click(ui_controls::LEFT, - click_location, click_location)); + ASSERT_NO_FATAL_FAILURE( + Click(ui_controls::LEFT, click_location, click_location)); EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX)); EXPECT_TRUE(omnibox_view->IsSelectAll()); // Clicking another omnibox spot should keep focus but clear the selection. omnibox_view->SelectAll(false); - const gfx::Point click2_location = omnibox_bounds.origin() + + const gfx::Point click2_location = + omnibox_bounds.origin() + gfx::Vector2d(omnibox_bounds.width() / 4, omnibox_bounds.height() / 4); - ASSERT_NO_FATAL_FAILURE(Click(ui_controls::LEFT, - click2_location, click2_location)); + ASSERT_NO_FATAL_FAILURE( + Click(ui_controls::LEFT, click2_location, click2_location)); EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX)); EXPECT_FALSE(omnibox_view->IsSelectAll()); // Take the focus away and click in the omnibox again, but drag a bit before // releasing. We should focus the omnibox but not select all of its text. ASSERT_NO_FATAL_FAILURE(ClickBrowserWindowCenter()); - ASSERT_NO_FATAL_FAILURE(Click(ui_controls::LEFT, - click_location, click2_location)); + ASSERT_NO_FATAL_FAILURE( + Click(ui_controls::LEFT, click_location, click2_location)); EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX)); EXPECT_FALSE(omnibox_view->IsSelectAll()); // Middle-click is only handled on Linux, by pasting the selection clipboard // and moving the cursor after the pasted text instead of selecting-all. ASSERT_NO_FATAL_FAILURE(ClickBrowserWindowCenter()); - ASSERT_NO_FATAL_FAILURE(Click(ui_controls::MIDDLE, - click_location, click_location)); + ASSERT_NO_FATAL_FAILURE( + Click(ui_controls::MIDDLE, click_location, click_location)); #if BUILDFLAG(IS_LINUX) EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX)); #else @@ -331,8 +336,11 @@ EXPECT_FALSE(omnibox_view->IsSelectAll()); size_t cursor_position = 14; - int cursor_x = render_text->GetCursorBounds( - gfx::SelectionModel(cursor_position, gfx::CURSOR_FORWARD), false).x(); + int cursor_x = + render_text + ->GetCursorBounds( + gfx::SelectionModel(cursor_position, gfx::CURSOR_FORWARD), false) + .x(); gfx::Point click_location = omnibox_view_views->GetBoundsInScreen().origin(); click_location.Offset(cursor_x + render_text->display_rect().x(), omnibox_view_views->height() / 2); @@ -340,8 +348,8 @@ // Middle click focuses the omnibox, pastes, and sets a trailing cursor. // Select-all on focus shouldn't alter the selection clipboard or cursor. SetClipboardText(ui::ClipboardBuffer::kSelection, u"123"); - ASSERT_NO_FATAL_FAILURE(Click(ui_controls::MIDDLE, - click_location, click_location)); + ASSERT_NO_FATAL_FAILURE( + Click(ui_controls::MIDDLE, click_location, click_location)); EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX)); EXPECT_FALSE(omnibox_view->IsSelectAll()); EXPECT_EQ(u"http://www.goo123gle.com/", omnibox_view->GetText()); @@ -353,8 +361,8 @@ // Middle clicking again, with focus, pastes and updates the cursor. SetClipboardText(ui::ClipboardBuffer::kSelection, u"4567"); - ASSERT_NO_FATAL_FAILURE(Click(ui_controls::MIDDLE, - click_location, click_location)); + ASSERT_NO_FATAL_FAILURE( + Click(ui_controls::MIDDLE, click_location, click_location)); EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX)); EXPECT_FALSE(omnibox_view->IsSelectAll()); EXPECT_EQ(u"http://www.goo4567123gle.com/", omnibox_view->GetText()); @@ -376,8 +384,10 @@ EXPECT_FALSE(omnibox_view->IsSelectAll()); // Tapping in the omnibox should take focus and select all text. - const gfx::Rect omnibox_bounds = BrowserView::GetBrowserViewForBrowser( - browser())->GetViewByID(VIEW_ID_OMNIBOX)->GetBoundsInScreen(); + const gfx::Rect omnibox_bounds = + BrowserView::GetBrowserViewForBrowser(browser()) + ->GetViewByID(VIEW_ID_OMNIBOX) + ->GetBoundsInScreen(); const gfx::Point tap_location = omnibox_bounds.CenterPoint(); ASSERT_NO_FATAL_FAILURE(Tap(tap_location, tap_location)); EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX)); @@ -396,7 +406,8 @@ // Tapping another omnibox spot should keep focus and selection. omnibox_view->SelectAll(false); - const gfx::Point tap2_location = omnibox_bounds.origin() + + const gfx::Point tap2_location = + omnibox_bounds.origin() + gfx::Vector2d(omnibox_bounds.width() / 4, omnibox_bounds.height() / 4); ASSERT_NO_FATAL_FAILURE(Tap(tap2_location, tap2_location)); EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX)); @@ -450,8 +461,8 @@ // Pressing tab to focus the omnibox should select all text. while (!ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX)) { - ASSERT_TRUE(ui_test_utils::SendKeyPressSync(browser(), ui::VKEY_TAB, - false, false, false, false)); + ASSERT_TRUE(ui_test_utils::SendKeyPressSync(browser(), ui::VKEY_TAB, false, + false, false, false)); } EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX)); EXPECT_TRUE(omnibox_view->IsSelectAll()); @@ -601,8 +612,10 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, BackgroundIsOpaque) { // The omnibox text should be rendered on an opaque background. Otherwise, we // can't use subpixel rendering. - OmniboxViewViews* view = BrowserView::GetBrowserViewForBrowser(browser())-> - toolbar()->location_bar()->omnibox_view(); + OmniboxViewViews* view = BrowserView::GetBrowserViewForBrowser(browser()) + ->toolbar() + ->location_bar() + ->omnibox_view(); ASSERT_TRUE(view); EXPECT_FALSE(view->GetRenderText()->subpixel_rendering_suppressed()); } @@ -1136,8 +1149,9 @@ // Set omnibox text and wait for autocomplete. omnibox_view->SetUserText(fake_url); - if (!controller->done()) + if (!controller->done()) { ui_test_utils::WaitForAutocompleteDone(browser()); + } ASSERT_TRUE(controller->done()); ASSERT_TRUE(omnibox_view->model()->PopupIsOpen());
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views_unittest.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views_unittest.cc index 126c05ff..d328c9e6 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_view_views_unittest.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_view_views_unittest.cc
@@ -184,8 +184,9 @@ const gfx::Range& range) { // Iterate backwards to get the most recently applied color for |range|. for (const auto& [color, other_range] : base::Reversed(range_colors_)) { - if (range == other_range) + if (range == other_range) { return color; + } } return std::nullopt; } @@ -195,8 +196,9 @@ // Iterate backwards to get the most recently applied style for |range|. for (const auto& [style, value, other_range] : base::Reversed(range_styles_)) { - if (range == other_range) + if (range == other_range) { return std::make_pair(style, value); + } } return std::nullopt; } @@ -468,8 +470,9 @@ void OmniboxViewViewsTest::TearDown() { // Clean ourselves up as the text input client. - if (omnibox_view_->GetInputMethod()) + if (omnibox_view_->GetInputMethod()) { omnibox_view_->GetInputMethod()->DetachTextInputClient(omnibox_view_); + } location_bar()->set_omnibox_view(nullptr); omnibox_view_ = nullptr; @@ -1156,8 +1159,9 @@ GetTextfieldTestApi().ExecuteTextEditCommand(clipboard_command); std::u16string expected_text; - if (clipboard_command == ui::TextEditCommand::COPY) + if (clipboard_command == ui::TextEditCommand::COPY) { expected_text = u"https://test.com/"; + } EXPECT_EQ(expected_text, omnibox_view()->GetText()); // Make sure the plain text format is available, but the HTML one isn't. @@ -1195,8 +1199,9 @@ ui::TextEditCommand clipboard_command = GetParam(); GetTextfieldTestApi().ExecuteTextEditCommand(clipboard_command); - if (clipboard_command == ui::TextEditCommand::CUT) + if (clipboard_command == ui::TextEditCommand::CUT) { EXPECT_EQ(std::u16string(), omnibox_view()->GetText()); + } // Make sure HTML format isn't written. See // BookmarkNodeData::WriteToClipboard() for details.
diff --git a/chrome/browser/ui/views/omnibox/rounded_omnibox_results_frame.cc b/chrome/browser/ui/views/omnibox/rounded_omnibox_results_frame.cc index 8570b1d7..655554c 100644 --- a/chrome/browser/ui/views/omnibox/rounded_omnibox_results_frame.cc +++ b/chrome/browser/ui/views/omnibox/rounded_omnibox_results_frame.cc
@@ -107,8 +107,9 @@ views::Widget* parent_widget = this_widget->parent(); std::unique_ptr<ui::MouseEvent> event( static_cast<ui::MouseEvent*>(this_event->Clone().release())); - if (!parent_widget) + if (!parent_widget) { return {nullptr, std::move(event)}; + } // On macOS if the parent widget is the overlay widget we are in immersive // fullscreen. Don't walk any higher up the tree. The overlay or tab widget will @@ -125,8 +126,9 @@ #endif DCHECK_NE(this_widget, top_level); - if (!top_level) + if (!top_level) { return {nullptr, std::move(event)}; + } gfx::Point event_location = this_event->location(); views::View::ConvertPointToScreen(this_view, &event_location); @@ -174,14 +176,16 @@ // well to catch 'em all. void OnMouseMoved(const ui::MouseEvent& event) override { auto pair = GetParentWidgetAndEvent(this, &event); - if (pair.widget) + if (pair.widget) { pair.widget->OnMouseEvent(pair.event.get()); + } } void OnMouseEvent(ui::MouseEvent* event) override { auto pair = GetParentWidgetAndEvent(this, event); - if (pair.widget) + if (pair.widget) { pair.widget->OnMouseEvent(pair.event.get()); + } // If the original event isn't marked as "handled" then it will propagate up // the view hierarchy and might be double-handled. https://crbug.com/870341 @@ -331,14 +335,16 @@ // well to catch 'em all. void RoundedOmniboxResultsFrame::OnMouseMoved(const ui::MouseEvent& event) { auto pair = GetParentWidgetAndEvent(this, &event); - if (pair.widget) + if (pair.widget) { pair.widget->OnMouseEvent(pair.event.get()); + } } void RoundedOmniboxResultsFrame::OnMouseEvent(ui::MouseEvent* event) { auto pair = GetParentWidgetAndEvent(this, event); - if (pair.widget) + if (pair.widget) { pair.widget->OnMouseEvent(pair.event.get()); + } } #endif // !USE_AURA
diff --git a/chrome/browser/ui/views/overlay/back_to_tab_label_button.cc b/chrome/browser/ui/views/overlay/back_to_tab_label_button.cc index 1471fdc3..cbf135f5 100644 --- a/chrome/browser/ui/views/overlay/back_to_tab_label_button.cc +++ b/chrome/browser/ui/views/overlay/back_to_tab_label_button.cc
@@ -79,19 +79,21 @@ } void BackToTabLabelButton::SetWindowSize(const gfx::Size& window_size) { - if (window_size_.has_value() && window_size_.value() == window_size) + if (window_size_.has_value() && window_size_.value() == window_size) { return; + } window_size_ = window_size; UpdateSizingAndPosition(); } void BackToTabLabelButton::UpdateSizingAndPosition() { - if (!window_size_.has_value()) + if (!window_size_.has_value()) { return; + } SetMaxSize(gfx::Size(window_size_->width() - kBackToTabButtonMargin, - kBackToTabButtonSize)); + kBackToTabButtonSize)); SetSize(CalculatePreferredSize({})); LabelButton::SetPosition( gfx::Point((window_size_->width() / 2) - (size().width() / 2),
diff --git a/chrome/browser/ui/views/overlay/hang_up_button.cc b/chrome/browser/ui/views/overlay/hang_up_button.cc index 25ad71b..f3296075 100644 --- a/chrome/browser/ui/views/overlay/hang_up_button.cc +++ b/chrome/browser/ui/views/overlay/hang_up_button.cc
@@ -21,8 +21,9 @@ } void HangUpButton::OnBoundsChanged(const gfx::Rect& previous_bounds) { - if (size() == previous_bounds.size()) + if (size() == previous_bounds.size()) { return; + } UpdateImage(); }
diff --git a/chrome/browser/ui/views/overlay/playback_image_button.cc b/chrome/browser/ui/views/overlay/playback_image_button.cc index 5750ce2..856ba9d 100644 --- a/chrome/browser/ui/views/overlay/playback_image_button.cc +++ b/chrome/browser/ui/views/overlay/playback_image_button.cc
@@ -72,8 +72,9 @@ void PlaybackImageButton::SetPlaybackState( const VideoOverlayWindowViews::PlaybackState playback_state) { - if (playback_state_ == playback_state) + if (playback_state_ == playback_state) { return; + } playback_state_ = playback_state; UpdateImageAndText();
diff --git a/chrome/browser/ui/views/overlay/resize_handle_button.cc b/chrome/browser/ui/views/overlay/resize_handle_button.cc index 9fda54a6..e823428 100644 --- a/chrome/browser/ui/views/overlay/resize_handle_button.cc +++ b/chrome/browser/ui/views/overlay/resize_handle_button.cc
@@ -92,11 +92,13 @@ void ResizeHandleButton::SetQuadrant( VideoOverlayWindowViews::WindowQuadrant quadrant) { - if (current_quadrant_ == quadrant) + if (current_quadrant_ == quadrant) { return; + } current_quadrant_ = quadrant; - if (GetWidget()) + if (GetWidget()) { UpdateImageForQuadrant(); + } } void ResizeHandleButton::UpdateImageForQuadrant() {
diff --git a/chrome/browser/ui/views/overlay/simple_overlay_window_image_button.cc b/chrome/browser/ui/views/overlay/simple_overlay_window_image_button.cc index 8a5b357..aec0f45c 100644 --- a/chrome/browser/ui/views/overlay/simple_overlay_window_image_button.cc +++ b/chrome/browser/ui/views/overlay/simple_overlay_window_image_button.cc
@@ -34,11 +34,13 @@ void SimpleOverlayWindowImageButton::OnBoundsChanged( const gfx::Rect& previous_bounds) { - if (!size().IsEmpty()) + if (!size().IsEmpty()) { last_visible_size_ = size(); + } - if (size() == previous_bounds.size()) + if (size() == previous_bounds.size()) { return; + } UpdateImage(); }
diff --git a/chrome/browser/ui/views/overlay/toggle_camera_button.cc b/chrome/browser/ui/views/overlay/toggle_camera_button.cc index 511128f..d54ea3d 100644 --- a/chrome/browser/ui/views/overlay/toggle_camera_button.cc +++ b/chrome/browser/ui/views/overlay/toggle_camera_button.cc
@@ -24,15 +24,17 @@ } void ToggleCameraButton::OnBoundsChanged(const gfx::Rect& previous_bounds) { - if (size() == previous_bounds.size()) + if (size() == previous_bounds.size()) { return; + } UpdateImageAndTooltipText(); } void ToggleCameraButton::UpdateImageAndTooltipText() { - if (bounds().IsEmpty()) + if (bounds().IsEmpty()) { return; + } const auto& icon = is_turned_on_ ? vector_icons::kVideocamIcon : vector_icons::kVideocamOffIcon;
diff --git a/chrome/browser/ui/views/overlay/toggle_microphone_button.cc b/chrome/browser/ui/views/overlay/toggle_microphone_button.cc index 6f2be21..28fe47e 100644 --- a/chrome/browser/ui/views/overlay/toggle_microphone_button.cc +++ b/chrome/browser/ui/views/overlay/toggle_microphone_button.cc
@@ -24,15 +24,17 @@ } void ToggleMicrophoneButton::OnBoundsChanged(const gfx::Rect& previous_bounds) { - if (size() == previous_bounds.size()) + if (size() == previous_bounds.size()) { return; + } UpdateImageAndTooltipText(); } void ToggleMicrophoneButton::UpdateImageAndTooltipText() { - if (bounds().IsEmpty()) + if (bounds().IsEmpty()) { return; + } const auto& icon = is_muted_ ? vector_icons::kMicOffIcon : vector_icons::kMicIcon;
diff --git a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc index d47fd98..103e766 100644 --- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc +++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
@@ -272,8 +272,9 @@ } int NonClientHitTest(const gfx::Point& point) override { // Outside of the window bounds, do nothing. - if (!bounds().Contains(point)) + if (!bounds().Contains(point)) { return HTNOWHERE; + } constexpr int kResizeAreaCornerSize = 16; int window_component = GetHTComponentForFrame( @@ -291,8 +292,9 @@ // If the resize handle is clicked on, we want to force the hit test to // force a resize drag. if (window->AreControlsVisible() && - window->GetResizeHandleControlsBounds().Contains(point)) + window->GetResizeHandleControlsBounds().Contains(point)) { return window->GetResizeHTComponent(); + } #endif // Allows for dragging and resizing the window. @@ -481,8 +483,9 @@ const gfx::Rect bounds = GetBounds(); gfx::Size window_size = bounds.size(); - if (!has_been_shown_) + if (!has_been_shown_) { window_size = gfx::Size(work_area.width() / 5, work_area.height() / 5); + } // Even though we define the minimum and maximum sizes for our views::Widget, // it's possible for the current size to be outside of those bounds @@ -674,8 +677,9 @@ !GetWindowBackgroundView()->bounds().Contains(event->location()) && progress_view_drag_state_ == global_media_controls::DragState::kDragEnded; - if (should_update_control_visibility) + if (should_update_control_visibility) { UpdateControlsVisibility(false); + } break; } @@ -815,8 +819,9 @@ void VideoOverlayWindowViews::UpdateMaxSize(const gfx::Rect& work_area) { // An empty |work_area| is not valid, but it is sometimes reported as a // transient value. - if (work_area.IsEmpty()) + if (work_area.IsEmpty()) { return; + } auto new_max_size = gfx::Size(work_area.width() * 0.8, work_area.height() * 0.8); @@ -829,13 +834,15 @@ // size actually changes. Running it unconditionally means also running it // when DPI <-> pixel computations introduce off-by-1 errors, which leads to // incorrect window sizing/positioning. - if (new_max_size == max_size_) + if (new_max_size == max_size_) { return; + } max_size_ = new_max_size; - if (!native_widget()) + if (!native_widget()) { return; + } // native_widget() is required for OnSizeConstraintsChanged. OnSizeConstraintsChanged(); @@ -861,8 +868,9 @@ return overlay_view_->WantsEvent(point_in_screen); } - if (!AreControlsVisible()) + if (!AreControlsVisible()) { return false; + } if (GetBackToTabControlsBounds().Contains(point) || GetSkipAdControlsBounds().Contains(point) || GetCloseControlsBounds().Contains(point) || @@ -1349,8 +1357,9 @@ GetRootView()->layer()->SetMasksToBounds(true); views::View* const contents_view = GetContentsView(); - for (std::unique_ptr<views::View>& child : view_holder_) + for (std::unique_ptr<views::View>& child : view_holder_) { contents_view->AddChildView(std::move(child)); + } view_holder_.clear(); // Don't show the controls until the mouse hovers over the window. @@ -1361,13 +1370,15 @@ gfx::Size window_size) { // This is the case when the window is initially created or the video surface // id has not been embedded. - if (!native_widget() || GetBounds().IsEmpty() || GetNaturalSize().IsEmpty()) + if (!native_widget() || GetBounds().IsEmpty() || GetNaturalSize().IsEmpty()) { return; + } gfx::Rect letterbox_region = media::ComputeLetterboxRegion( gfx::Rect(gfx::Point(0, 0), window_size), GetNaturalSize()); - if (letterbox_region.IsEmpty()) + if (letterbox_region.IsEmpty()) { return; + } // To avoid black stripes in the window when integer window dimensions don't // correspond to the video aspect ratio exactly (e.g. 854x480 for 16:9 @@ -1377,14 +1388,16 @@ if (aspect_ratio > 1 && window_size.height() == letterbox_region.height()) { const int height_from_width = base::ClampRound(window_size.width() / aspect_ratio); - if (height_from_width == window_size.height()) + if (height_from_width == window_size.height()) { letterbox_region.set_width(window_size.width()); + } } else if (aspect_ratio <= 1 && window_size.width() == letterbox_region.width()) { const int width_from_height = base::ClampRound(window_size.height() * aspect_ratio); - if (width_from_height == window_size.width()) + if (width_from_height == window_size.width()) { letterbox_region.set_height(window_size.height()); + } } const gfx::Rect video_bounds( @@ -1399,8 +1412,9 @@ window_background_view_->SetBoundsRect( gfx::Rect(gfx::Point(0, 0), GetBounds().size())); video_view_->SetBoundsRect(video_bounds); - if (video_view_->layer()->has_external_content()) + if (video_view_->layer()->has_external_content()) { video_view_->layer()->SetSurfaceSize(video_bounds.size()); + } if (IsOverlayViewShown()) { overlay_view_->SetBoundsRect(gfx::Rect(GetBounds().size())); @@ -1573,26 +1587,34 @@ // #7 Toggle camera // #8 Hang up std::vector<views::ImageButton*> visible_controls_views; - if (show_previous_track_button_) + if (show_previous_track_button_) { visible_controls_views.push_back(previous_track_controls_view_); - if (show_previous_slide_button_) + } + if (show_previous_slide_button_) { visible_controls_views.push_back(previous_slide_controls_view_); + } if (show_play_pause_button_) { visible_controls_views.push_back(play_pause_controls_view_); } - if (show_next_track_button_) + if (show_next_track_button_) { visible_controls_views.push_back(next_track_controls_view_); - if (show_next_slide_button_) + } + if (show_next_slide_button_) { visible_controls_views.push_back(next_slide_controls_view_); - if (show_toggle_microphone_button_) + } + if (show_toggle_microphone_button_) { visible_controls_views.push_back(toggle_microphone_button_); - if (show_toggle_camera_button_) + } + if (show_toggle_camera_button_) { visible_controls_views.push_back(toggle_camera_button_); - if (show_hang_up_button_) + } + if (show_hang_up_button_) { visible_controls_views.push_back(hang_up_button_); + } - if (visible_controls_views.size() > 4) + if (visible_controls_views.size() > 4) { visible_controls_views.resize(4); + } int mid_window_x = GetBounds().size().width() / 2; int primary_control_y = GetBounds().size().height() - @@ -1791,16 +1813,18 @@ } void VideoOverlayWindowViews::SetPlayPauseButtonVisibility(bool is_visible) { - if (show_play_pause_button_ == is_visible) + if (show_play_pause_button_ == is_visible) { return; + } show_play_pause_button_ = is_visible; UpdateControlsBounds(); } void VideoOverlayWindowViews::SetSkipAdButtonVisibility(bool is_visible) { - if (show_skip_ad_button_ == is_visible) + if (show_skip_ad_button_ == is_visible) { return; + } show_skip_ad_button_ = is_visible; UpdateControlsBounds(); @@ -1808,24 +1832,27 @@ void VideoOverlayWindowViews::SetPreviousSlideButtonVisibility( bool is_visible) { - if (show_previous_slide_button_ == is_visible) + if (show_previous_slide_button_ == is_visible) { return; + } show_previous_slide_button_ = is_visible; UpdateControlsBounds(); } void VideoOverlayWindowViews::SetNextSlideButtonVisibility(bool is_visible) { - if (show_next_slide_button_ == is_visible) + if (show_next_slide_button_ == is_visible) { return; + } show_next_slide_button_ = is_visible; UpdateControlsBounds(); } void VideoOverlayWindowViews::SetNextTrackButtonVisibility(bool is_visible) { - if (show_next_track_button_ == is_visible) + if (show_next_track_button_ == is_visible) { return; + } show_next_track_button_ = is_visible; UpdateControlsBounds(); @@ -1833,8 +1860,9 @@ void VideoOverlayWindowViews::SetPreviousTrackButtonVisibility( bool is_visible) { - if (show_previous_track_button_ == is_visible) + if (show_previous_track_button_ == is_visible) { return; + } show_previous_track_button_ = is_visible; UpdateControlsBounds(); @@ -1856,24 +1884,27 @@ void VideoOverlayWindowViews::SetToggleMicrophoneButtonVisibility( bool is_visible) { - if (show_toggle_microphone_button_ == is_visible) + if (show_toggle_microphone_button_ == is_visible) { return; + } show_toggle_microphone_button_ = is_visible; UpdateControlsBounds(); } void VideoOverlayWindowViews::SetToggleCameraButtonVisibility(bool is_visible) { - if (show_toggle_camera_button_ == is_visible) + if (show_toggle_camera_button_ == is_visible) { return; + } show_toggle_camera_button_ = is_visible; UpdateControlsBounds(); } void VideoOverlayWindowViews::SetHangUpButtonVisibility(bool is_visible) { - if (show_hang_up_button_ == is_visible) + if (show_hang_up_button_ == is_visible) { return; + } show_hang_up_button_ = is_visible; UpdateControlsBounds(); @@ -1961,8 +1992,9 @@ } void VideoOverlayWindowViews::OnGestureEvent(ui::GestureEvent* event) { - if (OnGestureEventHandledOrIgnored(event)) + if (OnGestureEventHandledOrIgnored(event)) { return; + } if (GetBackToTabControlsBounds().Contains(event->location())) { controller_->CloseAndFocusInitiator(); @@ -2244,8 +2276,9 @@ } const viz::FrameSinkId* VideoOverlayWindowViews::GetCurrentFrameSinkId() const { - if (auto* surface = video_view_->layer()->GetSurfaceId()) + if (auto* surface = video_view_->layer()->GetSurfaceId()) { return &surface->frame_sink_id(); + } return nullptr; }
diff --git a/chrome/browser/ui/views/page_action/page_action_icon_loading_indicator_view.cc b/chrome/browser/ui/views/page_action/page_action_icon_loading_indicator_view.cc index ac481be..07d487ab 100644 --- a/chrome/browser/ui/views/page_action/page_action_icon_loading_indicator_view.cc +++ b/chrome/browser/ui/views/page_action/page_action_icon_loading_indicator_view.cc
@@ -27,8 +27,9 @@ } void PageActionIconLoadingIndicatorView::SetAnimating(bool animating) { - if (!throbber_start_time_ == !animating) + if (!throbber_start_time_ == !animating) { return; + } SetVisible(animating); if (animating) { @@ -46,8 +47,9 @@ } void PageActionIconLoadingIndicatorView::OnPaint(gfx::Canvas* canvas) { - if (!throbber_start_time_) + if (!throbber_start_time_) { return; + } const SkColor color = GetColorProvider()->GetColor(ui::kColorThrobber); constexpr int kThrobberStrokeWidth = 2;
diff --git a/chrome/browser/ui/views/page_action/pwa_install_view.cc b/chrome/browser/ui/views/page_action/pwa_install_view.cc index b03cb84..b6470a0 100644 --- a/chrome/browser/ui/views/page_action/pwa_install_view.cc +++ b/chrome/browser/ui/views/page_action/pwa_install_view.cc
@@ -220,9 +220,8 @@ #endif web_app::CreateWebAppFromManifest( - GetWebContents(), - webapps::WebappInstallSource::OMNIBOX_INSTALL_ICON, base::DoNothing(), - iph_state); + GetWebContents(), webapps::WebappInstallSource::OMNIBOX_INSTALL_ICON, + base::DoNothing(), iph_state); } views::BubbleDialogDelegate* PwaInstallView::GetBubble() const {
diff --git a/chrome/browser/ui/views/page_action/zoom_view.cc b/chrome/browser/ui/views/page_action/zoom_view.cc index e5d7afa..c9e13f6 100644 --- a/chrome/browser/ui/views/page_action/zoom_view.cc +++ b/chrome/browser/ui/views/page_action/zoom_view.cc
@@ -38,14 +38,17 @@ } bool ZoomView::ShouldBeVisible(bool can_show_bubble) const { - if (delegate()->ShouldHidePageActionIcons()) + if (delegate()->ShouldHidePageActionIcons()) { return false; + } - if (can_show_bubble) + if (can_show_bubble) { return true; + } - if (HasAssociatedBubble()) + if (HasAssociatedBubble()) { return true; + } DCHECK(GetWebContents()); zoom::ZoomController* zoom_controller = @@ -54,21 +57,24 @@ } bool ZoomView::HasAssociatedBubble() const { - if (!GetBubble()) + if (!GetBubble()) { return false; + } // Bubbles may be hosted in their own widget so use their anchor view as a // more reliable way of determining whether this icon belongs to the same // browser window. - if (!GetBubble()->GetAnchorView()) + if (!GetBubble()->GetAnchorView()) { return false; + } return GetBubble()->GetAnchorView()->GetWidget() == GetWidget(); } void ZoomView::ZoomChangedForActiveTab(bool can_show_bubble) { content::WebContents* web_contents = GetWebContents(); - if (!web_contents) + if (!web_contents) { return; + } if (ShouldBeVisible(can_show_bubble)) { zoom::ZoomController* zoom_controller = @@ -79,11 +85,10 @@ IDS_TOOLTIP_ZOOM, base::FormatPercent(current_zoom_percent_))); // The icon is hidden when the zoom level is default. - icon_ = - zoom_controller && zoom_controller->GetZoomRelativeToDefault() == - zoom::ZoomController::ZOOM_BELOW_DEFAULT_ZOOM - ? &kZoomMinusChromeRefreshIcon - : &kZoomPlusChromeRefreshIcon; + icon_ = zoom_controller && zoom_controller->GetZoomRelativeToDefault() == + zoom::ZoomController::ZOOM_BELOW_DEFAULT_ZOOM + ? &kZoomMinusChromeRefreshIcon + : &kZoomPlusChromeRefreshIcon; UpdateIconImage(); // Visibility must be enabled before the bubble is shown to ensure the @@ -98,8 +103,9 @@ } else { // Close the bubble first to ensure focus is not lost when SetVisible(false) // is called. See crbug.com/913829. - if (HasAssociatedBubble()) + if (HasAssociatedBubble()) { ZoomBubbleView::CloseCurrentBubble(); + } SetVisible(false); } }
diff --git a/chrome/browser/ui/views/page_info/about_this_site_side_panel_coordinator.cc b/chrome/browser/ui/views/page_info/about_this_site_side_panel_coordinator.cc index 6906530..f9a38fc 100644 --- a/chrome/browser/ui/views/page_info/about_this_site_side_panel_coordinator.cc +++ b/chrome/browser/ui/views/page_info/about_this_site_side_panel_coordinator.cc
@@ -11,8 +11,8 @@ #include "chrome/browser/ui/page_info/about_this_site_side_panel.h" #include "chrome/browser/ui/views/chrome_layout_provider.h" #include "chrome/browser/ui/views/frame/browser_view.h" -#include "chrome/browser/ui/views/page_info/web_view_side_panel_view.h" #include "chrome/browser/ui/views/page_info/page_info_view_factory.h" +#include "chrome/browser/ui/views/page_info/web_view_side_panel_view.h" #include "chrome/browser/ui/views/side_panel/side_panel_entry.h" #include "chrome/browser/ui/views/side_panel/side_panel_registry.h" #include "chrome/browser/ui/views/side_panel/side_panel_ui.h"
diff --git a/chrome/browser/ui/views/page_info/about_this_site_side_panel_coordinator.h b/chrome/browser/ui/views/page_info/about_this_site_side_panel_coordinator.h index a404caf6..d190e23 100644 --- a/chrome/browser/ui/views/page_info/about_this_site_side_panel_coordinator.h +++ b/chrome/browser/ui/views/page_info/about_this_site_side_panel_coordinator.h
@@ -20,7 +20,7 @@ namespace views { class View; -} // namespace views +} // namespace views // AboutThisSideSidePanelCoordinator handles the creation and registration of // the WebViewSidePanelView.
diff --git a/chrome/browser/ui/views/page_info/merchant_trust_side_panel_coordinator_browsertest.cc b/chrome/browser/ui/views/page_info/merchant_trust_side_panel_coordinator_browsertest.cc index f22fb48..2f261e2f8 100644 --- a/chrome/browser/ui/views/page_info/merchant_trust_side_panel_coordinator_browsertest.cc +++ b/chrome/browser/ui/views/page_info/merchant_trust_side_panel_coordinator_browsertest.cc
@@ -49,8 +49,7 @@ class MockMerchantTrustService : public page_info::MerchantTrustService { public: - MockMerchantTrustService() - : MerchantTrustService(nullptr, false, nullptr) {} + MockMerchantTrustService() : MerchantTrustService(nullptr, false, nullptr) {} MOCK_METHOD(void, GetMerchantTrustInfo, (const GURL&, page_info::MerchantDataCallback),
diff --git a/chrome/browser/ui/views/page_info/page_info_ad_personalization_content_view.cc b/chrome/browser/ui/views/page_info/page_info_ad_personalization_content_view.cc index e1ce9bd..f0126d2 100644 --- a/chrome/browser/ui/views/page_info/page_info_ad_personalization_content_view.cc +++ b/chrome/browser/ui/views/page_info/page_info_ad_personalization_content_view.cc
@@ -56,8 +56,7 @@ PageInfoViewFactory::GetSiteSettingsIcon(), l10n_util::GetStringUTF16( IDS_PAGE_INFO_AD_PRIVACY_SUBPAGE_MANAGE_BUTTON), - std::u16string(), - PageInfoViewFactory::GetLaunchIcon())); + std::u16string(), PageInfoViewFactory::GetLaunchIcon())); manage_ad_privacy_button->SetTitleTextStyleAndColor( views::style::STYLE_BODY_3_MEDIUM, kColorPageInfoForeground);
diff --git a/chrome/browser/ui/views/page_info/page_info_bubble_view_base.cc b/chrome/browser/ui/views/page_info/page_info_bubble_view_base.cc index 09eafa6..866c5d0d 100644 --- a/chrome/browser/ui/views/page_info/page_info_bubble_view_base.cc +++ b/chrome/browser/ui/views/page_info/page_info_bubble_view_base.cc
@@ -59,8 +59,9 @@ SetShowCloseButton(true); set_parent_window(parent_window); - if (!anchor_view) + if (!anchor_view) { SetAnchorRect(anchor_rect); + } } void PageInfoBubbleViewBase::OnWidgetDestroying(views::Widget* widget) { @@ -78,8 +79,9 @@ void PageInfoBubbleViewBase::OnVisibilityChanged( content::Visibility visibility) { - if (visibility == content::Visibility::HIDDEN) + if (visibility == content::Visibility::HIDDEN) { GetWidget()->Close(); + } } void PageInfoBubbleViewBase::PrimaryPageChanged(content::Page& page) {
diff --git a/chrome/browser/ui/views/page_info/page_info_bubble_view_browsertest.cc b/chrome/browser/ui/views/page_info/page_info_bubble_view_browsertest.cc index d9955ad..d60755a6 100644 --- a/chrome/browser/ui/views/page_info/page_info_bubble_view_browsertest.cc +++ b/chrome/browser/ui/views/page_info/page_info_bubble_view_browsertest.cc
@@ -263,22 +263,22 @@ presenter->ui_for_testing()->SetIdentityInfo(identity_info); } - std::u16string GetCertificateButtonTitle() const { + std::u16string_view GetCertificateButtonTitle() const { // Only PageInfoBubbleViewBrowserTest can access certificate_button_ in // PageInfoBubbleView, or title() in HoverButton. auto* certificate_button = static_cast<RichHoverButton*>( PageInfoBubbleView::GetPageInfoBubbleForTesting()->GetViewByID( PageInfoViewFactory:: VIEW_ID_PAGE_INFO_LINK_OR_BUTTON_CERTIFICATE_VIEWER)); - return certificate_button->GetTitleViewForTesting()->GetText(); + return certificate_button->GetTitleText(); } - std::u16string GetCertificateButtonSubtitle() const { + std::u16string_view GetCertificateButtonSubtitle() const { auto* certificate_button = static_cast<RichHoverButton*>( PageInfoBubbleView::GetPageInfoBubbleForTesting()->GetViewByID( PageInfoViewFactory:: VIEW_ID_PAGE_INFO_LINK_OR_BUTTON_CERTIFICATE_VIEWER)); - return certificate_button->GetSubTitleViewForTesting()->GetText(); + return certificate_button->GetSubtitleText(); } const std::u16string GetPageInfoBubbleViewDetailText() { @@ -295,14 +295,12 @@ return static_cast<views::StyledLabel*>(label)->GetText(); } - const std::u16string GetSecurityInformationButtonText() { + std::u16string_view GetSecurityInformationButtonText() { auto* button = PageInfoBubbleView::GetPageInfoBubbleForTesting()->GetViewByID( PageInfoViewFactory:: VIEW_ID_PAGE_INFO_LINK_OR_BUTTON_SECURITY_INFORMATION); - return static_cast<RichHoverButton*>(button) - ->GetTitleViewForTesting() - ->GetText(); + return static_cast<RichHoverButton*>(button)->GetTitleText(); } void SetupSentimentServiceExpectations(bool interacted) {
diff --git a/chrome/browser/ui/views/page_info/page_info_bubble_view_dialog_browsertest.cc b/chrome/browser/ui/views/page_info/page_info_bubble_view_dialog_browsertest.cc index a20fc3b..dad8a48 100644 --- a/chrome/browser/ui/views/page_info/page_info_bubble_view_dialog_browsertest.cc +++ b/chrome/browser/ui/views/page_info/page_info_bubble_view_dialog_browsertest.cc
@@ -1120,7 +1120,7 @@ : public DialogBrowserTest { public: PageInfoBubbleViewMerchantTrustDialogBrowserTest() { - std::vector<base::test::FeatureRefAndParams> enabled_features = { + std::vector<base::test::FeatureRefAndParams> enabled_features = { {page_info::kMerchantTrust, {{page_info::kMerchantTrustForceShowUIForTestingName, "true"}}}, {page_info::kPageInfoAboutThisSiteMoreLangs, {}}};
diff --git a/chrome/browser/ui/views/page_info/page_info_bubble_view_interactive_uitest.cc b/chrome/browser/ui/views/page_info/page_info_bubble_view_interactive_uitest.cc index ecf37c3..1d49cd7 100644 --- a/chrome/browser/ui/views/page_info/page_info_bubble_view_interactive_uitest.cc +++ b/chrome/browser/ui/views/page_info/page_info_bubble_view_interactive_uitest.cc
@@ -71,8 +71,9 @@ // is already in the desired state, returns immediately, otherwise waits until // it is. void WaitForFocus(bool target_state_is_focused) { - if (focused_ == target_state_is_focused) + if (focused_ == target_state_is_focused) { return; + } target_state_is_focused_ = target_state_is_focused; run_loop_.Run(); } @@ -83,14 +84,16 @@ void OnFocused() { focused_ = true; - if (run_loop_.running() && target_state_is_focused_ == focused_) + if (run_loop_.running() && target_state_is_focused_ == focused_) { run_loop_.Quit(); + } } void OnBlurred() { focused_ = false; - if (run_loop_.running() && target_state_is_focused_ == focused_) + if (run_loop_.running() && target_state_is_focused_ == focused_) { run_loop_.Quit(); + } } private: @@ -124,10 +127,12 @@ private: static bool IsWebContentsFocused(content::WebContents* web_contents) { Browser* const browser = chrome::FindBrowserWithTab(web_contents); - if (!browser) + if (!browser) { return false; - if (browser->tab_strip_model()->GetActiveWebContents() != web_contents) + } + if (browser->tab_strip_model()->GetActiveWebContents() != web_contents) { return false; + } return BrowserView::GetBrowserViewForBrowser(browser) ->contents_web_view() ->HasFocus();
diff --git a/chrome/browser/ui/views/page_info/page_info_bubble_view_unittest.cc b/chrome/browser/ui/views/page_info/page_info_bubble_view_unittest.cc index 36a68c4..45b8762 100644 --- a/chrome/browser/ui/views/page_info/page_info_bubble_view_unittest.cc +++ b/chrome/browser/ui/views/page_info/page_info_bubble_view_unittest.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/views/page_info/page_info_bubble_view.h" +#include <string_view> + #include "base/memory/raw_ptr.h" #include "base/strings/utf_string_conversions.h" #include "base/test/metrics/histogram_tester.h" @@ -246,13 +248,11 @@ return base::ASCIIToUTF16(name); } - std::u16string GetSecurityInformationButtonText() { + std::u16string_view GetSecurityInformationButtonText() { auto* button = bubble_delegate_->GetViewByID( PageInfoViewFactory:: VIEW_ID_PAGE_INFO_LINK_OR_BUTTON_SECURITY_INFORMATION); - return static_cast<RichHoverButton*>(button) - ->GetTitleViewForTesting() - ->GetText(); + return static_cast<RichHoverButton*>(button)->GetTitleText(); } std::u16string GetSecuritySummaryText() { @@ -261,12 +261,10 @@ ->GetText(); } - std::u16string GetCookiesButtonTitleText() { + std::u16string_view GetCookiesButtonTitleText() { auto* button = bubble_delegate_->GetViewByID( PageInfoViewFactory::VIEW_ID_PAGE_INFO_LINK_OR_BUTTON_COOKIES_SUBPAGE); - return static_cast<RichHoverButton*>(button) - ->GetTitleViewForTesting() - ->GetText(); + return static_cast<RichHoverButton*>(button)->GetTitleText(); } std::u16string GetPermissionLabelTextAt(int index) { @@ -289,8 +287,9 @@ // Non-empty permission section has a reset all button // after all permission rows. - if (actual_count) + if (actual_count) { --actual_count; + } return actual_count; } @@ -313,10 +312,9 @@ CreateView(); } - std::u16string GetCertificateButtonSubtitleText() const { + std::u16string_view GetCertificateButtonSubtitleText() const { EXPECT_TRUE(certificate_button()); - EXPECT_TRUE(certificate_button()->GetSubTitleViewForTesting()); - return certificate_button()->GetSubTitleViewForTesting()->GetText(); + return certificate_button()->GetSubtitleText(); } const views::View::Views& GetChosenObjectChildren() { @@ -394,8 +392,9 @@ HistoryServiceFactory::GetDefaultFactory()}}); EXPECT_TRUE(profile_); - if (off_the_record) + if (off_the_record) { profile_ = profile_->GetPrimaryOTRProfile(/*create_if_needed=*/true); + } web_contents_ = factory_.CreateWebContents(profile_); } @@ -460,9 +459,7 @@ web_contents); } - void TearDown() override { - parent_window_->CloseNow(); - } + void TearDown() override { parent_window_->CloseNow(); } protected: std::unique_ptr<ScopedWebContentsTestHelper> web_contents_helper_;
diff --git a/chrome/browser/ui/views/page_info/page_info_cookies_content_view.cc b/chrome/browser/ui/views/page_info/page_info_cookies_content_view.cc index b4c3e5a..fab1532 100644 --- a/chrome/browser/ui/views/page_info/page_info_cookies_content_view.cc +++ b/chrome/browser/ui/views/page_info/page_info_cookies_content_view.cc
@@ -398,10 +398,9 @@ PageInfoViewFactory::GetImageModel(vector_icons::kTenancyIcon), l10n_util::GetStringUTF16(IDS_PAGE_INFO_COOKIES), /*secondary_text=*/u" ", PageInfoViewFactory::GetLaunchIcon(), - is_managed ? std::optional<ui::ImageModel>( - PageInfoViewFactory::GetImageModel( - vector_icons::kBusinessIcon)) - : std::nullopt)); + is_managed + ? PageInfoViewFactory::GetImageModel(vector_icons::kBusinessIcon) + : ui::ImageModel())); rws_button_->SetID( PageInfoViewFactory::VIEW_ID_PAGE_INFO_LINK_OR_BUTTON_RWS_SETTINGS); rws_button_->SetTooltipText(
diff --git a/chrome/browser/ui/views/page_info/page_info_cookies_content_view_unittest.cc b/chrome/browser/ui/views/page_info/page_info_cookies_content_view_unittest.cc index 7dbd0b9..9db91a95 100644 --- a/chrome/browser/ui/views/page_info/page_info_cookies_content_view_unittest.cc +++ b/chrome/browser/ui/views/page_info/page_info_cookies_content_view_unittest.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/ui/views/page_info/page_info_cookies_content_view.h" #include <memory> +#include <string_view> #include "base/test/scoped_feature_list.h" #include "chrome/browser/ui/layout_constants.h" @@ -35,13 +36,11 @@ using Status = ::content_settings::TrackingProtectionBlockingStatus; using FeatureType = ::content_settings::TrackingProtectionFeatureType; -std::u16string GetManageButtonSubtitle(views::View* content_view) { +std::u16string_view GetManageButtonSubtitle(views::View* content_view) { auto* manage_button = content_view->GetViewByID( PageInfoViewFactory::VIEW_ID_PAGE_INFO_LINK_OR_BUTTON_COOKIE_DIALOG); EXPECT_TRUE(manage_button); - auto* managed_button_subtitle = - static_cast<RichHoverButton*>(manage_button)->GetSubTitleViewForTesting(); - return managed_button_subtitle->GetText(); + return static_cast<RichHoverButton*>(manage_button)->GetSubtitleText(); } const char* GetVectorIconName(views::ImageView* image_view) {
diff --git a/chrome/browser/ui/views/page_info/page_info_history_controller.cc b/chrome/browser/ui/views/page_info/page_info_history_controller.cc index 803b8077..913aafd 100644 --- a/chrome/browser/ui/views/page_info/page_info_history_controller.cc +++ b/chrome/browser/ui/views/page_info/page_info_history_controller.cc
@@ -42,8 +42,9 @@ void PageInfoHistoryController::UpdateRow( std::optional<base::Time> last_visit) { - if (!container_tracker_.view()) + if (!container_tracker_.view()) { return; + } auto* container_view = static_cast<PageInfoMainView::ContainerView*>(container_tracker_.view());
diff --git a/chrome/browser/ui/views/page_info/page_info_main_view.cc b/chrome/browser/ui/views/page_info/page_info_main_view.cc index 1d6b8df..33324ef 100644 --- a/chrome/browser/ui/views/page_info/page_info_main_view.cc +++ b/chrome/browser/ui/views/page_info/page_info_main_view.cc
@@ -633,23 +633,21 @@ : l10n_util::GetStringUTF16( IDS_PAGE_INFO_ABOUT_THIS_PAGE_DESCRIPTION_PLACEHOLDER); - auto about_this_site_button = - std::make_unique<RichHoverButton>( - base::BindRepeating( - [](PageInfoMainView* view, GURL more_info_url, - bool has_description, const ui::Event& event) { - page_info::AboutThisSiteService::OnAboutThisSiteRowClicked( - has_description); - view->presenter_->RecordPageInfoAction( - page_info::PAGE_INFO_ABOUT_THIS_SITE_PAGE_OPENED); - view->ui_delegate_->OpenMoreAboutThisPageUrl(more_info_url, - event); - view->GetWidget()->Close(); - }, - this, GURL(info.more_about().url()), info.has_description()), - PageInfoViewFactory::GetImageModel( - PageInfoViewFactory::GetAboutThisSiteVectorIcon()), - title, description, PageInfoViewFactory::GetLaunchIcon()); + auto about_this_site_button = std::make_unique<RichHoverButton>( + base::BindRepeating( + [](PageInfoMainView* view, GURL more_info_url, bool has_description, + const ui::Event& event) { + page_info::AboutThisSiteService::OnAboutThisSiteRowClicked( + has_description); + view->presenter_->RecordPageInfoAction( + page_info::PAGE_INFO_ABOUT_THIS_SITE_PAGE_OPENED); + view->ui_delegate_->OpenMoreAboutThisPageUrl(more_info_url, event); + view->GetWidget()->Close(); + }, + this, GURL(info.more_about().url()), info.has_description()), + PageInfoViewFactory::GetImageModel( + PageInfoViewFactory::GetAboutThisSiteVectorIcon()), + title, description, PageInfoViewFactory::GetLaunchIcon()); about_this_site_button->SetID( PageInfoViewFactory::VIEW_ID_PAGE_INFO_ABOUT_THIS_SITE_BUTTON); about_this_site_button->SetSubtitleMultiline(false);
diff --git a/chrome/browser/ui/views/page_info/page_info_merchant_trust_coordinator.h b/chrome/browser/ui/views/page_info/page_info_merchant_trust_coordinator.h index 4719db61..88cb55f 100644 --- a/chrome/browser/ui/views/page_info/page_info_merchant_trust_coordinator.h +++ b/chrome/browser/ui/views/page_info/page_info_merchant_trust_coordinator.h
@@ -26,7 +26,6 @@ // views::ViewObserver void OnViewIsDeleting(views::View* observed_view) override; - std::unique_ptr<PageInfoMerchantTrustController> controller_; raw_ptr<PageInfoMerchantTrustContentView> content_view_; };
diff --git a/chrome/browser/ui/views/page_info/page_info_security_content_view.cc b/chrome/browser/ui/views/page_info/page_info_security_content_view.cc index e6d0d65..dd8391a 100644 --- a/chrome/browser/ui/views/page_info/page_info_security_content_view.cc +++ b/chrome/browser/ui/views/page_info/page_info_security_content_view.cc
@@ -30,8 +30,9 @@ ->GetInsetsMetric(views::INSETS_DIALOG) .left())); - if (is_standalone_page) + if (is_standalone_page) { presenter_->InitializeUiState(this, base::DoNothing()); + } } PageInfoSecurityContentView::~PageInfoSecurityContentView() = default; @@ -139,17 +140,17 @@ if (certificate_button_) { RemoveChildViewT(certificate_button_.get()); } - certificate_button_ = AddChildView( - std::make_unique<RichHoverButton>( - base::BindRepeating( - [](PageInfoSecurityContentView* view) { - view->presenter_->OpenCertificateDialog( - view->certificate_.get()); - }, - this), - icon, l10n_util::GetStringUTF16(title_id), subtitle_text, - PageInfoViewFactory::GetLaunchIcon()) - .release()); + certificate_button_ = + AddChildView(std::make_unique<RichHoverButton>( + base::BindRepeating( + [](PageInfoSecurityContentView* view) { + view->presenter_->OpenCertificateDialog( + view->certificate_.get()); + }, + this), + icon, l10n_util::GetStringUTF16(title_id), + subtitle_text, PageInfoViewFactory::GetLaunchIcon()) + .release()); certificate_button_->SetID( PageInfoViewFactory:: VIEW_ID_PAGE_INFO_LINK_OR_BUTTON_CERTIFICATE_VIEWER);
diff --git a/chrome/browser/ui/views/page_info/permission_toggle_row_view.cc b/chrome/browser/ui/views/page_info/permission_toggle_row_view.cc index 682797f8..ce53199 100644 --- a/chrome/browser/ui/views/page_info/permission_toggle_row_view.cc +++ b/chrome/browser/ui/views/page_info/permission_toggle_row_view.cc
@@ -82,8 +82,9 @@ // Add extra details as sublabel. std::u16string detail = delegate->GetPermissionDetail(permission.type); - if (!detail.empty()) + if (!detail.empty()) { row_view_->AddSecondaryLabel(detail); + } if (permission.requesting_origin.has_value()) { std::u16string requesting_origin_string;
diff --git a/chrome/browser/ui/views/page_info/safety_tip_page_info_bubble_view.cc b/chrome/browser/ui/views/page_info/safety_tip_page_info_bubble_view.cc index 5feefbb..bbc9cb60 100644 --- a/chrome/browser/ui/views/page_info/safety_tip_page_info_bubble_view.cc +++ b/chrome/browser/ui/views/page_info/safety_tip_page_info_bubble_view.cc
@@ -230,8 +230,9 @@ const GURL& suggested_url, base::OnceCallback<void(SafetyTipInteraction)> close_callback) { Browser* browser = chrome::FindBrowserWithTab(web_contents); - if (!browser) + if (!browser) { return; + } bubble_anchor_util::AnchorConfiguration configuration = bubble_anchor_util::GetPageInfoAnchorConfiguration(
diff --git a/chrome/browser/ui/views/passwords/manage_passwords_list_view.cc b/chrome/browser/ui/views/passwords/manage_passwords_list_view.cc index 37e3725..84dca06 100644 --- a/chrome/browser/ui/views/passwords/manage_passwords_list_view.cc +++ b/chrome/browser/ui/views/passwords/manage_passwords_list_view.cc
@@ -36,7 +36,7 @@ SetOrientation(views::BoxLayout::Orientation::kVertical); for (const std::unique_ptr<password_manager::PasswordForm>& password_form : credentials) { - std::optional<ui::ImageModel> store_icon = std::nullopt; + ui::ImageModel store_icon; if (is_account_storage_available && !password_form->IsUsingAccountStore()) { store_icon = ui::ImageModel::FromVectorIcon( vector_icons::kNotUploadedIcon, ui::kColorIcon, gfx::kFaviconSize); @@ -97,8 +97,7 @@ /*action_image_icon=*/ ui::ImageModel::FromVectorIcon( vector_icons::kLaunchIcon, ui::kColorIconSecondary, - GetLayoutConstant(PAGE_INFO_ICON_SIZE)), - /*state_icon=*/std::nullopt)); + GetLayoutConstant(PAGE_INFO_ICON_SIZE)))); manage_passwords_button->SetID(static_cast<int>( password_manager::ManagePasswordsViewIDs::kManagePasswordsButton)); manage_passwords_button->SetTooltipText(
diff --git a/chrome/browser/ui/views/payments/contact_info_editor_view_controller.cc b/chrome/browser/ui/views/payments/contact_info_editor_view_controller.cc index 2f60966..4d83829 100644 --- a/chrome/browser/ui/views/payments/contact_info_editor_view_controller.cc +++ b/chrome/browser/ui/views/payments/contact_info_editor_view_controller.cc
@@ -55,8 +55,9 @@ std::vector<EditorField> ContactInfoEditorViewController::GetFieldDefinitions() { std::vector<EditorField> fields; - if (!spec()) + if (!spec()) { return fields; + } if (spec()->request_payer_name()) { fields.push_back(EditorField( @@ -82,22 +83,25 @@ std::u16string ContactInfoEditorViewController::GetInitialValueForType( autofill::FieldType type) { - if (!profile_to_edit_) + if (!profile_to_edit_) { return std::u16string(); + } return GetValueForType(*profile_to_edit_, type); } bool ContactInfoEditorViewController::ValidateModelAndSave() { // TODO(crbug.com/40515884): Move this method and its helpers to a base class // shared with the Shipping Address editor. - if (!ValidateInputFields()) + if (!ValidateInputFields()) { return false; + } if (profile_to_edit_) { PopulateProfile(profile_to_edit_); - if (!is_incognito()) + if (!is_incognito()) { state()->GetPersonalDataManager()->address_data_manager().UpdateProfile( *profile_to_edit_); + } state()->profile_comparator()->Invalidate(*profile_to_edit_); std::move(on_edited_).Run(); on_added_.Reset(); @@ -108,9 +112,10 @@ std::make_unique<autofill::AutofillProfile>( autofill::i18n_model_definition::kLegacyHierarchyCountryCode); PopulateProfile(profile.get()); - if (!is_incognito()) + if (!is_incognito()) { state()->GetPersonalDataManager()->address_data_manager().AddProfile( *profile); + } std::move(on_added_).Run(*profile); on_edited_.Reset(); } @@ -200,8 +205,9 @@ bool ContactInfoEditorViewController::ContactInfoValidationDelegate:: TextfieldValueChanged(views::Textfield* textfield, bool was_blurred) { - if (!was_blurred) + if (!was_blurred) { return true; + } std::u16string error_message; bool is_valid = ValidateTextfield(textfield, &error_message); @@ -212,8 +218,9 @@ bool ContactInfoEditorViewController::ContactInfoValidationDelegate:: ValidateTextfield(views::Textfield* textfield, std::u16string* error_message) { - if (!controller_->spec()) + if (!controller_->spec()) { return false; + } // Show errors from merchant's retry() call. autofill::AutofillProfile* invalid_contact_profile = @@ -222,8 +229,9 @@ textfield->GetText() == controller_->GetValueForType(*invalid_contact_profile, field_.type)) { *error_message = controller_->spec()->GetPayerError(field_.type); - if (!error_message->empty()) + if (!error_message->empty()) { return false; + } } bool is_valid = true;
diff --git a/chrome/browser/ui/views/payments/editor_view_controller.cc b/chrome/browser/ui/views/payments/editor_view_controller.cc index f13f962..d7e0d9b 100644 --- a/chrome/browser/ui/views/payments/editor_view_controller.cc +++ b/chrome/browser/ui/views/payments/editor_view_controller.cc
@@ -107,12 +107,14 @@ bool EditorViewController::ValidateInputFields() { for (const auto& field : text_fields()) { - if (!field.first->IsValid()) + if (!field.first->IsValid()) { return false; + } } for (const auto& field : comboboxes()) { - if (!field.first->IsValid()) + if (!field.first->IsValid()) { return false; + } } return true; } @@ -179,8 +181,9 @@ } views::View* EditorViewController::GetFirstFocusedView() { - if (initial_focus_field_view_) + if (initial_focus_field_view_) { return initial_focus_field_view_; + } return PaymentRequestSheetController::GetFirstFocusedView(); } @@ -196,8 +199,9 @@ combobox->GetViewAccessibility().SetName(field.label); std::u16string initial_value = GetInitialValueForType(field.type); - if (!initial_value.empty()) + if (!initial_value.empty()) { combobox->SelectValue(initial_value); + } if (IsEditingExistingItem()) { combobox->SetInvalid( !delegate_ptr->IsValidCombobox(combobox.get(), error_message)); @@ -248,14 +252,17 @@ bool valid = false; views::View* focusable_field = CreateInputField(editor_view.get(), field, &valid); - if (!first_field) + if (!first_field) { first_field = focusable_field; - if (!initial_focus_field_view_ && !valid) + } + if (!initial_focus_field_view_ && !valid) { initial_focus_field_view_ = focusable_field; + } } - if (!initial_focus_field_view_) + if (!initial_focus_field_view_) { initial_focus_field_view_ = first_field; + } // Validate all fields and disable the primary (Done) button if necessary. primary_button()->SetEnabled(ValidateInputFields()); @@ -359,11 +366,13 @@ text_field->GetViewAccessibility().SetName(field.label); *valid = IsEditingExistingItem() && delegate_ptr->IsValidTextfield(text_field.get(), &error_message); - if (IsEditingExistingItem()) + if (IsEditingExistingItem()) { text_field->SetInvalid(!(*valid)); + } - if (field.control_type == EditorField::ControlType::TEXTFIELD_NUMBER) + if (field.control_type == EditorField::ControlType::TEXTFIELD_NUMBER) { text_field->SetTextInputType(ui::TextInputType::TEXT_INPUT_TYPE_NUMBER); + } text_field->set_controller(this); // Using autofill field type as a view ID (for testing). text_field->SetID(GetInputFieldViewId(field.type)); @@ -418,8 +427,9 @@ auto error_label_view = std::make_unique<views::View>(); error_label_view->SetLayoutManager(std::make_unique<views::FillLayout>()); error_labels_[field.type] = error_label_view.get(); - if (IsEditingExistingItem() && !error_message.empty()) + if (IsEditingExistingItem() && !error_message.empty()) { AddOrUpdateErrorMessageForField(field.type, error_message); + } field_view->AddChildView(std::move(error_label_view)); @@ -431,13 +441,15 @@ int widest_column_width = 0; for (const auto& field : GetFieldDefinitions()) { - if (field.length_hint != size) + if (field.length_hint != size) { continue; + } std::unique_ptr<views::View> extra_view = CreateExtraViewForField(field.type); - if (!extra_view) + if (!extra_view) { continue; + } widest_column_width = std::max(extra_view->GetPreferredSize().width(), widest_column_width); } @@ -466,8 +478,9 @@ } void EditorViewController::SaveButtonPressed(const ui::Event& event) { - if (!ValidateModelAndSave()) + if (!ValidateModelAndSave()) { return; + } if (back_navigation_type_ == BackNavigationType::kOneStep) { dialog()->GoBack(); } else {
diff --git a/chrome/browser/ui/views/payments/order_summary_view_controller.cc b/chrome/browser/ui/views/payments/order_summary_view_controller.cc index d18dfb2..88dea05 100644 --- a/chrome/browser/ui/views/payments/order_summary_view_controller.cc +++ b/chrome/browser/ui/views/payments/order_summary_view_controller.cc
@@ -147,8 +147,9 @@ } OrderSummaryViewController::~OrderSummaryViewController() { - if (spec()) + if (spec()) { spec()->RemoveObserver(this); + } state()->RemoveObserver(this); } @@ -170,8 +171,9 @@ } void OrderSummaryViewController::FillContentView(views::View* content_view) { - if (!spec()) + if (!spec()) { return; + } auto layout = std::make_unique<views::BoxLayout>( views::BoxLayout::Orientation::kVertical);
diff --git a/chrome/browser/ui/views/payments/payment_handler_modal_dialog_manager_delegate.cc b/chrome/browser/ui/views/payments/payment_handler_modal_dialog_manager_delegate.cc index 83b2c0c..e4a3e16 100644 --- a/chrome/browser/ui/views/payments/payment_handler_modal_dialog_manager_delegate.cc +++ b/chrome/browser/ui/views/payments/payment_handler_modal_dialog_manager_delegate.cc
@@ -33,14 +33,16 @@ web_modal::WebContentsModalDialogHost* PaymentHandlerModalDialogManagerDelegate::GetWebContentsModalDialogHost() { - if (!host_web_contents_) + if (!host_web_contents_) { return nullptr; + } auto* dialog_manager = static_cast<web_modal::WebContentsModalDialogManagerDelegate*>( chrome::FindBrowserWithTab(host_web_contents_.get())); - if (!dialog_manager) + if (!dialog_manager) { return nullptr; + } // Borrow the browser's WebContentModalDialogHost to display modal dialogs // triggered by the payment handler's web view (e.g. WebAuthn and Secure
diff --git a/chrome/browser/ui/views/payments/payment_handler_web_flow_view_controller.cc b/chrome/browser/ui/views/payments/payment_handler_web_flow_view_controller.cc index ecf869d3..ed36d70 100644 --- a/chrome/browser/ui/views/payments/payment_handler_web_flow_view_controller.cc +++ b/chrome/browser/ui/views/payments/payment_handler_web_flow_view_controller.cc
@@ -68,8 +68,9 @@ std::u16string GetPaymentHandlerDialogTitle( content::WebContents* web_contents) { - if (!web_contents) + if (!web_contents) { return std::u16string(); + } // If a page has no explicit <title> set or if it is still loading, the title // may be the URL of the page. We don't wish to show that to a user as the @@ -148,8 +149,9 @@ if (web_contents()) { auto* manager = web_modal::WebContentsModalDialogManager::FromWebContents( web_contents()); - if (manager) + if (manager) { manager->SetDelegate(nullptr); + } } state()->OnPaymentAppWindowClosed(); } @@ -450,14 +452,16 @@ void PaymentHandlerWebFlowViewController::DidFinishNavigation( content::NavigationHandle* navigation_handle) { - if (!is_active()) + if (!is_active()) { return; + } // Ignore non-primary main frame or same page navigations which aren't // relevant to below. if (navigation_handle->IsSameDocument() || - !navigation_handle->IsInPrimaryMainFrame()) + !navigation_handle->IsInPrimaryMainFrame()) { return; + } // Checking uncommitted navigations (e.g., Network errors) is unnecessary // because the new pages have no chance to be loaded, rendered nor execute js. @@ -500,13 +504,15 @@ UpdateHeaderView(); std::u16string title = GetPaymentHandlerDialogTitle(web_contents()); - if (!title.empty()) + if (!title.empty()) { dialog()->OnPaymentHandlerTitleSet(); + } } void PaymentHandlerWebFlowViewController::AbortPayment() { - if (web_contents()) + if (web_contents()) { web_contents()->Close(); + } state()->OnPaymentResponseError(errors::kPaymentHandlerInsecureNavigation); }
diff --git a/chrome/browser/ui/views/payments/payment_method_view_controller.cc b/chrome/browser/ui/views/payments/payment_method_view_controller.cc index f7d553e..bbb5db1 100644 --- a/chrome/browser/ui/views/payments/payment_method_view_controller.cc +++ b/chrome/browser/ui/views/payments/payment_method_view_controller.cc
@@ -84,8 +84,9 @@ std::u16string* accessible_content) override { DCHECK(accessible_content); auto card_info_container = std::make_unique<views::View>(); - if (!app_) + if (!app_) { return card_info_container; + } card_info_container->SetCanProcessEventsWithinSubtree(false); @@ -97,11 +98,13 @@ card_info_container->SetLayoutManager(std::move(box_layout)); std::u16string label_str = app_->GetLabel(); - if (!label_str.empty()) + if (!label_str.empty()) { card_info_container->AddChildView(new views::Label(label_str)); + } std::u16string sublabel = app_->GetSublabel(); - if (!sublabel.empty()) + if (!sublabel.empty()) { card_info_container->AddChildView(new views::Label(sublabel)); + } std::u16string missing_info; if (!app_->IsCompleteForPayment()) { missing_info = app_->GetMissingInfoLabel();
diff --git a/chrome/browser/ui/views/payments/payment_request_browsertest_base.cc b/chrome/browser/ui/views/payments/payment_request_browsertest_base.cc index 3a2d656..c1cf932 100644 --- a/chrome/browser/ui/views/payments/payment_request_browsertest_base.cc +++ b/chrome/browser/ui/views/payments/payment_request_browsertest_base.cc
@@ -68,8 +68,9 @@ const std::u16string& text) { size_t i; for (i = 0; i < combobox->GetRowCount(); i++) { - if (combobox->GetTextForRow(i) == text) + if (combobox->GetTextForRow(i) == text) { break; + } } DCHECK(i < combobox->GetRowCount()) << "Combobox does not contain " << text; combobox->SetSelectedRow(i); @@ -153,28 +154,33 @@ } void PaymentRequestBrowserTestBase::OnCanMakePaymentCalled() { - if (event_waiter_) + if (event_waiter_) { event_waiter_->OnEvent(DialogEvent::CAN_MAKE_PAYMENT_CALLED); + } } void PaymentRequestBrowserTestBase::OnCanMakePaymentReturned() { - if (event_waiter_) + if (event_waiter_) { event_waiter_->OnEvent(DialogEvent::CAN_MAKE_PAYMENT_RETURNED); + } } void PaymentRequestBrowserTestBase::OnHasEnrolledInstrumentCalled() { - if (event_waiter_) + if (event_waiter_) { event_waiter_->OnEvent(DialogEvent::HAS_ENROLLED_INSTRUMENT_CALLED); + } } void PaymentRequestBrowserTestBase::OnHasEnrolledInstrumentReturned() { - if (event_waiter_) + if (event_waiter_) { event_waiter_->OnEvent(DialogEvent::HAS_ENROLLED_INSTRUMENT_RETURNED); + } } void PaymentRequestBrowserTestBase::OnNotSupportedError() { - if (event_waiter_) + if (event_waiter_) { event_waiter_->OnEvent(DialogEvent::NOT_SUPPORTED_ERROR); + } } void PaymentRequestBrowserTestBase::OnConnectionTerminated() {} @@ -182,98 +188,117 @@ void PaymentRequestBrowserTestBase::OnPayCalled() {} void PaymentRequestBrowserTestBase::OnAbortCalled() { - if (event_waiter_) + if (event_waiter_) { event_waiter_->OnEvent(DialogEvent::ABORT_CALLED); + } } void PaymentRequestBrowserTestBase::OnDialogOpened() { - if (event_waiter_) + if (event_waiter_) { event_waiter_->OnEvent(DialogEvent::DIALOG_OPENED); + } } void PaymentRequestBrowserTestBase::OnDialogClosed() { - if (event_waiter_) + if (event_waiter_) { event_waiter_->OnEvent(DialogEvent::DIALOG_CLOSED); + } } void PaymentRequestBrowserTestBase::OnOrderSummaryOpened() { - if (event_waiter_) + if (event_waiter_) { event_waiter_->OnEvent(DialogEvent::ORDER_SUMMARY_OPENED); + } } void PaymentRequestBrowserTestBase::OnPaymentMethodOpened() { - if (event_waiter_) + if (event_waiter_) { event_waiter_->OnEvent(DialogEvent::PAYMENT_METHOD_OPENED); + } } void PaymentRequestBrowserTestBase::OnShippingAddressSectionOpened() { - if (event_waiter_) + if (event_waiter_) { event_waiter_->OnEvent(DialogEvent::SHIPPING_ADDRESS_SECTION_OPENED); + } } void PaymentRequestBrowserTestBase::OnShippingOptionSectionOpened() { - if (event_waiter_) + if (event_waiter_) { event_waiter_->OnEvent(DialogEvent::SHIPPING_OPTION_SECTION_OPENED); + } } void PaymentRequestBrowserTestBase::OnShippingAddressEditorOpened() { - if (event_waiter_) + if (event_waiter_) { event_waiter_->OnEvent(DialogEvent::SHIPPING_ADDRESS_EDITOR_OPENED); + } } void PaymentRequestBrowserTestBase::OnContactInfoEditorOpened() { - if (event_waiter_) + if (event_waiter_) { event_waiter_->OnEvent(DialogEvent::CONTACT_INFO_EDITOR_OPENED); + } } void PaymentRequestBrowserTestBase::OnBackNavigation() { - if (event_waiter_) + if (event_waiter_) { event_waiter_->OnEvent(DialogEvent::BACK_NAVIGATION); + } } void PaymentRequestBrowserTestBase::OnBackToPaymentSheetNavigation() { - if (event_waiter_) + if (event_waiter_) { event_waiter_->OnEvent(DialogEvent::BACK_TO_PAYMENT_SHEET_NAVIGATION); + } } void PaymentRequestBrowserTestBase::OnContactInfoOpened() { - if (event_waiter_) + if (event_waiter_) { event_waiter_->OnEvent(DialogEvent::CONTACT_INFO_OPENED); + } } void PaymentRequestBrowserTestBase::OnEditorViewUpdated() { - if (event_waiter_) + if (event_waiter_) { event_waiter_->OnEvent(DialogEvent::EDITOR_VIEW_UPDATED); + } } void PaymentRequestBrowserTestBase::OnErrorMessageShown() { - if (event_waiter_) + if (event_waiter_) { event_waiter_->OnEvent(DialogEvent::ERROR_MESSAGE_SHOWN); + } } void PaymentRequestBrowserTestBase::OnSpecDoneUpdating() { - if (event_waiter_) + if (event_waiter_) { event_waiter_->OnEvent(DialogEvent::SPEC_DONE_UPDATING); + } } void PaymentRequestBrowserTestBase::OnProcessingSpinnerShown() { - if (event_waiter_) + if (event_waiter_) { event_waiter_->OnEvent(DialogEvent::PROCESSING_SPINNER_SHOWN); + } } void PaymentRequestBrowserTestBase::OnProcessingSpinnerHidden() { - if (event_waiter_) + if (event_waiter_) { event_waiter_->OnEvent(DialogEvent::PROCESSING_SPINNER_HIDDEN); + } } void PaymentRequestBrowserTestBase::OnPaymentHandlerWindowOpened() { - if (event_waiter_) + if (event_waiter_) { event_waiter_->OnEvent(DialogEvent::PAYMENT_HANDLER_WINDOW_OPENED); + } } void PaymentRequestBrowserTestBase::OnPaymentHandlerTitleSet() { - if (event_waiter_) + if (event_waiter_) { event_waiter_->OnEvent(DialogEvent::PAYMENT_HANDLER_TITLE_SET); + } } // Install the payment app specified by `hostname`, e.g., "a.com". Specify the @@ -464,8 +489,9 @@ std::vector<PaymentRequest*> ptrs; ptrs.reserve(requests_.size()); for (const auto& weak : requests_) { - if (weak) + if (weak) { ptrs.push_back(&*weak); + } } return ptrs; } @@ -597,19 +623,23 @@ views::View* view = GetChildByDialogViewID(parent_view, DialogViewID::PROFILE_LABEL_LINE_1); - if (view) + if (view) { line_labels.push_back(static_cast<views::Label*>(view)->GetText()); + } view = GetChildByDialogViewID(parent_view, DialogViewID::PROFILE_LABEL_LINE_2); - if (view) + if (view) { line_labels.push_back(static_cast<views::Label*>(view)->GetText()); + } view = GetChildByDialogViewID(parent_view, DialogViewID::PROFILE_LABEL_LINE_3); - if (view) + if (view) { line_labels.push_back(static_cast<views::Label*>(view)->GetText()); + } view = GetChildByDialogViewID(parent_view, DialogViewID::PROFILE_LABEL_ERROR); - if (view) + if (view) { line_labels.push_back(static_cast<views::Label*>(view)->GetText()); + } return line_labels; }
diff --git a/chrome/browser/ui/views/payments/payment_request_dialog_view.cc b/chrome/browser/ui/views/payments/payment_request_dialog_view.cc index c6a3431..5cf87af 100644 --- a/chrome/browser/ui/views/payments/payment_request_dialog_view.cc +++ b/chrome/browser/ui/views/payments/payment_request_dialog_view.cc
@@ -94,8 +94,9 @@ controller_map_.clear(); request_->OnUserCancelled(); - if (observer_for_testing_) + if (observer_for_testing_) { observer_for_testing_->OnDialogClosed(); + } } bool PaymentRequestDialogView::ShouldShowCloseButton() const { @@ -122,8 +123,9 @@ } void PaymentRequestDialogView::ShowErrorMessage() { - if (being_closed_ || !request_->spec()) + if (being_closed_ || !request_->spec()) { return; + } view_stack_->Push(CreateViewAndInstallController( std::make_unique<ErrorMessageViewController>( @@ -133,8 +135,9 @@ /* animate = */ false); HideProcessingSpinner(); - if (observer_for_testing_) + if (observer_for_testing_) { observer_for_testing_->OnErrorMessageShown(); + } } void PaymentRequestDialogView::ShowProcessingSpinner() { @@ -142,8 +145,9 @@ throbber_overlay_->SetVisible(true); throbber_overlay_->GetViewAccessibility().SetIsIgnored(false); throbber_overlay_->GetViewAccessibility().SetIsLeaf(false); - if (observer_for_testing_) + if (observer_for_testing_) { observer_for_testing_->OnProcessingSpinnerShown(); + } } bool PaymentRequestDialogView::IsInteractive() const { @@ -153,8 +157,9 @@ void PaymentRequestDialogView::ShowPaymentHandlerScreen( const GURL& url, PaymentHandlerOpenWindowCallback callback) { - if (!request_->spec()) + if (!request_->spec()) { return; + } // The Payment Handler window is larger than the Payment Request sheet, which // causes us to make different decisions when e.g. animating it. @@ -183,13 +188,15 @@ !request_->skipped_payment_request_ui()); request_->OnPaymentHandlerOpenWindowCalled(); HideProcessingSpinner(); - if (observer_for_testing_) + if (observer_for_testing_) { observer_for_testing_->OnPaymentHandlerWindowOpened(); + } } void PaymentRequestDialogView::RetryDialog() { - if (!request_->spec()) + if (!request_->spec()) { return; + } HideProcessingSpinner(); GoBackToPaymentSheet(false /* animate */); @@ -234,28 +241,32 @@ } void PaymentRequestDialogView::OnSpecUpdated() { - if (!request_->spec()) + if (!request_->spec()) { return; + } if (request_->spec()->current_update_reason() != PaymentRequestSpec::UpdateReason::NONE) { HideProcessingSpinner(); } - if (observer_for_testing_) + if (observer_for_testing_) { observer_for_testing_->OnSpecDoneUpdating(); + } } void PaymentRequestDialogView::OnInitialized( InitializationTask* initialization_task) { initialization_task->RemoveInitializationObserver(this); - if (--number_of_initialization_tasks_ > 0) + if (--number_of_initialization_tasks_ > 0) { return; + } HideProcessingSpinner(); - if (request_->state()->are_requested_methods_supported()) + if (request_->state()->are_requested_methods_supported()) { OnDialogOpened(); + } } void PaymentRequestDialogView::Pay() { @@ -279,8 +290,9 @@ is_showing_large_payment_handler_window_ = false; ResizeDialogWindow(); } - if (observer_for_testing_) + if (observer_for_testing_) { observer_for_testing_->OnBackNavigation(); + } } void PaymentRequestDialogView::GoBackToPaymentSheet(bool animate) { @@ -297,13 +309,15 @@ is_showing_large_payment_handler_window_ = false; } } - if (observer_for_testing_) + if (observer_for_testing_) { observer_for_testing_->OnBackToPaymentSheetNavigation(); + } } void PaymentRequestDialogView::ShowContactProfileSheet() { - if (!request_->spec()) + if (!request_->spec()) { return; + } view_stack_->Push( CreateViewAndInstallController( @@ -312,13 +326,15 @@ weak_ptr_factory_.GetWeakPtr()), &controller_map_), /* animate */ true); - if (observer_for_testing_) + if (observer_for_testing_) { observer_for_testing_->OnContactInfoOpened(); + } } void PaymentRequestDialogView::ShowOrderSummary() { - if (!request_->spec()) + if (!request_->spec()) { return; + } view_stack_->Push(CreateViewAndInstallController( std::make_unique<OrderSummaryViewController>( @@ -326,13 +342,15 @@ weak_ptr_factory_.GetWeakPtr()), &controller_map_), /* animate = */ true); - if (observer_for_testing_) + if (observer_for_testing_) { observer_for_testing_->OnOrderSummaryOpened(); + } } void PaymentRequestDialogView::ShowPaymentMethodSheet() { - if (!request_->spec()) + if (!request_->spec()) { return; + } view_stack_->Push(CreateViewAndInstallController( std::make_unique<PaymentMethodViewController>( @@ -340,13 +358,15 @@ weak_ptr_factory_.GetWeakPtr()), &controller_map_), /* animate = */ true); - if (observer_for_testing_) + if (observer_for_testing_) { observer_for_testing_->OnPaymentMethodOpened(); + } } void PaymentRequestDialogView::ShowShippingProfileSheet() { - if (!request_->spec()) + if (!request_->spec()) { return; + } view_stack_->Push( CreateViewAndInstallController( @@ -355,13 +375,15 @@ weak_ptr_factory_.GetWeakPtr()), &controller_map_), /* animate = */ true); - if (observer_for_testing_) + if (observer_for_testing_) { observer_for_testing_->OnShippingAddressSectionOpened(); + } } void PaymentRequestDialogView::ShowShippingOptionSheet() { - if (!request_->spec()) + if (!request_->spec()) { return; + } view_stack_->Push(CreateViewAndInstallController( std::make_unique<ShippingOptionViewController>( @@ -369,8 +391,9 @@ weak_ptr_factory_.GetWeakPtr()), &controller_map_), /* animate = */ true); - if (observer_for_testing_) + if (observer_for_testing_) { observer_for_testing_->OnShippingOptionSectionOpened(); + } } void PaymentRequestDialogView::ShowShippingAddressEditor( @@ -378,8 +401,9 @@ base::OnceClosure on_edited, base::OnceCallback<void(const autofill::AutofillProfile&)> on_added, autofill::AutofillProfile* profile) { - if (!request_->spec()) + if (!request_->spec()) { return; + } view_stack_->Push( CreateViewAndInstallController( @@ -390,8 +414,9 @@ request_->IsOffTheRecord()), &controller_map_), /* animate = */ true); - if (observer_for_testing_) + if (observer_for_testing_) { observer_for_testing_->OnShippingAddressEditorOpened(); + } } void PaymentRequestDialogView::ShowContactInfoEditor( @@ -399,8 +424,9 @@ base::OnceClosure on_edited, base::OnceCallback<void(const autofill::AutofillProfile&)> on_added, autofill::AutofillProfile* profile) { - if (!request_->spec()) + if (!request_->spec()) { return; + } view_stack_->Push( CreateViewAndInstallController( @@ -411,13 +437,15 @@ request_->IsOffTheRecord()), &controller_map_), /* animate = */ true); - if (observer_for_testing_) + if (observer_for_testing_) { observer_for_testing_->OnContactInfoEditorOpened(); + } } void PaymentRequestDialogView::EditorViewUpdated() { - if (observer_for_testing_) + if (observer_for_testing_) { observer_for_testing_->OnEditorViewUpdated(); + } } void PaymentRequestDialogView::HideProcessingSpinner() { @@ -430,8 +458,9 @@ // the accessibility tree. throbber_overlay_->GetViewAccessibility().SetIsIgnored(true); throbber_overlay_->GetViewAccessibility().SetIsLeaf(true); - if (observer_for_testing_) + if (observer_for_testing_) { observer_for_testing_->OnProcessingSpinnerHidden(); + } } Profile* PaymentRequestDialogView::GetProfile() { @@ -497,16 +526,19 @@ PaymentRequestDialogView::~PaymentRequestDialogView() = default; void PaymentRequestDialogView::OnDialogOpened() { - if (!request_->spec()) + if (!request_->spec()) { return; + } - if (observer_for_testing_) + if (observer_for_testing_) { observer_for_testing_->OnDialogOpened(); + } } void PaymentRequestDialogView::ShowInitialPaymentSheet() { - if (!request_->spec()) + if (!request_->spec()) { return; + } view_stack_->Push(CreateViewAndInstallController( std::make_unique<PaymentSheetViewController>( @@ -515,11 +547,13 @@ &controller_map_), /* animate = */ false); - if (number_of_initialization_tasks_ > 0) + if (number_of_initialization_tasks_ > 0) { return; + } - if (request_->state()->are_requested_methods_supported()) + if (request_->state()->are_requested_methods_supported()) { OnDialogOpened(); + } } void PaymentRequestDialogView::SetupSpinnerOverlay() { @@ -575,14 +609,16 @@ } void PaymentRequestDialogView::OnPaymentHandlerTitleSet() { - if (observer_for_testing_) + if (observer_for_testing_) { observer_for_testing_->OnPaymentHandlerTitleSet(); + } } void PaymentRequestDialogView::ViewHierarchyChanged( const views::ViewHierarchyChangedDetails& details) { - if (being_closed_) + if (being_closed_) { return; + } // When a view that is associated with a controller is removed from this // view's descendants, dispose of the controller.
diff --git a/chrome/browser/ui/views/payments/payment_request_item_list.cc b/chrome/browser/ui/views/payments/payment_request_item_list.cc index 15556c9..db7ed2e 100644 --- a/chrome/browser/ui/views/payments/payment_request_item_list.cc +++ b/chrome/browser/ui/views/payments/payment_request_item_list.cc
@@ -91,8 +91,9 @@ container->AddChildView(CreateCheckmark(selected() && GetClickable())); - if (std::unique_ptr<views::View> extra_view = CreateExtraView()) + if (std::unique_ptr<views::View> extra_view = CreateExtraView()) { container->AddChildView(std::move(extra_view)); + } if (show_edit_button_) { auto edit_button = views::CreateVectorImageButton( @@ -116,16 +117,18 @@ void PaymentRequestItemList::Item::SetSelected(bool selected, bool notify) { selected_ = selected; - for (views::View* child : children()) + for (views::View* child : children()) { if (child->GetID() == static_cast<int>(DialogViewID::CHECKMARK_VIEW)) { child->SetVisible(selected); break; } + } UpdateAccessibleName(); - if (notify) + if (notify) { SelectedStateChanged(); + } } std::unique_ptr<views::ImageView> PaymentRequestItemList::Item::CreateCheckmark( @@ -159,8 +162,9 @@ void PaymentRequestItemList::Item::ButtonPressed() { if (selected_) { // |dialog()| may be null in tests - if (list_->dialog()) + if (list_->dialog()) { list_->dialog()->GoBack(); + } } else if (CanBeSelected()) { list()->SelectItem(this); } else { @@ -180,12 +184,14 @@ void PaymentRequestItemList::AddItem( std::unique_ptr<PaymentRequestItemList::Item> item) { DCHECK_EQ(this, item->list()); - if (!items_.empty()) + if (!items_.empty()) { item->set_previous_row(items_.back()->AsWeakPtr()); + } items_.push_back(std::move(item)); if (items_.back()->selected()) { - if (selected_item_) + if (selected_item_) { selected_item_->SetSelected(/*selected=*/false, /*notify=*/false); + } selected_item_ = items_.back().get(); } } @@ -202,16 +208,18 @@ views::BoxLayout::Orientation::kVertical, gfx::Insets::VH(kPaymentRequestRowVerticalInsets, 0), 0)); - for (auto& item : items_) + for (auto& item : items_) { content_view->AddChildView(item.release()); + } return content_view; } void PaymentRequestItemList::SelectItem(PaymentRequestItemList::Item* item) { DCHECK_EQ(this, item->list()); - if (selected_item_ == item) + if (selected_item_ == item) { return; + } UnselectSelectedItem(); @@ -223,8 +231,9 @@ // It's possible that no item is currently selected, either during list // creation or in the middle of the selection operation when the previously // selected item has been deselected but the new one isn't selected yet. - if (selected_item_) + if (selected_item_) { selected_item_->SetSelected(/*selected=*/false, /*notify=*/true); + } selected_item_ = nullptr; }
diff --git a/chrome/browser/ui/views/payments/payment_request_item_list.h b/chrome/browser/ui/views/payments/payment_request_item_list.h index e3a9ef3..6bd4e63 100644 --- a/chrome/browser/ui/views/payments/payment_request_item_list.h +++ b/chrome/browser/ui/views/payments/payment_request_item_list.h
@@ -16,7 +16,7 @@ namespace views { class ImageView; class View; -} +} // namespace views namespace payments {
diff --git a/chrome/browser/ui/views/payments/payment_request_row_view.cc b/chrome/browser/ui/views/payments/payment_request_row_view.cc index 824d41c4..ff42461 100644 --- a/chrome/browser/ui/views/payments/payment_request_row_view.cc +++ b/chrome/browser/ui/views/payments/payment_request_row_view.cc
@@ -29,22 +29,26 @@ // Right now this concatenates (with newlines) every Label inside the row to // ensure that no data is inaccessible. std::u16string GetAccessibleNameFromTree(views::View* view) { - if (views::IsViewClass<views::Label>(view)) + if (views::IsViewClass<views::Label>(view)) { return static_cast<views::Label*>(view) ->GetViewAccessibility() .GetCachedName(); + } std::u16string accessible_name; for (views::View* child : view->children()) { // Skip buttons they will be announced independently. This is used for // "more" items. - if (views::IsViewClass<views::Button>(child)) + if (views::IsViewClass<views::Button>(child)) { continue; + } std::u16string child_accessible_name = GetAccessibleNameFromTree(child); - if (child_accessible_name.empty()) + if (child_accessible_name.empty()) { continue; - if (!accessible_name.empty()) + } + if (!accessible_name.empty()) { accessible_name += '\n'; + } accessible_name += child_accessible_name; } return accessible_name; @@ -76,8 +80,9 @@ return clickable_; } void PaymentRequestRowView::SetClickable(bool clickable) { - if (clickable == clickable_) + if (clickable == clickable_) { return; + } clickable_ = clickable; UpdateButtonState(); OnPropertyChanged(&clickable_, views::PropertyEffects::kPropertyEffectsPaint); @@ -92,8 +97,9 @@ } void PaymentRequestRowView::SetRowInsets(const gfx::Insets& row_insets) { - if (row_insets == row_insets_) + if (row_insets == row_insets_) { return; + } row_insets_ = row_insets; UpdateBottomSeparatorVisualState(); OnPropertyChanged(&row_insets_, @@ -124,13 +130,15 @@ SetBackground(views::CreateThemedSolidBackground( kColorPaymentsRequestRowBackgroundHighlighted)); SetBottomSeparatorVisible(false); - if (previous_row_) + if (previous_row_) { previous_row_->SetBottomSeparatorVisible(false); + } } else { SetBackground(nullptr); SetBottomSeparatorVisible(true); - if (previous_row_) + if (previous_row_) { previous_row_->SetBottomSeparatorVisible(true); + } } } @@ -144,8 +152,9 @@ void PaymentRequestRowView::StateChanged(ButtonState old_state) { Button::StateChanged(old_state); - if (!GetClickable()) + if (!GetClickable()) { return; + } SetHighlighted(GetState() == views::Button::STATE_HOVERED || GetState() == views::Button::STATE_PRESSED); @@ -163,8 +172,9 @@ } void PaymentRequestRowView::OnFocus() { - if (GetClickable()) + if (GetClickable()) { SetHighlighted(true); + } View::OnFocus(); if (views::FocusRing* focus_ring = views::FocusRing::Get(this)) { focus_ring->SetProperty(views::kViewIgnoredByLayoutKey, true); @@ -172,8 +182,9 @@ } void PaymentRequestRowView::OnBlur() { - if (GetClickable()) + if (GetClickable()) { SetHighlighted(false); + } } BEGIN_METADATA(PaymentRequestRowView)
diff --git a/chrome/browser/ui/views/payments/payment_request_sheet_controller.cc b/chrome/browser/ui/views/payments/payment_request_sheet_controller.cc index 1e988fae..357e446 100644 --- a/chrome/browser/ui/views/payments/payment_request_sheet_controller.cc +++ b/chrome/browser/ui/views/payments/payment_request_sheet_controller.cc
@@ -56,8 +56,9 @@ const base::RepeatingCallback<void(bool*, const ui::Event&)>& enter_key_accelerator_callback) : enter_key_accelerator_callback_(enter_key_accelerator_callback) { - if (enter_key_accelerator_callback_) + if (enter_key_accelerator_callback_) { AddAccelerator(enter_key_accelerator_); + } } SheetView(const SheetView&) = delete; SheetView& operator=(const SheetView&) = delete; @@ -92,8 +93,9 @@ // RequestFocus only works if we are in an accessible context, and is a // no-op otherwise. Thus, if the focused view didn't change, we need to // proceed with setting the focus for standard usage. - if (focus->GetFocusedView() == title) + if (focus->GetFocusedView() == title) { return; + } views::View* first_focusable = first_focusable_; @@ -108,14 +110,16 @@ &dummy_focus_traversable, &dummy_focus_traversable_view); } - if (first_focusable) + if (first_focusable) { first_focusable->RequestFocus(); + } } bool AcceleratorPressed(const ui::Accelerator& accelerator) override { if (accelerator != enter_key_accelerator_ || - !enter_key_accelerator_callback_) + !enter_key_accelerator_callback_) { return views::View::AcceleratorPressed(accelerator); + } bool is_enabled = false; enter_key_accelerator_callback_.Run(&is_enabled, @@ -125,8 +129,9 @@ void ViewHierarchyChanged( const views::ViewHierarchyChangedDetails& details) override { - if (!details.is_add && details.child == first_focusable_) + if (!details.is_add && details.child == first_focusable_) { first_focusable_ = nullptr; + } } void SetVisible(bool visible) override { @@ -297,8 +302,9 @@ [](PaymentRequestSheetController* controller, internal::SheetView* sheet_view) { DialogViewID sheet_id; - if (controller->GetSheetId(&sheet_id)) + if (controller->GetSheetId(&sheet_id)) { sheet_view->SetID(static_cast<int>(sheet_id)); + } sheet_view->SetBackground(views::CreateThemedSolidBackground( ui::kColorDialogBackground)); @@ -366,8 +372,9 @@ // content) fills the dialog. view->SetFlexForView(scroll_ ? scroll_ : pane_, 1); - if (footer) + if (footer) { view->AddChildView(std::move(footer)); + } UpdateContentView(); @@ -377,8 +384,9 @@ void PaymentRequestSheetController::UpdateContentView() { // Do not update the view if the payment request is being aborted. - if (!is_active_) + if (!is_active_) { return; + } content_view_->RemoveAllChildViews(); FillContentView(content_view_); @@ -387,8 +395,9 @@ void PaymentRequestSheetController::UpdateHeaderView() { // Do not update the view if the payment request is being aborted. - if (!is_active_) + if (!is_active_) { return; + } header_view_->RemoveAllChildViews(); PopulateSheetHeaderView(header_view_); @@ -412,8 +421,9 @@ void PaymentRequestSheetController::RelayoutPane() { // Do not update the view if the payment request is being aborted. - if (!is_active_) + if (!is_active_) { return; + } content_view_->InvalidateLayout(); pane_->SizeToPreferredSize(); @@ -437,8 +447,9 @@ return base::BindRepeating( [](const base::WeakPtr<PaymentRequestDialogView>& dialog, const ui::Event& event) { - if (dialog->IsInteractive()) + if (dialog->IsInteractive()) { dialog->Pay(); + } }, dialog()); } @@ -596,8 +607,9 @@ } void PaymentRequestSheetController::CloseButtonPressed(const ui::Event& event) { - if (dialog()->IsInteractive()) + if (dialog()->IsInteractive()) { dialog()->CloseDialog(); + } } int PaymentRequestSheetController::GetHeaderHeight() { @@ -643,8 +655,9 @@ if (dialog()->IsInteractive() && primary_button_ && primary_button_->GetEnabled()) { ButtonCallback callback = GetPrimaryButtonCallback(); - if (callback) + if (callback) { callback.Run(event); + } } } @@ -653,8 +666,9 @@ } void PaymentRequestSheetController::BackButtonPressed() { - if (dialog()->IsInteractive()) + if (dialog()->IsInteractive()) { dialog()->GoBack(); + } } } // namespace payments
diff --git a/chrome/browser/ui/views/payments/payment_request_sheet_controller.h b/chrome/browser/ui/views/payments/payment_request_sheet_controller.h index 852bebd..c17939f 100644 --- a/chrome/browser/ui/views/payments/payment_request_sheet_controller.h +++ b/chrome/browser/ui/views/payments/payment_request_sheet_controller.h
@@ -19,7 +19,7 @@ namespace views { class MdTextButton; class View; -} +} // namespace views namespace payments {
diff --git a/chrome/browser/ui/views/payments/payment_request_show_promise_browsertest.cc b/chrome/browser/ui/views/payments/payment_request_show_promise_browsertest.cc index c43cd09..d60e67c 100644 --- a/chrome/browser/ui/views/payments/payment_request_show_promise_browsertest.cc +++ b/chrome/browser/ui/views/payments/payment_request_show_promise_browsertest.cc
@@ -71,8 +71,9 @@ void ExpectNoShippingWarningMessage() { views::View* view = dialog_view()->GetViewByID( static_cast<int>(DialogViewID::WARNING_LABEL)); - if (!view || !view->GetVisible()) + if (!view || !view->GetVisible()) { return; + } EXPECT_EQ(std::u16string(), static_cast<views::Label*>(view)->GetText()); }
diff --git a/chrome/browser/ui/views/payments/payment_request_views_util.cc b/chrome/browser/ui/views/payments/payment_request_views_util.cc index 939c5552..6a2c7cb 100644 --- a/chrome/browser/ui/views/payments/payment_request_views_util.cc +++ b/chrome/browser/ui/views/payments/payment_request_views_util.cc
@@ -72,8 +72,9 @@ // views::Label: void OnThemeChanged() override { Label::OnThemeChanged(); - if (enabled_color_id_.has_value()) + if (enabled_color_id_.has_value()) { SetEnabledColor(GetColorProvider()->GetColor(*enabled_color_id_)); + } } private: @@ -133,8 +134,9 @@ label->SetTextStyle(text_style); label->SetID(static_cast<int>(DialogViewID::PROFILE_LABEL_LINE_1)); label->SetHorizontalAlignment(gfx::ALIGN_LEFT); - if (!enabled) + if (!enabled) { label->set_enabled_color_id(ui::kColorLabelForegroundDisabled); + } container->AddChildView(std::move(label)); } @@ -142,8 +144,9 @@ auto label = std::make_unique<ThemeTrackingLabel>(s2); label->SetID(static_cast<int>(DialogViewID::PROFILE_LABEL_LINE_2)); label->SetHorizontalAlignment(gfx::ALIGN_LEFT); - if (!enabled) + if (!enabled) { label->set_enabled_color_id(ui::kColorLabelForegroundDisabled); + } container->AddChildView(std::move(label)); } @@ -151,8 +154,9 @@ auto label = std::make_unique<ThemeTrackingLabel>(s3); label->SetID(static_cast<int>(DialogViewID::PROFILE_LABEL_LINE_3)); label->SetHorizontalAlignment(gfx::ALIGN_LEFT); - if (!enabled) + if (!enabled) { label->set_enabled_color_id(ui::kColorLabelForegroundDisabled); + } container->AddChildView(std::move(label)); } @@ -242,8 +246,9 @@ float width = base::checked_cast<float>(img.width()); float height = base::checked_cast<float>(img.height()); float ratio = 1; - if (width && height) + if (width && height) { ratio = width / height; + } // We should set image size in density indepent pixels here, since // views::ImageView objects are rastered at the device scale factor. icon_view->SetImageSize(gfx::Size(
diff --git a/chrome/browser/ui/views/payments/payment_sheet_view_controller.cc b/chrome/browser/ui/views/payments/payment_sheet_view_controller.cc index 25fa7018..e467f2f 100644 --- a/chrome/browser/ui/views/payments/payment_sheet_view_controller.cc +++ b/chrome/browser/ui/views/payments/payment_sheet_view_controller.cc
@@ -100,8 +100,9 @@ std::u16string elided_string = base::i18n::MessageFormatter::FormatWithNumberedArgs( format_string_, "", elided_preview, n_); - if (gfx::GetStringWidth(elided_string, font_list()) <= pixel_width) + if (gfx::GetStringWidth(elided_string, font_list()) <= pixel_width) { return elided_string; + } } // TODO(crbug.com/40517112): Display something meaningful if the preview @@ -363,8 +364,9 @@ } PaymentSheetViewController::~PaymentSheetViewController() { - if (spec()) + if (spec()) { spec()->RemoveObserver(this); + } state()->RemoveObserver(this); } @@ -380,8 +382,9 @@ } void PaymentSheetViewController::ButtonPressed(base::RepeatingClosure closure) { - if (!dialog()->IsInteractive() || !spec()) + if (!dialog()->IsInteractive() || !spec()) { return; + } std::move(closure).Run(); @@ -413,8 +416,9 @@ } void PaymentSheetViewController::FillContentView(views::View* content_view) { - if (!spec()) + if (!spec()) { return; + } auto builder = views::Builder<views::View>(content_view) .SetLayoutManager(std::make_unique<views::BoxLayout>( @@ -428,16 +432,18 @@ // The shipping address and contact info rows are optional. std::unique_ptr<PaymentRequestRowView> summary_row = CreatePaymentSheetSummaryRow(); - if (!summary_row) + if (!summary_row) { return std::move(builder).BuildChildren(); + } PaymentRequestRowView* previous_row = summary_row.get(); builder.AddChild(views::Builder<views::View>(std::move(summary_row))); if (state()->ShouldShowShippingSection()) { std::unique_ptr<PaymentRequestRowView> shipping_row = CreateShippingRow(); - if (!shipping_row) + if (!shipping_row) { return std::move(builder).BuildChildren(); + } shipping_row->set_previous_row(previous_row->AsWeakPtr()); previous_row = shipping_row.get(); @@ -502,8 +508,9 @@ // +----------------------------------------------+ std::unique_ptr<PaymentRequestRowView> PaymentSheetViewController::CreatePaymentSheetSummaryRow() { - if (!spec()) + if (!spec()) { return nullptr; + } constexpr int kItemSummaryPriceFixedWidth = 96; auto view_builder = @@ -596,8 +603,9 @@ std::u16string* accessible_content) { DCHECK(accessible_content); autofill::AutofillProfile* profile = state()->selected_shipping_profile(); - if (!profile) + if (!profile) { return std::make_unique<views::Label>(std::u16string()); + } return GetShippingAddressLabelWithMissingInfo( AddressStyleType::SUMMARY, state()->GetApplicationLocale(), *profile, @@ -614,8 +622,9 @@ // +----------------------------------------------+ std::unique_ptr<PaymentRequestRowView> PaymentSheetViewController::CreateShippingRow() { - if (!spec()) + if (!spec()) { return nullptr; + } std::unique_ptr<views::Button> section; PaymentSheetRowBuilder builder(
diff --git a/chrome/browser/ui/views/payments/profile_list_view_controller.cc b/chrome/browser/ui/views/payments/profile_list_view_controller.cc index b3cce89c9..d2ddcb2 100644 --- a/chrome/browser/ui/views/payments/profile_list_view_controller.cc +++ b/chrome/browser/ui/views/payments/profile_list_view_controller.cc
@@ -98,8 +98,9 @@ void PerformSelectionFallback() override { // If enabled, the editor is opened to complete the invalid profile. - if (GetClickable()) + if (GetClickable()) { controller_->ShowEditor(profile_); + } } void EditButtonPressed() override { controller_->ShowEditor(profile_); } @@ -129,8 +130,9 @@ const ShippingProfileViewController&) = delete; ~ShippingProfileViewController() override { - if (spec()) + if (spec()) { spec()->RemoveObserver(this); + } } protected: @@ -217,8 +219,9 @@ private: void OnSpecUpdated() override { - if (!spec()) + if (!spec()) { return; + } // If there's an error, stay on this screen so the user can select a // different address. Otherwise, go back to the payment sheet. @@ -230,8 +233,9 @@ // The error profile is known, refresh the view to display it correctly. PopulateList(); UpdateContentView(); - if (spec()->has_shipping_address_error()) + if (spec()->has_shipping_address_error()) { ShowEditor(state()->selected_shipping_option_error_profile()); + } } } } @@ -355,8 +359,9 @@ } void ProfileListViewController::PopulateList() { - if (!spec()) + if (!spec()) { return; + } autofill::AutofillProfile* selected_profile = GetSelectedProfile(); @@ -388,8 +393,9 @@ views::BoxLayout::CrossAxisAlignment::kStretch); content_view->SetLayoutManager(std::move(layout)); std::unique_ptr<views::View> header_view = CreateHeaderView(); - if (header_view) + if (header_view) { content_view->AddChildView(header_view.release()); + } std::unique_ptr<views::View> list_view = list_.CreateListView(); list_view->SetID(static_cast<int>(GetDialogViewId())); content_view->AddChildView(list_view.release());
diff --git a/chrome/browser/ui/views/payments/profile_list_view_controller.h b/chrome/browser/ui/views/payments/profile_list_view_controller.h index ccc28d8..4455ea5c 100644 --- a/chrome/browser/ui/views/payments/profile_list_view_controller.h +++ b/chrome/browser/ui/views/payments/profile_list_view_controller.h
@@ -20,7 +20,7 @@ namespace views { class Button; class View; -} +} // namespace views namespace payments {
diff --git a/chrome/browser/ui/views/payments/secure_payment_confirmation_dialog_view.cc b/chrome/browser/ui/views/payments/secure_payment_confirmation_dialog_view.cc index 1dad9bb..c66ddcc 100644 --- a/chrome/browser/ui/views/payments/secure_payment_confirmation_dialog_view.cc +++ b/chrome/browser/ui/views/payments/secure_payment_confirmation_dialog_view.cc
@@ -151,8 +151,9 @@ model_->progress_bar_visible()); // ui_observer_for_test_ is used in platform browsertests. - if (ui_observer_for_test_) + if (ui_observer_for_test_) { ui_observer_for_test_->OnUIDisplayed(); + } } void SecurePaymentConfirmationDialogView::OnDialogAccepted() { @@ -250,13 +251,15 @@ } void SecurePaymentConfirmationDialogView::HideDialog() { - if (GetWidget()) + if (GetWidget()) { GetWidget()->Close(); + } } bool SecurePaymentConfirmationDialogView::ClickOptOutForTesting() { - if (!model_->opt_out_visible()) + if (!model_->opt_out_visible()) { return false; + } OnOptOutClicked(); return true; }
diff --git a/chrome/browser/ui/views/payments/secure_payment_confirmation_no_creds_dialog_view.cc b/chrome/browser/ui/views/payments/secure_payment_confirmation_no_creds_dialog_view.cc index 224bf01..bb00787 100644 --- a/chrome/browser/ui/views/payments/secure_payment_confirmation_no_creds_dialog_view.cc +++ b/chrome/browser/ui/views/payments/secure_payment_confirmation_no_creds_dialog_view.cc
@@ -81,13 +81,15 @@ } void SecurePaymentConfirmationNoCredsDialogView::HideDialog() { - if (GetWidget()) + if (GetWidget()) { GetWidget()->Close(); + } } bool SecurePaymentConfirmationNoCredsDialogView::ClickOptOutForTesting() { - if (!model_->opt_out_visible()) + if (!model_->opt_out_visible()) { return false; + } OnOptOutClicked(); return true; } @@ -103,14 +105,16 @@ void SecurePaymentConfirmationNoCredsDialogView::OnDialogClosed() { auto callback = std::move(response_callback_); - if (!callback) + if (!callback) { return; + } std::move(callback).Run(); HideDialog(); - if (observer_for_test_) + if (observer_for_test_) { observer_for_test_->OnDialogClosed(); + } } void SecurePaymentConfirmationNoCredsDialogView::OnOptOutClicked() {
diff --git a/chrome/browser/ui/views/payments/shipping_address_editor_view_controller.cc b/chrome/browser/ui/views/payments/shipping_address_editor_view_controller.cc index 0a9fcc09..6534a10 100644 --- a/chrome/browser/ui/views/payments/shipping_address_editor_view_controller.cc +++ b/chrome/browser/ui/views/payments/shipping_address_editor_view_controller.cc
@@ -65,8 +65,9 @@ profile_to_edit_(profile), chosen_country_index_(kInvalidCountryIndex), failed_to_load_region_data_(false) { - if (profile_to_edit_) + if (profile_to_edit_) { temporary_profile_ = *profile_to_edit_; + } UpdateCountries(/*model=*/nullptr); UpdateEditorFields(); } @@ -94,13 +95,15 @@ // is okay to initially build this profile with an empty country. autofill::AutofillProfile profile( autofill::i18n_model_definition::kLegacyHierarchyCountryCode); - if (!SaveFieldsToProfile(&profile, /*ignore_errors=*/false)) + if (!SaveFieldsToProfile(&profile, /*ignore_errors=*/false)) { return false; + } if (!profile_to_edit_) { // Add the profile (will not add a duplicate). - if (!is_incognito()) + if (!is_incognito()) { state()->GetPersonalDataManager()->address_data_manager().AddProfile( profile); + } std::move(on_added_).Run(profile); on_edited_.Reset(); } else { @@ -109,9 +112,10 @@ bool success = SaveFieldsToProfile(profile_to_edit_, /*ignore_errors=*/false); DCHECK(success); - if (!is_incognito()) + if (!is_incognito()) { state()->GetPersonalDataManager()->address_data_manager().UpdateProfile( *profile_to_edit_); + } state()->profile_comparator()->Invalidate(*profile_to_edit_); std::move(on_edited_).Run(); on_added_.Reset(); @@ -137,8 +141,9 @@ model->SetCountries(*state()->GetPersonalDataManager(), base::RepeatingCallback<bool(const std::string&)>(), state()->GetApplicationLocale()); - if (model->countries().size() != countries_.size()) + if (model->countries().size() != countries_.size()) { UpdateCountries(model.get()); + } return model; } case autofill::ADDRESS_HOME_STATE: { @@ -169,8 +174,9 @@ void ShippingAddressEditorViewController::OnPerformAction( ValidatingCombobox* sender) { EditorViewController::OnPerformAction(sender); - if (sender->GetID() != GetInputFieldViewId(autofill::ADDRESS_HOME_COUNTRY)) + if (sender->GetID() != GetInputFieldViewId(autofill::ADDRESS_HOME_COUNTRY)) { return; + } DCHECK(sender->GetSelectedIndex().has_value()); if (chosen_country_index_ != sender->GetSelectedIndex()) { chosen_country_index_ = sender->GetSelectedIndex().value(); @@ -258,8 +264,9 @@ bool ShippingAddressEditorViewController::ShippingAddressValidationDelegate:: TextfieldValueChanged(views::Textfield* textfield, bool was_blurred) { - if (!was_blurred) + if (!was_blurred) { return true; + } std::u16string error_message; bool is_valid = ValidateValue(textfield->GetText(), &error_message); @@ -290,8 +297,9 @@ bool ShippingAddressEditorViewController::ShippingAddressValidationDelegate:: ValidateValue(const std::u16string& value, std::u16string* error_message) { - if (!controller_ || !controller_->spec()) + if (!controller_ || !controller_->spec()) { return false; + } // Show errors from merchant's retry() call. Note that changing the selected // shipping address will clear the validation errors from retry(). @@ -301,8 +309,9 @@ value == controller_->GetValueForType(*invalid_shipping_profile, field_.type)) { *error_message = controller_->spec()->GetShippingAddressError(field_.type); - if (!error_message->empty()) + if (!error_message->empty()) { return false; + } } if (!value.empty()) { @@ -406,8 +415,9 @@ autofill::ADDRESS_HOME_COUNTRY, state()->GetApplicationLocale())); for (chosen_country_index_ = 0; chosen_country_index_ < countries_.size(); ++chosen_country_index_) { - if (chosen_country == countries_[chosen_country_index_].second) + if (chosen_country == countries_[chosen_country_index_].second) { break; + } } // Make sure the the country was actually found in |countries_| and was not // empty, otherwise set |chosen_country_index_| to index 0, which is the @@ -433,8 +443,9 @@ void ShippingAddressEditorViewController::UpdateEditorFields() { editor_fields_.clear(); std::string chosen_country_code; - if (chosen_country_index_ < countries_.size()) + if (chosen_country_index_ < countries_.size()) { chosen_country_code = countries_[chosen_country_index_].first; + } std::vector<std::vector<autofill::AutofillAddressUIComponent>> components; autofill::GetAddressComponents( @@ -516,8 +527,9 @@ profile->SetInfo(autofill::ADDRESS_HOME_COUNTRY, country, locale); LOG_IF(ERROR, !success && !ignore_errors) << "Can't set profile country to: " << country; - if (!success && !ignore_errors) + if (!success && !ignore_errors) { return false; + } } bool success = true; @@ -532,16 +544,18 @@ LOG_IF(ERROR, !success && !ignore_errors) << "Can't setinfo(" << field.second.type << ", " << field.first->GetText(); - if (!success && !ignore_errors) + if (!success && !ignore_errors) { return false; + } } for (const auto& field : comboboxes()) { // ValidatingCombobox* is the key, EditorField is the value. ValidatingCombobox* validating_combobox = field.first; // The country has already been dealt with. if (validating_combobox->GetID() == - GetInputFieldViewId(autofill::ADDRESS_HOME_COUNTRY)) + GetInputFieldViewId(autofill::ADDRESS_HOME_COUNTRY)) { continue; + } if (validating_combobox->IsValid()) { success = profile->SetInfo(field.second.type, @@ -555,8 +569,9 @@ << "Can't setinfo(" << field.second.type << ", " << validating_combobox->GetTextForRow( validating_combobox->GetSelectedIndex().value()); - if (!success && !ignore_errors) + if (!success && !ignore_errors) { return false; + } } profile->set_language_code(language_code_); return success; @@ -564,12 +579,14 @@ void ShippingAddressEditorViewController::OnComboboxModelChanged( ValidatingCombobox* combobox) { - if (combobox->GetID() != GetInputFieldViewId(autofill::ADDRESS_HOME_STATE)) + if (combobox->GetID() != GetInputFieldViewId(autofill::ADDRESS_HOME_STATE)) { return; + } autofill::RegionComboboxModel* model = static_cast<autofill::RegionComboboxModel*>(combobox->GetModel()); - if (model->IsPendingRegionDataLoad()) + if (model->IsPendingRegionDataLoad()) { return; + } if (model->failed_to_load_data()) { failed_to_load_region_data_ = true; // It is safe to update synchronously since the change comes from the model
diff --git a/chrome/browser/ui/views/payments/shipping_address_editor_view_controller_browsertest.cc b/chrome/browser/ui/views/payments/shipping_address_editor_view_controller_browsertest.cc index fd3f758..71f6807b 100644 --- a/chrome/browser/ui/views/payments/shipping_address_editor_view_controller_browsertest.cc +++ b/chrome/browser/ui/views/payments/shipping_address_editor_view_controller_browsertest.cc
@@ -109,10 +109,12 @@ ValidatingTextfield* textfield = static_cast<ValidatingTextfield*>(dialog_view()->GetViewByID( EditorViewController::GetInputFieldViewId(type))); - if (!textfield) + if (!textfield) { return false; - if (textfield_text) + } + if (textfield_text) { *textfield_text = textfield->GetText(); + } return true; } @@ -157,8 +159,9 @@ if (!accept_empty_phone_number) { EXPECT_EQ(u"+1 575-555-5555", textfield_text); } else if (textfield_text.empty()) { - if (unset_types) + if (unset_types) { unset_types->insert(autofill::PHONE_HOME_WHOLE_NUMBER); + } } } else if (unset_types) { unset_types->insert(autofill::PHONE_HOME_WHOLE_NUMBER); @@ -190,8 +193,9 @@ country_combobox->GetModel()); size_t i = 0; for (; i < country_model->GetItemCount(); i++) { - if (country_model->GetItemAt(i) == country_name) + if (country_model->GetItemAt(i) == country_name) { break; + } } country_combobox->SetSelectedRow(i); country_combobox->OnBlur();
diff --git a/chrome/browser/ui/views/payments/shipping_option_view_controller.cc b/chrome/browser/ui/views/payments/shipping_option_view_controller.cc index bb2830e..3319629a 100644 --- a/chrome/browser/ui/views/payments/shipping_option_view_controller.cc +++ b/chrome/browser/ui/views/payments/shipping_option_view_controller.cc
@@ -106,13 +106,15 @@ } ShippingOptionViewController::~ShippingOptionViewController() { - if (spec()) + if (spec()) { spec()->RemoveObserver(this); + } } void ShippingOptionViewController::OnSpecUpdated() { - if (!spec()) + if (!spec()) { return; + } if (spec()->current_update_reason() == PaymentRequestSpec::UpdateReason::SHIPPING_OPTION) {
diff --git a/chrome/browser/ui/views/payments/test_chrome_payment_request_delegate.cc b/chrome/browser/ui/views/payments/test_chrome_payment_request_delegate.cc index 68b9910..cbd2402 100644 --- a/chrome/browser/ui/views/payments/test_chrome_payment_request_delegate.cc +++ b/chrome/browser/ui/views/payments/test_chrome_payment_request_delegate.cc
@@ -113,8 +113,9 @@ std::string TestChromePaymentRequestDelegate::GetInvalidSslCertificateErrorMessage() { - if (is_valid_ssl_.has_value()) + if (is_valid_ssl_.has_value()) { return *is_valid_ssl_ ? "" : "Invalid SSL certificate"; + } return ChromePaymentRequestDelegate::GetInvalidSslCertificateErrorMessage(); }
diff --git a/chrome/browser/ui/views/payments/validating_combobox.cc b/chrome/browser/ui/views/payments/validating_combobox.cc index e11334a2..feb178cd 100644 --- a/chrome/browser/ui/views/payments/validating_combobox.cc +++ b/chrome/browser/ui/views/payments/validating_combobox.cc
@@ -32,8 +32,9 @@ void ValidatingCombobox::ViewHierarchyChanged( const views::ViewHierarchyChangedDetails& details) { - if (details.child == this && !details.is_add) + if (details.child == this && !details.is_add) { being_removed_ = true; + } } void ValidatingCombobox::OnContentsChanged() {
diff --git a/chrome/browser/ui/views/payments/validating_textfield.cc b/chrome/browser/ui/views/payments/validating_textfield.cc index 0d894ed6b..fe086c9 100644 --- a/chrome/browser/ui/views/payments/validating_textfield.cc +++ b/chrome/browser/ui/views/payments/validating_textfield.cc
@@ -3,10 +3,11 @@ // found in the LICENSE file. #include "chrome/browser/ui/views/payments/validating_textfield.h" -#include "ui/base/metadata/metadata_impl_macros.h" #include <utility> +#include "ui/base/metadata/metadata_impl_macros.h" + namespace payments { ValidatingTextfield::ValidatingTextfield( @@ -20,17 +21,20 @@ was_blurred_ = true; // Do not validate if the view is being removed. - if (!being_removed_) + if (!being_removed_) { Validate(); + } - if (!GetText().empty() && delegate_->ShouldFormat()) + if (!GetText().empty() && delegate_->ShouldFormat()) { SetText(delegate_->Format(GetText())); + } } void ValidatingTextfield::ViewHierarchyChanged( const views::ViewHierarchyChangedDetails& details) { - if (details.child == this && !details.is_add) + if (details.child == this && !details.is_add) { being_removed_ = true; + } } void ValidatingTextfield::OnContentsChanged() {
diff --git a/chrome/browser/ui/views/payments/validation_delegate.h b/chrome/browser/ui/views/payments/validation_delegate.h index e2d323d..b0182af 100644 --- a/chrome/browser/ui/views/payments/validation_delegate.h +++ b/chrome/browser/ui/views/payments/validation_delegate.h
@@ -7,7 +7,6 @@ #include <string> - namespace views { class Textfield; } // namespace views
diff --git a/chrome/browser/ui/views/payments/view_stack.cc b/chrome/browser/ui/views/payments/view_stack.cc index 1081eb0..b555285 100644 --- a/chrome/browser/ui/views/payments/view_stack.cc +++ b/chrome/browser/ui/views/payments/view_stack.cc
@@ -112,8 +112,9 @@ // The view can only be focused if it has a widget already. It's possible that // this isn't the case if some views are pushed before the stack is added to a // hierarchy that has a widget. - if (top()->GetWidget()) + if (top()->GetWidget()) { top()->RequestFocus(); + } } void ViewStack::OnBoundsChanged(const gfx::Rect& previous_bounds) { @@ -128,8 +129,8 @@ } } -void ViewStack::UpdateAnimatorBounds( - views::BoundsAnimator* animator, const gfx::Rect& target) { +void ViewStack::UpdateAnimatorBounds(views::BoundsAnimator* animator, + const gfx::Rect& target) { // If an animator is currently animating, figure out which views and update // their target bounds. if (animator->IsAnimating()) {
diff --git a/chrome/browser/ui/views/payments/view_stack.h b/chrome/browser/ui/views/payments/view_stack.h index 9c6c392a..1cd1036 100644 --- a/chrome/browser/ui/views/payments/view_stack.h +++ b/chrome/browser/ui/views/payments/view_stack.h
@@ -22,8 +22,7 @@ // left to right. It manages the animation and lifetime of views that are // pushed and popped on it. To use this class, add it to a view hierarchy, and // call Push/Pop to animate views in and out. -class ViewStack : public views::BoundsAnimatorObserver, - public views::View { +class ViewStack : public views::BoundsAnimatorObserver, public views::View { METADATA_HEADER(ViewStack, views::View) public: @@ -62,8 +61,8 @@ views::View* top() { return stack_.back(); } private: - FRIEND_TEST_ALL_PREFIXES( - ViewStackTest, TestPopStateRemovesChildViewAndCleansUpState); + FRIEND_TEST_ALL_PREFIXES(ViewStackTest, + TestPopStateRemovesChildViewAndCleansUpState); FRIEND_TEST_ALL_PREFIXES(ViewStackTest, TestDeletingViewCleansUpState); FRIEND_TEST_ALL_PREFIXES(ViewStackTest, TestInitialStateAddedAsChildView); FRIEND_TEST_ALL_PREFIXES(ViewStackTest, TestPushStateAddsViewToChildren); @@ -74,8 +73,8 @@ // Marks all views, except the topmost, as invisible. void HideCoveredViews(); - void UpdateAnimatorBounds( - views::BoundsAnimator* animator, const gfx::Rect& target); + void UpdateAnimatorBounds(views::BoundsAnimator* animator, + const gfx::Rect& target); // views::BoundsAnimatorObserver: void OnBoundsAnimatorProgressed(views::BoundsAnimator* animator) override {}
diff --git a/chrome/browser/ui/views/payments/view_stack_unittest.cc b/chrome/browser/ui/views/payments/view_stack_unittest.cc index 465b065..3ca6ec8 100644 --- a/chrome/browser/ui/views/payments/view_stack_unittest.cc +++ b/chrome/browser/ui/views/payments/view_stack_unittest.cc
@@ -2,11 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/views/payments/view_stack.h" + #include <memory> #include "base/observer_list.h" #include "base/run_loop.h" -#include "chrome/browser/ui/views/payments/view_stack.h" #include "chrome/test/views/chrome_views_test_base.h" #include "ui/gfx/animation/test_animation_delegate.h" @@ -16,9 +17,7 @@ public: Observer() : view_deleted_(false) {} - void OnViewBeingDeleted() { - view_deleted_ = true; - } + void OnViewBeingDeleted() { view_deleted_ = true; } bool view_deleted() { return view_deleted_; } @@ -35,9 +34,7 @@ observers_.Notify(&Observer::OnViewBeingDeleted); } - void AddObserver(Observer* observer) { - observers_.AddObserver(observer); - } + void AddObserver(Observer* observer) { observers_.AddObserver(observer); } private: base::ObserverList<Observer>::Unchecked observers_;
diff --git a/chrome/browser/ui/views/performance_controls/battery_saver_button.cc b/chrome/browser/ui/views/performance_controls/battery_saver_button.cc index dd2b02c..76a85ac 100644 --- a/chrome/browser/ui/views/performance_controls/battery_saver_button.cc +++ b/chrome/browser/ui/views/performance_controls/battery_saver_button.cc
@@ -47,8 +47,9 @@ } BatterySaverButton::~BatterySaverButton() { - if (IsBubbleShowing()) + if (IsBubbleShowing()) { BatterySaverBubbleView::CloseBubble(bubble_); + } } bool BatterySaverButton::IsBubbleShowing() const { @@ -62,8 +63,9 @@ // Wait until the view is properly laid out before triggering the promo // The promo will be triggered in |OnBoundsChanged| if the flag is set - if (!was_visible) + if (!was_visible) { pending_promo_ = true; + } } void BatterySaverButton::Hide() { @@ -89,11 +91,13 @@ void BatterySaverButton::OnBoundsChanged(const gfx::Rect& previous_bounds) { ToolbarButton::OnBoundsChanged(previous_bounds); - if (!GetVisible() || size().IsEmpty()) + if (!GetVisible() || size().IsEmpty()) { return; + } - if (pending_promo_) + if (pending_promo_) { MaybeShowFeaturePromo(); + } } void BatterySaverButton::OnClicked() {
diff --git a/chrome/browser/ui/views/performance_controls/memory_saver_bubble_view_unittest.cc b/chrome/browser/ui/views/performance_controls/memory_saver_bubble_view_unittest.cc index f09f5c2..b4a5565b 100644 --- a/chrome/browser/ui/views/performance_controls/memory_saver_bubble_view_unittest.cc +++ b/chrome/browser/ui/views/performance_controls/memory_saver_bubble_view_unittest.cc
@@ -50,7 +50,6 @@ public testing::WithParamInterface<std::tuple<int, int>> { public: void SetUp() override { - MemorySaverUnitTestMixin::SetUp(); AddNewTab(kMemorySavingsKilobytes,
diff --git a/chrome/browser/ui/views/performance_controls/memory_saver_chip_view.h b/chrome/browser/ui/views/performance_controls/memory_saver_chip_view.h index 640f9c66..f0926b2 100644 --- a/chrome/browser/ui/views/performance_controls/memory_saver_chip_view.h +++ b/chrome/browser/ui/views/performance_controls/memory_saver_chip_view.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_PERFORMANCE_CONTROLS_MEMORY_SAVER_CHIP_VIEW_H_ #include <string> + #include "base/scoped_observation.h" #include "chrome/browser/performance_manager/public/user_tuning/user_performance_tuning_manager.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/views/performance_controls/memory_saver_chip_view_browsertest.cc b/chrome/browser/ui/views/performance_controls/memory_saver_chip_view_browsertest.cc index 58306bc8..835eefc 100644 --- a/chrome/browser/ui/views/performance_controls/memory_saver_chip_view_browsertest.cc +++ b/chrome/browser/ui/views/performance_controls/memory_saver_chip_view_browsertest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/views/performance_controls/memory_saver_chip_view.h" + #include "base/functional/bind.h" #include "base/scoped_observation.h" #include "base/test/bind.h" @@ -18,7 +20,6 @@ #include "chrome/browser/ui/views/page_action/page_action_icon_controller.h" #include "chrome/browser/ui/views/page_action/page_action_icon_view.h" #include "chrome/browser/ui/views/performance_controls/memory_saver_bubble_view.h" -#include "chrome/browser/ui/views/performance_controls/memory_saver_chip_view.h" #include "chrome/browser/ui/views/toolbar/toolbar_view.h" #include "chrome/common/webui_url_constants.h" #include "chrome/test/base/in_process_browser_test.h"
diff --git a/chrome/browser/ui/views/performance_controls/memory_saver_interactive_ui_test.cc b/chrome/browser/ui/views/performance_controls/memory_saver_interactive_ui_test.cc index c80d4ec4..280d086 100644 --- a/chrome/browser/ui/views/performance_controls/memory_saver_interactive_ui_test.cc +++ b/chrome/browser/ui/views/performance_controls/memory_saver_interactive_ui_test.cc
@@ -75,7 +75,6 @@ } // namespace - // Tests Discarding on pages with various types of content class MemorySaverDiscardPolicyInteractiveTest : public MemorySaverInteractiveTestMixin<InteractiveBrowserTest>,
diff --git a/chrome/browser/ui/views/performance_controls/memory_saver_iph_interactive_uitest.cc b/chrome/browser/ui/views/performance_controls/memory_saver_iph_interactive_uitest.cc index 391b3c7..42a416a 100644 --- a/chrome/browser/ui/views/performance_controls/memory_saver_iph_interactive_uitest.cc +++ b/chrome/browser/ui/views/performance_controls/memory_saver_iph_interactive_uitest.cc
@@ -51,8 +51,7 @@ Do([this]() { constexpr int kTabCountThreshold = 10; for (int i = 0; i < kTabCountThreshold; i++) { - NavigateParams params(browser(), - GURL("about:blank"), + NavigateParams params(browser(), GURL("about:blank"), ui::PAGE_TRANSITION_LINK); params.disposition = WindowOpenDisposition::NEW_BACKGROUND_TAB; Navigate(¶ms); @@ -95,20 +94,19 @@ // Check that the performance menu item is alerted when the memory saver // promo is shown and the app menu button is clicked IN_PROC_BROWSER_TEST_F(MemorySaverIphUiTest, AlertMenuItemWhenPromoShown) { - RunTestSequence( - TriggerMemorySaverPromo(), - // This is required because normally this would happen when the button is - // pressed, but pages loading in the background can cause the render view - // to be focused, which can cause focus to pop back to the web view while - // the app menu is trying to show, which can in turn cause the menu to - // close. - ActivateSurface(kBrowserViewElementId), - PressButton(kToolbarAppMenuButtonElementId), - WaitForShow(AppMenuModel::kMoreToolsMenuItem), - CheckViewProperty(AppMenuModel::kMoreToolsMenuItem, - &views::MenuItemView::is_alerted, true), - SelectMenuItem(AppMenuModel::kMoreToolsMenuItem), - WaitForShow(ToolsMenuModel::kPerformanceMenuItem), - CheckViewProperty(ToolsMenuModel::kPerformanceMenuItem, - &views::MenuItemView::is_alerted, true)); + RunTestSequence(TriggerMemorySaverPromo(), + // This is required because normally this would happen when + // the button is pressed, but pages loading in the background + // can cause the render view to be focused, which can cause + // focus to pop back to the web view while the app menu is + // trying to show, which can in turn cause the menu to close. + ActivateSurface(kBrowserViewElementId), + PressButton(kToolbarAppMenuButtonElementId), + WaitForShow(AppMenuModel::kMoreToolsMenuItem), + CheckViewProperty(AppMenuModel::kMoreToolsMenuItem, + &views::MenuItemView::is_alerted, true), + SelectMenuItem(AppMenuModel::kMoreToolsMenuItem), + WaitForShow(ToolsMenuModel::kPerformanceMenuItem), + CheckViewProperty(ToolsMenuModel::kPerformanceMenuItem, + &views::MenuItemView::is_alerted, true)); }
diff --git a/chrome/browser/ui/views/permissions/chip/LHS_indicators_interactive_uitest.cc b/chrome/browser/ui/views/permissions/chip/LHS_indicators_interactive_uitest.cc index 63bcf87..454a232 100644 --- a/chrome/browser/ui/views/permissions/chip/LHS_indicators_interactive_uitest.cc +++ b/chrome/browser/ui/views/permissions/chip/LHS_indicators_interactive_uitest.cc
@@ -352,7 +352,8 @@ ShowAndVerifyUi(); } -IN_PROC_BROWSER_TEST_F(LHSIndicatorsInteractiveUITest, InvokeUi_camera_blocked) { +IN_PROC_BROWSER_TEST_F(LHSIndicatorsInteractiveUITest, + InvokeUi_camera_blocked) { SetPermission(ContentSettingsType::MEDIASTREAM_CAMERA, ContentSetting::CONTENT_SETTING_BLOCK); @@ -389,7 +390,8 @@ ShowAndVerifyUi(); } -IN_PROC_BROWSER_TEST_F(LHSIndicatorsInteractiveUITest, InvokeUi_PageInfo_camera) { +IN_PROC_BROWSER_TEST_F(LHSIndicatorsInteractiveUITest, + InvokeUi_PageInfo_camera) { SetPermission(ContentSettingsType::MEDIASTREAM_CAMERA, ContentSetting::CONTENT_SETTING_ALLOW);
diff --git a/chrome/browser/ui/views/permissions/chip/chip_controller.cc b/chrome/browser/ui/views/permissions/chip/chip_controller.cc index e6b7c8c..762f2df 100644 --- a/chrome/browser/ui/views/permissions/chip/chip_controller.cc +++ b/chrome/browser/ui/views/permissions/chip/chip_controller.cc
@@ -454,12 +454,14 @@ void ChipController::ShowPageInfoDialog() { content::WebContents* contents = GetLocationBarView()->GetWebContents(); - if (!contents) + if (!contents) { return; + } content::NavigationEntry* entry = contents->GetController().GetVisibleEntry(); - if (entry->IsInitialEntry()) + if (entry->IsInitialEntry()) { return; + } // Prevent chip from collapsing while prompt bubble is open. ResetTimers(); @@ -585,8 +587,9 @@ } void ChipController::HideChip() { - if (!chip_->GetVisible()) + if (!chip_->GetVisible()) { return; + } chip_->SetVisible(false); if (permission_dashboard_view_) { @@ -690,8 +693,9 @@ void ChipController::OnPromptBubbleDismissed() { DCHECK(permission_prompt_model_); - if (!permission_prompt_model_) + if (!permission_prompt_model_) { return; + } if (permission_prompt_model_->GetDelegate()) { permission_prompt_model_->GetDelegate()->SetDismissOnTabClose(); @@ -773,8 +777,9 @@ } void ChipController::StartDismissTimer() { - if (!permission_prompt_model_) + if (!permission_prompt_model_) { return; + } dismiss_timer_.Start(FROM_HERE, permission_prompt_model_->ShouldExpand()
diff --git a/chrome/browser/ui/views/permissions/chip/permission_chip_interactive_uitest.cc b/chrome/browser/ui/views/permissions/chip/permission_chip_interactive_uitest.cc index 26dacfc3..f27b3d10 100644 --- a/chrome/browser/ui/views/permissions/chip/permission_chip_interactive_uitest.cc +++ b/chrome/browser/ui/views/permissions/chip/permission_chip_interactive_uitest.cc
@@ -133,8 +133,8 @@ class PermissionChipInteractiveUITest : public InProcessBrowserTest { public: PermissionChipInteractiveUITest() = default; - PermissionChipInteractiveUITest( - const PermissionChipInteractiveUITest&) = delete; + PermissionChipInteractiveUITest(const PermissionChipInteractiveUITest&) = + delete; PermissionChipInteractiveUITest& operator=( const PermissionChipInteractiveUITest&) = delete; @@ -177,7 +177,6 @@ return lbv->GetChipController(); } - void ClickOnChip(PermissionChipView* chip) { ASSERT_TRUE(chip != nullptr); ASSERT_TRUE(chip->GetVisible()); @@ -281,7 +280,7 @@ l10n_util::GetStringUTF16( IDS_PERMISSIONS_PERMISSION_ALLOWED_CONFIRMATION)); - EXPECT_FALSE(IsLocationIconVisible()); + EXPECT_FALSE(IsLocationIconVisible()); // Check collapse timer is running and fast forward fire callback. Then, // fast forward animation to trigger callback and wait until it completes. @@ -1102,8 +1101,8 @@ LOCATION_BAR_LEFT_CHIP_AUTO_BUBBLE); } -class QuietChipFailFastInteractiveTest : public - PermissionChipInteractiveUITest { +class QuietChipFailFastInteractiveTest + : public PermissionChipInteractiveUITest { public: QuietChipFailFastInteractiveTest() { scoped_feature_list_.InitWithFeatures({features::kQuietNotificationPrompts},
diff --git a/chrome/browser/ui/views/permissions/chip/permission_chip_kombucha_interactive_uitest.cc b/chrome/browser/ui/views/permissions/chip/permission_chip_kombucha_interactive_uitest.cc index 4aea88b..0bc4073 100644 --- a/chrome/browser/ui/views/permissions/chip/permission_chip_kombucha_interactive_uitest.cc +++ b/chrome/browser/ui/views/permissions/chip/permission_chip_kombucha_interactive_uitest.cc
@@ -58,7 +58,7 @@ ~PermissionChipKombuchaInteractiveUITest() override = default; PermissionChipKombuchaInteractiveUITest( - const PermissionChipKombuchaInteractiveUITest&) = delete; + const PermissionChipKombuchaInteractiveUITest&) = delete; void operator=(const PermissionChipKombuchaInteractiveUITest&) = delete; void SetUp() override {
diff --git a/chrome/browser/ui/views/permissions/chip/permission_chip_view.cc b/chrome/browser/ui/views/permissions/chip/permission_chip_view.cc index 3573bd9..79a4efb 100644 --- a/chrome/browser/ui/views/permissions/chip/permission_chip_view.cc +++ b/chrome/browser/ui/views/permissions/chip/permission_chip_view.cc
@@ -133,9 +133,9 @@ } void PermissionChipView::UpdateBackgroundColor() { - SetBackground(views::CreateBackgroundFromPainter( - views::Painter::CreateSolidRoundRectPainterWithVariableRadius( - GetBackgroundColor(), GetCornerRadii()))); + SetBackground(views::CreateBackgroundFromPainter( + views::Painter::CreateSolidRoundRectPainterWithVariableRadius( + GetBackgroundColor(), GetCornerRadii()))); } void PermissionChipView::AnimationEnded(const gfx::Animation* animation) {
diff --git a/chrome/browser/ui/views/permissions/chip/permission_dashboard_controller.cc b/chrome/browser/ui/views/permissions/chip/permission_dashboard_controller.cc index c89da14f..32740fb 100644 --- a/chrome/browser/ui/views/permissions/chip/permission_dashboard_controller.cc +++ b/chrome/browser/ui/views/permissions/chip/permission_dashboard_controller.cc
@@ -232,7 +232,6 @@ indicator_chip->SetTheme(PermissionChipTheme::kInUseActivityIndicator); } - if (request_chip_controller_->is_confirmation_showing()) { request_chip_controller_->ResetPermissionPromptChip(); }
diff --git a/chrome/browser/ui/views/permissions/chooser_bubble_ui.cc b/chrome/browser/ui/views/permissions/chooser_bubble_ui.cc index 164c4c5d..9afd48e 100644 --- a/chrome/browser/ui/views/permissions/chooser_bubble_ui.cc +++ b/chrome/browser/ui/views/permissions/chooser_bubble_ui.cc
@@ -169,8 +169,9 @@ AnchorConfiguration configuration = GetChooserAnchorConfiguration(browser); SetAnchorView(configuration.anchor_view); SetHighlightedButton(configuration.highlighted_button); - if (!configuration.anchor_view) + if (!configuration.anchor_view) { SetAnchorRect(GetChooserAnchorRect(browser)); + } SetArrow(configuration.bubble_arrow); } @@ -184,8 +185,9 @@ } void ChooserBubbleUiViewDelegate::Close() { - if (GetWidget()) + if (GetWidget()) { GetWidget()->CloseWithReason(views::Widget::ClosedReason::kUnspecified); + } } BEGIN_METADATA(ChooserBubbleUiViewDelegate) @@ -202,11 +204,13 @@ std::unique_ptr<permissions::ChooserController> controller) { auto* contents = content::WebContents::FromRenderFrameHost(owner); auto* browser = chrome::FindBrowserWithTab(contents); - if (!browser) + if (!browser) { return base::DoNothing(); + } - if (browser->tab_strip_model()->GetActiveWebContents() != contents) + if (browser->tab_strip_model()->GetActiveWebContents() != contents) { return base::DoNothing(); + } // `GetExtensionsToolbarContainer` may return `nullptr`, for instance in // extension popup windows. @@ -259,11 +263,13 @@ #endif // BUILDFLAG(ENABLE_EXTENSIONS) auto* browser = chrome::FindBrowserWithTab(contents); - if (!browser) + if (!browser) { return base::DoNothing(); + } - if (browser->tab_strip_model()->GetActiveWebContents() != contents) + if (browser->tab_strip_model()->GetActiveWebContents() != contents) { return base::DoNothing(); + } auto bubble = std::make_unique<ChooserBubbleUiViewDelegate>( browser, contents, std::move(controller)); @@ -279,10 +285,11 @@ base::OnceClosure close_closure = bubble->MakeCloseClosure(); views::Widget* widget = views::BubbleDialogDelegateView::CreateBubble(std::move(bubble)); - if (browser->window()->IsActive()) + if (browser->window()->IsActive()) { widget->Show(); - else + } else { widget->ShowInactive(); + } // If we're opening this device chooser dialog on a picture-in-picture window, // then our widget is also always-on-top and needs to be tracked by the
diff --git a/chrome/browser/ui/views/permissions/embedded_permission_prompt.cc b/chrome/browser/ui/views/permissions/embedded_permission_prompt.cc index d358831..11fc6183 100644 --- a/chrome/browser/ui/views/permissions/embedded_permission_prompt.cc +++ b/chrome/browser/ui/views/permissions/embedded_permission_prompt.cc
@@ -263,8 +263,8 @@ delegate()->Requests(), permissions::ElementAnchoredBubbleVariant::OS_PROMPT); current_variant_first_display_time_ = base::Time::Now(); -// This view has no buttons, so the OS level prompt should be triggered at the -// same time as the |EmbeddedPermissionPromptShowSystemPromptView|. + // This view has no buttons, so the OS level prompt should be triggered at + // the same time as the |EmbeddedPermissionPromptShowSystemPromptView|. PromptForOsPermission(); break; case Variant::kOsSystemSettings: @@ -485,9 +485,9 @@ void EmbeddedPermissionPrompt::ShowSystemSettings() { const auto& requests = delegate()->Requests(); CHECK_GT(requests.size(), 0U); -// TODO(crbug.com/40275129) Chrome always shows the first permission in a group, -// as it is not possible to open multiple System Setting pages. Figure out a -// better way to handle this scenario. + // TODO(crbug.com/40275129) Chrome always shows the first permission in a + // group, as it is not possible to open multiple System Setting pages. Figure + // out a better way to handle this scenario. RecordOsMetrics(permissions::OsScreenAction::SYSTEM_SETTINGS); RecordPermissionActionUKM( permissions::ElementAnchoredBubbleAction::kSystemSettings);
diff --git a/chrome/browser/ui/views/permissions/embedded_permission_prompt_previously_denied_view.cc b/chrome/browser/ui/views/permissions/embedded_permission_prompt_previously_denied_view.cc index 9c19ac4..c1a89ae 100644 --- a/chrome/browser/ui/views/permissions/embedded_permission_prompt_previously_denied_view.cc +++ b/chrome/browser/ui/views/permissions/embedded_permission_prompt_previously_denied_view.cc
@@ -5,7 +5,6 @@ #include "chrome/browser/ui/views/permissions/embedded_permission_prompt_previously_denied_view.h" #include "base/memory/weak_ptr.h" - #include "chrome/browser/ui/url_identity.h" #include "components/permissions/features.h" #include "components/strings/grit/components_strings.h" @@ -82,9 +81,9 @@ l10n_util::GetStringUTF16(IDS_EMBEDDED_PROMPT_CONTINUE_NOT_ALLOWING), ButtonType::kContinueNotAllowing, ui::ButtonStyle::kTonal); - buttons.emplace_back( - l10n_util::GetStringUTF16(IDS_PERMISSION_ALLOW_THIS_TIME), - ButtonType::kAllowThisTime, ui::ButtonStyle::kTonal, kAllowThisTimeId); + buttons.emplace_back( + l10n_util::GetStringUTF16(IDS_PERMISSION_ALLOW_THIS_TIME), + ButtonType::kAllowThisTime, ui::ButtonStyle::kTonal, kAllowThisTimeId); return buttons; }
diff --git a/chrome/browser/ui/views/permissions/embedded_permission_prompt_show_system_prompt_view.cc b/chrome/browser/ui/views/permissions/embedded_permission_prompt_show_system_prompt_view.cc index 080c404d..fe30031b 100644 --- a/chrome/browser/ui/views/permissions/embedded_permission_prompt_show_system_prompt_view.cc +++ b/chrome/browser/ui/views/permissions/embedded_permission_prompt_show_system_prompt_view.cc
@@ -5,7 +5,6 @@ #include "chrome/browser/ui/views/permissions/embedded_permission_prompt_show_system_prompt_view.h" #include "base/memory/weak_ptr.h" - #include "chrome/browser/ui/url_identity.h" #include "components/permissions/features.h" #include "components/strings/grit/components_strings.h"
diff --git a/chrome/browser/ui/views/permissions/embedded_permission_prompt_system_settings_view.cc b/chrome/browser/ui/views/permissions/embedded_permission_prompt_system_settings_view.cc index a665573..9e5a127df 100644 --- a/chrome/browser/ui/views/permissions/embedded_permission_prompt_system_settings_view.cc +++ b/chrome/browser/ui/views/permissions/embedded_permission_prompt_system_settings_view.cc
@@ -5,7 +5,6 @@ #include "chrome/browser/ui/views/permissions/embedded_permission_prompt_system_settings_view.h" #include "base/memory/weak_ptr.h" - #include "chrome/browser/ui/url_identity.h" #include "components/permissions/features.h" #include "components/strings/grit/components_strings.h"
diff --git a/chrome/browser/ui/views/permissions/midi_permissions_flow_interactive_uitest.cc b/chrome/browser/ui/views/permissions/midi_permissions_flow_interactive_uitest.cc index 30313fc4..e28a59c 100644 --- a/chrome/browser/ui/views/permissions/midi_permissions_flow_interactive_uitest.cc +++ b/chrome/browser/ui/views/permissions/midi_permissions_flow_interactive_uitest.cc
@@ -125,8 +125,8 @@ for (PermissionToggleRowView* permission_toggle_row : AsView<PageInfoMainView>(element)->GetToggleRowsForTesting()) { if (permission_toggle_row->GetRowTitleForTesting() == - l10n_util::GetStringUTF16( - IDS_SITE_SETTINGS_TYPE_MIDI_SYSEX)) { + l10n_util::GetStringUTF16( + IDS_SITE_SETTINGS_TYPE_MIDI_SYSEX)) { includes_midi_sysex = true; } } @@ -149,8 +149,8 @@ for (PermissionToggleRowView* permission_toggle_row : AsView<PageInfoMainView>(element)->GetToggleRowsForTesting()) { if (permission_toggle_row->GetRowTitleForTesting() == - l10n_util::GetStringUTF16( - IDS_SITE_SETTINGS_TYPE_MIDI_SYSEX)) { + l10n_util::GetStringUTF16( + IDS_SITE_SETTINGS_TYPE_MIDI_SYSEX)) { includes_midi_sysex = true; } } @@ -165,18 +165,17 @@ context(), NavigateAndRequestMidi(), PressButton(PermissionPromptBubbleBaseView::kBlockButtonElementId), WaitForHide(PermissionPromptBubbleBaseView::kMainViewId), - AfterShow( - ContentSettingImageView::kMidiSysexActivityIndicatorElementId, - base::BindOnce([](ui::TrackedElement* element) { - auto* element_view = AsView<ContentSettingImageView>(element); - EXPECT_EQ(element_view->get_icon_for_testing(), - &vector_icons::kMidiOffChromeRefreshIcon); - EXPECT_EQ(element_view->get_icon_badge_for_testing(), - &gfx::kNoneIcon); - EXPECT_EQ( - element_view->get_tooltip_text_for_testing(), - l10n_util::GetStringUTF16(IDS_BLOCKED_MIDI_SYSEX_MESSAGE)); - }))); + AfterShow(ContentSettingImageView::kMidiSysexActivityIndicatorElementId, + base::BindOnce([](ui::TrackedElement* element) { + auto* element_view = AsView<ContentSettingImageView>(element); + EXPECT_EQ(element_view->get_icon_for_testing(), + &vector_icons::kMidiOffChromeRefreshIcon); + EXPECT_EQ(element_view->get_icon_badge_for_testing(), + &gfx::kNoneIcon); + EXPECT_EQ(element_view->get_tooltip_text_for_testing(), + l10n_util::GetStringUTF16( + IDS_BLOCKED_MIDI_SYSEX_MESSAGE)); + }))); } // Display in-use indicator of MIDI when allowed. @@ -186,16 +185,15 @@ context(), NavigateAndRequestMidi(), PressButton(PermissionPromptBubbleBaseView::kAllowButtonElementId), WaitForHide(PermissionPromptBubbleBaseView::kMainViewId), - AfterShow( - ContentSettingImageView::kMidiSysexActivityIndicatorElementId, - base::BindOnce([](ui::TrackedElement* element) { - auto* element_view = AsView<ContentSettingImageView>(element); - EXPECT_EQ(element_view->get_icon_for_testing(), - &vector_icons::kMidiChromeRefreshIcon); - EXPECT_EQ(element_view->get_icon_badge_for_testing(), - &gfx::kNoneIcon); - EXPECT_EQ( - element_view->get_tooltip_text_for_testing(), - l10n_util::GetStringUTF16(IDS_ALLOWED_MIDI_SYSEX_MESSAGE)); - }))); + AfterShow(ContentSettingImageView::kMidiSysexActivityIndicatorElementId, + base::BindOnce([](ui::TrackedElement* element) { + auto* element_view = AsView<ContentSettingImageView>(element); + EXPECT_EQ(element_view->get_icon_for_testing(), + &vector_icons::kMidiChromeRefreshIcon); + EXPECT_EQ(element_view->get_icon_badge_for_testing(), + &gfx::kNoneIcon); + EXPECT_EQ(element_view->get_tooltip_text_for_testing(), + l10n_util::GetStringUTF16( + IDS_ALLOWED_MIDI_SYSEX_MESSAGE)); + }))); }
diff --git a/chrome/browser/ui/views/permissions/permission_prompt_bubble.cc b/chrome/browser/ui/views/permissions/permission_prompt_bubble.cc index da40fd47..8af2f78 100644 --- a/chrome/browser/ui/views/permissions/permission_prompt_bubble.cc +++ b/chrome/browser/ui/views/permissions/permission_prompt_bubble.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/views/permissions/permission_prompt_bubble.h" + #include "base/functional/bind.h" #include "base/functional/callback_helpers.h" #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
diff --git a/chrome/browser/ui/views/permissions/permission_prompt_bubble_base_view_browsertest.cc b/chrome/browser/ui/views/permissions/permission_prompt_bubble_base_view_browsertest.cc index 04bdba3..e47e8f3 100644 --- a/chrome/browser/ui/views/permissions/permission_prompt_bubble_base_view_browsertest.cc +++ b/chrome/browser/ui/views/permissions/permission_prompt_bubble_base_view_browsertest.cc
@@ -445,13 +445,13 @@ GetTestApi().manager()->Accept(); base::RunLoop().RunUntilIdle(); - histograms.ExpectBucketCount( - "Permissions.Prompt.Geolocation.LocationBarLeftChipAutoBubble.Action", - static_cast<int>(permissions::PermissionAction::GRANTED), 1); - histograms.ExpectTimeBucketCount( - "Permissions.Prompt.Geolocation.LocationBarLeftChipAutoBubble.Accepted." - "TimeToAction", - duration, 1); + histograms.ExpectBucketCount( + "Permissions.Prompt.Geolocation.LocationBarLeftChipAutoBubble.Action", + static_cast<int>(permissions::PermissionAction::GRANTED), 1); + histograms.ExpectTimeBucketCount( + "Permissions.Prompt.Geolocation.LocationBarLeftChipAutoBubble.Accepted." + "TimeToAction", + duration, 1); ShowUi("notifications"); @@ -466,14 +466,14 @@ GetTestApi().manager()->Accept(); base::RunLoop().RunUntilIdle(); - histograms.ExpectBucketCount( - "Permissions.Prompt.Notifications.LocationBarLeftChipAutoBubble.Action", - static_cast<int>(permissions::PermissionAction::GRANTED), 1); - histograms.ExpectTimeBucketCount( - "Permissions.Prompt.Notifications.LocationBarLeftChipAutoBubble." - "Accepted." - "TimeToAction", - duration, 1); + histograms.ExpectBucketCount( + "Permissions.Prompt.Notifications.LocationBarLeftChipAutoBubble.Action", + static_cast<int>(permissions::PermissionAction::GRANTED), 1); + histograms.ExpectTimeBucketCount( + "Permissions.Prompt.Notifications.LocationBarLeftChipAutoBubble." + "Accepted." + "TimeToAction", + duration, 1); } IN_PROC_BROWSER_TEST_F(PermissionPromptBubbleBaseViewBrowserTest, @@ -493,14 +493,14 @@ GetTestApi().manager()->AcceptThisTime(); base::RunLoop().RunUntilIdle(); - histograms.ExpectBucketCount( - "Permissions.Prompt.Geolocation.LocationBarLeftChipAutoBubble.Action", - static_cast<int>(permissions::PermissionAction::GRANTED_ONCE), 1); - histograms.ExpectTimeBucketCount( - "Permissions.Prompt.Geolocation.LocationBarLeftChipAutoBubble." - "AcceptedOnce." - "TimeToAction", - duration, 1); + histograms.ExpectBucketCount( + "Permissions.Prompt.Geolocation.LocationBarLeftChipAutoBubble.Action", + static_cast<int>(permissions::PermissionAction::GRANTED_ONCE), 1); + histograms.ExpectTimeBucketCount( + "Permissions.Prompt.Geolocation.LocationBarLeftChipAutoBubble." + "AcceptedOnce." + "TimeToAction", + duration, 1); ShowUi("notifications"); @@ -515,14 +515,14 @@ GetTestApi().manager()->AcceptThisTime(); base::RunLoop().RunUntilIdle(); - histograms.ExpectBucketCount( - "Permissions.Prompt.Notifications.LocationBarLeftChipAutoBubble.Action", - static_cast<int>(permissions::PermissionAction::GRANTED_ONCE), 1); - histograms.ExpectTimeBucketCount( - "Permissions.Prompt.Notifications.LocationBarLeftChipAutoBubble." - "AcceptedOnce." - "TimeToAction", - duration, 1); + histograms.ExpectBucketCount( + "Permissions.Prompt.Notifications.LocationBarLeftChipAutoBubble.Action", + static_cast<int>(permissions::PermissionAction::GRANTED_ONCE), 1); + histograms.ExpectTimeBucketCount( + "Permissions.Prompt.Notifications.LocationBarLeftChipAutoBubble." + "AcceptedOnce." + "TimeToAction", + duration, 1); } IN_PROC_BROWSER_TEST_F(PermissionPromptBubbleBaseViewBrowserTest,
diff --git a/chrome/browser/ui/views/permissions/permission_prompt_chip.cc b/chrome/browser/ui/views/permissions/permission_prompt_chip.cc index 876aad87..d6bfd6e 100644 --- a/chrome/browser/ui/views/permissions/permission_prompt_chip.cc +++ b/chrome/browser/ui/views/permissions/permission_prompt_chip.cc
@@ -38,8 +38,9 @@ // fixes a bug when a chip overlays the padlock icon. lbv->InvalidateLayout(); - if (delegate->ShouldCurrentRequestUseQuietUI()) + if (delegate->ShouldCurrentRequestUseQuietUI()) { PreemptivelyResolvePermissionRequest(web_contents, delegate); + } chip_controller_ = lbv->GetChipController(); chip_controller_->ShowPermissionPrompt(delegate->GetWeakPtr()); @@ -112,34 +113,34 @@ void PermissionPromptChip::PreemptivelyResolvePermissionRequest( content::WebContents* web_contents, Delegate* delegate) { - DCHECK(delegate->ShouldCurrentRequestUseQuietUI()); + DCHECK(delegate->ShouldCurrentRequestUseQuietUI()); - bool is_subscribed_to_permission_change_event = true; - content::PermissionController* permission_controller = - web_contents->GetBrowserContext()->GetPermissionController(); + bool is_subscribed_to_permission_change_event = true; + content::PermissionController* permission_controller = + web_contents->GetBrowserContext()->GetPermissionController(); - // If at least one RFH is not subscribed to the PermissionChange event, we - // should not preemptively resolve a prompt. - for (permissions::PermissionRequest* request : delegate->Requests()) { - content::RenderFrameHost* rfh = - content::RenderFrameHost::FromID(request->get_requesting_frame_id()); - if (rfh == nullptr) - return; + // If at least one RFH is not subscribed to the PermissionChange event, we + // should not preemptively resolve a prompt. + for (permissions::PermissionRequest* request : delegate->Requests()) { + content::RenderFrameHost* rfh = + content::RenderFrameHost::FromID(request->get_requesting_frame_id()); + if (rfh == nullptr) { + return; + } - ContentSettingsType type = request->GetContentSettingsType(); + ContentSettingsType type = request->GetContentSettingsType(); - blink::PermissionType permission_type = - permissions::PermissionUtil::ContentSettingsTypeToPermissionType( - type); + blink::PermissionType permission_type = + permissions::PermissionUtil::ContentSettingsTypeToPermissionType(type); - // Pre-ignore is allowed only for the quiet chip. The quiet chip is - // enabled only for `NOTIFICATIONS` and `GEOLOCATION`. - DCHECK(permission_type == blink::PermissionType::NOTIFICATIONS || - permission_type == blink::PermissionType::GEOLOCATION); + // Pre-ignore is allowed only for the quiet chip. The quiet chip is + // enabled only for `NOTIFICATIONS` and `GEOLOCATION`. + DCHECK(permission_type == blink::PermissionType::NOTIFICATIONS || + permission_type == blink::PermissionType::GEOLOCATION); - is_subscribed_to_permission_change_event &= - permission_controller->IsSubscribedToPermissionChangeEvent( - permission_type, rfh); + is_subscribed_to_permission_change_event &= + permission_controller->IsSubscribedToPermissionChangeEvent( + permission_type, rfh); if (is_subscribed_to_permission_change_event) { // This will resolve a promise so an origin is not waiting for the user's
diff --git a/chrome/browser/ui/views/permissions/permission_prompt_factory.cc b/chrome/browser/ui/views/permissions/permission_prompt_factory.cc index d2328bfa..a5c99f8 100644 --- a/chrome/browser/ui/views/permissions/permission_prompt_factory.cc +++ b/chrome/browser/ui/views/permissions/permission_prompt_factory.cc
@@ -38,12 +38,14 @@ DCHECK(browser); // PWA uses the title bar as a substitute for LocationBarView. - if (web_app::AppBrowserController::IsWebApp(browser)) + if (web_app::AppBrowserController::IsWebApp(browser)) { return false; + } BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser); - if (!browser_view) + if (!browser_view) { return false; + } LocationBarView* location_bar = browser_view->GetLocationBarView(); @@ -98,8 +100,9 @@ bool ShouldUseChip(permissions::PermissionPrompt::Delegate* delegate) { // Permission request chip should not be shown if `delegate->Requests()` were // requested without a user gesture. - if (!permissions::PermissionUtil::HasUserGesture(delegate)) + if (!permissions::PermissionUtil::HasUserGesture(delegate)) { return false; + } std::vector<raw_ptr<permissions::PermissionRequest, VectorExperimental>> requests = delegate->Requests();
diff --git a/chrome/browser/ui/views/permissions/permission_prompt_notifications_mac.cc b/chrome/browser/ui/views/permissions/permission_prompt_notifications_mac.cc index 6e04f4f0..3bcf6be 100644 --- a/chrome/browser/ui/views/permissions/permission_prompt_notifications_mac.cc +++ b/chrome/browser/ui/views/permissions/permission_prompt_notifications_mac.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/views/permissions/permission_prompt_notifications_mac.h" + #include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/apps/app_shim/app_shim_manager_mac.h"
diff --git a/chrome/browser/ui/views/permissions/permission_request_chip_browsertest.cc b/chrome/browser/ui/views/permissions/permission_request_chip_browsertest.cc index 8d45b2c..7138974 100644 --- a/chrome/browser/ui/views/permissions/permission_request_chip_browsertest.cc +++ b/chrome/browser/ui/views/permissions/permission_request_chip_browsertest.cc
@@ -56,8 +56,7 @@ } // namespace class PermissionRequestChipGestureSensitiveBrowserTest - : public InProcessBrowserTest { -}; + : public InProcessBrowserTest {}; IN_PROC_BROWSER_TEST_F(PermissionRequestChipGestureSensitiveBrowserTest, ChipFinalizedWhenInteractingWithOmnibox) { @@ -295,8 +294,7 @@ } class PermissionRequestChipGestureInsensitiveBrowserTest - : public InProcessBrowserTest { -}; + : public InProcessBrowserTest {}; IN_PROC_BROWSER_TEST_F(PermissionRequestChipGestureInsensitiveBrowserTest, CallbacksResetWhenInteractingWithOmnibox) {
diff --git a/chrome/browser/ui/views/permissions/permission_rhs_indicators_interactive_uitest.cc b/chrome/browser/ui/views/permissions/permission_rhs_indicators_interactive_uitest.cc index e44a689..e24af22 100644 --- a/chrome/browser/ui/views/permissions/permission_rhs_indicators_interactive_uitest.cc +++ b/chrome/browser/ui/views/permissions/permission_rhs_indicators_interactive_uitest.cc
@@ -50,7 +50,7 @@ ~PermissionRHSIndicatorsInteractiveUITest() override = default; PermissionRHSIndicatorsInteractiveUITest( - const PermissionRHSIndicatorsInteractiveUITest&) = delete; + const PermissionRHSIndicatorsInteractiveUITest&) = delete; void operator=(const PermissionRHSIndicatorsInteractiveUITest&) = delete; void SetUp() override {
diff --git a/chrome/browser/ui/views/platform_keys_certificate_selector_chromeos.cc b/chrome/browser/ui/views/platform_keys_certificate_selector_chromeos.cc index 2033925..580f243 100644 --- a/chrome/browser/ui/views/platform_keys_certificate_selector_chromeos.cc +++ b/chrome/browser/ui/views/platform_keys_certificate_selector_chromeos.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/ui/views/platform_keys_certificate_selector_chromeos.h" #include <stddef.h> + #include <memory> #include <string> #include <utility> @@ -72,8 +73,9 @@ PlatformKeysCertificateSelector::~PlatformKeysCertificateSelector() { // Ensure to call back even if the dialog was closed because of the views // hierarchy being destroyed. - if (!callback_.is_null()) + if (!callback_.is_null()) { std::move(callback_).Run(nullptr); + } } void PlatformKeysCertificateSelector::Init() {
diff --git a/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view.cc b/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view.cc index 0e1d32b9..69c6392 100644 --- a/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view.cc +++ b/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view.cc
@@ -473,8 +473,9 @@ VLOG(2) << "PluginVmInstallerView destroyed"; plugin_vm_installer_->RemoveObserver(); // We call |Cancel()| if the user hasn't started installation to log to UMA. - if (state_ == State::kConfirmInstall || state_ == State::kInstalling) + if (state_ == State::kConfirmInstall || state_ == State::kInstalling) { plugin_vm_installer_->Cancel(); + } g_plugin_vm_installer_view = nullptr; } @@ -489,9 +490,10 @@ static_cast<int>(ui::mojom::DialogButton::kOk); case State::kError: DCHECK(reason_); - if (ShowRetryButton(*reason_)) + if (ShowRetryButton(*reason_)) { return static_cast<int>(ui::mojom::DialogButton::kCancel) | static_cast<int>(ui::mojom::DialogButton::kOk); + } return static_cast<int>(ui::mojom::DialogButton::kCancel); } } @@ -570,8 +572,9 @@ if (state_ == State::kCreated || state_ == State::kImported || state_ == State::kError) { - if (finished_callback_for_testing_) + if (finished_callback_for_testing_) { std::move(finished_callback_for_testing_).Run(state_ != State::kError); + } } } @@ -638,8 +641,9 @@ plugin_vm_installer_->SetObserver(this); std::optional<plugin_vm::PluginVmInstaller::FailureReason> failure_reason = plugin_vm_installer_->Start(); - if (failure_reason) + if (failure_reason) { OnError(failure_reason.value()); + } } BEGIN_METADATA(PluginVmInstallerView)
diff --git a/chrome/browser/ui/views/plus_addresses/plus_address_creation_dialog_delegate.cc b/chrome/browser/ui/views/plus_addresses/plus_address_creation_dialog_delegate.cc index b6e178e..f85f285 100644 --- a/chrome/browser/ui/views/plus_addresses/plus_address_creation_dialog_delegate.cc +++ b/chrome/browser/ui/views/plus_addresses/plus_address_creation_dialog_delegate.cc
@@ -514,7 +514,6 @@ void PlusAddressCreationDialogDelegate::ShowReserveResult( const PlusProfileOrError& maybe_plus_profile, bool offer_refresh) { - SetProgressBarVisibility(false); plus_address_container_->ShowRefresh(offer_refresh); plus_address_container_->SetEnabledForRefreshButton(true);
diff --git a/chrome/browser/ui/views/plus_addresses/plus_address_creation_dialog_interactive_uitest.cc b/chrome/browser/ui/views/plus_addresses/plus_address_creation_dialog_interactive_uitest.cc index 7652a20..d7d9253 100644 --- a/chrome/browser/ui/views/plus_addresses/plus_address_creation_dialog_interactive_uitest.cc +++ b/chrome/browser/ui/views/plus_addresses/plus_address_creation_dialog_interactive_uitest.cc
@@ -128,8 +128,8 @@ void Reinit(const std::string& server_url, bool enable_onboarding = false) { CHECK(!server_url.empty()); features_.Reset(); - // Don't enable the 'sync-with-server' param so that the dialog is the - // only way to trigger requests to the server. + // Don't enable the 'sync-with-server' param so that the dialog is the + // only way to trigger requests to the server. base::FieldTrialParams plus_addresses_enabled_params_with_server = plus_addresses_enabled_params_; plus_addresses_enabled_params_with_server["server-url"] = server_url;
diff --git a/chrome/browser/ui/views/policy/enterprise_startup_dialog_unittest.cc b/chrome/browser/ui/views/policy/enterprise_startup_dialog_unittest.cc index c7ae998..06f4b75 100644 --- a/chrome/browser/ui/views/policy/enterprise_startup_dialog_unittest.cc +++ b/chrome/browser/ui/views/policy/enterprise_startup_dialog_unittest.cc
@@ -2,13 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/enterprise_startup_dialog.h" + #include <memory> #include "base/command_line.h" #include "base/functional/bind.h" #include "base/test/mock_callback.h" #include "chrome/browser/headless/headless_mode_util.h" -#include "chrome/browser/ui/enterprise_startup_dialog.h" #include "content/public/test/browser_task_environment.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/switches.h"
diff --git a/chrome/browser/ui/views/policy/enterprise_startup_dialog_view.cc b/chrome/browser/ui/views/policy/enterprise_startup_dialog_view.cc index c1ef37d..6ee404f7 100644 --- a/chrome/browser/ui/views/policy/enterprise_startup_dialog_view.cc +++ b/chrome/browser/ui/views/policy/enterprise_startup_dialog_view.cc
@@ -309,15 +309,17 @@ void EnterpriseStartupDialogImpl::DisplayLaunchingInformationWithThrobber( const std::u16string& information) { - if (dialog_view_) + if (dialog_view_) { dialog_view_->DisplayLaunchingInformationWithThrobber(information); + } } void EnterpriseStartupDialogImpl::DisplayErrorMessage( const std::u16string& error_message, const std::optional<std::u16string>& accept_button) { - if (dialog_view_) + if (dialog_view_) { dialog_view_->DisplayErrorMessage(error_message, accept_button); + } } bool EnterpriseStartupDialogImpl::IsShowing() {
diff --git a/chrome/browser/ui/views/profiles/badged_profile_photo.cc b/chrome/browser/ui/views/profiles/badged_profile_photo.cc index 2bb7b8c..46d939eb 100644 --- a/chrome/browser/ui/views/profiles/badged_profile_photo.cc +++ b/chrome/browser/ui/views/profiles/badged_profile_photo.cc
@@ -91,8 +91,8 @@ break; case BadgedProfilePhoto::BADGE_TYPE_SYNC_PAUSED: SetImage(ui::ImageModel::FromVectorIcon( - kSyncPausedCircleIcon, - ui::kColorButtonBackgroundProminent, kBadgeIconSize)); + kSyncPausedCircleIcon, ui::kColorButtonBackgroundProminent, + kBadgeIconSize)); break; case BadgedProfilePhoto::BADGE_TYPE_SYNC_DISABLED: SetImage(ui::ImageModel::FromVectorIcon( @@ -134,8 +134,9 @@ profile_photo_view->SizeToPreferredSize(); AddChildView(profile_photo_view); - if (badge_type != BADGE_TYPE_NONE) + if (badge_type != BADGE_TYPE_NONE) { AddChildView(std::make_unique<BadgeView>(badge_type)); + } SetPreferredSize( gfx::Size(kBadgedProfilePhotoWidth, kBadgedProfilePhotoHeight));
diff --git a/chrome/browser/ui/views/profiles/dice_web_signin_interception_bubble_view.h b/chrome/browser/ui/views/profiles/dice_web_signin_interception_bubble_view.h index d06a398..57f53497 100644 --- a/chrome/browser/ui/views/profiles/dice_web_signin_interception_bubble_view.h +++ b/chrome/browser/ui/views/profiles/dice_web_signin_interception_bubble_view.h
@@ -5,10 +5,8 @@ #ifndef CHROME_BROWSER_UI_VIEWS_PROFILES_DICE_WEB_SIGNIN_INTERCEPTION_BUBBLE_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_PROFILES_DICE_WEB_SIGNIN_INTERCEPTION_BUBBLE_VIEW_H_ -#include "base/functional/callback_helpers.h" -#include "ui/views/bubble/bubble_dialog_delegate_view.h" - #include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" @@ -17,6 +15,7 @@ #include "chrome/browser/signin/dice_web_signin_interceptor.h" #include "content/public/browser/web_contents_delegate.h" #include "ui/base/metadata/metadata_header_macros.h" +#include "ui/views/bubble/bubble_dialog_delegate_view.h" namespace views { class View;
diff --git a/chrome/browser/ui/views/profiles/first_run_interactive_uitest.cc b/chrome/browser/ui/views/profiles/first_run_interactive_uitest.cc index c7c8dff..0f47e077 100644 --- a/chrome/browser/ui/views/profiles/first_run_interactive_uitest.cc +++ b/chrome/browser/ui/views/profiles/first_run_interactive_uitest.cc
@@ -319,6 +319,7 @@ // chrome/test/data/webui/intro/sign_in_promo_test.ts PressJsButton(kWebContentsId, button)); } + private: ChromeSigninClientWithURLLoaderHelper url_loader_factory_helper_; }; @@ -608,8 +609,9 @@ GTEST_SKIP() << "Sync not possible until buttons stop loading"; } - auto iph_delay = AvatarToolbarButton::SetScopedIPHMinDelayAfterCreationForTesting( - base::Seconds(0)); + auto iph_delay = + AvatarToolbarButton::SetScopedIPHMinDelayAfterCreationForTesting( + base::Seconds(0)); base::test::TestFuture<bool> proceed_future; ASSERT_TRUE(IsProfileNameDefault()); @@ -754,15 +756,17 @@ // TODO(crbug.com/366082752): Re-enable this test should_skip_test = true; #endif // WIN && ARCH_CPU_64_BITS - if (should_skip_test) + if (should_skip_test) { GTEST_SKIP() << "Test is flaky on win64"; + } if (SyncButtonsFeatureConfig() == SyncButtonsFeatureConfig::kButtonsStillLoading) { GTEST_SKIP() << "Decline is not possible until buttons stop loading"; } - auto iph_delay = AvatarToolbarButton::SetScopedIPHMinDelayAfterCreationForTesting( - base::Seconds(0)); + auto iph_delay = + AvatarToolbarButton::SetScopedIPHMinDelayAfterCreationForTesting( + base::Seconds(0)); base::test::TestFuture<bool> proceed_future; ASSERT_TRUE(IsProfileNameDefault());
diff --git a/chrome/browser/ui/views/profiles/incognito_menu_view.h b/chrome/browser/ui/views/profiles/incognito_menu_view.h index f26bf39b..186ff5fd 100644 --- a/chrome/browser/ui/views/profiles/incognito_menu_view.h +++ b/chrome/browser/ui/views/profiles/incognito_menu_view.h
@@ -22,8 +22,7 @@ // incognito mode and displays the incognito menu. class IncognitoMenuView : public ProfileMenuViewBase { public: - IncognitoMenuView(views::Button* anchor_button, - Browser* browser); + IncognitoMenuView(views::Button* anchor_button, Browser* browser); IncognitoMenuView(const IncognitoMenuView&) = delete; IncognitoMenuView& operator=(const IncognitoMenuView&) = delete;
diff --git a/chrome/browser/ui/views/profiles/profile_bubble_interactive_uitest.cc b/chrome/browser/ui/views/profiles/profile_bubble_interactive_uitest.cc index 2638738..c90b3fe 100644 --- a/chrome/browser/ui/views/profiles/profile_bubble_interactive_uitest.cc +++ b/chrome/browser/ui/views/profiles/profile_bubble_interactive_uitest.cc
@@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/views/profiles/profile_customization_bubble_view.h" - #include "base/check.h" #include "base/files/file_util.h" #include "base/functional/callback_helpers.h"
diff --git a/chrome/browser/ui/views/profiles/profile_customization_bubble_sync_controller.cc b/chrome/browser/ui/views/profiles/profile_customization_bubble_sync_controller.cc index 3b50132..110a11b 100644 --- a/chrome/browser/ui/views/profiles/profile_customization_bubble_sync_controller.cc +++ b/chrome/browser/ui/views/profiles/profile_customization_bubble_sync_controller.cc
@@ -32,11 +32,13 @@ case ProfileCustomizationBubbleSyncController::Outcome::kSkipBubble: // If the customization bubble is not shown, show the IPH now. Otherwise // the IPH will be shown after the customization bubble. - if (!anchor_view->GetWidget()) + if (!anchor_view->GetWidget()) { return; + } gfx::NativeWindow window = anchor_view->GetWidget()->GetNativeWindow(); - if (!window || !BrowserView::GetBrowserViewForNativeWindow(window)) + if (!window || !BrowserView::GetBrowserViewForNativeWindow(window)) { return; + } // Attempts to show first the Supervised user IPH (which has higher // priority), then the profile switch IPH. Whether the IPH will show (if // all conditions are met) is decided by the IPH framework. @@ -72,8 +74,9 @@ SyncServiceFactory::GetForProfile(profile); // TODO(crbug.com/40183503): A speculative fix, remove if not functional or // not needed. - if (!anchor_view || !sync_service) + if (!anchor_view || !sync_service) { return; + } auto controller = base::WrapUnique(new ProfileCustomizationBubbleSyncController( @@ -174,10 +177,11 @@ case ProfileCustomizationSyncedThemeWaiter::Outcome::kSyncSuccess: { bool using_custom_theme = !theme_service_->UsingDefaultTheme() && !theme_service_->UsingSystemTheme(); - if (using_custom_theme) + if (using_custom_theme) { InvokeCallbackAndDeleteItself(Outcome::kSkipBubble); - else + } else { ApplyDefaultColorAndShowBubble(); + } break; } case ProfileCustomizationSyncedThemeWaiter::Outcome::kSyncCannotStart: @@ -215,11 +219,13 @@ void ApplyProfileColorAndShowCustomizationBubbleWhenNoValueSynced( Browser* browser, SkColor suggested_profile_color) { - if (!browser) + if (!browser) { return; + } BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser); - if (!browser_view || !browser_view->toolbar_button_provider()) + if (!browser_view || !browser_view->toolbar_button_provider()) { return; + } views::View* anchor_view = BrowserView::GetBrowserViewForBrowser(browser) ->toolbar_button_provider() ->GetAvatarToolbarButton();
diff --git a/chrome/browser/ui/views/profiles/profile_customization_bubble_view_browsertest.cc b/chrome/browser/ui/views/profiles/profile_customization_bubble_view_browsertest.cc index 290d434..79eb698 100644 --- a/chrome/browser/ui/views/profiles/profile_customization_bubble_view_browsertest.cc +++ b/chrome/browser/ui/views/profiles/profile_customization_bubble_view_browsertest.cc
@@ -23,9 +23,9 @@ #include "components/keyed_service/content/browser_context_dependency_manager.h" #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/identity_manager.h" -#include "components/user_education/views/help_bubble_view.h" #include "components/supervised_user/core/browser/family_link_user_capabilities.h" #include "components/supervised_user/core/common/pref_names.h" +#include "components/user_education/views/help_bubble_view.h" #include "content/public/test/browser_test.h" #include "ui/views/bubble/bubble_dialog_delegate_view.h" @@ -57,7 +57,7 @@ bool IsSupervisedUser() { return GetSupervisionSignInMode() == - supervised_user::SupervisionMixin::SignInMode::kSupervised; + supervised_user::SupervisionMixin::SignInMode::kSupervised; } private:
diff --git a/chrome/browser/ui/views/profiles/profile_indicator_icon.cc b/chrome/browser/ui/views/profiles/profile_indicator_icon.cc index 668e952..143a27e7 100644 --- a/chrome/browser/ui/views/profiles/profile_indicator_icon.cc +++ b/chrome/browser/ui/views/profiles/profile_indicator_icon.cc
@@ -16,8 +16,9 @@ ProfileIndicatorIcon::~ProfileIndicatorIcon() = default; void ProfileIndicatorIcon::OnPaint(gfx::Canvas* canvas) { - if (base_icon_.IsEmpty()) + if (base_icon_.IsEmpty()) { return; + } if (old_height_ != height() || modified_icon_.isNull()) { old_height_ = height();
diff --git a/chrome/browser/ui/views/profiles/profile_management_flow_controller_impl.h b/chrome/browser/ui/views/profiles/profile_management_flow_controller_impl.h index 6d0f58a1..d1ec48e 100644 --- a/chrome/browser/ui/views/profiles/profile_management_flow_controller_impl.h +++ b/chrome/browser/ui/views/profiles/profile_management_flow_controller_impl.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_PROFILES_PROFILE_MANAGEMENT_FLOW_CONTROLLER_IMPL_H_ #include <memory> + #include "base/containers/queue.h" #include "chrome/browser/ui/views/profiles/profile_management_flow_controller.h" #include "chrome/browser/ui/views/profiles/profile_management_types.h"
diff --git a/chrome/browser/ui/views/profiles/profile_management_step_controller.cc b/chrome/browser/ui/views/profiles/profile_management_step_controller.cc index f2d8460..d7497af1 100644 --- a/chrome/browser/ui/views/profiles/profile_management_step_controller.cc +++ b/chrome/browser/ui/views/profiles/profile_management_step_controller.cc
@@ -117,13 +117,15 @@ void OnReloadRequested() override { // Sign-in may fail due to connectivity issues, allow reloading. - if (dice_sign_in_provider_) + if (dice_sign_in_provider_) { dice_sign_in_provider_->ReloadSignInPage(); + } } void OnNavigateBackRequested() override { - if (dice_sign_in_provider_) + if (dice_sign_in_provider_) { NavigateBackInternal(dice_sign_in_provider_->contents()); + } } private:
diff --git a/chrome/browser/ui/views/profiles/profile_menu_coordinator.cc b/chrome/browser/ui/views/profiles/profile_menu_coordinator.cc index ad17fb6..51408a6 100644 --- a/chrome/browser/ui/views/profiles/profile_menu_coordinator.cc +++ b/chrome/browser/ui/views/profiles/profile_menu_coordinator.cc
@@ -26,8 +26,9 @@ ProfileMenuCoordinator::~ProfileMenuCoordinator() { // Forcefully close the Widget if it hasn't been closed by the time the // browser is torn down to avoid dangling references. - if (IsShowing()) + if (IsShowing()) { bubble_tracker_.view()->GetWidget()->CloseNow(); + } } void ProfileMenuCoordinator::Show(bool is_source_accelerator) { @@ -77,8 +78,9 @@ views::BubbleDialogDelegateView::CreateBubble(std::move(bubble)); bubble_ptr->CreateAXWidgetObserver(widget); widget->Show(); - if (is_source_accelerator) + if (is_source_accelerator) { bubble_ptr->FocusFirstProfileButton(); + } } bool ProfileMenuCoordinator::IsShowing() const {
diff --git a/chrome/browser/ui/views/profiles/profile_menu_view.cc b/chrome/browser/ui/views/profiles/profile_menu_view.cc index 73eea53..f4779e31 100644 --- a/chrome/browser/ui/views/profiles/profile_menu_view.cc +++ b/chrome/browser/ui/views/profiles/profile_menu_view.cc
@@ -233,8 +233,9 @@ gfx::ImageSkia ProfileMenuView::GetSyncIcon() const { Profile* profile = browser()->profile(); - if (profile->IsOffTheRecord() || profile->IsGuestSession()) + if (profile->IsOffTheRecord() || profile->IsGuestSession()) { return gfx::ImageSkia(); + } bool is_sync_feature_enabled = IdentityManagerFactory::GetForProfile(profile)->HasPrimaryAccount( @@ -254,8 +255,8 @@ } ui::ColorId color_id = error == AvatarSyncErrorType::kSyncPaused - ? kColorProfileMenuSyncPausedIcon - : kColorProfileMenuSyncErrorIcon; + ? kColorProfileMenuSyncPausedIcon + : kColorProfileMenuSyncErrorIcon; return ColoredImageForMenu(kSyncDisabledChromeRefreshIcon, color_id); } @@ -276,8 +277,9 @@ void ProfileMenuView::OnManageGoogleAccountButtonClicked() { RecordClick(ActionableItem::kManageGoogleAccountButton); - if (!perform_menu_actions()) + if (!perform_menu_actions()) { return; + } Profile* profile = browser()->profile(); signin::IdentityManager* identity_manager = @@ -291,52 +293,59 @@ void ProfileMenuView::OnPasswordsButtonClicked() { RecordClick(ActionableItem::kPasswordsButton); - if (!perform_menu_actions()) + if (!perform_menu_actions()) { return; + } NavigateToManagePasswordsPage( browser(), password_manager::ManagePasswordsReferrer::kProfileChooser); } void ProfileMenuView::OnCreditCardsButtonClicked() { RecordClick(ActionableItem::kCreditCardsButton); - if (!perform_menu_actions()) + if (!perform_menu_actions()) { return; + } chrome::ShowSettingsSubPage(browser(), chrome::kPaymentsSubPage); } void ProfileMenuView::OnAddressesButtonClicked() { RecordClick(ActionableItem::kAddressesButton); - if (!perform_menu_actions()) + if (!perform_menu_actions()) { return; + } chrome::ShowSettingsSubPage(browser(), chrome::kAddressesSubPage); } void ProfileMenuView::OnGuestProfileButtonClicked() { RecordClick(ActionableItem::kGuestProfileButton); - if (!perform_menu_actions()) + if (!perform_menu_actions()) { return; + } DCHECK(profiles::IsGuestModeEnabled(*browser()->profile())); profiles::SwitchToGuestProfile(); } void ProfileMenuView::OnExitProfileButtonClicked() { RecordClick(ActionableItem::kExitProfileButton); - if (!perform_menu_actions()) + if (!perform_menu_actions()) { return; + } profiles::CloseProfileWindows(browser()->profile()); } void ProfileMenuView::OnSyncSettingsButtonClicked() { RecordClick(ActionableItem::kSyncSettingsButton); - if (!perform_menu_actions()) + if (!perform_menu_actions()) { return; + } chrome::ShowSettingsSubPage(browser(), chrome::kSyncSetupSubPage); } void ProfileMenuView::OnSyncErrorButtonClicked(AvatarSyncErrorType error) { RecordClick(ActionableItem::kSyncErrorButton); - if (!perform_menu_actions()) + if (!perform_menu_actions()) { return; + } // The logic below must be consistent with GetSyncInfoForAvatarErrorType(). switch (error) { @@ -404,8 +413,9 @@ signin_metrics::AccessPoint access_point) { RecordClick(button_type); - if (!perform_menu_actions()) + if (!perform_menu_actions()) { return; + } GetWidget()->CloseWithReason(views::Widget::ClosedReason::kUnspecified); if (button_type == ActionableItem::kSigninReauthButton) { @@ -429,8 +439,9 @@ "in the UI."; RecordClick(ActionableItem::kSignoutButton); - if (!perform_menu_actions()) + if (!perform_menu_actions()) { return; + } GetWidget()->CloseWithReason(views::Widget::ClosedReason::kUnspecified); browser()->signin_view_controller()->SignoutOrReauthWithPrompt( signin_metrics::AccessPoint:: @@ -443,8 +454,9 @@ void ProfileMenuView::OnOtherProfileSelected( const base::FilePath& profile_path) { RecordClick(ActionableItem::kOtherProfileButton); - if (!perform_menu_actions()) + if (!perform_menu_actions()) { return; + } if (!web_app::AppBrowserController::IsWebApp(browser())) { GetWidget()->CloseWithReason(views::Widget::ClosedReason::kUnspecified); @@ -482,31 +494,35 @@ void ProfileMenuView::OnAddNewProfileButtonClicked() { RecordClick(ActionableItem::kAddNewProfileButton); - if (!perform_menu_actions()) + if (!perform_menu_actions()) { return; + } ProfilePicker::Show(ProfilePicker::Params::FromEntryPoint( ProfilePicker::EntryPoint::kProfileMenuAddNewProfile)); } void ProfileMenuView::OnManageProfilesButtonClicked() { RecordClick(ActionableItem::kManageProfilesButton); - if (!perform_menu_actions()) + if (!perform_menu_actions()) { return; + } ProfilePicker::Show(ProfilePicker::Params::FromEntryPoint( ProfilePicker::EntryPoint::kProfileMenuManageProfiles)); } void ProfileMenuView::OnEditProfileButtonClicked() { RecordClick(ActionableItem::kEditProfileButton); - if (!perform_menu_actions()) + if (!perform_menu_actions()) { return; + } chrome::ShowSettingsSubPage(browser(), chrome::kManageProfileSubPage); } void ProfileMenuView::OnCookiesClearedOnExitLinkClicked() { RecordClick(ActionableItem::kCookiesClearedOnExitLink); - if (!perform_menu_actions()) + if (!perform_menu_actions()) { return; + } chrome::ShowSettingsSubPage(browser(), chrome::kContentSettingsSubPage + std::string("/") + chrome::kCookieSettingsSubPage); @@ -682,8 +698,9 @@ CHECK(!switches::IsImprovedSigninUIOnDesktopEnabled()); Profile* profile = browser()->profile(); - if (!profile->GetPrefs()->GetBoolean(prefs::kSigninAllowed)) + if (!profile->GetPrefs()->GetBoolean(prefs::kSigninAllowed)) { return; + } if (!SyncServiceFactory::IsSyncAllowed(profile)) { return;
diff --git a/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc b/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc index aa9a6c47..e61db55c 100644 --- a/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc +++ b/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc
@@ -417,8 +417,9 @@ bool Signout() { OpenProfileMenu(); - if (HasFatalFailure()) + if (HasFatalFailure()) { return false; + } static_cast<ProfileMenuView*>(profile_menu_view()) ->OnSignoutButtonClicked(); return true; @@ -648,8 +649,9 @@ bool Reauth() { OpenProfileMenu(); - if (HasFatalFailure()) + if (HasFatalFailure()) { return false; + } // This test does not check that the reauth button is displayed in the menu, // but this is tested in ProfileMenuClickTest. base::HistogramTester histogram_tester; @@ -839,8 +841,9 @@ size_t index) = 0; SyncServiceImplHarness* sync_harness() { - if (sync_harness_) + if (sync_harness_) { return sync_harness_.get(); + } sync_service()->OverrideNetworkForTest( fake_server::CreateFakeServerHttpPostProviderFactory( @@ -868,9 +871,10 @@ } void AdvanceFocus(int count) { - for (int i = 0; i < count; i++) + for (int i = 0; i < count; i++) { profile_menu_view()->GetFocusManager()->AdvanceFocus( /*reverse=*/false); + } } views::View* GetFocusedItem() {
diff --git a/chrome/browser/ui/views/profiles/profile_picker_dice_sign_in_provider.cc b/chrome/browser/ui/views/profiles/profile_picker_dice_sign_in_provider.cc index 6cebfce..4df14dc 100644 --- a/chrome/browser/ui/views/profiles/profile_picker_dice_sign_in_provider.cc +++ b/chrome/browser/ui/views/profiles/profile_picker_dice_sign_in_provider.cc
@@ -52,10 +52,12 @@ bool IsExternalURL(const GURL& url) { // Empty URL is used initially, about:blank is used to stop navigation after // sign-in succeeds. - if (url.is_empty() || url == GURL(url::kAboutBlankURL)) + if (url.is_empty() || url == GURL(url::kAboutBlankURL)) { return false; - if (gaia::HasGaiaSchemeHostPort(url)) + } + if (gaia::HasGaiaSchemeHostPort(url)) { return false; + } return true; } @@ -125,8 +127,9 @@ } void ProfilePickerDiceSignInProvider::NavigateBack() { - if (!IsInitialized() || !contents()) + if (!IsInitialized() || !contents()) { return; + } if (contents()->GetController().CanGoBack()) { contents()->GetController().GoBack();
diff --git a/chrome/browser/ui/views/profiles/profile_picker_dice_sign_in_toolbar.cc b/chrome/browser/ui/views/profiles/profile_picker_dice_sign_in_toolbar.cc index b71f605..2f49cfe3 100644 --- a/chrome/browser/ui/views/profiles/profile_picker_dice_sign_in_toolbar.cc +++ b/chrome/browser/ui/views/profiles/profile_picker_dice_sign_in_toolbar.cc
@@ -81,8 +81,9 @@ } void ProfilePickerDiceSignInToolbar::UpdateToolbarColor() { - if (!GetColorProvider()) + if (!GetColorProvider()) { return; + } SkColor background_color = GetColorProvider()->GetColor(kColorToolbar); SetBackground(views::CreateSolidBackground(background_color));
diff --git a/chrome/browser/ui/views/profiles/profile_picker_interactive_uitest.cc b/chrome/browser/ui/views/profiles/profile_picker_interactive_uitest.cc index 005fdd32..4eb07a3c 100644 --- a/chrome/browser/ui/views/profiles/profile_picker_interactive_uitest.cc +++ b/chrome/browser/ui/views/profiles/profile_picker_interactive_uitest.cc
@@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/views/profiles/profile_picker_view.h" - #include "base/check.h" #include "base/run_loop.h" #include "base/test/metrics/histogram_tester.h" @@ -18,6 +16,7 @@ #include "chrome/browser/ui/profiles/profile_picker.h" #include "chrome/browser/ui/views/profiles/profile_picker_interactive_uitest_base.h" #include "chrome/browser/ui/views/profiles/profile_picker_test_base.h" +#include "chrome/browser/ui/views/profiles/profile_picker_view.h" #include "chrome/test/base/interactive_test_utils.h" #include "chrome/test/interaction/interactive_browser_test.h" #include "components/search_engines/search_engines_switches.h"
diff --git a/chrome/browser/ui/views/profiles/profile_picker_interactive_uitest_base.cc b/chrome/browser/ui/views/profiles/profile_picker_interactive_uitest_base.cc index 735e6ce..5322046 100644 --- a/chrome/browser/ui/views/profiles/profile_picker_interactive_uitest_base.cc +++ b/chrome/browser/ui/views/profiles/profile_picker_interactive_uitest_base.cc
@@ -35,7 +35,7 @@ #if BUILDFLAG(IS_MAC) return {ui::VKEY_OEM_4, ui::EF_COMMAND_DOWN}; // Cmd-[ #else - return {ui::VKEY_LEFT, ui::EF_ALT_DOWN}; // Alt-left + return {ui::VKEY_LEFT, ui::EF_ALT_DOWN}; // Alt-left #endif case IDC_FULLSCREEN: @@ -43,7 +43,7 @@ return {ui::VKEY_F, ui::EF_COMMAND_DOWN | ui::EF_CONTROL_DOWN}; // Cmd-Ctrl-F. #else - return {ui::VKEY_F11, ui::EF_NONE}; // F11. + return {ui::VKEY_F11, ui::EF_NONE}; // F11. #endif #if BUILDFLAG(IS_MAC)
diff --git a/chrome/browser/ui/views/profiles/profile_picker_view_browsertest.cc b/chrome/browser/ui/views/profiles/profile_picker_view_browsertest.cc index 4f6f58e3..f21ef710 100644 --- a/chrome/browser/ui/views/profiles/profile_picker_view_browsertest.cc +++ b/chrome/browser/ui/views/profiles/profile_picker_view_browsertest.cc
@@ -191,8 +191,9 @@ ~BrowserAddedWaiter() override { BrowserList::RemoveObserver(this); } Browser* Wait() { - if (BrowserList::GetInstance()->size() == total_count_) + if (BrowserList::GetInstance()->size() == total_count_) { return BrowserList::GetInstance()->GetLastActive(); + } run_loop_.Run(); EXPECT_TRUE(browser_); return browser_; @@ -201,8 +202,9 @@ private: // BrowserListObserver implementation. void OnBrowserAdded(Browser* browser) override { - if (BrowserList::GetInstance()->size() != total_count_) + if (BrowserList::GetInstance()->size() != total_count_) { return; + } browser_ = browser; run_loop_.Quit(); } @@ -267,10 +269,12 @@ void Wait() { // Check if the right page has already been painted or loaded. if (web_contents()->GetLastCommittedURL() == url_) { - if (web_contents()->CompletedFirstVisuallyNonEmptyPaint()) + if (web_contents()->CompletedFirstVisuallyNonEmptyPaint()) { DidFirstVisuallyNonEmptyPaint(); - if (!web_contents()->IsLoading()) + } + if (!web_contents()->IsLoading()) { DidStopLoading(); + } } run_loop_.Run(); @@ -280,8 +284,9 @@ // WebContentsObserver: void DidFirstVisuallyNonEmptyPaint() override { // Making sure that the same event does not trigger the barrier twice. - if (did_paint_) + if (did_paint_) { return; + } did_paint_ = true; barrier_closure_.Run(); @@ -291,8 +296,9 @@ ASSERT_EQ(web_contents()->GetLastCommittedURL(), url_); // Making sure that the same event does not trigger the barrier twice. - if (did_load_) + if (did_load_) { return; + } // It shouldn't technically be necessary to wait for load stop here, we do // this to be consistent with the other tests relying on `WaitForLoadStop()` @@ -2858,8 +2864,9 @@ for (const auto* entry : profile_manager() ->GetProfileAttributesStorage() .GetAllProfilesAttributes()) { - if (entry->GetLocalProfileName() == name) + if (entry->GetLocalProfileName() == name) { return true; + } } return false; }
diff --git a/chrome/browser/ui/views/profiles/profile_picker_view_test_utils.cc b/chrome/browser/ui/views/profiles/profile_picker_view_test_utils.cc index ae6698f..3f142de 100644 --- a/chrome/browser/ui/views/profiles/profile_picker_view_test_utils.cc +++ b/chrome/browser/ui/views/profiles/profile_picker_view_test_utils.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/profiles/profile_ui_test_utils.h" +#include "chrome/browser/ui/views/profiles/profile_picker_view_test_utils.h" #include "base/files/file_path.h" #include "base/functional/bind.h" @@ -14,9 +14,9 @@ #include "chrome/browser/profiles/profile_test_util.h" #include "chrome/browser/profiles/profile_window.h" #include "chrome/browser/ui/profiles/profile_picker.h" +#include "chrome/browser/ui/profiles/profile_ui_test_utils.h" #include "chrome/browser/ui/views/profiles/profile_management_step_controller.h" #include "chrome/browser/ui/views/profiles/profile_picker_view.h" -#include "chrome/browser/ui/views/profiles/profile_picker_view_test_utils.h" #include "chrome/browser/ui/webui/signin/managed_user_profile_notice_handler.h" #include "chrome/browser/ui/webui/signin/managed_user_profile_notice_ui.h" #include "chrome/common/webui_url_constants.h" @@ -32,8 +32,9 @@ namespace { content::WebContents* GetPickerWebContents() { - if (!ProfilePicker::GetWebViewForTesting()) + if (!ProfilePicker::GetWebViewForTesting()) { return nullptr; + } return ProfilePicker::GetWebViewForTesting()->GetWebContents(); } @@ -101,15 +102,17 @@ ViewAddedWaiter::~ViewAddedWaiter() = default; void ViewAddedWaiter::Wait() { - if (view_->GetWidget()) + if (view_->GetWidget()) { return; + } observation_.Observe(view_.get()); run_loop_.Run(); } void ViewAddedWaiter::OnViewAddedToWidget(views::View* observed_view) { - if (observed_view == view_) + if (observed_view == view_) { run_loop_.Quit(); + } } // -- ViewDeletedWaiter -------------------------------------------------------- @@ -232,8 +235,9 @@ // UI elements to know when to stop waiting. run_loop_.Run(); - if (view_size.has_value()) + if (view_size.has_value()) { GetWidget()->SetSize(view_size.value()); + } } std::unique_ptr<ProfileManagementFlowController>
diff --git a/chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc b/chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc index b4cc655..2d566541 100644 --- a/chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc +++ b/chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc
@@ -87,8 +87,9 @@ bool show_profile_switch_iph, bool show_supervised_user_iph, ProfileCustomizationHandler::CustomizationResult result) { - if (!browser) + if (!browser) { return; + } browser->signin_view_controller()->CloseModalSignin(); if (show_supervised_user_iph) { @@ -359,8 +360,9 @@ &SigninViewControllerDelegateViews::NotifyModalDialogClosed, base::Unretained(this))); - if (!wait_for_size) + if (!wait_for_size) { DisplayModal(); + } } SigninViewControllerDelegateViews::~SigninViewControllerDelegateViews() = @@ -396,8 +398,9 @@ // Avoid displaying the sign-in modal view if there are no active web // contents. This happens if the user closes the browser window before this // dialog has a chance to be displayed. - if (!host_web_contents) + if (!host_web_contents) { return; + } gfx::NativeWindow window = host_web_contents->GetTopLevelNativeWindow(); switch (GetModalType()) {
diff --git a/chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h b/chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h index 7c2879a55..5cd11822 100644 --- a/chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h +++ b/chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h
@@ -27,7 +27,7 @@ namespace content { class WebContents; class WebContentsDelegate; -} +} // namespace content namespace signin_metrics { enum class ReauthAccessPoint;
diff --git a/chrome/browser/ui/views/profiles/sync_confirmation_ui_browsertest.cc b/chrome/browser/ui/views/profiles/sync_confirmation_ui_browsertest.cc index ac61acc0..37741dc2 100644 --- a/chrome/browser/ui/views/profiles/sync_confirmation_ui_browsertest.cc +++ b/chrome/browser/ui/views/profiles/sync_confirmation_ui_browsertest.cc
@@ -454,9 +454,8 @@ INSTANTIATE_TEST_SUITE_P( , SyncConfirmationUITest, - testing::Combine( - testing::Bool(), - testing::Values(SyncConfirmationUIAction::kTurnSyncOn, - SyncConfirmationUIAction::kGoToSettings), - testing::Values("", "pl")), + testing::Combine(testing::Bool(), + testing::Values(SyncConfirmationUIAction::kTurnSyncOn, + SyncConfirmationUIAction::kGoToSettings), + testing::Values("", "pl")), &SyncConfirmationUITestParamToTestSuffix);
diff --git a/chrome/browser/ui/views/promos/ios_promo_password_bubble.cc b/chrome/browser/ui/views/promos/ios_promo_password_bubble.cc index 0a19914..c71782f 100644 --- a/chrome/browser/ui/views/promos/ios_promo_password_bubble.cc +++ b/chrome/browser/ui/views/promos/ios_promo_password_bubble.cc
@@ -62,9 +62,7 @@ } // Handler for when the window closes. - void OnWindowClosing() { - ios_promo_password_delegate_ = nullptr; - } + void OnWindowClosing() { ios_promo_password_delegate_ = nullptr; } // Callback for when the bubble is dismissed. void OnDismissal() {
diff --git a/chrome/browser/ui/views/promos/ios_promo_password_bubble_browsertest.cc b/chrome/browser/ui/views/promos/ios_promo_password_bubble_browsertest.cc index d5e7cad..a20bdb1 100644 --- a/chrome/browser/ui/views/promos/ios_promo_password_bubble_browsertest.cc +++ b/chrome/browser/ui/views/promos/ios_promo_password_bubble_browsertest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/views/promos/ios_promo_password_bubble.h" + #include "chrome/browser/profiles/profile.h" #include "chrome/browser/promos/promos_pref_names.h" #include "chrome/browser/ui/browser.h" @@ -9,7 +11,6 @@ #include "chrome/browser/ui/test/test_browser_dialog.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/frame/toolbar_button_provider.h" -#include "chrome/browser/ui/views/promos/ios_promo_password_bubble.h" #include "chrome/test/base/chrome_test_utils.h" #include "components/feature_engagement/public/feature_constants.h" #include "content/public/test/browser_test.h"
diff --git a/chrome/browser/ui/views/qrcode_generator/qrcode_generator_bubble.cc b/chrome/browser/ui/views/qrcode_generator/qrcode_generator_bubble.cc index ed60522..8bcd4b8a 100644 --- a/chrome/browser/ui/views/qrcode_generator/qrcode_generator_bubble.cc +++ b/chrome/browser/ui/views/qrcode_generator/qrcode_generator_bubble.cc
@@ -123,8 +123,9 @@ } void QRCodeGeneratorBubble::Hide() { - if (on_closing_) + if (on_closing_) { std::move(on_closing_).Run(); + } CloseBubble(); if (qrcode_action_item_.get()) { qrcode_action_item_.get()->SetIsShowingBubble(false); @@ -230,8 +231,9 @@ } void QRCodeGeneratorBubble::WindowClosing() { - if (on_closing_) + if (on_closing_) { std::move(on_closing_).Run(); + } } void QRCodeGeneratorBubble::Init() { @@ -364,8 +366,9 @@ } void QRCodeGeneratorBubble::AddedToWidget() { - if (!on_back_button_pressed_) + if (!on_back_button_pressed_) { return; + } // Adding a title view will replace the default title. GetBubbleFrameView()->SetTitleView( @@ -406,8 +409,9 @@ /*static*/ const std::u16string QRCodeGeneratorBubble::GetQRCodeFilenameForURL( const GURL& url) { - if (!url.has_host() || url.HostIsIPAddress()) + if (!url.has_host() || url.HostIsIPAddress()) { return u"qrcode_chrome.png"; + } return base::UTF8ToUTF16(base::StrCat({"qrcode_", url.host(), ".png"})); }
diff --git a/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller.cc b/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller.cc index 19b1bc5..4b92e43 100644 --- a/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller.cc +++ b/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller.cc
@@ -94,8 +94,9 @@ } void RelaunchNotificationController::OnUpgradeRecommended() { - if (last_notification_style_ == NotificationStyle::kNone) + if (last_notification_style_ == NotificationStyle::kNone) { return; + } UpgradeDetector::UpgradeNotificationAnnoyanceLevel current_level = upgrade_detector_->upgrade_notification_stage(); @@ -140,8 +141,9 @@ void RelaunchNotificationController::OnRelaunchOverriddenToRequired( bool overridden) { - if (notification_type_required_overridden_ == overridden) + if (notification_type_required_overridden_ == overridden) { return; + } notification_type_required_overridden_ = overridden; HandleCurrentStyle(); } @@ -166,12 +168,14 @@ } // Nothing to do if there has been no change in the notification style. - if (notification_style == last_notification_style_) + if (notification_style == last_notification_style_) { return; + } // Close the bubble or dialog if either is open. - if (last_notification_style_ != NotificationStyle::kNone) + if (last_notification_style_ != NotificationStyle::kNone) { CloseRelaunchNotification(); + } // Reset state so that a notifications is shown anew in a new style if needed. last_level_ = UpgradeDetector::UPGRADE_ANNOYANCE_NONE; @@ -256,8 +260,10 @@ if (level == last_level_ && timer_.IsRunning()) { const base::Time& desired_run_time = timer_.desired_run_time(); DCHECK(!desired_run_time.is_null()); - if (high_deadline <= now && desired_run_time - now <= kRelaunchGracePeriod) + if (high_deadline <= now && + desired_run_time - now <= kRelaunchGracePeriod) { return; + } } base::Time deadline = high_deadline; @@ -269,8 +275,9 @@ // a) The device goes to sleep before the first notification and wakes up // after the deadline. // b) A change in policy value moves the deadline in the past. - if (high_deadline <= now) + if (high_deadline <= now) { deadline = now + kRelaunchGracePeriod; + } // (re)Start the timer to perform the relaunch when the deadline is reached. timer_.Start(FROM_HERE, deadline, this, &RelaunchNotificationController::OnRelaunchDeadlineExpired);
diff --git a/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller.h b/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller.h index c7e48211..d91b46d 100644 --- a/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller.h +++ b/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller.h
@@ -23,7 +23,7 @@ namespace base { class Clock; class TickClock; -} +} // namespace base // A class that observes changes to the browser.relaunch_notification // preference (which is backed by the RelaunchNotification policy
diff --git a/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_platform_impl_chromeos.cc b/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_platform_impl_chromeos.cc index 4f52f42..0ef9110 100644 --- a/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_platform_impl_chromeos.cc +++ b/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_platform_impl_chromeos.cc
@@ -62,8 +62,9 @@ void RelaunchNotificationControllerPlatformImpl::SetDeadline( base::Time deadline) { - if (relaunch_required_timer_) + if (relaunch_required_timer_) { relaunch_required_timer_->SetDeadline(deadline); + } } void RelaunchNotificationControllerPlatformImpl:: @@ -127,10 +128,12 @@ } void RelaunchNotificationControllerPlatformImpl::StartObserving() { - if (!display_observation_.IsObserving()) + if (!display_observation_.IsObserving()) { display_observation_.Observe(ash::Shell::Get()->display_configurator()); - if (!session_observation_.IsObserving()) + } + if (!session_observation_.IsObserving()) { session_observation_.Observe(session_manager::SessionManager::Get()); + } } void RelaunchNotificationControllerPlatformImpl::StopObserving() {
diff --git a/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_platform_impl_desktop.cc b/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_platform_impl_desktop.cc index 5ed50f5..baad955 100644 --- a/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_platform_impl_desktop.cc +++ b/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_platform_impl_desktop.cc
@@ -35,8 +35,9 @@ RelaunchNotificationControllerPlatformImpl:: ~RelaunchNotificationControllerPlatformImpl() { DCHECK(!widget_); - if (on_visible_) + if (on_visible_) { BrowserList::RemoveObserver(this); + } CHECK(!WidgetObserver::IsInObserverList()); CHECK(!BrowserListObserver::IsInObserverList()); } @@ -45,13 +46,15 @@ base::Time detection_time, bool /*past_deadline*/) { // Nothing to do if the bubble is visible. - if (widget_) + if (widget_) { return; + } // Show the bubble in the most recently active browser. Browser* browser = FindLastActiveTabbedBrowser(); - if (!browser) + if (!browser) { return; + } widget_ = RelaunchRecommendedBubbleView::ShowBubble( browser, detection_time, base::BindRepeating(&chrome::AttemptRelaunch)); @@ -64,8 +67,9 @@ base::Time deadline, base::OnceCallback<base::Time()> on_visible) { // Nothing to do if the dialog is visible. - if (widget_) + if (widget_) { return; + } // Show the dialog in the active tabbed browser window. Browser* browser = chrome::FindBrowserWithActiveWindow(); @@ -77,8 +81,9 @@ // If the instance is not already waiting for one to become active from a // previous call, start observing now. - if (!on_visible_) + if (!on_visible_) { BrowserList::AddObserver(this); + } // Hold on to the callback until an active tabbed browser is found. on_visible_ = std::move(on_visible); @@ -113,8 +118,9 @@ // Hold on to the new deadline if the instance is waiting for a Browser to // become active. - if (on_visible_) + if (on_visible_) { last_relaunch_deadline_ = deadline; + } } bool RelaunchNotificationControllerPlatformImpl::IsRequiredNotificationShown() @@ -132,8 +138,9 @@ void RelaunchNotificationControllerPlatformImpl::OnBrowserSetLastActive( Browser* browser) { // Ignore non-tabbed browsers. - if (!browser->is_type_normal()) + if (!browser->is_type_normal()) { return; + } BrowserList::RemoveObserver(this);
diff --git a/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_platform_impl_desktop_browsertest.cc b/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_platform_impl_desktop_browsertest.cc index 51136010..11b6dbb3 100644 --- a/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_platform_impl_desktop_browsertest.cc +++ b/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_platform_impl_desktop_browsertest.cc
@@ -2,10 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_platform_impl_desktop.h" + #include "base/run_loop.h" #include "base/time/time.h" #include "chrome/browser/ui/views/frame/browser_view.h" -#include "chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_platform_impl_desktop.h" #include "chrome/test/base/in_process_browser_test.h" #include "content/public/test/browser_test.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_unittest.cc b/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_unittest.cc index f54261aa..a66cece 100644 --- a/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_unittest.cc +++ b/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_unittest.cc
@@ -1134,10 +1134,11 @@ } void SetVisibility(bool is_visible) { - if (is_visible) + if (is_visible) { browser_view()->Show(); - else + } else { browser_view()->Hide(); + } // Allow UI tasks to run so that the browser becomes fully active/inactive. task_environment()->RunUntilIdle();
diff --git a/chrome/browser/ui/views/relaunch_notification/relaunch_required_timer.cc b/chrome/browser/ui/views/relaunch_notification/relaunch_required_timer.cc index 00c3decc5..0ba46991 100644 --- a/chrome/browser/ui/views/relaunch_notification/relaunch_required_timer.cc +++ b/chrome/browser/ui/views/relaunch_notification/relaunch_required_timer.cc
@@ -26,8 +26,9 @@ const base::TimeDelta deadline_offset = deadline_ - now; // Don't start the timer if the deadline is in the past or right now. - if (deadline_offset <= base::TimeDelta()) + if (deadline_offset <= base::TimeDelta()) { return; + } const base::TimeDelta refresh_delta = relaunch_notification::ComputeNextRefreshDelta(deadline_offset);
diff --git a/chrome/browser/ui/views/relaunch_notification/relaunch_required_timer_internal.cc b/chrome/browser/ui/views/relaunch_notification/relaunch_required_timer_internal.cc index a5ef0421..d43c31d 100644 --- a/chrome/browser/ui/views/relaunch_notification/relaunch_required_timer_internal.cc +++ b/chrome/browser/ui/views/relaunch_notification/relaunch_required_timer_internal.cc
@@ -55,14 +55,15 @@ static constexpr base::TimeDelta kMinSeconds = base::Seconds(1); base::TimeDelta delta; - if (rounded_offset > kMinDays) + if (rounded_offset > kMinDays) { delta = base::Days(rounded_offset.InDays() - 1); - else if (rounded_offset > kMinHours) + } else if (rounded_offset > kMinHours) { delta = base::Hours(rounded_offset.InHours() - 1); - else if (rounded_offset > kMinMinutes) + } else if (rounded_offset > kMinMinutes) { delta = base::Minutes(rounded_offset.InMinutes() - 1); - else if (rounded_offset > kMinSeconds) + } else if (rounded_offset > kMinSeconds) { delta = base::Seconds(rounded_offset.InSeconds() - 1); + } return deadline_offset - delta; }
diff --git a/chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc b/chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc index 371eacf..995a9c9 100644 --- a/chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc +++ b/chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc
@@ -54,8 +54,9 @@ : parent_(parent), submenu_view_(submenu_view) { submenu_view_observation_.Observe(submenu_view); auto* widget = submenu_view_->host(); - if (widget) + if (widget) { submenu_widget_observation_.Observe(widget); + } } SubmenuViewObserver(const SubmenuViewObserver&) = delete; @@ -84,8 +85,9 @@ void OnViewAddedToWidget(views::View* observed_view) override { DCHECK_EQ(submenu_view_, observed_view); auto* widget = submenu_view_->host(); - if (widget) + if (widget) { submenu_widget_observation_.Observe(widget); + } } // WidgetObserver: @@ -138,8 +140,8 @@ void RenderViewContextMenuViews::RunMenuAt(views::Widget* parent, const gfx::Point& point, ui::mojom::MenuSourceType type) { - static_cast<ToolkitDelegateViews*>(toolkit_delegate())-> - RunMenuAt(parent, point, type); + static_cast<ToolkitDelegateViews*>(toolkit_delegate()) + ->RunMenuAt(parent, point, type); } //////////////////////////////////////////////////////////////////////////////// @@ -161,8 +163,8 @@ case IDC_CONTENT_CONTEXT_REDO: // TODO(jcampan): should it be Ctrl-Y? - *accel = ui::Accelerator(ui::VKEY_Z, - ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN); + *accel = + ui::Accelerator(ui::VKEY_Z, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN); return true; case IDC_CONTENT_CONTEXT_CUT: @@ -178,8 +180,8 @@ return true; case IDC_CONTENT_CONTEXT_PASTE_AND_MATCH_STYLE: - *accel = ui::Accelerator(ui::VKEY_V, - ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN); + *accel = + ui::Accelerator(ui::VKEY_V, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN); return true; case IDC_CONTENT_CONTEXT_SELECTALL: @@ -216,8 +218,9 @@ if (IsHTML5Fullscreen()) { // Per UX design feedback, do not show an accelerator when press and // hold is required to exit fullscreen. - if (IsPressAndHoldEscRequiredToExitFullscreen()) + if (IsPressAndHoldEscRequiredToExitFullscreen()) { return false; + } *accel = ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE); return true; @@ -232,8 +235,9 @@ // (i.e., F11). ui::AcceleratorProvider* accelerator_provider = GetBrowserAcceleratorProvider(); - if (!accelerator_provider) + if (!accelerator_provider) { return false; + } return accelerator_provider->GetAcceleratorForCommandId(IDC_FULLSCREEN, accel); @@ -337,8 +341,9 @@ ui::AcceleratorProvider* RenderViewContextMenuViews::GetBrowserAcceleratorProvider() const { Browser* browser = GetBrowser(); - if (!browser) + if (!browser) { return nullptr; + } return BrowserView::GetBrowserViewForBrowser(browser); } @@ -361,18 +366,21 @@ } void RenderViewContextMenuViews::Show() { - if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode)) + if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode)) { return; + } // Menus need a Widget to work. If we're not the active tab we won't // necessarily be in a widget. views::Widget* top_level_widget = GetTopLevelWidget(); - if (!top_level_widget) + if (!top_level_widget) { return; + } // Don't show empty menus. - if (menu_model().GetItemCount() == 0) + if (menu_model().GetItemCount() == 0) { return; + } // Convert from target window coordinates to root window coordinates. gfx::Point screen_point(params().x, params().y); @@ -393,9 +401,10 @@ ->GetSubmenu(); if (submenu_view) { for (auto& observer : observers_) { - if (submenu_view->host()) + if (submenu_view->host()) { observer.OnContextMenuShown( params_, submenu_view->host()->GetWindowBoundsInScreen()); + } } submenu_view_observer_ =
diff --git a/chrome/browser/ui/views/sad_tab_view.cc b/chrome/browser/ui/views/sad_tab_view.cc index 4c0f4df6..7ce2012 100644 --- a/chrome/browser/ui/views/sad_tab_view.cc +++ b/chrome/browser/ui/views/sad_tab_view.cc
@@ -606,13 +606,15 @@ // put focus on the action button. This causes screen readers to // immediately announce the text of this view. GetViewAccessibility().SetRole(ax::mojom::Role::kDialog); - if (action_button_->GetWidget() && action_button_->GetWidget()->IsActive()) + if (action_button_->GetWidget() && action_button_->GetWidget()->IsActive()) { action_button_->RequestFocus(); + } } SadTabView::~SadTabView() { - if (owner_) + if (owner_) { owner_->SetCrashedOverlayView(nullptr); + } } void SadTabView::ReinstallInWebView() { @@ -652,12 +654,14 @@ void SadTabView::AttachToWebView() { Browser* browser = chrome::FindBrowserWithTab(web_contents()); // This can be null during prefetch. - if (!browser) + if (!browser) { return; + } // In unit tests, browser->window() might not be a real BrowserView. - if (!browser->window()->GetNativeWindow()) + if (!browser->window()->GetNativeWindow()) { return; + } BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser); DCHECK(browser_view);
diff --git a/chrome/browser/ui/views/sad_tab_view_interactive_uitest.cc b/chrome/browser/ui/views/sad_tab_view_interactive_uitest.cc index ba31ad11..e30fcc07 100644 --- a/chrome/browser/ui/views/sad_tab_view_interactive_uitest.cc +++ b/chrome/browser/ui/views/sad_tab_view_interactive_uitest.cc
@@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/views/sad_tab_view.h" - #include "build/build_config.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" @@ -12,6 +10,7 @@ #include "chrome/browser/ui/sad_tab_helper.h" #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" #include "chrome/browser/ui/views/frame/browser_view.h" +#include "chrome/browser/ui/views/sad_tab_view.h" #include "chrome/browser/ui/views/toolbar/toolbar_view.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/interactive_test_utils.h" @@ -115,8 +114,9 @@ TabStripModel* tab_strip_model = browser()->tab_strip_model(); content::WebContents* web_contents = tab_strip_model->GetActiveWebContents(); - while (!IsFocusedViewOnActionButtonInSadTab()) + while (!IsFocusedViewOnActionButtonInSadTab()) { PressTab(); + } // SadTab has a DCHECK that it's been painted at least once // before the action button can be pressed, bypass that. @@ -160,8 +160,9 @@ ASSERT_TRUE(IsFocusedViewInsideBrowserToolbar()); // Keep pressing the Tab key and make sure we make it back to the sad tab. - while (!IsFocusedViewInsideSadTab()) + while (!IsFocusedViewInsideSadTab()) { PressTab(); + } ASSERT_FALSE(IsFocusedViewInsideBrowserToolbar()); // Press Shift-Tab and ensure we end up back in the toolbar.
diff --git a/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc b/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc index 9720a0d..fa8ba1f2e 100644 --- a/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc +++ b/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc
@@ -149,10 +149,11 @@ ui::mojom::DialogButton::kCancel, l10n_util::GetStringUTF16(IDS_PAGE_INFO_IGNORE_PASSWORD_WARNING_BUTTON)); - // The set_*_callback() methods below need a OnceCallback each and we only have one - // (done_callback_), so create a proxy callback that references done_callback_ and use it for each - // of the set_*_callback() callbacks. Note that since only one of the three callbacks can ever be - // invoked, done_callback_ is still run at most once. + // The set_*_callback() methods below need a OnceCallback each and we only + // have one (done_callback_), so create a proxy callback that references + // done_callback_ and use it for each of the set_*_callback() callbacks. Note + // that since only one of the three callbacks can ever be invoked, + // done_callback_ is still run at most once. auto make_done_callback = [this](safe_browsing::WarningAction value) { return base::BindOnce( [](OnWarningDone* callback, safe_browsing::WarningAction value) { @@ -169,8 +170,9 @@ SetCloseCallback(make_done_callback(WarningAction::CLOSE)); // |service| maybe NULL in tests. - if (service_) + if (service_) { service_->AddObserver(this); + } if (password_type.account_type() == ReusedPasswordAccountType::SAVED_PASSWORD) { @@ -189,8 +191,9 @@ } PasswordReuseModalWarningDialog::~PasswordReuseModalWarningDialog() { - if (service_) + if (service_) { service_->RemoveObserver(this); + } LogModalWarningDialogLifetime(modal_construction_start_time_); } @@ -274,8 +277,9 @@ void PasswordReuseModalWarningDialog::OnMarkingSiteAsLegitimate( const GURL& url) { - if (url_.GetWithEmptyPath() == url.GetWithEmptyPath()) + if (url_.GetWithEmptyPath() == url.GetWithEmptyPath()) { GetWidget()->Close(); + } } void PasswordReuseModalWarningDialog::InvokeActionForTesting(
diff --git a/chrome/browser/ui/views/safe_browsing/tailored_security_desktop_dialog_manager_browsertest.cc b/chrome/browser/ui/views/safe_browsing/tailored_security_desktop_dialog_manager_browsertest.cc index b7dbba2..997dad0c 100644 --- a/chrome/browser/ui/views/safe_browsing/tailored_security_desktop_dialog_manager_browsertest.cc +++ b/chrome/browser/ui/views/safe_browsing/tailored_security_desktop_dialog_manager_browsertest.cc
@@ -2,13 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/views/safe_browsing/tailored_security_desktop_dialog_manager.h" + #include "base/command_line.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/metrics/user_action_tester.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/test/test_browser_dialog.h" -#include "chrome/browser/ui/views/safe_browsing/tailored_security_desktop_dialog_manager.h" #include "components/safe_browsing/core/browser/tailored_security_service/tailored_security_outcome.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test.h"
diff --git a/chrome/browser/ui/views/safe_browsing/tailored_security_unconsented_modal.cc b/chrome/browser/ui/views/safe_browsing/tailored_security_unconsented_modal.cc index 6898977..aee98f8 100644 --- a/chrome/browser/ui/views/safe_browsing/tailored_security_unconsented_modal.cc +++ b/chrome/browser/ui/views/safe_browsing/tailored_security_unconsented_modal.cc
@@ -148,8 +148,9 @@ IdentityManagerFactory::GetForProfile( Profile::FromBrowserContext(web_contents_->GetBrowserContext())); if (!identity_manager || - !identity_manager->HasPrimaryAccount(signin::ConsentLevel::kSignin)) + !identity_manager->HasPrimaryAccount(signin::ConsentLevel::kSignin)) { return; + } ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance(); gfx::ImageSkia header_image =
diff --git a/chrome/browser/ui/views/screen_capture_notification_ui_views.cc b/chrome/browser/ui/views/screen_capture_notification_ui_views.cc index 0d66bd7..ea398dd 100644 --- a/chrome/browser/ui/views/screen_capture_notification_ui_views.cc +++ b/chrome/browser/ui/views/screen_capture_notification_ui_views.cc
@@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/screen_capture_notification_ui.h" - #include <memory> #include "base/functional/bind.h" @@ -11,6 +9,7 @@ #include "base/scoped_multi_source_observation.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" +#include "chrome/browser/ui/screen_capture_notification_ui.h" #include "chrome/browser/ui/views/chrome_views_export.h" #include "chrome/grit/generated_resources.h" #include "chrome/grit/theme_resources.h" @@ -63,16 +62,16 @@ public: NotificationBarClientView(views::Widget* widget, views::View* view) - : views::ClientView(widget, view) { - } + : views::ClientView(widget, view) {} NotificationBarClientView(const NotificationBarClientView&) = delete; NotificationBarClientView& operator=(const NotificationBarClientView&) = delete; ~NotificationBarClientView() override = default; void SetClientRect(const gfx::Rect& rect) { - if (rect_ == rect) + if (rect_ == rect) { return; + } rect_ = rect; OnPropertyChanged(&rect_, views::kPropertyEffectsNone); } @@ -80,11 +79,13 @@ // views::ClientView: int NonClientHitTest(const gfx::Point& point) override { - if (!bounds().Contains(point)) + if (!bounds().Contains(point)) { return HTNOWHERE; + } // The whole window is HTCAPTION, except the |rect_|. - if (rect_.Contains(gfx::PointAtOffsetFromOrigin(point - origin()))) + if (rect_.Contains(gfx::PointAtOffsetFromOrigin(point - origin()))) { return HTCLIENT; + } return HTCAPTION; }
diff --git a/chrome/browser/ui/views/select_file_dialog_extension/select_file_dialog_extension.cc b/chrome/browser/ui/views/select_file_dialog_extension/select_file_dialog_extension.cc index 5e9aaf6..44fd9be 100644 --- a/chrome/browser/ui/views/select_file_dialog_extension/select_file_dialog_extension.cc +++ b/chrome/browser/ui/views/select_file_dialog_extension/select_file_dialog_extension.cc
@@ -58,9 +58,9 @@ namespace { -const int kFileManagerWidth = 972; // pixels -const int kFileManagerHeight = 640; // pixels -const int kFileManagerMinimumWidth = 640; // pixels +const int kFileManagerWidth = 972; // pixels +const int kFileManagerHeight = 640; // pixels +const int kFileManagerMinimumWidth = 640; // pixels const int kFileManagerMinimumHeight = 240; // pixels constexpr char kFakeEntryURLScheme[] = "fake-entry://"; @@ -93,10 +93,11 @@ void PendingDialog::Add(SelectFileDialogExtension::RoutingID id, scoped_refptr<SelectFileDialogExtension> dialog) { DCHECK(dialog.get()); - if (map_.find(id) == map_.end()) + if (map_.find(id) == map_.end()) { map_.insert(std::make_pair(id, dialog)); - else + } else { DLOG(WARNING) << "Duplicate pending dialog " << id; + } } void PendingDialog::Remove(SelectFileDialogExtension::RoutingID id) { @@ -106,8 +107,9 @@ scoped_refptr<SelectFileDialogExtension> PendingDialog::Find( SelectFileDialogExtension::RoutingID id) { Map::const_iterator it = map_.find(id); - if (it == map_.end()) + if (it == map_.end()) { return nullptr; + } return it->second; } @@ -135,9 +137,8 @@ if (!owner_browser) { // If an owner_window was supplied but we couldn't find a browser, this // could be for a app window. - app_window = - AppWindowRegistryUtil::GetAppWindowForNativeWindowAnyProfile( - owner_window); + app_window = AppWindowRegistryUtil::GetAppWindowForNativeWindowAnyProfile( + owner_window); } } @@ -147,8 +148,9 @@ } else { // If the owning window is still unknown, this could be a background page or // and extension popup. Use the last active browser. - if (!owner_browser) + if (!owner_browser) { owner_browser = chrome::FindLastActive(); + } if (owner_browser) { *base_window = owner_browser->window(); *web_contents = owner_browser->tab_strip_model()->GetActiveWebContents(); @@ -163,15 +165,17 @@ } // Check for a WebContents used for the Chrome OS WebUI login flow. - if (!*web_contents) + if (!*web_contents) { *web_contents = GetLoginWebContents(); + } } SelectFileDialogExtension::RoutingID GetRoutingID( content::WebContents* web_contents, const SelectFileDialogExtension::Owner& owner) { - if (owner.android_task_id.has_value()) + if (owner.android_task_id.has_value()) { return base::StringPrintf("android.%d", *owner.android_task_id); + } if (web_contents) { return base::StringPrintf( @@ -303,14 +307,14 @@ } // static -void SelectFileDialogExtension::OnFileSelected( - RoutingID routing_id, - const ui::SelectedFileInfo& file, - int index) { +void SelectFileDialogExtension::OnFileSelected(RoutingID routing_id, + const ui::SelectedFileInfo& file, + int index) { scoped_refptr<SelectFileDialogExtension> dialog = PendingDialog::GetInstance()->Find(routing_id); - if (!dialog.get()) + if (!dialog.get()) { return; + } dialog->selection_type_ = SINGLE_FILE; dialog->selection_files_.clear(); dialog->selection_files_.push_back(file); @@ -323,8 +327,9 @@ const std::vector<ui::SelectedFileInfo>& files) { scoped_refptr<SelectFileDialogExtension> dialog = PendingDialog::GetInstance()->Find(routing_id); - if (!dialog.get()) + if (!dialog.get()) { return; + } dialog->selection_type_ = MULTIPLE_FILES; dialog->selection_files_ = files; dialog->selection_index_ = 0; @@ -334,16 +339,18 @@ void SelectFileDialogExtension::OnFileSelectionCanceled(RoutingID routing_id) { scoped_refptr<SelectFileDialogExtension> dialog = PendingDialog::GetInstance()->Find(routing_id); - if (!dialog.get()) + if (!dialog.get()) { return; + } dialog->selection_type_ = CANCEL; dialog->selection_files_.clear(); dialog->selection_index_ = 0; } content::RenderFrameHost* SelectFileDialogExtension::GetPrimaryMainFrame() { - if (system_files_app_web_contents_) + if (system_files_app_web_contents_) { return system_files_app_web_contents_->GetPrimaryMainFrame(); + } return nullptr; } @@ -455,24 +462,28 @@ !display::Screen::GetScreen()->InTabletMode() && !is_for_capture_mode; // Obtain BaseWindow and WebContents if the owner window is browser. - if (!skip_finding_browser) + if (!skip_finding_browser) { FindRuntimeContext(owner.window, &base_window, &web_contents); + } - if (web_contents) + if (web_contents) { profile_ = Profile::FromBrowserContext(web_contents->GetBrowserContext()); + } // Handle the cases where |web_contents| is not available or |web_contents| is // associated with Default profile. - if (!web_contents || ash::ProfileHelper::IsSigninProfile(profile_)) + if (!web_contents || ash::ProfileHelper::IsSigninProfile(profile_)) { profile_ = ProfileManager::GetActiveUserProfile(); + } DCHECK(profile_); // Check if we have another dialog opened for the contents. It's unlikely, but // possible. In such situation, discard this request. RoutingID routing_id = GetRoutingID(web_contents, owner); - if (PendingExists(routing_id)) + if (PendingExists(routing_id)) { return; + } std::vector<std::string> volume_filter; if (use_media_store_filter) { @@ -542,8 +553,9 @@ void SelectFileDialogExtension::ApplyPolicyAndNotifyListener( std::optional<policy::DlpFileDestination> dialog_caller) { - if (!listener_) + if (!listener_) { return; + } // The selected files are passed by reference to the listener. Ensure they // outlive the dialog if it is immediately deleted by the listener. @@ -568,8 +580,9 @@ [](base::WeakPtr<SelectFileDialogExtension> weak_ptr, std::vector<ui::SelectedFileInfo> selection_files, bool is_allowed) { - if (!is_allowed) + if (!is_allowed) { weak_ptr->selection_type_ = SelectionType::CANCEL; + } weak_ptr->NotifyListener(std::move(selection_files)); }, weak_factory_.GetWeakPtr(), std::move(selection_files))); @@ -580,8 +593,9 @@ base::BindOnce( [](base::WeakPtr<SelectFileDialogExtension> weak_ptr, std::vector<ui::SelectedFileInfo> allowed_files) { - if (allowed_files.empty()) + if (allowed_files.empty()) { weak_ptr->selection_type_ = SelectionType::CANCEL; + } weak_ptr->NotifyListener(std::move(allowed_files)); }, weak_factory_.GetWeakPtr())); @@ -592,8 +606,9 @@ void SelectFileDialogExtension::NotifyListener( std::vector<ui::SelectedFileInfo> selection_files) { - if (!listener_) + if (!listener_) { return; + } switch (selection_type_) { case CANCEL: listener_->FileSelectionCanceled();
diff --git a/chrome/browser/ui/views/select_file_dialog_extension/select_file_dialog_extension.h b/chrome/browser/ui/views/select_file_dialog_extension/select_file_dialog_extension.h index 902a420..57e90a24 100644 --- a/chrome/browser/ui/views/select_file_dialog_extension/select_file_dialog_extension.h +++ b/chrome/browser/ui/views/select_file_dialog_extension/select_file_dialog_extension.h
@@ -185,11 +185,7 @@ // We defer the callback into SelectFileDialog::Listener until the window // closes, to match the semantics of file selection on Windows and Mac. // These are the data passed to the listener. - enum SelectionType { - CANCEL = 0, - SINGLE_FILE, - MULTIPLE_FILES - }; + enum SelectionType { CANCEL = 0, SINGLE_FILE, MULTIPLE_FILES }; SelectionType selection_type_ = CANCEL; std::vector<ui::SelectedFileInfo> selection_files_; int selection_index_ = 0;
diff --git a/chrome/browser/ui/views/select_file_dialog_extension/select_file_dialog_extension_browsertest.cc b/chrome/browser/ui/views/select_file_dialog_extension/select_file_dialog_extension_browsertest.cc index a36cd3b73..9254bbf3 100644 --- a/chrome/browser/ui/views/select_file_dialog_extension/select_file_dialog_extension_browsertest.cc +++ b/chrome/browser/ui/views/select_file_dialog_extension/select_file_dialog_extension_browsertest.cc
@@ -76,8 +76,9 @@ // ChromeKeyboardControllerClient::Observer void OnKeyboardVisibilityChanged(bool visible) override { - if (visible) + if (visible) { run_loop_.QuitWhenIdle(); + } } private: @@ -120,8 +121,9 @@ private: void QuitMessageLoop() { - if (message_loop_runner_.get()) + if (message_loop_runner_.get()) { message_loop_runner_->Quit(); + } } bool file_selected_ = false; @@ -154,10 +156,7 @@ use_file_type_filter_ = GetParam().file_type_filter; } - enum DialogButtonType { - DIALOG_BTN_OK, - DIALOG_BTN_CANCEL - }; + enum DialogButtonType { DIALOG_BTN_OK, DIALOG_BTN_CANCEL }; void SetUp() override { // Create the dialog wrapper and listener objects. @@ -293,9 +292,9 @@ void ClickJsButton(content::RenderFrameHost* frame_host, DialogButtonType button_type) { - std::string button_class = - (button_type == DIALOG_BTN_OK) ? ".button-panel .ok" : - ".button-panel .cancel"; + std::string button_class = (button_type == DIALOG_BTN_OK) + ? ".button-panel .ok" + : ".button-panel .cancel"; std::u16string script = base::ASCIIToUTF16( "console.log(\'Test JavaScript injected.\');" "document.querySelector(\'" + @@ -318,8 +317,9 @@ listener_->WaitForCalled(); // Dialog no longer believes it is running. - if (owning_window) + if (owning_window) { ASSERT_FALSE(dialog_->IsRunning(owning_window)); + } } bool UseFileTypeFilter() { return use_file_type_filter_; } @@ -400,7 +400,6 @@ CloseDialog(DIALOG_BTN_CANCEL, owning_window); } - IN_PROC_BROWSER_TEST_P(SelectFileDialogExtensionBrowserTest, SelectFileAndCancel) { gfx::NativeWindow owning_window = browser()->window()->GetNativeWindow(); @@ -628,9 +627,7 @@ // TODO(adanilo) factor out the unnecessary override of Setup(). class SelectFileDialogExtensionFlagTest : public BaseSelectFileDialogExtensionBrowserTest { - void SetUp() override { - BaseSelectFileDialogExtensionBrowserTest::SetUp(); - } + void SetUp() override { BaseSelectFileDialogExtensionBrowserTest::SetUp(); } }; IN_PROC_BROWSER_TEST_P(SelectFileDialogExtensionFlagTest,
diff --git a/chrome/browser/ui/views/select_file_dialog_extension/select_file_dialog_extension_unittest.cc b/chrome/browser/ui/views/select_file_dialog_extension/select_file_dialog_extension_unittest.cc index 27686a92..1107615 100644 --- a/chrome/browser/ui/views/select_file_dialog_extension/select_file_dialog_extension_unittest.cc +++ b/chrome/browser/ui/views/select_file_dialog_extension/select_file_dialog_extension_unittest.cc
@@ -72,8 +72,9 @@ } ~SelfDeletingClient() override { - if (dialog_.get()) + if (dialog_.get()) { dialog_->ListenerDestroyed(); + } } SelectFileDialogExtension* dialog() const { return dialog_.get(); }
diff --git a/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_device_picker_bubble_view.cc b/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_device_picker_bubble_view.cc index 0bfb345..c1b5e51 100644 --- a/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_device_picker_bubble_view.cc +++ b/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_device_picker_bubble_view.cc
@@ -97,8 +97,9 @@ void SendTabToSelfDevicePickerBubbleView::DeviceButtonPressed( SendTabToSelfBubbleDeviceButton* device_button) { - if (!controller_) + if (!controller_) { return; + } controller_->OnDeviceSelected(device_button->device_guid()); @@ -134,8 +135,9 @@ } void SendTabToSelfDevicePickerBubbleView::AddedToWidget() { - if (!controller_->show_back_button()) + if (!controller_->show_back_button()) { return; + } // Adding a title view will replace the default title. GetBubbleFrameView()->SetTitleView( @@ -179,8 +181,9 @@ view->SetGroup(kDeviceButtonGroup); } - if (!device_list_view->children().empty()) + if (!device_list_view->children().empty()) { SetInitiallyFocusedView(device_list_view->children()[0]); + } } BEGIN_METADATA(SendTabToSelfDevicePickerBubbleView)
diff --git a/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_promo_bubble_view.cc b/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_promo_bubble_view.cc index 6126b55..4109da7 100644 --- a/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_promo_bubble_view.cc +++ b/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_promo_bubble_view.cc
@@ -81,8 +81,9 @@ } SendTabToSelfPromoBubbleView::~SendTabToSelfPromoBubbleView() { - if (controller_) + if (controller_) { controller_->OnBubbleClosed(); + } } void SendTabToSelfPromoBubbleView::Hide() { @@ -90,8 +91,9 @@ } void SendTabToSelfPromoBubbleView::AddedToWidget() { - if (!controller_->show_back_button()) + if (!controller_->show_back_button()) { return; + } // Adding a title view will replace the default title. GetBubbleFrameView()->SetTitleView( @@ -115,8 +117,9 @@ } void SendTabToSelfPromoBubbleView::OnBackButtonClicked() { - if (controller_) + if (controller_) { controller_->OnBackButtonPressed(); + } CloseBubble(); }
diff --git a/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_toolbar_bubble_view.cc b/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_toolbar_bubble_view.cc index bf4d90a..a12c977 100644 --- a/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_toolbar_bubble_view.cc +++ b/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_toolbar_bubble_view.cc
@@ -127,7 +127,7 @@ base::SingleThreadTaskRunner::GetCurrentDefault()->PostDelayedTask( FROM_HERE, base::BindOnce(&SendTabToSelfToolbarBubbleView::Timeout, - weak_ptr_factory_.GetWeakPtr()), + weak_ptr_factory_.GetWeakPtr()), kTimeoutMs); } }
diff --git a/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_toolbar_bubble_view.h b/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_toolbar_bubble_view.h index 8ef6267..8707b572 100644 --- a/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_toolbar_bubble_view.h +++ b/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_toolbar_bubble_view.h
@@ -48,7 +48,6 @@ FRIEND_TEST_ALL_PREFIXES(SendTabToSelfToolbarBubbleViewTest, ButtonNavigatesToPage); - void OpenInNewTab(); void Timeout();
diff --git a/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_toolbar_bubble_view_unittest.cc b/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_toolbar_bubble_view_unittest.cc index 37af872..89ccb757 100644 --- a/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_toolbar_bubble_view_unittest.cc +++ b/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_toolbar_bubble_view_unittest.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_device_picker_bubble_view.h" +#include "chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_toolbar_bubble_view.h" #include <vector> @@ -11,7 +11,7 @@ #include "chrome/browser/ui/browser_navigator.h" #include "chrome/browser/ui/browser_navigator_params.h" #include "chrome/browser/ui/views/frame/test_with_browser_view.h" -#include "chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_toolbar_bubble_view.h" +#include "chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_device_picker_bubble_view.h" #include "chrome/test/views/chrome_views_test_base.h" #include "components/send_tab_to_self/send_tab_to_self_entry.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/ui/views/sharing/click_to_call_browsertest.cc b/chrome/browser/ui/views/sharing/click_to_call_browsertest.cc index 3a34331..176f9e1f 100644 --- a/chrome/browser/ui/views/sharing/click_to_call_browsertest.cc +++ b/chrome/browser/ui/views/sharing/click_to_call_browsertest.cc
@@ -520,10 +520,11 @@ std::optional<std::string> extracted = ExtractPhoneNumberForClickToCall(browser()->profile(), kPhoneNumber); - if (expected_enabled) + if (expected_enabled) { EXPECT_EQ(kPhoneNumber, extracted.value()); - else + } else { EXPECT_FALSE(extracted.has_value()); + } } INSTANTIATE_TEST_SUITE_P(All,
diff --git a/chrome/browser/ui/views/sharing/remote_copy_browsertest.cc b/chrome/browser/ui/views/sharing/remote_copy_browsertest.cc index 3ef1c8b..ed52a51e 100644 --- a/chrome/browser/ui/views/sharing/remote_copy_browsertest.cc +++ b/chrome/browser/ui/views/sharing/remote_copy_browsertest.cc
@@ -174,8 +174,9 @@ size_t expected_size = 1u; ASSERT_EQ(expected_size, types.size()); ASSERT_EQ(ui::kMimeTypeText, base::UTF16ToASCII(types[0])); - if (expected_size == 2u) + if (expected_size == 2u) { ASSERT_EQ(ui::kMimeTypeTextUtf8, base::UTF16ToASCII(types[1])); + } ASSERT_EQ(kText, ReadClipboardText()); message_center::Notification notification = GetNotification(); ASSERT_EQ(l10n_util::GetStringFUTF16( @@ -220,8 +221,9 @@ size_t expected_size = 1u; ASSERT_EQ(expected_size, types.size()); ASSERT_EQ(ui::kMimeTypeText, base::UTF16ToASCII(types[0])); - if (expected_size == 2u) + if (expected_size == 2u) { ASSERT_EQ(ui::kMimeTypeTextUtf8, base::UTF16ToASCII(types[1])); + } ASSERT_EQ(kText, ReadClipboardText()); // Send a message with an image url.
diff --git a/chrome/browser/ui/views/sharing/sharing_browsertest.cc b/chrome/browser/ui/views/sharing/sharing_browsertest.cc index 98815c3..e055329 100644 --- a/chrome/browser/ui/views/sharing/sharing_browsertest.cc +++ b/chrome/browser/ui/views/sharing/sharing_browsertest.cc
@@ -115,13 +115,15 @@ original_device_info_tracker->GetAllDeviceInfo(); ASSERT_EQ(2u, original_devices.size()); - for (size_t i = 0; i < original_devices.size(); i++) + for (size_t i = 0; i < original_devices.size(); i++) { AddDeviceInfo(*original_devices[i], i); + } const std::map<syncer::DeviceInfo::FormFactor, int> device_count_by_type = fake_device_info_tracker_.CountActiveDevicesByType(); int total = 0; - for (const auto& type_and_count : device_count_by_type) + for (const auto& type_and_count : device_count_by_type) { total += type_and_count.second; + } ASSERT_EQ(2, total); }
diff --git a/chrome/browser/ui/views/sharing/sharing_dialog_view.cc b/chrome/browser/ui/views/sharing/sharing_dialog_view.cc index aeced8f..101daf2 100644 --- a/chrome/browser/ui/views/sharing/sharing_dialog_view.cc +++ b/chrome/browser/ui/views/sharing/sharing_dialog_view.cc
@@ -144,8 +144,9 @@ } void SharingDialogView::WindowClosing() { - if (data_.close_callback) + if (data_.close_callback) { std::move(data_.close_callback).Run(this); + } } void SharingDialogView::WebContentsDestroyed() { @@ -205,8 +206,9 @@ if (!dialog) { auto* bubble = IntentPickerBubbleView::intent_picker_bubble(); if (bubble && bubble->bubble_type() == - IntentPickerBubbleView::BubbleType::kClickToCall) + IntentPickerBubbleView::BubbleType::kClickToCall) { return bubble; + } } #endif return static_cast<SharingDialogView*>(dialog);
diff --git a/chrome/browser/ui/views/sharing/sharing_dialog_view_unittest.cc b/chrome/browser/ui/views/sharing/sharing_dialog_view_unittest.cc index aef9ec9..3bc60fa 100644 --- a/chrome/browser/ui/views/sharing/sharing_dialog_view_unittest.cc +++ b/chrome/browser/ui/views/sharing/sharing_dialog_view_unittest.cc
@@ -57,8 +57,9 @@ } void TearDown() override { - if (dialog_) + if (dialog_) { dialog_->GetWidget()->CloseNow(); + } TestWithBrowserView::TearDown(); } @@ -94,12 +95,13 @@ SharingDialogData CreateDialogData(int devices, int apps) { SharingDialogData data; - if (devices) + if (devices) { data.type = SharingDialogType::kDialogWithDevicesMaybeApps; - else if (apps) + } else if (apps) { data.type = SharingDialogType::kDialogWithoutDevicesWithApp; - else + } else { data.type = SharingDialogType::kEducationalDialog; + } data.prefix = SharingFeatureName::kClickToCall; data.devices = CreateDevices(devices);
diff --git a/chrome/browser/ui/views/sharing/sharing_icon_view.cc b/chrome/browser/ui/views/sharing/sharing_icon_view.cc index 30ec989..be5fc76 100644 --- a/chrome/browser/ui/views/sharing/sharing_icon_view.cc +++ b/chrome/browser/ui/views/sharing/sharing_icon_view.cc
@@ -50,8 +50,9 @@ } void SharingIconView::StartLoadingAnimation() { - if (loading_animation_) + if (loading_animation_) { return; + } loading_animation_ = true; AnimateIn(IDS_BROWSER_SHARING_OMNIBOX_SENDING_LABEL); @@ -59,8 +60,9 @@ } void SharingIconView::StopLoadingAnimation() { - if (!loading_animation_) + if (!loading_animation_) { return; + } loading_animation_ = false; UnpauseAnimation(); @@ -69,8 +71,9 @@ void SharingIconView::UpdateImpl() { auto* controller = GetController(); - if (!controller) + if (!controller) { return; + } GetViewAccessibility().SetName( controller->GetTextForTooltipAndAccessibleName()); @@ -81,10 +84,11 @@ UpdateIconImage(); } - if (controller->is_loading()) + if (controller->is_loading()) { StartLoadingAnimation(); - else + } else { StopLoadingAnimation(); + } if (last_controller_ != controller) { ResetSlideAnimation(/*show=*/false); @@ -145,8 +149,9 @@ auto target_state = activate ? views::InkDropState::ACTIVATED : views::InkDropState::HIDDEN; if (views::InkDrop::Get(this)->GetInkDrop()->GetTargetInkDropState() != - target_state) + target_state) { views::InkDrop::Get(this)->AnimateToState(target_state, /*event=*/nullptr); + } } bool SharingIconView::IsTriggerableEvent(const ui::Event& event) {
diff --git a/chrome/browser/ui/views/sharing_hub/screenshot/screenshot_captured_bubble.cc b/chrome/browser/ui/views/sharing_hub/screenshot/screenshot_captured_bubble.cc index 60f708ba..87c7c37 100644 --- a/chrome/browser/ui/views/sharing_hub/screenshot/screenshot_captured_bubble.cc +++ b/chrome/browser/ui/views/sharing_hub/screenshot/screenshot_captured_bubble.cc
@@ -168,8 +168,9 @@ /*static*/ const std::u16string ScreenshotCapturedBubble::GetFilenameForURL( const GURL& url) { - if (!url.has_host() || url.HostIsIPAddress()) + if (!url.has_host() || url.HostIsIPAddress()) { return u"chrome_screenshot.png"; + } return base::ASCIIToUTF16( base::StrCat({"chrome_screenshot_", url.host(), ".png"})); @@ -181,8 +182,9 @@ image_view_->GetImage().GetRepresentation(1.0f).GetBitmap(); const GURL data_url = GURL(webui::GetBitmapDataUrl(bitmap)); - if (!web_contents_) + if (!web_contents_) { return; + } Browser* browser = chrome::FindBrowserWithTab(web_contents_.get()); content::DownloadManager* download_manager =
diff --git a/chrome/browser/ui/views/sharing_hub/sharing_hub_bubble_view_impl.cc b/chrome/browser/ui/views/sharing_hub/sharing_hub_bubble_view_impl.cc index 431289be..7e19aa0 100644 --- a/chrome/browser/ui/views/sharing_hub/sharing_hub_bubble_view_impl.cc +++ b/chrome/browser/ui/views/sharing_hub/sharing_hub_bubble_view_impl.cc
@@ -82,8 +82,9 @@ void SharingHubBubbleViewImpl::OnActionSelected( SharingHubBubbleActionButton* button) { - if (!controller_) + if (!controller_) { return; + } // The announcement has to happen here rather than in the button itself: the // button doesn't know whether controller_ will be null, so it doesn't know
diff --git a/chrome/browser/ui/views/shortcuts/shortcut_integration_interaction_test_base.cc b/chrome/browser/ui/views/shortcuts/shortcut_integration_interaction_test_base.cc index 9b51e042..d719dee 100644 --- a/chrome/browser/ui/views/shortcuts/shortcut_integration_interaction_test_base.cc +++ b/chrome/browser/ui/views/shortcuts/shortcut_integration_interaction_test_base.cc
@@ -24,8 +24,8 @@ platform_util::internal::DisableShellOperationsForTesting(); } -ShortcutIntegrationInteractionTestApi - ::~ShortcutIntegrationInteractionTestApi() = default; +ShortcutIntegrationInteractionTestApi :: + ~ShortcutIntegrationInteractionTestApi() = default; ui::test::InteractiveTestApi::MultiStep ShortcutIntegrationInteractionTestApi::ShowCreateShortcutDialog() { @@ -59,9 +59,8 @@ CreateDesktopShortcutDelegate::kCreateShortcutDialogOkButtonId)); } -ui::test::InteractiveTestApi::MultiStep -ShortcutIntegrationInteractionTestApi - ::ShowCreateShortcutDialogSetTitleAndAccept(const std::u16string& title) { +ui::test::InteractiveTestApi::MultiStep ShortcutIntegrationInteractionTestApi :: + ShowCreateShortcutDialogSetTitleAndAccept(const std::u16string& title) { return Steps( ShowCreateShortcutDialog(), EnterText(
diff --git a/chrome/browser/ui/views/shortcuts/shortcut_integration_interaction_test_internal.cc b/chrome/browser/ui/views/shortcuts/shortcut_integration_interaction_test_internal.cc index 3ab2dbbf6..0f56898 100644 --- a/chrome/browser/ui/views/shortcuts/shortcut_integration_interaction_test_internal.cc +++ b/chrome/browser/ui/views/shortcuts/shortcut_integration_interaction_test_internal.cc
@@ -221,8 +221,8 @@ base::WeakPtrFactory<ShortcutTracker> weak_ptr_factory_{this}; }; -ShortcutIntegrationInteractionTestPrivate - ::ShortcutIntegrationInteractionTestPrivate() +ShortcutIntegrationInteractionTestPrivate :: + ShortcutIntegrationInteractionTestPrivate() : internal::InteractiveBrowserTestPrivate( std::make_unique<InteractionTestUtilBrowser>()) {}
diff --git a/chrome/browser/ui/views/side_panel/extensions/extension_side_panel_coordinator.cc b/chrome/browser/ui/views/side_panel/extensions/extension_side_panel_coordinator.cc index e43c120..cfe92652 100644 --- a/chrome/browser/ui/views/side_panel/extensions/extension_side_panel_coordinator.cc +++ b/chrome/browser/ui/views/side_panel/extensions/extension_side_panel_coordinator.cc
@@ -118,7 +118,6 @@ registry_->Deregister(GetEntryKey()); } - void ExtensionSidePanelCoordinator::OnPanelOptionsChanged( const ExtensionId& extension_id, const api::side_panel::PanelOptions& updated_options) { @@ -154,8 +153,8 @@ return; } - bool should_create_entry = !entry && should_enable_entry && - !side_panel_url_.is_empty(); + bool should_create_entry = + !entry && should_enable_entry && !side_panel_url_.is_empty(); if (should_create_entry) { // Create a global entry if the extension has not disabled its side panel // for the current tab.
diff --git a/chrome/browser/ui/views/side_panel/history_clusters/history_clusters_side_panel_coordinator.cc b/chrome/browser/ui/views/side_panel/history_clusters/history_clusters_side_panel_coordinator.cc index 45ec2f9a..8b66fbf2 100644 --- a/chrome/browser/ui/views/side_panel/history_clusters/history_clusters_side_panel_coordinator.cc +++ b/chrome/browser/ui/views/side_panel/history_clusters/history_clusters_side_panel_coordinator.cc
@@ -147,8 +147,9 @@ GURL HistoryClustersSidePanelCoordinator::GetOpenInNewTabURL() const { std::string query; - if (history_clusters_ui_) + if (history_clusters_ui_) { query = history_clusters_ui_->GetLastQueryIssued(); + } return query.empty() ? GURL(history_clusters::GetChromeUIHistoryClustersURL()) : history_clusters::GetFullJourneysUrlForQuery(query);
diff --git a/chrome/browser/ui/views/side_panel/read_anything/read_anything_side_panel_controller_interactive_uitest.cc b/chrome/browser/ui/views/side_panel/read_anything/read_anything_side_panel_controller_interactive_uitest.cc index fffece16..a64ae61 100644 --- a/chrome/browser/ui/views/side_panel/read_anything/read_anything_side_panel_controller_interactive_uitest.cc +++ b/chrome/browser/ui/views/side_panel/read_anything/read_anything_side_panel_controller_interactive_uitest.cc
@@ -2,12 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/views/side_panel/read_anything/read_anything_side_panel_controller.h" - #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_element_identifiers.h" #include "chrome/browser/ui/tabs/public/tab_features.h" #include "chrome/browser/ui/tabs/public/tab_interface.h" +#include "chrome/browser/ui/views/side_panel/read_anything/read_anything_side_panel_controller.h" #include "chrome/browser/ui/views/side_panel/side_panel_registry.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/user_education/interactive_feature_promo_test.h"
diff --git a/chrome/browser/ui/views/side_panel/read_later_side_panel_web_view.cc b/chrome/browser/ui/views/side_panel/read_later_side_panel_web_view.cc index 498a5a3..52552ab 100644 --- a/chrome/browser/ui/views/side_panel/read_later_side_panel_web_view.cc +++ b/chrome/browser/ui/views/side_panel/read_later_side_panel_web_view.cc
@@ -51,8 +51,9 @@ TabStripModel* tab_strip_model, const TabStripModelChange& change, const TabStripSelectionChange& selection) { - if (GetVisible() && selection.active_tab_changed()) + if (GetVisible() && selection.active_tab_changed()) { UpdateActiveURL(tab_strip_model->GetActiveWebContents()); + } } void ReadLaterSidePanelWebView::TabChangedAt(content::WebContents* contents, @@ -67,8 +68,9 @@ void ReadLaterSidePanelWebView::UpdateActiveURL( content::WebContents* contents) { auto* controller = contents_wrapper()->GetWebUIController(); - if (!controller || !contents) + if (!controller || !contents) { return; + } controller->GetAs<ReadingListUI>()->SetActiveTabURL( chrome::GetURLToBookmark(contents));
diff --git a/chrome/browser/ui/views/side_panel/side_panel_content_proxy.cc b/chrome/browser/ui/views/side_panel/side_panel_content_proxy.cc index 7552ba5..2bd156b 100644 --- a/chrome/browser/ui/views/side_panel/side_panel_content_proxy.cc +++ b/chrome/browser/ui/views/side_panel/side_panel_content_proxy.cc
@@ -15,8 +15,9 @@ void SidePanelContentProxy::SetAvailable(bool available) { available_ = available; - if (available && available_callback_) + if (available && available_callback_) { std::move(available_callback_).Run(); + } } void SidePanelContentProxy::ResetAvailableCallback() {
diff --git a/chrome/browser/ui/views/side_panel/side_panel_coordinator.cc b/chrome/browser/ui/views/side_panel/side_panel_coordinator.cc index 4fe10921..a6da148e 100644 --- a/chrome/browser/ui/views/side_panel/side_panel_coordinator.cc +++ b/chrome/browser/ui/views/side_panel/side_panel_coordinator.cc
@@ -352,8 +352,9 @@ } GURL new_tab_url = GetEntryForUniqueKey(*current_key_)->GetOpenInNewTabURL(); - if (!new_tab_url.is_valid()) + if (!new_tab_url.is_valid()) { return; + } SidePanelUtil::RecordNewTabButtonClicked(current_key_->key.id()); content::OpenURLParams params(new_tab_url, content::Referrer(), @@ -633,8 +634,9 @@ auto* content = content_wrapper->AddChildView( content_view.has_value() ? std::move(content_view.value()) : entry->GetContent()); - if (auto* contextual_registry = GetActiveContextualRegistry()) + if (auto* contextual_registry = GetActiveContextualRegistry()) { contextual_registry->ResetActiveEntry(); + } current_key_ = unique_key; current_entry_ = entry->GetWeakPtr(); if (browser_view_->toolbar()->pinned_toolbar_actions_container()) {
diff --git a/chrome/browser/ui/views/side_panel/side_panel_coordinator_browsertest.cc b/chrome/browser/ui/views/side_panel/side_panel_coordinator_browsertest.cc index b6466f7a..8e67de5 100644 --- a/chrome/browser/ui/views/side_panel/side_panel_coordinator_browsertest.cc +++ b/chrome/browser/ui/views/side_panel/side_panel_coordinator_browsertest.cc
@@ -529,7 +529,6 @@ SidePanel::HorizontalAlignment::kLeft); } - IN_PROC_BROWSER_TEST_F(SidePanelCoordinatorTest, SidePanelToggleWithEntriesTest) { Init();
diff --git a/chrome/browser/ui/views/side_panel/side_panel_entry.cc b/chrome/browser/ui/views/side_panel/side_panel_entry.cc index d38331f..5a465d6f 100644 --- a/chrome/browser/ui/views/side_panel/side_panel_entry.cc +++ b/chrome/browser/ui/views/side_panel/side_panel_entry.cc
@@ -79,8 +79,9 @@ } GURL SidePanelEntry::GetOpenInNewTabURL() const { - if (open_in_new_tab_url_callback_.is_null()) + if (open_in_new_tab_url_callback_.is_null()) { return GURL(); + } return open_in_new_tab_url_callback_.Run(); }
diff --git a/chrome/browser/ui/views/side_panel/side_panel_entry_key.cc b/chrome/browser/ui/views/side_panel/side_panel_entry_key.cc index 5b86d30..c0cdbc2 100644 --- a/chrome/browser/ui/views/side_panel/side_panel_entry_key.cc +++ b/chrome/browser/ui/views/side_panel/side_panel_entry_key.cc
@@ -2,13 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/views/side_panel/side_panel_entry_key.h" + #include <sstream> #include <string> #include "base/check.h" #include "base/check_op.h" #include "chrome/browser/ui/views/side_panel/side_panel_entry_id.h" -#include "chrome/browser/ui/views/side_panel/side_panel_entry_key.h" SidePanelEntryKey::SidePanelEntryKey(SidePanelEntryId id) : id_(id) { CHECK_NE(id_, SidePanelEntryId::kExtension);
diff --git a/chrome/browser/ui/views/side_panel/side_panel_entry_key_unittest.cc b/chrome/browser/ui/views/side_panel/side_panel_entry_key_unittest.cc index 0cebe72..f125f35 100644 --- a/chrome/browser/ui/views/side_panel/side_panel_entry_key_unittest.cc +++ b/chrome/browser/ui/views/side_panel/side_panel_entry_key_unittest.cc
@@ -2,10 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/views/side_panel/side_panel_entry_key.h" + #include <string> #include "chrome/browser/ui/actions/chrome_action_id.h" -#include "chrome/browser/ui/views/side_panel/side_panel_entry_key.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/actions/action_id.h"
diff --git a/chrome/browser/ui/views/side_panel/side_panel_prefs.cc b/chrome/browser/ui/views/side_panel/side_panel_prefs.cc index c2b67ba..2c6ba6c5 100644 --- a/chrome/browser/ui/views/side_panel/side_panel_prefs.cc +++ b/chrome/browser/ui/views/side_panel/side_panel_prefs.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/views/side_panel/side_panel_prefs.h" + #include "base/feature_list.h" #include "base/i18n/rtl.h" #include "chrome/browser/ui/ui_features.h"
diff --git a/chrome/browser/ui/views/side_panel/side_panel_registry.cc b/chrome/browser/ui/views/side_panel/side_panel_registry.cc index 8e63ed9..bfe22702 100644 --- a/chrome/browser/ui/views/side_panel/side_panel_registry.cc +++ b/chrome/browser/ui/views/side_panel/side_panel_registry.cc
@@ -56,14 +56,16 @@ void SidePanelRegistry::ClearCachedEntryViews() { for (auto const& entry : entries_) { - if (!active_entry_.has_value() || entry.get() != active_entry_.value()) + if (!active_entry_.has_value() || entry.get() != active_entry_.value()) { entry.get()->ClearCachedView(); + } } } bool SidePanelRegistry::Register(std::unique_ptr<SidePanelEntry> entry) { - if (GetEntryForKey(entry->key())) + if (GetEntryForKey(entry->key())) { return false; + } // It's important to add `this` as an observer to `entry` before notifying // SidePanelRegistryObservers of the entry's registration because some // registry observers can call SidePanelEntryObserver methods for `entry`.
diff --git a/chrome/browser/ui/views/side_panel/side_panel_util.cc b/chrome/browser/ui/views/side_panel/side_panel_util.cc index 68dab33..581cfda 100644 --- a/chrome/browser/ui/views/side_panel/side_panel_util.cc +++ b/chrome/browser/ui/views/side_panel/side_panel_util.cc
@@ -15,6 +15,7 @@ #include "chrome/browser/ui/browser_window/public/browser_window_features.h" #include "chrome/browser/ui/ui_features.h" #include "chrome/browser/ui/views/side_panel/bookmarks/bookmarks_side_panel_coordinator.h" +#include "chrome/browser/ui/views/side_panel/extensions/extension_side_panel_manager.h" #include "chrome/browser/ui/views/side_panel/history_clusters/history_clusters_side_panel_coordinator.h" #include "chrome/browser/ui/views/side_panel/reading_list/reading_list_side_panel_coordinator.h" #include "chrome/browser/ui/views/side_panel/side_panel_content_proxy.h" @@ -27,7 +28,6 @@ #include "components/user_notes/user_notes_features.h" #include "ui/accessibility/accessibility_features.h" #include "ui/actions/actions.h" -#include "chrome/browser/ui/views/side_panel/extensions/extension_side_panel_manager.h" // static void SidePanelUtil::PopulateGlobalEntries(Browser* browser,
diff --git a/chrome/browser/ui/views/side_panel/side_panel_util.h b/chrome/browser/ui/views/side_panel/side_panel_util.h index 334f193..c3efb38 100644 --- a/chrome/browser/ui/views/side_panel/side_panel_util.h +++ b/chrome/browser/ui/views/side_panel/side_panel_util.h
@@ -9,9 +9,9 @@ #include <type_traits> #include "base/time/time.h" +#include "chrome/browser/ui/views/side_panel/side_panel_entry.h" #include "chrome/browser/ui/views/side_panel/side_panel_entry_id.h" #include "chrome/browser/ui/views/side_panel/side_panel_enums.h" -#include "chrome/browser/ui/views/side_panel/side_panel_entry.h" #include "ui/base/class_property.h" class Browser;
diff --git a/chrome/browser/ui/views/side_panel/side_panel_web_ui_view.cc b/chrome/browser/ui/views/side_panel/side_panel_web_ui_view.cc index 6958844..4713131a 100644 --- a/chrome/browser/ui/views/side_panel/side_panel_web_ui_view.cc +++ b/chrome/browser/ui/views/side_panel/side_panel_web_ui_view.cc
@@ -65,20 +65,23 @@ WebView::ViewHierarchyChanged(details); // Ensure the WebContents is in a visible state after being added to the // side panel so the correct lifecycle hooks are triggered. - if (details.is_add && details.child == this) + if (details.is_add && details.child == this) { contents_wrapper_->web_contents()->WasShown(); + } } void SidePanelWebUIView::ShowUI() { SetVisible(true); SidePanelUtil::GetSidePanelContentProxy(this)->SetAvailable(true); - if (on_show_cb_) + if (on_show_cb_) { on_show_cb_.Run(); + } } void SidePanelWebUIView::CloseUI() { - if (close_cb_) + if (close_cb_) { close_cb_.Run(); + } } void SidePanelWebUIView::ShowCustomContextMenu( @@ -96,8 +99,9 @@ } void SidePanelWebUIView::HideCustomContextMenu() { - if (context_menu_runner_) + if (context_menu_runner_) { context_menu_runner_->Cancel(); + } } bool SidePanelWebUIView::HandleKeyboardEvent(
diff --git a/chrome/browser/ui/views/site_data/page_specific_site_data_dialog_browsertest.cc b/chrome/browser/ui/views/site_data/page_specific_site_data_dialog_browsertest.cc index a9347535..7a93606 100644 --- a/chrome/browser/ui/views/site_data/page_specific_site_data_dialog_browsertest.cc +++ b/chrome/browser/ui/views/site_data/page_specific_site_data_dialog_browsertest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/views/site_data/page_specific_site_data_dialog.h" + #include <stddef.h> #include "base/memory/raw_ptr.h" @@ -10,7 +12,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/browser/ui/views/site_data/page_specific_site_data_dialog.h" #include "chrome/browser/ui/views/site_data/page_specific_site_data_dialog_controller.h" #include "chrome/browser/ui/views/site_data/site_data_row_view.h" #include "chrome/grit/generated_resources.h"
diff --git a/chrome/browser/ui/views/site_data/page_specific_site_data_dialog_controller.cc b/chrome/browser/ui/views/site_data/page_specific_site_data_dialog_controller.cc index 14b41139..8a017d74 100644 --- a/chrome/browser/ui/views/site_data/page_specific_site_data_dialog_controller.cc +++ b/chrome/browser/ui/views/site_data/page_specific_site_data_dialog_controller.cc
@@ -28,8 +28,9 @@ static_cast<PageSpecificSiteDataDialogController*>( web_contents->GetUserData( PageSpecificSiteDataDialogController::UserDataKey())); - if (!handle) + if (!handle) { return nullptr; + } return handle->GetDialogView(); } @@ -48,8 +49,9 @@ // dialog from its list of tracked dialogs, and therefore might not have any // active dialog. This should be rare enough that it's not worth trying to // re-open the dialog. See https://crbug.com/989888 - if (instance->GetWidget()->IsClosed()) + if (instance->GetWidget()->IsClosed()) { return; + } auto* dialog_manager = web_modal::WebContentsModalDialogManager::FromWebContents(web_contents);
diff --git a/chrome/browser/ui/views/site_data/page_specific_site_data_dialog_interactive_uitest.cc b/chrome/browser/ui/views/site_data/page_specific_site_data_dialog_interactive_uitest.cc index 5198de3..68362aa 100644 --- a/chrome/browser/ui/views/site_data/page_specific_site_data_dialog_interactive_uitest.cc +++ b/chrome/browser/ui/views/site_data/page_specific_site_data_dialog_interactive_uitest.cc
@@ -614,20 +614,20 @@ // Installs and launches an IWA, then opens the PageSpecificSiteData dialog. MultiStep NavigateAndOpenDialog(Browser* iwa_browser, ui::ElementIdentifier section_id) { - return Steps(InstrumentTab(kWebContentsElementId, - /*tab_index=*/std::nullopt, iwa_browser), - PressButton(kToolbarAppMenuButtonElementId), - WithView(kToolbarAppMenuButtonElementId, - base::BindOnce([](AppMenuButton* button) { - CHECK(button->IsMenuShowing()); - button->app_menu()->ExecuteCommand( - IDC_WEB_APP_MENU_APP_INFO, 0); - })), - PressButton(PageInfoMainView::kCookieButtonElementId), - PressButton(PageInfoCookiesContentView::kCookieDialogButton), - InAnyContext(AfterShow( - section_id, - ExpectActionCount(kCookiesDialogOpenedActionName, 1)))); + return Steps( + InstrumentTab(kWebContentsElementId, + /*tab_index=*/std::nullopt, iwa_browser), + PressButton(kToolbarAppMenuButtonElementId), + WithView(kToolbarAppMenuButtonElementId, + base::BindOnce([](AppMenuButton* button) { + CHECK(button->IsMenuShowing()); + button->app_menu()->ExecuteCommand(IDC_WEB_APP_MENU_APP_INFO, + 0); + })), + PressButton(PageInfoMainView::kCookieButtonElementId), + PressButton(PageInfoCookiesContentView::kCookieDialogButton), + InAnyContext(AfterShow( + section_id, ExpectActionCount(kCookiesDialogOpenedActionName, 1)))); } // Returns a test step that verifies that the hostname for `row` is equal to
diff --git a/chrome/browser/ui/views/site_data/site_data_row_view.cc b/chrome/browser/ui/views/site_data/site_data_row_view.cc index 064fe04..30927c9 100644 --- a/chrome/browser/ui/views/site_data/site_data_row_view.cc +++ b/chrome/browser/ui/views/site_data/site_data_row_view.cc
@@ -155,8 +155,9 @@ const auto favicon = favicon_cache->GetFaviconForPageUrl( origin.GetURL(), base::BindOnce(&SiteDataRowView::SetFaviconImage, base::Unretained(this))); - if (!favicon.IsEmpty()) + if (!favicon.IsEmpty()) { SetFaviconImage(favicon); + } std::u16string origin_display_name = UrlIdentity::CreateFromUrl(profile, origin.GetURL(), @@ -276,8 +277,9 @@ // The row is hidden, advance focus to the next row if the delete button was // focused. - if (delete_button_->HasFocus()) + if (delete_button_->HasFocus()) { GetFocusManager()->AdvanceFocus(/*reverse=*/false); + } } void SiteDataRowView::OnBlockMenuItemClicked(int event_flags) { @@ -295,8 +297,9 @@ void SiteDataRowView::SetContentSettingException(ContentSetting setting) { // For partitioned access, it's valid to create an allow exception that // matches current effective setting to allow 3PC. - if (!is_fully_partitioned_ || setting_ != CONTENT_SETTING_ALLOW) + if (!is_fully_partitioned_ || setting_ != CONTENT_SETTING_ALLOW) { DCHECK_NE(setting_, setting); + } create_exception_callback_.Run(origin_, setting);
diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector.cc b/chrome/browser/ui/views/ssl_client_certificate_selector.cc index 1f61e16..d1dd5f21 100644 --- a/chrome/browser/ui/views/ssl_client_certificate_selector.cc +++ b/chrome/browser/ui/views/ssl_client_certificate_selector.cc
@@ -110,8 +110,9 @@ // chance to abort instead of proceeding with a null certificate. (This // will be ignored if there was a previous call to CertificateSelected // or CancelCertificateSelection.) - if (dialog->auth_observer_impl_) + if (dialog->auth_observer_impl_) { dialog->auth_observer_impl_->CertificateSelected(nullptr, nullptr); + } }, this)); } @@ -148,8 +149,9 @@ void SSLClientCertificateSelector::OnCancel() { // Close the dialog if it is not currently being displayed - if (!GetWidget()->IsVisible()) + if (!GetWidget()->IsVisible()) { CloseDialog(); + } } base::OnceClosure SSLClientCertificateSelector::GetCancellationCallback() { @@ -182,8 +184,9 @@ // // TODO(davidben): Move this hook to the WebContentsDelegate and only try to // show a dialog in Browser's implementation. https://crbug.com/456255 - if (!SSLClientCertificateSelector::CanShow(contents)) + if (!SSLClientCertificateSelector::CanShow(contents)) { return base::OnceClosure(); + } SSLClientCertificateSelector* selector = new SSLClientCertificateSelector( contents, cert_request_info, std::move(client_certs),
diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc b/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc index 4c9f7d6..575e3c0 100644 --- a/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc +++ b/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/views/ssl_client_certificate_selector.h" + #include "base/files/file_path.h" #include "base/functional/bind.h" #include "base/memory/raw_ptr.h" @@ -13,7 +15,6 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/browser/ui/views/ssl_client_certificate_selector.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/interactive_test_utils.h" #include "chrome/test/base/ui_test_utils.h" @@ -80,9 +81,7 @@ // Have to release our reference to the auth handler during the test to allow // it to be destroyed while the Browser still exists. - void TearDownOnMainThread() override { - auth_requestor_.reset(); - } + void TearDownOnMainThread() override { auth_requestor_.reset(); } protected: std::unique_ptr<net::FakeClientCertIdentity> cert_identity_1_; @@ -228,7 +227,7 @@ protected: raw_ptr<Browser, AcrossTasksDanglingUntriaged> browser_1_; scoped_refptr<net::SSLCertRequestInfo> cert_request_info_1_; - scoped_refptr<StrictMock<SSLClientAuthRequestorMock> > auth_requestor_1_; + scoped_refptr<StrictMock<SSLClientAuthRequestorMock>> auth_requestor_1_; raw_ptr<SSLClientCertificateSelector, AcrossTasksDanglingUntriaged> selector_1_; }; @@ -242,8 +241,8 @@ IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorTest, Escape) { EXPECT_CALL(*auth_requestor_, CertificateSelected(nullptr, nullptr)); - EXPECT_TRUE(ui_test_utils::SendKeyPressSync( - browser(), ui::VKEY_ESCAPE, false, false, false, false)); + EXPECT_TRUE(ui_test_utils::SendKeyPressSync(browser(), ui::VKEY_ESCAPE, false, + false, false, false)); auth_requestor_->WaitForCompletion(); Mock::VerifyAndClear(auth_requestor_.get()); @@ -254,8 +253,8 @@ CertificateSelected(cert_identity_1_->certificate(), cert_identity_1_->ssl_private_key())); - EXPECT_TRUE(ui_test_utils::SendKeyPressSync( - browser(), ui::VKEY_RETURN, false, false, false, false)); + EXPECT_TRUE(ui_test_utils::SendKeyPressSync(browser(), ui::VKEY_RETURN, false, + false, false, false)); auth_requestor_->WaitForCompletion(); Mock::VerifyAndClear(auth_requestor_.get()); @@ -277,8 +276,8 @@ EXPECT_CALL(*auth_requestor_1_, CertificateSelected(nullptr, nullptr)); EXPECT_CALL(*auth_requestor_2_, CertificateSelected(nullptr, nullptr)); - EXPECT_TRUE(ui_test_utils::SendKeyPressSync( - browser(), ui::VKEY_ESCAPE, false, false, false, false)); + EXPECT_TRUE(ui_test_utils::SendKeyPressSync(browser(), ui::VKEY_ESCAPE, false, + false, false, false)); auth_requestor_1_->WaitForCompletion(); auth_requestor_2_->WaitForCompletion(); @@ -302,8 +301,8 @@ CertificateSelected(cert_identity_2_->certificate(), cert_identity_2_->ssl_private_key())); - EXPECT_TRUE(ui_test_utils::SendKeyPressSync( - browser(), ui::VKEY_DOWN, false, false, false, false)); + EXPECT_TRUE(ui_test_utils::SendKeyPressSync(browser(), ui::VKEY_DOWN, false, + false, false, false)); ASSERT_TRUE(selector_->GetSelectedCert()); EXPECT_EQ(cert_identity_1_->certificate(), @@ -315,8 +314,8 @@ EXPECT_EQ(cert_identity_2_->certificate(), selector_2_->GetSelectedCert()->certificate()); - EXPECT_TRUE(ui_test_utils::SendKeyPressSync( - browser(), ui::VKEY_RETURN, false, false, false, false)); + EXPECT_TRUE(ui_test_utils::SendKeyPressSync(browser(), ui::VKEY_RETURN, false, + false, false, false)); auth_requestor_1_->WaitForCompletion(); auth_requestor_2_->WaitForCompletion(); @@ -332,8 +331,8 @@ IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorMultiProfileTest, Escape) { EXPECT_CALL(*auth_requestor_1_, CertificateSelected(nullptr, nullptr)); - EXPECT_TRUE(ui_test_utils::SendKeyPressSync( - browser_1_, ui::VKEY_ESCAPE, false, false, false, false)); + EXPECT_TRUE(ui_test_utils::SendKeyPressSync(browser_1_, ui::VKEY_ESCAPE, + false, false, false, false)); auth_requestor_1_->WaitForCompletion(); Mock::VerifyAndClear(auth_requestor_.get()); @@ -350,8 +349,8 @@ CertificateSelected(cert_identity_1_->certificate(), cert_identity_1_->ssl_private_key())); - EXPECT_TRUE(ui_test_utils::SendKeyPressSync( - browser_1_, ui::VKEY_RETURN, false, false, false, false)); + EXPECT_TRUE(ui_test_utils::SendKeyPressSync(browser_1_, ui::VKEY_RETURN, + false, false, false, false)); auth_requestor_1_->WaitForCompletion(); Mock::VerifyAndClear(auth_requestor_.get());
diff --git a/chrome/browser/ui/views/status_bubble_views.cc b/chrome/browser/ui/views/status_bubble_views.cc index c585477..00c2a213 100644 --- a/chrome/browser/ui/views/status_bubble_views.cc +++ b/chrome/browser/ui/views/status_bubble_views.cc
@@ -268,8 +268,9 @@ } void StatusView::SetText(const std::u16string& text) { - if (text == GetText()) + if (text == GetText()) { return; + } text_->SetText(text); OnPropertyChanged(&text_, views::kPropertyEffectsNone); @@ -285,8 +286,9 @@ } void StatusView::SetStyle(BubbleStyle style) { - if (style_ == style) + if (style_ == style) { return; + } style_ = style; OnPropertyChanged(&style_, views::kPropertyEffectsPaint); @@ -333,10 +335,11 @@ } void StatusView::OnAnimationEnded() { - if (state_ == BubbleState::kFadingIn) + if (state_ == BubbleState::kFadingIn) { state_ = BubbleState::kShown; - else if (state_ == BubbleState::kFadingOut) + } else if (state_ == BubbleState::kFadingOut) { HideInstantly(); // This view may be destroyed after calling HideInstantly. + } } bool StatusView::IsDestroyPopupTimerRunning() const { @@ -349,8 +352,9 @@ } void StatusView::StartTimer(base::TimeDelta time) { - if (timer_factory_.HasWeakPtrs()) + if (timer_factory_.HasWeakPtrs()) { timer_factory_.InvalidateWeakPtrs(); + } status_bubble_->task_runner_->PostDelayedTask( FROM_HERE, @@ -368,8 +372,9 @@ } void StatusView::CancelTimer() { - if (timer_factory_.HasWeakPtrs()) + if (timer_factory_.HasWeakPtrs()) { timer_factory_.InvalidateWeakPtrs(); + } } void StatusView::RestartTimer(base::TimeDelta delay) { @@ -478,10 +483,11 @@ // different on different versions. Status bubble will use its own round // corner on Mac when there is no download shelf beneath. if (!status_bubble_->download_shelf_is_visible_) { - if (base::i18n::IsRTL() != (style_ == BubbleStyle::kStandard)) + if (base::i18n::IsRTL() != (style_ == BubbleStyle::kStandard)) { round_corner(gfx::RRectF::Corner::kLowerLeft); - else + } else { round_corner(gfx::RRectF::Corner::kLowerRight); + } } #endif } @@ -501,8 +507,9 @@ style_ == BubbleStyle::kStandard ? shadow_thickness_pixels : 0; int clip_right = style_ == BubbleStyle::kStandardRight ? shadow_thickness_pixels : 0; - if (base::i18n::IsRTL()) + if (base::i18n::IsRTL()) { std::swap(clip_left, clip_right); + } const int clip_bottom = clip_left || clip_right ? shadow_thickness_pixels : 0; gfx::Rect clip_rect(scaled_size); @@ -678,8 +685,8 @@ int StatusBubbleViews::StatusViewExpander::GetCurrentBubbleWidth() { return static_cast<int>(expansion_start_ + - (expansion_end_ - expansion_start_) * - gfx::LinearAnimation::GetCurrentValue()); + (expansion_end_ - expansion_start_) * + gfx::LinearAnimation::GetCurrentValue()); } void StatusBubbleViews::StatusViewExpander::SetBubbleWidth(int width) { @@ -689,7 +696,6 @@ // SetBubbleWidth() returns. } - // StatusBubbleViews ----------------------------------------------------------- const int StatusBubbleViews::kShadowThickness = 1; @@ -753,8 +759,9 @@ expand_view_.reset(); view_ = nullptr; // Move |popup_| to the stack to avoid reentrancy issues with CloseNow(). - if (std::unique_ptr<views::Widget> popup = std::move(popup_)) + if (std::unique_ptr<views::Widget> popup = std::move(popup_)) { popup->CloseNow(); + } } void StatusBubbleViews::Reposition() { @@ -774,8 +781,8 @@ // popup window's position is consistent with the base_view_'s window. views::View::ConvertPointToScreen(base_view_, &top_left); popup_->SetBounds(gfx::Rect(top_left.x() + position_.x(), - top_left.y() + position_.y(), - size_.width(), size_.height())); + top_left.y() + position_.y(), size_.width(), + size_.height())); } } @@ -792,8 +799,9 @@ // Initializing the `popup_` views::Widget can trigger a window manager work // area change that calls into this function while `view_` is still null, so // check both `popup_` and `view_`. - if (popup_.get() && view_ && contains_mouse_) + if (popup_.get() && view_ && contains_mouse_) { AvoidMouse(last_mouse_moved_location_); + } } int StatusBubbleViews::GetWidthForURL(const std::u16string& url_string) { @@ -804,18 +812,22 @@ } void StatusBubbleViews::SetStatus(const std::u16string& status_text) { - if (size_.IsEmpty()) + if (size_.IsEmpty()) { return; // We have no bounds, don't attempt to show the popup. + } - if (status_text_ == status_text && !status_text.empty()) + if (status_text_ == status_text && !status_text.empty()) { return; + } - if (!IsFrameVisible()) + if (!IsFrameVisible()) { return; // Don't show anything if the parent isn't visible. + } status_text_ = status_text; - if (status_text_.empty() && url_text_.empty() && !popup_) + if (status_text_.empty() && url_text_.empty() && !popup_) { return; + } InitPopup(); if (status_text_.empty()) { @@ -829,11 +841,13 @@ void StatusBubbleViews::SetURL(const GURL& url) { url_ = url; - if (size_.IsEmpty()) + if (size_.IsEmpty()) { return; // We have no bounds, don't attempt to show the popup. + } - if (url.is_empty() && status_text_.empty() && !popup_) + if (url.is_empty() && status_text_.empty() && !popup_) { return; + } InitPopup(); @@ -841,8 +855,9 @@ // display, display that status instead. if (url.is_empty() && !status_text_.empty()) { url_text_ = std::u16string(); - if (IsFrameVisible()) + if (IsFrameVisible()) { view_->AnimateForText(status_text_); + } return; } @@ -880,8 +895,7 @@ // size (shrinking or expanding). Otherwise delay. if (is_expanded_ && !url.is_empty()) { ExpandBubble(); - } else if (url_formatter::FormatUrl(url).length() > - url_text_.length()) { + } else if (url_formatter::FormatUrl(url).length() > url_text_.length()) { task_runner_->PostDelayedTask( FROM_HERE, base::BindOnce(&StatusBubbleViews::ExpandBubble, @@ -899,8 +913,9 @@ void StatusBubbleViews::Hide() { status_text_ = std::u16string(); url_text_ = std::u16string(); - if (view_) + if (view_) { view_->HideInstantly(); + } } void StatusBubbleViews::MouseMoved(bool left_content) { @@ -946,11 +961,11 @@ int top_right_x = top_left.x() + window_width; relative_location.set_x(top_right_x - relative_location.x()); } else { - relative_location.set_x( - relative_location.x() - (top_left.x() + position_.x())); + relative_location.set_x(relative_location.x() - + (top_left.x() + position_.x())); } - relative_location.set_y( - relative_location.y() - (top_left.y() + position_.y())); + relative_location.set_y(relative_location.y() - + (top_left.y() + position_.y())); // If the mouse is in a position where we think it would move the // status bubble, figure out where and how the bubble should be moved. @@ -964,10 +979,11 @@ // When the mouse is entering from the right, we want the offset to be // scaled by how horizontally far away the cursor is from the bubble. if (relative_location.x() > size_.width()) { - offset = static_cast<int>(static_cast<float>(offset) * ( - static_cast<float>(kMousePadding - - (relative_location.x() - size_.width())) / - static_cast<float>(kMousePadding))); + offset = static_cast<int>( + static_cast<float>(offset) * + (static_cast<float>(kMousePadding - + (relative_location.x() - size_.width())) / + static_cast<float>(kMousePadding))); } // Cap the offset and change the visual presentation of the bubble @@ -1001,8 +1017,8 @@ // Subtract border width + bubble width. int right_position_x = window_width - (position_.x() + size_.width()); popup_->SetBounds(gfx::Rect(top_left.x() + right_position_x, - top_left.y() + position_.y(), - size_.width(), size_.height())); + top_left.y() + position_.y(), size_.width(), + size_.height())); } else { offset_ = offset; popup_->SetBounds(gfx::Rect(top_left.x() + position_.x(), @@ -1014,15 +1030,16 @@ offset_ = 0; view_->SetStyle(StatusView::BubbleStyle::kStandard); popup_->SetBounds(gfx::Rect(top_left.x() + position_.x(), - top_left.y() + position_.y(), - size_.width(), size_.height())); + top_left.y() + position_.y(), size_.width(), + size_.height())); } } bool StatusBubbleViews::IsFrameVisible() { views::Widget* frame = base_view_->GetWidget(); - if (!frame->IsVisible()) + if (!frame->IsVisible()) { return false; + } views::Widget* window = frame->GetTopLevelWidget(); return !window || !window->IsMinimized(); @@ -1059,13 +1076,14 @@ void StatusBubbleViews::SetBubbleWidth(int width) { size_.set_width(width); - SetBounds(original_position_.x(), original_position_.y(), - size_.width(), size_.height()); + SetBounds(original_position_.x(), original_position_.y(), size_.width(), + size_.height()); } void StatusBubbleViews::CancelExpandTimer() { - if (expand_timer_factory_.HasWeakPtrs()) + if (expand_timer_factory_.HasWeakPtrs()) { expand_timer_factory_.InvalidateWeakPtrs(); + } } gfx::Animation* StatusBubbleViews::GetShowHideAnimationForTest() {
diff --git a/chrome/browser/ui/views/status_bubble_views.h b/chrome/browser/ui/views/status_bubble_views.h index 91bfa43..19820533 100644 --- a/chrome/browser/ui/views/status_bubble_views.h +++ b/chrome/browser/ui/views/status_bubble_views.h
@@ -20,11 +20,11 @@ namespace gfx { class Animation; class Point; -} +} // namespace gfx namespace views { class View; class Widget; -} +} // namespace views // StatusBubble displays a bubble of text that fades in, hovers over the // browser chrome and fades away when not needed. It is primarily designed
diff --git a/chrome/browser/ui/views/status_icons/concat_menu_model.cc b/chrome/browser/ui/views/status_icons/concat_menu_model.cc index dc2e4c9a..a63936a 100644 --- a/chrome/browser/ui/views/status_icons/concat_menu_model.cc +++ b/chrome/browser/ui/views/status_icons/concat_menu_model.cc
@@ -99,8 +99,9 @@ ui::MenuModel* ConcatMenuModel::GetMenuAndIndex(size_t* index) const { size_t m1_count = m1_->GetItemCount(); - if (*index < m1_count) + if (*index < m1_count) { return m1_; + } *index -= m1_count; DCHECK_LT(*index, m2_->GetItemCount());
diff --git a/chrome/browser/ui/views/status_icons/status_icon_linux_dbus.cc b/chrome/browser/ui/views/status_icons/status_icon_linux_dbus.cc index e93d0fc..159981e 100644 --- a/chrome/browser/ui/views/status_icons/status_icon_linux_dbus.cc +++ b/chrome/browser/ui/views/status_icons/status_icon_linux_dbus.cc
@@ -166,8 +166,9 @@ // change in order to update, so we need a new temporary directory and a // unique base name for the file. base::FilePath temp_dir; - if (!base::CreateNewTempDirectory("", &temp_dir)) + if (!base::CreateNewTempDirectory("", &temp_dir)) { return {}; + } base::FilePath file_path = temp_dir.Append( "status_icon_" + base::NumberToString(icon_file_id) + ".png"); @@ -202,8 +203,9 @@ void StatusIconLinuxDbus::SetToolTip(const std::u16string& tool_tip) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); - if (!properties_) + if (!properties_) { return; + } UpdateMenuImpl(delegate_->GetMenuModel(), true); @@ -381,8 +383,9 @@ void StatusIconLinuxDbus::OnRegistered(dbus::Response* response) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); - if (!response) + if (!response) { delegate_->OnImplInitializationFailed(); + } } void StatusIconLinuxDbus::OnNameOwnerChangedReceived( @@ -446,8 +449,9 @@ void StatusIconLinuxDbus::UpdateMenuImpl(ui::MenuModel* model, bool send_signal) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); - if (!menu_) + if (!menu_) { return; + } if (!model) { empty_menu_ = std::make_unique<ui::SimpleMenuModel>(nullptr); @@ -457,8 +461,9 @@ click_action_menu_ = std::make_unique<ui::SimpleMenuModel>(this); if (delegate_->HasClickAction() && !delegate_->GetToolTip().empty()) { click_action_menu_->AddItem(0, delegate_->GetToolTip()); - if (model->GetItemCount()) + if (model->GetItemCount()) { click_action_menu_->AddSeparator(ui::MenuSeparatorType::NORMAL_SEPARATOR); + } } concat_menu_ = @@ -470,8 +475,9 @@ void StatusIconLinuxDbus::SetIconImpl(const gfx::ImageSkia& image, bool send_signals) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); - if (!properties_) + if (!properties_) { return; + } if (should_write_icon_to_file_) { icon_task_runner_->PostTaskAndReplyWithResult( @@ -493,8 +499,9 @@ DCHECK_CURRENTLY_ON(content::BrowserThread::UI); CleanupIconFile(); icon_file_ = icon_file; - if (icon_file_.empty()) + if (icon_file_.empty()) { return; + } properties_->SetProperty(kInterfaceStatusNotifierItem, kPropertyIconThemePath, DbusString(icon_file_.DirName().value()), false);
diff --git a/chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.cc b/chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.cc index 6066148..be35214 100644 --- a/chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.cc +++ b/chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.cc
@@ -72,20 +72,23 @@ } StatusIconLinuxWrapper::~StatusIconLinuxWrapper() { - if (menu_model_) + if (menu_model_) { menu_model_->RemoveObserver(this); + } } void StatusIconLinuxWrapper::SetImage(const gfx::ImageSkia& image) { image_ = GetBestImageRep(image); - if (auto* status_icon = GetStatusIcon()) + if (auto* status_icon = GetStatusIcon()) { status_icon->SetIcon(image_); + } } void StatusIconLinuxWrapper::SetToolTip(const std::u16string& tool_tip) { tool_tip_ = tool_tip; - if (auto* status_icon = GetStatusIcon()) + if (auto* status_icon = GetStatusIcon()) { status_icon->SetToolTip(tool_tip); + } } void StatusIconLinuxWrapper::DisplayBalloon( @@ -130,8 +133,9 @@ case kTypeWindowed: status_icon_linux_.reset(); status_icon_type_ = kTypeNone; - if (menu_model_) + if (menu_model_) { menu_model_->RemoveObserver(this); + } menu_model_ = nullptr; return; case kTypeNone: @@ -140,8 +144,9 @@ } void StatusIconLinuxWrapper::OnMenuStateChanged() { - if (auto* status_icon = GetStatusIcon()) + if (auto* status_icon = GetStatusIcon()) { status_icon->RefreshPlatformContextMenu(); + } } std::unique_ptr<StatusIconLinuxWrapper> @@ -160,18 +165,21 @@ void StatusIconLinuxWrapper::UpdatePlatformContextMenu( StatusIconMenuModel* model) { - if (!GetStatusIcon()) + if (!GetStatusIcon()) { return; + } // If a menu already exists, remove ourself from its observer list. - if (menu_model_) + if (menu_model_) { menu_model_->RemoveObserver(this); + } GetStatusIcon()->UpdatePlatformContextMenu(model); menu_model_ = model; - if (model) + if (model) { model->AddObserver(this); + } } ui::StatusIconLinux* StatusIconLinuxWrapper::GetStatusIcon() {
diff --git a/chrome/browser/ui/views/status_icons/status_icon_win.cc b/chrome/browser/ui/views/status_icons/status_icon_win.cc index f100c8e..81e394f 100644 --- a/chrome/browser/ui/views/status_icons/status_icon_win.cc +++ b/chrome/browser/ui/views/status_icons/status_icon_win.cc
@@ -34,8 +34,9 @@ BOOL result = Shell_NotifyIcon(NIM_ADD, &icon_data); // This can happen if the explorer process isn't running when we try to // create the icon for some reason (for example, at startup). - if (!result) + if (!result) { LOG(WARNING) << "Unable to create status tray icon."; + } } StatusIconWin::~StatusIconWin() { @@ -53,13 +54,15 @@ return; } - if (!menu_model_) + if (!menu_model_) { return; + } // Set our window as the foreground window, so the context menu closes when // we click away from it. - if (!SetForegroundWindow(window_)) + if (!SetForegroundWindow(window_)) { return; + } menu_runner_ = std::make_unique<views::MenuRunner>( menu_model_, views::MenuRunner::HAS_MNEMONICS); @@ -69,8 +72,9 @@ } void StatusIconWin::HandleBalloonClickEvent() { - if (HasObservers()) + if (HasObservers()) { DispatchBalloonClickEvent(); + } } void StatusIconWin::ResetIcon() { @@ -84,12 +88,14 @@ icon_data.hIcon = icon_.get(); // If we have an image, then set the NIF_ICON flag, which tells // Shell_NotifyIcon() to set the image for the status icon it creates. - if (icon_data.hIcon) + if (icon_data.hIcon) { icon_data.uFlags |= NIF_ICON; + } // Re-add our icon. BOOL result = Shell_NotifyIcon(NIM_ADD, &icon_data); - if (!result) + if (!result) { LOG(WARNING) << "Unable to re-create status tray icon."; + } } void StatusIconWin::SetImage(const gfx::ImageSkia& image) { @@ -100,8 +106,9 @@ icon_ = IconUtil::CreateHICONFromSkBitmap(*image.bitmap()); icon_data.hIcon = icon_.get(); BOOL result = Shell_NotifyIcon(NIM_MODIFY, &icon_data); - if (!result) + if (!result) { LOG(WARNING) << "Error setting status tray icon image"; + } } void StatusIconWin::SetToolTip(const std::u16string& tool_tip) { @@ -111,8 +118,9 @@ icon_data.uFlags = NIF_TIP; wcscpy_s(icon_data.szTip, base::as_wcstr(tool_tip)); BOOL result = Shell_NotifyIcon(NIM_MODIFY, &icon_data); - if (!result) + if (!result) { LOG(WARNING) << "Unable to set tooltip for status tray icon"; + } } void StatusIconWin::DisplayBalloon( @@ -135,8 +143,9 @@ } BOOL result = Shell_NotifyIcon(NIM_MODIFY, &icon_data); - if (!result) + if (!result) { LOG(WARNING) << "Unable to create status tray balloon."; + } } void StatusIconWin::ForceVisible() {
diff --git a/chrome/browser/ui/views/status_icons/status_tray_linux.cc b/chrome/browser/ui/views/status_icons/status_tray_linux.cc index 7bb0b91..b20b015 100644 --- a/chrome/browser/ui/views/status_icons/status_tray_linux.cc +++ b/chrome/browser/ui/views/status_icons/status_tray_linux.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/ui/views/status_icons/status_tray_linux.h" #include <memory> + #include "chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.h" StatusTrayLinux::StatusTrayLinux() = default;
diff --git a/chrome/browser/ui/views/status_icons/status_tray_state_changer_interactive_uitest_win.cc b/chrome/browser/ui/views/status_icons/status_tray_state_changer_interactive_uitest_win.cc index 3e20079..b2d48c8 100644 --- a/chrome/browser/ui/views/status_icons/status_tray_state_changer_interactive_uitest_win.cc +++ b/chrome/browser/ui/views/status_icons/status_tray_state_changer_interactive_uitest_win.cc
@@ -100,7 +100,6 @@ // Test is disabled due to multiple COM initialization errors. See // https://crbug.com/367199 for details. TEST_F(StatusTrayStateChangerWinTest, DISABLED_ComApiTest) { - // Setup code to read the current preference. std::unique_ptr<NOTIFYITEM> notify_item = SetupAndGetCurrentNotifyItem(); ASSERT_TRUE(notify_item.get() != NULL); @@ -132,14 +131,16 @@ // Used to reset operating system state afterwards. std::unique_ptr<NOTIFYITEM> notify_item = SetupAndGetCurrentNotifyItem(); // We can't actually run this test if we're already showing the icon. - if (notify_item->preference == PREFERENCE_SHOW_ALWAYS) + if (notify_item->preference == PREFERENCE_SHOW_ALWAYS) { return; + } // This test can only run if the tray window structure conforms to what I've // seen in Win7 and Win8. HWND shell_tray_hwnd = ::FindWindow(L"Shell_TrayWnd", NULL); - if (shell_tray_hwnd == NULL) + if (shell_tray_hwnd == NULL) { return; + } HWND tray_notify_hwnd = ::FindWindowEx(shell_tray_hwnd, NULL, L"TrayNotifyWnd", NULL);
diff --git a/chrome/browser/ui/views/status_icons/status_tray_state_changer_win.cc b/chrome/browser/ui/views/status_icons/status_tray_state_changer_win.cc index c57d808..0bbce84 100644 --- a/chrome/browser/ui/views/status_icons/status_tray_state_changer_win.cc +++ b/chrome/browser/ui/views/status_icons/status_tray_state_changer_win.cc
@@ -27,9 +27,9 @@ : public IUnknown { public: virtual HRESULT STDMETHODCALLTYPE - RegisterCallback(INotificationCB* callback) = 0; + RegisterCallback(INotificationCB* callback) = 0; virtual HRESULT STDMETHODCALLTYPE - SetPreference(const NOTIFYITEM* notify_item) = 0; + SetPreference(const NOTIFYITEM* notify_item) = 0; virtual HRESULT STDMETHODCALLTYPE EnableAutoTray(BOOL enabled) = 0; }; @@ -38,8 +38,8 @@ class __declspec(uuid("D133CE13-3537-48BA-93A7-AFCD5D2053B4")) ITrayNotifyWin8 : public IUnknown { public: - virtual HRESULT STDMETHODCALLTYPE - RegisterCallback(INotificationCB* callback, unsigned long*) = 0; + virtual HRESULT STDMETHODCALLTYPE RegisterCallback(INotificationCB* callback, + unsigned long*) = 0; virtual HRESULT STDMETHODCALLTYPE UnregisterCallback(unsigned long*) = 0; virtual HRESULT STDMETHODCALLTYPE SetPreference(NOTIFYITEM const*) = 0; virtual HRESULT STDMETHODCALLTYPE EnableAutoTray(BOOL) = 0; @@ -76,12 +76,14 @@ // If the user has already hidden us explicitly, try to honor their choice by // not changing anything. - if (notify_item->preference == PREFERENCE_SHOW_NEVER) + if (notify_item->preference == PREFERENCE_SHOW_NEVER) { return; + } // If we are already on the taskbar, return since nothing needs to be done. - if (notify_item->preference == PREFERENCE_SHOW_ALWAYS) + if (notify_item->preference == PREFERENCE_SHOW_ALWAYS) { return; + } notify_item->preference = PREFERENCE_SHOW_ALWAYS; @@ -112,8 +114,9 @@ HRESULT hr = ::CoCreateInstance(CLSID_TrayNotify, nullptr, CLSCTX_ALL, IID_PPV_ARGS(&tray_notify_)); - if (FAILED(hr)) + if (FAILED(hr)) { return false; + } Microsoft::WRL::ComPtr<ITrayNotifyWin8> tray_notify_win8; hr = tray_notify_.As(&tray_notify_win8); @@ -142,12 +145,14 @@ // has a tendency to fail on particular versions of Windows. switch (interface_version_) { case INTERFACE_VERSION_WIN8: - if (!RegisterCallbackWin8()) + if (!RegisterCallbackWin8()) { VLOG(1) << "Unable to successfully run RegisterCallbackWin8."; + } break; case INTERFACE_VERSION_LEGACY: - if (!RegisterCallbackLegacy()) + if (!RegisterCallbackLegacy()) { VLOG(1) << "Unable to successfully run RegisterCallbackLegacy."; + } break; default: NOTREACHED(); @@ -159,8 +164,9 @@ bool StatusTrayStateChangerWin::RegisterCallbackWin8() { Microsoft::WRL::ComPtr<ITrayNotifyWin8> tray_notify_win8; HRESULT hr = tray_notify_.As(&tray_notify_win8); - if (FAILED(hr)) + if (FAILED(hr)) { return false; + } // The following two lines cause Windows Explorer to call us back with all the // existing tray icons and their preference. It would also presumably notify @@ -206,12 +212,14 @@ if (interface_version_ == INTERFACE_VERSION_LEGACY) { Microsoft::WRL::ComPtr<ITrayNotify> tray_notify; HRESULT hr = tray_notify_.As(&tray_notify); - if (SUCCEEDED(hr)) + if (SUCCEEDED(hr)) { tray_notify->SetPreference(notify_item.get()); + } } else if (interface_version_ == INTERFACE_VERSION_WIN8) { Microsoft::WRL::ComPtr<ITrayNotifyWin8> tray_notify; HRESULT hr = tray_notify_.As(&tray_notify); - if (SUCCEEDED(hr)) + if (SUCCEEDED(hr)) { tray_notify->SetPreference(notify_item.get()); + } } }
diff --git a/chrome/browser/ui/views/status_icons/status_tray_state_changer_win.h b/chrome/browser/ui/views/status_icons/status_tray_state_changer_win.h index 5f61b41..f927bcc1 100644 --- a/chrome/browser/ui/views/status_icons/status_tray_state_changer_win.h +++ b/chrome/browser/ui/views/status_icons/status_tray_state_changer_win.h
@@ -44,8 +44,8 @@ class __declspec(uuid("D782CCBA-AFB0-43F1-94DB-FDA3779EACCB")) INotificationCB : public IUnknown { public: - virtual HRESULT STDMETHODCALLTYPE - Notify(ULONG event, NOTIFYITEM* notify_item) = 0; + virtual HRESULT STDMETHODCALLTYPE Notify(ULONG event, + NOTIFYITEM* notify_item) = 0; }; // A class that is capable of reading and writing the state of the notification
diff --git a/chrome/browser/ui/views/status_icons/status_tray_win.cc b/chrome/browser/ui/views/status_icons/status_tray_win.cc index a7f0e7f..f6f0bf08 100644 --- a/chrome/browser/ui/views/status_icons/status_tray_win.cc +++ b/chrome/browser/ui/views/status_icons/status_tray_win.cc
@@ -58,8 +58,9 @@ void EnqueueChange(UINT icon_id, HWND window) override { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - if (pending_requests_ == 0) + if (pending_requests_ == 0) { worker_thread_.Start(); + } ++pending_requests_; worker_thread_.task_runner()->PostTaskAndReply( @@ -86,8 +87,9 @@ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK_GT(pending_requests_, 0); - if (--pending_requests_ == 0) + if (--pending_requests_ == 0) { worker_thread_.Stop(); + } } private: @@ -100,17 +102,13 @@ }; StatusTrayWin::StatusTrayWin() - : next_icon_id_(1), - atom_(0), - instance_(NULL), - window_(NULL) { + : next_icon_id_(1), atom_(0), instance_(NULL), window_(NULL) { // Register our window class WNDCLASSEX window_class; base::win::InitializeWindowClass( chrome::kStatusTrayWindowClass, - &base::win::WrappedWindowProc<StatusTrayWin::WndProcStatic>, - 0, 0, 0, NULL, NULL, NULL, NULL, NULL, - &window_class); + &base::win::WrappedWindowProc<StatusTrayWin::WndProcStatic>, 0, 0, 0, + NULL, NULL, NULL, NULL, NULL, &window_class); instance_ = window_class.hInstance; atom_ = RegisterClassEx(&window_class); CHECK(atom_); @@ -123,24 +121,27 @@ // create a hidden WS_POPUP window instead of an HWND_MESSAGE window, because // only top-level windows such as popups can receive broadcast messages like // "TaskbarCreated". - window_ = CreateWindow(MAKEINTATOM(atom_), - 0, WS_POPUP, 0, 0, 0, 0, 0, 0, instance_, 0); + window_ = CreateWindow(MAKEINTATOM(atom_), 0, WS_POPUP, 0, 0, 0, 0, 0, 0, + instance_, 0); gfx::CheckWindowCreated(window_, ::GetLastError()); gfx::SetWindowUserData(window_, this); } StatusTrayWin::~StatusTrayWin() { - if (window_) + if (window_) { DestroyWindow(window_); + } - if (atom_) + if (atom_) { UnregisterClass(MAKEINTATOM(atom_), instance_); + } } void StatusTrayWin::UpdateIconVisibilityInBackground( StatusIconWin* status_icon) { - if (!state_changer_proxy_.get()) + if (!state_changer_proxy_.get()) { state_changer_proxy_ = std::make_unique<StatusTrayStateChangerProxyImpl>(); + } state_changer_proxy_->EnqueueChange(status_icon->icon_id(), status_icon->window()); @@ -150,12 +151,13 @@ UINT message, WPARAM wparam, LPARAM lparam) { - StatusTrayWin* msg_wnd = reinterpret_cast<StatusTrayWin*>( - GetWindowLongPtr(hwnd, GWLP_USERDATA)); - if (msg_wnd) + StatusTrayWin* msg_wnd = + reinterpret_cast<StatusTrayWin*>(GetWindowLongPtr(hwnd, GWLP_USERDATA)); + if (msg_wnd) { return msg_wnd->WndProc(hwnd, message, wparam, lparam); - else + } else { return ::DefWindowProc(hwnd, message, wparam, lparam); + } } LRESULT CALLBACK StatusTrayWin::WndProc(HWND hwnd, @@ -184,8 +186,9 @@ // It is possible for this procedure to be called with an obsolete icon // id. In that case we should just return early before handling any // actions. - if (!win_icon) + if (!win_icon) { return TRUE; + } switch (lparam) { case TB_INDETERMINATE: @@ -216,10 +219,11 @@ const gfx::ImageSkia& image, const std::u16string& tool_tip) { UINT next_icon_id; - if (type == StatusTray::OTHER_ICON) + if (type == StatusTray::OTHER_ICON) { next_icon_id = NextIconId(); - else + } else { next_icon_id = ReservedIconId(type); + } auto icon = std::make_unique<StatusIconWin>(this, next_icon_id, window_, kStatusIconMessage);
diff --git a/chrome/browser/ui/views/status_icons/status_tray_win.h b/chrome/browser/ui/views/status_icons/status_tray_win.h index a3e9605..79fcae3 100644 --- a/chrome/browser/ui/views/status_icons/status_tray_win.h +++ b/chrome/browser/ui/views/status_icons/status_tray_win.h
@@ -38,8 +38,10 @@ void UpdateIconVisibilityInBackground(StatusIconWin* status_icon); // Exposed for testing. - LRESULT CALLBACK - WndProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam); + LRESULT CALLBACK WndProc(HWND hwnd, + UINT message, + WPARAM wparam, + LPARAM lparam); protected: // Overriden from StatusTray: @@ -52,8 +54,10 @@ FRIEND_TEST_ALL_PREFIXES(StatusTrayWinTest, EnsureVisibleTest); // Static callback invoked when a message comes in to our messaging window. - static LRESULT CALLBACK - WndProcStatic(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam); + static LRESULT CALLBACK WndProcStatic(HWND hwnd, + UINT message, + WPARAM wparam, + LPARAM lparam); UINT NextIconId();
diff --git a/chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc b/chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc index 10c487a0..93b65ddd 100644 --- a/chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc +++ b/chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc
@@ -54,9 +54,7 @@ void OnStatusIconClicked() override { ++status_icon_click_count_; } void OnBalloonClicked() override { balloon_clicked_ = true; } bool balloon_clicked() const { return balloon_clicked_; } - size_t status_icon_click_count() const { - return status_icon_click_count_; - } + size_t status_icon_click_count() const { return status_icon_click_count_; } private: size_t status_icon_click_count_;
diff --git a/chrome/browser/ui/views/storage/storage_pressure_bubble_view.cc b/chrome/browser/ui/views/storage/storage_pressure_bubble_view.cc index 5e63693..d5962e0 100644 --- a/chrome/browser/ui/views/storage/storage_pressure_bubble_view.cc +++ b/chrome/browser/ui/views/storage/storage_pressure_bubble_view.cc
@@ -52,8 +52,9 @@ void StoragePressureBubbleView::ShowBubble(const url::Origin& origin) { Browser* browser = BrowserList::GetInstance()->GetLastActive(); - if (!browser) + if (!browser) { return; + } StoragePressureBubbleView* bubble = new StoragePressureBubbleView( BrowserView::GetBrowserViewForBrowser(browser)
diff --git a/chrome/browser/ui/views/supervised_user/parent_permission_dialog_view.cc b/chrome/browser/ui/views/supervised_user/parent_permission_dialog_view.cc index c6511d1c..91e00b4 100644 --- a/chrome/browser/ui/views/supervised_user/parent_permission_dialog_view.cc +++ b/chrome/browser/ui/views/supervised_user/parent_permission_dialog_view.cc
@@ -401,8 +401,9 @@ ParentPermissionDialogView::~ParentPermissionDialogView() { // Let the observer know that this object is being destroyed. - if (observer_) + if (observer_) { observer_->OnParentPermissionDialogViewDestroyed(); + } // If the object is being destroyed but the callback hasn't been run, then // this is a failure case. @@ -419,8 +420,9 @@ void ParentPermissionDialogView::SetRepromptAfterIncorrectCredential( bool reprompt) { - if (reprompt_after_incorrect_credential_ == reprompt) + if (reprompt_after_incorrect_credential_ == reprompt) { return; + } reprompt_after_incorrect_credential_ = reprompt; OnPropertyChanged(&reprompt_after_incorrect_credential_, views::kPropertyEffectsNone); @@ -645,8 +647,9 @@ void ParentPermissionDialogView::SetSelectedParentPermissionEmail( const std::u16string& email_address) { - if (selected_parent_permission_email_ == email_address) + if (selected_parent_permission_email_ == email_address) { return; + } selected_parent_permission_email_ = email_address; OnPropertyChanged(&selected_parent_permission_email_, views::kPropertyEffectsNone); @@ -659,8 +662,9 @@ void ParentPermissionDialogView::SetParentPermissionCredential( const std::u16string& credential) { - if (parent_permission_credential_ == credential) + if (parent_permission_credential_ == credential) { return; + } parent_permission_credential_ = credential; OnPropertyChanged(&parent_permission_credential_, views::kPropertyEffectsNone); @@ -687,8 +691,9 @@ : views::DialogDelegate::CreateDialogWidget(this, nullptr, nullptr); widget->Show(); - if (test_view_observer) + if (test_view_observer) { test_view_observer->OnTestParentPermissionDialogViewCreated(this); + } } void ParentPermissionDialogView::LoadParentEmailAddresses() { @@ -697,13 +702,15 @@ std::u16string primary_parent_email = base::UTF8ToUTF16(service->GetCustodianEmailAddress()); - if (!primary_parent_email.empty()) + if (!primary_parent_email.empty()) { parent_permission_email_addresses_.push_back(primary_parent_email); + } std::u16string secondary_parent_email = base::UTF8ToUTF16(service->GetSecondCustodianEmailAddress()); - if (!secondary_parent_email.empty()) + if (!secondary_parent_email.empty()) { parent_permission_email_addresses_.push_back(secondary_parent_email); + } } void ParentPermissionDialogView::CloseWithReason( @@ -722,8 +729,9 @@ supervised_user::SupervisedUserService* service = SupervisedUserServiceFactory::GetForProfile(params_->profile); - if (service->GetCustodianEmailAddress() == base::UTF16ToUTF8(parent_email)) + if (service->GetCustodianEmailAddress() == base::UTF16ToUTF8(parent_email)) { return service->GetCustodianObfuscatedGaiaId(); + } CHECK_EQ(service->GetSecondCustodianEmailAddress(), base::UTF16ToUTF8(parent_email)) @@ -780,8 +788,9 @@ void ParentPermissionDialogView::SendResultOnce( ParentPermissionDialog::Result result) { - if (!params_->done_callback) + if (!params_->done_callback) { return; + } // Record UMA metrics. switch (result) { case ParentPermissionDialog::Result::kParentPermissionReceived: @@ -891,8 +900,9 @@ // Ownership of dialog_view is passed to the views system when the dialog is // shown here. We check for the validity of view_ because in theory it could // disappear from beneath this object before ShowDialog() is called. - if (view_) + if (view_) { view_->ShowDialog(); + } } ParentPermissionDialogImpl::~ParentPermissionDialogImpl() {
diff --git a/chrome/browser/ui/views/supervised_user/parent_permission_extension_flow_view_browsertest.cc b/chrome/browser/ui/views/supervised_user/parent_permission_extension_flow_view_browsertest.cc index 1f67b65..952860b 100644 --- a/chrome/browser/ui/views/supervised_user/parent_permission_extension_flow_view_browsertest.cc +++ b/chrome/browser/ui/views/supervised_user/parent_permission_extension_flow_view_browsertest.cc
@@ -283,7 +283,6 @@ 2); } - class ExtensionManagementApiTestSupervised : public ExtensionEnableFlowTestSupervised { public:
diff --git a/chrome/browser/ui/views/sync/inline_login_ui_browsertest.cc b/chrome/browser/ui/views/sync/inline_login_ui_browsertest.cc index 7f302e22..d2a4b0f3 100644 --- a/chrome/browser/ui/views/sync/inline_login_ui_browsertest.cc +++ b/chrome/browser/ui/views/sync/inline_login_ui_browsertest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/webui/signin/inline_login_ui.h" + #include "base/command_line.h" #include "base/containers/contains.h" #include "base/functional/bind.h" @@ -26,7 +28,6 @@ #include "chrome/browser/ui/test/test_browser_dialog.h" #include "chrome/browser/ui/views/sync/one_click_signin_dialog_view.h" #include "chrome/browser/ui/webui/signin/inline_login_handler_impl.h" -#include "chrome/browser/ui/webui/signin/inline_login_ui.h" #include "chrome/browser/ui/webui/signin/login_ui_service.h" #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" #include "chrome/browser/ui/webui/signin/login_ui_test_utils.h"
diff --git a/chrome/browser/ui/views/sync/one_click_signin_dialog_view.cc b/chrome/browser/ui/views/sync/one_click_signin_dialog_view.cc index 6a7d1586..db89adb 100644 --- a/chrome/browser/ui/views/sync/one_click_signin_dialog_view.cc +++ b/chrome/browser/ui/views/sync/one_click_signin_dialog_view.cc
@@ -39,8 +39,9 @@ std::unique_ptr<OneClickSigninLinksDelegate> delegate, gfx::NativeWindow window, base::OnceCallback<void(bool)> confirmed_callback) { - if (IsShowing()) + if (IsShowing()) { return; + } dialog_view_ = new OneClickSigninDialogView(email, std::move(delegate), std::move(confirmed_callback)); @@ -55,8 +56,9 @@ // static void OneClickSigninDialogView::Hide() { - if (IsShowing()) + if (IsShowing()) { dialog_view_->GetWidget()->Close(); + } } void OneClickSigninDialogView::WindowClosing() { @@ -113,8 +115,9 @@ IDS_ONE_CLICK_SIGNIN_DIALOG_ADVANCED)) .SetCallback(base::BindRepeating( [](OneClickSigninDialogView* view) { - if (view->Accept()) + if (view->Accept()) { Hide(); + } }, base::Unretained(this))) .SetHorizontalAlignment(gfx::ALIGN_LEFT)) @@ -122,8 +125,9 @@ } OneClickSigninDialogView::~OneClickSigninDialogView() { - if (!confirmed_callback_.is_null()) + if (!confirmed_callback_.is_null()) { std::move(confirmed_callback_).Run(false); + } } BEGIN_METADATA(OneClickSigninDialogView)
diff --git a/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc b/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc index eb855de..d46f3ec0 100644 --- a/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc +++ b/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc
@@ -37,7 +37,7 @@ } content::WebDragDestDelegate* - ChromeWebContentsViewDelegateViews::GetDragDestDelegate() { +ChromeWebContentsViewDelegateViews::GetDragDestDelegate() { // We install a chrome specific handler to intercept bookmark drags for the // bookmark manager/extension API. bookmark_handler_ = std::make_unique<WebDragBookmarkHandlerAura>(); @@ -85,8 +85,9 @@ void ChromeWebContentsViewDelegateViews::ShowMenu( std::unique_ptr<RenderViewContextMenuBase> menu) { context_menu_ = std::move(menu); - if (!context_menu_) + if (!context_menu_) { return; + } context_menu_->Show(); }
diff --git a/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h b/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h index 97c98c87..427c68bd 100644 --- a/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h +++ b/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h
@@ -18,7 +18,7 @@ class WebContents; class WebDragDestDelegate; class RenderFrameHost; -} +} // namespace content // A chrome specific class that extends WebContentsViewWin with features like // focus management, which live in chrome.
diff --git a/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views_mac.mm b/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views_mac.mm index 0e2cf719..065e21f 100644 --- a/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views_mac.mm +++ b/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views_mac.mm
@@ -115,8 +115,9 @@ void ChromeWebContentsViewDelegateViewsMac::ShowMenu( std::unique_ptr<RenderViewContextMenuBase> menu) { context_menu_ = std::move(menu); - if (!context_menu_.get()) + if (!context_menu_.get()) { return; + } // The renderer may send the "show context menu" message multiple times, one // for each right click mouse event it receives. Normally, this doesn't happen @@ -125,8 +126,9 @@ // the second mouse event arrives. In this case, |ShowContextMenu()| will // get called multiple times - if so, don't create another context menu. // TODO(asvitkine): Fix the renderer so that it doesn't do this. - if (web_contents_->IsShowingContextMenu()) + if (web_contents_->IsShowingContextMenu()) { return; + } context_menu_->Show(); }
diff --git a/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_focus_helper.cc b/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_focus_helper.cc index 4940362..f075b14 100644 --- a/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_focus_helper.cc +++ b/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_focus_helper.cc
@@ -51,8 +51,9 @@ void ChromeWebContentsViewFocusHelper::StoreFocus() { last_focused_view_tracker_.SetView(nullptr); - if (GetFocusManager()) + if (GetFocusManager()) { last_focused_view_tracker_.SetView(GetFocusManager()->GetFocusedView()); + } } bool ChromeWebContentsViewFocusHelper::RestoreFocus() {
diff --git a/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_focus_helper.h b/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_focus_helper.h index 3ea7f98..30853310 100644 --- a/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_focus_helper.h +++ b/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_focus_helper.h
@@ -17,7 +17,7 @@ class FocusManager; class Widget; class View; -} +} // namespace views // A chrome specific helper class that handles focus management. class ChromeWebContentsViewFocusHelper
diff --git a/chrome/browser/ui/views/tab_dialogs_views.cc b/chrome/browser/ui/views/tab_dialogs_views.cc index 8b69835..e42764a 100644 --- a/chrome/browser/ui/views/tab_dialogs_views.cc +++ b/chrome/browser/ui/views/tab_dialogs_views.cc
@@ -75,10 +75,12 @@ void TabDialogsViews::HideManagePasswordsBubble() { PasswordBubbleViewBase* bubble = PasswordBubbleViewBase::manage_password_bubble(); - if (!bubble) + if (!bubble) { return; - if (bubble->GetWebContents() == web_contents_) + } + if (bubble->GetWebContents() == web_contents_) { PasswordBubbleViewBase::CloseCurrentBubble(); + } } void TabDialogsViews::ShowDeprecatedAppsDialog(
diff --git a/chrome/browser/ui/views/tab_icon_view.cc b/chrome/browser/ui/views/tab_icon_view.cc index 62cf1af..5dd0085 100644 --- a/chrome/browser/ui/views/tab_icon_view.cc +++ b/chrome/browser/ui/views/tab_icon_view.cc
@@ -84,15 +84,17 @@ } void TabIconView::Update() { - if (!model_ || !model_->ShouldTabIconViewAnimate()) + if (!model_ || !model_->ShouldTabIconViewAnimate()) { throbber_start_time_ = base::TimeTicks(); + } SchedulePaint(); } void TabIconView::PaintThrobber(gfx::Canvas* canvas) { - if (throbber_start_time_ == base::TimeTicks()) + if (throbber_start_time_ == base::TimeTicks()) { throbber_start_time_ = base::TimeTicks::Now(); + } gfx::PaintThrobberSpinning(canvas, GetLocalBounds(), GetColorProvider()->GetColor(ui::kColorThrobber),
diff --git a/chrome/browser/ui/views/tab_modal_confirm_dialog_views.cc b/chrome/browser/ui/views/tab_modal_confirm_dialog_views.cc index f5df32a..972b746 100644 --- a/chrome/browser/ui/views/tab_modal_confirm_dialog_views.cc +++ b/chrome/browser/ui/views/tab_modal_confirm_dialog_views.cc
@@ -50,8 +50,9 @@ SetOwnedByWidget(true); std::optional<int> default_button = delegate_->GetDefaultDialogButton(); - if (bool(default_button)) + if (bool(default_button)) { SetDefaultButton(*default_button); + } message_box_view_ = new views::MessageBoxView(delegate_->GetDialogMessage()); message_box_view_->SetInterRowVerticalSpacing(
diff --git a/chrome/browser/ui/views/tab_modal_confirm_dialog_views.h b/chrome/browser/ui/views/tab_modal_confirm_dialog_views.h index fe61f81..8cbe4e9 100644 --- a/chrome/browser/ui/views/tab_modal_confirm_dialog_views.h +++ b/chrome/browser/ui/views/tab_modal_confirm_dialog_views.h
@@ -19,7 +19,7 @@ namespace views { class MessageBoxView; class Widget; -} +} // namespace views // Displays a tab-modal dialog, i.e. a dialog that will block the current page // but still allow the user to switch to a different page.
diff --git a/chrome/browser/ui/views/tab_search_bubble_host.cc b/chrome/browser/ui/views/tab_search_bubble_host.cc index abe41b2a5..ec3e3fb5 100644 --- a/chrome/browser/ui/views/tab_search_bubble_host.cc +++ b/chrome/browser/ui/views/tab_search_bubble_host.cc
@@ -262,8 +262,9 @@ auto* tracker = feature_engagement::TrackerFactory::GetForBrowserContext(profile_); - if (tracker) + if (tracker) { tracker->NotifyEvent(feature_engagement::events::kTabSearchOpened); + } if (triggered_by_keyboard_shortcut) { base::UmaHistogramEnumeration("Tabs.TabSearch.OpenAction",
diff --git a/chrome/browser/ui/views/tab_sharing/tab_sharing_infobar.cc b/chrome/browser/ui/views/tab_sharing/tab_sharing_infobar.cc index 01e25f1d..c2c5cc4c 100644 --- a/chrome/browser/ui/views/tab_sharing/tab_sharing_infobar.cc +++ b/chrome/browser/ui/views/tab_sharing/tab_sharing_infobar.cc
@@ -113,33 +113,32 @@ label_->SetElideBehavior(gfx::ELIDE_TAIL); const int buttons = delegate_ptr->GetButtons(); - const auto create_button = [&](TabSharingInfoBarDelegate:: - TabSharingInfoBarButton type, - void (TabSharingInfoBar::*click_function)(), - int button_context = - views::style::CONTEXT_BUTTON_MD) { - const bool use_text_color_for_icon = - type != TabSharingInfoBarDelegate::kCapturedSurfaceControlIndicator; - auto* button = AddChildView(std::make_unique<views::MdTextButton>( - base::BindRepeating(click_function, base::Unretained(this)), - delegate_ptr->GetButtonLabel(type), button_context, - use_text_color_for_icon)); - button->SetProperty( - views::kMarginsKey, - gfx::Insets::VH(ChromeLayoutProvider::Get()->GetDistanceMetric( - DISTANCE_TOAST_CONTROL_VERTICAL), - 0)); + const auto create_button = + [&](TabSharingInfoBarDelegate::TabSharingInfoBarButton type, + void (TabSharingInfoBar::*click_function)(), + int button_context = views::style::CONTEXT_BUTTON_MD) { + const bool use_text_color_for_icon = + type != TabSharingInfoBarDelegate::kCapturedSurfaceControlIndicator; + auto* button = AddChildView(std::make_unique<views::MdTextButton>( + base::BindRepeating(click_function, base::Unretained(this)), + delegate_ptr->GetButtonLabel(type), button_context, + use_text_color_for_icon)); + button->SetProperty( + views::kMarginsKey, + gfx::Insets::VH(ChromeLayoutProvider::Get()->GetDistanceMetric( + DISTANCE_TOAST_CONTROL_VERTICAL), + 0)); - const bool is_default_button = - type == buttons || type == TabSharingInfoBarDelegate::kStop; - button->SetStyle(is_default_button ? ui::ButtonStyle::kProminent - : ui::ButtonStyle::kTonal); - button->SetImageModel(views::Button::STATE_NORMAL, - delegate_ptr->GetButtonImage(type)); - button->SetEnabled(delegate_ptr->IsButtonEnabled(type)); - button->SetTooltipText(delegate_ptr->GetButtonTooltip(type)); - return button; - }; + const bool is_default_button = + type == buttons || type == TabSharingInfoBarDelegate::kStop; + button->SetStyle(is_default_button ? ui::ButtonStyle::kProminent + : ui::ButtonStyle::kTonal); + button->SetImageModel(views::Button::STATE_NORMAL, + delegate_ptr->GetButtonImage(type)); + button->SetEnabled(delegate_ptr->IsButtonEnabled(type)); + button->SetTooltipText(delegate_ptr->GetButtonTooltip(type)); + return button; + }; if (buttons & TabSharingInfoBarDelegate::kStop) { stop_button_ = create_button(TabSharingInfoBarDelegate::kStop,
diff --git a/chrome/browser/ui/views/tab_sharing/tab_sharing_ui_views.cc b/chrome/browser/ui/views/tab_sharing/tab_sharing_ui_views.cc index 6445551f..ce500c7c 100644 --- a/chrome/browser/ui/views/tab_sharing/tab_sharing_ui_views.cc +++ b/chrome/browser/ui/views/tab_sharing/tab_sharing_ui_views.cc
@@ -126,16 +126,18 @@ url::Origin GetOriginFromId(GlobalRenderFrameHostId rfh_id) { auto* rfh = content::RenderFrameHost::FromID(rfh_id); - if (!rfh) + if (!rfh) { return {}; + } return rfh->GetLastCommittedOrigin(); } bool CapturerRestrictedToSameOrigin(GlobalRenderFrameHostId capturer_id) { WebContents* capturer = WebContentsFromId(capturer_id); - if (!capturer) + if (!capturer) { return false; + } return capture_policy::GetAllowedCaptureLevel( GetOriginFromId(capturer_id).GetURL(), capturer) == AllowedScreenCaptureLevel::kSameOrigin; @@ -264,8 +266,9 @@ void TabSharingUIViews::StartSharing(infobars::InfoBar* infobar) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); - if (source_callback_.is_null()) + if (source_callback_.is_null()) { return; + } WebContents* shared_tab = infobars::ContentInfoBarManager::WebContentsFromInfoBar(infobar); @@ -285,8 +288,9 @@ void TabSharingUIViews::StopSharing() { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); - if (!stop_callback_.is_null()) + if (!stop_callback_.is_null()) { std::move(stop_callback_).Run(); + } #if BUILDFLAG(IS_CHROMEOS) policy::DlpContentManager::Get()->RemoveObserver( this, policy::DlpContentRestriction::kScreenShare); @@ -309,8 +313,9 @@ void TabSharingUIViews::OnBrowserRemoved(Browser* browser) { BrowserList* browser_list = BrowserList::GetInstance(); - if (browser_list->empty()) + if (browser_list->empty()) { browser_list->RemoveObserver(this); + } browser->tab_strip_model()->RemoveObserver(this); } @@ -320,8 +325,9 @@ const TabStripSelectionChange& selection) { if (change.type() == TabStripModelChange::kInserted) { for (const auto& contents : change.GetInsert()->contents) { - if (infobars_.find(contents.contents) == infobars_.end()) + if (infobars_.find(contents.contents) == infobars_.end()) { CreateInfobarForWebContents(contents.contents); + } } } @@ -344,8 +350,9 @@ TabChangeType change_type) { // Sad tab cannot be shared so don't create an infobar for it. auto* sad_tab_helper = SadTabHelper::FromWebContents(contents); - if (sad_tab_helper && sad_tab_helper->sad_tab()) + if (sad_tab_helper && sad_tab_helper->sad_tab()) { return; + } if (infobars_.find(contents) == infobars_.end()) { CreateInfobarForWebContents(contents); @@ -356,24 +363,28 @@ bool animate) { auto infobars_entry = base::ranges::find(infobars_, infobar, &InfoBars::value_type::second); - if (infobars_entry == infobars_.end()) + if (infobars_entry == infobars_.end()) { return; + } infobar->owner()->RemoveObserver(this); infobars_.erase(infobars_entry); if (infobars::ContentInfoBarManager::WebContentsFromInfoBar(infobar) == - shared_tab_) + shared_tab_) { StopSharing(); + } } void TabSharingUIViews::PrimaryPageChanged(content::Page& page) { - if (!shared_tab_) + if (!shared_tab_) { return; + } shared_tab_name_ = GetTabName(shared_tab_); for (const auto& infobars_entry : infobars_) { // Recreate infobars to reflect the new shared tab's hostname. - if (infobars_entry.first != shared_tab_) + if (infobars_entry.first != shared_tab_) { CreateInfobarForWebContents(infobars_entry.first); + } } } @@ -515,9 +526,9 @@ TabSharingInfoBarDelegate::ButtonState share_this_tab_instead_button_state = !is_share_instead_button_possible ? TabSharingInfoBarDelegate::ButtonState::NOT_SHOWN - : is_sharing_allowed_by_policy - ? TabSharingInfoBarDelegate::ButtonState::ENABLED - : TabSharingInfoBarDelegate::ButtonState::DISABLED; + : is_sharing_allowed_by_policy + ? TabSharingInfoBarDelegate::ButtonState::ENABLED + : TabSharingInfoBarDelegate::ButtonState::DISABLED; infobars_[contents] = TabSharingInfoBarDelegate::Create( infobar_manager, old_infobar, shared_tab_name_, capturer_name_, contents, @@ -544,8 +555,9 @@ const blink::MediaStreamDevice device( blink::mojom::MediaStreamType::GUM_TAB_VIDEO_CAPTURE, shared_tab_media_id_.ToString(), std::string()); - if (!shared_tab_) + if (!shared_tab_) { return; + } blink::mojom::StreamDevices devices; devices.video_device = device;
diff --git a/chrome/browser/ui/views/tab_sharing/tab_sharing_ui_views_browsertest.cc b/chrome/browser/ui/views/tab_sharing/tab_sharing_ui_views_browsertest.cc index 1fc68fd..a1a8a75 100644 --- a/chrome/browser/ui/views/tab_sharing/tab_sharing_ui_views_browsertest.cc +++ b/chrome/browser/ui/views/tab_sharing/tab_sharing_ui_views_browsertest.cc
@@ -897,8 +897,9 @@ } void AddTabs(Browser* browser, int tab_count) { - for (int i = 0; i < tab_count; ++i) + for (int i = 0; i < tab_count; ++i) { AddBlankTabAndShow(browser); + } } private: @@ -918,14 +919,16 @@ // Check that all tabs have 3 infobars corresponding to the 3 sharing // sessions. int tab_count = browser()->tab_strip_model()->count(); - for (int i = 0; i < tab_count; ++i) + for (int i = 0; i < tab_count; ++i) { EXPECT_EQ(3u, GetInfoBarManager(browser(), i)->infobars().size()); + } // Check that all shared tabs display a tab capture indicator. auto capture_indicator = GetCaptureIndicator(); - for (int i = 1; i < tab_count; ++i) + for (int i = 1; i < tab_count; ++i) { ASSERT_TRUE( capture_indicator->IsBeingMirrored(GetWebContents(browser(), i))); + } views::Widget* contents_border = GetContentsBorder(browser()); // The capturing tab, which is not itself being captured, does not have @@ -950,9 +953,10 @@ size_t shared_tab_count = 3; while (shared_tab_count) { tab_sharing_ui_views(--shared_tab_count)->StopSharing(); - for (int j = 0; j < browser()->tab_strip_model()->count(); ++j) + for (int j = 0; j < browser()->tab_strip_model()->count(); ++j) { ASSERT_EQ(shared_tab_count, GetInfoBarManager(browser(), j)->infobars().size()); + } } } @@ -966,9 +970,10 @@ TabStripModel* tab_strip_model = browser()->tab_strip_model(); while (tab_strip_model->count() > 1) { tab_strip_model->CloseWebContentsAt(1, TabCloseTypes::CLOSE_NONE); - for (int i = 0; i < tab_strip_model->count(); ++i) + for (int i = 0; i < tab_strip_model->count(); ++i) { ASSERT_EQ(tab_strip_model->count() - 1u, GetInfoBarManager(browser(), i)->infobars().size()); + } } } @@ -1139,8 +1144,9 @@ } void AddTabs(Browser* browser, int tab_count) { - for (int i = 0; i < tab_count; ++i) + for (int i = 0; i < tab_count; ++i) { AddBlankTabAndShow(browser); + } } void SourceChange(const content::DesktopMediaID& media_id,
diff --git a/chrome/browser/ui/views/tabs/alert_indicator_button.cc b/chrome/browser/ui/views/tabs/alert_indicator_button.cc index 84d8f16d..206a34d 100644 --- a/chrome/browser/ui/views/tabs/alert_indicator_button.cc +++ b/chrome/browser/ui/views/tabs/alert_indicator_button.cc
@@ -387,45 +387,45 @@ int image_width = GetLayoutConstant(TAB_ALERT_INDICATOR_ICON_WIDTH); switch (alert_state) { case TabAlertState::AUDIO_PLAYING: - icon = &vector_icons::kVolumeUpChromeRefreshIcon; + icon = &vector_icons::kVolumeUpChromeRefreshIcon; break; case TabAlertState::AUDIO_MUTING: - icon = &vector_icons::kVolumeOffChromeRefreshIcon; + icon = &vector_icons::kVolumeOffChromeRefreshIcon; break; case TabAlertState::MEDIA_RECORDING: case TabAlertState::AUDIO_RECORDING: case TabAlertState::VIDEO_RECORDING: case TabAlertState::DESKTOP_CAPTURING: - icon = &vector_icons::kRadioButtonCheckedIcon; + icon = &vector_icons::kRadioButtonCheckedIcon; break; case TabAlertState::TAB_CAPTURING: - icon = &vector_icons::kCaptureIcon; + icon = &vector_icons::kCaptureIcon; // Tab capturing and presenting icon uses a different width compared to // the other tab alert indicator icons. image_width = GetLayoutConstant(TAB_ALERT_INDICATOR_CAPTURE_ICON_WIDTH); break; case TabAlertState::BLUETOOTH_CONNECTED: - icon = &vector_icons::kBluetoothConnectedIcon; + icon = &vector_icons::kBluetoothConnectedIcon; break; case TabAlertState::BLUETOOTH_SCAN_ACTIVE: - icon = &vector_icons::kBluetoothScanningChromeRefreshIcon; + icon = &vector_icons::kBluetoothScanningChromeRefreshIcon; break; case TabAlertState::USB_CONNECTED: - icon = &vector_icons::kUsbChromeRefreshIcon; + icon = &vector_icons::kUsbChromeRefreshIcon; icon = &kTabUsbConnectedIcon; break; case TabAlertState::HID_CONNECTED: - icon = &vector_icons::kVideogameAssetChromeRefreshIcon; + icon = &vector_icons::kVideogameAssetChromeRefreshIcon; break; case TabAlertState::SERIAL_CONNECTED: - icon = &vector_icons::kSerialPortChromeRefreshIcon; + icon = &vector_icons::kSerialPortChromeRefreshIcon; break; case TabAlertState::PIP_PLAYING: - icon = &vector_icons::kPictureInPictureAltIcon; + icon = &vector_icons::kPictureInPictureAltIcon; break; case TabAlertState::VR_PRESENTING_IN_HEADSET: - icon = &vector_icons::kCardboardIcon; + icon = &vector_icons::kCardboardIcon; break; case TabAlertState::GLIC_ACCESSING: icon = &vector_icons::kFitScreenIcon;
diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc index c7ab9cf..d050d58 100644 --- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc +++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
@@ -95,8 +95,9 @@ if (source_context) { gfx::NativeWindow source_window = source_context->GetWidget()->GetNativeWindow(); - if (source_window) + if (source_window) { return BrowserView::GetBrowserViewForNativeWindow(source_window); + } } return nullptr; } @@ -125,8 +126,9 @@ void Cancel() { controller_ = nullptr; } void CloseMenu() { - if (menu_runner_) + if (menu_runner_) { menu_runner_->Cancel(); + } } void RunMenuAt(const gfx::Point& point, @@ -140,8 +142,7 @@ bool IsCommandIdChecked(int command_id) const override { return false; } bool IsCommandIdEnabled(int command_id) const override { return controller_->IsCommandEnabledForTab( - static_cast<TabStripModel::ContextMenuCommand>(command_id), - tab_); + static_cast<TabStripModel::ContextMenuCommand>(command_id), tab_); } bool IsCommandIdAlerted(int command_id) const override { return false; } @@ -169,8 +170,7 @@ // Executing the command destroys |this|, and can also end up destroying // |controller_|. So stop the highlights before executing the command. controller_->ExecuteCommandForTab( - static_cast<TabStripModel::ContextMenuCommand>(command_id), - tab_); + static_cast<TabStripModel::ContextMenuCommand>(command_id), tab_); } private: @@ -216,8 +216,9 @@ // When we get here the TabStrip is being deleted. We need to explicitly // cancel the menu, otherwise it may try to invoke something on the tabstrip // from its destructor. - if (context_menu_contents_.get()) + if (context_menu_contents_.get()) { context_menu_contents_->Cancel(); + } model_->RemoveObserver(this); } @@ -227,8 +228,9 @@ // Walk the model, calling our insertion observer method for each item within // it. - for (int i = 0; i < model_->count(); ++i) + for (int i = 0; i < model_->count(); ++i) { AddTab(model_->GetWebContentsAt(i), i); + } } bool BrowserTabStripController::IsCommandEnabledForTab( @@ -244,16 +246,17 @@ TabStripModel::ContextMenuCommand command_id, const Tab* tab) { const std::optional<int> model_index = tabstrip_->GetModelIndexOf(tab); - if (model_index.has_value()) + if (model_index.has_value()) { model_->ExecuteContextMenuCommand(model_index.value(), command_id); + } } bool BrowserTabStripController::IsTabPinned(const Tab* tab) const { return IsTabPinned(tabstrip_->GetModelIndexOf(tab).value()); } -const ui::ListSelectionModel& -BrowserTabStripController::GetSelectionModel() const { +const ui::ListSelectionModel& BrowserTabStripController::GetSelectionModel() + const { return model_->selection_model(); } @@ -271,8 +274,9 @@ std::optional<int> BrowserTabStripController::GetActiveIndex() const { const int active_index = model_->active_index(); - if (IsValidIndex(active_index)) + if (IsValidIndex(active_index)) { return active_index; + } return std::nullopt; } @@ -491,8 +495,9 @@ } void BrowserTabStripController::CloseContextMenuForTesting() { - if (context_menu_contents_) + if (context_menu_contents_) { context_menu_contents_->CloseMenu(); + } } int BrowserTabStripController::HasAvailableDragActions() const { @@ -523,8 +528,9 @@ AutocompleteClassifierFactory::GetForProfile(GetProfile()) ->Classify(location, false, false, metrics::OmniboxEventProto::BLANK, &match, nullptr); - if (match.destination_url.is_valid()) + if (match.destination_url.is_valid()) { model_->delegate()->AddTabAt(match.destination_url, -1, true); + } } void BrowserTabStripController::OnStartedDragging(bool dragging_window) { @@ -543,8 +549,9 @@ // We also use fast resize for the source browser window as the source browser // window may also change bounds during dragging. BrowserView* source_browser_view = GetSourceBrowserViewInTabDragging(); - if (source_browser_view && source_browser_view != browser_view_) + if (source_browser_view && source_browser_view != browser_view_) { source_browser_view->frame()->SetTabDragKind(TabDragKind::kTab); + } #if BUILDFLAG(IS_CHROMEOS) browser_view_->GetWidget()->GetNativeWindow()->SetProperty( @@ -558,10 +565,12 @@ BrowserView* source_browser_view = GetSourceBrowserViewInTabDragging(); // Only reset the source window's fast resize bit after the entire drag // ends. - if (browser_view_ != source_browser_view) + if (browser_view_ != source_browser_view) { browser_view_->frame()->SetTabDragKind(TabDragKind::kNone); - if (source_browser_view && !TabDragController::IsActive()) + } + if (source_browser_view && !TabDragController::IsActive()) { source_browser_view->frame()->SetTabDragKind(TabDragKind::kNone); + } #if BUILDFLAG(IS_CHROMEOS) browser_view_->GetWidget()->GetNativeWindow()->ClearProperty( @@ -715,8 +724,9 @@ break; } - if (tab_strip_model->empty()) + if (tab_strip_model->empty()) { return; + } if (selection.active_tab_changed()) { // It's possible for |new_contents| to be null when the final tab in a tab @@ -730,8 +740,9 @@ } } - if (selection.selection_changed()) + if (selection.selection_changed()) { tabstrip_->SetSelection(selection.new_model); + } } void BrowserTabStripController::OnTabWillBeAdded() {
diff --git a/chrome/browser/ui/views/tabs/compound_tab_container.h b/chrome/browser/ui/views/tabs/compound_tab_container.h index 86e4cd512..3cc03d776 100644 --- a/chrome/browser/ui/views/tabs/compound_tab_container.h +++ b/chrome/browser/ui/views/tabs/compound_tab_container.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_TABS_COMPOUND_TAB_CONTAINER_H_ #include <memory> + #include "base/memory/raw_ptr.h" #include "chrome/browser/ui/views/tabs/tab_container.h" #include "chrome/browser/ui/views/tabs/tab_container_controller.h"
diff --git a/chrome/browser/ui/views/tabs/compound_tab_container_unittest.cc b/chrome/browser/ui/views/tabs/compound_tab_container_unittest.cc index aad154e..65f460c 100644 --- a/chrome/browser/ui/views/tabs/compound_tab_container_unittest.cc +++ b/chrome/browser/ui/views/tabs/compound_tab_container_unittest.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/ui/views/tabs/compound_tab_container.h" #include <memory> + #include "base/memory/raw_ref.h" #include "chrome/browser/ui/layout_constants.h" #include "chrome/browser/ui/tabs/tab_renderer_data.h" @@ -60,8 +61,9 @@ int NumPinnedTabsInModel() const override { for (size_t i = 0; i < static_cast<size_t>(tab_strip_controller_->GetCount()); ++i) { - if (!tab_strip_controller_->IsTabPinned(static_cast<int>(i))) + if (!tab_strip_controller_->IsTabPinned(static_cast<int>(i))) { return static_cast<int>(i); + } } // All tabs are pinned. @@ -177,8 +179,9 @@ std::make_unique<Tab>(tab_slot_controller_.get()), model_index, pinned); tab_strip_controller_->AddTab(model_index, active, pinned); - if (active == TabActive::kActive) + if (active == TabActive::kActive) { tab_slot_controller_->set_active_tab(tab); + } if (group) { AddTabToGroup(model_index, group.value()); @@ -203,8 +206,9 @@ tab_strip_controller_->AddTabToGroup(model_index, group); const auto& group_views = tab_container_->get_group_views_for_testing(); - if (group_views.find(group) == group_views.end()) + if (group_views.find(group) == group_views.end()) { tab_container_->OnGroupCreated(group); + } tab_container_->OnGroupMoved(group); }
diff --git a/chrome/browser/ui/views/tabs/fade_footer_view.cc b/chrome/browser/ui/views/tabs/fade_footer_view.cc index 047cc24..350bf23 100644 --- a/chrome/browser/ui/views/tabs/fade_footer_view.cc +++ b/chrome/browser/ui/views/tabs/fade_footer_view.cc
@@ -59,8 +59,8 @@ views::MinimumFlexSizeRule::kScaleToZero, views::MaximumFlexSizeRule::kUnbounded, true)); - footer_label_->SetEnabledColorId(kColorTabHoverCardSecondaryText); - footer_label_->SetTextStyle(views::style::STYLE_BODY_4); + footer_label_->SetEnabledColorId(kColorTabHoverCardSecondaryText); + footer_label_->SetTextStyle(views::style::STYLE_BODY_4); // Vertically align the icon to the top line of the label const int offset = (footer_label_->GetLineHeight() -
diff --git a/chrome/browser/ui/views/tabs/fake_base_tab_strip_controller.cc b/chrome/browser/ui/views/tabs/fake_base_tab_strip_controller.cc index 71e5bd5..b17c3875 100644 --- a/chrome/browser/ui/views/tabs/fake_base_tab_strip_controller.cc +++ b/chrome/browser/ui/views/tabs/fake_base_tab_strip_controller.cc
@@ -33,8 +33,9 @@ num_pinned_tabs_++; data.pinned = true; } - if (tab_strip_) + if (tab_strip_) { tab_strip_->AddTabAt(index, std::move(data)); + } if (is_active == TabActive::kActive) { SetActiveIndex(index); } else if (active_index_.has_value() && index <= active_index_) { @@ -46,8 +47,9 @@ std::optional<tab_groups::TabGroupId> prev_group = tab_groups_[from_index]; tab_groups_.erase(tab_groups_.begin() + from_index); tab_groups_.insert(tab_groups_.begin() + to_index, prev_group); - if (tab_strip_) + if (tab_strip_) { tab_strip_->MoveTab(from_index, to_index, TabRendererData()); + } } void FakeBaseTabStripController::MoveGroup(const tab_groups::TabGroupId& group, @@ -64,8 +66,9 @@ void FakeBaseTabStripController::RemoveTab(int index) { DCHECK(IsValidIndex(index)); num_tabs_--; - if (index < num_pinned_tabs_) + if (index < num_pinned_tabs_) { num_pinned_tabs_--; + } tab_groups_.erase(tab_groups_.begin() + index); const bool was_active = index == active_index_; @@ -86,8 +89,9 @@ if (tab_strip_) { tab_strip_->RemoveTabAt(nullptr, index, was_active); - if (active_index_.has_value() && IsValidIndex(active_index_.value())) + if (active_index_.has_value() && IsValidIndex(active_index_.value())) { tab_strip_->SetSelection(selection_model_); + } } } @@ -137,14 +141,16 @@ if (tab_strip_ && old_group.has_value()) { tab_strip_->AddTabToGroup(std::nullopt, index); - if (!base::Contains(tab_groups_, old_group)) + if (!base::Contains(tab_groups_, old_group)) { tab_strip_->OnGroupClosed(old_group.value()); - else + } else { tab_strip_->OnGroupContentsChanged(old_group.value()); + } } if (tab_strip_ && new_group.has_value()) { - if (!group_exists) + if (!group_exists) { tab_strip_->OnGroupCreated(new_group.value()); + } tab_strip_->AddTabToGroup(new_group.value(), index); tab_strip_->OnGroupContentsChanged(new_group.value()); } @@ -153,8 +159,9 @@ std::optional<int> FakeBaseTabStripController::GetFirstTabInGroup( const tab_groups::TabGroupId& group) const { for (size_t i = 0; i < tab_groups_.size(); ++i) { - if (tab_groups_[i] == group) + if (tab_groups_[i] == group) { return i; + } } return std::nullopt; @@ -170,8 +177,9 @@ int first_tab = -1; int last_tab = -1; for (size_t i = 0; i < tab_groups_.size(); i++) { - if (tab_groups_[i] != group) + if (tab_groups_[i] != group) { continue; + } if (first_tab == -1) { first_tab = i; @@ -186,8 +194,8 @@ return first_tab > -1 ? gfx::Range(first_tab, last_tab) : gfx::Range(); } -const ui::ListSelectionModel& -FakeBaseTabStripController::GetSelectionModel() const { +const ui::ListSelectionModel& FakeBaseTabStripController::GetSelectionModel() + const { return selection_model_; } @@ -200,8 +208,9 @@ } bool FakeBaseTabStripController::IsActiveTab(int index) const { - if (!IsValidIndex(index)) + if (!IsValidIndex(index)) { return false; + } return active_index_ == index; } @@ -218,20 +227,18 @@ } void FakeBaseTabStripController::SelectTab(int index, const ui::Event& event) { - if (!IsValidIndex(index) || active_index_ == index) + if (!IsValidIndex(index) || active_index_ == index) { return; + } SetActiveIndex(index); } -void FakeBaseTabStripController::ExtendSelectionTo(int index) { -} +void FakeBaseTabStripController::ExtendSelectionTo(int index) {} -void FakeBaseTabStripController::ToggleSelected(int index) { -} +void FakeBaseTabStripController::ToggleSelected(int index) {} -void FakeBaseTabStripController::AddSelectionFromAnchorTo(int index) { -} +void FakeBaseTabStripController::AddSelectionFromAnchorTo(int index) {} void FakeBaseTabStripController::OnCloseTab( int index, @@ -330,6 +337,7 @@ DCHECK(IsValidIndex(new_index)); active_index_ = new_index; selection_model_.SetSelectedIndex(active_index_); - if (tab_strip_) + if (tab_strip_) { tab_strip_->SetSelection(selection_model_); + } }
diff --git a/chrome/browser/ui/views/tabs/glow_hover_controller.cc b/chrome/browser/ui/views/tabs/glow_hover_controller.cc index c45a55e..38b754dd3 100644 --- a/chrome/browser/ui/views/tabs/glow_hover_controller.cc +++ b/chrome/browser/ui/views/tabs/glow_hover_controller.cc
@@ -31,8 +31,9 @@ void GlowHoverController::SetLocation(const gfx::Point& location) { location_ = location; - if (ShouldDraw()) + if (ShouldDraw()) { view_->SchedulePaint(); + } } void GlowHoverController::SetSubtleOpacityScale(double opacity_scale) { @@ -63,8 +64,9 @@ animation_.Hide(); break; case TabStyle::HideHoverStyle::kImmediate: - if (ShouldDraw()) + if (ShouldDraw()) { view_->SchedulePaint(); + } animation_.Reset(); break; }
diff --git a/chrome/browser/ui/views/tabs/new_tab_button.cc b/chrome/browser/ui/views/tabs/new_tab_button.cc index 1a97ba90..1ff187d 100644 --- a/chrome/browser/ui/views/tabs/new_tab_button.cc +++ b/chrome/browser/ui/views/tabs/new_tab_button.cc
@@ -118,10 +118,9 @@ } SkColor NewTabButton::GetForegroundColor() const { - return GetColorProvider()->GetColor( - GetWidget()->ShouldPaintAsActive() - ? foreground_frame_active_color_id_ - : foreground_frame_inactive_color_id_); + return GetColorProvider()->GetColor( + GetWidget()->ShouldPaintAsActive() ? foreground_frame_active_color_id_ + : foreground_frame_inactive_color_id_); } int NewTabButton::GetCornerRadius() const {
diff --git a/chrome/browser/ui/views/tabs/overflow_view_unittest.cc b/chrome/browser/ui/views/tabs/overflow_view_unittest.cc index e810101..4458756 100644 --- a/chrome/browser/ui/views/tabs/overflow_view_unittest.cc +++ b/chrome/browser/ui/views/tabs/overflow_view_unittest.cc
@@ -102,12 +102,15 @@ static int InterpolateByTens(int minimum, int preferred, views::SizeBound bound) { - if (!bound.is_bounded()) + if (!bound.is_bounded()) { return preferred; - if (bound.value() <= minimum) + } + if (bound.value() <= minimum) { return minimum; - if (bound.value() >= preferred) + } + if (bound.value() >= preferred) { return preferred; + } return minimum + 10 * ((bound.value() - minimum) / 10); }
diff --git a/chrome/browser/ui/views/tabs/tab_container.h b/chrome/browser/ui/views/tabs/tab_container.h index 0652888..1c72576 100644 --- a/chrome/browser/ui/views/tabs/tab_container.h +++ b/chrome/browser/ui/views/tabs/tab_container.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_TABS_TAB_CONTAINER_H_ #include <memory> + #include "chrome/browser/ui/views/frame/browser_root_view.h" #include "chrome/browser/ui/views/tabs/tab.h" #include "chrome/browser/ui/views/tabs/tab_group_underline.h"
diff --git a/chrome/browser/ui/views/tabs/tab_container_impl.h b/chrome/browser/ui/views/tabs/tab_container_impl.h index 6be927ca..523e5b0 100644 --- a/chrome/browser/ui/views/tabs/tab_container_impl.h +++ b/chrome/browser/ui/views/tabs/tab_container_impl.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_TABS_TAB_CONTAINER_IMPL_H_ #include <memory> + #include "base/memory/raw_ptr.h" #include "base/memory/raw_ref.h" #include "base/timer/timer.h"
diff --git a/chrome/browser/ui/views/tabs/tab_container_unittest.cc b/chrome/browser/ui/views/tabs/tab_container_unittest.cc index 93dca35f..d3050ee5 100644 --- a/chrome/browser/ui/views/tabs/tab_container_unittest.cc +++ b/chrome/browser/ui/views/tabs/tab_container_unittest.cc
@@ -93,8 +93,9 @@ int NumPinnedTabsInModel() const override { for (size_t i = 0; i < static_cast<size_t>(tab_strip_controller_->GetCount()); ++i) { - if (!tab_strip_controller_->IsTabPinned(static_cast<int>(i))) + if (!tab_strip_controller_->IsTabPinned(static_cast<int>(i))) { return static_cast<int>(i); + } } // All tabs are pinned. @@ -205,11 +206,13 @@ std::make_unique<Tab>(tab_slot_controller_.get()), model_index, pinned); tab_strip_controller_->AddTab(model_index, active, pinned); - if (active == TabActive::kActive) + if (active == TabActive::kActive) { tab_slot_controller_->set_active_tab(tab); + } - if (group) + if (group) { AddTabToGroup(model_index, group.value()); + } return tab; } @@ -233,8 +236,9 @@ tab_strip_controller_->AddTabToGroup(model_index, group); const auto& group_views = tab_container_->get_group_views_for_testing(); - if (group_views.find(group) == group_views.end()) + if (group_views.find(group) == group_views.end()) { tab_container_->OnGroupCreated(group); + } tab_container_->OnGroupMoved(group); } @@ -249,8 +253,9 @@ bool group_is_empty = true; for (int i = 0; i < tab_container_->GetTabCount(); i++) { - if (tab_container_->GetTabAtModelIndex(i)->group() == old_group) + if (tab_container_->GetTabAtModelIndex(i)->group() == old_group) { group_is_empty = false; + } } if (group_is_empty) { @@ -265,17 +270,20 @@ std::optional<tab_groups::TabGroupId> old_group = tab_container_->GetTabAtModelIndex(index)->group(); - if (old_group.has_value()) + if (old_group.has_value()) { RemoveTabFromGroup(index); - if (new_group.has_value()) + } + if (new_group.has_value()) { AddTabToGroup(index, new_group.value()); + } } std::vector<TabGroupViews*> ListGroupViews() const { std::vector<TabGroupViews*> result; for (auto const& group_view_pair : - tab_container_->get_group_views_for_testing()) + tab_container_->get_group_views_for_testing()) { result.push_back(group_view_pair.second.get()); + } return result; } @@ -822,8 +830,9 @@ } TEST_F(TabContainerTest, GroupHeaderMovesRightWithTab) { - for (int i = 0; i < 4; i++) + for (int i = 0; i < 4; i++) { AddTab(i); + } tab_groups::TabGroupId group = tab_groups::TabGroupId::GenerateNew(); AddTabToGroup(1, group); tab_container_->CompleteAnimationAndLayout(); @@ -838,8 +847,9 @@ } TEST_F(TabContainerTest, GroupHeaderMovesLeftWithTab) { - for (int i = 0; i < 4; i++) + for (int i = 0; i < 4; i++) { AddTab(i); + } tab_groups::TabGroupId group = tab_groups::TabGroupId::GenerateNew(); AddTabToGroup(2, group); tab_container_->CompleteAnimationAndLayout(); @@ -854,8 +864,9 @@ } TEST_F(TabContainerTest, GroupHeaderDoesntMoveReorderingTabsInGroup) { - for (int i = 0; i < 4; i++) + for (int i = 0; i < 4; i++) { AddTab(i); + } tab_groups::TabGroupId group = tab_groups::TabGroupId::GenerateNew(); AddTabToGroup(1, group); AddTabToGroup(2, group); @@ -878,8 +889,9 @@ } TEST_F(TabContainerTest, GroupHeaderMovesOnRegrouping) { - for (int i = 0; i < 3; i++) + for (int i = 0; i < 3; i++) { AddTab(i); + } tab_groups::TabGroupId group0 = tab_groups::TabGroupId::GenerateNew(); AddTabToGroup(0, group0); tab_groups::TabGroupId group1 = tab_groups::TabGroupId::GenerateNew(); @@ -907,8 +919,9 @@ } TEST_F(TabContainerTest, UngroupedTabMovesLeftOfHeader) { - for (int i = 0; i < 2; i++) + for (int i = 0; i < 2; i++) { AddTab(i); + } tab_groups::TabGroupId group = tab_groups::TabGroupId::GenerateNew(); AddTabToGroup(0, group); tab_container_->CompleteAnimationAndLayout();
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller.cc b/chrome/browser/ui/views/tabs/tab_drag_controller.cc index cc5d7d9..8ce5d3b0 100644 --- a/chrome/browser/ui/views/tabs/tab_drag_controller.cc +++ b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
@@ -197,11 +197,13 @@ // Adds |x_offset| to all the rectangles in |rects|. void OffsetX(int x_offset, std::vector<gfx::Rect>* rects) { - if (x_offset == 0) + if (x_offset == 0) { return; + } - for (auto& rect : *rects) + for (auto& rect : *rects) { rect.set_x(rect.x() + x_offset); + } } bool IsWindowDragUsingSystemDragDropAllowed() { @@ -297,8 +299,9 @@ const TabStripSelectionChange& selection) override { switch (change.type()) { case TabStripModelChange::Type::kRemoved: - for (const auto& contents : change.GetRemove()->contents) + for (const auto& contents : change.GetRemove()->contents) { parent_->OnActiveStripWebContentsRemoved(contents.contents); + } break; case TabStripModelChange::Type::kReplaced: parent_->OnActiveStripWebContentsReplaced( @@ -354,8 +357,9 @@ } TabDragController::~TabDragController() { - if (g_tab_drag_controller == this) + if (g_tab_drag_controller == this) { g_tab_drag_controller = nullptr; + } widget_observation_.Reset(); @@ -625,8 +629,9 @@ void TabDragController::OnTabWillBeRemoved(content::WebContents* contents) { // End the drag before we remove a tab that's being dragged, to avoid // complex special cases that could result. - if (!CanRemoveTabDuringDrag(contents)) + if (!CanRemoveTabDuringDrag(contents)) { EndDrag(END_DRAG_COMPLETE); + } } bool TabDragController::CanRemoveTabDuringDrag( @@ -665,8 +670,9 @@ bring_to_front_timer_.Stop(); if (current_state_ == DragState::kNotStarted) { - if (!CanStartDrag(point_in_screen)) + if (!CanStartDrag(point_in_screen)) { return; // User hasn't dragged far enough yet. + } // If any of the tabs have disappeared (e.g. closed or discarded), cancel // the drag session. See crbug.com/1445776. @@ -679,8 +685,9 @@ { base::WeakPtr<TabDragController> ref(weak_factory_.GetWeakPtr()); SaveFocus(); - if (!ref) + if (!ref) { return; + } } current_state_ = DragState::kDraggingTabs; @@ -730,8 +737,9 @@ } } - if (ContinueDragging(point_in_screen) == Liveness::DELETED) + if (ContinueDragging(point_in_screen) == Liveness::DELETED) { return; + } } void TabDragController::EndDrag(EndDragReason reason) { @@ -742,8 +750,9 @@ return; } - if (tab_strip_scroll_session_) + if (tab_strip_scroll_session_) { tab_strip_scroll_session_->Stop(); + } // Some drags need to react to the model being mutated before the model can // change its state. @@ -751,8 +760,9 @@ // if the drag is not a header drag, ignore this signal. We must place the // drag at the current position in the tabstrip or else we will be // re-entering into tabstrip mutation code. - if (header_drag_) + if (header_drag_) { EndDragImpl(source_context_ == attached_context_ ? CANCELED : NORMAL); + } return; } @@ -817,8 +827,9 @@ // have to be called -- GetCursorScreenPoint() may return an incorrect // location in such case and causes a weird effect. See // https://crbug.com/914527 for the details. - if (!env->IsMouseButtonDown() && !env->is_touch_down()) + if (!env->IsMouseButtonDown() && !env->is_touch_down()) { return; + } #endif Drag(GetCursorScreenPoint()); } @@ -880,14 +891,16 @@ display::Screen::GetScreen()->GetDisplayNearestPoint(origin).work_area(); gfx::Point create_point(origin); if (!work_area.IsEmpty()) { - if (create_point.x() < work_area.x()) + if (create_point.x() < work_area.x()) { create_point.set_x(work_area.x()); - else if (create_point.x() > work_area.right()) + } else if (create_point.x() > work_area.right()) { create_point.set_x(work_area.right()); - if (create_point.y() < work_area.y()) + } + if (create_point.y() < work_area.y()) { create_point.set_y(work_area.y()); - else if (create_point.y() > work_area.bottom()) + } else if (create_point.y() > work_area.bottom()) { create_point.set_y(work_area.bottom()); + } } return gfx::Point(create_point.x() - window_create_point_.x(), create_point.y() - window_create_point_.y()); @@ -905,8 +918,9 @@ if (attached_context_ != source_context_) { if (is_dragging_new_browser_) { content::WebContents* active_contents = source_dragged_contents(); - if (active_contents && !active_contents->FocusLocationBarByDefault()) + if (active_contents && !active_contents->FocusLocationBarByDefault()) { active_contents->Focus(); + } } return; } @@ -1008,10 +1022,11 @@ views::Widget* browser_widget = GetAttachedBrowserWidget(); // Disable animations so that we don't see a close animation on aero. browser_widget->SetVisibilityChangedAnimationsEnabled(false); - if (can_release_capture_) + if (can_release_capture_) { browser_widget->ReleaseCapture(); - else + } else { SetCapture(target_context); + } #if !BUILDFLAG(IS_LINUX) // EndMoveLoop is going to snap the window back to its original location. @@ -1230,8 +1245,9 @@ std::vector<raw_ptr<TabSlotView, VectorExperimental>> views( drag_data_.size()); - for (size_t i = 0; i < drag_data_.size(); ++i) + for (size_t i = 0; i < drag_data_.size(); ++i) { views[i] = drag_data_[i].attached_view.get(); + } bool did_layout = false; @@ -1300,8 +1316,9 @@ } // Let stop be handled by the callback of `tab_strip_scroll_session_` - if (tab_strip_scroll_session_) + if (tab_strip_scroll_session_) { tab_strip_scroll_session_->MaybeStart(); + } if (!did_layout) { attached_context_->LayoutDraggedViewsAt( @@ -1314,8 +1331,9 @@ // Snap the non-dragged tabs to their ideal bounds now, otherwise those tabs // will animate to those bounds after attach, which looks flickery/bad. See // https://crbug.com/1360330. - if (just_attached) + if (just_attached) { attached_context_->ForceLayout(); + } } TabDragController::DetachPosition TabDragController::GetDetachPosition( @@ -1323,10 +1341,12 @@ DCHECK(attached_context_); gfx::Point attached_point(point_in_screen); views::View::ConvertPointFromScreen(attached_context_, &attached_point); - if (attached_point.x() < attached_context_->TabDragAreaBeginX()) + if (attached_point.x() < attached_context_->TabDragAreaBeginX()) { return DETACH_BEFORE; - if (attached_point.x() >= attached_context_->TabDragAreaEndX()) + } + if (attached_point.x() >= attached_context_->TabDragAreaEndX()) { return DETACH_AFTER; + } return DETACH_ABOVE_OR_BELOW; } @@ -1348,8 +1368,9 @@ const Liveness state = GetLocalProcessWindow( point_in_screen, current_state_ == DragState::kDraggingWindow, &local_window); - if (state == Liveness::DELETED) + if (state == Liveness::DELETED) { return Liveness::DELETED; + } if (local_window && CanAttachTo(local_window)) { TabDragContext* destination_tab_strip = @@ -1514,8 +1535,9 @@ attached_context_->ReleaseDragController(); DCHECK_EQ(me.get(), this); - if (release_capture == RELEASE_CAPTURE) + if (release_capture == RELEASE_CAPTURE) { attached_context_->GetWidget()->ReleaseCapture(); + } TabStripModel* attached_model = attached_context_->GetTabStripModel(); @@ -1534,8 +1556,9 @@ // Detaching may end up deleting the tab, drop references to it. drag_data_[i].attached_view = nullptr; } - if (header_drag_) + if (header_drag_) { source_view_drag_data()->attached_view = nullptr; + } // If we've removed the last Tab from the TabDragContext, hide the // frame now. @@ -1697,11 +1720,13 @@ drag_offset, move_loop_source, escape_behavior); // Note: |this| can be deleted here! - if (drag_loop_done_callback) + if (drag_loop_done_callback) { std::move(drag_loop_done_callback).Run(); + } - if (!ref) + if (!ref) { return; + } in_move_loop_ = false; widget_observation_.Reset(); @@ -1718,8 +1743,9 @@ MoveAttached(GetCursorScreenPoint(), true); attached_context_->GetWidget()->Activate(); // Activate may trigger a focus loss, destroying us. - if (!ref) + if (!ref) { return; + } tab_strip_to_attach_to_after_exit_ = nullptr; } else if (current_state_ == DragState::kDraggingWindow) { EndDrag(result == views::Widget::MoveLoopResult::kCanceled @@ -1770,12 +1796,14 @@ for (size_t i = first_tab_index(); i < drag_data_.size(); ++i) { const int model_index = model->GetIndexOfWebContents(drag_data_[i].contents); - if (model_index == TabStripModel::kNoTab) + if (model_index == TabStripModel::kNoTab) { return std::vector<raw_ptr<TabSlotView, VectorExperimental>>(); + } views.push_back(context->GetTabAt(model_index)); } - if (header_drag_) + if (header_drag_) { views.insert(views.begin(), context->GetTabGroupHeader(group_.value())); + } return views; } @@ -1834,8 +1862,9 @@ } } else if (drag_data_.size() > 1) { initial_selection_model_.Clear(); - if (previous_state != DragState::kNotStarted) + if (previous_state != DragState::kNotStarted) { RevertDrag(); + } } // else case the only tab we were dragging was deleted. Nothing to do. // Clear out drag data so we don't attempt to do anything with it. @@ -1865,12 +1894,14 @@ MaybeResumeTrackingSavedTabGroup(); if (attached_context_) { - if (did_restore_window_) + if (did_restore_window_) { MaximizeAttachedWindow(); + } if (attached_context_ == source_context_) { source_context_->StoppedDragging(); - if (header_drag_) + if (header_drag_) { source_context_->GetTabStripModel()->MoveTabGroup(group_.value()); + } } else { attached_context_->DraggedTabsDetached(); } @@ -1886,14 +1917,16 @@ } } - if (initial_selection_model_.empty()) + if (initial_selection_model_.empty()) { ResetSelection(source_context_->GetTabStripModel()); - else + } else { source_context_->GetTabStripModel()->SetSelectionFromModel( initial_selection_model_); + } - if (source_context_) + if (source_context_) { source_context_->GetWidget()->Activate(); + } } void TabDragController::ResetSelection(TabStripModel* model) { @@ -1915,8 +1948,9 @@ } } } - if (!has_one_valid_tab) + if (!has_one_valid_tab) { return; + } model->SetSelectionFromModel(selection_model); } @@ -1928,27 +1962,32 @@ // still there. ui::ListSelectionModel selection_model = initial_selection_model_; for (const TabDragData& data : base::Reversed(drag_data_)) { - if (data.source_model_index.has_value()) + if (data.source_model_index.has_value()) { selection_model.DecrementFrom(data.source_model_index.value()); + } } // We may have cleared out the selection model. Only reset it if it // contains something. - if (selection_model.empty()) + if (selection_model.empty()) { return; + } // Tabs in |source_context_| may have closed since the drag began. In that // case, |initial_selection_model_| may include indices that are no longer // valid in |source_context_|. Abort restoring the selection if so. if (!source_context_->GetTabStripModel()->ContainsIndex( - *(selection_model.selected_indices().rbegin()))) + *(selection_model.selected_indices().rbegin()))) { return; + } // The anchor/active may have been among the tabs that were dragged out. Force // the anchor/active to be valid. - if (!selection_model.anchor().has_value()) + if (!selection_model.anchor().has_value()) { selection_model.set_anchor(*selection_model.selected_indices().begin()); - if (!selection_model.active().has_value()) + } + if (!selection_model.active().has_value()) { selection_model.set_active(*selection_model.selected_indices().begin()); + } source_context_->GetTabStripModel()->SetSelectionFromModel(selection_model); } @@ -2030,8 +2069,9 @@ // index, so we skip those indices. if (target_index > index) { for (size_t i = drag_index + 1; i < drag_data_.size(); ++i) { - if (drag_data_[i].contents) + if (drag_data_[i].contents) { ++target_index; + } } } source_context_->GetTabStripModel()->MoveWebContentsAt( @@ -2073,8 +2113,9 @@ // macOS opts out since this maps maximize to fullscreen, which can // violate user expectations and interacts poorly with some window // management actions. - if (was_source_maximized_ || was_source_fullscreen_) + if (was_source_maximized_ || was_source_fullscreen_) { MaximizeAttachedWindow(); + } #endif // !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_MAC) } attached_context_->StoppedDragging(); @@ -2151,8 +2192,9 @@ void TabDragController::MaximizeAttachedWindow() { GetAttachedBrowserWidget()->Maximize(); #if BUILDFLAG(IS_MAC) - if (was_source_fullscreen_) + if (was_source_fullscreen_) { GetAttachedBrowserWidget()->SetFullscreen(true); + } #endif #if BUILDFLAG(IS_CHROMEOS) if (was_source_fullscreen_) { @@ -2161,9 +2203,10 @@ BrowserView* browser_view = BrowserView::GetBrowserViewForNativeWindow( GetAttachedBrowserWidget()->GetNativeWindow()); DCHECK(browser_view); - if (!browser_view->IsFullscreen()) + if (!browser_view->IsFullscreen()) { chrome::ToggleFullscreenMode(browser_view->browser(), /*user_initiated=*/false); + } } #endif } @@ -2233,8 +2276,9 @@ bool TabDragController::IsDraggingTab(content::WebContents* contents) const { for (auto& drag_data : drag_data_) { - if (drag_data.contents == contents) + if (drag_data.contents == contents) { return true; + } } return false; } @@ -2285,8 +2329,9 @@ // global screen coordinates tracking, eg: Linux/Wayland, in such cases, // avoid this heuristic to determine whether the new browser window should // be maximized or not when completing the drag session. - if (PlatformProvidesAbsoluteWindowPositions()) + if (PlatformProvidesAbsoluteWindowPositions()) { was_source_maximized_ = true; + } } if (source->GetWidget()->IsMaximized()) { @@ -2555,8 +2600,9 @@ if (exclude_dragged_view) { gfx::NativeWindow dragged_window = attached_context_->GetWidget()->GetNativeWindow(); - if (dragged_window) + if (dragged_window) { exclude.insert(dragged_window); + } } #if BUILDFLAG(IS_LINUX) @@ -2566,8 +2612,9 @@ // attached to another browser window in DragBrowserToNewTabStrip(). // TODO(pkotwicz): Fix this properly (crbug.com/358482) for (Browser* browser : *BrowserList::GetInstance()) { - if (browser->tab_strip_model()->empty()) + if (browser->tab_strip_model()->empty()) { exclude.insert(browser->window()->GetNativeWindow()); + } } #endif base::WeakPtr<TabDragController> ref(weak_factory_.GetWeakPtr()); @@ -2591,8 +2638,9 @@ // unpinned tabs. std::vector<int> selected_unpinned; for (size_t selected_index : selected) { - if (!attached_model->IsTabPinned(selected_index)) + if (!attached_model->IsTabPinned(selected_index)) { selected_unpinned.push_back(selected_index); + } } if (selected_unpinned.empty()) { @@ -2649,8 +2697,9 @@ // Extra polish: Prefer staying in an existing group, if any. This prevents // tabs at the edge of the group from flickering between grouped and // ungrouped. It also gives groups a slightly "sticky" feel while dragging. - if (left_group.has_value() && left_group == current_group) + if (left_group.has_value() && left_group == current_group) { left_edge += buffer; + } if (right_group.has_value() && right_group == current_group && left_edge > tab_left_inset) { left_edge -= buffer; @@ -2674,8 +2723,9 @@ return std::nullopt; } - if (left_most_selected_x_position <= left_edge - buffer) + if (left_most_selected_x_position <= left_edge - buffer) { return left_group; + } } if ((left_most_selected_x_position >= left_edge + buffer) && right_group.has_value() && @@ -2707,8 +2757,9 @@ // Do not allow dragging into a window with a modal dialog, it causes a // weird behavior. See crbug.com/336691 #if defined(USE_AURA) - if (wm::GetModalTransient(window)) + if (wm::GetModalTransient(window)) { return false; + } #else TabStripModel* model = other_browser->tab_strip_model(); DCHECK(model); @@ -2747,16 +2798,18 @@ #endif // BUILDFLAG(USE_AURA) // We don't allow drops on windows that don't have tabstrips. - if (!other_browser->SupportsWindowFeature(Browser::FEATURE_TABSTRIP)) + if (!other_browser->SupportsWindowFeature(Browser::FEATURE_TABSTRIP)) { return false; + } Browser* browser = BrowserView::GetBrowserViewForNativeWindow( GetAttachedBrowserWidget()->GetNativeWindow()) ->browser(); // Profiles must be the same. - if (other_browser->profile() != browser->profile()) + if (other_browser->profile() != browser->profile()) { return false; + } // Ensure that browser types and app names are the same. if (other_browser->type() != browser->type() || @@ -2775,14 +2828,16 @@ } void TabDragController::NotifyEventIfTabAddedToGroup() { - if (!source_context_ || source_context_->GetTabStripModel() == nullptr) + if (!source_context_ || source_context_->GetTabStripModel() == nullptr) { return; + } const TabStripModel* source_model = source_context_->GetTabStripModel(); for (size_t i = first_tab_index(); i < drag_data_.size(); ++i) { // If the tab already had a group, skip it. - if (drag_data_[i].tab_group_data.has_value()) + if (drag_data_[i].tab_group_data.has_value()) { continue; + } // Get the tab group from the source model. std::optional<tab_groups::TabGroupId> group_id = @@ -2791,14 +2846,16 @@ // If there was a tab group for that tab, then send the custom event for // adding a tab to a group. - if (!group_id.has_value()) + if (!group_id.has_value()) { continue; + } ui::TrackedElement* element = views::ElementTrackerViews::GetInstance()->GetElementForView( drag_data_[i].attached_view); - if (!element) + if (!element) { continue; + } ui::ElementTracker::GetFrameworkDelegate()->NotifyCustomEvent( element, kTabGroupedCustomEventId);
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller.h b/chrome/browser/ui/views/tabs/tab_drag_controller.h index 706e1b3..5d82163 100644 --- a/chrome/browser/ui/views/tabs/tab_drag_controller.h +++ b/chrome/browser/ui/views/tabs/tab_drag_controller.h
@@ -38,11 +38,11 @@ namespace ui { class ListSelectionModel; class PresentationTimeRecorder; -} +} // namespace ui namespace views { class View; class ViewTracker; -} +} // namespace views namespace tabs { class TabModel; } @@ -254,7 +254,7 @@ class DraggedTabsClosedTracker; // Used to indicate the direction the mouse has moved when attached. - static const int kMovedMouseLeft = 1 << 0; + static const int kMovedMouseLeft = 1 << 0; static const int kMovedMouseRight = 1 << 1; enum class DragState { @@ -304,18 +304,11 @@ }; // Enumeration of the possible positions the detached tab may detach from. - enum DetachPosition { - DETACH_BEFORE, - DETACH_AFTER, - DETACH_ABOVE_OR_BELOW - }; + enum DetachPosition { DETACH_BEFORE, DETACH_AFTER, DETACH_ABOVE_OR_BELOW }; // Specifies what should happen when a drag motion exits the tab strip region // in an attempt to detach a tab. - enum DetachBehavior { - DETACHABLE, - NOT_DETACHABLE - }; + enum DetachBehavior { DETACHABLE, NOT_DETACHABLE }; // Indicates what should happen after invoking DragBrowserToNewTabStrip(). enum DragBrowserResultType {
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc index 8c88938..6dbc4aef 100644 --- a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc +++ b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
@@ -331,24 +331,27 @@ } void ResetIDs(TabStripModel* model, int start) { - for (int i = 0; i < model->count(); ++i) + for (int i = 0; i < model->count(); ++i) { SetID(model->GetWebContentsAt(i), start + i); + } } std::string IDString(TabStripModel* model) { std::string result; for (int i = 0; i < model->count(); ++i) { - if (i != 0) + if (i != 0) { result += " "; + } WebContents* contents = model->GetWebContentsAt(i); TabDragControllerInteractiveUITestUserData* user_data = static_cast<TabDragControllerInteractiveUITestUserData*>( contents->GetUserData( &kTabDragControllerInteractiveUITestUserDataKey)); - if (user_data) + if (user_data) { result += base::NumberToString(user_data->id()); - else + } else { result += "?"; + } } return result; } @@ -539,15 +542,12 @@ namespace { -enum InputSource { - INPUT_SOURCE_MOUSE = 0, - INPUT_SOURCE_TOUCH = 1 -}; +enum InputSource { INPUT_SOURCE_MOUSE = 0, INPUT_SOURCE_TOUCH = 1 }; int GetDetachY(TabStrip* tab_strip) { return std::max(TabDragController::kTouchVerticalDetachMagnetism, TabDragController::kVerticalDetachMagnetism) + - tab_strip->height() + 1; + tab_strip->height() + 1; } bool GetIsDragged(Browser* browser) { @@ -579,9 +579,7 @@ delete; ~TestDesktopBrowserFrameAura() override = default; - void ReleaseCaptureOnNextClear() { - release_capture_ = true; - } + void ReleaseCaptureOnNextClear() { release_capture_ = true; } void ClearNativeFocus() override { views::DesktopNativeWidgetAura::ClearNativeFocus(); @@ -626,13 +624,14 @@ TabStrip* tab_strip = GetTabStripForBrowser(browser()); gfx::Point tab_1_center(GetCenterInScreenCoordinates(tab_strip->tab_at(1))); - ASSERT_TRUE(ui_test_utils::SendMouseMoveSync(tab_1_center) && - ui_test_utils::SendMouseEventsSync( - ui_controls::LEFT, ui_controls::DOWN)); + ASSERT_TRUE( + ui_test_utils::SendMouseMoveSync(tab_1_center) && + ui_test_utils::SendMouseEventsSync(ui_controls::LEFT, ui_controls::DOWN)); TestDesktopBrowserFrameAura* frame = static_cast<TestDesktopBrowserFrameAura*>( - BrowserView::GetBrowserViewForBrowser(browser())->GetWidget()-> - native_widget_private()); + BrowserView::GetBrowserViewForBrowser(browser()) + ->GetWidget() + ->native_widget_private()); // Invoke ReleaseCaptureOnDrag() so that when the drag happens and focus // changes capture is released and the drag cancels. frame->ReleaseCaptureOnNextClear(); @@ -655,7 +654,7 @@ tab_1_center.x(), tab_1_center.x(), 0, base::TimeTicks(), ui::GestureEventDetails(ui::EventType::kGestureTapDown)); tab_strip->MaybeStartDrag(tab1, gesture_tap_down, - tab_strip->GetSelectionModel()); + tab_strip->GetSelectionModel()); EXPECT_TRUE(TabDragController::IsActive()); ui::GestureEvent gesture_end( @@ -773,8 +772,9 @@ } bool DragInputTo(const gfx::Point& location, gfx::NativeWindow window_hint) { - if (input_source() == INPUT_SOURCE_MOUSE) + if (input_source() == INPUT_SOURCE_MOUSE) { return ui_test_utils::SendMouseMoveSync(location, window_hint); + } #if BUILDFLAG(IS_CHROMEOS) return SendTouchEventsSync(ui_controls::kTouchMove, 0, location); #else @@ -791,9 +791,10 @@ bool DragInputToAsync(const gfx::Point& location, const gfx::NativeWindow window_hint) { - if (input_source() == INPUT_SOURCE_MOUSE) + if (input_source() == INPUT_SOURCE_MOUSE) { return ui_controls::SendMouseMove(location.x(), location.y(), window_hint); + } #if BUILDFLAG(IS_CHROMEOS) return ui_controls::SendTouchEvents(ui_controls::kTouchMove, 0, location.x(), location.y()); @@ -882,8 +883,9 @@ bool MoveInputTo(const gfx::Point& location) { aura::Env::GetInstance()->SetLastMouseLocation(location); - if (input_source() == INPUT_SOURCE_MOUSE) + if (input_source() == INPUT_SOURCE_MOUSE) { return ui_test_utils::SendMouseMoveSync(location); + } #if BUILDFLAG(IS_CHROMEOS) return SendTouchEventsSync(ui_controls::kTouchMove, 0, location); #else @@ -2081,8 +2083,8 @@ EXPECT_FALSE(GetIsDragged(new_browser)); // After this both windows should still be manageable. EXPECT_TRUE(IsWindowPositionManaged(browser()->window()->GetNativeWindow())); - EXPECT_TRUE(IsWindowPositionManaged( - new_browser->window()->GetNativeWindow())); + EXPECT_TRUE( + IsWindowPositionManaged(new_browser->window()->GetNativeWindow())); // Both windows should not be maximized EXPECT_FALSE(browser()->window()->IsMaximized()); @@ -2320,8 +2322,8 @@ EXPECT_FALSE(GetIsDragged(new_browser)); // After this both windows should still be manageable. EXPECT_TRUE(IsWindowPositionManaged(browser()->window()->GetNativeWindow())); - EXPECT_TRUE(IsWindowPositionManaged( - new_browser->window()->GetNativeWindow())); + EXPECT_TRUE( + IsWindowPositionManaged(new_browser->window()->GetNativeWindow())); const bool kMaximizedStateRetainedOnTabDrag = #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -3686,8 +3688,8 @@ ASSERT_EQ(1u, browser_list()->size()); // Cancel the drag. - ASSERT_TRUE(ui_test_utils::SendKeyPressSync( - browser2, ui::VKEY_ESCAPE, false, false, false, false)); + ASSERT_TRUE(ui_test_utils::SendKeyPressSync(browser2, ui::VKEY_ESCAPE, false, + false, false, false)); ASSERT_FALSE(tab_strip2->GetDragContext()->IsDragSessionActive()); ASSERT_FALSE(TabDragController::IsActive()); @@ -3958,8 +3960,9 @@ for (Browser* browser : *BrowserList::GetInstance()) { BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser); if (TabDragController::IsAttachedTo( - browser_view->tabstrip()->GetDragContext())) + browser_view->tabstrip()->GetDragContext())) { return browser_view->tabstrip(); + } } return nullptr; } @@ -4165,8 +4168,9 @@ DraggedWindowObserver(const DraggedWindowObserver&) = delete; DraggedWindowObserver& operator=(const DraggedWindowObserver&) = delete; ~DraggedWindowObserver() override { - if (window_) + if (window_) { window_->RemoveObserver(this); + } } void StartObserving(aura::Window* window) { @@ -5323,8 +5327,9 @@ TabStripModel* tab_strip_model, const TabStripModelChange& change, const TabStripSelectionChange& selection) override { - if (change.type() != TabStripModelChange::kMoved) + if (change.type() != TabStripModelChange::kMoved) { return; + } const TabStripModelChange::Move* move = change.GetMove(); int index_to_select = move->to_index == 0 ? 1 : 0; tab_strip_model->ToggleSelectionAt(index_to_select);
diff --git a/chrome/browser/ui/views/tabs/tab_group_header.cc b/chrome/browser/ui/views/tabs/tab_group_header.cc index 2b3e468..717b4c74 100644 --- a/chrome/browser/ui/views/tabs/tab_group_header.cc +++ b/chrome/browser/ui/views/tabs/tab_group_header.cc
@@ -385,8 +385,8 @@ } int TabGroupHeader::GetDesiredWidth() const { - const int overlap_margin = group_style_->GetTabGroupViewOverlap() * 2; - return overlap_margin + title_chip_->width(); + const int overlap_margin = group_style_->GetTabGroupViewOverlap() * 2; + return overlap_margin + title_chip_->width(); } void TabGroupHeader::SetCollapsedState() {
diff --git a/chrome/browser/ui/views/tabs/tab_group_style.h b/chrome/browser/ui/views/tabs/tab_group_style.h index 55a3bfb..f15894d 100644 --- a/chrome/browser/ui/views/tabs/tab_group_style.h +++ b/chrome/browser/ui/views/tabs/tab_group_style.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_TABS_TAB_GROUP_STYLE_H_ #include <string> + #include "base/memory/raw_ptr.h" #include "tab_group_header.h" #include "ui/gfx/geometry/rect.h"
diff --git a/chrome/browser/ui/views/tabs/tab_group_views.cc b/chrome/browser/ui/views/tabs/tab_group_views.cc index b5b49ab..7ee31eb 100644 --- a/chrome/browser/ui/views/tabs/tab_group_views.cc +++ b/chrome/browser/ui/views/tabs/tab_group_views.cc
@@ -56,8 +56,9 @@ void TabGroupViews::UpdateBounds() { // If we're tearing down we should ignore events. - if (InTearDown()) + if (InTearDown()) { return; + } auto [leading_group_view, trailing_group_view] = GetLeadingTrailingGroupViews(); @@ -103,8 +104,9 @@ void TabGroupViews::OnGroupVisualsChanged() { // If we're tearing down we should ignore events. (We can still receive them // here if the editor bubble was open when the tab group was closed.) - if (InTearDown()) + if (InTearDown()) { return; + } header_->VisualsChanged(); underline_->SchedulePaint(); @@ -169,8 +171,9 @@ for (views::View* child : children) { TabSlotView* tab_slot_view = views::AsViewClass<TabSlotView>(child); if (!tab_slot_view || tab_slot_view->group() != group_ || - !tab_slot_view->GetVisible()) + !tab_slot_view->GetVisible()) { continue; + } gfx::Rect child_widget_bounds = child->ConvertRectToWidget(child->GetLocalBounds());
diff --git a/chrome/browser/ui/views/tabs/tab_group_views.h b/chrome/browser/ui/views/tabs/tab_group_views.h index f5565ef2..39242ab7 100644 --- a/chrome/browser/ui/views/tabs/tab_group_views.h +++ b/chrome/browser/ui/views/tabs/tab_group_views.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_TABS_TAB_GROUP_VIEWS_H_ #include <memory> + #include "base/memory/raw_ptr.h" #include "base/memory/raw_ref.h" #include "chrome/browser/ui/views/tabs/tab_slot_controller.h"
diff --git a/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc b/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc index b09c5b6e..6128377 100644 --- a/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc +++ b/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc
@@ -386,12 +386,12 @@ // navigating through the tab strip. set_focus_traversable_from_anchor_view(false); - title_label_ = AddChildView(std::make_unique<FadeLabelView>( - kHoverCardTitleMaxLines, CONTEXT_TAB_HOVER_CARD_TITLE, - views::style::STYLE_BODY_3_EMPHASIS)); - domain_label_ = AddChildView(std::make_unique<FadeLabelView>( - 1, views::style::CONTEXT_DIALOG_BODY_TEXT, views::style::STYLE_BODY_4)); - domain_label_->SetEnabledColorId(kColorTabHoverCardSecondaryText); + title_label_ = AddChildView(std::make_unique<FadeLabelView>( + kHoverCardTitleMaxLines, CONTEXT_TAB_HOVER_CARD_TITLE, + views::style::STYLE_BODY_3_EMPHASIS)); + domain_label_ = AddChildView(std::make_unique<FadeLabelView>( + 1, views::style::CONTEXT_DIALOG_BODY_TEXT, views::style::STYLE_BODY_4)); + domain_label_->SetEnabledColorId(kColorTabHoverCardSecondaryText); if (bubble_params_.show_image_preview) { thumbnail_view_ = AddChildView(std::make_unique<ThumbnailView>(this));
diff --git a/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view_unittest.cc b/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view_unittest.cc index b6f4c49..a7e3107 100644 --- a/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view_unittest.cc +++ b/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view_unittest.cc
@@ -29,8 +29,9 @@ auto render_text = gfx::RenderText::CreateRenderText(); render_text->set_glyph_width_for_test(kGlyphWidth); render_text->set_glyph_height_for_test(kGlyphHeight); - if (!text.empty()) + if (!text.empty()) { render_text->SetText(text); + } return render_text; }
diff --git a/chrome/browser/ui/views/tabs/tab_hover_card_controller.cc b/chrome/browser/ui/views/tabs/tab_hover_card_controller.cc index 6866590f..083b725b 100644 --- a/chrome/browser/ui/views/tabs/tab_hover_card_controller.cc +++ b/chrome/browser/ui/views/tabs/tab_hover_card_controller.cc
@@ -248,8 +248,9 @@ Tab* tab, TabSlotController::HoverCardUpdateType update_type) { // Never display a hover card for a closing tab. - if (tab && tab->closing()) + if (tab && tab->closing()) { tab = nullptr; + } // Update this ASAP so that if we try to fade-in and we have the wrong target // then when the fade timer elapses we won't incorrectly try to fade in on the @@ -257,22 +258,25 @@ if (target_tab_ != tab) { delayed_show_timer_.Stop(); target_tab_observation_.Reset(); - if (tab) + if (tab) { target_tab_observation_.Observe(tab); + } target_tab_ = tab; } // If there's nothing to attach to then there's no point in creating a card. - if (!hover_card_ && (!tab || !tab_strip_->GetWidget())) + if (!hover_card_ && (!tab || !tab_strip_->GetWidget())) { return; + } switch (update_type) { case TabSlotController::HoverCardUpdateType::kSelectionChanged: ResetCardsSeenCount(); break; case TabSlotController::HoverCardUpdateType::kHover: - if (!tab) + if (!tab) { last_mouse_exit_timestamp_ = base::TimeTicks::Now(); + } break; case TabSlotController::HoverCardUpdateType::kTabDataChanged: DCHECK(tab && IsHoverCardShowingForTab(tab)); @@ -288,10 +292,11 @@ break; } - if (tab) + if (tab) { UpdateOrShowCard(tab, update_type); - else + } else { HideHoverCard(); + } } void TabHoverCardController::PreventImmediateReshow() { @@ -352,8 +357,9 @@ // eliminates the show timer, lest the tests have to be significantly more // complex and time-consuming. const bool is_initial = !ShouldShowImmediately(tab); - if (is_initial) + if (is_initial) { ResetCardsSeenCount(); + } if (is_initial && !disable_animations_for_testing_) { delayed_show_timer_.Start( FROM_HERE, GetShowDelay(tab->width()), @@ -373,8 +379,9 @@ const Tab* intended_tab) { // Make sure the hover card isn't accidentally shown if it's already visible // or if the anchor is gone or changed. - if (hover_card_ || target_tab_ != intended_tab || !TargetTabIsValid()) + if (hover_card_ || target_tab_ != intended_tab || !TargetTabIsValid()) { return; + } CreateHoverCard(target_tab_); @@ -406,8 +413,9 @@ } void TabHoverCardController::HideHoverCard() { - if (!hover_card_ || hover_card_->GetWidget()->IsClosed()) + if (!hover_card_ || hover_card_->GetWidget()->IsClosed()) { return; + } // Required for test metrics. hover_card_last_seen_on_tab_ = nullptr; @@ -418,8 +426,9 @@ } // Cancel any pending fade-in. - if (fade_animator_->IsFadingIn()) + if (fade_animator_->IsFadingIn()) { fade_animator_->CancelFadeIn(); + } // This needs to be called whether we're doing a fade or a pop out. slide_animator_->StopAnimation(); @@ -427,8 +436,9 @@ hover_card_->GetWidget()->Close(); return; } - if (fade_animator_->IsFadingOut()) + if (fade_animator_->IsFadingOut()) { return; + } fade_animator_->FadeOut(); } @@ -525,8 +535,9 @@ void TabHoverCardController::UpdateCardContent(Tab* tab) { // If the hover card is transitioning between tabs, we need to do a // cross-fade. - if (hover_card_->GetAnchorView() != tab) + if (hover_card_->GetAnchorView() != tab) { hover_card_->SetTextFade(0.0); + } hover_card_->UpdateCardContent(tab); } @@ -536,8 +547,9 @@ bool is_initial_show) { // If the preview image feature is not enabled, |thumbnail_observer_| will be // null. - if (!thumbnail_observer_) + if (!thumbnail_observer_) { return; + } // Active tabs don't get thumbnails. if (tab->IsActive()) { @@ -558,8 +570,9 @@ return; } - if (thumbnail == thumbnail_observer_->current_image()) + if (thumbnail == thumbnail_observer_->current_image()) { return; + } // We're probably going ask for a preview image, so figure out whether we // want to capture now, later, or at all, and whether to show a placeholder @@ -606,8 +619,9 @@ } // If we've already waiting on this tab, we're done. - if (delayed_show_timer_.IsRunning()) + if (delayed_show_timer_.IsRunning()) { return; + } // Stop updating the preview image unless/until we re-enable capture. thumbnail_observer_->Observe(nullptr); @@ -618,8 +632,9 @@ // If we've elected to put off capture indefinitely (likely due to memory // pressure), there's no additional work to do. - if (capture_delay.is_inf()) + if (capture_delay.is_inf()) { return; + } // Start a delayed capture. delayed_show_timer_.Start( @@ -629,8 +644,9 @@ } void TabHoverCardController::StartThumbnailObservation(Tab* tab) { - if (tab != target_tab_) + if (tab != target_tab_) { return; + } // If the preview image feature is not enabled, |thumbnail_observer_| will be // null. @@ -658,8 +674,9 @@ } auto thumbnail = tab->data().thumbnail; - if (!thumbnail || thumbnail == thumbnail_observer_->current_image()) + if (!thumbnail || thumbnail == thumbnail_observer_->current_image()) { return; + } thumbnail_observer_->Observe(thumbnail); } @@ -685,10 +702,12 @@ } const views::View* TabHoverCardController::GetTargetAnchorView() const { - if (!hover_card_) + if (!hover_card_) { return nullptr; - if (slide_animator_->is_animating()) + } + if (slide_animator_->is_animating()) { return slide_animator_->desired_anchor_view(); + } return hover_card_->GetAnchorView(); } @@ -722,18 +741,22 @@ // There's a potential race condition where we get the fade in complete signal // just as we've decided to fade out, so check for null. // See: crbug.com/1192451 - if (target_tab_ && fade_type == views::WidgetFadeAnimator::FadeType::kFadeIn) + if (target_tab_ && + fade_type == views::WidgetFadeAnimator::FadeType::kFadeIn) { OnCardFullyVisible(); + } - if (fade_type == views::WidgetFadeAnimator::FadeType::kFadeOut) + if (fade_type == views::WidgetFadeAnimator::FadeType::kFadeOut) { hover_card_->GetWidget()->Close(); + } } void TabHoverCardController::OnSlideAnimationProgressed( views::BubbleSlideAnimator* animator, double value) { - if (hover_card_) + if (hover_card_) { hover_card_->SetTextFade(value); + } if (thumbnail_wait_state_ == ThumbnailWaitState::kWaitingWithoutPlaceholder) { const auto crossfade_start = TabHoverCardBubbleView::GetPreviewImageCrossfadeStart(); @@ -770,8 +793,9 @@ thumbnail_wait_state_ = ThumbnailWaitState::kNotWaiting; // The hover card could be destroyed before the preview image is delivered. - if (!hover_card_) + if (!hover_card_) { return; + } // Can still set image on a fading-out hover card (we can change this behavior // later if we want). hover_card_->SetTargetTabImage(thumbnail_image);
diff --git a/chrome/browser/ui/views/tabs/tab_hover_card_controller_interactive_uitest.cc b/chrome/browser/ui/views/tabs/tab_hover_card_controller_interactive_uitest.cc index ac79f0f..b94c9f8 100644 --- a/chrome/browser/ui/views/tabs/tab_hover_card_controller_interactive_uitest.cc +++ b/chrome/browser/ui/views/tabs/tab_hover_card_controller_interactive_uitest.cc
@@ -194,15 +194,15 @@ // Because this test depends on Aura event handling, it is not performed on Mac. IN_PROC_BROWSER_TEST_F(TabHoverCardInteractiveUiTest, HoverCardHidesOnAnyKeyPressInSameWindow) { - RunTestSequence(InstrumentTab(kFirstTabContents, 0), - NavigateWebContents(kFirstTabContents, - GURL(chrome::kChromeUINewTabURL)), - HoverTabAt(0), CheckHovercardIsOpen(), - Check(base::BindLambdaForTesting([=, this]() { - return ui_test_utils::SendKeyPressSync( - browser(), ui::VKEY_DOWN, false, false, false, false); - })), - CheckHovercardIsClosed()); + RunTestSequence( + InstrumentTab(kFirstTabContents, 0), + NavigateWebContents(kFirstTabContents, GURL(chrome::kChromeUINewTabURL)), + HoverTabAt(0), CheckHovercardIsOpen(), + Check(base::BindLambdaForTesting([=, this]() { + return ui_test_utils::SendKeyPressSync(browser(), ui::VKEY_DOWN, false, + false, false, false); + })), + CheckHovercardIsClosed()); } #endif @@ -293,8 +293,9 @@ AddTabAtIndex(1, GURL(url::kAboutBlankURL), ui::PAGE_TRANSITION_TYPED)); // Cycle focus until it reaches a tab. - while (!tab_strip->IsFocusInTabs()) + while (!tab_strip->IsFocusInTabs()) { browser()->command_controller()->ExecuteCommand(IDC_FOCUS_NEXT_PANE); + } WaitForHoverCardVisible(tab_strip); @@ -767,9 +768,8 @@ EXPECT_FALSE(footer_view->GetVisible()); } -IN_PROC_BROWSER_TEST_F( - TabHoverCardFadeFooterInteractiveUiTest, - BackgroundTabHoverCardContentsHaveCorrectDimensions) { +IN_PROC_BROWSER_TEST_F(TabHoverCardFadeFooterInteractiveUiTest, + BackgroundTabHoverCardContentsHaveCorrectDimensions) { TabStrip* const tab_strip = GetTabStrip(browser()); ASSERT_TRUE( AddTabAtIndex(1, GURL(url::kAboutBlankURL), ui::PAGE_TRANSITION_TYPED));
diff --git a/chrome/browser/ui/views/tabs/tab_hover_card_test_util.cc b/chrome/browser/ui/views/tabs/tab_hover_card_test_util.cc index 56f9ecfe..b259a913 100644 --- a/chrome/browser/ui/views/tabs/tab_hover_card_test_util.cc +++ b/chrome/browser/ui/views/tabs/tab_hover_card_test_util.cc
@@ -75,16 +75,18 @@ TabHoverCardTestUtil::HoverCardDestroyedWaiter::HoverCardDestroyedWaiter( TabStrip* tab_strip) { auto* const hover_card = GetHoverCard(tab_strip); - if (hover_card && hover_card->GetWidget()) + if (hover_card && hover_card->GetWidget()) { observation_.Observe(hover_card->GetWidget()); + } } TabHoverCardTestUtil::HoverCardDestroyedWaiter::~HoverCardDestroyedWaiter() = default; void TabHoverCardTestUtil::HoverCardDestroyedWaiter::Wait() { - if (!observation_.IsObserving()) + if (!observation_.IsObserving()) { return; + } DCHECK(quit_closure_.is_null()); quit_closure_ = run_loop_.QuitClosure(); run_loop_.Run(); @@ -94,8 +96,9 @@ void TabHoverCardTestUtil::HoverCardDestroyedWaiter::OnWidgetDestroyed( views::Widget* widget) { observation_.Reset(); - if (!quit_closure_.is_null()) + if (!quit_closure_.is_null()) { std::move(quit_closure_).Run(); + } } } // namespace test
diff --git a/chrome/browser/ui/views/tabs/tab_hover_card_thumbnail_observer.cc b/chrome/browser/ui/views/tabs/tab_hover_card_thumbnail_observer.cc index f8819fb..bcad8f7 100644 --- a/chrome/browser/ui/views/tabs/tab_hover_card_thumbnail_observer.cc +++ b/chrome/browser/ui/views/tabs/tab_hover_card_thumbnail_observer.cc
@@ -11,13 +11,15 @@ void TabHoverCardThumbnailObserver::Observe( scoped_refptr<ThumbnailImage> thumbnail_image) { - if (current_image_ == thumbnail_image) + if (current_image_ == thumbnail_image) { return; + } subscription_.reset(); current_image_ = std::move(thumbnail_image); - if (!current_image_) + if (!current_image_) { return; + } subscription_ = current_image_->Subscribe(); if (!current_image_) { @@ -41,6 +43,7 @@ void TabHoverCardThumbnailObserver::ThumbnailImageCallback( const ThumbnailImage* image, gfx::ImageSkia preview_image) { - if (image == current_image_.get()) + if (image == current_image_.get()) { callback_list_.Notify(this, preview_image); + } }
diff --git a/chrome/browser/ui/views/tabs/tab_scrubber_chromeos.cc b/chrome/browser/ui/views/tabs/tab_scrubber_chromeos.cc index 8a06b15..a5740ae 100644 --- a/chrome/browser/ui/views/tabs/tab_scrubber_chromeos.cc +++ b/chrome/browser/ui/views/tabs/tab_scrubber_chromeos.cc
@@ -30,8 +30,9 @@ // static TabScrubberChromeOS* TabScrubberChromeOS::GetInstance() { static TabScrubberChromeOS* instance = nullptr; - if (!instance) + if (!instance) { instance = new TabScrubberChromeOS(); + } return instance; } @@ -51,8 +52,9 @@ // The contents insets are logical rather than physical, so reverse them for // RTL. - if (base::i18n::IsRTL()) + if (base::i18n::IsRTL()) { std::swap(left, right); + } // For very narrow tabs, the contents insets may be too large. Clamp to the // opposite edges of the tab, which should be at (overlap / 2). @@ -161,15 +163,17 @@ } else if (highlighted_tab_ == -1) { // Has the direction of the swipe changed while scrubbing? Direction direction = (x_offset < 0) ? LEFT : RIGHT; - if (direction != swipe_direction_) + if (direction != swipe_direction_) { ScrubDirectionChanged(direction); + } } UpdateSwipeX(x_offset); Tab* new_tab = tab_strip_->GetTabAt(gfx::Point(swipe_x_, swipe_y_)); - if (!new_tab) + if (!new_tab) { return; + } int new_index = tab_strip_->GetModelIndexOf(new_tab).value(); if (highlighted_tab_ == -1 && @@ -178,10 +182,11 @@ } if (new_index != highlighted_tab_) { - if (activate_timer_.IsRunning()) + if (activate_timer_.IsRunning()) { activate_timer_.Reset(); - else + } else { ScheduleFinishScrubIfNeeded(); + } } UpdateHighlightedTab(new_tab, new_index); @@ -194,8 +199,9 @@ } void TabScrubberChromeOS::OnBrowserRemoved(Browser* browser) { - if (browser != browser_) + if (browser != browser_) { return; + } if (browser_) { BrowserView::GetBrowserViewForBrowser(browser_) @@ -213,34 +219,40 @@ } void TabScrubberChromeOS::OnTabAdded(int index) { - if (highlighted_tab_ == -1) + if (highlighted_tab_ == -1) { return; + } - if (index < highlighted_tab_) + if (index < highlighted_tab_) { ++highlighted_tab_; + } } void TabScrubberChromeOS::OnTabMoved(int from_index, int to_index) { - if (highlighted_tab_ == -1) + if (highlighted_tab_ == -1) { return; + } - if (from_index == highlighted_tab_) + if (from_index == highlighted_tab_) { highlighted_tab_ = to_index; - else if (from_index < highlighted_tab_ && highlighted_tab_ <= to_index) + } else if (from_index < highlighted_tab_ && highlighted_tab_ <= to_index) { --highlighted_tab_; - else if (from_index > highlighted_tab_ && highlighted_tab_ >= to_index) + } else if (from_index > highlighted_tab_ && highlighted_tab_ >= to_index) { ++highlighted_tab_; + } } void TabScrubberChromeOS::OnTabRemoved(int index) { - if (highlighted_tab_ == -1) + if (highlighted_tab_ == -1) { return; + } if (index == highlighted_tab_) { FinishScrub(false); return; } - if (index < highlighted_tab_) + if (index < highlighted_tab_) { --highlighted_tab_; + } } Browser* TabScrubberChromeOS::GetActiveBrowser() { @@ -351,8 +363,9 @@ // that minimum reduction). Please note, x_offset might be negative. float min = 0.25 * x_offset; float max = x_offset; - if (x_offset < 0) + if (x_offset < 0) { std::swap(min, max); + } swipe_x_ += std::clamp( x_offset - (tab_strip_->GetTabCount() * 0.02f * x_offset), min, max); @@ -367,18 +380,21 @@ Tab* last_tab = tab_strip_->tab_at(last_tab_index); int last_tab_center = last_tab->GetMirroredBounds().CenterPoint().x(); - if (swipe_x_ < first_tab_center) + if (swipe_x_ < first_tab_center) { swipe_x_ = first_tab_center; - if (swipe_x_ > last_tab_center) + } + if (swipe_x_ > last_tab_center) { swipe_x_ = last_tab_center; + } } void TabScrubberChromeOS::UpdateHighlightedTab(Tab* new_tab, int new_index) { DCHECK(scrubbing_); DCHECK(new_tab); - if (new_index == highlighted_tab_) + if (new_index == highlighted_tab_) { return; + } if (highlighted_tab_ != -1) { Tab* tab = tab_strip_->tab_at(highlighted_tab_);
diff --git a/chrome/browser/ui/views/tabs/tab_scrubber_chromeos_browsertest.cc b/chrome/browser/ui/views/tabs/tab_scrubber_chromeos_browsertest.cc index 516df6af..ee8d4b6 100644 --- a/chrome/browser/ui/views/tabs/tab_scrubber_chromeos_browsertest.cc +++ b/chrome/browser/ui/views/tabs/tab_scrubber_chromeos_browsertest.cc
@@ -54,13 +54,15 @@ delete; ~ImmersiveRevealEndedWaiter() override { - if (immersive_controller_) + if (immersive_controller_) { immersive_controller_->RemoveObserver(this); + } } void Wait() { - if (!immersive_controller_ || !immersive_controller_->IsRevealed()) + if (!immersive_controller_ || !immersive_controller_->IsRevealed()) { return; + } base::RunLoop run_loop; quit_closure_ = run_loop.QuitClosure(); @@ -69,8 +71,9 @@ private: void MaybeQuitRunLoop() { - if (!quit_closure_.is_null()) + if (!quit_closure_.is_null()) { std::move(quit_closure_).Run(); + } } // ImmersiveModeController::Observer: @@ -203,8 +206,9 @@ direction = InvertDirectionIfNeeded(direction); - if (scrub_type == SKIP_TABS) + if (scrub_type == SKIP_TABS) { increment *= 2; + } browser->tab_strip_model()->AddObserver(this); ScrollGenerator scroll_generator(event_generator.get()); int last = GetStartX(browser, active_index, direction); @@ -254,8 +258,9 @@ void AddTabs(Browser* browser, int num_tabs) { TabStrip* tab_strip = GetTabStrip(browser); - for (int i = 0; i < num_tabs; ++i) + for (int i = 0; i < num_tabs; ++i) { AddBlankTabAndShow(browser); + } ASSERT_EQ(num_tabs + 1, browser->tab_strip_model()->count()); ASSERT_EQ(num_tabs, browser->tab_strip_model()->active_index()); tab_strip->StopAnimating(true); @@ -271,8 +276,9 @@ TabStripModel* tab_strip_model, const TabStripModelChange& change, const TabStripSelectionChange& selection) override { - if (tab_strip_model->empty() || !selection.active_tab_changed()) + if (tab_strip_model->empty() || !selection.active_tab_changed()) { return; + } ASSERT_TRUE(selection.new_model.active().has_value()); activation_order_.push_back(selection.new_model.active().value()); @@ -299,8 +305,9 @@ gfx::Point(), time_for_next_event_, 0, 0, 0, 0, 0, kScrubbingGestureFingerCount); event_generator->Dispatch(&fling_cancel); - if (TabScrubberChromeOS::GetInstance()->IsActivationPending()) + if (TabScrubberChromeOS::GetInstance()->IsActivationPending()) { TabScrubberChromeOS::GetInstance()->FinishScrub(true); + } } ScrollGenerator(const ScrollGenerator&) = delete; @@ -312,8 +319,9 @@ last_x_offset_, 0, last_x_offset_, 0, kScrubbingGestureFingerCount); event_generator_->Dispatch(&fling_start); - if (TabScrubberChromeOS::GetInstance()->IsActivationPending()) + if (TabScrubberChromeOS::GetInstance()->IsActivationPending()) { TabScrubberChromeOS::GetInstance()->FinishScrub(true); + } } void GenerateScroll(int x_offset) { @@ -323,8 +331,9 @@ kScrubbingGestureFingerCount); last_x_offset_ = x_offset; event_generator_->Dispatch(&scroll); - if (TabScrubberChromeOS::GetInstance()->IsActivationPending()) + if (TabScrubberChromeOS::GetInstance()->IsActivationPending()) { TabScrubberChromeOS::GetInstance()->FinishScrub(true); + } } raw_ptr<ui::test::EventGenerator> event_generator_;
diff --git a/chrome/browser/ui/views/tabs/tab_slot_view.cc b/chrome/browser/ui/views/tabs/tab_slot_view.cc index 848d3f5..8fa34f2 100644 --- a/chrome/browser/ui/views/tabs/tab_slot_view.cc +++ b/chrome/browser/ui/views/tabs/tab_slot_view.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/views/tabs/tab_slot_view.h" + #include "ui/base/metadata/metadata_impl_macros.h" TabSlotView::TabSlotView() = default;
diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc index bef578b0..e1d6a12c 100644 --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc
@@ -2136,7 +2136,6 @@ } void TabStrip::CloseTabInternal(int model_index, CloseTabSource source) { - if (!tab_container_->InTabClose() && IsAnimating()) { // Cancel any current animations. We do this as remove uses the current // ideal bounds and we need to know ideal bounds is in a good state.
diff --git a/chrome/browser/ui/views/tabs/tab_strip_browsertest.cc b/chrome/browser/ui/views/tabs/tab_strip_browsertest.cc index 22643d8..a702322 100644 --- a/chrome/browser/ui/views/tabs/tab_strip_browsertest.cc +++ b/chrome/browser/ui/views/tabs/tab_strip_browsertest.cc
@@ -61,16 +61,18 @@ std::vector<content::WebContents*> GetWebContentses() { std::vector<content::WebContents*> contentses; - for (int i = 0; i < tab_strip()->GetTabCount(); ++i) + for (int i = 0; i < tab_strip()->GetTabCount(); ++i) { contentses.push_back(tab_strip_model()->GetWebContentsAt(i)); + } return contentses; } std::vector<content::WebContents*> GetWebContentsesInOrder( const std::vector<int>& order) { std::vector<content::WebContents*> contentses; - for (int i = 0; i < tab_strip()->GetTabCount(); ++i) + for (int i = 0; i < tab_strip()->GetTabCount(); ++i) { contentses.push_back(tab_strip_model()->GetWebContentsAt(order[i])); + } return contentses; } @@ -1171,8 +1173,9 @@ IN_PROC_BROWSER_TEST_F(TabStripBrowsertest, TabGroupTabNavigationAccelerators) { ASSERT_TRUE(browser()->tab_strip_model()->SupportsTabGroups()); // Create five tabs. - for (int i = 0; i < 4; i++) + for (int i = 0; i < 4; i++) { AppendTab(); + } ASSERT_EQ(5, tab_strip_model()->count());
diff --git a/chrome/browser/ui/views/tabs/tab_strip_controller.h b/chrome/browser/ui/views/tabs/tab_strip_controller.h index 65545558..09f7746 100644 --- a/chrome/browser/ui/views/tabs/tab_strip_controller.h +++ b/chrome/browser/ui/views/tabs/tab_strip_controller.h
@@ -35,7 +35,7 @@ namespace ui { class Event; class ListSelectionModel; -} +} // namespace ui // Model/Controller for the TabStrip. // NOTE: All indices used by this class are in model coordinates.
diff --git a/chrome/browser/ui/views/tabs/tab_strip_layout.cc b/chrome/browser/ui/views/tabs/tab_strip_layout.cc index 2e400955c..fc3f2ab5 100644 --- a/chrome/browser/ui/views/tabs/tab_strip_layout.cc +++ b/chrome/browser/ui/views/tabs/tab_strip_layout.cc
@@ -21,8 +21,9 @@ const TabLayoutConstants& layout_constants, const std::vector<TabWidthConstraints>& tabs, std::optional<int> width) { - if (!width.has_value()) + if (!width.has_value()) { return TabSizer(LayoutDomain::kInactiveWidthEqualsActiveWidth, 1); + } float minimum_width = 0; float crossover_width = 0; @@ -88,8 +89,9 @@ } bool TabSizer::TabAcceptsExtraSpace(const TabWidthConstraints& tab) const { - if (space_fraction_available_ == 0.0f || space_fraction_available_ == 1.0f) + if (space_fraction_available_ == 0.0f || space_fraction_available_ == 1.0f) { return false; + } switch (domain_) { case LayoutDomain::kInactiveWidthBelowActiveWidth: return tab.GetMinimumWidth() < tab.GetLayoutCrossoverWidth(); @@ -111,8 +113,9 @@ std::optional<int> extra_space, TabSizer tab_sizer) { // Don't expand tabs if they are already at their preferred width. - if (tab_sizer.IsAlreadyPreferredWidth() || !extra_space.has_value()) + if (tab_sizer.IsAlreadyPreferredWidth() || !extra_space.has_value()) { return; + } int allocated_extra_space = 0; for (size_t i = 0; i < tabs.size(); i++) { @@ -130,8 +133,9 @@ const TabLayoutConstants& layout_constants, const std::vector<TabWidthConstraints>& tabs, std::optional<int> width) { - if (tabs.empty()) + if (tabs.empty()) { return std::vector<gfx::Rect>(); + } TabSizer tab_sizer = CalculateSpaceFractionAvailable(layout_constants, tabs, width);
diff --git a/chrome/browser/ui/views/tabs/tab_strip_layout_helper.cc b/chrome/browser/ui/views/tabs/tab_strip_layout_helper.cc index 5a963aa6..b7a6e81 100644 --- a/chrome/browser/ui/views/tabs/tab_strip_layout_helper.cc +++ b/chrome/browser/ui/views/tabs/tab_strip_layout_helper.cc
@@ -74,8 +74,9 @@ std::vector<Tab*> TabStripLayoutHelper::GetTabs() const { std::vector<Tab*> tabs; for (const TabSlot& slot : slots_) { - if (slot.type == ViewType::kTab) + if (slot.type == ViewType::kTab) { tabs.push_back(static_cast<Tab*>(slot.view)); + } } return tabs; @@ -83,8 +84,9 @@ std::vector<TabSlotView*> TabStripLayoutHelper::GetTabSlotViews() const { std::vector<TabSlotView*> views; - for (const TabSlot& slot : slots_) + for (const TabSlot& slot : slots_) { views.push_back(slot.view); + } return views; } @@ -117,8 +119,9 @@ auto it = base::ranges::find_if(slots_, [tab](const TabSlot& slot) { return slot.type == ViewType::kTab && slot.view == tab; }); - if (it != slots_.end()) + if (it != slots_.end()) { slots_.erase(it); + } } void TabStripLayoutHelper::MoveTab( @@ -133,8 +136,9 @@ GetSlotInsertionIndexForNewTab(new_index, moving_tab_group); slots_.insert(slots_.begin() + new_slot_index, moving_tab); - if (moving_tab_group.has_value()) + if (moving_tab_group.has_value()) { UpdateGroupHeaderIndex(moving_tab_group.value()); + } } void TabStripLayoutHelper::SetTabPinned(int model_index, TabPinned pinned) { @@ -315,8 +319,9 @@ std::optional<tab_groups::TabGroupId> group) const { int slot_index = GetFirstSlotIndexForTabModelIndex(new_model_index); - if (slot_index == static_cast<int>(slots_.size())) + if (slot_index == static_cast<int>(slots_.size())) { return slot_index; + } // If |slot_index| points to a group header and the new tab's |group| // matches, the tab goes to the right of the header to keep it @@ -361,14 +366,17 @@ // We simply return the first slot that has a matching model index. for (int slot_index = 0; slot_index < static_cast<int>(slots_.size()); ++slot_index) { - if (slots_[slot_index].state.IsClosed()) + if (slots_[slot_index].state.IsClosed()) { continue; + } - if (model_index == current_model_index) + if (model_index == current_model_index) { return slot_index; + } - if (slots_[slot_index].type == ViewType::kTab) + if (slots_[slot_index].type == ViewType::kTab) { current_model_index += 1; + } } // If there's no slot in |slots_| corresponding to |model_index|, then @@ -394,12 +402,14 @@ bool active) { // If the slot is collapsed, its width should never be reported as the // current active or inactive tab width - it's not even visible. - if (SlotIsCollapsedTab(tab_index)) + if (SlotIsCollapsedTab(tab_index)) { return; - if (active) + } + if (active) { active_tab_width_ = tab_width; - else + } else { inactive_tab_width_ = tab_width; + } } bool TabStripLayoutHelper::SlotIsCollapsedTab(int i) const {
diff --git a/chrome/browser/ui/views/tabs/tab_strip_layout_unittest.cc b/chrome/browser/ui/views/tabs/tab_strip_layout_unittest.cc index 6d68407..89ce0f5 100644 --- a/chrome/browser/ui/views/tabs/tab_strip_layout_unittest.cc +++ b/chrome/browser/ui/views/tabs/tab_strip_layout_unittest.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/ui/views/tabs/tab_strip_layout.h" #include <stddef.h> + #include <string> #include "base/strings/string_number_conversions.h" @@ -21,8 +22,9 @@ std::string TabWidthsAsString(const std::vector<gfx::Rect>& tab_bounds) { std::string result; for (const auto& bounds : tab_bounds) { - if (!result.empty()) + if (!result.empty()) { result += " "; + } result += base::NumberToString(bounds.width()); } return result; @@ -33,8 +35,9 @@ std::string TabXPositionsAsString(const std::vector<gfx::Rect>& tab_bounds) { std::string result; for (const auto& bounds : tab_bounds) { - if (!result.empty()) + if (!result.empty()) { result += " "; + } result += base::NumberToString(bounds.x()); } return result;
diff --git a/chrome/browser/ui/views/tabs/tab_strip_scroll_container.cc b/chrome/browser/ui/views/tabs/tab_strip_scroll_container.cc index d8d7ea53..a2e21a2 100644 --- a/chrome/browser/ui/views/tabs/tab_strip_scroll_container.cc +++ b/chrome/browser/ui/views/tabs/tab_strip_scroll_container.cc
@@ -3,7 +3,6 @@ // found in the LICENSE file. #include "chrome/browser/ui/views/tabs/tab_strip_scroll_container.h" -#include <memory> #include <memory>
diff --git a/chrome/browser/ui/views/tabs/tab_strip_scroll_container_unittest.cc b/chrome/browser/ui/views/tabs/tab_strip_scroll_container_unittest.cc index f23d10f..885e19be 100644 --- a/chrome/browser/ui/views/tabs/tab_strip_scroll_container_unittest.cc +++ b/chrome/browser/ui/views/tabs/tab_strip_scroll_container_unittest.cc
@@ -3,8 +3,10 @@ // found in the LICENSE file. #include "chrome/browser/ui/views/tabs/tab_strip_scroll_container.h" + #include <cstddef> #include <memory> + #include "chrome/browser/ui/views/tabs/tab_strip.h" #include "chrome/test/views/chrome_views_test_base.h" #include "fake_base_tab_strip_controller.h"
diff --git a/chrome/browser/ui/views/tabs/tab_strip_scroll_session.cc b/chrome/browser/ui/views/tabs/tab_strip_scroll_session.cc index 02a41d99..b18e45d20 100644 --- a/chrome/browser/ui/views/tabs/tab_strip_scroll_session.cc +++ b/chrome/browser/ui/views/tabs/tab_strip_scroll_session.cc
@@ -35,14 +35,17 @@ TabStripScrollSessionWithTimer::~TabStripScrollSessionWithTimer() = default; void TabStripScrollSessionWithTimer::MaybeStart() { - if (!tab_drag_with_scroll_manager_->GetAttachedContext() || IsRunning()) + if (!tab_drag_with_scroll_manager_->GetAttachedContext() || IsRunning()) { return; + } const TabStripScrollSession::TabScrollDirection scroll_direction = GetTabScrollDirection(); - if (scroll_direction != TabStripScrollSession::TabScrollDirection::kNoScroll) + if (scroll_direction != + TabStripScrollSession::TabScrollDirection::kNoScroll) { Start(scroll_direction); + } } void TabStripScrollSessionWithTimer::Start(TabScrollDirection direction) { @@ -100,13 +103,12 @@ return tab_scroll_offset; case TabStripScrollSessionWithTimer::ScrollSessionTimerType::kVariableTimer: if (scroll_direction_ == TabScrollDirection::kScrollTowardsTrailingTabs) { - return ceil( - std::clamp(GetRatioInScrollableRegion() * tab_scroll_offset, 0.0, - CalculateBaseScrollOffset() * 3)); + return ceil(std::clamp(GetRatioInScrollableRegion() * tab_scroll_offset, + 0.0, CalculateBaseScrollOffset() * 3)); } else { return floor( std::clamp(GetRatioInScrollableRegion() * tab_scroll_offset, - CalculateBaseScrollOffset() * -3, 0.0)); + CalculateBaseScrollOffset() * -3, 0.0)); } default: NOTREACHED();
diff --git a/chrome/browser/ui/views/tabs/tab_strip_unittest.cc b/chrome/browser/ui/views/tabs/tab_strip_unittest.cc index c12a394..59c2cc05 100644 --- a/chrome/browser/ui/views/tabs/tab_strip_unittest.cc +++ b/chrome/browser/ui/views/tabs/tab_strip_unittest.cc
@@ -210,8 +210,9 @@ std::vector<TabGroupViews*> ListGroupViews() const { std::vector<TabGroupViews*> result; for (auto const& group_view_pair : - tab_strip_->tab_container_->get_group_views_for_testing()) + tab_strip_->tab_container_->get_group_views_for_testing()) { result.push_back(group_view_pair.second.get()); + } return result; } @@ -898,15 +899,17 @@ for (; invisible_tab_index < 100; ++invisible_tab_index) { controller_->AddTab(invisible_tab_index, TabActive::kInactive); CompleteAnimationAndLayout(); - if (!tab_strip_->tab_at(invisible_tab_index)->GetVisible()) + if (!tab_strip_->tab_at(invisible_tab_index)->GetVisible()) { break; + } } EXPECT_GT(invisible_tab_index, 0); EXPECT_LT(invisible_tab_index, 100); // The tabs before the invisible tab should still be visible. - for (int i = 0; i < invisible_tab_index; ++i) + for (int i = 0; i < invisible_tab_index; ++i) { EXPECT_TRUE(tab_strip_->tab_at(i)->GetVisible()); + } // Enlarging the strip should result in the last tab becoming visible. SetMaxTabStripWidth(kInitialWidth * 2); @@ -921,14 +924,16 @@ SetMaxTabStripWidth(kInitialWidth / 2); int i = 0; for (; i < invisible_tab_index; ++i) { - if (!tab_strip_->tab_at(i)->GetVisible()) + if (!tab_strip_->tab_at(i)->GetVisible()) { break; + } } ASSERT_GT(i, 0); EXPECT_LT(i, invisible_tab_index); invisible_tab_index = i; - for (int j = invisible_tab_index + 1; j < tab_strip_->GetTabCount(); ++j) + for (int j = invisible_tab_index + 1; j < tab_strip_->GetTabCount(); ++j) { EXPECT_FALSE(tab_strip_->tab_at(j)->GetVisible()); + } // When we're already in overflow, adding tabs at the beginning or end of // the strip should not change how many tabs are visible. @@ -942,8 +947,9 @@ EXPECT_FALSE(tab_strip_->tab_at(invisible_tab_index)->GetVisible()); // If we remove enough tabs, all the tabs should be visible. - for (int j = tab_strip_->GetTabCount() - 1; j >= invisible_tab_index; --j) + for (int j = tab_strip_->GetTabCount() - 1; j >= invisible_tab_index; --j) { controller_->RemoveTab(j); + } CompleteAnimationAndLayout(); EXPECT_TRUE(tab_strip_->tab_at(tab_strip_->GetTabCount() - 1)->GetVisible()); } @@ -959,15 +965,17 @@ for (; invisible_tab_index < 100; ++invisible_tab_index) { controller_->AddTab(invisible_tab_index, TabActive::kInactive); CompleteAnimationAndLayout(); - if (!tab_strip_->tab_at(invisible_tab_index)->GetVisible()) + if (!tab_strip_->tab_at(invisible_tab_index)->GetVisible()) { break; + } } ASSERT_GT(invisible_tab_index, 0); ASSERT_LT(invisible_tab_index, 100); // The tabs before the invisible tab should still be visible. - for (int i = 0; i < invisible_tab_index; ++i) + for (int i = 0; i < invisible_tab_index; ++i) { ASSERT_TRUE(tab_strip_->tab_at(i)->GetVisible()); + } // The group header of an invisible tab should not be visible. std::optional<tab_groups::TabGroupId> group1 =
diff --git a/chrome/browser/ui/views/tabs/tab_style_views.cc b/chrome/browser/ui/views/tabs/tab_style_views.cc index 4d06216e..c6957ab1 100644 --- a/chrome/browser/ui/views/tabs/tab_style_views.cc +++ b/chrome/browser/ui/views/tabs/tab_style_views.cc
@@ -514,8 +514,9 @@ // This function doesn't handle active tabs, as they are normally painted by a // different code path (with z-value infinity). float sort_value = GetHoverAnimationValue(); - if (tab_->IsSelected()) + if (tab_->IsSelected()) { sort_value += 4.f; + } if (IsHovering()) { sort_value += 2.f; } @@ -635,13 +636,15 @@ // There's a "glow" that gets drawn over inactive tabs based on the mouse's // location. There is no glow for the active tab so don't update the hover // controller and incur a redraw. - if (hover_controller_ && !tab_->IsActive()) + if (hover_controller_ && !tab_->IsActive()) { hover_controller_->SetLocation(location); + } } void TabStyleViewsImpl::ShowHover(TabStyle::ShowHoverStyle style) { - if (!hover_controller_) + if (!hover_controller_) { return; + } if (style == TabStyle::ShowHoverStyle::kSubtle) { hover_controller_->SetSubtleOpacityScale( @@ -651,8 +654,9 @@ } void TabStyleViewsImpl::HideHover(TabStyle::HideHoverStyle style) { - if (hover_controller_) + if (hover_controller_) { hover_controller_->Hide(style); + } } TabStyle::SeparatorBounds TabStyleViewsImpl::GetSeparatorBounds( @@ -716,8 +720,9 @@ float trailing_opacity = GetSeparatorOpacity(for_layout, false); // Return the opacities in physical order, rather than logical. - if (base::i18n::IsRTL()) + if (base::i18n::IsRTL()) { std::swap(leading_opacity, trailing_opacity); + } return {leading_opacity, trailing_opacity}; } @@ -828,11 +833,13 @@ int TabStyleViewsImpl::GetStrokeThickness(bool should_paint_as_active) const { std::optional<tab_groups::TabGroupId> group = tab_->group(); - if (group.has_value() && tab_->IsActive()) + if (group.has_value() && tab_->IsActive()) { return TabGroupUnderline::kStrokeThickness; + } - if (tab_->IsActive() || should_paint_as_active) + if (tab_->IsActive() || should_paint_as_active) { return tab_->controller()->GetStrokeThickness(); + } return 0; } @@ -915,8 +922,9 @@ ShapeModifier modifier) { const Tab* adjacent_tab = tab->controller()->GetAdjacentTab(tab, offset); if (adjacent_tab && adjacent_tab->IsSelected() && - !adjacent_tab->IsMouseHovered()) + !adjacent_tab->IsMouseHovered()) { return modifier; + } return kNone; }; shape_modifier |= check_adjacent_tab(tab_, -1, kNoLowerLeftArc); @@ -1019,8 +1027,9 @@ const bool is_active = selection_state == TabStyle::TabSelectionState::kActive; const int stroke_thickness = GetStrokeThickness(is_active); - if (!stroke_thickness) + if (!stroke_thickness) { return; + } SkPath outer_path = GetPath(TabStyle::PathType::kBorder, canvas->image_scale(), is_active, @@ -1037,8 +1046,9 @@ void TabStyleViewsImpl::PaintSeparators(gfx::Canvas* canvas) const { const auto separator_opacities = GetSeparatorOpacities(false); - if (!separator_opacities.left && !separator_opacities.right) + if (!separator_opacities.left && !separator_opacities.right) { return; + } gfx::ScopedCanvas scoped_canvas(canvas); const float scale = canvas->UndoDeviceScaleFactor();
diff --git a/chrome/browser/ui/views/tabs/tab_unittest.cc b/chrome/browser/ui/views/tabs/tab_unittest.cc index 437ad6c..e0748b5 100644 --- a/chrome/browser/ui/views/tabs/tab_unittest.cc +++ b/chrome/browser/ui/views/tabs/tab_unittest.cc
@@ -125,10 +125,11 @@ break; case 2: EXPECT_TRUE(tab.showing_icon_); - if (tab.data_.alert_state.size()) + if (tab.data_.alert_state.size()) { EXPECT_TRUE(tab.showing_alert_indicator_); - else + } else { EXPECT_FALSE(tab.showing_alert_indicator_); + } break; default: EXPECT_EQ(3, VisibleIconCount(tab)); @@ -392,10 +393,11 @@ data.pinned = is_pinned_tab; controller->set_active_tab(is_active_tab ? tab : nullptr); - if (alert_state) + if (alert_state) { data.alert_state = {alert_state.value()}; - else + } else { data.alert_state.clear(); + } tab->SetData(data); StopFadeAnimationIfNecessary(*tab); @@ -684,13 +686,22 @@ SkColor fg_inactive; } color_schemes[] = { { - SK_ColorBLACK, SK_ColorWHITE, SK_ColorBLACK, SK_ColorWHITE, + SK_ColorBLACK, + SK_ColorWHITE, + SK_ColorBLACK, + SK_ColorWHITE, }, { - SK_ColorBLACK, SK_ColorWHITE, SK_ColorWHITE, SK_ColorBLACK, + SK_ColorBLACK, + SK_ColorWHITE, + SK_ColorWHITE, + SK_ColorBLACK, }, { - kDarkGray, kLightGray, kDarkGray, kLightGray, + kDarkGray, + kLightGray, + kDarkGray, + kLightGray, }, };
diff --git a/chrome/browser/ui/views/tabs/z_orderable_tab_container_element.cc b/chrome/browser/ui/views/tabs/z_orderable_tab_container_element.cc index 0f40032..fe18e16 100644 --- a/chrome/browser/ui/views/tabs/z_orderable_tab_container_element.cc +++ b/chrome/browser/ui/views/tabs/z_orderable_tab_container_element.cc
@@ -46,12 +46,14 @@ unsigned int z_value = 0; // The active tab is always on top. - if (tab && tab->IsActive()) + if (tab && tab->IsActive()) { z_value |= kActiveTab; + } // Group headers and underlines are painted above non-active tabs. - if (header || underline) + if (header || underline) { z_value |= kGroupView; + } // The non-active tabs are painted next. They are ordered by their selected // or hovered state, which is animated and thus real-valued.
diff --git a/chrome/browser/ui/views/task_manager_view.cc b/chrome/browser/ui/views/task_manager_view.cc index 25d7ecc..9bc91f3 100644 --- a/chrome/browser/ui/views/task_manager_view.cc +++ b/chrome/browser/ui/views/task_manager_view.cc
@@ -164,8 +164,9 @@ // static void TaskManagerView::Hide() { - if (g_task_manager_view) + if (g_task_manager_view) { g_task_manager_view->GetWidget()->Close(); + } } bool TaskManagerView::IsColumnVisible(int column_id) const { @@ -190,8 +191,9 @@ } TableSortDescriptor TaskManagerView::GetSortDescriptor() const { - if (!IsTableSorted()) + if (!IsTableSorted()) { return TableSortDescriptor(); + } const auto& descriptor = tab_table_->sort_descriptors().front(); return TableSortDescriptor(descriptor.column_id, descriptor.ascending); @@ -306,8 +308,9 @@ } void TaskManagerView::OnKeyDown(ui::KeyboardCode keycode) { - if (keycode == ui::VKEY_RETURN) + if (keycode == ui::VKEY_RETURN) { ActivateSelectedTab(); + } } void TaskManagerView::ShowContextMenuForViewImpl( @@ -692,8 +695,9 @@ void TaskManagerView::ActivateSelectedTab() { const std::optional<size_t> active_row = tab_table_->selection_model().active(); - if (active_row.has_value()) + if (active_row.has_value()) { table_model_->ActivateTask(active_row.value()); + } } void TaskManagerView::SelectTaskOfActiveTab(Browser* browser) { @@ -706,8 +710,9 @@ void TaskManagerView::RetrieveSavedAlwaysOnTopState() { is_always_on_top_ = false; - if (!g_browser_process->local_state()) + if (!g_browser_process->local_state()) { return; + } const base::Value::Dict& dictionary = g_browser_process->local_state()->GetDict(GetWindowName());
diff --git a/chrome/browser/ui/views/task_manager_view_browsertest.cc b/chrome/browser/ui/views/task_manager_view_browsertest.cc index d85e8f95..a7f1929 100644 --- a/chrome/browser/ui/views/task_manager_view_browsertest.cc +++ b/chrome/browser/ui/views/task_manager_view_browsertest.cc
@@ -89,8 +89,9 @@ void ClearStoredColumnSettings() const { PrefService* local_state = g_browser_process->local_state(); - if (!local_state) + if (!local_state) { FAIL(); + } ScopedDictPrefUpdate dict_update(local_state, prefs::kTaskManagerColumnVisibility); @@ -117,8 +118,9 @@ std::unique_ptr<TaskManagerTester> tester = TaskManagerTester::Create(base::RepeatingClosure()); for (size_t i = 0; i < tester->GetRowCount(); ++i) { - if (tester->GetTabId(i) == tab_id) + if (tester->GetTabId(i) == tab_id) { return i; + } } return std::nullopt; } @@ -136,8 +138,9 @@ // Tests that all defined columns have a corresponding string IDs for keying // into the user preferences dictionary. IN_PROC_BROWSER_TEST_F(TaskManagerViewTest, AllColumnsHaveStringIds) { - for (size_t i = 0; i < kColumnsSize; ++i) + for (size_t i = 0; i < kColumnsSize; ++i) { EXPECT_NE("", GetColumnIdAsString(kColumns[i].id)); + } } // Test that all defined columns can be sorted @@ -338,8 +341,9 @@ std::vector<content::WebContents*> tabs; for (size_t i = 0; i < tester->GetRowCount(); ++i) { // Filter based on our title. - if (!base::MatchPattern(tester->GetRowTitle(i), pattern)) + if (!base::MatchPattern(tester->GetRowTitle(i), pattern)) { continue; + } content::WebContents* tab = FindWebContentsByTabId(tester->GetTabId(i)); EXPECT_NE(nullptr, tab); tabs.push_back(tab);
diff --git a/chrome/browser/ui/views/test/view_event_test_base.h b/chrome/browser/ui/views/test/view_event_test_base.h index 984cdde..185c5bd 100644 --- a/chrome/browser/ui/views/test/view_event_test_base.h +++ b/chrome/browser/ui/views/test/view_event_test_base.h
@@ -143,6 +143,8 @@ // Convenience macro for defining a ViewEventTestBase. See class description // of ViewEventTestBase for details. #define VIEW_TEST(test_class, name) \ - TEST_F(test_class, name) { StartMessageLoopAndRunTest(); } + TEST_F(test_class, name) { \ + StartMessageLoopAndRunTest(); \ + } #endif // CHROME_BROWSER_UI_VIEWS_TEST_VIEW_EVENT_TEST_BASE_H_
diff --git a/chrome/browser/ui/views/theme_profile_key.cc b/chrome/browser/ui/views/theme_profile_key.cc index 7d46758..6bbffb3 100644 --- a/chrome/browser/ui/views/theme_profile_key.cc +++ b/chrome/browser/ui/views/theme_profile_key.cc
@@ -18,8 +18,9 @@ class ProfileTracker : public ProfileObserver { public: explicit ProfileTracker(Profile* profile) : profile_(profile) { - if (profile_) + if (profile_) { observation_.Observe(profile_.get()); + } } ~ProfileTracker() override = default;
diff --git a/chrome/browser/ui/views/toolbar/app_menu.cc b/chrome/browser/ui/views/toolbar/app_menu.cc index b8e8ef3..5e2d67e 100644 --- a/chrome/browser/ui/views/toolbar/app_menu.cc +++ b/chrome/browser/ui/views/toolbar/app_menu.cc
@@ -213,8 +213,9 @@ // We need to flip the canvas for RTL iff the button is not auto-flipping // already, so we end up flipping exactly once. gfx::ScopedCanvas scoped_canvas(canvas); - if (!view->GetFlipCanvasOnPaintForRTLUI()) + if (!view->GetFlipCanvasOnPaintForRTLUI()) { scoped_canvas.FlipIfRTL(view->width()); + } ui::NativeTheme::MenuSeparatorExtraParams menu_separator; const gfx::Rect separator_bounds(gfx::Size( MenuConfig::instance().separator_thickness, view->height())); @@ -255,14 +256,14 @@ menu_item.corner_radius = kCircularButtonSize / 2; } const auto* const color_provider = view->GetColorProvider(); - cc::PaintFlags flags; - flags.setColor(color_provider->GetColor( - state == views::Button::STATE_NORMAL - ? ui::kColorMenuButtonBackground - : ui::kColorMenuButtonBackgroundSelected)); - canvas->DrawRoundRect(gfx::RectF(bounds_rect), menu_item.corner_radius, - flags); - return; + cc::PaintFlags flags; + flags.setColor( + color_provider->GetColor(state == views::Button::STATE_NORMAL + ? ui::kColorMenuButtonBackground + : ui::kColorMenuButtonBackgroundSelected)); + canvas->DrawRoundRect(gfx::RectF(bounds_rect), menu_item.corner_radius, + flags); + return; } const ButtonType type_; @@ -481,10 +482,10 @@ DCHECK(menu_); std::unique_ptr<views::Button> menu_button; - auto button = std::make_unique<InMenuImageButton>(std::move(callback)); - button->Init(type, InMenuButtonBackground::ButtonShape::kCircular, - image_model); - menu_button = std::move(button); + auto button = std::make_unique<InMenuImageButton>(std::move(callback)); + button->Init(type, InMenuButtonBackground::ButtonShape::kCircular, + image_model); + menu_button = std::move(button); menu_button->GetViewAccessibility().SetName(GetAccessibleNameForAppMenuItem( menu_model_, index, accessible_name_id, add_accelerator_text)); menu_button->set_tag(index); @@ -821,8 +822,9 @@ if (contents) { const auto* zoom_controller = zoom::ZoomController::FromWebContents(contents); - if (zoom_controller) + if (zoom_controller) { zoom = zoom_controller->GetZoomPercent(); + } increment_button_->SetEnabled(zoom < contents->GetMaximumZoomPercent()); decrement_button_->SetEnabled(zoom > contents->GetMinimumZoomPercent()); } @@ -1047,8 +1049,9 @@ } void AppMenu::CloseMenu() { - if (menu_runner_.get()) + if (menu_runner_.get()) { menu_runner_->Cancel(); + } } bool AppMenu::IsShowing() const { @@ -1126,8 +1129,9 @@ views::MenuItemView* menu, DropPosition position, const ui::DropTargetEvent& event) { - if (!IsBookmarkCommand(menu->GetCommand())) + if (!IsBookmarkCommand(menu->GetCommand())) { return base::DoNothing(); + } return bookmark_menu_delegate_->GetDropCallback(menu, position, event); } @@ -1168,8 +1172,9 @@ } bool AppMenu::IsItemChecked(int command_id) const { - if (IsBookmarkCommand(command_id)) + if (IsBookmarkCommand(command_id)) { return false; + } const Entry& entry = command_id_to_entry_.find(command_id)->second; return entry.first->IsItemCheckedAt(entry.second); @@ -1202,14 +1207,16 @@ return true; } - if (command_id == IDC_SHARING_HUB_MENU) + if (command_id == IDC_SHARING_HUB_MENU) { return true; + } // The items representing the cut menu (cut/copy/paste), zoom menu // (increment/decrement/reset) and extension toolbar view are always enabled. // The child views of these items enabled state updates appropriately. - if (command_id == IDC_EDIT_MENU || command_id == IDC_ZOOM_MENU) + if (command_id == IDC_EDIT_MENU || command_id == IDC_ZOOM_MENU) { return true; + } // If `command_id` is not added to App Menu via MenuModel, you should handle // it in the code above. `command_id_to_entry_` traces only MenuModel entries. @@ -1276,8 +1283,9 @@ auto ix = command_id_to_entry_.find(command_id); const Entry& entry = ix->second; ui::Accelerator menu_accelerator; - if (!entry.first->GetAcceleratorAt(entry.second, &menu_accelerator)) + if (!entry.first->GetAcceleratorAt(entry.second, &menu_accelerator)) { return false; + } *accelerator = ui::Accelerator(menu_accelerator.key_code(), menu_accelerator.modifiers()); @@ -1293,7 +1301,7 @@ MENU_ACTION_SHOW_SAVED_TAB_GROUPS, LIMIT_MENU_ACTION); stg_everything_menu_ = - std::make_unique<tab_groups::STGEverythingMenu>(nullptr, browser_); + std::make_unique<tab_groups::STGEverythingMenu>(nullptr, browser_); stg_everything_menu_->SetShowSubmenu(true); stg_everything_menu_->PopulateMenu(menu); } else if (IsTabGroupsCommand(menu->GetCommand())) { @@ -1347,12 +1355,14 @@ if (bookmark_menu_delegate_.get()) { BookmarkModel* model = BookmarkModelFactory::GetForBrowserContext(browser_->profile()); - if (model) + if (model) { model->RemoveObserver(this); + } } - if (selected_menu_model_) + if (selected_menu_model_) { selected_menu_model_->ActivatedAt(selected_index_); + } } bool AppMenu::ShouldExecuteCommandWithoutClosingMenu(int command_id, @@ -1383,15 +1393,17 @@ void AppMenu::BookmarkModelChanged() { DCHECK(bookmark_menu_delegate_.get()); - if (!bookmark_menu_delegate_->is_mutating_model()) + if (!bookmark_menu_delegate_->is_mutating_model()) { root_->Cancel(); + } } void AppMenu::OnGlobalErrorsChanged() { // A change in the global errors list can add or remove items from the // menu. Close the menu to avoid have a stale menu on-screen. - if (root_) + if (root_) { root_->Cancel(); + } } views::View* AppMenu::GetZoomAppMenuViewForTest() { @@ -1432,20 +1444,19 @@ switch (model->GetCommandIdAt(i)) { case IDC_PROFILE_MENU_IN_APP_MENU: { - add_menu_row_background( - ChromeLayoutProvider::Get()->GetDistanceMetric( - DISTANCE_CONTENT_LIST_VERTICAL_MULTI), - ui::kColorAppMenuProfileRowBackground); - ProfileAttributesEntry* profile_attributes = - GetProfileAttributesFromProfile(browser_->profile()); - if (profile_attributes && - !profile_attributes->GetLocalProfileName().empty()) { - const MenuConfig& config = MenuConfig::instance(); - AddSignedInChipToProfileMenuItem( - browser_->profile(), item, - config.arrow_to_edge_padding + config.arrow_size, - profile_menu_item_selected_subscription_list_); - } + add_menu_row_background(ChromeLayoutProvider::Get()->GetDistanceMetric( + DISTANCE_CONTENT_LIST_VERTICAL_MULTI), + ui::kColorAppMenuProfileRowBackground); + ProfileAttributesEntry* profile_attributes = + GetProfileAttributesFromProfile(browser_->profile()); + if (profile_attributes && + !profile_attributes->GetLocalProfileName().empty()) { + const MenuConfig& config = MenuConfig::instance(); + AddSignedInChipToProfileMenuItem( + browser_->profile(), item, + config.arrow_to_edge_padding + config.arrow_size, + profile_menu_item_selected_subscription_list_); + } break; } case IDC_UPGRADE_DIALOG: { @@ -1581,13 +1592,15 @@ } void AppMenu::CreateBookmarkMenu() { - if (bookmark_menu_delegate_.get()) + if (bookmark_menu_delegate_.get()) { return; // Already created the menu. + } BookmarkModel* model = BookmarkModelFactory::GetForBrowserContext(browser_->profile()); - if (!model->loaded()) + if (!model->loaded()) { return; + } model->AddObserver(this);
diff --git a/chrome/browser/ui/views/toolbar/app_menu.h b/chrome/browser/ui/views/toolbar/app_menu.h index ecb3acb1..ae5da307 100644 --- a/chrome/browser/ui/views/toolbar/app_menu.h +++ b/chrome/browser/ui/views/toolbar/app_menu.h
@@ -29,7 +29,7 @@ class MenuButtonController; class MenuItemView; class MenuRunner; -} +} // namespace views // AppMenu adapts the AppMenuModel to view's menu related classes. class AppMenu final : public views::MenuDelegate, @@ -116,12 +116,11 @@ class ZoomView; typedef std::pair<ui::MenuModel*, size_t> Entry; - typedef std::map<int,Entry> CommandIDToEntry; + typedef std::map<int, Entry> CommandIDToEntry; // Populates |parent| with all the child menus in |model|. Recursively invokes // |PopulateMenu| for any submenu. - void PopulateMenu(views::MenuItemView* parent, - ui::MenuModel* model); + void PopulateMenu(views::MenuItemView* parent, ui::MenuModel* model); // Adds a new menu item to |parent| at |menu_index| to represent the item in // |model| at |model_index|:
diff --git a/chrome/browser/ui/views/toolbar/back_forward_button.cc b/chrome/browser/ui/views/toolbar/back_forward_button.cc index e8da0b9..8801133 100644 --- a/chrome/browser/ui/views/toolbar/back_forward_button.cc +++ b/chrome/browser/ui/views/toolbar/back_forward_button.cc
@@ -67,8 +67,9 @@ const std::u16string BackForwardButton::GetAccessiblePageLoadingMessage() { // If we don't have a model, there is no menu from which to obtain the title // of the page that is about to be loaded. - if (!menu_model()) + if (!menu_model()) { return std::u16string(); + } // The title of the page which is about to be loaded should be at the top of // the menu. @@ -82,8 +83,9 @@ if (GetFocusManager()->GetFocusedView() != BrowserView::GetBrowserViewForBrowser(browser_)->contents_web_view()) { const std::u16string message = GetAccessiblePageLoadingMessage(); - if (!message.empty()) + if (!message.empty()) { GetViewAccessibility().AnnounceText(message); + } } content::WebContents* web_contents =
diff --git a/chrome/browser/ui/views/toolbar/browser_app_menu_button.cc b/chrome/browser/ui/views/toolbar/browser_app_menu_button.cc index b561418..227f5de 100644 --- a/chrome/browser/ui/views/toolbar/browser_app_menu_button.cc +++ b/chrome/browser/ui/views/toolbar/browser_app_menu_button.cc
@@ -88,8 +88,9 @@ } void BrowserAppMenuButton::ShowMenu(int run_types) { - if (IsMenuShowing()) + if (IsMenuShowing()) { return; + } #if BUILDFLAG(IS_CHROMEOS) if (auto* input_method = GetInputMethod()) { @@ -116,8 +117,9 @@ Browser* browser = toolbar_view_->browser(); BrowserWindow* browser_window = browser->window(); - if (browser_window == nullptr) + if (browser_window == nullptr) { return AlertMenuItem::kNone; + } auto* const service = UserEducationServiceFactory::GetForBrowserContext(browser->profile());
diff --git a/chrome/browser/ui/views/toolbar/browser_app_menu_button_interactive_uitest_chromeos.cc b/chrome/browser/ui/views/toolbar/browser_app_menu_button_interactive_uitest_chromeos.cc index edd2c55d..98c9059 100644 --- a/chrome/browser/ui/views/toolbar/browser_app_menu_button_interactive_uitest_chromeos.cc +++ b/chrome/browser/ui/views/toolbar/browser_app_menu_button_interactive_uitest_chromeos.cc
@@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/views/toolbar/browser_app_menu_button.h" - #include "base/files/file_path.h" #include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" @@ -11,6 +9,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/views/frame/browser_view.h" +#include "chrome/browser/ui/views/toolbar/browser_app_menu_button.h" #include "chrome/browser/ui/views/toolbar/toolbar_view.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h"
diff --git a/chrome/browser/ui/views/toolbar/chrome_labs/chrome_labs_bubble_view.h b/chrome/browser/ui/views/toolbar/chrome_labs/chrome_labs_bubble_view.h index 4b8006d..6b6f46d 100644 --- a/chrome/browser/ui/views/toolbar/chrome_labs/chrome_labs_bubble_view.h +++ b/chrome/browser/ui/views/toolbar/chrome_labs/chrome_labs_bubble_view.h
@@ -20,7 +20,7 @@ namespace views { class Button; class FlexLayoutView; -} +} // namespace views // TODO(elainechien): Use composition instead of inheritance. class ChromeLabsBubbleView : public views::BubbleDialogDelegateView {
diff --git a/chrome/browser/ui/views/toolbar/chrome_labs/chrome_labs_button.cc b/chrome/browser/ui/views/toolbar/chrome_labs/chrome_labs_button.cc index 7222cd14..b607b204 100644 --- a/chrome/browser/ui/views/toolbar/chrome_labs/chrome_labs_button.cc +++ b/chrome/browser/ui/views/toolbar/chrome_labs/chrome_labs_button.cc
@@ -82,10 +82,11 @@ bool should_show_dot_indicator = AreNewChromeLabsExperimentsAvailable( model_, browser_view_->browser()->profile()); - if (should_show_dot_indicator) + if (should_show_dot_indicator) { new_experiments_indicator_->Show(); - else + } else { new_experiments_indicator_->Hide(); + } } BEGIN_METADATA(ChromeLabsButton)
diff --git a/chrome/browser/ui/views/toolbar/chrome_labs/chrome_labs_item_view.cc b/chrome/browser/ui/views/toolbar/chrome_labs/chrome_labs_item_view.cc index 8135fe7..e641bd0 100644 --- a/chrome/browser/ui/views/toolbar/chrome_labs/chrome_labs_item_view.cc +++ b/chrome/browser/ui/views/toolbar/chrome_labs/chrome_labs_item_view.cc
@@ -156,24 +156,26 @@ experiment_name_->GetViewAccessibility().SetIsIgnored(true); experiment_description->GetViewAccessibility().SetIsIgnored(true); GetViewAccessibility().SetRole(ax::mojom::Role::kGroup); - if (!lab.visible_name.empty()) + if (!lab.visible_name.empty()) { GetViewAccessibility().SetName(lab.visible_name, ax::mojom::NameFrom::kAttribute); + } - // There is currently a MacOS VoiceOver screen reader bug where VoiceOver - // does not announce the accessible description for groups - // (crbug.com/1197159). The MacOS specific code here provides a temporary - // mitigation for screen reader users and moves announcing the description - // to when the user interacts with the combobox of that experiment. Don’t - // add an accessible description for now to prevent the screen reader from - // announcing the description twice in the time between when the VoiceOver - // bug is fixed and this code gets removed. - // TODO(elainechien): Remove MacOS specific code for experiment description - // when VoiceOver bug is fixed. + // There is currently a MacOS VoiceOver screen reader bug where VoiceOver + // does not announce the accessible description for groups + // (crbug.com/1197159). The MacOS specific code here provides a temporary + // mitigation for screen reader users and moves announcing the description + // to when the user interacts with the combobox of that experiment. Don’t + // add an accessible description for now to prevent the screen reader from + // announcing the description twice in the time between when the VoiceOver + // bug is fixed and this code gets removed. + // TODO(elainechien): Remove MacOS specific code for experiment description + // when VoiceOver bug is fixed. #if !BUILDFLAG(IS_MAC) - if (!lab.visible_description.empty()) + if (!lab.visible_description.empty()) { GetViewAccessibility().SetDescription(lab.visible_description); + } #endif AddChildView(
diff --git a/chrome/browser/ui/views/toolbar/chrome_labs/chrome_labs_view_controller.cc b/chrome/browser/ui/views/toolbar/chrome_labs/chrome_labs_view_controller.cc index be3eb8f..9d61c58 100644 --- a/chrome/browser/ui/views/toolbar/chrome_labs/chrome_labs_view_controller.cc +++ b/chrome/browser/ui/views/toolbar/chrome_labs/chrome_labs_view_controller.cc
@@ -82,8 +82,9 @@ }; const auto get_enum = [](const std::string& internal_name) { - if (internal_name == flag_descriptions::kScrollableTabStripFlagId) + if (internal_name == flag_descriptions::kScrollableTabStripFlagId) { return ChromeLabsSelectedLab::kTabScrollingSelected; + } #if BUILDFLAG(ENABLE_WEBUI_TAB_STRIP) && \ (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS)) if (internal_name == flag_descriptions::kWebUITabStripFlagId) @@ -94,8 +95,9 @@ }; const std::string histogram_name = get_histogram_name(selected_lab_state); - if (!histogram_name.empty()) + if (!histogram_name.empty()) { base::UmaHistogramEnumeration(histogram_name, get_enum(internal_name)); + } } // Returns the number of days since epoch (1970-01-01) in the local timezone. @@ -129,8 +131,9 @@ flags_state->GetSanitizedEnabledFlags(flags_storage, &enabled_entries); for (int i = 0; i < entry->NumOptions(); i++) { const std::string name = entry->NameForOption(i); - if (base::Contains(enabled_entries, name)) + if (base::Contains(enabled_entries, name)) { return i; + } } return 0; }
diff --git a/chrome/browser/ui/views/toolbar/home_button.cc b/chrome/browser/ui/views/toolbar/home_button.cc index b4276e3..611344f 100644 --- a/chrome/browser/ui/views/toolbar/home_button.cc +++ b/chrome/browser/ui/views/toolbar/home_button.cc
@@ -121,8 +121,9 @@ void HomePageUndoBubbleCoordinator::Show(const GURL& undo_url, bool undo_value_is_ntp) { - if (tracker_.view()) + if (tracker_.view()) { tracker_.view()->GetWidget()->Close(); + } auto undo_bubble = std::make_unique<HomePageUndoBubble>( anchor_view_, prefs_, undo_url, undo_value_is_ntp);
diff --git a/chrome/browser/ui/views/toolbar/overflow_button.h b/chrome/browser/ui/views/toolbar/overflow_button.h index e92f488..9584e84 100644 --- a/chrome/browser/ui/views/toolbar/overflow_button.h +++ b/chrome/browser/ui/views/toolbar/overflow_button.h
@@ -19,7 +19,6 @@ METADATA_HEADER(OverflowButton, ToolbarButton) public: - OverflowButton(); OverflowButton(const OverflowButton&) = delete; OverflowButton& operator=(const OverflowButton&) = delete;
diff --git a/chrome/browser/ui/views/toolbar/pinned_toolbar_actions_container_unittest.cc b/chrome/browser/ui/views/toolbar/pinned_toolbar_actions_container_unittest.cc index c717745..a040bc9 100644 --- a/chrome/browser/ui/views/toolbar/pinned_toolbar_actions_container_unittest.cc +++ b/chrome/browser/ui/views/toolbar/pinned_toolbar_actions_container_unittest.cc
@@ -608,9 +608,9 @@ EXPECT_FALSE(pinned_button->ShouldSkipExecutionForTesting()); pinned_button->SetIsActionShowingBubble(true); - ui::MouseEvent press_event(ui::EventType::kMousePressed, gfx::Point(), gfx::Point(), - ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, - 0); + ui::MouseEvent press_event(ui::EventType::kMousePressed, gfx::Point(), + gfx::Point(), ui::EventTimeForNow(), + ui::EF_LEFT_MOUSE_BUTTON, 0); ui::MouseEvent release_event(ui::EventType::kMouseReleased, gfx::Point(), gfx::Point(), ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, 0);
diff --git a/chrome/browser/ui/views/toolbar/reload_button.cc b/chrome/browser/ui/views/toolbar/reload_button.cc index 9160e1f..10acad0 100644 --- a/chrome/browser/ui/views/toolbar/reload_button.cc +++ b/chrome/browser/ui/views/toolbar/reload_button.cc
@@ -122,13 +122,14 @@ void ReloadButton::OnMouseExited(const ui::MouseEvent& event) { ToolbarButton::OnMouseExited(event); - if (!IsMenuShowing()) + if (!IsMenuShowing()) { ChangeMode(intended_mode_, true); + } } void ReloadButton::UpdateCachedTooltipText() { - int reload_tooltip = menu_enabled_ ? - IDS_TOOLTIP_RELOAD_WITH_MENU : IDS_TOOLTIP_RELOAD; + int reload_tooltip = + menu_enabled_ ? IDS_TOOLTIP_RELOAD_WITH_MENU : IDS_TOOLTIP_RELOAD; SetCachedTooltipText(l10n_util::GetStringUTF16( visible_mode_ == Mode::kReload ? reload_tooltip : IDS_TOOLTIP_STOP)); } @@ -239,15 +240,17 @@ } void ReloadButton::ExecuteBrowserCommand(int command, int event_flags) { - if (!command_updater_) + if (!command_updater_) { return; + } command_updater_->ExecuteCommandWithDisposition( command, ui::DispositionFromEventFlags(event_flags)); } void ReloadButton::OnDoubleClickTimer() { - if (!IsMenuShowing()) + if (!IsMenuShowing()) { ChangeMode(intended_mode_, false); + } } void ReloadButton::OnStopToReloadTimer() {
diff --git a/chrome/browser/ui/views/toolbar/reload_button_browsertest.cc b/chrome/browser/ui/views/toolbar/reload_button_browsertest.cc index 0814683..7653482 100644 --- a/chrome/browser/ui/views/toolbar/reload_button_browsertest.cc +++ b/chrome/browser/ui/views/toolbar/reload_button_browsertest.cc
@@ -2,11 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/views/toolbar/reload_button.h" + #include "build/build_config.h" #include "chrome/browser/external_protocol/external_protocol_handler.h" #include "chrome/browser/ui/view_ids.h" #include "chrome/browser/ui/views/frame/browser_view.h" -#include "chrome/browser/ui/views/toolbar/reload_button.h" #include "chrome/browser/ui/views/toolbar/toolbar_view.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/interactive_test_utils.h"
diff --git a/chrome/browser/ui/views/toolbar/reload_button_unittest.cc b/chrome/browser/ui/views/toolbar/reload_button_unittest.cc index 11473b6d..b6a40ab 100644 --- a/chrome/browser/ui/views/toolbar/reload_button_unittest.cc +++ b/chrome/browser/ui/views/toolbar/reload_button_unittest.cc
@@ -241,4 +241,4 @@ EXPECT_EQ(button_data.GetString16Attribute( ax::mojom::StringAttribute::kDescription), reload()->GetTooltipText(gfx::Point())); -} \ No newline at end of file +}
diff --git a/chrome/browser/ui/views/toolbar/toolbar_action_hover_card_bubble_view.cc b/chrome/browser/ui/views/toolbar/toolbar_action_hover_card_bubble_view.cc index d9fe342e..08370db 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_action_hover_card_bubble_view.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_action_hover_card_bubble_view.cc
@@ -263,8 +263,9 @@ policy_separator_->SetVisible(show_policy_label); policy_label_->SetVisible(show_policy_label); - if (show_policy_label) + if (show_policy_label) { policy_label_->SetData({GetPolicyText(state.policy), false}); + } } void ToolbarActionHoverCardBubbleView::SetTextFade(double percent) {
diff --git a/chrome/browser/ui/views/toolbar/toolbar_action_hover_card_bubble_view_interactive_uitest.cc b/chrome/browser/ui/views/toolbar/toolbar_action_hover_card_bubble_view_interactive_uitest.cc index 8f8660d0..e34c68d 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_action_hover_card_bubble_view_interactive_uitest.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_action_hover_card_bubble_view_interactive_uitest.cc
@@ -45,13 +45,15 @@ // views::WidgetObserver: void OnWidgetDestroyed(views::Widget* widget) override { observation_.Reset(); - if (!quit_closure_.is_null()) + if (!quit_closure_.is_null()) { std::move(quit_closure_).Run(); + } } void Wait() { - if (!observation_.IsObserving()) + if (!observation_.IsObserving()) { return; + } DCHECK(quit_closure_.is_null()); quit_closure_ = run_loop_.QuitClosure(); run_loop_.Run();
diff --git a/chrome/browser/ui/views/toolbar/toolbar_action_hover_card_controller.cc b/chrome/browser/ui/views/toolbar/toolbar_action_hover_card_controller.cc index a7df4829..bf139834 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_action_hover_card_controller.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_action_hover_card_controller.cc
@@ -111,8 +111,9 @@ if (target_action_view_ != action_view) { delayed_show_timer_.Stop(); target_action_view_observation_.Reset(); - if (action_view) + if (action_view) { target_action_view_observation_.Observe(action_view); + } target_action_view_ = action_view; } @@ -124,8 +125,9 @@ switch (update_type) { case ToolbarActionHoverCardUpdateType::kHover: - if (!action_view) + if (!action_view) { last_mouse_exit_timestamp_ = base::TimeTicks::Now(); + } break; case ToolbarActionHoverCardUpdateType::kToolbarActionUpdated: DCHECK(action_view); @@ -140,10 +142,11 @@ break; } - if (action_view && action_view->GetCurrentWebContents()) + if (action_view && action_view->GetCurrentWebContents()) { UpdateOrShowHoverCard(action_view, update_type); - else + } else { HideHoverCard(); + } } void ToolbarActionHoverCardController::UpdateOrShowHoverCard( @@ -153,8 +156,9 @@ // Close is asynchronous, so make sure that if we're closing we clear out all // of our data *now* rather than waiting for the deletion message. - if (hover_card_ && hover_card_->GetWidget()->IsClosed()) + if (hover_card_ && hover_card_->GetWidget()->IsClosed()) { OnViewIsDeleting(hover_card_); + } // Cancel any pending fades. if (hover_card_ && fade_animator_->IsFadingOut()) { @@ -256,8 +260,9 @@ // Make sure the hover card isn't accidentally shown if it's already visible // or if the anchor is gone or changed. if (hover_card_ || target_action_view_ != intended_action_view || - !TargetActionViewIsValid()) + !TargetActionViewIsValid()) { return; + } CreateHoverCard(target_action_view_); UpdateHoverCardContent(target_action_view_); @@ -274,8 +279,9 @@ } void ToolbarActionHoverCardController::HideHoverCard() { - if (!hover_card_ || hover_card_->GetWidget()->IsClosed()) + if (!hover_card_ || hover_card_->GetWidget()->IsClosed()) { return; + } // Cancel any pending fade-in. if (fade_animator_->IsFadingIn()) { @@ -288,8 +294,9 @@ hover_card_->GetWidget()->Close(); return; } - if (fade_animator_->IsFadingOut()) + if (fade_animator_->IsFadingOut()) { return; + } fade_animator_->FadeOut(); } @@ -315,10 +322,12 @@ const views::View* ToolbarActionHoverCardController::GetTargetAnchorView() const { - if (!hover_card_) + if (!hover_card_) { return nullptr; - if (slide_animator_->is_animating()) + } + if (slide_animator_->is_animating()) { return slide_animator_->desired_anchor_view(); + } return hover_card_->GetAnchorView(); } @@ -331,15 +340,17 @@ void ToolbarActionHoverCardController::OnFadeAnimationEnded( views::WidgetFadeAnimator* animator, views::WidgetFadeAnimator::FadeType fade_type) { - if (fade_type == views::WidgetFadeAnimator::FadeType::kFadeOut) + if (fade_type == views::WidgetFadeAnimator::FadeType::kFadeOut) { hover_card_->GetWidget()->Close(); + } } void ToolbarActionHoverCardController::OnSlideAnimationProgressed( views::BubbleSlideAnimator* animator, double value) { - if (hover_card_) + if (hover_card_) { hover_card_->SetTextFade(value); + } } void ToolbarActionHoverCardController::OnSlideAnimationComplete( @@ -376,8 +387,9 @@ views::View* observed_view, views::View* starting_view) { // Only care about target action view becoming invisible. - if (observed_view != target_action_view_) + if (observed_view != target_action_view_) { return; + } // Visibility comes from `starting_view` or the widget, if no starting view; // see documentation for ViewObserver::OnViewVisibilityChanged(). const bool visible = starting_view @@ -386,6 +398,7 @@ observed_view->GetWidget()->IsVisible()); // If visibility changed to false, treat it as if the target action view had // gone away. - if (!visible) + if (!visible) { OnViewIsDeleting(observed_view); + } }
diff --git a/chrome/browser/ui/views/toolbar/toolbar_action_view.cc b/chrome/browser/ui/views/toolbar/toolbar_action_view.cc index 0574f71..27d55c2c 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_action_view.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_action_view.cc
@@ -138,8 +138,9 @@ void ToolbarActionView::MaybeUpdateHoverCardStatus( const ui::MouseEvent& event) { - if (!GetWidget()->IsMouseEventsEnabled()) + if (!GetWidget()->IsMouseEventsEnabled()) { return; + } view_controller_->UpdateHoverCard(this, ToolbarActionHoverCardUpdateType::kHover); @@ -153,8 +154,9 @@ content::WebContents* web_contents = GetCurrentWebContents(); GetViewAccessibility().SetName( view_controller_->GetAccessibleName(web_contents)); - if (!sessions::SessionTabHelper::IdForTab(web_contents).is_valid()) + if (!sessions::SessionTabHelper::IdForTab(web_contents).is_valid()) { return; + } ui::ImageModel icon = view_controller_->GetIcon(web_contents, GetPreferredSize()); @@ -218,16 +220,18 @@ // of |suppress_next_release_| so it can be updated now. const bool suppress_next_release = suppress_next_release_; suppress_next_release_ = false; - if (!suppress_next_release) + if (!suppress_next_release) { MenuButton::OnMouseReleased(event); + } } void ToolbarActionView::OnGestureEvent(ui::GestureEvent* event) { // While the dropdown menu is showing, the button should not handle gestures. - if (context_menu_controller_->IsMenuRunning()) + if (context_menu_controller_->IsMenuRunning()) { event->StopPropagation(); - else + } else { MenuButton::OnGestureEvent(event); + } } void ToolbarActionView::OnDragDone() {
diff --git a/chrome/browser/ui/views/toolbar/toolbar_action_view.h b/chrome/browser/ui/views/toolbar/toolbar_action_view.h index b6ce1fa..2d66d8f 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_action_view.h +++ b/chrome/browser/ui/views/toolbar/toolbar_action_view.h
@@ -66,9 +66,7 @@ content::WebContents* GetCurrentWebContents() const override; void UpdateState() override; - ToolbarActionViewController* view_controller() { - return view_controller_; - } + ToolbarActionViewController* view_controller() { return view_controller_; } // Returns button icon so it can be accessed during tests. gfx::ImageSkia GetIconForTest();
diff --git a/chrome/browser/ui/views/toolbar/toolbar_action_view_delegate_views.h b/chrome/browser/ui/views/toolbar/toolbar_action_view_delegate_views.h index 3c44d73..daf6c96a 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_action_view_delegate_views.h +++ b/chrome/browser/ui/views/toolbar/toolbar_action_view_delegate_views.h
@@ -10,7 +10,7 @@ namespace views { class Button; class FocusManager; -} +} // namespace views // The views-specific methods necessary for a ToolbarActionViewDelegate. class ToolbarActionViewDelegateViews : public ToolbarActionViewDelegate {
diff --git a/chrome/browser/ui/views/toolbar/toolbar_action_view_unittest.cc b/chrome/browser/ui/views/toolbar/toolbar_action_view_unittest.cc index 7c4b175..6ca83851 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_action_view_unittest.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_action_view_unittest.cc
@@ -54,7 +54,9 @@ } bool CanStartDragForView(views::View* sender, const gfx::Point& press_pt, - const gfx::Point& p) override { return false; } + const gfx::Point& p) override { + return false; + } void set_web_contents(content::WebContents* web_contents) { web_contents_ = web_contents; @@ -69,15 +71,12 @@ class OpenMenuListener : public views::ContextMenuController { public: explicit OpenMenuListener(views::View* view) - : view_(view), - opened_menu_(false) { + : view_(view), opened_menu_(false) { view_->set_context_menu_controller(this); } OpenMenuListener(const OpenMenuListener&) = delete; OpenMenuListener& operator=(const OpenMenuListener&) = delete; - ~OpenMenuListener() override { - view_->set_context_menu_controller(nullptr); - } + ~OpenMenuListener() override { view_->set_context_menu_controller(nullptr); } void ShowContextMenuForViewImpl( views::View* source,
diff --git a/chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.cc b/chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.cc index b3b6903..47a9fc20 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.cc
@@ -39,10 +39,12 @@ std::u16string cancel_text = delegate_->GetDismissButtonText(); int buttons = static_cast<int>(ui::mojom::DialogButton::kNone); - if (!ok_text.empty()) + if (!ok_text.empty()) { buttons |= static_cast<int>(ui::mojom::DialogButton::kOk); - if (!cancel_text.empty()) + } + if (!cancel_text.empty()) { buttons |= static_cast<int>(ui::mojom::DialogButton::kCancel); + } SetButtons(buttons); SetDefaultButton(static_cast<int>(delegate_->GetDefaultDialogButton())); SetButtonLabel(ui::mojom::DialogButton::kOk, ok_text); @@ -75,8 +77,9 @@ std::unique_ptr<ToolbarActionsBarBubbleDelegate::ExtraViewInfo> extra_view_info = delegate_->GetExtraViewInfo(); - if (!extra_view_info) + if (!extra_view_info) { return nullptr; + } std::unique_ptr<views::ImageView> icon; if (extra_view_info->resource) { @@ -125,8 +128,9 @@ void ToolbarActionsBarBubbleViews::NotifyDelegateOfClose( ToolbarActionsBarBubbleDelegate::CloseAction action) { - if (delegate_notified_of_close_) + if (delegate_notified_of_close_) { return; + } delegate_notified_of_close_ = true; delegate_->OnBubbleClosed(action); } @@ -182,12 +186,14 @@ views::Widget* widget, bool visible) { DCHECK_EQ(GetWidget(), widget); - if (!visible) + if (!visible) { return; + } GetWidget()->RemoveObserver(this); - if (observer_notified_of_show_) + if (observer_notified_of_show_) { return; + } observer_notified_of_show_ = true; // Using Unretained is safe here because the delegate (which might invoke the
diff --git a/chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.h b/chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.h index 9f2a366..abd1e3f 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.h +++ b/chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.h
@@ -18,7 +18,7 @@ namespace views { class ImageButton; class Label; -} +} // namespace views class ToolbarActionsBarBubbleViews : public views::BubbleDialogDelegateView, public views::WidgetObserver {
diff --git a/chrome/browser/ui/views/toolbar/toolbar_button.cc b/chrome/browser/ui/views/toolbar/toolbar_button.cc index 14087d60..4ae37eec 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_button.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_button.cc
@@ -190,8 +190,9 @@ } else { SetBackground(nullptr); const auto* cp = GetColorProvider(); - if (cp) + if (cp) { label()->SetBackgroundColor(cp->GetColor(kColorToolbar)); + } } // Apply new border with target insets. @@ -218,8 +219,9 @@ SkColor ToolbarButton::GetForegroundColor(ButtonState state) const { const auto* color_provider = GetColorProvider(); - if (has_in_product_help_promo_) + if (has_in_product_help_promo_) { return color_provider->GetColor(kColorToolbarFeaturePromoHighlight); + } switch (state) { case ButtonState::STATE_HOVERED: return color_provider->GetColor(kColorToolbarButtonIconHovered); @@ -285,8 +287,9 @@ void ToolbarButton::SetVectorIcons(const gfx::VectorIcon& icon, const gfx::VectorIcon& touch_icon) { vector_icons_.emplace(VectorIcons{icon, touch_icon}); - if (GetThemeProvider()) + if (GetThemeProvider()) { UpdateIcon(); + } } void ToolbarButton::UpdateIcon() { @@ -326,24 +329,27 @@ } void ToolbarButton::SetLayoutInsetDelta(const gfx::Insets& inset_delta) { - if (layout_inset_delta_ == inset_delta) + if (layout_inset_delta_ == inset_delta) { return; + } layout_inset_delta_ = inset_delta; UpdateColorsAndInsets(); } void ToolbarButton::SetLeadingMargin(int margin) { gfx::Insets* const internal_padding = GetProperty(views::kInternalPaddingKey); - if (internal_padding->left() == margin) + if (internal_padding->left() == margin) { return; + } internal_padding->set_left(margin); UpdateColorsAndInsets(); } void ToolbarButton::SetTrailingMargin(int margin) { gfx::Insets* const internal_padding = GetProperty(views::kInternalPaddingKey); - if (internal_padding->right() == margin) + if (internal_padding->right() == margin) { return; + } internal_padding->set_right(margin); UpdateColorsAndInsets(); } @@ -361,8 +367,9 @@ } void ToolbarButton::SetLayoutInsets(const std::optional<gfx::Insets>& insets) { - if (layout_insets_ == insets) + if (layout_insets_ == insets) { return; + } layout_insets_ = insets; UpdateColorsAndInsets(); } @@ -383,8 +390,9 @@ } void ToolbarButton::OnBoundsChanged(const gfx::Rect& previous_bounds) { - if (size() != previous_bounds.size()) + if (size() != previous_bounds.size()) { UpdateColorsAndInsets(); + } LabelButton::OnBoundsChanged(previous_bounds); } @@ -453,8 +461,9 @@ LabelButton::OnMouseReleased(event); } - if (IsTriggerableEvent(event)) + if (IsTriggerableEvent(event)) { show_menu_factory_.InvalidateWeakPtrs(); + } } void ToolbarButton::OnMouseCaptureLost() {} @@ -463,8 +472,10 @@ // Starting a drag results in a MouseExited, we need to ignore it. // A right click release triggers an exit event. We want to // remain in a PUSHED state until the drop down menu closes. - if (GetState() != STATE_DISABLED && !InDrag() && GetState() != STATE_PRESSED) + if (GetState() != STATE_DISABLED && !InDrag() && + GetState() != STATE_PRESSED) { SetState(STATE_NORMAL); + } } void ToolbarButton::OnGestureEvent(ui::GestureEvent* event) { @@ -481,8 +492,9 @@ View* source, const gfx::Point& point, ui::mojom::MenuSourceType source_type) { - if (!GetEnabled()) + if (!GetEnabled()) { return; + } show_menu_factory_.InvalidateWeakPtrs(); ShowDropDownMenu(source_type); @@ -527,8 +539,9 @@ } void ToolbarButton::ShowDropDownMenu(ui::mojom::MenuSourceType source_type) { - if (!ShouldShowMenu()) + if (!ShouldShowMenu()) { return; + } gfx::Rect menu_anchor_bounds = GetAnchorBoundsInScreen(); @@ -548,8 +561,9 @@ screen->GetDisplayNearestPoint(screen->GetCursorScreenPoint()); int left_bound = display.bounds().x(); #endif - if (menu_anchor_bounds.x() < left_bound) + if (menu_anchor_bounds.x() < left_bound) { menu_anchor_bounds.set_x(left_bound); + } // Make the button look depressed while the menu is open. SetState(STATE_PRESSED); @@ -560,11 +574,13 @@ // Exit if the model is null. Although ToolbarButton::ShouldShowMenu() // performs the same check, its overrides may not. - if (!model_) + if (!model_) { return; + } - if (tab_strip_model_ && !tab_strip_model_->GetActiveWebContents()) + if (tab_strip_model_ && !tab_strip_model_->GetActiveWebContents()) { return; + } // Create and run menu. menu_model_adapter_ = std::make_unique<views::MenuModelAdapter>( @@ -639,8 +655,9 @@ std::optional<SkColor> ToolbarButton::HighlightColorAnimation::GetTextColor() const { - if (!IsShown() || !parent_->GetColorProvider()) + if (!IsShown() || !parent_->GetColorProvider()) { return std::nullopt; + } // Use the overridden value supplied by the button. const std::optional<SkColor> text_color_overridden = @@ -682,8 +699,9 @@ std::optional<SkColor> ToolbarButton::HighlightColorAnimation::GetBackgroundColor() const { const auto* const color_provider = parent_->GetColorProvider(); - if (!IsShown() || !color_provider) + if (!IsShown() || !color_provider) { return std::nullopt; + } SkColor bg_color = color_provider->GetColor(kColorToolbarButtonBackgroundHighlightedDefault); if (highlight_color_.has_value()) { @@ -699,8 +717,9 @@ std::optional<SkColor> ToolbarButton::HighlightColorAnimation::GetInkDropBaseColor() const { - if (!highlight_color_) + if (!highlight_color_) { return std::nullopt; + } return *highlight_color_; } @@ -708,8 +727,9 @@ const gfx::Animation* animation) { // Only reset the color after the animation slides _back_ and not when it // finishes sliding fully _open_. - if (highlight_color_animation_.GetCurrentValue() == 0.0f) + if (highlight_color_animation_.GetCurrentValue() == 0.0f) { ClearHighlightColor(); + } } void ToolbarButton::HighlightColorAnimation::AnimationProgressed(
diff --git a/chrome/browser/ui/views/toolbar/toolbar_button.h b/chrome/browser/ui/views/toolbar/toolbar_button.h index e9be410..a6957be 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_button.h +++ b/chrome/browser/ui/views/toolbar/toolbar_button.h
@@ -40,7 +40,7 @@ namespace views { class MenuModelAdapter; class MenuRunner; -} +} // namespace views // This class provides basic drawing and mouse-over behavior for buttons // appearing in the toolbar.
diff --git a/chrome/browser/ui/views/toolbar/toolbar_controller.cc b/chrome/browser/ui/views/toolbar/toolbar_controller.cc index 9132ccb..89dbca47 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_controller.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_controller.cc
@@ -539,25 +539,24 @@ const ResponsiveElementInfo& element, const views::ProposedLayout* proposed_layout) const { return absl::visit( - base::Overloaded{[&](actions::ActionId id) { - CHECK(!proposed_layout); - return pinned_actions_delegate_ && - pinned_actions_delegate_->IsOverflowed(id); - }, - [&](ToolbarController::ElementIdInfo id) { - const auto* const toolbar_element = - FindToolbarElementWithId(toolbar_container_view_, - id.overflow_identifier); - const views::FlexLayout* const flex_layout = - static_cast<views::FlexLayout*>( - toolbar_container_view_->GetLayoutManager()); - return flex_layout->CanBeVisible(toolbar_element) && - !(proposed_layout - ? proposed_layout - ->GetLayoutFor(toolbar_element) - ->visible - : toolbar_element->GetVisible()); - }}, + base::Overloaded{ + [&](actions::ActionId id) { + CHECK(!proposed_layout); + return pinned_actions_delegate_ && + pinned_actions_delegate_->IsOverflowed(id); + }, + [&](ToolbarController::ElementIdInfo id) { + const auto* const toolbar_element = FindToolbarElementWithId( + toolbar_container_view_, id.overflow_identifier); + const views::FlexLayout* const flex_layout = + static_cast<views::FlexLayout*>( + toolbar_container_view_->GetLayoutManager()); + return flex_layout->CanBeVisible(toolbar_element) && + !(proposed_layout + ? proposed_layout->GetLayoutFor(toolbar_element) + ->visible + : toolbar_element->GetVisible()); + }}, element.overflow_id); }
diff --git a/chrome/browser/ui/views/toolbar/toolbar_controller_interactive_uitest.cc b/chrome/browser/ui/views/toolbar/toolbar_controller_interactive_uitest.cc index 7161a60..998c5be 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_controller_interactive_uitest.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_controller_interactive_uitest.cc
@@ -554,21 +554,21 @@ IN_PROC_BROWSER_TEST_F(ToolbarControllerUiTest, ActionItemsShowInMenuAndActivateFromMenu) { - RunTestSequence( - PinBookmarkToToolbar(), - AddDummyButtonsToToolbarTillElementOverflows( - ChromeActionIds::kActionSidePanelShowBookmarks), - PressButton(kToolbarOverflowButtonElementId), - CheckMenuMatchesOverflowedElements(), + RunTestSequence(PinBookmarkToToolbar(), + AddDummyButtonsToToolbarTillElementOverflows( + ChromeActionIds::kActionSidePanelShowBookmarks), + PressButton(kToolbarOverflowButtonElementId), + CheckMenuMatchesOverflowedElements(), - // Check bookmark menu item is activated correctly. - ActivateMenuItemWithElementId( - ChromeActionIds::kActionSidePanelShowBookmarks), - WaitForShow(kSidePanelElementId), Check([this]() { - auto* coordinator = browser()->GetFeatures().side_panel_coordinator(); - return coordinator->IsSidePanelEntryShowing( - SidePanelEntry::Key(SidePanelEntry::Id::kBookmarks)); - })); + // Check bookmark menu item is activated correctly. + ActivateMenuItemWithElementId( + ChromeActionIds::kActionSidePanelShowBookmarks), + WaitForShow(kSidePanelElementId), Check([this]() { + auto* coordinator = + browser()->GetFeatures().side_panel_coordinator(); + return coordinator->IsSidePanelEntryShowing( + SidePanelEntry::Key(SidePanelEntry::Id::kBookmarks)); + })); } IN_PROC_BROWSER_TEST_F(ToolbarControllerUiTest,
diff --git a/chrome/browser/ui/views/toolbar/toolbar_icon_container_view.cc b/chrome/browser/ui/views/toolbar/toolbar_icon_container_view.cc index 828aed9..7d28fac 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_icon_container_view.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_icon_container_view.cc
@@ -145,8 +145,9 @@ DCHECK(!main_item_); main_item_ = item; auto* const main_button = views::Button::AsButton(item); - if (main_button) + if (main_button) { ObserveButton(main_button); + } AddChildView(main_item_.get()); } @@ -174,28 +175,34 @@ } bool ToolbarIconContainerView::GetHighlighted() const { - if (!uses_highlight_) + if (!uses_highlight_) { return false; + } - if (IsMouseHovered() && (!main_item_ || !main_item_->IsMouseHovered())) + if (IsMouseHovered() && (!main_item_ || !main_item_->IsMouseHovered())) { return true; + } // Focused, pressed or hovered children should trigger the highlight. for (const views::View* child : children()) { - if (child == main_item_) + if (child == main_item_) { continue; - if (child->HasFocus()) + } + if (child->HasFocus()) { return true; + } const views::Button* button = views::Button::AsButton(child); - if (!button) + if (!button) { continue; + } if (button->GetState() == views::Button::ButtonState::STATE_PRESSED || button->GetState() == views::Button::ButtonState::STATE_HOVERED) { return true; } // The container should also be highlighted if a dialog is anchored to. - if (base::Contains(highlighted_buttons_, button)) + if (base::Contains(highlighted_buttons_, button)) { return true; + } } return false; @@ -262,17 +269,19 @@ bool showing_before = border_.layer()->GetTargetOpacity() == 1; border_.layer()->SetOpacity(GetHighlighted() ? 1 : 0); - if (showing_before == (border_.layer()->GetTargetOpacity() == 1)) + if (showing_before == (border_.layer()->GetTargetOpacity() == 1)) { return; + } observers_.Notify(&Observer::OnHighlightChanged); } void ToolbarIconContainerView::OnButtonHighlightedChanged( views::Button* button) { - if (views::InkDrop::Get(button)->GetHighlighted()) + if (views::InkDrop::Get(button)->GetHighlighted()) { highlighted_buttons_.insert(button); - else + } else { highlighted_buttons_.erase(button); + } UpdateHighlight(); }
diff --git a/chrome/browser/ui/views/toolbar/toolbar_ink_drop_util.cc b/chrome/browser/ui/views/toolbar/toolbar_ink_drop_util.cc index e6c3026e..ebc68a5 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_ink_drop_util.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_ink_drop_util.cc
@@ -54,8 +54,9 @@ gfx::Insets margin_insets; gfx::Insets* const internal_padding = host_view->GetProperty(views::kInternalPaddingKey); - if (internal_padding) + if (internal_padding) { margin_insets = *internal_padding; + } // Inset the inkdrop insets so that the end result matches the target inkdrop // dimensions.
diff --git a/chrome/browser/ui/views/toolbar/toolbar_ink_drop_util_unittest.cc b/chrome/browser/ui/views/toolbar/toolbar_ink_drop_util_unittest.cc index 5482586..49421ac 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_ink_drop_util_unittest.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_ink_drop_util_unittest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/views/toolbar/toolbar_ink_drop_util.h" + #include "base/test/scoped_feature_list.h" #include "chrome/browser/ui/color/chrome_color_provider_utils.h" #include "chrome/test/views/chrome_views_test_base.h" @@ -51,9 +52,9 @@ // Basic test to check for various inkdrop properties for toolbar buttons. TEST_F(ToolbarInkDropUtilTest, ConfigureInkDropForToolbarTest) { ConfigureInkDropForToolbar(button_host_.get()); - EXPECT_EQ(views::InkDrop::Get(button_host_.get())->GetLayerRegion(), - views::LayerRegion::kAbove); - std::unique_ptr<views::InkDropHighlight> highlight = - views::InkDrop::Get(button_host_.get())->CreateInkDropHighlight(); - EXPECT_NE(highlight, nullptr); + EXPECT_EQ(views::InkDrop::Get(button_host_.get())->GetLayerRegion(), + views::LayerRegion::kAbove); + std::unique_ptr<views::InkDropHighlight> highlight = + views::InkDrop::Get(button_host_.get())->CreateInkDropHighlight(); + EXPECT_NE(highlight, nullptr); }
diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc index a8d957e..b9325db 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -147,17 +147,20 @@ // Gets the display mode for a given browser. ToolbarView::DisplayMode GetDisplayMode(Browser* browser) { #if BUILDFLAG(IS_CHROMEOS) - if (browser->is_type_custom_tab()) + if (browser->is_type_custom_tab()) { return ToolbarView::DisplayMode::CUSTOM_TAB; + } #endif // Checked in this order because even tabbed PWAs use the CUSTOM_TAB // display mode. - if (web_app::AppBrowserController::IsWebApp(browser)) + if (web_app::AppBrowserController::IsWebApp(browser)) { return ToolbarView::DisplayMode::CUSTOM_TAB; + } - if (browser->SupportsWindowFeature(Browser::FEATURE_TABSTRIP)) + if (browser->SupportsWindowFeature(Browser::FEATURE_TABSTRIP)) { return ToolbarView::DisplayMode::NORMAL; + } return ToolbarView::DisplayMode::LOCATION; } @@ -239,8 +242,9 @@ container_view_->SetBackground( std::make_unique<TopContainerBackground>(browser_view)); - for (const auto& view_and_command : GetViewCommandMap()) + for (const auto& view_and_command : GetViewCommandMap()) { chrome::AddCommandObserver(browser_, view_and_command.second, this); + } } views::SetCascadingColorProviderColor( container_view_, views::kCascadingBackgroundColor, kColorToolbar); @@ -253,8 +257,9 @@ overflow_button_->set_toolbar_controller(nullptr); - for (const auto& view_and_command : GetViewCommandMap()) + for (const auto& view_and_command : GetViewCommandMap()) { chrome::RemoveCommandObserver(browser_, view_and_command.second, this); + } } void ToolbarView::Init() { @@ -267,16 +272,16 @@ #endif // The background views must be behind container_view_. - background_view_left_ = AddChildViewAt(std::make_unique<View>(), 0); - background_view_left_->SetBackground( - std::make_unique<TabstripLikeBackground>(browser_view_)); - background_view_right_ = AddChildViewAt(std::make_unique<View>(), 0); - background_view_right_->SetBackground( - std::make_unique<TabstripLikeBackground>(browser_view_)); + background_view_left_ = AddChildViewAt(std::make_unique<View>(), 0); + background_view_left_->SetBackground( + std::make_unique<TabstripLikeBackground>(browser_view_)); + background_view_right_ = AddChildViewAt(std::make_unique<View>(), 0); + background_view_right_->SetBackground( + std::make_unique<TabstripLikeBackground>(browser_view_)); - active_state_subscription_ = - GetWidget()->RegisterPaintAsActiveChangedCallback(base::BindRepeating( - &ToolbarView::ActiveStateChanged, base::Unretained(this))); + active_state_subscription_ = + GetWidget()->RegisterPaintAsActiveChangedCallback(base::BindRepeating( + &ToolbarView::ActiveStateChanged, base::Unretained(this))); auto location_bar = std::make_unique<LocationBarView>( browser_, browser_->profile(), browser_->command_controller(), this, @@ -366,7 +371,7 @@ } std::unique_ptr<media_router::CastToolbarButton> cast; if (!(features::IsToolbarPinningEnabled() && - base::FeatureList::IsEnabled(features::kPinnedCastButton))) { + base::FeatureList::IsEnabled(features::kPinnedCastButton))) { if (media_router::MediaRouterEnabled(browser_->profile())) { cast = media_router::CastToolbarButton::Create(browser_); } @@ -455,19 +460,23 @@ std::make_unique<PerformanceInterventionButton>(browser_view_)); } - if (cast) + if (cast) { cast_ = container_view_->AddChildView(std::move(cast)); + } - if (media_button) + if (media_button) { media_button_ = container_view_->AddChildView(std::move(media_button)); + } - if (download_button) + if (download_button) { download_button_ = container_view_->AddChildView(std::move(download_button)); + } - if (send_tab_to_self_button) + if (send_tab_to_self_button) { send_tab_to_self_button_ = container_view_->AddChildView(std::move(send_tab_to_self_button)); + } avatar_ = container_view_->AddChildView( std::make_unique<AvatarToolbarButton>(browser_view_)); @@ -546,16 +555,18 @@ for (auto* button : std::array<views::Button*, 5>{back_, forward_, reload_, home_, avatar_}) { - if (button) + if (button) { button->set_tag(GetViewCommandMap().at(button->GetID())); + } } initialized_ = true; } void ToolbarView::AnimationEnded(const gfx::Animation* animation) { - if (animation->GetCurrentValue() == 0) + if (animation->GetCurrentValue() == 0) { SetToolbarVisibility(false); + } browser()->window()->ToolbarSizeChanged(/*is_animating=*/false); } @@ -564,18 +575,21 @@ } void ToolbarView::Update(WebContents* tab) { - if (location_bar_) + if (location_bar_) { location_bar_->Update(tab); + } - if (extensions_container_) + if (extensions_container_) { extensions_container_->UpdateAllIcons(); + } if (pinned_toolbar_actions_container_) { pinned_toolbar_actions_container_->UpdateAllIcons(); } - if (reload_) + if (reload_) { reload_->SetMenuEnabled(chrome::IsDebuggerAttachedToCurrentTab(browser_)); + } } bool ToolbarView::UpdateSecurityState() { @@ -635,13 +649,15 @@ } void ToolbarView::ResetTabState(WebContents* tab) { - if (location_bar_) + if (location_bar_) { location_bar_->ResetTabState(tab); + } } void ToolbarView::SetPaneFocusAndFocusAppMenu() { - if (app_menu_button_) + if (app_menu_button_) { SetPaneFocus(app_menu_button_); + } } bool ToolbarView::GetAppMenuFocused() const { @@ -667,8 +683,9 @@ GetPageActionIconView(PageActionIconType::kIntentPicker); } - if (!highlighted_button) + if (!highlighted_button) { return; + } IntentPickerBubbleView::ShowBubble( location_bar(), highlighted_button, bubble_type, GetWebContents(), @@ -817,8 +834,9 @@ void ToolbarView::Layout(PassKey) { // If we have not been initialized yet just do nothing. - if (!initialized_) + if (!initialized_) { return; + } // The container view should be the exact same size/position as ToolbarView. container_view_->SetSize(size()); @@ -866,11 +884,13 @@ void ToolbarView::OnThemeChanged() { views::AccessiblePaneView::OnThemeChanged(); - if (!initialized_) + if (!initialized_) { return; + } - if (display_mode_ == DisplayMode::NORMAL) + if (display_mode_ == DisplayMode::NORMAL) { LoadImages(); + } SchedulePaint(); } @@ -928,15 +948,17 @@ bool ToolbarView::AcceleratorPressed(const ui::Accelerator& accelerator) { const views::View* focused_view = focus_manager()->GetFocusedView(); - if (focused_view && (focused_view->GetID() == VIEW_ID_OMNIBOX)) + if (focused_view && (focused_view->GetID() == VIEW_ID_OMNIBOX)) { return false; // Let the omnibox handle all accelerator events. + } return AccessiblePaneView::AcceleratorPressed(accelerator); } void ToolbarView::ChildPreferredSizeChanged(views::View* child) { InvalidateLayout(); - if (size() != GetPreferredSize()) + if (size() != GetPreferredSize()) { PreferredSizeChanged(); + } } //////////////////////////////////////////////////////////////////////////////// @@ -1092,8 +1114,9 @@ void ToolbarView::UpdateTypeAndSeverity( AppMenuIconController::TypeAndSeverity type_and_severity) { // There's no app menu in tabless windows. - if (!app_menu_button_) + if (!app_menu_button_) { return; + } std::u16string accname_app = l10n_util::GetStringUTF16(IDS_ACCNAME_APP); if (type_and_severity.type == @@ -1137,18 +1160,21 @@ } AppMenuButton* ToolbarView::GetAppMenuButton() { - if (app_menu_button_) + if (app_menu_button_) { return app_menu_button_; + } return custom_tab_bar_ ? custom_tab_bar_->custom_tab_menu_button() : nullptr; } gfx::Rect ToolbarView::GetFindBarBoundingBox(int contents_bottom) { - if (!browser_->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR)) + if (!browser_->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR)) { return gfx::Rect(); + } - if (!location_bar_->IsDrawn()) + if (!location_bar_->IsDrawn()) { return gfx::Rect(); + } gfx::Rect bounds = location_bar_->ConvertRectToWidget(location_bar_->GetLocalBounds()); @@ -1246,8 +1272,9 @@ void ToolbarView::LoadImages() { DCHECK_EQ(display_mode_, DisplayMode::NORMAL); - if (extensions_container_) + if (extensions_container_) { extensions_container_->UpdateAllIcons(); + } } void ToolbarView::OnShowForwardButtonChanged() {
diff --git a/chrome/browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc b/chrome/browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc index 387ab66..3b4b7ce 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc
@@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/views/toolbar/toolbar_view.h" - #include <stddef.h> #include "base/functional/bind.h" @@ -26,6 +24,7 @@ #include "chrome/browser/ui/view_ids.h" #include "chrome/browser/ui/views/toolbar/reload_button.h" #include "chrome/browser/ui/views/toolbar/toolbar_button.h" +#include "chrome/browser/ui/views/toolbar/toolbar_view.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/interactive_test_utils.h" #include "chrome/test/base/ui_test_utils.h" @@ -99,14 +98,18 @@ focus_manager->AdvanceFocus(false); view = focus_manager->GetFocusedView(); ids.push_back(view->GetID()); - if (view->GetID() == VIEW_ID_RELOAD_BUTTON) + if (view->GetID() == VIEW_ID_RELOAD_BUTTON) { found_reload = true; - if (view->GetID() == VIEW_ID_APP_MENU) + } + if (view->GetID() == VIEW_ID_APP_MENU) { found_app_menu = true; - if (view->GetID() == VIEW_ID_OMNIBOX) + } + if (view->GetID() == VIEW_ID_OMNIBOX) { found_location_bar = true; - if (ids.size() > 100) + } + if (ids.size() > 100) { GTEST_FAIL() << "Tabbed 100 times, still haven't cycled back!"; + } } // Make sure we found a few key items. @@ -121,8 +124,9 @@ focus_manager->AdvanceFocus(true); view = focus_manager->GetFocusedView(); reverse_ids.push_back(view->GetID()); - if (reverse_ids.size() > 100) + if (reverse_ids.size() > 100) { GTEST_FAIL() << "Tabbed 100 times, still haven't cycled back!"; + } } // Assert that the views were focused in exactly the reverse order. @@ -130,8 +134,9 @@ // be the same, and the others are reverse. ASSERT_EQ(ids.size(), reverse_ids.size()); size_t count = ids.size(); - for (size_t i = 0; i < count - 1; i++) + for (size_t i = 0; i < count - 1; i++) { EXPECT_EQ(ids[i], reverse_ids[count - 2 - i]); + } EXPECT_EQ(ids[count - 1], reverse_ids[count - 1]); }
diff --git a/chrome/browser/ui/views/toolbar/webui_tab_counter_button.cc b/chrome/browser/ui/views/toolbar/webui_tab_counter_button.cc index 61000a6..38f05ef1 100644 --- a/chrome/browser/ui/views/toolbar/webui_tab_counter_button.cc +++ b/chrome/browser/ui/views/toolbar/webui_tab_counter_button.cc
@@ -79,8 +79,9 @@ // throbber animation. bool ShouldChangeStartThrobber(TabStripModel* tab_strip_model, const TabStripModelChange& change) { - if (change.type() != TabStripModelChange::kInserted) + if (change.type() != TabStripModelChange::kInserted) { return false; + } const auto& contents = change.GetInsert()->contents; return contents.size() > 1 || tab_strip_model->GetActiveWebContents() != contents[0].contents; @@ -88,8 +89,9 @@ std::u16string GetTabCounterLabelText(int num_tabs) { // In the triple-digit case, fall back to ':D' to match Android. - if (num_tabs >= 100) + if (num_tabs >= 100) { return std::u16string(u":D"); + } return base::FormatNumber(num_tabs); } @@ -135,8 +137,9 @@ public: explicit InteractionTracker(views::Widget* widget) : native_window_(widget->GetNativeWindow()) { - if (native_window_) + if (native_window_) { native_window_->AddPreTargetHandler(this); + } scoped_widget_observation_.Observe(widget); } @@ -144,8 +147,9 @@ void operator=(const InteractionTracker& other) = delete; ~InteractionTracker() override { - if (native_window_) + if (native_window_) { native_window_->RemovePreTargetHandler(this); + } } const std::optional<gfx::Point>& last_interaction_location() const { @@ -281,13 +285,15 @@ } void TabCounterAnimator::MaybeStartPendingAnimation() { - if (flying_link_ && flying_link_->is_flying()) + if (flying_link_ && flying_link_->is_flying()) { return; + } if (pending_throbber_) { // Start the throbber if it is not already showing. - if (!throbber_timer_.IsRunning()) + if (!throbber_timer_.IsRunning()) { throbber_->Start(); + } // Automatically stop the throbber after 1 second. This will reset the timer // if it is already running. Currently we do not check the real loading @@ -333,8 +339,9 @@ } void TabCounterAnimator::LayoutIfAnimating() { - if (!border_animation_.is_animating() && !label_animation_.is_animating()) + if (!border_animation_.is_animating() && !label_animation_.is_animating()) { return; + } // |border_view_| does a hop or a dip based on animation type. int border_y_delta = 0; @@ -604,8 +611,9 @@ void WebUITabCounterButton::AfterPropertyChange(const void* key, int64_t old_value) { View::AfterPropertyChange(key, old_value); - if (key != user_education::kHasInProductHelpPromoKey) + if (key != user_education::kHasInProductHelpPromoKey) { return; + } UpdateColors(); } @@ -655,9 +663,10 @@ WindowOpenDisposition disposition) { if (disposition == WindowOpenDisposition::NEW_BACKGROUND_TAB && interaction_tracker_ && - interaction_tracker_->last_interaction_location().has_value()) + interaction_tracker_->last_interaction_location().has_value()) { animator_->StartFlyingLinkFrom( interaction_tracker_->last_interaction_location().value()); + } } void WebUITabCounterButton::OnTabStripModelChanged(
diff --git a/chrome/browser/ui/views/tooltip/tooltip_browsertest.cc b/chrome/browser/ui/views/tooltip/tooltip_browsertest.cc index 2c2e0e4d..cb448e86 100644 --- a/chrome/browser/ui/views/tooltip/tooltip_browsertest.cc +++ b/chrome/browser/ui/views/tooltip/tooltip_browsertest.cc
@@ -72,16 +72,18 @@ void OnTooltipShown(views::Widget* widget) { if (widget->GetName() == TooltipAura::kWidgetName) { active_widget_ = widget; - if (run_loop_ && run_loop_->running()) + if (run_loop_ && run_loop_->running()) { run_loop_->Quit(); + } } } void OnTooltipClosed(views::Widget* widget) { if (active_widget_ == widget) { active_widget_ = nullptr; - if (run_loop_ && run_loop_->running()) + if (run_loop_ && run_loop_->running()) { run_loop_->Quit(); + } } }
diff --git a/chrome/browser/ui/views/translate/translate_bubble_controller.cc b/chrome/browser/ui/views/translate/translate_bubble_controller.cc index c29dd33..9946d35 100644 --- a/chrome/browser/ui/views/translate/translate_bubble_controller.cc +++ b/chrome/browser/ui/views/translate/translate_bubble_controller.cc
@@ -56,8 +56,9 @@ LocationBarBubbleDelegateView::DisplayReason reason) { // If the Partial Translate bubble is already being shown, close it before // showing the full translate bubble. - if (partial_translate_bubble_view_) + if (partial_translate_bubble_view_) { partial_translate_bubble_view_->CloseBubble(); + } if (translate_bubble_view_) { // When the user reads the advanced setting panel, the bubble should not be @@ -96,8 +97,9 @@ GetOnTranslateBubbleClosedCallback()); translate_bubble_view_ = translate_bubble_view.get(); - if (highlighted_button) + if (highlighted_button) { translate_bubble_view_->SetHighlightedButton(highlighted_button); + } views::Widget* bubble_widget = views::BubbleDialogDelegateView::CreateBubble( std::move(translate_bubble_view)); @@ -186,8 +188,9 @@ translate::TranslateErrors error_type) { // If the other Translate bubble is already being shown, close it before // showing this one. - if (translate_bubble_view_) + if (translate_bubble_view_) { translate_bubble_view_->CloseBubble(); + } // Truncate text selection, if needed. Log the length of the text selection // before truncating. @@ -253,8 +256,9 @@ anchor_view, std::move(model), web_contents, GetOnPartialTranslateBubbleClosedCallback()); partial_translate_bubble_view_ = partial_translate_bubble_view.get(); - if (highlighted_button) + if (highlighted_button) { partial_translate_bubble_view_->SetHighlightedButton(highlighted_button); + } views::BubbleDialogDelegateView::CreateBubble( std::move(partial_translate_bubble_view)); partial_translate_bubble_view_->SetViewState(view_state, error_type);
diff --git a/chrome/browser/ui/views/translate/translate_bubble_controller_unittest.cc b/chrome/browser/ui/views/translate/translate_bubble_controller_unittest.cc index faaec0ac..836e270 100644 --- a/chrome/browser/ui/views/translate/translate_bubble_controller_unittest.cc +++ b/chrome/browser/ui/views/translate/translate_bubble_controller_unittest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/views/translate/translate_bubble_controller.h" + #include <memory> #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/ui/views/translate/translate_bubble_test_utils_views.cc b/chrome/browser/ui/views/translate/translate_bubble_test_utils_views.cc index 69984e7f..9dad5ada 100644 --- a/chrome/browser/ui/views/translate/translate_bubble_test_utils_views.cc +++ b/chrome/browser/ui/views/translate/translate_bubble_test_utils_views.cc
@@ -2,11 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/translate/translate_bubble_test_utils.h" - #include "base/check_op.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/translate/translate_bubble_model.h" +#include "chrome/browser/ui/translate/translate_bubble_test_utils.h" #include "chrome/browser/ui/views/translate/translate_bubble_controller.h" #include "chrome/browser/ui/views/translate/translate_bubble_view.h" #include "ui/events/keycodes/dom/dom_code.h" @@ -35,8 +34,9 @@ TranslateBubbleController* controller = TranslateBubbleController::FromWebContents( browser->tab_strip_model()->GetActiveWebContents()); - if (controller) + if (controller) { controller->CloseBubble(); + } } void PressTranslate(Browser* browser) {
diff --git a/chrome/browser/ui/views/translate/translate_bubble_view_browsertest.cc b/chrome/browser/ui/views/translate/translate_bubble_view_browsertest.cc index 774c64cf6..ad4973c6 100644 --- a/chrome/browser/ui/views/translate/translate_bubble_view_browsertest.cc +++ b/chrome/browser/ui/views/translate/translate_bubble_view_browsertest.cc
@@ -173,9 +173,8 @@ browser()->tab_strip_model()->GetActiveWebContents())); // Close the last tab. - chrome::CloseWebContents(browser(), - browser()->tab_strip_model()->GetActiveWebContents(), - false); + chrome::CloseWebContents( + browser(), browser()->tab_strip_model()->GetActiveWebContents(), false); } IN_PROC_BROWSER_TEST_F(TranslateBubbleViewBrowserTest, AlertAccessibleEvent) {
diff --git a/chrome/browser/ui/views/translate/translate_bubble_view_interactive_uitest.cc b/chrome/browser/ui/views/translate/translate_bubble_view_interactive_uitest.cc index b743d37..4aaf411 100644 --- a/chrome/browser/ui/views/translate/translate_bubble_view_interactive_uitest.cc +++ b/chrome/browser/ui/views/translate/translate_bubble_view_interactive_uitest.cc
@@ -166,8 +166,9 @@ std::unique_ptr<net::test_server::HttpResponse> HandleRequest( const net::test_server::HttpRequest& request) { - if (request.GetURL().path() != "/mock_translate_script.js") + if (request.GetURL().path() != "/mock_translate_script.js") { return nullptr; + } std::unique_ptr<net::test_server::BasicHttpResponse> http_response( new net::test_server::BasicHttpResponse); @@ -386,8 +387,9 @@ bool offline = false; content::URLLoaderInterceptor interceptor(base::BindLambdaForTesting( [&](content::URLLoaderInterceptor::RequestParams* params) -> bool { - if (!offline) + if (!offline) { return false; + } params->client->OnComplete( network::URLLoaderCompletionStatus(net::ERR_INTERNET_DISCONNECTED)); return true;
diff --git a/chrome/browser/ui/views/translate/translate_bubble_view_unittest.cc b/chrome/browser/ui/views/translate/translate_bubble_view_unittest.cc index a09a995..14c69d78 100644 --- a/chrome/browser/ui/views/translate/translate_bubble_view_unittest.cc +++ b/chrome/browser/ui/views/translate/translate_bubble_view_unittest.cc
@@ -80,8 +80,9 @@ } std::string GetSourceLanguageCode() const override { - if (source_language_index_ == 0) + if (source_language_index_ == 0) { return "und"; + } return "eng-US"; }
diff --git a/chrome/browser/ui/views/update_recommended_message_box.cc b/chrome/browser/ui/views/update_recommended_message_box.cc index f5d0e2521..9db8ae39 100644 --- a/chrome/browser/ui/views/update_recommended_message_box.cc +++ b/chrome/browser/ui/views/update_recommended_message_box.cc
@@ -27,7 +27,8 @@ void UpdateRecommendedMessageBox::Show(gfx::NativeWindow parent_window) { // When the window closes, it will delete itself. constrained_window::CreateBrowserModalDialogViews( - new UpdateRecommendedMessageBox(), parent_window)->Show(); + new UpdateRecommendedMessageBox(), parent_window) + ->Show(); } ////////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/ui/views/user_education/feature_promo_dialog_interactive_uitest.cc b/chrome/browser/ui/views/user_education/feature_promo_dialog_interactive_uitest.cc index 90410613..80f13b0 100644 --- a/chrome/browser/ui/views/user_education/feature_promo_dialog_interactive_uitest.cc +++ b/chrome/browser/ui/views/user_education/feature_promo_dialog_interactive_uitest.cc
@@ -131,9 +131,10 @@ // The browser may have already queued a promo for startup. Since the test // uses a mock, cancel that and just show it directly. const auto status = promo_controller->GetPromoStatus(*feature_); - if (status == user_education::FeaturePromoStatus::kQueuedForStartup) + if (status == user_education::FeaturePromoStatus::kQueuedForStartup) { promo_controller->EndPromo( *feature_, user_education::EndFeaturePromoReason::kAbortPromo); + } // Set up mock tracker to allow the IPH, then attempt to show it. EXPECT_CALL(*GetMockTrackerFor(browser()),
diff --git a/chrome/browser/ui/views/web_apps/create_shortcut_confirmation_view_browsertest.cc b/chrome/browser/ui/views/web_apps/create_shortcut_confirmation_view_browsertest.cc index c08bd61..3623f58a 100644 --- a/chrome/browser/ui/views/web_apps/create_shortcut_confirmation_view_browsertest.cc +++ b/chrome/browser/ui/views/web_apps/create_shortcut_confirmation_view_browsertest.cc
@@ -2,13 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/views/web_apps/create_shortcut_confirmation_view.h" + #include "base/strings/utf_string_conversions.h" #include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/test_future.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/test/test_browser_dialog.h" -#include "chrome/browser/ui/views/web_apps/create_shortcut_confirmation_view.h" #include "chrome/browser/ui/web_applications/web_app_dialogs.h" #include "chrome/browser/web_applications/web_app_helpers.h" #include "chrome/browser/web_applications/web_app_install_info.h" @@ -67,8 +68,8 @@ webapps::WebappInstallSource::MENU_CREATE_SHORTCUT); web_app::ShowCreateShortcutDialog(web_contents, std::move(app_info), - std::move(install_tracker), - base::BindLambdaForTesting(callback)); + std::move(install_tracker), + base::BindLambdaForTesting(callback)); } void SetUp() override { @@ -126,8 +127,8 @@ webapps::WebappInstallSource::MENU_CREATE_SHORTCUT); web_app::ShowCreateShortcutDialog(web_contents, std::move(app_info), - std::move(install_tracker), - base::BindLambdaForTesting(callback)); + std::move(install_tracker), + base::BindLambdaForTesting(callback)); EXPECT_TRUE(is_accepted); EXPECT_EQ(install_info->user_display_mode, @@ -154,8 +155,8 @@ webapps::WebappInstallSource::MENU_CREATE_SHORTCUT); web_app::ShowCreateShortcutDialog(web_contents, std::move(app_info), - std::move(install_tracker), - install_result.GetCallback()); + std::move(install_tracker), + install_result.GetCallback()); CreateShortcutConfirmationView* dialog = CreateShortcutConfirmationView::GetDialogForTesting(); @@ -252,8 +253,8 @@ webapps::WebappInstallSource::MENU_CREATE_SHORTCUT); web_app::ShowCreateShortcutDialog(web_contents, std::move(app_info), - std::move(install_tracker), - base::BindLambdaForTesting(callback)); + std::move(install_tracker), + base::BindLambdaForTesting(callback)); EXPECT_TRUE(is_accepted) << test_case.input; EXPECT_EQ(test_case.expected_result, title) << test_case.input; }
diff --git a/chrome/browser/ui/views/web_apps/deprecated_apps_dialog_view_browsertest.cc b/chrome/browser/ui/views/web_apps/deprecated_apps_dialog_view_browsertest.cc index dc42fd1..65431580 100644 --- a/chrome/browser/ui/views/web_apps/deprecated_apps_dialog_view_browsertest.cc +++ b/chrome/browser/ui/views/web_apps/deprecated_apps_dialog_view_browsertest.cc
@@ -91,8 +91,9 @@ const DeprecatedAppsDialogViewBrowserTest&) = delete; bool IsDialogShown() { - if (test_dialog_view_) + if (test_dialog_view_) { return true; + } return false; } @@ -103,8 +104,9 @@ } void WaitForDialogToBeDestroyed() { - if (!test_dialog_view_) + if (!test_dialog_view_) { return; + } DeprecatedAppDialogWidgetObserver dialog_observer( test_dialog_view_.get()->GetWidget());
diff --git a/chrome/browser/ui/views/web_apps/file_handler_launch_dialog_browsertest.cc b/chrome/browser/ui/views/web_apps/file_handler_launch_dialog_browsertest.cc index e60b15a9..b6c28a8 100644 --- a/chrome/browser/ui/views/web_apps/file_handler_launch_dialog_browsertest.cc +++ b/chrome/browser/ui/views/web_apps/file_handler_launch_dialog_browsertest.cc
@@ -146,8 +146,9 @@ std::vector<base::FilePath> file_paths = {}, GURL expected_url = {}) { content::TestNavigationObserver navigation_observer(expected_url); - if (!expected_url.is_empty()) + if (!expected_url.is_empty()) { navigation_observer.StartWatchingNewWebContents(); + } base::RunLoop run_loop; web_app::startup::SetStartupDoneCallbackForTesting(run_loop.QuitClosure()); @@ -156,15 +157,17 @@ remember_checkbox_state); views::NamedWidgetShownWaiter waiter(views::test::AnyWidgetTestPasskey{}, "FileHandlerLaunchDialogView"); - if (file_paths.empty()) + if (file_paths.empty()) { file_paths = {{base::FilePath::FromASCII("foo.txt")}}; + } LaunchAppWithFiles(file_paths); waiter.WaitIfNeededAndGet()->CloseWithReason(user_response); run_loop.Run(); EXPECT_EQ(expected_end_state, GetApp()->file_handler_approval_state()); - if (!expected_url.is_empty()) + if (!expected_url.is_empty()) { navigation_observer.Wait(); + } } // Launches the app to handle a file, assumes no dialog will be shown, but
diff --git a/chrome/browser/ui/views/web_apps/frame_toolbar/web_app_frame_toolbar_view.h b/chrome/browser/ui/views/web_apps/frame_toolbar/web_app_frame_toolbar_view.h index dea6fe20..e62a159 100644 --- a/chrome/browser/ui/views/web_apps/frame_toolbar/web_app_frame_toolbar_view.h +++ b/chrome/browser/ui/views/web_apps/frame_toolbar/web_app_frame_toolbar_view.h
@@ -20,7 +20,7 @@ namespace { class WebAppNonClientFrameViewChromeOSTest; class LocationBarViewQuietNotificationInteractiveUITest; -} +} // namespace namespace views { class View;
diff --git a/chrome/browser/ui/views/web_apps/isolated_web_apps/isolated_web_app_installer_coordinator.h b/chrome/browser/ui/views/web_apps/isolated_web_apps/isolated_web_app_installer_coordinator.h index f9226df7..63f40f8 100644 --- a/chrome/browser/ui/views/web_apps/isolated_web_apps/isolated_web_app_installer_coordinator.h +++ b/chrome/browser/ui/views/web_apps/isolated_web_apps/isolated_web_app_installer_coordinator.h
@@ -33,7 +33,6 @@ ~IsolatedWebAppInstallerCoordinator(); - void FocusWindow(); IsolatedWebAppInstallerModel* GetModelForTesting();
diff --git a/chrome/browser/ui/views/web_apps/isolated_web_apps/pref_observer_ash.cc b/chrome/browser/ui/views/web_apps/isolated_web_apps/pref_observer_ash.cc index 87a482b..02a6362 100644 --- a/chrome/browser/ui/views/web_apps/isolated_web_apps/pref_observer_ash.cc +++ b/chrome/browser/ui/views/web_apps/isolated_web_apps/pref_observer_ash.cc
@@ -2,13 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/views/web_apps/isolated_web_apps/pref_observer.h" - #include "ash/constants/ash_pref_names.h" #include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/ui/views/web_apps/isolated_web_apps/pref_observer.h" #include "chrome/browser/web_applications/isolated_web_apps/isolated_web_app_features.h" #include "components/prefs/pref_change_registrar.h" #include "components/prefs/pref_service.h"
diff --git a/chrome/browser/ui/views/web_apps/simple_install_dialog_bubble_view_browsertest.cc b/chrome/browser/ui/views/web_apps/simple_install_dialog_bubble_view_browsertest.cc index 1d7ed0fb..31cbed9 100644 --- a/chrome/browser/ui/views/web_apps/simple_install_dialog_bubble_view_browsertest.cc +++ b/chrome/browser/ui/views/web_apps/simple_install_dialog_bubble_view_browsertest.cc
@@ -3,7 +3,6 @@ // found in the LICENSE file. #include "base/functional/callback_helpers.h" -#include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" @@ -14,7 +13,6 @@ #include "chrome/browser/picture_in_picture/picture_in_picture_window_manager.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/web_applications/test/web_app_browsertest_util.h" #include "chrome/browser/ui/web_applications/web_app_browsertest_base.h" #include "chrome/browser/ui/web_applications/web_app_dialogs.h" @@ -283,62 +281,6 @@ views::Widget::ClosedReason::kCloseButtonClicked, 1); } -IN_PROC_BROWSER_TEST_F(SimpleInstallDialogBubbleViewBrowserTest, - WindowSizeLoweringClosesDialog) { - std::unique_ptr<webapps::MlInstallOperationTracker> install_tracker = - GetInstallTracker(browser()); - - views::NamedWidgetShownWaiter widget_waiter( - views::test::AnyWidgetTestPasskey{}, kInstallDialogName); - base::test::TestFuture<bool, std::unique_ptr<WebAppInstallInfo>> test_future; - ShowSimpleInstallDialogForWebApps( - browser()->tab_strip_model()->GetActiveWebContents(), GetAppInfo(), - std::move(install_tracker), test_future.GetCallback()); - - views::Widget* widget = widget_waiter.WaitIfNeededAndGet(); - ASSERT_NE(widget, nullptr); - EXPECT_FALSE(test_future.IsReady()); - - base::HistogramTester histograms; - views::test::WidgetDestroyedWaiter destroy_waiter(widget); - // Make the size of the browser window too small for the dialog. - browser()->GetBrowserView().SetBounds(gfx::Rect(100, 100)); - destroy_waiter.Wait(); - - ASSERT_TRUE(test_future.Wait()); - EXPECT_FALSE(test_future.Get<bool>()); - - histograms.ExpectUniqueSample( - "WebApp.InstallConfirmation.CloseReason", - views::Widget::ClosedReason::kCloseButtonClicked, 1); -} - -IN_PROC_BROWSER_TEST_F(SimpleInstallDialogBubbleViewBrowserTest, - SmallWindowClosesDialogAutomatically) { - std::unique_ptr<webapps::MlInstallOperationTracker> install_tracker = - GetInstallTracker(browser()); - - base::HistogramTester histograms; - views::AnyWidgetObserver widget_observer(views::test::AnyWidgetTestPasskey{}); - browser()->GetBrowserView().SetBounds(gfx::Rect(100, 100)); - - base::RunLoop run_loop; - widget_observer.set_closing_callback( - base::BindLambdaForTesting([&](views::Widget* widget) { - if (widget->GetName() == kInstallDialogName) { - run_loop.Quit(); - } - })); - ShowSimpleInstallDialogForWebApps( - browser()->tab_strip_model()->GetActiveWebContents(), GetAppInfo(), - std::move(install_tracker), base::DoNothing()); - run_loop.Run(); - - histograms.ExpectUniqueSample( - "WebApp.InstallConfirmation.CloseReason", - views::Widget::ClosedReason::kCloseButtonClicked, 1); -} - class PictureInPictureSimpleInstallDialogOcclusionTest : public MixinBasedInProcessBrowserTest { protected:
diff --git a/chrome/browser/ui/views/web_apps/view_visible_in_active_widget_notifier.cc b/chrome/browser/ui/views/web_apps/view_visible_in_active_widget_notifier.cc index 191ecc5..346155d0 100644 --- a/chrome/browser/ui/views/web_apps/view_visible_in_active_widget_notifier.cc +++ b/chrome/browser/ui/views/web_apps/view_visible_in_active_widget_notifier.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/views/web_apps/view_visible_in_active_widget_notifier.h" + #include <utility> #include "base/functional/bind.h" @@ -9,7 +11,6 @@ #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h" #include "chrome/browser/ui/views/frame/browser_view.h" -#include "chrome/browser/ui/views/web_apps/view_visible_in_active_widget_notifier.h" #include "chrome/browser/ui/web_applications/web_app_dialogs.h" #include "ui/base/interaction/element_identifier.h" #include "ui/base/interaction/element_tracker.h"
diff --git a/chrome/browser/ui/views/web_apps/view_visible_in_active_widget_notifier_unittest.cc b/chrome/browser/ui/views/web_apps/view_visible_in_active_widget_notifier_unittest.cc index f82443c44..f8e58c6 100644 --- a/chrome/browser/ui/views/web_apps/view_visible_in_active_widget_notifier_unittest.cc +++ b/chrome/browser/ui/views/web_apps/view_visible_in_active_widget_notifier_unittest.cc
@@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <memory> - #include "chrome/browser/ui/views/web_apps/view_visible_in_active_widget_notifier.h" +#include <memory> + #include "base/memory/weak_ptr.h" #include "base/run_loop.h" #include "base/test/test_future.h"
diff --git a/chrome/browser/ui/views/web_apps/web_app_identity_update_confirmation_view_browsertest.cc b/chrome/browser/ui/views/web_apps/web_app_identity_update_confirmation_view_browsertest.cc index 9afd30f..a3f43c3 100644 --- a/chrome/browser/ui/views/web_apps/web_app_identity_update_confirmation_view_browsertest.cc +++ b/chrome/browser/ui/views/web_apps/web_app_identity_update_confirmation_view_browsertest.cc
@@ -60,20 +60,23 @@ } bool VerifyUi() override { - if (!DialogBrowserTest::VerifyUi()) + if (!DialogBrowserTest::VerifyUi()) { return false; + } views::Widget::Widgets widgets; #if BUILDFLAG(IS_CHROMEOS) - for (aura::Window* root_window : ash::Shell::GetAllRootWindows()) + for (aura::Window* root_window : ash::Shell::GetAllRootWindows()) { views::Widget::GetAllChildWidgets(root_window, &widgets); + } #else widgets = views::test::WidgetTest::GetAllWidgets(); #endif // BUILDFLAG(IS_CHROMEOS) for (views::Widget* widget : widgets) { - if (!widget->GetRootView()) + if (!widget->GetRootView()) { continue; + } views::View* view = widget->GetRootView()->GetViewByID( VIEW_ID_APP_IDENTITY_UPDATE_HEADER); if (view) { @@ -144,8 +147,9 @@ base::RunLoop run_loop; observer.set_closing_callback( base::BindLambdaForTesting([&](views::Widget* widget) { - if (widget == dialog_widget) + if (widget == dialog_widget) { run_loop.Quit(); + } })); // Uninstalling the app will abort its App Identity Update dialog. web_app::test::UninstallWebApp(browser()->profile(), app_id_);
diff --git a/chrome/browser/ui/views/web_apps/web_app_info_image_source.cc b/chrome/browser/ui/views/web_apps/web_app_info_image_source.cc index bb5f87a..5f063f90 100644 --- a/chrome/browser/ui/views/web_apps/web_app_info_image_source.cc +++ b/chrome/browser/ui/views/web_apps/web_app_info_image_source.cc
@@ -16,7 +16,8 @@ gfx::ImageSkiaRep WebAppInfoImageSource::GetImageForScale(float scale) { int size = base::saturated_cast<int>(dip_size_ * scale); auto icon = icons_.find(size); - if (icon != icons_.end()) + if (icon != icons_.end()) { return gfx::ImageSkiaRep(icon->second, scale); + } return gfx::ImageSkiaRep(); }
diff --git a/chrome/browser/ui/views/web_dialog_view_browsertest.cc b/chrome/browser/ui/views/web_dialog_view_browsertest.cc index 8f25364..7407b621 100644 --- a/chrome/browser/ui/views/web_dialog_view_browsertest.cc +++ b/chrome/browser/ui/views/web_dialog_view_browsertest.cc
@@ -54,8 +54,9 @@ void OnWidgetBoundsChanged(views::Widget* widget, const gfx::Rect& bounds) override { - if (bounds.size() != old_size_) + if (bounds.size() != old_size_) { run_loop_.Quit(); + } } private:
diff --git a/chrome/browser/ui/views/webauthn/authenticator_client_pin_entry_sheet_view.cc b/chrome/browser/ui/views/webauthn/authenticator_client_pin_entry_sheet_view.cc index de56de8..56a2514 100644 --- a/chrome/browser/ui/views/webauthn/authenticator_client_pin_entry_sheet_view.cc +++ b/chrome/browser/ui/views/webauthn/authenticator_client_pin_entry_sheet_view.cc
@@ -11,8 +11,7 @@ AuthenticatorClientPinEntrySheetView::AuthenticatorClientPinEntrySheetView( std::unique_ptr<AuthenticatorClientPinEntrySheetModel> sheet_model) - : AuthenticatorRequestSheetView(std::move(sheet_model)) { -} + : AuthenticatorRequestSheetView(std::move(sheet_model)) {} AuthenticatorClientPinEntrySheetView::~AuthenticatorClientPinEntrySheetView() = default;
diff --git a/chrome/browser/ui/views/webid/account_selection_bubble_view_unittest.cc b/chrome/browser/ui/views/webid/account_selection_bubble_view_unittest.cc index c61aa8e..a10d617a 100644 --- a/chrome/browser/ui/views/webid/account_selection_bubble_view_unittest.cc +++ b/chrome/browser/ui/views/webid/account_selection_bubble_view_unittest.cc
@@ -320,9 +320,8 @@ /*expect_privacy_policy=*/true); } - void TestMultipleAccounts( - const std::u16string& expected_title, - bool expect_idp_brand_icon_in_header) { + void TestMultipleAccounts(const std::u16string& expected_title, + bool expect_idp_brand_icon_in_header) { const std::vector<std::string> kAccountSuffixes = {"0", "1", "2"}; CreateAndShowMultiAccountPicker(kAccountSuffixes);
diff --git a/chrome/browser/ui/views/webid/account_selection_modal_view_browsertest.cc b/chrome/browser/ui/views/webid/account_selection_modal_view_browsertest.cc index 3cfe133..b90e5d6 100644 --- a/chrome/browser/ui/views/webid/account_selection_modal_view_browsertest.cc +++ b/chrome/browser/ui/views/webid/account_selection_modal_view_browsertest.cc
@@ -63,11 +63,10 @@ kDefaultDisclosureFields, /*has_login_status_mismatch=*/false)) { test_shared_url_loader_factory_ = - base::MakeRefCounted<network::WeakWrapperSharedURLLoaderFactory>( - &test_url_loader_factory_); + base::MakeRefCounted<network::WeakWrapperSharedURLLoaderFactory>( + &test_url_loader_factory_); } - AccountSelectionModalViewTest(const AccountSelectionModalViewTest&) = - delete; + AccountSelectionModalViewTest(const AccountSelectionModalViewTest&) = delete; AccountSelectionModalViewTest& operator=( const AccountSelectionModalViewTest&) = delete; ~AccountSelectionModalViewTest() override = default; @@ -95,9 +94,7 @@ } protected: - void CreateAccountSelectionModal() { - ShowUi(""); - } + void CreateAccountSelectionModal() { ShowUi(""); } void CreateAndShowSingleAccountPicker( bool show_back_button,
diff --git a/chrome/browser/ui/views/webid/fedcm_account_selection_view_desktop.cc b/chrome/browser/ui/views/webid/fedcm_account_selection_view_desktop.cc index 6bb040b..480bc9a 100644 --- a/chrome/browser/ui/views/webid/fedcm_account_selection_view_desktop.cc +++ b/chrome/browser/ui/views/webid/fedcm_account_selection_view_desktop.cc
@@ -446,8 +446,8 @@ rp_context, rp_mode, has_modal_support); } - account_selection_view_->ShowErrorDialog( - base::UTF8ToUTF16(idp_etld_plus_one), idp_metadata, error); + account_selection_view_->ShowErrorDialog(base::UTF8ToUTF16(idp_etld_plus_one), + idp_metadata, error); UpdateDialogVisibilityAndPosition(); return true; }
diff --git a/chrome/browser/ui/views/webview_accessibility_browsertest.cc b/chrome/browser/ui/views/webview_accessibility_browsertest.cc index af946eb..0cd8c40 100644 --- a/chrome/browser/ui/views/webview_accessibility_browsertest.cc +++ b/chrome/browser/ui/views/webview_accessibility_browsertest.cc
@@ -34,8 +34,9 @@ if (node->GetRole() == ax::mojom::Role::kButton) { bool offscreen = false; tree->GetTreeBounds(node, &offscreen, /* clip = */ true); - if (offscreen) + if (offscreen) { count++; + } } for (const ui::AXNode* child : node->children()) {
diff --git a/chrome/browser/ui/web_applications/app_browser_controller.cc b/chrome/browser/ui/web_applications/app_browser_controller.cc index 04462cd..68941d2 100644 --- a/chrome/browser/ui/web_applications/app_browser_controller.cc +++ b/chrome/browser/ui/web_applications/app_browser_controller.cc
@@ -112,12 +112,15 @@ if (browser->IsAttemptingToCloseBrowser() || browser->IsBrowserClosing()) { continue; } - if (browser->type() == Browser::TYPE_POPUP) + if (browser->type() == Browser::TYPE_POPUP) { continue; - if (browser->profile() != &profile) + } + if (browser->profile() != &profile) { continue; - if (!IsForWebApp(browser, app_id)) + } + if (!IsForWebApp(browser, app_id)) { continue; + } return browser; } return nullptr; @@ -163,14 +166,16 @@ } bool AppBrowserController::ShouldShowCustomTabBar() const { - if (!IsInstalled()) + if (!IsInstalled()) { return false; + } content::WebContents* web_contents = browser()->tab_strip_model()->GetActiveWebContents(); - if (!web_contents) + if (!web_contents) { return false; + } GURL start_url = GetAppStartUrl(); std::string_view start_url_scheme = start_url.scheme_piece(); @@ -184,8 +189,9 @@ // If the url is unset, it doesn't give a signal as to whether the toolbar // should be shown or not. In lieu of more information, do not show the // toolbar. - if (url.is_empty()) + if (url.is_empty()) { return false; + } // Show toolbar when not using 'https', unless this is an internal app, // or origin is secure (e.g. localhost). @@ -203,8 +209,9 @@ GURL visible_url = web_contents->GetVisibleURL(); GURL last_committed_url = web_contents->GetLastCommittedURL(); - if (last_committed_url.is_empty() && visible_url.is_empty()) + if (last_committed_url.is_empty() && visible_url.is_empty()) { return should_show_toolbar_for_url(initial_url()); + } if (should_show_toolbar_for_url(visible_url) || should_show_toolbar_for_url(last_committed_url)) { @@ -237,8 +244,9 @@ bool AppBrowserController::HasTitlebarAppOriginText() const { #if BUILDFLAG(IS_CHROMEOS) // Do not show origin text for System Apps. - if (system_app()) + if (system_app()) { return false; + } #endif // BUILDFLAG(IS_CHROMEOS) return true; } @@ -376,12 +384,15 @@ void AppBrowserController::DidStartNavigation( content::NavigationHandle* navigation_handle) { - if (!initial_url().is_empty()) + if (!initial_url().is_empty()) { return; - if (!navigation_handle->IsInPrimaryMainFrame()) + } + if (!navigation_handle->IsInPrimaryMainFrame()) { return; - if (navigation_handle->GetURL().is_empty()) + } + if (navigation_handle->GetURL().is_empty()) { return; + } SetInitialURL(navigation_handle->GetURL()); } @@ -432,12 +443,14 @@ browser()->tab_strip_model()->GetActiveWebContents(); if (web_contents) { std::optional<SkColor> color = web_contents->GetThemeColor(); - if (color) + if (color) { result = color; + } } - if (!result) + if (!result) { return std::nullopt; + } // The frame/tabstrip code expects an opaque color. return SkColorSetA(*result, SK_AlphaOPAQUE); @@ -445,16 +458,19 @@ std::optional<SkColor> AppBrowserController::GetBackgroundColor() const { std::optional<SkColor> color; - if (auto* web_contents = browser()->tab_strip_model()->GetActiveWebContents()) + if (auto* web_contents = + browser()->tab_strip_model()->GetActiveWebContents()) { color = web_contents->GetBackgroundColor(); + } return color ? SkColorSetA(*color, SK_AlphaOPAQUE) : color; } std::u16string AppBrowserController::GetTitle() const { content::WebContents* web_contents = browser()->tab_strip_model()->GetActiveWebContents(); - if (!web_contents) + if (!web_contents) { return std::u16string(); + } content::NavigationEntry* entry = web_contents->GetController().GetVisibleEntry(); @@ -464,8 +480,9 @@ std::string AppBrowserController::GetTitleForMediaControls() const { #if BUILDFLAG(IS_CHROMEOS) // Only return the app name if we're a System Web App. - if (system_app()) + if (system_app()) { return base::UTF16ToUTF8(GetAppShortName()); + } #endif // BUILDFLAG(IS_CHROMEOS) return std::string(); } @@ -508,11 +525,13 @@ } } if (change.type() == TabStripModelChange::kInserted) { - for (const auto& contents : change.GetInsert()->contents) + for (const auto& contents : change.GetInsert()->contents) { OnTabInserted(contents.contents); + } } else if (change.type() == TabStripModelChange::kRemoved) { - for (const auto& contents : change.GetRemove()->contents) + for (const auto& contents : change.GetRemove()->contents) { OnTabRemoved(contents.contents); + } // WebContents should be null when the last tab is closed. DCHECK_EQ(web_contents() == nullptr, tab_strip_model->empty()); } @@ -553,8 +572,9 @@ // out yet. Whether or not the PWA background color is set is used in many // locations to derive other colors. Those specific locations would need to be // addressed in their own context. - if (bg_color) + if (bg_color) { mixer[kColorPwaBackground] = {bg_color.value()}; + } mixer[kColorPwaMenuButtonIcon] = {kColorToolbarButtonIcon}; mixer[kColorPwaSecurityChipForeground] = {ui::kColorSecondaryForeground}; mixer[kColorPwaSecurityChipForegroundDangerous] = { @@ -581,8 +601,9 @@ ui::DeriveDefaultIconColor(ui::kColorEndpointForeground); mixer[kColorPwaToolbarButtonIconDisabled] = ui::SetAlpha(kColorPwaToolbarButtonIcon, gfx::kDisabledControlAlpha); - if (bg_color) + if (bg_color) { mixer[kColorWebContentsBackground] = {kColorPwaBackground}; + } mixer[kColorInfoBarBackground] = {kColorPwaToolbarBackground}; mixer[kColorInfoBarForeground] = {kColorPwaToolbarButtonIcon}; @@ -645,12 +666,14 @@ // If the window bounds have not been overridden, there is no need to resize // the window. - if (!browser()->bounds_overridden()) + if (!browser()->bounds_overridden()) { return; + } // The saved bounds will only be wrong if they are content bounds. - if (!chrome::SavedBoundsAreContentBounds(browser())) + if (!chrome::SavedBoundsAreContentBounds(browser())) { return; + } // TODO(crbug.com/41459774): Correctly set the window size at creation time. // This is currently not possible because the current url is not easily known @@ -663,8 +686,9 @@ } void AppBrowserController::OnTabInserted(content::WebContents* contents) { - if (!contents->GetVisibleURL().is_empty() && initial_url_.is_empty()) + if (!contents->GetVisibleURL().is_empty() && initial_url_.is_empty()) { SetInitialURL(contents->GetVisibleURL()); + } // Collect draggable app regions if the app supports Window Controls Overlay // or Borderless mode. This is required in addition to the use in @@ -729,8 +753,9 @@ draggable_region_ = sk_region; - if (on_draggable_region_set_for_testing_) + if (on_draggable_region_set_for_testing_) { std::move(on_draggable_region_set_for_testing_).Run(); + } } void AppBrowserController::SetOnUpdateDraggableRegionForTesting( @@ -796,8 +821,9 @@ kAutogenerated); BrowserThemePack::BuildFromWebAppColors(*theme_color, *background_color, theme_pack_.get()); - if (browser_->window()) + if (browser_->window()) { browser_->window()->UserChangedTheme(BrowserThemeChangeType::kWebAppTheme); + } } void AppBrowserController::SetInitialURL(const GURL& initial_url) {
diff --git a/chrome/browser/ui/web_applications/app_browser_controller_browsertest_chromeos.cc b/chrome/browser/ui/web_applications/app_browser_controller_browsertest_chromeos.cc index 7e3812e8..755ff83 100644 --- a/chrome/browser/ui/web_applications/app_browser_controller_browsertest_chromeos.cc +++ b/chrome/browser/ui/web_applications/app_browser_controller_browsertest_chromeos.cc
@@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/web_applications/app_browser_controller.h" - #include <memory> #include "base/memory/raw_ptr.h" @@ -22,6 +20,7 @@ #include "chrome/browser/ui/extensions/application_launch.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" +#include "chrome/browser/ui/web_applications/app_browser_controller.h" #include "chrome/browser/ui/web_applications/test/web_app_browsertest_util.h" #include "chrome/browser/ui/window_sizer/window_sizer.h" #include "chrome/browser/web_applications/web_app_constants.h" @@ -71,8 +70,9 @@ TabStripModel* tab_strip_model, const TabStripModelChange& change, const TabStripSelectionChange& selection) override { - if (selection.active_tab_changed()) + if (selection.active_tab_changed()) { content::WebContentsObserver::Observe(selection.new_contents); + } } // content::WebContentsObserver: @@ -102,8 +102,9 @@ protected: Profile* profile() { - if (!profile_) + if (!profile_) { profile_ = browser()->profile(); + } return profile_; }
diff --git a/chrome/browser/ui/web_applications/diagnostics/app_type_initialized_event.cc b/chrome/browser/ui/web_applications/diagnostics/app_type_initialized_event.cc index 4f2e80b..f9d8a9e 100644 --- a/chrome/browser/ui/web_applications/diagnostics/app_type_initialized_event.cc +++ b/chrome/browser/ui/web_applications/diagnostics/app_type_initialized_event.cc
@@ -38,8 +38,9 @@ } void AppTypeInitializedEvent::OnAppTypeInitialized(apps::AppType app_type) { - if (!callback_ || app_type != app_type_) + if (!callback_ || app_type != app_type_) { return; + } scoped_observation_.Reset(); std::move(callback_).Run(); }
diff --git a/chrome/browser/ui/web_applications/diagnostics/web_app_icon_health_checks.cc b/chrome/browser/ui/web_applications/diagnostics/web_app_icon_health_checks.cc index 1b0d04b..03563c803 100644 --- a/chrome/browser/ui/web_applications/diagnostics/web_app_icon_health_checks.cc +++ b/chrome/browser/ui/web_applications/diagnostics/web_app_icon_health_checks.cc
@@ -71,8 +71,9 @@ webapps::AppId app_id, std::optional<WebAppIconDiagnosticResult> result) { apps_running_icon_diagnostics_.erase(app_id); - if (result) + if (result) { results_.push_back(*std::move(result)); + } run_complete_callback_.Run(); }
diff --git a/chrome/browser/ui/web_applications/share_target_utils.cc b/chrome/browser/ui/web_applications/share_target_utils.cc index d20b0fd2..d0642e8 100644 --- a/chrome/browser/ui/web_applications/share_target_utils.cc +++ b/chrome/browser/ui/web_applications/share_target_utils.cc
@@ -46,19 +46,22 @@ {.name = share_target.params.title, .value = *intent.share_title}); } - if (!intent.share_text.has_value()) + if (!intent.share_text.has_value()) { return result; + } apps_util::SharedText extracted_text = apps_util::ExtractSharedText(*intent.share_text); - if (!share_target.params.text.empty() && !extracted_text.text.empty()) + if (!share_target.params.text.empty() && !extracted_text.text.empty()) { result.push_back( {.name = share_target.params.text, .value = extracted_text.text}); + } - if (!share_target.params.url.empty() && !extracted_text.url.is_empty()) + if (!share_target.params.url.empty() && !extracted_text.url.is_empty()) { result.push_back( {.name = share_target.params.url, .value = extracted_text.url.spec()}); + } return result; } @@ -105,8 +108,9 @@ break; } } - if (name.empty()) + if (name.empty()) { continue; + } storage::FileSystemURL file_system_url;
diff --git a/chrome/browser/ui/web_applications/share_to_target_browsertest.cc b/chrome/browser/ui/web_applications/share_to_target_browsertest.cc index 3229bfe..bdbb47b5 100644 --- a/chrome/browser/ui/web_applications/share_to_target_browsertest.cc +++ b/chrome/browser/ui/web_applications/share_to_target_browsertest.cc
@@ -83,16 +83,18 @@ private: // WebAppBrowserTestBase: void TearDownOnMainThread() override { - if (!app_id_.empty()) + if (!app_id_.empty()) { CloseAppWindows(app_id_); + } WebAppBrowserTestBase::TearDownOnMainThread(); } static void CloseAppWindows(const webapps::AppId& app_id) { for (Browser* browser : *BrowserList::GetInstance()) { const AppBrowserController* app_controller = browser->app_controller(); - if (app_controller && app_controller->app_id() == app_id) + if (app_controller && app_controller->app_id() == app_id) { browser->window()->Close(); + } } }
diff --git a/chrome/browser/ui/web_applications/sub_apps_install_dialog_controller_unittest.cc b/chrome/browser/ui/web_applications/sub_apps_install_dialog_controller_unittest.cc index 937510d..1fe00ab 100644 --- a/chrome/browser/ui/web_applications/sub_apps_install_dialog_controller_unittest.cc +++ b/chrome/browser/ui/web_applications/sub_apps_install_dialog_controller_unittest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/web_applications/sub_apps_install_dialog_controller.h" + #include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/web_applications/tabbed_web_app_navigation_throttle.cc b/chrome/browser/ui/web_applications/tabbed_web_app_navigation_throttle.cc index ce37a0a..66f22c5 100644 --- a/chrome/browser/ui/web_applications/tabbed_web_app_navigation_throttle.cc +++ b/chrome/browser/ui/web_applications/tabbed_web_app_navigation_throttle.cc
@@ -34,8 +34,9 @@ std::unique_ptr<content::NavigationThrottle> TabbedWebAppNavigationThrottle::MaybeCreateThrottleFor( content::NavigationHandle* handle) { - if (!handle->IsInPrimaryMainFrame()) + if (!handle->IsInPrimaryMainFrame()) { return nullptr; + } // Reloading the page should not cause the tab to change. if (handle->GetReloadType() != content::ReloadType::NONE) { @@ -45,12 +46,14 @@ content::WebContents* web_contents = handle->GetWebContents(); Browser* browser = chrome::FindBrowserWithTab(web_contents); - if (!browser || !browser->app_controller()) + if (!browser || !browser->app_controller()) { return nullptr; + } WebAppProvider* provider = WebAppProvider::GetForWebContents(web_contents); - if (!provider) + if (!provider) { return nullptr; + } const webapps::AppId& app_id = browser->app_controller()->app_id();
diff --git a/chrome/browser/ui/web_applications/test/system_web_app_interactive_uitest.cc b/chrome/browser/ui/web_applications/test/system_web_app_interactive_uitest.cc index b6b0ca0c..caceccdb 100644 --- a/chrome/browser/ui/web_applications/test/system_web_app_interactive_uitest.cc +++ b/chrome/browser/ui/web_applications/test/system_web_app_interactive_uitest.cc
@@ -918,15 +918,14 @@ auto app_id = GetManager().GetAppIdForSystemApp(GetAppType()).value(); apps::AppServiceProxyFactory::GetForProfile(profile) ->AppRegistryCache() - .ForOneApp( - app_id, [profile, &item](const apps::AppUpdate& update) { - item = std::make_unique<AppServiceAppItem>( - profile, /*model_updater=*/nullptr, /*sync_item=*/nullptr, - update); + .ForOneApp(app_id, [profile, &item](const apps::AppUpdate& update) { + item = std::make_unique<AppServiceAppItem>( + profile, /*model_updater=*/nullptr, /*sync_item=*/nullptr, + update); - // Because model updater is null, set position manually. - item->SetChromePosition(item->CalculateDefaultPositionForTest()); - }); + // Because model updater is null, set position manually. + item->SetChromePosition(item->CalculateDefaultPositionForTest()); + }); return item; }
diff --git a/chrome/browser/ui/web_applications/test/web_app_browsertest_util.cc b/chrome/browser/ui/web_applications/test/web_app_browsertest_util.cc index 5e8ada8..4d1e614f 100644 --- a/chrome/browser/ui/web_applications/test/web_app_browsertest_util.cc +++ b/chrome/browser/ui/web_applications/test/web_app_browsertest_util.cc
@@ -386,8 +386,9 @@ observer.WaitForNavigationFinished(); } - if (!proceed_through_interstitial) + if (!proceed_through_interstitial) { return; + } { // Need a second TestNavigationObserver; the above one is spent. @@ -432,11 +433,13 @@ Browser* FindWebAppBrowser(Profile* profile, const webapps::AppId& app_id) { for (Browser* browser : *BrowserList::GetInstance()) { - if (browser->profile() != profile) + if (browser->profile() != profile) { continue; + } - if (AppBrowserController::IsForWebApp(browser, app_id)) + if (AppBrowserController::IsForWebApp(browser, app_id)) { return browser; + } } return nullptr; @@ -453,8 +456,9 @@ if (browser->IsAttemptingToCloseBrowser() || browser->IsBrowserClosing()) { continue; } - if (browser == test_browser) + if (browser == test_browser) { return true; + } } return false; } @@ -490,20 +494,23 @@ } Browser* BrowserWaiter::AwaitRemoved(const base::Location& location) { - if (!removed_browser_) + if (!removed_browser_) { removed_run_loop_.Run(location); + } return removed_browser_; } void BrowserWaiter::OnBrowserAdded(Browser* browser) { - if (filter_ && browser != filter_) + if (filter_ && browser != filter_) { return; + } added_browser_ = browser; added_run_loop_.Quit(); } void BrowserWaiter::OnBrowserRemoved(Browser* browser) { - if (filter_ && browser != filter_) + if (filter_ && browser != filter_) { return; + } removed_browser_ = browser; removed_run_loop_.Quit(); }
diff --git a/chrome/browser/ui/web_applications/web_app_badging_browsertest.cc b/chrome/browser/ui/web_applications/web_app_badging_browsertest.cc index c3dacde0..693fb05 100644 --- a/chrome/browser/ui/web_applications/web_app_badging_browsertest.cc +++ b/chrome/browser/ui/web_applications/web_app_badging_browsertest.cc
@@ -198,8 +198,9 @@ ASSERT_TRUE(content::ExecJs(on, script)); - if (badge_change_map_.size() >= expected_badge_change_count_) + if (badge_change_map_.size() >= expected_badge_change_count_) { return; + } awaiter_->Run(); }
diff --git a/chrome/browser/ui/web_applications/web_app_browsertest_base.cc b/chrome/browser/ui/web_applications/web_app_browsertest_base.cc index 34099d6..91f9f3d 100644 --- a/chrome/browser/ui/web_applications/web_app_browsertest_base.cc +++ b/chrome/browser/ui/web_applications/web_app_browsertest_base.cc
@@ -91,8 +91,7 @@ return web_app::test::InstallWebApp(profile(), std::move(web_app_info)); } -void WebAppBrowserTestBase::UninstallWebApp( - const webapps::AppId& app_id) { +void WebAppBrowserTestBase::UninstallWebApp(const webapps::AppId& app_id) { web_app::test::UninstallWebApp(profile(), app_id); } @@ -106,8 +105,7 @@ return web_app::LaunchWebAppBrowserAndWait(profile(), app_id); } -Browser* -WebAppBrowserTestBase::LaunchWebAppBrowserAndAwaitInstallabilityCheck( +Browser* WebAppBrowserTestBase::LaunchWebAppBrowserAndAwaitInstallabilityCheck( const webapps::AppId& app_id) { Browser* browser = web_app::LaunchWebAppBrowserAndWait(profile(), app_id); webapps::TestAppBannerManagerDesktop::FromWebContents( @@ -121,9 +119,8 @@ return web_app::LaunchBrowserForWebAppInTab(profile(), app_id); } -bool WebAppBrowserTestBase::NavigateInRenderer( - content::WebContents* contents, - const GURL& url) { +bool WebAppBrowserTestBase::NavigateInRenderer(content::WebContents* contents, + const GURL& url) { EXPECT_TRUE( content::ExecJs(contents, "window.location = '" + url.spec() + "';")); bool success = content::WaitForLoadStop(contents); @@ -141,8 +138,7 @@ return manager->WaitForInstallableCheck(); } -Browser* -WebAppBrowserTestBase::NavigateInNewWindowAndAwaitInstallabilityCheck( +Browser* WebAppBrowserTestBase::NavigateInNewWindowAndAwaitInstallabilityCheck( const GURL& url) { Browser* new_browser = Browser::Create( Browser::CreateParams(Browser::TYPE_NORMAL, profile(), true)); @@ -151,8 +147,8 @@ return new_browser; } -std::optional<webapps::AppId> -WebAppBrowserTestBase::FindAppWithUrlInScope(const GURL& url) { +std::optional<webapps::AppId> WebAppBrowserTestBase::FindAppWithUrlInScope( + const GURL& url) { // TODO(crbug.com/340952100): Evaluate call sites of FindBestAppWithUrlInScope // for correctness. return provider().registrar_unsafe().FindBestAppWithUrlInScope( @@ -162,10 +158,9 @@ }); } -Browser* WebAppBrowserTestBase::OpenPopupAndWait( - Browser* browser, - const GURL& url, - const gfx::Size& popup_size) { +Browser* WebAppBrowserTestBase::OpenPopupAndWait(Browser* browser, + const GURL& url, + const gfx::Size& popup_size) { content::WebContents* const web_contents = browser->tab_strip_model()->GetActiveWebContents(); @@ -261,8 +256,7 @@ WebAppBrowserTestBaseParent::TearDownOnMainThread(); } -void WebAppBrowserTestBase::SetUpCommandLine( - base::CommandLine* command_line) { +void WebAppBrowserTestBase::SetUpCommandLine(base::CommandLine* command_line) { // Browser will both run and display insecure content. command_line->AppendSwitch(switches::kAllowRunningInsecureContent); cert_verifier_.SetUpCommandLine(command_line);
diff --git a/chrome/browser/ui/web_applications/web_app_browsertest_base.h b/chrome/browser/ui/web_applications/web_app_browsertest_base.h index aab8c7e..d59482c 100644 --- a/chrome/browser/ui/web_applications/web_app_browsertest_base.h +++ b/chrome/browser/ui/web_applications/web_app_browsertest_base.h
@@ -49,8 +49,7 @@ public: WebAppBrowserTestBase(); WebAppBrowserTestBase(const WebAppBrowserTestBase&) = delete; - WebAppBrowserTestBase& operator=(const WebAppBrowserTestBase&) = - delete; + WebAppBrowserTestBase& operator=(const WebAppBrowserTestBase&) = delete; ~WebAppBrowserTestBase() override = 0; WebAppProvider& provider();
diff --git a/chrome/browser/ui/web_applications/web_app_dialog_utils.cc b/chrome/browser/ui/web_applications/web_app_dialog_utils.cc index c2c8ad3..a258b32f1 100644 --- a/chrome/browser/ui/web_applications/web_app_dialog_utils.cc +++ b/chrome/browser/ui/web_applications/web_app_dialog_utils.cc
@@ -122,8 +122,9 @@ void OnWebAppInstalled(WebAppInstalledCallback callback, const webapps::AppId& installed_app_id, webapps::InstallResultCode code) { - if (GetInstalledCallbackForTesting()) + if (GetInstalledCallbackForTesting()) { std::move(GetInstalledCallbackForTesting()).Run(installed_app_id, code); + } std::move(callback).Run(installed_app_id, code); } @@ -133,8 +134,9 @@ bool CanCreateWebApp(const Browser* browser) { // Check whether user is allowed to install web app. if (!WebAppProvider::GetForWebApps(browser->profile()) || - !AreWebAppsUserInstallable(browser->profile())) + !AreWebAppsUserInstallable(browser->profile())) { return false; + } // Check whether we're able to install the current page as an app. content::WebContents* web_contents = @@ -145,8 +147,9 @@ } content::NavigationEntry* entry = web_contents->GetController().GetLastCommittedEntry(); - if (entry && entry->GetPageType() == content::PAGE_TYPE_ERROR) + if (entry && entry->GetPageType() == content::PAGE_TYPE_ERROR) { return false; + } return true; } @@ -219,8 +222,9 @@ WebAppInstalledCallback installed_callback, PwaInProductHelpState iph_state) { auto* provider = WebAppProvider::GetForWebContents(web_contents); - if (!provider) + if (!provider) { return false; + } webapps::MLInstallabilityPromoter* promoter = webapps::MLInstallabilityPromoter::FromWebContents(web_contents);
diff --git a/chrome/browser/ui/web_applications/web_app_dialog_utils.h b/chrome/browser/ui/web_applications/web_app_dialog_utils.h index 6d1bc72..140efce 100644 --- a/chrome/browser/ui/web_applications/web_app_dialog_utils.h +++ b/chrome/browser/ui/web_applications/web_app_dialog_utils.h
@@ -20,7 +20,7 @@ namespace webapps { enum class WebappInstallSource; enum class InstallResultCode; -} +} // namespace webapps namespace web_app {
diff --git a/chrome/browser/ui/web_applications/web_app_launch_handler_browsertest.cc b/chrome/browser/ui/web_applications/web_app_launch_handler_browsertest.cc index 0c2b551..41a7da3 100644 --- a/chrome/browser/ui/web_applications/web_app_launch_handler_browsertest.cc +++ b/chrome/browser/ui/web_applications/web_app_launch_handler_browsertest.cc
@@ -75,8 +75,9 @@ webapps::AppId app_id = InstallWebAppFromPage( browser(), embedded_test_server()->GetURL(test_file_path)); - if (await_metric) + if (await_metric) { metrics_waiter.Wait(); + } // Installing a web app will pop it out to a new window. // Close this to avoid it interfering with test steps.
diff --git a/chrome/browser/ui/web_applications/web_app_launch_process.cc b/chrome/browser/ui/web_applications/web_app_launch_process.cc index a3cb3a1f6..d62a76d 100644 --- a/chrome/browser/ui/web_applications/web_app_launch_process.cc +++ b/chrome/browser/ui/web_applications/web_app_launch_process.cc
@@ -46,12 +46,14 @@ std::optional<GURL> GetProtocolHandlingTranslatedUrl( OsIntegrationManager& os_integration_manager, const apps::AppLaunchParams& params) { - if (!params.protocol_handler_launch_url.has_value()) + if (!params.protocol_handler_launch_url.has_value()) { return std::nullopt; + } GURL protocol_url(params.protocol_handler_launch_url.value()); - if (!protocol_url.is_valid()) + if (!protocol_url.is_valid()) { return std::nullopt; + } std::optional<GURL> translated_url = os_integration_manager.TranslateProtocolUrl(params.app_id, protocol_url); @@ -265,8 +267,9 @@ LaunchHandler::ClientMode WebAppLaunchProcess::GetLaunchClientMode() const { LaunchHandler launch_handler = GetLaunchHandler(); - if (launch_handler.client_mode == LaunchHandler::ClientMode::kAuto) + if (launch_handler.client_mode == LaunchHandler::ClientMode::kAuto) { return LaunchHandler::ClientMode::kNavigateNew; + } return launch_handler.client_mode; }
diff --git a/chrome/browser/ui/web_applications/web_app_launch_utils_unittest.cc b/chrome/browser/ui/web_applications/web_app_launch_utils_unittest.cc index 9daaa84..0d263b788 100644 --- a/chrome/browser/ui/web_applications/web_app_launch_utils_unittest.cc +++ b/chrome/browser/ui/web_applications/web_app_launch_utils_unittest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/web_applications/web_app_launch_utils.h" + #include "chrome/browser/web_applications/test/web_app_test.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h"
diff --git a/chrome/browser/ui/web_applications/web_app_metrics.cc b/chrome/browser/ui/web_applications/web_app_metrics.cc index 8c6bce7a7..9140e066 100644 --- a/chrome/browser/ui/web_applications/web_app_metrics.cc +++ b/chrome/browser/ui/web_applications/web_app_metrics.cc
@@ -94,16 +94,19 @@ double old_score, site_engagement::EngagementType engagement_type, const std::optional<webapps::AppId>& app_id) { - if (!web_contents) + if (!web_contents) { return; + } Browser* browser = chrome::FindBrowserWithTab(web_contents); - if (!browser) + if (!browser) { return; + } // Number of apps is not yet counted. - if (num_user_installed_apps_ == kNumUserInstalledAppsNotCounted) + if (num_user_installed_apps_ == kNumUserInstalledAppsNotCounted) { return; + } // The engagement broken down by the number of apps installed must be recorded // for all engagement events, not just web apps.
diff --git a/chrome/browser/ui/web_applications/web_app_protocol_handling_browsertest.cc b/chrome/browser/ui/web_applications/web_app_protocol_handling_browsertest.cc index 6d4e9b6..224e3195 100644 --- a/chrome/browser/ui/web_applications/web_app_protocol_handling_browsertest.cc +++ b/chrome/browser/ui/web_applications/web_app_protocol_handling_browsertest.cc
@@ -45,13 +45,15 @@ GURL start_url = embedded_test_server()->GetURL(path); page_load_metrics::PageLoadMetricsTestWaiter metrics_waiter( browser()->tab_strip_model()->GetActiveWebContents()); - if (await_metric) + if (await_metric) { metrics_waiter.AddWebFeatureExpectation(protocol_handling_feature); + } webapps::AppId app_id = web_app::InstallWebAppFromPage(browser(), start_url); - if (await_metric) + if (await_metric) { metrics_waiter.Wait(); + } return app_id; }
diff --git a/chrome/browser/ui/web_applications/web_app_tabbed_utils.cc b/chrome/browser/ui/web_applications/web_app_tabbed_utils.cc index a001a49..65ebfbf 100644 --- a/chrome/browser/ui/web_applications/web_app_tabbed_utils.cc +++ b/chrome/browser/ui/web_applications/web_app_tabbed_utils.cc
@@ -12,8 +12,9 @@ namespace web_app { bool HasPinnedHomeTab(const TabStripModel* tab_strip_model) { - if (!tab_strip_model->ContainsIndex(0)) + if (!tab_strip_model->ContainsIndex(0)) { return false; + } return tab_strip_model->delegate()->IsForWebApp() && tab_strip_model->IsTabPinned(0); }
diff --git a/chrome/browser/ui/web_applications/web_app_ui_utils.cc b/chrome/browser/ui/web_applications/web_app_ui_utils.cc index 2872667..39b9c66 100644 --- a/chrome/browser/ui/web_applications/web_app_ui_utils.cc +++ b/chrome/browser/ui/web_applications/web_app_ui_utils.cc
@@ -25,13 +25,15 @@ std::optional<webapps::AppId> GetAppIdForManagementLinkInWebContents( content::WebContents* web_contents) { Browser* browser = chrome::FindBrowserWithTab(web_contents); - if (!browser) + if (!browser) { return std::nullopt; + } const webapps::AppId* app_id = web_app::WebAppTabHelper::GetAppId(web_contents); - if (!app_id) + if (!app_id) { return std::nullopt; + } if (!WebAppProvider::GetForWebApps(browser->profile()) ->registrar_unsafe() @@ -52,8 +54,9 @@ int* tooltip_text_id) { std::optional<webapps::AppId> app_id = GetAppIdForManagementLinkInWebContents(web_contents); - if (!app_id) + if (!app_id) { return false; + } *link_text_id = IDS_WEB_APP_SETTINGS_LINK; *tooltip_text_id = IDS_WEB_APP_SETTINGS_LINK_TOOLTIP; @@ -64,8 +67,9 @@ content::WebContents* web_contents) { std::optional<webapps::AppId> app_id = GetAppIdForManagementLinkInWebContents(web_contents); - if (!app_id) + if (!app_id) { return false; + } #if BUILDFLAG(IS_CHROMEOS) chrome::ShowAppManagementPage(
diff --git a/chrome/browser/ui/web_applications/web_app_uninstall_browsertest.cc b/chrome/browser/ui/web_applications/web_app_uninstall_browsertest.cc index 535a534..10025b5 100644 --- a/chrome/browser/ui/web_applications/web_app_uninstall_browsertest.cc +++ b/chrome/browser/ui/web_applications/web_app_uninstall_browsertest.cc
@@ -161,8 +161,9 @@ provider->scheduler().RemoveUserUninstallableManagements( app_id, webapps::WebappUninstallSource::kAppMenu, base::BindLambdaForTesting([&](webapps::UninstallResultCode code) { - if (quit_run_loop) + if (quit_run_loop) { run_loop.Quit(); + } quit_run_loop = true; })); @@ -172,8 +173,9 @@ provider->scheduler().RemoveUserUninstallableManagements( app_id, webapps::WebappUninstallSource::kAppMenu, base::BindLambdaForTesting([&](webapps::UninstallResultCode code) { - if (quit_run_loop) + if (quit_run_loop) { run_loop.Quit(); + } quit_run_loop = true; }));
diff --git a/chrome/browser/ui/web_applications/web_app_window_controls_overlay_browsertest.cc b/chrome/browser/ui/web_applications/web_app_window_controls_overlay_browsertest.cc index e718ed9..14886b1 100644 --- a/chrome/browser/ui/web_applications/web_app_window_controls_overlay_browsertest.cc +++ b/chrome/browser/ui/web_applications/web_app_window_controls_overlay_browsertest.cc
@@ -41,13 +41,15 @@ GURL start_url = embedded_test_server()->GetURL(path); page_load_metrics::PageLoadMetricsTestWaiter metrics_waiter( browser()->tab_strip_model()->GetActiveWebContents()); - if (await_metric) + if (await_metric) { metrics_waiter.AddWebFeatureExpectation(window_controls_overlay_feature); + } webapps::AppId app_id = web_app::InstallWebAppFromPage(browser(), start_url); - if (await_metric) + if (await_metric) { metrics_waiter.Wait(); + } return app_id; }
diff --git a/chrome/browser/ui/webauthn/account_hover_list_model.h b/chrome/browser/ui/webauthn/account_hover_list_model.h index 7a44117..3b86ff21 100644 --- a/chrome/browser/ui/webauthn/account_hover_list_model.h +++ b/chrome/browser/ui/webauthn/account_hover_list_model.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBAUTHN_ACCOUNT_HOVER_LIST_MODEL_H_ #include <stddef.h> + #include <string> #include <vector>
diff --git a/chrome/browser/ui/webauthn/ambient/ambient_signin_controller.h b/chrome/browser/ui/webauthn/ambient/ambient_signin_controller.h index 29aa8d8..e02caea 100644 --- a/chrome/browser/ui/webauthn/ambient/ambient_signin_controller.h +++ b/chrome/browser/ui/webauthn/ambient/ambient_signin_controller.h
@@ -30,7 +30,7 @@ namespace password_manager { class PasskeyCredential; struct PasswordForm; -} +} // namespace password_manager namespace tabs { class TabInterface;
diff --git a/chrome/browser/ui/webauthn/sheet_models_unittest.cc b/chrome/browser/ui/webauthn/sheet_models_unittest.cc index 99555427..d7c1fbd 100644 --- a/chrome/browser/ui/webauthn/sheet_models_unittest.cc +++ b/chrome/browser/ui/webauthn/sheet_models_unittest.cc
@@ -31,8 +31,7 @@ OtherMechanismButtonVisibility other_mechanism_button_visibility) : AuthenticatorSheetModelBase(dialog_model, other_mechanism_button_visibility) { - vector_illustrations_.emplace(kPasskeyUsbDarkIcon, - kPasskeyUsbDarkIcon); + vector_illustrations_.emplace(kPasskeyUsbDarkIcon, kPasskeyUsbDarkIcon); } std::u16string GetStepTitle() const override { return u"Step title"; }
diff --git a/chrome/browser/ui/webauthn/webauthn_ui_helpers.h b/chrome/browser/ui/webauthn/webauthn_ui_helpers.h index 271151e..c6637ed 100644 --- a/chrome/browser/ui/webauthn/webauthn_ui_helpers.h +++ b/chrome/browser/ui/webauthn/webauthn_ui_helpers.h
@@ -7,7 +7,6 @@ #include <string> - namespace webauthn_ui_helpers { // Takes a valid relying party identifier and elides it so that it's suitable to
diff --git a/chrome/browser/ui/webid/account_selection_view.h b/chrome/browser/ui/webid/account_selection_view.h index f0dc3c4..ee51cd0 100644 --- a/chrome/browser/ui/webid/account_selection_view.h +++ b/chrome/browser/ui/webid/account_selection_view.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBID_ACCOUNT_SELECTION_VIEW_H_ #include <memory> + #include "base/memory/raw_ptr.h" #include "content/public/browser/identity_request_account.h" #include "content/public/browser/identity_request_dialog_controller.h"
diff --git a/chrome/browser/ui/webui/about/about_ui.cc b/chrome/browser/ui/webui/about/about_ui.cc index ca7c302..4a28298 100644 --- a/chrome/browser/ui/webui/about/about_ui.cc +++ b/chrome/browser/ui/webui/about/about_ui.cc
@@ -155,8 +155,9 @@ const ash::StartupCustomizationDocument* customization = ash::StartupCustomizationDocument::GetInstance(); - if (!customization->IsReady()) + if (!customization->IsReady()) { return; + } base::FilePath oem_eula_file_path; if (net::FileURLToFilePath(GURL(customization->GetEULAPage(locale_)), @@ -403,19 +404,19 @@ } } -void AppendBody(std::string *output) { +void AppendBody(std::string* output) { output->append("</head>\n<body>\n"); } -void AppendFooter(std::string *output) { +void AppendFooter(std::string* output) { output->append("</body>\n</html>\n"); } } // namespace about_ui -using about_ui::AppendHeader; using about_ui::AppendBody; using about_ui::AppendFooter; +using about_ui::AppendHeader; namespace { @@ -473,7 +474,6 @@ ? base::StrCat({"<li><a href='", url, "/'>", url, "</a></li>\n"}) : base::StrCat({"<li>", url, "</li>\n"}); } - } #if BUILDFLAG(ENABLE_SESSION_SERVICE) @@ -484,7 +484,8 @@ chrome::kChromeUISessionServiceInternalsPath, "</a></li>\n"}); #endif // BUILDFLAG(ENABLE_SESSION_SERVICE) - html += "</ul>\n<h2>For Debug</h2>\n" + html += + "</ul>\n<h2>For Debug</h2>\n" "<p>The following pages are for debugging purposes only. Because they " "crash or hang the renderer, they're not linked directly; you can type " "them into the address bar if you need them.</p>\n<ul>"; @@ -561,8 +562,7 @@ AboutUIHTMLSource::AboutUIHTMLSource(const std::string& source_name, Profile* profile) - : source_name_(source_name), - profile_(profile) {} + : source_name_(source_name), profile_(profile) {} AboutUIHTMLSource::~AboutUIHTMLSource() = default; @@ -583,10 +583,11 @@ response = ChromeURLs(profile_); } else if (source_name_ == chrome::kChromeUICreditsHost) { int idr = IDR_ABOUT_UI_CREDITS_HTML; - if (path == kCreditsJsPath) + if (path == kCreditsJsPath) { idr = IDR_ABOUT_UI_CREDITS_JS; - else if (path == kCreditsCssPath) + } else if (path == kCreditsCssPath) { idr = IDR_ABOUT_UI_CREDITS_CSS; + } if (idr == IDR_ABOUT_UI_CREDITS_HTML) { response = about_ui::GetCredits(true /*include_scripts*/); } else {
diff --git a/chrome/browser/ui/webui/about/about_ui.h b/chrome/browser/ui/webui/about/about_ui.h index 1b8d354f..3f08e018 100644 --- a/chrome/browser/ui/webui/about/about_ui.h +++ b/chrome/browser/ui/webui/about/about_ui.h
@@ -139,8 +139,8 @@ // Helper functions void AppendHeader(std::string* output, const std::string& unescaped_title); -void AppendBody(std::string *output); -void AppendFooter(std::string *output); +void AppendBody(std::string* output); +void AppendFooter(std::string* output); } // namespace about_ui
diff --git a/chrome/browser/ui/webui/about/about_ui_unittest.cc b/chrome/browser/ui/webui/about/about_ui_unittest.cc index 3c94d7c6..2f81df0b 100644 --- a/chrome/browser/ui/webui/about/about_ui_unittest.cc +++ b/chrome/browser/ui/webui/about/about_ui_unittest.cc
@@ -104,8 +104,9 @@ // the |locale| string to the created file. bool CreateTermsForLocale(const std::string& locale) { base::FilePath dir = arc_tos_dir_.Append(base::ToLowerASCII(locale)); - if (!base::CreateDirectory(dir)) + if (!base::CreateDirectory(dir)) { return false; + } return base::WriteFile(dir.AppendASCII("terms.html"), locale); } @@ -114,8 +115,9 @@ // Writes the |locale| string to the created file. bool CreatePrivacyPolicyForLocale(const std::string& locale) { base::FilePath dir = arc_tos_dir_.Append(base::ToLowerASCII(locale)); - if (!base::CreateDirectory(dir)) + if (!base::CreateDirectory(dir)) { return false; + } return base::WriteFile(dir.AppendASCII("privacy_policy.pdf"), locale); }
diff --git a/chrome/browser/ui/webui/access_code_cast/access_code_cast_dialog.cc b/chrome/browser/ui/webui/access_code_cast/access_code_cast_dialog.cc index 277a7a12..1784496 100644 --- a/chrome/browser/ui/webui/access_code_cast/access_code_cast_dialog.cc +++ b/chrome/browser/ui/webui/access_code_cast/access_code_cast_dialog.cc
@@ -32,11 +32,13 @@ // Keeps track of the dialog that is currently being displayed. static base::NoDestructor<base::WeakPtr<AccessCodeCastDialog>> current_instance; - if (*current_instance) + if (*current_instance) { // Closing the dialog will cause the dialog to delete itself. (*current_instance)->CloseDialogWidget(); - if (dialog) + } + if (dialog) { *current_instance = std::move(dialog); + } } void UpdateDialogPosition(views::Widget* widget, @@ -80,8 +82,9 @@ dialog_host->GetHostView()); const gfx::Rect work_area = display.work_area(); - if (!work_area.Contains(display_rect)) + if (!work_area.Contains(display_rect)) { display_rect.AdjustToFit(work_area); + } position = display_rect.origin(); } @@ -135,8 +138,9 @@ // ensures that a |MediaRouteStarter| is passed in, if |media_route_starter_| // is nullptr, it means that |ShowWebDialog| was already called. DCHECK(media_route_starter_) << "Cannot show dialog more than once!"; - if (!media_route_starter_) + if (!media_route_starter_) { return; + } auto extra_params = CreateParams(dialog_mode); @@ -213,8 +217,9 @@ // views::WidgetObserver: void AccessCodeCastDialog::OnWidgetActivationChanged(views::Widget* widget, bool active) { - if (block_widget_activation_changed_for_test_) + if (block_widget_activation_changed_for_test_) { return; + } DCHECK(dialog_widget_) << "dialog_widget_ must be set exactly once during dialog setup"; // Close the dialog only if it is no longer active and it isn't already @@ -264,8 +269,9 @@ views::Widget* widget = views::Widget::GetWidgetForNativeWindow( web_contents_->GetTopLevelNativeWindow()); DCHECK(widget) << "Could not find a parent widget!"; - if (widget) + if (widget) { parent = widget->GetNativeView(); + } } return parent;
diff --git a/chrome/browser/ui/webui/access_code_cast/access_code_cast_dialog_browsertest.cc b/chrome/browser/ui/webui/access_code_cast/access_code_cast_dialog_browsertest.cc index 02899c4..f1abf6a 100644 --- a/chrome/browser/ui/webui/access_code_cast/access_code_cast_dialog_browsertest.cc +++ b/chrome/browser/ui/webui/access_code_cast/access_code_cast_dialog_browsertest.cc
@@ -2,11 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/webui/access_code_cast/access_code_cast_dialog.h" + #include "chrome/browser/media/router/discovery/access_code/access_code_cast_feature.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/test/test_browser_dialog.h" -#include "chrome/browser/ui/webui/access_code_cast/access_code_cast_dialog.h" #include "chrome/test/base/chrome_test_utils.h" #include "components/prefs/pref_service.h" #include "content/public/browser/web_contents_observer.h"
diff --git a/chrome/browser/ui/webui/access_code_cast/access_code_cast_handler.cc b/chrome/browser/ui/webui/access_code_cast/access_code_cast_handler.cc index 9b37ce3..0ce0e1b1 100644 --- a/chrome/browser/ui/webui/access_code_cast/access_code_cast_handler.cc +++ b/chrome/browser/ui/webui/access_code_cast/access_code_cast_handler.cc
@@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <numeric> - #include "chrome/browser/ui/webui/access_code_cast/access_code_cast_handler.h" +#include <numeric> + #include "base/containers/contains.h" #include "base/metrics/histogram_functions.h" #include "base/rand_util.h" @@ -160,8 +160,9 @@ AccessCodeCastHandler::~AccessCodeCastHandler() { AccessCodeCastMetrics::RecordAccessCodeNotFoundCount( access_code_not_found_count_); - if (media_route_starter_) + if (media_route_starter_) { media_route_starter_->RemoveMediaSinkWithCastModesObserver(this); + } } void AccessCodeCastHandler::Init() { @@ -213,8 +214,9 @@ // attempt to create route parameters before the sink is in QRM will fail. void AccessCodeCastHandler::CheckForDiscoveryCompletion() { // Dialog has already notified (with most likely an error). - if (!add_sink_callback_) + if (!add_sink_callback_) { return; + } DCHECK(sink_id_) << "Must have a sink id to complete!"; DCHECK(media_route_starter_) << "Must have a MediaRouteStarter to complete!"; @@ -234,8 +236,9 @@ std::optional<MediaSink::Id> sink_id) { DCHECK(sink_id || add_sink_result != AddSinkResultCode::OK); - if (add_sink_result == AddSinkResultCode::ACCESS_CODE_NOT_FOUND) + if (add_sink_result == AddSinkResultCode::ACCESS_CODE_NOT_FOUND) { access_code_not_found_count_++; + } // Wait for OnResultsUpdated before triggering the |add_sink_callback_| since // we are not entirely sure the sink is ready to be casted to yet. @@ -400,8 +403,9 @@ } bool AccessCodeCastHandler::IsAccountSyncEnabled() { - if (!identity_manager_ || !sync_service_) + if (!identity_manager_ || !sync_service_) { return false; + } return identity_manager_->HasPrimaryAccount(signin::ConsentLevel::kSync) && sync_service_->IsSyncFeatureActive(); }
diff --git a/chrome/browser/ui/webui/app_settings/web_app_settings_navigation_throttle.cc b/chrome/browser/ui/webui/app_settings/web_app_settings_navigation_throttle.cc index 6fb8108..9a5bcb8 100644 --- a/chrome/browser/ui/webui/app_settings/web_app_settings_navigation_throttle.cc +++ b/chrome/browser/ui/webui/app_settings/web_app_settings_navigation_throttle.cc
@@ -25,11 +25,13 @@ WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor( content::NavigationHandle* handle) { // Check the current url scheme is chrome:// - if (!handle->GetURL().SchemeIs(content::kChromeUIScheme)) + if (!handle->GetURL().SchemeIs(content::kChromeUIScheme)) { return nullptr; + } // Check the current url is chrome://app-settings - if (handle->GetURL().host_piece() != chrome::kChromeUIWebAppSettingsHost) + if (handle->GetURL().host_piece() != chrome::kChromeUIWebAppSettingsHost) { return nullptr; + } return std::make_unique<WebAppSettingsNavigationThrottle>(handle); }
diff --git a/chrome/browser/ui/webui/app_settings/web_app_settings_ui.cc b/chrome/browser/ui/webui/app_settings/web_app_settings_ui.cc index dbbac90..3fc49c3 100644 --- a/chrome/browser/ui/webui/app_settings/web_app_settings_ui.cc +++ b/chrome/browser/ui/webui/app_settings/web_app_settings_ui.cc
@@ -161,8 +161,9 @@ const webapps::AppId current_app_id = web_app::GetAppIdFromAppSettingsUrl(web_contents->GetURL()); - if (app_id == current_app_id) + if (app_id == current_app_id) { web_contents->ClosePage(); + } } void WebAppSettingsUI::OnWebAppInstallManagerDestroyed() {
diff --git a/chrome/browser/ui/webui/ash/add_supervision/add_supervision_handler.cc b/chrome/browser/ui/webui/ash/add_supervision/add_supervision_handler.cc index bab1144..9ff83e0f 100644 --- a/chrome/browser/ui/webui/ash/add_supervision/add_supervision_handler.cc +++ b/chrome/browser/ui/webui/ash/add_supervision/add_supervision_handler.cc
@@ -79,15 +79,16 @@ std::vector<std::string> installed_arc_apps; apps::AppServiceProxyFactory::GetForProfile(profile) ->AppRegistryCache() - .ForEachApp([&installed_arc_apps, - profile](const apps::AppUpdate& update) { - if (ShouldIncludeAppUpdate(update)) { - std::string package_name = - arc::AppIdToArcPackageName(update.AppId(), profile); - if (!package_name.empty()) - installed_arc_apps.push_back(package_name); - } - }); + .ForEachApp( + [&installed_arc_apps, profile](const apps::AppUpdate& update) { + if (ShouldIncludeAppUpdate(update)) { + std::string package_name = + arc::AppIdToArcPackageName(update.AppId(), profile); + if (!package_name.empty()) { + installed_arc_apps.push_back(package_name); + } + } + }); std::move(callback).Run(installed_arc_apps); }
diff --git a/chrome/browser/ui/webui/ash/add_supervision/add_supervision_handler_utils_unittest.cc b/chrome/browser/ui/webui/ash/add_supervision/add_supervision_handler_utils_unittest.cc index 1fc6e79..5c3db3c 100644 --- a/chrome/browser/ui/webui/ash/add_supervision/add_supervision_handler_utils_unittest.cc +++ b/chrome/browser/ui/webui/ash/add_supervision/add_supervision_handler_utils_unittest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/webui/ash/add_supervision/add_supervision_handler_utils.h" + #include "components/services/app_service/public/cpp/app_types.h" #include "components/services/app_service/public/cpp/app_update.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/ui/webui/ash/add_supervision/add_supervision_metrics_recorder_browsertest.cc b/chrome/browser/ui/webui/ash/add_supervision/add_supervision_metrics_recorder_browsertest.cc index 38c70f7a..3296265 100644 --- a/chrome/browser/ui/webui/ash/add_supervision/add_supervision_metrics_recorder_browsertest.cc +++ b/chrome/browser/ui/webui/ash/add_supervision/add_supervision_metrics_recorder_browsertest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/webui/ash/add_supervision/add_supervision_metrics_recorder.h" + #include "base/test/metrics/histogram_tester.h" #include "base/test/metrics/user_action_tester.h" #include "base/test/test_mock_time_task_runner.h" @@ -9,7 +11,6 @@ #include "chrome/browser/ui/webui/ash/add_supervision/add_supervision.mojom.h" #include "chrome/browser/ui/webui/ash/add_supervision/add_supervision_handler.h" #include "chrome/browser/ui/webui/ash/add_supervision/add_supervision_handler_utils.h" -#include "chrome/browser/ui/webui/ash/add_supervision/add_supervision_metrics_recorder.h" #include "chrome/browser/ui/webui/ash/add_supervision/add_supervision_ui.h" #include "chrome/test/base/in_process_browser_test.h" #include "components/signin/public/identity_manager/identity_test_environment.h"
diff --git a/chrome/browser/ui/webui/ash/add_supervision/add_supervision_ui_browsertest.cc b/chrome/browser/ui/webui/ash/add_supervision/add_supervision_ui_browsertest.cc index 3465df7..45d074c 100644 --- a/chrome/browser/ui/webui/ash/add_supervision/add_supervision_ui_browsertest.cc +++ b/chrome/browser/ui/webui/ash/add_supervision/add_supervision_ui_browsertest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/webui/ash/add_supervision/add_supervision_ui.h" + #include <string> #include "base/strings/strcat.h" @@ -9,7 +11,6 @@ #include "base/test/metrics/user_action_tester.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/webui/ash/add_supervision/add_supervision_metrics_recorder.h" -#include "chrome/browser/ui/webui/ash/add_supervision/add_supervision_ui.h" #include "chrome/browser/ui/webui/ash/add_supervision/confirm_signout_dialog.h" #include "chrome/common/webui_url_constants.h" #include "chrome/test/base/in_process_browser_test.h"
diff --git a/chrome/browser/ui/webui/ash/arc_power_control/arc_power_control_handler.cc b/chrome/browser/ui/webui/ash/arc_power_control/arc_power_control_handler.cc index 92d8d34..9a670cf 100644 --- a/chrome/browser/ui/webui/ash/arc_power_control/arc_power_control_handler.cc +++ b/chrome/browser/ui/webui/ash/arc_power_control/arc_power_control_handler.cc
@@ -165,8 +165,9 @@ std::string mode = kThrottlingAuto; auto* observer = instance_throttle_->GetObserverByName( arc::ArcInstanceThrottle::kChromeArcPowerControlPageObserver); - if (observer && observer->enforced()) + if (observer && observer->enforced()) { mode = observer->active() ? kThrottlingDisable : kThrottlingForce; + } CallJavascriptFunction(GetJavascriptDomain() + "setThrottlingMode", base::Value(mode)); @@ -181,8 +182,9 @@ arc::mojom::PowerInstance* power_instance = ARC_GET_INSTANCE_FOR_METHOD( arc::ArcServiceManager::Get()->arc_bridge_service()->power(), GetWakefulnessMode); - if (!power_instance) + if (!power_instance) { return; + } power_instance->GetWakefulnessMode( base::BindOnce(&ArcPowerControlHandler::OnWakefulnessChanged, @@ -220,19 +222,22 @@ if (wakefulness_mode_ == arc::mojom::WakefulnessMode::ASLEEP) { arc::mojom::PowerInstance* const power_instance = ARC_GET_INSTANCE_FOR_METHOD(power, Resume); - if (power_instance) + if (power_instance) { power_instance->Resume(); + } } else { arc::mojom::PowerInstance* const power_instance = ARC_GET_INSTANCE_FOR_METHOD(power, SetIdleState); - if (power_instance) + if (power_instance) { power_instance->SetIdleState(arc::mojom::IdleState::ACTIVE); + } } } else if (mode == kWakenessfullDoze) { arc::mojom::PowerInstance* const power_instance = ARC_GET_INSTANCE_FOR_METHOD(power, SetIdleState); - if (power_instance) + if (power_instance) { power_instance->SetIdleState(arc::mojom::IdleState::INACTIVE); + } } else if (mode == kWakenessfullForceDoze) { arc::mojom::PowerInstance* const power_instance = ARC_GET_INSTANCE_FOR_METHOD(power, SetIdleState); @@ -242,8 +247,9 @@ } else if (mode == kWakenessfullSleep) { arc::mojom::PowerInstance* const power_instance = ARC_GET_INSTANCE_FOR_METHOD(power, Suspend); - if (power_instance) + if (power_instance) { power_instance->Suspend(base::BindOnce(&OnAndroidSuspendReady)); + } } else { LOG(ERROR) << "Invalid mode: " << mode; } @@ -317,8 +323,9 @@ } void ArcPowerControlHandler::StopTracing() { - if (!system_stat_collector_) + if (!system_stat_collector_) { return; + } const base::TimeTicks tracing_time_max = TRACE_TIME_TICKS_NOW(); stop_tracing_timer_.Stop(); @@ -371,10 +378,11 @@ } status += " ("; - if (instance_throttle_->should_throttle()) + if (instance_throttle_->should_throttle()) { status += "throttling"; - else + } else { status += "critical foreground"; + } status += ")"; CallJavascriptFunction(GetJavascriptDomain() + "setPowerControlStatus",
diff --git a/chrome/browser/ui/webui/ash/assistant_optin/assistant_optin_ui.cc b/chrome/browser/ui/webui/ash/assistant_optin/assistant_optin_ui.cc index 5e7944a8..038ca4db 100644 --- a/chrome/browser/ui/webui/ash/assistant_optin/assistant_optin_ui.cc +++ b/chrome/browser/ui/webui/ash/assistant_optin/assistant_optin_ui.cc
@@ -145,8 +145,9 @@ // static bool AssistantOptInDialog::BounceIfActive() { - if (!g_dialog) + if (!g_dialog) { return false; + } g_dialog->Focus(); wm::AnimateWindow(g_dialog->dialog_window(), @@ -190,8 +191,9 @@ } void AssistantOptInDialog::OnDialogClosed(const std::string& json_retval) { - if (assistant_ui_) + if (assistant_ui_) { assistant_ui_->OnDialogClosed(); + } PrefService* prefs = ProfileManager::GetActiveUserProfile()->GetPrefs(); const bool completed =
diff --git a/chrome/browser/ui/webui/ash/audio/audio_handler.cc b/chrome/browser/ui/webui/ash/audio/audio_handler.cc index aa7cf94..22cc7d6 100644 --- a/chrome/browser/ui/webui/ash/audio/audio_handler.cc +++ b/chrome/browser/ui/webui/ash/audio/audio_handler.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/webui/ash/audio/audio_handler.h" + #include <string> #include <tuple> #include <utility> @@ -9,7 +11,6 @@ #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/chrome_pages.h" -#include "chrome/browser/ui/webui/ash/audio/audio_handler.h" namespace ash {
diff --git a/chrome/browser/ui/webui/ash/bluetooth/bluetooth_pairing_dialog.cc b/chrome/browser/ui/webui/ash/bluetooth/bluetooth_pairing_dialog.cc index e44ba8f2..0c582692 100644 --- a/chrome/browser/ui/webui/ash/bluetooth/bluetooth_pairing_dialog.cc +++ b/chrome/browser/ui/webui/ash/bluetooth/bluetooth_pairing_dialog.cc
@@ -48,8 +48,9 @@ {"cancel", IDS_CANCEL}, {"close", IDS_CLOSE}, }; - for (const auto& entry : localized_strings) + for (const auto& entry : localized_strings) { html_source->AddLocalizedString(entry.name, entry.id); + } bluetooth::AddLoadTimeData(html_source); }
diff --git a/chrome/browser/ui/webui/ash/cellular_setup/cellular_setup_localized_strings_provider.cc b/chrome/browser/ui/webui/ash/cellular_setup/cellular_setup_localized_strings_provider.cc index 50b17bff..799a97d 100644 --- a/chrome/browser/ui/webui/ash/cellular_setup/cellular_setup_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/ash/cellular_setup/cellular_setup_localized_strings_provider.cc
@@ -133,18 +133,21 @@ } void AddLocalizedValuesToBuilder(::login::LocalizedValuesBuilder* builder) { - for (const auto& entry : kLocalizedStringsWithoutPlaceholders) + for (const auto& entry : kLocalizedStringsWithoutPlaceholders) { builder->Add(entry.name, entry.id); + } } void AddNonStringLoadTimeData(content::WebUIDataSource* html_source) { - for (const auto& entry : GetBooleanValues()) + for (const auto& entry : GetBooleanValues()) { html_source->AddBoolean(entry.name, entry.value); + } } void AddNonStringLoadTimeDataToDict(base::Value::Dict* dict) { - for (const auto& entry : GetBooleanValues()) + for (const auto& entry : GetBooleanValues()) { dict->SetByDottedPath(entry.name, entry.value); + } } } // namespace ash::cellular_setup
diff --git a/chrome/browser/ui/webui/ash/cellular_setup/mobile_setup_ui.cc b/chrome/browser/ui/webui/ash/cellular_setup/mobile_setup_ui.cc index ea1a7164b..45dca351 100644 --- a/chrome/browser/ui/webui/ash/cellular_setup/mobile_setup_ui.cc +++ b/chrome/browser/ui/webui/ash/cellular_setup/mobile_setup_ui.cc
@@ -140,8 +140,9 @@ base::Value GetCellularNetworkInfoValue(const NetworkState* network, const DeviceState* device) { base::Value::Dict info; - if (!device || !network) + if (!device || !network) { return base::Value(std::move(info)); + } DCHECK_EQ(network->device_path(), device->path()); @@ -349,8 +350,9 @@ MobileActivator::PlanActivationState state, MobileActivator::ActivationError error) { DCHECK_EQ(TYPE_ACTIVATION, type_); - if (!web_ui()) + if (!web_ui()) { return; + } NetworkStateHandler* network_state_handler = NetworkHandler::Get()->network_state_handler(); @@ -376,8 +378,9 @@ } void MobileSetupHandler::Reset() { - if (!active_) + if (!active_) { return; + } active_ = false; if (type_ == TYPE_ACTIVATION) { @@ -397,12 +400,14 @@ void MobileSetupHandler::HandleGetDeviceInfo(const base::Value::List& args) { DCHECK_NE(TYPE_ACTIVATION, type_); - if (!web_ui()) + if (!web_ui()) { return; + } std::string path = web_ui()->GetWebContents()->GetURL().path(); - if (path.empty()) + if (path.empty()) { return; + } active_ = true; AllowJavascript(); @@ -445,12 +450,14 @@ void MobileSetupHandler::DefaultNetworkChanged( const NetworkState* default_network) { - if (!web_ui()) + if (!web_ui()) { return; + } std::string path = web_ui()->GetWebContents()->GetURL().path().substr(1); - if (path.empty()) + if (path.empty()) { return; + } const NetworkState* network = NetworkHandler::Get()->network_state_handler()->GetNetworkState(path); @@ -465,12 +472,14 @@ void MobileSetupHandler::NetworkConnectionStateChanged( const NetworkState* network) { - if (!web_ui()) + if (!web_ui()) { return; + } std::string path = web_ui()->GetWebContents()->GetURL().path().substr(1); - if (path.empty() || path != network->path()) + if (path.empty() || path != network->path()) { return; + } UpdatePortalReachability(network, false /* do not force notification */); }
diff --git a/chrome/browser/ui/webui/ash/cloud_upload/cloud_upload_dialog.cc b/chrome/browser/ui/webui/ash/cloud_upload/cloud_upload_dialog.cc index 9aa08e0..b6ffdf3 100644 --- a/chrome/browser/ui/webui/ash/cloud_upload/cloud_upload_dialog.cc +++ b/chrome/browser/ui/webui/ash/cloud_upload/cloud_upload_dialog.cc
@@ -588,21 +588,21 @@ return true; } - // The files need to be moved. - auto operation = - GetUploadType(profile_, file_urls_.front()) == UploadType::kCopy - ? OfficeFilesTransferRequired::kCopy - : OfficeFilesTransferRequired::kMove; - // Set as WARNING as INFO is not allowed. - LOG(WARNING) << (operation == OfficeFilesTransferRequired::kCopy ? "Copy" - : "Mov") - << "ing a " << ext << " file to " - << (cloud_provider_ == CloudProvider::kGoogleDrive - ? "Google Drive" - : "OneDrive"); - transfer_required_ = operation; - cloud_open_metrics_->LogTransferRequired(operation); - return ConfirmMoveOrStartUpload(); + // The files need to be moved. + auto operation = + GetUploadType(profile_, file_urls_.front()) == UploadType::kCopy + ? OfficeFilesTransferRequired::kCopy + : OfficeFilesTransferRequired::kMove; + // Set as WARNING as INFO is not allowed. + LOG(WARNING) << (operation == OfficeFilesTransferRequired::kCopy ? "Copy" + : "Mov") + << "ing a " << ext << " file to " + << (cloud_provider_ == CloudProvider::kGoogleDrive + ? "Google Drive" + : "OneDrive"); + transfer_required_ = operation; + cloud_open_metrics_->LogTransferRequired(operation); + return ConfirmMoveOrStartUpload(); } void CloudOpenTask::OpenAlreadyHostedDriveUrls() {
diff --git a/chrome/browser/ui/webui/ash/cloud_upload/one_drive_upload_handler.cc b/chrome/browser/ui/webui/ash/cloud_upload/one_drive_upload_handler.cc index 6d55231..c299c569 100644 --- a/chrome/browser/ui/webui/ash/cloud_upload/one_drive_upload_handler.cc +++ b/chrome/browser/ui/webui/ash/cloud_upload/one_drive_upload_handler.cc
@@ -208,8 +208,7 @@ LOG(ERROR) << "Upload to OneDrive: " << error_message; notification_manager_->ShowUploadError(error_message); } - std::move(callback_).Run(OfficeTaskResult::kFailedToUpload, std::nullopt, - 0); + std::move(callback_).Run(OfficeTaskResult::kFailedToUpload, std::nullopt, 0); } void OneDriveUploadHandler::OnIOTaskStatus(
diff --git a/chrome/browser/ui/webui/ash/edu_coexistence/edu_coexistence_login_handler.cc b/chrome/browser/ui/webui/ash/edu_coexistence/edu_coexistence_login_handler.cc index 31786741..76ef660 100644 --- a/chrome/browser/ui/webui/ash/edu_coexistence/edu_coexistence_login_handler.cc +++ b/chrome/browser/ui/webui/ash/edu_coexistence/edu_coexistence_login_handler.cc
@@ -73,15 +73,17 @@ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); // This should only be set during local development tests. - if (command_line->HasSwitch(kEduCoexistenceLoginURLSwitch)) + if (command_line->HasSwitch(kEduCoexistenceLoginURLSwitch)) { return command_line->GetSwitchValueASCII(kEduCoexistenceLoginURLSwitch); + } return kEduCoexistenceLoginDefaultURL; } std::string GetSourceUI() { - if (session_manager::SessionManager::Get()->IsUserSessionBlocked()) + if (session_manager::SessionManager::Get()->IsUserSessionBlocked()) { return kOobe; + } return kInSession; } @@ -113,17 +115,20 @@ Profile* profile = ProfileManager::GetActiveUserProfile(); const policy::UserCloudPolicyManagerAsh* policy_manager = profile->GetUserCloudPolicyManagerAsh(); - if (!policy_manager) + if (!policy_manager) { return std::string(); + } const policy::CloudPolicyCore* core = policy_manager->core(); const policy::CloudPolicyStore* store = core->store(); - if (!store) + if (!store) { return std::string(); + } const enterprise_management::PolicyData* policy = store->policy(); - if (!policy) + if (!policy) { return std::string(); + } return policy->device_id(); } @@ -209,8 +214,9 @@ void EduCoexistenceLoginHandler::OnRefreshTokenUpdatedForAccount( const CoreAccountInfo& account_info) { - if (edu_account_email_.empty() || account_info.email != edu_account_email_) + if (edu_account_email_.empty() || account_info.email != edu_account_email_) { return; + } AllowJavascript(); @@ -329,8 +335,9 @@ } void EduCoexistenceLoginHandler::ConsentLogged(const base::Value::List& args) { - if (args.size() == 0) + if (args.size() == 0) { return; + } DCHECK(!in_error_state_); @@ -348,8 +355,9 @@ void EduCoexistenceLoginHandler::OnError(const base::Value::List& args) { AllowJavascript(); - if (args.size() == 0) + if (args.size() == 0) { return; + } in_error_state_ = true; for (const base::Value& message : args) { DCHECK(message.is_string());
diff --git a/chrome/browser/ui/webui/ash/edu_coexistence/edu_coexistence_state_tracker.cc b/chrome/browser/ui/webui/ash/edu_coexistence/edu_coexistence_state_tracker.cc index d6b4364..4a18827 100644 --- a/chrome/browser/ui/webui/ash/edu_coexistence/edu_coexistence_state_tracker.cc +++ b/chrome/browser/ui/webui/ash/edu_coexistence/edu_coexistence_state_tracker.cc
@@ -53,8 +53,9 @@ } void EduCoexistenceStateTracker::OnDialogClosed(const content::WebUI* web_ui) { - if (!base::Contains(state_tracker_, web_ui)) + if (!base::Contains(state_tracker_, web_ui)) { return; + } FlowState& state = state_tracker_[web_ui]; @@ -62,8 +63,9 @@ // then EduCoexistenceLoginHandler has not received a parental consent logged // signal. Notify |EduCoexistenceChildSigninHelper| that we weren't able to // successfully log the parental consent so that it can clean up after itself. - if (state.consent_logged_callback) + if (state.consent_logged_callback) { std::move(state.consent_logged_callback).Run(/* success */ false); + } const std::string& histogram_name = state.is_onboarding ? kEduCoexistenceV2OnboardingFlowResult @@ -114,8 +116,9 @@ const EduCoexistenceStateTracker::FlowState* EduCoexistenceStateTracker::GetInfoForWebUIForTest( const content::WebUI* web_ui) const { - if (!base::Contains(state_tracker_, web_ui)) + if (!base::Contains(state_tracker_, web_ui)) { return nullptr; + } return &state_tracker_.at(web_ui); }
diff --git a/chrome/browser/ui/webui/ash/emoji/emoji_page_handler.cc b/chrome/browser/ui/webui/ash/emoji/emoji_page_handler.cc index e54619df..8d328b3 100644 --- a/chrome/browser/ui/webui/ash/emoji/emoji_page_handler.cc +++ b/chrome/browser/ui/webui/ash/emoji/emoji_page_handler.cc
@@ -60,9 +60,9 @@ } void LogInsertGif(bool is_inserted) { - EmojiVariantType insert_value = is_inserted - ? EmojiVariantType::kEmojiPickerGifInserted - : EmojiVariantType::kEmojiPickerGifCopied; + EmojiVariantType insert_value = + is_inserted ? EmojiVariantType::kEmojiPickerGifInserted + : EmojiVariantType::kEmojiPickerGifCopied; base::UmaHistogramEnumeration("InputMethod.SystemEmojiPicker.TriggerType", insert_value); }
diff --git a/chrome/browser/ui/webui/ash/emoji/seal_utils.cc b/chrome/browser/ui/webui/ash/emoji/seal_utils.cc index 9b9e368..38a23a3d 100644 --- a/chrome/browser/ui/webui/ash/emoji/seal_utils.cc +++ b/chrome/browser/ui/webui/ash/emoji/seal_utils.cc
@@ -11,9 +11,9 @@ namespace { - constexpr char kSealKeyHash[] = - "\x58\x68\x46\x8c\x87\x23\x66\x2b\xef\x20\x58\xc5\x27\x2b\xcf\x0e" - "\x13\x27\xea\xc1"; +constexpr char kSealKeyHash[] = + "\x58\x68\x46\x8c\x87\x23\x66\x2b\xef\x20\x58\xc5\x27\x2b\xcf\x0e" + "\x13\x27\xea\xc1"; }
diff --git a/chrome/browser/ui/webui/ash/emulator/device_emulator_message_handler.cc b/chrome/browser/ui/webui/ash/emulator/device_emulator_message_handler.cc index 02b4617e..973e0fb5 100644 --- a/chrome/browser/ui/webui/ash/emulator/device_emulator_message_handler.cc +++ b/chrome/browser/ui/webui/ash/emulator/device_emulator_message_handler.cc
@@ -248,8 +248,9 @@ // Get each device's properties. base::Value::List devices; - for (const dbus::ObjectPath& path : paths) + for (const dbus::ObjectPath& path : paths) { devices.Append(GetDeviceInfo(path)); + } base::Value predefined_devices = fake_bluetooth_device_client_->GetBluetoothDevicesAsDictionaries(); @@ -424,8 +425,9 @@ CHECK(device_type); bool dual_role = *device_type == "DualRoleUSB"; source->set_active_by_default(!dual_role); - if (dual_role) + if (dual_role) { props.set_supports_dual_role_devices(true); + } std::optional<int> port = val.GetDict().FindInt("port"); CHECK(port.has_value()); source->set_port( @@ -435,14 +437,16 @@ CHECK(power_level); source->set_max_power(*power_level == "high" ? kPowerLevelHigh : kPowerLevelLow); - if (*id == selected_id) + if (*id == selected_id) { selected_source = source; + } } // Emulate the device's source selection process. for (const auto& source : props.available_external_power_source()) { - if (!source.active_by_default()) + if (!source.active_by_default()) { continue; + } if (selected_source && selected_source->active_by_default() && source.max_power() < selected_source->max_power()) { continue; @@ -613,8 +617,9 @@ device.Set("incoming", false); base::Value::List uuids; - for (const std::string& uuid : props->uuids.value()) + for (const std::string& uuid : props->uuids.value()) { uuids.Append(uuid); + } device.Set("uuids", std::move(uuids)); return device; @@ -642,16 +647,18 @@ } void DeviceEmulatorMessageHandler::TouchpadExists(bool exists) { - if (!IsJavascriptAllowed()) + if (!IsJavascriptAllowed()) { return; + } FireWebUIListener("touchpad-exists-changed", base::Value(exists)); } void DeviceEmulatorMessageHandler::HapticTouchpadExists(bool exists) {} void DeviceEmulatorMessageHandler::MouseExists(bool exists) { - if (!IsJavascriptAllowed()) + if (!IsJavascriptAllowed()) { return; + } FireWebUIListener("mouse-exists-changed", base::Value(exists)); }
diff --git a/chrome/browser/ui/webui/ash/enterprise_reporting/history_converter.cc b/chrome/browser/ui/webui/ash/enterprise_reporting/history_converter.cc index 9a4c7d6..e5bcfabe 100644 --- a/chrome/browser/ui/webui/ash/enterprise_reporting/history_converter.cc +++ b/chrome/browser/ui/webui/ash/enterprise_reporting/history_converter.cc
@@ -126,7 +126,7 @@ } void PopulateBlockedRecord(const ::reporting::BlockedRecordCall& source, - enterprise_reporting::mojom::ErpHistoryEvent& dest){ + enterprise_reporting::mojom::ErpHistoryEvent& dest) { dest.call = "BlockedRecord"; dest.parameters.emplace_back( enterprise_reporting::mojom::ErpHistoryEventParameter::New( @@ -179,7 +179,7 @@ break; case ::reporting::HealthDataHistory::RecordCase::kBlockedRecordCall: PopulateBlockedRecord(history.blocked_record_call(), - *result->events.back()); + *result->events.back()); break; case ::reporting::HealthDataHistory::RecordCase:: kBlockedDestinationsUpdatedCall:
diff --git a/chrome/browser/ui/webui/ash/in_session_password_change/password_change_dialogs.cc b/chrome/browser/ui/webui/ash/in_session_password_change/password_change_dialogs.cc index af136e3bd..d5eea449 100644 --- a/chrome/browser/ui/webui/ash/in_session_password_change/password_change_dialogs.cc +++ b/chrome/browser/ui/webui/ash/in_session_password_change/password_change_dialogs.cc
@@ -87,8 +87,9 @@ // static void PasswordChangeDialog::Dismiss() { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); - if (g_dialog) + if (g_dialog) { g_dialog->Close(); + } } PasswordChangeDialog::PasswordChangeDialog() @@ -117,8 +118,9 @@ // static void ConfirmPasswordChangeDialog::Dismiss() { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); - if (g_confirm_dialog) + if (g_confirm_dialog) { g_confirm_dialog->Close(); + } } ConfirmPasswordChangeDialog::ConfirmPasswordChangeDialog( @@ -179,8 +181,9 @@ // static void UrgentPasswordExpiryNotificationDialog::Dismiss() { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); - if (g_notification_dialog) + if (g_notification_dialog) { g_notification_dialog->Close(); + } } UrgentPasswordExpiryNotificationDialog::UrgentPasswordExpiryNotificationDialog()
diff --git a/chrome/browser/ui/webui/ash/in_session_password_change/password_change_handler.cc b/chrome/browser/ui/webui/ash/in_session_password_change/password_change_handler.cc index 681bfa0..9a754161 100644 --- a/chrome/browser/ui/webui/ash/in_session_password_change/password_change_handler.cc +++ b/chrome/browser/ui/webui/ash/in_session_password_change/password_change_handler.cc
@@ -37,8 +37,9 @@ params.Set("passwordChangeUrl", password_change_url_); const user_manager::User* user = ProfileHelper::Get()->GetUserByProfile(profile); - if (user) + if (user) { params.Set("userName", user->GetDisplayEmail()); + } CallJavascriptFunction("$(\'main-element\').loadAuthenticator", params); }
diff --git a/chrome/browser/ui/webui/ash/internet/internet_detail_dialog.cc b/chrome/browser/ui/webui/ash/internet/internet_detail_dialog.cc index 968c7ac..880d46bf 100644 --- a/chrome/browser/ui/webui/ash/internet/internet_detail_dialog.cc +++ b/chrome/browser/ui/webui/ash/internet/internet_detail_dialog.cc
@@ -68,8 +68,9 @@ {"networkProxyConnectionType", IDS_SETTINGS_INTERNET_NETWORK_PROXY_CONNECTION_TYPE_DIALOG}, }; - for (const auto& entry : localized_strings) + for (const auto& entry : localized_strings) { html_source->AddLocalizedString(entry.name, entry.id); + } } std::string GetNetworkName8(const NetworkState& network) { @@ -113,10 +114,11 @@ gfx::NativeWindow parent) { auto* network_state_handler = NetworkHandler::Get()->network_state_handler(); const NetworkState* network; - if (!network_id.empty()) + if (!network_id.empty()) { network = network_state_handler->GetNetworkStateFromGuid(network_id); - else + } else { network = network_state_handler->DefaultNetwork(); + } if (!network) { LOG(ERROR) << "Network not found: " << network_id; return;
diff --git a/chrome/browser/ui/webui/ash/kerberos/kerberos_in_browser_browsertest.cc b/chrome/browser/ui/webui/ash/kerberos/kerberos_in_browser_browsertest.cc index ccb54962..ac401d83 100644 --- a/chrome/browser/ui/webui/ash/kerberos/kerberos_in_browser_browsertest.cc +++ b/chrome/browser/ui/webui/ash/kerberos/kerberos_in_browser_browsertest.cc
@@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/webui/ash/kerberos/kerberos_in_browser_dialog.h" - #include <string> #include "base/memory/raw_ptr.h" @@ -14,6 +12,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/ui/ash/system_web_apps/system_web_app_ui_utils.h" #include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/webui/ash/kerberos/kerberos_in_browser_dialog.h" #include "chrome/test/base/chrome_test_utils.h" #include "content/public/test/browser_test.h" #include "content/public/test/browser_test_utils.h"
diff --git a/chrome/browser/ui/webui/ash/launcher_internals/launcher_internals_ui.cc b/chrome/browser/ui/webui/ash/launcher_internals/launcher_internals_ui.cc index e7594cb..5c076f73 100644 --- a/chrome/browser/ui/webui/ash/launcher_internals/launcher_internals_ui.cc +++ b/chrome/browser/ui/webui/ash/launcher_internals/launcher_internals_ui.cc
@@ -37,8 +37,9 @@ mojo::PendingRemote<launcher_internals::mojom::Page> page) { auto* search_controller = AppListClientImpl::GetInstance()->search_controller(); - if (!search_controller) + if (!search_controller) { return; + } page_handler_ = std::make_unique<LauncherInternalsHandler>(search_controller, std::move(page));
diff --git a/chrome/browser/ui/webui/ash/lock_screen_reauth/lock_screen_captive_portal_dialog.cc b/chrome/browser/ui/webui/ash/lock_screen_reauth/lock_screen_captive_portal_dialog.cc index aed2aaf..d9fcfd7 100644 --- a/chrome/browser/ui/webui/ash/lock_screen_reauth/lock_screen_captive_portal_dialog.cc +++ b/chrome/browser/ui/webui/ash/lock_screen_reauth/lock_screen_captive_portal_dialog.cc
@@ -73,8 +73,9 @@ bool LockScreenCaptivePortalDialog::IsDialogClosedForTesting( base::OnceClosure callback) { - if (!is_running_) + if (!is_running_) { return true; + } DCHECK(!on_closed_callback_for_testing_); on_closed_callback_for_testing_ = std::move(callback); return false; @@ -82,8 +83,9 @@ bool LockScreenCaptivePortalDialog::IsDialogShownForTesting( base::OnceClosure callback) { - if (is_running_) + if (is_running_) { return true; + } DCHECK(!on_shown_callback_for_testing_); on_shown_callback_for_testing_ = std::move(callback); return false;
diff --git a/chrome/browser/ui/webui/ash/lock_screen_reauth/lock_screen_network_handler.cc b/chrome/browser/ui/webui/ash/lock_screen_reauth/lock_screen_network_handler.cc index 2229e10..79d503a4 100644 --- a/chrome/browser/ui/webui/ash/lock_screen_reauth/lock_screen_network_handler.cc +++ b/chrome/browser/ui/webui/ash/lock_screen_reauth/lock_screen_network_handler.cc
@@ -76,8 +76,9 @@ // been loaded. LockScreenStartReauthDialog* start_reauth_dialog = LockScreenStartReauthDialog::GetInstance(); - if (!start_reauth_dialog) + if (!start_reauth_dialog) { return; + } start_reauth_dialog->OnNetworkDialogReadyForTesting(); }
diff --git a/chrome/browser/ui/webui/ash/lock_screen_reauth/lock_screen_reauth_dialogs.cc b/chrome/browser/ui/webui/ash/lock_screen_reauth/lock_screen_reauth_dialogs.cc index 49f1495..a5927c0 100644 --- a/chrome/browser/ui/webui/ash/lock_screen_reauth/lock_screen_reauth_dialogs.cc +++ b/chrome/browser/ui/webui/ash/lock_screen_reauth/lock_screen_reauth_dialogs.cc
@@ -49,16 +49,18 @@ bool IsDialogLoaded(bool is_loaded, base::OnceClosure& on_loaded_callback, base::OnceClosure callback) { - if (is_loaded) + if (is_loaded) { return true; + } DCHECK(!on_loaded_callback); on_loaded_callback = std::move(callback); return false; } void OnDialogLoaded(bool& is_loaded, base::OnceClosure& on_loaded_callback) { - if (is_loaded) + if (is_loaded) { return; + } is_loaded = true; if (on_loaded_callback) { std::move(on_loaded_callback).Run(); @@ -84,8 +86,9 @@ void WebContentsDestroyed() override { ResetDelegate(); } void ResetDelegate() { - if (!web_contents()) + if (!web_contents()) { return; + } web_modal::WebContentsModalDialogManager::FromWebContents(web_contents()) ->SetDelegate(nullptr); } @@ -160,8 +163,9 @@ // static void LockScreenStartReauthDialog::Dismiss() { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); - if (g_dialog) + if (g_dialog) { g_dialog->Close(); + } } // static @@ -177,14 +181,16 @@ content::WebContents* LockScreenStartReauthDialog::GetWebContents() { auto* web_ui = webui(); - if (!web_ui) + if (!web_ui) { return nullptr; + } return web_ui->GetWebContents(); } void LockScreenStartReauthDialog::DeleteLockScreenNetworkDialog() { - if (!lock_screen_network_dialog_) + if (!lock_screen_network_dialog_) { return; + } lock_screen_network_dialog_.reset(); if (is_network_dialog_visible_) { is_network_dialog_visible_ = false; @@ -224,14 +230,16 @@ } void LockScreenStartReauthDialog::DismissLockScreenCaptivePortalDialog() { - if (captive_portal_dialog_) + if (captive_portal_dialog_) { captive_portal_dialog_->Dismiss(); + } } void LockScreenStartReauthDialog::ShowLockScreenNetworkDialog() { TerminateAutoReload(); - if (lock_screen_network_dialog_) + if (lock_screen_network_dialog_) { return; + } DCHECK(profile_); is_network_dialog_visible_ = true; lock_screen_network_dialog_ = @@ -320,8 +328,9 @@ void LockScreenStartReauthDialog::UpdateState( NetworkError::ErrorReason reason) { - if (is_proxy_auth_in_progress_) + if (is_proxy_auth_in_progress_) { return; + } const NetworkStateInformer::State state = network_state_informer_->state(); @@ -362,8 +371,9 @@ bool LockScreenStartReauthDialog::IsLoadedForTesting( base::OnceClosure callback) { - if (is_dialog_loaded_for_testing_) + if (is_dialog_loaded_for_testing_) { return true; + } DCHECK(!on_dialog_loaded_callback_for_testing_); on_dialog_loaded_callback_for_testing_ = std::move(callback); return false; @@ -371,16 +381,18 @@ bool LockScreenStartReauthDialog::IsClosedForTesting( base::OnceClosure callback) { - if (!is_dialog_loaded_for_testing_) + if (!is_dialog_loaded_for_testing_) { return true; + } DCHECK(!on_dialog_closed_callback_for_testing_); on_dialog_closed_callback_for_testing_ = std::move(callback); return false; } void LockScreenStartReauthDialog::OnReadyForTesting() { - if (is_dialog_loaded_for_testing_) + if (is_dialog_loaded_for_testing_) { return; + } is_dialog_loaded_for_testing_ = true; if (on_dialog_loaded_callback_for_testing_) { std::move(on_dialog_loaded_callback_for_testing_).Run();
diff --git a/chrome/browser/ui/webui/ash/login/add_child_screen_handler.cc b/chrome/browser/ui/webui/ash/login/add_child_screen_handler.cc index dc33223..745eb60 100644 --- a/chrome/browser/ui/webui/ash/login/add_child_screen_handler.cc +++ b/chrome/browser/ui/webui/ash/login/add_child_screen_handler.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/webui/ash/login/add_child_screen_handler.h" + #include "base/logging.h" #include "chrome/browser/ash/login/oobe_screen.h" #include "chrome/browser/ash/login/wizard_controller.h"
diff --git a/chrome/browser/ui/webui/ash/login/ai_intro_screen_handler.h b/chrome/browser/ui/webui/ash/login/ai_intro_screen_handler.h index 84e1d4d..f266183 100644 --- a/chrome/browser/ui/webui/ash/login/ai_intro_screen_handler.h +++ b/chrome/browser/ui/webui/ash/login/ai_intro_screen_handler.h
@@ -31,7 +31,7 @@ }; class AiIntroScreenHandler final : public BaseScreenHandler, - public AiIntroScreenView { + public AiIntroScreenView { public: using TView = AiIntroScreenView;
diff --git a/chrome/browser/ui/webui/ash/login/assistant_optin_flow_screen_handler.cc b/chrome/browser/ui/webui/ash/login/assistant_optin_flow_screen_handler.cc index b4a023bd..168c43a 100644 --- a/chrome/browser/ui/webui/ash/login/assistant_optin_flow_screen_handler.cc +++ b/chrome/browser/ui/webui/ash/login/assistant_optin_flow_screen_handler.cc
@@ -56,8 +56,9 @@ std::u16string GetGivenNameIfIsChild() { const user_manager::User* user = user_manager::UserManager::Get()->GetActiveUser(); - if (!user || !user->IsChild()) + if (!user || !user->IsChild()) { return std::u16string(); + } return user->GetGivenName(); } @@ -67,10 +68,12 @@ : BaseScreenHandler(kScreenId), is_oobe_(is_oobe) {} AssistantOptInFlowScreenHandler::~AssistantOptInFlowScreenHandler() { - if (assistant::AssistantSettings::Get() && voice_match_enrollment_started_) + if (assistant::AssistantSettings::Get() && voice_match_enrollment_started_) { StopSpeakerIdEnrollment(); - if (AssistantState::Get()) + } + if (AssistantState::Get()) { AssistantState::Get()->RemoveObserver(this); + } } void AssistantOptInFlowScreenHandler::DeclareLocalizedValues( @@ -311,8 +314,9 @@ void AssistantOptInFlowScreenHandler::OnAssistantSettingsEnabled(bool enabled) { // Close the opt-in screen is the Assistant is disabled. - if (!enabled) + if (!enabled) { HandleFlowFinished(); + } } void AssistantOptInFlowScreenHandler::OnAssistantStatusChanged( @@ -324,8 +328,9 @@ } void AssistantOptInFlowScreenHandler::SendGetSettingsRequest() { - if (!initialized_) + if (!initialized_) { return; + } if (AssistantState::Get()->assistant_status() == assistant::AssistantStatus::NOT_READY) { @@ -497,8 +502,9 @@ ReloadContent(std::move(dictionary)); // Skip activity control and users will be in opted out mode. - if (skip_activity_control) + if (skip_activity_control) { ShowNextScreen(); + } } void AssistantOptInFlowScreenHandler::OnUpdateSettingsResponse( @@ -588,8 +594,9 @@ !voice_match_enrollment_error_) { prefs->SetBoolean(assistant::prefs::kAssistantHotwordEnabled, false); } - if (voice_match_enrollment_started_) + if (voice_match_enrollment_started_) { StopSpeakerIdEnrollment(); + } ShowNextScreen(); } else if (action == kRecordPressed) { if (!prefs->GetBoolean(assistant::prefs::kAssistantHotwordEnabled)) { @@ -602,8 +609,9 @@ assistant::AssistantSettings::Get()->StartSpeakerIdEnrollment( flow_type_ == FlowType::kSpeakerIdRetrain, weak_factory_.GetWeakPtr()); } else if (action == kReloadRequested) { - if (voice_match_enrollment_started_) + if (voice_match_enrollment_started_) { StopSpeakerIdEnrollment(); + } } } @@ -648,8 +656,9 @@ // Allow JavaScript. This is necessary for the in-session WebUI and is is not // triggered in the OOBE flow, where `screen` objects are associated with // handlers. TODO(crbug.com/1309022) - Separate in-session and OOBE handlers. - if (!is_oobe_) + if (!is_oobe_) { AllowJavascript(); + } auto* prefs = ProfileManager::GetActiveUserProfile()->GetPrefs(); // Do not skip the flow if the OOBE debug overlay is present. Otherwise it is @@ -668,18 +677,21 @@ DCHECK(IsKnownEnumValue(static_cast<FlowType>(flow_type))); flow_type_ = static_cast<FlowType>(flow_type); - if (flow_type_ == FlowType::kConsentFlow) + if (flow_type_ == FlowType::kConsentFlow) { SendGetSettingsRequest(); + } } bool AssistantOptInFlowScreenHandler::DeviceHasBattery() { // Assume that the device has a battery if we can't determine otherwise. - if (!chromeos::PowerManagerClient::Get()) + if (!chromeos::PowerManagerClient::Get()) { return true; + } auto status = chromeos::PowerManagerClient::Get()->GetLastStatus(); - if (!status.has_value() || !status->has_battery_state()) + if (!status.has_value() || !status->has_battery_state()) { return true; + } return status->battery_state() != power_manager::PowerSupplyProperties_BatteryState_NOT_PRESENT;
diff --git a/chrome/browser/ui/webui/ash/login/base_webui_handler.cc b/chrome/browser/ui/webui/ash/login/base_webui_handler.cc index 71dc6bfc1..bc4d14b9 100644 --- a/chrome/browser/ui/webui/ash/login/base_webui_handler.cc +++ b/chrome/browser/ui/webui/ash/login/base_webui_handler.cc
@@ -22,8 +22,9 @@ void BaseWebUIHandler::OnJavascriptAllowed() { auto deferred_calls = std::exchange(deferred_calls_, {}); - for (auto& call : deferred_calls) + for (auto& call : deferred_calls) { std::move(call).Run(); + } InitAfterJavascriptAllowed(); } @@ -43,8 +44,9 @@ void BaseWebUIHandler::InitAfterJavascriptAllowed() {} void BaseWebUIHandler::ShowScreenDeprecated(OobeScreenId screen) { - if (!GetOobeUI()) + if (!GetOobeUI()) { return; + } GetOobeUI()->GetCoreOobe()->ShowScreenWithData(screen, std::nullopt); } @@ -54,8 +56,9 @@ OobeScreenId BaseWebUIHandler::GetCurrentScreen() { OobeUI* oobe_ui = GetOobeUI(); - if (!oobe_ui) + if (!oobe_ui) { return OOBE_SCREEN_UNKNOWN; + } return oobe_ui->current_screen(); }
diff --git a/chrome/browser/ui/webui/ash/login/check_passwords_against_cryptohome_helper.h b/chrome/browser/ui/webui/ash/login/check_passwords_against_cryptohome_helper.h index 800d1ff..367a74f 100644 --- a/chrome/browser/ui/webui/ash/login/check_passwords_against_cryptohome_helper.h +++ b/chrome/browser/ui/webui/ash/login/check_passwords_against_cryptohome_helper.h
@@ -28,8 +28,8 @@ OnCheckPasswordsAgainstCryptohomeHelperSuccessCallback on_check_passwords_against_cryptohome_helper_success_callback); - CheckPasswordsAgainstCryptohomeHelper(const CheckPasswordsAgainstCryptohomeHelper&) = - delete; + CheckPasswordsAgainstCryptohomeHelper( + const CheckPasswordsAgainstCryptohomeHelper&) = delete; CheckPasswordsAgainstCryptohomeHelper& operator=( const CheckPasswordsAgainstCryptohomeHelper&) = delete;
diff --git a/chrome/browser/ui/webui/ash/login/choobe_screen_handler.cc b/chrome/browser/ui/webui/ash/login/choobe_screen_handler.cc index 5779924..fa621d0 100644 --- a/chrome/browser/ui/webui/ash/login/choobe_screen_handler.cc +++ b/chrome/browser/ui/webui/ash/login/choobe_screen_handler.cc
@@ -5,7 +5,6 @@ #include "chrome/browser/ui/webui/ash/login/choobe_screen_handler.h" #include "base/logging.h" - #include "chrome/browser/ash/login/choobe_flow_controller.h" #include "chrome/browser/ash/login/oobe_screen.h" #include "chrome/browser/ash/login/wizard_controller.h"
diff --git a/chrome/browser/ui/webui/ash/login/core_oobe_handler.cc b/chrome/browser/ui/webui/ash/login/core_oobe_handler.cc index eae3df5..914000b 100644 --- a/chrome/browser/ui/webui/ash/login/core_oobe_handler.cc +++ b/chrome/browser/ui/webui/ash/login/core_oobe_handler.cc
@@ -42,7 +42,6 @@ builder->Add("productName", IDS_SHORT_PRODUCT_NAME); builder->Add("learnMore", IDS_LEARN_MORE); - // Strings for Asset Identifier shown in version string. builder->Add("assetIdLabel", IDS_OOBE_ASSET_ID_LABEL);
diff --git a/chrome/browser/ui/webui/ash/login/debug/debug_overlay_handler.cc b/chrome/browser/ui/webui/ash/login/debug/debug_overlay_handler.cc index f2505a1..1c915596 100644 --- a/chrome/browser/ui/webui/ash/login/debug/debug_overlay_handler.cc +++ b/chrome/browser/ui/webui/ash/login/debug/debug_overlay_handler.cc
@@ -112,8 +112,9 @@ void DebugOverlayHandler::HandleCaptureScreenshot(const std::string& name) { aura::Window::Windows root_windows = Shell::GetAllRootWindows(); - if (root_windows.size() == 0) + if (root_windows.size() == 0) { return; + } screenshot_index_++; std::string filename_base = @@ -127,8 +128,9 @@ filename.append(base::StringPrintf("- Display %zu", screen)); } - if (add_resolution_to_filename_) + if (add_resolution_to_filename_) { filename.append("_" + rect.size().ToString()); + } if (DarkLightModeController::Get()->IsDarkModeEnabled()) { filename.append("_dark");
diff --git a/chrome/browser/ui/webui/ash/login/display_size_screen_handler.cc b/chrome/browser/ui/webui/ash/login/display_size_screen_handler.cc index aad5be5..389d12a 100644 --- a/chrome/browser/ui/webui/ash/login/display_size_screen_handler.cc +++ b/chrome/browser/ui/webui/ash/login/display_size_screen_handler.cc
@@ -5,7 +5,6 @@ #include "chrome/browser/ui/webui/ash/login/display_size_screen_handler.h" #include "base/logging.h" - #include "chrome/browser/ash/login/oobe_screen.h" #include "chrome/browser/ash/login/wizard_controller.h" #include "chrome/browser/ui/webui/ash/login/base_screen_handler.h"
diff --git a/chrome/browser/ui/webui/ash/login/drive_pinning_screen_handler.cc b/chrome/browser/ui/webui/ash/login/drive_pinning_screen_handler.cc index a02657c..a2577af8 100644 --- a/chrome/browser/ui/webui/ash/login/drive_pinning_screen_handler.cc +++ b/chrome/browser/ui/webui/ash/login/drive_pinning_screen_handler.cc
@@ -5,7 +5,6 @@ #include "chrome/browser/ui/webui/ash/login/drive_pinning_screen_handler.h" #include "base/logging.h" - #include "chrome/browser/ash/login/oobe_screen.h" #include "chrome/browser/ash/login/wizard_controller.h" #include "chrome/browser/ui/webui/ash/login/base_screen_handler.h"
diff --git a/chrome/browser/ui/webui/ash/login/enable_debugging_screen_handler.cc b/chrome/browser/ui/webui/ash/login/enable_debugging_screen_handler.cc index 2d6ef509..1ff1ed99 100644 --- a/chrome/browser/ui/webui/ash/login/enable_debugging_screen_handler.cc +++ b/chrome/browser/ui/webui/ash/login/enable_debugging_screen_handler.cc
@@ -36,8 +36,7 @@ void EnableDebuggingScreenHandler::DeclareLocalizedValues( ::login::LocalizedValuesBuilder* builder) { - builder->Add("enableDebuggingScreenTitle", - IDS_ENABLE_DEBUGGING_SCREEN_TITLE); + builder->Add("enableDebuggingScreenTitle", IDS_ENABLE_DEBUGGING_SCREEN_TITLE); builder->Add("enableDebuggingScreenAccessibleTitle", IDS_ENABLE_DEBUGGING_SCREEN_TITLE); builder->Add("enableDebuggingCancelButton", IDS_CANCEL); @@ -48,21 +47,17 @@ IDS_ENABLE_DEBUGGING_ENABLE_BUTTON); builder->Add("enableDebuggingRemveRootfsMessage", IDS_ENABLE_DEBUGGING_SCREEN_ROOTFS_REMOVE_MSG); - builder->Add("enableDebuggingLearnMore", - IDS_ENABLE_DEBUGGING_LEARN_MORE); + builder->Add("enableDebuggingLearnMore", IDS_ENABLE_DEBUGGING_LEARN_MORE); builder->Add("enableDebuggingSetupMessage", IDS_ENABLE_DEBUGGING_SETUP_MESSAGE); builder->AddF("enableDebuggingWarningTitle", IDS_ENABLE_DEBUGGING_SCREEN_WARNING_MSG, IDS_SHORT_PRODUCT_NAME); - builder->AddF("enableDebuggingDoneMessage", - IDS_ENABLE_DEBUGGING_DONE_MESSAGE, + builder->AddF("enableDebuggingDoneMessage", IDS_ENABLE_DEBUGGING_DONE_MESSAGE, IDS_SHORT_PRODUCT_NAME); - builder->Add("enableDebuggingErrorTitle", - IDS_ENABLE_DEBUGGING_ERROR_TITLE); + builder->Add("enableDebuggingErrorTitle", IDS_ENABLE_DEBUGGING_ERROR_TITLE); builder->AddF("enableDebuggingErrorMessage", - IDS_ENABLE_DEBUGGING_ERROR_MESSAGE, - IDS_SHORT_PRODUCT_NAME); + IDS_ENABLE_DEBUGGING_ERROR_MESSAGE, IDS_SHORT_PRODUCT_NAME); builder->Add("enableDebuggingPasswordLabel", IDS_ENABLE_DEBUGGING_ROOT_PASSWORD_LABEL); builder->Add("enableDebuggingConfirmPasswordLabel",
diff --git a/chrome/browser/ui/webui/ash/login/enrollment_screen_handler.cc b/chrome/browser/ui/webui/ash/login/enrollment_screen_handler.cc index 570bd11..7a24355 100644 --- a/chrome/browser/ui/webui/ash/login/enrollment_screen_handler.cc +++ b/chrome/browser/ui/webui/ash/login/enrollment_screen_handler.cc
@@ -172,10 +172,11 @@ } void EnrollmentScreenHandler::Show() { - if (!IsJavascriptAllowed()) + if (!IsJavascriptAllowed()) { show_on_init_ = true; - else + } else { DoShow(); + } } void EnrollmentScreenHandler::Hide() { @@ -712,9 +713,10 @@ } void EnrollmentScreenHandler::HandleOnLearnMore() { - if (!help_app_.get()) + if (!help_app_.get()) { help_app_ = new HelpAppLauncher( LoginDisplayHost::default_host()->GetNativeWindow()); + } help_app_->ShowHelpTopic(HelpAppLauncher::HELP_DEVICE_ATTRIBUTES); } @@ -783,8 +785,9 @@ const std::string& partition_name) { // If enrollment ends and the browser is being restarted, the renderers are // killed so we can not talk to them anymore. - if (shutdown_) + if (shutdown_) { return; + } signin_partition_name_ = partition_name; @@ -819,8 +822,9 @@ screen_data.Set("gaia_buttons_type", GetGaiaButtonsTypeString(gaia_buttons_type_)); const std::string& app_locale = g_browser_process->GetApplicationLocale(); - if (!app_locale.empty()) + if (!app_locale.empty()) { screen_data.Set("hl", app_locale); + } const std::string& email = config_.enrollment_nudge_email; if (!email.empty()) { screen_data.Set("email", email);
diff --git a/chrome/browser/ui/webui/ash/login/error_screen_handler.cc b/chrome/browser/ui/webui/ash/login/error_screen_handler.cc index f03e3471..c279b45 100644 --- a/chrome/browser/ui/webui/ash/login/error_screen_handler.cc +++ b/chrome/browser/ui/webui/ash/login/error_screen_handler.cc
@@ -85,7 +85,8 @@ builder->Add("proxySettingsMenuName", IDS_NETWORK_PROXY_SETTINGS_LIST_ITEM_NAME); builder->Add("addWiFiNetworkMenuName", IDS_NETWORK_ADD_WI_FI_LIST_ITEM_NAME); - builder->Add("autoEnrollmentErrorMessageTitle", IDS_LOGIN_AUTO_ENROLLMENT_OFFLINE_TITLE); + builder->Add("autoEnrollmentErrorMessageTitle", + IDS_LOGIN_AUTO_ENROLLMENT_OFFLINE_TITLE); ui::network_element::AddLocalizedValuesToBuilder(builder); builder->Add("offlineLogin", IDS_OFFLINE_LOGIN_HTML);
diff --git a/chrome/browser/ui/webui/ash/login/gaia_info_screen_handler.cc b/chrome/browser/ui/webui/ash/login/gaia_info_screen_handler.cc index 19f1ac0..f50b765 100644 --- a/chrome/browser/ui/webui/ash/login/gaia_info_screen_handler.cc +++ b/chrome/browser/ui/webui/ash/login/gaia_info_screen_handler.cc
@@ -5,7 +5,6 @@ #include "chrome/browser/ui/webui/ash/login/gaia_info_screen_handler.h" #include "base/logging.h" - #include "chrome/browser/ash/login/oobe_screen.h" #include "chrome/browser/ash/login/wizard_controller.h" #include "chrome/browser/ui/webui/ash/login/base_screen_handler.h"
diff --git a/chrome/browser/ui/webui/ash/login/gaia_screen_handler.cc b/chrome/browser/ui/webui/ash/login/gaia_screen_handler.cc index b92ca5b..f5f5f11 100644 --- a/chrome/browser/ui/webui/ash/login/gaia_screen_handler.cc +++ b/chrome/browser/ui/webui/ash/login/gaia_screen_handler.cc
@@ -226,8 +226,9 @@ cros_settings->GetBoolean(kAccountsPrefAllowNewUser, &allow_new_user); // nosignup flow if new users are not allowed. - if (!allow_new_user) + if (!allow_new_user) { params.Set("flow", "nosignup"); + } } // TODO(crbug.com/40239091) @@ -335,8 +336,9 @@ } GaiaScreenHandler::~GaiaScreenHandler() { - if (is_security_token_pin_enabled_) + if (is_security_token_pin_enabled_) { GetLoginScreenPinDialogManager()->RemovePinDialogHost(this); + } HttpAuthDialog::RemoveObserver(this); } @@ -422,8 +424,9 @@ params.Set("screenMode", screen_mode_); const std::string app_locale = g_browser_process->GetApplicationLocale(); - if (!app_locale.empty()) + if (!app_locale.empty()) { params.Set("hl", app_locale); + } const std::string enterprise_enrollment_domain( GetEnterpriseEnrollmentDomain()); @@ -461,8 +464,9 @@ params.Set("chromeType", GetChromeType()); params.Set("clientId", gaia_urls.oauth2_chrome_client_id()); params.Set("clientVersion", version_info::GetVersionNumber()); - if (!platform_version->empty()) + if (!platform_version->empty()) { params.Set("platformVersion", *platform_version); + } // Extended stable channel is not supported on Chrome OS Ash. params.Set("releaseChannel", chrome::GetChannelName(chrome::WithExtendedStable(false))); @@ -512,8 +516,9 @@ // We only send `chromeos_board` Gaia URL parameter if user has opted into // sending device statistics. - if (*collect_stats_consent) + if (*collect_stats_consent) { params.Set("lsbReleaseBoard", base::SysInfo::GetLsbReleaseBoard()); + } params.Set("webviewPartitionName", partition_name); signin_partition_name_ = partition_name; @@ -1018,11 +1023,13 @@ frame_state_ = FRAME_STATE_LOADED; const NetworkStateInformer::State state = network_state_informer_->state(); - if (state == NetworkStateInformer::ONLINE) + if (state == NetworkStateInformer::ONLINE) { UpdateState(NetworkError::ERROR_REASON_UPDATE); + } - if (test_expects_complete_login_) + if (test_expects_complete_login_) { SubmitLoginFormForTest(); + } if (LoginDisplayHost::default_host()) { LoginDisplayHost::default_host()->OnGaiaScreenReady(); @@ -1081,8 +1088,9 @@ void GaiaScreenHandler::HandleOnFatalError(int error_code, const base::Value::Dict& params) { - if (!LoginDisplayHost::default_host()) + if (!LoginDisplayHost::default_host()) { return; + } LoginDisplayHost::default_host() ->GetWizardController() ->ShowSignInFatalErrorScreen( @@ -1236,8 +1244,9 @@ enable_ash_httpauth_ = HttpAuthDialog::Enable(); base::Value::Dict data; - if (LoginDisplayHost::default_host()) + if (LoginDisplayHost::default_host()) { data.Set("hasUserPods", LoginDisplayHost::default_host()->HasUserPods()); + } ShowInWebUI(std::move(data)); elapsed_timer_ = std::make_unique<base::ElapsedTimer>(); hidden_ = false;
diff --git a/chrome/browser/ui/webui/ash/login/gemini_intro_screen_handler.cc b/chrome/browser/ui/webui/ash/login/gemini_intro_screen_handler.cc index 78e8b345..17cd789 100644 --- a/chrome/browser/ui/webui/ash/login/gemini_intro_screen_handler.cc +++ b/chrome/browser/ui/webui/ash/login/gemini_intro_screen_handler.cc
@@ -17,8 +17,8 @@ namespace ash { -GeminiIntroScreenHandler::GeminiIntroScreenHandler() : - BaseScreenHandler(kScreenId) {} +GeminiIntroScreenHandler::GeminiIntroScreenHandler() + : BaseScreenHandler(kScreenId) {} GeminiIntroScreenHandler::~GeminiIntroScreenHandler() = default; @@ -27,7 +27,7 @@ ::login::LocalizedValuesBuilder* builder) { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) if (base::FeatureList::IsEnabled( - features::kFeatureManagementOobeGeminiIntro)) { + features::kFeatureManagementOobeGeminiIntro)) { auto product_name = ui::ResourceBundle::GetSharedInstance().LoadDataResourceString( IDR_CROS_OOBE_PRODUCT_NAME);
diff --git a/chrome/browser/ui/webui/ash/login/hid_detection_screen_handler.cc b/chrome/browser/ui/webui/ash/login/hid_detection_screen_handler.cc index e3bafc5b..07d7eae 100644 --- a/chrome/browser/ui/webui/ash/login/hid_detection_screen_handler.cc +++ b/chrome/browser/ui/webui/ash/login/hid_detection_screen_handler.cc
@@ -83,22 +83,22 @@ builder->Add("hidDetectionContinue", IDS_HID_DETECTION_CONTINUE_BUTTON); builder->Add("hidDetectionInvitation", IDS_HID_DETECTION_INVITATION_TEXT); builder->Add("hidDetectionPrerequisites", - IDS_HID_DETECTION_PRECONDITION_TEXT); + IDS_HID_DETECTION_PRECONDITION_TEXT); builder->Add("hidDetectionPrerequisitesTouchscreen", IDS_HID_DETECTION_PRECONDITION_TOUCHSCREEN_TEXT); builder->Add("hidDetectionMouseSearching", IDS_HID_DETECTION_SEARCHING_MOUSE); builder->Add("hidDetectionKeyboardSearching", - IDS_HID_DETECTION_SEARCHING_KEYBOARD); + IDS_HID_DETECTION_SEARCHING_KEYBOARD); builder->Add("hidDetectionUSBMouseConnected", - IDS_HID_DETECTION_CONNECTED_USB_MOUSE); + IDS_HID_DETECTION_CONNECTED_USB_MOUSE); builder->Add("hidDetectionPointingDeviceConnected", - IDS_HID_DETECTION_CONNECTED_POINTING_DEVICE); + IDS_HID_DETECTION_CONNECTED_POINTING_DEVICE); builder->Add("hidDetectionKeyboardPairing", IDS_HID_DETECTION_PAIRING_BLUETOOTH_KEYBOARD); builder->Add("hidDetectionUSBKeyboardConnected", - IDS_HID_DETECTION_CONNECTED_USB_KEYBOARD); + IDS_HID_DETECTION_CONNECTED_USB_KEYBOARD); builder->Add("hidDetectionBTMousePaired", - IDS_HID_DETECTION_PAIRED_BLUETOOTH_MOUSE); + IDS_HID_DETECTION_PAIRED_BLUETOOTH_MOUSE); builder->Add("hidDetectionBTEnterKey", IDS_HID_DETECTION_BLUETOOTH_ENTER_KEY); builder->Add("hidDetectionPinDialogTitle", IDS_HID_DETECTION_PAIRING_BLUETOOTH_KEYBOARD_PIN_DIALOG_TITLE);
diff --git a/chrome/browser/ui/webui/ash/login/l10n_util.cc b/chrome/browser/ui/webui/ash/login/l10n_util.cc index e7615bd..cf7b8cb 100644 --- a/chrome/browser/ui/webui/ash/login/l10n_util.cc +++ b/chrome/browser/ui/webui/ash/login/l10n_util.cc
@@ -112,14 +112,16 @@ std::set<std::string> language_codes; // Collect the language codes from the supported input methods. for (const auto& descriptor : descriptors) { - for (const auto& language : descriptor.language_codes()) + for (const auto& language : descriptor.language_codes()) { language_codes.insert(language); + } } // Language sort order. std::map<std::string, int /* index */> language_index; - for (size_t i = 0; i < most_relevant_language_codes.size(); ++i) + for (size_t i = 0; i < most_relevant_language_codes.size(); ++i) { language_index[most_relevant_language_codes[i]] = i; + } // Map of display name -> {language code, native_display_name}. // In theory, we should be able to create a map that is sorted by @@ -151,16 +153,18 @@ const std::string lang = l10n_util::GetLanguage(language_id); // Ignore non-specific codes. - if (lang.empty() || lang == language_id) + if (lang.empty() || lang == language_id) { continue; + } if (base::Contains(base_language_codes, language_id)) { // Language is supported. No need to replace continue; } std::string resolved_locale; - if (!l10n_util::CheckAndResolveLocale(language_id, &resolved_locale)) + if (!l10n_util::CheckAndResolveLocale(language_id, &resolved_locale)) { continue; + } if (!base::Contains(base_language_codes, resolved_locale)) { // Resolved locale is not supported. @@ -183,8 +187,9 @@ for (const auto& language_code : language_codes) { // Exclude the language which is not in `base_langauge_codes` even it has // input methods. - if (!base::Contains(base_language_codes, language_code)) + if (!base::Contains(base_language_codes, language_code)) { continue; + } const std::u16string display_name = l10n_util::GetDisplayNameForLocale(language_code, app_locale, true); @@ -213,8 +218,9 @@ // Build the list of display names, and build the language map. for (const auto& base_language_code : base_language_codes) { // Skip this language if it was already added. - if (language_codes.find(base_language_code) != language_codes.end()) + if (language_codes.find(base_language_code) != language_codes.end()) { continue; + } std::u16string display_name = l10n_util::GetDisplayNameForLocale( base_language_code, app_locale, false); @@ -240,8 +246,9 @@ std::vector<std::u16string> out_display_names; for (const auto& most_relevant_locales_display_name : most_relevant_locales_display_names) { - if (most_relevant_locales_display_name.size() == 0) + if (most_relevant_locales_display_name.size() == 0) { continue; + } out_display_names.push_back(most_relevant_locales_display_name); } @@ -315,8 +322,9 @@ it != layouts.end(); ++it) { const input_method::InputMethodDescriptor* ime = util->GetInputMethodDescriptorFromId(*it); - if (!InsertString(ime->id(), &input_methods_added)) + if (!InsertString(ime->id(), &input_methods_added)) { continue; + } input_methods_list.Append(CreateInputMethodsEntry(*ime, selected, util)); } @@ -330,11 +338,13 @@ std::string CalculateSelectedLanguage(const std::string& requested_locale, const std::string& loaded_locale) { std::string resolved_locale; - if (!l10n_util::CheckAndResolveLocale(requested_locale, &resolved_locale)) + if (!l10n_util::CheckAndResolveLocale(requested_locale, &resolved_locale)) { return loaded_locale; + } - if (resolved_locale == loaded_locale) + if (resolved_locale == loaded_locale) { return requested_locale; + } return loaded_locale; } @@ -410,8 +420,9 @@ language_info.Set("value", value); language_info.Set("title", display_name); - if (value == selected) + if (value == selected) { language_info.Set("selected", true); + } } } @@ -472,15 +483,17 @@ for (const auto& most_relevant : most_relevant_language_codes) { for (const auto& entry : available_locales) { const std::string* available_locale = nullptr; - if (entry.is_dict()) + if (entry.is_dict()) { available_locale = entry.GetDict().FindString("value"); + } if (!available_locale) { NOTREACHED(); } - if (*available_locale == most_relevant) + if (*available_locale == most_relevant) { return most_relevant; + } } } @@ -523,8 +536,9 @@ for (size_t i = 0; i < input_methods.size(); ++i) { // Makes sure the id is in legacy xkb id format. const std::string& ime_id = input_methods[i].id(); - if (!InsertString(ime_id, &input_methods_added)) + if (!InsertString(ime_id, &input_methods_added)) { continue; + } if (!optgroup_added) { optgroup_added = true; AddOptgroupOtherLayouts(input_methods_list);
diff --git a/chrome/browser/ui/webui/ash/login/l10n_util_unittest.cc b/chrome/browser/ui/webui/ash/login/l10n_util_unittest.cc index 287e077..3f8a0e9 100644 --- a/chrome/browser/ui/webui/ash/login/l10n_util_unittest.cc +++ b/chrome/browser/ui/webui/ash/login/l10n_util_unittest.cc
@@ -110,23 +110,19 @@ std::vector<std::string> most_relevant_language_codes; EXPECT_EQ("en-US", FindMostRelevantLocale(most_relevant_language_codes, - available_locales, - "en-US")); + available_locales, "en-US")); most_relevant_language_codes.push_back("xx"); EXPECT_EQ("en-US", FindMostRelevantLocale(most_relevant_language_codes, - available_locales, - "en-US")); + available_locales, "en-US")); most_relevant_language_codes.push_back("fr"); EXPECT_EQ("fr", FindMostRelevantLocale(most_relevant_language_codes, - available_locales, - "en-US")); + available_locales, "en-US")); most_relevant_language_codes.push_back("de"); EXPECT_EQ("fr", FindMostRelevantLocale(most_relevant_language_codes, - available_locales, - "en-US")); + available_locales, "en-US")); } void InitStartupCustomizationDocumentForTesting(const std::string& manifest) {
diff --git a/chrome/browser/ui/webui/ash/login/network_state_informer.cc b/chrome/browser/ui/webui/ash/login/network_state_informer.cc index 45b1c571..f7ac9917 100644 --- a/chrome/browser/ui/webui/ash/login/network_state_informer.cc +++ b/chrome/browser/ui/webui/ash/login/network_state_informer.cc
@@ -68,8 +68,9 @@ } void NetworkStateInformer::AddObserver(NetworkStateInformerObserver* observer) { - if (!observers_.HasObserver(observer)) + if (!observers_.HasObserver(observer)) { observers_.AddObserver(observer); + } } void NetworkStateInformer::RemoveObserver( @@ -119,8 +120,9 @@ const NetworkState* network = NetworkHandler::Get()->network_state_handler()->GetNetworkState( service_path); - if (!network) + if (!network) { return std::string(); + } return network->name(); } @@ -135,19 +137,22 @@ bool NetworkStateInformer::UpdateState(const NetworkState* network) { State new_state = GetStateForNetwork(network); std::string new_network_path; - if (network) + if (network) { new_network_path = network->path(); + } - if (new_state == state_ && new_network_path == network_path_) + if (new_state == state_ && new_network_path == network_path_) { return false; + } state_ = new_state; network_path_ = new_network_path; proxy_config_.reset(); if (state_ == ONLINE) { - for (NetworkStateInformerObserver& observer : observers_) + for (NetworkStateInformerObserver& observer : observers_) { observer.OnNetworkReady(); + } } return true; @@ -185,18 +190,20 @@ void NetworkStateInformer::UpdateStateAndNotify(const NetworkState* network) { bool state_changed = UpdateState(network); bool proxy_config_changed = UpdateProxyConfig(network); - if (state_changed) + if (state_changed) { SendStateToObservers(NetworkError::ERROR_REASON_NETWORK_STATE_CHANGED); - else if (proxy_config_changed) + } else if (proxy_config_changed) { SendStateToObservers(NetworkError::ERROR_REASON_PROXY_CONFIG_CHANGED); - else + } else { SendStateToObservers(NetworkError::ERROR_REASON_UPDATE); + } } void NetworkStateInformer::SendStateToObservers( NetworkError::ErrorReason reason) { - for (NetworkStateInformerObserver& observer : observers_) + for (NetworkStateInformerObserver& observer : observers_) { observer.UpdateState(reason); + } } } // namespace ash
diff --git a/chrome/browser/ui/webui/ash/login/online_login_utils.cc b/chrome/browser/ui/webui/ash/login/online_login_utils.cc index 2a03ed43..d5fa118 100644 --- a/chrome/browser/ui/webui/ash/login/online_login_utils.cc +++ b/chrome/browser/ui/webui/ash/login/online_login_utils.cc
@@ -98,8 +98,9 @@ OnSetCookieForLoadGaiaWithPartition callback) { content::StoragePartition* partition = signin_partition_manager->GetCurrentStoragePartition(); - if (!partition) + if (!partition) { return; + } // Note: The CanonicalCookie created here is not Secure. This is fine because // it's being set into a different StoragePartition than the user's actual @@ -117,8 +118,9 @@ std::nullopt /* server_time */, std::nullopt /* cookie_partition_key */, net::CookieSourceType::kOther, /*status=*/nullptr)); - if (!cc) + if (!cc) { return; + } const net::CookieOptions options = net::CookieOptions::MakeAllInclusive(); partition->GetCookieManagerForBrowserProcess()->SetCanonicalCookie( @@ -260,8 +262,9 @@ content::StoragePartition* partition = signin_partition_manager_->GetCurrentStoragePartition(); - if (!partition) + if (!partition) { return; + } // Validity check that partition did not change during login flow. DCHECK_EQ(signin_partition_manager_->GetCurrentStoragePartitionName(), @@ -309,12 +312,13 @@ login::GaiaCookiesData cookie_data; for (const auto& cookie_with_access_result : cookies) { const auto& cookie = cookie_with_access_result.cookie; - if (cookie.Name() == login::kOAUTHCodeCookie) + if (cookie.Name() == login::kOAUTHCodeCookie) { cookie_data.auth_code = cookie.Value(); - else if (cookie.Name() == login::kGAPSCookie) + } else if (cookie.Name() == login::kGAPSCookie) { cookie_data.gaps_cookie = cookie.Value(); - else if (cookie.Name() == login::kRAPTCookie) + } else if (cookie.Name() == login::kRAPTCookie) { cookie_data.rapt = cookie.Value(); + } } if (cookie_data.auth_code.empty() && !allow_empty_auth_code_for_testing_) {
diff --git a/chrome/browser/ui/webui/ash/login/oobe_display_chooser.cc b/chrome/browser/ui/webui/ash/login/oobe_display_chooser.cc index c4530e3..ce0a0ef 100644 --- a/chrome/browser/ui/webui/ash/login/oobe_display_chooser.cc +++ b/chrome/browser/ui/webui/ash/login/oobe_display_chooser.cc
@@ -50,8 +50,9 @@ // Don't (potentially) queue a second task to run MoveToTouchDisplay if one // already is queued. - if (weak_ptr_factory_.HasWeakPtrs()) + if (weak_ptr_factory_.HasWeakPtrs()) { return; + } display::Display primary_display = display::Screen::GetScreen()->GetPrimaryDisplay();
diff --git a/chrome/browser/ui/webui/ash/login/oobe_ui.h b/chrome/browser/ui/webui/ash/login/oobe_ui.h index a5e491f..9dfb9a01 100644 --- a/chrome/browser/ui/webui/ash/login/oobe_ui.h +++ b/chrome/browser/ui/webui/ash/login/oobe_ui.h
@@ -150,8 +150,9 @@ THandler* GetHandler() { OobeScreenId expected_screen = THandler::kScreenId; for (BaseScreenHandler* handler : screen_handlers_) { - if (expected_screen == handler->oobe_screen()) + if (expected_screen == handler->oobe_screen()) { return static_cast<THandler*>(handler); + } } NOTREACHED() << "Unable to find handler for screen " << expected_screen;
diff --git a/chrome/browser/ui/webui/ash/login/perks_discovery_screen_handler.cc b/chrome/browser/ui/webui/ash/login/perks_discovery_screen_handler.cc index fafc7aec..093104ff 100644 --- a/chrome/browser/ui/webui/ash/login/perks_discovery_screen_handler.cc +++ b/chrome/browser/ui/webui/ash/login/perks_discovery_screen_handler.cc
@@ -38,8 +38,10 @@ base::Value(perk.additional_text.value())); } if (perk.content.illustration.has_value()) { - perk_dict.Set("illustrationUrl", base::Value(perk.content.illustration->url)); - perk_dict.Set("illustrationWidth", base::Value(perk.content.illustration->width)); + perk_dict.Set("illustrationUrl", + base::Value(perk.content.illustration->url)); + perk_dict.Set("illustrationWidth", + base::Value(perk.content.illustration->width)); perk_dict.Set("illustrationHeight", base::Value(perk.content.illustration->height)); }
diff --git a/chrome/browser/ui/webui/ash/login/perks_discovery_screen_handler.h b/chrome/browser/ui/webui/ash/login/perks_discovery_screen_handler.h index 331a4a3..274c7cda4 100644 --- a/chrome/browser/ui/webui/ash/login/perks_discovery_screen_handler.h +++ b/chrome/browser/ui/webui/ash/login/perks_discovery_screen_handler.h
@@ -26,7 +26,8 @@ // Shows the contents of the screen. virtual void Show() = 0; - virtual void SetPerksData(const std::vector<SinglePerkDiscoveryPayload>& perks) = 0; + virtual void SetPerksData( + const std::vector<SinglePerkDiscoveryPayload>& perks) = 0; virtual void SetOverviewStep() = 0; // Gets a WeakPtr to the instance. @@ -52,7 +53,8 @@ // PerksDiscoveryScreenView: void Show() override; - void SetPerksData(const std::vector<SinglePerkDiscoveryPayload>& perks) override; + void SetPerksData( + const std::vector<SinglePerkDiscoveryPayload>& perks) override; void SetOverviewStep() override; base::WeakPtr<PerksDiscoveryScreenView> AsWeakPtr() override;
diff --git a/chrome/browser/ui/webui/ash/login/personalized_recommend_apps_screen_handler.h b/chrome/browser/ui/webui/ash/login/personalized_recommend_apps_screen_handler.h index 7eb5699..14251b1 100644 --- a/chrome/browser/ui/webui/ash/login/personalized_recommend_apps_screen_handler.h +++ b/chrome/browser/ui/webui/ash/login/personalized_recommend_apps_screen_handler.h
@@ -11,8 +11,8 @@ namespace ash { -// Interface for dependency injection between PersonalizedRecommendAppsScreen and -// its WebUI representation. +// Interface for dependency injection between PersonalizedRecommendAppsScreen +// and its WebUI representation. class PersonalizedRecommendAppsScreenView { public: inline constexpr static StaticOobeScreenId kScreenId{
diff --git a/chrome/browser/ui/webui/ash/login/reset_screen_handler.cc b/chrome/browser/ui/webui/ash/login/reset_screen_handler.cc index 58e74711..7b723a2 100644 --- a/chrome/browser/ui/webui/ash/login/reset_screen_handler.cc +++ b/chrome/browser/ui/webui/ash/login/reset_screen_handler.cc
@@ -41,8 +41,7 @@ builder->Add("resetWarningDataDetails", IDS_RESET_SCREEN_WARNING_DETAILS_DATA); builder->Add("resetRestartMessage", IDS_RESET_SCREEN_RESTART_MSG); - builder->AddF("resetRevertPromise", - IDS_RESET_SCREEN_PREPARING_REVERT_PROMISE, + builder->AddF("resetRevertPromise", IDS_RESET_SCREEN_PREPARING_REVERT_PROMISE, IDS_SHORT_PRODUCT_NAME); builder->AddF("resetRevertSpinnerMessage", IDS_RESET_SCREEN_PREPARING_REVERT_SPINNER_MESSAGE,
diff --git a/chrome/browser/ui/webui/ash/login/signin_userlist_unittest.cc b/chrome/browser/ui/webui/ash/login/signin_userlist_unittest.cc index f2f837071..3a0822b 100644 --- a/chrome/browser/ui/webui/ash/login/signin_userlist_unittest.cc +++ b/chrome/browser/ui/webui/ash/login/signin_userlist_unittest.cc
@@ -55,16 +55,18 @@ TestingBrowserProcess::GetGlobal(), &local_state_); ASSERT_TRUE(profile_manager_->SetUp()); - for (size_t i = 0; i < std::size(kUsersPublic); ++i) + for (size_t i = 0; i < std::size(kUsersPublic); ++i) { fake_user_manager_->AddPublicAccountUser( AccountId::FromUserEmail(kUsersPublic[i])); + } for (size_t i = 0; i < kMaxUsers + 1; ++i) { fake_user_manager_->AddUser( AccountId::FromUserEmail(GenerateUserEmail(i))); // Insert owner second to last. - if (i == kMaxUsers - 1) + if (i == kMaxUsers - 1) { fake_user_manager_->AddUser(AccountId::FromUserEmail(kOwner)); + } } fake_user_manager_->SetOwnerId(AccountId::FromUserEmail(kOwner));
diff --git a/chrome/browser/ui/webui/ash/login/ssh_configured_handler.cc b/chrome/browser/ui/webui/ash/login/ssh_configured_handler.cc index b659c87..1f329e3 100644 --- a/chrome/browser/ui/webui/ash/login/ssh_configured_handler.cc +++ b/chrome/browser/ui/webui/ash/login/ssh_configured_handler.cc
@@ -47,10 +47,12 @@ } void SshConfiguredHandler::InitAfterJavascriptAllowed() { - if (callback_ids_.empty()) + if (callback_ids_.empty()) { return; - if (!is_ssh_configured_.has_value()) + } + if (!is_ssh_configured_.has_value()) { return; + } ResolveCallbacks(); } @@ -83,8 +85,9 @@ } void SshConfiguredHandler::ResolveCallbacks() { - if (!IsJavascriptAllowed()) + if (!IsJavascriptAllowed()) { return; + } DCHECK(is_ssh_configured_.has_value()); for (const std::string& callback_id : callback_ids_) { ResolveJavascriptCallback(base::Value(callback_id),
diff --git a/chrome/browser/ui/webui/ash/login/testapi/oobe_test_api_handler.cc b/chrome/browser/ui/webui/ash/login/testapi/oobe_test_api_handler.cc index 44de005..cbc40709 100644 --- a/chrome/browser/ui/webui/ash/login/testapi/oobe_test_api_handler.cc +++ b/chrome/browser/ui/webui/ash/login/testapi/oobe_test_api_handler.cc
@@ -87,7 +87,7 @@ void OobeTestAPIHandler::GetAdditionalParameters(base::Value::Dict* dict) { login::NetworkStateHelper helper_; dict->Set("testapi_shouldSkipNetworkFirstShow", - !switches::IsOOBENetworkScreenSkippingDisabledForTesting() && + !switches::IsOOBENetworkScreenSkippingDisabledForTesting() && helper_.IsConnectedToEthernet()); dict->Set(
diff --git a/chrome/browser/ui/webui/ash/login/touchpad_scroll_screen_handler.cc b/chrome/browser/ui/webui/ash/login/touchpad_scroll_screen_handler.cc index 55eae51..8e39b22e 100644 --- a/chrome/browser/ui/webui/ash/login/touchpad_scroll_screen_handler.cc +++ b/chrome/browser/ui/webui/ash/login/touchpad_scroll_screen_handler.cc
@@ -5,7 +5,6 @@ #include "chrome/browser/ui/webui/ash/login/touchpad_scroll_screen_handler.h" #include "base/logging.h" - #include "chrome/browser/ash/login/oobe_screen.h" #include "chrome/browser/ash/login/wizard_controller.h" #include "chrome/browser/ui/webui/ash/login/base_screen_handler.h"
diff --git a/chrome/browser/ui/webui/ash/login/wrong_hwid_screen_handler.cc b/chrome/browser/ui/webui/ash/login/wrong_hwid_screen_handler.cc index d2559221..22a11e3 100644 --- a/chrome/browser/ui/webui/ash/login/wrong_hwid_screen_handler.cc +++ b/chrome/browser/ui/webui/ash/login/wrong_hwid_screen_handler.cc
@@ -28,11 +28,10 @@ ::login::LocalizedValuesBuilder* builder) { builder->Add("wrongHWIDScreenHeader", IDS_WRONG_HWID_SCREEN_HEADER); builder->Add("wrongHWIDMessageFirstPart", - IDS_WRONG_HWID_SCREEN_MESSAGE_FIRST_PART); + IDS_WRONG_HWID_SCREEN_MESSAGE_FIRST_PART); builder->Add("wrongHWIDMessageSecondPart", - IDS_WRONG_HWID_SCREEN_MESSAGE_SECOND_PART); - builder->Add("wrongHWIDScreenSkipLink", - IDS_WRONG_HWID_SCREEN_SKIP_LINK); + IDS_WRONG_HWID_SCREEN_MESSAGE_SECOND_PART); + builder->Add("wrongHWIDScreenSkipLink", IDS_WRONG_HWID_SCREEN_SKIP_LINK); } } // namespace ash
diff --git a/chrome/browser/ui/webui/ash/multidevice_internals/multidevice_internals_phone_hub_handler.cc b/chrome/browser/ui/webui/ash/multidevice_internals/multidevice_internals_phone_hub_handler.cc index e5ec0dc..d998284f 100644 --- a/chrome/browser/ui/webui/ash/multidevice_internals/multidevice_internals_phone_hub_handler.cc +++ b/chrome/browser/ui/webui/ash/multidevice_internals/multidevice_internals_phone_hub_handler.cc
@@ -106,27 +106,32 @@ const base::Value::Dict* browser_tab_metadata = browser_tab_status_dict->FindDict(key); - if (!browser_tab_metadata) + if (!browser_tab_metadata) { return; + } const std::string* url = browser_tab_metadata->FindString("url"); - if (!url || url->empty()) + if (!url || url->empty()) { return; + } const std::string* title = browser_tab_metadata->FindString("title"); - if (!title) + if (!title) { return; + } // JavaScript time stamps don't fit in int. std::optional<double> last_accessed_timestamp = browser_tab_metadata->FindDouble("lastAccessedTimeStamp"); - if (!last_accessed_timestamp) + if (!last_accessed_timestamp) { return; + } int favicon_image_type_as_int = browser_tab_metadata->FindInt("favicon").value_or(0); - if (!favicon_image_type_as_int) + if (!favicon_image_type_as_int) { return; + } auto favicon_image_type = static_cast<ImageType>(favicon_image_type_as_int); gfx::Image favicon = gfx::Image::CreateFrom1xBitmap( @@ -152,8 +157,9 @@ MultidevicePhoneHubHandler::MultidevicePhoneHubHandler() = default; MultidevicePhoneHubHandler::~MultidevicePhoneHubHandler() { - if (fake_phone_hub_manager_) + if (fake_phone_hub_manager_) { EnableRealPhoneHubManager(); + } } void MultidevicePhoneHubHandler::RegisterMessages() { @@ -344,8 +350,9 @@ void MultidevicePhoneHubHandler::EnableRealPhoneHubManager() { // If no FakePhoneHubManager is active, return early. This ensures that we // don't unnecessarily re-initialize the Phone Hub UI. - if (!fake_phone_hub_manager_) + if (!fake_phone_hub_manager_) { return; + } PA_LOG(VERBOSE) << "Setting real Phone Hub Manager"; Profile* profile = Profile::FromWebUI(web_ui()); @@ -359,8 +366,9 @@ void MultidevicePhoneHubHandler::EnableFakePhoneHubManager() { // Don't create FakePhoneHubManager if it already exists to prevent UAF. - if (fake_phone_hub_manager_) + if (fake_phone_hub_manager_) { return; + } PA_LOG(VERBOSE) << "Setting fake Phone Hub Manager"; fake_phone_hub_manager_ = std::make_unique<phonehub::FakePhoneHubManager>(); @@ -533,14 +541,16 @@ std::optional<std::u16string> opt_title; const std::string* title = notification_data_value.FindString("title"); - if (title && !title->empty()) + if (title && !title->empty()) { opt_title = base::UTF8ToUTF16(*title); + } std::optional<std::u16string> opt_text_content; if (const std::string* text_content = notification_data_value.FindString("textContent")) { - if (!text_content->empty()) + if (!text_content->empty()) { opt_text_content = base::UTF8ToUTF16(*text_content); + } } std::optional<gfx::Image> opt_shared_image;
diff --git a/chrome/browser/ui/webui/ash/multidevice_setup/multidevice_setup_dialog.cc b/chrome/browser/ui/webui/ash/multidevice_setup/multidevice_setup_dialog.cc index c640132..52c27c6 100644 --- a/chrome/browser/ui/webui/ash/multidevice_setup/multidevice_setup_dialog.cc +++ b/chrome/browser/ui/webui/ash/multidevice_setup/multidevice_setup_dialog.cc
@@ -87,8 +87,9 @@ std::u16string()) {} MultiDeviceSetupDialog::~MultiDeviceSetupDialog() { - for (auto& callback : on_close_callbacks_) + for (auto& callback : on_close_callbacks_) { std::move(callback).Run(); + } } void MultiDeviceSetupDialog::GetDialogSize(gfx::Size* size) const { @@ -140,8 +141,9 @@ MultiDeviceSetupService* service = MultiDeviceSetupServiceFactory::GetForProfile( Profile::FromWebUI(web_ui())); - if (service) + if (service) { service->BindMultiDeviceSetup(std::move(receiver)); + } } void MultiDeviceSetupDialogUI::BindInterface(
diff --git a/chrome/browser/ui/webui/ash/multidevice_setup/multidevice_setup_localized_strings_provider.cc b/chrome/browser/ui/webui/ash/multidevice_setup/multidevice_setup_localized_strings_provider.cc index 39cee66..0f5c7a5d 100644 --- a/chrome/browser/ui/webui/ash/multidevice_setup/multidevice_setup_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/ash/multidevice_setup/multidevice_setup_localized_strings_provider.cc
@@ -155,8 +155,9 @@ } void AddLocalizedValuesToBuilder(::login::LocalizedValuesBuilder* builder) { - for (const auto& entry : kLocalizedStringsWithoutPlaceholders) + for (const auto& entry : kLocalizedStringsWithoutPlaceholders) { builder->Add(entry.name, entry.id); + } // TODO(crbug.com/964547): Refactor so that any change to these strings will // surface in both the OOBE and post-OOBE UIs without having to adjust both
diff --git a/chrome/browser/ui/webui/ash/network_ui/network_logs_message_handler.cc b/chrome/browser/ui/webui/ash/network_ui/network_logs_message_handler.cc index fcffe19..64688b88 100644 --- a/chrome/browser/ui/webui/ash/network_ui/network_logs_message_handler.cc +++ b/chrome/browser/ui/webui/ash/network_ui/network_logs_message_handler.cc
@@ -33,8 +33,9 @@ Profile* profile = Profile::FromWebUI(web_ui); const DownloadPrefs* const prefs = DownloadPrefs::FromBrowserContext(profile); base::FilePath path = prefs->DownloadPath(); - if (file_manager::util::IsUnderNonNativeLocalPath(profile, path)) + if (file_manager::util::IsUnderNonNativeLocalPath(profile, path)) { path = prefs->GetDefaultDownloadDirectoryForProfile(); + } return path; }
diff --git a/chrome/browser/ui/webui/ash/network_ui/network_ui.cc b/chrome/browser/ui/webui/ash/network_ui/network_ui.cc index 96d0951..6568ea7 100644 --- a/chrome/browser/ui/webui/ash/network_ui/network_ui.cc +++ b/chrome/browser/ui/webui/ash/network_ui/network_ui.cc
@@ -101,8 +101,9 @@ const NetworkState* network = NetworkHandler::Get()->network_state_handler()->GetNetworkStateFromGuid( guid); - if (!network) + if (!network) { return false; + } *service_path = network->path(); return true; } @@ -110,12 +111,14 @@ void SetDeviceProperties(base::Value::Dict* dictionary) { DCHECK(dictionary); const std::string* device = dictionary->FindString(shill::kDeviceProperty); - if (!device) + if (!device) { return; + } const DeviceState* device_state = NetworkHandler::Get()->network_state_handler()->GetDeviceState(*device); - if (!device_state) + if (!device_state) { return; + } base::Value::Dict device_dictionary = device_state->properties().Clone(); if (!device_state->ip_configs().empty()) { @@ -126,8 +129,9 @@ } device_dictionary.Set(shill::kIPConfigsProperty, std::move(ip_configs)); } - if (!device_dictionary.empty()) + if (!device_dictionary.empty()) { dictionary->Set(shill::kDeviceProperty, std::move(device_dictionary)); + } } bool IsGuestModeActive() { @@ -152,8 +156,9 @@ const ManagedNetworkConfigurationHandler* managed_network_configuration_handler = NetworkHandler::Get()->managed_network_configuration_handler(); - if (!managed_network_configuration_handler) + if (!managed_network_configuration_handler) { return std::nullopt; + } if (managed_network_configuration_handler ->AllowOnlyPolicyCellularNetworks()) { NET_LOG(ERROR) @@ -162,8 +167,9 @@ } NetworkStateHandler* network_state_handler = NetworkHandler::Get()->network_state_handler(); - if (!network_state_handler) + if (!network_state_handler) { return std::nullopt; + } NetworkStateHandler::NetworkStateList state_list; network_state_handler->GetNetworkListByType(NetworkTypePattern::Cellular(), /*configured_only=*/false, @@ -416,8 +422,9 @@ void ResetESimCache(const base::Value::List& arg_list) { CellularESimProfileHandler* handler = NetworkHandler::Get()->cellular_esim_profile_handler(); - if (!handler) + if (!handler) { return; + } CellularESimProfileHandlerImpl* handler_impl = static_cast<CellularESimProfileHandlerImpl*>(handler); @@ -427,8 +434,9 @@ void DisableActiveESimProfile(const base::Value::List& arg_list) { CellularESimProfileHandler* handler = NetworkHandler::Get()->cellular_esim_profile_handler(); - if (!handler) + if (!handler) { return; + } CellularESimProfileHandlerImpl* handler_impl = static_cast<CellularESimProfileHandlerImpl*>(handler); @@ -437,13 +445,15 @@ void ResetEuicc(const base::Value::List& arg_list) { std::optional<dbus::ObjectPath> euicc_path = GetEuiccResetPath(); - if (!euicc_path) + if (!euicc_path) { return; + } CellularESimUninstallHandler* handler = NetworkHandler::Get()->cellular_esim_uninstall_handler(); - if (!handler) + if (!handler) { return; + } NET_LOG(EVENT) << "Executing reset EUICC on " << euicc_path->value(); handler->ResetEuiccMemory( *euicc_path, base::BindOnce(&NetworkConfigMessageHandler::OnEuiccReset,
diff --git a/chrome/browser/ui/webui/ash/network_ui/onc_import_message_handler.cc b/chrome/browser/ui/webui/ash/network_ui/onc_import_message_handler.cc index d42fc88..ba32fa7a 100644 --- a/chrome/browser/ui/webui/ash/network_ui/onc_import_message_handler.cc +++ b/chrome/browser/ui/webui/ash/network_ui/onc_import_message_handler.cc
@@ -44,8 +44,9 @@ auto split_callback = base::SplitOnceCallback(std::move(callback)); net::NSSCertDatabase* cert_db = std::move(database_getter).Run(std::move(split_callback.first)); - if (cert_db) + if (cert_db) { std::move(split_callback.second).Run(cert_db); + } } } // namespace @@ -123,8 +124,9 @@ result += base::StringPrintf("Networks imported: %d\n", num_networks_imported); if (certificates.empty()) { - if (!num_networks_imported) + if (!num_networks_imported) { has_error = true; + } Respond(callback_id, result, has_error); return; }
diff --git a/chrome/browser/ui/webui/ash/office_fallback/office_fallback_dialog.cc b/chrome/browser/ui/webui/ash/office_fallback/office_fallback_dialog.cc index 8b74119..bfd9d44 100644 --- a/chrome/browser/ui/webui/ash/office_fallback/office_fallback_dialog.cc +++ b/chrome/browser/ui/webui/ash/office_fallback/office_fallback_dialog.cc
@@ -212,8 +212,9 @@ // Delete class. SystemWebDialogDelegate::OnDialogClosed(choice); // Run callback after dialog closed. - if (callback) + if (callback) { std::move(callback).Run(choice); + } } OfficeFallbackDialog::OfficeFallbackDialog(
diff --git a/chrome/browser/ui/webui/ash/office_fallback/office_fallback_dialog_browsertest.cc b/chrome/browser/ui/webui/ash/office_fallback/office_fallback_dialog_browsertest.cc index e5efd7c..aaf9b130 100644 --- a/chrome/browser/ui/webui/ash/office_fallback/office_fallback_dialog_browsertest.cc +++ b/chrome/browser/ui/webui/ash/office_fallback/office_fallback_dialog_browsertest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/webui/ash/office_fallback/office_fallback_dialog.h" + #include <utility> #include "base/test/bind.h" @@ -10,7 +12,6 @@ #include "chrome/browser/ash/file_manager/office_file_tasks.h" #include "chrome/browser/ash/file_system_provider/service.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/ui/webui/ash/office_fallback/office_fallback_dialog.h" #include "chrome/browser/ui/webui/ash/office_fallback/office_fallback_ui.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/grit/generated_resources.h"
diff --git a/chrome/browser/ui/webui/ash/parent_access/parent_access_metrics_utils.cc b/chrome/browser/ui/webui/ash/parent_access/parent_access_metrics_utils.cc index 21a674e..d5c68b2 100644 --- a/chrome/browser/ui/webui/ash/parent_access/parent_access_metrics_utils.cc +++ b/chrome/browser/ui/webui/ash/parent_access/parent_access_metrics_utils.cc
@@ -2,9 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/webui/ash/parent_access/parent_access_metrics_utils.h" + #include <string_view> -#include "chrome/browser/ui/webui/ash/parent_access/parent_access_metrics_utils.h" #include "base/strings/string_util.h" namespace parent_access {
diff --git a/chrome/browser/ui/webui/ash/set_time/set_time_ui.cc b/chrome/browser/ui/webui/ash/set_time/set_time_ui.cc index 3836e03..e32262cd 100644 --- a/chrome/browser/ui/webui/ash/set_time/set_time_ui.cc +++ b/chrome/browser/ui/webui/ash/set_time/set_time_ui.cc
@@ -146,8 +146,9 @@ } void OnParentAccessValidation(bool success) { - if (success) + if (success) { FireWebUIListener("validation-complete"); + } } base::ScopedObservation<SystemClockClient, SystemClockClient::Observer>
diff --git a/chrome/browser/ui/webui/ash/settings/os_settings_features_util.cc b/chrome/browser/ui/webui/ash/settings/os_settings_features_util.cc index e2a5f31..96fda88 100644 --- a/chrome/browser/ui/webui/ash/settings/os_settings_features_util.cc +++ b/chrome/browser/ui/webui/ash/settings/os_settings_features_util.cc
@@ -56,12 +56,14 @@ bool ShouldShowParentalControlSettings(const Profile* profile) { // Not shown for secondary users. - if (profile != ProfileManager::GetPrimaryUserProfile()) + if (profile != ProfileManager::GetPrimaryUserProfile()) { return false; + } // Also not shown for guest sessions. - if (profile->IsGuestSession()) + if (profile->IsGuestSession()) { return false; + } return profile->IsChild() || !profile->GetProfilePolicyConnector()->IsManaged();
diff --git a/chrome/browser/ui/webui/ash/settings/pages/a11y/accessibility_handler_unittest.cc b/chrome/browser/ui/webui/ash/settings/pages/a11y/accessibility_handler_unittest.cc index 9b79552f8..117f0bf5 100644 --- a/chrome/browser/ui/webui/ash/settings/pages/a11y/accessibility_handler_unittest.cc +++ b/chrome/browser/ui/webui/ash/settings/pages/a11y/accessibility_handler_unittest.cc
@@ -48,9 +48,7 @@ web_ui_->AddMessageHandler(std::move(handler)); } - void TearDown() override { - web_ui_.reset(); - } + void TearDown() override { web_ui_.reset(); } protected: MockNewWindowDelegate& new_window_delegate() { return new_window_delegate_; }
diff --git a/chrome/browser/ui/webui/ash/settings/pages/a11y/settings_with_tts_preview_handler.cc b/chrome/browser/ui/webui/ash/settings/pages/a11y/settings_with_tts_preview_handler.cc index 66e725e..fa4903c 100644 --- a/chrome/browser/ui/webui/ash/settings/pages/a11y/settings_with_tts_preview_handler.cc +++ b/chrome/browser/ui/webui/ash/settings/pages/a11y/settings_with_tts_preview_handler.cc
@@ -57,16 +57,19 @@ const std::string& text = args[0].GetString(); const std::string& voice_id = args[1].GetString(); - if (text.empty() || voice_id.empty()) + if (text.empty() || voice_id.empty()) { return; + } std::optional<base::Value> json = base::JSONReader::Read(voice_id); std::string name; std::string extension_id; - if (const std::string* ptr = json->GetDict().FindString("name")) + if (const std::string* ptr = json->GetDict().FindString("name")) { name = *ptr; - if (const std::string* ptr = json->GetDict().FindString("extension")) + } + if (const std::string* ptr = json->GetDict().FindString("extension")) { extension_id = *ptr; + } std::unique_ptr<content::TtsUtterance> utterance = content::TtsUtterance::Create(web_ui()->GetWebContents());
diff --git a/chrome/browser/ui/webui/ash/settings/pages/apps/mojom/app_type_mojom_traits_unittest.cc b/chrome/browser/ui/webui/ash/settings/pages/apps/mojom/app_type_mojom_traits_unittest.cc index 4239e5a..ed67d99 100644 --- a/chrome/browser/ui/webui/ash/settings/pages/apps/mojom/app_type_mojom_traits_unittest.cc +++ b/chrome/browser/ui/webui/ash/settings/pages/apps/mojom/app_type_mojom_traits_unittest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/webui/ash/settings/pages/apps/mojom/app_type_mojom_traits.h" + #include "chrome/browser/ui/webui/ash/settings/pages/apps/mojom/app_notification_handler.mojom.h" #include "components/services/app_service/public/cpp/app_types.h" #include "mojo/public/cpp/test_support/test_utils.h"
diff --git a/chrome/browser/ui/webui/ash/settings/pages/crostini/crostini_handler.cc b/chrome/browser/ui/webui/ash/settings/pages/crostini/crostini_handler.cc index b45b0ca7..07865d0 100644 --- a/chrome/browser/ui/webui/ash/settings/pages/crostini/crostini_handler.cc +++ b/chrome/browser/ui/webui/ash/settings/pages/crostini/crostini_handler.cc
@@ -217,16 +217,16 @@ base::BindRepeating(&CrostiniHandler::HandleSetVmDeviceShared, handler_weak_ptr_factory_.GetWeakPtr())); } - web_ui()->RegisterMessageCallback( - "requestBruschettaInstallerView", - base::BindRepeating( - &CrostiniHandler::HandleRequestBruschettaInstallerView, - handler_weak_ptr_factory_.GetWeakPtr())); - web_ui()->RegisterMessageCallback( - "requestBruschettaUninstallerView", - base::BindRepeating( - &CrostiniHandler::HandleRequestBruschettaUninstallerView, - handler_weak_ptr_factory_.GetWeakPtr())); + web_ui()->RegisterMessageCallback( + "requestBruschettaInstallerView", + base::BindRepeating( + &CrostiniHandler::HandleRequestBruschettaInstallerView, + handler_weak_ptr_factory_.GetWeakPtr())); + web_ui()->RegisterMessageCallback( + "requestBruschettaUninstallerView", + base::BindRepeating( + &CrostiniHandler::HandleRequestBruschettaUninstallerView, + handler_weak_ptr_factory_.GetWeakPtr())); } void CrostiniHandler::OnJavascriptAllowed() {
diff --git a/chrome/browser/ui/webui/ash/settings/pages/main/os_settings_hats_handler.cc b/chrome/browser/ui/webui/ash/settings/pages/main/os_settings_hats_handler.cc index 6637ffa7..27fb5bc 100644 --- a/chrome/browser/ui/webui/ash/settings/pages/main/os_settings_hats_handler.cc +++ b/chrome/browser/ui/webui/ash/settings/pages/main/os_settings_hats_handler.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/webui/ash/settings/pages/main/os_settings_hats_handler.h" + #include "chrome/browser/ui/webui/ash/settings/os_settings_ui.h" #include "chrome/browser/ui/webui/ash/settings/services/hats/os_settings_hats_manager.h" #include "chrome/browser/ui/webui/ash/settings/services/hats/os_settings_hats_manager_factory.h"
diff --git a/chrome/browser/ui/webui/ash/settings/pages/main/os_settings_hats_handler_unittest.cc b/chrome/browser/ui/webui/ash/settings/pages/main/os_settings_hats_handler_unittest.cc index 186c901..f359cc1 100644 --- a/chrome/browser/ui/webui/ash/settings/pages/main/os_settings_hats_handler_unittest.cc +++ b/chrome/browser/ui/webui/ash/settings/pages/main/os_settings_hats_handler_unittest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/webui/ash/settings/pages/main/os_settings_hats_handler.h" + #include "chrome/browser/ui/webui/ash/settings/services/hats/os_settings_hats_manager.h" #include "chrome/browser/ui/webui/ash/settings/services/hats/os_settings_hats_manager_factory.h" #include "chrome/test/base/browser_with_test_window_test.h"
diff --git a/chrome/browser/ui/webui/ash/settings/pages/os_settings_section.cc b/chrome/browser/ui/webui/ash/settings/pages/os_settings_section.cc index 7daca55..fc25a355 100644 --- a/chrome/browser/ui/webui/ash/settings/pages/os_settings_section.cc +++ b/chrome/browser/ui/webui/ash/settings/pages/os_settings_section.cc
@@ -34,8 +34,9 @@ mojom::Subpage subpage, const base::span<const mojom::Setting>& settings, HierarchyGenerator* generator) { - for (const auto& setting : settings) + for (const auto& setting : settings) { generator->RegisterNestedSetting(setting, subpage); + } } OsSettingsSection::~OsSettingsSection() = default; @@ -80,8 +81,9 @@ OsSettingsIdentifier id, const std::string& url_to_modify) { // Default case for static URLs which do not need to be modified. - if (type != mojom::SearchResultType::kSetting) + if (type != mojom::SearchResultType::kSetting) { return url_to_modify; + } std::stringstream ss; ss << url_to_modify;
diff --git a/chrome/browser/ui/webui/ash/settings/pages/people/people_section.h b/chrome/browser/ui/webui/ash/settings/pages/people/people_section.h index 61f08237..0fef2bb 100644 --- a/chrome/browser/ui/webui/ash/settings/pages/people/people_section.h +++ b/chrome/browser/ui/webui/ash/settings/pages/people/people_section.h
@@ -74,7 +74,6 @@ void UpdateAccountManagerSearchTags( const std::vector<::account_manager::Account>& accounts); - raw_ptr<account_manager::AccountManager> account_manager_ = nullptr; raw_ptr<account_manager::AccountManagerFacade> account_manager_facade_ = nullptr;
diff --git a/chrome/browser/ui/webui/ash/settings/pages/personalization/personalization_hub_handler.h b/chrome/browser/ui/webui/ash/settings/pages/personalization/personalization_hub_handler.h index d1ccf044..3655d20d 100644 --- a/chrome/browser/ui/webui/ash/settings/pages/personalization/personalization_hub_handler.h +++ b/chrome/browser/ui/webui/ash/settings/pages/personalization/personalization_hub_handler.h
@@ -5,9 +5,8 @@ #ifndef CHROME_BROWSER_UI_WEBUI_ASH_SETTINGS_PAGES_PERSONALIZATION_PERSONALIZATION_HUB_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_ASH_SETTINGS_PAGES_PERSONALIZATION_PERSONALIZATION_HUB_HANDLER_H_ -#include "chrome/browser/ui/webui/settings/settings_page_ui_handler.h" - #include "base/values.h" +#include "chrome/browser/ui/webui/settings/settings_page_ui_handler.h" namespace ash::settings {
diff --git a/chrome/browser/ui/webui/ash/settings/pages/power/device_power_handler_browsertest.cc b/chrome/browser/ui/webui/ash/settings/pages/power/device_power_handler_browsertest.cc index ddc9df24..b25aaea 100644 --- a/chrome/browser/ui/webui/ash/settings/pages/power/device_power_handler_browsertest.cc +++ b/chrome/browser/ui/webui/ash/settings/pages/power/device_power_handler_browsertest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/webui/ash/settings/pages/power/device_power_handler.h" + #include <memory> #include <set> #include <utility> @@ -14,7 +16,6 @@ #include "base/test/scoped_feature_list.h" #include "base/values.h" #include "chrome/browser/profiles/profile_manager.h" -#include "chrome/browser/ui/webui/ash/settings/pages/power/device_power_handler.h" #include "chrome/test/base/in_process_browser_test.h" #include "chromeos/dbus/power/fake_power_manager_client.h" #include "chromeos/dbus/power/power_policy_controller.h"
diff --git a/chrome/browser/ui/webui/ash/settings/pages/privacy/app_permission_handler_unittest.cc b/chrome/browser/ui/webui/ash/settings/pages/privacy/app_permission_handler_unittest.cc index 4564a89..4de3d49 100644 --- a/chrome/browser/ui/webui/ash/settings/pages/privacy/app_permission_handler_unittest.cc +++ b/chrome/browser/ui/webui/ash/settings/pages/privacy/app_permission_handler_unittest.cc
@@ -138,9 +138,7 @@ handler_->AddObserver(observer_->GenerateRemote()); } - void TearDown() override { - handler_.reset(); - } + void TearDown() override { handler_.reset(); } protected: AppPermissionHandlerTestObserver* observer() { return observer_.get(); }
diff --git a/chrome/browser/ui/webui/ash/settings/pages/privacy/metrics_consent_handler_unittest.cc b/chrome/browser/ui/webui/ash/settings/pages/privacy/metrics_consent_handler_unittest.cc index c04f26ad..73d72d4 100644 --- a/chrome/browser/ui/webui/ash/settings/pages/privacy/metrics_consent_handler_unittest.cc +++ b/chrome/browser/ui/webui/ash/settings/pages/privacy/metrics_consent_handler_unittest.cc
@@ -60,8 +60,9 @@ : public ::metrics::TestMetricsServiceClient { public: std::optional<bool> GetCurrentUserMetricsConsent() const override { - if (should_use_user_consent_) + if (should_use_user_consent_) { return current_user_metrics_consent_; + } return std::nullopt; }
diff --git a/chrome/browser/ui/webui/ash/settings/pages/privacy/peripheral_data_access_handler.cc b/chrome/browser/ui/webui/ash/settings/pages/privacy/peripheral_data_access_handler.cc index 86bae5b..5a73c06c 100644 --- a/chrome/browser/ui/webui/ash/settings/pages/privacy/peripheral_data_access_handler.cc +++ b/chrome/browser/ui/webui/ash/settings/pages/privacy/peripheral_data_access_handler.cc
@@ -122,9 +122,10 @@ } void PeripheralDataAccessHandler::OnFilePathChecked( - const std::string& callback_id, bool is_thunderbolt_supported) { + const std::string& callback_id, + bool is_thunderbolt_supported) { ResolveJavascriptCallback(base::Value(callback_id), - base::Value(is_thunderbolt_supported)); + base::Value(is_thunderbolt_supported)); } void PeripheralDataAccessHandler::OnPeripheralDataAccessProtectionChanged() {
diff --git a/chrome/browser/ui/webui/ash/settings/pages/privacy/peripheral_data_access_handler.h b/chrome/browser/ui/webui/ash/settings/pages/privacy/peripheral_data_access_handler.h index fd852a6..f686929 100644 --- a/chrome/browser/ui/webui/ash/settings/pages/privacy/peripheral_data_access_handler.h +++ b/chrome/browser/ui/webui/ash/settings/pages/privacy/peripheral_data_access_handler.h
@@ -40,7 +40,7 @@ void OnPeripheralDataAccessProtectionChanged(); void OnFilePathChecked(const std::string& callback_id, - bool is_thunderbolt_supported); + bool is_thunderbolt_supported); void OnLocalStatePrefChanged();
diff --git a/chrome/browser/ui/webui/ash/settings/pages/search/search_engines_handler_unittest.cc b/chrome/browser/ui/webui/ash/settings/pages/search/search_engines_handler_unittest.cc index 715843f..5dbbebb 100644 --- a/chrome/browser/ui/webui/ash/settings/pages/search/search_engines_handler_unittest.cc +++ b/chrome/browser/ui/webui/ash/settings/pages/search/search_engines_handler_unittest.cc
@@ -56,9 +56,7 @@ handler_->AllowJavascriptForTesting(); } - void TearDown() override { - web_ui_.reset(); - } + void TearDown() override { web_ui_.reset(); } protected: MockNewWindowDelegate& new_window_delegate() { return new_window_delegate_; }
diff --git a/chrome/browser/ui/webui/ash/settings/search/hierarchy.cc b/chrome/browser/ui/webui/ash/settings/search/hierarchy.cc index 07a3f6ba..6cdfe3d 100644 --- a/chrome/browser/ui/webui/ash/settings/search/hierarchy.cc +++ b/chrome/browser/ui/webui/ash/settings/search/hierarchy.cc
@@ -120,8 +120,9 @@ auto it = subpage_map.find(subpage); // Metadata already exists; return it. - if (it != subpage_map.end()) + if (it != subpage_map.end()) { return it->second; + } // Metadata does not exist yet; insert then return it. auto pair = subpage_map.emplace( @@ -139,8 +140,9 @@ auto it = settings_map.find(setting); // Metadata already exists; return it. - if (it != settings_map.end()) + if (it != settings_map.end()) { return it->second; + } // Metadata does not exist yet; insert then return it. auto pair = settings_map.emplace(setting, section_); @@ -252,8 +254,9 @@ const SubpageMetadata& subpage_metadata = GetSubpageMetadata(subpage); // Top-level subpage; simply return section hierarchy. - if (!subpage_metadata.parent_subpage) + if (!subpage_metadata.parent_subpage) { return GenerateHierarchyStrings(subpage_metadata.section); + } // Nested subpage; use recursive call, then append parent subpage name itself. std::vector<std::u16string> hierarchy_strings = @@ -270,8 +273,9 @@ const SettingMetadata& setting_metadata = GetSettingMetadata(setting); // Top-level setting; simply return section hierarchy. - if (!setting_metadata.primary.subpage) + if (!setting_metadata.primary.subpage) { return GenerateHierarchyStrings(setting_metadata.primary.section); + } // Nested setting; use subpage ancestors, then append subpage name itself. std::vector<std::u16string> hierarchy_strings =
diff --git a/chrome/browser/ui/webui/ash/settings/services/hats/os_settings_hats_manager.cc b/chrome/browser/ui/webui/ash/settings/services/hats/os_settings_hats_manager.cc index a650125..9c80e63e 100644 --- a/chrome/browser/ui/webui/ash/settings/services/hats/os_settings_hats_manager.cc +++ b/chrome/browser/ui/webui/ash/settings/services/hats/os_settings_hats_manager.cc
@@ -3,13 +3,13 @@ // found in the LICENSE file. #include "chrome/browser/ui/webui/ash/settings/services/hats/os_settings_hats_manager.h" -#include "chrome/browser/ui/webui/ash/settings/services/hats/os_settings_hats_manager_factory.h" #include "base/functional/bind.h" #include "base/time/time.h" #include "chrome/browser/ash/hats/hats_config.h" #include "chrome/browser/ash/hats/hats_notification_controller.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/ui/webui/ash/settings/services/hats/os_settings_hats_manager_factory.h" #include "content/public/browser/browser_context.h" namespace ash::settings {
diff --git a/chrome/browser/ui/webui/ash/settings/services/hats/os_settings_hats_manager_factory.cc b/chrome/browser/ui/webui/ash/settings/services/hats/os_settings_hats_manager_factory.cc index c9322bb2..4abdf777 100644 --- a/chrome/browser/ui/webui/ash/settings/services/hats/os_settings_hats_manager_factory.cc +++ b/chrome/browser/ui/webui/ash/settings/services/hats/os_settings_hats_manager_factory.cc
@@ -2,8 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/no_destructor.h" #include "chrome/browser/ui/webui/ash/settings/services/hats/os_settings_hats_manager_factory.h" + +#include "base/no_destructor.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/ash/settings/services/hats/os_settings_hats_manager.h"
diff --git a/chrome/browser/ui/webui/ash/slow/slow_trace_ui.cc b/chrome/browser/ui/webui/ash/slow/slow_trace_ui.cc index 0eecc17..dd1e0947 100644 --- a/chrome/browser/ui/webui/ash/slow/slow_trace_ui.cc +++ b/chrome/browser/ui/webui/ash/slow/slow_trace_ui.cc
@@ -41,8 +41,7 @@ const std::string path = content::URLDataSource::URLToRequestPath(url); size_t pos = path.find('#'); ContentTracingManager* manager = ContentTracingManager::Get(); - if (!manager || - pos == std::string::npos || + if (!manager || pos == std::string::npos || !base::StringToInt(path.substr(pos + 1), &trace_id)) { std::move(callback).Run(nullptr); return; @@ -78,7 +77,6 @@ SlowTraceController::SlowTraceController(content::WebUI* web_ui) : WebUIController(web_ui) { - // Set up the chrome://slow_trace/ source. content::URLDataSource::Add(Profile::FromWebUI(web_ui), std::make_unique<SlowTraceSource>());
diff --git a/chrome/browser/ui/webui/ash/system_web_dialog/system_web_dialog_browsertest.cc b/chrome/browser/ui/webui/ash/system_web_dialog/system_web_dialog_browsertest.cc index cf272c5..8187777 100644 --- a/chrome/browser/ui/webui/ash/system_web_dialog/system_web_dialog_browsertest.cc +++ b/chrome/browser/ui/webui/ash/system_web_dialog/system_web_dialog_browsertest.cc
@@ -2,14 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/webui/ash/system_web_dialog/system_web_dialog_delegate.h" - #include "ash/public/cpp/test/shell_test_api.h" #include "chrome/browser/ash/login/login_manager_test.h" #include "chrome/browser/ash/login/test/login_manager_mixin.h" #include "chrome/browser/ash/login/test/oobe_base_test.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/webui/ash/system_web_dialog/system_web_dialog_delegate.h" #include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h" #include "chrome/common/pref_names.h" #include "chrome/common/webui_url_constants.h" @@ -34,8 +33,9 @@ explicit MockSystemWebDialog(const char* id = nullptr) : SystemWebDialogDelegate(GURL(chrome::kChromeUIInternetConfigDialogURL), std::u16string()) { - if (id) + if (id) { id_ = std::string(id); + } } MockSystemWebDialog(const MockSystemWebDialog&) = delete;
diff --git a/chrome/browser/ui/webui/ash/system_web_dialog/system_web_dialog_delegate.cc b/chrome/browser/ui/webui/ash/system_web_dialog/system_web_dialog_delegate.cc index 37920fc..4ce3aedf 100644 --- a/chrome/browser/ui/webui/ash/system_web_dialog/system_web_dialog_delegate.cc +++ b/chrome/browser/ui/webui/ash/system_web_dialog/system_web_dialog_delegate.cc
@@ -107,8 +107,9 @@ // TODO(crbug.com/40112040): It could be possible that a Chromebox is // hooked up to a low-resolution monitor. It might be a good idea to check // that display's resolution as well. - if (!display::HasInternalDisplay()) + if (!display::HasInternalDisplay()) { return preferred_size; + } display::Display internal_display; if (!display::Screen::GetScreen()->GetDisplayWithDisplayId(
diff --git a/chrome/browser/ui/webui/ash/user_image/user_image_source.cc b/chrome/browser/ui/webui/ash/user_image/user_image_source.cc index 36039d74..aae9ba9 100644 --- a/chrome/browser/ui/webui/ash/user_image/user_image_source.cc +++ b/chrome/browser/ui/webui/ash/user_image/user_image_source.cc
@@ -98,16 +98,18 @@ user_manager::UserImage::ImageFormat image_format, int frame) { // Return all frames. - if (frame == -1) + if (frame == -1) { return image_bytes; + } // TODO(reveman): Add support for frames beyond 0 (crbug.com/750064). if (frame) { NOTIMPLEMENTED() << "Unsupported frame: " << frame; return nullptr; } // Only PNGs can be animated. - if (image_format != user_manager::UserImage::FORMAT_PNG) + if (image_format != user_manager::UserImage::FORMAT_PNG) { return image_bytes; + } // Extract first frame by re-encoding image. SkBitmap bitmap = gfx::PNGCodec::Decode(*image_bytes); if (bitmap.isNull()) {
diff --git a/chrome/browser/ui/webui/autofill_and_password_manager_internals/autofill_internals_ui_browsertest.cc b/chrome/browser/ui/webui/autofill_and_password_manager_internals/autofill_internals_ui_browsertest.cc index 2a2e0de..6780c84 100644 --- a/chrome/browser/ui/webui/autofill_and_password_manager_internals/autofill_internals_ui_browsertest.cc +++ b/chrome/browser/ui/webui/autofill_and_password_manager_internals/autofill_internals_ui_browsertest.cc
@@ -2,10 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/webui/autofill_and_password_manager_internals/internals_ui_handler.h" - #include "base/task/single_thread_task_runner.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/webui/autofill_and_password_manager_internals/internals_ui_handler.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" @@ -47,8 +46,9 @@ // Wait for reset-fake-button to become visible constexpr char kGetResetButtonDisplayStyle[] = "document.getElementById('reset-cache-fake-button').style.display"; - while ("inline" != EvalJs(kGetResetButtonDisplayStyle)) + while ("inline" != EvalJs(kGetResetButtonDisplayStyle)) { SpinRunLoop(); + } // Trigger reset button. constexpr char kClickResetButton[] = @@ -58,8 +58,9 @@ // Wait for dialog to appear. constexpr char kDialogTextVisible[] = "document.getElementsByClassName('modal-dialog-text').length > 0"; - while (!EvalJs(kDialogTextVisible).ExtractBool()) + while (!EvalJs(kDialogTextVisible).ExtractBool()) { SpinRunLoop(); + } // Check result text. constexpr char kDialogText[] = @@ -73,8 +74,9 @@ EXPECT_TRUE(ExecJs(kClickCloseButton)); // Wait for dialog to disappear. - while (EvalJs(kDialogTextVisible).ExtractBool()) + while (EvalJs(kDialogTextVisible).ExtractBool()) { SpinRunLoop(); + } } } // namespace
diff --git a/chrome/browser/ui/webui/autofill_and_password_manager_internals/internals_ui_handler.cc b/chrome/browser/ui/webui/autofill_and_password_manager_internals/internals_ui_handler.cc index 9ff83ed..5d40b50 100644 --- a/chrome/browser/ui/webui/autofill_and_password_manager_internals/internals_ui_handler.cc +++ b/chrome/browser/ui/webui/autofill_and_password_manager_internals/internals_ui_handler.cc
@@ -192,26 +192,30 @@ void InternalsUIHandler::StartSubscription() { LogRouter* log_router = get_log_router_function_.Run(Profile::FromWebUI(web_ui())); - if (!log_router) + if (!log_router) { return; + } registered_with_log_router_ = true; log_router->RegisterReceiver(this); } void InternalsUIHandler::EndSubscription() { - if (!registered_with_log_router_) + if (!registered_with_log_router_) { return; + } registered_with_log_router_ = false; LogRouter* log_router = get_log_router_function_.Run(Profile::FromWebUI(web_ui())); - if (log_router) + if (log_router) { log_router->UnregisterReceiver(this); + } } void InternalsUIHandler::LogEntry(const base::Value::Dict& entry) { - if (!registered_with_log_router_) + if (!registered_with_log_router_) { return; + } FireWebUIListener("add-structured-log", entry); }
diff --git a/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc b/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc index 64301ab..3edd4da 100644 --- a/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc +++ b/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc
@@ -124,8 +124,9 @@ {"toastItemDeleted", IDS_BOOKMARK_MANAGER_TOAST_ITEM_DELETED}, {"undo", IDS_BOOKMARK_BAR_UNDO}, }; - for (const auto& str : kStrings) + for (const auto& str : kStrings) { AddLocalizedString(source, str.name, str.id); + } return source; }
diff --git a/chrome/browser/ui/webui/browser_command/browser_command_handler.cc b/chrome/browser/ui/webui/browser_command/browser_command_handler.cc index 28799ff..c0f897c 100644 --- a/chrome/browser/ui/webui/browser_command/browser_command_handler.cc +++ b/chrome/browser/ui/webui/browser_command/browser_command_handler.cc
@@ -58,8 +58,9 @@ supported_commands_(supported_commands), command_updater_(std::make_unique<CommandUpdaterImpl>(this)), page_handler_(this, std::move(pending_page_handler)) { - if (supported_commands_.empty()) + if (supported_commands_.empty()) { return; + } EnableSupportedCommands(); } @@ -111,8 +112,7 @@ can_execute = true; break; case Command::kOpenNTPAndStartCustomizeChromeTutorial: - can_execute = TutorialServiceExists() && - DefaultSearchProviderIsGoogle(); + can_execute = TutorialServiceExists() && DefaultSearchProviderIsGoogle(); break; case Command::kStartPasswordManagerTutorial: can_execute = TutorialServiceExists();
diff --git a/chrome/browser/ui/webui/browser_switch/browser_switch_ui.cc b/chrome/browser/ui/webui/browser_switch/browser_switch_ui.cc index c6a1ea3c..7d23fad 100644 --- a/chrome/browser/ui/webui/browser_switch/browser_switch_ui.cc +++ b/chrome/browser/ui/webui/browser_switch/browser_switch_ui.cc
@@ -52,11 +52,13 @@ profile = profile->GetOriginalProfile(); int tab_count = 0; for (const Browser* browser : *BrowserList::GetInstance()) { - if (browser->profile()->GetOriginalProfile() != profile) + if (browser->profile()->GetOriginalProfile() != profile) { continue; + } tab_count += browser->tab_strip_model()->count(); - if (tab_count > 1) + if (tab_count > 1) { return false; + } } return true; } @@ -518,8 +520,9 @@ base::Value::Dict retval; for (const auto& source : sources) { base::Value val; - if (source.url.is_valid()) + if (source.url.is_valid()) { val = base::Value(source.url.spec()); + } // |pref_name| is something like "browser_switcher.blah"; however path // expansion is not expected on it as the JavaScript expects to see // "browser_switcher.blah" as a key in the object, not a nested hierarchy.
diff --git a/chrome/browser/ui/webui/certificate_manager_localized_strings_provider.cc b/chrome/browser/ui/webui/certificate_manager_localized_strings_provider.cc index c587651..921ec1e 100644 --- a/chrome/browser/ui/webui/certificate_manager_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/certificate_manager_localized_strings_provider.cc
@@ -16,98 +16,99 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source) { static constexpr webui::LocalizedString kLocalizedStrings[] = { - {"certificateManagerExpandA11yLabel", - IDS_SETTINGS_CERTIFICATE_MANAGER_EXPAND_ACCESSIBILITY_LABEL}, - {"certificateManagerNoCertificates", - IDS_SETTINGS_CERTIFICATE_MANAGER_NO_CERTIFICATES}, - {"certificateManagerYourCertificates", - IDS_SETTINGS_CERTIFICATE_MANAGER_YOUR_CERTIFICATES}, - {"certificateManagerYourCertificatesDescription", - IDS_SETTINGS_CERTIFICATE_MANAGER_YOUR_CERTIFICATES_DESCRIPTION}, - {"certificateManagerServers", IDS_SETTINGS_CERTIFICATE_MANAGER_SERVERS}, - {"certificateManagerServersDescription", - IDS_SETTINGS_CERTIFICATE_MANAGER_SERVERS_DESCRIPTION}, - {"certificateManagerAuthorities", - IDS_SETTINGS_CERTIFICATE_MANAGER_AUTHORITIES}, - {"certificateManagerAuthoritiesDescription", - IDS_SETTINGS_CERTIFICATE_MANAGER_AUTHORITIES_DESCRIPTION}, - {"certificateManagerOthers", IDS_SETTINGS_CERTIFICATE_MANAGER_OTHERS}, - {"certificateManagerOthersDescription", - IDS_SETTINGS_CERTIFICATE_MANAGER_OTHERS_DESCRIPTION}, - {"certificateManagerView", IDS_SETTINGS_CERTIFICATE_MANAGER_VIEW}, - {"certificateManagerImport", IDS_SETTINGS_CERTIFICATE_MANAGER_IMPORT}, - {"certificateManagerImportAndBind", - IDS_SETTINGS_CERTIFICATE_MANAGER_IMPORT_AND_BIND}, - {"certificateManagerExport", IDS_SETTINGS_CERTIFICATE_MANAGER_EXPORT}, - {"certificateManagerDelete", IDS_SETTINGS_DELETE}, - {"certificateManagerUntrusted", IDS_SETTINGS_CERTIFICATE_MANAGER_UNTRUSTED}, - // CA trust edit dialog. - {"certificateManagerCaTrustEditDialogTitle", - IDS_SETTINGS_CERTIFICATE_MANAGER_CA_TRUST_EDIT_DIALOG_TITLE}, - {"certificateManagerCaTrustEditDialogDescription", - IDS_SETTINGS_CERTIFICATE_MANAGER_CA_TRUST_EDIT_DIALOG_DESCRIPTION}, - {"certificateManagerCaTrustEditDialogExplanation", - IDS_SETTINGS_CERTIFICATE_MANAGER_CA_TRUST_EDIT_DIALOG_EXPLANATION}, - {"certificateManagerCaTrustEditDialogSsl", - IDS_SETTINGS_CERTIFICATE_MANAGER_CA_TRUST_EDIT_DIALOG_SSL}, - {"certificateManagerCaTrustEditDialogEmail", - IDS_SETTINGS_CERTIFICATE_MANAGER_CA_TRUST_EDIT_DIALOG_EMAIL}, - {"certificateManagerCaTrustEditDialogObjSign", - IDS_SETTINGS_CERTIFICATE_MANAGER_CA_TRUST_EDIT_DIALOG_OBJ_SIGN}, - // Certificate delete confirmation dialog. - {"certificateManagerDeleteUserTitle", - IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE_USER_TITLE}, - {"certificateManagerDeleteUserDescription", - IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE_USER_DESCRIPTION}, - {"certificateManagerDeleteServerTitle", - IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE_SERVER_TITLE}, - {"certificateManagerDeleteServerDescription", - IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE_SERVER_DESCRIPTION}, - {"certificateManagerDeleteCaTitle", - IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE_CA_TITLE}, - {"certificateManagerDeleteCaDescription", - IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE_CA_DESCRIPTION}, - {"certificateManagerDeleteOtherTitle", - IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE_OTHER_TITLE}, - // Encrypt/decrypt password dialogs. - {"certificateManagerEncryptPasswordTitle", - IDS_SETTINGS_CERTIFICATE_MANAGER_ENCRYPT_PASSWORD_TITLE}, - {"certificateManagerDecryptPasswordTitle", - IDS_SETTINGS_CERTIFICATE_MANAGER_DECRYPT_PASSWORD_TITLE}, - {"certificateManagerEncryptPasswordDescription", - IDS_SETTINGS_CERTIFICATE_MANAGER_ENCRYPT_PASSWORD_DESCRIPTION}, - {"certificateManagerPassword", IDS_SETTINGS_CERTIFICATE_MANAGER_PASSWORD}, - {"certificateManagerConfirmPassword", - IDS_SETTINGS_CERTIFICATE_MANAGER_CONFIRM_PASSWORD}, - {"certificateImportErrorFormat", - IDS_SETTINGS_CERTIFICATE_MANAGER_IMPORT_ERROR_FORMAT}, + {"certificateManagerExpandA11yLabel", + IDS_SETTINGS_CERTIFICATE_MANAGER_EXPAND_ACCESSIBILITY_LABEL}, + {"certificateManagerNoCertificates", + IDS_SETTINGS_CERTIFICATE_MANAGER_NO_CERTIFICATES}, + {"certificateManagerYourCertificates", + IDS_SETTINGS_CERTIFICATE_MANAGER_YOUR_CERTIFICATES}, + {"certificateManagerYourCertificatesDescription", + IDS_SETTINGS_CERTIFICATE_MANAGER_YOUR_CERTIFICATES_DESCRIPTION}, + {"certificateManagerServers", IDS_SETTINGS_CERTIFICATE_MANAGER_SERVERS}, + {"certificateManagerServersDescription", + IDS_SETTINGS_CERTIFICATE_MANAGER_SERVERS_DESCRIPTION}, + {"certificateManagerAuthorities", + IDS_SETTINGS_CERTIFICATE_MANAGER_AUTHORITIES}, + {"certificateManagerAuthoritiesDescription", + IDS_SETTINGS_CERTIFICATE_MANAGER_AUTHORITIES_DESCRIPTION}, + {"certificateManagerOthers", IDS_SETTINGS_CERTIFICATE_MANAGER_OTHERS}, + {"certificateManagerOthersDescription", + IDS_SETTINGS_CERTIFICATE_MANAGER_OTHERS_DESCRIPTION}, + {"certificateManagerView", IDS_SETTINGS_CERTIFICATE_MANAGER_VIEW}, + {"certificateManagerImport", IDS_SETTINGS_CERTIFICATE_MANAGER_IMPORT}, + {"certificateManagerImportAndBind", + IDS_SETTINGS_CERTIFICATE_MANAGER_IMPORT_AND_BIND}, + {"certificateManagerExport", IDS_SETTINGS_CERTIFICATE_MANAGER_EXPORT}, + {"certificateManagerDelete", IDS_SETTINGS_DELETE}, + {"certificateManagerUntrusted", + IDS_SETTINGS_CERTIFICATE_MANAGER_UNTRUSTED}, + // CA trust edit dialog. + {"certificateManagerCaTrustEditDialogTitle", + IDS_SETTINGS_CERTIFICATE_MANAGER_CA_TRUST_EDIT_DIALOG_TITLE}, + {"certificateManagerCaTrustEditDialogDescription", + IDS_SETTINGS_CERTIFICATE_MANAGER_CA_TRUST_EDIT_DIALOG_DESCRIPTION}, + {"certificateManagerCaTrustEditDialogExplanation", + IDS_SETTINGS_CERTIFICATE_MANAGER_CA_TRUST_EDIT_DIALOG_EXPLANATION}, + {"certificateManagerCaTrustEditDialogSsl", + IDS_SETTINGS_CERTIFICATE_MANAGER_CA_TRUST_EDIT_DIALOG_SSL}, + {"certificateManagerCaTrustEditDialogEmail", + IDS_SETTINGS_CERTIFICATE_MANAGER_CA_TRUST_EDIT_DIALOG_EMAIL}, + {"certificateManagerCaTrustEditDialogObjSign", + IDS_SETTINGS_CERTIFICATE_MANAGER_CA_TRUST_EDIT_DIALOG_OBJ_SIGN}, + // Certificate delete confirmation dialog. + {"certificateManagerDeleteUserTitle", + IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE_USER_TITLE}, + {"certificateManagerDeleteUserDescription", + IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE_USER_DESCRIPTION}, + {"certificateManagerDeleteServerTitle", + IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE_SERVER_TITLE}, + {"certificateManagerDeleteServerDescription", + IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE_SERVER_DESCRIPTION}, + {"certificateManagerDeleteCaTitle", + IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE_CA_TITLE}, + {"certificateManagerDeleteCaDescription", + IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE_CA_DESCRIPTION}, + {"certificateManagerDeleteOtherTitle", + IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE_OTHER_TITLE}, + // Encrypt/decrypt password dialogs. + {"certificateManagerEncryptPasswordTitle", + IDS_SETTINGS_CERTIFICATE_MANAGER_ENCRYPT_PASSWORD_TITLE}, + {"certificateManagerDecryptPasswordTitle", + IDS_SETTINGS_CERTIFICATE_MANAGER_DECRYPT_PASSWORD_TITLE}, + {"certificateManagerEncryptPasswordDescription", + IDS_SETTINGS_CERTIFICATE_MANAGER_ENCRYPT_PASSWORD_DESCRIPTION}, + {"certificateManagerPassword", IDS_SETTINGS_CERTIFICATE_MANAGER_PASSWORD}, + {"certificateManagerConfirmPassword", + IDS_SETTINGS_CERTIFICATE_MANAGER_CONFIRM_PASSWORD}, + {"certificateImportErrorFormat", + IDS_SETTINGS_CERTIFICATE_MANAGER_IMPORT_ERROR_FORMAT}, #if BUILDFLAG(IS_CHROMEOS) - {"certificateProvisioningListHeader", - IDS_SETTINGS_CERTIFICATE_MANAGER_PROVISIONING_LIST_HEADER}, - {"certificateProvisioningRefresh", - IDS_SETTINGS_CERTIFICATE_MANAGER_PROVISIONING_REFRESH}, - {"certificateProvisioningReset", - IDS_SETTINGS_CERTIFICATE_MANAGER_PROVISIONING_RESET}, - {"certificateProvisioningDetails", - IDS_SETTINGS_CERTIFICATE_MANAGER_PROVISIONING_DETAILS}, - {"certificateProvisioningAdvancedSectionTitle", - IDS_SETTINGS_CERTIFICATE_MANAGER_PROVISIONING_ADVANCED}, - {"certificateProvisioningProfileName", - IDS_SETTINGS_CERTIFICATE_MANAGER_PROVISIONING_CERTIFICATE_PROFILE_NAME}, - {"certificateProvisioningProfileId", - IDS_SETTINGS_CERTIFICATE_MANAGER_PROVISIONING_CERTIFICATE_PROFILE_ID}, - {"certificateProvisioningStatus", - IDS_SETTINGS_CERTIFICATE_MANAGER_PROVISIONING_STATUS}, - {"certificateProvisioningStatusId", - IDS_SETTINGS_CERTIFICATE_MANAGER_PROVISIONING_STATUS_ID}, - {"certificateProvisioningLastUpdate", - IDS_SETTINGS_CERTIFICATE_MANAGER_PROVISIONING_LAST_UPDATE}, - {"certificateProvisioningLastUnsuccessfulStatus", - IDS_SETTINGS_CERTIFICATE_MANAGER_PROVISIONING_LAST_UNSUCCESSFUL_STATUS}, - {"certificateProvisioningPublicKey", IDS_CERT_DETAILS_SUBJECT_KEY}, + {"certificateProvisioningListHeader", + IDS_SETTINGS_CERTIFICATE_MANAGER_PROVISIONING_LIST_HEADER}, + {"certificateProvisioningRefresh", + IDS_SETTINGS_CERTIFICATE_MANAGER_PROVISIONING_REFRESH}, + {"certificateProvisioningReset", + IDS_SETTINGS_CERTIFICATE_MANAGER_PROVISIONING_RESET}, + {"certificateProvisioningDetails", + IDS_SETTINGS_CERTIFICATE_MANAGER_PROVISIONING_DETAILS}, + {"certificateProvisioningAdvancedSectionTitle", + IDS_SETTINGS_CERTIFICATE_MANAGER_PROVISIONING_ADVANCED}, + {"certificateProvisioningProfileName", + IDS_SETTINGS_CERTIFICATE_MANAGER_PROVISIONING_CERTIFICATE_PROFILE_NAME}, + {"certificateProvisioningProfileId", + IDS_SETTINGS_CERTIFICATE_MANAGER_PROVISIONING_CERTIFICATE_PROFILE_ID}, + {"certificateProvisioningStatus", + IDS_SETTINGS_CERTIFICATE_MANAGER_PROVISIONING_STATUS}, + {"certificateProvisioningStatusId", + IDS_SETTINGS_CERTIFICATE_MANAGER_PROVISIONING_STATUS_ID}, + {"certificateProvisioningLastUpdate", + IDS_SETTINGS_CERTIFICATE_MANAGER_PROVISIONING_LAST_UPDATE}, + {"certificateProvisioningLastUnsuccessfulStatus", + IDS_SETTINGS_CERTIFICATE_MANAGER_PROVISIONING_LAST_UNSUCCESSFUL_STATUS}, + {"certificateProvisioningPublicKey", IDS_CERT_DETAILS_SUBJECT_KEY}, #endif // BUILDFLAG(IS_CHROMEOS) - // For A11y. - {"menu", IDS_MENU}, + // For A11y. + {"menu", IDS_MENU}, }; html_source->AddLocalizedStrings(kLocalizedStrings); }
diff --git a/chrome/browser/ui/webui/certificate_provisioning_ui_handler.cc b/chrome/browser/ui/webui/certificate_provisioning_ui_handler.cc index faf9a5af..1742a65 100644 --- a/chrome/browser/ui/webui/certificate_provisioning_ui_handler.cc +++ b/chrome/browser/ui/webui/certificate_provisioning_ui_handler.cc
@@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <string> - -#include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/webui/certificate_provisioning_ui_handler.h" +#include <string> + #include "base/check_is_test.h" #include "base/containers/span.h" #include "base/functional/bind.h" #include "base/i18n/time_formatting.h" +#include "base/strings/utf_string_conversions.h" #include "base/time/time.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process_platform_part.h" @@ -121,8 +121,9 @@ // "5 minutes ago". std::u16string GetTimeSinceLastUpdate(base::Time last_update_time) { const base::Time now = base::Time::NowFromSystemTime(); - if (last_update_time.is_null() || last_update_time > now) + if (last_update_time.is_null() || last_update_time > now) { return std::u16string(); + } const base::TimeDelta elapsed_time = now - last_update_time; return ui::TimeFormat::Simple(ui::TimeFormat::FORMAT_ELAPSED, ui::TimeFormat::LENGTH_SHORT, elapsed_time); @@ -130,8 +131,9 @@ std::u16string GetMessageFromBackendError( const crosapi::mojom::CertProvisioningBackendServerErrorPtr& call_info) { - if (!call_info) + if (!call_info) { return std::u16string(); + } std::u16string time_u16 = base::UTF8ToUTF16(base::TimeFormatHTTP(call_info->time)); @@ -189,8 +191,9 @@ void CertificateProvisioningUiHandler::OnStateChanged() { // If Javascript is not allowed yet, the UI will request a refresh during its // first message to the handler. - if (!IsJavascriptAllowed()) + if (!IsJavascriptAllowed()) { return; + } RefreshCertificateProvisioningProcesses(); }
diff --git a/chrome/browser/ui/webui/certificate_provisioning_ui_handler_unittest.cc b/chrome/browser/ui/webui/certificate_provisioning_ui_handler_unittest.cc index de24ca1..97ab4565 100644 --- a/chrome/browser/ui/webui/certificate_provisioning_ui_handler_unittest.cc +++ b/chrome/browser/ui/webui/certificate_provisioning_ui_handler_unittest.cc
@@ -96,16 +96,19 @@ return; } if (value->is_list()) { - for (base::Value& child : value->GetList()) + for (base::Value& child : value->GetList()) { FormatDictRecurse(&child, messages); + } return; } - if (!value->is_string()) + if (!value->is_string()) { return; + } for (size_t i = 0; i < messages.size(); ++i) { std::string placeholder = std::string("$") + base::NumberToString(i); - if (value->GetString() != placeholder) + if (value->GetString() != placeholder) { continue; + } *value = base::Value(messages[i]); } } @@ -125,8 +128,9 @@ base::Value GetByProfileId(const base::Value& all_processes, const std::string& profile_id) { for (const base::Value& process : all_processes.GetList()) { - if (profile_id == *process.GetDict().FindString("certProfileId")) + if (profile_id == *process.GetDict().FindString("certProfileId")) { return process.Clone(); + } } return base::Value(); } @@ -187,8 +191,9 @@ *out_all_processes = std::move(args[0]); // Extract all profile ids for easier verification. - if (!out_profile_ids) + if (!out_profile_ids) { return; + } out_profile_ids->clear(); for (const base::Value& process : out_all_processes->GetList()) { const std::string* profile_id =
diff --git a/chrome/browser/ui/webui/certificates_handler.cc b/chrome/browser/ui/webui/certificates_handler.cc index 669483f..48238d7 100644 --- a/chrome/browser/ui/webui/certificates_handler.cc +++ b/chrome/browser/ui/webui/certificates_handler.cc
@@ -91,13 +91,16 @@ std::u16string a_str; std::u16string b_str; const std::string* ptr = a_dict.FindString(kCertificatesHandlerNameField); - if (ptr) + if (ptr) { a_str = base::UTF8ToUTF16(*ptr); + } ptr = b_dict.FindString(kCertificatesHandlerNameField); - if (ptr) + if (ptr) { b_str = base::UTF8ToUTF16(*ptr); - if (collator_ == nullptr) + } + if (collator_ == nullptr) { return a_str < b_str; + } return base::i18n::CompareString16WithCollator(*collator_, a_str, b_str) == UCOL_LESS; } @@ -149,12 +152,14 @@ // Therefore PFX can be distingushed by checking if the file starts with an // indefinite SEQUENCE, or a definite SEQUENCE { INTEGER, ... }. bool CouldBePFX(std::string_view data) { - if (data.size() < 4) + if (data.size() < 4) { return false; + } // Indefinite length SEQUENCE. - if (data[0] == 0x30 && static_cast<uint8_t>(data[1]) == 0x80) + if (data[0] == 0x30 && static_cast<uint8_t>(data[1]) == 0x80) { return true; + } // If the SEQUENCE is definite length, it can be parsed through the version // tag using DER parser, since INTEGER must be definite length, even in BER. @@ -278,8 +283,9 @@ file_access_provider_(base::MakeRefCounted<FileAccessProvider>()) {} CertificatesHandler::~CertificatesHandler() { - if (select_file_dialog_.get()) + if (select_file_dialog_.get()) { select_file_dialog_->ListenerDestroyed(); + } select_file_dialog_.reset(); } @@ -401,8 +407,9 @@ void CertificatesHandler::HandleViewCertificate(const base::Value::List& args) { CertificateManagerModel::CertInfo* cert_info = GetCertInfoFromCallbackArgs(args, 0 /* arg_index */); - if (!cert_info) + if (!cert_info) { return; + } net::ScopedCERTCertificateList certs; certs.push_back(net::x509_util::DupCERTCertificate(cert_info->cert())); CertificateViewerDialog::ShowConstrained( @@ -411,8 +418,9 @@ bool CertificatesHandler::AssignWebUICallbackId(const base::Value::List& args) { CHECK_LE(1U, args.size()); - if (!webui_callback_id_.empty()) + if (!webui_callback_id_.empty()) { return false; + } webui_callback_id_ = args[0].GetString(); return true; } @@ -428,8 +436,9 @@ CertificateManagerModel::CertInfo* cert_info = GetCertInfoFromCallbackArgs(args, 1 /* arg_index */); - if (!cert_info) + if (!cert_info) { return; + } net::NSSCertDatabase::TrustBits trust_bits = certificate_manager_model_->cert_db()->GetCertTrust(cert_info->cert(), @@ -457,8 +466,9 @@ CertificateManagerModel::CertInfo* cert_info = GetCertInfoFromCallbackArgs(args, 1 /* arg_index */); - if (!cert_info) + if (!cert_info) { return; + } if (!CanEditCertificate(cert_info)) { RejectCallbackWithError( @@ -492,8 +502,9 @@ void CertificatesHandler::HandleExportPersonal(const base::Value::List& args) { // Early return if the select file dialog is already active. - if (select_file_dialog_) + if (select_file_dialog_) { return; + } CHECK_EQ(2U, args.size()); if (!AssignWebUICallbackId(args)) { @@ -503,8 +514,9 @@ CertificateManagerModel::CertInfo* cert_info = GetCertInfoFromCallbackArgs(args, 1 /* arg_index */); - if (!cert_info) + if (!cert_info) { return; + } selected_cert_list_.push_back( net::x509_util::DupCERTCertificate(cert_info->cert())); @@ -590,8 +602,9 @@ void CertificatesHandler::HandleImportPersonal(const base::Value::List& args) { // Early return if the select file dialog is already active. - if (select_file_dialog_) + if (select_file_dialog_) { return; + } // When the "allowed" value changes while user on the certificate manager // page, the UI doesn't update without page refresh and user can still see and @@ -767,16 +780,18 @@ // There may be pending file dialogs, we need to tell them that we've gone // away so they don't try and call back to us. - if (select_file_dialog_.get()) + if (select_file_dialog_.get()) { select_file_dialog_->ListenerDestroyed(); + } select_file_dialog_.reset(); pending_operation_ = std::nullopt; } void CertificatesHandler::HandleImportServer(const base::Value::List& args) { // Early return if the select file dialog is already active. - if (select_file_dialog_) + if (select_file_dialog_) { return; + } CHECK_EQ(1U, args.size()); if (!AssignWebUICallbackId(args)) { @@ -851,8 +866,9 @@ void CertificatesHandler::HandleImportCA(const base::Value::List& args) { // Early return if the select file dialog is already active. - if (select_file_dialog_) + if (select_file_dialog_) { return; + } // When the "allowed" value changes while user on the certificate manager // page, the UI doesn't update without page refresh and user can still see and @@ -964,8 +980,9 @@ const base::Value::List& args) { CertificateManagerModel::CertInfo* cert_info = GetCertInfoFromCallbackArgs(args, 0 /* arg_index */); - if (!cert_info) + if (!cert_info) { return; + } net::ScopedCERTCertificateList export_certs; export_certs.push_back(net::x509_util::DupCERTCertificate(cert_info->cert())); @@ -983,8 +1000,9 @@ CertificateManagerModel::CertInfo* cert_info = GetCertInfoFromCallbackArgs(args, 1 /* arg_index */); - if (!cert_info) + if (!cert_info) { return; + } if (!CanDeleteCertificate(cert_info)) { RejectCallbackWithError( @@ -1063,8 +1081,9 @@ UErrorCode error = U_ZERO_ERROR; collator.reset(icu::Collator::createInstance( icu::Locale(g_browser_process->GetApplicationLocale().c_str()), error)); - if (U_FAILURE(error)) + if (U_FAILURE(error)) { collator.reset(); + } DictionaryIdComparator comparator(collator.get()); CertificateManagerModel::OrgGroupingMap org_grouping_map; @@ -1155,15 +1174,16 @@ const std::string& title, const net::NSSCertDatabase::ImportCertFailureList& not_imported) { std::string error; - if (selected_cert_list_.size() == 1) + if (selected_cert_list_.size() == 1) { error = l10n_util::GetStringUTF8( IDS_SETTINGS_CERTIFICATE_MANAGER_IMPORT_SINGLE_NOT_IMPORTED); - else if (not_imported.size() == selected_cert_list_.size()) + } else if (not_imported.size() == selected_cert_list_.size()) { error = l10n_util::GetStringUTF8( IDS_SETTINGS_CERTIFICATE_MANAGER_IMPORT_ALL_NOT_IMPORTED); - else + } else { error = l10n_util::GetStringUTF8( IDS_SETTINGS_CERTIFICATE_MANAGER_IMPORT_SOME_NOT_IMPORTED); + } base::Value::List cert_error_list; for (const auto& failure : not_imported) { @@ -1190,15 +1210,18 @@ CertificateManagerModel::CertInfo* CertificatesHandler::GetCertInfoFromCallbackArgs(const base::Value::List& args, size_t arg_index) { - if (arg_index >= args.size()) + if (arg_index >= args.size()) { return nullptr; + } const auto& arg = args[arg_index]; - if (!arg.is_string()) + if (!arg.is_string()) { return nullptr; + } int32_t cert_info_id = 0; - if (!base::StringToInt(arg.GetString(), &cert_info_id)) + if (!base::StringToInt(arg.GetString(), &cert_info_id)) { return nullptr; + } return cert_info_id_map_.Lookup(cert_info_id); }
diff --git a/chrome/browser/ui/webui/chrome_url_data_manager_browsertest.cc b/chrome/browser/ui/webui/chrome_url_data_manager_browsertest.cc index 4e9aa10c..543f7e09 100644 --- a/chrome/browser/ui/webui/chrome_url_data_manager_browsertest.cc +++ b/chrome/browser/ui/webui/chrome_url_data_manager_browsertest.cc
@@ -509,8 +509,8 @@ #endif #if BUILDFLAG(ENABLE_DICE_SUPPORT) "chrome://signin-dice-web-intercept.top-chrome/?debug", - // Note: Disabled because a DCHECK fires when directly visiting the URL. - // "chrome://signin-reauth", +// Note: Disabled because a DCHECK fires when directly visiting the URL. +// "chrome://signin-reauth", #endif #if BUILDFLAG(IS_CHROMEOS_ASH) // TODO(crbug.com/40250068): Uncomment when TrustedTypes are enabled.
diff --git a/chrome/browser/ui/webui/chrome_web_contents_handler.cc b/chrome/browser/ui/webui/chrome_web_contents_handler.cc index 8d16b0b..edf38d2 100644 --- a/chrome/browser/ui/webui/chrome_web_contents_handler.cc +++ b/chrome/browser/ui/webui/chrome_web_contents_handler.cc
@@ -38,8 +38,9 @@ const OpenURLParams& params, base::OnceCallback<void(content::NavigationHandle&)> navigation_handle_callback) { - if (!context) + if (!context) { return nullptr; + } Profile* profile = Profile::FromBrowserContext(context); @@ -73,8 +74,9 @@ } // Close the browser if chrome::Navigate created a new one. - if (browser_created && (browser != nav_params.browser)) + if (browser_created && (browser != nav_params.browser)) { browser->window()->Close(); + } return nav_params.navigated_or_inserted_contents; } @@ -93,8 +95,9 @@ WindowOpenDisposition disposition, const blink::mojom::WindowFeatures& window_features, bool user_gesture) { - if (!context) + if (!context) { return; + } Profile* profile = Profile::FromBrowserContext(context); @@ -119,8 +122,9 @@ Navigate(¶ms); // Close the browser if chrome::Navigate created a new one. - if (browser_created && (browser != params.browser)) + if (browser_created && (browser != params.browser)) { browser->window()->Close(); + } } void ChromeWebContentsHandler::RunFileChooser(
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc index 7231a00..e66f2c1 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -259,8 +259,9 @@ const GURL& url) { Profile* profile = Profile::FromWebUI(web_ui); WebUIFactoryFunction function = GetWebUIFactoryFunction(web_ui, profile, url); - if (!function) + if (!function) { return nullptr; + } return base::WrapUnique((*function)(web_ui, url)); } @@ -371,22 +372,27 @@ } #endif - if (!content::HasWebUIScheme(page_url)) + if (!content::HasWebUIScheme(page_url)) { return nullptr; + } - if (page_url.host_piece() == chrome::kChromeUIComponentsHost) + if (page_url.host_piece() == chrome::kChromeUIComponentsHost) { return ComponentsUI::GetFaviconResourceBytes(scale_factor); + } #if BUILDFLAG(IS_WIN) - if (page_url.host_piece() == chrome::kChromeUIConflictsHost) + if (page_url.host_piece() == chrome::kChromeUIConflictsHost) { return ConflictsUI::GetFaviconResourceBytes(scale_factor); + } #endif - if (page_url.host_piece() == chrome::kChromeUICrashesHost) + if (page_url.host_piece() == chrome::kChromeUICrashesHost) { return CrashesUI::GetFaviconResourceBytes(scale_factor); + } - if (page_url.host_piece() == chrome::kChromeUIFlagsHost) + if (page_url.host_piece() == chrome::kChromeUIFlagsHost) { return FlagsUI::GetFaviconResourceBytes(scale_factor); + } #if !BUILDFLAG(IS_ANDROID) #if !BUILDFLAG(IS_CHROMEOS) @@ -396,35 +402,42 @@ } #endif // !BUILDFLAG(IS_CHROMEOS) - if (page_url.host_piece() == chrome::kChromeUINewTabPageHost) + if (page_url.host_piece() == chrome::kChromeUINewTabPageHost) { return NewTabPageUI::GetFaviconResourceBytes(scale_factor); + } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) - if (page_url.host_piece() == chrome::kChromeUIWhatsNewHost) + if (page_url.host_piece() == chrome::kChromeUIWhatsNewHost) { return WhatsNewUI::GetFaviconResourceBytes(scale_factor); + } #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) // Bookmarks are part of NTP on Android. - if (page_url.host_piece() == chrome::kChromeUIBookmarksHost) + if (page_url.host_piece() == chrome::kChromeUIBookmarksHost) { return BookmarksUI::GetFaviconResourceBytes(scale_factor); + } - if (page_url.host_piece() == chrome::kChromeUIHistoryHost) + if (page_url.host_piece() == chrome::kChromeUIHistoryHost) { return HistoryUI::GetFaviconResourceBytes(scale_factor); + } - if (page_url.host_piece() == password_manager::kChromeUIPasswordManagerHost) + if (page_url.host_piece() == password_manager::kChromeUIPasswordManagerHost) { return PasswordManagerUI::GetFaviconResourceBytes(scale_factor); + } // Android uses the native download manager. - if (page_url.host_piece() == chrome::kChromeUIDownloadsHost) + if (page_url.host_piece() == chrome::kChromeUIDownloadsHost) { return DownloadsUI::GetFaviconResourceBytes(scale_factor); + } // Android doesn't use the Options/Settings pages. if (page_url.host_piece() == chrome::kChromeUISettingsHost) { return settings_utils::GetFaviconResourceBytes(scale_factor); } - if (page_url.host_piece() == chrome::kChromeUIManagementHost) + if (page_url.host_piece() == chrome::kChromeUIManagementHost) { return ManagementUI::GetFaviconResourceBytes(scale_factor); + } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ BUILDFLAG(IS_CHROMEOS) @@ -443,8 +456,9 @@ #endif // !BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_CHROMEOS) - if (page_url.host_piece() == chrome::kChromeUIOSSettingsHost) + if (page_url.host_piece() == chrome::kChromeUIOSSettingsHost) { return settings_utils::GetFaviconResourceBytes(scale_factor); + } #endif // BUILDFLAG(IS_CHROMEOS) return nullptr;
diff --git a/chrome/browser/ui/webui/commerce/commerce_internals_ui_config.cc b/chrome/browser/ui/webui/commerce/commerce_internals_ui_config.cc index 2e54256d..52bddd9 100644 --- a/chrome/browser/ui/webui/commerce/commerce_internals_ui_config.cc +++ b/chrome/browser/ui/webui/commerce/commerce_internals_ui_config.cc
@@ -27,8 +27,7 @@ Profile* profile = Profile::FromWebUI(web_ui); return std::make_unique<CommerceInternalsUI>( - web_ui, - commerce::ShoppingServiceFactory::GetForBrowserContext(profile)); + web_ui, commerce::ShoppingServiceFactory::GetForBrowserContext(profile)); } } // namespace commerce
diff --git a/chrome/browser/ui/webui/components/components_ui.cc b/chrome/browser/ui/webui/components/components_ui.cc index 4b3670c..2c8082e 100644 --- a/chrome/browser/ui/webui/components/components_ui.cc +++ b/chrome/browser/ui/webui/components/components_ui.cc
@@ -47,13 +47,13 @@ source->EnableReplaceI18nInJS(); static constexpr webui::LocalizedString kStrings[] = { - {"componentsTitle", IDS_COMPONENTS_TITLE}, - {"componentsNoneInstalled", IDS_COMPONENTS_NONE_INSTALLED}, - {"componentVersion", IDS_COMPONENTS_VERSION}, - {"checkUpdate", IDS_COMPONENTS_CHECK_FOR_UPDATE}, - {"noComponents", IDS_COMPONENTS_NO_COMPONENTS}, - {"statusLabel", IDS_COMPONENTS_STATUS_LABEL}, - {"checkingLabel", IDS_COMPONENTS_CHECKING_LABEL}, + {"componentsTitle", IDS_COMPONENTS_TITLE}, + {"componentsNoneInstalled", IDS_COMPONENTS_NONE_INSTALLED}, + {"componentVersion", IDS_COMPONENTS_VERSION}, + {"checkUpdate", IDS_COMPONENTS_CHECK_FOR_UPDATE}, + {"noComponents", IDS_COMPONENTS_NO_COMPONENTS}, + {"statusLabel", IDS_COMPONENTS_STATUS_LABEL}, + {"checkingLabel", IDS_COMPONENTS_CHECKING_LABEL}, }; source->AddLocalizedStrings(kStrings);
diff --git a/chrome/browser/ui/webui/compose/compose_untrusted_ui.cc b/chrome/browser/ui/webui/compose/compose_untrusted_ui.cc index b35460b..31ef40b 100644 --- a/chrome/browser/ui/webui/compose/compose_untrusted_ui.cc +++ b/chrome/browser/ui/webui/compose/compose_untrusted_ui.cc
@@ -119,9 +119,9 @@ "enableOnDeviceDogfoodFooter", base::FeatureList::IsEnabled( compose::features::kEnableComposeOnDeviceDogfoodFooter)); - source->AddBoolean( - "enableUpfrontInputModes", - base::FeatureList::IsEnabled(compose::features::kComposeUpfrontInputModes)); + source->AddBoolean("enableUpfrontInputModes", + base::FeatureList::IsEnabled( + compose::features::kComposeUpfrontInputModes)); source->OverrideContentSecurityPolicy( network::mojom::CSPDirectiveName::StyleSrc,
diff --git a/chrome/browser/ui/webui/conflicts/conflicts_data_fetcher.cc b/chrome/browser/ui/webui/conflicts/conflicts_data_fetcher.cc index ec754d6..85c2ade 100644 --- a/chrome/browser/ui/webui/conflicts/conflicts_data_fetcher.cc +++ b/chrome/browser/ui/webui/conflicts/conflicts_data_fetcher.cc
@@ -29,14 +29,17 @@ std::string GetProcessTypesString(const ModuleInfoData& module_data) { uint32_t process_types = module_data.process_types; - if (!process_types) + if (!process_types) { return "None"; + } std::string result; - if (process_types & ProcessTypeToBit(content::PROCESS_TYPE_BROWSER)) + if (process_types & ProcessTypeToBit(content::PROCESS_TYPE_BROWSER)) { result.append("B"); - if (process_types & ProcessTypeToBit(content::PROCESS_TYPE_RENDERER)) + } + if (process_types & ProcessTypeToBit(content::PROCESS_TYPE_RENDERER)) { result.append("R"); + } // TODO(pmonette): Add additional process types as more get supported. return result; @@ -66,8 +69,9 @@ #endif void AppendString(std::string_view input, std::string* output) { - if (!output->empty()) + if (!output->empty()) { *output += ", "; + } output->append(input); } @@ -79,14 +83,17 @@ // Output status regarding the blocklist cache, current blocking, and // load status. - if (blocking_state.was_blocked) + if (blocking_state.was_blocked) { status = "Blocked"; - if (!blocking_state.was_loaded) + } + if (!blocking_state.was_loaded) { AppendString(kNotLoaded, &status); - else if (blocking_state.was_in_blocklist_cache) + } else if (blocking_state.was_in_blocklist_cache) { AppendString("Bypassed blocking", &status); - if (blocking_state.was_in_blocklist_cache) + } + if (blocking_state.was_in_blocklist_cache) { AppendString("In blocklist cache", &status); + } return status; } @@ -124,8 +131,9 @@ // This is a module explicitly allowed to load by the Module List // component. But it is still valid for a potential warning, and so the // warning status is used instead. - if (incompatible_applications_updater) + if (incompatible_applications_updater) { break; + } return "Tolerated - Will be blocked in the future"; case BlockingDecision::kDisallowedExplicit: return "Disallowed - Explicitly blocklisted"; @@ -183,8 +191,9 @@ const ModuleInfoKey& module_key, IncompatibleApplicationsUpdater* incompatible_applications_updater, ModuleBlocklistCacheUpdater* module_blocklist_cache_updater) { - if (!incompatible_applications_updater && !module_blocklist_cache_updater) + if (!incompatible_applications_updater && !module_blocklist_cache_updater) { return std::string(); + } std::string status; @@ -261,8 +270,9 @@ } } - if (!ModuleDatabase::IsThirdPartyBlockingPolicyEnabled()) + if (!ModuleDatabase::IsThirdPartyBlockingPolicyEnabled()) { return kPolicyDisabled; + } if (!IncompatibleApplicationsUpdater::IsWarningEnabled() && !ModuleBlocklistCacheUpdater::IsBlockingEnabled()) { @@ -337,8 +347,9 @@ ConflictsDataFetcher::~ConflictsDataFetcher() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - if (module_list_.has_value()) + if (module_list_.has_value()) { ModuleDatabase::GetInstance()->RemoveObserver(this); + } } // static @@ -434,8 +445,9 @@ #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) std::string type_string; - if (module_data.module_properties & ModuleInfoData::kPropertyShellExtension) + if (module_data.module_properties & ModuleInfoData::kPropertyShellExtension) { type_string = "Shell extension"; + } data.Set("type_description", type_string); const auto& inspection_result = *module_data.inspection_result;
diff --git a/chrome/browser/ui/webui/constrained_web_dialog_ui.cc b/chrome/browser/ui/webui/constrained_web_dialog_ui.cc index 78a92cd..e6852a76 100644 --- a/chrome/browser/ui/webui/constrained_web_dialog_ui.cc +++ b/chrome/browser/ui/webui/constrained_web_dialog_ui.cc
@@ -43,7 +43,8 @@ : public base::SupportsUserData::Data { public: explicit ConstrainedWebDialogDelegateUserData( - ConstrainedWebDialogDelegate* delegate) : delegate_(delegate) {} + ConstrainedWebDialogDelegate* delegate) + : delegate_(delegate) {} ~ConstrainedWebDialogDelegateUserData() override = default; ConstrainedWebDialogDelegateUserData( const ConstrainedWebDialogDelegateUserData&) = delete; @@ -76,8 +77,9 @@ base::Unretained(this))); ConstrainedWebDialogDelegate* delegate = GetConstrainedDelegate(); - if (!delegate) + if (!delegate) { return; + } ui::WebDialogDelegate* dialog_delegate = delegate->GetWebDialogDelegate(); std::vector<WebUIMessageHandler*> handlers; @@ -94,8 +96,9 @@ void ConstrainedWebDialogUI::OnDialogCloseMessage( const base::Value::List& args) { ConstrainedWebDialogDelegate* delegate = GetConstrainedDelegate(); - if (!delegate) + if (!delegate) { return; + } std::string json_retval; if (!args.empty()) { @@ -129,8 +132,8 @@ ConstrainedWebDialogDelegate* ConstrainedWebDialogUI::GetConstrainedDelegate() { ConstrainedWebDialogDelegateUserData* user_data = static_cast<ConstrainedWebDialogDelegateUserData*>( - web_ui()->GetWebContents()-> - GetUserData(&kConstrainedWebDialogDelegateUserDataKey)); + web_ui()->GetWebContents()->GetUserData( + &kConstrainedWebDialogDelegateUserDataKey)); return user_data ? user_data->delegate() : nullptr; }
diff --git a/chrome/browser/ui/webui/constrained_web_dialog_ui.h b/chrome/browser/ui/webui/constrained_web_dialog_ui.h index 8e7190b..9c994df 100644 --- a/chrome/browser/ui/webui/constrained_web_dialog_ui.h +++ b/chrome/browser/ui/webui/constrained_web_dialog_ui.h
@@ -18,7 +18,7 @@ namespace content { class BrowserContext; class WebContents; -} +} // namespace content namespace ui { class WebDialogDelegate;
diff --git a/chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc b/chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc index 724c445e..760e26c 100644 --- a/chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc +++ b/chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc
@@ -35,7 +35,8 @@ namespace { -static const char kTestDataURL[] = "data:text/html,<!doctype html>" +static const char kTestDataURL[] = + "data:text/html,<!doctype html>" "<body></body>" "<style>" "body { height: 150px; width: 150px; }" @@ -47,8 +48,10 @@ } std::string GetChangeDimensionsScript(int dimension) { - return base::StringPrintf("window.document.body.style.width = %d + 'px';" - "window.document.body.style.height = %d + 'px';", dimension, dimension); + return base::StringPrintf( + "window.document.body.style.width = %d + 'px';" + "window.document.body.style.height = %d + 'px';", + dimension, dimension); } class AutoResizingTestWebDialogDelegate
diff --git a/chrome/browser/ui/webui/cr_components/most_visited/most_visited_handler.cc b/chrome/browser/ui/webui/cr_components/most_visited/most_visited_handler.cc index 916a519b..cb2418f 100644 --- a/chrome/browser/ui/webui/cr_components/most_visited/most_visited_handler.cc +++ b/chrome/browser/ui/webui/cr_components/most_visited/most_visited_handler.cc
@@ -312,6 +312,7 @@ } void MostVisitedHandler::OnDestroyed() { - if (preinstalled_web_app_observer_.IsObserving()) + if (preinstalled_web_app_observer_.IsObserving()) { preinstalled_web_app_observer_.Reset(); + } }
diff --git a/chrome/browser/ui/webui/data_sharing/data_sharing_page_handler.cc b/chrome/browser/ui/webui/data_sharing/data_sharing_page_handler.cc index 78c770a..e2d908a 100644 --- a/chrome/browser/ui/webui/data_sharing/data_sharing_page_handler.cc +++ b/chrome/browser/ui/webui/data_sharing/data_sharing_page_handler.cc
@@ -46,8 +46,8 @@ } void DataSharingPageHandler::CloseUI(int status_code) { - // TODO(crbug.com/368634445): In addition to closing the WebUI bubble some special - // codes should trigger follow up native info dialogs. + // TODO(crbug.com/368634445): In addition to closing the WebUI bubble some + // special codes should trigger follow up native info dialogs. auto embedder = webui_controller_->embedder(); if (embedder) { embedder->CloseUI();
diff --git a/chrome/browser/ui/webui/data_sharing/data_sharing_ui.cc b/chrome/browser/ui/webui/data_sharing/data_sharing_ui.cc index 7d9a397..39872508 100644 --- a/chrome/browser/ui/webui/data_sharing/data_sharing_ui.cc +++ b/chrome/browser/ui/webui/data_sharing/data_sharing_ui.cc
@@ -155,6 +155,8 @@ IDS_DATA_SHARING_PREVIEW_DIALOG_TITLE_PLURAL}, {"previewDialogBody", IDS_DATA_SHARING_PREVIEW_DIALOG_BODY}, {"manageGroupTitle", IDS_DATA_SHARING_MANAGE_GROUP_TITLE}, + {"groupFull", IDS_DATA_SHARING_GROUP_FULL}, + {"ownerCannotShare", IDS_DATA_SHARING_OWNER_CANNOT_SHARE}, }; source->AddLocalizedStrings(kStrings); }
diff --git a/chrome/browser/ui/webui/devtools/devtools_ui.cc b/chrome/browser/ui/webui/devtools/devtools_ui.cc index 372fdaa..9b2a07a 100644 --- a/chrome/browser/ui/webui/devtools/devtools_ui.cc +++ b/chrome/browser/ui/webui/devtools/devtools_ui.cc
@@ -22,10 +22,12 @@ GURL DevToolsUI::GetProxyURL(const std::string& frontend_url) { GURL url(frontend_url); if (url.scheme() == content::kChromeDevToolsScheme && - url.host() == chrome::kChromeUIDevToolsHost) + url.host() == chrome::kChromeUIDevToolsHost) { return GURL(); - if (!url.is_valid() || url.host() != kRemoteFrontendDomain) + } + if (!url.is_valid() || url.host() != kRemoteFrontendDomain) { return GURL(); + } return GURL(base::StringPrintf( "%s://%s/%s/%s?%s", content::kChromeDevToolsScheme, chrome::kChromeUIDevToolsHost, chrome::kChromeUIDevToolsRemotePath, @@ -41,8 +43,9 @@ // static bool DevToolsUI::IsFrontendResourceURL(const GURL& url) { - if (url.host_piece() == kRemoteFrontendDomain) + if (url.host_piece() == kRemoteFrontendDomain) { return true; + } const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); if (cmd_line->HasSwitch(switches::kCustomDevtoolsFrontend)) {
diff --git a/chrome/browser/ui/webui/devtools/devtools_ui_data_source.cc b/chrome/browser/ui/webui/devtools/devtools_ui_data_source.cc index 3d47daa..42a8c0b 100644 --- a/chrome/browser/ui/webui/devtools/devtools_ui_data_source.cc +++ b/chrome/browser/ui/webui/devtools/devtools_ui_data_source.cc
@@ -123,8 +123,9 @@ bool DevToolsDataSource::MaybeHandleCustomRequest(const std::string& path, GotDataCallback* callback) { GURL custom_devtools_frontend = GetCustomDevToolsFrontendURL(); - if (!custom_devtools_frontend.is_valid()) + if (!custom_devtools_frontend.is_valid()) { return false; + } std::string stripped_path = StripDevToolsRevisionWithPrefix(path, "serve_rev/"); stripped_path = StripDevToolsRevisionWithPrefix(stripped_path, "serve_file/"); @@ -382,6 +383,7 @@ default; DevToolsDataSource::PendingRequest::~PendingRequest() { - if (callback) + if (callback) { std::move(callback).Run(CreateNotFoundResponse()); + } }
diff --git a/chrome/browser/ui/webui/devtools/devtools_ui_data_source.h b/chrome/browser/ui/webui/devtools/devtools_ui_data_source.h index f251d4e..144b108 100644 --- a/chrome/browser/ui/webui/devtools/devtools_ui_data_source.h +++ b/chrome/browser/ui/webui/devtools/devtools_ui_data_source.h
@@ -9,7 +9,6 @@ #include <memory> #include "content/public/browser/url_data_source.h" - #include "services/network/public/cpp/shared_url_loader_factory.h" #include "services/network/public/cpp/simple_url_loader.h" #include "third_party/blink/public/public_buildflags.h"
diff --git a/chrome/browser/ui/webui/discards/discards_ui.cc b/chrome/browser/ui/webui/discards/discards_ui.cc index b3b30f1..a538346 100644 --- a/chrome/browser/ui/webui/discards/discards_ui.cc +++ b/chrome/browser/ui/webui/discards/discards_ui.cc
@@ -78,8 +78,9 @@ resource_coordinator::LifecycleUnit* GetLifecycleUnitById(int32_t id) { for (resource_coordinator::LifecycleUnit* lifecycle_unit : g_browser_process->GetTabManager()->GetSortedLifecycleUnits()) { - if (lifecycle_unit->GetID() == id) + if (lifecycle_unit->GetID() == id) { return lifecycle_unit; + } } return nullptr; } @@ -90,8 +91,9 @@ const int current_entry_index = controller.GetCurrentEntryIndex(); // A WebContents which hasn't navigated yet does not have a NavigationEntry. - if (current_entry_index == -1) + if (current_entry_index == -1) { return 0; + } auto* nav_entry = controller.GetEntryAtIndex(current_entry_index); DCHECK(nav_entry); @@ -208,8 +210,9 @@ if (lifecycle_unit) { auto* tab_lifecycle_unit_external = lifecycle_unit->AsTabLifecycleUnitExternal(); - if (tab_lifecycle_unit_external) + if (tab_lifecycle_unit_external) { tab_lifecycle_unit_external->SetAutoDiscardable(is_auto_discardable); + } } std::move(callback).Run(); } @@ -253,8 +256,9 @@ void LoadById(int32_t id) override { auto* lifecycle_unit = GetLifecycleUnitById(id); - if (lifecycle_unit) + if (lifecycle_unit) { lifecycle_unit->Load(); + } } void Discard(DiscardCallback callback) override {
diff --git a/chrome/browser/ui/webui/discards/graph_dump_impl.cc b/chrome/browser/ui/webui/discards/graph_dump_impl.cc index 08c8eef0..6ddf81aa 100644 --- a/chrome/browser/ui/webui/discards/graph_dump_impl.cc +++ b/chrome/browser/ui/webui/discards/graph_dump_impl.cc
@@ -38,8 +38,9 @@ std::string ToJSON(const base::Value::Dict& value) { std::string result; JSONStringValueSerializer serializer(&result); - if (serializer.Serialize(value)) + if (serializer.Serialize(value)) { return result; + } return std::string(); } @@ -70,19 +71,22 @@ base::WeakPtr<content::WebContents> web_contents, FaviconAvailableCallback on_favicon_available) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - if (!web_contents) + if (!web_contents) { return; + } Profile* profile = Profile::FromBrowserContext(web_contents->GetBrowserContext()); - if (!profile) + if (!profile) { return; + } favicon::FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(profile, ServiceAccessType::EXPLICIT_ACCESS); - if (!favicon_service) + if (!favicon_service) { return; + } constexpr size_t kIconSize = 16; constexpr bool kFallbackToHost = true; @@ -99,8 +103,9 @@ FaviconAvailableCallback on_favicon_available, const favicon_base::FaviconRawBitmapResult& result) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - if (!result.is_valid()) + if (!result.is_valid()) { return; + } std::move(on_favicon_available).Run(result.bitmap_data); } @@ -143,8 +148,9 @@ on_frame(parent_frame); for (const performance_manager::FrameNode* child_frame : - parent_frame->GetChildFrameNodes()) + parent_frame->GetChildFrameNodes()) { ForFrameAndOffspring(child_frame, on_frame); + } } } // namespace @@ -382,8 +388,9 @@ int64_t DiscardsGraphDumpImpl::GetNodeId( const performance_manager::Node* node) const { - if (node == nullptr) + if (node == nullptr) { return 0; + } auto it = node_ids_.find(node); CHECK(it != node_ids_.end(), base::NotFatalUntil::M130); @@ -409,8 +416,9 @@ void DiscardsGraphDumpImpl::StartPageFaviconRequest( const performance_manager::PageNode* page_node) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - if (!page_node->GetMainFrameUrl().is_valid()) + if (!page_node->GetMainFrameUrl().is_valid()) { return; + } EnsureFaviconRequestHelper() .AsyncCall(&FaviconRequestHelper::RequestFavicon) @@ -421,8 +429,9 @@ void DiscardsGraphDumpImpl::StartFrameFaviconRequest( const performance_manager::FrameNode* frame_node) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - if (!frame_node->GetURL().is_valid()) + if (!frame_node->GetURL().is_valid()) { return; + } EnsureFaviconRequestHelper() .AsyncCall(&FaviconRequestHelper::RequestFavicon) @@ -441,8 +450,9 @@ for (const performance_manager::PageNode* page_node : graph->GetAllPageNodes()) { SendPageNotification(page_node, created); - if (created) + if (created) { StartPageFaviconRequest(page_node); + } // Dispatch preorder frame notifications. for (const performance_manager::FrameNode* main_frame_node : @@ -451,8 +461,9 @@ main_frame_node, [this, created](const performance_manager::FrameNode* frame_node) { this->SendFrameNotification(frame_node, created); - if (created) + if (created) { this->StartFrameFaviconRequest(frame_node); + } }); } } @@ -508,10 +519,11 @@ ToJSON(GetOwningGraph()->GetNodeDataDescriberRegistry()->DescribeNodeData( page_node)); - if (created) + if (created) { change_subscriber_->PageCreated(std::move(page_info)); - else + } else { change_subscriber_->PageChanged(std::move(page_info)); + } } void DiscardsGraphDumpImpl::SendProcessNotification( @@ -529,10 +541,11 @@ ToJSON(GetOwningGraph()->GetNodeDataDescriberRegistry()->DescribeNodeData( process)); - if (created) + if (created) { change_subscriber_->ProcessCreated(std::move(process_info)); - else + } else { change_subscriber_->ProcessChanged(std::move(process_info)); + } } void DiscardsGraphDumpImpl::SendWorkerNotification( @@ -563,10 +576,11 @@ ToJSON(GetOwningGraph()->GetNodeDataDescriberRegistry()->DescribeNodeData( worker)); - if (created) + if (created) { change_subscriber_->WorkerCreated(std::move(worker_info)); - else + } else { change_subscriber_->WorkerChanged(std::move(worker_info)); + } } void DiscardsGraphDumpImpl::SendDeletionNotification(
diff --git a/chrome/browser/ui/webui/discards/graph_dump_impl_unittest.cc b/chrome/browser/ui/webui/discards/graph_dump_impl_unittest.cc index 9b69739..ceaf88b 100644 --- a/chrome/browser/ui/webui/discards/graph_dump_impl_unittest.cc +++ b/chrome/browser/ui/webui/discards/graph_dump_impl_unittest.cc
@@ -271,8 +271,9 @@ EXPECT_NE(0u, frame->page_id); // The page's main frame should have an URL. - if (frame->id == impl_raw->GetNodeIdForTesting(main_frame)) + if (frame->id == impl_raw->GetNodeIdForTesting(main_frame)) { EXPECT_EQ(kExampleUrl, frame->url); + } } EXPECT_NE(0u, frame->id); EXPECT_NE(0u, frame->process_id);
diff --git a/chrome/browser/ui/webui/download_internals/download_internals_ui_message_handler.cc b/chrome/browser/ui/webui/download_internals/download_internals_ui_message_handler.cc index 564cab88..503c735 100644 --- a/chrome/browser/ui/webui/download_internals/download_internals_ui_message_handler.cc +++ b/chrome/browser/ui/webui/download_internals/download_internals_ui_message_handler.cc
@@ -24,8 +24,9 @@ : download_service_(nullptr) {} DownloadInternalsUIMessageHandler::~DownloadInternalsUIMessageHandler() { - if (download_service_) + if (download_service_) { download_service_->GetLogger()->RemoveObserver(this); + } } void DownloadInternalsUIMessageHandler::RegisterMessages() { @@ -53,40 +54,45 @@ void DownloadInternalsUIMessageHandler::OnServiceStatusChanged( const base::Value::Dict& service_status) { - if (!IsJavascriptAllowed()) + if (!IsJavascriptAllowed()) { return; + } FireWebUIListener("service-status-changed", service_status); } void DownloadInternalsUIMessageHandler::OnServiceDownloadsAvailable( const base::Value::List& service_downloads) { - if (!IsJavascriptAllowed()) + if (!IsJavascriptAllowed()) { return; + } FireWebUIListener("service-downloads-available", service_downloads); } void DownloadInternalsUIMessageHandler::OnServiceDownloadChanged( const base::Value::Dict& service_download) { - if (!IsJavascriptAllowed()) + if (!IsJavascriptAllowed()) { return; + } FireWebUIListener("service-download-changed", service_download); } void DownloadInternalsUIMessageHandler::OnServiceDownloadFailed( const base::Value::Dict& service_download) { - if (!IsJavascriptAllowed()) + if (!IsJavascriptAllowed()) { return; + } FireWebUIListener("service-download-failed", service_download); } void DownloadInternalsUIMessageHandler::OnServiceRequestMade( const base::Value::Dict& service_request) { - if (!IsJavascriptAllowed()) + if (!IsJavascriptAllowed()) { return; + } FireWebUIListener("service-request-made", service_request); }
diff --git a/chrome/browser/ui/webui/downloads/downloads_dom_handler.h b/chrome/browser/ui/webui/downloads/downloads_dom_handler.h index 569a8756..e50786d 100644 --- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.h +++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.h
@@ -26,7 +26,7 @@ class DownloadManager; class WebContents; class WebUI; -} +} // namespace content namespace download { class DownloadItem;
diff --git a/chrome/browser/ui/webui/downloads/downloads_list_tracker.cc b/chrome/browser/ui/webui/downloads/downloads_list_tracker.cc index a25f8ab..f4ea0191 100644 --- a/chrome/browser/ui/webui/downloads/downloads_list_tracker.cc +++ b/chrome/browser/ui/webui/downloads/downloads_list_tracker.cc
@@ -199,8 +199,9 @@ DownloadsListTracker::~DownloadsListTracker() = default; void DownloadsListTracker::Reset() { - if (sending_updates_) + if (sending_updates_) { page_->ClearAll(); + } sent_to_page_ = 0u; } @@ -209,11 +210,13 @@ std::vector<std::u16string> new_terms; new_terms.resize(search_terms.size()); - for (const auto& t : search_terms) + for (const auto& t : search_terms) { new_terms.push_back(base::UTF8ToUTF16(t)); + } - if (new_terms == search_terms_) + if (new_terms == search_terms_) { return false; + } search_terms_.swap(new_terms); RebuildSortedItems(); @@ -280,8 +283,9 @@ void DownloadsListTracker::OnDownloadCreated(DownloadManager* manager, DownloadItem* download_item) { DCHECK_EQ(0u, sorted_items_.count(download_item)); - if (should_show_.Run(*download_item)) + if (should_show_.Run(*download_item)) { InsertItem(sorted_items_.insert(download_item).first); + } } void DownloadsListTracker::OnDownloadUpdated(DownloadManager* manager, @@ -290,19 +294,21 @@ bool is_showing = current_position != sorted_items_.end(); bool should_show = should_show_.Run(*download_item); - if (!is_showing && should_show) + if (!is_showing && should_show) { InsertItem(sorted_items_.insert(download_item).first); - else if (is_showing && !should_show) + } else if (is_showing && !should_show) { RemoveItem(current_position); - else if (is_showing) + } else if (is_showing) { UpdateItem(current_position); + } } void DownloadsListTracker::OnDownloadRemoved(DownloadManager* manager, DownloadItem* download_item) { auto current_position = sorted_items_.find(download_item); - if (current_position != sorted_items_.end()) + if (current_position != sorted_items_.end()) { RemoveItem(current_position); + } } DownloadsListTracker::DownloadsListTracker( @@ -357,8 +363,9 @@ auto* registry = extensions::ExtensionRegistry::Get(profile); const extensions::Extension* extension = registry->GetExtensionById( by_ext->id(), extensions::ExtensionRegistry::EVERYTHING); - if (extension) + if (extension) { by_ext_name = extension->name(); + } } file_value->by_ext_id = by_ext_id; file_value->by_ext_name = by_ext_name; @@ -419,8 +426,9 @@ state = downloads::mojom::State::kInterrupted; progress_status_text = download_model.GetTabProgressStatusText(); - if (download_item->CanResume()) + if (download_item->CanResume()) { percent = GetPercentComplete(download_item); + } // TODO(crbug.com/40467967): GetHistoryPageStatusText() is using // GetStatusText() as a temporary measure until the layout is fixed to @@ -518,8 +526,9 @@ const DownloadItem* DownloadsListTracker::GetItemForTesting( size_t index) const { - if (index >= sorted_items_.size()) + if (index >= sorted_items_.size()) { return nullptr; + } auto it = sorted_items_.begin(); std::advance(it, index); @@ -567,8 +576,9 @@ GetMainNotifierManager()->GetAllDownloads(&all_items); - if (GetOriginalNotifierManager()) + if (GetOriginalNotifierManager()) { GetOriginalNotifierManager()->GetAllDownloads(&all_items); + } DownloadQuery query; query.AddFilter(should_show_); @@ -579,12 +589,14 @@ } void DownloadsListTracker::InsertItem(const SortedSet::iterator& insert) { - if (!sending_updates_) + if (!sending_updates_) { return; + } size_t index = GetIndex(insert); - if (index >= chunk_size_ && index >= sent_to_page_) + if (index >= chunk_size_ && index >= sent_to_page_) { return; + } std::vector<downloads::mojom::DataPtr> list; list.push_back(CreateDownloadData(*insert)); @@ -595,8 +607,9 @@ } void DownloadsListTracker::UpdateItem(const SortedSet::iterator& update) { - if (!sending_updates_ || GetIndex(update) >= sent_to_page_) + if (!sending_updates_ || GetIndex(update) >= sent_to_page_) { return; + } page_->UpdateItem(static_cast<int>(GetIndex(update)), CreateDownloadData(*update));
diff --git a/chrome/browser/ui/webui/downloads/downloads_list_tracker_unittest.cc b/chrome/browser/ui/webui/downloads/downloads_list_tracker_unittest.cc index e965111..5e0ea72 100644 --- a/chrome/browser/ui/webui/downloads/downloads_list_tracker_unittest.cc +++ b/chrome/browser/ui/webui/downloads/downloads_list_tracker_unittest.cc
@@ -78,8 +78,8 @@ base::BindRepeating(&ShouldShowItem)) {} ~TestDownloadsListTracker() override = default; - using DownloadsListTracker::IsIncognito; using DownloadsListTracker::GetItemForTesting; + using DownloadsListTracker::IsIncognito; using DownloadsListTracker::SetChunkSizeForTesting; protected: @@ -97,15 +97,17 @@ DownloadsListTrackerTest() = default; ~DownloadsListTrackerTest() override { - for (const auto& mock_item : mock_items_) + for (const auto& mock_item : mock_items_) { testing::Mock::VerifyAndClear(mock_item.get()); + } } // testing::Test: void SetUp() override { ON_CALL(manager_, GetBrowserContext()).WillByDefault(Return(&profile_)); - ON_CALL(manager_, GetAllDownloads(_)).WillByDefault( - testing::Invoke(this, &DownloadsListTrackerTest::GetAllDownloads)); + ON_CALL(manager_, GetAllDownloads(_)) + .WillByDefault( + testing::Invoke(this, &DownloadsListTrackerTest::GetAllDownloads)); } MockDownloadItem* CreateMock(uint64_t id, const base::Time& started) { @@ -149,8 +151,9 @@ private: void GetAllDownloads(DownloadVector* result) { - for (const auto& mock_item : mock_items_) + for (const auto& mock_item : mock_items_) { result->push_back(mock_item.get()); + } } // NOTE: The initialization order of these members matters. @@ -181,12 +184,14 @@ } MATCHER_P(MatchIds, expected, "") { - if (arg.size() != expected.size()) + if (arg.size() != expected.size()) { return false; + } for (size_t i = 0; i < arg.size(); ++i) { - if (arg[i]->id != base::NumberToString(expected[i])) + if (arg[i]->id != base::NumberToString(expected[i])) { return false; + } } return true; } @@ -271,8 +276,9 @@ TEST_F(DownloadsListTrackerTest, Incognito) { testing::NiceMock<content::MockDownloadManager> incognito_manager; - ON_CALL(incognito_manager, GetBrowserContext()).WillByDefault(Return( - TestingProfile::Builder().BuildIncognito(profile()))); + ON_CALL(incognito_manager, GetBrowserContext()) + .WillByDefault( + Return(TestingProfile::Builder().BuildIncognito(profile()))); MockDownloadItem item; EXPECT_CALL(item, GetId()).WillRepeatedly(Return(0));
diff --git a/chrome/browser/ui/webui/extensions/extension_icon_source.cc b/chrome/browser/ui/webui/extensions/extension_icon_source.cc index 4442637..d92d7d57 100644 --- a/chrome/browser/ui/webui/extensions/extension_icon_source.cc +++ b/chrome/browser/ui/webui/extensions/extension_icon_source.cc
@@ -71,8 +71,8 @@ } // namespace -ExtensionIconSource::ExtensionIconSource(Profile* profile) : profile_(profile) { -} +ExtensionIconSource::ExtensionIconSource(Profile* profile) + : profile_(profile) {} struct ExtensionIconSource::ExtensionIconRequest { content::URLDataSource::GotDataCallback callback; @@ -174,14 +174,14 @@ return default_extension_data_.get(); } -void ExtensionIconSource::FinalizeImage(const SkBitmap* image, - int request_id) { +void ExtensionIconSource::FinalizeImage(const SkBitmap* image, int request_id) { SkBitmap bitmap; ExtensionIconRequest* request = GetData(request_id); - if (request->grayscale) + if (request->grayscale) { bitmap = DesaturateImage(image); - else + } else { bitmap = *image; + } std::move(request->callback).Run(BitmapToMemory(&bitmap).get()); ClearData(request_id); @@ -191,20 +191,22 @@ ExtensionIconRequest* request = GetData(request_id); const SkBitmap* default_image = nullptr; - if (request->extension->is_app()) + if (request->extension->is_app()) { default_image = GetDefaultAppImage(); - else + } else { default_image = GetDefaultExtensionImage(); + } SkBitmap resized_image(skia::ImageOperations::Resize( - *default_image, skia::ImageOperations::RESIZE_LANCZOS3, - request->size, request->size)); + *default_image, skia::ImageOperations::RESIZE_LANCZOS3, request->size, + request->size)); // There are cases where Resize returns an empty bitmap, for example if you // ask for an image too large. In this case it is better to return the default // image than returning nothing at all. - if (resized_image.empty()) + if (resized_image.empty()) { resized_image = *default_image; + } FinalizeImage(&resized_image, request_id); } @@ -261,10 +263,11 @@ void ExtensionIconSource::OnImageLoaded(int request_id, const gfx::Image& image) { - if (image.IsEmpty()) + if (image.IsEmpty()) { LoadIconFailed(request_id); - else + } else { FinalizeImage(image.ToSkBitmap(), request_id); + } } void ExtensionIconSource::LoadIconFailed(int request_id) { @@ -272,10 +275,11 @@ ExtensionResource icon = IconsInfo::GetIconResource( request->extension.get(), request->size, request->match); - if (request->size == extension_misc::EXTENSION_ICON_BITTY) + if (request->size == extension_misc::EXTENSION_ICON_BITTY) { LoadFaviconImage(request_id); - else + } else { LoadDefaultImage(request_id); + } } bool ExtensionIconSource::ParseData( @@ -286,23 +290,27 @@ std::string path_lower = base::ToLowerASCII(path); std::vector<std::string> path_parts = base::SplitString( path_lower, "/", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); - if (path_lower.empty() || path_parts.size() < 3) + if (path_lower.empty() || path_parts.size() < 3) { return false; + } std::string size_param = path_parts.at(1); std::string match_param = path_parts.at(2); match_param = match_param.substr(0, match_param.find('?')); int size; - if (!base::StringToInt(size_param, &size)) + if (!base::StringToInt(size_param, &size)) { return false; - if (size <= 0 || size > extension_misc::EXTENSION_ICON_GIGANTOR) + } + if (size <= 0 || size > extension_misc::EXTENSION_ICON_GIGANTOR) { return false; + } ExtensionIconSet::Match match_type; int match_num; - if (!base::StringToInt(match_param, &match_num)) + if (!base::StringToInt(match_param, &match_num)) { return false; + } match_type = static_cast<ExtensionIconSet::Match>(match_num); if (!(match_type == ExtensionIconSet::Match::kExactly || match_type == ExtensionIconSet::Match::kSmaller || @@ -313,8 +321,9 @@ std::string extension_id = path_parts.at(0); const Extension* extension = ExtensionRegistry::Get(profile_)->GetInstalledExtension(extension_id); - if (!extension) + if (!extension) { return false; + } bool grayscale = path_lower.find("grayscale=true") != std::string::npos;
diff --git a/chrome/browser/ui/webui/extensions/extension_icon_source.h b/chrome/browser/ui/webui/extensions/extension_icon_source.h index 24ac79d..a33f221 100644 --- a/chrome/browser/ui/webui/extensions/extension_icon_source.h +++ b/chrome/browser/ui/webui/extensions/extension_icon_source.h
@@ -104,8 +104,7 @@ // Loads the extension's |icon| for the given |request_id| and returns the // image to the client. - void LoadExtensionImage(const ExtensionResource& icon, - int request_id); + void LoadExtensionImage(const ExtensionResource& icon, int request_id); // Loads the favicon image for the app associated with the |request_id|. If // the image does not exist, we fall back to the default image.
diff --git a/chrome/browser/ui/webui/extensions/extensions_internals_source.cc b/chrome/browser/ui/webui/extensions/extensions_internals_source.cc index a920d5f..fb70050 100644 --- a/chrome/browser/ui/webui/extensions/extensions_internals_source.cc +++ b/chrome/browser/ui/webui/extensions/extensions_internals_source.cc
@@ -93,32 +93,45 @@ base::Value::List CreationFlagsToList(int creation_flags) { base::Value::List flags_value; - if (creation_flags == extensions::Extension::NO_FLAGS) + if (creation_flags == extensions::Extension::NO_FLAGS) { flags_value.Append("NO_FLAGS"); - if (creation_flags & extensions::Extension::REQUIRE_KEY) + } + if (creation_flags & extensions::Extension::REQUIRE_KEY) { flags_value.Append("REQUIRE_KEY"); - if (creation_flags & extensions::Extension::REQUIRE_MODERN_MANIFEST_VERSION) + } + if (creation_flags & extensions::Extension::REQUIRE_MODERN_MANIFEST_VERSION) { flags_value.Append("REQUIRE_MODERN_MANIFEST_VERSION"); - if (creation_flags & extensions::Extension::ALLOW_FILE_ACCESS) + } + if (creation_flags & extensions::Extension::ALLOW_FILE_ACCESS) { flags_value.Append("ALLOW_FILE_ACCESS"); - if (creation_flags & extensions::Extension::FROM_WEBSTORE) + } + if (creation_flags & extensions::Extension::FROM_WEBSTORE) { flags_value.Append("FROM_WEBSTORE"); - if (creation_flags & extensions::Extension::FOLLOW_SYMLINKS_ANYWHERE) + } + if (creation_flags & extensions::Extension::FOLLOW_SYMLINKS_ANYWHERE) { flags_value.Append("FOLLOW_SYMLINKS_ANYWHERE"); - if (creation_flags & extensions::Extension::ERROR_ON_PRIVATE_KEY) + } + if (creation_flags & extensions::Extension::ERROR_ON_PRIVATE_KEY) { flags_value.Append("ERROR_ON_PRIVATE_KEY"); - if (creation_flags & extensions::Extension::WAS_INSTALLED_BY_DEFAULT) + } + if (creation_flags & extensions::Extension::WAS_INSTALLED_BY_DEFAULT) { flags_value.Append("WAS_INSTALLED_BY_DEFAULT"); - if (creation_flags & extensions::Extension::REQUIRE_PERMISSIONS_CONSENT) + } + if (creation_flags & extensions::Extension::REQUIRE_PERMISSIONS_CONSENT) { flags_value.Append("REQUIRE_PERMISSIONS_CONSENT"); - if (creation_flags & extensions::Extension::IS_EPHEMERAL) + } + if (creation_flags & extensions::Extension::IS_EPHEMERAL) { flags_value.Append("IS_EPHEMERAL"); - if (creation_flags & extensions::Extension::WAS_INSTALLED_BY_OEM) + } + if (creation_flags & extensions::Extension::WAS_INSTALLED_BY_OEM) { flags_value.Append("WAS_INSTALLED_BY_OEM"); - if (creation_flags & extensions::Extension::MAY_BE_UNTRUSTED) + } + if (creation_flags & extensions::Extension::MAY_BE_UNTRUSTED) { flags_value.Append("MAY_BE_UNTRUSTED"); - if (creation_flags & extensions::Extension::WITHHOLD_PERMISSIONS) + } + if (creation_flags & extensions::Extension::WITHHOLD_PERMISSIONS) { flags_value.Append("WITHHOLD_PERMISSIONS"); + } return flags_value; }
diff --git a/chrome/browser/ui/webui/extensions/extensions_internals_unittest.cc b/chrome/browser/ui/webui/extensions/extensions_internals_unittest.cc index 27d859d7..50257d3 100644 --- a/chrome/browser/ui/webui/extensions/extensions_internals_unittest.cc +++ b/chrome/browser/ui/webui/extensions/extensions_internals_unittest.cc
@@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/webui/extensions/extensions_internals_source.h" - #include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/values.h" @@ -11,6 +9,7 @@ #include "chrome/browser/extensions/extension_service_test_base.h" #include "chrome/browser/extensions/permissions/permissions_updater.h" #include "chrome/browser/extensions/permissions/scripting_permissions_modifier.h" +#include "chrome/browser/ui/webui/extensions/extensions_internals_source.h" #include "chrome/test/base/testing_profile.h" #include "extensions/browser/event_router.h" #include "extensions/browser/event_router_factory.h"
diff --git a/chrome/browser/ui/webui/family_link_user_internals/family_link_user_internals_message_handler.cc b/chrome/browser/ui/webui/family_link_user_internals/family_link_user_internals_message_handler.cc index 08fe048..5a9bd40 100644 --- a/chrome/browser/ui/webui/family_link_user_internals/family_link_user_internals_message_handler.cc +++ b/chrome/browser/ui/webui/family_link_user_internals/family_link_user_internals_message_handler.cc
@@ -165,8 +165,9 @@ const base::Value::List& args) { DCHECK(args.empty()); AllowJavascript(); - if (scoped_observation_.IsObserving()) + if (scoped_observation_.IsObserving()) { return; + } scoped_observation_.Observe(GetSupervisedUserService()->GetURLFilter()); } @@ -179,14 +180,16 @@ void FamilyLinkUserInternalsMessageHandler::HandleTryURL( const base::Value::List& args) { DCHECK_EQ(2u, args.size()); - if (!args[0].is_string() || !args[1].is_string()) + if (!args[0].is_string() || !args[1].is_string()) { return; + } const std::string& callback_id = args[0].GetString(); const std::string& url_str = args[1].GetString(); GURL url = url_formatter::FixupURL(url_str, std::string()); - if (!url.is_valid()) + if (!url.is_valid()) { return; + } supervised_user::SupervisedUserURLFilter* filter = GetSupervisedUserService()->GetURLFilter();
diff --git a/chrome/browser/ui/webui/family_link_user_internals/family_link_user_internals_ui.cc b/chrome/browser/ui/webui/family_link_user_internals/family_link_user_internals_ui.cc index 20ecf79..86f44788 100644 --- a/chrome/browser/ui/webui/family_link_user_internals/family_link_user_internals_ui.cc +++ b/chrome/browser/ui/webui/family_link_user_internals/family_link_user_internals_ui.cc
@@ -22,7 +22,8 @@ content::WebUIDataSource* source = content::WebUIDataSource::CreateAndAdd( profile, chrome::kChromeUIFamilyLinkUserInternalsHost); webui::SetupWebUIDataSource( - source, base::span<const webui::ResourcePath>(kFamilyLinkUserInternalsResources), + source, + base::span<const webui::ResourcePath>(kFamilyLinkUserInternalsResources), IDR_FAMILY_LINK_USER_INTERNALS_FAMILY_LINK_USER_INTERNALS_HTML); source->OverrideContentSecurityPolicy(
diff --git a/chrome/browser/ui/webui/favicon_source.h b/chrome/browser/ui/webui/favicon_source.h index d6b61d2..7384c9e 100644 --- a/chrome/browser/ui/webui/favicon_source.h +++ b/chrome/browser/ui/webui/favicon_source.h
@@ -25,7 +25,7 @@ namespace chrome { enum class FaviconUrlFormat; struct ParsedFaviconPath; -} +} // namespace chrome namespace ui { class NativeTheme; @@ -70,12 +70,7 @@ private: // Defines the allowed pixel sizes for requested favicons. - enum IconSize { - SIZE_16, - SIZE_32, - SIZE_64, - NUM_SIZES - }; + enum IconSize { SIZE_16, SIZE_32, SIZE_64, NUM_SIZES }; // Called when favicon data is available from the history backend. If // |bitmap_result| is valid, returns it to caller using |callback|. Otherwise
diff --git a/chrome/browser/ui/webui/feed_internals/feedv2_internals_page_handler.cc b/chrome/browser/ui/webui/feed_internals/feedv2_internals_page_handler.cc index b80fa44..95dd822 100644 --- a/chrome/browser/ui/webui/feed_internals/feedv2_internals_page_handler.cc +++ b/chrome/browser/ui/webui/feed_internals/feedv2_internals_page_handler.cc
@@ -62,10 +62,12 @@ properties->is_web_feed_follow_intro_debug_enabled = IsWebFeedFollowIntroDebugEnabled(); properties->use_feed_query_requests = ShouldUseFeedQueryRequests(); - if (debug_data.fetch_info) + if (debug_data.fetch_info) { properties->feed_fetch_url = debug_data.fetch_info->base_request_url; - if (debug_data.upload_info) + } + if (debug_data.upload_info) { properties->feed_actions_url = debug_data.upload_info->base_request_url; + } properties->load_stream_status = debug_data.load_stream_status;
diff --git a/chrome/browser/ui/webui/feedback/feedback_dialog.cc b/chrome/browser/ui/webui/feedback/feedback_dialog.cc index 042f6be..6ec2330 100644 --- a/chrome/browser/ui/webui/feedback/feedback_dialog.cc +++ b/chrome/browser/ui/webui/feedback/feedback_dialog.cc
@@ -141,8 +141,9 @@ // The widget_ is set to null when the FeedbackDialog is constructed. // After the following two function calls, it is finally initialized. // Therefore, it is safer to check whether the widget_ is null - if (this->widget_) + if (this->widget_) { this->widget_->Show(); + } } views::Widget* FeedbackDialog::GetWidget() const {
diff --git a/chrome/browser/ui/webui/fileicon_source.cc b/chrome/browser/ui/webui/fileicon_source.cc index 4a09069..493a8818 100644 --- a/chrome/browser/ui/webui/fileicon_source.cc +++ b/chrome/browser/ui/webui/fileicon_source.cc
@@ -42,8 +42,12 @@ const char kScaleFactorParameter[] = "scale"; IconLoader::IconSize SizeStringToIconSize(std::string_view size_string) { - if (size_string == "small") return IconLoader::SMALL; - if (size_string == "large") return IconLoader::LARGE; + if (size_string == "small") { + return IconLoader::SMALL; + } + if (size_string == "large") { + return IconLoader::LARGE; + } // We default to NORMAL if we don't recognize the size_string. Including // size_string=="normal". return IconLoader::NORMAL; @@ -72,8 +76,9 @@ FileIconSource::IconRequestDetails::IconRequestDetails() = default; FileIconSource::IconRequestDetails::IconRequestDetails( IconRequestDetails&& other) = default; -FileIconSource::IconRequestDetails& FileIconSource::IconRequestDetails:: -operator=(IconRequestDetails&& other) = default; +FileIconSource::IconRequestDetails& +FileIconSource::IconRequestDetails::operator=(IconRequestDetails&& other) = + default; FileIconSource::IconRequestDetails::~IconRequestDetails() = default; FileIconSource::FileIconSource() = default;
diff --git a/chrome/browser/ui/webui/flags/flags_ui.cc b/chrome/browser/ui/webui/flags/flags_ui.cc index df03c72..20727940b 100644 --- a/chrome/browser/ui/webui/flags/flags_ui.cc +++ b/chrome/browser/ui/webui/flags/flags_ui.cc
@@ -105,8 +105,9 @@ std::unique_ptr<flags_ui::FlagsStorage> storage, flags_ui::FlagAccess access) { // If the flags_ui has gone away, there's nothing to do. - if (!flags_ui) + if (!flags_ui) { return; + } // Note that |dom_handler| is owned by the web ui that owns |flags_ui|, so // it is still alive if |flags_ui| is.
diff --git a/chrome/browser/ui/webui/flags/flags_ui_handler.cc b/chrome/browser/ui/webui/flags/flags_ui_handler.cc index d677014..d84bec7 100644 --- a/chrome/browser/ui/webui/flags/flags_ui_handler.cc +++ b/chrome/browser/ui/webui/flags/flags_ui_handler.cc
@@ -169,8 +169,9 @@ const base::Value::List& args) { DCHECK(flags_storage_); DCHECK_EQ(2u, args.size()); - if (args.size() != 2) + if (args.size() != 2) { return; + } if (!args[0].is_string() || !args[1].is_string()) { NOTREACHED();
diff --git a/chrome/browser/ui/webui/flags/flags_ui_handler.h b/chrome/browser/ui/webui/flags/flags_ui_handler.h index 4cc380f..111ec65 100644 --- a/chrome/browser/ui/webui/flags/flags_ui_handler.h +++ b/chrome/browser/ui/webui/flags/flags_ui_handler.h
@@ -2,9 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/webui/flags/flags_ui.h" - #include "build/build_config.h" +#include "chrome/browser/ui/webui/flags/flags_ui.h" #include "components/flags_ui/feature_entry.h" #include "components/flags_ui/flags_state.h" #include "content/public/browser/web_ui_message_handler.h"
diff --git a/chrome/browser/ui/webui/gcm_internals_ui.cc b/chrome/browser/ui/webui/gcm_internals_ui.cc index 5ff3a8a..1c2bc5c 100644 --- a/chrome/browser/ui/webui/gcm_internals_ui.cc +++ b/chrome/browser/ui/webui/gcm_internals_ui.cc
@@ -93,7 +93,7 @@ Profile* profile = Profile::FromWebUI(web_ui()); gcm::GCMProfileService* profile_service = - gcm::GCMProfileServiceFactory::GetForProfile(profile); + gcm::GCMProfileServiceFactory::GetForProfile(profile); if (!profile_service || !profile_service->driver()) { ReturnResults(profile, nullptr, nullptr);
diff --git a/chrome/browser/ui/webui/help/help_utils_chromeos.cc b/chrome/browser/ui/webui/help/help_utils_chromeos.cc index 49db3e7..19175bd 100644 --- a/chrome/browser/ui/webui/help/help_utils_chromeos.cc +++ b/chrome/browser/ui/webui/help/help_utils_chromeos.cc
@@ -24,13 +24,15 @@ // Device Policy overrides the defaults. ash::CrosSettings* settings = ash::CrosSettings::Get(); - if (!settings) + if (!settings) { return default_update_over_cellular_allowed; + } const base::Value* types_value = settings->GetPref(ash::kAllowedConnectionTypesForUpdate); - if (!types_value) + if (!types_value) { return default_update_over_cellular_allowed; + } CHECK(types_value->is_list()); const auto& list = types_value->GetList(); for (size_t i = 0; i < list.size(); ++i) { @@ -39,8 +41,9 @@ continue; } - if (list[i].GetInt() == 4) + if (list[i].GetInt() == 4) { return true; + } } // Device policy does not allow updates over cellular, as cellular is not // included in allowed connection types for updates.
diff --git a/chrome/browser/ui/webui/help/version_updater_basic.cc b/chrome/browser/ui/webui/help/version_updater_basic.cc index 753c402..ebcef56 100644 --- a/chrome/browser/ui/webui/help/version_updater_basic.cc +++ b/chrome/browser/ui/webui/help/version_updater_basic.cc
@@ -2,11 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/webui/help/version_updater.h" - #include <memory> #include <string> +#include "chrome/browser/ui/webui/help/version_updater.h" #include "chrome/browser/upgrade_detector/upgrade_detector.h" namespace {
diff --git a/chrome/browser/ui/webui/help/version_updater_chromeos.cc b/chrome/browser/ui/webui/help/version_updater_chromeos.cc index 1105b60..0965e722 100644 --- a/chrome/browser/ui/webui/help/version_updater_chromeos.cc +++ b/chrome/browser/ui/webui/help/version_updater_chromeos.cc
@@ -56,8 +56,9 @@ NetworkStatus GetNetworkStatus(bool interactive, const ash::NetworkState* network, bool metered) { - if (!network || !network->IsConnectedState()) // Offline state. + if (!network || !network->IsConnectedState()) { // Offline state. return NETWORK_STATUS_OFFLINE; + } if (metered && !help_utils_chromeos::IsUpdateOverCellularAllowed(interactive)) { @@ -70,8 +71,9 @@ bool IsAutoUpdateDisabled() { bool update_disabled = kDefaultAutoUpdateDisabled; ash::CrosSettings* settings = ash::CrosSettings::Get(); - if (!settings) + if (!settings) { return update_disabled; + } const base::Value* update_disabled_value = settings->GetPref(ash::kUpdateDisabled); if (update_disabled_value) { @@ -85,16 +87,20 @@ bool metered) { const std::string type = network->type(); if (ash::NetworkTypePattern::WiFi().MatchesType(type)) { - if (metered) + if (metered) { return l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_METERED_WIFI); + } return l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_WIFI); } - if (ash::NetworkTypePattern::Ethernet().MatchesType(type)) + if (ash::NetworkTypePattern::Ethernet().MatchesType(type)) { return l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_ETHERNET); - if (ash::NetworkTypePattern::Mobile().MatchesType(type)) + } + if (ash::NetworkTypePattern::Mobile().MatchesType(type)) { return l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_MOBILE_DATA); - if (ash::NetworkTypePattern::VPN().MatchesType(type)) + } + if (ash::NetworkTypePattern::VPN().MatchesType(type)) { return l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_VPN); + } NOTREACHED(); } @@ -143,12 +149,14 @@ callback_ = std::move(callback); // User is not actively checking for updates. - if (!EnsureCanUpdate(false /* interactive */, callback_)) + if (!EnsureCanUpdate(false /* interactive */, callback_)) { return; + } UpdateEngineClient* update_engine_client = UpdateEngineClient::Get(); - if (!update_engine_client->HasObserver(this)) + if (!update_engine_client->HasObserver(this)) { update_engine_client->AddObserver(this); + } this->UpdateStatusChanged(update_engine_client->GetLastStatus()); } @@ -168,12 +176,14 @@ callback_ = std::move(callback); // User is actively checking for updates. - if (!EnsureCanUpdate(true /* interactive */, callback_)) + if (!EnsureCanUpdate(true /* interactive */, callback_)) { return; + } UpdateEngineClient* update_engine_client = UpdateEngineClient::Get(); - if (!update_engine_client->HasObserver(this)) + if (!update_engine_client->HasObserver(this)) { update_engine_client->AddObserver(this); + } if (update_engine_client->GetLastStatus().current_operation() != update_engine::Operation::IDLE) { @@ -198,8 +208,9 @@ context_) : nullptr; // For local owner set the field in the policy blob. - if (service) + if (service) { service->SetString(ash::kReleaseChannel, channel); + } UpdateEngineClient::Get()->SetChannel(channel, is_powerwash_allowed); } @@ -298,8 +309,9 @@ // If the status change is for an installation, this means that DLCs are being // installed and has nothing to with the OS. Ignore this status change. - if (status.is_install()) + if (status.is_install()) { return; + } // If the updater is currently idle, just show the last operation (unless it // was previously checking for an update -- in that case, the system is @@ -399,6 +411,7 @@ UpdateEngineClient::UpdateCheckResult result) { // If version updating is not implemented, this binary is the most up-to-date // possible with respect to automatic updating. - if (result == UpdateEngineClient::UPDATE_RESULT_NOTIMPLEMENTED) + if (result == UpdateEngineClient::UPDATE_RESULT_NOTIMPLEMENTED) { callback_.Run(UPDATED, 0, false, false, std::string(), 0, std::u16string()); + } }
diff --git a/chrome/browser/ui/webui/help/version_updater_chromeos.h b/chrome/browser/ui/webui/help/version_updater_chromeos.h index cf809d24..df6566f 100644 --- a/chrome/browser/ui/webui/help/version_updater_chromeos.h +++ b/chrome/browser/ui/webui/help/version_updater_chromeos.h
@@ -14,7 +14,7 @@ namespace content { class BrowserContext; class WebContents; -} +} // namespace content class VersionUpdaterCros : public VersionUpdater, public ash::UpdateEngineClient::Observer {
diff --git a/chrome/browser/ui/webui/help/version_updater_chromeos_unittest.cc b/chrome/browser/ui/webui/help/version_updater_chromeos_unittest.cc index 677f174d..0d9453b 100644 --- a/chrome/browser/ui/webui/help/version_updater_chromeos_unittest.cc +++ b/chrome/browser/ui/webui/help/version_updater_chromeos_unittest.cc
@@ -69,9 +69,7 @@ ash::ShillServiceClient::TestInterface* service_test = network_handler_test_helper_->service_test(); service_test->ClearServices(); - service_test->AddService("/service/eth", - "eth" /* guid */, - "eth", + service_test->AddService("/service/eth", "eth" /* guid */, "eth", shill::kTypeEthernet, shill::kStateOnline, true /* visible */); base::RunLoop().RunUntilIdle();
diff --git a/chrome/browser/ui/webui/help/version_updater_mac.mm b/chrome/browser/ui/webui/help/version_updater_mac.mm index 1b45d0c4..9dd6332 100644 --- a/chrome/browser/ui/webui/help/version_updater_mac.mm +++ b/chrome/browser/ui/webui/help/version_updater_mac.mm
@@ -38,10 +38,11 @@ namespace { int GetDownloadProgress(int64_t downloaded_bytes, int64_t total_bytes) { - if (downloaded_bytes < 0 || total_bytes <= 0) + if (downloaded_bytes < 0 || total_bytes <= 0) { return -1; + } return 100 * std::clamp(static_cast<double>(downloaded_bytes) / total_bytes, - 0.0, 1.0); + 0.0, 1.0); } void UpdateStatus(VersionUpdater::StatusCallback status_callback,
diff --git a/chrome/browser/ui/webui/history/browsing_history_handler.cc b/chrome/browser/ui/webui/history/browsing_history_handler.cc index 3db964ac..c7eeaa4 100644 --- a/chrome/browser/ui/webui/history/browsing_history_handler.cc +++ b/chrome/browser/ui/webui/history/browsing_history_handler.cc
@@ -77,7 +77,8 @@ // Gets the name and type of a device for the given sync client ID. // |name| and |type| are out parameters. void GetDeviceNameAndType(const syncer::DeviceInfoTracker* tracker, - const std::string& client_id, std::string* name, + const std::string& client_id, + std::string* name, std::string* type) { // DeviceInfoTracker must be syncing in order for remote history entries to // be available. @@ -131,16 +132,18 @@ // as the title, we mark the title as LTR since URLs are always treated as // left to right strings. if (base::i18n::IsRTL()) { - if (using_url_as_the_title) + if (using_url_as_the_title) { base::i18n::WrapStringWithLTRFormatting(&title_to_set); - else + } else { base::i18n::AdjustStringForLocaleDirection(&title_to_set); + } } // Number of chars to truncate titles when making them "short". static const size_t kShortTitleLength = 300; - if (title_to_set.size() > kShortTitleLength) + if (title_to_set.size() > kShortTitleLength) { title_to_set.resize(kShortTitleLength); + } result->Set("title", title_to_set); } @@ -185,8 +188,10 @@ // Converts `entry` to a base::Value::Dict to be owned by the caller. base::Value::Dict HistoryEntryToValue( const BrowsingHistoryService::HistoryEntry& entry, - BookmarkModel* bookmark_model, Profile& profile, - const syncer::DeviceInfoTracker* tracker, base::Clock* clock) { + BookmarkModel* bookmark_model, + Profile& profile, + const syncer::DeviceInfoTracker* tracker, + base::Clock* clock) { base::Value::Dict result; SetHistoryEntryUrlAndTitle(entry, &result); @@ -199,7 +204,9 @@ // When the domain is empty, use the scheme instead. This allows for a // sensible treatment of e.g. file: URLs when group by domain is on. - if (domain.empty()) domain = base::UTF8ToUTF16(entry.url.scheme() + ":"); + if (domain.empty()) { + domain = base::UTF8ToUTF16(entry.url.scheme() + ":"); + } // The items which are to be written into result are also described in // chrome/browser/resources/history/history.js in @typedef for @@ -253,8 +260,9 @@ std::string device_name; std::string device_type; - if (!entry.client_id.empty()) + if (!entry.client_id.empty()) { GetDeviceNameAndType(tracker, entry.client_id, &device_name, &device_type); + } result.Set("deviceName", device_name); result.Set("deviceType", device_type); @@ -409,7 +417,8 @@ } void BrowsingHistoryHandler::SendHistoryQuery( - int max_count, const std::u16string& query, + int max_count, + const std::u16string& query, std::optional<double> begin_timestamp) { history::QueryOptions options; options.max_count = max_count; @@ -581,7 +590,8 @@ } void BrowsingHistoryHandler::HasOtherFormsOfBrowsingHistory( - bool has_other_forms, bool has_synced_results) { + bool has_other_forms, + bool has_synced_results) { if (IsJavascriptAllowed()) { FireWebUIListener("has-other-forms-changed", base::Value(has_other_forms)); } else {
diff --git a/chrome/browser/ui/webui/history/browsing_history_handler.h b/chrome/browser/ui/webui/history/browsing_history_handler.h index cc1bf7a9..d932da0e 100644 --- a/chrome/browser/ui/webui/history/browsing_history_handler.h +++ b/chrome/browser/ui/webui/history/browsing_history_handler.h
@@ -83,7 +83,8 @@ } protected: - virtual void SendHistoryQuery(int count, const std::u16string& query, + virtual void SendHistoryQuery(int count, + const std::u16string& query, std::optional<double> begin_timestamp); private:
diff --git a/chrome/browser/ui/webui/history/browsing_history_handler_unittest.cc b/chrome/browser/ui/webui/history/browsing_history_handler_unittest.cc index 2c9f4e3..4e6cb9b0 100644 --- a/chrome/browser/ui/webui/history/browsing_history_handler_unittest.cc +++ b/chrome/browser/ui/webui/history/browsing_history_handler_unittest.cc
@@ -40,7 +40,8 @@ class MockBrowsingHistoryService : public BrowsingHistoryService { public: - MOCK_METHOD(void, QueryHistory, + MOCK_METHOD(void, + QueryHistory, (const std::u16string& search_text, const QueryOptions& options), (override)); }; @@ -81,7 +82,8 @@ BrowsingHistoryHandlerWithWebUIForTesting& operator=( const BrowsingHistoryHandlerWithWebUIForTesting&) = delete; - void SendHistoryQuery(int count, const std::u16string& query, + void SendHistoryQuery(int count, + const std::u16string& query, std::optional<double> begin_timestamp) override { if (postpone_query_results_) { return;
diff --git a/chrome/browser/ui/webui/history/foreign_session_handler.cc b/chrome/browser/ui/webui/history/foreign_session_handler.cc index 8fd6dd5..01661e6 100644 --- a/chrome/browser/ui/webui/history/foreign_session_handler.cc +++ b/chrome/browser/ui/webui/history/foreign_session_handler.cc
@@ -48,16 +48,18 @@ // Helper method to create JSON compatible objects from Session objects. std::optional<base::Value::Dict> SessionTabToValue( const ::sessions::SessionTab& tab) { - if (tab.navigations.empty()) + if (tab.navigations.empty()) { return std::nullopt; + } int selected_index = std::min(tab.current_navigation_index, static_cast<int>(tab.navigations.size() - 1)); const ::sessions::SerializedNavigationEntry& current_navigation = tab.navigations.at(selected_index); GURL tab_url = current_navigation.virtual_url(); - if (!tab_url.is_valid() || tab_url.spec() == chrome::kChromeUINewTabURL) + if (!tab_url.is_valid() || tab_url.spec() == chrome::kChromeUINewTabURL) { return std::nullopt; + } base::Value::Dict dictionary; NewTabUI::SetUrlTitleAndDirection(&dictionary, current_navigation.title(), @@ -89,8 +91,9 @@ // Helper method to create JSON compatible objects from SessionWindow objects. std::optional<base::Value::Dict> SessionWindowToValue( const ::sessions::SessionWindow& window) { - if (window.tabs.empty()) + if (window.tabs.empty()) { return std::nullopt; + } base::Value::List tab_values; // Calculate the last |modification_time| for all entries within a window. @@ -102,8 +105,9 @@ tab_values.Append(std::move(*tab_value)); } } - if (tab_values.empty()) + if (tab_values.empty()) { return std::nullopt; + } base::Value::Dict dictionary = BuildWindowData(window.timestamp, window.window_id); @@ -130,8 +134,9 @@ SessionID tab_id, const WindowOpenDisposition& disposition) { sync_sessions::OpenTabsUIDelegate* open_tabs = GetOpenTabsUIDelegate(web_ui); - if (!open_tabs) + if (!open_tabs) { return; + } const ::sessions::SessionTab* tab; if (!open_tabs->GetForeignTab(session_string_value, tab_id, &tab)) { @@ -151,8 +156,9 @@ content::WebUI* web_ui, const std::string& session_string_value) { sync_sessions::OpenTabsUIDelegate* open_tabs = GetOpenTabsUIDelegate(web_ui); - if (!open_tabs) + if (!open_tabs) { return; + } // Note: we don't own the ForeignSessions themselves. std::vector<const ::sessions::SessionWindow*> windows = @@ -203,8 +209,9 @@ void ForeignSessionHandler::OnJavascriptAllowed() { // This can happen if the page is refreshed. - if (!initial_session_list_) + if (!initial_session_list_) { initial_session_list_ = GetForeignSessions(); + } Profile* profile = Profile::FromWebUI(web_ui()); @@ -296,8 +303,9 @@ bool is_collapsed = collapsed_sessions.Find(session_tag); session_data.Set("collapsed", is_collapsed); - if (is_collapsed) + if (is_collapsed) { current_collapsed_sessions.Set(session_tag, true); + } base::Value::List window_list; @@ -375,8 +383,9 @@ sync_sessions::OpenTabsUIDelegate* open_tabs = GetOpenTabsUIDelegate(web_ui()); - if (open_tabs) + if (open_tabs) { open_tabs->DeleteForeignSession(session_tag); + } } void ForeignSessionHandler::HandleSetForeignSessionCollapsed( @@ -403,10 +412,11 @@ // collapsed state persists. PrefService* prefs = Profile::FromWebUI(web_ui())->GetPrefs(); ScopedDictPrefUpdate update(prefs, prefs::kNtpCollapsedForeignSessions); - if (is_collapsed) + if (is_collapsed) { update->Set(session_tag, true); - else + } else { update->Remove(session_tag); + } } } // namespace browser_sync
diff --git a/chrome/browser/ui/webui/history/history_login_handler.cc b/chrome/browser/ui/webui/history/history_login_handler.cc index 0842110..6b27af65 100644 --- a/chrome/browser/ui/webui/history/history_login_handler.cc +++ b/chrome/browser/ui/webui/history/history_login_handler.cc
@@ -57,8 +57,9 @@ void HistoryLoginHandler::ProfileInfoChanged() { bool signed_in = !profile_info_watcher_->GetAuthenticatedUsername().empty(); - if (!signin_callback_.is_null()) + if (!signin_callback_.is_null()) { signin_callback_.Run(); + } FireWebUIListener("sign-in-state-changed", base::Value(signed_in)); }
diff --git a/chrome/browser/ui/webui/identity_internals_ui.cc b/chrome/browser/ui/webui/identity_internals_ui.cc index 61ab0d5..57d39e48 100644 --- a/chrome/browser/ui/webui/identity_internals_ui.cc +++ b/chrome/browser/ui/webui/identity_internals_ui.cc
@@ -180,8 +180,9 @@ extensions::ExtensionRegistry::Get(Profile::FromWebUI(web_ui())); const extensions::Extension* extension = registry->enabled_extensions().GetByID(access_tokens_key.extension_id); - if (!extension) + if (!extension) { return std::string(); + } return extension->name(); } @@ -242,8 +243,9 @@ extensions::IdentityAPI* api = extensions::IdentityAPI::GetFactoryInstance()->Get( Profile::FromWebUI(web_ui())); - if (api) + if (api) { tokens = api->token_cache()->access_tokens_cache(); + } for (const auto& key_tokens : tokens) { for (const auto& token : key_tokens.second) { results.Append(GetInfoForToken(key_tokens.first, token)); @@ -308,7 +310,7 @@ } // namespace IdentityInternalsUI::IdentityInternalsUI(content::WebUI* web_ui) - : content::WebUIController(web_ui) { + : content::WebUIController(web_ui) { // chrome://identity-internals source. content::WebUIDataSource* html_source = content::WebUIDataSource::CreateAndAdd(
diff --git a/chrome/browser/ui/webui/identity_internals_ui.h b/chrome/browser/ui/webui/identity_internals_ui.h index 76b3315..bb7a173 100644 --- a/chrome/browser/ui/webui/identity_internals_ui.h +++ b/chrome/browser/ui/webui/identity_internals_ui.h
@@ -17,8 +17,7 @@ }; // The WebUI for chrome://identity-internals -class IdentityInternalsUI - : public content::WebUIController { +class IdentityInternalsUI : public content::WebUIController { public: explicit IdentityInternalsUI(content::WebUI* web_ui);
diff --git a/chrome/browser/ui/webui/identity_internals_ui_browsertest.cc b/chrome/browser/ui/webui/identity_internals_ui_browsertest.cc index a0452eb..c0385f8 100644 --- a/chrome/browser/ui/webui/identity_internals_ui_browsertest.cc +++ b/chrome/browser/ui/webui/identity_internals_ui_browsertest.cc
@@ -15,7 +15,7 @@ const char kChromeWebStoreId[] = "ahfgeienlihckogmohjhadlkjgocpleb"; const int kOneHour = 3600; -} // namespace +} // namespace IdentityInternalsUIBrowserTest::IdentityInternalsUIBrowserTest() = default;
diff --git a/chrome/browser/ui/webui/inspect_ui.cc b/chrome/browser/ui/webui/inspect_ui.cc index 723628ee..f53da7d 100644 --- a/chrome/browser/ui/webui/inspect_ui.cc +++ b/chrome/browser/ui/webui/inspect_ui.cc
@@ -345,53 +345,60 @@ const base::Value::List& args) { std::string source; std::string id; - if (ParseStringArgs(args, &source, &id)) + if (ParseStringArgs(args, &source, &id)) { inspect_ui_->Inspect(source, id); + } } void InspectMessageHandler::HandleInspectFallbackCommand( const base::Value::List& args) { std::string source; std::string id; - if (ParseStringArgs(args, &source, &id)) + if (ParseStringArgs(args, &source, &id)) { inspect_ui_->InspectFallback(source, id); + } } void InspectMessageHandler::HandleActivateCommand( const base::Value::List& args) { std::string source; std::string id; - if (ParseStringArgs(args, &source, &id)) + if (ParseStringArgs(args, &source, &id)) { inspect_ui_->Activate(source, id); + } } void InspectMessageHandler::HandleCloseCommand(const base::Value::List& args) { std::string source; std::string id; - if (ParseStringArgs(args, &source, &id)) + if (ParseStringArgs(args, &source, &id)) { inspect_ui_->Close(source, id); + } } void InspectMessageHandler::HandleReloadCommand(const base::Value::List& args) { std::string source; std::string id; - if (ParseStringArgs(args, &source, &id)) + if (ParseStringArgs(args, &source, &id)) { inspect_ui_->Reload(source, id); + } } void InspectMessageHandler::HandleOpenCommand(const base::Value::List& args) { std::string source_id; std::string browser_id; std::string url; - if (ParseStringArgs(args, &source_id, &browser_id, &url)) + if (ParseStringArgs(args, &source_id, &browser_id, &url)) { inspect_ui_->Open(source_id, browser_id, url); + } } void InspectMessageHandler::HandlePauseCommand(const base::Value::List& args) { std::string source; std::string id; - if (ParseStringArgs(args, &source, &id)) + if (ParseStringArgs(args, &source, &id)) { inspect_ui_->Pause(source, id); + } } void InspectMessageHandler::HandleInspectBrowserCommand( @@ -400,8 +407,8 @@ std::string browser_id; std::string front_end; if (ParseStringArgs(args, &source_id, &browser_id, &front_end)) { - inspect_ui_->InspectBrowserWithCustomFrontend( - source_id, browser_id, GURL(front_end)); + inspect_ui_->InspectBrowserWithCustomFrontend(source_id, browser_id, + GURL(front_end)); } } @@ -409,41 +416,48 @@ const char* pref_name, const base::Value::List& args) { Profile* profile = Profile::FromWebUI(web_ui()); - if (!profile) + if (!profile) { return; + } - if (args.size() == 1 && args[0].is_bool()) + if (args.size() == 1 && args[0].is_bool()) { profile->GetPrefs()->SetBoolean(pref_name, args[0].GetBool()); + } } void InspectMessageHandler::HandlePortForwardingConfigCommand( const base::Value::List& args) { Profile* profile = Profile::FromWebUI(web_ui()); - if (!profile) + if (!profile) { return; + } if (args.size() == 1) { const base::Value& src = args[0]; - if (src.is_dict()) + if (src.is_dict()) { profile->GetPrefs()->Set(prefs::kDevToolsPortForwardingConfig, src); + } } } void InspectMessageHandler::HandleTCPDiscoveryConfigCommand( const base::Value::List& args) { Profile* profile = Profile::FromWebUI(web_ui()); - if (!profile) + if (!profile) { return; + } - if (args.size() == 1u && args[0].is_list()) + if (args.size() == 1u && args[0].is_list()) { profile->GetPrefs()->Set(prefs::kDevToolsTCPDiscoveryConfig, args[0]); + } } void InspectMessageHandler::HandleOpenNodeFrontendCommand( const base::Value::List& args) { Profile* profile = Profile::FromWebUI(web_ui()); - if (!profile) + if (!profile) { return; + } DevToolsWindow::OpenNodeFrontendWindow(profile, DevToolsOpenedByAction::kInspectLink); } @@ -459,16 +473,18 @@ ChromeBrowserMainExtraPartsViews::Get()->GetUiDevToolsServerInstance(); server->SetOnSessionEnded(base::BindOnce([]() { if (ChromeBrowserMainExtraPartsViews::Get() - ->GetUiDevToolsServerInstance()) + ->GetUiDevToolsServerInstance()) { ChromeBrowserMainExtraPartsViews::Get()->DestroyUiDevTools(); + } })); } inspect_ui_->PopulateNativeUITargets(GetUiDevToolsTargets()); std::vector<ui_devtools::UiDevToolsServer::NameUrlPair> pairs = ui_devtools::UiDevToolsServer::GetClientNamesAndUrls(); - if (!pairs.empty()) + if (!pairs.empty()) { CreateNativeUIInspectionSession(pairs[0].second); + } } void InspectMessageHandler::HandleSetBubbleLocking( @@ -556,8 +572,9 @@ void InspectUI::Activate(const std::string& source_id, const std::string& target_id) { scoped_refptr<DevToolsAgentHost> target = FindTarget(source_id, target_id); - if (target) + if (target) { target->Activate(); + } } void InspectUI::Close(const std::string& source_id, @@ -566,24 +583,27 @@ if (target) { target->Close(); DevToolsTargetsUIHandler* handler = FindTargetHandler(source_id); - if (handler) + if (handler) { handler->ForceUpdate(); + } } } void InspectUI::Reload(const std::string& source_id, const std::string& target_id) { scoped_refptr<DevToolsAgentHost> target = FindTarget(source_id, target_id); - if (target) + if (target) { target->Reload(); + } } void InspectUI::Open(const std::string& source_id, const std::string& browser_id, const std::string& url) { DevToolsTargetsUIHandler* handler = FindTargetHandler(source_id); - if (handler) + if (handler) { handler->Open(browser_id, url); + } } void InspectUI::Pause(const std::string& source_id, @@ -597,10 +617,9 @@ } } -void InspectUI::InspectBrowserWithCustomFrontend( - const std::string& source_id, - const std::string& browser_id, - const GURL& frontend_url) { +void InspectUI::InspectBrowserWithCustomFrontend(const std::string& source_id, + const std::string& browser_id, + const GURL& frontend_url) { if (!frontend_url.SchemeIs(content::kChromeUIScheme) && !frontend_url.SchemeIs(content::kChromeDevToolsScheme) && frontend_url.host() != kInspectUiLocalHost) { @@ -608,14 +627,16 @@ } DevToolsTargetsUIHandler* handler = FindTargetHandler(source_id); - if (!handler) + if (!handler) { return; + } // Fetch agent host from remote browser. scoped_refptr<content::DevToolsAgentHost> agent_host = handler->GetBrowserAgentHost(browser_id); - if (agent_host->IsAttached()) + if (agent_host->IsAttached()) { return; + } // Create web contents for the front-end. WebContents* inspect_ui = web_ui()->GetWebContents(); @@ -643,8 +664,9 @@ } void InspectUI::StartListeningNotifications() { - if (!target_handlers_.empty()) // Possible when reloading the page. + if (!target_handlers_.empty()) { // Possible when reloading the page. StopListeningNotifications(); + } Profile* profile = Profile::FromWebUI(web_ui()); @@ -696,8 +718,9 @@ } void InspectUI::StopListeningNotifications() { - if (target_handlers_.empty()) + if (target_handlers_.empty()) { return; + } target_handlers_.clear(); @@ -747,8 +770,9 @@ auto default_set = GetPrefValue(prefs::kDevToolsPortForwardingDefaultSet)->GetIfBool(); - if (!default_set || default_set.value()) + if (!default_set || default_set.value()) { return; + } // This is the first chrome://inspect invocation on a fresh profile or after // upgrade from a version that did not have kDevToolsPortForwardingDefaultSet. @@ -756,17 +780,20 @@ auto enabled = GetPrefValue(prefs::kDevToolsPortForwardingEnabled)->GetIfBool(); - if (!enabled) + if (!enabled) { return; + } const base::Value::Dict* config = GetPrefValue(prefs::kDevToolsPortForwardingConfig)->GetIfDict(); - if (!config) + if (!config) { return; + } // Do nothing if user already took explicit action. - if (enabled.value() || !config->empty()) + if (enabled.value() || !config->empty()) { return; + } base::Value::Dict default_config; default_config.Set(kInspectUiPortForwardingDefaultPort, @@ -793,10 +820,11 @@ } scoped_refptr<content::DevToolsAgentHost> InspectUI::FindTarget( - const std::string& source_id, const std::string& target_id) { + const std::string& source_id, + const std::string& target_id) { auto it = target_handlers_.find(source_id); - return it != target_handlers_.end() ? - it->second->GetTarget(target_id) : nullptr; + return it != target_handlers_.end() ? it->second->GetTarget(target_id) + : nullptr; } void InspectUI::PopulateTargets(const std::string& source,
diff --git a/chrome/browser/ui/webui/inspect_ui.h b/chrome/browser/ui/webui/inspect_ui.h index 5ac5aee..96e683b 100644 --- a/chrome/browser/ui/webui/inspect_ui.h +++ b/chrome/browser/ui/webui/inspect_ui.h
@@ -57,10 +57,9 @@ const std::string& browser_id, const std::string& url); void Pause(const std::string& source_id, const std::string& target_id); - void InspectBrowserWithCustomFrontend( - const std::string& source_id, - const std::string& browser_id, - const GURL& frontend_url); + void InspectBrowserWithCustomFrontend(const std::string& source_id, + const std::string& browser_id, + const GURL& frontend_url); void PopulateNativeUITargets(const base::Value::List& targets); void ShowNativeUILaunchButton(bool enabled); @@ -88,8 +87,7 @@ void AddTargetUIHandler(std::unique_ptr<DevToolsTargetsUIHandler> handler); - DevToolsTargetsUIHandler* FindTargetHandler( - const std::string& source_id); + DevToolsTargetsUIHandler* FindTargetHandler(const std::string& source_id); scoped_refptr<content::DevToolsAgentHost> FindTarget( const std::string& source_id, const std::string& target_id);
diff --git a/chrome/browser/ui/webui/internals/internals_ui.cc b/chrome/browser/ui/webui/internals/internals_ui.cc index c420812..c35effc 100644 --- a/chrome/browser/ui/webui/internals/internals_ui.cc +++ b/chrome/browser/ui/webui/internals/internals_ui.cc
@@ -25,8 +25,9 @@ bool ShouldHandleWebUIRequestCallback(const std::string& path) { #if BUILDFLAG(ENABLE_SESSION_SERVICE) - if (SessionServiceInternalsHandler::ShouldHandleWebUIRequestCallback(path)) + if (SessionServiceInternalsHandler::ShouldHandleWebUIRequestCallback(path)) { return true; + } #endif return false; }
diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc index 18ace87..a58c87f 100644 --- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc +++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
@@ -173,12 +173,14 @@ ssl_info.cert = ssl_info.unverified_cert = CreateFakeCert(); // This delegate doesn't create an interstitial. int options_mask = 0; - if (overridable) + if (overridable) { options_mask |= security_interstitials::SSLErrorOptionsMask::SOFT_OVERRIDE_ENABLED; - if (strict_enforcement) + } + if (strict_enforcement) { options_mask |= security_interstitials::SSLErrorOptionsMask::STRICT_ENFORCEMENT; + } ChromeSecurityBlockingPageFactory blocking_page_factory; return blocking_page_factory.CreateSSLPage(web_contents, cert_error, ssl_info, request_url, options_mask, @@ -442,8 +444,9 @@ std::string url_param; if (net::GetValueForKeyInQuery(web_contents->GetVisibleURL(), "url", &url_param)) { - if (GURL(url_param).is_valid()) + if (GURL(url_param).is_valid()) { request_url = GURL(url_param); + } } std::string type_param; bool is_giant_webview = false; @@ -503,14 +506,16 @@ std::string request_url_param; if (net::GetValueForKeyInQuery(web_contents->GetVisibleURL(), "url", &request_url_param)) { - if (GURL(request_url_param).is_valid()) + if (GURL(request_url_param).is_valid()) { request_url = GURL(request_url_param); + } } std::string landing_url_param; if (net::GetValueForKeyInQuery(web_contents->GetVisibleURL(), "landing_page", &landing_url_param)) { - if (GURL(landing_url_param).is_valid()) + if (GURL(landing_url_param).is_valid()) { landing_url = GURL(landing_url_param); + } } std::string wifi_connection_param; if (net::GetValueForKeyInQuery(web_contents->GetVisibleURL(), "is_wifi",
diff --git a/chrome/browser/ui/webui/managed_ui_handler.cc b/chrome/browser/ui/webui/managed_ui_handler.cc index 5a9861e..7469214 100644 --- a/chrome/browser/ui/webui/managed_ui_handler.cc +++ b/chrome/browser/ui/webui/managed_ui_handler.cc
@@ -79,8 +79,9 @@ // Manually add/remove observers. ScopedObserver doesn't work with // PolicyService::Observer because AddObserver() takes 2 arguments. void ManagedUIHandler::AddObservers() { - if (has_observers_) + if (has_observers_) { return; + } has_observers_ = true; @@ -96,8 +97,9 @@ } void ManagedUIHandler::RemoveObservers() { - if (!has_observers_) + if (!has_observers_) { return; + } has_observers_ = false; @@ -124,8 +126,9 @@ void ManagedUIHandler::NotifyIfChanged() { bool managed = chrome::ShouldDisplayManagedUi(profile_); - if (managed == managed_) + if (managed == managed_) { return; + } managed_ = managed; FireWebUIListener("is-managed-changed", base::Value(managed)); content::WebUIDataSource::Update(profile_, source_name_,
diff --git a/chrome/browser/ui/webui/management/management_ui_handler.cc b/chrome/browser/ui/webui/management/management_ui_handler.cc index 0482385..36a13ec 100644 --- a/chrome/browser/ui/webui/management/management_ui_handler.cc +++ b/chrome/browser/ui/webui/management/management_ui_handler.cc
@@ -424,17 +424,17 @@ const char* title; const char* permission; } analysis_connector_permissions[] = { - {enterprise_connectors::FILE_ATTACHED, kManagementOnFileAttachedEvent, - kManagementOnFileAttachedVisibleData}, - {enterprise_connectors::FILE_DOWNLOADED, kManagementOnFileDownloadedEvent, - kManagementOnFileDownloadedVisibleData}, - {enterprise_connectors::BULK_DATA_ENTRY, kManagementOnBulkDataEntryEvent, - kManagementOnBulkDataEntryVisibleData}, - {enterprise_connectors::PRINT, kManagementOnPrintEvent, - kManagementOnPrintVisibleData}, + {enterprise_connectors::FILE_ATTACHED, kManagementOnFileAttachedEvent, + kManagementOnFileAttachedVisibleData}, + {enterprise_connectors::FILE_DOWNLOADED, kManagementOnFileDownloadedEvent, + kManagementOnFileDownloadedVisibleData}, + {enterprise_connectors::BULK_DATA_ENTRY, kManagementOnBulkDataEntryEvent, + kManagementOnBulkDataEntryVisibleData}, + {enterprise_connectors::PRINT, kManagementOnPrintEvent, + kManagementOnPrintVisibleData}, #if BUILDFLAG(IS_CHROMEOS) - {enterprise_connectors::FILE_TRANSFER, kManagementOnFileTransferEvent, - kManagementOnFileTransferVisibleData}, + {enterprise_connectors::FILE_TRANSFER, kManagementOnFileTransferEvent, + kManagementOnFileTransferVisibleData}, #endif }; auto* connectors_service =
diff --git a/chrome/browser/ui/webui/management/management_ui_handler.h b/chrome/browser/ui/webui/management/management_ui_handler.h index be64efa..af389f9 100644 --- a/chrome/browser/ui/webui/management/management_ui_handler.h +++ b/chrome/browser/ui/webui/management/management_ui_handler.h
@@ -120,7 +120,6 @@ const extensions::Extension* extension, extensions::UnloadedExtensionReason reason) override; - // policy::PolicyService::Observer void OnPolicyUpdated(const policy::PolicyNamespace& ns, const policy::PolicyMap& previous,
diff --git a/chrome/browser/ui/webui/management/management_ui_handler_chromeos.h b/chrome/browser/ui/webui/management/management_ui_handler_chromeos.h index 0f98c73..6b553237 100644 --- a/chrome/browser/ui/webui/management/management_ui_handler_chromeos.h +++ b/chrome/browser/ui/webui/management/management_ui_handler_chromeos.h
@@ -20,9 +20,8 @@ class SecureDnsManager; } -class ManagementUIHandlerChromeOS : - public BitmapFetcherDelegate, - public ManagementUIHandler { +class ManagementUIHandlerChromeOS : public BitmapFetcherDelegate, + public ManagementUIHandler { public: explicit ManagementUIHandlerChromeOS(Profile* profile); ManagementUIHandlerChromeOS(const ManagementUIHandlerChromeOS&) = delete;
diff --git a/chrome/browser/ui/webui/management/management_ui_handler_unittest.cc b/chrome/browser/ui/webui/management/management_ui_handler_unittest.cc index 1874dcc..9c8395a 100644 --- a/chrome/browser/ui/webui/management/management_ui_handler_unittest.cc +++ b/chrome/browser/ui/webui/management/management_ui_handler_unittest.cc
@@ -1625,8 +1625,8 @@ std::set<std::string> expected_messages = { kProfileReportingOverview, kProfileReportingUsername, - kProfileReportingBrowser, kProfileReportingExtension, - kProfileReportingPolicy, kProfileReportingLearnMore}; + kProfileReportingBrowser, kProfileReportingExtension, + kProfileReportingPolicy, kProfileReportingLearnMore}; ASSERT_PRED_FORMAT2(MessagesToBeEQ, handler_.GetReportingInfo(/*can_collect_signals=*/false,
diff --git a/chrome/browser/ui/webui/media/media_engagement_ui.cc b/chrome/browser/ui/webui/media/media_engagement_ui.cc index dcdc28b..e3f04aa 100644 --- a/chrome/browser/ui/webui/media/media_engagement_ui.cc +++ b/chrome/browser/ui/webui/media/media_engagement_ui.cc
@@ -115,8 +115,9 @@ std::vector<component_updater::ComponentInfo> info = cus->GetComponents(); for (const auto& component : info) { - if (component.id == kPreloadComponentID) + if (component.id == kPreloadComponentID) { return component.version.GetString(); + } } return std::string();
diff --git a/chrome/browser/ui/webui/media/webrtc_logs_ui.cc b/chrome/browser/ui/webui/media/webrtc_logs_ui.cc index f191b77c..538ac79 100644 --- a/chrome/browser/ui/webui/media/webrtc_logs_ui.cc +++ b/chrome/browser/ui/webui/media/webrtc_logs_ui.cc
@@ -305,8 +305,9 @@ // If we haven't set |value_w| above, we fall back on the upload time, which // was already in the variable. In case it's empty set the string to // inform that the time is unknown. - if (value_w.empty()) + if (value_w.empty()) { value_w = std::u16string(u"(unknown time)"); + } upload_value.Set("capture_time", value_w); result.Append(std::move(upload_value));
diff --git a/chrome/browser/ui/webui/metrics_handler.cc b/chrome/browser/ui/webui/metrics_handler.cc index 3f5737d..64675006 100644 --- a/chrome/browser/ui/webui/metrics_handler.cc +++ b/chrome/browser/ui/webui/metrics_handler.cc
@@ -69,10 +69,9 @@ // As |histogram_name| may change between calls, the UMA_HISTOGRAM_ENUMERATION // macro cannot be used here. - base::HistogramBase* counter = - base::LinearHistogram::FactoryGet( - histogram_name, 1, int_boundary_value, bucket_count + 1, - base::HistogramBase::kUmaTargetedHistogramFlag); + base::HistogramBase* counter = base::LinearHistogram::FactoryGet( + histogram_name, 1, int_boundary_value, bucket_count + 1, + base::HistogramBase::kUmaTargetedHistogramFlag); counter->Add(int_value); }
diff --git a/chrome/browser/ui/webui/metrics_reporter/metrics_reporter_unittest.cc b/chrome/browser/ui/webui/metrics_reporter/metrics_reporter_unittest.cc index a0649e5d..313e4310 100644 --- a/chrome/browser/ui/webui/metrics_reporter/metrics_reporter_unittest.cc +++ b/chrome/browser/ui/webui/metrics_reporter/metrics_reporter_unittest.cc
@@ -52,8 +52,9 @@ [](std::optional<base::TimeTicks> expected_time, std::optional<base::TimeDelta> time) { EXPECT_EQ(expected_time.has_value(), time.has_value()); - if (time.has_value()) + if (time.has_value()) { EXPECT_EQ(time, expected_time->since_origin()); + } }, expected_time); }
diff --git a/chrome/browser/ui/webui/metrics_reporter/mock_metrics_reporter.h b/chrome/browser/ui/webui/metrics_reporter/mock_metrics_reporter.h index ff2d7e31..8b9feba7 100644 --- a/chrome/browser/ui/webui/metrics_reporter/mock_metrics_reporter.h +++ b/chrome/browser/ui/webui/metrics_reporter/mock_metrics_reporter.h
@@ -6,7 +6,6 @@ #define CHROME_BROWSER_UI_WEBUI_METRICS_REPORTER_MOCK_METRICS_REPORTER_H_ #include "chrome/browser/ui/webui/metrics_reporter/metrics_reporter.h" - #include "testing/gmock/include/gmock/gmock.h" class MockMetricsReporter : public MetricsReporter {
diff --git a/chrome/browser/ui/webui/nacl_ui.cc b/chrome/browser/ui/webui/nacl_ui.cc index 04c797cb..cb64901 100644 --- a/chrome/browser/ui/webui/nacl_ui.cc +++ b/chrome/browser/ui/webui/nacl_ui.cc
@@ -142,8 +142,7 @@ NaClDomHandler::NaClDomHandler() : has_plugin_info_(false), pnacl_path_validated_(false), - pnacl_path_exists_(false) { -} + pnacl_path_exists_(false) {} NaClDomHandler::~NaClDomHandler() = default; @@ -176,8 +175,8 @@ bool NaClDomHandler::isPluginEnabled(size_t plugin_index) { std::vector<content::WebPluginInfo> info_array; - PluginService::GetInstance()->GetPluginInfoArray( - GURL(), "application/x-nacl", false, &info_array, NULL); + PluginService::GetInstance()->GetPluginInfoArray(GURL(), "application/x-nacl", + false, &info_array, NULL); PluginPrefs* plugin_prefs = PluginPrefs::GetForProfile(Profile::FromWebUI(web_ui())).get(); return (!info_array.empty() && @@ -202,8 +201,8 @@ void NaClDomHandler::AddPluginList(base::Value::List* list) { // Obtain the version of the NaCl plugin. std::vector<content::WebPluginInfo> info_array; - PluginService::GetInstance()->GetPluginInfoArray( - GURL(), "application/x-nacl", false, &info_array, NULL); + PluginService::GetInstance()->GetPluginInfoArray(GURL(), "application/x-nacl", + false, &info_array, NULL); std::u16string nacl_version; std::u16string nacl_key = u"NaCl plugin"; if (info_array.empty()) { @@ -256,9 +255,8 @@ void NaClDomHandler::AddNaClInfo(base::Value::List* list) { std::u16string nacl_enabled_string = u"Disabled"; - if (isPluginEnabled(0) && - base::CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnableNaCl)) { + if (isPluginEnabled(0) && base::CommandLine::ForCurrentProcess()->HasSwitch( + switches::kEnableNaCl)) { nacl_enabled_string = u"Enabled by flag '--enable-nacl'"; } AddPair(list, u"Native Client (non-portable, outside web store)", @@ -319,14 +317,16 @@ JSONFileValueDeserializer deserializer(pnacl_json_path); std::string error; std::unique_ptr<base::Value> root = deserializer.Deserialize(nullptr, &error); - if (!root || !root->is_dict()) + if (!root || !root->is_dict()) { return; + } // Now try to get the field. This may leave version empty if the // the "get" fails (no key, or wrong type). if (const std::string* ptr = root->GetDict().FindString("pnacl-version")) { - if (base::IsStringASCII(*ptr)) + if (base::IsStringASCII(*ptr)) { *version = *ptr; + } } } @@ -344,8 +344,9 @@ void NaClDomHandler::MaybeRespondToPage() { // Don't reply until everything is ready. The page will show a 'loading' // message until then. - if (callback_id_.empty() || !has_plugin_info_) + if (callback_id_.empty() || !has_plugin_info_) { return; + } if (!pnacl_path_validated_) { std::string* version_string = new std::string;
diff --git a/chrome/browser/ui/webui/nearby_internals/nearby_internals_contact_handler.cc b/chrome/browser/ui/webui/nearby_internals/nearby_internals_contact_handler.cc index 05b57a6..86d7e23 100644 --- a/chrome/browser/ui/webui/nearby_internals/nearby_internals_contact_handler.cc +++ b/chrome/browser/ui/webui/nearby_internals/nearby_internals_contact_handler.cc
@@ -67,8 +67,9 @@ if (contacts) { base::Value::List contact_list; contact_list.reserve(contacts->size()); - for (const auto& contact : *contacts) + for (const auto& contact : *contacts) { contact_list.Append(ContactRecordToReadableDictionary(contact)); + } dictionary.Set(kContactMessageContactRecordKey, FormatListAsJSON(contact_list));
diff --git a/chrome/browser/ui/webui/nearby_internals/nearby_internals_prefs_handler.cc b/chrome/browser/ui/webui/nearby_internals/nearby_internals_prefs_handler.cc index 09ffb09..ce0b32b2 100644 --- a/chrome/browser/ui/webui/nearby_internals/nearby_internals_prefs_handler.cc +++ b/chrome/browser/ui/webui/nearby_internals/nearby_internals_prefs_handler.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/webui/nearby_internals/nearby_internals_prefs_handler.h" + #include "base/functional/bind.h" #include "chrome/browser/nearby_sharing/common/nearby_share_prefs.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/webui/nearby_internals/quick_pair/quick_pair_handler.h b/chrome/browser/ui/webui/nearby_internals/quick_pair/quick_pair_handler.h index e2045b01a..c5b871e4 100644 --- a/chrome/browser/ui/webui/nearby_internals/quick_pair/quick_pair_handler.h +++ b/chrome/browser/ui/webui/nearby_internals/quick_pair/quick_pair_handler.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_NEARBY_INTERNALS_QUICK_PAIR_QUICK_PAIR_HANDLER_H_ #include <memory> + #include "ash/quick_pair/common/log_buffer.h" #include "ash/quick_pair/common/logging.h" #include "base/functional/callback.h"
diff --git a/chrome/browser/ui/webui/nearby_share/nearby_share_dialog_ui.cc b/chrome/browser/ui/webui/nearby_share/nearby_share_dialog_ui.cc index 666b09b..fb55218 100644 --- a/chrome/browser/ui/webui/nearby_share/nearby_share_dialog_ui.cc +++ b/chrome/browser/ui/webui/nearby_share/nearby_share_dialog_ui.cc
@@ -57,8 +57,9 @@ bool NearbyShareDialogUIConfig::IsWebUIEnabled( content::BrowserContext* browser_context) { - if (browser_context->IsOffTheRecord()) + if (browser_context->IsOffTheRecord()) { return false; + } return NearbySharingServiceFactory::IsNearbyShareSupportedForBrowserContext( browser_context); } @@ -191,8 +192,9 @@ } void NearbyShareDialogUI::HandleClose(const base::Value::List& args) { - if (!sharesheet_controller_) + if (!sharesheet_controller_) { return; + } CHECK_EQ(1u, args.size()); CHECK_GE(args[0].GetInt(), 0);
diff --git a/chrome/browser/ui/webui/nearby_share/nearby_share_dialog_ui_browsertest.cc b/chrome/browser/ui/webui/nearby_share/nearby_share_dialog_ui_browsertest.cc index fcf9af58..ebc8aee 100644 --- a/chrome/browser/ui/webui/nearby_share/nearby_share_dialog_ui_browsertest.cc +++ b/chrome/browser/ui/webui/nearby_share/nearby_share_dialog_ui_browsertest.cc
@@ -2,13 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/webui/nearby_share/nearby_share_dialog_ui.h" + #include "base/strings/stringprintf.h" #include "chrome/browser/nearby_sharing/common/nearby_share_features.h" #include "chrome/browser/sharesheet/sharesheet_controller.h" #include "chrome/browser/sharesheet/sharesheet_types.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/browser/ui/webui/nearby_share/nearby_share_dialog_ui.h" #include "chrome/common/webui_url_constants.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h"
diff --git a/chrome/browser/ui/webui/net_export_ui.cc b/chrome/browser/ui/webui/net_export_ui.cc index 42a584f..24c1decd 100644 --- a/chrome/browser/ui/webui/net_export_ui.cc +++ b/chrome/browser/ui/webui/net_export_ui.cc
@@ -58,8 +58,8 @@ namespace { // May only be accessed on the UI thread -base::LazyInstance<base::FilePath>::Leaky - last_save_dir = LAZY_INSTANCE_INITIALIZER; +base::LazyInstance<base::FilePath>::Leaky last_save_dir = + LAZY_INSTANCE_INITIALIZER; void CreateAndAddNetExportHTMLSource(Profile* profile) { content::WebUIDataSource* source = content::WebUIDataSource::CreateAndAdd( @@ -160,8 +160,9 @@ NetExportMessageHandler::~NetExportMessageHandler() { // There may be a pending file dialog, it needs to be told that the user // has gone away so that it doesn't try to call back. - if (select_file_dialog_) + if (select_file_dialog_) { select_file_dialog_->ListenerDestroyed(); + } file_writer_->StopNetLog(); } @@ -223,10 +224,12 @@ if (UsingMobileUI()) { StartNetLog(base::FilePath()); } else { - base::FilePath initial_dir = last_save_dir.Pointer()->empty() ? - DownloadPrefs::FromBrowserContext( - web_ui()->GetWebContents()->GetBrowserContext())->DownloadPath() : - *last_save_dir.Pointer(); + base::FilePath initial_dir = + last_save_dir.Pointer()->empty() + ? DownloadPrefs::FromBrowserContext( + web_ui()->GetWebContents()->GetBrowserContext()) + ->DownloadPath() + : *last_save_dir.Pointer(); base::FilePath initial_path = initial_dir.Append(FILE_PATH_LITERAL("chrome-net-export-log.json")); ShowSelectFileDialog(initial_path); @@ -290,8 +293,9 @@ void NetExportMessageHandler::SendEmail(const base::FilePath& file_to_send) { DCHECK_CURRENTLY_ON(BrowserThread::UI); #if BUILDFLAG(IS_ANDROID) - if (file_to_send.empty()) + if (file_to_send.empty()) { return; + } std::string email; std::string subject = "net_internals_log"; std::string title = "Issue number: "; @@ -318,8 +322,9 @@ void NetExportMessageHandler::ShowFileInShell(const base::FilePath& path) { DCHECK_CURRENTLY_ON(BrowserThread::UI); - if (path.empty()) + if (path.empty()) { return; + } // (The |profile| parameter is relevant for Chrome OS) Profile* profile = Profile::FromWebUI(web_ui()); @@ -347,8 +352,9 @@ const base::FilePath& default_path) { // User may have clicked more than once before the save dialog appears. // This prevents creating more than one save dialog. - if (select_file_dialog_) + if (select_file_dialog_) { return; + } WebContents* webcontents = web_ui()->GetWebContents();
diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc index e49e417f..8eab6ab 100644 --- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
@@ -554,7 +554,6 @@ } // namespace - //////////////////////////////////////////////////////////////////////////////// // // NetInternalsUI
diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc index 535c12e..869b009 100644 --- a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc
@@ -376,8 +376,9 @@ ASSERT_TRUE(browser()); auto resolve_host_parameters = network::mojom::ResolveHostParameters::New(); - if (local) + if (local) { resolve_host_parameters->source = net::HostResolverSource::LOCAL_ONLY; + } mojo::PendingRemote<network::mojom::ResolveHostClient> client; // DnsLookupClient owns itself. new DnsLookupClient(
diff --git a/chrome/browser/ui/webui/new_tab_page/foo/foo_handler.cc b/chrome/browser/ui/webui/new_tab_page/foo/foo_handler.cc index 9cd81b06..ba5042a 100644 --- a/chrome/browser/ui/webui/new_tab_page/foo/foo_handler.cc +++ b/chrome/browser/ui/webui/new_tab_page/foo/foo_handler.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/webui/new_tab_page/foo/foo_handler.h" + #include "base/strings/string_number_conversions.h" FooHandler::FooHandler(mojo::PendingReceiver<foo::mojom::FooHandler> handler)
diff --git a/chrome/browser/ui/webui/new_tab_page/new_tab_page_handler.cc b/chrome/browser/ui/webui/new_tab_page/new_tab_page_handler.cc index c4844a9..4b9e5ff 100644 --- a/chrome/browser/ui/webui/new_tab_page/new_tab_page_handler.cc +++ b/chrome/browser/ui/webui/new_tab_page/new_tab_page_handler.cc
@@ -344,12 +344,14 @@ // PromoService to base::Value. The middle-slot promo part is then reencoded // from base::Value to a JSON string stored in |data.middle_slot_json|. auto middle_slot = base::JSONReader::Read(data.middle_slot_json); - if (!middle_slot.has_value()) + if (!middle_slot.has_value()) { return nullptr; + } base::Value::Dict& middle_slot_dict = middle_slot->GetDict(); - if (middle_slot_dict.FindBoolByDottedPath("hidden").value_or(false)) + if (middle_slot_dict.FindBoolByDottedPath("hidden").value_or(false)) { return nullptr; + } auto promo = new_tab_page::mojom::Promo::New(); promo->id = data.promo_id; @@ -682,8 +684,9 @@ void NewTabPageHandler::ChooseLocalCustomBackground( ChooseLocalCustomBackgroundCallback callback) { // Early return if the select file dialog is already active. - if (select_file_dialog_) + if (select_file_dialog_) { return; + } select_file_dialog_ = ui::SelectFileDialog::Create( this, std::make_unique<ChromeSelectFilePolicy>(web_contents_)); @@ -744,8 +747,9 @@ base::Value::List& list = update.Get(); base::Value module_id_value(module_id); if (disabled) { - if (!base::Contains(list, module_id_value)) + if (!base::Contains(list, module_id_value)) { list.Append(std::move(module_id_value)); + } } else { list.EraseValue(module_id_value); } @@ -1275,8 +1279,9 @@ LogEvent(NTP_CUSTOMIZE_LOCAL_IMAGE_DONE); LogEvent(NTP_BACKGROUND_UPLOAD_DONE); - if (choose_local_custom_background_callback_) + if (choose_local_custom_background_callback_) { std::move(choose_local_custom_background_callback_).Run(true); + } } void NewTabPageHandler::FileSelectionCanceled() { @@ -1286,8 +1291,9 @@ // with the event. LogEvent(NTP_CUSTOMIZE_LOCAL_IMAGE_CANCEL); LogEvent(NTP_BACKGROUND_UPLOAD_CANCEL); - if (choose_local_custom_background_callback_) + if (choose_local_custom_background_callback_) { std::move(choose_local_custom_background_callback_).Run(false); + } } void NewTabPageHandler::OnTabInterfaceChanged() { @@ -1335,8 +1341,7 @@ logo->metadata.type, logo->dark_encoded_image->as_string(), logo->metadata.dark_mime_type, logo->metadata.dark_animated_url, logo->metadata.dark_width_px, logo->metadata.dark_height_px, - logo->metadata.dark_background_color, - logo->metadata.dark_log_url, + logo->metadata.dark_background_color, logo->metadata.dark_log_url, logo->metadata.dark_cta_log_url); } if (logo->metadata.on_click_url.is_valid()) {
diff --git a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc index 3092de6..8e20b994 100644 --- a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc +++ b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc
@@ -649,8 +649,9 @@ void NewTabPageUI::BindInterface( mojo::PendingReceiver<browser_command::mojom::CommandHandlerFactory> pending_receiver) { - if (browser_command_factory_receiver_.is_bound()) + if (browser_command_factory_receiver_.is_bound()) { browser_command_factory_receiver_.reset(); + } browser_command_factory_receiver_.Bind(std::move(pending_receiver)); } @@ -786,8 +787,9 @@ // should not directly access any member variables. void NewTabPageUI::OnColorProviderChanged() { base::Value::Dict update; - if (!web_contents() || !web_ui()) + if (!web_contents() || !web_ui()) { return; + } const ui::ColorProvider& color_provider = web_contents()->GetColorProvider(); auto background_color = color_provider.GetColor(kColorNewTabPageBackground); update.Set("backgroundColor", skia::SkColorToHexString(background_color));
diff --git a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.h b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.h index f2abd4b..efc1b3a 100644 --- a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.h +++ b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.h
@@ -96,14 +96,13 @@ bool IsWebUIEnabled(content::BrowserContext* browser_context) override; }; -class NewTabPageUI - : public ui::MojoWebUIController, - public new_tab_page::mojom::PageHandlerFactory, - public most_visited::mojom::MostVisitedPageHandlerFactory, - public browser_command::mojom::CommandHandlerFactory, - public help_bubble::mojom::HelpBubbleHandlerFactory, - public NtpCustomBackgroundServiceObserver, - content::WebContentsObserver { +class NewTabPageUI : public ui::MojoWebUIController, + public new_tab_page::mojom::PageHandlerFactory, + public most_visited::mojom::MostVisitedPageHandlerFactory, + public browser_command::mojom::CommandHandlerFactory, + public help_bubble::mojom::HelpBubbleHandlerFactory, + public NtpCustomBackgroundServiceObserver, + content::WebContentsObserver { public: explicit NewTabPageUI(content::WebUI* web_ui);
diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.cc b/chrome/browser/ui/webui/ntp/new_tab_ui.cc index 8f7f067..f18b4bb 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_ui.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_ui.cc
@@ -73,8 +73,9 @@ const char kLTRHtmlTextDirection[] = "ltr"; const char* GetHtmlTextDirection(const std::u16string& text) { - if (base::i18n::IsRTL() && base::i18n::StringContainsStrongRTLChars(text)) + if (base::i18n::IsRTL() && base::i18n::StringContainsStrongRTLChars(text)) { return kRTLHtmlTextDirection; + } return kLTRHtmlTextDirection; } @@ -141,10 +142,11 @@ // title will be rendered as "!Yahoo" if its "dir" attribute is not set to // "ltr". std::string direction; - if (using_url_as_the_title) + if (using_url_as_the_title) { direction = kLTRHtmlTextDirection; - else + } else { direction = GetHtmlTextDirection(title); + } dictionary->Set("title", title_to_set); dictionary->Set("direction", direction);
diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc b/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc index 7b88870..1970e9a 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc
@@ -45,9 +45,7 @@ class NewTabUIBrowserTest : public InProcessBrowserTest { public: - NewTabUIBrowserTest() { - logging::SetLogMessageHandler(&HandleMessage); - } + NewTabUIBrowserTest() { logging::SetLogMessageHandler(&HandleMessage); } ~NewTabUIBrowserTest() override { logging::SetLogMessageHandler(nullptr); }
diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc index b8fd352..9fa644a 100644 --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
@@ -156,19 +156,23 @@ NTPResourceCache::~NTPResourceCache() = default; NTPResourceCache::WindowType NTPResourceCache::GetWindowType(Profile* profile) { - if (profile->IsGuestSession()) + if (profile->IsGuestSession()) { return GUEST; - if (profile->IsIncognitoProfile()) + } + if (profile->IsIncognitoProfile()) { return INCOGNITO; - if (profile->IsOffTheRecord()) + } + if (profile->IsOffTheRecord()) { return NON_PRIMARY_OTR; + } return NORMAL; } base::RefCountedMemory* NTPResourceCache::GetNewTabGuestHTML() { - if (!new_tab_guest_html_) + if (!new_tab_guest_html_) { CreateNewTabGuestHTML(); + } return new_tab_guest_html_.get(); } @@ -182,8 +186,9 @@ return GetNewTabGuestHTML(); case INCOGNITO: - if (!new_tab_incognito_html_) + if (!new_tab_incognito_html_) { CreateNewTabIncognitoHTML(wc_getter); + } return new_tab_incognito_html_.get(); case NON_PRIMARY_OTR: @@ -204,19 +209,22 @@ DCHECK_CURRENTLY_ON(BrowserThread::UI); // Guest mode doesn't have theme-related CSS. - if (win_type == GUEST) + if (win_type == GUEST) { return nullptr; + } // Returns the cached CSS if it exists. // The cache will be invalidated when the theme of |wc_getter| changes. if (win_type == INCOGNITO) { - if (!new_tab_incognito_css_) + if (!new_tab_incognito_css_) { CreateNewTabIncognitoCSS(wc_getter); + } return new_tab_incognito_css_.get(); } - if (!new_tab_css_) + if (!new_tab_css_) { CreateNewTabCSS(wc_getter); + } return new_tab_css_.get(); }
diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.h b/chrome/browser/ui/webui/ntp/ntp_resource_cache.h index cb0e238..0c6ac54 100644 --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.h +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.h
@@ -33,7 +33,7 @@ namespace ui { class ColorProvider; class ThemeProvider; -} +} // namespace ui SkColor GetThemeColor(const ui::NativeTheme* native_theme, const ui::ColorProvider& cp,
diff --git a/chrome/browser/ui/webui/offline/offline_internals_ui_message_handler.cc b/chrome/browser/ui/webui/offline/offline_internals_ui_message_handler.cc index 31e7ef6..3236d8c9 100644 --- a/chrome/browser/ui/webui/offline/offline_internals_ui_message_handler.cc +++ b/chrome/browser/ui/webui/offline/offline_internals_ui_message_handler.cc
@@ -58,8 +58,9 @@ const offline_pages::MultipleItemStatuses& results) { // If any requests failed, return "failure", else "success". for (const auto& result : results) { - if (result.second == offline_pages::ItemActionStatus::STORE_ERROR) + if (result.second == offline_pages::ItemActionStatus::STORE_ERROR) { return "Store failure, could not delete one or more requests"; + } } return "Success"; @@ -225,8 +226,9 @@ AllowJavascript(); CHECK(!args.empty()); const bool should_record = args[0].GetBool(); - if (offline_page_model_) + if (offline_page_model_) { offline_page_model_->GetLogger()->SetIsLogging(should_record); + } } void OfflineInternalsUIMessageHandler::HandleGetNetworkStatus( @@ -288,8 +290,9 @@ AllowJavascript(); CHECK(!args.empty()); const bool should_record = args[0].GetBool(); - if (request_coordinator_) + if (request_coordinator_) { request_coordinator_->GetLogger()->SetIsLogging(should_record); + } } void OfflineInternalsUIMessageHandler::HandleSetRecordPrefetchService( @@ -299,9 +302,7 @@ } void OfflineInternalsUIMessageHandler::HandleSetLimitlessPrefetchingEnabled( - const base::Value::List& args) { - -} + const base::Value::List& args) {} void OfflineInternalsUIMessageHandler::HandleGetLimitlessPrefetchingEnabled( const base::Value::List& args) { @@ -342,10 +343,12 @@ const base::Value& callback_id = args[0]; std::vector<std::string> logs; - if (offline_page_model_) + if (offline_page_model_) { offline_page_model_->GetLogger()->GetLogs(&logs); - if (request_coordinator_) + } + if (request_coordinator_) { request_coordinator_->GetLogger()->GetLogs(&logs); + } std::sort(logs.begin(), logs.end()); base::Value::List result;
diff --git a/chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc b/chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc index b032e93..4989341 100644 --- a/chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc +++ b/chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc
@@ -358,8 +358,9 @@ page_->HandleNewAutocompleteQuery(type, base::UTF16ToUTF8(input.text())); // Kick off ml-disabled autocompletion to show a before/after comparison on // chrome://omnibox/ml. - if (type == mojom::AutocompleteControllerType::kBrowser) + if (type == mojom::AutocompleteControllerType::kBrowser) { ml_disabled_controller_->Start(input); + } } void OmniboxPageHandler::OnResultChanged(AutocompleteController* controller, @@ -374,8 +375,9 @@ input_.text().substr(input_.parts().host.begin, input_.parts().host.len); response->host = base::UTF16ToUTF8(host); bool is_typed_host; - if (!LookupIsTypedHost(host, &is_typed_host)) + if (!LookupIsTypedHost(host, &is_typed_host)) { is_typed_host = false; + } response->is_typed_host = is_typed_host; response->input_text = base::UTF16ToUTF8(input_.text()); @@ -387,9 +389,11 @@ mojo::ConvertTo<std::vector<mojom::AutocompleteMatchPtr>>(matches); } std::vector<scoped_refptr<AutocompleteProvider>> providers = {}; - for (const auto& provider : controller->providers()) - if (controller->ShouldRunProvider(provider.get())) + for (const auto& provider : controller->providers()) { + if (controller->ShouldRunProvider(provider.get())) { providers.push_back(provider); + } + } response->results_by_provider = mojo::ConvertTo<std::vector<mojom::AutocompleteResultsForProviderPtr>>( providers); @@ -412,11 +416,13 @@ // Obtain a vector of all image urls required. std::vector<std::string> image_urls; - for (const auto& match : response->combined_results) + for (const auto& match : response->combined_results) { image_urls.push_back(match->image); + } for (const auto& results_by_provider : response->results_by_provider) { - for (const auto& match : results_by_provider->results) + for (const auto& match : results_by_provider->results) { image_urls.push_back(match->image); + } } auto type = GetAutocompleteControllerType(controller); @@ -462,11 +468,13 @@ history::HistoryService* const history_service = HistoryServiceFactory::GetForProfile(profile_, ServiceAccessType::EXPLICIT_ACCESS); - if (!history_service) + if (!history_service) { return false; + } history::URLDatabase* url_db = history_service->InMemoryDatabase(); - if (!url_db) + if (!url_db) { return false; + } *is_typed_host = url_db->IsTypedHost(base::UTF16ToUTF8(host), /*scheme=*/nullptr); return true; @@ -490,21 +498,24 @@ // variable (or something else) and some providers will short-circuit // important logic and return stale results. In short, we want the // actual results to not depend on the state of the previous request. - if (reset_autocomplete_controller) + if (reset_autocomplete_controller) { controller_ = CreateController(false); + } AutocompleteInput input( base::UTF8ToUTF16(input_string), cursor_position, static_cast<metrics::OmniboxEventProto::PageClassification>( page_classification), ChromeAutocompleteSchemeClassifier(profile_)); GURL current_url_gurl{current_url}; - if (current_url_gurl.is_valid()) + if (current_url_gurl.is_valid()) { input.set_current_url(current_url_gurl); + } input.set_current_title(base::UTF8ToUTF16(current_url)); input.set_prevent_inline_autocomplete(prevent_inline_autocomplete); input.set_prefer_keyword(prefer_keyword); - if (prefer_keyword) + if (prefer_keyword) { input.set_keyword_mode_entry_method(metrics::OmniboxEventProto::TAB); + } input.set_focus_type(zero_suggest ? metrics::OmniboxFocusType::INTERACTION_FOCUS : metrics::OmniboxFocusType::INTERACTION_DEFAULT); @@ -553,8 +564,9 @@ // `HistoryEmbeddingsProvider` only supports 1 query at a time. Running it for // the traditional-scoring controller used in the ML before/after comparisons // would break history embeddings for the other, more important controllers. - if (ml_disabled) + if (ml_disabled) { providers &= ~AutocompleteProvider::TYPE_HISTORY_EMBEDDINGS; + } auto controller = std::make_unique<AutocompleteController>( std::make_unique<ChromeAutocompleteProviderClient>(profile_), providers, @@ -568,10 +580,12 @@ mojom::AutocompleteControllerType OmniboxPageHandler::GetAutocompleteControllerType( AutocompleteController* controller) { - if (controller == controller_.get()) + if (controller == controller_.get()) { return mojom::AutocompleteControllerType::kDebug; - if (controller == ml_disabled_controller_.get()) + } + if (controller == ml_disabled_controller_.get()) { return mojom::AutocompleteControllerType::kMlDisabledDebug; + } return mojom::AutocompleteControllerType::kBrowser; }
diff --git a/chrome/browser/ui/webui/page_not_available_for_guest/page_not_available_for_guest_ui.cc b/chrome/browser/ui/webui/page_not_available_for_guest/page_not_available_for_guest_ui.cc index 4cbcbdbb..af0494b 100644 --- a/chrome/browser/ui/webui/page_not_available_for_guest/page_not_available_for_guest_ui.cc +++ b/chrome/browser/ui/webui/page_not_available_for_guest/page_not_available_for_guest_ui.cc
@@ -22,16 +22,17 @@ content::WebUIDataSource::CreateAndAdd(profile, host_name); std::u16string page_title; - if (host_name == chrome::kChromeUIBookmarksHost) + if (host_name == chrome::kChromeUIBookmarksHost) { page_title = l10n_util::GetStringUTF16(IDS_BOOKMARK_MANAGER_TITLE); - else if (host_name == chrome::kChromeUIHistoryHost) + } else if (host_name == chrome::kChromeUIHistoryHost) { page_title = l10n_util::GetStringUTF16(IDS_HISTORY_TITLE); - else if (host_name == chrome::kChromeUIExtensionsHost) + } else if (host_name == chrome::kChromeUIExtensionsHost) { page_title = l10n_util::GetStringUTF16(IDS_EXTENSIONS_TOOLBAR_TITLE); - else if (host_name == password_manager::kChromeUIPasswordManagerHost) + } else if (host_name == password_manager::kChromeUIPasswordManagerHost) { page_title = l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_UI_TITLE); - else + } else { page_title = base::UTF8ToUTF16(host_name); + } source->AddString("pageTitle", page_title); std::u16string page_heading = l10n_util::GetStringFUTF16(
diff --git a/chrome/browser/ui/webui/password_manager/promo_card.cc b/chrome/browser/ui/webui/password_manager/promo_card.cc index 570baef..958fbd0e 100644 --- a/chrome/browser/ui/webui/password_manager/promo_card.cc +++ b/chrome/browser/ui/webui/password_manager/promo_card.cc
@@ -34,7 +34,6 @@ constexpr char kNumberOfTimesShownKey[] = "number_of_times_shown"; constexpr char kWasDismissedKey[] = "was_dismissed"; - // Creates new pref entry for the promo card with a given id. base::Value::Dict CreatePromoCardPrefEntry(const std::string& id) { base::Value::Dict promo_card_pref_entry;
diff --git a/chrome/browser/ui/webui/policy_indicator_localized_strings_provider.cc b/chrome/browser/ui/webui/policy_indicator_localized_strings_provider.cc index ee87624..bcabd3b 100644 --- a/chrome/browser/ui/webui/policy_indicator_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/policy_indicator_localized_strings_provider.cc
@@ -20,25 +20,27 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source) { int controlled_setting_policy_id = IDS_CONTROLLED_SETTING_POLICY; #if BUILDFLAG(IS_CHROMEOS_ASH) - if (ash::DemoSession::IsDeviceInDemoMode()) + if (ash::DemoSession::IsDeviceInDemoMode()) { controlled_setting_policy_id = IDS_CONTROLLED_SETTING_DEMO_SESSION; + } #endif webui::LocalizedString localized_strings[] = { - {"controlledSettingPolicy", controlled_setting_policy_id}, - {"controlledSettingRecommendedMatches", IDS_CONTROLLED_SETTING_RECOMMENDED}, - {"controlledSettingRecommendedDiffers", - IDS_CONTROLLED_SETTING_HAS_RECOMMENDATION}, - {"controlledSettingExtension", IDS_CONTROLLED_SETTING_EXTENSION}, - {"controlledSettingExtensionWithoutName", - IDS_CONTROLLED_SETTING_EXTENSION_WITHOUT_NAME}, - {"controlledSettingChildRestriction", - IDS_CONTROLLED_SETTING_CHILD_RESTRICTION}, - {"controlledSettingParent", IDS_CONTROLLED_SETTING_PARENT}, + {"controlledSettingPolicy", controlled_setting_policy_id}, + {"controlledSettingRecommendedMatches", + IDS_CONTROLLED_SETTING_RECOMMENDED}, + {"controlledSettingRecommendedDiffers", + IDS_CONTROLLED_SETTING_HAS_RECOMMENDATION}, + {"controlledSettingExtension", IDS_CONTROLLED_SETTING_EXTENSION}, + {"controlledSettingExtensionWithoutName", + IDS_CONTROLLED_SETTING_EXTENSION_WITHOUT_NAME}, + {"controlledSettingChildRestriction", + IDS_CONTROLLED_SETTING_CHILD_RESTRICTION}, + {"controlledSettingParent", IDS_CONTROLLED_SETTING_PARENT}, #if BUILDFLAG(IS_CHROMEOS_ASH) - {"controlledSettingShared", IDS_CONTROLLED_SETTING_SHARED}, - {"controlledSettingWithOwner", IDS_CONTROLLED_SETTING_WITH_OWNER}, - {"controlledSettingNoOwner", IDS_CONTROLLED_SETTING_NO_OWNER}, + {"controlledSettingShared", IDS_CONTROLLED_SETTING_SHARED}, + {"controlledSettingWithOwner", IDS_CONTROLLED_SETTING_WITH_OWNER}, + {"controlledSettingNoOwner", IDS_CONTROLLED_SETTING_NO_OWNER}, #endif }; html_source->AddLocalizedStrings(localized_strings);
diff --git a/chrome/browser/ui/webui/predictors/predictors_handler.cc b/chrome/browser/ui/webui/predictors/predictors_handler.cc index f818eff..f0a351f3 100644 --- a/chrome/browser/ui/webui/predictors/predictors_handler.cc +++ b/chrome/browser/ui/webui/predictors/predictors_handler.cc
@@ -29,7 +29,7 @@ predictors::LoadingPredictorFactory::GetForProfile(profile); } -PredictorsHandler::~PredictorsHandler() { } +PredictorsHandler::~PredictorsHandler() {} void PredictorsHandler::RegisterMessages() { web_ui()->RegisterMessageCallback( @@ -53,8 +53,7 @@ base::Value::List db; for (AutocompleteActionPredictor::DBCacheMap::const_iterator it = autocomplete_action_predictor_->db_cache_.begin(); - it != autocomplete_action_predictor_->db_cache_.end(); - ++it) { + it != autocomplete_action_predictor_->db_cache_.end(); ++it) { db.Append( base::Value::Dict() .Set("user_text", it->first.user_text)
diff --git a/chrome/browser/ui/webui/predictors/predictors_handler.h b/chrome/browser/ui/webui/predictors/predictors_handler.h index 80a5f48d..9c3d228c 100644 --- a/chrome/browser/ui/webui/predictors/predictors_handler.h +++ b/chrome/browser/ui/webui/predictors/predictors_handler.h
@@ -12,7 +12,7 @@ namespace predictors { class AutocompleteActionPredictor; class LoadingPredictor; -} +} // namespace predictors class Profile;
diff --git a/chrome/browser/ui/webui/print_preview/extension_printer_handler.cc b/chrome/browser/ui/webui/print_preview/extension_printer_handler.cc index 8725d261..49d6100 100644 --- a/chrome/browser/ui/webui/print_preview/extension_printer_handler.cc +++ b/chrome/browser/ui/webui/print_preview/extension_printer_handler.cc
@@ -65,8 +65,9 @@ base::ReadOnlySharedMemoryRegion pwg_region) { auto data = base::RefCountedSharedMemoryMapping::CreateFromWholeRegion(pwg_region); - if (data) + if (data) { job->document_bytes = data; + } std::move(callback).Run(std::move(job)); } @@ -94,8 +95,9 @@ const std::string& printer_id) { std::vector<std::string> components = base::SplitString( printer_id, ":", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); - if (components.size() != 3 || components[0] != kProvisionalUsbLabel) + if (components.size() != 3 || components[0] != kProvisionalUsbLabel) { return std::nullopt; + } return ProvisionalUsbPrinter{.extension_id = std::move(components[1]), .device_guid = std::move(components[2])}; } @@ -277,8 +279,9 @@ const gfx::Size& page_size, std::unique_ptr<extensions::PrinterProviderPrintJob> job, PrintJobCallback callback) { - if (!pwg_raster_converter_) + if (!pwg_raster_converter_) { pwg_raster_converter_ = PwgRasterConverter::CreateDefault(); + } PwgRasterSettings bitmap_settings = PwgRasterConverter::GetBitmapSettings(printer_description, print_ticket); @@ -321,13 +324,16 @@ PRINTER_LOG(EVENT) << "ExtensionPrinterHandler::WrapGetPrintersCallback(): " << "printers.size()=" << printers.size() << " done=" << done; - if (!printers.empty()) + if (!printers.empty()) { callback.Run(std::move(printers)); + } - if (done) + if (done) { pending_enumeration_count_--; - if (pending_enumeration_count_ == 0) + } + if (pending_enumeration_count_ == 0) { std::move(done_callback_).Run(); + } } void ExtensionPrinterHandler::WrapGetCapabilityCallback( @@ -369,8 +375,9 @@ for (const auto& extension : registry->enabled_extensions()) { const UsbPrinterManifestData* manifest_data = UsbPrinterManifestData::Get(extension.get()); - if (!manifest_data || !HasUsbPrinterProviderPermissions(extension.get())) + if (!manifest_data || !HasUsbPrinterProviderPermissions(extension.get())) { continue; + } const extensions::DevicePermissions* device_permissions = permissions_manager->GetForExtension(extension->id()); @@ -406,10 +413,12 @@ DCHECK_GT(pending_enumeration_count_, 0); pending_enumeration_count_--; base::Value::List list = std::move(printer_list); - if (!list.empty()) + if (!list.empty()) { callback.Run(std::move(list)); - if (pending_enumeration_count_ == 0) + } + if (pending_enumeration_count_ == 0) { std::move(done_callback_).Run(); + } } } // namespace printing
diff --git a/chrome/browser/ui/webui/print_preview/extension_printer_handler_unittest.cc b/chrome/browser/ui/webui/print_preview/extension_printer_handler_unittest.cc index 67daf84..82972ba 100644 --- a/chrome/browser/ui/webui/print_preview/extension_printer_handler_unittest.cc +++ b/chrome/browser/ui/webui/print_preview/extension_printer_handler_unittest.cc
@@ -257,10 +257,11 @@ base::Value::Dict capability) { ++call_count; base::Value::Dict* capabilities = capability.FindDict(kSettingCapabilities); - if (capabilities) + if (capabilities) { capability_out = std::move(*capabilities); - else + } else { capability_out.clear(); + } } // Used as a callback to StartPrint in tests. @@ -421,16 +422,18 @@ const PrinterProviderPrintJob* GetNextPendingPrintJob() const { EXPECT_GT(pending_print_count(), 0u); - if (pending_print_count() == 0) + if (pending_print_count() == 0) { return nullptr; + } return &pending_print_requests_.front().job; } void TriggerNextPrintCallback(const std::string& result) { ASSERT_GT(pending_print_count(), 0u); base::Value result_value; - if (result != kPrintRequestSuccess) + if (result != kPrintRequestSuccess) { result_value = base::Value(result); + } std::move(pending_print_requests_.front().callback).Run(result_value); pending_print_requests_.pop(); }
diff --git a/chrome/browser/ui/webui/print_preview/local_printer_handler_default_unittest.cc b/chrome/browser/ui/webui/print_preview/local_printer_handler_default_unittest.cc index 6fa6802..b1c5c6e 100644 --- a/chrome/browser/ui/webui/print_preview/local_printer_handler_default_unittest.cc +++ b/chrome/browser/ui/webui/print_preview/local_printer_handler_default_unittest.cc
@@ -233,8 +233,9 @@ if (UseService()) { #if BUILDFLAG(ENABLE_OOP_PRINTING) sandboxed_print_backend_ = base::MakeRefCounted<TestPrintBackend>(); - if (SupportFallback()) + if (SupportFallback()) { unsandboxed_print_backend_ = base::MakeRefCounted<TestPrintBackend>(); + } #if BUILDFLAG(IS_WIN) // To test OOP for Windows, the Print Backend service and Data Decoder
diff --git a/chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc b/chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc index 0cd68be2a..f49b83c 100644 --- a/chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc +++ b/chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc
@@ -205,8 +205,9 @@ } } #endif - if (!pdf_file_saved_closure.is_null()) + if (!pdf_file_saved_closure.is_null()) { std::move(pdf_file_saved_closure).Run(); + } } base::FilePath CreateDirectoryIfNotExists(const base::FilePath& path) { @@ -218,8 +219,9 @@ base::FilePath SelectSaveDirectory(const base::FilePath& path, const base::FilePath& default_path) { - if (base::DirectoryExists(path)) + if (base::DirectoryExists(path)) { return path; + } return CreateDirectoryIfNotExists(default_path); } @@ -248,8 +250,9 @@ sticky_settings_(sticky_settings) {} PdfPrinterHandler::~PdfPrinterHandler() { - if (select_file_dialog_.get()) + if (select_file_dialog_.get()) { select_file_dialog_->ListenerDestroyed(); + } } void PdfPrinterHandler::Reset() { @@ -367,8 +370,9 @@ base::FilePath::StringType ext = default_filename.Extension(); if (!ext.empty()) { ext = ext.substr(1); - if (ext == kPdfExtension) + if (ext == kPdfExtension) { return default_filename; + } } return default_filename.AddExtension(kPdfExtension); } @@ -394,8 +398,9 @@ name = base::FilePath::FromUTF16Unsafe( url_formatter::IDNToUnicode(url.host())); } - if (name.AsUTF8Unsafe() == url.host()) + if (name.AsUTF8Unsafe() == url.host()) { return name.AddExtension(kPdfExtension); + } return name.ReplaceExtension(kPdfExtension); } @@ -476,8 +481,9 @@ print_to_pdf_path_.clear(); - if (print_callback_) + if (print_callback_) { std::move(print_callback_).Run(base::Value()); + } } void PdfPrinterHandler::OnGotUniqueFileName(const base::FilePath& path) { @@ -487,8 +493,9 @@ void PdfPrinterHandler::OnDirectorySelected(const base::FilePath& filename, const base::FilePath& directory) { // Early return if the select file dialog is already active. - if (select_file_dialog_) + if (select_file_dialog_) { return; + } base::FilePath path = directory.Append(filename);
diff --git a/chrome/browser/ui/webui/print_preview/pdf_printer_handler.h b/chrome/browser/ui/webui/print_preview/pdf_printer_handler.h index 325cf8e..a6fbf7a0 100644 --- a/chrome/browser/ui/webui/print_preview/pdf_printer_handler.h +++ b/chrome/browser/ui/webui/print_preview/pdf_printer_handler.h
@@ -18,7 +18,7 @@ namespace base { class FilePath; class RefCountedMemory; -} +} // namespace base namespace content { class WebContents;
diff --git a/chrome/browser/ui/webui/print_preview/pdf_printer_handler_unittest.cc b/chrome/browser/ui/webui/print_preview/pdf_printer_handler_unittest.cc index 3fae2de..0e7d23ef 100644 --- a/chrome/browser/ui/webui/print_preview/pdf_printer_handler_unittest.cc +++ b/chrome/browser/ui/webui/print_preview/pdf_printer_handler_unittest.cc
@@ -350,8 +350,9 @@ expected_capability.GetDict().FindListByDottedPath(kPaperOptionPath); ASSERT_TRUE(expected_paper_options); - for (const PrinterSemanticCapsAndDefaults::Paper& paper : kTestPapers) + for (const PrinterSemanticCapsAndDefaults::Paper& paper : kTestPapers) { expected_paper_options->Append(GetValueFromCustomPaper(paper)); + } SetMacCustomPaperSizesForTesting(kTestPapers);
diff --git a/chrome/browser/ui/webui/print_preview/pdf_printer_handler_win_unittest.cc b/chrome/browser/ui/webui/print_preview/pdf_printer_handler_win_unittest.cc index 605a287..18c73246 100644 --- a/chrome/browser/ui/webui/print_preview/pdf_printer_handler_win_unittest.cc +++ b/chrome/browser/ui/webui/print_preview/pdf_printer_handler_win_unittest.cc
@@ -47,8 +47,7 @@ : PdfPrinterHandler(profile, contents, sticky_settings), save_failed_(false) {} - void FileSelected(const ui::SelectedFileInfo& file, - int index) override { + void FileSelected(const ui::SelectedFileInfo& file, int index) override { // Since we always cancel the dialog as soon as it is initialized, this // should never be called. NOTREACHED();
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc index 7e6bf0f..594b32de 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
@@ -215,8 +215,9 @@ UserActionBuckets DetermineUserAction(const base::Value::Dict& settings) { #if BUILDFLAG(IS_MAC) - if (settings.contains(kSettingOpenPDFInPreview)) + if (settings.contains(kSettingOpenPDFInPreview)) { return UserActionBuckets::kOpenInMacPreview; + } #endif #if BUILDFLAG(IS_CHROMEOS) @@ -238,8 +239,9 @@ NOTREACHED(); } - if (settings.FindBool(kSettingShowSystemDialog).value_or(false)) + if (settings.FindBool(kSettingShowSystemDialog).value_or(false)) { return UserActionBuckets::kFallbackToAdvancedSettingsDialog; + } return UserActionBuckets::kPrintToPrinter; } @@ -260,18 +262,22 @@ ptr->print_header_footer_default == crosapi::mojom::Policies::OptionalBool::kTrue); } - if (!header_footer_policy.empty()) + if (!header_footer_policy.empty()) { policies.Set(kHeaderFooter, std::move(header_footer_policy)); + } base::Value::Dict background_graphics_policy; int value = static_cast<int>(ptr->allowed_background_graphics_modes); - if (value) + if (value) { background_graphics_policy.Set(kAllowedMode, value); + } value = static_cast<int>(ptr->background_graphics_default); - if (value) + if (value) { background_graphics_policy.Set(kDefaultMode, value); - if (!background_graphics_policy.empty()) + } + if (!background_graphics_policy.empty()) { policies.Set(kCssBackground, std::move(background_graphics_policy)); + } base::Value::Dict paper_size_policy; const std::optional<gfx::Size>& default_paper_size = ptr->paper_size_default; @@ -283,8 +289,9 @@ default_paper_size.value().height()); paper_size_policy.Set(kDefaultMode, std::move(default_paper_size_value)); } - if (!paper_size_policy.empty()) + if (!paper_size_policy.empty()) { policies.Set(kMediaSize, std::move(paper_size_policy)); + } if (ptr->max_sheets_allowed_has_value) { base::Value::Dict sheets_policy; @@ -293,30 +300,40 @@ } base::Value::Dict color_policy; - if (ptr->allowed_color_modes) + if (ptr->allowed_color_modes) { color_policy.Set(kAllowedMode, static_cast<int>(ptr->allowed_color_modes)); - if (ptr->default_color_mode != printing::mojom::ColorModeRestriction::kUnset) + } + if (ptr->default_color_mode != + printing::mojom::ColorModeRestriction::kUnset) { color_policy.Set(kDefaultMode, static_cast<int>(ptr->default_color_mode)); - if (!color_policy.empty()) + } + if (!color_policy.empty()) { policies.Set(kColor, std::move(color_policy)); + } base::Value::Dict duplex_policy; - if (ptr->allowed_duplex_modes) + if (ptr->allowed_duplex_modes) { duplex_policy.Set(kAllowedMode, static_cast<int>(ptr->allowed_duplex_modes)); + } if (ptr->default_duplex_mode != - printing::mojom::DuplexModeRestriction::kUnset) + printing::mojom::DuplexModeRestriction::kUnset) { duplex_policy.Set(kDefaultMode, static_cast<int>(ptr->default_duplex_mode)); - if (!duplex_policy.empty()) + } + if (!duplex_policy.empty()) { policies.Set(kDuplex, std::move(duplex_policy)); + } base::Value::Dict pin_policy; - if (ptr->allowed_pin_modes != printing::mojom::PinModeRestriction::kUnset) + if (ptr->allowed_pin_modes != printing::mojom::PinModeRestriction::kUnset) { pin_policy.Set(kAllowedMode, static_cast<int>(ptr->allowed_pin_modes)); - if (ptr->default_pin_mode != printing::mojom::PinModeRestriction::kUnset) + } + if (ptr->default_pin_mode != printing::mojom::PinModeRestriction::kUnset) { pin_policy.Set(kDefaultMode, static_cast<int>(ptr->default_pin_mode)); - if (!pin_policy.empty()) + } + if (!pin_policy.empty()) { policies.Set(kPin, std::move(pin_policy)); + } base::Value::Dict print_as_image_for_pdf_default_policy; if (ptr->default_print_pdf_as_image != @@ -347,8 +364,9 @@ prefs.GetBoolean(prefs::kPrintHeaderFooter)); } } - if (!header_footer_policy.empty()) + if (!header_footer_policy.empty()) { policies.Set(kHeaderFooter, std::move(header_footer_policy)); + } base::Value::Dict background_graphics_policy; if (prefs.HasPrefPath(prefs::kPrintingAllowedBackgroundGraphicsModes)) { @@ -361,8 +379,9 @@ kDefaultMode, prefs.GetInteger(prefs::kPrintingBackgroundGraphicsDefault)); } - if (!background_graphics_policy.empty()) + if (!background_graphics_policy.empty()) { policies.Set(kCssBackground, std::move(background_graphics_policy)); + } base::Value::Dict paper_size_policy; std::optional<gfx::Size> default_paper_size = ParsePaperSizeDefault(prefs); @@ -374,8 +393,9 @@ default_paper_size.value().height()); paper_size_policy.Set(kDefaultMode, std::move(default_paper_size_value)); } - if (!paper_size_policy.empty()) + if (!paper_size_policy.empty()) { policies.Set(kMediaSize, std::move(paper_size_policy)); + } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) base::Value::Dict print_as_image_available_for_pdf_policy; @@ -490,8 +510,9 @@ void PrintPreviewHandler::ReadPrinterTypeDenyListFromPrefs() { #if BUILDFLAG(IS_CHROMEOS) - if (!local_printer_) + if (!local_printer_) { return; + } local_printer_->GetPrinterTypeDenyList( base::BindOnce(&PrintPreviewHandler::OnPrinterTypeDenyListReady, @@ -499,8 +520,9 @@ return; #else PrefService* prefs = GetPrefs(); - if (!prefs->HasPrefPath(prefs::kPrinterTypeDenyList)) + if (!prefs->HasPrefPath(prefs::kPrinterTypeDenyList)) { return; + } const base::Value::List& deny_list_from_prefs = prefs->GetList(prefs::kPrinterTypeDenyList); @@ -510,14 +532,15 @@ for (const base::Value& deny_list_value : deny_list_from_prefs) { const std::string& deny_list_str = deny_list_value.GetString(); mojom::PrinterType printer_type; - if (deny_list_str == "extension") + if (deny_list_str == "extension") { printer_type = mojom::PrinterType::kExtension; - else if (deny_list_str == "pdf") + } else if (deny_list_str == "pdf") { printer_type = mojom::PrinterType::kPdf; - else if (deny_list_str == "local") + } else if (deny_list_str == "local") { printer_type = mojom::PrinterType::kLocal; - else + } else { continue; + } deny_list.push_back(printer_type); } @@ -678,8 +701,9 @@ VLOG(1) << "Print preview request start"; - if (!print_render_frame_.is_bound()) + if (!print_render_frame_.is_bound()) { rfh->GetRemoteAssociatedInterfaces()->GetInterface(&print_render_frame_); + } if (!print_preview_ui()->IsBound()) { print_render_frame_->SetPrintPreviewUI( @@ -720,8 +744,9 @@ const mojom::RequestPrintPreviewParams* request_params = GetRequestParams(); CHECK(request_params); bool is_pdf = !request_params->is_modifiable; - if (last_preview_settings_.has_value()) + if (last_preview_settings_.has_value()) { ReportPrintSettingsStats(settings, last_preview_settings_.value(), is_pdf); + } { PrintDocumentTypeBuckets doc_type = is_pdf ? PrintDocumentTypeBuckets::kPdfDocument @@ -806,8 +831,9 @@ void PrintPreviewHandler::HandleCancelPendingPrintRequest( const base::Value::List& /*args*/) { WebContents* initiator = GetInitiator(); - if (initiator) + if (initiator) { ClearInitiatorDetails(); + } ShowPrintErrorDialogForGenericError(); } @@ -815,10 +841,12 @@ std::string data_to_save; PrintPreviewStickySettings* sticky_settings = PrintPreviewStickySettings::GetInstance(); - if (args[0].is_string()) + if (args[0].is_string()) { data_to_save = args[0].GetString(); - if (!data_to_save.empty()) + } + if (!data_to_save.empty()) { sticky_settings->StoreAppState(data_to_save); + } sticky_settings->SaveInPrefs(GetPrefs()); } @@ -829,15 +857,17 @@ UserActionBuckets::kFallbackToAdvancedSettingsDialog); WebContents* initiator = GetInitiator(); - if (!initiator) + if (!initiator) { return; + } auto weak_this = weak_factory_.GetWeakPtr(); auto* print_view_manager = PrintViewManager::FromWebContents(initiator); print_view_manager->PrintForSystemDialogNow(base::BindOnce( &PrintPreviewHandler::ClosePreviewDialog, weak_factory_.GetWeakPtr())); - if (!weak_this) + if (!weak_this) { return; + } // Cancel the pending preview request if exists. print_preview_ui()->OnCancelPendingPreviewRequest(); @@ -858,16 +888,18 @@ // On error, assume the units are SI. // Since the only measurement units print preview's WebUI cares about are // those for measuring distance, assume anything non-US is SI. - if (errorCode > U_ZERO_ERROR || system != UMS_US) + if (errorCode > U_ZERO_ERROR || system != UMS_US) { system = UMS_SI; + } // Getting the number formatting based on the locale and writing to // dictionary. std::u16string number_format = base::FormatDouble(123456.78, 2); size_t thousands_pos = number_format.find('3') + 1; std::u16string thousands_delimiter = number_format.substr(thousands_pos, 1); - if (number_format[thousands_pos] == '4') + if (number_format[thousands_pos] == '4') { thousands_delimiter.clear(); + } size_t decimal_pos = number_format.find('6') + 1; DCHECK_NE(number_format[decimal_pos], '7'); std::u16string decimal_delimiter = number_format.substr(decimal_pos, 1); @@ -949,8 +981,9 @@ initial_settings.Set(kAppState, base::Value()); } - if (!policies.empty()) + if (!policies.empty()) { initial_settings.Set(kPolicies, std::move(policies)); + } initial_settings.Set( kPdfPrinterDisabled, @@ -1021,20 +1054,23 @@ void PrintPreviewHandler::OnPrintPreviewReady(int preview_uid, int request_id) { std::string callback_id = GetCallbackId(request_id); - if (callback_id.empty()) + if (callback_id.empty()) { return; + } ResolveJavascriptCallback(base::Value(callback_id), base::Value(preview_uid)); } void PrintPreviewHandler::OnPrintPreviewFailed(int request_id) { WebContents* initiator = GetInitiator(); - if (!initiator || initiator->IsBeingDestroyed()) + if (!initiator || initiator->IsBeingDestroyed()) { return; // Drop notification if fired during destruction sequence. + } std::string callback_id = GetCallbackId(request_id); - if (callback_id.empty()) + if (callback_id.empty()) { return; + } if (!reported_failed_preview_) { reported_failed_preview_ = true; @@ -1050,8 +1086,9 @@ void PrintPreviewHandler::OnInvalidPrinterSettings(int request_id) { std::string callback_id = GetCallbackId(request_id); - if (callback_id.empty()) + if (callback_id.empty()) { return; + } RejectJavascriptCallback(base::Value(callback_id), base::Value("SETTINGS_INVALID")); @@ -1061,8 +1098,9 @@ int copies, mojom::DuplexMode duplex, int request_id) { - if (!ShouldReceiveRendererMessage(request_id)) + if (!ShouldReceiveRendererMessage(request_id)) { return; + } FireWebUIListener("print-preset-options", base::Value(disable_scaling), base::Value(copies), base::Value(static_cast<int>(duplex))); @@ -1071,8 +1109,9 @@ void PrintPreviewHandler::SendPageCountReady(int page_count, int fit_to_page_scaling, int request_id) { - if (!ShouldReceiveRendererMessage(request_id)) + if (!ShouldReceiveRendererMessage(request_id)) { return; + } FireWebUIListener("page-count-ready", base::Value(page_count), base::Value(request_id), base::Value(fit_to_page_scaling)); @@ -1083,8 +1122,9 @@ bool all_pages_have_custom_size, bool all_pages_have_custom_orientation, int request_id) { - if (!ShouldReceiveRendererMessage(request_id)) + if (!ShouldReceiveRendererMessage(request_id)) { return; + } FireWebUIListener("page-layout-ready", std::move(layout), base::Value(all_pages_have_custom_size), @@ -1098,11 +1138,13 @@ // gets called, the print preview may have failed. Since the failure message // may have arrived first, check for this case and bail out instead of // thinking this may be a bad IPC message. - if (base::Contains(preview_failures_, preview_request_id)) + if (base::Contains(preview_failures_, preview_request_id)) { return; + } - if (!ShouldReceiveRendererMessage(preview_request_id)) + if (!ShouldReceiveRendererMessage(preview_request_id)) { return; + } FireWebUIListener("page-preview-ready", base::Value(page_index), base::Value(preview_uid), base::Value(preview_request_id)); @@ -1110,8 +1152,9 @@ void PrintPreviewHandler::OnPrintPreviewCancelled(int request_id) { std::string callback_id = GetCallbackId(request_id); - if (callback_id.empty()) + if (callback_id.empty()) { return; + } RejectJavascriptCallback(base::Value(callback_id), base::Value("CANCELLED")); } @@ -1123,8 +1166,9 @@ void PrintPreviewHandler::ClearInitiatorDetails() { WebContents* initiator = GetInitiator(); - if (!initiator) + if (!initiator) { return; + } // We no longer require the initiator details. Remove those details associated // with the preview dialog to allow the initiator to create another preview @@ -1192,10 +1236,11 @@ void PrintPreviewHandler::OnPrintResult(const std::string& callback_id, const base::Value& error) { - if (error.is_none()) + if (error.is_none()) { ResolveJavascriptCallback(base::Value(callback_id), error); - else + } else { RejectJavascriptCallback(base::Value(callback_id), error); + } // Remove the preview dialog from the background printing manager if it is // being stored there. Since the PDF has been sent and the callback is // resolved or rejected, it is no longer needed and can be destroyed.
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.h b/chrome/browser/ui/webui/print_preview/print_preview_handler.h index ebb0dd7a..448fafa 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_handler.h +++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.h
@@ -263,8 +263,7 @@ // |callback_id|: The javascript callback to run. // |error|: The returned print job error. Useful for reporting a specific // error. None type implies no error. - void OnPrintResult(const std::string& callback_id, - const base::Value& error); + void OnPrintResult(const std::string& callback_id, const base::Value& error); #if BUILDFLAG(ENTERPRISE_CONTENT_ANALYSIS) // Called when enterprise policy returns a verdict.
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler_chromeos.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler_chromeos.cc index 56754cd..ad5c7ebe 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_handler_chromeos.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_handler_chromeos.cc
@@ -237,8 +237,9 @@ base::Value::Dict* printer = destination_info.FindDict(kPrinter); if (printer) { base::Value::Dict* policies_value = printer->FindDict(kSettingPolicies); - if (policies_value) + if (policies_value) { response.Set("policies", std::move(*policies_value)); + } } ResolveJavascriptCallback(base::Value(callback_id), response); } @@ -290,10 +291,11 @@ void PrintPreviewHandlerChromeOS::HandleRequestPrinterStatusUpdateCompletion( base::Value callback_id, std::optional<base::Value::Dict> result) { - if (result) + if (result) { ResolveJavascriptCallback(callback_id, *result); - else + } else { ResolveJavascriptCallback(callback_id, base::Value()); + } } void PrintPreviewHandlerChromeOS::HandleChoosePrintServers(
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler_unittest.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler_unittest.cc index 35b7f0e2..f8e1b28 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_handler_unittest.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_handler_unittest.cc
@@ -203,8 +203,9 @@ PrintSettingsBuckets::kTotal, PrintSettingsBuckets::kDefaultMedia, }; - for (auto bucket : kPopulatedPrintSettingsBuckets) + for (auto bucket : kPopulatedPrintSettingsBuckets) { histograms.ExpectBucketCount("PrintPreview.PrintSettings", bucket, 1); + } // All other PrintPreview.PrintSettings buckets should be empty. histograms.ExpectTotalCount("PrintPreview.PrintSettings", @@ -238,8 +239,9 @@ void StartGetPrinters(AddedPrintersCallback added_printers_callback, GetPrintersDoneCallback done_callback) override { - if (!printers_.empty()) + if (!printers_.empty()) { added_printers_callback.Run(printers_.Clone()); + } std::move(done_callback).Run(); } @@ -261,8 +263,9 @@ void SetPrinters(const std::vector<PrinterInfo>& printers) { printers_.clear(); for (const auto& printer : printers) { - if (printer.is_default) + if (printer.is_default) { default_printer_ = printer.id; + } printers_.Append(printer.basic_info.Clone()); printer_capabilities_[printer.id] = printer.capabilities.Clone(); } @@ -604,8 +607,9 @@ const base::Value::Dict& settings, const std::string& policy_name) { const base::Value::Dict* policies = settings.FindDict("policies"); - if (!policies) + if (!policies) { return nullptr; + } return policies->FindDict(policy_name); } @@ -625,8 +629,9 @@ const base::Value* policy_value = policy ? policy->Find("value") : nullptr; ASSERT_EQ(expected_policy_value.has_value(), !!policy_value); - if (expected_policy_value.has_value()) + if (expected_policy_value.has_value()) { EXPECT_EQ(expected_policy_value.value(), *policy_value); + } } // Validates the initial settings allowed/default mode policies structure in @@ -649,12 +654,14 @@ policy ? policy->Find("defaultMode") : nullptr; ASSERT_EQ(expected_allowed_mode.has_value(), !!allowed_mode); - if (expected_allowed_mode.has_value()) + if (expected_allowed_mode.has_value()) { EXPECT_EQ(expected_allowed_mode.value(), *allowed_mode); + } ASSERT_EQ(expected_default_mode.has_value(), !!default_mode); - if (expected_default_mode.has_value()) + if (expected_default_mode.has_value()) { EXPECT_EQ(expected_default_mode.value(), *default_mode); + } } // Simulates a 'getPrinters' Web UI message by constructing the arguments and
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_metrics.cc b/chrome/browser/ui/webui/print_preview/print_preview_metrics.cc index 39979d1..7ba9e28 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_metrics.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_metrics.cc
@@ -78,14 +78,17 @@ : PrintSettingsBuckets::kPortrait); } - if (print_settings.FindInt(kSettingCopies).value_or(1) > 1) + if (print_settings.FindInt(kSettingCopies).value_or(1) > 1) { ReportPrintSettingHistogram(PrintSettingsBuckets::kCopies); + } - if (preview_settings.FindInt(kSettingPagesPerSheet).value_or(1) != 1) + if (preview_settings.FindInt(kSettingPagesPerSheet).value_or(1) != 1) { ReportPrintSettingHistogram(PrintSettingsBuckets::kPagesPerSheet); + } - if (print_settings.FindBool(kSettingCollate).value_or(false)) + if (print_settings.FindBool(kSettingCollate).value_or(false)) { ReportPrintSettingHistogram(PrintSettingsBuckets::kCollate); + } std::optional<int> duplex_mode_opt = print_settings.FindInt(kSettingDuplexMode); @@ -120,11 +123,13 @@ } } - if (preview_settings.FindInt(kSettingMarginsType).value_or(0) != 0) + if (preview_settings.FindInt(kSettingMarginsType).value_or(0) != 0) { ReportPrintSettingHistogram(PrintSettingsBuckets::kNonDefaultMargins); + } - if (preview_settings.FindBool(kSettingHeaderFooterEnabled).value_or(false)) + if (preview_settings.FindBool(kSettingHeaderFooterEnabled).value_or(false)) { ReportPrintSettingHistogram(PrintSettingsBuckets::kHeadersAndFooters); + } if (preview_settings.FindBool(kSettingShouldPrintBackgrounds) .value_or(false)) { @@ -136,8 +141,9 @@ ReportPrintSettingHistogram(PrintSettingsBuckets::kSelectionOnly); } - if (preview_settings.FindBool(kSettingRasterizePdf).value_or(false)) + if (preview_settings.FindBool(kSettingRasterizePdf).value_or(false)) { ReportPrintSettingHistogram(PrintSettingsBuckets::kPrintAsImage); + } ScalingType scaling_type = static_cast<ScalingType>(preview_settings.FindInt(kSettingScalingType) @@ -147,10 +153,11 @@ } if (is_pdf) { - if (scaling_type == ScalingType::FIT_TO_PAGE) + if (scaling_type == ScalingType::FIT_TO_PAGE) { ReportPrintSettingHistogram(PrintSettingsBuckets::kFitToPage); - else if (scaling_type == ScalingType::FIT_TO_PAPER) + } else if (scaling_type == ScalingType::FIT_TO_PAPER) { ReportPrintSettingHistogram(PrintSettingsBuckets::kFitToPaper); + } } int dpi_horizontal = @@ -170,8 +177,9 @@ } #if BUILDFLAG(IS_CHROMEOS_ASH) - if (print_settings.FindString(kSettingPinValue)) + if (print_settings.FindString(kSettingPinValue)) { ReportPrintSettingHistogram(PrintSettingsBuckets::kPin); + } #endif // BUILDFLAG(IS_CHROMEOS_ASH) }
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui.cc index 6ad43e88ba..334898d 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_ui.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_ui.cc
@@ -122,8 +122,9 @@ void StopWorker(int document_cookie) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); - if (document_cookie <= 0) + if (document_cookie <= 0) { return; + } scoped_refptr<PrintQueriesQueue> queue = g_browser_process->print_job_manager()->queue(); std::unique_ptr<PrinterQuery> printer_query = @@ -155,150 +156,155 @@ void AddPrintPreviewStrings(content::WebUIDataSource* source) { static constexpr webui::LocalizedString kLocalizedStrings[] = { - {"advancedSettingsDialogConfirm", - IDS_PRINT_PREVIEW_ADVANCED_SETTINGS_DIALOG_CONFIRM}, - {"advancedSettingsDialogTitle", - IDS_PRINT_PREVIEW_ADVANCED_SETTINGS_DIALOG_TITLE}, - {"advancedSettingsSearchBoxPlaceholder", - IDS_PRINT_PREVIEW_ADVANCED_SETTINGS_SEARCH_BOX_PLACEHOLDER}, - {"borderlessLabel", IDS_PRINT_PREVIEW_BORDERLESS_LABEL}, - {"bottom", IDS_PRINT_PREVIEW_BOTTOM_MARGIN_LABEL}, - {"cancel", IDS_CANCEL}, - {"clearSearch", IDS_CLEAR_SEARCH}, - {"copiesInstruction", IDS_PRINT_PREVIEW_COPIES_INSTRUCTION}, - {"copiesLabel", IDS_PRINT_PREVIEW_COPIES_LABEL}, - {"couldNotPrint", IDS_PRINT_PREVIEW_COULD_NOT_PRINT}, - {"customMargins", IDS_PRINT_PREVIEW_CUSTOM_MARGINS}, - {"defaultMargins", IDS_PRINT_PREVIEW_DEFAULT_MARGINS}, - {"destinationLabel", IDS_PRINT_PREVIEW_DESTINATION_LABEL}, - {"destinationSearchTitle", IDS_PRINT_PREVIEW_DESTINATION_SEARCH_TITLE}, - {"dpiItemLabel", IDS_PRINT_PREVIEW_DPI_ITEM_LABEL}, - {"dpiLabel", IDS_PRINT_PREVIEW_DPI_LABEL}, - {"examplePageRangeText", IDS_PRINT_PREVIEW_EXAMPLE_PAGE_RANGE_TEXT}, - {"extensionDestinationIconTooltip", - IDS_PRINT_PREVIEW_EXTENSION_DESTINATION_ICON_TOOLTIP}, - {"goBackButton", IDS_PRINT_PREVIEW_BUTTON_GO_BACK}, - {"invalidPrinterSettings", IDS_PRINT_PREVIEW_INVALID_PRINTER_SETTINGS}, - {"layoutLabel", IDS_PRINT_PREVIEW_LAYOUT_LABEL}, - {"left", IDS_PRINT_PREVIEW_LEFT_MARGIN_LABEL}, - {"loading", IDS_PRINT_PREVIEW_LOADING}, - {"manage", IDS_PRINT_PREVIEW_MANAGE}, + {"advancedSettingsDialogConfirm", + IDS_PRINT_PREVIEW_ADVANCED_SETTINGS_DIALOG_CONFIRM}, + {"advancedSettingsDialogTitle", + IDS_PRINT_PREVIEW_ADVANCED_SETTINGS_DIALOG_TITLE}, + {"advancedSettingsSearchBoxPlaceholder", + IDS_PRINT_PREVIEW_ADVANCED_SETTINGS_SEARCH_BOX_PLACEHOLDER}, + {"borderlessLabel", IDS_PRINT_PREVIEW_BORDERLESS_LABEL}, + {"bottom", IDS_PRINT_PREVIEW_BOTTOM_MARGIN_LABEL}, + {"cancel", IDS_CANCEL}, + {"clearSearch", IDS_CLEAR_SEARCH}, + {"copiesInstruction", IDS_PRINT_PREVIEW_COPIES_INSTRUCTION}, + {"copiesLabel", IDS_PRINT_PREVIEW_COPIES_LABEL}, + {"couldNotPrint", IDS_PRINT_PREVIEW_COULD_NOT_PRINT}, + {"customMargins", IDS_PRINT_PREVIEW_CUSTOM_MARGINS}, + {"defaultMargins", IDS_PRINT_PREVIEW_DEFAULT_MARGINS}, + {"destinationLabel", IDS_PRINT_PREVIEW_DESTINATION_LABEL}, + {"destinationSearchTitle", IDS_PRINT_PREVIEW_DESTINATION_SEARCH_TITLE}, + {"dpiItemLabel", IDS_PRINT_PREVIEW_DPI_ITEM_LABEL}, + {"dpiLabel", IDS_PRINT_PREVIEW_DPI_LABEL}, + {"examplePageRangeText", IDS_PRINT_PREVIEW_EXAMPLE_PAGE_RANGE_TEXT}, + {"extensionDestinationIconTooltip", + IDS_PRINT_PREVIEW_EXTENSION_DESTINATION_ICON_TOOLTIP}, + {"goBackButton", IDS_PRINT_PREVIEW_BUTTON_GO_BACK}, + {"invalidPrinterSettings", IDS_PRINT_PREVIEW_INVALID_PRINTER_SETTINGS}, + {"layoutLabel", IDS_PRINT_PREVIEW_LAYOUT_LABEL}, + {"left", IDS_PRINT_PREVIEW_LEFT_MARGIN_LABEL}, + {"loading", IDS_PRINT_PREVIEW_LOADING}, + {"manage", IDS_PRINT_PREVIEW_MANAGE}, #if BUILDFLAG(IS_CHROMEOS) - {"managePrintersLabel", IDS_PRINT_PREVIEW_MANAGE_PRINTERS_LABEL}, + {"managePrintersLabel", IDS_PRINT_PREVIEW_MANAGE_PRINTERS_LABEL}, #endif - {"managedSettings", IDS_PRINT_PREVIEW_MANAGED_SETTINGS_TEXT}, - {"marginsLabel", IDS_PRINT_PREVIEW_MARGINS_LABEL}, - {"mediaSizeLabel", IDS_PRINT_PREVIEW_MEDIA_SIZE_LABEL}, - {"mediaTypeLabel", IDS_PRINT_PREVIEW_MEDIA_TYPE_LABEL}, - {"minimumMargins", IDS_PRINT_PREVIEW_MINIMUM_MARGINS}, - {"moreOptionsLabel", IDS_MORE_OPTIONS_LABEL}, - {"newShowAdvancedOptions", IDS_PRINT_PREVIEW_NEW_SHOW_ADVANCED_OPTIONS}, - {"noAdvancedSettingsMatchSearchHint", - IDS_PRINT_PREVIEW_NO_ADVANCED_SETTINGS_MATCH_SEARCH_HINT}, - {"noDestinationsMessage", IDS_PRINT_PREVIEW_NO_DESTINATIONS_MESSAGE}, - {"noMargins", IDS_PRINT_PREVIEW_NO_MARGINS}, - {"nonIsotropicDpiItemLabel", - IDS_PRINT_PREVIEW_NON_ISOTROPIC_DPI_ITEM_LABEL}, - {"optionAllPages", IDS_PRINT_PREVIEW_OPTION_ALL_PAGES}, - {"optionBackgroundColorsAndImages", - IDS_PRINT_PREVIEW_OPTION_BACKGROUND_COLORS_AND_IMAGES}, - {"optionBw", IDS_PRINT_PREVIEW_OPTION_BW}, - {"optionCollate", IDS_PRINT_PREVIEW_OPTION_COLLATE}, - {"optionColor", IDS_PRINT_PREVIEW_OPTION_COLOR}, - {"optionCustomPages", IDS_PRINT_PREVIEW_OPTION_CUSTOM_PAGES}, - {"optionCustomScaling", IDS_PRINT_PREVIEW_OPTION_CUSTOM_SCALING}, - {"optionDefaultScaling", IDS_PRINT_PREVIEW_OPTION_DEFAULT_SCALING}, - {"optionEvenPages", IDS_PRINT_PREVIEW_OPTION_EVEN_PAGES}, - {"optionFitToPage", IDS_PRINT_PREVIEW_OPTION_FIT_TO_PAGE}, - {"optionFitToPaper", IDS_PRINT_PREVIEW_OPTION_FIT_TO_PAPER}, - {"optionHeaderFooter", IDS_PRINT_PREVIEW_OPTION_HEADER_FOOTER}, - {"optionLandscape", IDS_PRINT_PREVIEW_OPTION_LANDSCAPE}, - {"optionLongEdge", IDS_PRINT_PREVIEW_OPTION_LONG_EDGE}, - {"optionOddPages", IDS_PRINT_PREVIEW_OPTION_ODD_PAGES}, - {"optionPortrait", IDS_PRINT_PREVIEW_OPTION_PORTRAIT}, - {"optionRasterize", IDS_PRINT_PREVIEW_OPTION_RASTERIZE}, - {"optionSelectionOnly", IDS_PRINT_PREVIEW_OPTION_SELECTION_ONLY}, - {"optionShortEdge", IDS_PRINT_PREVIEW_OPTION_SHORT_EDGE}, - {"optionTwoSided", IDS_PRINT_PREVIEW_OPTION_TWO_SIDED}, - {"optionsLabel", IDS_PRINT_PREVIEW_OPTIONS_LABEL}, - {"pageDescription", IDS_PRINT_PREVIEW_DESCRIPTION}, - {"pageRangeLimitInstructionWithValue", - IDS_PRINT_PREVIEW_PAGE_RANGE_LIMIT_INSTRUCTION_WITH_VALUE}, - {"pageRangeSyntaxInstruction", - IDS_PRINT_PREVIEW_PAGE_RANGE_SYNTAX_INSTRUCTION}, - {"pagesLabel", IDS_PRINT_PREVIEW_PAGES_LABEL}, - {"pagesPerSheetLabel", IDS_PRINT_PREVIEW_PAGES_PER_SHEET_LABEL}, - {"previewFailed", IDS_PRINT_PREVIEW_FAILED}, - {"printOnBothSidesLabel", IDS_PRINT_PREVIEW_PRINT_ON_BOTH_SIDES_LABEL}, - {"printButton", IDS_PRINT_PREVIEW_PRINT_BUTTON}, - {"printDestinationsTitle", IDS_PRINT_PREVIEW_PRINT_DESTINATIONS_TITLE}, - {"printPagesLabel", IDS_PRINT_PREVIEW_PRINT_PAGES_LABEL}, + {"managedSettings", IDS_PRINT_PREVIEW_MANAGED_SETTINGS_TEXT}, + {"marginsLabel", IDS_PRINT_PREVIEW_MARGINS_LABEL}, + {"mediaSizeLabel", IDS_PRINT_PREVIEW_MEDIA_SIZE_LABEL}, + {"mediaTypeLabel", IDS_PRINT_PREVIEW_MEDIA_TYPE_LABEL}, + {"minimumMargins", IDS_PRINT_PREVIEW_MINIMUM_MARGINS}, + {"moreOptionsLabel", IDS_MORE_OPTIONS_LABEL}, + {"newShowAdvancedOptions", IDS_PRINT_PREVIEW_NEW_SHOW_ADVANCED_OPTIONS}, + {"noAdvancedSettingsMatchSearchHint", + IDS_PRINT_PREVIEW_NO_ADVANCED_SETTINGS_MATCH_SEARCH_HINT}, + {"noDestinationsMessage", IDS_PRINT_PREVIEW_NO_DESTINATIONS_MESSAGE}, + {"noMargins", IDS_PRINT_PREVIEW_NO_MARGINS}, + {"nonIsotropicDpiItemLabel", + IDS_PRINT_PREVIEW_NON_ISOTROPIC_DPI_ITEM_LABEL}, + {"optionAllPages", IDS_PRINT_PREVIEW_OPTION_ALL_PAGES}, + {"optionBackgroundColorsAndImages", + IDS_PRINT_PREVIEW_OPTION_BACKGROUND_COLORS_AND_IMAGES}, + {"optionBw", IDS_PRINT_PREVIEW_OPTION_BW}, + {"optionCollate", IDS_PRINT_PREVIEW_OPTION_COLLATE}, + {"optionColor", IDS_PRINT_PREVIEW_OPTION_COLOR}, + {"optionCustomPages", IDS_PRINT_PREVIEW_OPTION_CUSTOM_PAGES}, + {"optionCustomScaling", IDS_PRINT_PREVIEW_OPTION_CUSTOM_SCALING}, + {"optionDefaultScaling", IDS_PRINT_PREVIEW_OPTION_DEFAULT_SCALING}, + {"optionEvenPages", IDS_PRINT_PREVIEW_OPTION_EVEN_PAGES}, + {"optionFitToPage", IDS_PRINT_PREVIEW_OPTION_FIT_TO_PAGE}, + {"optionFitToPaper", IDS_PRINT_PREVIEW_OPTION_FIT_TO_PAPER}, + {"optionHeaderFooter", IDS_PRINT_PREVIEW_OPTION_HEADER_FOOTER}, + {"optionLandscape", IDS_PRINT_PREVIEW_OPTION_LANDSCAPE}, + {"optionLongEdge", IDS_PRINT_PREVIEW_OPTION_LONG_EDGE}, + {"optionOddPages", IDS_PRINT_PREVIEW_OPTION_ODD_PAGES}, + {"optionPortrait", IDS_PRINT_PREVIEW_OPTION_PORTRAIT}, + {"optionRasterize", IDS_PRINT_PREVIEW_OPTION_RASTERIZE}, + {"optionSelectionOnly", IDS_PRINT_PREVIEW_OPTION_SELECTION_ONLY}, + {"optionShortEdge", IDS_PRINT_PREVIEW_OPTION_SHORT_EDGE}, + {"optionTwoSided", IDS_PRINT_PREVIEW_OPTION_TWO_SIDED}, + {"optionsLabel", IDS_PRINT_PREVIEW_OPTIONS_LABEL}, + {"pageDescription", IDS_PRINT_PREVIEW_DESCRIPTION}, + {"pageRangeLimitInstructionWithValue", + IDS_PRINT_PREVIEW_PAGE_RANGE_LIMIT_INSTRUCTION_WITH_VALUE}, + {"pageRangeSyntaxInstruction", + IDS_PRINT_PREVIEW_PAGE_RANGE_SYNTAX_INSTRUCTION}, + {"pagesLabel", IDS_PRINT_PREVIEW_PAGES_LABEL}, + {"pagesPerSheetLabel", IDS_PRINT_PREVIEW_PAGES_PER_SHEET_LABEL}, + {"previewFailed", IDS_PRINT_PREVIEW_FAILED}, + {"printOnBothSidesLabel", IDS_PRINT_PREVIEW_PRINT_ON_BOTH_SIDES_LABEL}, + {"printButton", IDS_PRINT_PREVIEW_PRINT_BUTTON}, + {"printDestinationsTitle", IDS_PRINT_PREVIEW_PRINT_DESTINATIONS_TITLE}, + {"printPagesLabel", IDS_PRINT_PREVIEW_PRINT_PAGES_LABEL}, #if BUILDFLAG(IS_CHROMEOS) - {"printerSetupInfoMessageDetailNoPrintersText", - IDS_PRINT_PREVIEW_PRINTER_SETUP_INFO_MESSAGE_DETAIL_NO_PRINTERS_TEXT}, - {"printerSetupInfoMessageDetailPrinterOfflineText", - IDS_PRINT_PREVIEW_PRINTER_SETUP_INFO_MESSAGE_DETAIL_PRINTER_OFFLINE_TEXT}, - {"printerSetupInfoMessageHeadingNoPrintersText", - IDS_PRINT_PREVIEW_PRINTER_SETUP_INFO_MESSAGE_HEADING_NO_PRINTERS_TEXT}, - {"printerSetupInfoMessageHeadingPrinterOfflineText", - IDS_PRINT_PREVIEW_PRINTER_SETUP_INFO_MESSAGE_HEADING_PRINTER_OFFLINE_TEXT}, - {"printToGoogleDrive", IDS_PRINT_PREVIEW_PRINT_TO_GOOGLE_DRIVE}, + {"printerSetupInfoMessageDetailNoPrintersText", + IDS_PRINT_PREVIEW_PRINTER_SETUP_INFO_MESSAGE_DETAIL_NO_PRINTERS_TEXT}, + {"printerSetupInfoMessageDetailPrinterOfflineText", + IDS_PRINT_PREVIEW_PRINTER_SETUP_INFO_MESSAGE_DETAIL_PRINTER_OFFLINE_TEXT}, + {"printerSetupInfoMessageHeadingNoPrintersText", + IDS_PRINT_PREVIEW_PRINTER_SETUP_INFO_MESSAGE_HEADING_NO_PRINTERS_TEXT}, + {"printerSetupInfoMessageHeadingPrinterOfflineText", + IDS_PRINT_PREVIEW_PRINTER_SETUP_INFO_MESSAGE_HEADING_PRINTER_OFFLINE_TEXT}, + {"printToGoogleDrive", IDS_PRINT_PREVIEW_PRINT_TO_GOOGLE_DRIVE}, #endif - {"printToPDF", IDS_PRINT_PREVIEW_PRINT_TO_PDF}, - {"printing", IDS_PRINT_PREVIEW_PRINTING}, + {"printToPDF", IDS_PRINT_PREVIEW_PRINT_TO_PDF}, + {"printing", IDS_PRINT_PREVIEW_PRINTING}, #if BUILDFLAG(IS_CHROMEOS) - {"resolveExtensionUSBDialogTitle", - IDS_PRINT_PREVIEW_RESOLVE_EXTENSION_USB_DIALOG_TITLE}, - {"resolveExtensionUSBErrorMessage", - IDS_PRINT_PREVIEW_RESOLVE_EXTENSION_USB_ERROR_MESSAGE}, - {"resolveExtensionUSBPermissionMessage", - IDS_PRINT_PREVIEW_RESOLVE_EXTENSION_USB_PERMISSION_MESSAGE}, + {"resolveExtensionUSBDialogTitle", + IDS_PRINT_PREVIEW_RESOLVE_EXTENSION_USB_DIALOG_TITLE}, + {"resolveExtensionUSBErrorMessage", + IDS_PRINT_PREVIEW_RESOLVE_EXTENSION_USB_ERROR_MESSAGE}, + {"resolveExtensionUSBPermissionMessage", + IDS_PRINT_PREVIEW_RESOLVE_EXTENSION_USB_PERMISSION_MESSAGE}, #endif - {"right", IDS_PRINT_PREVIEW_RIGHT_MARGIN_LABEL}, - {"saveButton", IDS_PRINT_PREVIEW_SAVE_BUTTON}, - {"saving", IDS_PRINT_PREVIEW_SAVING}, - {"scalingInstruction", IDS_PRINT_PREVIEW_SCALING_INSTRUCTION}, - {"scalingLabel", IDS_PRINT_PREVIEW_SCALING_LABEL}, - {"searchBoxPlaceholder", IDS_PRINT_PREVIEW_SEARCH_BOX_PLACEHOLDER}, - {"searchResultBubbleText", IDS_SEARCH_RESULT_BUBBLE_TEXT}, - {"searchResultsBubbleText", IDS_SEARCH_RESULTS_BUBBLE_TEXT}, - {"selectButton", IDS_PRINT_PREVIEW_BUTTON_SELECT}, - {"seeMore", IDS_PRINT_PREVIEW_SEE_MORE}, - {"seeMoreDestinationsLabel", IDS_PRINT_PREVIEW_SEE_MORE_DESTINATIONS_LABEL}, + {"right", IDS_PRINT_PREVIEW_RIGHT_MARGIN_LABEL}, + {"saveButton", IDS_PRINT_PREVIEW_SAVE_BUTTON}, + {"saving", IDS_PRINT_PREVIEW_SAVING}, + {"scalingInstruction", IDS_PRINT_PREVIEW_SCALING_INSTRUCTION}, + {"scalingLabel", IDS_PRINT_PREVIEW_SCALING_LABEL}, + {"searchBoxPlaceholder", IDS_PRINT_PREVIEW_SEARCH_BOX_PLACEHOLDER}, + {"searchResultBubbleText", IDS_SEARCH_RESULT_BUBBLE_TEXT}, + {"searchResultsBubbleText", IDS_SEARCH_RESULTS_BUBBLE_TEXT}, + {"selectButton", IDS_PRINT_PREVIEW_BUTTON_SELECT}, + {"seeMore", IDS_PRINT_PREVIEW_SEE_MORE}, + {"seeMoreDestinationsLabel", + IDS_PRINT_PREVIEW_SEE_MORE_DESTINATIONS_LABEL}, #if BUILDFLAG(IS_CHROMEOS) - {"serverSearchBoxPlaceholder", - IDS_PRINT_PREVIEW_SERVER_SEARCH_BOX_PLACEHOLDER}, + {"serverSearchBoxPlaceholder", + IDS_PRINT_PREVIEW_SERVER_SEARCH_BOX_PLACEHOLDER}, #endif - {"title", IDS_PRINT_PREVIEW_TITLE}, - {"top", IDS_PRINT_PREVIEW_TOP_MARGIN_LABEL}, + {"title", IDS_PRINT_PREVIEW_TITLE}, + {"top", IDS_PRINT_PREVIEW_TOP_MARGIN_LABEL}, #if BUILDFLAG(IS_CHROMEOS) - {"configuringFailedText", IDS_PRINT_CONFIGURING_FAILED_TEXT}, - {"configuringInProgressText", IDS_PRINT_CONFIGURING_IN_PROGRESS_TEXT}, - {"optionPin", IDS_PRINT_PREVIEW_OPTION_PIN}, - {"pinErrorMessage", IDS_PRINT_PREVIEW_PIN_ERROR_MESSAGE}, - {"pinPlaceholder", IDS_PRINT_PREVIEW_PIN_PLACEHOLDER}, - {"printerEulaURL", IDS_PRINT_PREVIEW_EULA_URL}, - {"printerStatusDeviceError", IDS_PRINT_PREVIEW_PRINTER_STATUS_DEVICE_ERROR}, - {"printerStatusDoorOpen", IDS_PRINT_PREVIEW_PRINTER_STATUS_DOOR_OPEN}, - {"printerStatusLowOnInk", IDS_PRINT_PREVIEW_PRINTER_STATUS_LOW_ON_INK}, - {"printerStatusLowOnPaper", IDS_PRINT_PREVIEW_PRINTER_STATUS_LOW_ON_PAPER}, - {"printerStatusOutOfInk", IDS_PRINT_PREVIEW_PRINTER_STATUS_OUT_OF_INK}, - {"printerStatusOutOfPaper", IDS_PRINT_PREVIEW_PRINTER_STATUS_OUT_OF_PAPER}, - {"printerStatusOutputAlmostFull", - IDS_PRINT_PREVIEW_PRINTER_STATUS_OUPUT_ALMOST_FULL}, - {"printerStatusOutputFull", IDS_PRINT_PREVIEW_PRINTER_STATUS_OUPUT_FULL}, - {"printerStatusPaperJam", IDS_PRINT_PREVIEW_PRINTER_STATUS_PAPER_JAM}, - {"printerStatusPaused", IDS_PRINT_PREVIEW_PRINTER_STATUS_PAUSED}, - {"printerStatusPrinterQueueFull", - IDS_PRINT_PREVIEW_PRINTER_STATUS_PRINTER_QUEUE_FULL}, - {"printerStatusPrinterUnreachable", - IDS_PRINT_PREVIEW_PRINTER_STATUS_PRINTER_UNREACHABLE}, - {"printerStatusStopped", IDS_PRINT_PREVIEW_PRINTER_STATUS_STOPPED}, - {"printerStatusTrayMissing", IDS_PRINT_PREVIEW_PRINTER_STATUS_TRAY_MISSING}, + {"configuringFailedText", IDS_PRINT_CONFIGURING_FAILED_TEXT}, + {"configuringInProgressText", IDS_PRINT_CONFIGURING_IN_PROGRESS_TEXT}, + {"optionPin", IDS_PRINT_PREVIEW_OPTION_PIN}, + {"pinErrorMessage", IDS_PRINT_PREVIEW_PIN_ERROR_MESSAGE}, + {"pinPlaceholder", IDS_PRINT_PREVIEW_PIN_PLACEHOLDER}, + {"printerEulaURL", IDS_PRINT_PREVIEW_EULA_URL}, + {"printerStatusDeviceError", + IDS_PRINT_PREVIEW_PRINTER_STATUS_DEVICE_ERROR}, + {"printerStatusDoorOpen", IDS_PRINT_PREVIEW_PRINTER_STATUS_DOOR_OPEN}, + {"printerStatusLowOnInk", IDS_PRINT_PREVIEW_PRINTER_STATUS_LOW_ON_INK}, + {"printerStatusLowOnPaper", + IDS_PRINT_PREVIEW_PRINTER_STATUS_LOW_ON_PAPER}, + {"printerStatusOutOfInk", IDS_PRINT_PREVIEW_PRINTER_STATUS_OUT_OF_INK}, + {"printerStatusOutOfPaper", + IDS_PRINT_PREVIEW_PRINTER_STATUS_OUT_OF_PAPER}, + {"printerStatusOutputAlmostFull", + IDS_PRINT_PREVIEW_PRINTER_STATUS_OUPUT_ALMOST_FULL}, + {"printerStatusOutputFull", IDS_PRINT_PREVIEW_PRINTER_STATUS_OUPUT_FULL}, + {"printerStatusPaperJam", IDS_PRINT_PREVIEW_PRINTER_STATUS_PAPER_JAM}, + {"printerStatusPaused", IDS_PRINT_PREVIEW_PRINTER_STATUS_PAUSED}, + {"printerStatusPrinterQueueFull", + IDS_PRINT_PREVIEW_PRINTER_STATUS_PRINTER_QUEUE_FULL}, + {"printerStatusPrinterUnreachable", + IDS_PRINT_PREVIEW_PRINTER_STATUS_PRINTER_UNREACHABLE}, + {"printerStatusStopped", IDS_PRINT_PREVIEW_PRINTER_STATUS_STOPPED}, + {"printerStatusTrayMissing", + IDS_PRINT_PREVIEW_PRINTER_STATUS_TRAY_MISSING}, #endif #if BUILDFLAG(IS_MAC) - {"openPdfInPreviewOption", IDS_PRINT_PREVIEW_OPEN_PDF_IN_PREVIEW_APP}, - {"openingPDFInPreview", IDS_PRINT_PREVIEW_OPENING_PDF_IN_PREVIEW_APP}, + {"openPdfInPreviewOption", IDS_PRINT_PREVIEW_OPEN_PDF_IN_PREVIEW_APP}, + {"openingPDFInPreview", IDS_PRINT_PREVIEW_OPENING_PDF_IN_PREVIEW_APP}, #endif }; source->AddLocalizedStrings(kLocalizedStrings); @@ -478,8 +484,9 @@ void PrintPreviewUI::ClearPreviewUIId() { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); - if (!id_) + if (!id_) { return; + } receiver_.reset(); PrintPreviewDataService::GetInstance()->RemoveEntry(*id_); @@ -509,19 +516,22 @@ uint32_t page_index, int request_id, scoped_refptr<base::RefCountedMemory> data_bytes) { - if (!data_bytes || !data_bytes->size()) + if (!data_bytes || !data_bytes->size()) { return; + } // Don't bother notifying the UI if this request has been cancelled already. - if (ShouldCancelRequest(id_, request_id)) + if (ShouldCancelRequest(id_, request_id)) { return; + } DCHECK_NE(page_index, kInvalidPageIndex); SetPrintPreviewDataForIndex(base::checked_cast<int>(page_index), std::move(data_bytes)); - if (g_test_delegate) + if (g_test_delegate) { g_test_delegate->DidRenderPreviewPage(web_ui()->GetWebContents()); + } handler_->SendPagePreviewReady(base::checked_cast<int>(page_index), *id_, request_id); } @@ -529,12 +539,14 @@ void PrintPreviewUI::NotifyUIPreviewDocumentReady( int request_id, scoped_refptr<base::RefCountedMemory> data_bytes) { - if (!data_bytes || !data_bytes->size()) + if (!data_bytes || !data_bytes->size()) { return; + } // Don't bother notifying the UI if this request has been cancelled already. - if (ShouldCancelRequest(id_, request_id)) + if (ShouldCancelRequest(id_, request_id)) { return; + } if (!initial_preview_start_time_.is_null()) { base::TimeDelta display_time = @@ -586,8 +598,9 @@ base::ReadOnlySharedMemoryRegion region) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); - if (ShouldCancelRequest(id_, request_id)) + if (ShouldCancelRequest(id_, request_id)) { return; + } if (status != mojom::PrintCompositor::Status::kSuccess) { DLOG(ERROR) << "Compositing pdf failed with error " << status; @@ -602,8 +615,9 @@ } else { AddPdfPageForNupConversion(std::move(region)); uint32_t current_page_index = GetPageToNupConvertIndex(page_index); - if (current_page_index == kInvalidPageIndex) + if (current_page_index == kInvalidPageIndex) { return; + } if (((current_page_index + 1) % pages_per_sheet_) == 0 || LastPageComposited(page_index)) { @@ -615,12 +629,14 @@ gfx::Rect printable_rect = PageSetup::GetSymmetricalPrintableArea(page_size(), printable_area()); - if (printable_rect.IsEmpty()) + if (printable_rect.IsEmpty()) { return; + } WebContents* web_contents = GetInitiator(web_ui()); - if (!web_contents) + if (!web_contents) { return; + } auto* client = PdfNupConverterClient::FromWebContents(web_contents); DCHECK(client); @@ -661,8 +677,9 @@ base::ReadOnlySharedMemoryRegion region) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); - if (ShouldCancelRequest(id_, request_id)) + if (ShouldCancelRequest(id_, request_id)) { return; + } if (status != mojom::PrintCompositor::Status::kSuccess) { DLOG(ERROR) << "Completion of document to pdf failed with error " << status; @@ -676,16 +693,18 @@ base::RefCountedSharedMemoryMapping::CreateFromWholeRegion(region)); } else { WebContents* web_contents = GetInitiator(web_ui()); - if (!web_contents) + if (!web_contents) { return; + } auto* client = PdfNupConverterClient::FromWebContents(web_contents); DCHECK(client); gfx::Rect printable_rect = PageSetup::GetSymmetricalPrintableArea(page_size_, printable_area_); - if (printable_rect.IsEmpty()) + if (printable_rect.IsEmpty()) { return; + } client->DoNupPdfDocumentConvert( document_cookie, pages_per_sheet_, page_size_, printable_rect, @@ -703,11 +722,13 @@ mojom::PrintCompositor::Status status) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); - if (ShouldCancelRequest(id_, request_id)) + if (ShouldCancelRequest(id_, request_id)) { return; + } - if (status != mojom::PrintCompositor::Status::kSuccess) + if (status != mojom::PrintCompositor::Status::kSuccess) { OnPrintPreviewFailed(request_id); + } } void PrintPreviewUI::OnNupPdfDocumentConvertDone( @@ -730,8 +751,9 @@ } bool PrintPreviewUI::LastPageComposited(uint32_t page_index) const { - if (pages_to_render_.empty()) + if (pages_to_render_.empty()) { return false; + } return page_index == pages_to_render_.back(); } @@ -761,8 +783,9 @@ int request_id) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); - if (!preview_ui_id) + if (!preview_ui_id) { return true; + } auto& map = GetPrintPreviewRequestIdMap(); auto it = map.find(*preview_ui_id); @@ -777,8 +800,9 @@ WebContents* preview_dialog = web_ui()->GetWebContents(); BackgroundPrintingManager* background_printing_manager = g_browser_process->background_printing_manager(); - if (background_printing_manager->HasPrintPreviewDialog(preview_dialog)) + if (background_printing_manager->HasPrintPreviewDialog(preview_dialog)) { return; + } OnClosePrintPreviewDialog(); } @@ -841,8 +865,9 @@ page_size_ = ToFlooredSize(params->page_size); ClearAllPreviewData(); - if (g_test_delegate) + if (g_test_delegate) { g_test_delegate->DidGetPreviewPageCount(params->page_count); + } handler_->SendPageCountReady(base::checked_cast<int>(params->page_count), params->fit_to_page_scaling, request_id); } @@ -886,8 +911,9 @@ } bool PrintPreviewUI::OnPendingPreviewPage(uint32_t page_index) { - if (pages_to_render_index_ >= pages_to_render_.size()) + if (pages_to_render_index_ >= pages_to_render_.size()) { return false; + } bool matched = page_index == pages_to_render_[pages_to_render_index_]; ++pages_to_render_index_; @@ -911,12 +937,14 @@ WebContents* preview_dialog = web_ui()->GetWebContents(); BackgroundPrintingManager* background_printing_manager = g_browser_process->background_printing_manager(); - if (background_printing_manager->HasPrintPreviewDialog(preview_dialog)) + if (background_printing_manager->HasPrintPreviewDialog(preview_dialog)) { return; + } ConstrainedWebDialogDelegate* delegate = GetConstrainedDelegate(); - if (!delegate) + if (!delegate) { return; + } std::unique_ptr<content::WebContents> preview_contents = delegate->ReleaseWebContents(); DCHECK_EQ(preview_dialog, preview_contents.get()); @@ -926,12 +954,14 @@ } void PrintPreviewUI::OnClosePrintPreviewDialog() { - if (dialog_closed_) + if (dialog_closed_) { return; + } dialog_closed_ = true; ConstrainedWebDialogDelegate* delegate = GetConstrainedDelegate(); - if (!delegate) + if (!delegate) { return; + } delegate->GetWebDialogDelegate()->OnDialogClosed(std::string()); delegate->OnDialogCloseFromWebUI(); } @@ -939,8 +969,9 @@ void PrintPreviewUI::SetOptionsFromDocument( const mojom::OptionsFromDocumentParamsPtr params, int32_t request_id) { - if (ShouldCancelRequest(id_, request_id)) + if (ShouldCancelRequest(id_, request_id)) { return; + } handler_->SendPrintPresetOptions(params->is_scaling_disabled, params->copies, params->duplex, request_id); } @@ -955,22 +986,25 @@ } WebContents* web_contents = GetInitiator(web_ui()); - if (!web_contents) + if (!web_contents) { return; + } // For case of print preview, page metafile is used to composite into // the document PDF at same time. Need to indicate that this scenario // is at play for the compositor. auto* client = PrintCompositeClient::FromWebContents(web_contents); DCHECK(client); - if (client->GetIsDocumentConcurrentlyComposited(document_cookie)) + if (client->GetIsDocumentConcurrentlyComposited(document_cookie)) { return; + } content::RenderFrameHost* render_frame_host = PrintViewManager::FromWebContents(web_contents)->print_preview_rfh(); // |render_frame_host| could be null when the print preview dialog is closed. - if (!render_frame_host) + if (!render_frame_host) { return; + } PRINTER_LOG(EVENT) << "Compositing for document type " << GetCompositorDocumentType(); @@ -998,12 +1032,14 @@ if (ShouldUseCompositor()) { // Don't bother compositing if this request has been cancelled already. - if (ShouldCancelRequest(id_, request_id)) + if (ShouldCancelRequest(id_, request_id)) { return; + } WebContents* web_contents = GetInitiator(web_ui()); - if (!web_contents) + if (!web_contents) { return; + } auto* client = PrintCompositeClient::FromWebContents(web_contents); DCHECK(client); @@ -1012,8 +1048,9 @@ PrintViewManager::FromWebContents(web_contents)->print_preview_rfh(); // |render_frame_host| could be null when the print preview dialog is // closed. - if (!render_frame_host) + if (!render_frame_host) { return; + } // Use utility process to convert Skia metafile to PDF or XPS. client->CompositePage( @@ -1046,8 +1083,9 @@ // the individual pages, so |metafile| should be invalid. // When it is inactive, the print document is composed from |metafile|. // So if this comparison succeeds, that means the renderer sent bad data. - if (composite_document_using_individual_pages == metafile.IsValid()) + if (composite_document_using_individual_pages == metafile.IsValid()) { return; + } if (params->expected_pages_count == 0) { receiver_.ReportBadMessage(kInvalidPageCountForMetafileReadyForPrinting); @@ -1056,16 +1094,18 @@ if (composite_document_using_individual_pages) { // Don't bother compositing if this request has been cancelled already. - if (ShouldCancelRequest(id_, request_id)) + if (ShouldCancelRequest(id_, request_id)) { return; + } auto callback = base::BindOnce(&PrintPreviewUI::OnCompositeToPdfDone, weak_ptr_factory_.GetWeakPtr(), params->document_cookie, request_id); WebContents* web_contents = GetInitiator(web_ui()); - if (!web_contents) + if (!web_contents) { return; + } // Page metafile is used to composite into the document at same time. // Need to provide particulars of how many pages are required before @@ -1087,8 +1127,9 @@ void PrintPreviewUI::PrintPreviewFailed(int32_t document_cookie, int32_t request_id) { StopWorker(document_cookie); - if (ShouldCancelRequest(id_, request_id)) + if (ShouldCancelRequest(id_, request_id)) { return; + } OnPrintPreviewFailed(request_id); } @@ -1096,16 +1137,18 @@ int32_t request_id) { // Always need to stop the worker. StopWorker(document_cookie); - if (ShouldCancelRequest(id_, request_id)) + if (ShouldCancelRequest(id_, request_id)) { return; + } handler_->OnPrintPreviewCancelled(request_id); } void PrintPreviewUI::PrinterSettingsInvalid(int32_t document_cookie, int32_t request_id) { StopWorker(document_cookie); - if (ShouldCancelRequest(id_, request_id)) + if (ShouldCancelRequest(id_, request_id)) { return; + } handler_->OnInvalidPrinterSettings(request_id); }
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_utils.cc b/chrome/browser/ui/webui/print_preview/print_preview_utils.cc index 3a04a15..e2bb0ca 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_utils.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_utils.cc
@@ -60,8 +60,9 @@ printer_info.Set(kSettingPrinterDescription, printer.printer_description); base::Value::Dict options; - for (const auto& opt_it : printer.options) + for (const auto& opt_it : printer.options) { options.SetByDottedPath(opt_it.first, opt_it.second); + } #if BUILDFLAG(IS_CHROMEOS_ASH) printer_info.Set( @@ -93,30 +94,37 @@ } bool DpiCapabilityInvalid(const base::Value& val) { - if (!val.is_dict()) + if (!val.is_dict()) { return true; + } const auto& dict = val.GetDict(); std::optional<int> horizontal_dpi = dict.FindInt(kHorizontalDpi); - if (horizontal_dpi.value_or(0) <= 0) + if (horizontal_dpi.value_or(0) <= 0) { return true; + } std::optional<int> vertical_dpi = dict.FindInt(kVerticalDpi); - if (vertical_dpi.value_or(0) <= 0) + if (vertical_dpi.value_or(0) <= 0) { return true; + } return false; } bool VendorCapabilityInvalid(const base::Value& val) { - if (!val.is_dict()) + if (!val.is_dict()) { return true; + } const auto& dict = val.GetDict(); const std::string* option_type = dict.FindString(kTypeKey); - if (!option_type) + if (!option_type) { return true; - if (*option_type != kSelectString) + } + if (*option_type != kSelectString) { return false; + } const base::Value::Dict* select_cap = dict.FindDict(kSelectCapKey); - if (!select_cap) + if (!select_cap) { return true; + } const base::Value::List* options_list = select_cap->FindList(kOptionKey); if (!options_list || options_list->empty() || GetFilteredList(*options_list, ValueIsNull).empty()) { @@ -133,18 +141,21 @@ base::Value::Dict ValidateCddForPrintPreview(base::Value::Dict cdd) { base::Value::Dict* caps = cdd.FindDict(kPrinter); - if (!caps) + if (!caps) { return cdd; + } base::Value::Dict out_caps; for (auto capability : *caps) { const auto& key = capability.first; base::Value& value = capability.second; base::Value::List* list_value = nullptr; - if (value.is_list()) + if (value.is_list()) { list_value = &value.GetList(); - if (value.is_dict()) + } + if (value.is_dict()) { list_value = value.GetDict().FindList(kOptionKey); + } if (!list_value) { out_caps.Set(key, std::move(value)); @@ -160,25 +171,29 @@ } else { list_value->EraseIf(ValueIsNull); } - if (list_value->empty()) // leave out empty lists. + if (list_value->empty()) { // leave out empty lists. continue; + } if (is_vendor_capability) { // Need to also filter the individual capability lists. for (auto& vendor_option : *list_value) { - if (!vendor_option.is_dict()) + if (!vendor_option.is_dict()) { continue; + } auto& vendor_dict = vendor_option.GetDict(); const std::string* type = vendor_dict.FindString(kTypeKey); - if (!type || *type != kSelectString) + if (!type || *type != kSelectString) { continue; + } auto* select_cap_dict = vendor_dict.FindDict(kSelectCapKey); if (select_cap_dict) { auto* option_list = select_cap_dict->FindList(kOptionKey); - if (option_list) + if (option_list) { option_list->EraseIf(ValueIsNull); + } } } } @@ -187,8 +202,9 @@ option_dict.Set(kOptionKey, std::move(*list_value)); std::optional<bool> reset_to_default = value.GetDict().FindBool(kResetToDefaultKey); - if (reset_to_default.has_value()) + if (reset_to_default.has_value()) { option_dict.Set(kResetToDefaultKey, reset_to_default.value()); + } out_caps.Set(key, std::move(option_dict)); } else { out_caps.Set(key, std::move(*list_value)); @@ -200,8 +216,9 @@ base::Value::Dict UpdateCddWithDpiIfMissing(base::Value::Dict cdd) { base::Value::Dict* printer = cdd.FindDict(kPrinter); - if (!printer) + if (!printer) { return cdd; + } if (!printer->FindDict(kDpiCapabilityKey)) { base::Value::Dict default_dpi; @@ -255,8 +272,9 @@ VLOG(1) << "Enumerate printers finished, found " << printers.size() << " printers"; - if (!printers.empty()) + if (!printers.empty()) { callback.Run(std::move(printers)); + } std::move(done_callback).Run(); }
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_utils_unittest.cc b/chrome/browser/ui/webui/print_preview/print_preview_utils_unittest.cc index ddc133f5..f198a2c 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_utils_unittest.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_utils_unittest.cc
@@ -64,8 +64,9 @@ base::Value::Dict option; option.Set(kDisplayName, base::NumberToString(i)); option.Set(kValue, i); - if (i == 1) + if (i == 1) { option.Set(kIsDefault, true); + } pages_per_sheet.Append(std::move(option)); } base::Value::Dict pages_per_sheet_option; @@ -107,8 +108,9 @@ size_t index) { base::Value::List* vendor_capabilities_list = printer.FindList(kVendorCapability); - if (!vendor_capabilities_list || index >= vendor_capabilities_list->size()) + if (!vendor_capabilities_list || index >= vendor_capabilities_list->size()) { return nullptr; + } auto& ret = (*vendor_capabilities_list)[index]; return ret.is_dict() ? &ret.GetDict() : nullptr; @@ -381,8 +383,9 @@ base::Value::Dict option; option.Set(kDisplayName, base::NumberToString(i)); option.Set(kValue, i); - if (i == 1) + if (i == 1) { option.Set(kIsDefault, true); + } pages_per_sheet.Append(std::move(option)); } vendor_dict->Set(kOptionKey, std::move(pages_per_sheet));
diff --git a/chrome/browser/ui/webui/privacy_sandbox/privacy_sandbox_dialog_handler.cc b/chrome/browser/ui/webui/privacy_sandbox/privacy_sandbox_dialog_handler.cc index 94479418e..55f68c4 100644 --- a/chrome/browser/ui/webui/privacy_sandbox/privacy_sandbox_dialog_handler.cc +++ b/chrome/browser/ui/webui/privacy_sandbox/privacy_sandbox_dialog_handler.cc
@@ -114,8 +114,9 @@ } void PrivacySandboxDialogHandler::OnJavascriptDisallowed() { - if (did_user_make_decision_) + if (did_user_make_decision_) { return; + } // If user hasn't made a decision, notify the service. if (IsConsent(prompt_type_)) { @@ -135,8 +136,9 @@ void PrivacySandboxDialogHandler::HandlePromptActionOccurred( const base::Value::List& args) { - if (!IsJavascriptAllowed()) + if (!IsJavascriptAllowed()) { return; + } CHECK_EQ(1U, args.size()); auto action =
diff --git a/chrome/browser/ui/webui/privacy_sandbox/privacy_sandbox_internals_handler.cc b/chrome/browser/ui/webui/privacy_sandbox/privacy_sandbox_internals_handler.cc index 367f181..89182183 100644 --- a/chrome/browser/ui/webui/privacy_sandbox/privacy_sandbox_internals_handler.cc +++ b/chrome/browser/ui/webui/privacy_sandbox/privacy_sandbox_internals_handler.cc
@@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "chrome/browser/ui/webui/privacy_sandbox/privacy_sandbox_internals_handler.h" + #include "base/logging.h" #include "chrome/browser/content_settings/cookie_settings_factory.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
diff --git a/chrome/browser/ui/webui/privacy_sandbox/related_website_sets/related_website_sets_handler.cc b/chrome/browser/ui/webui/privacy_sandbox/related_website_sets/related_website_sets_handler.cc index 776e896..27b9935 100644 --- a/chrome/browser/ui/webui/privacy_sandbox/related_website_sets/related_website_sets_handler.cc +++ b/chrome/browser/ui/webui/privacy_sandbox/related_website_sets/related_website_sets_handler.cc
@@ -20,8 +20,7 @@ namespace { constexpr char kNoServiceError[] = "Service error"; -constexpr char kServiceNotReadyError[] = - "Backend error, service not ready"; +constexpr char kServiceNotReadyError[] = "Backend error, service not ready"; SiteType GetSiteType(const net::SiteType type) { switch (type) {
diff --git a/chrome/browser/ui/webui/profile_helper.cc b/chrome/browser/ui/webui/profile_helper.cc index 775b5f8..ea1a668 100644 --- a/chrome/browser/ui/webui/profile_helper.cc +++ b/chrome/browser/ui/webui/profile_helper.cc
@@ -53,8 +53,9 @@ void DeleteProfileAtPath(base::FilePath file_path, ProfileMetrics::ProfileDelete deletion_source) { - if (!profiles::IsMultipleProfilesEnabled()) + if (!profiles::IsMultipleProfilesEnabled()) { return; + } g_browser_process->profile_manager() ->GetDeleteProfileHelper() .MaybeScheduleProfileForDeletion(
diff --git a/chrome/browser/ui/webui/profile_helper.h b/chrome/browser/ui/webui/profile_helper.h index 7ce44f59..9767cb0 100644 --- a/chrome/browser/ui/webui/profile_helper.h +++ b/chrome/browser/ui/webui/profile_helper.h
@@ -23,6 +23,4 @@ } // namespace webui - - #endif // CHROME_BROWSER_UI_WEBUI_PROFILE_HELPER_H_
diff --git a/chrome/browser/ui/webui/profile_helper_browsertest.cc b/chrome/browser/ui/webui/profile_helper_browsertest.cc index 45c6de0..b0592d54 100644 --- a/chrome/browser/ui/webui/profile_helper_browsertest.cc +++ b/chrome/browser/ui/webui/profile_helper_browsertest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/webui/profile_helper.h" + #include "base/containers/contains.h" #include "base/files/file_util.h" #include "base/functional/bind.h" @@ -22,7 +24,6 @@ #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_list_observer.h" -#include "chrome/browser/ui/webui/profile_helper.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/profile_deletion_observer.h" #include "chrome/test/base/ui_test_utils.h" @@ -57,14 +58,13 @@ BrowserList::RemoveObserver(this); } - void Wait() { - loop_.Run(); - } + void Wait() { loop_.Run(); } protected: void OnBrowserSetLastActive(Browser* browser) override { - if (browser->profile() == profile_) + if (browser->profile() == profile_) { loop_.Quit(); + } } private:
diff --git a/chrome/browser/ui/webui/profile_info_watcher.cc b/chrome/browser/ui/webui/profile_info_watcher.cc index 83de27b..4cd24e7 100644 --- a/chrome/browser/ui/webui/profile_info_watcher.cc +++ b/chrome/browser/ui/webui/profile_info_watcher.cc
@@ -23,8 +23,9 @@ ProfileManager* profile_manager = g_browser_process->profile_manager(); // The profile_manager might be NULL in testing environments. - if (profile_manager) + if (profile_manager) { profile_manager->GetProfileAttributesStorage().AddObserver(this); + } signin_allowed_pref_.Init( prefs::kSigninAllowed, profile_->GetPrefs(), @@ -35,8 +36,9 @@ ProfileInfoWatcher::~ProfileInfoWatcher() { ProfileManager* profile_manager = g_browser_process->profile_manager(); // The profile_manager might be NULL in testing environments. - if (profile_manager) + if (profile_manager) { profile_manager->GetProfileAttributesStorage().RemoveObserver(this); + } } void ProfileInfoWatcher::OnProfileAuthInfoChanged( @@ -60,6 +62,7 @@ } void ProfileInfoWatcher::RunCallback() { - if (GetIdentityManager()) + if (GetIdentityManager()) { callback_.Run(); + } }
diff --git a/chrome/browser/ui/webui/reset_password/reset_password_ui.cc b/chrome/browser/ui/webui/reset_password/reset_password_ui.cc index 6b25ee6..e17039a 100644 --- a/chrome/browser/ui/webui/reset_password/reset_password_ui.cc +++ b/chrome/browser/ui/webui/reset_password/reset_password_ui.cc
@@ -90,8 +90,9 @@ PasswordType GetPasswordType(content::WebContents* web_contents) { content::NavigationEntry* nav_entry = web_contents->GetController().GetPendingEntry(); - if (!nav_entry || !nav_entry->GetHasPostData() || !nav_entry->GetPostData()) + if (!nav_entry || !nav_entry->GetHasPostData() || !nav_entry->GetPostData()) { return PasswordType::PASSWORD_TYPE_UNKNOWN; + } auto& post_data = nav_entry->GetPostData()->elements()->at(0); if (post_data.type() == network::DataElement::Tag::kBytes) { int post_data_int = -1; @@ -108,8 +109,9 @@ // Properly format host name based on text direction. std::u16string GetFormattedHostName(const std::string host_name) { std::u16string host = url_formatter::IDNToUnicode(host_name); - if (base::i18n::IsRTL()) + if (base::i18n::IsRTL()) { base::i18n::WrapStringWithLTRFormatting(&host); + } return host; }
diff --git a/chrome/browser/ui/webui/sandbox/sandbox_handler.cc b/chrome/browser/ui/webui/sandbox/sandbox_handler.cc index cbe3f8b..d1fa270 100644 --- a/chrome/browser/ui/webui/sandbox/sandbox_handler.cc +++ b/chrome/browser/ui/webui/sandbox/sandbox_handler.cc
@@ -33,8 +33,9 @@ for (BrowserChildProcessHostIterator itr; !itr.Done(); ++itr) { const ChildProcessData& process_data = itr.GetData(); // Only add processes that have already started, i.e. with valid handles. - if (!process_data.GetProcess().IsValid()) + if (!process_data.GetProcess().IsValid()) { continue; + } base::Value::Dict proc; proc.Set("processId", base::strict_cast<double>(process_data.GetProcess().Pid())); @@ -59,8 +60,9 @@ !it.IsAtEnd(); it.Advance()) { RenderProcessHost* host = it.GetCurrentValue(); // Skip processes that might not have started yet. - if (!host->GetProcess().IsValid()) + if (!host->GetProcess().IsValid()) { continue; + } base::Value::Dict proc; proc.Set("processId", base::strict_cast<double>(host->GetProcess().Pid()));
diff --git a/chrome/browser/ui/webui/sanitized_image_source.cc b/chrome/browser/ui/webui/sanitized_image_source.cc index d5a2120..f621b73 100644 --- a/chrome/browser/ui/webui/sanitized_image_source.cc +++ b/chrome/browser/ui/webui/sanitized_image_source.cc
@@ -77,8 +77,9 @@ }; for (const char* const suffix : kGooglePhotosHostSuffixes) { - if (base::EndsWith(url.host_piece(), suffix)) + if (base::EndsWith(url.host_piece(), suffix)) { return true; + } } return false; }
diff --git a/chrome/browser/ui/webui/search_engine_choice/search_engine_choice_ui.cc b/chrome/browser/ui/webui/search_engine_choice/search_engine_choice_ui.cc index 80a0f4d..daa962e 100644 --- a/chrome/browser/ui/webui/search_engine_choice/search_engine_choice_ui.cc +++ b/chrome/browser/ui/webui/search_engine_choice/search_engine_choice_ui.cc
@@ -71,7 +71,6 @@ SearchEngineChoiceUI::SearchEngineChoiceUI(content::WebUI* web_ui) : ui::MojoWebUIController(web_ui, true), profile_(CHECK_DEREF(Profile::FromWebUI(web_ui))) { - content::WebUIDataSource* source = content::WebUIDataSource::CreateAndAdd( web_ui->GetWebContents()->GetBrowserContext(), chrome::kChromeUISearchEngineChoiceHost);
diff --git a/chrome/browser/ui/webui/segmentation_internals/segmentation_internals_page_handler_impl.cc b/chrome/browser/ui/webui/segmentation_internals/segmentation_internals_page_handler_impl.cc index 2acba1b..253bfe7 100644 --- a/chrome/browser/ui/webui/segmentation_internals/segmentation_internals_page_handler_impl.cc +++ b/chrome/browser/ui/webui/segmentation_internals/segmentation_internals_page_handler_impl.cc
@@ -19,39 +19,45 @@ : receiver_(this, std::move(receiver)), page_(std::move(page)), service_proxy_(segmentation_service->GetServiceProxy()) { - if (service_proxy_) + if (service_proxy_) { service_proxy_->AddObserver(this); + } } SegmentationInternalsPageHandlerImpl::~SegmentationInternalsPageHandlerImpl() { - if (service_proxy_) + if (service_proxy_) { service_proxy_->RemoveObserver(this); + } } void SegmentationInternalsPageHandlerImpl::GetServiceStatus() { - if (!service_proxy_) + if (!service_proxy_) { return; + } service_proxy_->GetServiceStatus(); } void SegmentationInternalsPageHandlerImpl::ExecuteModel(int segment_id) { - if (!service_proxy_) + if (!service_proxy_) { return; + } service_proxy_->ExecuteModel(static_cast<SegmentId>(segment_id)); } void SegmentationInternalsPageHandlerImpl::OverwriteResult(int segment_id, float result) { - if (!service_proxy_) + if (!service_proxy_) { return; + } service_proxy_->OverwriteResult(static_cast<SegmentId>(segment_id), result); } void SegmentationInternalsPageHandlerImpl::SetSelected( const std::string& segmentation_key, int segment_id) { - if (!service_proxy_) + if (!service_proxy_) { return; + } service_proxy_->SetSelectedSegment(segmentation_key, static_cast<SegmentId>(segment_id));
diff --git a/chrome/browser/ui/webui/settings/about_handler.cc b/chrome/browser/ui/webui/settings/about_handler.cc index 841116f..6567243 100644 --- a/chrome/browser/ui/webui/settings/about_handler.cc +++ b/chrome/browser/ui/webui/settings/about_handler.cc
@@ -133,8 +133,9 @@ // On a managed machine we delegate this setting to the affiliated users // only if the policy value is true. ash::CrosSettings::Get()->GetBoolean(ash::kReleaseChannelDelegated, &value); - if (!value) + if (!value) { return false; + } // Get the currently logged-in user and check if it is affiliated. const user_manager::User* user = @@ -186,8 +187,9 @@ } // Try the fallback region code if no directory was found. - if (region_path.empty() && region != kDefaultRegionCode) + if (region_path.empty() && region != kDefaultRegionCode) { region_path = GetRegulatoryLabelDirForRegion(kDefaultRegionCode); + } return region_path; } @@ -202,8 +204,9 @@ .AppendASCII(kRegulatoryLabelTextFilename); std::string contents; - if (base::ReadFileToString(text_path, &contents)) + if (base::ReadFileToString(text_path, &contents)) { return contents; + } return std::string(); } @@ -915,17 +918,19 @@ state == VersionUpdater::PROMOTE_ENABLED; std::u16string text; - if (actionable) + if (actionable) { text = l10n_util::GetStringUTF16(IDS_ABOUT_CHROME_AUTOUPDATE_ALL); - else if (state == VersionUpdater::PROMOTED) + } else if (state == VersionUpdater::PROMOTED) { text = l10n_util::GetStringUTF16(IDS_ABOUT_CHROME_AUTOUPDATE_ALL_IS_ON); + } base::Value::Dict promo_state; promo_state.Set("hidden", hidden); promo_state.Set("disabled", disabled); promo_state.Set("actionable", actionable); - if (!text.empty()) + if (!text.empty()) { promo_state.Set("text", text); + } FireWebUIListener("promotion-state-changed", promo_state); }
diff --git a/chrome/browser/ui/webui/settings/accessibility_main_handler.h b/chrome/browser/ui/webui/settings/accessibility_main_handler.h index 314ddd3..2041b51 100644 --- a/chrome/browser/ui/webui/settings/accessibility_main_handler.h +++ b/chrome/browser/ui/webui/settings/accessibility_main_handler.h
@@ -15,7 +15,6 @@ #include "chrome/browser/ash/accessibility/accessibility_manager.h" #endif // BUILDFLAG(IS_CHROMEOS_ASH) - namespace settings { // Settings handler for the main accessibility settings page,
diff --git a/chrome/browser/ui/webui/settings/browser_lifetime_handler.cc b/chrome/browser/ui/webui/settings/browser_lifetime_handler.cc index ef33299c..2fbec7e 100644 --- a/chrome/browser/ui/webui/settings/browser_lifetime_handler.cc +++ b/chrome/browser/ui/webui/settings/browser_lifetime_handler.cc
@@ -127,8 +127,9 @@ !user_manager::UserManager::Get()->IsLoggedInAsGuest() && !user_manager::UserManager::Get()->IsLoggedInAsChildUser(); - if (!allow_powerwash) + if (!allow_powerwash) { return; + } PrefService* prefs = g_browser_process->local_state(); prefs->SetBoolean(prefs::kFactoryResetRequested, true);
diff --git a/chrome/browser/ui/webui/settings/captions_handler.cc b/chrome/browser/ui/webui/settings/captions_handler.cc index 38644bfc..efaf0003 100644 --- a/chrome/browser/ui/webui/settings/captions_handler.cc +++ b/chrome/browser/ui/webui/settings/captions_handler.cc
@@ -66,8 +66,9 @@ } CaptionsHandler::~CaptionsHandler() { - if (soda_available_) + if (soda_available_) { speech::SodaInstaller::GetInstance()->RemoveObserver(this); + } } void CaptionsHandler::RegisterMessages() { @@ -98,13 +99,15 @@ } void CaptionsHandler::OnJavascriptAllowed() { - if (soda_available_) + if (soda_available_) { speech::SodaInstaller::GetInstance()->AddObserver(this); + } } void CaptionsHandler::OnJavascriptDisallowed() { - if (soda_available_) + if (soda_available_) { speech::SodaInstaller::GetInstance()->RemoveObserver(this); + } } void CaptionsHandler::HandleLiveCaptionSectionReady( @@ -243,8 +246,9 @@ // early. We do not check for a matching language if multi-language is // enabled because we show all of the languages' download status in the UI, // even ones that are not currently selected. - if (!prefs::IsLanguageCodeForLiveCaption(language_code, prefs_)) + if (!prefs::IsLanguageCodeForLiveCaption(language_code, prefs_)) { return; + } speech::SodaInstaller::GetInstance()->RemoveObserver(this); }
diff --git a/chrome/browser/ui/webui/settings/custom_home_pages_table_model.cc b/chrome/browser/ui/webui/settings/custom_home_pages_table_model.cc index 427458bf..7d28517a 100644 --- a/chrome/browser/ui/webui/settings/custom_home_pages_table_model.cc +++ b/chrome/browser/ui/webui/settings/custom_home_pages_table_model.cc
@@ -71,8 +71,9 @@ void CustomHomePagesTableModel::Add(size_t index, const GURL& url) { AddWithoutNotification(index, url); LoadTitle(&(entries_[index])); - if (observer_) + if (observer_) { observer_->OnItemsAdded(index, 1); + } } void CustomHomePagesTableModel::RemoveWithoutNotification(size_t index) { @@ -89,32 +90,36 @@ void CustomHomePagesTableModel::Remove(size_t index) { RemoveWithoutNotification(index); - if (observer_) + if (observer_) { observer_->OnItemsRemoved(index, 1); + } } void CustomHomePagesTableModel::SetToCurrentlyOpenPages( content::WebContents* ignore_contents) { // Remove the current entries. - while (RowCount()) + while (RowCount()) { RemoveWithoutNotification(0); + } // Add tabs from appropriate browser windows. size_t add_index = 0; for (Browser* browser : *BrowserList::GetInstance()) { - if (!ShouldIncludeBrowser(browser)) + if (!ShouldIncludeBrowser(browser)) { continue; + } - for (int tab_index = 0; - tab_index < browser->tab_strip_model()->count(); + for (int tab_index = 0; tab_index < browser->tab_strip_model()->count(); ++tab_index) { content::WebContents* contents = browser->tab_strip_model()->GetWebContentsAt(tab_index); - if (contents == ignore_contents) + if (contents == ignore_contents) { continue; + } const GURL url = contents->GetURL(); - if (!url.is_empty() && !url.SchemeIs(content::kChromeDevToolsScheme)) + if (!url.is_empty() && !url.SchemeIs(content::kChromeDevToolsScheme)) { AddWithoutNotification(add_index++, url); + } } } LoadAllTitles(); @@ -122,8 +127,9 @@ std::vector<GURL> CustomHomePagesTableModel::GetURLs() { std::vector<GURL> urls(entries_.size()); - for (size_t i = 0; i < entries_.size(); ++i) + for (size_t i = 0; i < entries_.size(); ++i) { urls[i] = entries_[i].url; + } return urls; } @@ -151,8 +157,9 @@ bool CustomHomePagesTableModel::ShouldIncludeBrowser(Browser* browser) { // Do not include incognito browsers. - if (browser->profile() != profile_) + if (browser->profile() != profile_) { return false; + } #if BUILDFLAG(IS_CHROMEOS_ASH) // Do not include the Settings window. if (chrome::SettingsWindowManager::GetInstance()->IsSettingsBrowser( @@ -193,8 +200,9 @@ &task_tracker_); } } - if (entries_.empty()) + if (entries_.empty()) { observer_->OnModelChanged(); + } } void CustomHomePagesTableModel::OnGotOneOfManyTitles( @@ -202,8 +210,9 @@ history::QueryURLResult result) { OnGotTitle(entry_url, false, std::move(result)); DCHECK_GE(num_outstanding_title_lookups_, 1); - if (--num_outstanding_title_lookups_ == 0 && observer_) + if (--num_outstanding_title_lookups_ == 0 && observer_) { observer_->OnModelChanged(); + } } void CustomHomePagesTableModel::OnGotTitle(const GURL& entry_url, @@ -225,8 +234,9 @@ entry->task_id = base::CancelableTaskTracker::kBadTaskId; if (result.success && !result.row.title().empty()) { entry->title = result.row.title(); - if (observer_ && observable) + if (observer_ && observable) { observer_->OnItemsChanged(entry_index, 1); + } } }
diff --git a/chrome/browser/ui/webui/settings/downloads_handler.cc b/chrome/browser/ui/webui/settings/downloads_handler.cc index 6ab9624d..f8503957 100644 --- a/chrome/browser/ui/webui/settings/downloads_handler.cc +++ b/chrome/browser/ui/webui/settings/downloads_handler.cc
@@ -34,8 +34,9 @@ DownloadsHandler::~DownloadsHandler() { // There may be pending file dialogs, we need to tell them that we've gone // away so they don't try and call back to us. - if (select_folder_dialog_) + if (select_folder_dialog_) { select_folder_dialog_->ListenerDestroyed(); + } } void DownloadsHandler::RegisterMessages() { @@ -94,8 +95,9 @@ void DownloadsHandler::HandleSelectDownloadLocation( const base::Value::List& args) { // Early return if the select folder dialog is already active. - if (select_folder_dialog_) + if (select_folder_dialog_) { return; + } PrefService* pref_service = profile_->GetPrefs(); select_folder_dialog_ = ui::SelectFileDialog::Create(
diff --git a/chrome/browser/ui/webui/settings/font_handler.cc b/chrome/browser/ui/webui/settings/font_handler.cc index 91f6715..21ecda5 100644 --- a/chrome/browser/ui/webui/settings/font_handler.cc +++ b/chrome/browser/ui/webui/settings/font_handler.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/ui/webui/settings/font_handler.h" #include <stddef.h> + #include <string> #include <utility> #include <vector>
diff --git a/chrome/browser/ui/webui/settings/hats_handler.cc b/chrome/browser/ui/webui/settings/hats_handler.cc index f5dce54b..a17af3f 100644 --- a/chrome/browser/ui/webui/settings/hats_handler.cc +++ b/chrome/browser/ui/webui/settings/hats_handler.cc
@@ -231,8 +231,9 @@ // The HaTS service may not be available for the profile, for example if it // is a guest profile. - if (!hats_service) + if (!hats_service) { return; + } std::string trigger = ""; int timeout_ms = 0; @@ -290,8 +291,9 @@ void HatsHandler::InformSentimentService(TrustSafetyInteraction interaction) { auto* sentiment_service = TrustSafetySentimentServiceFactory::GetForProfile( Profile::FromWebUI(web_ui())); - if (!sentiment_service) + if (!sentiment_service) { return; + } if (interaction == TrustSafetyInteraction::USED_PRIVACY_CARD) { sentiment_service->InteractedWithPrivacySettings(
diff --git a/chrome/browser/ui/webui/settings/hats_handler_unittest.cc b/chrome/browser/ui/webui/settings/hats_handler_unittest.cc index 0767267..d023a04e 100644 --- a/chrome/browser/ui/webui/settings/hats_handler_unittest.cc +++ b/chrome/browser/ui/webui/settings/hats_handler_unittest.cc
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "build/build_config.h" #include "chrome/browser/ui/webui/settings/hats_handler.h" #include <memory> @@ -11,6 +10,7 @@ #include "base/memory/raw_ptr.h" #include "base/values.h" #include "build/branding_buildflags.h" +#include "build/build_config.h" #include "chrome/browser/privacy_sandbox/privacy_sandbox_settings_factory.h" #include "chrome/browser/ui/hats/hats_service.h" #include "chrome/browser/ui/hats/hats_service_factory.h"
diff --git a/chrome/browser/ui/webui/settings/import_data_handler.cc b/chrome/browser/ui/webui/settings/import_data_handler.cc index d4b2e0b0..cecce41 100644 --- a/chrome/browser/ui/webui/settings/import_data_handler.cc +++ b/chrome/browser/ui/webui/settings/import_data_handler.cc
@@ -46,11 +46,13 @@ ImportDataHandler::~ImportDataHandler() { DCHECK_CURRENTLY_ON(BrowserThread::UI); - if (importer_host_) + if (importer_host_) { importer_host_->set_observer(nullptr); + } - if (select_file_dialog_.get()) + if (select_file_dialog_.get()) { select_file_dialog_->ListenerDestroyed(); + } } void ImportDataHandler::RegisterMessages() { @@ -88,12 +90,14 @@ uint16_t imported_items) { DCHECK_CURRENTLY_ON(BrowserThread::UI); - if (!imported_items) + if (!imported_items) { return; + } // If another import is already ongoing, let it finish silently. - if (importer_host_) + if (importer_host_) { importer_host_->set_observer(nullptr); + } FireWebUIListener("import-data-status-changed", base::Value(kImportStatusInProgress)); @@ -175,8 +179,9 @@ const base::Value::List& args) { DCHECK_CURRENTLY_ON(BrowserThread::UI); - if (select_file_dialog_) + if (select_file_dialog_) { return; + } DCHECK(args.empty()); select_file_dialog_ = ui::SelectFileDialog::Create(
diff --git a/chrome/browser/ui/webui/settings/metrics_reporting_handler.cc b/chrome/browser/ui/webui/settings/metrics_reporting_handler.cc index 6a927f1c..1e786cc 100644 --- a/chrome/browser/ui/webui/settings/metrics_reporting_handler.cc +++ b/chrome/browser/ui/webui/settings/metrics_reporting_handler.cc
@@ -7,14 +7,13 @@ #if BUILDFLAG(GOOGLE_CHROME_BRANDING) && !BUILDFLAG(IS_CHROMEOS_ASH) -#include "chrome/browser/ui/webui/settings/metrics_reporting_handler.h" - #include "base/functional/bind.h" #include "base/functional/callback_helpers.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" #include "chrome/browser/metrics/metrics_reporting_state.h" +#include "chrome/browser/ui/webui/settings/metrics_reporting_handler.h" #include "components/metrics/metrics_pref_names.h" #include "components/prefs/pref_service.h" #include "content/public/browser/web_ui.h"
diff --git a/chrome/browser/ui/webui/settings/metrics_reporting_handler_unittest.cc b/chrome/browser/ui/webui/settings/metrics_reporting_handler_unittest.cc index eadb8d4..09ba82f 100644 --- a/chrome/browser/ui/webui/settings/metrics_reporting_handler_unittest.cc +++ b/chrome/browser/ui/webui/settings/metrics_reporting_handler_unittest.cc
@@ -7,10 +7,9 @@ #if BUILDFLAG(GOOGLE_CHROME_BRANDING) && !BUILDFLAG(IS_CHROMEOS_ASH) -#include "chrome/browser/ui/webui/settings/metrics_reporting_handler.h" - #include "base/run_loop.h" #include "base/values.h" +#include "chrome/browser/ui/webui/settings/metrics_reporting_handler.h" #include "chrome/test/base/scoped_testing_local_state.h" #include "chrome/test/base/testing_browser_process.h" #include "components/metrics/metrics_pref_names.h" @@ -24,8 +23,8 @@ class TestingMetricsReportingHandler : public MetricsReportingHandler { public: - using MetricsReportingHandler::set_web_ui; using MetricsReportingHandler::HandleGetMetricsReporting; + using MetricsReportingHandler::set_web_ui; }; class MetricsReportingHandlerTest : public testing::Test {
diff --git a/chrome/browser/ui/webui/settings/performance_handler.h b/chrome/browser/ui/webui/settings/performance_handler.h index 94456cb..619550c 100644 --- a/chrome/browser/ui/webui/settings/performance_handler.h +++ b/chrome/browser/ui/webui/settings/performance_handler.h
@@ -39,7 +39,8 @@ void OnDeviceHasBatteryChanged(bool device_has_battery) override; /** - * Returns a list of currently opened tabs' urls in order of most recently used. + * Returns a list of currently opened tabs' urls in order of most recently + * used. */ base::Value GetCurrentOpenSites(); void HandleGetCurrentOpenSites(const base::Value::List& args);
diff --git a/chrome/browser/ui/webui/settings/performance_handler_unittest.cc b/chrome/browser/ui/webui/settings/performance_handler_unittest.cc index 36e2100..1d9acf3 100644 --- a/chrome/browser/ui/webui/settings/performance_handler_unittest.cc +++ b/chrome/browser/ui/webui/settings/performance_handler_unittest.cc
@@ -24,7 +24,8 @@ PerformanceHandlerTest() = default; void SetUp() override { - web_contents_ = content::WebContentsTester::CreateTestWebContents(profile(), nullptr); + web_contents_ = + content::WebContentsTester::CreateTestWebContents(profile(), nullptr); web_ui_ = std::make_unique<content::TestWebUI>(); web_ui_->set_web_contents(web_contents_.get()); handler_ = std::make_unique<PerformanceHandler>();
diff --git a/chrome/browser/ui/webui/settings/privacy_sandbox_handler.cc b/chrome/browser/ui/webui/settings/privacy_sandbox_handler.cc index 53008b97..5873391 100644 --- a/chrome/browser/ui/webui/settings/privacy_sandbox_handler.cc +++ b/chrome/browser/ui/webui/settings/privacy_sandbox_handler.cc
@@ -125,12 +125,14 @@ const base::Value::List& args) { AllowJavascript(); base::Value::List top_topics_list; - for (const auto& topic : GetPrivacySandboxService()->GetCurrentTopTopics()) + for (const auto& topic : GetPrivacySandboxService()->GetCurrentTopTopics()) { top_topics_list.Append(ConvertTopicToValue(topic)); + } base::Value::List blocked_topics_list; - for (const auto& topic : GetPrivacySandboxService()->GetBlockedTopics()) + for (const auto& topic : GetPrivacySandboxService()->GetBlockedTopics()) { blocked_topics_list.Append(ConvertTopicToValue(topic)); + } base::Value::Dict topics_state; topics_state.Set(kTopTopics, std::move(top_topics_list)); @@ -152,14 +154,16 @@ // Combine |joining_sites| with the blocked FLEDGE sites information. The // latter is available synchronously. base::Value::List joining_sites_list; - for (const auto& site : joining_sites) + for (const auto& site : joining_sites) { joining_sites_list.Append(site); + } const auto blocked_sites = GetPrivacySandboxService()->GetBlockedFledgeJoiningTopFramesForDisplay(); base::Value::List blocked_sites_list; - for (const auto& site : blocked_sites) + for (const auto& site : blocked_sites) { blocked_sites_list.Append(site); + } base::Value::Dict fledge_state; fledge_state.Set(kJoiningSites, std::move(joining_sites_list));
diff --git a/chrome/browser/ui/webui/settings/privacy_sandbox_handler_unittest.cc b/chrome/browser/ui/webui/settings/privacy_sandbox_handler_unittest.cc index e02edb525..bc557b1 100644 --- a/chrome/browser/ui/webui/settings/privacy_sandbox_handler_unittest.cc +++ b/chrome/browser/ui/webui/settings/privacy_sandbox_handler_unittest.cc
@@ -289,9 +289,7 @@ : public PrivacySandboxMessageHandlerTest, public testing::WithParamInterface<std::pair<bool, bool>> { public: - void SetUp() override { - PrivacySandboxMessageHandlerTest::SetUp(); - } + void SetUp() override { PrivacySandboxMessageHandlerTest::SetUp(); } private: base::test::ScopedFeatureList feature_list_;
diff --git a/chrome/browser/ui/webui/settings/protocol_handlers_handler.cc b/chrome/browser/ui/webui/settings/protocol_handlers_handler.cc index 3c1abbe..06e8a80b 100644 --- a/chrome/browser/ui/webui/settings/protocol_handlers_handler.cc +++ b/chrome/browser/ui/webui/settings/protocol_handlers_handler.cc
@@ -46,8 +46,9 @@ handler_value.Set("protocol", handler.protocol()); handler_value.Set("spec", handler.url().spec()); handler_value.Set("host", handler.url().host()); - if (registry) + if (registry) { handler_value.Set("is_default", registry->IsDefault(handler)); + } if (handler.web_app_id().has_value()) { const auto& web_app_id = handler.web_app_id().value(); @@ -226,10 +227,11 @@ bool enabled = true; CHECK(args[0].is_bool()); enabled = args[0].GetBool(); - if (enabled) + if (enabled) { GetProtocolHandlerRegistry()->Enable(); - else + } else { GetProtocolHandlerRegistry()->Disable(); + } } void ProtocolHandlersHandler::HandleSetDefault(const base::Value::List& args) { @@ -241,8 +243,9 @@ custom_handlers::ProtocolHandler ProtocolHandlersHandler::ParseHandlerFromArgs( const base::Value::List& args) const { bool ok = args.size() >= 2u && args[0].is_string() && args[1].is_string(); - if (!ok) + if (!ok) { return custom_handlers::ProtocolHandler::EmptyProtocolHandler(); + } std::string protocol = args[0].GetString(); std::string url = args[1].GetString(); return custom_handlers::ProtocolHandler::CreateProtocolHandler(protocol, @@ -273,8 +276,9 @@ } void ProtocolHandlersHandler::UpdateAllAllowedLaunchProtocols() { - if (!web_app_provider_) + if (!web_app_provider_) { return; + } base::flat_set<std::string> protocols( web_app_provider_->registrar_unsafe().GetAllAllowedLaunchProtocols()); @@ -294,8 +298,9 @@ } void ProtocolHandlersHandler::UpdateAllDisallowedLaunchProtocols() { - if (!web_app_provider_) + if (!web_app_provider_) { return; + } base::flat_set<std::string> protocols( web_app_provider_->registrar_unsafe().GetAllDisallowedLaunchProtocols()); @@ -342,8 +347,9 @@ const std::string* protocol = args[0].GetIfString(); const std::string* url = args[1].GetIfString(); const std::string* app_id = args[2].GetIfString(); - if (!protocol || !url || !app_id) + if (!protocol || !url || !app_id) { return custom_handlers::ProtocolHandler::EmptyProtocolHandler(); + } return custom_handlers::ProtocolHandler::CreateWebAppProtocolHandler( *protocol, GURL(*url), *app_id); }
diff --git a/chrome/browser/ui/webui/settings/recent_site_settings_helper.cc b/chrome/browser/ui/webui/settings/recent_site_settings_helper.cc index f8fb48a..7001012 100644 --- a/chrome/browser/ui/webui/settings/recent_site_settings_helper.cc +++ b/chrome/browser/ui/webui/settings/recent_site_settings_helper.cc
@@ -41,8 +41,9 @@ base::Time GetMostRecentTimestamp(const RecentSitePermissions& x) { auto most_recent = base::Time(); for (const auto& setting : x.settings) { - if (setting.timestamp > most_recent) + if (setting.timestamp > most_recent) { most_recent = setting.timestamp; + } } return most_recent; }
diff --git a/chrome/browser/ui/webui/settings/reset_settings_handler.cc b/chrome/browser/ui/webui/settings/reset_settings_handler.cc index 84e4579..e6b52229 100644 --- a/chrome/browser/ui/webui/settings/reset_settings_handler.cc +++ b/chrome/browser/ui/webui/settings/reset_settings_handler.cc
@@ -52,8 +52,9 @@ static const char kOriginUserClick[] = "userclick"; static const char kOriginTriggeredReset[] = "triggeredreset"; - if (request_origin == kOriginUserClick) + if (request_origin == kOriginUserClick) { return reset_report::ChromeResetReport::RESET_REQUEST_ORIGIN_USER_CLICK; + } if (request_origin == kOriginTriggeredReset) { return reset_report::ChromeResetReport:: RESET_REQUEST_ORIGIN_TRIGGERED_RESET; @@ -83,8 +84,9 @@ const base::Time reset_time = chrome_prefs::GetResetTime(profile); // If there is no reset time, do not show the banner. - if (reset_time.is_null()) + if (reset_time.is_null()) { return false; + } // Otherwise, only show the banner if it has been less than |kBannerShowTime| // since reset. @@ -199,8 +201,9 @@ void ResetSettingsHandler::OnHideResetProfileDialog( const base::Value::List& args) { - if (!GetResetter()->IsActive()) + if (!GetResetter()->IsActive()) { setting_snapshot_.reset(); + } } void ResetSettingsHandler::OnHideResetProfileBanner( @@ -222,8 +225,9 @@ } ProfileResetter* ResetSettingsHandler::GetResetter() { - if (!resetter_) + if (!resetter_) { resetter_ = std::make_unique<ProfileResetter>(profile_); + } return resetter_.get(); }
diff --git a/chrome/browser/ui/webui/settings/reset_settings_handler_unittest.cc b/chrome/browser/ui/webui/settings/reset_settings_handler_unittest.cc index 6e85556..ca000f9d 100644 --- a/chrome/browser/ui/webui/settings/reset_settings_handler_unittest.cc +++ b/chrome/browser/ui/webui/settings/reset_settings_handler_unittest.cc
@@ -22,10 +22,8 @@ class TestingResetSettingsHandler : public ResetSettingsHandler { public: - TestingResetSettingsHandler( - TestingProfile* profile, content::WebUI* web_ui) - : ResetSettingsHandler(profile), - resetter_(profile) { + TestingResetSettingsHandler(TestingProfile* profile, content::WebUI* web_ui) + : ResetSettingsHandler(profile), resetter_(profile) { set_web_ui(web_ui); } @@ -73,8 +71,7 @@ // Check that the delegate ProfileResetter was called. EXPECT_EQ(1u, handler()->Resets()); // Check that Javascript side is notified after resetting is done. - EXPECT_EQ("cr.webUIResponse", - web_ui()->call_data()[0]->function_name()); + EXPECT_EQ("cr.webUIResponse", web_ui()->call_data()[0]->function_name()); const std::string* callback_id = web_ui()->call_data()[0]->arg1()->GetIfString(); EXPECT_NE(nullptr, callback_id);
diff --git a/chrome/browser/ui/webui/settings/search_engines_handler.cc b/chrome/browser/ui/webui/settings/search_engines_handler.cc index 0f90f92..e9eb7cf 100644 --- a/chrome/browser/ui/webui/settings/search_engines_handler.cc +++ b/chrome/browser/ui/webui/settings/search_engines_handler.cc
@@ -229,8 +229,9 @@ dict.Set("urlLocked", ((template_url->prepopulate_id() > 0) || (template_url->starter_pack_id() > 0))); GURL icon_url = template_url->favicon_url(); - if (icon_url.is_valid()) + if (icon_url.is_valid()) { dict.Set("iconURL", icon_url.spec()); + } // The icons that are used for search engines in the EEA region are bundled // with Chrome. We use the favicon service for countries outside the EEA @@ -402,10 +403,11 @@ const std::u16string& keyword, const std::string& url) { DCHECK(!url.empty()); - if (template_url) + if (template_url) { list_controller_.ModifyTemplateURL(template_url, title, keyword, url); - else + } else { list_controller_.AddTemplateURL(title, keyword, url); + } edit_controller_.reset(); } @@ -423,8 +425,9 @@ bool SearchEnginesHandler::CheckFieldValidity(const std::string& field_name, const std::string& field_value) { - if (!edit_controller_.get()) + if (!edit_controller_.get()) { return false; + } bool is_valid = false; if (field_name.compare(kSearchEngineField) == 0) { @@ -442,16 +445,18 @@ void SearchEnginesHandler::HandleSearchEngineEditCancelled( const base::Value::List& args) { - if (!edit_controller_.get()) + if (!edit_controller_.get()) { return; + } edit_controller_->CleanUpCancelledAdd(); edit_controller_.reset(); } void SearchEnginesHandler::HandleSearchEngineEditCompleted( const base::Value::List& args) { - if (!edit_controller_.get()) + if (!edit_controller_.get()) { return; + } CHECK_EQ(3U, args.size()); const std::string& search_engine = args[0].GetString();
diff --git a/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc b/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc index f42554d..4c24c98 100644 --- a/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc +++ b/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc
@@ -78,7 +78,7 @@ browsing_data::prefs::kDeleteCacheBasic, }; -} // namespace +} // namespace namespace settings { @@ -113,8 +113,9 @@ } void ClearBrowsingDataHandler::OnJavascriptAllowed() { - if (sync_service_) + if (sync_service_) { sync_service_observation_.Observe(sync_service_.get()); + } dse_service_observation_.Observe( TemplateURLServiceFactory::GetForProfile(profile_)); @@ -178,12 +179,14 @@ switch (*data_type) { case BrowsingDataType::HISTORY: - if (prefs->GetBoolean(prefs::kAllowDeletingBrowserHistory)) + if (prefs->GetBoolean(prefs::kAllowDeletingBrowserHistory)) { remove_mask |= chrome_browsing_data_remover::DATA_TYPE_HISTORY; + } break; case BrowsingDataType::DOWNLOADS: - if (prefs->GetBoolean(prefs::kAllowDeletingBrowserHistory)) + if (prefs->GetBoolean(prefs::kAllowDeletingBrowserHistory)) { remove_mask |= content::BrowsingDataRemover::DATA_TYPE_DOWNLOADS; + } break; case BrowsingDataType::CACHE: remove_mask |= content::BrowsingDataRemover::DATA_TYPE_CACHE;
diff --git a/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler_unittest.cc b/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler_unittest.cc index 9b2746b..64c45e63 100644 --- a/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler_unittest.cc +++ b/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler_unittest.cc
@@ -184,8 +184,9 @@ continue; } const std::string* event = data.arg1()->GetIfString(); - if (!event || *event != "update-sync-state") + if (!event || *event != "update-sync-state") { continue; + } const base::Value::Dict* arg2_dict = data.arg2()->GetIfDict(); if (!arg2_dict) { continue; @@ -217,8 +218,9 @@ data.prepopulate_id = prepopulate_id; TemplateURL* url = template_url_service->Add(std::make_unique<TemplateURL>(data)); - if (set_default) + if (set_default) { template_url_service->SetUserSelectedDefaultSearchProvider(url); + } return url; }
diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc index 26873b0..0d930158 100644 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -253,7 +253,7 @@ user_manager::UserManager::Get()->IsLoggedInAsGuest() || user_manager::UserManager::Get()->IsLoggedInAsManagedGuestSession()); #else - profile->IsGuestSession()); + profile->IsGuestSession()); #endif html_source->AddBoolean("isChildAccount", profile->IsChild());
diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.h b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.h index d6eb555..c0b4f03 100644 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.h +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.h
@@ -10,7 +10,7 @@ namespace content { class WebUIDataSource; class WebContents; -} +} // namespace content namespace settings {
diff --git a/chrome/browser/ui/webui/settings/settings_manage_profile_handler.cc b/chrome/browser/ui/webui/settings/settings_manage_profile_handler.cc index 4dea1e04f..7766dc8 100644 --- a/chrome/browser/ui/webui/settings/settings_manage_profile_handler.cc +++ b/chrome/browser/ui/webui/settings/settings_manage_profile_handler.cc
@@ -100,8 +100,9 @@ void ManageProfileHandler::OnProfileHighResAvatarLoaded( const base::FilePath& profile_path) { - if (profile_path != profile_->GetPath()) + if (profile_path != profile_->GetPath()) { return; + } // GAIA image is loaded asynchronously. FireWebUIListener( @@ -111,8 +112,9 @@ void ManageProfileHandler::OnProfileAvatarChanged( const base::FilePath& profile_path) { - if (profile_path != profile_->GetPath()) + if (profile_path != profile_->GetPath()) { return; + } // This is necessary to send the potentially updated GAIA photo. FireWebUIListener( @@ -206,8 +208,8 @@ weak_factory_.GetWeakPtr(), callback_id)); } -void ManageProfileHandler::OnHasProfileShortcuts( - const std::string& callback_id, bool has_shortcuts) { +void ManageProfileHandler::OnHasProfileShortcuts(const std::string& callback_id, + bool has_shortcuts) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); ResolveJavascriptCallback( base::Value(callback_id), @@ -229,7 +231,7 @@ const base::Value::List& args) { DCHECK(ProfileShortcutManager::IsFeatureEnabled()); ProfileShortcutManager* shortcut_manager = - g_browser_process->profile_manager()->profile_shortcut_manager(); + g_browser_process->profile_manager()->profile_shortcut_manager(); DCHECK(shortcut_manager); shortcut_manager->RemoveProfileShortcuts(profile_->GetPath());
diff --git a/chrome/browser/ui/webui/settings/settings_manage_profile_handler_unittest.cc b/chrome/browser/ui/webui/settings/settings_manage_profile_handler_unittest.cc index da13558..cce4a8e 100644 --- a/chrome/browser/ui/webui/settings/settings_manage_profile_handler_unittest.cc +++ b/chrome/browser/ui/webui/settings/settings_manage_profile_handler_unittest.cc
@@ -30,8 +30,8 @@ explicit TestManageProfileHandler(Profile* profile) : ManageProfileHandler(profile) {} - using ManageProfileHandler::set_web_ui; using ManageProfileHandler::AllowJavascript; + using ManageProfileHandler::set_web_ui; }; } // namespace
diff --git a/chrome/browser/ui/webui/settings/settings_media_devices_selection_handler.cc b/chrome/browser/ui/webui/settings/settings_media_devices_selection_handler.cc index ad95f68..7c41fea 100644 --- a/chrome/browser/ui/webui/settings/settings_media_devices_selection_handler.cc +++ b/chrome/browser/ui/webui/settings/settings_media_devices_selection_handler.cc
@@ -235,8 +235,9 @@ } #endif - if (facing_info.empty()) + if (facing_info.empty()) { return device.descriptor.display_name(); + } return device.descriptor.display_name() + " " + facing_info; }
diff --git a/chrome/browser/ui/webui/settings/settings_media_devices_selection_handler_unittest.cc b/chrome/browser/ui/webui/settings/settings_media_devices_selection_handler_unittest.cc index c361a2a..45321ec6 100644 --- a/chrome/browser/ui/webui/settings/settings_media_devices_selection_handler_unittest.cc +++ b/chrome/browser/ui/webui/settings/settings_media_devices_selection_handler_unittest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/webui/settings/settings_media_devices_selection_handler.h" + #include "base/test/test_future.h" #include "chrome/test/base/testing_profile.h" #include "components/media_effects/test/fake_audio_service.h"
diff --git a/chrome/browser/ui/webui/settings/settings_secure_dns_handler_browsertest.cc b/chrome/browser/ui/webui/settings/settings_secure_dns_handler_browsertest.cc index 21826e0..dac26d0 100644 --- a/chrome/browser/ui/webui/settings/settings_secure_dns_handler_browsertest.cc +++ b/chrome/browser/ui/webui/settings/settings_secure_dns_handler_browsertest.cc
@@ -180,25 +180,29 @@ } const base::Value::Dict* dict = data->arg2()->GetIfDict(); - if (!dict) + if (!dict) { return false; + } // Get the secure DNS mode. const std::string* secure_dns_mode = dict->FindString("mode"); - if (!secure_dns_mode) + if (!secure_dns_mode) { return false; + } *out_secure_dns_mode = *secure_dns_mode; // Get the DoH config string. const std::string* doh_config = dict->FindString("config"); - if (!doh_config) + if (!doh_config) { return false; + } *out_doh_config = *doh_config; // Get the forced management description. std::optional<int> management_mode = dict->FindInt("managementMode"); - if (!management_mode.has_value()) + if (!management_mode.has_value()) { return false; + } *out_management_mode = *management_mode; return true; @@ -221,18 +225,21 @@ continue; } const base::Value::Dict* dict = data->arg2()->GetIfDict(); - if (!dict) + if (!dict) { return false; + } std::optional<bool> doh_with_identifiers_active = dict->FindBool("dohWithIdentifiersActive"); - if (!doh_with_identifiers_active) + if (!doh_with_identifiers_active) { return false; + } *out_doh_with_identifiers_active = *doh_with_identifiers_active; const std::string* doh_config_for_display = dict->FindString("configForDisplay"); - if (!doh_config_for_display) + if (!doh_config_for_display) { return false; + } *out_doh_config_for_display = *doh_config_for_display; return true;
diff --git a/chrome/browser/ui/webui/settings/settings_startup_pages_handler.cc b/chrome/browser/ui/webui/settings/settings_startup_pages_handler.cc index b90434b..e099baef 100644 --- a/chrome/browser/ui/webui/settings/settings_startup_pages_handler.cc +++ b/chrome/browser/ui/webui/settings/settings_startup_pages_handler.cc
@@ -20,14 +20,14 @@ namespace settings { StartupPagesHandler::StartupPagesHandler(content::WebUI* webui) - : startup_custom_pages_table_model_(Profile::FromWebUI(webui)) { -} + : startup_custom_pages_table_model_(Profile::FromWebUI(webui)) {} StartupPagesHandler::~StartupPagesHandler() = default; void StartupPagesHandler::RegisterMessages() { - if (Profile::FromWebUI(web_ui())->IsOffTheRecord()) + if (Profile::FromWebUI(web_ui())->IsOffTheRecord()) { return; + } web_ui()->RegisterMessageCallback( "addStartupPage", @@ -59,8 +59,9 @@ SessionStartupPref pref = SessionStartupPref::GetStartupPref(prefService); startup_custom_pages_table_model_.SetURLs(pref.urls); - if (pref.urls.empty()) + if (pref.urls.empty()) { pref.type = SessionStartupPref::DEFAULT; + } pref_change_registrar_.Init(prefService); pref_change_registrar_.Add( @@ -189,8 +190,9 @@ SessionStartupPref pref = SessionStartupPref::GetStartupPref(prefs); pref.urls = startup_custom_pages_table_model_.GetURLs(); - if (pref.urls.empty()) + if (pref.urls.empty()) { pref.type = SessionStartupPref::DEFAULT; + } SessionStartupPref::SetStartupPref(prefs, pref); }
diff --git a/chrome/browser/ui/webui/settings/settings_ui_browsertest.cc b/chrome/browser/ui/webui/settings/settings_ui_browsertest.cc index 24b7710..48f5f16 100644 --- a/chrome/browser/ui/webui/settings/settings_ui_browsertest.cc +++ b/chrome/browser/ui/webui/settings/settings_ui_browsertest.cc
@@ -2,13 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/webui/settings/settings_ui.h" + #include <string> #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/hats/hats_service_factory.h" #include "chrome/browser/ui/hats/mock_hats_service.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/browser/ui/webui/settings/settings_ui.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h"
diff --git a/chrome/browser/ui/webui/settings/settings_utils.cc b/chrome/browser/ui/webui/settings/settings_utils.cc index 5b1e436..1a1c22a 100644 --- a/chrome/browser/ui/webui/settings/settings_utils.cc +++ b/chrome/browser/ui/webui/settings/settings_utils.cc
@@ -17,8 +17,9 @@ GURL* fixed_url) { GURL url = url_formatter::FixupURL(url_string, std::string()); bool valid = url.is_valid() && !extensions::ExtensionTabUtil::IsKillURL(url); - if (valid && fixed_url) + if (valid && fixed_url) { fixed_url->Swap(&url); + } return valid; }
diff --git a/chrome/browser/ui/webui/settings/settings_utils_linux.cc b/chrome/browser/ui/webui/settings/settings_utils_linux.cc index 3561ae86..a416e01 100644 --- a/chrome/browser/ui/webui/settings/settings_utils_linux.cc +++ b/chrome/browser/ui/webui/settings/settings_utils_linux.cc
@@ -46,8 +46,8 @@ const char* const kKDE6ProxyConfigCommand[] = {"kcmshell6", "kcm_proxy"}; // In Deepin OS, we might need to run dde-control-center instead. -const char* const kDeepinProxyConfigCommand[] = {"dde-control-center", - "-m", "network"}; +const char* const kDeepinProxyConfigCommand[] = {"dde-control-center", "-m", + "network"}; // The URL for Linux proxy configuration help when not running under a // supported desktop environment. @@ -57,12 +57,14 @@ void ShowLinuxProxyConfigUrl(base::WeakPtr<content::WebContents> web_contents, bool launched) { DCHECK_CURRENTLY_ON(BrowserThread::UI); - if (launched) + if (launched) { return; + } std::unique_ptr<base::Environment> env(base::Environment::Create()); const char* name = base::nix::GetDesktopEnvironmentName(env.get()); - if (name) + if (name) { LOG(ERROR) << "Could not find " << name << " network settings in $PATH"; + } OpenURLParams params(GURL(kLinuxProxyConfigUrl), Referrer(), WindowOpenDisposition::NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_LINK, false); @@ -82,8 +84,9 @@ // success, so we search $PATH first to predict whether the exec is // expected to succeed. std::unique_ptr<base::Environment> env(base::Environment::Create()); - if (!base::ExecutableExistsInPath(env.get(), command[0])) + if (!base::ExecutableExistsInPath(env.get(), command[0])) { return false; + } std::vector<std::string> argv; for (const char* arg : command) {
diff --git a/chrome/browser/ui/webui/settings/settings_utils_mac.mm b/chrome/browser/ui/webui/settings/settings_utils_mac.mm index 96204b8e..b1748d4 100644 --- a/chrome/browser/ui/webui/settings/settings_utils_mac.mm +++ b/chrome/browser/ui/webui/settings/settings_utils_mac.mm
@@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import <Cocoa/Cocoa.h> - #include "chrome/browser/ui/webui/settings/settings_utils.h" +#import <Cocoa/Cocoa.h> + #include "base/apple/foundation_util.h" #include "base/apple/osstatus_logging.h" #include "base/functional/callback_helpers.h"
diff --git a/chrome/browser/ui/webui/settings/shared_settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/shared_settings_localized_strings_provider.cc index cbd1b990..2a94500 100644 --- a/chrome/browser/ui/webui/settings/shared_settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/shared_settings_localized_strings_provider.cc
@@ -177,39 +177,41 @@ void AddSharedSyncPageStrings(content::WebUIDataSource* html_source) { static constexpr webui::LocalizedString kLocalizedStrings[] = { - {"syncDisabledByAdministrator", IDS_SIGNED_IN_WITH_SYNC_DISABLED_BY_POLICY}, - {"passphrasePlaceholder", IDS_SETTINGS_PASSPHRASE_PLACEHOLDER}, - {"existingPassphraseTitle", IDS_SETTINGS_EXISTING_PASSPHRASE_TITLE}, - {"submitPassphraseButton", IDS_SETTINGS_SUBMIT_PASSPHRASE}, - {"encryptWithGoogleCredentialsLabel", - IDS_SETTINGS_ENCRYPT_WITH_GOOGLE_CREDENTIALS_LABEL}, - {"encryptionOptionsTitle", IDS_SETTINGS_ENCRYPTION_OPTIONS}, - {"mismatchedPassphraseError", IDS_SETTINGS_MISMATCHED_PASSPHRASE_ERROR}, - {"emptyPassphraseError", IDS_SETTINGS_EMPTY_PASSPHRASE_ERROR}, - {"incorrectPassphraseError", IDS_SETTINGS_INCORRECT_PASSPHRASE_ERROR}, - {"syncPageTitle", IDS_SETTINGS_SYNC_SYNC_AND_NON_PERSONALIZED_SERVICES}, - {"passphraseConfirmationPlaceholder", - IDS_SETTINGS_PASSPHRASE_CONFIRMATION_PLACEHOLDER}, - {"syncLoading", IDS_SETTINGS_SYNC_LOADING}, - {"syncDataEncryptedText", IDS_SETTINGS_SYNC_DATA_ENCRYPTED_TEXT}, - {"sync", IDS_SETTINGS_SYNC}, - {"manageSyncedDataTitle", - IDS_SETTINGS_NEW_MANAGE_SYNCED_DATA_TITLE_UNIFIED_CONSENT}, + {"syncDisabledByAdministrator", + IDS_SIGNED_IN_WITH_SYNC_DISABLED_BY_POLICY}, + {"passphrasePlaceholder", IDS_SETTINGS_PASSPHRASE_PLACEHOLDER}, + {"existingPassphraseTitle", IDS_SETTINGS_EXISTING_PASSPHRASE_TITLE}, + {"submitPassphraseButton", IDS_SETTINGS_SUBMIT_PASSPHRASE}, + {"encryptWithGoogleCredentialsLabel", + IDS_SETTINGS_ENCRYPT_WITH_GOOGLE_CREDENTIALS_LABEL}, + {"encryptionOptionsTitle", IDS_SETTINGS_ENCRYPTION_OPTIONS}, + {"mismatchedPassphraseError", IDS_SETTINGS_MISMATCHED_PASSPHRASE_ERROR}, + {"emptyPassphraseError", IDS_SETTINGS_EMPTY_PASSPHRASE_ERROR}, + {"incorrectPassphraseError", IDS_SETTINGS_INCORRECT_PASSPHRASE_ERROR}, + {"syncPageTitle", IDS_SETTINGS_SYNC_SYNC_AND_NON_PERSONALIZED_SERVICES}, + {"passphraseConfirmationPlaceholder", + IDS_SETTINGS_PASSPHRASE_CONFIRMATION_PLACEHOLDER}, + {"syncLoading", IDS_SETTINGS_SYNC_LOADING}, + {"syncDataEncryptedText", IDS_SETTINGS_SYNC_DATA_ENCRYPTED_TEXT}, + {"sync", IDS_SETTINGS_SYNC}, + {"manageSyncedDataTitle", + IDS_SETTINGS_NEW_MANAGE_SYNCED_DATA_TITLE_UNIFIED_CONSENT}, #if BUILDFLAG(IS_CHROMEOS_ASH) - {"manageSyncedDataSubtitle", - IDS_SETTINGS_NEW_MANAGE_SYNCED_DATA_SUBTITLE_UNIFIED_CONSENT}, + {"manageSyncedDataSubtitle", + IDS_SETTINGS_NEW_MANAGE_SYNCED_DATA_SUBTITLE_UNIFIED_CONSENT}, #endif - {"manageBrowserSyncedDataTitle", - IDS_SETTINGS_NEW_MANAGE_BROWSER_SYNCED_DATA_TITLE}, - {"syncAdvancedDevicePageTitle", - IDS_SETTINGS_NEW_SYNC_ADVANCED_DEVICE_PAGE_TITLE}, - {"syncAdvancedBrowserPageTitle", - IDS_SETTINGS_NEW_SYNC_ADVANCED_BROWSER_PAGE_TITLE}, - {"enterPassphraseLabel", IDS_SYNC_ENTER_PASSPHRASE_BODY}, - {"enterPassphraseLabelWithDate", IDS_SYNC_ENTER_PASSPHRASE_BODY_WITH_DATE}, - {"existingPassphraseLabelWithDate", - IDS_SYNC_FULL_ENCRYPTION_BODY_CUSTOM_WITH_DATE}, - {"existingPassphraseLabel", IDS_SYNC_FULL_ENCRYPTION_BODY_CUSTOM}, + {"manageBrowserSyncedDataTitle", + IDS_SETTINGS_NEW_MANAGE_BROWSER_SYNCED_DATA_TITLE}, + {"syncAdvancedDevicePageTitle", + IDS_SETTINGS_NEW_SYNC_ADVANCED_DEVICE_PAGE_TITLE}, + {"syncAdvancedBrowserPageTitle", + IDS_SETTINGS_NEW_SYNC_ADVANCED_BROWSER_PAGE_TITLE}, + {"enterPassphraseLabel", IDS_SYNC_ENTER_PASSPHRASE_BODY}, + {"enterPassphraseLabelWithDate", + IDS_SYNC_ENTER_PASSPHRASE_BODY_WITH_DATE}, + {"existingPassphraseLabelWithDate", + IDS_SYNC_FULL_ENCRYPTION_BODY_CUSTOM_WITH_DATE}, + {"existingPassphraseLabel", IDS_SYNC_FULL_ENCRYPTION_BODY_CUSTOM}, }; html_source->AddLocalizedStrings(kLocalizedStrings);
diff --git a/chrome/browser/ui/webui/settings/site_settings_handler.cc b/chrome/browser/ui/webui/settings/site_settings_handler.cc index 914b910..8609c209 100644 --- a/chrome/browser/ui/webui/settings/site_settings_handler.cc +++ b/chrome/browser/ui/webui/settings/site_settings_handler.cc
@@ -237,16 +237,18 @@ GURL launch_url = extensions::AppLaunchInfo::GetLaunchWebURL(extension->get()); // Skip adding the launch URL if it is part of the web extent. - if (web_extent.MatchesURL(launch_url)) + if (web_extent.MatchesURL(launch_url)) { continue; + } site_settings::AddExceptionForHostedApp(launch_url.spec(), *extension->get(), exceptions); } } base::flat_set<url::Origin> GetInstalledAppOrigins(Profile* profile) { - if (!apps::AppServiceProxyFactory::IsAppServiceAvailableForProfile(profile)) + if (!apps::AppServiceProxyFactory::IsAppServiceAvailableForProfile(profile)) { return base::flat_set<url::Origin>(); + } std::vector<url::Origin> origins; apps::AppServiceProxyFactory::GetForProfile(profile) @@ -536,8 +538,9 @@ origin_object.Set(kNumCookies, 0); bool is_installed = installed_origins.contains(origin); - if (is_installed) + if (is_installed) { has_installed_pwa = true; + } origin_object.Set(kIsInstalled, is_installed); origin_object.Set(kHasPermissionSettings, @@ -822,8 +825,9 @@ auto* primary_otr_profile = profile_->GetPrimaryOTRProfile(/*create_if_needed=*/true); // Avoid duplicate observation. - if (primary_otr_profile != profile_) + if (primary_otr_profile != profile_) { ObserveSourcesForProfile(primary_otr_profile); + } } // Listen for zoom changes in the default StoragePartition and the primary @@ -930,8 +934,9 @@ const ContentSettingsPattern& primary_pattern, const ContentSettingsPattern& secondary_pattern, ContentSettingsType content_type) { - if (!site_settings::HasRegisteredGroupName(content_type)) + if (!site_settings::HasRegisteredGroupName(content_type)) { return; + } if (primary_pattern.MatchesAllHosts() && secondary_pattern.MatchesAllHosts()) { @@ -967,8 +972,9 @@ } void SiteSettingsHandler::OnProfileWillBeDestroyed(Profile* profile) { - if (profile->IsOffTheRecord()) + if (profile->IsOffTheRecord()) { FireWebUIListener("onIncognitoStatusChanged", base::Value(false)); + } StopObservingSourcesForProfile(profile); } @@ -1030,8 +1036,9 @@ const base::Value::List& args) { CHECK_EQ(1U, args.size()); auto origin = url::Origin::Create(GURL(args[0].GetString())); - if (origin.opaque()) + if (origin.opaque()) { return; + } AllowJavascript(); // TODO(crbug.com/40240175) - Permission info loading before storage info @@ -1103,8 +1110,9 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) // ChromeOS special case: in Guest mode, settings are opened in Incognito // mode so we need the original profile to actually modify settings. - if (user_manager::UserManager::Get()->IsLoggedInAsGuest()) + if (user_manager::UserManager::Get()->IsLoggedInAsGuest()) { profile = profile->GetOriginalProfile(); + } #endif HostContentSettingsMap* map = HostContentSettingsMapFactory::GetForProfile(profile); @@ -1474,8 +1482,9 @@ std::string type; DCHECK(type_val.is_string()); const std::string* maybe_type = type_val.GetIfString(); - if (maybe_type) + if (maybe_type) { type = *maybe_type; + } ContentSettingsType content_type = site_settings::ContentSettingsTypeFromGroupName(type); CHECK(content_type != ContentSettingsType::DEFAULT) @@ -1643,8 +1652,9 @@ std::string value = args[2].GetString(); const GURL origin(origin_string); - if (!origin.is_valid()) + if (!origin.is_valid()) { return; + } ContentSetting setting; CHECK(content_settings::ContentSettingFromString(value, &setting)); @@ -1807,8 +1817,9 @@ Profile* profile = nullptr; if (incognito) { - if (!profile_->HasPrimaryOTRProfile()) + if (!profile_->HasPrimaryOTRProfile()) { return; + } profile = profile_->GetPrimaryOTRProfile(/*create_if_needed=*/true); } else { profile = profile_; @@ -1896,8 +1907,9 @@ Profile* target_profile = nullptr; if (incognito) { - if (!profile_->HasPrimaryOTRProfile()) + if (!profile_->HasPrimaryOTRProfile()) { return; + } target_profile = profile_->GetPrimaryOTRProfile(/*create_if_needed=*/true); } else { target_profile = profile_; @@ -2042,8 +2054,9 @@ } void SiteSettingsHandler::SendZoomLevels() { - if (!IsJavascriptAllowed()) + if (!IsJavascriptAllowed()) { return; + } base::Value::List zoom_levels_exceptions; @@ -2173,8 +2186,9 @@ } void SiteSettingsHandler::SendBlockAutoplayStatus() { - if (!IsJavascriptAllowed()) + if (!IsJavascriptAllowed()) { return; + } base::Value::Dict status; @@ -2197,8 +2211,9 @@ const base::Value::List& args) { AllowJavascript(); - if (!UnifiedAutoplayConfig::IsBlockAutoplayUserModifiable(profile_)) + if (!UnifiedAutoplayConfig::IsBlockAutoplayUserModifiable(profile_)) { return; + } CHECK_EQ(1U, args.size()); CHECK(args[0].is_bool()); @@ -2230,13 +2245,16 @@ } void SiteSettingsHandler::ServicePendingRequests() { - if (!IsJavascriptAllowed()) + if (!IsJavascriptAllowed()) { return; + } - if (send_sites_list_) + if (send_sites_list_) { OnStorageFetched(); - if (update_site_details_) + } + if (update_site_details_) { OnGetUsageInfo(); + } send_sites_list_ = false; update_site_details_ = false; @@ -2244,27 +2262,32 @@ void SiteSettingsHandler::ObserveSourcesForProfile(Profile* profile) { auto* map = HostContentSettingsMapFactory::GetForProfile(profile); - if (!observations_.IsObservingSource(map)) + if (!observations_.IsObservingSource(map)) { observations_.AddObservation(map); + } auto* usb_context = UsbChooserContextFactory::GetForProfile(profile); - if (!chooser_observations_.IsObservingSource(usb_context)) + if (!chooser_observations_.IsObservingSource(usb_context)) { chooser_observations_.AddObservation(usb_context); + } auto* serial_context = SerialChooserContextFactory::GetForProfile(profile); - if (!chooser_observations_.IsObservingSource(serial_context)) + if (!chooser_observations_.IsObservingSource(serial_context)) { chooser_observations_.AddObservation(serial_context); + } auto* hid_context = HidChooserContextFactory::GetForProfile(profile); - if (!chooser_observations_.IsObservingSource(hid_context)) + if (!chooser_observations_.IsObservingSource(hid_context)) { chooser_observations_.AddObservation(hid_context); + } if (base::FeatureList::IsEnabled( features::kWebBluetoothNewPermissionsBackend)) { auto* bluetooth_context = BluetoothChooserContextFactory::GetForProfile(profile); - if (!chooser_observations_.IsObservingSource(bluetooth_context)) + if (!chooser_observations_.IsObservingSource(bluetooth_context)) { chooser_observations_.AddObservation(bluetooth_context); + } } if (base::FeatureList::IsEnabled( @@ -2292,27 +2315,32 @@ void SiteSettingsHandler::StopObservingSourcesForProfile(Profile* profile) { auto* map = HostContentSettingsMapFactory::GetForProfile(profile); - if (observations_.IsObservingSource(map)) + if (observations_.IsObservingSource(map)) { observations_.RemoveObservation(map); + } auto* usb_context = UsbChooserContextFactory::GetForProfile(profile); - if (chooser_observations_.IsObservingSource(usb_context)) + if (chooser_observations_.IsObservingSource(usb_context)) { chooser_observations_.RemoveObservation(usb_context); + } auto* serial_context = SerialChooserContextFactory::GetForProfile(profile); - if (chooser_observations_.IsObservingSource(serial_context)) + if (chooser_observations_.IsObservingSource(serial_context)) { chooser_observations_.RemoveObservation(serial_context); + } auto* hid_context = HidChooserContextFactory::GetForProfile(profile); - if (chooser_observations_.IsObservingSource(hid_context)) + if (chooser_observations_.IsObservingSource(hid_context)) { chooser_observations_.RemoveObservation(hid_context); + } if (base::FeatureList::IsEnabled( features::kWebBluetoothNewPermissionsBackend)) { auto* bluetooth_context = BluetoothChooserContextFactory::GetForProfile(profile); - if (chooser_observations_.IsObservingSource(bluetooth_context)) + if (chooser_observations_.IsObservingSource(bluetooth_context)) { chooser_observations_.RemoveObservation(bluetooth_context); + } } if (base::FeatureList::IsEnabled( @@ -2333,8 +2361,9 @@ AllSitesMap* all_sites_map, std::map<url::Origin, int64_t>* origin_size_map) { for (const auto& entry : *browsing_data_model_) { - if (entry.data_details->storage_size == 0) + if (entry.data_details->storage_size == 0) { continue; + } url::Origin origin = BrowsingDataModel::GetOriginForDataKey(entry.data_key.get()); @@ -2542,8 +2571,9 @@ auto filter_builder = content::BrowsingDataFilterBuilder::Create( content::BrowsingDataFilterBuilder::Mode::kDelete); - for (const auto& origin : origins) + for (const auto& origin : origins) { filter_builder->AddOrigin(origin); + } CdmDocumentServiceImpl::ClearCdmData( profile_, base::Time::Min(), base::Time::Max(),
diff --git a/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc b/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc index dd818bd..28d45ef0 100644 --- a/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc +++ b/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc
@@ -392,8 +392,9 @@ void TearDown() override { if (profile_) { auto* partition = profile_->GetDefaultStoragePartition(); - if (partition) + if (partition) { partition->WaitForDeletionTasksForTesting(); + } } } @@ -1803,9 +1804,10 @@ // permissions are correctly transformed for usage by JS. const GURL url1("https://example.com"); const GURL url2("http://example.com"); - for (int i = 0; i < 3; ++i) + for (int i = 0; i < 3; ++i) { auto_blocker->RecordDismissAndEmbargo( url1, ContentSettingsType::NOTIFICATIONS, false); + } clock.Advance(base::Hours(2)); clock.Advance(base::Hours(1)); @@ -1818,9 +1820,10 @@ permissions::PermissionDecisionAutoBlocker* incognito_auto_blocker = PermissionDecisionAutoBlockerFactory::GetForProfile(incognito_profile()); incognito_auto_blocker->SetClockForTesting(&clock); - for (int i = 0; i < 3; ++i) + for (int i = 0; i < 3; ++i) { incognito_auto_blocker->RecordDismissAndEmbargo( url1, ContentSettingsType::NOTIFICATIONS, false); + } handler()->HandleGetRecentSitePermissions(get_recent_permissions_args); { @@ -2407,7 +2410,7 @@ RemovesTrackingProtectionExceptionsWhenFeatureIsOff) { constexpr char kOrigin[] = "https://www.test.com:443"; base::Value::List set_args; - set_args.Append("*"); // Primary pattern. + set_args.Append("*"); // Primary pattern. set_args.Append(kOrigin); // Secondary pattern. set_args.Append(kTrackingProtection); set_args.Append( @@ -3190,8 +3193,9 @@ GURL* tab_url) { content::WebContents* web_contents = browser->tab_strip_model()->GetWebContentsAt(tab_index); - if (tab_url) + if (tab_url) { *tab_url = web_contents->GetLastCommittedURL(); + } return infobars::ContentInfoBarManager::FromWebContents(web_contents); } @@ -3470,8 +3474,9 @@ }); WebUIAllowlist* allowlist = WebUIAllowlist::GetOrCreate(profile()); - for (const url::Origin& origin : kWebUIOrigins) + for (const url::Origin& origin : kWebUIOrigins) { allowlist->RegisterAutoGrantedPermission(origin, content_settings_type); + } // Verify the auto-granted permissions are registered, and they are indeed // provided by WebUIAllowlist. @@ -3559,8 +3564,9 @@ }; WebUIAllowlist* allowlist = WebUIAllowlist::GetOrCreate(profile()); - for (const url::Origin& origin : kWebUIOrigins) + for (const url::Origin& origin : kWebUIOrigins) { allowlist->RegisterAutoGrantedPermission(origin, content_settings_type); + } for (const url::Origin& origin : kWebUIOrigins) { base::Value::List get_origin_permissions_args; @@ -4518,16 +4524,19 @@ bool ChooserExceptionContainsSiteException(const base::Value::Dict& exception, std::string_view origin) { const base::Value::List* sites = exception.FindList(site_settings::kSites); - if (!sites) + if (!sites) { return false; + } for (const auto& site : *sites) { const std::string* exception_origin = site.GetDict().FindString(site_settings::kOrigin); - if (!exception_origin) + if (!exception_origin) { continue; - if (*exception_origin == origin) + } + if (*exception_origin == origin) { return true; + } } return false; } @@ -4542,8 +4551,9 @@ for (const auto& exception : exceptions) { const std::string* exception_display_name = exception.GetDict().FindString(site_settings::kDisplayName); - if (!exception_display_name) + if (!exception_display_name) { continue; + } if (*exception_display_name == display_name) { return ChooserExceptionContainsSiteException(exception.GetDict(),
diff --git a/chrome/browser/ui/webui/settings/system_handler.cc b/chrome/browser/ui/webui/settings/system_handler.cc index ebef62c..672e7c6 100644 --- a/chrome/browser/ui/webui/settings/system_handler.cc +++ b/chrome/browser/ui/webui/settings/system_handler.cc
@@ -23,7 +23,8 @@ // static void SystemHandler::AddLoadTimeData(content::WebUIDataSource* data_source) { - data_source->AddBoolean("hardwareAccelerationEnabledAtStartup", + data_source->AddBoolean( + "hardwareAccelerationEnabledAtStartup", g_browser_process->gpu_mode_manager()->initial_gpu_mode_pref()); }
diff --git a/chrome/browser/ui/webui/side_panel/bookmarks/bookmarks_page_handler.cc b/chrome/browser/ui/webui/side_panel/bookmarks/bookmarks_page_handler.cc index 3b6933ae..b1532e56 100644 --- a/chrome/browser/ui/webui/side_panel/bookmarks/bookmarks_page_handler.cc +++ b/chrome/browser/ui/webui/side_panel/bookmarks/bookmarks_page_handler.cc
@@ -191,8 +191,9 @@ void BookmarksPageHandler::BookmarkCurrentTabInFolder(int64_t folder_id) { Browser* browser = chrome::FindLastActive(); - if (!browser) + if (!browser) { return; + } chrome::BookmarkCurrentTabInFolder(browser, folder_id); } @@ -264,23 +265,26 @@ ui::mojom::ClickModifiersPtr click_modifiers, side_panel::mojom::ActionSource source) { Browser* browser = chrome::FindLastActive(); - if (!browser) + if (!browser) { return; + } bookmarks::BookmarkModel* bookmark_model = BookmarkModelFactory::GetForBrowserContext(browser->profile()); const bookmarks::BookmarkNode* bookmark_node = bookmarks::GetBookmarkNodeByID(bookmark_model, node_id); - if (!bookmark_node) + if (!bookmark_node) { return; + } WindowOpenDisposition open_location = ui::DispositionFromClick( click_modifiers->middle_button, click_modifiers->alt_key, click_modifiers->ctrl_key, click_modifiers->meta_key, click_modifiers->shift_key); chrome::OpenAllIfAllowed(browser, {bookmark_node}, open_location, false); - if (source == side_panel::mojom::ActionSource::kPriceTracking) + if (source == side_panel::mojom::ActionSource::kPriceTracking) { return; + } base::RecordAction(base::UserMetricsAction("SidePanel.Bookmarks.Navigation")); RecordBookmarkLaunch( parent_folder_depth > 0 ? BookmarkLaunchLocation::kSidePanelSubfolder @@ -320,8 +324,9 @@ const gfx::Point& point, side_panel::mojom::ActionSource source) { int64_t id; - if (!base::StringToInt64(id_string, &id)) + if (!base::StringToInt64(id_string, &id)) { return; + } auto embedder = bookmarks_ui_ ? bookmarks_ui_->embedder() : reading_list_ui_->embedder();
diff --git a/chrome/browser/ui/webui/side_panel/bookmarks/bookmarks_page_handler_unittest.cc b/chrome/browser/ui/webui/side_panel/bookmarks/bookmarks_page_handler_unittest.cc index 5eb8184..de8f94c 100644 --- a/chrome/browser/ui/webui/side_panel/bookmarks/bookmarks_page_handler_unittest.cc +++ b/chrome/browser/ui/webui/side_panel/bookmarks/bookmarks_page_handler_unittest.cc
@@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <memory> - #include "chrome/browser/ui/webui/side_panel/bookmarks/bookmarks_page_handler.h" +#include <memory> + #include "chrome/browser/ui/webui/bookmarks/bookmark_prefs.h" #include "chrome/test/base/browser_with_test_window_test.h" #include "components/bookmarks/common/bookmark_pref_names.h"
diff --git a/chrome/browser/ui/webui/side_panel/bookmarks/bookmarks_side_panel_ui.h b/chrome/browser/ui/webui/side_panel/bookmarks/bookmarks_side_panel_ui.h index 642dc98..bc4efb4 100644 --- a/chrome/browser/ui/webui/side_panel/bookmarks/bookmarks_side_panel_ui.h +++ b/chrome/browser/ui/webui/side_panel/bookmarks/bookmarks_side_panel_ui.h
@@ -27,7 +27,7 @@ class ShoppingListContextMenuController; class ShoppingServiceHandler; class PriceTrackingHandler; -} +} // namespace commerce namespace ui { class ColorChangeHandler;
diff --git a/chrome/browser/ui/webui/side_panel/customize_chrome/customize_chrome_page_handler_unittest.cc b/chrome/browser/ui/webui/side_panel/customize_chrome/customize_chrome_page_handler_unittest.cc index 9c77f4e..d43d02b4 100644 --- a/chrome/browser/ui/webui/side_panel/customize_chrome/customize_chrome_page_handler_unittest.cc +++ b/chrome/browser/ui/webui/side_panel/customize_chrome/customize_chrome_page_handler_unittest.cc
@@ -336,7 +336,7 @@ base::MockRepeatingCallback<void(const GURL& gurl)> mock_open_url_callback_; std::unique_ptr<CustomizeChromePageHandler> handler_; raw_ptr<NtpCustomBackgroundServiceObserver> - ntp_custom_background_service_observer_; + ntp_custom_background_service_observer_; raw_ptr<NtpBackgroundServiceObserver> ntp_background_service_observer_; };
diff --git a/chrome/browser/ui/webui/side_panel/reading_list/reading_list_page_handler.cc b/chrome/browser/ui/webui/side_panel/reading_list/reading_list_page_handler.cc index 546dd13a..75af271 100644 --- a/chrome/browser/ui/webui/side_panel/reading_list/reading_list_page_handler.cc +++ b/chrome/browser/ui/webui/side_panel/reading_list/reading_list_page_handler.cc
@@ -178,8 +178,9 @@ bool mark_as_read, ui::mojom::ClickModifiersPtr click_modifiers) { Browser* browser = chrome::FindLastActive(); - if (!browser) + if (!browser) { return; + } // Open in active tab if the user is on the NTP. WindowOpenDisposition open_location = ui::DispositionFromClick( @@ -215,8 +216,9 @@ void ReadingListPageHandler::MarkCurrentTabAsRead() { Browser* browser = chrome::FindLastActive(); - if (!browser) + if (!browser) { return; + } chrome::MarkCurrentTabAsReadInReadLater(browser); base::RecordAction(base::UserMetricsAction("DesktopReadingList.MarkAsRead")); @@ -224,8 +226,9 @@ void ReadingListPageHandler::AddCurrentTab() { Browser* browser = chrome::FindLastActive(); - if (!browser) + if (!browser) { return; + } chrome::MoveCurrentTabToReadLater(browser); reading_list_model_->MarkAllSeen(); @@ -244,10 +247,11 @@ int32_t y) { auto embedder = reading_list_ui_->embedder(); Browser* browser = chrome::FindLastActive(); - if (embedder) + if (embedder) { embedder->ShowContextMenu(gfx::Point(x, y), std::make_unique<ReadLaterItemContextMenu>( browser, reading_list_model_, url)); + } } void ReadingListPageHandler::UpdateCurrentPageActionButtonState() { @@ -263,15 +267,17 @@ void ReadingListPageHandler::CloseUI() { auto embedder = reading_list_ui_->embedder(); - if (embedder) + if (embedder) { embedder->CloseUI(); + } } void ReadingListPageHandler::ReadingListModelCompletedBatchUpdates( const ReadingListModel* model) { DCHECK(model == reading_list_model_); - if (web_contents_->GetVisibility() == content::Visibility::HIDDEN) + if (web_contents_->GetVisibility() == content::Visibility::HIDDEN) { return; + } page_->ItemsChanged(CreateReadLaterEntriesByStatusData()); UpdateCurrentPageActionButton(); reading_list_model_->MarkAllSeen(); @@ -299,8 +305,9 @@ } const std::optional<GURL> ReadingListPageHandler::GetActiveTabURL() { - if (active_tab_url_) + if (active_tab_url_) { return active_tab_url_.value(); + } Browser* browser = chrome::FindLastActive(); if (browser) { return chrome::GetURLToBookmark( @@ -310,8 +317,9 @@ } void ReadingListPageHandler::SetActiveTabURL(const GURL& url) { - if (active_tab_url_ && active_tab_url_.value() == url) + if (active_tab_url_ && active_tab_url_.value() == url) { return; + } active_tab_url_ = url; UpdateCurrentPageActionButton(); @@ -364,8 +372,9 @@ std::string ReadingListPageHandler::GetTimeSinceLastUpdate( int64_t last_update_time) { const int64_t now = TimeToUS(clock_->Now()); - if (last_update_time > now) + if (last_update_time > now) { return std::string(); + } const base::TimeDelta elapsed_time = base::Microseconds(now - last_update_time); return base::UTF16ToUTF8( @@ -375,12 +384,14 @@ void ReadingListPageHandler::UpdateCurrentPageActionButton() { if (web_contents_->GetVisibility() == content::Visibility::HIDDEN || - Profile::FromWebUI(web_ui_)->IsGuestSession()) + Profile::FromWebUI(web_ui_)->IsGuestSession()) { return; + } const std::optional<GURL> url = GetActiveTabURL(); - if (!url.has_value()) + if (!url.has_value()) { return; + } reading_list::mojom::CurrentPageActionButtonState new_state; if (!reading_list_model_->IsUrlSupported(url.value())) {
diff --git a/chrome/browser/ui/webui/side_panel/reading_list/reading_list_ui.cc b/chrome/browser/ui/webui/side_panel/reading_list/reading_list_ui.cc index 1c69f372..d026cd0 100644 --- a/chrome/browser/ui/webui/side_panel/reading_list/reading_list_ui.cc +++ b/chrome/browser/ui/webui/side_panel/reading_list/reading_list_ui.cc
@@ -58,8 +58,9 @@ {"unreadHeader", IDS_READ_LATER_MENU_UNREAD_HEADER}, {"cancelA11yLabel", IDS_CANCEL}, }; - for (const auto& str : kLocalizedStrings) + for (const auto& str : kLocalizedStrings) { webui::AddLocalizedString(source, str.name, str.id); + } source->AddBoolean("useRipples", views::PlatformStyle::kUseRipples); @@ -105,8 +106,9 @@ void ReadingListUI::BindInterface( mojo::PendingReceiver<help_bubble::mojom::HelpBubbleHandlerFactory> pending_receiver) { - if (help_bubble_handler_factory_receiver_.is_bound()) + if (help_bubble_handler_factory_receiver_.is_bound()) { help_bubble_handler_factory_receiver_.reset(); + } help_bubble_handler_factory_receiver_.Bind(std::move(pending_receiver)); } @@ -122,6 +124,7 @@ } void ReadingListUI::SetActiveTabURL(const GURL& url) { - if (page_handler_) + if (page_handler_) { page_handler_->SetActiveTabURL(url); + } }
diff --git a/chrome/browser/ui/webui/signin/ash/inline_login_dialog.cc b/chrome/browser/ui/webui/signin/ash/inline_login_dialog.cc index 5c2b2cb..5616c43 100644 --- a/chrome/browser/ui/webui/signin/ash/inline_login_dialog.cc +++ b/chrome/browser/ui/webui/signin/ash/inline_login_dialog.cc
@@ -112,8 +112,9 @@ void WebContentsDestroyed() override { ResetDelegate(); } void ResetDelegate() { - if (!web_contents()) + if (!web_contents()) { return; + } web_modal::WebContentsModalDialogManager::FromWebContents(web_contents()) ->SetDelegate(nullptr); } @@ -176,8 +177,9 @@ } InlineLoginDialog::~InlineLoginDialog() { - for (auto& observer : modal_dialog_host_observer_list_) + for (auto& observer : modal_dialog_host_observer_list_) { observer.OnHostDestroying(); + } if (!close_dialog_closure_.is_null()) { std::move(close_dialog_closure_).Run(); @@ -229,8 +231,9 @@ // The args value will be available from JS via // chrome.getVariableValue('dialogArguments'). std::string InlineLoginDialog::GetDialogArgs() const { - if (!add_account_options_) + if (!add_account_options_) { return std::string(); + } std::string json; base::JSONWriter::Write( @@ -262,8 +265,9 @@ // get displayed on the lock screen. In this case it is safe to ignore it, // since in this case user will get it again after a request to Google // properties. - if (session_manager::SessionManager::Get()->IsUserSessionBlocked()) + if (session_manager::SessionManager::Get()->IsUserSessionBlocked()) { return; + } if (dialog) { dialog->dialog_window()->Focus();
diff --git a/chrome/browser/ui/webui/signin/ash/inline_login_handler_impl.cc b/chrome/browser/ui/webui/signin/ash/inline_login_handler_impl.cc index d1013a1c..46455af 100644 --- a/chrome/browser/ui/webui/signin/ash/inline_login_handler_impl.cc +++ b/chrome/browser/ui/webui/signin/ash/inline_login_handler_impl.cc
@@ -472,15 +472,17 @@ auto* identity_manager = IdentityManagerFactory::GetForProfile(Profile::FromWebUI(web_ui())); for (const auto& account : accounts) { - if (account.key.account_type() != account_manager::AccountType::kGaia) + if (account.key.account_type() != account_manager::AccountType::kGaia) { continue; + } if (!arc_accounts.contains(account)) { AccountInfo maybe_account_info = identity_manager->FindExtendedAccountInfoByGaiaId( GaiaId(account.key.id())); - if (maybe_account_info.IsEmpty()) + if (maybe_account_info.IsEmpty()) { continue; + } result.Append(GaiaAccountToValue(account, maybe_account_info)); }
diff --git a/chrome/browser/ui/webui/signin/ash/signin_helper.cc b/chrome/browser/ui/webui/signin/ash/signin_helper.cc index 223996b..70b0cc5 100644 --- a/chrome/browser/ui/webui/signin/ash/signin_helper.cc +++ b/chrome/browser/ui/webui/signin/ash/signin_helper.cc
@@ -47,8 +47,9 @@ void SigninHelper::ArcHelper::OnAccountAdded( const account_manager::Account& account) { // Don't change ARC availability after reauthentication. - if (!is_account_addition_) + if (!is_account_addition_) { return; + } account_apps_availability_->SetIsAccountAvailableInArc(account, is_available_in_arc_);
diff --git a/chrome/browser/ui/webui/signin/ash/user_cloud_signin_restriction_policy_fetcher.cc b/chrome/browser/ui/webui/signin/ash/user_cloud_signin_restriction_policy_fetcher.cc index 7adb8df..7ac1aa95 100644 --- a/chrome/browser/ui/webui/signin/ash/user_cloud_signin_restriction_policy_fetcher.cc +++ b/chrome/browser/ui/webui/signin/ash/user_cloud_signin_restriction_policy_fetcher.cc
@@ -272,8 +272,9 @@ GoogleServiceAuthError error = GoogleServiceAuthError::AuthErrorNone(); std::optional<int> response_code; - if (url_loader->ResponseInfo() && url_loader->ResponseInfo()->headers) + if (url_loader->ResponseInfo() && url_loader->ResponseInfo()->headers) { response_code = url_loader->ResponseInfo()->headers->response_code(); + } // Check for network or HTTP errors. if (url_loader->NetError() != net::OK || !response_body) {
diff --git a/chrome/browser/ui/webui/signin/batch_upload_handler.cc b/chrome/browser/ui/webui/signin/batch_upload_handler.cc index a238b09d..79b8aee 100644 --- a/chrome/browser/ui/webui/signin/batch_upload_handler.cc +++ b/chrome/browser/ui/webui/signin/batch_upload_handler.cc
@@ -96,8 +96,7 @@ return favicon_url; } - if (absl::holds_alternative<syncer::LocalDataItemModel::FolderIcon>( - icon)) { + if (absl::holds_alternative<syncer::LocalDataItemModel::FolderIcon>(icon)) { return GURL(kFolderIconUrl); }
diff --git a/chrome/browser/ui/webui/signin/dice_web_signin_intercept_handler.cc b/chrome/browser/ui/webui/signin/dice_web_signin_intercept_handler.cc index 9dea7290..fdb59f7 100644 --- a/chrome/browser/ui/webui/signin/dice_web_signin_intercept_handler.cc +++ b/chrome/browser/ui/webui/signin/dice_web_signin_intercept_handler.cc
@@ -144,8 +144,9 @@ void DiceWebSigninInterceptHandler::OnExtendedAccountInfoUpdated( const AccountInfo& info) { - if (!info.IsValid()) + if (!info.IsValid()) { return; + } bool should_fire_event = false; if (info.account_id == intercepted_account().account_id) { @@ -200,10 +201,12 @@ // If there is no extended info for the primary account, populate with // reasonable defaults. - if (primary_account().hosted_domain.empty()) + if (primary_account().hosted_domain.empty()) { bubble_parameters_.primary_account.hosted_domain = kNoHostedDomainFound; - if (primary_account().given_name.empty()) + } + if (primary_account().given_name.empty()) { bubble_parameters_.primary_account.given_name = primary_account().email; + } DCHECK(!args.empty()); const base::Value& callback_id = args[0]; @@ -505,8 +508,9 @@ std::string manager_domain = intercepted_account().IsManaged() ? intercepted_account().hosted_domain : std::string(); - if (manager_domain.empty()) + if (manager_domain.empty()) { manager_domain = chrome::GetDeviceManagerIdentity().value_or(std::string()); + } if (manager_domain.empty()) { return l10n_util::GetStringFUTF8(
diff --git a/chrome/browser/ui/webui/signin/inline_login_handler.cc b/chrome/browser/ui/webui/signin/inline_login_handler.cc index cfa827b..bcdc314 100644 --- a/chrome/browser/ui/webui/signin/inline_login_handler.cc +++ b/chrome/browser/ui/webui/signin/inline_login_handler.cc
@@ -95,9 +95,8 @@ // present and its value is zero, this means we don't want to keep the // the data. std::string value; - if (!net::GetValueForKeyInQuery(current_url, - signin::kSignInPromoQueryKeyForceKeepData, - &value) || + if (!net::GetValueForKeyInQuery( + current_url, signin::kSignInPromoQueryKeyForceKeepData, &value) || value == "0") { partition->ClearData( content::StoragePartition::REMOVE_DATA_MASK_ALL, @@ -143,11 +142,13 @@ default_email = profile->GetPrefs()->GetString( prefs::kGoogleServicesLastSyncingUsername); } else { - if (!net::GetValueForKeyInQuery(current_url, "email", &default_email)) + if (!net::GetValueForKeyInQuery(current_url, "email", &default_email)) { default_email.clear(); + } } - if (!default_email.empty()) + if (!default_email.empty()) { params.Set("email", default_email); + } // The legacy full-tab Chrome sign-in page is no longer used as it was relying // on exchanging cookies for refresh tokens and that endpoint is no longer @@ -193,8 +194,9 @@ params.gaia_id = GaiaId(CHECK_DEREF(dict.FindString("gaiaId"))); for (const auto& cookie_with_access_result : cookies) { - if (cookie_with_access_result.cookie.Name() == "oauth_code") + if (cookie_with_access_result.cookie.Name() == "oauth_code") { params.auth_code = cookie_with_access_result.cookie.Value(); + } } params.skip_for_now = dict.FindBool("skipForNow").value_or(false); @@ -245,6 +247,7 @@ } void InlineLoginHandler::CloseDialogFromJavascript() { - if (IsJavascriptAllowed()) + if (IsJavascriptAllowed()) { FireWebUIListener("close-dialog"); + } }
diff --git a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc index 8498976c..27b187e 100644 --- a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc +++ b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc
@@ -167,8 +167,9 @@ return credential_provider::kUiecEMailMissmatch; } - if (email_domains_parameter.empty()) + if (email_domains_parameter.empty()) { return credential_provider::kUiecSuccess; + } std::vector<std::string> all_email_domains = GetEmailDomainsFromParameter(email_domains_parameter); @@ -182,21 +183,25 @@ #endif void SetProfileLocked(const base::FilePath profile_path, bool locked) { - if (profile_path.empty()) + if (profile_path.empty()) { return; + } ProfileManager* profile_manager = g_browser_process->profile_manager(); - if (!profile_manager) + if (!profile_manager) { return; + } ProfileAttributesEntry* entry = profile_manager->GetProfileAttributesStorage() .GetProfileAttributesWithPath(profile_path); - if (!entry) + if (!entry) { return; + } - if (signin_util::IsForceSigninEnabled()) + if (signin_util::IsForceSigninEnabled()) { entry->LockForceSigninProfile(locked); + } } void UnlockProfileAndHideLoginUI(const base::FilePath profile_path, @@ -498,8 +503,9 @@ // make sure the webui is aware. content::WebContents* contents = web_ui()->GetWebContents(); const GURL& current_url = contents->GetLastCommittedURL(); - if (HasFromProfilePickerURLParameter(current_url)) + if (HasFromProfilePickerURLParameter(current_url)) { params.Set("dontResizeNonEmbeddedPages", true); + } HandlerSigninReason reason = GetHandlerSigninReason(current_url); @@ -515,15 +521,17 @@ &email_domains)) { std::vector<std::string> all_email_domains = GetEmailDomainsFromParameter(email_domains); - if (all_email_domains.size() == 1) + if (all_email_domains.size() == 1) { params.Set("emailDomain", all_email_domains[0]); + } } std::string show_tos; if (net::GetValueForKeyInQuery( current_url, credential_provider::kShowTosSwitch, &show_tos)) { - if (!show_tos.empty()) + if (!show_tos.empty()) { params.Set("showTos", show_tos); + } } // Prevent opening a new window if the embedded page fails to load. @@ -588,8 +596,9 @@ } // This value exists only for webview sign in. - if (params.trusted_found) + if (params.trusted_found) { confirm_untrusted_signin_ = !params.trusted_value; + } DCHECK(!params.email.empty()); DCHECK(!params.gaia_id.empty()); @@ -716,8 +725,9 @@ AboutSigninInternals* about_signin_internals = AboutSigninInternalsFactory::GetForProfile(profile); - if (about_signin_internals) + if (about_signin_internals) { about_signin_internals->OnAuthenticationResultReceived("Successful"); + } std::string signin_scoped_device_id = GetSigninScopedDeviceIdForProfile(profile); @@ -770,14 +780,16 @@ void InlineLoginHandlerImpl::SendLSTFetchResultsMessage( const base::Value& arg) { - if (IsJavascriptAllowed()) + if (IsJavascriptAllowed()) { FireWebUIListener("send-lst-fetch-results", arg); + } } Browser* InlineLoginHandlerImpl::GetDesktopBrowser() { Browser* browser = chrome::FindBrowserWithTab(web_ui()->GetWebContents()); - if (!browser) + if (!browser) { browser = chrome::FindLastActiveWithProfile(Profile::FromWebUI(web_ui())); + } return browser; }
diff --git a/chrome/browser/ui/webui/signin/inline_login_handler_impl.h b/chrome/browser/ui/webui/signin/inline_login_handler_impl.h index 16588bd5..2c76413d 100644 --- a/chrome/browser/ui/webui/signin/inline_login_handler_impl.h +++ b/chrome/browser/ui/webui/signin/inline_login_handler_impl.h
@@ -42,8 +42,8 @@ ~InlineLoginHandlerImpl() override; - using InlineLoginHandler::web_ui; using InlineLoginHandler::CloseDialogFromJavascript; + using InlineLoginHandler::web_ui; base::WeakPtr<InlineLoginHandlerImpl> GetWeakPtr() { return weak_factory_.GetWeakPtr(); @@ -151,8 +151,7 @@ private: // Overridden from GaiaAuthConsumer. void OnClientOAuthSuccess(const ClientOAuthResult& result) override; - void OnClientOAuthFailure(const GoogleServiceAuthError& error) - override; + void OnClientOAuthFailure(const GoogleServiceAuthError& error) override; void OnClientOAuthSuccessAndBrowserOpened(const ClientOAuthResult& result);
diff --git a/chrome/browser/ui/webui/signin/inline_login_ui.cc b/chrome/browser/ui/webui/signin/inline_login_ui.cc index c339c70..169120ad 100644 --- a/chrome/browser/ui/webui/signin/inline_login_ui.cc +++ b/chrome/browser/ui/webui/signin/inline_login_ui.cc
@@ -147,63 +147,63 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) static constexpr webui::ResourcePath kResources[] = { - {"account_manager_shared.css.js", IDR_ACCOUNT_MANAGER_SHARED_CSS_JS}, - {"error_screen.html.js", - IDR_ACCOUNT_MANAGER_COMPONENTS_ERROR_SCREEN_HTML_JS}, - {"error_screen.js", IDR_ACCOUNT_MANAGER_COMPONENTS_ERROR_SCREEN_JS}, - // Resources for the server-based edu coexistence flow. - {"edu-coexistence", IDR_EDU_COEXISTENCE_EDU_COEXISTENCE_HTML}, + {"account_manager_shared.css.js", IDR_ACCOUNT_MANAGER_SHARED_CSS_JS}, + {"error_screen.html.js", + IDR_ACCOUNT_MANAGER_COMPONENTS_ERROR_SCREEN_HTML_JS}, + {"error_screen.js", IDR_ACCOUNT_MANAGER_COMPONENTS_ERROR_SCREEN_JS}, + // Resources for the server-based edu coexistence flow. + {"edu-coexistence", IDR_EDU_COEXISTENCE_EDU_COEXISTENCE_HTML}, - {"account_manager_signin_blocked_by_policy.svg", - IDS_ACCOUNT_MANAGER_SIGNIN_BLOCKED_BY_POLICY_SVG}, + {"account_manager_signin_blocked_by_policy.svg", + IDS_ACCOUNT_MANAGER_SIGNIN_BLOCKED_BY_POLICY_SVG}, #if BUILDFLAG(GOOGLE_CHROME_BRANDING) - {"account_manager_welcome_1x.png", IDR_ACCOUNT_MANAGER_WELCOME_1X_PNG}, - {"account_manager_welcome_2x.png", IDR_ACCOUNT_MANAGER_WELCOME_2X_PNG}, - {"googleg.svg", IDR_ACCOUNT_MANAGER_WELCOME_GOOGLE_LOGO_SVG}, + {"account_manager_welcome_1x.png", IDR_ACCOUNT_MANAGER_WELCOME_1X_PNG}, + {"account_manager_welcome_2x.png", IDR_ACCOUNT_MANAGER_WELCOME_2X_PNG}, + {"googleg.svg", IDR_ACCOUNT_MANAGER_WELCOME_GOOGLE_LOGO_SVG}, #endif }; source->AddResourcePaths(kResources); #endif // BUILDFLAG(IS_CHROMEOS_ASH) static constexpr webui::LocalizedString kLocalizedStrings[] = { - {"accessibleCloseButtonLabel", IDS_SIGNIN_ACCESSIBLE_CLOSE_BUTTON}, - {"accessibleBackButtonLabel", IDS_SIGNIN_ACCESSIBLE_BACK_BUTTON}, + {"accessibleCloseButtonLabel", IDS_SIGNIN_ACCESSIBLE_CLOSE_BUTTON}, + {"accessibleBackButtonLabel", IDS_SIGNIN_ACCESSIBLE_BACK_BUTTON}, #if BUILDFLAG(IS_CHROMEOS_ASH) - {"title", IDS_ACCOUNT_MANAGER_DIALOG_TITLE}, - {"ok", IDS_APP_OK}, - {"nextButtonLabel", IDS_ACCOUNT_MANAGER_DIALOG_NEXT_BUTTON}, - {"accountManagerDialogWelcomeTitle", - IDS_ACCOUNT_MANAGER_DIALOG_WELCOME_TITLE}, - {"accountManagerDialogWelcomeCheckbox", - IDS_ACCOUNT_MANAGER_DIALOG_WELCOME_CHECKBOX}, - {"accountManagerDialogArcAccountPickerTitle", - IDS_ACCOUNT_MANAGER_DIALOG_ARC_ACCOUNT_PICKER_TITLE}, - {"addAccountLabel", IDS_ACCOUNT_MANAGER_DIALOG_ADD_ACCOUNT_LABEL}, - {"accountUseInArcButtonLabel", - IDS_SETTINGS_ACCOUNT_MANAGER_USE_IN_ARC_BUTTON_LABEL}, - {"accountManagerErrorNoInternetTitle", - IDS_ACCOUNT_MANAGER_ERROR_NO_INTERNET_TITLE}, - {"accountManagerErrorNoInternetBody", - IDS_ACCOUNT_MANAGER_ERROR_NO_INTERNET_BODY}, - {"accountManagerErrorCannotAddAccountTitle", - IDS_ACCOUNT_MANAGER_ERROR_CANNOT_ADD_ACCOUNT_TITLE}, - {"accountManagerErrorCannotAddAccountBody", - IDS_ACCOUNT_MANAGER_ERROR_CANNOT_ADD_ACCOUNT_BODY}, - {"accountManagerDialogSigninBlockedByPolicyTitle", - IDS_ACCOUNT_MANAGER_DIALOG_SIGNIN_BLOCKED_BY_POLICY_TITLE}, - {"accountManagerDialogSigninBlockedByPolicyBody", - IDS_ACCOUNT_MANAGER_DIALOG_SIGNIN_BLOCKED_BY_POLICY_BODY}, - {"accountManagerDialogSigninErrorTitle", - IDS_ACCOUNT_MANAGER_DIALOG_SIGNIN_ERROR_TITLE}, - {"accountManagerDialogSigninErrorBody", - IDS_ACCOUNT_MANAGER_DIALOG_SIGNIN_ERROR_BODY}, - {"accountManagerDialogSigninBlockedByPolicyImageAlt", - IDS_ACCOUNT_MANAGER_DIALOG_SIGNIN_BLOCKED_BY_POLICY_IMAGE_ALT}, - {"accountManagerDialogSigninSpinnerText", - IDS_ACCOUNT_MANAGER_DIALOG_SIGNIN_SPINNER_TEXT}, + {"title", IDS_ACCOUNT_MANAGER_DIALOG_TITLE}, + {"ok", IDS_APP_OK}, + {"nextButtonLabel", IDS_ACCOUNT_MANAGER_DIALOG_NEXT_BUTTON}, + {"accountManagerDialogWelcomeTitle", + IDS_ACCOUNT_MANAGER_DIALOG_WELCOME_TITLE}, + {"accountManagerDialogWelcomeCheckbox", + IDS_ACCOUNT_MANAGER_DIALOG_WELCOME_CHECKBOX}, + {"accountManagerDialogArcAccountPickerTitle", + IDS_ACCOUNT_MANAGER_DIALOG_ARC_ACCOUNT_PICKER_TITLE}, + {"addAccountLabel", IDS_ACCOUNT_MANAGER_DIALOG_ADD_ACCOUNT_LABEL}, + {"accountUseInArcButtonLabel", + IDS_SETTINGS_ACCOUNT_MANAGER_USE_IN_ARC_BUTTON_LABEL}, + {"accountManagerErrorNoInternetTitle", + IDS_ACCOUNT_MANAGER_ERROR_NO_INTERNET_TITLE}, + {"accountManagerErrorNoInternetBody", + IDS_ACCOUNT_MANAGER_ERROR_NO_INTERNET_BODY}, + {"accountManagerErrorCannotAddAccountTitle", + IDS_ACCOUNT_MANAGER_ERROR_CANNOT_ADD_ACCOUNT_TITLE}, + {"accountManagerErrorCannotAddAccountBody", + IDS_ACCOUNT_MANAGER_ERROR_CANNOT_ADD_ACCOUNT_BODY}, + {"accountManagerDialogSigninBlockedByPolicyTitle", + IDS_ACCOUNT_MANAGER_DIALOG_SIGNIN_BLOCKED_BY_POLICY_TITLE}, + {"accountManagerDialogSigninBlockedByPolicyBody", + IDS_ACCOUNT_MANAGER_DIALOG_SIGNIN_BLOCKED_BY_POLICY_BODY}, + {"accountManagerDialogSigninErrorTitle", + IDS_ACCOUNT_MANAGER_DIALOG_SIGNIN_ERROR_TITLE}, + {"accountManagerDialogSigninErrorBody", + IDS_ACCOUNT_MANAGER_DIALOG_SIGNIN_ERROR_BODY}, + {"accountManagerDialogSigninBlockedByPolicyImageAlt", + IDS_ACCOUNT_MANAGER_DIALOG_SIGNIN_BLOCKED_BY_POLICY_IMAGE_ALT}, + {"accountManagerDialogSigninSpinnerText", + IDS_ACCOUNT_MANAGER_DIALOG_SIGNIN_SPINNER_TEXT}, #else - {"title", IDS_CHROME_SIGNIN_TITLE}, + {"title", IDS_CHROME_SIGNIN_TITLE}, #endif }; source->AddLocalizedStrings(kLocalizedStrings); @@ -352,8 +352,9 @@ Profile* profile = Profile::FromWebUI(web_ui); CreateAndAddWebUIDataSource(profile); - if (!IsValidChromeSigninReason(web_ui->GetWebContents()->GetVisibleURL())) + if (!IsValidChromeSigninReason(web_ui->GetWebContents()->GetVisibleURL())) { return; + } #if BUILDFLAG(IS_CHROMEOS_ASH) web_ui->AddMessageHandler(
diff --git a/chrome/browser/ui/webui/signin/login_ui_service.cc b/chrome/browser/ui/webui/signin/login_ui_service.cc index 7029ea2..255337e 100644 --- a/chrome/browser/ui/webui/signin/login_ui_service.cc +++ b/chrome/browser/ui/webui/signin/login_ui_service.cc
@@ -49,8 +49,9 @@ void LoginUIService::SyncConfirmationUIClosed( SyncConfirmationUIClosedResult result) { - for (Observer& observer : observer_list_) + for (Observer& observer : observer_list_) { observer.OnSyncConfirmationUIClosed(result); + } } void LoginUIService::DisplayLoginResult(Browser* browser,
diff --git a/chrome/browser/ui/webui/signin/login_ui_service_factory.cc b/chrome/browser/ui/webui/signin/login_ui_service_factory.cc index 423e302..e76dbd5 100644 --- a/chrome/browser/ui/webui/signin/login_ui_service_factory.cc +++ b/chrome/browser/ui/webui/signin/login_ui_service_factory.cc
@@ -42,7 +42,8 @@ std::unique_ptr<KeyedService> LoginUIServiceFactory::BuildServiceInstanceForBrowserContext( content::BrowserContext* browser_context) const { - return std::make_unique<LoginUIService>(Profile::FromBrowserContext(browser_context)); + return std::make_unique<LoginUIService>( + Profile::FromBrowserContext(browser_context)); } bool LoginUIServiceFactory::ServiceIsCreatedWithBrowserContext() const {
diff --git a/chrome/browser/ui/webui/signin/login_ui_service_unittest.cc b/chrome/browser/ui/webui/signin/login_ui_service_unittest.cc index 53d3363..aa2a4b84d 100644 --- a/chrome/browser/ui/webui/signin/login_ui_service_unittest.cc +++ b/chrome/browser/ui/webui/signin/login_ui_service_unittest.cc
@@ -62,7 +62,7 @@ class TestLoginUI : public LoginUIService::LoginUI { public: - TestLoginUI() { } + TestLoginUI() {} TestLoginUI(const TestLoginUI&) = delete; TestLoginUI& operator=(const TestLoginUI&) = delete;
diff --git a/chrome/browser/ui/webui/signin/managed_user_profile_notice_handler.cc b/chrome/browser/ui/webui/signin/managed_user_profile_notice_handler.cc index e206352..0da66fe 100644 --- a/chrome/browser/ui/webui/signin/managed_user_profile_notice_handler.cc +++ b/chrome/browser/ui/webui/signin/managed_user_profile_notice_handler.cc
@@ -72,8 +72,9 @@ std::string GetManagedAccountTitle(ProfileAttributesEntry* entry, const std::string& account_domain_name) { DCHECK(entry); - if (entry->GetHostedDomain() == kNoHostedDomainFound) + if (entry->GetHostedDomain() == kNoHostedDomainFound) { return std::string(); + } const std::string domain_name = entry->GetHostedDomain().empty() ? account_domain_name : entry->GetHostedDomain(); @@ -85,8 +86,9 @@ std::string GetManagedDeviceTitle() { std::optional<std::string> device_manager = chrome::GetDeviceManagerIdentity(); - if (!device_manager) + if (!device_manager) { return std::string(); + } if (device_manager->empty()) { return l10n_util::GetStringUTF8( IDS_ENTERPRISE_PROFILE_WELCOME_DEVICE_MANAGED); @@ -191,8 +193,9 @@ } void ManagedUserProfileNoticeHandler::OnBrowserRemoved(Browser* browser) { - if (browser_ == browser) + if (browser_ == browser) { browser_ = nullptr; + } } void ManagedUserProfileNoticeHandler::OnExtendedAccountInfoUpdated( @@ -231,8 +234,9 @@ const base::Value::List& args) { AllowJavascript(); - if (browser_) + if (browser_) { signin::SetInitializedModalHeight(browser_, web_ui(), args); + } } void ManagedUserProfileNoticeHandler::HandleProceed( @@ -340,8 +344,9 @@ void ManagedUserProfileNoticeHandler::UpdateProfileInfo( const base::FilePath& profile_path) { DCHECK(IsJavascriptAllowed()); - if (profile_path != profile_path_) + if (profile_path != profile_path_) { return; + } FireWebUIListener("on-profile-info-changed", GetProfileInfoValue()); }
diff --git a/chrome/browser/ui/webui/signin/profile_customization_handler.cc b/chrome/browser/ui/webui/signin/profile_customization_handler.cc index d7defb5..f3d8bb17 100644 --- a/chrome/browser/ui/webui/signin/profile_customization_handler.cc +++ b/chrome/browser/ui/webui/signin/profile_customization_handler.cc
@@ -149,15 +149,17 @@ /*is_default_name=*/false); } - if (completion_callback_) + if (completion_callback_) { std::move(completion_callback_).Run(CustomizationResult::kDone); + } } void ProfileCustomizationHandler::HandleSkip(const base::Value::List& args) { CHECK_EQ(0u, args.size()); - if (completion_callback_) + if (completion_callback_) { std::move(completion_callback_).Run(CustomizationResult::kSkip); + } } void ProfileCustomizationHandler::HandleDeleteProfile( @@ -185,8 +187,9 @@ void ProfileCustomizationHandler::UpdateProfileInfo( const base::FilePath& profile_path) { DCHECK(IsJavascriptAllowed()); - if (profile_path != profile_->GetPath()) + if (profile_path != profile_->GetPath()) { return; + } FireWebUIListener("on-profile-info-changed", GetProfileInfoValue()); } @@ -204,8 +207,9 @@ dict.Set("pictureUrl", webui::GetBitmapDataUrl(icon.AsBitmap())); dict.Set("isManaged", AccountInfo::IsManaged(entry->GetHostedDomain())); std::u16string gaia_name = entry->GetGAIANameToDisplay(); - if (gaia_name.empty()) + if (gaia_name.empty()) { gaia_name = entry->GetLocalProfileName(); + } dict.Set("welcomeTitle", l10n_util::GetStringFUTF8( IDS_PROFILE_CUSTOMIZATION_WELCOME, gaia_name)); return dict;
diff --git a/chrome/browser/ui/webui/signin/profile_customization_handler.h b/chrome/browser/ui/webui/signin/profile_customization_handler.h index a01bc2ae..b01b258 100644 --- a/chrome/browser/ui/webui/signin/profile_customization_handler.h +++ b/chrome/browser/ui/webui/signin/profile_customization_handler.h
@@ -5,13 +5,12 @@ #ifndef CHROME_BROWSER_UI_WEBUI_SIGNIN_PROFILE_CUSTOMIZATION_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_SIGNIN_PROFILE_CUSTOMIZATION_HANDLER_H_ -#include "content/public/browser/web_ui_message_handler.h" - #include "base/files/file_path.h" #include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" #include "chrome/browser/profiles/profile_attributes_storage.h" +#include "content/public/browser/web_ui_message_handler.h" class Profile; class ProfileAttributesEntry;
diff --git a/chrome/browser/ui/webui/signin/profile_picker_ui.cc b/chrome/browser/ui/webui/signin/profile_picker_ui.cc index fad01b4..76e6a57 100644 --- a/chrome/browser/ui/webui/signin/profile_picker_ui.cc +++ b/chrome/browser/ui/webui/signin/profile_picker_ui.cc
@@ -68,8 +68,9 @@ const base::Value* browser_signin_value = policies.GetValue( policy::key::kBrowserSignin, base::Value::Type::INTEGER); - if (!browser_signin_value) + if (!browser_signin_value) { return true; + } return static_cast<policy::BrowserSigninMode>( browser_signin_value->GetInt()) != @@ -91,8 +92,9 @@ int managed_by_id = IDS_PROFILE_PICKER_PROFILE_CREATION_FLOW_DEVICE_MANAGED_BY_DESCRIPTION; #endif - if (!manager) + if (!manager) { return std::string(); + } if (manager->empty()) { return l10n_util::GetStringUTF8(managed_id); }
diff --git a/chrome/browser/ui/webui/signin/signin_email_confirmation_dialog.cc b/chrome/browser/ui/webui/signin/signin_email_confirmation_dialog.cc index 4d8736d..dbe57cf 100644 --- a/chrome/browser/ui/webui/signin/signin_email_confirmation_dialog.cc +++ b/chrome/browser/ui/webui/signin/signin_email_confirmation_dialog.cc
@@ -135,15 +135,17 @@ void SigninEmailConfirmationDialog::CloseDialog() { content::WebContents* dialog_web_contents = GetDialogWebContents(); - if (!dialog_web_contents) + if (!dialog_web_contents) { return; + } content::WebUI* web_ui = dialog_web_contents->GetWebUI(); if (web_ui) { SigninEmailConfirmationUI* signin_email_confirmation_ui = static_cast<SigninEmailConfirmationUI*>(web_ui->GetController()); - if (signin_email_confirmation_ui) + if (signin_email_confirmation_ui) { signin_email_confirmation_ui->Close(); + } } } @@ -187,8 +189,9 @@ NotifyModalDialogClosed(); - if (callback_) + if (callback_) { std::move(callback_).Run(action); + } } void SigninEmailConfirmationDialog::CloseModalSignin() {
diff --git a/chrome/browser/ui/webui/signin/signin_error_handler.cc b/chrome/browser/ui/webui/signin/signin_error_handler.cc index 013b9540e..2552e183 100644 --- a/chrome/browser/ui/webui/signin/signin_error_handler.cc +++ b/chrome/browser/ui/webui/signin/signin_error_handler.cc
@@ -28,8 +28,9 @@ } void SigninErrorHandler::OnBrowserRemoved(Browser* browser) { - if (browser_ == browser) + if (browser_ == browser) { browser_ = nullptr; + } } void SigninErrorHandler::RegisterMessages() { @@ -53,8 +54,9 @@ void SigninErrorHandler::HandleSwitchToExistingProfile( const base::Value::List& args) { - if (duplicate_profile_path_.empty()) + if (duplicate_profile_path_.empty()) { return; + } // CloseDialog will eventually destroy this object, so nothing should access // its members after this call. However, closing the dialog may steal focus @@ -75,8 +77,9 @@ void SigninErrorHandler::HandleLearnMore(const base::Value::List& args) { // "Learn more" only shown when from_profile_picker_=false DCHECK(!from_profile_picker_); - if (!browser_) + if (!browser_) { return; + } CloseDialog(); signin_ui_util::ShowSigninErrorLearnMorePage(browser_->profile()); } @@ -84,8 +87,9 @@ void SigninErrorHandler::HandleInitializedWithSize( const base::Value::List& args) { AllowJavascript(); - if (duplicate_profile_path_.empty()) + if (duplicate_profile_path_.empty()) { FireWebUIListener("switch-button-unavailable"); + } signin::SetInitializedModalHeight(browser_, web_ui(), args); }
diff --git a/chrome/browser/ui/webui/signin/signin_error_handler_unittest.cc b/chrome/browser/ui/webui/signin/signin_error_handler_unittest.cc index 889f9ab..e49e605a 100644 --- a/chrome/browser/ui/webui/signin/signin_error_handler_unittest.cc +++ b/chrome/browser/ui/webui/signin/signin_error_handler_unittest.cc
@@ -39,10 +39,10 @@ SigninErrorHandler::CloseBrowserModalSigninDialog(); } - using SigninErrorHandler::HandleSwitchToExistingProfile; using SigninErrorHandler::HandleConfirm; - using SigninErrorHandler::HandleLearnMore; using SigninErrorHandler::HandleInitializedWithSize; + using SigninErrorHandler::HandleLearnMore; + using SigninErrorHandler::HandleSwitchToExistingProfile; bool browser_modal_dialog_did_close() { return browser_modal_dialog_did_close_;
diff --git a/chrome/browser/ui/webui/signin/signin_reauth_handler.cc b/chrome/browser/ui/webui/signin/signin_reauth_handler.cc index 83f990c..8951c11 100644 --- a/chrome/browser/ui/webui/signin/signin_reauth_handler.cc +++ b/chrome/browser/ui/webui/signin/signin_reauth_handler.cc
@@ -37,8 +37,9 @@ } void SigninReauthHandler::OnJavascriptAllowed() { - if (!controller_) + if (!controller_) { return; + } SigninReauthViewController::GaiaReauthType gaia_reauth_type = controller_->gaia_reauth_type(); @@ -55,8 +56,9 @@ void SigninReauthHandler::OnGaiaReauthTypeDetermined( SigninReauthViewController::GaiaReauthType reauth_type) { - if (!IsJavascriptAllowed()) + if (!IsJavascriptAllowed()) { return; + } FireWebUIListener("reauth-type-determined"); } @@ -66,13 +68,15 @@ } void SigninReauthHandler::HandleConfirm(const base::Value::List& args) { - if (controller_) + if (controller_) { controller_->OnReauthConfirmed(BuildConsent(args)); + } } void SigninReauthHandler::HandleCancel(const base::Value::List& args) { - if (controller_) + if (controller_) { controller_->OnReauthDismissed(); + } } sync_pb::UserConsentTypes::AccountPasswordsConsent
diff --git a/chrome/browser/ui/webui/signin/signin_url_utils.cc b/chrome/browser/ui/webui/signin/signin_url_utils.cc index fde5838..641d4fc 100644 --- a/chrome/browser/ui/webui/signin/signin_url_utils.cc +++ b/chrome/browser/ui/webui/signin/signin_url_utils.cc
@@ -59,8 +59,9 @@ signin_metrics::ReauthAccessPoint GetReauthAccessPointForReauthConfirmationURL( const GURL& url) { std::string value; - if (!net::GetValueForKeyInQuery(url, kAccessPointParamKey, &value)) + if (!net::GetValueForKeyInQuery(url, kAccessPointParamKey, &value)) { return signin_metrics::ReauthAccessPoint::kUnknown; + } int access_point_int = -1; base::StringToInt(value, &access_point_int);
diff --git a/chrome/browser/ui/webui/signin/signin_utils.cc b/chrome/browser/ui/webui/signin/signin_utils.cc index a241c5d..1b9dfabb 100644 --- a/chrome/browser/ui/webui/signin/signin_utils.cc +++ b/chrome/browser/ui/webui/signin/signin_utils.cc
@@ -75,8 +75,9 @@ Browser* GetDesktopBrowser(content::WebUI* web_ui) { Browser* browser = chrome::FindBrowserWithTab(web_ui->GetWebContents()); - if (!browser) + if (!browser) { browser = chrome::FindLastActiveWithProfile(Profile::FromWebUI(web_ui)); + } return browser; } @@ -92,8 +93,9 @@ void SetInitializedModalHeight(Browser* browser, content::WebUI* web_ui, const base::Value::List& args) { - if (!browser) + if (!browser) { return; + } double height = args[0].GetDouble(); browser->signin_view_controller()->SetModalSigninHeight(
diff --git a/chrome/browser/ui/webui/signin/signin_utils.h b/chrome/browser/ui/webui/signin/signin_utils.h index 2e3c4b1..c9479e2 100644 --- a/chrome/browser/ui/webui/signin/signin_utils.h +++ b/chrome/browser/ui/webui/signin/signin_utils.h
@@ -24,7 +24,7 @@ class RenderFrameHost; class WebContents; class WebUI; -} +} // namespace content namespace extensions { class WebViewGuest;
diff --git a/chrome/browser/ui/webui/signin/signin_utils_desktop.cc b/chrome/browser/ui/webui/signin/signin_utils_desktop.cc index 42df1f5..5d0583e 100644 --- a/chrome/browser/ui/webui/signin/signin_utils_desktop.cc +++ b/chrome/browser/ui/webui/signin/signin_utils_desktop.cc
@@ -26,19 +26,23 @@ SigninUIError CanOfferSignin(Profile* profile, const GaiaId& gaia_id, const std::string& email) { - if (!profile) + if (!profile) { return SigninUIError::Other(email); + } - if (!profile->GetPrefs()->GetBoolean(prefs::kSigninAllowed)) + if (!profile->GetPrefs()->GetBoolean(prefs::kSigninAllowed)) { return SigninUIError::Other(email); + } - if (!ChromeSigninClient::ProfileAllowsSigninCookies(profile)) + if (!ChromeSigninClient::ProfileAllowsSigninCookies(profile)) { return SigninUIError::Other(email); + } if (!email.empty()) { auto* identity_manager = IdentityManagerFactory::GetForProfile(profile); - if (!identity_manager) + if (!identity_manager) { return SigninUIError::Other(email); + } // Make sure this username is not prohibited by policy. if (!signin::IsUsernameAllowedByPatternFromPrefs( @@ -53,8 +57,9 @@ identity_manager->GetPrimaryAccountInfo(signin::ConsentLevel::kSync) .email; const bool same_email = gaia::AreEmailsSame(current_email, email); - if (!current_email.empty() && !same_email) + if (!current_email.empty() && !same_email) { return SigninUIError::WrongReauthAccount(email, current_email); + } // If some profile, not just the current one, is already connected to this // account, don't show the infobar.
diff --git a/chrome/browser/ui/webui/signin/sync_confirmation_handler.cc b/chrome/browser/ui/webui/signin/sync_confirmation_handler.cc index b1e98a65..44b572b0 100644 --- a/chrome/browser/ui/webui/signin/sync_confirmation_handler.cc +++ b/chrome/browser/ui/webui/signin/sync_confirmation_handler.cc
@@ -164,8 +164,9 @@ } void SyncConfirmationHandler::OnBrowserRemoved(Browser* browser) { - if (browser_ == browser) + if (browser_ == browser) { browser_ = nullptr; + } } void SyncConfirmationHandler::RegisterMessages() { @@ -461,6 +462,7 @@ this, &SyncConfirmationHandler::OnDeadline); } - if (browser_) + if (browser_) { signin::SetInitializedModalHeight(browser_, web_ui(), args); + } }
diff --git a/chrome/browser/ui/webui/signin/sync_confirmation_handler_unittest.cc b/chrome/browser/ui/webui/signin/sync_confirmation_handler_unittest.cc index e184a9d..843eaf08 100644 --- a/chrome/browser/ui/webui/signin/sync_confirmation_handler_unittest.cc +++ b/chrome/browser/ui/webui/signin/sync_confirmation_handler_unittest.cc
@@ -68,9 +68,9 @@ const TestingSyncConfirmationHandler&) = delete; using SyncConfirmationHandler::HandleConfirm; - using SyncConfirmationHandler::HandleUndo; - using SyncConfirmationHandler::HandleInitializedWithSize; using SyncConfirmationHandler::HandleGoToSettings; + using SyncConfirmationHandler::HandleInitializedWithSize; + using SyncConfirmationHandler::HandleUndo; using SyncConfirmationHandler::RecordConsent; }; @@ -97,8 +97,7 @@ did_user_explicitly_interact_(false), on_sync_confirmation_ui_closed_called_(false), sync_confirmation_ui_closed_result_(LoginUIService::ABORT_SYNC), - web_ui_(new content::TestWebUI) { - } + web_ui_(new content::TestWebUI) {} SyncConfirmationHandlerTest(const SyncConfirmationHandlerTest&) = delete; SyncConfirmationHandlerTest& operator=(const SyncConfirmationHandlerTest&) = @@ -137,13 +136,9 @@ TestingSyncConfirmationHandler* handler() { return handler_; } - content::TestWebUI* web_ui() { - return web_ui_.get(); - } + content::TestWebUI* web_ui() { return web_ui_.get(); } - base::UserActionTester* user_action_tester() { - return &user_action_tester_; - } + base::UserActionTester* user_action_tester() { return &user_action_tester_; } consent_auditor::FakeConsentAuditor* consent_auditor() { return static_cast<consent_auditor::FakeConsentAuditor*>( @@ -434,9 +429,9 @@ EXPECT_EQ(LoginUIService::ABORT_SYNC, sync_confirmation_ui_closed_result_); EXPECT_EQ(1, user_action_tester()->GetActionCount("Signin_Undo_Signin")); EXPECT_EQ(0, user_action_tester()->GetActionCount( - "Signin_Signin_WithDefaultSyncSettings")); + "Signin_Signin_WithDefaultSyncSettings")); EXPECT_EQ(0, user_action_tester()->GetActionCount( - "Signin_Signin_WithAdvancedSyncSettings")); + "Signin_Signin_WithAdvancedSyncSettings")); } TEST_F(SyncConfirmationHandlerTest, TestHandleConfirm) { @@ -463,9 +458,9 @@ sync_confirmation_ui_closed_result_); EXPECT_EQ(0, user_action_tester()->GetActionCount("Signin_Undo_Signin")); EXPECT_EQ(1, user_action_tester()->GetActionCount( - "Signin_Signin_WithDefaultSyncSettings")); + "Signin_Signin_WithDefaultSyncSettings")); EXPECT_EQ(0, user_action_tester()->GetActionCount( - "Signin_Signin_WithAdvancedSyncSettings")); + "Signin_Signin_WithAdvancedSyncSettings")); // The corresponding string IDs get recorded. std::vector<std::vector<int>> expected_id_vectors = {{1, 2, 4}};
diff --git a/chrome/browser/ui/webui/signin/turn_sync_on_helper_delegate_impl.cc b/chrome/browser/ui/webui/signin/turn_sync_on_helper_delegate_impl.cc index 718b915..a733dca 100644 --- a/chrome/browser/ui/webui/signin/turn_sync_on_helper_delegate_impl.cc +++ b/chrome/browser/ui/webui/signin/turn_sync_on_helper_delegate_impl.cc
@@ -182,16 +182,19 @@ LoginUIService::SyncConfirmationUIClosedResult result) { DCHECK(sync_confirmation_callback_); // Treat closing the ui as an implicit ABORT_SYNC action. - if (result == LoginUIService::UI_CLOSED) + if (result == LoginUIService::UI_CLOSED) { result = LoginUIService::ABORT_SYNC; - if (browser_) + } + if (browser_) { browser_->signin_view_controller()->CloseModalSignin(); + } std::move(sync_confirmation_callback_).Run(result); } void TurnSyncOnHelperDelegateImpl::OnBrowserRemoved(Browser* browser) { - if (browser == browser_) + if (browser == browser_) { browser_ = nullptr; + } } #if !BUILDFLAG(IS_CHROMEOS_LACROS)
diff --git a/chrome/browser/ui/webui/signin/turn_sync_on_helper_delegate_impl.h b/chrome/browser/ui/webui/signin/turn_sync_on_helper_delegate_impl.h index b581875..888c3919 100644 --- a/chrome/browser/ui/webui/signin/turn_sync_on_helper_delegate_impl.h +++ b/chrome/browser/ui/webui/signin/turn_sync_on_helper_delegate_impl.h
@@ -20,7 +20,7 @@ namespace policy { class ProfileSeparationPolicies; class UserCloudSigninRestrictionPolicyFetcher; -} +} // namespace policy // Default implementation for TurnSyncOnHelper::Delegate. class TurnSyncOnHelperDelegateImpl : public TurnSyncOnHelper::Delegate,
diff --git a/chrome/browser/ui/webui/signin/turn_sync_on_helper_policy_fetch_tracker.cc b/chrome/browser/ui/webui/signin/turn_sync_on_helper_policy_fetch_tracker.cc index 534b88f..7e99efa 100644 --- a/chrome/browser/ui/webui/signin/turn_sync_on_helper_policy_fetch_tracker.cc +++ b/chrome/browser/ui/webui/signin/turn_sync_on_helper_policy_fetch_tracker.cc
@@ -66,8 +66,9 @@ // policy::PolicyService::ProviderUpdateObserver void OnProviderUpdatePropagated( policy::ConfigurationPolicyProvider* provider) override { - if (provider != profile_->GetUserCloudPolicyManager()) + if (provider != profile_->GetUserCloudPolicyManager()) { return; + } VLOG(2) << "Policies after sign in:"; VLOG(2) << policy::PolicyConversions( std::make_unique<policy::ChromePolicyConversionsClient>( @@ -75,15 +76,17 @@ .ToJSON(); scoped_policy_update_observer_.Reset(); policy_update_timeout_timer_.Reset(); - if (on_policy_updated_callback_) + if (on_policy_updated_callback_) { std::move(on_policy_updated_callback_).Run(); + } } void OnProviderUpdateTimedOut() { DVLOG(1) << "Waiting for policies update propagated timed out"; scoped_policy_update_observer_.Reset(); - if (on_policy_updated_callback_) + if (on_policy_updated_callback_) { std::move(on_policy_updated_callback_).Run(); + } } private:
diff --git a/chrome/browser/ui/webui/support_tool/support_tool_ui_browsertest.cc b/chrome/browser/ui/webui/support_tool/support_tool_ui_browsertest.cc index ec7be3f5..0fdb342 100644 --- a/chrome/browser/ui/webui/support_tool/support_tool_ui_browsertest.cc +++ b/chrome/browser/ui/webui/support_tool/support_tool_ui_browsertest.cc
@@ -2,11 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/webui/support_tool/support_tool_ui.h" + #include <string> #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" -#include "chrome/browser/ui/webui/support_tool/support_tool_ui.h" #include "chrome/common/chrome_features.h" #include "chrome/common/webui_url_constants.h" #include "chrome/test/base/in_process_browser_test.h"
diff --git a/chrome/browser/ui/webui/support_tool/support_tool_ui_utils_unittest.cc b/chrome/browser/ui/webui/support_tool/support_tool_ui_utils_unittest.cc index 2f0b4c6..7a42151 100644 --- a/chrome/browser/ui/webui/support_tool/support_tool_ui_utils_unittest.cc +++ b/chrome/browser/ui/webui/support_tool/support_tool_ui_utils_unittest.cc
@@ -90,8 +90,9 @@ ASSERT_TRUE(data_collector_enum); if (base::Contains(included_data_collectors, static_cast<support_tool::DataCollectorType>( - data_collector_enum.value()))) + data_collector_enum.value()))) { data_collector_item.Set(support_tool_ui::kDataCollectorIncluded, true); + } } }
diff --git a/chrome/browser/ui/webui/system/system_info_ui.cc b/chrome/browser/ui/webui/system/system_info_ui.cc index 4e005b2..e8c3d748 100644 --- a/chrome/browser/ui/webui/system/system_info_ui.cc +++ b/chrome/browser/ui/webui/system/system_info_ui.cc
@@ -131,8 +131,9 @@ void SystemInfoUIHandler::OnSystemInfo( std::unique_ptr<SystemLogsResponse> sys_info) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); - if (!sys_info) + if (!sys_info) { return; + } base::Value::List data; for (SystemLogsResponse::const_iterator it = sys_info->begin(); it != sys_info->end(); ++it) {
diff --git a/chrome/browser/ui/webui/tab_search/tab_search_page_handler.cc b/chrome/browser/ui/webui/tab_search/tab_search_page_handler.cc index c81b9894..9c5d7e75 100644 --- a/chrome/browser/ui/webui/tab_search/tab_search_page_handler.cc +++ b/chrome/browser/ui/webui/tab_search/tab_search_page_handler.cc
@@ -104,8 +104,9 @@ for (const auto& tab : tabs) { const sessions::SerializedNavigationEntry& entry = tab->navigations[tab->current_navigation_index]; - if (entry.timestamp() > last_active_time) + if (entry.timestamp() > last_active_time) { last_active_time = entry.timestamp(); + } } return last_active_time; } @@ -659,8 +660,9 @@ if (!sent_initial_payload_) { sent_initial_payload_ = true; int tab_count = 0; - for (const auto& window : profile_tabs->windows) + for (const auto& window : profile_tabs->windows) { tab_count += window->tabs.size(); + } base::UmaHistogramCounts100("Tabs.TabSearch.NumWindowsOnOpen", profile_tabs->windows.size()); base::UmaHistogramCounts10000("Tabs.TabSearch.NumTabsOnOpen", tab_count); @@ -791,11 +793,13 @@ void TabSearchPageHandler::OpenRecentlyClosedEntry(int32_t session_id) { sessions::TabRestoreService* tab_restore_service = TabRestoreServiceFactory::GetForProfile(Profile::FromWebUI(web_ui_)); - if (!tab_restore_service) + if (!tab_restore_service) { return; + } Browser* active_browser = chrome::FindLastActive(); - if (!active_browser) + if (!active_browser) { return; + } tab_restore_service->RestoreEntryById( BrowserLiveTabContext::FindContextForWebContents( active_browser->tab_strip_model()->GetActiveWebContents()), @@ -1092,21 +1096,24 @@ return; } auto embedder = webui_controller_->embedder(); - if (embedder) + if (embedder) { embedder->ShowUI(); + } } tab_search::mojom::ProfileDataPtr TabSearchPageHandler::CreateProfileData() { auto profile_data = tab_search::mojom::ProfileData::New(); Browser* active_browser = chrome::FindLastActive(); - if (!active_browser) + if (!active_browser) { return profile_data; + } std::set<DedupKey> tab_dedup_keys; std::set<tab_groups::TabGroupId> tab_group_ids; for (Browser* browser : *BrowserList::GetInstance()) { - if (!ShouldTrackBrowser(browser)) + if (!ShouldTrackBrowser(browser)) { continue; + } TabStripModel* tab_strip_model = browser->tab_strip_model(); auto window = tab_search::mojom::Window::New(); @@ -1118,15 +1125,16 @@ // during loading and thus has no title/URL. Skip any such pending tabs. // These tabs will be added to the list later on once loading has // finished. - if (!web_contents->GetController().GetLastCommittedEntry()) + if (!web_contents->GetController().GetLastCommittedEntry()) { continue; + } tab_search::mojom::TabPtr tab = GetTab(tab_strip_model, web_contents, i); tab_dedup_keys.insert(DedupKey(tab->url, tab->group_id)); window->tabs.push_back(std::move(tab)); } profile_data->windows.push_back(std::move(window)); - if (tab_strip_model->group_model()) + if (tab_strip_model->group_model()) { for (auto tab_group_id : tab_strip_model->group_model()->ListTabGroups()) { const tab_groups::TabGroupVisualData* tab_group_visual_data = @@ -1142,6 +1150,7 @@ tab_group_ids.insert(tab_group_id); profile_data->tab_groups.push_back(std::move(tab_group)); } + } } AddRecentlyClosedEntries(profile_data->recently_closed_tabs, @@ -1291,8 +1300,9 @@ std::set<DedupKey>& tab_dedup_keys) { sessions::TabRestoreService* tab_restore_service = TabRestoreServiceFactory::GetForProfile(Profile::FromWebUI(web_ui_)); - if (!tab_restore_service) + if (!tab_restore_service) { return; + } const int kRecentlyClosedTabCountThreshold = 100; int recently_closed_tab_count = 0; @@ -1381,8 +1391,9 @@ std::set<DedupKey>& tab_dedup_keys, std::set<tab_groups::TabGroupId>& tab_group_ids, std::vector<tab_search::mojom::TabGroupPtr>& tab_groups) { - if (tab->navigations.size() == 0) + if (tab->navigations.size() == 0) { return false; + } tab_search::mojom::RecentlyClosedTabPtr recently_closed_tab = GetRecentlyClosedTab(tab, close_time); @@ -1480,7 +1491,8 @@ alert == TabAlertState::AUDIO_RECORDING || alert == TabAlertState::VIDEO_RECORDING || alert == TabAlertState::AUDIO_PLAYING || - alert == TabAlertState::AUDIO_MUTING; + alert == TabAlertState::AUDIO_MUTING || + alert == TabAlertState::GLIC_ACCESSING; }); return tab_data; @@ -1569,15 +1581,18 @@ void TabSearchPageHandler::TabChangedAt(content::WebContents* contents, int index, TabChangeType change_type) { - if (!IsWebContentsVisible()) + if (!IsWebContentsVisible()) { return; + } // TODO(crbug.com/40709736): Support more values for TabChangeType and filter // out the changes we are not interested in. - if (change_type != TabChangeType::kAll) + if (change_type != TabChangeType::kAll) { return; + } Browser* browser = chrome::FindBrowserWithTab(contents); - if (!browser) + if (!browser) { return; + } Browser* active_browser = chrome::FindLastActive(); TRACE_EVENT0("browser", "TabSearchPageHandler:TabChangedAt"); @@ -1595,13 +1610,15 @@ } void TabSearchPageHandler::ScheduleDebounce() { - if (!debounce_timer_->IsRunning()) + if (!debounce_timer_->IsRunning()) { debounce_timer_->Reset(); + } } void TabSearchPageHandler::NotifyTabsChanged() { - if (!IsWebContentsVisible()) + if (!IsWebContentsVisible()) { return; + } page_->TabsChanged(CreateProfileData()); debounce_timer_->Stop(); }
diff --git a/chrome/browser/ui/webui/tab_strip/tab_before_unload_tracker.cc b/chrome/browser/ui/webui/tab_strip/tab_before_unload_tracker.cc index 50fb3e5..799d052 100644 --- a/chrome/browser/ui/webui/tab_strip/tab_before_unload_tracker.cc +++ b/chrome/browser/ui/webui/tab_strip/tab_before_unload_tracker.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/ui/webui/tab_strip/tab_before_unload_tracker.h" #include <memory> + #include "base/memory/raw_ptr.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_observer.h"
diff --git a/chrome/browser/ui/webui/tab_strip/tab_strip_page_handler.cc b/chrome/browser/ui/webui/tab_strip/tab_strip_page_handler.cc index 328ed65c..29911ec 100644 --- a/chrome/browser/ui/webui/tab_strip/tab_strip_page_handler.cc +++ b/chrome/browser/ui/webui/tab_strip/tab_strip_page_handler.cc
@@ -270,8 +270,9 @@ const TabStripModelChange& change, const TabStripSelectionChange& selection) { TRACE_EVENT0("browser", "TabStripPageHandler:OnTabStripModelChanged"); - if (tab_strip_model->empty()) + if (tab_strip_model->empty()) { return; + } // The context menu model is created when the menu is first shown. However, if // the tab strip model changes, the context menu model may not longer reflect @@ -405,15 +406,17 @@ should_drag_on_gesture_scroll_ = false; return false; } - if (!context_menu_after_tap_) + if (!context_menu_after_tap_) { page_->ShowContextMenu(); + } return true; case blink::WebInputEvent::Type::kGestureTwoFingerTap: page_->ShowContextMenu(); return true; case blink::WebInputEvent::Type::kGestureLongTap: - if (context_menu_after_tap_) + if (context_menu_after_tap_) { page_->ShowContextMenu(); + } should_drag_on_gesture_scroll_ = false; long_press_timer_->Stop(); @@ -829,10 +832,11 @@ return; } - if (thumbnail_tracked) + if (thumbnail_tracked) { thumbnail_tracker_.AddTab(tab); - else + } else { thumbnail_tracker_.RemoveTab(tab); + } } void TabStripPageHandler::ReportTabActivationDuration(uint32_t duration_ms) { @@ -863,8 +867,9 @@ // there is no data), send a blank URI. TRACE_EVENT0("browser", "TabStripPageHandler:HandleThumbnailUpdate"); std::string data_uri; - if (image) + if (image) { data_uri = webui::MakeDataURIForImage(base::span(image->data), "jpeg"); + } const SessionID::id_type tab_id = extensions::ExtensionTabUtil::GetTabId(tab); page_->TabThumbnailUpdated(tab_id, data_uri); @@ -882,8 +887,9 @@ const char* histogram_fragment, int tab_count, base::TimeDelta duration) { - if (tab_count <= 0) + if (tab_count <= 0) { return; + } // It isn't possible to report both a number of tabs and duration datapoint // together in a histogram or to correlate two histograms together. As a
diff --git a/chrome/browser/ui/webui/tab_strip/tab_strip_ui_util.cc b/chrome/browser/ui/webui/tab_strip/tab_strip_ui_util.cc index 96db108..99eafb2 100644 --- a/chrome/browser/ui/webui/tab_strip/tab_strip_ui_util.cc +++ b/chrome/browser/ui/webui/tab_strip/tab_strip_ui_util.cc
@@ -31,8 +31,9 @@ std::optional<tab_groups::TabGroupId> GetTabGroupIdFromString( TabGroupModel* tab_group_model, std::string group_id_string) { - if (!tab_group_model) + if (!tab_group_model) { return std::nullopt; + } for (tab_groups::TabGroupId candidate : tab_group_model->ListTabGroups()) { if (candidate.ToString() == group_id_string) { return std::optional<tab_groups::TabGroupId>{candidate}; @@ -178,8 +179,9 @@ bool DropTabsInNewBrowser(Browser* new_browser, const std::u16string& tab_id_str, const std::u16string& group_id_str) { - if (tab_id_str.empty() && group_id_str.empty()) + if (tab_id_str.empty() && group_id_str.empty()) { return false; + } Browser* source_browser = nullptr; gfx::Range tab_indices_to_move; @@ -191,8 +193,9 @@ if (!tab_id_str.empty()) { int tab_id = -1; - if (!base::StringToInt(tab_id_str, &tab_id)) + if (!base::StringToInt(tab_id_str, &tab_id)) { return false; + } extensions::WindowController* source_window = nullptr; int source_index = -1; @@ -211,23 +214,27 @@ std::string group_id_utf8 = base::UTF16ToUTF8(group_id_str); source_browser = GetBrowserWithGroupId(new_browser->profile(), group_id_utf8); - if (!source_browser) + if (!source_browser) { return false; + } TabGroupModel* source_group_model = source_browser->tab_strip_model()->group_model(); - if (!source_group_model) + if (!source_group_model) { return false; + } source_group_id = GetTabGroupIdFromString(source_group_model, group_id_utf8); - if (!source_group_id) + if (!source_group_id) { return false; + } TabGroup* source_group = source_group_model->GetTabGroup(*source_group_id); tab_indices_to_move = source_group->ListTabs(); TabGroupModel* new_group_model = new_browser->tab_strip_model()->group_model(); - if (!new_group_model) + if (!new_group_model) { return false; + } new_group_model->AddTabGroup(*source_group_id, *source_group->visual_data()); }
diff --git a/chrome/browser/ui/webui/tab_strip/thumbnail_tracker.cc b/chrome/browser/ui/webui/tab_strip/thumbnail_tracker.cc index b57daa11..808fa15 100644 --- a/chrome/browser/ui/webui/tab_strip/thumbnail_tracker.cc +++ b/chrome/browser/ui/webui/tab_strip/thumbnail_tracker.cc
@@ -19,8 +19,9 @@ ContentsData(ThumbnailTracker* parent, content::WebContents* contents) : content::WebContentsObserver(contents), parent_(parent) { thumbnail_ = parent_->thumbnail_getter_.Run(contents); - if (!thumbnail_) + if (!thumbnail_) { return; + } subscription_ = thumbnail_->Subscribe(); subscription_->SetCompressedImageCallback(base::BindRepeating( @@ -31,8 +32,9 @@ ContentsData& operator=(const ContentsData&) = delete; void RequestThumbnail() { - if (thumbnail_) + if (thumbnail_) { thumbnail_->RequestCompressedThumbnailData(); + } } // content::WebContents:
diff --git a/chrome/browser/ui/webui/tabs/tabs.mojom b/chrome/browser/ui/webui/tabs/tabs.mojom index b42cea2e..4335825c 100644 --- a/chrome/browser/ui/webui/tabs/tabs.mojom +++ b/chrome/browser/ui/webui/tabs/tabs.mojom
@@ -12,6 +12,7 @@ kAudioPlaying, kBluetoothConnected, kDesktopCapturing, + kGlicAccessing, kHidConnected, kMediaRecording, kPipPlaying,
diff --git a/chrome/browser/ui/webui/tabs/tabs_mojom_traits.h b/chrome/browser/ui/webui/tabs/tabs_mojom_traits.h index 16407479..c5e62ab9 100644 --- a/chrome/browser/ui/webui/tabs/tabs_mojom_traits.h +++ b/chrome/browser/ui/webui/tabs/tabs_mojom_traits.h
@@ -43,7 +43,9 @@ {TabAlertState::AUDIO_RECORDING, tabs::mojom::TabAlertState::kAudioRecording}, {TabAlertState::VIDEO_RECORDING, - tabs::mojom::TabAlertState::kVideoRecording}}); + tabs::mojom::TabAlertState::kVideoRecording}, + {TabAlertState::GLIC_ACCESSING, + tabs::mojom::TabAlertState::kGlicAccessing}}); return alert_state_map.at(input); }
diff --git a/chrome/browser/ui/webui/test_files_request_filter.cc b/chrome/browser/ui/webui/test_files_request_filter.cc index 906a1173..eac4bd5 100644 --- a/chrome/browser/ui/webui/test_files_request_filter.cc +++ b/chrome/browser/ui/webui/test_files_request_filter.cc
@@ -17,8 +17,9 @@ bool ShouldHandleTestFileRequestCallback(const std::string& path) { std::vector<std::string> url_substr = base::SplitString(path, "/", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); - if (url_substr.size() != 2 || url_substr[0] != "test") + if (url_substr.size() != 2 || url_substr[0] != "test") { return false; + } base::ScopedAllowBlockingForTesting allow_blocking; base::FilePath test_data_dir;
diff --git a/chrome/browser/ui/webui/theme_source.cc b/chrome/browser/ui/webui/theme_source.cc index 1d418a8..c3e9480e 100644 --- a/chrome/browser/ui/webui/theme_source.cc +++ b/chrome/browser/ui/webui/theme_source.cc
@@ -290,37 +290,36 @@ base::SPLIT_WANT_ALL); using ColorIdCSSCallback = base::RepeatingCallback<std::string(ui::ColorId)>; - auto generate_color_mapping = [&color_id_sets, &color_provider, - &generate_rgb_vars]( - std::string set_name, ui::ColorId start, - ui::ColorId end, - ColorIdCSSCallback color_css_name) { - // Only return these mappings if specified in the query parameter. - auto it = base::ranges::find(color_id_sets, set_name); - if (it == color_id_sets.end()) { - return std::string(); - } - color_id_sets.erase(it); - std::string css_string; - for (ui::ColorId id = start; id < end; ++id) { - const SkColor color = color_provider.GetColor(id); - std::string css_id_to_color_mapping = - base::StringPrintf("%s:%s;", color_css_name.Run(id).c_str(), - ui::ConvertSkColorToCSSColor(color).c_str()); - base::StrAppend(&css_string, {css_id_to_color_mapping}); - if (generate_rgb_vars) { - // Also generate a r,g,b string for each color so apps can construct - // colors with their own opacities in css. - const std::string css_rgb_color_str = - color_utils::SkColorToRgbString(color); - const std::string css_id_to_rgb_color_mapping = - base::StringPrintf("%s-rgb:%s;", color_css_name.Run(id).c_str(), - css_rgb_color_str.c_str()); - base::StrAppend(&css_string, {css_id_to_rgb_color_mapping}); - } - } - return css_string; - }; + auto generate_color_mapping = + [&color_id_sets, &color_provider, &generate_rgb_vars]( + std::string set_name, ui::ColorId start, ui::ColorId end, + ColorIdCSSCallback color_css_name) { + // Only return these mappings if specified in the query parameter. + auto it = base::ranges::find(color_id_sets, set_name); + if (it == color_id_sets.end()) { + return std::string(); + } + color_id_sets.erase(it); + std::string css_string; + for (ui::ColorId id = start; id < end; ++id) { + const SkColor color = color_provider.GetColor(id); + std::string css_id_to_color_mapping = + base::StringPrintf("%s:%s;", color_css_name.Run(id).c_str(), + ui::ConvertSkColorToCSSColor(color).c_str()); + base::StrAppend(&css_string, {css_id_to_color_mapping}); + if (generate_rgb_vars) { + // Also generate a r,g,b string for each color so apps can construct + // colors with their own opacities in css. + const std::string css_rgb_color_str = + color_utils::SkColorToRgbString(color); + const std::string css_id_to_rgb_color_mapping = + base::StringPrintf("%s-rgb:%s;", color_css_name.Run(id).c_str(), + css_rgb_color_str.c_str()); + base::StrAppend(&css_string, {css_id_to_rgb_color_mapping}); + } + } + return css_string; + }; // Convenience lambda for wrapping // |ConvertColorProviderColorIdToCSSColorId|.
diff --git a/chrome/browser/ui/webui/top_chrome/profile_preload_candidate_selector_unittest.cc b/chrome/browser/ui/webui/top_chrome/profile_preload_candidate_selector_unittest.cc index 015cdfa..af2bbd9 100644 --- a/chrome/browser/ui/webui/top_chrome/profile_preload_candidate_selector_unittest.cc +++ b/chrome/browser/ui/webui/top_chrome/profile_preload_candidate_selector_unittest.cc
@@ -16,11 +16,11 @@ #include "chrome/browser/ui/webui/top_chrome/top_chrome_web_ui_controller.h" #include "chrome/browser/ui/webui/top_chrome/top_chrome_webui_config.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" -#include "content/public/browser/browser_context.h" -#include "content/public/common/url_constants.h" #include "components/site_engagement/content/site_engagement_score.h" #include "components/site_engagement/content/site_engagement_service.h" +#include "content/public/browser/browser_context.h" #include "content/public/browser/web_contents.h" +#include "content/public/common/url_constants.h" #include "content/public/test/scoped_web_ui_controller_factory_registration.h" #include "testing/gmock/include/gmock/gmock.h" #include "url/gurl.h" @@ -99,8 +99,8 @@ : public ChromeRenderViewHostTestHarness { public: ProfilePreloadCandidateSelectorTest() - : registration1_(std::make_unique<TestWebUIConfig1>(enabled_webui_1_)), - registration2_(std::make_unique<TestWebUIConfig2>()) {} + : registration1_(std::make_unique<TestWebUIConfig1>(enabled_webui_1_)), + registration2_(std::make_unique<TestWebUIConfig2>()) {} ~ProfilePreloadCandidateSelectorTest() override = default; ProfilePreloadCandidateSelectorTest( const ProfilePreloadCandidateSelectorTest&) = delete; @@ -217,8 +217,7 @@ EXPECT_EQ(GURL(kWebUIUrl2), *GetURLToPreload(profile())); } -TEST_F(ProfilePreloadCandidateSelectorTest, - IgnoreDisabledWebUIs) { +TEST_F(ProfilePreloadCandidateSelectorTest, IgnoreDisabledWebUIs) { // Set engagement scores to maximum, so that the selector won't reject a URL // due to its low engagemen score. SetEngagementScore(profile(), GURL(kWebUIUrl1), @@ -226,7 +225,7 @@ // Set URL2 to have a lower engagement score than URL1, so that when URL2 is // selected, it is not due to it having a higher engagement score. SetEngagementScore(profile(), GURL(kWebUIUrl2), - SiteEngagementService::GetMaxPoints()-1); + SiteEngagementService::GetMaxPoints() - 1); // By default no WebUI is present, selects either URL1 or URL2. EXPECT_TRUE(
diff --git a/chrome/browser/ui/webui/top_chrome/top_chrome_web_ui_controller.cc b/chrome/browser/ui/webui/top_chrome/top_chrome_web_ui_controller.cc index ca68a9f6..272f9609 100644 --- a/chrome/browser/ui/webui/top_chrome/top_chrome_web_ui_controller.cc +++ b/chrome/browser/ui/webui/top_chrome/top_chrome_web_ui_controller.cc
@@ -7,7 +7,7 @@ #include "content/public/browser/web_ui.h" TopChromeWebUIController::TopChromeWebUIController(content::WebUI* contents, - bool enable_chrome_send) + bool enable_chrome_send) : MojoWebUIController(contents, enable_chrome_send) {} TopChromeWebUIController::~TopChromeWebUIController() = default;
diff --git a/chrome/browser/ui/webui/top_chrome/top_chrome_web_ui_controller.h b/chrome/browser/ui/webui/top_chrome/top_chrome_web_ui_controller.h index a20cfac9..cefe27e3 100644 --- a/chrome/browser/ui/webui/top_chrome/top_chrome_web_ui_controller.h +++ b/chrome/browser/ui/webui/top_chrome/top_chrome_web_ui_controller.h
@@ -34,10 +34,9 @@ // By default TopChromeWebUIController do not have normal WebUI bindings. // Pass |enable_chrome_send| as true if these are needed. explicit TopChromeWebUIController(content::WebUI* contents, - bool enable_chrome_send = false); + bool enable_chrome_send = false); TopChromeWebUIController(const TopChromeWebUIController&) = delete; - TopChromeWebUIController& operator=(const TopChromeWebUIController&) = - delete; + TopChromeWebUIController& operator=(const TopChromeWebUIController&) = delete; ~TopChromeWebUIController() override; void set_embedder(base::WeakPtr<Embedder> embedder) { embedder_ = embedder; }
diff --git a/chrome/browser/ui/webui/top_chrome/webui_contents_wrapper.cc b/chrome/browser/ui/webui/top_chrome/webui_contents_wrapper.cc index 7a133f3..b8279a2 100644 --- a/chrome/browser/ui/webui/top_chrome/webui_contents_wrapper.cc +++ b/chrome/browser/ui/webui/top_chrome/webui_contents_wrapper.cc
@@ -133,10 +133,11 @@ } void WebUIContentsWrapper::ResizeDueToAutoResize(content::WebContents* source, - const gfx::Size& new_size) { + const gfx::Size& new_size) { DCHECK_EQ(web_contents(), source); - if (host_) + if (host_) { host_->ResizeDueToAutoResize(source, new_size); + } } content::KeyboardEventProcessingResult @@ -268,20 +269,23 @@ } void WebUIContentsWrapper::CloseUI() { - if (host_) + if (host_) { host_->CloseUI(); + } } void WebUIContentsWrapper::ShowContextMenu( gfx::Point point, std::unique_ptr<ui::MenuModel> menu_model) { - if (host_) + if (host_) { host_->ShowCustomContextMenu(point, std::move(menu_model)); + } } void WebUIContentsWrapper::HideContextMenu() { - if (host_) + if (host_) { host_->HideCustomContextMenu(); + } } base::WeakPtr<WebUIContentsWrapper::Host> WebUIContentsWrapper::GetHost() {
diff --git a/chrome/browser/ui/webui/top_chrome/webui_contents_wrapper_unittest.cc b/chrome/browser/ui/webui/top_chrome/webui_contents_wrapper_unittest.cc index 2c0cc72..c96967f 100644 --- a/chrome/browser/ui/webui/top_chrome/webui_contents_wrapper_unittest.cc +++ b/chrome/browser/ui/webui/top_chrome/webui_contents_wrapper_unittest.cc
@@ -86,8 +86,7 @@ base::WeakPtrFactory<MockHost> weak_ptr_factory_{this}; }; -class TestWebUIContentsWrapper - : public WebUIContentsWrapper { +class TestWebUIContentsWrapper : public WebUIContentsWrapper { public: explicit TestWebUIContentsWrapper(Profile* profile) : WebUIContentsWrapper(GURL(""), profile, 0, true, true, true, "Test") {} @@ -111,8 +110,7 @@ public: WebUIContentsWrapperTest() = default; WebUIContentsWrapperTest(const WebUIContentsWrapperTest&) = delete; - WebUIContentsWrapperTest& operator=(const WebUIContentsWrapperTest&) = - delete; + WebUIContentsWrapperTest& operator=(const WebUIContentsWrapperTest&) = delete; ~WebUIContentsWrapperTest() override = default; // ViewsTestBase:
diff --git a/chrome/browser/ui/webui/user_actions/user_actions_ui_handler.cc b/chrome/browser/ui/webui/user_actions/user_actions_ui_handler.cc index 1c3a3be1..089a3fd7 100644 --- a/chrome/browser/ui/webui/user_actions/user_actions_ui_handler.cc +++ b/chrome/browser/ui/webui/user_actions/user_actions_ui_handler.cc
@@ -38,8 +38,9 @@ void UserActionsUIHandler::OnUserAction(const std::string& action, base::TimeTicks action_time) { - if (!IsJavascriptAllowed()) + if (!IsJavascriptAllowed()) { return; + } base::Value user_action_name(action); FireWebUIListener("user-action", user_action_name);
diff --git a/chrome/browser/ui/webui/version/version_handler.cc b/chrome/browser/ui/webui/version/version_handler.cc index 3c684382..2d8d97e 100644 --- a/chrome/browser/ui/webui/version/version_handler.cc +++ b/chrome/browser/ui/webui/version/version_handler.cc
@@ -40,16 +40,18 @@ base::FilePath executable_path = base::MakeAbsoluteFilePath( base::CommandLine::ForCurrentProcess()->GetProgram()); - if (!executable_path.empty()) + if (!executable_path.empty()) { *exec_path_out = executable_path.LossyDisplayName(); - else + } else { *exec_path_out = l10n_util::GetStringUTF16(IDS_VERSION_UI_PATH_NOTFOUND); + } base::FilePath profile_path_copy(base::MakeAbsoluteFilePath(profile_path)); - if (!profile_path.empty() && !profile_path_copy.empty()) + if (!profile_path.empty() && !profile_path_copy.empty()) { *profile_path_out = profile_path.LossyDisplayName(); - else + } else { *profile_path_out = l10n_util::GetStringUTF16(IDS_VERSION_UI_PATH_NOTFOUND); + } } } // namespace
diff --git a/chrome/browser/ui/webui/version/version_ui.cc b/chrome/browser/ui/webui/version/version_ui.cc index e9bdbe3..57ccd5e9d 100644 --- a/chrome/browser/ui/webui/version/version_ui.cc +++ b/chrome/browser/ui/webui/version/version_ui.cc
@@ -269,8 +269,9 @@ std::string command_line; typedef std::vector<std::string> ArgvList; const ArgvList& argv = base::CommandLine::ForCurrentProcess()->argv(); - for (auto iter = argv.begin(); iter != argv.end(); iter++) + for (auto iter = argv.begin(); iter != argv.end(); iter++) { command_line += " " + *iter; + } // TODO(viettrungluu): |command_line| could really have any encoding, whereas // below we assumes it's UTF-8. html_source->AddString(version_ui::kCommandLine, command_line);
diff --git a/chrome/browser/ui/webui/version/version_util_win.cc b/chrome/browser/ui/webui/version/version_util_win.cc index a14328e..ce37afa 100644 --- a/chrome/browser/ui/webui/version/version_util_win.cc +++ b/chrome/browser/ui/webui/version/version_util_win.cc
@@ -72,13 +72,15 @@ const std::string release_id = gi->release_id(); - if (!release_id.empty()) + if (!release_id.empty()) { version += " Version " + release_id; + } - if (patch > 0) + if (patch > 0) { version += base::StringPrintf(" (Build %u.%u)", build, patch); - else + } else { version += base::StringPrintf(" (Build %u)", build); + } return version; }
diff --git a/chrome/browser/ui/webui/version/version_util_win.h b/chrome/browser/ui/webui/version/version_util_win.h index a53b40f..19263a97 100644 --- a/chrome/browser/ui/webui/version/version_util_win.h +++ b/chrome/browser/ui/webui/version/version_util_win.h
@@ -7,7 +7,6 @@ #include <string> - namespace version_utils { namespace win {
diff --git a/chrome/browser/ui/webui/web_app_internals/iwa_internals_handler.cc b/chrome/browser/ui/webui/web_app_internals/iwa_internals_handler.cc index 169c326..8f6c99d 100644 --- a/chrome/browser/ui/webui/web_app_internals/iwa_internals_handler.cc +++ b/chrome/browser/ui/webui/web_app_internals/iwa_internals_handler.cc
@@ -618,7 +618,8 @@ return; } - RETURN_IF_ERROR(GetIsolatedWebAppById(provider->registrar_unsafe(), app_id), [&](auto) { std::move(callback).Run(/*success=*/false); }); + RETURN_IF_ERROR(GetIsolatedWebAppById(provider->registrar_unsafe(), app_id), + [&](auto) { std::move(callback).Run(/*success=*/false); }); base::Version version = base::Version(pinned_version); if (!version.IsValid()) {
diff --git a/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc b/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc index 267dd770..4348c7a 100644 --- a/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc +++ b/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc
@@ -24,9 +24,9 @@ #include "ui/gfx/geometry/rect.h" #include "url/gurl.h" +using content::BrowserContext; using content::OpenURLParams; using content::Referrer; -using content::BrowserContext; using content::WebContents; using content::WebContentsTester; using ui::WebDialogWebContentsDelegate;
diff --git a/chrome/browser/ui/webui/webapks/webapks_handler.cc b/chrome/browser/ui/webui/webapks/webapks_handler.cc index 8f8e080..527546e 100644 --- a/chrome/browser/ui/webui/webapks/webapks_handler.cc +++ b/chrome/browser/ui/webui/webapks/webapks_handler.cc
@@ -39,14 +39,16 @@ void WebApksHandler::HandleRequestWebApkUpdate(const base::Value::List& args) { AllowJavascript(); for (const auto& val : args) { - if (val.is_string()) + if (val.is_string()) { ShortcutHelper::SetForceWebApkUpdate(val.GetString()); + } } } void WebApksHandler::OnWebApkInfoRetrieved(const WebApkInfo& webapk_info) { - if (!IsJavascriptAllowed()) + if (!IsJavascriptAllowed()) { return; + } base::Value::Dict result; result.Set("name", webapk_info.name); result.Set("shortName", webapk_info.short_name);
diff --git a/chrome/browser/ui/webui/webui_allowlist_provider_unittest.cc b/chrome/browser/ui/webui/webui_allowlist_provider_unittest.cc index 5139b084..99ff3bb5 100644 --- a/chrome/browser/ui/webui/webui_allowlist_provider_unittest.cc +++ b/chrome/browser/ui/webui/webui_allowlist_provider_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "ui/webui/webui_allowlist_provider.h" + #include <map> #include <memory> @@ -23,7 +25,6 @@ #include "net/cookies/site_for_cookies.h" #include "testing/gmock/include/gmock/gmock.h" #include "ui/webui/webui_allowlist.h" -#include "ui/webui/webui_allowlist_provider.h" #include "url/origin.h" using ::testing::_;
diff --git a/chrome/browser/ui/webui/webui_gallery/webui_gallery_ui.cc b/chrome/browser/ui/webui/webui_gallery/webui_gallery_ui.cc index be04123..b65f7f7 100644 --- a/chrome/browser/ui/webui/webui_gallery/webui_gallery_ui.cc +++ b/chrome/browser/ui/webui/webui_gallery/webui_gallery_ui.cc
@@ -27,10 +27,8 @@ content::WebUIDataSource* source = content::WebUIDataSource::CreateAndAdd( profile, chrome::kChromeUIWebuiGalleryHost); - webui::SetupWebUIDataSource( - source, - base::span(kWebuiGalleryResources), - IDR_WEBUI_GALLERY_WEBUI_GALLERY_HTML); + webui::SetupWebUIDataSource(source, base::span(kWebuiGalleryResources), + IDR_WEBUI_GALLERY_WEBUI_GALLERY_HTML); source->OverrideContentSecurityPolicy( network::mojom::CSPDirectiveName::FrameSrc, "frame-src 'self';");
diff --git a/chrome/browser/ui/webui/webui_load_timer.cc b/chrome/browser/ui/webui/webui_load_timer.cc index 4099daa..c5932977 100644 --- a/chrome/browser/ui/webui/webui_load_timer.cc +++ b/chrome/browser/ui/webui/webui_load_timer.cc
@@ -49,8 +49,9 @@ void WebuiLoadTimer::DOMContentLoaded( content::RenderFrameHost* render_frame_host) { // See comment in DocumentOnLoadCompletedInPrimaryMainFrame. - if (!timer_ || !render_frame_host->IsInPrimaryMainFrame()) + if (!timer_ || !render_frame_host->IsInPrimaryMainFrame()) { return; + } CallUmaHistogramTimes(document_initial_load_uma_id_, timer_->Elapsed()); } @@ -58,8 +59,9 @@ // The WebContents could have been created for a child RenderFrameHost so it // would never receive a DidStartNavigation with the main frame, however it // will receive this callback. - if (!timer_) + if (!timer_) { return; + } CallUmaHistogramTimes(document_load_completed_uma_id_, timer_->Elapsed()); timer_.reset(); }
diff --git a/chrome/browser/ui/webui/webui_url_hashes_browsertest.cc b/chrome/browser/ui/webui/webui_url_hashes_browsertest.cc index f21725ec..4fe1bb17 100644 --- a/chrome/browser/ui/webui/webui_url_hashes_browsertest.cc +++ b/chrome/browser/ui/webui/webui_url_hashes_browsertest.cc
@@ -2,11 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/webui/webui_url_hashes.h" + #include "base/hash/hash.h" #include "base/metrics/histogram_base.h" #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h" -#include "chrome/browser/ui/webui/webui_url_hashes.h" #include "chrome/test/base/in_process_browser_test.h" #include "content/public/browser/webui_config_map.h" #include "content/public/test/browser_test.h"
diff --git a/chrome/browser/ui/webui/whats_new/whats_new_ui.cc b/chrome/browser/ui/webui/whats_new/whats_new_ui.cc index 820f3174..bcc11ca 100644 --- a/chrome/browser/ui/webui/whats_new/whats_new_ui.cc +++ b/chrome/browser/ui/webui/whats_new/whats_new_ui.cc
@@ -124,8 +124,9 @@ void WhatsNewUI::BindInterface( mojo::PendingReceiver<browser_command::mojom::CommandHandlerFactory> pending_receiver) { - if (browser_command_factory_receiver_.is_bound()) + if (browser_command_factory_receiver_.is_bound()) { browser_command_factory_receiver_.reset(); + } browser_command_factory_receiver_.Bind(std::move(pending_receiver)); }
diff --git a/chrome/browser/ui/window_name_prompt/window_name_prompt.cc b/chrome/browser/ui/window_name_prompt/window_name_prompt.cc index 16982659..1c1950e 100644 --- a/chrome/browser/ui/window_name_prompt/window_name_prompt.cc +++ b/chrome/browser/ui/window_name_prompt/window_name_prompt.cc
@@ -21,10 +21,11 @@ ui::DialogModel* dialog_model) { std::string text = base::UTF16ToUTF8( dialog_model->GetTextfieldByUniqueId(kWindowNameFieldId)->text()); - if (text.empty()) + if (text.empty()) { base::RecordAction(base::UserMetricsAction("WindowNaming_Cleared")); - else + } else { base::RecordAction(base::UserMetricsAction("WindowNaming_Set")); + } browser->SetWindowUserTitle(text); }
diff --git a/chrome/browser/ui/window_sizer/window_sizer.cc b/chrome/browser/ui/window_sizer/window_sizer.cc index d4b6617..84a5b8f 100644 --- a/chrome/browser/ui/window_sizer/window_sizer.cc +++ b/chrome/browser/ui/window_sizer/window_sizer.cc
@@ -73,8 +73,9 @@ DCHECK(bounds); DCHECK(show_state); - if (!browser_ || !browser_->profile()->GetPrefs()) + if (!browser_ || !browser_->profile()->GetPrefs()) { return false; + } const base::Value::Dict* pref = chrome::GetWindowPlacementDictionaryReadOnly( @@ -86,12 +87,14 @@ std::optional<bool> maximized = pref ? pref->FindBool("maximized") : std::nullopt; - if (!pref_bounds || !maximized) + if (!pref_bounds || !maximized) { return false; + } *bounds = pref_bounds.value(); - if (pref_area) + if (pref_area) { *work_area = pref_area.value(); + } if (*show_state == ui::mojom::WindowShowState::kDefault && maximized.value()) { *show_state = ui::mojom::WindowShowState::kMaximized; @@ -125,8 +128,9 @@ app_id = browser_->app_controller()->app_id(), display = display::Screen::GetScreen()->GetDisplayForNewWindows()]( Browser* browser) { - if (browser->profile() != profile) + if (browser->profile() != profile) { return false; + } if (!web_app::AppBrowserController::IsForWebApp(browser, app_id)) { return false; } @@ -146,20 +150,20 @@ } if (window) { - *bounds = window->GetRestoredBounds(); + *bounds = window->GetRestoredBounds(); - // On Mac GetRestoredBounds already returns the maximized bounds for - // maximized windows. Additionally creating a window with a maximized - // show state results in an invisible window if the window is a PWA - // (i.e. out-of-process remote cocoa) window - // (https://crbug.com/1441966). Never using WindowShowState::kMaximized - // on Mac is also consistent with NativeWidgetMac::Show, which does not - // support WindowShowState::kMaximized either. + // On Mac GetRestoredBounds already returns the maximized bounds for + // maximized windows. Additionally creating a window with a maximized + // show state results in an invisible window if the window is a PWA + // (i.e. out-of-process remote cocoa) window + // (https://crbug.com/1441966). Never using WindowShowState::kMaximized + // on Mac is also consistent with NativeWidgetMac::Show, which does not + // support WindowShowState::kMaximized either. #if !BUILDFLAG(IS_MAC) - if (*show_state == ui::mojom::WindowShowState::kDefault && - window->IsMaximized()) { - *show_state = ui::mojom::WindowShowState::kMaximized; - } + if (*show_state == ui::mojom::WindowShowState::kDefault && + window->IsMaximized()) { + *show_state = ui::mojom::WindowShowState::kMaximized; + } #endif return true; } @@ -171,8 +175,9 @@ static std::optional<gfx::Rect> RectFromPrefixedPref( const base::Value::Dict* pref, const std::string& prefix) { - if (!pref) + if (!pref) { return std::nullopt; + } std::optional<int> top, left, bottom, right; @@ -181,8 +186,9 @@ bottom = pref->FindInt(prefix + "bottom"); right = pref->FindInt(prefix + "right"); - if (!top || !left || !bottom || !right) + if (!top || !left || !bottom || !right) { return std::nullopt; + } return gfx::Rect(left.value(), top.value(), std::max(0, right.value() - left.value()), @@ -243,11 +249,13 @@ ui::mojom::WindowShowState* show_state) { if (bounds->IsEmpty()) { // See if there's last active window's placement information. - if (GetLastActiveWindowBounds(bounds, show_state)) + if (GetLastActiveWindowBounds(bounds, show_state)) { return; + } // See if there's saved placement information. - if (GetSavedWindowBounds(bounds, show_state)) + if (GetSavedWindowBounds(bounds, show_state)) { return; + } // No saved placement, figure out some sensible default size based on // the user's screen size. @@ -278,8 +286,9 @@ DCHECK(bounds); DCHECK(show_state); if (!state_provider_.get() || - !state_provider_->GetLastActiveWindowState(bounds, show_state)) + !state_provider_->GetLastActiveWindowState(bounds, show_state)) { return false; + } bounds->Offset(kWindowTilePixels, kWindowTilePixels); AdjustBoundsToBeVisibleOnDisplay( display::Screen::GetScreen()->GetDisplayMatching(*bounds), gfx::Rect(), @@ -293,11 +302,10 @@ DCHECK(bounds); DCHECK(show_state); gfx::Rect saved_work_area; - if (!state_provider_.get() || - !state_provider_->GetPersistentState(bounds, - &saved_work_area, - show_state)) + if (!state_provider_.get() || !state_provider_->GetPersistentState( + bounds, &saved_work_area, show_state)) { return false; + } AdjustBoundsToBeVisibleOnDisplay(GetDisplayForNewWindow(*bounds), saved_work_area, bounds); return true; @@ -319,7 +327,7 @@ gfx::Rect screen_size = display::Screen::GetScreen()->GetPrimaryDisplay().bounds(); double width_to_height = - static_cast<double>(screen_size.width()) / screen_size.height(); + static_cast<double>(screen_size.width()) / screen_size.height(); // The least wide a screen can be to qualify for the halving described above. static const int kMinScreenWidthForWindowHalving = 1600; @@ -330,8 +338,8 @@ // Halve the work area, subtracting aesthetic padding on either side. // The padding is set so that two windows, side by side have // kWindowTilePixels between screen edge and each other. - default_width = static_cast<int>(work_area.width() / 2. - - 1.5 * kWindowTilePixels); + default_width = + static_cast<int>(work_area.width() / 2. - 1.5 * kWindowTilePixels); } #endif // !BUILDFLAG(IS_MAC) return gfx::Rect(kWindowTilePixels + work_area.x(), @@ -348,10 +356,12 @@ // If |bounds| is empty, reset to the default size. if (bounds->IsEmpty()) { gfx::Rect default_bounds = GetDefaultWindowBounds(display); - if (bounds->height() <= 0) + if (bounds->height() <= 0) { bounds->set_height(default_bounds.height()); - if (bounds->width() <= 0) + } + if (bounds->width() <= 0) { bounds->set_width(default_bounds.width()); + } } // Ensure the minimum height and width. @@ -361,14 +371,14 @@ const gfx::Rect work_area = display.work_area(); CHECK(!work_area.IsEmpty(), base::NotFatalUntil::M131); // Ensure that the title bar is not above the work area. - if (bounds->y() < work_area.y()) + if (bounds->y() < work_area.y()) { bounds->set_y(work_area.y()); + } // Reposition and resize the bounds if the saved_work_area is different from // the current work area and the current work area doesn't completely contain // the bounds. - if (!saved_work_area.IsEmpty() && - saved_work_area != work_area && + if (!saved_work_area.IsEmpty() && saved_work_area != work_area && !work_area.Contains(*bounds)) { bounds->AdjustToFit(work_area); } @@ -379,13 +389,15 @@ // On mac, we want to be aggressive about repositioning windows that are // partially offscreen. If the window is partially offscreen horizontally, // move it to be flush with the left edge of the work area. - if (bounds->x() < work_area.x() || bounds->right() > work_area.right()) + if (bounds->x() < work_area.x() || bounds->right() > work_area.right()) { bounds->set_x(work_area.x()); + } // If the window is partially offscreen vertically, move it to be flush with // the top of the work area. - if (bounds->y() < work_area.y() || bounds->bottom() > work_area.bottom()) + if (bounds->y() < work_area.y() || bounds->bottom() > work_area.bottom()) { bounds->set_y(work_area.y()); + } #else // On non-Mac platforms, we are less aggressive about repositioning. Simply // ensure that at least kMinVisibleWidth * kMinVisibleHeight is visible or @@ -419,8 +431,9 @@ // static ui::mojom::WindowShowState WindowSizer::GetWindowDefaultShowState( const Browser* browser) { - if (!browser) + if (!browser) { return ui::mojom::WindowShowState::kDefault; + } // Only tabbed browsers and dev tools use the command line. bool use_command_line =
diff --git a/chrome/browser/ui/window_sizer/window_sizer.h b/chrome/browser/ui/window_sizer/window_sizer.h index e5fca1f..a0c709d 100644 --- a/chrome/browser/ui/window_sizer/window_sizer.h +++ b/chrome/browser/ui/window_sizer/window_sizer.h
@@ -17,7 +17,7 @@ namespace display { class Display; class Screen; -} +} // namespace display /////////////////////////////////////////////////////////////////////////////// // WindowSizer
diff --git a/chrome/browser/ui/window_sizer/window_sizer_chromeos.cc b/chrome/browser/ui/window_sizer/window_sizer_chromeos.cc index 487257a..ab28de9 100644 --- a/chrome/browser/ui/window_sizer/window_sizer_chromeos.cc +++ b/chrome/browser/ui/window_sizer/window_sizer_chromeos.cc
@@ -44,8 +44,9 @@ gfx::Rect* bounds, ui::mojom::WindowShowState* show_state) { // If we got *both* the bounds and show state, we're done. - if (GetBrowserBounds(bounds, show_state)) + if (GetBrowserBounds(bounds, show_state)) { return; + } // Fall back to cross-platform behavior. Note that |show_state| may have been // changed by the function above. @@ -58,8 +59,9 @@ // Let apps set their own default. if (browser() && browser()->app_controller()) { gfx::Rect bounds = browser()->app_controller()->GetDefaultBounds(); - if (!bounds.IsEmpty()) + if (!bounds.IsEmpty()) { return bounds; + } } const gfx::Rect work_area = display.work_area(); @@ -82,8 +84,9 @@ bool WindowSizerChromeOS::GetBrowserBounds( gfx::Rect* bounds, ui::mojom::WindowShowState* show_state) const { - if (!browser()) + if (!browser()) { return false; + } // This should not be called on a Browser that already has a window. DCHECK(!browser()->window()); @@ -151,8 +154,9 @@ bool is_saved_bounds = GetSavedWindowBounds(bounds_in_screen, show_state); display::Display display = GetDisplayForNewWindow(*bounds_in_screen); - if (!is_saved_bounds) + if (!is_saved_bounds) { *bounds_in_screen = GetDefaultWindowBounds(display); + } base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); if (browser()->is_session_restore()) {
diff --git a/chrome/browser/ui/window_sizer/window_sizer_chromeos_unittest.cc b/chrome/browser/ui/window_sizer/window_sizer_chromeos_unittest.cc index 50e7fff..82802b4 100644 --- a/chrome/browser/ui/window_sizer/window_sizer_chromeos_unittest.cc +++ b/chrome/browser/ui/window_sizer/window_sizer_chromeos_unittest.cc
@@ -90,10 +90,12 @@ ui::mojom::WindowShowState* out_show_state) { DCHECK(out_show_state); auto provider = std::make_unique<TestStateProvider>(); - if (source == PERSISTED || source == BOTH) + if (source == PERSISTED || source == BOTH) { provider->SetPersistentState(bounds, work_area, show_state_persisted); - if (source == LAST_ACTIVE || source == BOTH) + } + if (source == LAST_ACTIVE || source == BOTH) { provider->SetLastActiveState(bounds, show_state_last); + } WindowSizer::GetBrowserWindowBoundsAndShowState( std::move(provider), passed_in, browser, out_bounds, out_show_state); @@ -131,8 +133,9 @@ std::unique_ptr<Browser> CreateTestBrowser(aura::Window* window, const gfx::Rect& bounds, Browser::CreateParams* params) { - if (!bounds.IsEmpty()) + if (!bounds.IsEmpty()) { window->SetBounds(bounds); + } std::unique_ptr<Browser> browser = chrome::CreateBrowserWithAuraTestWindowForParams(base::WrapUnique(window), params);
diff --git a/chrome/browser/ui/window_sizer/window_sizer_common_unittest.cc b/chrome/browser/ui/window_sizer/window_sizer_common_unittest.cc index 95851dcf..9565f583 100644 --- a/chrome/browser/ui/window_sizer/window_sizer_common_unittest.cc +++ b/chrome/browser/ui/window_sizer/window_sizer_common_unittest.cc
@@ -41,8 +41,7 @@ display::Screen::SetScreenInstance(previous_screen_); } - void AddDisplay(const gfx::Rect& bounds, - const gfx::Rect& work_area) { + void AddDisplay(const gfx::Rect& bounds, const gfx::Rect& work_area) { const int num_displays = GetNumDisplays(); display::Display display(num_displays, bounds); display.set_work_area(work_area); @@ -147,16 +146,19 @@ test_screen.AddDisplay(monitor1_bounds_, monitor1_work_area_.IsEmpty() ? monitor1_bounds_ : monitor1_work_area_); - if (!monitor2_bounds_.IsEmpty()) + if (!monitor2_bounds_.IsEmpty()) { test_screen.AddDisplay(monitor2_bounds_, monitor2_bounds_); + } auto provider = std::make_unique<TestStateProvider>(); - if (!persisted_bounds_.IsEmpty() || !persisted_work_area_.IsEmpty()) + if (!persisted_bounds_.IsEmpty() || !persisted_work_area_.IsEmpty()) { provider->SetPersistentState(persisted_bounds_, persisted_work_area_, ui::mojom::WindowShowState::kDefault); - if (!last_active_bounds_.IsEmpty()) + } + if (!last_active_bounds_.IsEmpty()) { provider->SetLastActiveState(last_active_bounds_, ui::mojom::WindowShowState::kDefault); + } ui::mojom::WindowShowState ignored; gfx::Rect out_bounds; @@ -173,7 +175,7 @@ // all Ash-specific logic, so there's no point running this on Chrome OS. TEST(WindowSizerTestCommon, PersistedWindowOffscreenWithNonAggressiveRepositioning) { - { // off the left but the minimum visibility condition is barely satisfied + { // off the left but the minimum visibility condition is barely satisfied // without relocaiton. gfx::Rect initial_bounds(-470, 50, 500, 400); @@ -184,7 +186,7 @@ EXPECT_EQ(initial_bounds.ToString(), window_bounds.ToString()); } - { // off the left and the minimum visibility condition is satisfied by + { // off the left and the minimum visibility condition is satisfied by // relocation. gfx::Rect window_bounds = WindowSizerTestUtil() @@ -195,7 +197,7 @@ window_bounds.ToString()); } - { // off the top + { // off the top gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) @@ -204,7 +206,7 @@ EXPECT_EQ("50,0 500x400", window_bounds.ToString()); } - { // off the right but the minimum visibility condition is barely satisified + { // off the right but the minimum visibility condition is barely satisified // without relocation. gfx::Rect initial_bounds(994, 50, 500, 400); gfx::Rect window_bounds = WindowSizerTestUtil() @@ -214,7 +216,7 @@ EXPECT_EQ(initial_bounds.ToString(), window_bounds.ToString()); } - { // off the right and the minimum visibility condition is satisified by + { // off the right and the minimum visibility condition is satisified by // relocation. gfx::Rect window_bounds = WindowSizerTestUtil() @@ -225,7 +227,7 @@ window_bounds.ToString()); } - { // off the bottom but the minimum visibility condition is barely satisified + { // off the bottom but the minimum visibility condition is barely satisified // without relocation. gfx::Rect initial_bounds(50, 738, 500, 400); gfx::Rect window_bounds = WindowSizerTestUtil() @@ -235,7 +237,7 @@ EXPECT_EQ(initial_bounds.ToString(), window_bounds.ToString()); } - { // off the bottom and the minimum visibility condition is satisified by + { // off the bottom and the minimum visibility condition is satisified by // relocation. gfx::Rect window_bounds = WindowSizerTestUtil() @@ -246,7 +248,7 @@ window_bounds.ToString()); } - { // off the topleft + { // off the topleft gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) @@ -256,7 +258,7 @@ window_bounds.ToString()); } - { // off the topright and the minimum visibility condition is satisified by + { // off the topright and the minimum visibility condition is satisified by // relocation. gfx::Rect window_bounds = WindowSizerTestUtil() @@ -267,35 +269,32 @@ window_bounds.ToString()); } - { // off the bottomleft and the minimum visibility condition is satisified by + { // off the bottomleft and the minimum visibility condition is satisified by // relocation. gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) .WithPersistedBounds(gfx::Rect(-471, 739, 500, 400)) .GetWindowBounds(); - EXPECT_EQ(gfx::Rect(-470 /* not -471 */, - 738 /* not 739 */, - 500, - 400).ToString(), - window_bounds.ToString()); + EXPECT_EQ( + gfx::Rect(-470 /* not -471 */, 738 /* not 739 */, 500, 400).ToString(), + window_bounds.ToString()); } - { // off the bottomright and the minimum visibility condition is satisified by + { // off the bottomright and the minimum visibility condition is satisified + // by // relocation. gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) .WithPersistedBounds(gfx::Rect(995, 739, 500, 400)) .GetWindowBounds(); - EXPECT_EQ(gfx::Rect(994 /* not 995 */, - 738 /* not 739 */, - 500, - 400).ToString(), - window_bounds.ToString()); + EXPECT_EQ( + gfx::Rect(994 /* not 995 */, 738 /* not 739 */, 500, 400).ToString(), + window_bounds.ToString()); } - { // entirely off left + { // entirely off left gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) @@ -305,7 +304,7 @@ window_bounds.ToString()); } - { // entirely off left (monitor was detached since last run) + { // entirely off left (monitor was detached since last run) gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) @@ -315,7 +314,7 @@ EXPECT_EQ("0,50 500x400", window_bounds.ToString()); } - { // entirely off top + { // entirely off top gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) @@ -324,7 +323,7 @@ EXPECT_EQ("50,0 500x400", window_bounds.ToString()); } - { // entirely off top (monitor was detached since last run) + { // entirely off top (monitor was detached since last run) gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) @@ -334,7 +333,7 @@ EXPECT_EQ("50,0 500x400", window_bounds.ToString()); } - { // entirely off right + { // entirely off right gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) @@ -344,7 +343,7 @@ window_bounds.ToString()); } - { // entirely off right (monitor was detached since last run) + { // entirely off right (monitor was detached since last run) gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) @@ -354,7 +353,7 @@ EXPECT_EQ("524,50 500x400", window_bounds.ToString()); } - { // entirely off bottom + { // entirely off bottom gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) @@ -364,7 +363,7 @@ window_bounds.ToString()); } - { // entirely off bottom (monitor was detached since last run) + { // entirely off bottom (monitor was detached since last run) gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) @@ -379,7 +378,7 @@ // Test that the window is sized appropriately for the first run experience // where the default window bounds calculation is invoked. TEST(WindowSizerTestCommon, AdjustFitSize) { - { // Check that the window gets resized to the screen. + { // Check that the window gets resized to the screen. gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) @@ -388,7 +387,7 @@ EXPECT_EQ("0,0 1024x768", window_bounds.ToString()); } - { // Check that a window which hangs out of the screen get moved back in. + { // Check that a window which hangs out of the screen get moved back in. gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768)
diff --git a/chrome/browser/ui/window_sizer/window_sizer_mac.mm b/chrome/browser/ui/window_sizer/window_sizer_mac.mm index aac3787..bcf87ec7 100644 --- a/chrome/browser/ui/window_sizer/window_sizer_mac.mm +++ b/chrome/browser/ui/window_sizer/window_sizer_mac.mm
@@ -26,16 +26,16 @@ NSRect window_frame = [window frame]; // Limit to not overflow the work area right and bottom edges. - NSPoint limit = NSMakePoint( - std::min(NSMinX(window_frame) + kWindowTilePixels, - NSMaxX(work_area) - size.width()), - std::max(NSMaxY(window_frame) - kWindowTilePixels, - NSMinY(work_area) + size.height())); + NSPoint limit = + NSMakePoint(std::min(NSMinX(window_frame) + kWindowTilePixels, + NSMaxX(work_area) - size.width()), + std::max(NSMaxY(window_frame) - kWindowTilePixels, + NSMinY(work_area) + size.height())); // Adjust corner to now overflow the work area left and top edges, so // that if a popup does not fit the title-bar is remains visible. - corner = NSMakePoint(std::max(corner.x, limit.x), - std::min(corner.y, limit.y)); + corner = + NSMakePoint(std::max(corner.x, limit.x), std::min(corner.y, limit.y)); } return gfx::Point(corner.x, NSHeight(main_area) - corner.y);
diff --git a/chrome/browser/ui/window_sizer/window_sizer_unittest.cc b/chrome/browser/ui/window_sizer/window_sizer_unittest.cc index f9075f46..8b1cc969 100644 --- a/chrome/browser/ui/window_sizer/window_sizer_unittest.cc +++ b/chrome/browser/ui/window_sizer/window_sizer_unittest.cc
@@ -2,10 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/window_sizer/window_sizer_common_unittest.h" - #include "base/compiler_specific.h" #include "build/build_config.h" +#include "chrome/browser/ui/window_sizer/window_sizer_common_unittest.h" #include "testing/gtest/include/gtest/gtest.h" namespace { @@ -15,52 +14,52 @@ // Test that the window is sized appropriately for the first run experience // where the default window bounds calculation is invoked. TEST(WindowSizerTest, DefaultSizeCase) { - { // 4:3 monitor case, 1024x768, no taskbar + { // 4:3 monitor case, 1024x768, no taskbar gfx::Rect window_bounds = WindowSizerTestUtil().WithMonitorBounds(p1024x768).GetWindowBounds(); - EXPECT_EQ(gfx::Rect(kWindowTilePixels, kWindowTilePixels, - 1024 - kWindowTilePixels * 2, - 768 - kWindowTilePixels * 2), - window_bounds); + EXPECT_EQ( + gfx::Rect(kWindowTilePixels, kWindowTilePixels, + 1024 - kWindowTilePixels * 2, 768 - kWindowTilePixels * 2), + window_bounds); } - { // 4:3 monitor case, 1024x768, taskbar on bottom + { // 4:3 monitor case, 1024x768, taskbar on bottom gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) .WithMonitorWorkArea(taskbar_bottom_work_area) .GetWindowBounds(); - EXPECT_EQ(gfx::Rect(kWindowTilePixels, kWindowTilePixels, - 1024 - kWindowTilePixels * 2, - (taskbar_bottom_work_area.height() - - kWindowTilePixels * 2)), - window_bounds); + EXPECT_EQ( + gfx::Rect(kWindowTilePixels, kWindowTilePixels, + 1024 - kWindowTilePixels * 2, + (taskbar_bottom_work_area.height() - kWindowTilePixels * 2)), + window_bounds); } - { // 4:3 monitor case, 1024x768, taskbar on right + { // 4:3 monitor case, 1024x768, taskbar on right gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) .WithMonitorWorkArea(taskbar_right_work_area) .GetWindowBounds(); EXPECT_EQ(gfx::Rect(kWindowTilePixels, kWindowTilePixels, - taskbar_right_work_area.width() - kWindowTilePixels*2, + taskbar_right_work_area.width() - kWindowTilePixels * 2, 768 - kWindowTilePixels * 2), window_bounds); } - { // 4:3 monitor case, 1024x768, taskbar on left + { // 4:3 monitor case, 1024x768, taskbar on left gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) .WithMonitorWorkArea(taskbar_left_work_area) .GetWindowBounds(); - EXPECT_EQ(gfx::Rect(taskbar_left_work_area.x() + kWindowTilePixels, - kWindowTilePixels, - taskbar_left_work_area.width() - kWindowTilePixels * 2, - (taskbar_left_work_area.height() - - kWindowTilePixels * 2)), - window_bounds); + EXPECT_EQ( + gfx::Rect(taskbar_left_work_area.x() + kWindowTilePixels, + kWindowTilePixels, + taskbar_left_work_area.width() - kWindowTilePixels * 2, + (taskbar_left_work_area.height() - kWindowTilePixels * 2)), + window_bounds); } - { // 4:3 monitor case, 1024x768, taskbar on top + { // 4:3 monitor case, 1024x768, taskbar on top gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) .WithMonitorWorkArea(taskbar_top_work_area) @@ -72,7 +71,7 @@ window_bounds); } - { // 4:3 monitor case, 1280x1024 + { // 4:3 monitor case, 1280x1024 gfx::Rect window_bounds = WindowSizerTestUtil().WithMonitorBounds(p1280x1024).GetWindowBounds(); EXPECT_EQ(gfx::Rect(kWindowTilePixels, kWindowTilePixels, @@ -81,7 +80,7 @@ window_bounds); } - { // 4:3 monitor case, 1600x1200 + { // 4:3 monitor case, 1600x1200 gfx::Rect window_bounds = WindowSizerTestUtil().WithMonitorBounds(p1600x1200).GetWindowBounds(); EXPECT_EQ(gfx::Rect(kWindowTilePixels, kWindowTilePixels, @@ -130,18 +129,18 @@ // Test that the next opened window is positioned appropriately given the // bounds of an existing window of the same type. TEST(WindowSizerTest, LastWindowBoundsCase) { - { // normal, in the middle of the screen somewhere. + { // normal, in the middle of the screen somewhere. gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) .WithLastActiveBounds( gfx::Rect(kWindowTilePixels, kWindowTilePixels, 500, 400)) .GetWindowBounds(); - EXPECT_EQ(gfx::Rect(kWindowTilePixels * 2, - kWindowTilePixels * 2, 500, 400), window_bounds); + EXPECT_EQ(gfx::Rect(kWindowTilePixels * 2, kWindowTilePixels * 2, 500, 400), + window_bounds); } - { // taskbar on top. + { // taskbar on top. gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) @@ -149,10 +148,11 @@ .WithLastActiveBounds( gfx::Rect(kWindowTilePixels, kWindowTilePixels, 500, 400)) .GetWindowBounds(); - EXPECT_EQ(gfx::Rect(kWindowTilePixels * 2, - std::max(kWindowTilePixels * 2, - 34 /* toolbar height */), - 500, 400), window_bounds); + EXPECT_EQ( + gfx::Rect(kWindowTilePixels * 2, + std::max(kWindowTilePixels * 2, 34 /* toolbar height */), 500, + 400), + window_bounds); } { // Too small to satisfy the minimum visibility condition. @@ -162,17 +162,15 @@ .WithLastActiveBounds( gfx::Rect(kWindowTilePixels, kWindowTilePixels, 29, 29)) .GetWindowBounds(); - EXPECT_EQ(gfx::Rect(kWindowTilePixels * 2, - kWindowTilePixels * 2, - 30 /* not 29 */, - 30 /* not 29 */), + EXPECT_EQ(gfx::Rect(kWindowTilePixels * 2, kWindowTilePixels * 2, + 30 /* not 29 */, 30 /* not 29 */), window_bounds); } } // Test that the window opened is sized appropriately given persisted sizes. TEST(WindowSizerTest, PersistedBoundsCase) { - { // normal, in the middle of the screen somewhere. + { // normal, in the middle of the screen somewhere. gfx::Rect initial_bounds(kWindowTilePixels, kWindowTilePixels, 500, 400); gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) @@ -181,7 +179,7 @@ EXPECT_EQ(initial_bounds.ToString(), window_bounds.ToString()); } - { // Normal. + { // Normal. gfx::Rect initial_bounds(0, 0, 1024, 768); gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) @@ -190,7 +188,7 @@ EXPECT_EQ(initial_bounds.ToString(), window_bounds.ToString()); } - { // normal, on non-primary monitor in negative coords. + { // normal, on non-primary monitor in negative coords. gfx::Rect initial_bounds(-600, 10, 500, 400); gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768, left_s1024x768) @@ -199,7 +197,7 @@ EXPECT_EQ(initial_bounds.ToString(), window_bounds.ToString()); } - { // normal, on non-primary monitor in negative coords. + { // normal, on non-primary monitor in negative coords. gfx::Rect initial_bounds(-1024, 0, 1024, 768); gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768, left_s1024x768) @@ -234,7 +232,7 @@ EXPECT_EQ("1224,50 600x500", window_bounds.ToString()); } - { // Non-primary monitor resoultion has changed, and the window is now too + { // Non-primary monitor resoultion has changed, and the window is now too // large for the monitor. gfx::Rect initial_bounds(1274, 50, 900, 700); @@ -247,20 +245,20 @@ EXPECT_EQ("1024,0 800x600", window_bounds.ToString()); } - { // width and height too small + { // width and height too small gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) .WithPersistedBounds( gfx::Rect(kWindowTilePixels, kWindowTilePixels, 29, 29)) .GetWindowBounds(); - EXPECT_EQ(gfx::Rect(kWindowTilePixels, kWindowTilePixels, - 30 /* not 29 */, 30 /* not 29 */), + EXPECT_EQ(gfx::Rect(kWindowTilePixels, kWindowTilePixels, 30 /* not 29 */, + 30 /* not 29 */), window_bounds); } #if BUILDFLAG(IS_MAC) - { // Saved state is too tall to possibly be resized. Mac resizers + { // Saved state is too tall to possibly be resized. Mac resizers // are at the bottom of the window, and no piece of a window can // be moved higher than the menubar. (Perhaps the user changed // resolution to something smaller before relaunching Chrome?) @@ -310,7 +308,7 @@ #if BUILDFLAG(IS_MAC) TEST(WindowSizerTest, LastWindowOffscreenWithAggressiveRepositioning) { - { // taskbar on left. The new window overlaps slightly with the taskbar, so + { // taskbar on left. The new window overlaps slightly with the taskbar, so // it is moved to be flush with the left edge of the work area. gfx::Rect window_bounds = WindowSizerTestUtil() @@ -319,49 +317,47 @@ .WithLastActiveBounds( gfx::Rect(kWindowTilePixels, kWindowTilePixels, 500, 400)) .GetWindowBounds(); - EXPECT_EQ(gfx::Rect(taskbar_left_work_area.x(), - kWindowTilePixels * 2, 500, 400), window_bounds); + EXPECT_EQ( + gfx::Rect(taskbar_left_work_area.x(), kWindowTilePixels * 2, 500, 400), + window_bounds); } - { // offset would put the new window offscreen at the bottom + { // offset would put the new window offscreen at the bottom gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) .WithLastActiveBounds(gfx::Rect(10, 729, 500, 400)) .GetWindowBounds(); EXPECT_EQ(gfx::Rect(10 + kWindowTilePixels, - 0 /* not 729 + kWindowTilePixels */, - 500, 400), + 0 /* not 729 + kWindowTilePixels */, 500, 400), window_bounds); } - { // offset would put the new window offscreen at the right + { // offset would put the new window offscreen at the right gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) .WithLastActiveBounds(gfx::Rect(985, 10, 500, 400)) .GetWindowBounds(); EXPECT_EQ(gfx::Rect(0 /* not 985 + kWindowTilePixels*/, - 10 + kWindowTilePixels, - 500, 400), + 10 + kWindowTilePixels, 500, 400), window_bounds); } - { // offset would put the new window offscreen at the bottom right + { // offset would put the new window offscreen at the bottom right gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) .WithLastActiveBounds(gfx::Rect(985, 729, 500, 400)) .GetWindowBounds(); EXPECT_EQ(gfx::Rect(0 /* not 985 + kWindowTilePixels*/, - 0 /* not 729 + kWindowTilePixels*/, - 500, 400), + 0 /* not 729 + kWindowTilePixels*/, 500, 400), window_bounds); } } TEST(WindowSizerTest, PersistedWindowOffscreenWithAggressiveRepositioning) { - { // off the left + { // off the left gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) @@ -370,7 +366,7 @@ EXPECT_EQ(gfx::Rect(0 /* not -471 */, 50, 500, 400), window_bounds); } - { // off the top + { // off the top gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) @@ -379,7 +375,7 @@ EXPECT_EQ(gfx::Rect(50, 0, 500, 400), window_bounds); } - { // off the right + { // off the right gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) @@ -388,7 +384,7 @@ EXPECT_EQ(gfx::Rect(0 /* not 995 */, 50, 500, 400), window_bounds); } - { // off the bottom + { // off the bottom gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) @@ -397,7 +393,7 @@ EXPECT_EQ(gfx::Rect(50, 0 /* not 739 */, 500, 400), window_bounds); } - { // off the topleft + { // off the topleft gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) @@ -407,37 +403,37 @@ window_bounds); } - { // off the topright + { // off the topright gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) .WithPersistedBounds(gfx::Rect(995, -371, 500, 400)) .GetWindowBounds(); EXPECT_EQ(gfx::Rect(0 /* not 995 */, 0 /* not -371 */, 500, 400), - window_bounds); + window_bounds); } - { // off the bottomleft + { // off the bottomleft gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) .WithPersistedBounds(gfx::Rect(-471, 739, 500, 400)) .GetWindowBounds(); EXPECT_EQ(gfx::Rect(0 /* not -471 */, 0 /* not 739 */, 500, 400), - window_bounds); + window_bounds); } - { // off the bottomright + { // off the bottomright gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) .WithPersistedBounds(gfx::Rect(995, 739, 500, 400)) .GetWindowBounds(); EXPECT_EQ(gfx::Rect(0 /* not 995 */, 0 /* not 739 */, 500, 400), - window_bounds); + window_bounds); } - { // entirely off left + { // entirely off left gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) @@ -446,7 +442,7 @@ EXPECT_EQ(gfx::Rect(0 /* not -700 */, 50, 500, 400), window_bounds); } - { // entirely off left (monitor was detached since last run) + { // entirely off left (monitor was detached since last run) gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) @@ -456,7 +452,7 @@ EXPECT_EQ(gfx::Rect(0, 50, 500, 400), window_bounds); } - { // entirely off top + { // entirely off top gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) @@ -465,7 +461,7 @@ EXPECT_EQ(gfx::Rect(50, 0, 500, 400), window_bounds); } - { // entirely off top (monitor was detached since last run) + { // entirely off top (monitor was detached since last run) gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) @@ -475,7 +471,7 @@ EXPECT_EQ(gfx::Rect(50, 0, 500, 400), window_bounds); } - { // entirely off right + { // entirely off right gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) @@ -484,7 +480,7 @@ EXPECT_EQ(gfx::Rect(0 /* not 1200 */, 50, 500, 400), window_bounds); } - { // entirely off right (monitor was detached since last run) + { // entirely off right (monitor was detached since last run) gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) @@ -494,7 +490,7 @@ EXPECT_EQ(gfx::Rect(524 /* not 1200 */, 50, 500, 400), window_bounds); } - { // entirely off bottom + { // entirely off bottom gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) @@ -503,7 +499,7 @@ EXPECT_EQ(gfx::Rect(50, 0 /* not 800 */, 500, 400), window_bounds); } - { // entirely off bottom (monitor was detached since last run) + { // entirely off bottom (monitor was detached since last run) gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) @@ -513,7 +509,7 @@ EXPECT_EQ(gfx::Rect(50, 368 /* not 800 */, 500, 400), window_bounds); } - { // wider than the screen. off both the left and right + { // wider than the screen. off both the left and right gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) @@ -524,7 +520,7 @@ } #else TEST(WindowSizerTest, LastWindowOffscreenWithNonAggressiveRepositioning) { - { // taskbar on left. + { // taskbar on left. gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) @@ -532,24 +528,23 @@ .WithLastActiveBounds( gfx::Rect(kWindowTilePixels, kWindowTilePixels, 500, 400)) .GetWindowBounds(); - EXPECT_EQ(gfx::Rect(kWindowTilePixels * 2, - kWindowTilePixels * 2, 500, 400), window_bounds); + EXPECT_EQ(gfx::Rect(kWindowTilePixels * 2, kWindowTilePixels * 2, 500, 400), + window_bounds); } // Linux does not tile windows, so tile adjustment tests don't make sense. #if !BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_MAC) - { // offset would put the new window offscreen at the bottom but the minimum + { // offset would put the new window offscreen at the bottom but the minimum // visibility condition is barely satisfied without relocation. gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) .WithLastActiveBounds(gfx::Rect(10, 728, 500, 400)) .GetWindowBounds(); - EXPECT_EQ(gfx::Rect(10 + kWindowTilePixels, 738, - 500, 400), window_bounds); + EXPECT_EQ(gfx::Rect(10 + kWindowTilePixels, 738, 500, 400), window_bounds); } - { // offset would put the new window offscreen at the bottom and the minimum + { // offset would put the new window offscreen at the bottom and the minimum // visibility condition is satisfied by relocation. gfx::Rect window_bounds = WindowSizerTestUtil() @@ -560,7 +555,7 @@ window_bounds); } - { // offset would put the new window offscreen at the right but the minimum + { // offset would put the new window offscreen at the right but the minimum // visibility condition is barely satisfied without relocation. gfx::Rect window_bounds = WindowSizerTestUtil() @@ -570,18 +565,18 @@ EXPECT_EQ(gfx::Rect(994, 10 + kWindowTilePixels, 500, 400), window_bounds); } - { // offset would put the new window offscreen at the right and the minimum + { // offset would put the new window offscreen at the right and the minimum // visibility condition is satisfied by relocation. gfx::Rect window_bounds = WindowSizerTestUtil() .WithMonitorBounds(p1024x768) .WithLastActiveBounds(gfx::Rect(985, 10, 500, 400)) .GetWindowBounds(); - EXPECT_EQ(gfx::Rect(994 /* not 995 */, 10 + kWindowTilePixels, - 500, 400), window_bounds); + EXPECT_EQ(gfx::Rect(994 /* not 995 */, 10 + kWindowTilePixels, 500, 400), + window_bounds); } - { // offset would put the new window offscreen at the bottom right and the + { // offset would put the new window offscreen at the bottom right and the // minimum visibility condition is satisfied by relocation. gfx::Rect window_bounds = WindowSizerTestUtil()
diff --git a/chrome/browser/ui/zoom/chrome_zoom_level_otr_delegate.cc b/chrome/browser/ui/zoom/chrome_zoom_level_otr_delegate.cc index ffd2cf2..8d295484c 100644 --- a/chrome/browser/ui/zoom/chrome_zoom_level_otr_delegate.cc +++ b/chrome/browser/ui/zoom/chrome_zoom_level_otr_delegate.cc
@@ -30,6 +30,7 @@ // If there's a manager to aggregate ZoomLevelChanged events, pass this event // along. Since we already hold a subscription from our associated // HostZoomMap, we don't need to create a separate subscription for this. - if (zoom_event_manager_) + if (zoom_event_manager_) { zoom_event_manager_->OnZoomLevelChanged(change); + } }
diff --git a/chrome/browser/ui/zoom/chrome_zoom_level_prefs.cc b/chrome/browser/ui/zoom/chrome_zoom_level_prefs.cc index 50fadfa..726a3892 100644 --- a/chrome/browser/ui/zoom/chrome_zoom_level_prefs.cc +++ b/chrome/browser/ui/zoom/chrome_zoom_level_prefs.cc
@@ -48,8 +48,9 @@ std::string timestamp_str; const std::string* timestamp_str_ptr = dictionary.FindString(kLastModifiedPath); - if (timestamp_str_ptr) + if (timestamp_str_ptr) { timestamp_str = *timestamp_str_ptr; + } int64_t timestamp = 0; base::StringToInt64(timestamp_str, ×tamp); base::Time last_modified = base::Time::FromInternalValue(timestamp); @@ -94,8 +95,9 @@ // set this manually. host_zoom_map_->SetDefaultZoomLevel(level); default_zoom_changed_callbacks_.Notify(); - if (zoom_event_manager_) + if (zoom_event_manager_) { zoom_event_manager_->OnDefaultZoomLevelChanged(); + } } double ChromeZoomLevelPrefs::GetDefaultZoomLevelPref() const { @@ -115,11 +117,13 @@ // If there's a manager to aggregate ZoomLevelChanged events, pass this event // along. Since we already hold a subscription to our associated HostZoomMap, // we don't need to create a separate subscription for this. - if (zoom_event_manager_) + if (zoom_event_manager_) { zoom_event_manager_->OnZoomLevelChanged(change); + } - if (change.mode != content::HostZoomMap::ZOOM_CHANGED_FOR_HOST) + if (change.mode != content::HostZoomMap::ZOOM_CHANGED_FOR_HOST) { return; + } double level = change.zoom_level; ScopedDictPrefUpdate update(pref_service_, prefs::kPartitionPerHostZoomLevels); @@ -192,8 +196,9 @@ // per-host zoom level dictionaries is different from the legacy profile // per-host zoom level dictionaries, the following code will fail if run // on the legacy dictionaries. - if (!sanitize_partition_host_zoom_levels) + if (!sanitize_partition_host_zoom_levels) { return; + } // Sanitize prefs to remove entries that match the default zoom level and/or // have an empty host. @@ -203,8 +208,9 @@ base::Value::Dict& host_zoom_dictionaries = update.Get(); base::Value::Dict* partition_dictionary = host_zoom_dictionaries.FindDict(partition_key_); - for (const std::string& s : keys_to_remove) + for (const std::string& s : keys_to_remove) { partition_dictionary->Remove(s); + } } }
diff --git a/chrome/browser/ui/zoom/zoom_controller_browsertest.cc b/chrome/browser/ui/zoom/zoom_controller_browsertest.cc index a02cc0e..0f842e49 100644 --- a/chrome/browser/ui/zoom/zoom_controller_browsertest.cc +++ b/chrome/browser/ui/zoom/zoom_controller_browsertest.cc
@@ -119,11 +119,8 @@ // Since this page uses the default zoom level, the changes to the default // zoom level will change the zoom level for this web_contents. ZoomController::ZoomChangedEventData zoom_change_data( - web_contents, - new_default_zoom_level, - new_default_zoom_level, - ZoomController::ZOOM_MODE_DEFAULT, - false); + web_contents, new_default_zoom_level, new_default_zoom_level, + ZoomController::ZOOM_MODE_DEFAULT, false); ZoomChangedWatcher zoom_change_watcher(web_contents, zoom_change_data); // TODO(wjmaclean): Convert this to call partition-specific zoom level prefs // when they become available. @@ -214,9 +211,7 @@ // When the event is initiated from HostZoomMap, the old zoom level is not // available. ZoomController::ZoomChangedEventData zoom_change_data( - web_contents, - new_zoom_level, - new_zoom_level, + web_contents, new_zoom_level, new_zoom_level, ZoomController::ZOOM_MODE_DEFAULT, false); // The ZoomController did not initiate, so this will be 'false'. ZoomChangedWatcher zoom_change_watcher(web_contents, zoom_change_data); @@ -241,11 +236,8 @@ zoom_controller->SetZoomLevel(new_zoom_level); ZoomController::ZoomChangedEventData zoom_change_data( - web_contents, - new_zoom_level, - default_zoom_level, - ZoomController::ZOOM_MODE_DISABLED, - true); + web_contents, new_zoom_level, default_zoom_level, + ZoomController::ZOOM_MODE_DISABLED, true); ZoomChangedWatcher zoom_change_watcher(web_contents, zoom_change_data); zoom_controller->SetZoomMode(ZoomController::ZOOM_MODE_DISABLED); zoom_change_watcher.Wait(); @@ -386,9 +378,7 @@ double new_zoom_level = old_zoom_level + 0.5; ZoomController::ZoomChangedEventData zoom_change_data( - web_contents, - old_zoom_level, - new_zoom_level, + web_contents, old_zoom_level, new_zoom_level, ZoomController::ZOOM_MODE_DEFAULT, true); // We have a non-empty host, so this will be 'true'. ZoomChangedWatcher zoom_change_watcher(web_contents, zoom_change_data);
diff --git a/chrome/browser/ui/zoom/zoom_controller_unittest.cc b/chrome/browser/ui/zoom/zoom_controller_unittest.cc index 83e1266..8a194b1 100644 --- a/chrome/browser/ui/zoom/zoom_controller_unittest.cc +++ b/chrome/browser/ui/zoom/zoom_controller_unittest.cc
@@ -48,10 +48,7 @@ TEST_F(ZoomControllerTest, DidNavigateMainFrame) { double zoom_level = zoom_controller_->GetZoomLevel(); ZoomController::ZoomChangedEventData zoom_change_data( - web_contents(), - zoom_level, - zoom_level, - ZoomController::ZOOM_MODE_DEFAULT, + web_contents(), zoom_level, zoom_level, ZoomController::ZOOM_MODE_DEFAULT, false); ZoomChangedWatcher zoom_change_watcher(zoom_controller_.get(), zoom_change_data); @@ -81,11 +78,8 @@ } ZoomController::ZoomChangedEventData zoom_change_data2( - web_contents(), - old_zoom_level, - new_zoom_level, - ZoomController::ZOOM_MODE_ISOLATED, - true /* can_show_bubble */); + web_contents(), old_zoom_level, new_zoom_level, + ZoomController::ZOOM_MODE_ISOLATED, true /* can_show_bubble */); { ZoomChangedWatcher zoom_change_watcher2(zoom_controller_.get(), @@ -104,11 +98,8 @@ zoom_controller_->SetZoomMode(zoom::ZoomController::ZOOM_MODE_MANUAL); // By default, the zoom controller will send 'true' for can_show_bubble. ZoomController::ZoomChangedEventData zoom_change_data1( - web_contents(), - old_zoom_level, - new_zoom_level1, - ZoomController::ZOOM_MODE_MANUAL, - true /* can_show_bubble */); + web_contents(), old_zoom_level, new_zoom_level1, + ZoomController::ZOOM_MODE_MANUAL, true /* can_show_bubble */); { ZoomChangedWatcher zoom_change_watcher1(zoom_controller_.get(), zoom_change_data1); @@ -119,16 +110,12 @@ // Override default and verify the subsequent event reflects this change. zoom_controller_->SetShowsNotificationBubble(false); ZoomController::ZoomChangedEventData zoom_change_data2( - web_contents(), - new_zoom_level1, - new_zoom_level2, - ZoomController::ZOOM_MODE_MANUAL, - false /* can_show_bubble */); + web_contents(), new_zoom_level1, new_zoom_level2, + ZoomController::ZOOM_MODE_MANUAL, false /* can_show_bubble */); { ZoomChangedWatcher zoom_change_watcher2(zoom_controller_.get(), zoom_change_data2); zoom_controller_->SetZoomLevel(new_zoom_level2); zoom_change_watcher2.Wait(); } - }
diff --git a/chrome/build/android-arm32.pgo.txt b/chrome/build/android-arm32.pgo.txt index d8fe6cf..7a73ca2 100644 --- a/chrome/build/android-arm32.pgo.txt +++ b/chrome/build/android-arm32.pgo.txt
@@ -1 +1 @@ -chrome-android32-main-1734753651-b23fabf8ebea0dcc7d56bead2c08c664f6e36e76-759122182116d7ecf34d21df3ffc79c276e85b26.profdata +chrome-android32-main-1734933580-dbe11371abf0a049093b5a99cbb2c7e0dd8e5e6e-8046f7fde6b872b9abbe3b2a743a74997eca6f41.profdata
diff --git a/chrome/build/android-arm64.pgo.txt b/chrome/build/android-arm64.pgo.txt index f1e5244..a7b3969a 100644 --- a/chrome/build/android-arm64.pgo.txt +++ b/chrome/build/android-arm64.pgo.txt
@@ -1 +1 @@ -chrome-android64-main-1734753651-a79954e005185818f3b9a6c180bdb2803acd25c6-759122182116d7ecf34d21df3ffc79c276e85b26.profdata +chrome-android64-main-1734928869-27ff8a3fdde3f4c6e3f7dda18a263f4fce8953ff-e7292ae95017855deb14ab60339b58723069357e.profdata
diff --git a/chrome/build/linux.pgo.txt b/chrome/build/linux.pgo.txt index 7e0be373..9e80a31f 100644 --- a/chrome/build/linux.pgo.txt +++ b/chrome/build/linux.pgo.txt
@@ -1 +1 @@ -chrome-linux-main-1734739051-53b7a1787415e05d8f77547f4bbc82f8aa4058ee-cfab8f0ac75e2fd2fad2f46c91a6d0d64b5a836a.profdata +chrome-linux-main-1734866726-4e705ce5f8c562084714e6641e11d10a73cee4d6-9a528ce44b9476db30a4492a1edbb452648ba7c3.profdata
diff --git a/chrome/build/mac-arm.pgo.txt b/chrome/build/mac-arm.pgo.txt index d1af226..5fc46947 100644 --- a/chrome/build/mac-arm.pgo.txt +++ b/chrome/build/mac-arm.pgo.txt
@@ -1 +1 @@ -chrome-mac-arm-main-1734753302-db964bd25c5490c208de0c32cfba0d9dd73170a2-988e6eae6751b1789b9a44c5b0c3ef31653be3dc.profdata +chrome-mac-arm-main-1734933580-df4dd37102c618dd38c4e836832ca7444c898426-8046f7fde6b872b9abbe3b2a743a74997eca6f41.profdata
diff --git a/chrome/build/mac.pgo.txt b/chrome/build/mac.pgo.txt index 094c5ea..6a3d85e 100644 --- a/chrome/build/mac.pgo.txt +++ b/chrome/build/mac.pgo.txt
@@ -1 +1 @@ -chrome-mac-main-1734739051-c39300c500b0f20a13ecbca70b3d7a463779ba43-cfab8f0ac75e2fd2fad2f46c91a6d0d64b5a836a.profdata +chrome-mac-main-1734911937-61284a9bfa40bbc5a8201863427ec56c163c2ac3-0937cb6714963e796b1d8b6256f4d8d191755934.profdata
diff --git a/chrome/build/win-arm64.pgo.txt b/chrome/build/win-arm64.pgo.txt index 109af17..6c77d72 100644 --- a/chrome/build/win-arm64.pgo.txt +++ b/chrome/build/win-arm64.pgo.txt
@@ -1 +1 @@ -chrome-win-arm64-main-1734717451-7bdc100bf2305982877753adefb75f2e544cac91-59b1c8501f4c46a54e4227b038d97732e2b17942.profdata +chrome-win-arm64-main-1734933580-ef6c01cb656d5afb316e1e73389cec87b8960a17-8046f7fde6b872b9abbe3b2a743a74997eca6f41.profdata
diff --git a/chrome/build/win32.pgo.txt b/chrome/build/win32.pgo.txt index 1f7935fc..68908581 100644 --- a/chrome/build/win32.pgo.txt +++ b/chrome/build/win32.pgo.txt
@@ -1 +1 @@ -chrome-win32-main-1734739051-a74cbbe62c7d071bc6c6fa7bca641609a009e2d0-cfab8f0ac75e2fd2fad2f46c91a6d0d64b5a836a.profdata +chrome-win32-main-1734911937-dfada901c73fc6aec6a0438bbdb5dfd5b31dab26-0937cb6714963e796b1d8b6256f4d8d191755934.profdata
diff --git a/chrome/build/win64.pgo.txt b/chrome/build/win64.pgo.txt index 59cf36d8..e3336c03 100644 --- a/chrome/build/win64.pgo.txt +++ b/chrome/build/win64.pgo.txt
@@ -1 +1 @@ -chrome-win64-main-1734739051-63454e5aa25e7ec8f429975087d80aa3d4a5ce6a-cfab8f0ac75e2fd2fad2f46c91a6d0d64b5a836a.profdata +chrome-win64-main-1734911937-7abb1ff93bc6b894c42445a825d58bdb45e6cee8-0937cb6714963e796b1d8b6256f4d8d191755934.profdata
diff --git a/chrome/test/chromedriver/net/pipe_connection_posix.cc b/chrome/test/chromedriver/net/pipe_connection_posix.cc index 3571aca..fe5988c3 100644 --- a/chrome/test/chromedriver/net/pipe_connection_posix.cc +++ b/chrome/test/chromedriver/net/pipe_connection_posix.cc
@@ -2,14 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/test/chromedriver/net/pipe_connection_posix.h" + #include "base/functional/callback_forward.h" #ifdef UNSAFE_BUFFERS_BUILD // TODO(crbug.com/40285824): Remove this and convert code to safer constructs. #pragma allow_unsafe_buffers #endif -#include "chrome/test/chromedriver/net/pipe_connection_posix.h" - +#include <list> #include <memory> #include <string>
diff --git a/chromecast/browser/cast_web_contents_impl.cc b/chromecast/browser/cast_web_contents_impl.cc index 5980346..a0b6cdd 100644 --- a/chromecast/browser/cast_web_contents_impl.cc +++ b/chromecast/browser/cast_web_contents_impl.cc
@@ -131,13 +131,6 @@ CastWebContentsImpl::CastWebContentsImpl(content::WebContents* web_contents, mojom::CastWebViewParamsPtr params) - : CastWebContentsImpl(web_contents, - std::move(params), - nullptr /* parent */) {} - -CastWebContentsImpl::CastWebContentsImpl(content::WebContents* web_contents, - mojom::CastWebViewParamsPtr params, - CastWebContents* parent) : web_contents_(web_contents), params_(std::move(params)), page_state_(PageState::IDLE), @@ -148,7 +141,6 @@ ? std::make_unique<CastMediaBlocker>(web_contents_) : nullptr), main_process_host_(nullptr), - parent_cast_web_contents_(parent), tab_id_(params_->is_root_window ? 0 : next_tab_id++), id_(next_id++), main_frame_loaded_(false), @@ -931,7 +923,7 @@ params->enabled_for_dev = params_->enabled_for_dev; params->background_color = params_->background_color; auto result = inner_contents_.insert(std::unique_ptr<CastWebContentsImpl>( - new CastWebContentsImpl(inner_web_contents, std::move(params), this))); + new CastWebContentsImpl(inner_web_contents, std::move(params)))); // Notifies remote observers. for (auto& observer : observers_) {
diff --git a/chromecast/browser/cast_web_contents_impl.h b/chromecast/browser/cast_web_contents_impl.h index e35d634e..4456fe6 100644 --- a/chromecast/browser/cast_web_contents_impl.h +++ b/chromecast/browser/cast_web_contents_impl.h
@@ -149,10 +149,6 @@ content::WebContentsObserver::MediaStoppedReason reason) override; private: - // Constructor used to create inner CastWebContents. - CastWebContentsImpl(content::WebContents* web_contents, - mojom::CastWebViewParamsPtr params, - CastWebContents* parent); void OnPageLoading(); void OnPageLoaded(); void UpdatePageState(); @@ -179,7 +175,6 @@ // Retained so that this observer can be removed before being destroyed: content::RenderProcessHost* main_process_host_; - CastWebContents* const parent_cast_web_contents_ = nullptr; base::flat_set<std::unique_ptr<CastWebContents>> inner_contents_; base::Value::Dict renderer_features_;
diff --git a/chromeos/CHROMEOS_LKGM b/chromeos/CHROMEOS_LKGM index 71cc9aa3..979865f 100644 --- a/chromeos/CHROMEOS_LKGM +++ b/chromeos/CHROMEOS_LKGM
@@ -1 +1 @@ -16134.0.0-1065535 \ No newline at end of file +16136.0.0-1065588 \ No newline at end of file
diff --git a/chromeos/strings/chromeos_strings_bs.xtb b/chromeos/strings/chromeos_strings_bs.xtb index ffcb723..0f458f2 100644 --- a/chromeos/strings/chromeos_strings_bs.xtb +++ b/chromeos/strings/chromeos_strings_bs.xtb
@@ -691,6 +691,7 @@ <translation id="4354430579665871434">tipka</translation> <translation id="4356100841225547054">Isključite zvuk</translation> <translation id="4361257691546579041">APN je zadana vrsta.</translation> +<translation id="4368101969572512692">Nasumični prijedlozi</translation> <translation id="437294888293595148">Poništi sve prečice</translation> <translation id="437477383107495720">Zečevi</translation> <translation id="4376423484621194274">Administrator ne dozvoljava zatvaranje aplikacije <ph name="APP_NAME" /></translation>
diff --git a/chromeos/strings/chromeos_strings_en-GB.xtb b/chromeos/strings/chromeos_strings_en-GB.xtb index d5606a7c..5716414 100644 --- a/chromeos/strings/chromeos_strings_en-GB.xtb +++ b/chromeos/strings/chromeos_strings_en-GB.xtb
@@ -691,6 +691,7 @@ <translation id="4354430579665871434">key</translation> <translation id="4356100841225547054">Turn off volume</translation> <translation id="4361257691546579041">APN is type default.</translation> +<translation id="4368101969572512692">Shuffle suggestions</translation> <translation id="437294888293595148">Reset all shortcuts</translation> <translation id="437477383107495720">bunnies</translation> <translation id="4376423484621194274">Your administrator doesn't allow closing <ph name="APP_NAME" /></translation>
diff --git a/chromeos/strings/chromeos_strings_fa.xtb b/chromeos/strings/chromeos_strings_fa.xtb index a79751e..d97e324 100644 --- a/chromeos/strings/chromeos_strings_fa.xtb +++ b/chromeos/strings/chromeos_strings_fa.xtb
@@ -691,6 +691,7 @@ <translation id="4354430579665871434">کلید</translation> <translation id="4356100841225547054">خاموش کردن صدا</translation> <translation id="4361257691546579041">«نام نقطه دستیابی» از نوع پیشفرض است.</translation> +<translation id="4368101969572512692">درهم کردن پیشنهادها</translation> <translation id="437294888293595148">بازنشانی همه میانبرها</translation> <translation id="437477383107495720">خرگوش</translation> <translation id="4376423484621194274">سرپرست شما بستن <ph name="APP_NAME" /> را غیرمجاز کرده است</translation>
diff --git a/chromeos/strings/chromeos_strings_fr.xtb b/chromeos/strings/chromeos_strings_fr.xtb index 02d5a49..3d89f80 100644 --- a/chromeos/strings/chromeos_strings_fr.xtb +++ b/chromeos/strings/chromeos_strings_fr.xtb
@@ -413,7 +413,7 @@ <translation id="2890557891229184386">île tropicale</translation> <translation id="2895772081848316509">sombre</translation> <translation id="2915996080311180594">Redémarrer plus tard</translation> -<translation id="2926057806159140518">Saisissez votre nom d'utilisateur et votre mot de passe ou scannez votre code QR</translation> +<translation id="2926057806159140518">Saisissez votre nom d'utilisateur et votre mot de passe ou scannez votre QR code</translation> <translation id="2940811910881150316">Impossible de tester l'appareil. Rouvrez l'écran pour tester.</translation> <translation id="2941112035454246133">Faible</translation> <translation id="2956070106555335453">Résumé</translation>
diff --git a/chromeos/strings/chromeos_strings_gu.xtb b/chromeos/strings/chromeos_strings_gu.xtb index cfb492a..8a4feb4 100644 --- a/chromeos/strings/chromeos_strings_gu.xtb +++ b/chromeos/strings/chromeos_strings_gu.xtb
@@ -691,6 +691,7 @@ <translation id="4354430579665871434">કી</translation> <translation id="4356100841225547054">વૉલ્યૂમ બંધ કરો</translation> <translation id="4361257691546579041">APNનો પ્રકાર ડિફૉલ્ટ છે.</translation> +<translation id="4368101969572512692">સૂચનોને શફલ કરો</translation> <translation id="437294888293595148">બધા શૉર્ટકટ રીસેટ કરો</translation> <translation id="437477383107495720">સસલાં</translation> <translation id="4376423484621194274">તમારા ઍડમિનિસ્ટ્રેટર <ph name="APP_NAME" />ને બંધ કરવાની મંજૂરી આપતા નથી</translation>
diff --git a/chromeos/strings/chromeos_strings_hr.xtb b/chromeos/strings/chromeos_strings_hr.xtb index 37d3754a..f5ed8d53 100644 --- a/chromeos/strings/chromeos_strings_hr.xtb +++ b/chromeos/strings/chromeos_strings_hr.xtb
@@ -691,6 +691,7 @@ <translation id="4354430579665871434">tipka</translation> <translation id="4356100841225547054">Isključite zvuk</translation> <translation id="4361257691546579041">APN je zadana vrsta.</translation> +<translation id="4368101969572512692">Nasumični prijedlozi</translation> <translation id="437294888293595148">Poništavanje prečaca</translation> <translation id="437477383107495720">zečići</translation> <translation id="4376423484621194274">Vaš administrator ne dopušta zatvaranje aplikacije <ph name="APP_NAME" /></translation>
diff --git a/chromeos/strings/chromeos_strings_hu.xtb b/chromeos/strings/chromeos_strings_hu.xtb index 5b42a1af..5ad12f9 100644 --- a/chromeos/strings/chromeos_strings_hu.xtb +++ b/chromeos/strings/chromeos_strings_hu.xtb
@@ -691,6 +691,7 @@ <translation id="4354430579665871434">billentyű</translation> <translation id="4356100841225547054">Hangerő kikapcsolása</translation> <translation id="4361257691546579041">Az APN típusa: alapértelmezett.</translation> +<translation id="4368101969572512692">Véletlenszerű javaslatok</translation> <translation id="437294888293595148">Összes gyorsparancs visszaállítása</translation> <translation id="437477383107495720">nyuszik</translation> <translation id="4376423484621194274">A rendszergazda nem engedélyezi a(z) <ph name="APP_NAME" /> bezárását</translation>
diff --git a/chromeos/strings/chromeos_strings_it.xtb b/chromeos/strings/chromeos_strings_it.xtb index 74196d0..110676a 100644 --- a/chromeos/strings/chromeos_strings_it.xtb +++ b/chromeos/strings/chromeos_strings_it.xtb
@@ -691,6 +691,7 @@ <translation id="4354430579665871434">chiave</translation> <translation id="4356100841225547054">Disattiva il volume</translation> <translation id="4361257691546579041">L'APN è predefinito</translation> +<translation id="4368101969572512692">Mescola suggerimenti</translation> <translation id="437294888293595148">Reimposta tutte le scorciatoie</translation> <translation id="437477383107495720">coniglietti</translation> <translation id="4376423484621194274">L'amministratore non consente la chiusura di <ph name="APP_NAME" /></translation>
diff --git a/chromeos/strings/chromeos_strings_km.xtb b/chromeos/strings/chromeos_strings_km.xtb index f002e1a..b8e502f 100644 --- a/chromeos/strings/chromeos_strings_km.xtb +++ b/chromeos/strings/chromeos_strings_km.xtb
@@ -691,6 +691,7 @@ <translation id="4354430579665871434">គ្រាប់ចុច</translation> <translation id="4356100841225547054">បិទកម្រិតសំឡេង</translation> <translation id="4361257691546579041">APN គឺជាប្រភេទលំនាំដើម។</translation> +<translation id="4368101969572512692">ច្របល់ការណែនាំ</translation> <translation id="437294888293595148">កំណត់ផ្លូវកាត់ទាំងអស់ឡើងវិញ</translation> <translation id="437477383107495720">កូនទន្សាយ</translation> <translation id="4376423484621194274">អ្នកគ្រប់គ្រងរបស់អ្នកមិនអនុញ្ញាតឱ្យបិទ <ph name="APP_NAME" /> ទេ</translation>
diff --git a/chromeos/strings/chromeos_strings_lo.xtb b/chromeos/strings/chromeos_strings_lo.xtb index 14b0b8d..0d1d2ec 100644 --- a/chromeos/strings/chromeos_strings_lo.xtb +++ b/chromeos/strings/chromeos_strings_lo.xtb
@@ -691,6 +691,7 @@ <translation id="4354430579665871434">ປຸ່ມ</translation> <translation id="4356100841225547054">ປິດລະດັບສຽງ</translation> <translation id="4361257691546579041">APN ເປັນປະເພດຄ່າເລີ່ມຕົ້ນ.</translation> +<translation id="4368101969572512692">ການແນະນຳແບບສຸ່ມ</translation> <translation id="437294888293595148">ຣີເຊັດທາງລັດທັງໝົດ</translation> <translation id="437477383107495720">ກະຕ່າຍນ້ອຍ</translation> <translation id="4376423484621194274">ຜູ້ເບິ່ງແຍງລະບົບຂອງທ່ານບໍ່ອະນຸຍາດໃຫ້ປິດ <ph name="APP_NAME" /></translation>
diff --git a/chromeos/strings/chromeos_strings_ms.xtb b/chromeos/strings/chromeos_strings_ms.xtb index ece65ceb..875a176 100644 --- a/chromeos/strings/chromeos_strings_ms.xtb +++ b/chromeos/strings/chromeos_strings_ms.xtb
@@ -691,6 +691,7 @@ <translation id="4354430579665871434">kekunci</translation> <translation id="4356100841225547054">Matikan kelantangan</translation> <translation id="4361257691546579041">APN merupakan jenis lalai.</translation> +<translation id="4368101969572512692">Rombak cadangan</translation> <translation id="437294888293595148">Tetapkan semula semua pintasan</translation> <translation id="437477383107495720">arnab</translation> <translation id="4376423484621194274">Pentadbir anda tidak membenarkan penutupan <ph name="APP_NAME" /></translation>
diff --git a/chromeos/strings/chromeos_strings_sk.xtb b/chromeos/strings/chromeos_strings_sk.xtb index 3627513..2ef2215a 100644 --- a/chromeos/strings/chromeos_strings_sk.xtb +++ b/chromeos/strings/chromeos_strings_sk.xtb
@@ -691,6 +691,7 @@ <translation id="4354430579665871434">kláves</translation> <translation id="4356100841225547054">Vypnutie zvuku</translation> <translation id="4361257691546579041">Názov prístupového bodu (APN) je typ Predvolený.</translation> +<translation id="4368101969572512692">Náhodné návrhy</translation> <translation id="437294888293595148">Resetovať všetky skratky</translation> <translation id="437477383107495720">zajace</translation> <translation id="4376423484621194274">Váš správca zavretie aplikácie <ph name="APP_NAME" /> nepovoľuje</translation>
diff --git a/clank b/clank index c21490b..2bf79a0 160000 --- a/clank +++ b/clank
@@ -1 +1 @@ -Subproject commit c21490b893c1a3efa293da12c73480149478ce73 +Subproject commit 2bf79a00d99f68d4fab6a186f66f856748e24972
diff --git a/components/browser_ui/strings/android/translations/browser_ui_strings_bs.xtb b/components/browser_ui/strings/android/translations/browser_ui_strings_bs.xtb index 5449ba4e..b206a19 100644 --- a/components/browser_ui/strings/android/translations/browser_ui_strings_bs.xtb +++ b/components/browser_ui/strings/android/translations/browser_ui_strings_bs.xtb
@@ -26,6 +26,7 @@ <translation id="1384959399684842514">Preuzimanje je pauzirano</translation> <translation id="1396327438254055134">Dozvolite web lokaciji da koristi optimizator V8.</translation> <translation id="1415402041810619267">URL je odsječen</translation> +<translation id="1415855080660575082">Dopustite Chromeu da dijeli vaše nedavne kartice s uređajem kako biste ih vidjeli na popisu aplikacija i u rezultatima pretraživanja na uređaju. Tu značajku možete uključiti ili isključiti u postavkama Chromea.</translation> <translation id="1448064542941920355">Smanjenje zumiranja</translation> <translation id="146867109637325312">{COUNT,plural, =1{<ph name="SITE_COUNT" /> web lokacija}one{<ph name="SITE_COUNT" /> web lokacija}few{<ph name="SITE_COUNT" /> web lokacije}other{<ph name="SITE_COUNT" /> web lokacija}}</translation> <translation id="1500473259453106018">Sakrij karticu Padovi cijena na karticama</translation> @@ -91,6 +92,7 @@ <translation id="2438120137003069591">Ovoj web lokaciji ste privremeno dozvolili da koristi kolačiće trećih strana, što podrazumijeva manju zaštitu prilikom pregledanja, ali veću vjerovatnost da će funkcije web lokacije funkcionirati u skladu s očekivanjima. <ph name="BEGIN_LINK" />Pošaljite povratne informacije<ph name="END_LINK" /></translation> <translation id="244264527810019436">Funkcije na nekim web lokacijama možda neće funkcionirati u anonimnom načinu rada</translation> <translation id="2442870161001914531">Uvijek zatraži verziju web lokacije za računar</translation> +<translation id="2445311670906052406">Chrome sada nedavne kartice dijeli s vašim uređajem. Prikazat će se na popisu aplikacija na uređaju i u rezultatima pretraživanja. To uvijek možete isključiti u postavkama Chromea.</translation> <translation id="2469312991797799607">Ova radnja će izbrisati sve podatke i kolačiće za domenu <ph name="ORIGIN" /> i sve njene web lokacije</translation> <translation id="2482878487686419369">Obavještenja</translation> <translation id="2485422356828889247">Deinstaliraj</translation> @@ -116,6 +118,7 @@ <translation id="2750481671343847896">Web lokacije vam mogu prikazati upite za prijavu koji potiču od usluga identiteta.</translation> <translation id="2787357173144933081">Odmah pokreni višenamjenski okvir</translation> <translation id="2790501146643349491">Kada je postavka uključena, nedavno zatvorene web lokacije mogu završiti slanje i primanje podataka. Kada je postavka isključena, nedavno zatvorene web lokacije ne mogu završiti slanje ni primanje podataka.</translation> +<translation id="2814830417943086299">Chrome sada prikazuje vaše nedavne kartice na popisu aplikacija i u rezultatima pretraživanja na uređaju. To uvijek možete isključiti u postavkama Chromea.</translation> <translation id="2822354292072154809">Jeste li sigurni da želite poništiti sva odobrenja web lokacije za <ph name="CHOSEN_OBJECT_NAME" />?</translation> <translation id="2850913818900871965">Zahtijevaj prikaz na mobilnom uređaju</translation> <translation id="2870560284913253234">Web lokacija</translation> @@ -557,6 +560,7 @@ <translation id="9109747640384633967">{PERMISSIONS_SUMMARY_MIXED,plural, =1{<ph name="PERMISSION_1" />, <ph name="PERMISSION_2" /> i još <ph name="NUM_MORE" />}one{<ph name="PERMISSION_1" />, <ph name="PERMISSION_2" /> i još <ph name="NUM_MORE" />}few{<ph name="PERMISSION_1" />, <ph name="PERMISSION_2" /> i još <ph name="NUM_MORE" />}other{<ph name="PERMISSION_1" />, <ph name="PERMISSION_2" /> i još <ph name="NUM_MORE" />}}</translation> <translation id="913657688200966289">Uključite odobrenja za aplikaciju <ph name="APP_NAME" /> u <ph name="BEGIN_LINK" />Postavkama Androida<ph name="END_LINK" />.</translation> <translation id="9138217887606523162">Trenutno zumiranje je <ph name="ZOOM_LEVEL" /> %%</translation> +<translation id="9156722768168878035">Dopustite Chromeu da prikazuje vaše nedavne kartice na popisu aplikacija i u rezultatima pretraživanja na uređaju. To uvijek možete isključiti u postavkama Chromea.</translation> <translation id="9162462602695099906">Ova stranica je opasna</translation> <translation id="947156494302904893">Web lokacije koje posjećujete mogu potvrditi da ste stvarna osoba, a ne bot</translation> <translation id="959682366969460160">Postanite organizirani</translation>
diff --git a/components/browser_ui/strings/android/translations/browser_ui_strings_en-GB.xtb b/components/browser_ui/strings/android/translations/browser_ui_strings_en-GB.xtb index 2e3a8b30..28ce105 100644 --- a/components/browser_ui/strings/android/translations/browser_ui_strings_en-GB.xtb +++ b/components/browser_ui/strings/android/translations/browser_ui_strings_en-GB.xtb
@@ -26,6 +26,7 @@ <translation id="1384959399684842514">Download paused</translation> <translation id="1396327438254055134">Allow site to use V8 optimiser.</translation> <translation id="1415402041810619267">URL truncated</translation> +<translation id="1415855080660575082">Let Chrome share your recent tabs with your device to see them in your device's app list and search results. You can turn this on or off in Chrome settings.</translation> <translation id="1448064542941920355">Decrease zoom</translation> <translation id="146867109637325312">{COUNT,plural, =1{<ph name="SITE_COUNT" /> site}other{<ph name="SITE_COUNT" /> sites}}</translation> <translation id="1500473259453106018">Hide price drops on tabs card</translation> @@ -91,6 +92,7 @@ <translation id="2438120137003069591">You temporarily allowed this site to use third-party cookies, which means less browsing protection but site features are more likely to work as expected. <ph name="BEGIN_LINK" />Send feedback<ph name="END_LINK" /></translation> <translation id="244264527810019436">Features on some sites may not work in Incognito mode</translation> <translation id="2442870161001914531">Always request desktop site</translation> +<translation id="2445311670906052406">Chrome now shares your recent tabs with your device. You'll see them in your device's app list and search results. You can turn this off at any time in Chrome settings.</translation> <translation id="2469312991797799607">This action will clear all data and cookies for <ph name="ORIGIN" /> and all sites under it</translation> <translation id="2482878487686419369">Notifications</translation> <translation id="2485422356828889247">Uninstall</translation> @@ -116,6 +118,7 @@ <translation id="2750481671343847896">Sites can show sign-in prompts from identity services.</translation> <translation id="2787357173144933081">Jump-start omnibox</translation> <translation id="2790501146643349491">When on, recently closed sites can finish sending and receiving data. When off, recently closed sites can't finish sending or receiving data.</translation> +<translation id="2814830417943086299">Chrome now shows your recent tabs in your device's app list and search results. You can turn this off at any time in Chrome settings.</translation> <translation id="2822354292072154809">Are you sure that you want to reset all site permissions for <ph name="CHOSEN_OBJECT_NAME" />?</translation> <translation id="2850913818900871965">Request mobile view</translation> <translation id="2870560284913253234">Site</translation> @@ -557,6 +560,7 @@ <translation id="9109747640384633967">{PERMISSIONS_SUMMARY_MIXED,plural, =1{<ph name="PERMISSION_1" />, <ph name="PERMISSION_2" />, and <ph name="NUM_MORE" /> more}other{<ph name="PERMISSION_1" />, <ph name="PERMISSION_2" />, and <ph name="NUM_MORE" /> more}}</translation> <translation id="913657688200966289">Turn on permissions for <ph name="APP_NAME" /> in <ph name="BEGIN_LINK" />Android settings<ph name="END_LINK" />.</translation> <translation id="9138217887606523162">Current zoom is <ph name="ZOOM_LEVEL" /> %%</translation> +<translation id="9156722768168878035">Let Chrome show your recent tabs in your device's app list and search results. You can turn this off at any time in Chrome settings.</translation> <translation id="9162462602695099906">This page is dangerous</translation> <translation id="947156494302904893">Sites that you visit can verify that you're a real person and not a bot</translation> <translation id="959682366969460160">Get organised</translation>
diff --git a/components/browser_ui/strings/android/translations/browser_ui_strings_fa.xtb b/components/browser_ui/strings/android/translations/browser_ui_strings_fa.xtb index 728e474..b1be58d8 100644 --- a/components/browser_ui/strings/android/translations/browser_ui_strings_fa.xtb +++ b/components/browser_ui/strings/android/translations/browser_ui_strings_fa.xtb
@@ -26,6 +26,7 @@ <translation id="1384959399684842514">بارگیری موقتاً متوقف شد</translation> <translation id="1396327438254055134">به سایت اجازه دهید از بهینهساز V8 استفاده کند.</translation> <translation id="1415402041810619267">نشانی وب کوتاهشده</translation> +<translation id="1415855080660575082">اجازه دهید Chrome برگههای اخیرتان را با دستگاهتان همرسانی کند تا بتوانید آنها را در فهرست برنامهها و نتایج جستجوی دستگاهتان ببینید. میتوانید این گزینه را در تنظیمات Chrome روشن یا خاموش کنید.</translation> <translation id="1448064542941920355">کاهش بزرگنمایی</translation> <translation id="146867109637325312">{COUNT,plural, =1{<ph name="SITE_COUNT" /> سایت}one{<ph name="SITE_COUNT" /> سایت}other{<ph name="SITE_COUNT" /> سایت}}</translation> <translation id="1500473259453106018">پنهان کردن کارت «کاهش قیمت در برگهها»</translation> @@ -91,6 +92,7 @@ <translation id="2438120137003069591">موقتاً به این سایت اجازه دادید از کوکیهای طرف سوم استفاده کند. این کار بهمعنی محافظت کمتر هنگام مرور است اما ویژگیهای سایت به احتمال زیاد طبق انتظار کار خواهند کرد. <ph name="BEGIN_LINK" />ارسال بازخورد<ph name="END_LINK" /></translation> <translation id="244264527810019436">ممکن است ویژگیهای برخیاز سایتها در «حالت ناشناس» کار نکند</translation> <translation id="2442870161001914531">همیشه سایت ویژه رایانه درخواست شود</translation> +<translation id="2445311670906052406">اکنون Chrome برگههای اخیرتان را با دستگاهتان همرسانی میکند. آنها را در فهرست برنامهها و نتایج جستجوی دستگاهتان خواهید دید. هرزمان بخواهید میتوانید این گزینه را در تنظیمات Chrome خاموش کنید.</translation> <translation id="2469312991797799607">با این کار، همه دادهها و کوکیهای <ph name="ORIGIN" /> و همه سایتهای تحت آن حذف خواهد شد</translation> <translation id="2482878487686419369">اعلانها</translation> <translation id="2485422356828889247">حذف نصب</translation> @@ -116,6 +118,7 @@ <translation id="2750481671343847896">سایتها میتوانند پیاموارههای ورود به سیستم سرویسهای تعیین هویت را نشان دهند.</translation> <translation id="2787357173144933081">شروع با پرش به نوار نشانی</translation> <translation id="2790501146643349491">هرگاه روشن باشد، سایتهای اخیراً بستهشده میتوانند ارسال و دریافت داده را تکمیل کنند. هرگاه خاموش باشد، سایتهای اخیراً بستهشده نمیتوانند ارسال یا دریافت داده را تکمیل کنند.</translation> +<translation id="2814830417943086299">اکنون Chrome برگههای اخیرتان را در فهرست برنامهها و نتایج جستجوی دستگاهتان نشان میدهد. هرزمان بخواهید میتوانید این گزینه را در تنظیمات Chrome خاموش کنید.</translation> <translation id="2822354292072154809">مطمئناید میخواهید همه مجوزهای سایت مربوط به <ph name="CHOSEN_OBJECT_NAME" /> را بازنشانی کنید؟</translation> <translation id="2850913818900871965">درخواست نمای تلفن همراه</translation> <translation id="2870560284913253234">سایت</translation> @@ -557,6 +560,7 @@ <translation id="9109747640384633967">{PERMISSIONS_SUMMARY_MIXED,plural, =1{<ph name="PERMISSION_1" />، <ph name="PERMISSION_2" />، و <ph name="NUM_MORE" /> اجازه دیگر}one{<ph name="PERMISSION_1" />، <ph name="PERMISSION_2" />، و <ph name="NUM_MORE" /> اجازه دیگر}other{<ph name="PERMISSION_1" />، <ph name="PERMISSION_2" />، و <ph name="NUM_MORE" /> اجازه دیگر}}</translation> <translation id="913657688200966289">اجازههای <ph name="APP_NAME" /> را در <ph name="BEGIN_LINK" />تنظیمات Android<ph name="END_LINK" /> روشن کنید.</translation> <translation id="9138217887606523162">بزرگنمایی کنونی <ph name="ZOOM_LEVEL" /> %% است</translation> +<translation id="9156722768168878035">اجازه دهید Chrome برگههای اخیرتان را در فهرست برنامهها و نتایج جستجوی دستگاهتان نشان دهد. هرزمان بخواهید میتوانید این گزینه را در تنظیمات Chrome خاموش کنید.</translation> <translation id="9162462602695099906">این صفحه خطرناک است</translation> <translation id="947156494302904893">سایتهایی که بازدید میکنید میتوانند تأیید کنند که شما شخص واقعی هستید و روبات نیستید</translation> <translation id="959682366969460160">سازماندهی شوید</translation>
diff --git a/components/browser_ui/strings/android/translations/browser_ui_strings_gu.xtb b/components/browser_ui/strings/android/translations/browser_ui_strings_gu.xtb index 9262c99..f79a5e90 100644 --- a/components/browser_ui/strings/android/translations/browser_ui_strings_gu.xtb +++ b/components/browser_ui/strings/android/translations/browser_ui_strings_gu.xtb
@@ -26,6 +26,7 @@ <translation id="1384959399684842514">ડાઉનલોડ થોભાવ્યું</translation> <translation id="1396327438254055134">સાઇટને V8 ઑપ્ટિમાઇઝરનો ઉપયોગ કરવાની મંજૂરી આપો.</translation> <translation id="1415402041810619267">URL ટૂંકી કરી છે</translation> +<translation id="1415855080660575082">તમારા તાજેતરના ટૅબ તમારી ડિવાઇસની ઍપની સૂચિ અને શોધ પરિણામોમાં દેખાય તે માટે Chromeને તમારા ડિવાઇસ સાથે તે શેર કરવાની મંજૂરી આપો. Chrome સેટિંગમાં તમે આને ચાલુ અથવા બંધ કરી શકો છો.</translation> <translation id="1448064542941920355">નાનું-મોટું કરવાની ટકાવારી ઘટાડો</translation> <translation id="146867109637325312">{COUNT,plural, =1{<ph name="SITE_COUNT" /> સાઇટ}one{<ph name="SITE_COUNT" /> સાઇટ}other{<ph name="SITE_COUNT" /> સાઇટ}}</translation> <translation id="1500473259453106018">ટૅબ કાર્ડ પર કિંમતમાં ઘટાડાની સૂચનાઓ છુપાવો</translation> @@ -91,6 +92,7 @@ <translation id="2438120137003069591">તમે આ સાઇટને હંગામી રીતે ત્રીજા પક્ષની કુકીનો ઉપયોગ કરવાની મંજૂરી આપી છે, જેનો અર્થ એ થાય છે કે સાઇટને બ્રાઉઝિંગ સંબંધિત સુરક્ષા ઓછી મળે છે, પરંતુ સાઇટની સુવિધાઓ અપેક્ષા મુજબ કામ કરે એવી સંભાવના વધુ છે. <ph name="BEGIN_LINK" />પ્રતિસાદ મોકલો<ph name="END_LINK" /></translation> <translation id="244264527810019436">છૂપા મોડમાં અમુક સાઇટ પર અમુક સુવિધાઓ કદાચ કામ કરી શકશે નહીં</translation> <translation id="2442870161001914531">હંમેશાં ડેસ્કટૉપ સાઇટની વિનંતી કરો</translation> +<translation id="2445311670906052406">Chrome હવે તમારા તાજેતરના ટૅબને તમારા ડિવાઇસ સાથે શેર કરે છે. તમને તે તમારા ડિવાઇસની ઍપની સૂચિ અને શોધ પરિણામોમાં જોવા મળશે. Chrome સેટિંગમાં તમે આને કોઈપણ સમયે બંધ કરી શકો છો.</translation> <translation id="2469312991797799607">આ ક્રિયાના પરિણામે <ph name="ORIGIN" /> માટેની અને તેની હેઠળ આવતી બધી સાઇટ માટેનો બધો ડેટા અને કુકી ડિલીટ થઈ જશે</translation> <translation id="2482878487686419369">નોટિફિકેશનો</translation> <translation id="2485422356828889247">અનઇન્સ્ટૉલ કરો</translation> @@ -116,6 +118,7 @@ <translation id="2750481671343847896">સાઇટ ઓળખ સેવાઓના સાઇન ઇન કરવાના સંકેતો બતાવી શકે છે.</translation> <translation id="2787357173144933081">ઑમ્નિબૉક્સની શરૂઆત કરો</translation> <translation id="2790501146643349491">ચાલુ હોય ત્યારે, તાજેતરમાં બંધ કરેલી સાઇટ ડેટા મોકલવાનું અને પ્રાપ્ત કરવાનું પૂર્ણ કરી શકે છે. બંધ હોય ત્યારે, તાજેતરમાં બંધ કરેલી સાઇટ ડેટા મોકલવાનું અને પ્રાપ્ત કરવાનું પૂર્ણ કરી શકતી નથી.</translation> +<translation id="2814830417943086299">Chrome હવે તમારા ડિવાઇસની ઍપની સૂચિ અને શોધ પરિણામોમાં તમારા તાજેતરના ટૅબ બતાવે છે. Chrome સેટિંગમાં તમે આને કોઈપણ સમયે બંધ કરી શકો છો.</translation> <translation id="2822354292072154809">શું તમે ખરેખર <ph name="CHOSEN_OBJECT_NAME" />ની બધી સાઇટ પસંદગીઓને રીસેટ કરવા માગો છે?</translation> <translation id="2850913818900871965">મોબાઇલ વ્યૂની વિનંતી કરો</translation> <translation id="2870560284913253234">સાઇટ</translation> @@ -557,6 +560,7 @@ <translation id="9109747640384633967">{PERMISSIONS_SUMMARY_MIXED,plural, =1{<ph name="PERMISSION_1" />, <ph name="PERMISSION_2" /> અને વધુ <ph name="NUM_MORE" />}one{<ph name="PERMISSION_1" />, <ph name="PERMISSION_2" /> અને વધુ <ph name="NUM_MORE" />}other{<ph name="PERMISSION_1" />, <ph name="PERMISSION_2" /> અને વધુ <ph name="NUM_MORE" />}}</translation> <translation id="913657688200966289"><ph name="BEGIN_LINK" />Android સેટિંગ<ph name="END_LINK" />માં <ph name="APP_NAME" /> માટે પરવાનગીઓ ચાલુ કરો.</translation> <translation id="9138217887606523162">નાનું-મોટું કરવાની વર્તમાન ટકાવારી <ph name="ZOOM_LEVEL" /> %% છે</translation> +<translation id="9156722768168878035">Chromeને તમારા ડિવાઇસની ઍપની સૂચિ અને શોધ પરિણામોમાં તમારા તાજેતરના ટૅબ બતાવવા દો. Chrome સેટિંગમાં તમે આને કોઈપણ સમયે બંધ કરી શકો છો.</translation> <translation id="9162462602695099906">આ પેજ જોખમી છે</translation> <translation id="947156494302904893">તમે મુલાકાત લો છો એ વિવિધ સાઇટ એ વાતની ચકાસણી કરી શકે છે કે તમે જ અસલી વપરાશકર્તા છો અને બૉટ નથી</translation> <translation id="959682366969460160">સંગઠિત રહો</translation>
diff --git a/components/browser_ui/strings/android/translations/browser_ui_strings_hr.xtb b/components/browser_ui/strings/android/translations/browser_ui_strings_hr.xtb index 7c46fe5..25a2b0c 100644 --- a/components/browser_ui/strings/android/translations/browser_ui_strings_hr.xtb +++ b/components/browser_ui/strings/android/translations/browser_ui_strings_hr.xtb
@@ -26,6 +26,7 @@ <translation id="1384959399684842514">Preuzimanje je pauzirano</translation> <translation id="1396327438254055134">Dopusti upotrebu alata za optimizaciju V8 na web-lokaciji.</translation> <translation id="1415402041810619267">URL je skraćen</translation> +<translation id="1415855080660575082">Dopustite Chromeu da dijeli vaše nedavne kartice s uređajem kako biste ih vidjeli na popisu aplikacija i u rezultatima pretraživanja na uređaju. Tu značajku možete uključiti ili isključiti u postavkama Chromea.</translation> <translation id="1448064542941920355">Smanjite zumiranje</translation> <translation id="146867109637325312">{COUNT,plural, =1{<ph name="SITE_COUNT" /> web-lokacija}one{<ph name="SITE_COUNT" /> web-lokacija}few{<ph name="SITE_COUNT" /> web-lokacije}other{<ph name="SITE_COUNT" /> web-lokacija}}</translation> <translation id="1500473259453106018">Sakrij karticu Sniženja cijena na karticama</translation> @@ -91,6 +92,7 @@ <translation id="2438120137003069591">Privremeno ste dopustili ovoj web-lokaciji upotrebu kolačića trećih strana, što znači da će biti manje zaštite pregledavanja, ali će značajke web-lokacije vjerojatnije funkcionirati u skladu s očekivanjima. <ph name="BEGIN_LINK" />Pošaljite svoje dojmove<ph name="END_LINK" /></translation> <translation id="244264527810019436">Značajke na nekim web-lokacijama možda neće funkcionirati u anonimnom načinu rada</translation> <translation id="2442870161001914531">Uvijek zahtijevaj web-lokaciju za računalo</translation> +<translation id="2445311670906052406">Chrome sada nedavne kartice dijeli s vašim uređajem. Prikazat će se na popisu aplikacija na uređaju i u rezultatima pretraživanja. To uvijek možete isključiti u postavkama Chromea.</translation> <translation id="2469312991797799607">Tom ćete radnjom izbrisati sve podatke i kolačiće za web-lokaciju <ph name="ORIGIN" /> te sve njoj podređene web-lokacije</translation> <translation id="2482878487686419369">Obavijesti</translation> <translation id="2485422356828889247">Deinstaliraj</translation> @@ -116,6 +118,7 @@ <translation id="2750481671343847896">Web-lokacije mogu prikazivati upite za prijavu s usluga za provjeru identiteta.</translation> <translation id="2787357173144933081">Odmah pokreni višenamjenski okvir</translation> <translation id="2790501146643349491">Kad je ta postavka uključena, nedavno zatvorene web-lokacije mogu dovršiti slanje i primanje podataka. Kad je ta postavka isključena, nedavno zatvorene web-lokacije ne mogu dovršiti slanje ili primanje podataka.</translation> +<translation id="2814830417943086299">Chrome sada prikazuje vaše nedavne kartice na popisu aplikacija i u rezultatima pretraživanja na uređaju. To uvijek možete isključiti u postavkama Chromea.</translation> <translation id="2822354292072154809">Jeste li sigurni da želite poništiti sva dopuštenja za aplikaciju <ph name="CHOSEN_OBJECT_NAME" />?</translation> <translation id="2850913818900871965">Zahtijevaj prikaz na mobilnom uređaju</translation> <translation id="2870560284913253234">Web lokacija</translation> @@ -557,6 +560,7 @@ <translation id="9109747640384633967">{PERMISSIONS_SUMMARY_MIXED,plural, =1{<ph name="PERMISSION_1" />, <ph name="PERMISSION_2" /> i još <ph name="NUM_MORE" />}one{<ph name="PERMISSION_1" />, <ph name="PERMISSION_2" /> i još <ph name="NUM_MORE" />}few{<ph name="PERMISSION_1" />, <ph name="PERMISSION_2" /> i još <ph name="NUM_MORE" />}other{<ph name="PERMISSION_1" />, <ph name="PERMISSION_2" /> i još <ph name="NUM_MORE" />}}</translation> <translation id="913657688200966289">Uključite dopuštenja za aplikaciju <ph name="APP_NAME" /> u <ph name="BEGIN_LINK" />Androidovim postavkama<ph name="END_LINK" />.</translation> <translation id="9138217887606523162">Trenutačno je zumiranje <ph name="ZOOM_LEVEL" />%%</translation> +<translation id="9156722768168878035">Dopustite Chromeu da prikazuje vaše nedavne kartice na popisu aplikacija i u rezultatima pretraživanja na uređaju. To uvijek možete isključiti u postavkama Chromea.</translation> <translation id="9162462602695099906">Ova je stranica opasna</translation> <translation id="947156494302904893">Web-lokacije koje posjećujete mogu potvrditi da ste stvarna osoba, a ne bot</translation> <translation id="959682366969460160">Organizirajte se</translation>
diff --git a/components/browser_ui/strings/android/translations/browser_ui_strings_hu.xtb b/components/browser_ui/strings/android/translations/browser_ui_strings_hu.xtb index 9378dff..eb7bcbd6 100644 --- a/components/browser_ui/strings/android/translations/browser_ui_strings_hu.xtb +++ b/components/browser_ui/strings/android/translations/browser_ui_strings_hu.xtb
@@ -26,6 +26,7 @@ <translation id="1384959399684842514">A letöltés szünetel</translation> <translation id="1396327438254055134">A V8-optimalizáló használatának engedélyezése az alábbi webhely számára.</translation> <translation id="1415402041810619267">URL csonkolva</translation> +<translation id="1415855080660575082">Engedélyezze a Chrome-nak, hogy megossza eszközével a nemrég megnyitott lapokat, hogy azok megjelenjenek az eszköz alkalmazáslistáján és a keresési találatok között is. Ezt a Chrome beállításai között kapcsolhatja be vagy ki.</translation> <translation id="1448064542941920355">Nagyítás csökkentése</translation> <translation id="146867109637325312">{COUNT,plural, =1{<ph name="SITE_COUNT" /> webhely}other{<ph name="SITE_COUNT" /> webhely}}</translation> <translation id="1500473259453106018">A Price drops on tabs (Árcsökkenések a lapokon) kártya elrejtése</translation> @@ -91,6 +92,7 @@ <translation id="2438120137003069591">Átmenetileg engedélyezte a webhely számára a harmadik féltől származó cookie-k használatát, ami azt jelenti, hogy kisebb védelemben van része böngészés közben, de a webhelyfunkciók nagyobb valószínűséggel működnek majd a várt módon. <ph name="BEGIN_LINK" />Visszajelzés küldése<ph name="END_LINK" /></translation> <translation id="244264527810019436">Előfordulhat, hogy bizonyos webhelyek funkciói nem működnek inkognitó módban</translation> <translation id="2442870161001914531">Mindig az asztali webhely kérése</translation> +<translation id="2445311670906052406">A Chrome mostantól megosztja az eszközével a nemrég megnyitott lapokat. Ezeket az eszköz alkalmazáslistájában és a keresési találatok között láthatja. Ezt bármikor kikapcsolhatja a Chrome beállításai között.</translation> <translation id="2469312991797799607">A művelet minden adatot és cookie-t töröl a(z) <ph name="ORIGIN" /> domainről és az alatta lévő összes webhelyről.</translation> <translation id="2482878487686419369">Értesítések</translation> <translation id="2485422356828889247">Eltávolítás</translation> @@ -116,6 +118,7 @@ <translation id="2750481671343847896">A webhelyek megjeleníthetnek identitásszolgáltatásoktól származó bejelentkezési értesítéseket.</translation> <translation id="2787357173144933081">Gyorsindítás a cím- és keresősávval</translation> <translation id="2790501146643349491">Ha be van kapcsolva, a nemrégiben bezárt webhelyek befejezhetik az adatok küldését és fogadását. Ha ki van kapcsolva, a nemrégiben bezárt webhelyek nem tudják befejezni az adatok küldését és fogadását.</translation> +<translation id="2814830417943086299">A Chrome mostantól megjeleníti a legutóbbi lapokat az eszköz alkalmazáslistáján és a keresési találatok között is. Ezt bármikor kikapcsolhatja a Chrome beállításai között.</translation> <translation id="2822354292072154809">Biztosan visszaállítja a(z) <ph name="CHOSEN_OBJECT_NAME" /> minden webhelyengedélyét?</translation> <translation id="2850913818900871965">Mobilnézet kérelmezése</translation> <translation id="2870560284913253234">Webhely</translation> @@ -557,6 +560,7 @@ <translation id="9109747640384633967">{PERMISSIONS_SUMMARY_MIXED,plural, =1{<ph name="PERMISSION_1" />, <ph name="PERMISSION_2" /> és további <ph name="NUM_MORE" />}other{<ph name="PERMISSION_1" />, <ph name="PERMISSION_2" /> és további <ph name="NUM_MORE" />}}</translation> <translation id="913657688200966289">A(z) <ph name="APP_NAME" /> alkalmazásra vonatkozó engedélyeket az <ph name="BEGIN_LINK" />Android-beállítások<ph name="END_LINK" /> között lehet aktiválni.</translation> <translation id="9138217887606523162">Jelenlegi nagyítási szint: <ph name="ZOOM_LEVEL" />%%</translation> +<translation id="9156722768168878035">Engedélyezze a Chrome-nak, hogy megjeleníthesse a legutóbbi lapokat az eszköz alkalmazáslistáján és a keresési találatok között. Ezt bármikor kikapcsolhatja a Chrome beállításai között.</translation> <translation id="9162462602695099906">Ez az oldal veszélyes</translation> <translation id="947156494302904893">A felkeresett webhelyek ellenőrizni tudják, hogy Ön valódi személy, nem pedig robot</translation> <translation id="959682366969460160">Könnyebb rendszerezés</translation>
diff --git a/components/browser_ui/strings/android/translations/browser_ui_strings_it.xtb b/components/browser_ui/strings/android/translations/browser_ui_strings_it.xtb index bbc0750bc..a6bb3f6 100644 --- a/components/browser_ui/strings/android/translations/browser_ui_strings_it.xtb +++ b/components/browser_ui/strings/android/translations/browser_ui_strings_it.xtb
@@ -26,6 +26,7 @@ <translation id="1384959399684842514">Download sospeso</translation> <translation id="1396327438254055134">Consenti al sito di utilizzare lo strumento di ottimizzazione V8.</translation> <translation id="1415402041810619267">URL troncato</translation> +<translation id="1415855080660575082">Consenti a Chrome di condividere le schede recenti con il tuo dispositivo per visualizzarle nell'elenco di app e nei risultati di ricerca del dispositivo. Puoi attivare o disattivare questa funzionalità nelle impostazioni di Chrome.</translation> <translation id="1448064542941920355">Diminuisci lo zoom</translation> <translation id="146867109637325312">{COUNT,plural, =1{<ph name="SITE_COUNT" /> sito}other{<ph name="SITE_COUNT" /> siti}}</translation> <translation id="1500473259453106018">Nascondi scheda Cali di prezzo nelle schede</translation> @@ -91,6 +92,7 @@ <translation id="2438120137003069591">Hai consentito temporaneamente a questo sito di utilizzare i cookie di terze parti, il che comporta una minore protezione della navigazione, ma è più probabile che le funzionalità del sito funzionino come previsto. <ph name="BEGIN_LINK" />Invia feedback<ph name="END_LINK" /></translation> <translation id="244264527810019436">Le funzionalità su alcuni siti potrebbero non essere disponibili in modalità di navigazione in incognito</translation> <translation id="2442870161001914531">Richiedi sempre sito desktop</translation> +<translation id="2445311670906052406">Chrome ora condivide le schede recenti con il tuo dispositivo. Le vedrai nell'elenco di app e nei risultati di ricerca del tuo dispositivo. Puoi disattivare questa funzionalità in qualsiasi momento nelle impostazioni di Chrome.</translation> <translation id="2469312991797799607">Questa azione eliminerà tutti i dati e i cookie di <ph name="ORIGIN" /> e di tutti i siti secondari</translation> <translation id="2482878487686419369">Notifiche</translation> <translation id="2485422356828889247">Disinstalla</translation> @@ -116,6 +118,7 @@ <translation id="2750481671343847896">I siti possono mostrare richieste di accesso da servizi di identità.</translation> <translation id="2787357173144933081">Omnibox avvio rapido</translation> <translation id="2790501146643349491">Quando l'opzione è attiva, i siti chiusi di recente possono terminare l'invio e la ricezione di dati. Quando l'opzione è disattivata, i siti chiusi di recente non possono terminare l'invio o la ricezione di dati.</translation> +<translation id="2814830417943086299">Ora Chrome mostra le schede recenti nell'elenco di app e nei risultati di ricerca del dispositivo. Puoi disattivare questa funzionalità in qualsiasi momento nelle impostazioni di Chrome.</translation> <translation id="2822354292072154809">Vuoi reimpostare tutte le autorizzazioni del sito per <ph name="CHOSEN_OBJECT_NAME" />?</translation> <translation id="2850913818900871965">Richiedi visualizzazione mobile</translation> <translation id="2870560284913253234">Sito</translation> @@ -557,6 +560,7 @@ <translation id="9109747640384633967">{PERMISSIONS_SUMMARY_MIXED,plural, =1{<ph name="PERMISSION_1" />, <ph name="PERMISSION_2" /> e <ph name="NUM_MORE" /> altra}other{<ph name="PERMISSION_1" />, <ph name="PERMISSION_2" /> e altre <ph name="NUM_MORE" />}}</translation> <translation id="913657688200966289">Attiva le autorizzazioni per l'app <ph name="APP_NAME" /> nelle <ph name="BEGIN_LINK" />Impostazioni Android<ph name="END_LINK" />.</translation> <translation id="9138217887606523162">Al momento lo zoom è <ph name="ZOOM_LEVEL" /> %%</translation> +<translation id="9156722768168878035">Consenti a Chrome di mostrare le schede recenti nell'elenco di app e nei risultati di ricerca del dispositivo. Puoi disattivare questa funzionalità in qualsiasi momento nelle impostazioni di Chrome.</translation> <translation id="9162462602695099906">Questa pagina è pericolosa</translation> <translation id="947156494302904893">I siti che visiti possono verificare che sei una persona reale e non un bot</translation> <translation id="959682366969460160">Organizzazione</translation>
diff --git a/components/browser_ui/strings/android/translations/browser_ui_strings_km.xtb b/components/browser_ui/strings/android/translations/browser_ui_strings_km.xtb index cd7e7794..a791bb5 100644 --- a/components/browser_ui/strings/android/translations/browser_ui_strings_km.xtb +++ b/components/browser_ui/strings/android/translations/browser_ui_strings_km.xtb
@@ -26,6 +26,7 @@ <translation id="1384959399684842514">បានផ្អាកការទាញយក</translation> <translation id="1396327438254055134">អនុញ្ញាតឱ្យគេហទំព័រប្រើឧបករណ៍បង្កើនប្រសិទ្ធភាព V8។</translation> <translation id="1415402041810619267">បានបង្រួម URL</translation> +<translation id="1415855080660575082">អនុញ្ញាតឱ្យ Chrome ចែករំលែកផ្ទាំងថ្មីៗរបស់អ្នកជាមួយឧបករណ៍របស់អ្នក ដើម្បីមើលឃើញផ្ទាំងទាំងនោះនៅក្នុងលទ្ធផលស្វែងរក និងបញ្ជីកម្មវិធីរបស់ឧបករណ៍អ្នក។ អ្នកអាចបើក ឬបិទវាបាននៅក្នុងការកំណត់ Chrome។</translation> <translation id="1448064542941920355">បន្ថយការពង្រីកបង្រួម</translation> <translation id="146867109637325312">{COUNT,plural, =1{គេហទំព័រ <ph name="SITE_COUNT" />}other{គេហទំព័រ <ph name="SITE_COUNT" />}}</translation> <translation id="1500473259453106018">លាក់កាត "តម្លៃធ្លាក់ចុះនៅលើផ្ទាំង"</translation> @@ -91,6 +92,7 @@ <translation id="2438120137003069591">អ្នកបានអនុញ្ញាតឱ្យគេហទំព័រនេះប្រើខូគីភាគីទីបីជាបណ្ដោះអាសន្ន ដែលមានន័យថាមានការការពារការរុករកតិចជាងមុន ប៉ុន្តែមុខងារគេហទំព័រកាន់តែទំនងនឹងដំណើរការដូចការរំពឹងទុក។ <ph name="BEGIN_LINK" />ផ្ញើមតិកែលម្អ<ph name="END_LINK" /></translation> <translation id="244264527810019436">មុខងារនៅលើគេហទំព័រមួយចំនួនអាចមិនដំណើរការនៅក្នុងមុខងារឯកជនទេ</translation> <translation id="2442870161001914531">ស្នើគេហទំព័រសម្រាប់កុំព្យូទ័រជានិច្ច</translation> +<translation id="2445311670906052406">ឥឡូវនេះ Chrome ចែករំលែកផ្ទាំងថ្មីៗរបស់អ្នកជាមួយឧបករណ៍របស់អ្នកហើយ។ អ្នកនឹងឃើញផ្ទាំងទាំងនោះនៅក្នុងលទ្ធផលស្វែងរក និងបញ្ជីកម្មវិធីរបស់ឧបករណ៍អ្នក។ អ្នកអាចបិទវានៅពេលណាក៏បាននៅក្នុងការកំណត់ Chrome។</translation> <translation id="2469312991797799607">សកម្មភាពនេះនឹងលុបខូគី និងទិន្នន័យទាំងអស់សម្រាប់ <ph name="ORIGIN" /> និងគេហទំព័រទាំងអស់ដែលស្ថិតនៅក្រោមនោះ</translation> <translation id="2482878487686419369">ការជូនដំណឹង</translation> <translation id="2485422356828889247">លុប</translation> @@ -116,6 +118,7 @@ <translation id="2750481671343847896">គេហទំព័រអាចបង្ហាញសារចូលគណនីពីសេវាកម្មដែលសួររកអត្តសញ្ញាណ។</translation> <translation id="2787357173144933081">ចាប់ផ្ដើមប្រអប់ពហុមុខងារ</translation> <translation id="2790501146643349491">នៅពេលបើក គេហទំព័រដែលបានបិទថ្មីៗអាចបញ្ចប់ការផ្ញើ និងការទទួលទិន្នន័យបាន។ នៅពេលបិទ គេហទំព័រដែលបានបិទថ្មីៗមិនអាចបញ្ចប់ការផ្ញើ ឬការទទួលទិន្នន័យបានទេ។</translation> +<translation id="2814830417943086299">ឥឡូវនេះ Chrome បង្ហាញផ្ទាំងថ្មីៗរបស់អ្នកនៅក្នុងលទ្ធផលស្វែងរក និងបញ្ជីកម្មវិធីរបស់ឧបករណ៍អ្នកហើយ។ អ្នកអាចបិទវានៅពេលណាក៏បាននៅក្នុងការកំណត់ Chrome។</translation> <translation id="2822354292072154809">តើអ្នកប្រាកដថាចង់កំណត់ការអនុញ្ញាតគេហទំព័រទាំងអស់ឡើងវិញសម្រាប់ <ph name="CHOSEN_OBJECT_NAME" /> ដែរទេ?</translation> <translation id="2850913818900871965">ស្នើសុំទិដ្ឋភាពលើទូរសព្ទ</translation> <translation id="2870560284913253234">គេហទំព័រ</translation> @@ -557,6 +560,7 @@ <translation id="9109747640384633967">{PERMISSIONS_SUMMARY_MIXED,plural, =1{<ph name="PERMISSION_1" />, <ph name="PERMISSION_2" /> និង <ph name="NUM_MORE" /> ទៀត}other{<ph name="PERMISSION_1" />, <ph name="PERMISSION_2" /> និង <ph name="NUM_MORE" /> ទៀត}}</translation> <translation id="913657688200966289">បើកការអនុញ្ញាតសម្រាប់ <ph name="APP_NAME" /> នៅក្នុង<ph name="BEGIN_LINK" />ការកំណត់ Android<ph name="END_LINK" />។</translation> <translation id="9138217887606523162">ការពង្រីកបង្រួមបច្ចុប្បន្នគឺ <ph name="ZOOM_LEVEL" /> %%</translation> +<translation id="9156722768168878035">អនុញ្ញាតឱ្យ Chrome បង្ហាញផ្ទាំងថ្មីៗរបស់អ្នកនៅក្នុងលទ្ធផលស្វែងរក និងបញ្ជីកម្មវិធីរបស់ឧបករណ៍អ្នក។ អ្នកអាចបិទវានៅពេលណាក៏បាននៅក្នុងការកំណត់ Chrome។</translation> <translation id="9162462602695099906">ទំព័រនេះមានគ្រោះថ្នាក់</translation> <translation id="947156494302904893">គេហទំព័រដែលអ្នកចូលមើលអាចផ្ទៀងផ្ទាត់ថា អ្នកគឺជាមនុស្សពិតប្រាកដ និងមិនមែនជាបូតទេ</translation> <translation id="959682366969460160">រៀបចំឱ្យមានសណ្តាប់ធ្នាប់</translation>
diff --git a/components/browser_ui/strings/android/translations/browser_ui_strings_lo.xtb b/components/browser_ui/strings/android/translations/browser_ui_strings_lo.xtb index afe464b3..cb492b7a 100644 --- a/components/browser_ui/strings/android/translations/browser_ui_strings_lo.xtb +++ b/components/browser_ui/strings/android/translations/browser_ui_strings_lo.xtb
@@ -26,6 +26,7 @@ <translation id="1384959399684842514">ຢຸດການດາວໂຫລດໄວ້ຊົ່ວຄາວແລ້ວ</translation> <translation id="1396327438254055134">ອະນຸຍາດໃຫ້ເວັບໄຊນໍາໃຊ້ຕົວເພີ່ມປະສິດທິພາບ V8.</translation> <translation id="1415402041810619267">ຕັດ URL ໃຫ້ສັ້ນລົງແລ້ວ</translation> +<translation id="1415855080660575082">ອະນຸຍາດໃຫ້ Chrome ແບ່ງປັນແຖບຫຼ້າສຸດຂອງທ່ານກັບອຸປະກອນຂອງທ່ານເພື່ອເບິ່ງແຖບເຫຼົ່ານັ້ນໃນລາຍຊື່ແອັບ ແລະ ຜົນການຊອກຫາໃນອຸປະກອນຂອງທ່ານ. ທ່ານສາມາດເປີດ ຫຼື ປິດການຕັ້ງຄ່ານີ້ໄດ້ໃນການຕັ້ງຄ່າ Chrome.</translation> <translation id="1448064542941920355">ຫຼຸດການຊູມ</translation> <translation id="146867109637325312">{COUNT,plural, =1{<ph name="SITE_COUNT" /> ເວັບໄຊ}other{<ph name="SITE_COUNT" /> ເວັບໄຊ}}</translation> <translation id="1500473259453106018">ເຊື່ອງບັດເບິ່ງລາຄາຫຼຸດລົງໃນແຖບ</translation> @@ -91,6 +92,7 @@ <translation id="2438120137003069591">ທ່ານໄດ້ອະນຸຍາດໃຫ້ເວັບໄຊນີ້ໃຊ້ຄຸກກີ້ພາກສ່ວນທີສາມເປັນການຊົ່ວຄາວແລ້ວ, ເຊິ່ງໝາຍຄວາມວ່າການປົກປ້ອງລະຫວ່າງທ່ອງເວັບຈະຫຼຸດລົງ ແຕ່ຄຸນສົມບັດຂອງເວັບໄຊມີແນວໂນ້ມທີ່ຈະເຮັດວຽກຕາມທີ່ຄາດໄວ້ໄດ້ຫຼາຍກວ່າ. <ph name="BEGIN_LINK" />ສົ່ງຄຳຕິຊົມ<ph name="END_LINK" /></translation> <translation id="244264527810019436">ຄຸນສົມບັດຢູ່ບາງເວັບໄຊອາດບໍ່ເຮັດວຽກໃນໂໝດບໍ່ເປີດເຜີຍຕົວຕົນ</translation> <translation id="2442870161001914531">ຮ້ອງຂໍເວັບໄຊເດັສທັອບທຸກເທື່ອ</translation> +<translation id="2445311670906052406">ຕອນນີ້ Chrome ຈະແບ່ງປັນແຖບຫຼ້າສຸດຂອງທ່ານກັບອຸປະກອນຂອງທ່ານ. ທ່ານຈະເຫັນພວກມັນໃນຂໍ້ມູນແອັບ ແລະ ຜົນການຊອກຫາຂອງອຸປະກອນຂອງທ່ານ. ທ່ານສາມາດປິດການຕັ້ງຄ່ານີ້ໄດ້ທຸກເວລາໃນການຕັ້ງຄ່າ Chrome.</translation> <translation id="2469312991797799607">ຄຳສັ່ງນີ້ຈະລຶບຂໍ້ມູນ ແລະ ຄຸກກີ້ທັງໝົດຂອງ <ph name="ORIGIN" /> ຮວມທັງທຸກເວັບໄຊຈາກຕົ້ນທາງນີ້</translation> <translation id="2482878487686419369">ການແຈ້ງເຕືອນ</translation> <translation id="2485422356828889247">ຖອນຕິດຕັ້ງ</translation> @@ -116,6 +118,7 @@ <translation id="2750481671343847896">ເວັບໄຊສາມາດສະແດງຂໍ້ຄວາມການເຂົ້າສູ່ລະບົບຈາກບໍລິການຕົວຕົນຕ່າງໆໄດ້.</translation> <translation id="2787357173144933081">ເລີ່ມຕົ້ນນຳໃຊ້ Omnibox</translation> <translation id="2790501146643349491">ເມື່ອເປີດ, ເວັບໄຊທີ່ປິດຫຼ້າສຸດສາມາດສຳເລັດການສົ່ງ ແລະ ຮັບຂໍ້ມູນໄດ້. ເມື່ອປິດ, ເວັບໄຊທີ່ປິດຫຼ້າສຸດບໍ່ສາມາດສຳເລັດການສົ່ງ ແລະ ຮັບຂໍ້ມູນໄດ້.</translation> +<translation id="2814830417943086299">ຕອນນີ້ Chrome ສະແດງແຖບຫຼ້າສຸດຂອງທ່ານໃນຂໍ້ມູນແອັບ ແລະ ຜົນການຊອກຫາຂອງອຸປະກອນຂອງທ່ານ. ທ່ານສາມາດປິດການຕັ້ງຄ່ານີ້ໄດ້ທຸກເວລາໃນການຕັ້ງຄ່າ Chrome.</translation> <translation id="2822354292072154809">ທ່ານແນ່ໃຈບໍ່ວ່າທ່ານຕ້ອງການຣີເຊັດການອະນຸຍາດເວັບໄຊທັງໝົດສຳລັບ <ph name="CHOSEN_OBJECT_NAME" />?</translation> <translation id="2850913818900871965">ຮ້ອງຂໍມຸມມອງມືຖື</translation> <translation id="2870560284913253234">ເວັບໄຊທ໌</translation> @@ -557,6 +560,7 @@ <translation id="9109747640384633967">{PERMISSIONS_SUMMARY_MIXED,plural, =1{<ph name="PERMISSION_1" />, <ph name="PERMISSION_2" /> ແລະ ອີກ <ph name="NUM_MORE" /> ລາຍການ}other{<ph name="PERMISSION_1" />, <ph name="PERMISSION_2" /> ແລະ ອີກ <ph name="NUM_MORE" /> ລາຍການ}}</translation> <translation id="913657688200966289">ເປີດການອະນຸຍາດສຳລັບ <ph name="APP_NAME" /> ໃນ <ph name="BEGIN_LINK" />ການຕັ້ງຄ່າ Android<ph name="END_LINK" />.</translation> <translation id="9138217887606523162">ຊູມປັດຈຸບັນແມ່ນ <ph name="ZOOM_LEVEL" /> %%</translation> +<translation id="9156722768168878035">ໃຫ້ Chrome ສະແດງແຖບຫຼ້າສຸດຂອງທ່ານໃນຂໍ້ມູນແອັບ ແລະ ຜົນການຊອກຫາຂອງອຸປະກອນຂອງທ່ານ. ທ່ານສາມາດປິດການຕັ້ງຄ່ານີ້ໄດ້ທຸກເວລາໃນການຕັ້ງຄ່າ Chrome.</translation> <translation id="9162462602695099906">ໜ້ານີ້ອັນຕະລາຍ</translation> <translation id="947156494302904893">ເວັບໄຊທີ່ທ່ານເຂົ້າເບິ່ງສາມາດຢັ້ງຢືນໄດ້ວ່າທ່ານແມ່ນບຸກຄົນທີ່ແທ້ຈິງ ແລະ ບໍ່ແມ່ນບັອດ</translation> <translation id="959682366969460160">ຈັດໃຫ້ເປັນລະບຽບ</translation>
diff --git a/components/browser_ui/strings/android/translations/browser_ui_strings_ms.xtb b/components/browser_ui/strings/android/translations/browser_ui_strings_ms.xtb index 3a8a4f3..bea4a64 100644 --- a/components/browser_ui/strings/android/translations/browser_ui_strings_ms.xtb +++ b/components/browser_ui/strings/android/translations/browser_ui_strings_ms.xtb
@@ -26,6 +26,7 @@ <translation id="1384959399684842514">Muat turun dijeda</translation> <translation id="1396327438254055134">Benarkan laman menggunakan pengoptimum V8.</translation> <translation id="1415402041810619267">URL terpangkas</translation> +<translation id="1415855080660575082">Benarkan Chrome berkongsi tab terbaharu anda dengan peranti anda untuk melihat tab tersebut dalam senarai apl dan hasil carian peranti anda. Anda boleh menghidupkan atau mematikan ciri ini dalam tetapan Chrome.</translation> <translation id="1448064542941920355">Zum keluar</translation> <translation id="146867109637325312">{COUNT,plural, =1{<ph name="SITE_COUNT" /> laman}other{<ph name="SITE_COUNT" /> laman}}</translation> <translation id="1500473259453106018">Sembunyikan kad penurunan harga pada tab</translation> @@ -91,6 +92,7 @@ <translation id="2438120137003069591">Anda membenarkan laman ini menggunakan kuki pihak ketiga secara sementara, bermakna kurang perlindungan penyemakan imbas tetapi ciri laman berkemungkinan besar berfungsi seperti yang dijangkakan. <ph name="BEGIN_LINK" />Hantar maklum balas<ph name="END_LINK" /></translation> <translation id="244264527810019436">Ciri pada sesetengah laman mungkin tidak berfungsi dalam mod Inkognito</translation> <translation id="2442870161001914531">Sentiasa minta laman desktop</translation> +<translation id="2445311670906052406">Kini Chrome berkongsi tab terbaharu anda dengan peranti anda. Anda akan melihat tab tersebut dalam senarai apl dan hasil carian peranti anda. Anda boleh mematikan ciri ini dalam tetapan Chrome pada bila-bila masa.</translation> <translation id="2469312991797799607">Tindakan ini akan memadamkan semua data dan kuki untuk <ph name="ORIGIN" /> dan semua laman di bawah domain ini</translation> <translation id="2482878487686419369">Pemberitahuan</translation> <translation id="2485422356828889247">Nyahpasang</translation> @@ -116,6 +118,7 @@ <translation id="2750481671343847896">Laman boleh menunjukkan gesaan log masuk daripada perkhidmatan identiti.</translation> <translation id="2787357173144933081">Mulakan Omnibox</translation> <translation id="2790501146643349491">Apabila dihidupkan, laman yang ditutup baru-baru ini dapat menyelesaikan penghantaran dan penerimaan data. Apabila dimatikan, laman yang ditutup baru-baru ini tidak dapat menyelesaikan penghantaran atau penerimaan data.</translation> +<translation id="2814830417943086299">Kini Chrome memaparkan tab terbaharu anda dalam senarai apl dan hasil carian peranti anda. Anda boleh mematikan ciri ini dalam tetapan Chrome pada bila-bila masa.</translation> <translation id="2822354292072154809">Adakah anda pasti mahu menetapkan semula semua kebenaran tapak untuk <ph name="CHOSEN_OBJECT_NAME" />?</translation> <translation id="2850913818900871965">Minta paparan mudah alih</translation> <translation id="2870560284913253234">Tapak</translation> @@ -557,6 +560,7 @@ <translation id="9109747640384633967">{PERMISSIONS_SUMMARY_MIXED,plural, =1{<ph name="PERMISSION_1" />, <ph name="PERMISSION_2" /> dan <ph name="NUM_MORE" /> lagi}other{<ph name="PERMISSION_1" />, <ph name="PERMISSION_2" /> dan <ph name="NUM_MORE" /> lagi}}</translation> <translation id="913657688200966289">Hidupkan kebenaran untuk <ph name="APP_NAME" /> dalam <ph name="BEGIN_LINK" />Tetapan Android<ph name="END_LINK" />.</translation> <translation id="9138217887606523162">Zum semasa ialah <ph name="ZOOM_LEVEL" /> %%</translation> +<translation id="9156722768168878035">Benarkan Chrome memaparkan tab terbaharu anda dalam senarai apl dan hasil carian peranti anda. Anda boleh mematikan ciri ini dalam tetapan Chrome pada bila-bila masa.</translation> <translation id="9162462602695099906">Halaman ini berbahaya</translation> <translation id="947156494302904893">Laman yang anda lawati boleh mengesahkan bahawa anda orang sebenar dan bukan bot</translation> <translation id="959682366969460160">Jadi teratur</translation>
diff --git a/components/browser_ui/strings/android/translations/browser_ui_strings_sk.xtb b/components/browser_ui/strings/android/translations/browser_ui_strings_sk.xtb index a64ad3ef..14836b4 100644 --- a/components/browser_ui/strings/android/translations/browser_ui_strings_sk.xtb +++ b/components/browser_ui/strings/android/translations/browser_ui_strings_sk.xtb
@@ -26,6 +26,7 @@ <translation id="1384959399684842514">Sťahovanie bolo pozastavené</translation> <translation id="1396327438254055134">Povoľte webu používanie optimalizátora V8.</translation> <translation id="1415402041810619267">Skrátená webová adresa</translation> +<translation id="1415855080660575082">Povoľte Chromu zdieľať vaše nedávne karty so zariadením, aby sa v ňom mohli zobrazovať v zozname aplikácií a výsledkoch vyhľadávania. Túto možnosť môžete zapnúť alebo vypnúť v nastaveniach Chromu.</translation> <translation id="1448064542941920355">Znížiť úroveň lupy</translation> <translation id="146867109637325312">{COUNT,plural, =1{<ph name="SITE_COUNT" /> webe}few{<ph name="SITE_COUNT" /> weboch}many{<ph name="SITE_COUNT" /> sites}other{<ph name="SITE_COUNT" /> weboch}}</translation> <translation id="1500473259453106018">Skryť kartu Poklesy cien na kartách</translation> @@ -91,6 +92,7 @@ <translation id="2438120137003069591">Tomuto webu ste dočasne povolili používať súbory cookie tretích strán, čo znamená nižšiu ochranu, ale funkcie webu budú s väčšou pravdepodobnosťou fungovať podľa očakávaní. <ph name="BEGIN_LINK" />Odoslať spätnú väzbu<ph name="END_LINK" /></translation> <translation id="244264527810019436">Funkcie na niektorých weboch nemusia byť v režime inkognito k dispozícii</translation> <translation id="2442870161001914531">Vždy požadovať web pre počítače</translation> +<translation id="2445311670906052406">Chrome teraz zdieľa vaše nedávne karty s vaším zariadením. Nájdete ich v zariadení v zozname aplikácií a vo výsledkoch vyhľadávania. Túto možnosť môžete kedykoľvek vypnúť v nastaveniach Chromu.</translation> <translation id="2469312991797799607">Touto akciou odstránite všetky údaje a súbory cookie domény <ph name="ORIGIN" /> a všetkých jej webov</translation> <translation id="2482878487686419369">Upozornenia</translation> <translation id="2485422356828889247">Odinštalovať</translation> @@ -116,6 +118,7 @@ <translation id="2750481671343847896">Weby môžu zobrazovať výzvy na prihlásenie od služieb identity.</translation> <translation id="2787357173144933081">Rýchly štart omniboxu</translation> <translation id="2790501146643349491">Keď je táto možnosť zapnutá, nedávno zavreté weby môžu dokončiť odosielanie a prijímanie údajov. Keď je táto možnosť vypnutá, nedávno zavreté weby nemôžu dokončiť odosielanie ani prijímanie údajov.</translation> +<translation id="2814830417943086299">Chrome teraz zobrazuje vaše nedávne karty v zozname aplikácií a výsledkoch vyhľadávania v zariadení. Túto možnosť môžete kedykoľvek vypnúť v nastaveniach Chromu.</translation> <translation id="2822354292072154809">Naozaj chcete resetovať všetky povolenia webu pre <ph name="CHOSEN_OBJECT_NAME" />?</translation> <translation id="2850913818900871965">Požadovať zobrazenie v mobile</translation> <translation id="2870560284913253234">Web</translation> @@ -557,6 +560,7 @@ <translation id="9109747640384633967">{PERMISSIONS_SUMMARY_MIXED,plural, =1{<ph name="PERMISSION_1" />, <ph name="PERMISSION_2" /> a <ph name="NUM_MORE" /> ďalšie povolenie}few{<ph name="PERMISSION_1" />, <ph name="PERMISSION_2" /> a <ph name="NUM_MORE" /> ďalšie povolenia}many{<ph name="PERMISSION_1" />, <ph name="PERMISSION_2" />, and <ph name="NUM_MORE" /> more}other{<ph name="PERMISSION_1" />, <ph name="PERMISSION_2" /> a <ph name="NUM_MORE" /> ďalších povolení}}</translation> <translation id="913657688200966289">Zapnite v <ph name="BEGIN_LINK" />nastaveniach Androidu<ph name="END_LINK" /> povolenia pre aplikáciu <ph name="APP_NAME" />.</translation> <translation id="9138217887606523162">Aktuálna úroveň lupy je <ph name="ZOOM_LEVEL" /> %%</translation> +<translation id="9156722768168878035">Povoľte Chromu zobrazovať vaše nedávne karty v zozname aplikácií a výsledkoch vyhľadávania v zariadení. Túto možnosť môžete kedykoľvek vypnúť v nastaveniach Chromu.</translation> <translation id="9162462602695099906">Táto stránka je nebezpečná</translation> <translation id="947156494302904893">Weby, ktoré navštevujete môžu skontrolovať, či ste skutočná osoba a nie robot</translation> <translation id="959682366969460160">Usporiadanie položiek</translation>
diff --git a/components/certificate_transparency/data/log_list.json b/components/certificate_transparency/data/log_list.json index 309d161..6571353 100644 --- a/components/certificate_transparency/data/log_list.json +++ b/components/certificate_transparency/data/log_list.json
@@ -1,6 +1,6 @@ { - "version": "50.44", - "log_list_timestamp": "2024-12-20T12:54:57Z", + "version": "50.46", + "log_list_timestamp": "2024-12-22T12:58:49Z", "operators": [ { "name": "Google",
diff --git a/components/collaboration/internal/collaboration_controller.cc b/components/collaboration/internal/collaboration_controller.cc index 7bd170b..1f6f712 100644 --- a/components/collaboration/internal/collaboration_controller.cc +++ b/components/collaboration/internal/collaboration_controller.cc
@@ -143,7 +143,8 @@ } }; -class AuthenticatingState : public ControllerState { +class AuthenticatingState : public ControllerState, + public CollaborationService::Observer { public: AuthenticatingState(StateId id, CollaborationController* controller) : ControllerState(id, controller) {} @@ -156,7 +157,14 @@ ServiceStatus status = controller->collaboration_service()->GetServiceStatus(); if (!status.IsAuthenticationValid()) { - HandleError(); + // Set up the timeout exit task. + collaboration_service_observer_.Observe( + controller->collaboration_service()); + base::SingleThreadTaskRunner::GetCurrentDefault()->PostDelayedTask( + FROM_HERE, + base::BindOnce(&AuthenticatingState::HandleError, + weak_ptr_factory_.GetWeakPtr()), + base::Minutes(30)); return; } @@ -164,6 +172,18 @@ controller->delegate()->NotifySignInAndSyncStatusChange(); controller->TransitionTo(StateId::kCheckingFlowRequirements); } + + // CollaborationService::Observer implementation. + void OnServiceStatusChanged(const ServiceStatusUpdate& update) override { + if (update.new_status.IsAuthenticationValid()) { + controller->delegate()->NotifySignInAndSyncStatusChange(); + controller->TransitionTo(StateId::kCheckingFlowRequirements); + } + } + + private: + base::ScopedObservation<CollaborationService, CollaborationService::Observer> + collaboration_service_observer_{this}; }; class CheckingFlowRequirementsState : public ControllerState {
diff --git a/components/collaboration/internal/collaboration_controller_unittest.cc b/components/collaboration/internal/collaboration_controller_unittest.cc index 5faf6a5..4957a467 100644 --- a/components/collaboration/internal/collaboration_controller_unittest.cc +++ b/components/collaboration/internal/collaboration_controller_unittest.cc
@@ -87,7 +87,8 @@ } protected: - base::test::SingleThreadTaskEnvironment task_environment_; + base::test::SingleThreadTaskEnvironment task_environment_{ + base::test::TaskEnvironment::TimeSource::MOCK_TIME}; base::OnceCallback<void(Outcome)> prepare_ui_callback_; MockCollaborationControllerDelegate* delegate_; std::unique_ptr<MockCollaborationService> collaboration_service_; @@ -132,8 +133,7 @@ // Simulate that the user is not already in the tab group. data_sharing::GroupId group_id(kGroupId); - const GroupToken& token = - GroupToken(data_sharing::GroupId(kGroupId), kAccessToken); + const GroupToken& token = GroupToken(group_id, kAccessToken); base::OnceCallback<void( const data_sharing::DataSharingService::GroupDataOrFailureOutcome&)> group_data_callback; @@ -268,13 +268,18 @@ IsNotNullCallback())) .WillOnce(MoveArg<1>(&error_ui_callback)); ServiceStatus status; - status.signin_status = SigninStatus::kNotSignedIn; - status.sync_status = SyncStatus::kSyncEnabled; + status.signin_status = SigninStatus::kSignedIn; + status.sync_status = SyncStatus::kNotSyncing; ASSERT_FALSE(status.IsAuthenticationValid()); EXPECT_CALL(*collaboration_service_, GetServiceStatus()) .WillOnce(Return(status)); + EXPECT_CALL(*collaboration_service_, AddObserver(_)); std::move(authentication_ui_calback).Run(Outcome::kSuccess); + EXPECT_EQ(controller_->GetStateForTesting(), StateId::kAuthenticating); + + // Reach time out. + task_environment_.FastForwardBy(base::Minutes(30)); EXPECT_EQ(controller_->GetStateForTesting(), StateId::kError); // Simulate exiting the flow. @@ -282,6 +287,51 @@ run_loop.Run(); } +TEST_F(CollaborationControllerTest, AuthenticationSuccessObserved) { + RunLoop run_loop; + // Start Join flow with authenticating screens. + base::OnceCallback<void(Outcome)> authentication_ui_calback; + InitializeJoinController(run_loop.QuitClosure()); + EXPECT_CALL(*delegate_, ShowAuthenticationUi(IsNotNullCallback())) + .WillOnce(MoveArg<0>(&authentication_ui_calback)); + controller_->SetStateForTesting(StateId::kAuthenticating); + + // Simulate Authentication finishing successfully on the UI. + ServiceStatus status; + status.signin_status = SigninStatus::kSignedIn; + status.sync_status = SyncStatus::kNotSyncing; + ASSERT_FALSE(status.IsAuthenticationValid()); + EXPECT_CALL(*collaboration_service_, GetServiceStatus()) + .WillOnce(Return(status)); + + CollaborationService::Observer* observer; + EXPECT_CALL(*collaboration_service_, AddObserver(_)) + .WillOnce(SaveArg<0>(&observer)); + std::move(authentication_ui_calback).Run(Outcome::kSuccess); + EXPECT_EQ(controller_->GetStateForTesting(), StateId::kAuthenticating); + + // Simulate observing the status change. + CollaborationService::Observer::ServiceStatusUpdate update; + update.old_status = status; + update.new_status = status; + update.new_status.sync_status = SyncStatus::kSyncEnabled; + ASSERT_TRUE(update.new_status.IsAuthenticationValid()); + EXPECT_CALL(*delegate_, NotifySignInAndSyncStatusChange()); + EXPECT_CALL(*collaboration_service_, RemoveObserver(observer)); + EXPECT_CALL(*collaboration_service_, + GetCurrentUserRoleForGroup(data_sharing::GroupId(kGroupId))) + .WillOnce(Return(data_sharing::MemberRole::kUnknown)); + EXPECT_CALL(*data_sharing_service_, ReadNewGroup(_, _)); + observer->OnServiceStatusChanged(update); + EXPECT_EQ(controller_->GetStateForTesting(), + StateId::kCheckingFlowRequirements); + + // Reach time out won't do anything since state already transitionned. + task_environment_.FastForwardBy(base::Minutes(30)); + EXPECT_EQ(controller_->GetStateForTesting(), + StateId::kCheckingFlowRequirements); +} + TEST_F(CollaborationControllerTest, CheckingFlowRequirementsShareFlow) { // Start Share flow. tab_groups::LocalTabGroupID local_id =
diff --git a/components/collaboration/internal/collaboration_service_impl.cc b/components/collaboration/internal/collaboration_service_impl.cc index 4537544..da749ca 100644 --- a/components/collaboration/internal/collaboration_service_impl.cc +++ b/components/collaboration/internal/collaboration_service_impl.cc
@@ -32,15 +32,7 @@ identity_manager_(identity_manager), sync_service_(sync_service) { // Initialize ServiceStatus. - current_status_.collaboration_status = CollaborationStatus::kDisabled; - if (base::FeatureList::IsEnabled( - data_sharing::features::kDataSharingFeature)) { - current_status_.collaboration_status = - CollaborationStatus::kEnabledCreateAndJoin; - } else if (base::FeatureList::IsEnabled( - data_sharing::features::kDataSharingJoinOnly)) { - current_status_.collaboration_status = CollaborationStatus::kAllowedToJoin; - } + current_status_.collaboration_status = GetCollaborationStatus(); current_status_.sync_status = GetSyncStatus(); sync_observer_.Observe(sync_service_); @@ -57,6 +49,16 @@ return false; } +void CollaborationServiceImpl::AddObserver( + CollaborationService::Observer* observer) { + observers_.AddObserver(observer); +} + +void CollaborationServiceImpl::RemoveObserver( + CollaborationService::Observer* observer) { + observers_.RemoveObserver(observer); +} + void CollaborationServiceImpl::StartJoinFlow( std::unique_ptr<CollaborationControllerDelegate> delegate, const GURL& url) { @@ -145,14 +147,7 @@ } void CollaborationServiceImpl::OnStateChanged(syncer::SyncService* sync) { - SyncStatus new_status = GetSyncStatus(); - - if (current_status_.sync_status == new_status) { - return; - } - - current_status_.sync_status = new_status; - // TODO(crbug.com/380145739): Notify observers. + RefreshServiceStatus(); } void CollaborationServiceImpl::OnSyncShutdown(syncer::SyncService* sync) { @@ -161,17 +156,17 @@ void CollaborationServiceImpl::OnPrimaryAccountChanged( const signin::PrimaryAccountChangeEvent& event_details) { - RefreshSigninStatus(); + RefreshServiceStatus(); } void CollaborationServiceImpl::OnRefreshTokenUpdatedForAccount( const CoreAccountInfo& account_info) { - RefreshSigninStatus(); + RefreshServiceStatus(); } void CollaborationServiceImpl::OnRefreshTokenRemovedForAccount( const CoreAccountId& account_id) { - RefreshSigninStatus(); + RefreshServiceStatus(); } void CollaborationServiceImpl::OnIdentityManagerShutdown( @@ -233,14 +228,34 @@ return status; } -void CollaborationServiceImpl::RefreshSigninStatus() { - SigninStatus new_status = GetSigninStatus(); - if (current_status_.signin_status == new_status) { - return; +CollaborationStatus CollaborationServiceImpl::GetCollaborationStatus() { + // TODO(haileywang): Support collaboration status updates. + CollaborationStatus status = CollaborationStatus::kDisabled; + if (base::FeatureList::IsEnabled( + data_sharing::features::kDataSharingFeature)) { + status = CollaborationStatus::kEnabledCreateAndJoin; + } else if (base::FeatureList::IsEnabled( + data_sharing::features::kDataSharingJoinOnly)) { + status = CollaborationStatus::kAllowedToJoin; } - current_status_.signin_status = new_status; - // TODO(crbug.com/380145739): Notify observers. + return status; +} + +void CollaborationServiceImpl::RefreshServiceStatus() { + ServiceStatus new_status; + new_status.sync_status = GetSyncStatus(); + new_status.signin_status = GetSigninStatus(); + new_status.collaboration_status = GetCollaborationStatus(); + + if (new_status != current_status_) { + CollaborationService::Observer::ServiceStatusUpdate update; + update.new_status = new_status; + update.old_status = current_status_; + current_status_ = new_status; + observers_.Notify(&CollaborationService::Observer::OnServiceStatusChanged, + update); + } } } // namespace collaboration
diff --git a/components/collaboration/internal/collaboration_service_impl.h b/components/collaboration/internal/collaboration_service_impl.h index 6a7ab04c..b59ad3f8 100644 --- a/components/collaboration/internal/collaboration_service_impl.h +++ b/components/collaboration/internal/collaboration_service_impl.h
@@ -43,6 +43,8 @@ // CollaborationService implementation. bool IsEmptyService() override; + void AddObserver(CollaborationService::Observer* observer) override; + void RemoveObserver(CollaborationService::Observer* observer) override; void StartJoinFlow(std::unique_ptr<CollaborationControllerDelegate> delegate, const GURL& url) override; void StartShareOrManageFlow( @@ -80,7 +82,8 @@ private: SyncStatus GetSyncStatus(); SigninStatus GetSigninStatus(); - void RefreshSigninStatus(); + CollaborationStatus GetCollaborationStatus(); + void RefreshServiceStatus(); ServiceStatus current_status_; base::ScopedObservation<syncer::SyncService, syncer::SyncServiceObserver> @@ -88,6 +91,7 @@ base::ScopedObservation<signin::IdentityManager, signin::IdentityManager::Observer> identity_manager_observer_{this}; + base::ObserverList<CollaborationService::Observer> observers_; // Service providing information about tabs and tab groups. const raw_ptr<tab_groups::TabGroupSyncService> tab_group_sync_service_;
diff --git a/components/collaboration/internal/empty_collaboration_service.cc b/components/collaboration/internal/empty_collaboration_service.cc index a0fd69ae..aebf654 100644 --- a/components/collaboration/internal/empty_collaboration_service.cc +++ b/components/collaboration/internal/empty_collaboration_service.cc
@@ -14,6 +14,10 @@ return true; } +void EmptyCollaborationService::AddObserver(Observer* observer) {} + +void EmptyCollaborationService::RemoveObserver(Observer* observer) {} + void EmptyCollaborationService::StartJoinFlow( std::unique_ptr<CollaborationControllerDelegate> delegate, const GURL& url) {}
diff --git a/components/collaboration/internal/empty_collaboration_service.h b/components/collaboration/internal/empty_collaboration_service.h index 988b260d4..03da911 100644 --- a/components/collaboration/internal/empty_collaboration_service.h +++ b/components/collaboration/internal/empty_collaboration_service.h
@@ -18,6 +18,8 @@ // CollaborationService implementation. bool IsEmptyService() override; + void AddObserver(Observer* observer) override; + void RemoveObserver(Observer* observer) override; void StartJoinFlow(std::unique_ptr<CollaborationControllerDelegate> delegate, const GURL& url) override; void StartShareOrManageFlow(
diff --git a/components/collaboration/public/collaboration_service.h b/components/collaboration/public/collaboration_service.h index 32dd4fe..7fbcf5b 100644 --- a/components/collaboration/public/collaboration_service.h +++ b/components/collaboration/public/collaboration_service.h
@@ -5,6 +5,7 @@ #ifndef COMPONENTS_COLLABORATION_PUBLIC_COLLABORATION_SERVICE_H_ #define COMPONENTS_COLLABORATION_PUBLIC_COLLABORATION_SERVICE_H_ +#include "base/observer_list_types.h" #include "base/supports_user_data.h" #include "build/build_config.h" #include "components/collaboration/public/collaboration_controller_delegate.h" @@ -24,6 +25,23 @@ class CollaborationService : public KeyedService, public base::SupportsUserData { public: + class Observer : public base::CheckedObserver { + public: + struct ServiceStatusUpdate { + ServiceStatus old_status; + ServiceStatus new_status; + + // Helper methods. + }; + Observer() = default; + Observer(const Observer&) = delete; + Observer& operator=(const Observer&) = delete; + ~Observer() override = default; + + // Called when service status has changed. + virtual void OnServiceStatusChanged(const ServiceStatusUpdate& update) {} + }; + #if BUILDFLAG(IS_ANDROID) // Returns a Java object of the type CollaborationService for the given // CollaborationService. @@ -43,6 +61,9 @@ // using an empty service from the Chrome embedder. virtual bool IsEmptyService() = 0; + virtual void AddObserver(Observer* observer) = 0; + virtual void RemoveObserver(Observer* observer) = 0; + // Starts a new join flow. This will cancel all existing ongoing join and // share flows in the same browser instance. virtual void StartJoinFlow(
diff --git a/components/collaboration/public/service_status.cc b/components/collaboration/public/service_status.cc index f20ed85..68e9857 100644 --- a/components/collaboration/public/service_status.cc +++ b/components/collaboration/public/service_status.cc
@@ -36,10 +36,16 @@ } // LINT.ThenChange(//components/collaboration/public/android/java/src/org/chromium/components/collaboration/ServiceStatus.java) -bool ServiceStatus::IsAuthenticationValid() { +bool ServiceStatus::IsAuthenticationValid() const { // This is only used in native code. return signin_status == SigninStatus::kSignedIn && sync_status == SyncStatus::kSyncEnabled; } +bool operator==(const ServiceStatus& lhs, const ServiceStatus& rhs) { + return lhs.signin_status == rhs.signin_status && + lhs.sync_status == rhs.sync_status && + lhs.collaboration_status == rhs.collaboration_status; +} + } // namespace collaboration
diff --git a/components/collaboration/public/service_status.h b/components/collaboration/public/service_status.h index c992eb30..e9bea9c8 100644 --- a/components/collaboration/public/service_status.h +++ b/components/collaboration/public/service_status.h
@@ -56,9 +56,11 @@ // Whether the current user is logged in and sync enabled. This will fail if // the current user's account is paused. - bool IsAuthenticationValid(); + bool IsAuthenticationValid() const; }; +bool operator==(const ServiceStatus& lhs, const ServiceStatus& rhs); + } // namespace collaboration #endif // COMPONENTS_COLLABORATION_PUBLIC_SERVICE_STATUS_H_
diff --git a/components/collaboration/test_support/mock_collaboration_service.h b/components/collaboration/test_support/mock_collaboration_service.h index 1d8e15d..97747af 100644 --- a/components/collaboration/test_support/mock_collaboration_service.h +++ b/components/collaboration/test_support/mock_collaboration_service.h
@@ -16,6 +16,8 @@ ~MockCollaborationService() override; MOCK_METHOD(bool, IsEmptyService, (), (override)); + MOCK_METHOD1(AddObserver, void(Observer*)); + MOCK_METHOD1(RemoveObserver, void(Observer*)); MOCK_METHOD(void, StartJoinFlow, (std::unique_ptr<CollaborationControllerDelegate> delegate,
diff --git a/components/country_codes/country_codes.cc b/components/country_codes/country_codes.cc index 3a4aa8ad..7e6cdde 100644 --- a/components/country_codes/country_codes.cc +++ b/components/country_codes/country_codes.cc
@@ -48,8 +48,9 @@ // SPECIAL CASE: Timor-Leste changed from 'TP' to 'TL' in 2002. Windows XP // predates this; we therefore map this value. - if (c1 == 'T' && c2 == 'P') + if (c1 == 'T' && c2 == 'P') { c2 = 'L'; + } return CountryCharsToCountryID(c1, c2); } @@ -122,8 +123,9 @@ } int GetCountryIDFromPrefs(PrefService* prefs) { - if (!prefs) + if (!prefs) { return GetCurrentCountryID(); + } // Cache first run Country ID value in prefs, and use it afterwards. This // ensures that just because the user moves around, we won't automatically @@ -162,8 +164,9 @@ base::apple::ScopedCFTypeRef<CFLocaleRef> locale(CFLocaleCopyCurrent()); CFStringRef country = (CFStringRef)CFLocaleGetValue(locale.get(), kCFLocaleCountryCode); - if (!country) + if (!country) { return kCountryIDUnknown; + } UniChar isobuf[2]; CFRange char_range = CFRangeMake(0, 2); @@ -183,8 +186,9 @@ int GetCurrentCountryID() { const char* locale = setlocale(LC_MESSAGES, nullptr); - if (!locale) + if (!locale) { return kCountryIDUnknown; + } // The format of a locale name is: // language[_territory][.codeset][@modifier], where territory is an ISO 3166 @@ -193,8 +197,9 @@ // First remove the language portion. std::string locale_str(locale); size_t territory_delim = locale_str.find('_'); - if (territory_delim == std::string::npos) + if (territory_delim == std::string::npos) { return kCountryIDUnknown; + } locale_str.erase(0, territory_delim + 1); // Next remove any codeset/modifier portion and uppercase. @@ -208,8 +213,9 @@ // We only use the lowest 16 bits to build two ASCII characters. If there is // more than that, the ID is invalid. The check for positive integers also // handles the |kCountryIDUnknown| case. - if ((country_id & 0xFFFF) != country_id || country_id < 0) + if ((country_id & 0xFFFF) != country_id || country_id < 0) { return kCountryCodeUnknown; + } // Decode the country code string from the provided integer. The first two // bytes of the country ID represent two ASCII chars.
diff --git a/components/country_codes/country_codes_unittest.cc b/components/country_codes/country_codes_unittest.cc index 98dc975..dbd3c67 100644 --- a/components/country_codes/country_codes_unittest.cc +++ b/components/country_codes/country_codes_unittest.cc
@@ -2,10 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "components/country_codes/country_codes.h" + #include <string> #include <vector> -#include "components/country_codes/country_codes.h" #include "testing/gtest/include/gtest/gtest.h" namespace country_codes {
diff --git a/components/eye_dropper/eye_dropper_view_aura.cc b/components/eye_dropper/eye_dropper_view_aura.cc index 4ac8595..69e8d461 100644 --- a/components/eye_dropper/eye_dropper_view_aura.cc +++ b/components/eye_dropper/eye_dropper_view_aura.cc
@@ -2,12 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/eye_dropper/eye_dropper_view.h" - #include <algorithm> #include "base/memory/raw_ptr.h" #include "build/build_config.h" +#include "components/eye_dropper/eye_dropper_view.h" #include "ui/aura/client/cursor_client.h" #include "ui/aura/client/focus_change_observer.h" #include "ui/aura/client/focus_client.h"
diff --git a/components/google/core/common/google_util.cc b/components/google/core/common/google_util.cc index 77e916a4b..cc05afba 100644 --- a/components/google/core/common/google_util.cc +++ b/components/google/core/common/google_util.cc
@@ -42,8 +42,9 @@ // Removes a single trailing dot if present in |host|. void StripTrailingDot(std::string_view* host) { - if (base::EndsWith(*host, ".")) + if (base::EndsWith(*host, ".")) { host->remove_suffix(1); + } } // True if the given canonical |host| is "[www.]<domain_in_lower_case>.<TLD>" @@ -64,8 +65,9 @@ net::registry_controlled_domains::GetCanonicalHostRegistryLength( host, net::registry_controlled_domains::EXCLUDE_UNKNOWN_REGISTRIES, net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES); - if ((tld_length == 0) || (tld_length == std::string::npos)) + if ((tld_length == 0) || (tld_length == std::string::npos)) { return false; + } // Removes the tld and the preceding dot. std::string_view host_minus_tld = @@ -75,11 +77,13 @@ // Remove the trailing dot from tld if present, as for Google domains it's the // same page. StripTrailingDot(&tld); - if (!allowed_tlds.contains(tld)) + if (!allowed_tlds.contains(tld)) { return false; + } - if (base::EqualsCaseInsensitiveASCII(host_minus_tld, domain_in_lower_case)) + if (base::EqualsCaseInsensitiveASCII(host_minus_tld, domain_in_lower_case)) { return true; + } if (subdomain_permission == ALLOW_SUBDOMAIN) { std::string dot_domain = base::StrCat({".", domain_in_lower_case}); @@ -106,8 +110,9 @@ bool IsCanonicalHostGoogleHostname(std::string_view canonical_host, SubdomainPermission subdomain_permission) { const GURL& base_url(CommandLineGoogleBaseURL()); - if (base_url.is_valid() && (canonical_host == base_url.host_piece())) + if (base_url.is_valid() && (canonical_host == base_url.host_piece())) { return true; + } static constexpr auto google_tlds = base::MakeFixedFlatSet<std::string_view>({GOOGLE_TLD_LIST}); @@ -128,8 +133,9 @@ // Google subdomains for google search, and an HTTP or HTTPS scheme. Requires // |url| to use the standard port for its scheme (80 for HTTP, 443 for HTTPS). bool IsGoogleSearchSubdomainUrl(const GURL& url) { - if (!IsValidURL(url, PortPermission::DISALLOW_NON_STANDARD_PORTS)) + if (!IsValidURL(url, PortPermission::DISALLOW_NON_STANDARD_PORTS)) { return false; + } std::string_view host(url.host_piece()); StripTrailingDot(&host); @@ -151,8 +157,9 @@ url::Component query(0, static_cast<int>(str.length())), key, value; while (url::ExtractQueryKeyValue(str, &query, &key, &value)) { std::string_view key_str = str.substr(key.begin, key.len); - if (key_str == "q" || key_str == "as_q" || key_str == "imgurl") + if (key_str == "q" || key_str == "as_q" || key_str == "imgurl") { return true; + } } return false; } @@ -173,20 +180,24 @@ // TODO(igorcov): This needs a fix for case when the host has a trailing dot, // like "google.com./". https://crbug.com/720295. const size_t last_dot = google_hostname.find_last_of('.'); - if (last_dot == std::string::npos) + if (last_dot == std::string::npos) { return std::string(); + } std::string_view country_code = google_hostname.substr(last_dot + 1); // Assume the com TLD implies the US. - if (country_code == "com") + if (country_code == "com") { return "us"; + } // Google uses the Unicode Common Locale Data Repository (CLDR), and the CLDR // code for the UK is "gb". - if (country_code == "uk") + if (country_code == "uk") { return "gb"; + } // Catalonia does not have a CLDR country code, since it's a region in Spain, // so use Spain instead. - if (country_code == "cat") + if (country_code == "cat") { return "es"; + } return std::string(country_code); } @@ -211,8 +222,9 @@ if (current_switch_value != *switch_value) { *switch_value = current_switch_value; *base_url = url_formatter::FixupURL(*switch_value, std::string()); - if (!base_url->is_valid() || base_url->has_query() || base_url->has_ref()) + if (!base_url->is_valid() || base_url->has_query() || base_url->has_ref()) { *base_url = GURL(); + } } return *base_url; } @@ -263,8 +275,9 @@ // Make sure the path is a known search path. std::string_view path(url.path_piece()); bool is_home_page_base = IsPathHomePageBase(path); - if (!is_home_page_base && path != "/search" && path != "/imgres") + if (!is_home_page_base && path != "/search" && path != "/imgres") { return false; + } // Check for query parameter in URL parameter and hash fragment, depending on // the path type. @@ -280,11 +293,13 @@ } bool IsGoogleAssociatedDomainUrl(const GURL& url) { - if (IsGoogleDomainUrl(url, ALLOW_SUBDOMAIN, ALLOW_NON_STANDARD_PORTS)) + if (IsGoogleDomainUrl(url, ALLOW_SUBDOMAIN, ALLOW_NON_STANDARD_PORTS)) { return true; + } - if (IsYoutubeDomainUrl(url, ALLOW_SUBDOMAIN, ALLOW_NON_STANDARD_PORTS)) + if (IsYoutubeDomainUrl(url, ALLOW_SUBDOMAIN, ALLOW_NON_STANDARD_PORTS)) { return true; + } // Some domains don't have international TLD extensions, so testing for them // is very straightforward. @@ -316,8 +331,9 @@ "googleweblight.com", }; for (size_t i = 0; i < std::size(kHostsToSetHeadersFor); ++i) { - if (base::EqualsCaseInsensitiveASCII(host, kHostsToSetHeadersFor[i])) + if (base::EqualsCaseInsensitiveASCII(host, kHostsToSetHeadersFor[i])) { return true; + } } return false;
diff --git a/components/infobars/android/confirm_infobar.cc b/components/infobars/android/confirm_infobar.cc index 0343e07..c486b319 100644 --- a/components/infobars/android/confirm_infobar.cc +++ b/components/infobars/android/confirm_infobar.cc
@@ -66,23 +66,27 @@ void ConfirmInfoBar::OnLinkClicked(JNIEnv* env, const JavaParamRef<jobject>& obj) { - if (!owner()) + if (!owner()) { return; // We're closing; don't call anything, it might access the owner. + } - if (GetDelegate()->LinkClicked(WindowOpenDisposition::NEW_FOREGROUND_TAB)) + if (GetDelegate()->LinkClicked(WindowOpenDisposition::NEW_FOREGROUND_TAB)) { RemoveSelf(); + } } void ConfirmInfoBar::ProcessButton(int action) { - if (!owner()) + if (!owner()) { return; // We're closing; don't call anything, it might access the owner. + } DCHECK((action == InfoBarAndroid::ACTION_OK) || (action == InfoBarAndroid::ACTION_CANCEL)); ConfirmInfoBarDelegate* delegate = GetDelegate(); if ((action == InfoBarAndroid::ACTION_OK) ? delegate->Accept() - : delegate->Cancel()) + : delegate->Cancel()) { RemoveSelf(); + } } } // namespace infobars
diff --git a/components/infobars/android/infobar_android.cc b/components/infobars/android/infobar_android.cc index ebdca564..59e9b19 100644 --- a/components/infobars/android/infobar_android.cc +++ b/components/infobars/android/infobar_android.cc
@@ -62,8 +62,9 @@ void InfoBarAndroid::OnCloseButtonClicked(JNIEnv* env, const JavaParamRef<jobject>& obj) { - if (!owner()) + if (!owner()) { return; // We're closing; don't call anything, it might access the owner. + } delegate()->InfoBarDismissed(); RemoveSelf(); }
diff --git a/components/infobars/content/content_infobar_manager.cc b/components/infobars/content/content_infobar_manager.cc index bc76225..0158d6e 100644 --- a/components/infobars/content/content_infobar_manager.cc +++ b/components/infobars/content/content_infobar_manager.cc
@@ -34,8 +34,9 @@ // static content::WebContents* ContentInfoBarManager::WebContentsFromInfoBar( InfoBar* infobar) { - if (!infobar || !infobar->owner()) + if (!infobar || !infobar->owner()) { return nullptr; + } ContentInfoBarManager* infobar_manager = static_cast<ContentInfoBarManager*>(infobar->owner()); return infobar_manager->web_contents(); @@ -48,8 +49,9 @@ // Infobar animations cause viewport resizes. Disable them for automated // tests, since they could lead to flakiness. if (base::CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnableAutomation)) + switches::kEnableAutomation)) { set_animations_enabled(false); + } } ContentInfoBarManager::~ContentInfoBarManager() { @@ -84,8 +86,9 @@ ui::PageTransitionCoreTypeIs(load_details.entry->GetTransitionType(), ui::PAGE_TRANSITION_RELOAD); ignore_next_reload_ = false; - if (!ignore) + if (!ignore) { OnNavigation(NavigationDetailsFromLoadCommittedDetails(load_details)); + } } void ContentInfoBarManager::WebContentsDestroyed() {
diff --git a/components/infobars/core/infobar.cc b/components/infobars/core/infobar.cc index 7222967..62cf94c 100644 --- a/components/infobars/core/infobar.cc +++ b/components/infobars/core/infobar.cc
@@ -80,8 +80,9 @@ } void InfoBar::RemoveSelf() { - if (owner_) + if (owner_) { owner_->RemoveInfoBar(this); + } } void InfoBar::SetTargetHeight(int height) { @@ -110,8 +111,9 @@ // with bogus sizes, because if we're ever re-added to a container, it will // call Show(false) while re-adding us, which will compute a correct set of // sizes. - if (!container_ || !container_->delegate()) + if (!container_ || !container_->delegate()) { return; + } int old_height = height_; height_ = animation_.CurrentValueBetween(0, target_height_); @@ -119,17 +121,20 @@ // Don't re-layout if nothing has changed, e.g. because the animation step was // not large enough to actually change the height by at least a pixel. bool height_differs = old_height != height_; - if (height_differs) + if (height_differs) { PlatformSpecificOnHeightRecalculated(); + } - if (height_differs || force_notify) + if (height_differs || force_notify) { container_->OnInfoBarStateChanged(animation_.is_animating()); + } } void InfoBar::MaybeDelete() { if (!owner_ && (animation_.GetCurrentValue() == 0.0)) { - if (container_) + if (container_) { container_->RemoveInfoBar(this); + } delete this; } }
diff --git a/components/infobars/core/infobar_container.cc b/components/infobars/core/infobar_container.cc index 1c8cbd05..8d2087d 100644 --- a/components/infobars/core/infobar_container.cc +++ b/components/infobars/core/infobar_container.cc
@@ -17,8 +17,7 @@ namespace infobars { -InfoBarContainer::Delegate::~Delegate() { -} +InfoBarContainer::Delegate::~Delegate() {} InfoBarContainer::InfoBarContainer(Delegate* delegate) : delegate_(delegate), @@ -28,13 +27,15 @@ InfoBarContainer::~InfoBarContainer() { // RemoveAllInfoBarsForDestruction() should have already cleared our infobars. DCHECK(infobars_.empty()); - if (infobar_manager_) + if (infobar_manager_) { infobar_manager_->RemoveObserver(this); + } } void InfoBarContainer::ChangeInfoBarManager(InfoBarManager* infobar_manager) { - if (infobar_manager_) + if (infobar_manager_) { infobar_manager_->RemoveObserver(this); + } bool state_changed = false; { @@ -64,15 +65,18 @@ } // Now that everything is up to date, signal the delegate to re-layout. - if (state_changed) + if (state_changed) { OnInfoBarStateChanged(false); + } } void InfoBarContainer::OnInfoBarStateChanged(bool is_animating) { - if (ignore_infobar_state_changed_) + if (ignore_infobar_state_changed_) { return; - if (delegate_) + } + if (delegate_) { delegate_->InfoBarContainerStateChanged(is_animating); + } PlatformSpecificInfoBarStateChanged(is_animating); }
diff --git a/components/infobars/core/infobar_delegate.cc b/components/infobars/core/infobar_delegate.cc index f0ab939..6d23770 100644 --- a/components/infobars/core/infobar_delegate.cc +++ b/components/infobars/core/infobar_delegate.cc
@@ -20,8 +20,7 @@ const int InfoBarDelegate::kNoIconID = 0; -InfoBarDelegate::~InfoBarDelegate() { -} +InfoBarDelegate::~InfoBarDelegate() {} int InfoBarDelegate::GetIconId() const { return kNoIconID; @@ -35,9 +34,10 @@ ui::ImageModel InfoBarDelegate::GetIcon() const { #if !BUILDFLAG(IS_IOS) && !BUILDFLAG(IS_ANDROID) const gfx::VectorIcon& vector_icon = GetVectorIcon(); - if (!vector_icon.is_empty()) + if (!vector_icon.is_empty()) { return ui::ImageModel::FromVectorIcon(vector_icon, ui::kColorInfoBarIcon, 20); + } #endif int icon_id = GetIconId(); @@ -62,13 +62,13 @@ bool InfoBarDelegate::ShouldExpire(const NavigationDetails& details) const { return details.is_navigation_to_different_page && - !details.did_replace_entry && - // This next condition ensures a navigation that passes the above - // conditions doesn't dismiss infobars added while that navigation was - // already in process. We carve out an exception for reloads since we - // want reloads to dismiss infobars, but they will have unchanged entry - // IDs. - ((nav_entry_id_ != details.entry_id) || details.is_reload); + !details.did_replace_entry && + // This next condition ensures a navigation that passes the above + // conditions doesn't dismiss infobars added while that navigation was + // already in process. We carve out an exception for reloads since we + // want reloads to dismiss infobars, but they will have unchanged entry + // IDs. + ((nav_entry_id_ != details.entry_id) || details.is_reload); } bool InfoBarDelegate::LinkClicked(WindowOpenDisposition disposition) { @@ -76,8 +76,7 @@ return false; } -void InfoBarDelegate::InfoBarDismissed() { -} +void InfoBarDelegate::InfoBarDismissed() {} bool InfoBarDelegate::IsCloseable() const { return true; @@ -97,13 +96,13 @@ } ThemeInstalledInfoBarDelegate* - InfoBarDelegate::AsThemePreviewInfobarDelegate() { +InfoBarDelegate::AsThemePreviewInfobarDelegate() { return nullptr; } #if BUILDFLAG(IS_IOS) translate::TranslateInfoBarDelegate* - InfoBarDelegate::AsTranslateInfoBarDelegate() { +InfoBarDelegate::AsTranslateInfoBarDelegate() { return nullptr; } #endif
diff --git a/components/infobars/core/infobar_delegate.h b/components/infobars/core/infobar_delegate.h index 22d21fd2..b7c5c6d 100644 --- a/components/infobars/core/infobar_delegate.h +++ b/components/infobars/core/infobar_delegate.h
@@ -32,7 +32,7 @@ namespace gfx { class Image; struct VectorIcon; -} +} // namespace gfx namespace ui { class ImageModel;
diff --git a/components/infobars/core/infobar_manager.cc b/components/infobars/core/infobar_manager.cc index f6f47ef1..30d3a5e 100644 --- a/components/infobars/core/infobar_manager.cc +++ b/components/infobars/core/infobar_manager.cc
@@ -34,23 +34,17 @@ // InfoBarManager::Observer --------------------------------------------------- -InfoBarManager::Observer::~Observer() { -} +InfoBarManager::Observer::~Observer() {} -void InfoBarManager::Observer::OnInfoBarAdded(InfoBar* infobar) { -} +void InfoBarManager::Observer::OnInfoBarAdded(InfoBar* infobar) {} void InfoBarManager::Observer::OnInfoBarRemoved(InfoBar* infobar, - bool animate) { -} + bool animate) {} void InfoBarManager::Observer::OnInfoBarReplaced(InfoBar* old_infobar, - InfoBar* new_infobar) { -} + InfoBar* new_infobar) {} -void InfoBarManager::Observer::OnManagerShuttingDown(InfoBarManager* manager) { -} - +void InfoBarManager::Observer::OnManagerShuttingDown(InfoBarManager* manager) {} // InfoBarManager -------------------------------------------------------------- @@ -74,8 +68,9 @@ infobars_.push_back(infobar_ptr); infobar_ptr->SetOwner(this); - for (Observer& observer : observer_list_) + for (Observer& observer : observer_list_) { observer.OnInfoBarAdded(infobar_ptr); + } return infobar_ptr; } @@ -85,8 +80,9 @@ } void InfoBarManager::RemoveAllInfoBars(bool animate) { - while (!infobars_.empty()) + while (!infobars_.empty()) { RemoveInfoBarInternal(infobars_.back(), animate); + } } InfoBar* InfoBarManager::ReplaceInfoBar(InfoBar* old_infobar, @@ -110,8 +106,9 @@ // to AddInfoBar() or similar, we don't dupe-check against this infobar. infobars_.erase(++i); - for (Observer& observer : observer_list_) + for (Observer& observer : observer_list_) { observer.OnInfoBarReplaced(old_infobar, new_infobar_ptr); + } old_infobar->CloseSoon(); return new_infobar_ptr; @@ -133,8 +130,9 @@ // Destroy all remaining InfoBars. It's important to not animate here so that // we guarantee that we'll delete all delegates before we do anything else. RemoveAllInfoBars(false); - for (Observer& observer : observer_list_) + for (Observer& observer : observer_list_) { observer.OnManagerShuttingDown(this); + } } void InfoBarManager::OnNavigation( @@ -144,8 +142,9 @@ // delegate list. for (size_t i = infobars_.size(); i > 0; --i) { InfoBar* infobar = infobars_[i - 1]; - if (infobar->delegate()->ShouldExpire(details)) + if (infobar->delegate()->ShouldExpire(details)) { RemoveInfoBar(infobar); + } } } @@ -164,8 +163,9 @@ // This notification must happen before the call to CloseSoon() below, since // observers may want to access |infobar| and that call can delete it. - for (Observer& observer : observer_list_) + for (Observer& observer : observer_list_) { observer.OnInfoBarRemoved(infobar, animate); + } infobar->CloseSoon(); }
diff --git a/components/infobars/core/infobar_manager.h b/components/infobars/core/infobar_manager.h index 98be6121..6b98977 100644 --- a/components/infobars/core/infobar_manager.h +++ b/components/infobars/core/infobar_manager.h
@@ -32,8 +32,7 @@ virtual void OnInfoBarAdded(InfoBar* infobar); virtual void OnInfoBarRemoved(InfoBar* infobar, bool animate); - virtual void OnInfoBarReplaced(InfoBar* old_infobar, - InfoBar* new_infobar); + virtual void OnInfoBarReplaced(InfoBar* old_infobar, InfoBar* new_infobar); virtual void OnManagerShuttingDown(InfoBarManager* manager); };
diff --git a/components/invalidation/impl/invalidator_registrar_with_memory.cc b/components/invalidation/impl/invalidator_registrar_with_memory.cc index 20ae09ce..404590d 100644 --- a/components/invalidation/impl/invalidator_registrar_with_memory.cc +++ b/components/invalidation/impl/invalidator_registrar_with_memory.cc
@@ -63,10 +63,6 @@ } // namespace -BASE_FEATURE(kRestoreInterestingTopicsFeature, - "InvalidatorRestoreInterestingTopics", - base::FEATURE_ENABLED_BY_DEFAULT); - // static void InvalidatorRegistrarWithMemory::RegisterProfilePrefs( PrefRegistrySimple* registry) { @@ -95,9 +91,6 @@ update->Set(sender_id_, base::Value::Dict()); return; } - // Restore |handler_name_to_subscribed_topics_map_| from prefs. - if (!base::FeatureList::IsEnabled(kRestoreInterestingTopicsFeature)) - return; for (auto it : *pref_data) { const std::string& topic_name = it.first; if (it.second.is_dict()) {
diff --git a/components/invalidation/impl/invalidator_registrar_with_memory.h b/components/invalidation/impl/invalidator_registrar_with_memory.h index 031d352..72a838e 100644 --- a/components/invalidation/impl/invalidator_registrar_with_memory.h +++ b/components/invalidation/impl/invalidator_registrar_with_memory.h
@@ -26,8 +26,6 @@ class Invalidation; -BASE_DECLARE_FEATURE(kRestoreInterestingTopicsFeature); - // A helper class for FCMInvalidationService. It helps keep track of registered // handlers and which topic registrations are associated with each handler. class INVALIDATION_EXPORT InvalidatorRegistrarWithMemory {
diff --git a/components/invalidation/impl/invalidator_registrar_with_memory_unittest.cc b/components/invalidation/impl/invalidator_registrar_with_memory_unittest.cc index e5d2f3f0..26daba7 100644 --- a/components/invalidation/impl/invalidator_registrar_with_memory_unittest.cc +++ b/components/invalidation/impl/invalidator_registrar_with_memory_unittest.cc
@@ -271,9 +271,6 @@ } TEST_F(InvalidatorRegistrarWithMemoryTest, RestoresInterestingTopics) { - base::test::ScopedFeatureList feature_list; - feature_list.InitAndEnableFeature(kRestoreInterestingTopicsFeature); - TestingPrefServiceSimple pref_service; InvalidatorRegistrarWithMemory::RegisterProfilePrefs(pref_service.registry());
diff --git a/components/metrics/metrics_service.cc b/components/metrics/metrics_service.cc index 05d1f86..5c4e3f82 100644 --- a/components/metrics/metrics_service.cc +++ b/components/metrics/metrics_service.cc
@@ -480,10 +480,6 @@ return state_manager_->GetPseudoLowEntropySource(); } -void MetricsService::SetExternalClientId(const std::string& id) { - state_manager_->SetExternalClientId(id); -} - bool MetricsService::WasLastShutdownClean() const { return state_manager_->clean_exit_beacon()->exited_cleanly(); } @@ -515,8 +511,6 @@ action_callback_ = base::BindRepeating(&MetricsService::OnUserAction, base::Unretained(this)); base::AddActionCallback(action_callback_); - - enablement_observers_.Notify(/*enabled=*/true); } void MetricsService::DisableRecording() { @@ -540,8 +534,6 @@ // those histograms. To ensure that this independent log contains histograms // that we wish to appear in every log, call OnDidCreateMetricsLog(). delegating_provider_.OnDidCreateMetricsLog(); - - enablement_observers_.Notify(/*enabled=*/false); } bool MetricsService::recording_active() const { @@ -1387,11 +1379,6 @@ logs_event_manager_.RemoveObserver(observer); } -base::CallbackListSubscription MetricsService::AddEnablementObserver( - const base::RepeatingCallback<void(bool)>& observer) { - return enablement_observers_.Add(observer); -} - void MetricsService::SetPersistentSystemProfile( const std::string& serialized_proto, bool complete) {
diff --git a/components/metrics/metrics_service.h b/components/metrics/metrics_service.h index eb4b516..fe275563 100644 --- a/components/metrics/metrics_service.h +++ b/components/metrics/metrics_service.h
@@ -15,7 +15,6 @@ #include <string> #include "base/callback_list.h" -#include "base/functional/bind.h" #include "base/functional/callback_forward.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" @@ -110,14 +109,6 @@ int GetOldLowEntropySource(); int GetPseudoLowEntropySource(); - // Set an external provided id for the metrics service. This method can be - // set by a caller which wants to explicitly control the *next* id used by the - // metrics service. Note that setting the external client id will *not* change - // the current metrics client id. In order to change the current client id, - // callers should call ResetClientId to change the current client id to the - // provided id. - void SetExternalClientId(const std::string& id); - // Returns the date at which the current metrics client ID was created as // an int64_t containing seconds since the epoch. int64_t GetMetricsReportingEnabledDate(); @@ -270,12 +261,6 @@ return logs_event_observer_.get(); } - // Observers will be notified when the enablement state changes. The callback - // should accept one boolean argument, which will signal whether or not the - // metrics collection has been enabled. - base::CallbackListSubscription AddEnablementObserver( - const base::RepeatingCallback<void(bool)>& observer); - #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) bool IsInForegroundForTesting() const { return is_in_foreground_; } #endif @@ -641,9 +626,6 @@ // page. std::unique_ptr<MetricsServiceObserver> logs_event_observer_; - // A set of observers that keeps track of the metrics reporting state. - base::RepeatingCallbackList<void(bool)> enablement_observers_; - // Subscription for a callback that runs if this install is detected as // cloned. base::CallbackListSubscription cloned_install_subscription_;
diff --git a/components/metrics/metrics_service_unittest.cc b/components/metrics/metrics_service_unittest.cc index d6ed3913f..e384db8 100644 --- a/components/metrics/metrics_service_unittest.cc +++ b/components/metrics/metrics_service_unittest.cc
@@ -24,7 +24,6 @@ #include "base/metrics/statistics_recorder.h" #include "base/metrics/user_metrics.h" #include "base/task/single_thread_task_runner.h" -#include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h" #include "base/threading/platform_thread.h" @@ -1353,30 +1352,6 @@ GetLocalState()->GetTime(prefs::kStabilityBrowserLastLiveTimeStamp)); } -TEST_F(MetricsServiceTest, EnablementObserverNotification) { - EnableMetricsReporting(); - TestMetricsServiceClient client; - TestMetricsService service(GetMetricsStateManager(), &client, - GetLocalState()); - service.InitializeMetricsRecordingState(); - - std::optional<bool> enabled; - auto observer = [&enabled](bool notification) { enabled = notification; }; - - auto subscription = - service.AddEnablementObserver(base::BindLambdaForTesting(observer)); - - service.Start(); - ASSERT_TRUE(enabled.has_value()); - EXPECT_TRUE(enabled.value()); - - enabled.reset(); - - service.Stop(); - ASSERT_TRUE(enabled.has_value()); - EXPECT_FALSE(enabled.value()); -} - // Verifies that when a cloned install is detected, logs are purged. TEST_F(MetricsServiceTest, PurgeLogsOnClonedInstallDetected) { EnableMetricsReporting();
diff --git a/components/metrics/metrics_state_manager.cc b/components/metrics/metrics_state_manager.cc index baaf7011..970900e 100644 --- a/components/metrics/metrics_state_manager.cc +++ b/components/metrics/metrics_state_manager.cc
@@ -242,15 +242,13 @@ EntropyParams entropy_params, StartupVisibility startup_visibility, StoreClientInfoCallback store_client_info, - LoadClientInfoCallback retrieve_client_info, - std::string_view external_client_id) + LoadClientInfoCallback retrieve_client_info) : local_state_(local_state), enabled_state_provider_(enabled_state_provider), entropy_params_(entropy_params), store_client_info_(std::move(store_client_info)), load_client_info_(std::move(retrieve_client_info)), clean_exit_beacon_(backup_registry_key, user_data_dir, local_state), - external_client_id_(external_client_id), entropy_state_(local_state), entropy_source_returned_(ENTROPY_SOURCE_NONE), metrics_ids_were_reset_(false), @@ -301,16 +299,8 @@ // `initial_client_id_` will only be set in the following cases: // 1. UMA is enabled // 2. there is a provisional client id (due to this being a first run) - // 3. there is an externally provided client ID (e.g. in Lacros, from Ash) if (!client_id_.empty()) { initial_client_id_ = client_id_; - } else if (!external_client_id_.empty()) { - // Typically, `client_id_` should have been set to the external client ID in - // the call to ForceClientIdCreation() above. However, that call is gated, - // and may not always happen, for example if this is a first run and the - // consent state is not yet known (although we know it is soon going to be - // set to true, since an external client ID was provided). - initial_client_id_ = external_client_id_; } else { // Note that there is possibly no provisional client ID. initial_client_id_ = @@ -429,13 +419,6 @@ // kMetricsRecordingOnly is used by Chromedriver tests. DCHECK(enabled_state_provider_->IsConsentGiven() || IsMetricsReportingForceEnabled() || IsMetricsRecordingOnlyEnabled()); - if (!external_client_id_.empty()) { - client_id_ = external_client_id_; - base::UmaHistogramEnumeration("UMA.ClientIdSource", - ClientIdSource::kClientIdFromExternal); - local_state_->SetString(prefs::kMetricsClientID, client_id_); - return; - } #if BUILDFLAG(IS_CHROMEOS) std::string previous_client_id = client_id_; #endif // BUILDFLAG(IS_CHROMEOS) @@ -517,10 +500,6 @@ BackUpCurrentClientInfo(); } -void MetricsStateManager::SetExternalClientId(const std::string& id) { - external_client_id_ = id; -} - void MetricsStateManager::CheckForClonedInstall() { cloned_install_detector_.CheckForClonedInstall(local_state_); } @@ -561,8 +540,7 @@ StartupVisibility startup_visibility, EntropyParams entropy_params, StoreClientInfoCallback store_client_info, - LoadClientInfoCallback retrieve_client_info, - std::string_view external_client_id) { + LoadClientInfoCallback retrieve_client_info) { std::unique_ptr<MetricsStateManager> result; // Note: |instance_exists_| is updated in the constructor and destructor. if (!instance_exists_) { @@ -573,8 +551,7 @@ : std::move(store_client_info), retrieve_client_info.is_null() ? base::BindRepeating(&NoOpLoadClientInfoBackup) - : std::move(retrieve_client_info), - external_client_id)); + : std::move(retrieve_client_info))); } return result; }
diff --git a/components/metrics/metrics_state_manager.h b/components/metrics/metrics_state_manager.h index be2e099..f43482f5 100644 --- a/components/metrics/metrics_state_manager.h +++ b/components/metrics/metrics_state_manager.h
@@ -159,10 +159,6 @@ // before recording. void ForceClientIdCreation(); - // Sets the external client id. Useful for callers that want explicit control - // of the next metrics client id. - void SetExternalClientId(const std::string& id); - // Checks if this install was cloned or imaged from another machine. If a // clone is detected, resets the client id and low entropy source. This // should not be called more than once. @@ -215,8 +211,7 @@ StartupVisibility startup_visibility = StartupVisibility::kUnknown, EntropyParams entropy_params = {}, StoreClientInfoCallback store_client_info = StoreClientInfoCallback(), - LoadClientInfoCallback load_client_info = LoadClientInfoCallback(), - std::string_view external_client_id = std::string_view()); + LoadClientInfoCallback load_client_info = LoadClientInfoCallback()); // Registers local state prefs used by this class. static void RegisterPrefs(PrefRegistrySimple* registry); @@ -232,11 +227,6 @@ FRIEND_TEST_ALL_PREFIXES(MetricsStateManagerTest, EntropySourceUsed_Low); FRIEND_TEST_ALL_PREFIXES(MetricsStateManagerTest, EntropySourceUsed_High); FRIEND_TEST_ALL_PREFIXES(MetricsStateManagerTest, - EntropySourceUsed_High_ExternalClientId); - FRIEND_TEST_ALL_PREFIXES( - MetricsStateManagerTest, - EntropySourceUsed_High_ExternalClientId_MetricsReportingDisabled); - FRIEND_TEST_ALL_PREFIXES(MetricsStateManagerTest, ProvisionalClientId_PromotedToClientId); FRIEND_TEST_ALL_PREFIXES(MetricsStateManagerTest, ProvisionalClientId_PersistedAcrossFirstRuns); @@ -271,11 +261,9 @@ // Recorded when we are somehow missing the client ID in Local State, cache // and backup, so we promote the provisional client ID. kClientIdFromProvisionalId = 4, - // Recorded when the client ID is passed in from external source. - // This is needed for Lacros since the client id is passed in from - // ash chrome. - kClientIdFromExternal = 5, - kMaxValue = kClientIdFromExternal, + // Not recorded anymore. + kClientIdFromExternalDeprecated = 5, + kMaxValue = kClientIdFromExternalDeprecated, }; // Creates the MetricsStateManager with the given |local_state|. Uses @@ -291,8 +279,7 @@ EntropyParams entropy_params, StartupVisibility startup_visibility, StoreClientInfoCallback store_client_info, - LoadClientInfoCallback load_client_info, - std::string_view external_client_id); + LoadClientInfoCallback load_client_info); // Returns a MetricsStateManagerProvider instance and sets its // |log_normal_metric_state_.gen| with the provided random seed. @@ -372,11 +359,6 @@ // randomization. std::string initial_client_id_; - // If not empty, use an external client id passed in from another browser as - // |client_id_|. This is needed for the Lacros browser where client id needs - // be passed in from ash chrome. - std::string external_client_id_; - // An instance of EntropyState for getting the entropy source values. EntropyState entropy_state_;
diff --git a/components/metrics/metrics_state_manager_unittest.cc b/components/metrics/metrics_state_manager_unittest.cc index a1e2e40..6cb80f8 100644 --- a/components/metrics/metrics_state_manager_unittest.cc +++ b/components/metrics/metrics_state_manager_unittest.cc
@@ -76,8 +76,7 @@ MetricsStateManagerTest(const MetricsStateManagerTest&) = delete; MetricsStateManagerTest& operator=(const MetricsStateManagerTest&) = delete; - std::unique_ptr<MetricsStateManager> CreateStateManager( - const std::string& external_client_id = "") { + std::unique_ptr<MetricsStateManager> CreateStateManager() { std::unique_ptr<MetricsStateManager> state_manager = MetricsStateManager::Create( &prefs_, enabled_state_provider_.get(), std::wstring(), @@ -87,8 +86,7 @@ base::Unretained(this)), base::BindRepeating( &MetricsStateManagerTest::LoadFakeClientInfoBackup, - base::Unretained(this)), - external_client_id); + base::Unretained(this))); state_manager->InstantiateFieldTrialList(); return state_manager; } @@ -213,36 +211,6 @@ state_manager->client_id()); } -TEST_F(MetricsStateManagerTest, EntropySourceUsed_High_ExternalClientId) { - EnableMetricsReporting(); - const std::string kExternalClientId = "abc"; - std::unique_ptr<MetricsStateManager> state_manager( - CreateStateManager(kExternalClientId)); - // |enable_limited_entropy_mode| is irrelevant but is set for test coverage. - state_manager->CreateEntropyProviders( - /*enable_limited_entropy_mode=*/true); - EXPECT_EQ(state_manager->entropy_source_returned(), - MetricsStateManager::ENTROPY_SOURCE_HIGH); - EXPECT_EQ(state_manager->client_id(), kExternalClientId); - EXPECT_EQ(state_manager->initial_client_id_for_testing(), kExternalClientId); -} - -TEST_F(MetricsStateManagerTest, - EntropySourceUsed_High_ExternalClientId_MetricsReportingDisabled) { - const std::string kExternalClientId = "abc"; - std::unique_ptr<MetricsStateManager> state_manager( - CreateStateManager(kExternalClientId)); - // |enable_limited_entropy_mode| is irrelevant but is set for test coverage. - state_manager->CreateEntropyProviders( - /*enable_limited_entropy_mode=*/true); - EXPECT_TRUE(state_manager->client_id().empty()); - EXPECT_EQ(state_manager->entropy_source_returned(), - MetricsStateManager::ENTROPY_SOURCE_HIGH); - EXPECT_EQ(state_manager->initial_client_id_for_testing(), kExternalClientId); -} - -// Check that setting the kMetricsResetIds pref to true causes the client id to -// be reset. We do not check that the low entropy source is reset because we // cannot ensure that metrics state manager won't generate the same id again. TEST_F(MetricsStateManagerTest, ResetMetricsIDs) { // Set an initial client id in prefs. It should not be possible for the @@ -802,15 +770,4 @@ } } -TEST_F(MetricsStateManagerTest, UseExternalClientId) { - base::HistogramTester histogram_tester; - std::string external_client_id = "AAAAAAAA-BBBB-CCCC-DDDD-EEEEEEEEEEEE"; - std::unique_ptr<MetricsStateManager> state_manager( - CreateStateManager(external_client_id)); - EnableMetricsReporting(); - state_manager->ForceClientIdCreation(); - EXPECT_EQ(external_client_id, state_manager->client_id()); - histogram_tester.ExpectUniqueSample("UMA.ClientIdSource", 5, 1); -} - } // namespace metrics
diff --git a/components/policy/resources/policy_templates_fr.xtb b/components/policy/resources/policy_templates_fr.xtb index ae1e0a1..e90fc09 100644 --- a/components/policy/resources/policy_templates_fr.xtb +++ b/components/policy/resources/policy_templates_fr.xtb
@@ -1036,7 +1036,7 @@ Si la règle <ph name="DEVICE_FAMILY_LINK_ACCOUNTS_ALLOWED_POLICY_NAME" /> est activée, les utilisateurs de Family Link sont autorisés (en plus des comptes définis dans cette règle).</translation> <translation id="18186215616223740">Forcer le téléchargement des documents Office gérés par <ph name="BASIC_EDITOR_NAME" />, auxquels l'utilisateur accède</translation> <translation id="1819272352048746487">Permet d'activer ou de désactiver les différentes fonctionnalités du clavier à l'écran</translation> -<translation id="1820974289087266512">La fonctionnalité de générateur de code QR est désactivée.</translation> +<translation id="1820974289087266512">La fonctionnalité de générateur de QR code est désactivée.</translation> <translation id="1822163547472114648">Paramètres de Créer des thèmes avec l'IA</translation> <translation id="1823974945066396306">Définit la liste des utilisateurs autorisés à se connecter à l'appareil. Les entrées se présentent sous la forme suivante : <ph name="USER_ALLOWLIST_ENTRY_FORMAT" /> (<ph name="USER_ALLOWLIST_ENTRY_EXAMPLE" />, par exemple). Pour autoriser des utilisateurs arbitraires sur un domaine, utilisez les entrées sous la forme suivante : <ph name="USER_ALLOWLIST_ENTRY_WILDCARD" />. @@ -1993,7 +1993,7 @@ Si vous configurez cette règle, les utilisateurs ne peuvent pas la modifier ni l'ignorer. Si cette règle n'est pas définie, la mise en surbrillance du curseur de saisie est désactivée au départ, mais les utilisateurs peuvent l'activer à tout moment.</translation> -<translation id="2506865562891982662">Autoriser les utilisateurs à sélectionner des appareils Cast avec un code d'accès ou un code QR dans la liste dédiée du menu <ph name="PRODUCT_NAME" />.</translation> +<translation id="2506865562891982662">Autoriser les utilisateurs à sélectionner des appareils Cast avec un code d'accès ou un QR code dans la liste dédiée du menu <ph name="PRODUCT_NAME" />.</translation> <translation id="2509748672176727116">L'utilisateur pourra capturer des paquets du réseau</translation> <translation id="2509919237512982967">Utiliser les anciens éléments de contrôle de formulaire jusqu'à la version M84.</translation> <translation id="2512972020817284317">Activer la fusion de règles cloud utilisateurs.</translation> @@ -2890,9 +2890,9 @@ Si cette règle n'est pas configurée, les sites peuvent exécuter JavaScript. Toutefois, les utilisateurs peuvent modifier ce paramètre.</translation> <translation id="3207821022126246451">WebRTC utilisera TCP sur l'interface publique et utilisera UDP uniquement s'il est compatible avec un proxy configuré.</translation> -<translation id="3207873329349672535">Cette règle détermine si l'utilisateur se verra proposer ou non une option dans le menu <ph name="PRODUCT_NAME" />, qui lui permet de caster du contenu sur des appareils Cast ne figurant pas dans la liste du menu <ph name="PRODUCT_NAME" />, en utilisant soit le code d'accès ou le code QR affiché sur l'écran de l'appareil Cast. - Par défaut, l'utilisateur doit ressaisir le code d'accès ou rescanner le code QR pour lancer une nouvelle session de diffusion. Toutefois, si la valeur de la règle <ph name="ACCESS_CODE_CAST_DEVICE_DURATION_POLICY_NAME" /> n'est pas nulle (sachant qu'elle l'est par défaut), l'appareil Cast reste alors dans la liste des appareils Cast disponibles tant que la durée d'affichage définie n'est pas écoulée. - Si cette règle est activée, les utilisateurs auront la possibilité de sélectionner des appareils Cast en utilisant un code d'accès ou en scannant un code QR. +<translation id="3207873329349672535">Cette règle détermine si l'utilisateur se verra proposer ou non une option dans le menu <ph name="PRODUCT_NAME" />, qui lui permet de caster du contenu sur des appareils Cast ne figurant pas dans la liste du menu <ph name="PRODUCT_NAME" />, en utilisant soit le code d'accès ou le QR code affiché sur l'écran de l'appareil Cast. + Par défaut, l'utilisateur doit ressaisir le code d'accès ou rescanner le QR code pour lancer une nouvelle session de diffusion. Toutefois, si la valeur de la règle <ph name="ACCESS_CODE_CAST_DEVICE_DURATION_POLICY_NAME" /> n'est pas nulle (sachant qu'elle l'est par défaut), l'appareil Cast reste alors dans la liste des appareils Cast disponibles tant que la durée d'affichage définie n'est pas écoulée. + Si cette règle est activée, les utilisateurs auront la possibilité de sélectionner des appareils Cast en utilisant un code d'accès ou en scannant un QR code. Si cette règle est désactivée ou n'est pas configurée, les utilisateurs n'auront pas cette possibilité.</translation> <translation id="3208615748170745525">Jours à compter de la détection de mises à jour.</translation> <translation id="3209947902706795852">Invitez les utilisateurs à migrer.</translation> @@ -3195,7 +3195,7 @@ <translation id="3442589735857147823">Autoriser les utilisateurs à se servir des machines virtuelles nécessaires pour faire fonctionner les applis Linux</translation> <translation id="3450649825886735618">Ne pas utiliser de services Web Google pour corriger les fautes d'orthographe</translation> <translation id="3451422488938880786"> Permet d'autoriser ou non le remappage des raccourcis clavier internationaux</translation> -<translation id="3451901387456196887">Permettre à l'utilisateur de sélectionner un appareil Cast dans le menu <ph name="PRODUCT_NAME" /> en utilisant un code d'accès ou en scannant un code QR.</translation> +<translation id="3451901387456196887">Permettre à l'utilisateur de sélectionner un appareil Cast dans le menu <ph name="PRODUCT_NAME" /> en utilisant un code d'accès ou en scannant un QR code.</translation> <translation id="3456292544936505775">Cette règle permet de définir les périodes durant lesquelles l'appareil <ph name="PRODUCT_OS_NAME" /> n'est pas autorisé à rechercher automatiquement des mises à jour. Si des périodes sont définies lors de la configuration de cette règle : Aucune recherche automatique de mises à jour n'est effectuée pendant ces périodes. Les appareils nécessitant un rollback de la version Enterprise ou équipés d'une version antérieure à <ph name="PRODUCT_OS_NAME" /> ne sont pas concernés par cette règle en raison de problèmes de sécurité potentiels. Sachez également que cette règle n'empêche pas l'utilisateur ni l'administrateur de procéder à une recherche de mises à jour. @@ -3286,6 +3286,7 @@ Si cette règle est définie sur "False", l'appareil n'essaiera pas de contacter Quirks Server pour télécharger les fichiers de configuration. Si cette règle est définie sur "True" ou si elle n'est pas définie, <ph name="PRODUCT_OS_NAME" /> contactera automatiquement Quirks Server pour télécharger les fichiers de configuration, s'ils sont disponibles, et les enregistrer sur l'appareil Ces fichiers pourront, par exemple, être utilisés pour améliorer la qualité d'affichage des moniteurs connectés.</translation> +<translation id="3513864752694608929">Ne pas appliquer les modes de saisie activés</translation> <translation id="3515196503924273265">Permet d'activer la fonctionnalité NewBaseUrlInheritanceBehavior</translation> <translation id="351654132746710200">Une fois <ph name="LACROS_NAME" /> désactivé, la migration des données n'est pas effectuée. Le dossier <ph name="LACROS_NAME" /> est supprimé, et les utilisateurs continuent d'utiliser les données restantes.</translation> <translation id="3518293344797498431">Rechargez la batterie à environ 80 % pour maximiser sa durée de vie.</translation> @@ -3866,7 +3867,7 @@ Si cette règle est définie sur 1 - DisabledForBrowser, le processus de navigateur de <ph name="PRODUCT_NAME" /> ne peut pas créer de code dynamique. Remarque : pour en savoir plus sur les règles d'atténuation des risques liés aux processus, consultez https://chromium.googlesource.com/chromium/src/+/HEAD/docs/design/sandbox.md#Process-mitigation-policies.</translation> -<translation id="3960728283243442805">Ne pas permettre à l'utilisateur de sélectionner un appareil Cast dans le menu <ph name="PRODUCT_NAME" /> en utilisant un code d'accès ni en scannant un code QR.</translation> +<translation id="3960728283243442805">Ne pas permettre à l'utilisateur de sélectionner un appareil Cast dans le menu <ph name="PRODUCT_NAME" /> en utilisant un code d'accès ni en scannant un QR code.</translation> <translation id="3962445567482559878">Utiliser le mode EDU du processus de prise en main de l'Assistant</translation> <translation id="396261881101930204">Ne pas proposer de recommandations de contenus multimédias à l'utilisateur</translation> <translation id="3964298692570794635">Autoriser le contenu non sécurisé sur ces sites</translation> @@ -4506,7 +4507,7 @@ <translation id="4483120730995943109">Les fonctions JavaScript setTimeout() dont le délai d'expiration est défini sur 0 ms ne seront pas ramenées à 1 ms.</translation> <translation id="4483649828988077221">Désactiver les mises à jour automatiques</translation> <translation id="4483738129334574255">Désactiver le jeu easter egg du dinosaure sur les appareils <ph name="PRODUCT_OS_NAME" /> enregistrés, l'activer dans d'autres circonstances</translation> -<translation id="4484515651939984695">Définir la durée d'affichage (en secondes) d'un appareil Cast sélectionné via un code d'accès ou un code QR dans la liste des appareils Cast du menu <ph name="PRODUCT_NAME" />.</translation> +<translation id="4484515651939984695">Définir la durée d'affichage (en secondes) d'un appareil Cast sélectionné via un code d'accès ou un QR code dans la liste des appareils Cast du menu <ph name="PRODUCT_NAME" />.</translation> <translation id="4485425108474077672">Configurer l'URL de la page "Nouvel onglet"</translation> <translation id="4488959486611931919">Remarque : Aucune panne de site n'a été signalée depuis que Chrome a commencé à bloquer ces cookies par défaut à partir de M118. Cette fonctionnalité ne sera donc plus configurable (et cette règle n'aura aucun effet) à partir de M127. @@ -5396,11 +5397,11 @@ Si vous activez ce paramètre, <ph name="PRODUCT_NAME" /> ignore toutes les options liées au proxy spécifiées à partir de la ligne de commande. Si cette règle n'est pas configurée, les utilisateurs peuvent choisir eux-mêmes leurs paramètres de proxy.</translation> -<translation id="5169461017653366056">Cette règle active la fonctionnalité de générateur de code QR dans <ph name="PRODUCT_NAME" />. +<translation id="5169461017653366056">Cette règle active la fonctionnalité de générateur de QR code dans <ph name="PRODUCT_NAME" />. -Si vous activez cette règle ou ne la configurez pas, la fonctionnalité de générateur de code QR est activée. +Si vous activez cette règle ou ne la configurez pas, la fonctionnalité de générateur de QR code est activée. -Si vous désactivez cette règle, la fonctionnalité de générateur de code QR est désactivée.</translation> +Si vous désactivez cette règle, la fonctionnalité de générateur de QR code est désactivée.</translation> <translation id="5170018694841697392">N'appliquez pas l'utilisation de SafeSearch dans la recherche Google</translation> <translation id="5172783335366295717">Cette règle définit le paramètre par défaut pour toutes les fonctionnalités d'IA générative couvertes. Par exemple, si cette règle est définie sur la valeur 1, cette valeur sera le paramètre par défaut pour toutes les fonctionnalités d'IA génératives couvertes. Cela n'aura aucune incidence sur les valeurs de règle définies manuellement. Pour connaître la liste des fonctionnalités couvertes, consultez https://support.google.com/chrome/a?p=generative_ai_settings. @@ -6678,6 +6679,7 @@ <translation id="6092073071805297119">Autoriser l'utilisation du filtrage des performances d'accessibilité.</translation> <translation id="60925735895026302">Interdire à tous les sites de demander l'accès aux imprimantes locales via l'API WebPrinting</translation> <translation id="6093156968240188330">Permettre aux utilisateurs distants d'interagir avec des fenêtres élevées dans les sessions d'assistance à distance</translation> +<translation id="6093551397728373988">Exiger l'activation de tous les modes de saisie autorisés dans une session utilisateur</translation> <translation id="6094314311474620462">Désactivez l'impression</translation> <translation id="6097601282776163274">Activer la collecte de données anonymisées avec clé d'URL</translation> <translation id="6099853574908182288">Mode d'impression par défaut couleur</translation> @@ -6873,6 +6875,11 @@ Si cette règle est désactivée, les utilisateurs ne sont pas autorisés à exécuter Chrome for Testing. Ils pourront quand même installer Chrome for Testing, mais cette version ne s'exécutera pas avec les profils pour lesquels cette règle est désactivée.</translation> <translation id="6258658183356534534">Contrôlez la fonctionnalité de mise à jour GREASE des indications du client user-agent.</translation> <translation id="6261643884958898336">Enregistrer les informations d'identification de l'ordinateur</translation> +<translation id="6262668203803408414">Si cette règle est définie sur "True", tous les modes de saisie de la règle <ph name="ALLOWED_INPUT_METHODS_POLICY_NAME" /> sont activés dans les sessions <ph name="PRODUCT_OS_NAME" />. +Aucun autre mode de saisie ne peut être activé dans les sessions utilisateur. +Si cette règle est définie sur "False" ou qu'elle n'est pas configurée, aucun mode de saisie activé n'est appliqué et la règle <ph name="ALLOWED_INPUT_METHODS_POLICY_NAME" /> ne configure que les modes de saisie disponibles pour l'utilisateur. + +Si la règle <ph name="ALLOWED_INPUT_METHODS_POLICY_NAME" /> n'est pas configurée ou qu'elle est définie sur une liste vide, cette règle est ignorée et les utilisateurs peuvent activer n'importe quel mode de saisie.</translation> <translation id="6264247808139384018">Si cette règle est activée ou n'est pas configurée, les utilisateurs qui s'authentifient avec un mot de passe peuvent verrouiller l'écran. Si cette règle est désactivée, les utilisateurs ne peuvent pas verrouiller l'écran (ils peuvent uniquement se déconnecter de leur session utilisateur).</translation> @@ -7448,11 +7455,11 @@ <translation id="6593350713192882944">Activer les Réponses rapides</translation> <translation id="6594372503585248865">Activer l'interface utilisateur liée à la connexion sur le bureau de l'hôte à distance lorsqu'une connexion est active</translation> <translation id="65947892191748867">Désactiver l'autorisation de partage des signaux pour les utilisateurs gérés sur les appareils non gérés</translation> -<translation id="6596675965208703569">Cette règle permet de définir la durée d'affichage (en secondes) d'un appareil Cast, auparavant sélectionné via un code d'accès ou un code QR, dans la liste des appareils Cast du menu <ph name="PRODUCT_NAME" />. - Cette durée est à compter du moment où l'utilisateur a saisi le code d'accès ou scanné le code QR pour la première fois. +<translation id="6596675965208703569">Cette règle permet de définir la durée d'affichage (en secondes) d'un appareil Cast, auparavant sélectionné via un code d'accès ou un QR code, dans la liste des appareils Cast du menu <ph name="PRODUCT_NAME" />. + Cette durée est à compter du moment où l'utilisateur a saisi le code d'accès ou scanné le QR code pour la première fois. L'appareil Cast sera affiché dans la liste des appareils Cast du menu <ph name="PRODUCT_NAME" /> pendant toute cette durée. - Une fois celle-ci écoulée, l'utilisateur devra ressaisir le code d'accès ou rescanner le code QR pour réutiliser l'appareil Cast. - La durée par défaut est nulle. Les appareils Cast ne restent donc pas affichés dans la liste du menu <ph name="PRODUCT_NAME" />, et l'utilisateur doit ressaisir le code d'accès ou rescanner le code QR pour lancer une nouvelle session de diffusion. + Une fois celle-ci écoulée, l'utilisateur devra ressaisir le code d'accès ou rescanner le QR code pour réutiliser l'appareil Cast. + La durée par défaut est nulle. Les appareils Cast ne restent donc pas affichés dans la liste du menu <ph name="PRODUCT_NAME" />, et l'utilisateur doit ressaisir le code d'accès ou rescanner le QR code pour lancer une nouvelle session de diffusion. Notez que cette règle ne concerne que la durée d'affichage d'un appareil Cast dans la liste dédiée du menu <ph name="PRODUCT_NAME" />, et n'a aucune incidence sur les sessions de diffusion en cours qui se poursuivront même si la durée définie est écoulée. Elle n'a aucune incidence non plus, sauf si la règle <ph name="ACCESS_CODE_CAST_ENABLED_POLICY_NAME" /> est activée.</translation> <translation id="6598235178374410284">Avatar de l'utilisateur</translation> @@ -8900,6 +8907,7 @@ Il était prévu que cette règle serait temporaire. Elle a été supprimée après le lancement complet de la nouvelle interface utilisateur de l'info-bulle de téléchargement.</translation> <translation id="7736521021425189418">Terminal (disponible depuis la version 117)</translation> +<translation id="7736846524371077454">Exiger l'activation de tous les modes de saisie autorisés</translation> <translation id="7740644123648617252">Activer l'importation des données de saisie automatique à la première exécution</translation> <translation id="7744253761377202223">Pourcentage de luminosité de l'écran lorsque l'appareil fonctionne sur secteur.</translation> <translation id="7747447585227954402">Autoriser les appareils à utiliser un <ph name="PLUGIN_VM_NAME" /> pour <ph name="PRODUCT_OS_NAME" /></translation> @@ -10678,7 +10686,7 @@ <translation id="9113058104383612727">Activer les outils de dépannage de kiosque</translation> <translation id="9113065986946552397">Les résultats d'un nettoyage Chrome Cleanup sont toujours partagés avec Google</translation> <translation id="9113262510565261950">Délai d'inactivité pour l'écran de connexion de l'économiseur d'écran de l'appareil.</translation> -<translation id="911448529868608648">Active le générateur de code QR</translation> +<translation id="911448529868608648">Active le générateur de QR code</translation> <translation id="911605919007170833">Signaler l'état de sécurité</translation> <translation id="9117826695152538214">Définissez cette règle sur "True" pour maintenir les touches rémanentes activées. Définissez cette règle sur "False" pour les maintenir désactivées. @@ -10729,7 +10737,7 @@ <translation id="9142561920976791097">Le nouveau comportement d'envoi des événements sur les commandes de formulaire désactivées sera utilisé.</translation> <translation id="91459503271584213">Lancer directement les hôtes de messagerie native exécutables sous Windows</translation> <translation id="9148720248753722892">Interdire les certificats signés SHA-1</translation> -<translation id="9149075762533142978">La fonctionnalité de générateur de code QR est activée.</translation> +<translation id="9149075762533142978">La fonctionnalité de générateur de QR code est activée.</translation> <translation id="9149678135092892302">Désactiver les rapports sur les informations liées à la version</translation> <translation id="9150416707757015439">Cette règle est obsolète. Veuillez utiliser la règle "IncognitoModeAvailability". Active le mode navigation privée de <ph name="PRODUCT_NAME" />.
diff --git a/components/policy/resources/policy_templates_it.xtb b/components/policy/resources/policy_templates_it.xtb index 50dca5d..a0d3578 100644 --- a/components/policy/resources/policy_templates_it.xtb +++ b/components/policy/resources/policy_templates_it.xtb
@@ -249,6 +249,7 @@ Se il criterio è impostato su false o non viene configurato, le pagine web possono usare l'API WebGL e i plug-in possono usare l'API Pepper 3D, ma le impostazioni predefinite del browser potrebbero comunque richiedere argomenti della riga di comando per usare queste API.</translation> <translation id="1198458955128279215">Utilizza il comportamento predefinito del piano di implementazione delle funzionalità.</translation> <translation id="1202216683470826356">Mostra schede nella pagina Nuova scheda</translation> +<translation id="1203676252390737801">Gestione dell'IP di WebRTC per URL</translation> <translation id="1204263402976895730">Stampanti aziendali attive</translation> <translation id="1207301487141109411">Impedisci la selezione degli avatar degli utenti da file system locale, fotocamera e profilo Google</translation> <translation id="1209096923317019235">Assegna le app come gestori predefiniti per le estensioni dei file specificate</translation> @@ -669,6 +670,13 @@ Se questo criterio viene attivato, il selettore di emoji supporterà le emoji in formato GIF. Se viene disattivato o se non viene configurato, il selettore di emoji non supporterà le emoji in formato GIF. Se non viene configurato, il selettore di emoji verrà attivato per gli utenti normali, ma sarà disattivato per gli utenti gestiti.</translation> +<translation id="1493245040983394029">Questa policy consente di controllare le impostazioni della funzionalità di editing di foto con AI generativa per <ph name="PRODUCT_OS_NAME" />. + +0 = Attiva la funzionalità per gli utenti e invia i dati pertinenti a Google per contribuire ad addestrare o migliorare i modelli di AI. A seconda della funzionalità, tra i dati pertinenti sono inclusi prompt, input, output e materiali originali. Possono essere esaminati da persone al solo scopo di migliorare i modelli di AI. 0 è il valore predefinito, ad eccezione dei casi riportati di seguito. + +1 = Attiva la funzionalità per gli utenti, ma non invia dati a Google per addestrare o migliorare i modelli di AI. 1 è il valore predefinito per gli utenti aziendali gestiti da <ph name="GOOGLE_ADMIN_CONSOLE_PRODUCT_NAME" /> e per gli account Education gestiti da <ph name="GOOGLE_WORKSPACE_PRODUCT_NAME" />. + +2 = Disattiva la funzionalità.</translation> <translation id="1494138678487405397">Disattiva l'alto contrasto nella schermata di accesso</translation> <translation id="1497797462580613666">Gestione dei download avrà un'opzione per salvare i file su <ph name="GOOGLE_DRIVE_NAME" />.</translation> <translation id="1498640472634891941">Questo criterio consente di elencare i pattern URL che specificano i siti a cui viene automaticamente negata l'autorizzazione di accesso alle stampanti locali tramite l'API WebPrinting. @@ -1696,6 +1704,7 @@ <translation id="2204753382813641270">Controlla la visualizzazione automatica della barra delle app</translation> <translation id="2208976000652006649">Parametri per l'URL di ricerca che utilizza POST</translation> <translation id="2212011154693551439">La pagina della cronologia di Chrome organizzata in gruppi sarà visibile all'indirizzo chrome://history/grouped per impostazione predefinita.</translation> +<translation id="2212207215880394506">Non consentire l'editing di foto con AI generativa.</translation> <translation id="221287948061571053">Nascondi badge aziendale espanso nella barra degli strumenti</translation> <translation id="2213059592185933570">Attiva la creazione di profili di roaming</translation> <translation id="2213342458177721585">Attiva il layout Hindi Inscript a livello di dispositivo.</translation> @@ -2230,6 +2239,7 @@ Se il criterio viene impostato su "UserOnly" (valore 1), gli utenti possono gestire i certificati a livello di utente, ma non quelli a livello di dispositivo.</translation> <translation id="2593762551209145088">Navigazione sicura non è mai attiva.</translation> +<translation id="2594773358911436070">Impostazioni WebRTC</translation> <translation id="26023406105317310">Configura account Kerberos</translation> <translation id="2603237557651009842">Blocca l'API WebPrinting su questi siti</translation> <translation id="2603382859270873566">Attiva il supporto dell'API PPB_VideoDecoder(Dev).</translation> @@ -2351,6 +2361,7 @@ Se imposti il criterio e attivi l'accesso automatico (vedi i criteri <ph name="DEVICE_LOCAL_ACCOUNT_AUTO_LOGIN_ID_POLICY_NAME" /> e <ph name="DEVICE_LOCAL_ACCOUNT_AUTO_LOGIN_DELAY_POLICY_NAME" />), per la sessione gestita vengono usati la prima lingua consigliata e il layout della tastiera corrispondente più usato. Il layout della tastiera preselezionato è sempre il layout più usato corrispondente alla lingua preselezionata. Gli utenti possono scegliere in qualsiasi momento qualsiasi lingua supportata da <ph name="PRODUCT_OS_NAME" /> per la loro sessione.</translation> +<translation id="269274821351405808">Impostazioni per la funzionalità di editing di foto con AI generativa</translation> <translation id="2693108589792503178">Configura l'URL di modifica della password.</translation> <translation id="2694143893026486692">Lente d'ingrandimento ancorata attivata</translation> <translation id="2696077732471707315"> @@ -2522,6 +2533,7 @@ Questo criterio può essere impostato soltanto come criterio relativo agli utenti cloud.</translation> <translation id="2846689894646472396">Velocità di controllo degli eventi di rete in millisecondi.</translation> <translation id="2847788524147474533">I criteri relativi al computer della piattaforma hanno la precedenza sui criteri relativi al cloud in ambito computer</translation> +<translation id="2849051159985119151">Consenti l'editing di foto con AI generativa senza migliorare i modelli di AI.</translation> <translation id="2849275596224278787">Nascondi opzioni di accessibilità nel menu della barra delle applicazioni della schermata di accesso</translation> <translation id="2853649500575897584">Non vengono bloccati i punti di estensioni precedenti nel processo del browser</translation> <translation id="2853757230661166968">Consente alle applicazioni di acquisire le scorciatoie di sistema predefinite e di eseguirne l'override.</translation> @@ -3283,6 +3295,7 @@ Se il criterio viene impostato su "hidden", le funzionalità disattivate saranno inutilizzabili e non visibili per gli utenti. Se il criterio non viene configurato o presenta un valore non valido, la modalità di disattivazione delle funzionalità di sistema sarà "blocked".</translation> +<translation id="3411947169047929182">Controlla la configurazione correlata a WebRTC</translation> <translation id="341285788698114069">Questo criterio consente di stabilire la priorità del processo audio su Windows. Se il criterio viene attivato, il processo audio verrà eseguito con priorità sopra la norma. Se il criterio viene disattivato, il processo audio verrà eseguito con priorità normale. @@ -4668,6 +4681,7 @@ <translation id="4467952432486360968">Blocca cookie di terze parti</translation> <translation id="4472740647327683596">La larghezza della pagina in micron.</translation> <translation id="4474167089968829729">Attiva il salvataggio delle password in Gestione password</translation> +<translation id="447692108909279121">Gestione dell'IP di WebRTC</translation> <translation id="4478248026668918517">Blocca il rilevamento dell'ambito dei criteri.</translation> <translation id="4479671363221255277">La configurazione del criterio consente di elencare pattern URL che specificano quali siti possono richiedere agli utenti l'accesso di lettura di file o directory nel file system del sistema operativo host tramite l'API file system. @@ -5804,6 +5818,23 @@ Se la norma non viene impostata oppure è impostata sulla stringa vuota o su un intervallo di porte non valido, WebRTC è autorizzato a utilizzare qualsiasi porta UDP locale disponibile.</translation> <translation id="5288776487100096897">Consenti ai criteri relativi al cloud degli utenti di eseguire l'override dei criteri <ph name="CHROME_BROWSER_CLOUD_MANAGEMENT_NAME" />.</translation> +<translation id="5289330879750533981">Questa policy permette di applicare restrizioni agli indirizzi IP e alle interfacce che WebRTC utilizza quando prova a trovare la migliore connessione disponibile ogni pattern URL specifico. + +Accetta un elenco di pattern URL e coppie di tipi di gestione. I pattern URL vengono controllati in ordine e la prima corrispondenza configurerà il tipo di gestione utilizzato da WebRTC per il dominio. Quando l'URL del documento corrente non corrisponde a nessuna voce, viene usata la configurazione impostata dalla policy <ph name="WEB_RTC_IP_HANDLING_POLICY_NAME" />. + +Per informazioni dettagliate sui pattern di input validi, visita la pagina https://cloud.google.com/docs/chrome-enterprise/policies/url-patterns. I caratteri jolly (<ph name="WILDCARD_VALUE" />) sono consentiti. Questa policy ha corrispondenze basate soltanto sull'origine, pertanto qualsiasi percorso nel pattern URL viene ignorato. + +Valori di gestione validi: + +* valore predefinito: WebRTC utilizza tutte le interfacce di rete. + +* default_public_and_private_interfaces: WebRTC utilizza tutte le interfacce pubbliche e private. + +* default_public_interface_only: WebRTC utilizza tutte le interfacce pubbliche, ma non quelle private. + +* disable_non_proxied_udp: WebRTC utilizza il proxy UDP SOCKS o passa al proxy TCP. + +Per una descrizione dettagliata di tutti i valori di gestione, consulta la sezione 5.2 del documento RFC 8828 (https://tools.ietf.org/html/rfc8828.html#section-5.2).</translation> <translation id="5290940294294002042">Specifica un elenco di plug-in che l'utente può attivare o disattivare</translation> <translation id="5293285950307241933">Cancella tutti i dati utente locali</translation> <translation id="5293619885162445352">Consenti a <ph name="PEPPER_NAME" /> di usare il nuovo decodificatore video.</translation> @@ -6953,6 +6984,7 @@ Se questo criterio non viene configurato, <ph name="PRODUCT_NAME" /> utilizza la versione massima predefinita. In caso contrario, il criterio potrebbe essere impostato su uno dei seguenti valori: "tls1.2" o "tls1.3". Se viene impostato, <ph name="PRODUCT_NAME" /> non utilizzerà versioni di SSL/TLS successive alla versione specificata. Un valore non riconosciuto verrà ignorato.</translation> +<translation id="6120909112796019291">Consenti l'editing di foto con AI generativa e migliora i modelli di AI.</translation> <translation id="6123052603197028610">Non consentire query ai server Google per recuperare i timestamp</translation> <translation id="6130360423841559818">Gestisci il nuovo comportamento della finestra di dialogo di annullamento generata dall'evento beforeunload</translation> <translation id="6131803221304830537">Disattiva l'integrità del codice del renderer</translation> @@ -7372,6 +7404,7 @@ Se il criterio viene impostato su False, i contenuti pubblicati con la tecnologia Signed HTTP Exchange non vengono caricati.</translation> <translation id="6368011194414932347">Configura l'URL della pagina iniziale</translation> <translation id="6368403635025849609">Consenti JavaScript su questi siti</translation> +<translation id="6368671810229507360">WebRTC</translation> <translation id="6371005337713685988">Impostazioni di insiemi di siti web correlati</translation> <translation id="6371561334154580937">Mostra finestra di dialogo di disconnessione nell'ultima finestra chiusa.</translation> <translation id="6372105930898423193">Consente di riattivare la funzionalità AppCache anche se è disattivata per impostazione predefinita.</translation> @@ -9878,6 +9911,21 @@ <translation id="8238421250255592181">Un flag booleano che indica se la tastiera sullo schermo può offrire la funzionalità di completamento automatico.</translation> <translation id="8239109177194627162">Disattiva la compilazione automatica per le carte di credito</translation> <translation id="8239143983379015783">Forza l'attivazione della quota permanente</translation> +<translation id="8240976615241583524">Questa policy permette di applicare restrizioni agli indirizzi IP e alle interfacce che WebRTC utilizza quando prova a trovare la migliore connessione disponibile. + +Valori validi: + +* valore predefinito: WebRTC utilizza tutte le interfacce di rete disponibili. + +* default_public_and_private_interfaces: WebRTC utilizza tutte le interfacce pubbliche e private. + +* default_public_interface_only: WebRTC utilizza tutte le interfacce pubbliche, ma non quelle private. + +* disable_non_proxied_udp: WebRTC utilizza il proxy UDP SOCKS o passa al proxy TCP. + +Se la policy non viene configurata, per impostazione predefinita vengono usate tutte le interfacce di rete disponibili. + +Per una descrizione dettagliata di tutti i valori di gestione, consulta la sezione 5.2 del documento RFC 8828 (https://tools.ietf.org/html/rfc8828.html#section-5.2).</translation> <translation id="8244171102276095471">Attiva i pacchetti di crittografia RC4 in TLS</translation> <translation id="8244525275280476362">Ritardo di recupero massimo dopo l'invalidazione di una norma</translation> <translation id="8244828501034607035">Questo criterio consente di stabilire la visibilità della scheda Outlook nella pagina Nuova scheda. La scheda verrà visualizzata nella pagina Nuova scheda solo se il criterio è abilitato e la tua organizzazione ha autorizzato l'utilizzo dei dati del calendario di Outlook nel browser.
diff --git a/components/policy/resources/policy_templates_nl.xtb b/components/policy/resources/policy_templates_nl.xtb index c0194e3..313f3cfd 100644 --- a/components/policy/resources/policy_templates_nl.xtb +++ b/components/policy/resources/policy_templates_nl.xtb
@@ -636,6 +636,7 @@ Als je het beleid niet instelt, probeert <ph name="PRODUCT_NAME" /> te detecteren of er een server op het intranet is. Alleen dan reageert het product op IWA-verzoeken. Als een server wordt gedetecteerd als internet, worden IWA-verzoeken ervan genegeerd door <ph name="PRODUCT_NAME" />. Opmerking: Gebruik bij meerdere servernamen een komma als scheidingsteken. Jokertekens (<ph name="WILDCARD_VALUE" />) zijn toegestaan.</translation> +<translation id="1488008594883876680">Vooraf laden van <ph name="ARC_VM" />-image aanzetten</translation> <translation id="1488724823347505879">Delen van Android-apps naar web-apps aanzetten</translation> <translation id="1490962807364514840">Verzamelingssnelheid voor telemetrie voor CPU-runtime-tellers in milliseconden.</translation> <translation id="1492223733885011596">Met dit beleid wordt gif-ondersteuning voor de emoji-kiezer aangezet op <ph name="PRODUCT_OS_NAME" />. @@ -695,6 +696,35 @@ <translation id="1542491165152947087">Sta gebruikers toe de <ph name="PRIVACY_SANDBOX_NAME" />-instelling voor advertentieonderwerpen op hun apparaat aan of uit te zetten.</translation> <translation id="1542958897137600427">Registratie van clientcertificaten aanzetten</translation> <translation id="1548431234399786388">Beheert de instellingen voor Rapportage over browsergebeurtenissen.</translation> +<translation id="155018731031610976">Dit beleid biedt een manier om de lijst met sets te overschrijven die de browser gebruikt voor first-party sets-functies. + +Elke set in de lijst met first-party sets van de browser moet voldoen aan de vereisten van een first-party set. +Een first-party set moet een primaire site en een of meer lidsites bevatten. +Een set kan ook een lijst bevatten van servicesites waarvan de set de eigenaar is, evenals een routebeschrijving van een site naar alle ccTLD-varianten. +Ga naar https://github.com/WICG/first-party-sets voor meer informatie over hoe <ph name="PRODUCT_NAME" /> first-party sets gebruikt. + +Alle sites in een first-party set moeten een registreerbaar domein zijn dat via HTTPS wordt gehost. Elke site in een first-party set moet ook uniek zijn. Dit betekent dat een site niet meer dan één keer kan worden vermeld in een first-party set. + +Als dit beleid een leeg woordenboek krijgt, gebruikt de browser de openbare lijst met first-party sets. + +Voor alle sites in een first-party set uit de lijst <ph name="REPLACEMENTS" /> geldt dat als een site ook aanwezig is in een first-party set in de lijst van de browser, die site wordt verwijderd uit de first-party set van de browser. +Daarna wordt de first-party set van het beleid toegevoegd aan de lijst met first-party sets van de browser. + +Voor alle sites in een first-party set uit de lijst <ph name="ADDITIONS" /> geldt dat als een site ook aanwezig is in een first-party set in de lijst van de browser, de first-party set van de browser wordt geüpdatet zodat de nieuwe first-party set kan worden toegevoegd aan de lijst van de browser. Nadat de lijst van de browser is geüpdatet, wordt de first-party set van het beleid toegevoegd aan de lijst met first-party sets van de browser. + +De lijst met first-party sets van de browser vereist dat voor alle sites op de lijst geen site in meer dan één set is opgenomen. Dit is ook vereist voor zowel de lijst <ph name="REPLACEMENTS" /> als de lijst <ph name="ADDITIONS" />. Een site kan ook niet in zowel de lijst <ph name="REPLACEMENTS" /> als de lijst <ph name="ADDITIONS" /> staan. + +Jokertekens (*) worden zowel in first-party sets als in deze lijsten niet ondersteund als beleidswaarde. + +Alle sets die in dit beleid worden vermeld, moeten geldige first-party sets zijn. Zo niet, dan krijg je de relevante foutmelding. + +In <ph name="MS_WIN_NAME" /> is dit beleid alleen beschikbaar voor instanties die zijn gekoppeld aan een <ph name="MS_AD_NAME" />-domein of aan <ph name="MS_AAD_NAME" />, of die zijn ingeschreven voor <ph name="CHROME_ENTERPRISE_CORE_NAME" />. + +In <ph name="MAC_OS_NAME" /> is dit beleid alleen beschikbaar voor instanties die via MDM worden beheerd, via een MCX aan een domein zijn gekoppeld of zijn ingeschreven voor <ph name="CHROME_ENTERPRISE_CORE_NAME" />. + +Dit is het equivalent van het beleid <ph name="RELATED_WEBSITE_SETS_OVERRIDES_POLICY_NAME" />. +Beide beleidsregels kunnen worden gebruikt, maar dit beleid wordt binnenkort beëindigd. Daarom heeft het beleid <ph name="RELATED_WEBSITE_SETS_OVERRIDES_POLICY_NAME" /> de voorkeur. +Ze hebben beide hetzelfde effect op het gedrag van de browser.</translation> <translation id="1550295162561011575">Als je dit beleid instelt, kunnen beheerders automatisering instellen om apps te starten op <ph name="PRODUCT_NAME" />-apparaten. Deze apps kunnen worden gestart nadat de gebruiker is ingelogd of kunnen gelijktijdig door de gebruiker worden gestart vanuit de launcher.</translation> <translation id="1551782388466447648">Het virtuele aanraaktoetsenbord aanzetten op het inlogscherm</translation> <translation id="1552418937045050762">Als deze instelling aanstaat, kunnen gebruikers zich aanmelden voor Dichtbij delen. Daarmee kunnen ze bestanden sturen naar en ontvangen van mensen in de buurt. @@ -713,6 +743,17 @@ <translation id="1561424797596341174">Beleid overschrijft Debug-builds van de host voor externe toegang</translation> <translation id="1561967320164410511">U2F plus extensies voor individuele bevestiging</translation> <translation id="1562846754315919408">Meldingen tonen als USB-apparaten worden gevonden</translation> +<translation id="1563745847791078494">Als je het beleid instelt, wordt de standaard-URL voor de homepage ingesteld in <ph name="PRODUCT_NAME" />. Je kunt de homepage openen met de knop Homepage. Op desktops bepaalt het beleid <ph name="RESTORE_ON_STARTUP_POLICY_NAME" /> welke pagina's worden geopend als de browser wordt opgestart. + +Als de homepage niet is ingesteld op de pagina Nieuw tabblad (door de gebruiker of <ph name="HOMEPAGE_IS_NEW_TAB_PAGE_POLICY_NAME" />), heeft dit beleid geen effect. + +De URL heeft een standaardschema nodig, zoals http://example.com of https://example.com. Als dit beleid is ingesteld, kunnen gebruikers de URL van de homepage niet wijzigen in <ph name="PRODUCT_NAME" />. + +Als je <ph name="HOMEPAGE_LOCATION_POLICY_NAME" /> en <ph name="HOMEPAGE_IS_NEW_TAB_PAGE_POLICY_NAME" /> geen van beide instelt, kunnen gebruikers hun homepage kiezen. + +In <ph name="MS_WIN_NAME" /> is dit beleid alleen beschikbaar voor instanties die zijn gekoppeld aan een <ph name="MS_AD_NAME" />-domein of aan <ph name="MS_AAD_NAME" />, of die zijn ingeschreven voor <ph name="CHROME_ENTERPRISE_CORE_NAME" />. + +In <ph name="MAC_OS_NAME" /> is dit beleid alleen beschikbaar voor instanties die via MDM worden beheerd, via een MCX aan een domein zijn gekoppeld of zijn ingeschreven voor <ph name="CHROME_ENTERPRISE_CORE_NAME" />.</translation> <translation id="1567718448549957373">Als je het beleid aanzet of niet instelt, mogen <ph name="BASIC_AUTH" />-verificatie-uitdagingen worden ontvangen via niet-beveiligde HTTP. Als je het beleid uitzet, mogen niet-beveiligde HTTP-verzoeken het <ph name="BASIC_AUTH" />-verificatieschema niet gebruiken. Alleen beveiligde HTTPS is toegestaan. @@ -899,6 +940,13 @@ Als je dit beleid niet toepast, staat <ph name="PRODUCT_NAME" /> niet toe dat er gastprofielen worden gestart.</translation> <translation id="1666001345366986837">Instellingen voor de functie VC-achtergrond met generatieve AI</translation> +<translation id="166702014436078732">Als je dit beleid instelt, stel je de URL in waarmee gebruikers hun wachtwoord moeten wijzigen nadat zij een waarschuwing zien in de browser. De service voor wachtwoordbeveiliging stuurt gebruikers de URL (alleen HTTP- en HTTPS-protocollen) die je aangeeft via dit beleid. Zorg dat je pagina voor het wijzigen van wachtwoorden voldoet aan de richtlijnen op https://www.chromium.org/developers/design-documents/create-amazing-password-forms, zodat <ph name="PRODUCT_NAME" /> de salted hash van het nieuwe wachtwoord op deze pagina voor het wijzigen van wachtwoorden juist vastlegt. + +Als je dit beleid niet toepast of niet instelt, stuurt de service gebruikers naar https://myaccount.google.com om hun wachtwoord te wijzigen. + +In <ph name="MS_WIN_NAME" /> is deze functionaliteit alleen beschikbaar voor instanties die zijn gekoppeld aan een <ph name="MS_AD_NAME" />-domein of aan <ph name="MS_AAD_NAME" />, of die zijn ingeschreven voor <ph name="CHROME_ENTERPRISE_CORE_NAME" />. + +In <ph name="MAC_OS_NAME" /> is deze functionaliteit alleen beschikbaar voor instanties die via MDM worden beheerd, via MCX aan een domein zijn gekoppeld of zijn ingeschreven voor <ph name="CHROME_ENTERPRISE_CORE_NAME" />.</translation> <translation id="1670638264428789878">Gerelateerde websitesets aanzetten</translation> <translation id="1671405606278443620">Instellingen voor AI-gestuurd zoeken in geschiedenis</translation> <translation id="1673097259557436886">Websites altijd laten weten dat er geen betaalmethoden zijn opgeslagen</translation> @@ -1749,6 +1797,13 @@ <translation id="2309284543927494965">Updates blokkeren</translation> <translation id="2309341709647905294">Geen informatie rapporteren over randapparaten die zijn aangesloten op het apparaat</translation> <translation id="2309390639296060546">Standaardinstelling voor geolocatie</translation> +<translation id="2315759015564614266">Als je het beleid toepast, wordt er een standaard zoekopdracht uitgevoerd als een gebruiker in de adresbalk tekst invoert die geen URL is. Als je de standaard zoekprovider wilt aangeven, stel je alle andere standaard zoekbeleidsregels in. Als je die zoekbeleidsregels leeg laat, kan de gebruiker zelf de standaardprovider kiezen. Als je het beleid niet toepast, wordt er geen zoekopdracht uitgevoerd als de gebruiker in de adresbalk tekst invoert die geen URL is. De waarde Uitgezet wordt niet ondersteund door de <ph name="GOOGLE_ADMIN_CONSOLE_PRODUCT_NAME" />. + +Als je het beleid instelt, kunnen gebruikers dit niet wijzigen in <ph name="PRODUCT_NAME" />. Als je dit beleid niet instelt, wordt de standaard zoekprovider geactiveerd en kunnen gebruikers de lijst met zoekproviders instellen. + +In <ph name="MS_WIN_NAME" /> is dit beleid alleen beschikbaar voor instanties die zijn gekoppeld aan een <ph name="MS_AD_NAME" />-domein of aan <ph name="MS_AAD_NAME" />, of die zijn ingeschreven voor <ph name="CHROME_ENTERPRISE_CORE_NAME" />. + +In <ph name="MAC_OS_NAME" /> is dit beleid alleen beschikbaar voor instanties die via MDM worden beheerd, via een MCX aan een domein zijn gekoppeld of zijn ingeschreven voor <ph name="CHROME_ENTERPRISE_CORE_NAME" />.</translation> <translation id="2316700579410680894">Als je het beleid instelt, kun je een lijst met URL-patronen opgeven met de sites die automatisch toegangsrechten krijgen voor een USB-apparaat met de opgegeven leveranciers- en product-ID's. Het beleid is alleen geldig als elk item in de lijst de velden <ph name="DEVICES_FIELD_NAME" /> en <ph name="URLS_FIELD_NAME" /> bevat. Elk item in het veld <ph name="DEVICES_FIELD_NAME" /> kan een veld <ph name="VENDOR_ID_FIELD_NAME" /> en een veld <ph name="PRODUCT_ID_FIELD_NAME" /> hebben. Als je het veld <ph name="VENDOR_ID_FIELD_NAME" /> weglaat, wordt een beleid gemaakt dat geschikt is voor elk apparaat. Als je het veld <ph name="PRODUCT_ID_FIELD_NAME" /> weglaat, wordt een beleid gemaakt dat geschikt is voor elk apparaat met de opgegeven leveranciers-ID. Een beleid dat het veld <ph name="PRODUCT_ID_FIELD_NAME" /> bevat zonder het veld <ph name="VENDOR_ID_FIELD_NAME" />, is ongeldig. Het USB-rechtenmodel geeft de opgegeven URL toegang tot het USB-apparaat als oorsprong op hoofdniveau. Als ingesloten frames toegang tot USB-apparaten nodig hebben, moet de <ph name="FEATURE_POLICY_HEADER_NAME" />-header 'usb' worden gebruikt om toegang te geven. De URL moet geldig zijn, anders wordt het beleid genegeerd. @@ -2175,6 +2230,23 @@ <translation id="264771271300359481">Geen enkele site toestaan het klembordrecht voor sites te gebruiken</translation> <translation id="2649537800219643135">Afbeeldingsbron voor de screensaver voor het vergrendelscherm.</translation> <translation id="2649896281375932517">Gebruikers laten bepalen</translation> +<translation id="2649948251789347405">Met dit beleid kunnen beheerders een aangewezen zakelijke verzamelsite voor zoeken instellen die zoekaanbevelingen en -resultaten in de adresbalk geeft indien geactiveerd door een specifiek zoekwoord. Gebruikers kunnen een zoekopdracht starten door het aangegeven zoekwoord in het veld <ph name="SHORTCUT_SEARCH_AGGREGATOR_SETTINGS_FIELD" /> met of zonder het voorvoegsel @ (bijvoorbeeld <ph name="SHORTCUT_EXAMPLE_SEARCH_AGGREGATOR_SETTINGS" />), gevolgd door de spatiebalk of Tab, in de adresbalk te typen. + +De volgende velden zijn vereist: <ph name="NAME_SEARCH_AGGREGATOR_SETTINGS_FIELD" />, <ph name="SHORTCUT_SEARCH_AGGREGATOR_SETTINGS_FIELD" />, <ph name="SEARCH_URL_SEARCH_AGGREGATOR_SETTINGS_FIELD" />, <ph name="SUGGEST_URL_SEARCH_AGGREGATOR_SETTINGS_FIELD" />. + +Het veld <ph name="NAME_SEARCH_AGGREGATOR_SETTINGS_FIELD" /> komt overeen met de naam van de zoekmachine die aan de gebruiker wordt getoond in de adresbalk. + +Het veld <ph name="SHORTCUT_SEARCH_AGGREGATOR_SETTINGS_FIELD" /> komt overeen met het zoekwoord dat de gebruiker invoert om de zoekopdracht te activeren. De snelkoppeling kan gewone woorden en tekens bevatten, maar mag geen spaties bevatten of beginnen met het symbool @. Snelkoppelingen moeten uniek zijn. + +Het veld <ph name="SEARCH_URL_SEARCH_AGGREGATOR_SETTINGS_FIELD" /> geeft de URL aan waarop moet worden gezocht. Voer het webadres voor de resultatenpagina van de zoekmachine in en gebruik <ph name="SEARCH_TERM_MARKER" /> in plaats van de zoekopdracht. + +Het veld <ph name="SUGGEST_URL_SEARCH_AGGREGATOR_SETTINGS_FIELD" /> geeft de URL aan die zoeksuggesties levert. Als <ph name="SUGGEST_URL_SEARCH_AGGREGATOR_SETTINGS_FIELD" /> <ph name="SEARCH_TERM_MARKER" /> bevat, krijgt Chrome zoeksuggesties via een GET-verzoek aan de URL, waarbij <ph name="SEARCH_TERM_MARKER" /> wordt vervangen door de zoekopdracht van de gebruiker. Anders wordt een POST-verzoek verstuurd en wordt de zoekopdracht van de gebruiker doorgegeven in de POST-parameters onder de sleutel <ph name="SEARCH_SUGGEST_POST_PARAMS_QUERY_KEY" />. + +Het veld <ph name="ICON_URL_SEARCH_AGGREGATOR_SETTINGS_FIELD" /> geeft de URL aan van een afbeelding die wordt gebruikt voor de zoeksuggesties. Er wordt een standaardicoon gebruikt als dit veld niet is ingesteld. We raden je aan een favicon te gebruiken (bijvoorbeeld <ph name="ICON_URL_EXAMPLE" />). + +In <ph name="MS_WIN_NAME" /> is dit beleid alleen beschikbaar voor instanties die zijn gekoppeld aan een <ph name="MS_AD_NAME" />-domein of aan <ph name="MS_AAD_NAME" />, of die zijn ingeschreven voor <ph name="CHROME_ENTERPRISE_CORE_NAME" />. + +In <ph name="MAC_OS_NAME" /> is dit beleid alleen beschikbaar voor instanties die via MDM worden beheerd, via een MCX aan een domein zijn gekoppeld of zijn ingeschreven voor <ph name="CHROME_ENTERPRISE_CORE_NAME" />.</translation> <translation id="2650049181907741121">Actie die wordt ondernomen wanneer de gebruiker de klep sluit</translation> <translation id="2656559539624760733">De Chrome Root Store niet gebruiken.</translation> <translation id="2658653824183107970">De verouderde <ph name="CORS" />-implementatie in plaats van de nieuwe <ph name="CORS" /> gebruiken</translation> @@ -3047,6 +3119,8 @@ Als je dit beleid niet toepast, heeft dit een nadelige invloed op de beveiliging en stabiliteit van <ph name="PRODUCT_NAME" />, omdat daardoor de sandbox waarvan de processen van het weergaveprogramma gebruikmaken, minder wordt. Pas het beleid alleen niet toe als er compatibiliteitsproblemen zijn met software van derden die in de processen van het weergaveprogramma moeten worden uitgevoerd. Opmerking: Lees meer informatie over het beleid voor procesbeperking (https://chromium.googlesource.com/chromium/src/+/HEAD/docs/design/sandbox.md#Process-mitigation-policies).</translation> +<translation id="3338041636115991551">Tenzij de kortstondige modus of toegang tot meerdere accounts aanstaat tijdens de sessie van de gebruiker, wordt ARC aangezet als ArcEnabled wordt ingesteld op Waar. Als het beleid wordt ingesteld op Onwaar of niet wordt ingesteld, kunnen zakelijke gebruikers ARC niet gebruiken. +Dit beleid bepaalt alleen <ph name="ARC_VM" /> op <ph name="PRODUCT_NAME" />. Zie voor <ph name="PRODUCT_OS_FLEX_NAME" /> het beleid <ph name="DEVICE_FLEX_ARC_PRELOAD_ENABLED_POLICY_NAME" /> voor meer informatie.</translation> <translation id="3338431256935927407">Bepaalt de instellingen met betrekking tot de Cloud Upload-functie.</translation> <translation id="3339271789059866414">Configureert de beschikbaarheid van de systeemproxyservice en de proxygegevens voor systeemservices. Als het beleid niet is ingesteld, is de systeemproxyservice niet beschikbaar.</translation> @@ -3374,6 +3448,7 @@ Als er een lagere waarde wordt ingesteld voor dit beleid, heeft dit een permanent effect: het apparaat kan mogelijk niet worden teruggezet naar oudere versies, zelfs nadat het beleid weer wordt ingesteld op een hogere waarde. De werkelijke rollbackmogelijkheden zijn ook afhankelijk van het moederbord en patches voor kritieke risico's.</translation> +<translation id="3565284547329101236"><ph name="ARC_VM" />-image vooraf laden op Flex</translation> <translation id="35668690622495904"> Aanroepen worden niet geweigerd als ze afkomstig zijn van contexten die niet op de toelatingslijst staan. (Aanroepen kunnen wel worden geweigerd om andere redenen).</translation> <translation id="3568762199045490351">JavaScript-functie setTimeout() met een time-out van 0 ms wordt vastgezet op 1 ms.</translation> @@ -3714,6 +3789,19 @@ Gebruikers kunnen een protocolhandler niet verwijderen als deze is geregistreerd door een beleid. Als ze een nieuwe standaard handler installeren, kunnen ze de protocolhandlers wijzigen die door het beleid zijn geïnstalleerd.</translation> <translation id="3842619997238271109">Staat niet toe dat de host voor externe toegang pincode- en koppelingsverificaties gebruikt bij de acceptatie van clientverbindingen</translation> +<translation id="3844931982362586388">Met dit beleid wordt de standaard-URL van de pagina Nieuw tabblad geconfigureerd en wordt voorkomen dat gebruikers deze kunnen wijzigen. + +De pagina Nieuw tabblad wordt geopend als er nieuwe tabbladen en vensters worden geopend. + +Met dit beleid bepaal je niet welke pagina's worden geopend als de browser wordt opgestart. Deze pagina's worden beheerd door het beleid <ph name="RESTORE_ON_STARTUP_POLICY_NAME" />. Dit beleid is wel van invloed op de homepage als hiervoor is ingesteld dat de pagina Nieuw tabblad moet worden geopend, maar ook op de startpagina als deze is ingesteld op de pagina Nieuw tabblad. + +Het is verstandig om de volledig canonieke URL op te geven. Als de URL niet volledig canoniek is, gebruikt <ph name="PRODUCT_NAME" /> standaard https://. + +Als je het beleid niet instelt of leeg laat, wordt de standaardpagina Nieuw tabblad gebruikt. + +In <ph name="MS_WIN_NAME" /> is dit beleid alleen beschikbaar voor instanties die zijn gekoppeld aan een <ph name="MS_AD_NAME" />-domein of aan <ph name="MS_AAD_NAME" />, of die zijn ingeschreven voor <ph name="CHROME_ENTERPRISE_CORE_NAME" />. + +In <ph name="MAC_OS_NAME" /> is dit beleid alleen beschikbaar voor instanties die via MDM worden beheerd, via een MCX aan een domein zijn gekoppeld of zijn ingeschreven voor <ph name="CHROME_ENTERPRISE_CORE_NAME" />.</translation> <translation id="3845318141474759319">Generatieve AI-achtergronden toestaan zonder AI-modellen te verbeteren</translation> <translation id="3851443303439635700">De nestdrempel bepalen waarvoor de JavaScript-functie setTimeout() wordt vastgezet</translation> <translation id="3854609566862485607">Dit beleid beheert een aangepast label waarmee beheerde profielen worden geïdentificeerd. Voor beheerde profielen wordt dit label naast de avatar in de werkbalk getoond. Het aangepaste label wordt niet vertaald. @@ -3786,6 +3874,13 @@ Als je het beleid niet instelt of dit instelt op een lege of ongeldige waarde, wordt er geen extra <ph name="CLIENT_INFO_IPP_ATTRIBUTE" />-waarde toegevoegd aan verzoeken voor afdruktaken. </translation> <translation id="3896591584655529057">Opslag van toegangssleutels met de wachtwoordmanager aanzetten</translation> +<translation id="3896751141670591496">Als je dit beleid toepast of niet instelt, worden er beveiligingswaarschuwingen getoond als Chrome wordt gestart met bepaalde mogelijk schadelijke opdrachtregelmarkeringen. + +Als je dit beleid niet toepast, worden er geen beveiligingswaarschuwingen getoond als Chrome wordt gestart met bepaalde mogelijk schadelijke opdrachtregelmarkeringen. + +In <ph name="MS_WIN_NAME" /> is dit beleid alleen beschikbaar voor instanties die zijn gekoppeld aan een <ph name="MS_AD_NAME" />-domein of aan <ph name="MS_AAD_NAME" />, of die zijn ingeschreven voor <ph name="CHROME_ENTERPRISE_CORE_NAME" />. + +In <ph name="MAC_OS_NAME" /> is dit beleid alleen beschikbaar voor instanties die via MDM worden beheerd, via een MCX aan een domein zijn gekoppeld of zijn ingeschreven voor <ph name="CHROME_ENTERPRISE_CORE_NAME" />.</translation> <translation id="3897218615484393758">Beperken hoelang een gebruiker die via SAML is geverifieerd offline kan inloggen op het vergrendelscherm</translation> <translation id="3897860452756794695">Het nieuwe offsetParent-gedrag wordt gebruikt.</translation> <translation id="3898345958122666461">NTLMv2 uitzetten</translation> @@ -4264,6 +4359,11 @@ <translation id="4278656834593750050">Oplaadgeluiden aanzetten</translation> <translation id="4282243913059705499"><ph name="PRODUCT_NAME" />-icoon altijd tonen in de werkbalk</translation> <translation id="4285674129118156176">Toestaan dat niet-gelieerde gebruikers ARC gebruiken</translation> +<translation id="4287004822156577027">Als je het beleid toepast of niet instelt, scant Chrome Cleanup het systeem periodiek op ongewenste software. Als er ongewenste software wordt aangetroffen, wordt de gebruiker gevraagd of deze software moet worden verwijderd. Het is in dit geval mogelijk Chrome Cleanup handmatig te starten via chrome://settings. + +Als je het beleid niet toepast, scant Chrome Cleanup niet periodiek en wordt handmatige activering uitgezet. + +In <ph name="MS_WIN_NAME" /> is dit beleid alleen beschikbaar voor instanties die zijn gekoppeld aan een <ph name="MS_AD_NAME" />-domein of aan <ph name="MS_AAD_NAME" />, of die zijn ingeschreven voor <ph name="CHROME_ENTERPRISE_CORE_NAME" />.</translation> <translation id="428948795004445932">Snelheid waarmee netwerkgegevens worden bemonsterd en verzameld. Het toegestane minimum is 1 minuut. Als je dit beleid niet instelt, is de standaardsnelheid van 10 minuten van toepassing.</translation> @@ -4639,6 +4739,13 @@ Ga naar https://cloud.google.com/docs/chrome-enterprise/policies/url-patterns voor gedetailleerde informatie over geldige URL-patronen. * is geen geaccepteerde waarde voor dit beleid. Als je dit beleid niet instelt, is voor alle oorsprongen een eerder gebruikersgebaar vereist om deze API's aan te roepen.</translation> +<translation id="4584427961967778141">Als je dit beleid instelt, worden de extensiebeheerinstellingen voor <ph name="PRODUCT_NAME" /> beheerd, waaronder instellingen die worden beheerd door bestaande, aan extensies gerelateerde beleidsregels. Dit beleid vervangt verouderde beleidsregels die misschien zijn ingesteld. + +Met dit beleid wordt alleen een extensie-ID of een update-URL toegewezen aan de bijbehorende specifieke instelling. Er kan een standaardconfiguratie worden ingesteld voor de speciale ID <ph name="DEFAULT_SCOPE" />, die van toepassing is op alle extensies waarvoor geen aangepaste configuratie is ingesteld in dit beleid. Bij een update-URL is de configuratie van toepassing op alle extensies met de exacte update-URL die wordt vermeld in het manifest van de extensie (http://support.google.com/chrome/a?p=Configure_ExtensionSettings_policy). Als de flag override_update_url is ingesteld op Waar, wordt de extensie geïnstalleerd en geüpdatet met de update-URL die is gespecificeerd in het beleid <ph name="EXTENSION_INSTALL_FORCELIST_POLICY_NAME" /> of in het veld update_url in dit beleid. De flag override_update_url wordt genegeerd als de update_url een URL voor de Chrome Web Store is. + +In <ph name="MS_WIN_NAME" /> kunnen instanties, apps en extensies van buiten de Chrome Web Store alleen afgedwongen geïnstalleerd worden als de instantie is gekoppeld aan een <ph name="MS_AD_NAME" />-domein of aan <ph name="MS_AAD_NAME" />, of is ingeschreven voor <ph name="CHROME_ENTERPRISE_CORE_NAME" />. + +In <ph name="MAC_OS_NAME" /> kunnen instanties, apps en extensies van buiten de Chrome Web Store alleen afgedwongen geïnstalleerd worden als de instantie wordt beheerd via MDM, via MCX aan een domein is gekoppeld of is ingeschreven voor <ph name="CHROME_ENTERPRISE_CORE_NAME" />.</translation> <translation id="4591366717022345234">Gebruikers Quick Fix Build bieden</translation> <translation id="4593391169954484940">De SHA-256-hash van het bestand.</translation> <translation id="4594027034164195984">Toestaan dat afbeeldingen van derden een verificatieprompt tonen</translation> @@ -4660,6 +4767,13 @@ <translation id="4599810650416623373">JavaScript-optimalisaties blokkeren op deze sites</translation> <translation id="4600786265870346112">Grote cursor gebruiken</translation> <translation id="4602988345256038309">Verbindingen voor externe support met deze machine toestaan</translation> +<translation id="4605677392792989397">Als je het beleid instelt, wordt de lijst met zakelijke login-URL's (alleen HTTP- en HTTPS-protocollen) ingesteld. De service voor wachtwoordbeveiliging legt salted hashes van wachtwoorden op deze URL's vast en gebruikt ze om hergebruik van wachtwoorden op te sporen. Zorg ervoor dat je inlogpagina's voldoen aan de richtlijnen op https://www.chromium.org/developers/design-documents/create-amazing-password-forms, zodat <ph name="PRODUCT_NAME" /> de 'salted hashes' van wachtwoorden juist vastlegt. + +Als je deze instelling uitzet of niet instelt, legt de service voor wachtwoordbeveiliging salted hashes van wachtwoorden alleen vast op https://accounts.google.com. + +In <ph name="MS_WIN_NAME" /> is deze functionaliteit alleen beschikbaar voor instanties die zijn gekoppeld aan een <ph name="MS_AD_NAME" />-domein of aan <ph name="MS_AAD_NAME" />, of die zijn ingeschreven voor <ph name="CHROME_ENTERPRISE_CORE_NAME" />. + +In <ph name="MAC_OS_NAME" /> is deze functionaliteit alleen beschikbaar voor instanties die via MDM worden beheerd, via MCX aan een domein zijn gekoppeld of zijn ingeschreven voor <ph name="CHROME_ENTERPRISE_CORE_NAME" />.</translation> <translation id="4607416370554533118">Als je het beleid instelt, kun je een lijst met URL-patronen opgeven van sites waarvoor Chrome automatisch een clientcertificaat kan selecteren. De waarde is een matrix van JSON-woordenboeken met tekenreeksen, elk met de indeling <ph name="AUTO_SELECT_CERTIFICATE_FOR_URLS_EXAMPLE" />, waarbij <ph name="URL_PATTERN_PLACEHOLDER" /> een patroon voor het instellen van content is. <ph name="FILTER_PLACEHOLDER" /> beperkt de clientcertificaten waaruit de browser automatisch kan kiezen. Onafhankelijk van het filter worden alleen certificaten geselecteerd die overeenkomen met het certificaatverzoek van de server. Voorbeelden voor het gebruik van het gedeelte <ph name="FILTER_PLACEHOLDER" />: @@ -5213,6 +5327,17 @@ <translation id="5033070732967197381">WebAuthn API-verzoeken toestaan op sites met niet-werkende TLS-certificaten.</translation> <translation id="5034504101537897433">Rapportage voor informatie over crashrapporten van apparaat aanzetten</translation> <translation id="5036013147560568855">Versie van het certificaatregistratieprotocol. De standaardinstelling is 1. 1 is het 'statische' protocol. 2 is het 'dynamische' protocol.</translation> +<translation id="5036559232677914717">Als je dit beleid instelt, kun je aangeven hoe het systeem moet reageren als de browser wordt opgestart. Als je deze instelling uitzet, heeft dit hetzelfde effect als wanneer je het beleid niet instelt, omdat het opstartgedrag van <ph name="PRODUCT_NAME" /> moet zijn aangegeven. + +Als je het beleid instelt, kunnen gebruikers dit niet wijzigen in <ph name="PRODUCT_NAME" />. Als je het beleid niet instelt, kunnen gebruikers dit wijzigen. + +Als je dit beleid instelt op <ph name="POLICY_ENUM_RESTOREONSTARTUP_RESTOREONSTARTUPISLASTSESSION" /> of <ph name="POLICY_ENUM_RESTOREONSTARTUP_RESTOREONSTARTUPISLASTSESSIONANDURLS" />, worden sommige instellingen uitgezet die afhankelijk zijn van sessies of waarmee bij het afsluiten bepaalde acties worden uitgevoerd (zoals browsegegevens wissen bij afsluiten of sessiespecifieke cookies). + +Als je dit beleid instelt op <ph name="POLICY_ENUM_RESTOREONSTARTUP_RESTOREONSTARTUPISLASTSESSIONANDURLS" />, herstelt de browser de vorige sessie en wordt een afzonderlijk venster geopend om URL's te tonen die zijn ingesteld via <ph name="RESTORE_ON_STARTUP_URLS_POLICY_NAME" />. Gebruikers kunnen ervoor kiezen om deze URL's geopend te laten. Dan worden ze ook hersteld in de toekomstige sessie. + +In <ph name="MS_WIN_NAME" /> is dit beleid alleen beschikbaar voor instanties die zijn gekoppeld aan een <ph name="MS_AD_NAME" />-domein of aan <ph name="MS_AAD_NAME" />, of die zijn ingeschreven voor <ph name="CHROME_ENTERPRISE_CORE_NAME" />. + +In <ph name="MAC_OS_NAME" /> is dit beleid alleen beschikbaar voor instanties die via MDM worden beheerd, via een MCX aan een domein zijn gekoppeld of zijn ingeschreven voor <ph name="CHROME_ENTERPRISE_CORE_NAME" />.</translation> <translation id="5037749623252479780">Instellingen voor PageUp/PageDown staan uit</translation> <translation id="5039110755072335605">Ondersteuning voor CORS-verzoekheaders zonder jokertekens</translation> <translation id="504116558738617678">Waarschuwingen voor weinig schijfruimte alleen tonen als het apparaat onbeheerd is of er slechts 1 gebruiker is</translation> @@ -5532,6 +5657,7 @@ <translation id="5258651513421638932">Smartcardverbinding door geïsoleerde apps toestaan</translation> <translation id="5262320080678421295">Vertrouwen in certificaten van de verouderde PKI van Symantec Corporation uitzetten</translation> <translation id="5265613843467285323">Een UI-schakelaar tonen om een scherm uit te sluiten in de spiegelmodus.</translation> +<translation id="5270408671043421978">Vooraf laden van <ph name="ARC_VM" />-image uitzetten</translation> <translation id="5272332743749468542">Scherm uitsluiten in spiegelmodus beschikbaar maken voor de gebruiker</translation> <translation id="5273744932022326215">Zet de toegankelijkheidsfunctie voor cursormarkering op het inlogscherm aan. @@ -5696,6 +5822,25 @@ Als je dit beleid instelt op onwaar, staan <ph name="PRODUCT_NAME" /> en <ph name="LACROS_NAME" /> niet toe dat er een nieuwe persoon wordt toegevoegd via gebruikersbeheer.</translation> <translation id="5377606826822211923">Het gebruik van Android-apps van niet-vertrouwde bronnen beheren voor de gebruiker</translation> +<translation id="5377826248281933035">Dit beleid biedt een lijst met sites die gebruikers snel kunnen zoeken met snelkoppelingen in de adresbalk. Gebruikers kunnen een zoekopdracht starten door de snelkoppeling of @snelkoppeling (bijvoorbeeld @werk), gevolgd door de spatiebalk of Tab, in de adresbalk te typen. + +De volgende velden zijn vereist voor elke site: <ph name="NAME_SITE_SEARCH_SETTINGS_FIELD" />, <ph name="SHORTCUT_SITE_SEARCH_SETTINGS_FIELD" />, <ph name="URL_SITE_SEARCH_SETTINGS_FIELD" />. + +Het veld <ph name="NAME_SITE_SEARCH_SETTINGS_FIELD" /> komt overeen met de naam van de site of zoekmachine die aan de gebruiker wordt getoond in de adresbalk. + +Het veld <ph name="SHORTCUT_SITE_SEARCH_SETTINGS_FIELD" /> kan gewone woorden en tekens bevatten, maar mag geen spaties bevatten of beginnen met het symbool @. Snelkoppelingen moeten ook uniek zijn. + +Voor elke invoer geeft het veld <ph name="URL_SITE_SEARCH_SETTINGS_FIELD" /> de URL aan van de zoekmachine die tijdens een zoekopdracht met het bijbehorende zoekwoord wordt gebruikt. De URL moet de tekenreeks <ph name="SEARCH_TERM_MARKER" /> bevatten. Deze tekenreeks wordt tijdens de zoekopdracht vervangen door de zoektermen van de gebruiker. Ongeldige invoer en vermeldingen met dubbele snelkoppelingen worden genegeerd. + +Items voor Zoekopdrachten op site die zijn ingesteld als aanbevolen, worden weergegeven in de adresbalk als de gebruiker '@' typt. Er kunnen maximaal 3 items als aanbevolen worden geselecteerd. + +Gebruikers kunnen items voor Zoekopdrachten op site die zijn ingesteld via het beleid, niet bewerken of uitzetten. Ze kunnen wel nieuwe snelkoppelingen voor dezelfde URL toevoegen. Daarnaast kunnen gebruikers geen nieuwe items voor Zoekopdrachten op site maken met een snelkoppeling die eerder via dit beleid is gemaakt. + +Als er een conflict is met een snelkoppeling die de gebruiker eerder heeft gemaakt, krijgt de gebruikersinstelling voorrang. Gebruikers kunnen de optie die door het beleid is gemaakt nog wel activeren door '@' in de zoekbalk te typen. Als de gebruiker bijvoorbeeld 'werk' al heeft gedefinieerd als snelkoppeling naar URL1 en het beleid de optie 'werk' definieert als snelkoppeling naar URL2, wordt er een zoekopdracht naar URL1 gestart als de gebruiker 'werk' in de zoekbalk typt, maar wordt er naar URL2 gezocht als de gebruiker '@werk' in de zoekbalk typt. + +In <ph name="MS_WIN_NAME" /> is dit beleid alleen beschikbaar voor instanties die zijn gekoppeld aan een <ph name="MS_AD_NAME" />-domein of aan <ph name="MS_AAD_NAME" />, of die zijn ingeschreven voor <ph name="CHROME_ENTERPRISE_CORE_NAME" />. + +In <ph name="MAC_OS_NAME" /> is dit beleid alleen beschikbaar voor instanties die via MDM worden beheerd, via een MCX aan een domein zijn gekoppeld of zijn ingeschreven voor <ph name="CHROME_ENTERPRISE_CORE_NAME" />.</translation> <translation id="537786648513450280">Het gebruik van Android-apps van niet-vertrouwde bronnen beheren voor het apparaat</translation> <translation id="5378885577701865339">De functie voor gedeeld klembord uitzetten</translation> <translation id="538108065117008131"><ph name="PRODUCT_FRAME_NAME" /> toestaan de volgende soorten content te verwerken.</translation> @@ -5845,6 +5990,17 @@ <translation id="5480380613778757009">Als je dit beleid uitzet of niet instelt, worden alle weergave-instellingen die zijn ingesteld in de beheerde gastsessie, gereset zodra de sessie wordt beëindigd. Als je dit beleid instelt op True, worden de weergave-eigenschappen bewaard nadat de beheerde gastsessie is beëindigd.</translation> <translation id="5483012943408894695">Beginpunten of hostnaampatronen waarvoor geen beperkingen voor niet-beveiligde herkomsten zouden moeten gelden.</translation> <translation id="5483065054530244863">Door lokale vertrouwensinstanties verstrekte, met SHA-1 ondertekende certificaten toestaan</translation> +<translation id="5486352219019836984">Als je dit beleid toepast, wordt aanbevolen dat anonieme rapportage van gebruiks- en crashgegevens over <ph name="PRODUCT_NAME" /> aan Google standaard aanstaat. Gebruikers kunnen deze instelling nog steeds wijzigen. + +Als je dit beleid niet toepast, staat anonieme rapportage uit en worden er geen gebruiks- of crashgegevens naar Google gestuurd. Gebruikers kunnen deze instelling niet wijzigen. + +Als dit beleid niet is ingesteld, kunnen gebruikers het gedrag voor anonieme rapportage kiezen tijdens de installatie of de eerste uitvoering. Ze kunnen deze instelling later wijzigen. + +In <ph name="MS_WIN_NAME" /> is dit beleid alleen beschikbaar voor instanties die zijn gekoppeld aan een <ph name="MS_AD_NAME" />-domein of aan <ph name="MS_AAD_NAME" />, of die zijn ingeschreven voor <ph name="CHROME_ENTERPRISE_CORE_NAME" />. + +In <ph name="MAC_OS_NAME" /> is dit beleid alleen beschikbaar voor instanties die via MDM worden beheerd, via een MCX aan een domein zijn gekoppeld of zijn ingeschreven voor <ph name="CHROME_ENTERPRISE_CORE_NAME" />. + +(Zie <ph name="DEVICE_METRICS_REPORTING_ENABLED_POLICY_NAME" /> voor <ph name="PRODUCT_OS_NAME" />.)</translation> <translation id="5486917900445838803">Als je dit beleid toepast of niet instelt, wordt grafische versnelling gebruikt als dit beschikbaar is. Als je het beleid niet toepast, wordt grafische versnelling niet gebruikt.</translation> @@ -6200,6 +6356,11 @@ <translation id="5708969689202733975">Toegestane modi voor snel ontgrendelen configureren</translation> <translation id="5714563837055244378">Delen van Android-apps naar web-apps aanzetten.</translation> <translation id="5715739768416614900">Kiosk-tools voor probleemoplossing aanzetten.</translation> +<translation id="5716156630400143265">Als je <ph name="RESTORE_ON_STARTUP_POLICY_NAME" /> instelt op RestoreOnStartupIsURLs, geef je aan welke URL's moeten worden geopend door <ph name="RESTORE_ON_STARTUP_URLS_POLICY_NAME" /> in te stellen op een lijst met URL's. + +Als je het beleid niet instelt, wordt de pagina Nieuw tabblad geopend als de browser wordt opgestart. + +In <ph name="MS_WIN_NAME" /> is dit beleid alleen beschikbaar voor instanties die zijn gekoppeld aan een <ph name="MS_AD_NAME" />-domein of aan <ph name="MS_AAD_NAME" />, of die zijn ingeschreven voor <ph name="CHROME_ENTERPRISE_CORE_NAME" />.</translation> <translation id="5717973246079053225">Cloudrapportage voor beheerde profielen uitzetten</translation> <translation id="572155275267014074">Android-instellingen</translation> <translation id="5722577409367087850">De extensie laden</translation> @@ -6425,6 +6586,15 @@ <translation id="5899751601113377553">Voorkomen dat gebruikers <ph name="LACROS_NAME" /> gebruiken</translation> <translation id="5900919753933009463">Netwerkconfiguratie rapporteren</translation> <translation id="5901427587865226597">Alleen dubbelzijdig afdrukken</translation> +<translation id="5903484826174648217">Als je dit beleid toepast, vertrouwt Safe Browsing de domeinen die je aangeeft. De functie checkt deze niet op gevaarlijke bronnen zoals phishing, malware of ongewenste software. De service voor downloadbeveiliging van Safe Browsing checkt downloads die worden gehost op deze domeinen niet. De service voor wachtwoordbeveiliging checkt niet of wachtwoorden opnieuw worden gebruikt. + +Als je het beleid niet instelt, wordt de standaardbescherming van Safe Browsing toegepast op alle bronnen. + +Dit beleid ondersteunt geen reguliere expressies. Subdomeinen van een bepaald domein worden wel op de toelatingslijst gezet. Volledig gekwalificeerde domeinnamen (FQDN's) zijn niet vereist. + +In <ph name="MS_WIN_NAME" /> is dit beleid alleen beschikbaar voor instanties die zijn gekoppeld aan een <ph name="MS_AD_NAME" />-domein of aan <ph name="MS_AAD_NAME" />, of die zijn ingeschreven voor <ph name="CHROME_ENTERPRISE_CORE_NAME" />. + +In <ph name="MAC_OS_NAME" /> is dit beleid alleen beschikbaar voor instanties die via MDM worden beheerd, via een MCX aan een domein zijn gekoppeld of zijn ingeschreven voor <ph name="CHROME_ENTERPRISE_CORE_NAME" />.</translation> <translation id="5905114360004248993">Pop-ups toestaan op deze sites</translation> <translation id="5905473632148429217">Online OCSP/CRL-controles aanzetten</translation> <translation id="5908808391744484238">Als je het beleid toepast of niet instelt, kan het filter voor URL-parameters bepaalde parameters verwijderen als de gebruiker in het contextmenu 'Link in incognitovenster openen' selecteert. @@ -6638,6 +6808,19 @@ <translation id="6099853574908182288">Standaard kleurenmodus voor afdrukken</translation> <translation id="6102342563050263313">Scrollen naar opgegeven tekst in URL-fragmenten aanzetten</translation> <translation id="6102449843040973938">Niet voorkomen dat <ph name="BOREALIS_NAME" /> wordt uitgevoerd op een apparaat</translation> +<translation id="6103130052818694000">Dit beleid is beëindigd in <ph name="PRODUCT_NAME" /> 83. Gebruik in plaats daarvan <ph name="SAFE_BROWSING_PROTECTION_LEVEL_POLICY_NAME" />. + +Als je het beleid toepast, blijft de Safe Browsing-functie van Chrome actief. Als je het beleid niet toepast, blijft Safe Browsing uit. + +Als je dit beleid instelt, kunnen gebruikers dit niet wijzigen en de instelling 'Bescherming tegen phishing en malware aanzetten' niet overschrijven. Als je dit beleid niet instelt, wordt 'Bescherming tegen phishing en malware aanzetten' ingesteld op Waar, maar kan de gebruiker dit wijzigen. + +Ga naar https://developers.google.com/safe-browsing voor meer informatie over Safe Browsing. + +Als je het beleid <ph name="SAFE_BROWSING_PROTECTION_LEVEL_POLICY_NAME" /> instelt, wordt de waarde van het beleid <ph name="SAFE_BROWSING_ENABLED_POLICY_NAME" /> genegeerd. + +In <ph name="MS_WIN_NAME" /> is dit beleid alleen beschikbaar voor instanties die zijn gekoppeld aan een <ph name="MS_AD_NAME" />-domein of aan <ph name="MS_AAD_NAME" />, of die zijn ingeschreven voor <ph name="CHROME_ENTERPRISE_CORE_NAME" />. + +In <ph name="MAC_OS_NAME" /> is dit beleid alleen beschikbaar voor instanties die via MDM worden beheerd, via een MCX aan een domein zijn gekoppeld of zijn ingeschreven voor <ph name="CHROME_ENTERPRISE_CORE_NAME" />.</translation> <translation id="610892566190435199">Rapportage van aan/uit-status van apparaat aanzetten</translation> <translation id="6111936128861357925">Easter egg-dinosaurusgame toestaan</translation> <translation id="6118226055960302400">Toegestaan gedrag herstellen.</translation> @@ -6892,6 +7075,13 @@ <translation id="627672037430076089">Verbindingen voor externe support met deze machine voorkomen</translation> <translation id="6277314550042130537">KDC-beleidsgoedkeuring gebruiken tijdens HTTP-verificatie</translation> <translation id="6278428485366576908">Thema</translation> +<translation id="6279010879606347019">Als je het beleid toepast, wordt de pagina Nieuw tabblad gebruikt als homepage van de gebruiker en wordt de URL voor de homepage genegeerd. Als je het beleid niet toepast, wordt de pagina Nieuw tabblad nooit gebruikt als homepage van de gebruiker, tenzij de URL voor de homepage is ingesteld op chrome://newtab. + +Als je het beleid instelt, kunnen gebruikers het type homepage niet wijzigen in <ph name="PRODUCT_NAME" />. Als je dit beleid niet instelt, kan de gebruiker bepalen of de pagina Nieuw tabblad als homepage wordt gebruikt. + +In <ph name="MS_WIN_NAME" /> is dit beleid alleen beschikbaar voor instanties die zijn gekoppeld aan een <ph name="MS_AD_NAME" />-domein of aan <ph name="MS_AAD_NAME" />, of die zijn ingeschreven voor <ph name="CHROME_ENTERPRISE_CORE_NAME" />. + +In <ph name="MAC_OS_NAME" /> is dit beleid alleen beschikbaar voor instanties die via MDM worden beheerd, via een MCX aan een domein zijn gekoppeld of zijn ingeschreven voor <ph name="CHROME_ENTERPRISE_CORE_NAME" />.</translation> <translation id="628084107912717806">Geeft aan of WebAssembly-modules cross-origin kunnen worden verstuurd.</translation> <translation id="6280973140313576289">Profielkiezer afgedwongen bij opstarten</translation> <translation id="6282524907402492171">Waarschuwingen over beëindiging van <ph name="CLOUD_PRINT_NAME" /> tonen</translation> @@ -7651,6 +7841,13 @@ <translation id="6766216162565713893">Toestaan dat sites de gebruiker vragen om toegang te verlenen tot een Bluetooth-apparaat in de buurt</translation> <translation id="6770454900105963262">Informatie over actieve kiosk-sessies melden</translation> <translation id="6774132787348495175">Gebruikers niet toestaan virtuele machines te gebruiken die nodig zijn om Linux-apps te ondersteunen</translation> +<translation id="678121785914414680">Lijst met bestandstypen die automatisch moeten worden geopend nadat ze zijn gedownload. Het voorafgaande scheidingsteken mag niet worden opgenomen als je het bestandstype vermeldt. Vermeld dus 'txt' in plaats van '.txt'. + +Bestanden met typen die automatisch moeten worden geopend, vallen nog steeds onder de geactiveerde Safe Browsing-checks en worden niet geopend als ze die checks niet doorstaan. + +Als dit beleid niet is ingesteld, worden alleen bestandstypen waarvoor een gebruiker dit al heeft aangegeven, automatisch geopend nadat ze zijn gedownload. + +In <ph name="MS_WIN_NAME" /> is dit beleid alleen beschikbaar voor instanties die zijn gekoppeld aan een <ph name="MS_AD_NAME" />-domein of aan <ph name="MS_AAD_NAME" />, of die zijn ingeschreven voor <ph name="CHROME_ENTERPRISE_CORE_NAME" />.</translation> <translation id="6782331708811245959">Rapportage voor opstartmodus van apparaat aanzetten</translation> <translation id="6783578496154221347">Gebruik WeeklyTimeIntervalChecked in nieuwe code.</translation> <translation id="6785201942412171878">De sneltoets beheren die wordt gebruikt om de 'six pack'-toetsen voor PageUp/PageDown te activeren</translation> @@ -9286,6 +9483,13 @@ <translation id="8089200718228084417">Verouderde Privet-afdrukken aanzetten</translation> <translation id="8091982561085048989">Booleaanse markering die aangeeft of IPP Everywhere moet worden gebruikt om de printer in te stellen. Deze markering wordt ondersteund in versie 76 en hoger van <ph name="PRODUCT_OS_NAME" />.</translation> <translation id="8094095107731619070">Autocorrectie op fysiek toetsenbord als gebruikers typen aanzetten</translation> +<translation id="8098760437853291958">Als je het beleid toepast of niet instelt, worden gedownloade bestanden voor analyse gestuurd naar Safe Browsing, zelfs als deze van een vertrouwde bron afkomstig zijn. + +Als je het beleid niet toepast, worden gedownloade bestanden niet voor analyse naar Safe Browsing gestuurd als deze van een vertrouwde bron afkomstig zijn. + +Deze beperkingen gelden zowel voor downloads die via de webpaginacontent als voor downloads die via de menuoptie Link downloaden geactiveerd zijn. Deze beperkingen gelden niet voor het opslaan of downloaden van de huidige pagina die wordt getoond of voor de afdrukoptie Opslaan als pdf. + +In <ph name="MS_WIN_NAME" /> is dit beleid alleen beschikbaar voor instanties die zijn gekoppeld aan een <ph name="MS_AD_NAME" />-domein of aan <ph name="MS_AAD_NAME" />, of die zijn ingeschreven voor <ph name="CHROME_ENTERPRISE_CORE_NAME" />.</translation> <translation id="8099833343914898016">Een vooraf bepaalde lijst met snelkoppelingen via de Launcher-toets voert nooit een actie uit als het volledige scherm is geactiveerd.</translation> <translation id="8099880303030573137">Inactieve vertraging wanneer op de batterij wordt gewerkt</translation> <translation id="8101381354936029836">Beleid van atomische groep:</translation> @@ -9419,6 +9623,34 @@ Meer informatie over Safe Browsing ( https://developers.google.com/safe-browsing ).</translation> <translation id="8199823751103472868">Als je het beleid instelt, wordt Hindi InScript-indeling aangezet voor <ph name="PRODUCT_OS_NAME" />. Als het beleid is ingesteld op False of niet is ingesteld, is de indeling niet beschikbaar.</translation> <translation id="8202834945144737726">Het attestproces <ph name="CHROME_ENTERPRISE_DEVICE_TRUST_CONNECTOR" /> aanzetten voor een lijst met URL's op het inlogscherm</translation> +<translation id="8210117014924235250">Dit beleid biedt een manier om de lijst met sets te overschrijven die de browser gebruikt voor functies van gehelen van gerelateerde websites. + +Dit beleid overschrijft het beleid <ph name="FIRST_PARTY_SETS_OVERRIDES_POLICY_NAME" />. + +Elke set in de lijst met gehelen van gerelateerde websites van de browser moet voldoen aan de vereisten van een geheel van gerelateerde websites. +Een geheel van gerelateerde websites moet bestaan uit een primaire site en een of meer lidsites. +Een set kan ook een lijst bevatten van servicesites waarvan de set de eigenaar is, evenals een routebeschrijving van een site naar alle ccTLD-varianten. +Ga naar https://github.com/WICG/first-party-sets voor meer informatie over hoe <ph name="PRODUCT_NAME" /> gehelen van gerelateerde websites gebruikt. + + +Alle sites in een geheel van gerelateerde websites moeten een registreerbaar domein zijn dat via HTTPS wordt gehost. Elke site in een geheel van gerelateerde websites moet ook uniek zijn. Dit betekent dat een site niet meer dan één keer in een geheel van gerelateerde websites kan voorkomen. + +Als dit beleid een leeg woordenboek krijgt, gebruikt de browser de openbare lijst met gehelen van gerelateerde websites. + +Voor alle sites in een geheel van gerelateerde websites uit de lijst <ph name="REPLACEMENTS" /> geldt dat als een site ook aanwezig is in een geheel van gerelateerde websites in de lijst van de browser, die site wordt verwijderd uit het geheel van gerelateerde websites van de browser. +Daarna wordt het geheel van gerelateerde websites van het beleid toegevoegd aan de lijst met gehelen van gerelateerde websites van de browser. + +Voor alle sites in een geheel van gerelateerde websites uit de lijst <ph name="ADDITIONS" /> geldt dat als een site ook aanwezig is in een geheel van gerelateerde websites in de lijst van de browser, het geheel van gerelateerde websites van de browser wordt geüpdatet zodat het nieuwe geheel van gerelateerde websites aan de lijst van de browser kan worden toegevoegd. Nadat de lijst van de browser is geüpdatet, wordt het geheel van gerelateerde websites van het beleid toegevoegd aan de lijst met gehelen van gerelateerde websites van de browser. + +De lijst met gehelen van gerelateerde websites van de browser vereist dat geen van de sites op de lijst in meer dan één set voorkomt. Dit is ook vereist voor zowel de lijst <ph name="REPLACEMENTS" /> als de lijst <ph name="ADDITIONS" />. Een site kan ook niet in zowel de lijst <ph name="REPLACEMENTS" /> als de lijst <ph name="ADDITIONS" /> staan. + +Jokertekens (*) worden niet ondersteund als beleidswaarde of binnen een geheel van gerelateerde websites in deze lijsten. + +Alle sets die in het beleid worden vermeld, moeten geldige gehelen van gerelateerde websites zijn. Zo niet, dan krijg je de relevante foutmelding. + +In <ph name="MS_WIN_NAME" /> is dit beleid alleen beschikbaar voor instanties die zijn gekoppeld aan een <ph name="MS_AD_NAME" />-domein of aan <ph name="MS_AAD_NAME" />, of die zijn ingeschreven voor <ph name="CHROME_ENTERPRISE_CORE_NAME" />. + +In <ph name="MAC_OS_NAME" /> is dit beleid alleen beschikbaar voor instanties die via MDM worden beheerd, via een MCX aan een domein zijn gekoppeld of zijn ingeschreven voor <ph name="CHROME_ENTERPRISE_CORE_NAME" />.</translation> <translation id="8213475033260328041">Kies ervoor om de betreffende gegevens van <ph name="PRODUCT_NAME" /> op te slaan in een specifieke geografische locatie. Als je dit beleid niet instelt of instelt op <ph name="DATA_REGION_SETTING_NO_PREFERENCE_OPTION_NAME" /> (waarde 0), kunnen de betreffende gegevens worden opgeslagen in elke geografische locatie (of meerdere). @@ -9502,6 +9734,23 @@ Als je het beleid niet instelt, vragen websites om toegang maar kunnen gebruikers deze instelling wijzigen.</translation> <translation id="8267520984570984190">Het standaardgedrag voor formaataanpassing van het virtuele toetsenbord is niet aangepast</translation> <translation id="8269238942896230153">Een beheerd account moet een primair account zijn en bij het maken van een profiel mogen geen bestaande browsegegevens worden geïmporteerd</translation> +<translation id="827020625039819798">Als je het beleid instelt, wordt een lijst met apps en extensies gespecificeerd die op de achtergrond worden geïnstalleerd zonder interactie met de gebruiker en die niet kunnen worden verwijderd of uitgezet door gebruikers via de <ph name="PRODUCT_NAME" />-interface. Rechten worden impliciet verleend, waaronder voor de extensie-API's enterprise.deviceAttributes en enterprise.platformKeys. (Deze 2 API's zijn niet beschikbaar voor apps en extensies die niet afgedwongen geïnstalleerd zijn.) + +Hoewel <ph name="PRODUCT_NAME" /> probeert te voorkomen dat gebruikers deze extensies verwijderen, maken sommige besturingssystemen het onmogelijk voor <ph name="PRODUCT_NAME" /> om zich goed te verdedigen tegen externe wijzigingen in extensies. Deze poging tot voorkomen is dus een maximale inspanning. + +Als je dit beleid niet instelt, worden apps of extensies niet automatisch geïnstalleerd en kunnen gebruikers elke app of extensie in <ph name="PRODUCT_NAME" /> verwijderen. + +Dit beleid vervangt het beleid <ph name="EXTENSION_INSTALL_BLOCKLIST_POLICY_NAME" />. Als een eerder afgedwongen geïnstalleerde app of extensie wordt verwijderd uit deze lijst, verwijdert <ph name="PRODUCT_NAME" /> de app of extensie automatisch. + +Gebruikers kunnen de broncode van een extensie wijzigen via de ontwikkelaarstools, waardoor de extensie misschien niet meer functioneert. Als je je hierover zorgen maakt, moet je het beleid <ph name="DEVELOPER_TOOLS_DISABLED_POLICY_NAME" /> instellen. + +Elk lijstitem van het beleid is een tekenreeks die een extensie-ID en optioneel een update-URL bevat, gescheiden door een puntkomma (;). De extensie-ID is de tekenreeks van 32 letters die bijvoorbeeld op chrome://extensions kan worden gevonden als de ontwikkelaarsmodus actief is. De update-URL, indien aangegeven, moet verwijzen naar een XML-updatedocument voor het manifest ( https://developer.chrome.com/extensions/autoupdate ). De update-URL moet een van de volgende schema's gebruiken: <ph name="HTTP_SCHEME" />, <ph name="HTTPS_SCHEME" /> of <ph name="FILE_SCHEME" />. Standaard wordt de update-URL van de Chrome Web Store gebruikt. De update-URL die in dit beleid is ingesteld, wordt alleen voor de eerste installatie gebruikt. Daaropvolgende updates van de extensie gebruiken de update-URL die in het manifest van de extensie wordt aangegeven. De update-URL voor volgende updates kan worden overschreven door het beleid <ph name="EXTENSION_SETTINGS_POLICY_NAME" />. Zie http://support.google.com/chrome/a?p=Configure_ExtensionSettings_policy. + +In <ph name="MS_WIN_NAME" /> kunnen instanties, apps en extensies van buiten de Chrome Web Store alleen afgedwongen geïnstalleerd worden als de instantie is gekoppeld aan een <ph name="MS_AD_NAME" />-domein of aan <ph name="MS_AAD_NAME" />, of is ingeschreven voor <ph name="CHROME_ENTERPRISE_CORE_NAME" />. + +In <ph name="MAC_OS_NAME" /> kunnen instanties, apps en extensies van buiten de Chrome Web Store alleen afgedwongen geïnstalleerd worden als de instantie wordt beheerd via MDM, via MCX aan een domein is gekoppeld of is ingeschreven voor <ph name="CHROME_ENTERPRISE_CORE_NAME" />. + +Opmerking: Dit beleid is niet van toepassing op de incognitomodus. Lees meer informatie over het hosten van extensies ( https://developer.chrome.com/extensions/hosting ).</translation> <translation id="8270320981823560179">Drive</translation> <translation id="827054846390793641">Verbindingsgerelateerde UI aanzetten op hostdesktop bij een actieve verbinding</translation> <translation id="8272422063636310696">Bepaalt of een pagina die verouderde technologieën gebruikt, wordt gerapporteerd op basis van de URL. @@ -9743,6 +9992,13 @@ <translation id="8452787853105404870">Hardwaregegevens naar Google sturen om ChromeOS Flex te verbeteren</translation> <translation id="8453218444172088993">Zet de <ph name="PRIVACY_SANDBOX_NAME" />-instelling voor advertentieonderwerpen uit voor je gebruikers.</translation> <translation id="8455529558077979314">Instellingen voor privacyscherm</translation> +<translation id="8459662059679040042">Als je het beleid toepast en <ph name="CHROME_CLEANUP_NAME" /> ongewenste software vindt, kan dit beleid (in overeenstemming met het beleid ingesteld door <ph name="SAFE_BROWSING_EXTENDED_REPORTING_ENABLED_POLICY_NAME" />) de resultaten van de scan naar Google sturen. <ph name="CHROME_CLEANUP_NAME" /> vraagt gebruikers of ze willen opschonen. De resultaten worden naar Google gestuurd. + +Als je het beleid niet toepast en <ph name="CHROME_CLEANUP_NAME" /> ongewenste software vindt, worden de resultaten van de scan niet naar Google gestuurd, ongeacht de waarde van <ph name="SAFE_BROWSING_EXTENDED_REPORTING_ENABLED_POLICY_NAME" />. <ph name="CHROME_CLEANUP_NAME" /> vraagt gebruikers of ze willen opschonen. De resultaten worden niet naar Google gestuurd. + +Als je het beleid niet instelt, kan <ph name="CHROME_CLEANUP_NAME" /> (in overeenstemming met het beleid ingesteld door <ph name="SAFE_BROWSING_EXTENDED_REPORTING_ENABLED_POLICY_NAME" />) de resultaten van scans op ongewenste software naar Google sturen. <ph name="CHROME_CLEANUP_NAME" /> vraagt gebruikers of ze willen opschonen en de resultaten willen delen met Google om bij te dragen aan de toekomstige detectie van ongewenste software. Deze resultaten bevatten metadata van bestanden, automatisch geïnstalleerde extensies en registersleutels zoals beschreven in de whitepaper over het Privacybeleid van Chrome. + +In <ph name="MS_WIN_NAME" /> is dit beleid alleen beschikbaar voor instanties die zijn gekoppeld aan een <ph name="MS_AD_NAME" />-domein of aan <ph name="MS_AAD_NAME" />, of die zijn ingeschreven voor <ph name="CHROME_ENTERPRISE_CORE_NAME" />.</translation> <translation id="8461914792118322307">Proxy</translation> <translation id="8465065632133292531">Parameters voor instant-URL die POST gebruikt</translation> <translation id="8466326735698755782">Sta Tabbladen vergelijken toe zonder AI-modellen te verbeteren.</translation> @@ -10192,6 +10448,13 @@ <translation id="8801680448782904838">Een gebruiker laten weten dat het aanbevolen of vereist is om de browser of het apparaat opnieuw op te starten</translation> <translation id="8802800226877198994">Zet Gif-ondersteuning aan.</translation> <translation id="8804685015028424497">Incognitomodus uitzetten</translation> +<translation id="8806417793261941339">Dit beleid is verouderd. Gebruik in plaats daarvan <ph name="SAFE_BROWSING_ALLOWLIST_DOMAINS_POLICY_NAME" />. + + Als je dit beleid toepast, vertrouwt Safe Browsing de domeinen die je aangeeft. De functie checkt deze niet op gevaarlijke bronnen zoals phishing, malware of ongewenste software. De service voor downloadbeveiliging van Safe Browsing checkt downloads die worden gehost op deze domeinen niet. De service voor wachtwoordbeveiliging checkt niet of wachtwoorden opnieuw worden gebruikt. + + Als je het beleid uitschakelt of niet instelt, wordt de standaardbescherming van Safe Browsing toegepast op alle bronnen. + + In <ph name="MS_WIN_NAME" /> is deze functionaliteit alleen beschikbaar voor instanties die zijn gekoppeld aan een <ph name="MS_AD_NAME" />-domein, worden uitgevoerd in Windows 10 Pro of zijn ingeschreven voor <ph name="CHROME_ENTERPRISE_CORE_NAME" />. In <ph name="MAC_OS_NAME" /> is deze functionaliteit alleen beschikbaar voor instanties die via MDM worden beheerd of via MCX aan een domein zijn gekoppeld.</translation> <translation id="8806478127647484805">Gebruikers niet toestaan processen te beëindigen met taakbeheer van Chrome</translation> <translation id="8807274441692477185">Het scherm met de scrollrichting van de touchpad niet tonen tijdens het inloggen</translation> <translation id="8807313206348471682">Het bevestigingsdialoogvenster voor uitloggen tonen</translation> @@ -10330,6 +10593,15 @@ <translation id="8897796778265450949">Beperk de tijd dat een gebruiker die via GAIA is geverifieerd zonder SAML, offline kan inloggen.</translation> <translation id="889814528399907891">Toestaan dat gebruikers <ph name="LACROS_NAME" /> aanzetten en instellen als primaire browser</translation> <translation id="8900312706328930425">Frequentie van cloudrapportage in uren</translation> +<translation id="8902938589482529940">Met dit beleid kun je een <ph name="ARC_VM" />-image vooraf laden op het apparaat dat is geïnstalleerd met <ph name="PRODUCT_OS_FLEX_NAME" />. + +Als je het beleid toepast, kan de <ph name="ARC_VM" />-image afzonderlijk vooraf worden geladen op <ph name="PRODUCT_OS_FLEX_NAME" />. + +Als je het beleid niet toepast of niet instelt, wordt voorkomen dat de <ph name="ARC_VM" />-image afzonderlijk vooraf wordt geladen op <ph name="PRODUCT_OS_FLEX_NAME" />. + +Als een image al is gedownload en het beleid daarna wordt geüpdatet, wordt de image pas verwijderd nadat de gebruiker is uitgelogd of het apparaat opnieuw heeft opgestart. + +Dit beleid bepaalt alleen <ph name="ARC_VM" /> op <ph name="PRODUCT_OS_FLEX_NAME" />. Zie voor <ph name="PRODUCT_NAME" /> het beleid <ph name="ARC_ENABLED_POLICY_NAME" /> voor meer informatie.</translation> <translation id="8903283771634816230">Als je dit beleid toepast, gebruikt <ph name="PRODUCT_NAME" /> de standaardprinter van het OS als standaardbestemming voor het afdrukvoorbeeld. Als je het beleid niet toepast of niet instelt, gebruikt <ph name="PRODUCT_NAME" /> de laatst gebruikte printer als standaardbestemming voor het afdrukvoorbeeld.</translation>
diff --git a/components/policy/resources/policy_templates_pt-BR.xtb b/components/policy/resources/policy_templates_pt-BR.xtb index 3c84987..d95e6c4 100644 --- a/components/policy/resources/policy_templates_pt-BR.xtb +++ b/components/policy/resources/policy_templates_pt-BR.xtb
@@ -3390,6 +3390,7 @@ Quando esta política for definida como falsa, o dispositivo não tentará entrar em contato com o servidor Quirks para baixar os arquivos de configuração. Se esta política for definida como verdadeira ou for deixada sem definição, o <ph name="PRODUCT_OS_NAME" /> entrará em contato automaticamente com o servidor Quirks, fará o download dos arquivos de configuração, se eles estiverem disponíveis, e os armazenará no dispositivo. Esses arquivos podem ser usados, por exemplo, para melhorar a qualidade de exibição de monitores acoplados.</translation> +<translation id="3513864752694608929">Não aplicar métodos de entrada ativados</translation> <translation id="3515196503924273265">Permite ativar o recurso NewBaseUrlInheritanceBehavior</translation> <translation id="351654132746710200">Depois que a opção <ph name="LACROS_NAME" /> for desativada, a migração de dados não vai ser realizada. A pasta <ph name="LACROS_NAME" /> será removida, e os usuários vão continuar usando os dados restantes.</translation> <translation id="3518293344797498431">Carrega a bateria até cerca de 80% para maximizar a vida útil dela.</translation> @@ -6922,6 +6923,7 @@ <translation id="6092073071805297119">Permitir o uso da filtragem de desempenho de acessibilidade.</translation> <translation id="60925735895026302">Não permitir que os sites peçam acesso a impressoras locais pela API WebPrinting</translation> <translation id="6093156968240188330">Permitir que usuários remotos interajam com janelas elevadas em sessões de assistência remota</translation> +<translation id="6093551397728373988">Aplicar todos os métodos de entrada permitidos para que sejam ativados em uma sessão de usuário</translation> <translation id="6094314311474620462">Desativar a impressão</translation> <translation id="6097601282776163274">Ativar a coleta de dados anônimos inseridos no URL</translation> <translation id="6099853574908182288">Modo de cor de impressão padrão</translation> @@ -7118,6 +7120,11 @@ Se for desativada, os usuários não terão permissão para executar o Chrome for Testing. Os usuários ainda poderão instalar o Chrome for Testing, mas ele não será executado nos perfis em que a política estiver desativada.</translation> <translation id="6258658183356534534">Controlar o recurso de atualização do User-Agent Client Hints GREASE.</translation> <translation id="6261643884958898336">Reportar informações de identificação da máquina</translation> +<translation id="6262668203803408414">Se a política for definida como verdadeira, todos os métodos de entrada da política <ph name="ALLOWED_INPUT_METHODS_POLICY_NAME" /> serão ativados nas sessões do <ph name="PRODUCT_OS_NAME" />. +Não é possível ativar outros métodos de entrada nas sessões de usuário. +Se a política for definida como falsa ou deixada sem definição, nenhum método de entrada ativado será aplicado, e a política <ph name="ALLOWED_INPUT_METHODS_POLICY_NAME" /> vai configurar apenas os métodos de entrada disponíveis para o usuário. + +Se a política <ph name="ALLOWED_INPUT_METHODS_POLICY_NAME" /> for deixada sem definição ou definida como uma lista vazia, ela será ignorada e os usuários poderão ativar qualquer método de entrada.</translation> <translation id="6264247808139384018">Se a política for ativada ou não for definida, os usuários que autenticam com uma senha poderão bloquear a tela. Se a política for desativada, os usuários não poderão bloquear a tela. Eles só poderão sair da sessão do usuário.</translation> @@ -9248,6 +9255,7 @@ A política era temporária e foi removida após o lançamento da nova interface de download em balão.</translation> <translation id="7736521021425189418">Terminal (com suporte desde a versão 117)</translation> +<translation id="7736846524371077454">Ativar todos os métodos de entrada permitidos</translation> <translation id="7740644123648617252">Ativar a importação de dados de preenchimento automático de formulários na primeira execução</translation> <translation id="7744253761377202223">Porcentagem de brilho da tela quando em funcionamento com energia CA.</translation> <translation id="7747447585227954402">Permite que dispositivos usem um <ph name="PLUGIN_VM_NAME" /> no <ph name="PRODUCT_OS_NAME" /></translation>
diff --git a/components/policy/resources/policy_templates_th.xtb b/components/policy/resources/policy_templates_th.xtb index 4eacbaa..45787c8 100644 --- a/components/policy/resources/policy_templates_th.xtb +++ b/components/policy/resources/policy_templates_th.xtb
@@ -248,6 +248,7 @@ การตั้งค่านโยบายเป็น "เท็จ" หรือไม่ได้ตั้งค่าจะให้หน้าเว็บใช้ WebGL API และปลั๊กอินใช้ Pepper 3D API ได้ แต่การตั้งค่าเริ่มต้นของเบราว์เซอร์อาจยังคงต้องใช้อาร์กิวเมนต์บรรทัดคำสั่งเพื่อใช้ API เหล่านี้</translation> <translation id="1198458955128279215">ใช้ลักษณะการทํางานเริ่มต้นของแผนการเปิดตัวฟีเจอร์</translation> <translation id="1202216683470826356">แสดงการ์ดในหน้าแท็บใหม่</translation> +<translation id="1203676252390737801">การจัดการ IP ของ WebRTC ต่อ URL</translation> <translation id="1204263402976895730">เครื่องพิมพ์ขององค์กรที่มีการเปิดใช้</translation> <translation id="1207301487141109411">ป้องกันไม่ให้เลือกรูปโปรไฟล์ของผู้ใช้จากระบบไฟล์ในเครื่อง กล้อง และโปรไฟล์ Google</translation> <translation id="1209096923317019235">กําหนดแอปเป็นตัวแฮนเดิลเริ่มต้นสําหรับนามสกุลไฟล์ที่ระบุ</translation> @@ -642,6 +643,13 @@ หากตั้งค่านโยบายนี้เป็น "เปิดใช้" เครื่องมือเลือกอีโมจิจะรองรับอีโมจิ GIF หากตั้งค่านโยบายนี้เป็น "ปิดใช้" หรือไม่ได้ตั้งค่า เครื่องมือเลือกอีโมจิจะไม่รองรับอีโมจิ GIF หากไม่ได้ตั้งค่านโยบายนี้ไว้ เครื่องมือเลือกอีโมจิจะเปิดใช้สำหรับผู้ใช้ทั่วไปแต่ปิดใช้สำหรับผู้ใช้ที่มีการจัดการ</translation> +<translation id="1493245040983394029">นโยบายนี้ควบคุมการตั้งค่าฟีเจอร์แต่งภาพของ Photos ด้วย Generative AI สำหรับ <ph name="PRODUCT_OS_NAME" /> + +0 = เปิดใช้ฟีเจอร์ให้กับผู้ใช้ แล้วส่งข้อมูลที่เกี่ยวข้องไปยัง Google เพื่อช่วยฝึกหรือปรับปรุงโมเดล AI ข้อมูลที่เกี่ยวข้องอาจรวมถึงพรอมต์ อินพุต เอาต์พุต และเนื้อหาแหล่งที่มา โดยทั้งนี้จะขึ้นอยู่กับฟีเจอร์นั้นๆ อาจมีการตรวจสอบจากเจ้าหน้าที่เพื่อวัตถุประสงค์ในการปรับปรุงโมเดล AI เท่านั้น 0 คือค่าเริ่มต้น เว้นแต่จะระบุไว้ด้านล่าง + +1 = เปิดใช้ฟีเจอร์ให้กับผู้ใช้ แต่ไม่ต้องส่งข้อมูลไปยัง Google เพื่อฝึกหรือปรับปรุงโมเดล AI 1 คือค่าเริ่มต้นสำหรับผู้ใช้ระดับองค์กรที่จัดการโดย <ph name="GOOGLE_ADMIN_CONSOLE_PRODUCT_NAME" /> และบัญชี Education ที่จัดการโดย <ph name="GOOGLE_WORKSPACE_PRODUCT_NAME" /> + +2 = ปิดใช้ฟีเจอร์</translation> <translation id="1494138678487405397">ปิดใช้คอนทราสต์สูงในหน้าจอการเข้าสู่ระบบ</translation> <translation id="1497797462580613666">Download Manager จะมีตัวเลือกให้บันทึกไฟล์ไปยัง <ph name="GOOGLE_DRIVE_NAME" /></translation> <translation id="1498640472634891941">การตั้งค่านโยบายนี้ให้คุณระบุรูปแบบ URL ซึ่งเจาะจงเว็บไซต์ที่จะถูกปฏิเสธไม่ให้เข้าถึงเครื่องพิมพ์ในเครือข่ายโดยอัตโนมัติผ่าน WebPrinting API @@ -1593,6 +1601,7 @@ <translation id="2204753382813641270">ควบคุมการซ่อนชั้นวางอัตโนมัติ</translation> <translation id="2208976000652006649">พารามิเตอร์สำหรับ URL ค้นหาที่ใช้ POST</translation> <translation id="2212011154693551439">หน้าประวัติการเข้าชมใน Chrome ที่แบ่งออกเป็นกลุ่มๆ จะปรากฏที่ chrome://history/grouped โดยค่าเริ่มต้น</translation> +<translation id="2212207215880394506">ไม่อนุญาตให้ใช้ฟีเจอร์แต่งภาพของ Photos ด้วย Generative AI</translation> <translation id="221287948061571053">ซ่อนป้ายองค์กรแบบขยายในแถบเครื่องมือ</translation> <translation id="2213059592185933570">เปิดใช้การสร้างโปรไฟล์โรมมิ่ง</translation> <translation id="2213342458177721585">เปิดใช้เลย์เอาต์แป้นพิมพ์ภาษาฮินดีสำหรับทั้งอุปกรณ์</translation> @@ -2118,6 +2127,7 @@ การตั้งค่านโยบายเป็น "ผู้ใช้เท่านั้น" (ค่า 1) จะทำให้ผู้ใช้จัดการใบรับรองได้ แต่ต้องไม่ใช่ใบรับรองแบบทั่วทั้งอุปกรณ์</translation> <translation id="2593762551209145088">Safe Browsing จะไม่ทำงานเลย</translation> +<translation id="2594773358911436070">การตั้งค่า WebRtc</translation> <translation id="26023406105317310">กำหนดค่าบัญชี Kerberos</translation> <translation id="2603237557651009842">บล็อก WebPrinting API ในเว็บไซต์เหล่านี้</translation> <translation id="2603382859270873566">เปิดใช้การรองรับ PPB_VideoDecoder(Dev) API</translation> @@ -2222,6 +2232,7 @@ หากคุณตั้งค่านโยบายนี้และเปิดการลงชื่อเข้าใช้โดยอัตโนมัติ (ดูนโยบาย <ph name="DEVICE_LOCAL_ACCOUNT_AUTO_LOGIN_ID_POLICY_NAME" /> และ <ph name="DEVICE_LOCAL_ACCOUNT_AUTO_LOGIN_DELAY_POLICY_NAME" />) เซสชันที่มีการจัดการจะใช้ภาษาที่แนะนำและรูปแบบแป้นพิมพ์ยอดนิยมที่คู่กันเป็นอันดับแรก รูปแบบแป้นพิมพ์ที่เลือกไว้ล่วงหน้าจะเป็นรูปแบบยอดนิยมคู่กับภาษาที่เลือกไว้ล่วงหน้าเสมอ ผู้ใช้เลือกภาษาที่ <ph name="PRODUCT_OS_NAME" /> รองรับสำหรับเซสชันได้ทุกเมื่อ</translation> +<translation id="269274821351405808">การตั้งค่าฟีเจอร์แต่งภาพของ Photos ด้วย Generative AI</translation> <translation id="2693108589792503178">กำหนดค่า URL การเปลี่ยนรหัสผ่าน</translation> <translation id="2694143893026486692">แว่นขยายหน้าจอบางส่วนเปิดอยู่</translation> <translation id="2696077732471707315"> @@ -2392,6 +2403,7 @@ นโยบายนี้จะตั้งค่าเป็นนโยบายผู้ใช้ระบบคลาวด์ได้เท่านั้น</translation> <translation id="2846689894646472396">อัตราการตรวจสอบกิจกรรมในเครือข่ายเป็นมิลลิวินาที</translation> <translation id="2847788524147474533">นโยบายสำหรับเครื่องที่ใช้แพลตฟอร์มจะมีผลเหนือนโยบายสำหรับเครื่องที่ใช้ระบบคลาวด์</translation> +<translation id="2849051159985119151">อนุญาตให้ใช้ฟีเจอร์แต่งภาพของ Photos ด้วย Generative AI โดยไม่ปรับปรุงโมเดล AI</translation> <translation id="2849275596224278787">ซ่อนตัวเลือกการช่วยเหลือพิเศษในเมนูถาดระบบของหน้าจอการเข้าสู่ระบบ</translation> <translation id="2853649500575897584">อย่าบล็อกจุดขยายสัญญาณเดิมในกระบวนการของเบราว์เซอร์</translation> <translation id="2853757230661166968">อนุญาตให้แอปพลิเคชันบันทึกและลบล้างแป้นพิมพ์ลัดเริ่มต้นของระบบ</translation> @@ -3144,6 +3156,7 @@ หากตั้งค่านโยบายนี้เป็น "ซ่อน" ฟีเจอร์ที่ปิดใช้จะไม่สามารถใช้ได้และผู้ใช้จะมองไม่เห็น หากไม่ได้ตั้งค่านโยบายนี้หรือมีค่าไม่ถูกต้อง โหมดปิดใช้ของฟีเจอร์ของระบบจะ "ถูกบล็อก"</translation> +<translation id="3411947169047929182">ควบคุมการกำหนดค่าที่เกี่ยวข้องกับ WebRtc</translation> <translation id="341285788698114069">นโยบายนี้ควบคุมลำดับความสำคัญของกระบวนการของเสียงใน Windows หากเปิดใช้นโยบายนี้ กระบวนการของเสียงจะทำงานโดยมีลำดับความสำคัญสูงกว่าปกติ หากปิดใช้นโยบายนี้ กระบวนการของเสียงจะทำงานโดยมีลำดับความสำคัญปกติ @@ -4492,6 +4505,7 @@ <translation id="4467952432486360968">ปิดกั้นคุกกี้ของบุคคลที่สาม</translation> <translation id="4472740647327683596">ความกว้างของหน้าโดยหน่วยเป็นไมโครเมตร</translation> <translation id="4474167089968829729">เปิดการบันทึกรหัสผ่านไปยังโปรแกรมจัดการรหัสผ่าน</translation> +<translation id="447692108909279121">การจัดการ IP ของ WebRTC</translation> <translation id="4478248026668918517">บล็อกการตรวจหาขอบเขตนโยบาย</translation> <translation id="4479671363221255277">การตั้งค่านโยบายจะให้คุณสร้างรายการรูปแบบ URL ซึ่งระบุเว็บไซต์ที่ขอให้ผู้ใช้ให้สิทธิ์การเข้าถึงในการอ่านไฟล์หรือไดเรกทอรีในระบบไฟล์ของระบบปฏิบัติการของโฮสต์ผ่าน File System API ได้ @@ -5580,6 +5594,23 @@ หากไม่ได้ตั้งค่านโยบายนี้ไว้ หรือตั้งค่าเป็นสตริงว่างหรือช่วงพอร์ตที่ไม่ถูกต้อง จะเป็นการอนุญาตให้ WebRTC ใช้พอร์ต UDP ที่ว่างอยู่พอร์ตใดก็ได้ในเครื่อง</translation> <translation id="5288776487100096897">อนุญาตให้นโยบายระดับผู้ใช้บนระบบคลาวด์ลบล้างนโยบาย <ph name="CHROME_BROWSER_CLOUD_MANAGEMENT_NAME" /></translation> +<translation id="5289330879750533981">นโยบายนี้อนุญาตให้จำกัดที่อยู่ IP และอินเทอร์เฟซที่ WebRTC ที่ใช้เมื่อพยายามค้นหาการเชื่อมต่อที่ดีที่สุดที่มีสำหรับ URL บางรูปแบบ + +โดยรับรายการรูปแบบ URL และคู่ประเภทการจัดการ ระบบจะตรวจสอบรูปแบบ URL ตามลําดับและการจับคู่ครั้งแรกจะกําหนดค่าการจัดการที่ WebRTC ใช้สําหรับโดเมน เมื่อ URL ของเอกสารปัจจุบันไม่ตรงกับรายการใดๆ ระบบจะใช้ค่ากำหนดที่นโยบาย <ph name="WEB_RTC_IP_HANDLING_POLICY_NAME" /> ตั้ง + +ดูข้อมูลโดยละเอียดเกี่ยวกับรูปแบบอินพุตที่ถูกต้องได้ที่ https://cloud.google.com/docs/chrome-enterprise/policies/url-patterns ใช้ไวลด์การ์ด (<ph name="WILDCARD_VALUE" />) ได้ นโยบายนี้จะจับคู่โดยอิงตามต้นทางเท่านั้น ระบบจึงไม่สนใจเส้นทางใดก็ตามในรูปแบบ URL + +ค่าการจัดการที่ถูกต้อง + +* ค่าเริ่มต้น - WebRTC ใช้อินเทอร์เฟซเครือข่ายทั้งหมด + +* default_public_and_private_interfaces - WebRTC ใช้อินเทอร์เฟซสาธารณะและส่วนตัวทั้งหมด + +* default_public_interface_only - WebRTC ใช้อินเทอร์เฟซสาธารณะทั้งหมด แต่ไม่ใช้อินเทอร์เฟซส่วนตัว + +* disable_non_proxied_udp - WebRTC ใช้พร็อกซี SOCKS ของ UDP หรือจะเปลี่ยนไปใช้พร็อกซีของ TCP + +ดูคำอธิบายโดยละเอียดของค่าการจัดการทั้งหมดได้ที่ RFC 8828 ส่วนที่ 5.2 (https://tools.ietf.org/html/rfc8828.html#section-5.2)</translation> <translation id="5290940294294002042">ระบุรายการปลั๊กอินที่ผู้ใช้สามารถเปิดหรือปิดใช้งาน</translation> <translation id="5293285950307241933">ลบข้อมูลผู้ใช้ทั้งหมดในระบบ</translation> <translation id="5293619885162445352">อนุญาตให้ <ph name="PEPPER_NAME" /> ใช้เครื่องมือถอดรหัสวิดีโอใหม่</translation> @@ -6656,6 +6687,7 @@ หากไม่ได้กำหนดค่านโยบายนี้ไว้ "<ph name="PRODUCT_NAME" />" จะใช้เวอร์ชันสูงสุดตามค่าเริ่มต้น มิเช่นนั้น อาจตั้งค่าเป็น "tls1.2" หรือ "tls1.3" เมื่อตั้งค่าแล้ว "<ph name="PRODUCT_NAME" />" จะไม่ใช้เวอร์ชัน SSL/TLS ที่สูงกว่าเวอร์ชันที่ระบุ ระบบจะไม่สนใจค่าที่ไม่รู้จัก</translation> +<translation id="6120909112796019291">อนุญาตให้ใช้ฟีเจอร์แต่งภาพของ Photos ด้วย Generative AI และปรับปรุงโมเดล AI</translation> <translation id="6123052603197028610">ไม่อนุญาตการค้นหาไปยังเซิร์ฟเวอร์ของ Google เพื่อเรียกการประทับเวลา</translation> <translation id="6130360423841559818">ควบคุมลักษณะการทำงานใหม่ของกล่องโต้ตอบการยกเลิกที่เหตุการณ์ beforeunload สร้างขึ้น</translation> <translation id="6131803221304830537">ปิดใช้ความสมบูรณ์ของโค้ดในโปรแกรมแสดงภาพ</translation> @@ -7047,6 +7079,7 @@ การตั้งค่านโยบายเป็น "เท็จ" จะป้องกันไม่ให้ Signed HTTP Exchange โหลด</translation> <translation id="6368011194414932347">กำหนดค่า URL ของหน้าแรก</translation> <translation id="6368403635025849609">อนุญาตให้ใช้ JavaScript บนไซต์เหล่านี้</translation> +<translation id="6368671810229507360">WebRTC</translation> <translation id="6371005337713685988">การตั้งค่าชุดเว็บไซต์ที่เกี่ยวข้อง</translation> <translation id="6371561334154580937">แสดงกล่องโต้ตอบการออกจากระบบเมื่อปิดหน้าต่างสุดท้าย</translation> <translation id="6372105930898423193">อนุญาตให้เปิดใช้ฟีเจอร์ AppCache อีกครั้งหากฟีเจอร์นี้ปิดอยู่โดยค่าเริ่มต้น</translation> @@ -9462,6 +9495,21 @@ <translation id="8238421250255592181">ธงบูลีนที่ระบุว่าแป้นพิมพ์บนหน้าจอจะมีฟีเจอร์การเติมคำอัตโนมัติหรือไม่</translation> <translation id="8239109177194627162">ปิดใช้ฟีเจอร์ป้อนข้อความอัตโนมัติสำหรับบัตรเครดิต</translation> <translation id="8239143983379015783">บังคับให้เปิดใช้โควต้าถาวร</translation> +<translation id="8240976615241583524">นโยบายนี้อนุญาตให้จำกัดที่อยู่ IP และอินเทอร์เฟซที่ WebRTC จะใช้เมื่อพยายามค้นหาการเชื่อมต่อที่ดีที่สุดที่มีอยู่ + +ค่าที่ถูกต้อง: + +* ค่าเริ่มต้น - WebRTC ใช้อินเทอร์เฟซเครือข่ายทั้งหมดที่มีอยู่ + +* default_public_and_private_interfaces - WebRTC ใช้อินเทอร์เฟซสาธารณะและส่วนตัวทั้งหมด + +* default_public_interface_only - WebRTC ใช้อินเทอร์เฟซสาธารณะทั้งหมด แต่ไม่ใช้อินเทอร์เฟซส่วนตัว + +* disable_non_proxied_udp - WebRTC ใช้พร็อกซี SOCKS ของ UDP หรือจะเปลี่ยนไปใช้พร็อกซีของ TCP + +โดยค่าเริ่มต้นจะเป็นใช้อินเทอร์เฟซเครือข่ายทั้งหมดที่มีอยู่เมื่อไม่ได้ตั้งค่า + +ดูคำอธิบายโดยละเอียดของค่าการจัดการทั้งหมดได้ที่ RFC 8828 ส่วนที่ 5.2 (https://tools.ietf.org/html/rfc8828.html#section-5.2)</translation> <translation id="8244171102276095471">เปิดใช้ชุดการเข้ารหัส RC4 ใน TLS</translation> <translation id="8244525275280476362">การหน่วงเวลาสูงสุดในการดึงข้อมูลภายหลังการลบล้างนโยบาย</translation> <translation id="8244828501034607035">นโยบายนี้ควบคุมการแสดงการ์ด Outlook ในหน้าแท็บใหม่ การ์ดดังกล่าวจะแสดงในหน้าแท็บใหม่ก็ต่อเมื่อมีการเปิดใช้นโยบายดังกล่าวและองค์กรให้สิทธิ์ในการใช้งานข้อมูลปฏิทิน Outlook ในเบราว์เซอร์
diff --git a/components/policy/resources/policy_templates_tr.xtb b/components/policy/resources/policy_templates_tr.xtb index 8d4b9fa..1754465 100644 --- a/components/policy/resources/policy_templates_tr.xtb +++ b/components/policy/resources/policy_templates_tr.xtb
@@ -3333,6 +3333,7 @@ dosyalarını indirmek için Quirks Server ile iletişim kurmayı denemez. Bu politika true (doğru) değerine ayarlanırsa veya yapılandırılmazsa, <ph name="PRODUCT_OS_NAME" />, Quirks Server ile otomatik olarak iletişim kurar ve varsa yapılandırma dosyalarını indirip cihaza kaydeder. Bu tür dosyalar, örneğin bağlı monitörlerin görüntü kalitesini iyileştirmek için kullanılabilir.</translation> +<translation id="3513864752694608929">Etkin giriş yöntemlerini zorunlu kılma</translation> <translation id="3515196503924273265">NewBaseUrlInheritanceBehavior özelliğinin etkinleştirilmesine izin verir</translation> <translation id="351654132746710200"><ph name="LACROS_NAME" /> devre dışı bırakıldıktan sonra veri taşıma işlemi gerçekleştirilmez. <ph name="LACROS_NAME" /> klasörü kaldırılır ve kullanıcılar kalan verileri kullanmaya devam eder.</translation> <translation id="3518293344797498431">Pil kullanım ömrünü en üst düzeye çıkarmak için pili yaklaşık %80 oranında şarj et.</translation> @@ -6780,6 +6781,7 @@ <translation id="6092073071805297119">Erişilebilirlik performansı filtrelerinin kullanılmasına izin ver.</translation> <translation id="60925735895026302">Hiçbir sitenin WebPrinting API aracılığıyla yerel yazıcılara erişim istemesine izin verme</translation> <translation id="6093156968240188330">Uzaktan yardım oturumlarında uzak kullanıcıların yükseltilmiş pencerelerle etkileşimde bulunmasına izin ver</translation> +<translation id="6093551397728373988">İzin verilen tüm giriş yöntemlerinin kullanıcı oturumunda etkinleştirilmesini zorunlu kıl</translation> <translation id="6094314311474620462">Yazdırmayı devre dışı bırak</translation> <translation id="6097601282776163274">URL içeren veya URL'lerle ilişkili anonim veri toplamayı etkinleştir</translation> <translation id="6099853574908182288">Varsayılan renkli yazdırma modu</translation> @@ -6975,6 +6977,11 @@ Bu politika, Devre Dışı değerine ayarlanırsa kullanıcıların Chrome for Testing'i çalıştırmasına izin verilmez. Kullanıcılar yine de Chrome for Testing'i yükleyebilir ancak bu politikanın Devre Dışı değerine ayarlandığı profillerde çalıştıramaz.</translation> <translation id="6258658183356534534">Kullanıcı aracısı istemci ipuçları GREASE güncelleme özelliğini kontrol et.</translation> <translation id="6261643884958898336">Makine Kimlik bilgilerini bildir</translation> +<translation id="6262668203803408414">Politika, doğru değerine ayarlanırsa <ph name="ALLOWED_INPUT_METHODS_POLICY_NAME" /> politikasındaki tüm giriş yöntemlerinin <ph name="PRODUCT_OS_NAME" /> oturumlarında etkinleştirilmesi zorunlu kılınır. +Kullanıcı oturumlarında başka giriş yöntemi etkinleştirilemez. +Politika, yanlış değerine ayarlanır veya ayarlanmadan bırakılırsa etkin giriş yöntemleri zorunlu kılınmaz ve <ph name="ALLOWED_INPUT_METHODS_POLICY_NAME" /> politikası yalnızca hangi giriş yöntemlerinin kullanılabileceğini yapılandırır. + +<ph name="ALLOWED_INPUT_METHODS_POLICY_NAME" /> politikası ayarlanmaz veya boş listeye ayarlanırsa bu politika yoksayılır ve kullanıcılar istedikleri giriş yöntemini etkinleştirebilir.</translation> <translation id="6264247808139384018">Politika, Etkin değerine ayarlanır veya ayarlanmadan bırakılırsa şifreyle kimlik doğrulayan kullanıcılar ekranı kilitleyebilir. Politika, Devre Dışı değerine ayarlanırsa kullanıcılar ekranı kilitleyemez. (Yalnızca kullanıcı oturumundan çıkış yapabilirler.)</translation> @@ -9056,6 +9063,7 @@ Geçici bir süreliğine kullanılması planlanan bu politika, yeni indirme balonu kullanıcı arayüzü tam olarak kullanıma sunulduktan sonra kaldırılmıştır.</translation> <translation id="7736521021425189418">Terminal (117 sürümünden itibaren desteklenir)</translation> +<translation id="7736846524371077454">İzin verilen tüm giriş yöntemlerinin etkinleştirilmesini zorunlu kıl</translation> <translation id="7740644123648617252">İlk çalıştırmada form otomatik doldurma verilerinin içe aktarılmasını etkinleştir</translation> <translation id="7744253761377202223">AC gücünde çalışırken ekran parlaklığı yüzdesi</translation> <translation id="7747447585227954402">Cihazların <ph name="PRODUCT_OS_NAME" /> üzerinde bir <ph name="PLUGIN_VM_NAME" /> kullanmasına izin verir</translation>
diff --git a/components/policy/resources/policy_templates_uk.xtb b/components/policy/resources/policy_templates_uk.xtb index 9761f145..293bc7c 100644 --- a/components/policy/resources/policy_templates_uk.xtb +++ b/components/policy/resources/policy_templates_uk.xtb
@@ -3326,6 +3326,7 @@ зв’язується із сервером Quirks, щоб завантажити файли конфігурації. Якщо для цього правила вибрано значення true або його не налаштовано, <ph name="PRODUCT_OS_NAME" /> автоматично зв’язується із сервером Quirks, завантажує файли конфігурації (якщо вони доступні) і зберігає їх на пристрої. Ці файли допомагають, наприклад, покращити якість зображення приєднаних моніторів.</translation> +<translation id="3513864752694608929">Не застосовувати дозволені методи введення примусово</translation> <translation id="3515196503924273265">Дозволяє вмикати функцію NewBaseUrlInheritanceBehavior</translation> <translation id="351654132746710200">Якщо вимкнути <ph name="LACROS_NAME" />, дані не переноситимуться. Папку <ph name="LACROS_NAME" /> буде вилучено, і користувачі зможуть надалі використовувати наявні дані.</translation> <translation id="3518293344797498431">Заряджати акумулятор до 80%, щоб подовжити його строк служби.</translation> @@ -6723,6 +6724,7 @@ <translation id="6092073071805297119">Дозволити використання фільтрів ефективності для функцій доступності.</translation> <translation id="60925735895026302">Заборонити всім сайтам запитувати доступ до локальних принтерів через WebPrinting API</translation> <translation id="6093156968240188330">Дозволити віддаленим користувачам взаємодіяти з вікнами на робочому столі під час сеансів віддаленої допомоги</translation> +<translation id="6093551397728373988">Примусово ввімкнути всі дозволені методи введення в сеансі користувача</translation> <translation id="6094314311474620462">Вимкнути друк</translation> <translation id="6097601282776163274">Увімкнути збір анонімних даних, захищених паролем URL-адрес</translation> <translation id="6099853574908182288">Стандартні параметри кольорового друку</translation> @@ -6918,6 +6920,11 @@ Якщо його вимкнути, версія Chrome for Testing не запускатиметься. Користувачі все одно зможуть установлювати її, але вона не працюватиме в профілях, де це правило вимкнено.</translation> <translation id="6258658183356534534">Керувати функцією User-Agent Client Hints GREASE Update.</translation> <translation id="6261643884958898336">Повідомляти ідентифікаційну інформацію комп’ютера</translation> +<translation id="6262668203803408414">Якщо для цього правила вибрати значення "правда", у сеансах <ph name="PRODUCT_OS_NAME" /> буде примусово ввімкнено всі методи введення з правила <ph name="ALLOWED_INPUT_METHODS_POLICY_NAME" />. +Користувачі не зможуть вмикати інші методи введення. +Якщо для цього правила вибрати значення "неправда" або не налаштувати його, жодний з увімкнених методів введення не застосовуватиметься примусово, а правило <ph name="ALLOWED_INPUT_METHODS_POLICY_NAME" /> лише визначатиме, які методи введення доступні користувачу. + +Якщо правило <ph name="ALLOWED_INPUT_METHODS_POLICY_NAME" /> не налаштувати або вказати для нього порожній список, воно ігноруватиметься, і користувачі зможуть вмикати будь-які методи введення.</translation> <translation id="6264247808139384018">Якщо ввімкнути це правило або не налаштувати його, користувачі, які автентифікуються за допомогою пароля, зможуть блокувати екран. Якщо вимкнути це правило, користувачі не зможуть блокувати екран. (Вони можуть лише вийти із сеансу.)</translation> @@ -8982,6 +8989,7 @@ Це правило було тимчасовим. Ми вилучили його після запуску нової спливаючої підказки щодо завантаження.</translation> <translation id="7736521021425189418">Термінал (підтримується, починаючи з версії 117)</translation> +<translation id="7736846524371077454">Примусово ввімкнути всі дозволені методи введення</translation> <translation id="7740644123648617252">Увімкнути імпортування даних форми автозаповнення під час першого запуску</translation> <translation id="7744253761377202223">Відсоток яскравості екрана під час роботи від електромережі</translation> <translation id="7747447585227954402">Дозволити пристроям використовувати плагін <ph name="PLUGIN_VM_NAME" /> в <ph name="PRODUCT_OS_NAME" /></translation>
diff --git a/components/policy/resources/policy_templates_vi.xtb b/components/policy/resources/policy_templates_vi.xtb index 70f764bd..19c0642 100644 --- a/components/policy/resources/policy_templates_vi.xtb +++ b/components/policy/resources/policy_templates_vi.xtb
@@ -640,6 +640,7 @@ Nếu bạn không đặt chính sách này, <ph name="PRODUCT_NAME" /> sẽ tìm cách phát hiện xem một máy chủ có thuộc mạng nội bộ hay không. Chỉ khi đó, ứng dụng này mới phản hồi yêu cầu IWA. Nếu phát hiện một máy chủ là từ Internet, thì <ph name="PRODUCT_NAME" /> sẽ bỏ qua yêu cầu IWA từ máy chủ đó. Lưu ý: Hãy phân tách tên của các máy chủ bằng dấu phẩy. Cho phép sử dụng ký tự đại diện <ph name="WILDCARD_VALUE" />.</translation> +<translation id="1488008594883876680">Cho phép tải trước hình ảnh <ph name="ARC_VM" /></translation> <translation id="1488724823347505879">Bật tính năng chia sẻ dữ liệu của ứng dụng Android sang ứng dụng web</translation> <translation id="1490962807364514840">Chu kỳ thu thập từ xa của bộ đếm thời gian chạy CPU tính bằng mili giây.</translation> <translation id="1492223733885011596">Chính sách này cho phép bộ chọn biểu tượng cảm xúc hỗ trợ GIF trong <ph name="PRODUCT_OS_NAME" />. @@ -706,6 +707,43 @@ <translation id="1542491165152947087">Cho phép người dùng bật hoặc tắt chế độ cài đặt Chủ đề quảng cáo của <ph name="PRIVACY_SANDBOX_NAME" /> trên thiết bị của họ.</translation> <translation id="1542958897137600427">Bật tính năng cấp chứng chỉ máy khách</translation> <translation id="1548431234399786388">Kiểm soát chế độ cài đặt cho chính sách Báo cáo sự kiện trên trình duyệt.</translation> +<translation id="155018731031610976">Chính sách này cung cấp cách ghi đè danh sách nhóm mà trình duyệt dùng cho các tính năng của Nhóm bên thứ nhất. + +Mọi nhóm trong danh sách Nhóm bên thứ nhất của trình duyệt đều phải đáp ứng yêu cầu về Nhóm bên thứ nhất. +Nhóm bên thứ nhất phải chứa một trang web chính và tối thiểu một trang web thành viên. +Một bộ cũng có thể chứa danh sách trang web dịch vụ thuộc sở hữu của bộ đó và bản đồ từ một trang web đến tất cả biến thể ccTLD (miền cấp cao nhất theo mã quốc gia) của trang web đó. +Hãy truy cập https://github.com/WICG/first-party-sets để biết thêm thông tin về Nhóm bên thứ nhất mà <ph name="PRODUCT_NAME" /> sử dụng. + +Tất cả trang web trong một Nhóm bên thứ nhất đều phải là miền có thể đăng ký và được phân phát qua HTTPS. Mỗi trang web trong Nhóm bên thứ nhất cũng phải là duy nhất, nghĩa là mỗi trang web chỉ được liệt kê một lần trong một Nhóm bên thứ nhất. + +Khi bạn cung cấp một từ điển trống cho chính sách này, trình duyệt sẽ sử dụng danh sách Nhóm bên thứ nhất công khai. + +Đối với mọi trang web ở Nhóm bên thứ nhất trong danh sách <ph name="REPLACEMENTS" />, nếu một trang web cũng xuất hiện +trong Nhóm bên thứ nhất thuộc danh sách của trình duyệt thì trang web đó sẽ bị loại bỏ khỏi Nhóm bên thứ nhất của trình duyệt. +Sau đó, Nhóm bên thứ nhất của chính sách sẽ được thêm vào danh sách Nhóm bên thứ nhất của trình duyệt. + +Đối với mọi trang web ở Nhóm bên thứ nhất trong danh sách <ph name="ADDITIONS" />, nếu một trang web cũng xuất hiện +trong Nhóm bên thứ nhất thuộc danh sách của trình duyệt thì Nhóm bên thứ nhất của trình duyệt sẽ được cập nhật sao cho +có thể thêm Nhóm bên thứ nhất mới vào danh sách của trình duyệt. Sau khi danh sách của trình duyệt được cập nhật, +Nhóm bên thứ nhất của chính sách sẽ được thêm vào danh sách Nhóm bên thứ nhất của trình duyệt. + +Danh sách Nhóm bên thứ nhất của trình duyệt yêu cầu mỗi trang web thuộc danh sách này +chỉ xuất hiện trong một nhóm. Đây cũng là yêu cầu đối với cả danh sách <ph name="REPLACEMENTS" /> +và danh sách <ph name="ADDITIONS" />. Tương tự như vậy, một trang web không được xuất hiện trong cả +danh sách <ph name="REPLACEMENTS" /> và danh sách <ph name="ADDITIONS" />. + +Hệ thống không hỗ trợ việc dùng ký tự đại diện (*) làm giá trị chính sách, cũng như trong mọi Nhóm bên thứ nhất thuộc những danh sách này. + +Mọi nhóm mà chính sách cung cấp đều phải là Nhóm bên thứ nhất hợp lệ. Nếu không, +lỗi tương ứng sẽ xảy ra. + +Trên <ph name="MS_WIN_NAME" />, chính sách này chỉ có trên các phiên bản đã liên kết với một miền <ph name="MS_AD_NAME" />, <ph name="MS_AAD_NAME" /> hoặc đã đăng ký <ph name="CHROME_ENTERPRISE_CORE_NAME" />. + +Trên <ph name="MAC_OS_NAME" />, chính sách này chỉ có trên các phiên bản được quản lý qua MDM (Quản lý thiết bị di động), đã liên kết với một miền qua MCX hoặc đã đăng ký <ph name="CHROME_ENTERPRISE_CORE_NAME" />. + +Chính sách này tương đương với chính sách <ph name="RELATED_WEBSITE_SETS_OVERRIDES_POLICY_NAME" />. +Bạn có thể sử dụng một trong hai chính sách nhưng chính sách này sắp không được dùng nữa nên chính sách <ph name="RELATED_WEBSITE_SETS_OVERRIDES_POLICY_NAME" /> sẽ được ưu tiên sử dụng. +Cả hai có tác động như nhau đối với hành vi của trình duyệt.</translation> <translation id="1550295162561011575">Nếu bạn đặt chính sách này, quản trị viên có thể định cấu hình tự động khởi chạy ứng dụng trên các thiết bị <ph name="PRODUCT_NAME" />. Các ứng dụng này có thể khởi chạy khi người dùng đăng nhập hoặc người dùng có thể khởi chạy các ứng dụng cùng nhau từ trình chạy.</translation> <translation id="1551782388466447648">Bật bàn phím ảo cảm ứng trên màn hình đăng nhập</translation> <translation id="1552418937045050762">Nếu bạn bật tùy chọn cài đặt này, người dùng sẽ được phép chọn sử dụng tính năng Chia sẻ lân cận. Tính năng này cho phép họ gửi và nhận tệp từ những người ở gần. @@ -724,6 +762,17 @@ <translation id="1561424797596341174">Chính sách ghi đè dành cho bản dựng Gỡ lỗi của máy chủ truy cập từ xa</translation> <translation id="1561967320164410511">Tiện ích U2F+ để chứng thực cá nhân</translation> <translation id="1562846754315919408">Hiện thông báo khi phát hiện thiết bị USB</translation> +<translation id="1563745847791078494">Việc đặt chính sách này sẽ đặt URL trang chủ mặc định trong <ph name="PRODUCT_NAME" />. Bạn mở trang chủ bằng nút Trang chủ. Trên máy tính, chính sách <ph name="RESTORE_ON_STARTUP_POLICY_NAME" /> kiểm soát những trang nào sẽ mở ra khi khởi động. + +Nếu người dùng hoặc <ph name="HOMEPAGE_IS_NEW_TAB_PAGE_POLICY_NAME" /> đặt trang chủ thành trang Thẻ mới, thì chính sách này sẽ không có hiệu lực. + +URL cần có một giao thức chuẩn, chẳng hạn như http://example.com hoặc https://example.com. Khi bạn đặt chính sách này, người dùng sẽ không thể thay đổi URL trang chủ của họ trong <ph name="PRODUCT_NAME" />. + +Nếu bạn không đặt cả hai chính sách <ph name="HOMEPAGE_LOCATION_POLICY_NAME" /> và <ph name="HOMEPAGE_IS_NEW_TAB_PAGE_POLICY_NAME" />, thì người dùng có thể chọn trang chủ của họ. + +Trên <ph name="MS_WIN_NAME" />, chính sách này chỉ có trên các phiên bản đã liên kết với một miền <ph name="MS_AD_NAME" />, <ph name="MS_AAD_NAME" /> hoặc đã đăng ký <ph name="CHROME_ENTERPRISE_CORE_NAME" />. + +Trên <ph name="MAC_OS_NAME" />, chính sách này chỉ có trên các phiên bản được quản lý qua MDM (Quản lý thiết bị di động), đã liên kết với một miền qua MCX hoặc đã đăng ký <ph name="CHROME_ENTERPRISE_CORE_NAME" />.</translation> <translation id="1567718448549957373">Nếu bạn không đặt hoặc đặt chính sách này thành Bật, thì người dùng sẽ nhận được các thử thách xác thực <ph name="BASIC_AUTH" /> qua HTTP không an toàn. Nếu bạn đặt chính sách này thành Tắt, thì các yêu cầu HTTP không an toàn sẽ không được phép dùng lược đồ xác thực <ph name="BASIC_AUTH" />; chỉ HTTP an toàn mới được phép. @@ -907,6 +956,13 @@ Nếu bạn đặt chính sách này thành Tắt, thì <ph name="PRODUCT_NAME" /> sẽ không cho phép khởi động hồ sơ khách.</translation> <translation id="1666001345366986837">Chế độ cài đặt tính năng Nền AI tạo sinh cho hội nghị truyền hình</translation> +<translation id="166702014436078732">Khi bạn đặt chính sách này, hệ thống sẽ đặt URL để người dùng đổi mật khẩu của họ sau khi thấy cảnh báo trên trình duyệt. Dịch vụ bảo vệ mật khẩu đưa người dùng tới URL (chỉ giao thức HTTP và HTTPS) mà bạn chỉ định thông qua chính sách này. Để <ph name="PRODUCT_NAME" /> ghi lại chính xác hàm băm được thêm dữ liệu ngẫu nhiên của mật khẩu mới trên trang đổi mật khẩu này, hãy đảm bảo trang đổi mật khẩu của bạn tuân thủ các nguyên tắc này (https://www.chromium.org/developers/design-documents/create-amazing-password-forms). + +Khi bạn tắt hoặc không đặt chính sách này, dịch vụ sẽ đưa người dùng tới trang https://myaccount.google.com để đổi mật khẩu. + +Trên <ph name="MS_WIN_NAME" />, chính sách này chỉ có trên các phiên bản đã liên kết với một miền <ph name="MS_AD_NAME" />, <ph name="MS_AAD_NAME" /> hoặc đã đăng ký <ph name="CHROME_ENTERPRISE_CORE_NAME" />. + +Trên <ph name="MAC_OS_NAME" />, chính sách này chỉ có trên các phiên bản được quản lý qua MDM (Quản lý thiết bị di động), đã liên kết với một miền qua MCX hoặc đã đăng ký <ph name="CHROME_ENTERPRISE_CORE_NAME" />.</translation> <translation id="1670638264428789878">Bật tính năng Nhóm trang web có liên quan</translation> <translation id="1671405606278443620">Chế độ cài đặt cho tính năng Tìm nhật ký dựa trên AI</translation> <translation id="1673097259557436886">Luôn cho các trang web biết rằng không có phương thức thanh toán nào được lưu</translation> @@ -1772,6 +1828,13 @@ <translation id="2309284543927494965">Chặn bản cập nhật</translation> <translation id="2309341709647905294">Không báo cáo thông tin về những thiết bị ngoại vi được cắm vào thiết bị này</translation> <translation id="2309390639296060546">Cài đặt vị trí địa lý mặc định</translation> +<translation id="2315759015564614266">Nếu bạn đặt chính sách này thành Bật, hệ thống sẽ thực hiện thao tác tìm kiếm mặc định khi người dùng nhập văn bản không phải là URL vào thanh địa chỉ. Để chỉ định nhà cung cấp dịch vụ tìm kiếm mặc định, hãy đặt các chính sách tìm kiếm mặc định còn lại. Nếu bạn để trống những chính sách đó thì người dùng có thể chọn nhà cung cấp mặc định. Nếu bạn đặt chính sách này thành Tắt, hệ thống sẽ không tìm kiếm khi người dùng nhập văn bản không phải là URL vào thanh địa chỉ. <ph name="GOOGLE_ADMIN_CONSOLE_PRODUCT_NAME" /> không hỗ trợ giá trị Tắt. + +Nếu bạn đặt chính sách này, người dùng sẽ không thể thay đổi lựa chọn của bạn trong <ph name="PRODUCT_NAME" />. Nếu bạn không đặt chính sách này, nhà cung cấp dịch vụ tìm kiếm mặc định sẽ được bật và người dùng có thể đặt danh sách nhà cung cấp dịch vụ tìm kiếm. + +Trên <ph name="MS_WIN_NAME" />, chính sách này chỉ có trên các phiên bản đã liên kết với một miền <ph name="MS_AD_NAME" />, <ph name="MS_AAD_NAME" /> hoặc đã đăng ký <ph name="CHROME_ENTERPRISE_CORE_NAME" />. + +Trên <ph name="MAC_OS_NAME" />, chính sách này chỉ có trên các phiên bản được quản lý qua MDM (Quản lý thiết bị di động), đã liên kết với một miền qua MCX hoặc đã đăng ký <ph name="CHROME_ENTERPRISE_CORE_NAME" />.</translation> <translation id="2316700579410680894">Nếu đặt chính sách này, bạn có thể lập danh sách các mẫu URL chỉ định những trang web được hệ thống tự động cấp quyền truy cập vào thiết bị USB bằng mã sản phẩm và mã nhà cung cấp đã cho. Mỗi mục trên danh sách này phải có cả trường <ph name="DEVICES_FIELD_NAME" /> và trường <ph name="URLS_FIELD_NAME" /> thì chính sách mới hợp lệ. Mỗi mục trong trường <ph name="DEVICES_FIELD_NAME" /> có thể chứa trường <ph name="VENDOR_ID_FIELD_NAME" /> và <ph name="PRODUCT_ID_FIELD_NAME" />. Nếu bạn bỏ qua trường <ph name="VENDOR_ID_FIELD_NAME" />, hệ thống sẽ tạo một chính sách áp dụng cho mọi thiết bị. Nếu bạn bỏ qua trường <ph name="PRODUCT_ID_FIELD_NAME" />, hệ thống sẽ tạo một chính sách áp dụng cho mọi thiết bị có mã nhà cung cấp đã cho. Nếu có trường <ph name="PRODUCT_ID_FIELD_NAME" /> mà không có trường <ph name="VENDOR_ID_FIELD_NAME" /> thì chính sách sẽ không hợp lệ. Mô hình quản lý quyền truy cập USB sẽ cấp cho URL được chỉ định quyền truy cập vào thiết bị USB dưới dạng nguồn cấp cao nhất. Nếu các khung đã nhúng cần truy cập vào thiết bị USB, thì tiêu đề <ph name="FEATURE_POLICY_HEADER_NAME" /> "usb" sẽ được dùng để cấp quyền truy cập. URL này phải hợp lệ. Nếu không, chính sách sẽ bị bỏ qua. @@ -2197,6 +2260,23 @@ <translation id="264771271300359481">Không cho phép bất kỳ trang web nào sử dụng quyền bảng nhớ tạm cho trang web</translation> <translation id="2649537800219643135">Nguồn hình ảnh màn hình khoá trên trình bảo vệ màn hình của người dùng.</translation> <translation id="2649896281375932517">Để người dùng quyết định</translation> +<translation id="2649948251789347405">Chính sách này cho phép quản trị viên thiết lập một công cụ chuyên biệt để tổng hợp nội dung tìm kiếm cho doanh nghiệp. Công cụ này sẽ cung cấp cụm từ tìm kiếm được đề xuất và kết quả tìm kiếm trong thanh địa chỉ khi được kích hoạt bởi một từ khoá cụ thể. Người dùng có thể bắt đầu tìm kiếm bằng cách nhập từ khoá được chỉ định trong trường <ph name="SHORTCUT_SEARCH_AGGREGATOR_SETTINGS_FIELD" /> (có thể dùng hoăc không dùng tiền tố @, ví dụ: <ph name="SHORTCUT_EXAMPLE_SEARCH_AGGREGATOR_SETTINGS" />) vào thanh địa chỉ, sau đó nhấn phím cách hoặc phím Tab. + +Các trường sau đây là trường bắt buộc: <ph name="NAME_SEARCH_AGGREGATOR_SETTINGS_FIELD" />, <ph name="SHORTCUT_SEARCH_AGGREGATOR_SETTINGS_FIELD" />, <ph name="SEARCH_URL_SEARCH_AGGREGATOR_SETTINGS_FIELD" />, <ph name="SUGGEST_URL_SEARCH_AGGREGATOR_SETTINGS_FIELD" />. + +Trường <ph name="NAME_SEARCH_AGGREGATOR_SETTINGS_FIELD" /> tương ứng với tên công cụ tìm kiếm hiển thị cho người dùng trong thanh địa chỉ. + +Trường <ph name="SHORTCUT_SEARCH_AGGREGATOR_SETTINGS_FIELD" /> tương ứng với từ khoá mà người dùng nhập để kích hoạt quá trình tìm kiếm. Lối tắt có thể chứa các từ và ký tự thuần tuý, nhưng không được chứa dấu cách hoặc bắt đầu bằng ký hiệu @. Lối tắt không được trùng lặp. + +Trường <ph name="SEARCH_URL_SEARCH_AGGREGATOR_SETTINGS_FIELD" /> chỉ định URL nơi quá trình tìm kiếm sẽ diễn ra. Nhập địa chỉ web cho trang kết quả của công cụ tìm kiếm và sử dụng <ph name="SEARCH_TERM_MARKER" /> thay cho cụm từ tìm kiếm. + +Trường <ph name="SUGGEST_URL_SEARCH_AGGREGATOR_SETTINGS_FIELD" /> chỉ định URL cung cấp cụm từ tìm kiếm được đề xuất. Nếu <ph name="SUGGEST_URL_SEARCH_AGGREGATOR_SETTINGS_FIELD" /> chứa <ph name="SEARCH_TERM_MARKER" />, thì Chrome sẽ lấy các cụm từ tìm kiếm được đề xuất bằng cách gửi một yêu cầu GET đến URL này, thay thế <ph name="SEARCH_TERM_MARKER" /> bằng cụm từ tìm kiếm của người dùng. Nếu không, Chrome sẽ gửi một yêu cầu POST, cụm từ tìm kiếm của người dùng sẽ được truyền trong các thông số POST theo khoá <ph name="SEARCH_SUGGEST_POST_PARAMS_QUERY_KEY" />. + +Trường <ph name="ICON_URL_SEARCH_AGGREGATOR_SETTINGS_FIELD" /> chỉ định URL đến một hình ảnh sẽ được dùng cho các cụm từ tìm kiếm được đề xuất. Nếu bạn không thiết lập trường này, thì hệ thống sẽ dùng một biểu tượng mặc định. Bạn nên sử dụng một biểu tượng trang web (ví dụ: <ph name="ICON_URL_EXAMPLE" />). + +Trên <ph name="MS_WIN_NAME" />, chính sách này chỉ có trên các phiên bản đã liên kết với một miền <ph name="MS_AD_NAME" />, <ph name="MS_AAD_NAME" /> hoặc đã đăng ký <ph name="CHROME_ENTERPRISE_CORE_NAME" />. + +Trên <ph name="MAC_OS_NAME" />, chính sách này chỉ có trên các phiên bản được quản lý qua MDM (Quản lý thiết bị di động), đã liên kết với một miền qua MCX hoặc đã đăng ký <ph name="CHROME_ENTERPRISE_CORE_NAME" />.</translation> <translation id="2650049181907741121">Hành động sẽ thực hiện khi người dùng đóng nắp</translation> <translation id="2656559539624760733">Không sử dụng Chrome Root Store.</translation> <translation id="2658653824183107970">Sử dụng quy trình triển khai <ph name="CORS" /> cũ thay vì <ph name="CORS" /> mới</translation> @@ -3077,6 +3157,8 @@ Khi bạn tắt chính sách này, thì tính bảo mật và độ ổn định của <ph name="PRODUCT_NAME" /> sẽ bị ảnh hưởng vì hộp cát sẽ làm yếu hộp cát mà trình kết xuất sử dụng. Bạn chỉ nên tắt chính sách này nếu gặp vấn đề về khả năng tương thích với phần mềm bên thứ ba. Phần mềm này phải chạy trong các quá trình xử lý kết xuất. Lưu ý: Hãy đọc thêm về Chính sách giảm thiểu quy trình (https://chromium.googlesource.com/chromium/src/+/HEAD/docs/design/sandbox.md#Process-mitigation-policies).</translation> +<translation id="3338041636115991551">Trừ phi chế độ tạm thời hoặc đăng nhập nhiều tài khoản đang bật trong phiên của người dùng, thì khi đặt ArcEnabled thành True (Đúng), ARC sẽ được bật cho người dùng. Nếu bạn đặt chính sách này thành False (Sai) hoặc không đặt, thì người dùng doanh nghiệp sẽ không thể sử dụng ARC. +Chính sách này chỉ kiểm soát <ph name="ARC_VM" /> trên <ph name="PRODUCT_NAME" />. Để biết thêm chi tiết về <ph name="PRODUCT_OS_FLEX_NAME" />, vui lòng xem chính sách <ph name="DEVICE_FLEX_ARC_PRELOAD_ENABLED_POLICY_NAME" />.</translation> <translation id="3338431256935927407">Kiểm soát các chế độ cài đặt liên quan đến tính năng Tải lên đám mây.</translation> <translation id="3339271789059866414">Định cấu hình tình trạng có sẵn của dịch vụ Proxy hệ thống và thông tin xác thực proxy đối với các dịch vụ hệ thống. Nếu bạn không đặt chính sách này, thì dịch vụ Proxy hệ thống sẽ không dùng được.</translation> @@ -3408,6 +3490,7 @@ Việc đặt chính sách này thành một giá trị thấp hơn sẽ có hiệu lực vĩnh viễn: thiết bị CÓ THỂ không khôi phục được về các phiên bản trước ngay cả khi bạn đặt lại chính sách này thành một giá trị cao hơn. Khả năng khôi phục thực tế cũng có thể phụ thuộc vào bảng mạch và các bản vá lỗ hổng bảo mật nghiêm trọng.</translation> +<translation id="3565284547329101236">Tải trước hình ảnh <ph name="ARC_VM" /> trên Flex</translation> <translation id="35668690622495904"> Cuộc gọi không bị từ chối do bắt nguồn từ các ngữ cảnh không được phép. (Cuộc gọi vẫn có thể bị từ chối vì những lý do khác.)</translation> @@ -3772,6 +3855,19 @@ Người dùng không thể xóa trình xử lý giao thức do chính sách đăng ký. Tuy nhiên, họ có thể thay đổi các trình xử lý giao thức do chính sách cài đặt bằng cách cài đặt một trình xử lý mặc định mới.</translation> <translation id="3842619997238271109">Không cho phép máy chủ truy cập từ xa sử dụng mã PIN và phương pháp xác thực ghép nối khi chấp nhận kết nối từ máy khách</translation> +<translation id="3844931982362586388">Việc đặt chính sách này sẽ định cấu hình URL trang Thẻ mới mặc định và không cho người dùng thay đổi URL đó. + +Trang Thẻ mới sẽ mở cùng với các thẻ và cửa sổ mới. + +Chính sách này không quyết định trang nào sẽ mở khi khởi động. Những trang đó do chính sách <ph name="RESTORE_ON_STARTUP_POLICY_NAME" /> kiểm soát. Chính sách này có ảnh hưởng đến trang chủ cũng như trang khởi động nếu bạn đặt chính sách thành mở trang Thẻ mới. + +Phương pháp hay nhất là cung cấp URL chính tắc đầy đủ. Nếu URL không phải là URL chính tắc đầy đủ, thì <ph name="PRODUCT_NAME" /> sẽ đặt mặc định thành https://. + +Nếu bạn không đặt hoặc để trống chính sách này, thì trang Thẻ mới mặc định sẽ được sử dụng. + +Trên <ph name="MS_WIN_NAME" />, chính sách này chỉ có trên các phiên bản đã liên kết với một miền <ph name="MS_AD_NAME" />, <ph name="MS_AAD_NAME" /> hoặc đã đăng ký <ph name="CHROME_ENTERPRISE_CORE_NAME" />. + +Trên <ph name="MAC_OS_NAME" />, chính sách này chỉ có trên các phiên bản được quản lý qua MDM (Quản lý thiết bị di động), đã liên kết với một miền qua MCX hoặc đã đăng ký <ph name="CHROME_ENTERPRISE_CORE_NAME" />.</translation> <translation id="3845318141474759319">Cho phép dùng Hình nền AI tạo sinh nhưng không tham gia cải tiến mô hình AI</translation> <translation id="3851443303439635700">Kiểm soát ngưỡng lồng, là ngưỡng mà trước đó hàm JavaScript setTimeout() bắt đầu bị kẹp</translation> <translation id="3854609566862485607">Chính sách này kiểm soát một nhãn tuỳ chỉnh dùng để xác định hồ sơ được quản lý. Đối với hồ sơ được quản lý, nhãn này sẽ hiển thị bên cạnh hình đại diện trên thanh công cụ. Nhãn tuỳ chỉnh này sẽ không được dịch. @@ -3844,6 +3940,13 @@ Nếu bạn không đặt chính sách này hay đặt thành một giá trị trống hoặc không hợp lệ, giá trị <ph name="CLIENT_INFO_IPP_ATTRIBUTE" /> bổ sung sẽ không được thêm vào yêu cầu lệnh in. </translation> <translation id="3896591584655529057">Bật tính năng lưu khoá truy cập bằng trình quản lý mật khẩu</translation> +<translation id="3896751141670591496">Khi bạn đặt chính sách này thành Bật hoặc không đặt, cảnh báo bảo mật sẽ hiện ra khi cờ hiệu dòng lệnh có thể gây nguy hiểm được dùng để chạy Chrome. + +Khi bạn đặt chính sách này thành Tắt, cảnh báo bảo mật sẽ không hiện ra khi Chrome được chạy bằng cờ hiệu dòng lệnh có thể gây nguy hiểm. + +Trên <ph name="MS_WIN_NAME" />, chính sách này chỉ có trên các phiên bản đã liên kết với một miền <ph name="MS_AD_NAME" />, <ph name="MS_AAD_NAME" /> hoặc đã đăng ký <ph name="CHROME_ENTERPRISE_CORE_NAME" />. + +Trên <ph name="MAC_OS_NAME" />, chính sách này chỉ có trên các phiên bản được quản lý qua MDM (Quản lý thiết bị di động), đã liên kết với một miền qua MCX hoặc đã đăng ký <ph name="CHROME_ENTERPRISE_CORE_NAME" />.</translation> <translation id="3897218615484393758">Giới hạn thời gian mà người dùng đã xác thực qua SAML có thể đăng nhập ở chế độ ngoại tuyến trên màn hình khóa</translation> <translation id="3897860452756794695">Thao tác offsetParent mới sẽ được sử dụng.</translation> <translation id="3898345958122666461">Tắt NTLMv2</translation> @@ -4348,6 +4451,11 @@ <translation id="4278656834593750050">Bật chuông báo khi sạc</translation> <translation id="4282243913059705499">Luôn hiển thị biểu tượng <ph name="PRODUCT_NAME" /> trên thanh công cụ</translation> <translation id="4285674129118156176">Cho phép người dùng không được liên kết sử dụng ARC</translation> +<translation id="4287004822156577027">Nếu bạn đặt chính sách này thành Bật hoặc không đặt, thì tính năng Làm sạch Chrome sẽ định kỳ quét hệ thống để tìm phần mềm không mong muốn. Nếu tìm thấy phần mềm không mong muốn, tính năng này sẽ hỏi người dùng xem họ có muốn xoá phần mềm đó hay không. Tính năng Làm sạch Chrome có thể được kích hoạt theo cách thủ công trên trang chrome://settings. + +Khi bạn đặt chính sách này thành Tắt, tính năng Làm sạch Chrome sẽ không quét định kỳ và lựa chọn kích hoạt theo cách thủ công sẽ bị tắt. + +Trên <ph name="MS_WIN_NAME" />, chính sách này chỉ có trên các phiên bản đã liên kết với một miền <ph name="MS_AD_NAME" />, <ph name="MS_AAD_NAME" /> hoặc đã đăng ký <ph name="CHROME_ENTERPRISE_CORE_NAME" />.</translation> <translation id="428948795004445932">Chu kỳ hệ thống lấy mẫu và thu thập dữ liệu mạng. Thời gian tối thiểu cho phép là 1 phút. Nếu bạn không đặt chính sách này, thì chu kỳ mặc định là 10 phút sẽ được áp dụng.</translation> @@ -4747,6 +4855,13 @@ Nếu không đặt chính sách này, tất cả nguồn gốc sẽ yêu cầu cử chỉ trước đó của người dùng để gọi các API này.</translation> +<translation id="4584427961967778141">Nếu bạn đặt chính sách này, hệ thống sẽ kiểm soát các chế độ cài đặt quản lý tiện ích cho <ph name="PRODUCT_NAME" />, bao gồm cả những chế độ cài đặt chịu sự kiểm soát của các chính sách hiện có liên quan đến tiện ích. Chính sách này sẽ thay thế mọi chính sách cũ mà bạn có thể đã đặt. + +Chính sách này chỉ ánh xạ một mã tiện ích hoặc một URL cập nhật với chế độ cài đặt cụ thể tương ứng. Bạn có thể đặt cấu hình mặc định cho mã đặc biệt <ph name="DEFAULT_SCOPE" />. Cấu hình này sẽ áp dụng cho tất cả tiện ích chưa đặt cấu hình tuỳ chỉnh trong chính sách này. Với URL cập nhật, cấu hình sẽ áp dụng cho những tiện ích có URL cập nhật chính xác được nêu trong tệp kê khai của tiện ích đó (http://support.google.com/chrome/a?p=Configure_ExtensionSettings_policy). Nếu bạn đặt cờ "override_update_url" thành True (Đúng), thì tiện ích đó sẽ được cài đặt và cập nhật bằng URL "cập nhật" được chỉ định trong chính sách <ph name="EXTENSION_INSTALL_FORCELIST_POLICY_NAME" /> hoặc trong trường "update_url" của chính sách này. Cờ "override_update_url" sẽ bị bỏ qua nếu "update_url" là một URL của Cửa hàng Chrome trực tuyến. + +Trên các phiên bản <ph name="MS_WIN_NAME" />, bạn chỉ có thể buộc cài đặt các ứng dụng và tiện ích từ bên ngoài Cửa hàng Chrome trực tuyến nếu phiên bản đó đã liên kết với một miền <ph name="MS_AD_NAME" />, <ph name="MS_AAD_NAME" /> hoặc đã đăng ký <ph name="CHROME_ENTERPRISE_CORE_NAME" />. + +Trên các phiên bản <ph name="MAC_OS_NAME" />, bạn chỉ có thể buộc cài đặt các ứng dụng và tiện ích từ bên ngoài Cửa hàng Chrome trực tuyến nếu phiên bản đó được quản lý qua MDM (Quản lý thiết bị di động), đã liên kết với một miền qua MCX hoặc đã đăng ký <ph name="CHROME_ENTERPRISE_CORE_NAME" />.</translation> <translation id="4591366717022345234">Cung cấp Bản dựng Quick Fix cho người dùng</translation> <translation id="4593391169954484940">Hàm băm SHA-256 của tệp.</translation> <translation id="4594027034164195984">Cho phép hình ảnh của bên thứ ba hiện lời nhắc xác thực</translation> @@ -4768,6 +4883,13 @@ <translation id="4599810650416623373">Chặn tính năng tối ưu hoá JavaScript trên các trang web này</translation> <translation id="4600786265870346112">Bật con trỏ lớn</translation> <translation id="4602988345256038309">Cho phép các kết nối hỗ trợ từ xa đến máy này</translation> +<translation id="4605677392792989397">Việc đặt chính sách này sẽ đặt danh sách các URL đăng nhập của doanh nghiệp (chỉ giao thức HTTP và HTTPS). Dịch vụ bảo vệ mật khẩu sẽ ghi lại hàm băm được thêm dữ liệu ngẫu nhiên của mật khẩu trên các URL này và dùng cho mục đích phát hiện mật khẩu trùng lặp. Để <ph name="PRODUCT_NAME" /> ghi lại chính xác hàm băm được thêm dữ liệu ngẫu nhiên vào mật khẩu, hãy đảm bảo các trang đăng nhập của bạn tuân thủ những nguyên tắc này (https://www.chromium.org/developers/design-documents/create-amazing-password-forms). + +Nếu bạn tắt hoặc không đặt chế độ cài đặt này, dịch vụ bảo vệ mật khẩu sẽ chỉ ghi lại hàm băm được thêm dữ liệu ngẫu nhiên vào mật khẩu trên https://accounts.google.com. + +Trên <ph name="MS_WIN_NAME" />, chính sách này chỉ có trên các phiên bản đã liên kết với một miền <ph name="MS_AD_NAME" />, <ph name="MS_AAD_NAME" /> hoặc đã đăng ký <ph name="CHROME_ENTERPRISE_CORE_NAME" />. + +Trên <ph name="MAC_OS_NAME" />, chính sách này chỉ có trên các phiên bản được quản lý qua MDM (Quản lý thiết bị di động), đã liên kết với một miền qua MCX hoặc đã đăng ký <ph name="CHROME_ENTERPRISE_CORE_NAME" />.</translation> <translation id="4607416370554533118">Khi đặt chính sách này, bạn có thể tạo danh sách các mẫu URL chỉ định trang web mà Chrome có thể tự động chọn chứng chỉ máy khách. Giá trị là một mảng từ điển JSON phân thành chuỗi, mỗi mảng có dạng <ph name="AUTO_SELECT_CERTIFICATE_FOR_URLS_EXAMPLE" />, trong đó <ph name="URL_PATTERN_PLACEHOLDER" /> là mẫu thông tin cài đặt nội dung. <ph name="FILTER_PLACEHOLDER" /> giới hạn các chứng chỉ máy khách mà trình duyệt sẽ tự động chọn. Bất kể bộ lọc là gì, chỉ các chứng chỉ khớp với yêu cầu chứng chỉ của máy chủ mới được chọn. Ví dụ về cách sử dụng phần <ph name="FILTER_PLACEHOLDER" />: @@ -5350,6 +5472,17 @@ <translation id="5033070732967197381">Cho phép yêu cầu API WebAuthn trên các trang web có chứng chỉ TLS bị hỏng.</translation> <translation id="5034504101537897433">Bật tính năng báo cáo thông tin trong báo cáo sự cố của thiết bị</translation> <translation id="5036013147560568855">Phiên bản của giao thức cấp phép chứng chỉ. Giá trị mặc định là 1. 1 là giao thức "tĩnh". 2 là giao thức "động".</translation> +<translation id="5036559232677914717">Nếu đặt chính sách này, bạn có thể chỉ định hành vi của hệ thống khi khởi động. Việc tắt chế độ cài đặt này tương tự như việc không đặt chính sách vì <ph name="PRODUCT_NAME" /> chắc chắn đã chỉ định hành vi khi khởi động. + +Nếu bạn đặt chính sách này, người dùng sẽ không thể thay đổi lựa chọn của bạn trong <ph name="PRODUCT_NAME" />. Nếu bạn không đặt chính sách này, người dùng sẽ có thể thay đổi lựa chọn đó. + +Việc đặt chính sách này thành <ph name="POLICY_ENUM_RESTOREONSTARTUP_RESTOREONSTARTUPISLASTSESSION" /> hoặc <ph name="POLICY_ENUM_RESTOREONSTARTUP_RESTOREONSTARTUPISLASTSESSIONANDURLS" /> sẽ tắt một số chế độ cài đặt dựa vào phiên hoặc thực hiện một số thao tác khi thoát, chẳng hạn như xoá dữ liệu duyệt web khi thoát hoặc xoá cookie của riêng phiên đó. + +Nếu bạn đặt chính sách này thành <ph name="POLICY_ENUM_RESTOREONSTARTUP_RESTOREONSTARTUPISLASTSESSIONANDURLS" />, trình duyệt sẽ khôi phục phiên trước đó và mở một cửa sổ riêng để hiển thị các URL được đặt từ <ph name="RESTORE_ON_STARTUP_URLS_POLICY_NAME" />. Xin lưu ý rằng người dùng có thể chọn tiếp tục mở các URL đó và các URL đó cũng sẽ được khôi phục trong phiên tiếp theo. + +Trên <ph name="MS_WIN_NAME" />, chính sách này chỉ có trên các phiên bản đã liên kết với một miền <ph name="MS_AD_NAME" />, <ph name="MS_AAD_NAME" /> hoặc đã đăng ký <ph name="CHROME_ENTERPRISE_CORE_NAME" />. + +Trên <ph name="MAC_OS_NAME" />, chính sách này chỉ có trên các phiên bản được quản lý qua MDM (Quản lý thiết bị di động), đã liên kết với một miền qua MCX hoặc đã đăng ký <ph name="CHROME_ENTERPRISE_CORE_NAME" />.</translation> <translation id="5037749623252479780">Chế độ cài đặt phím PageUp/PageDown bị tắt</translation> <translation id="5039110755072335605">hỗ trợ các tiêu đề của yêu cầu không phải ký tự đại diện CORS</translation> <translation id="504116558738617678">Chỉ hiển thị các cảnh báo dung lượng ổ đĩa thấp nếu thiết bị không được quản lý hoặc chỉ có 1 người dùng</translation> @@ -5673,6 +5806,7 @@ <translation id="5258651513421638932">Cho phép Ứng dụng tách biệt kết nối với Thẻ thông minh</translation> <translation id="5262320080678421295">Tắt chế độ cài đặt tin cậy trong các chứng chỉ do PKI cũ của Symantec Corporation phát hành</translation> <translation id="5265613843467285323">Hiện nút bật tắt trên giao diện người dùng để loại trừ một màn hình khỏi chế độ phản chiếu.</translation> +<translation id="5270408671043421978">Không cho phép tải trước hình ảnh <ph name="ARC_VM" /></translation> <translation id="5272332743749468542">Cho phép người dùng lựa chọn Loại trừ màn hình khỏi chế độ phản chiếu</translation> <translation id="5273744932022326215">Bật tính năng hỗ trợ tiếp cận về làm nổi bật con trỏ trên màn hình đăng nhập. @@ -5862,6 +5996,25 @@ Nếu bạn đặt chính sách này thành false (sai) thì <ph name="PRODUCT_NAME" /> và <ph name="LACROS_NAME" /> sẽ không cho phép thêm người mới trong trình quản lý người dùng.</translation> <translation id="5377606826822211923">Kiểm soát việc người dùng sử dụng ứng dụng Android từ những nguồn không tin cậy</translation> +<translation id="5377826248281933035">Chính sách này cung cấp một danh sách trang web mà người dùng có thể nhanh chóng tìm kiếm bằng cách sử dụng lối tắt trong thanh địa chỉ. Người dùng có thể bắt đầu tìm kiếm bằng cách nhập lối tắt hoặc @lốitắt (ví dụ: @côngviệc) vào thanh địa chỉ, sau đó nhấn phím cách hoặc phím Tab. + +Các trường sau đây là trường bắt buộc cho mỗi trang web: <ph name="NAME_SITE_SEARCH_SETTINGS_FIELD" />, <ph name="SHORTCUT_SITE_SEARCH_SETTINGS_FIELD" />, <ph name="URL_SITE_SEARCH_SETTINGS_FIELD" />. + +Trường <ph name="NAME_SITE_SEARCH_SETTINGS_FIELD" /> tương ứng với tên trang web hoặc tên công cụ tìm kiếm sẽ hiển thị cho người dùng trong thanh địa chỉ. + +<ph name="SHORTCUT_SITE_SEARCH_SETTINGS_FIELD" /> có thể chứa các từ và ký tự thuần tuý, nhưng không được chứa dấu cách hoặc bắt đầu bằng ký hiệu @. Lối tắt cũng phải là lối tắt duy nhất. + +Đối với mỗi mục nhập, trường <ph name="URL_SITE_SEARCH_SETTINGS_FIELD" /> chỉ định URL của công cụ tìm kiếm được dùng trong quá trình tìm kiếm với từ khoá tương ứng. URL đó phải chứa chuỗi <ph name="SEARCH_TERM_MARKER" />. Chuỗi này sẽ được thay bằng cụm từ tìm kiếm của người dùng trong truy vấn. Các mục nhập không hợp lệ và các mục nhập có lối tắt trùng lặp sẽ bị bỏ qua. + +Các mục nhập tìm kiếm trên trang web được định cấu hình là mục nổi bật sẽ hiển thị trong thanh địa chỉ khi người dùng nhập "@". Có thể chọn tối đa ba mục nhập làm mục nổi bật. + +Người dùng không thể chỉnh sửa hoặc vô hiệu hoá các mục nhập tìm kiếm trên trang web do chính sách đặt, nhưng có thể thêm lối tắt mới cho cùng một URL. Ngoài ra, người dùng không thể tạo mục nhập tìm kiếm mới trên trang web bằng lối tắt đã được tạo trước đó thông qua chính sách này. + +Trong trường hợp xung đột với lối tắt mà người dùng đã tạo trước đó, thì chế độ cài đặt của người dùng sẽ được ưu tiên. Tuy nhiên, người dùng vẫn có thể kích hoạt lựa chọn do chính sách tạo bằng cách nhập "@" vào thanh tìm kiếm. Ví dụ: Nếu người dùng đã xác định "côngviệc" là lối tắt đến URL1 và chính sách xác định "côngviệc" là lối tắt đến URL2, thì việc nhập "côngviệc" vào thanh tìm kiếm sẽ kích hoạt thao tác tìm kiếm đến URL1 nhưng việc nhập "@côngviệc" vào thanh tìm kiếm sẽ kích hoạt thao tác tìm kiếm đến URL2. + +Trên <ph name="MS_WIN_NAME" />, chính sách này chỉ có trên các phiên bản đã liên kết với một miền <ph name="MS_AD_NAME" />, <ph name="MS_AAD_NAME" /> hoặc đã đăng ký <ph name="CHROME_ENTERPRISE_CORE_NAME" />. + +Trên <ph name="MAC_OS_NAME" />, chính sách này chỉ có trên các phiên bản được quản lý qua MDM (Quản lý thiết bị di động), đã liên kết với một miền qua MCX hoặc đã đăng ký <ph name="CHROME_ENTERPRISE_CORE_NAME" />.</translation> <translation id="537786648513450280">Kiểm soát việc thiết bị dùng ứng dụng Android từ các nguồn không tin cậy</translation> <translation id="5378885577701865339">Tắt tính năng bảng nhớ tạm dùng chung</translation> <translation id="538108065117008131">Cho phép <ph name="PRODUCT_FRAME_NAME" /> xử lý các loại nội dung sau.</translation> @@ -6011,6 +6164,17 @@ <translation id="5480380613778757009">Nếu bạn tắt hoặc không đặt chính sách này, thì tất cả những chế độ cài đặt hiển thị đã đặt trong Phiên khách được quản lý sẽ được đặt lại ngay khi phiên này kết thúc. Nếu bạn đặt chính sách này thành Bật, thì các thuộc tính hiển thị sẽ vẫn giữ nguyên sau khi bạn thoát khỏi phiên khách được quản lý.</translation> <translation id="5483012943408894695">Nguồn gốc hoặc mẫu tên máy chủ mà các hạn chế đối với nguồn gốc không an toàn không được áp dụng</translation> <translation id="5483065054530244863">Cho phép các chứng chỉ SHA-1 có chữ ký do neo tin cậy cục bộ phát hành</translation> +<translation id="5486352219019836984">Khi Bật chính sách này, bạn nên bật tính năng báo cáo ẩn danh về dữ liệu liên quan đến sự cố và mức sử dụng <ph name="PRODUCT_NAME" /> cho Google theo mặc định. Người dùng vẫn có thể thay đổi chế độ cài đặt này. + +Khi bạn Tắt chính sách này, tính năng báo cáo ẩn danh sẽ bị tắt nên dữ liệu về sự cố và mức sử dụng sẽ không được gửi cho Google. Người dùng sẽ không thể thay đổi chế độ cài đặt này. + +Khi bạn không đặt chính sách này, người dùng có thể chọn hành vi báo cáo ẩn danh khi cài đặt hoặc khi chạy lần đầu, cũng như có thể thay đổi chế độ cài đặt này sau đó. + +Trên <ph name="MS_WIN_NAME" />, chính sách này chỉ có trên các phiên bản đã liên kết với một miền <ph name="MS_AD_NAME" />, <ph name="MS_AAD_NAME" /> hoặc đã đăng ký <ph name="CHROME_ENTERPRISE_CORE_NAME" />. + +Trên <ph name="MAC_OS_NAME" />, chính sách này chỉ có trên các phiên bản được quản lý qua MDM (Quản lý thiết bị di động), đã liên kết với một miền qua MCX hoặc đã đăng ký <ph name="CHROME_ENTERPRISE_CORE_NAME" />. + +(Để biết thông tin về <ph name="PRODUCT_OS_NAME" />, hãy xem <ph name="DEVICE_METRICS_REPORTING_ENABLED_POLICY_NAME" />.)</translation> <translation id="5486917900445838803">Nếu bạn đặt chính sách này thành Enabled (Bật) hoặc không đặt thì tính năng tăng tốc đồ hoạ sẽ bật (nếu có). Nếu bạn đặt chính sách này thành Disabled (Tắt) thì tính năng tăng tốc đồ hoạ sẽ tắt.</translation> @@ -6368,6 +6532,11 @@ <translation id="5708969689202733975">Định cấu hình chế độ mở khóa nhanh được phép</translation> <translation id="5714563837055244378">Bật tính năng chia sẻ dữ liệu của Ứng dụng Android sang Web.</translation> <translation id="5715739768416614900">Bật các công cụ khắc phục sự cố Kiosk.</translation> +<translation id="5716156630400143265">Nếu bạn đặt chính sách <ph name="RESTORE_ON_STARTUP_POLICY_NAME" /> thành RestoreOnStartupIsURLs, thì việc đặt <ph name="RESTORE_ON_STARTUP_URLS_POLICY_NAME" /> thành một danh sách URL sẽ chỉ định những URL nào mở ra. + +Nếu bạn không đặt chính sách này, trang Thẻ mới sẽ mở khi khởi động. + +Trên <ph name="MS_WIN_NAME" />, chính sách này chỉ có trên các phiên bản đã liên kết với một miền <ph name="MS_AD_NAME" />, <ph name="MS_AAD_NAME" /> hoặc đã đăng ký <ph name="CHROME_ENTERPRISE_CORE_NAME" />.</translation> <translation id="5717973246079053225">Tắt tính năng báo cáo trên đám mây qua hồ sơ được quản lý.</translation> <translation id="572155275267014074">Cài đặt Android</translation> <translation id="5722577409367087850">Tải tiện ích</translation> @@ -6607,6 +6776,15 @@ <translation id="5899751601113377553">Ngăn người dùng sử dụng <ph name="LACROS_NAME" /></translation> <translation id="5900919753933009463">Báo cáo cấu hình mạng</translation> <translation id="5901427587865226597">Chỉ in hai mặt</translation> +<translation id="5903484826174648217">Khi bạn đặt chính sách này thành Bật, tính năng Duyệt web an toàn sẽ tin cậy các miền mà bạn chỉ định. Tính năng này sẽ không dò tìm tài nguyên nguy hiểm trong các miền đó, chẳng hạn như dò tìm hoạt động lừa đảo, phần mềm độc hại hoặc phần mềm không mong muốn. Dịch vụ bảo vệ tệp đã tải xuống của tính năng Duyệt web an toàn sẽ không kiểm tra các tệp đã tải xuống được lưu trữ trên những miền này. Dịch vụ bảo vệ mật khẩu của tính năng này sẽ không dò tìm mật khẩu trùng lặp. + +Nếu bạn không đặt chính sách này, dịch vụ bảo vệ mặc định của tính năng Duyệt web an toàn sẽ được áp dụng cho mọi tài nguyên. + +Chính sách này không hỗ trợ biểu thức chính quy. Tuy nhiên, miền con của một miền cụ thể sẽ được đưa vào danh sách cho phép. Không bắt buộc phải sử dụng tên miền đủ điều kiện (FQDN). + +Trên <ph name="MS_WIN_NAME" />, chính sách này chỉ có trên các phiên bản đã liên kết với một miền <ph name="MS_AD_NAME" />, <ph name="MS_AAD_NAME" /> hoặc đã đăng ký <ph name="CHROME_ENTERPRISE_CORE_NAME" />. + +Trên <ph name="MAC_OS_NAME" />, chính sách này chỉ có trên các phiên bản được quản lý qua MDM (Quản lý thiết bị di động), đã liên kết với một miền qua MCX hoặc đã đăng ký <ph name="CHROME_ENTERPRISE_CORE_NAME" />.</translation> <translation id="5905114360004248993">Cho phép cửa sổ bật lên trên các trang web này</translation> <translation id="5905473632148429217">Bật tính năng kiểm tra OCSP/CRL trực tuyến</translation> <translation id="5908808391744484238">Khi được bật hoặc không được thiết lập, bộ lọc tham số URL có thể xoá một số tham số khi người dùng chọn "Mở đường liên kết trong cửa sổ ẩn danh" trên trình đơn theo bối cảnh. @@ -6826,6 +7004,19 @@ <translation id="6099853574908182288">Chế độ in màu mặc định</translation> <translation id="6102342563050263313">Bật tùy chọn cuộn đến những phần văn bản cụ thể trong URL</translation> <translation id="6102449843040973938">Cho phép <ph name="BOREALIS_NAME" /> chạy trên một thiết bị</translation> +<translation id="6103130052818694000">Chính sách này không được dùng trong <ph name="PRODUCT_NAME" /> 83 nữa, vui lòng sử dụng <ph name="SAFE_BROWSING_PROTECTION_LEVEL_POLICY_NAME" />. + +Khi bạn đặt chính sách này thành Bật, tính năng Duyệt web an toàn của Chrome sẽ luôn bật. Khi bạn đặt chính sách này thành Tắt, tính năng Duyệt web an toàn sẽ luôn tắt. + +Nếu bạn đặt chính sách này, người dùng sẽ không thể thay đổi lựa chọn đó hoặc ghi đè chế độ cài đặt "Bật tính năng bảo vệ chống tấn công giả mạo và phần mềm độc hại" trong Chrome. Nếu bạn không đặt chính sách này, chế độ "Bật tính năng bảo vệ chống tấn công giả mạo và phần mềm độc hại" sẽ được đặt thành True (Đúng), nhưng người dùng có thể thay đổi chế độ này. + +Xem thêm về tính năng Duyệt web an toàn (https://developers.google.com/safe-browsing). + +Nếu bạn đặt chính sách <ph name="SAFE_BROWSING_PROTECTION_LEVEL_POLICY_NAME" />, giá trị của chính sách <ph name="SAFE_BROWSING_ENABLED_POLICY_NAME" /> sẽ bị bỏ qua. + +Trên <ph name="MS_WIN_NAME" />, chính sách này chỉ có trên các phiên bản đã liên kết với một miền <ph name="MS_AD_NAME" />, <ph name="MS_AAD_NAME" /> hoặc đã đăng ký <ph name="CHROME_ENTERPRISE_CORE_NAME" />. + +Trên <ph name="MAC_OS_NAME" />, chính sách này chỉ có trên các phiên bản được quản lý qua MDM (Quản lý thiết bị di động), đã liên kết với một miền qua MCX hoặc đã đăng ký <ph name="CHROME_ENTERPRISE_CORE_NAME" />.</translation> <translation id="610892566190435199">Bật tính năng báo cáo trạng thái nguồn của thiết bị</translation> <translation id="6111936128861357925">Cho phép trò chơi trứng khủng long Phục sinh</translation> <translation id="6118226055960302400">Khôi phục hành vi được phép.</translation> @@ -7098,6 +7289,13 @@ <translation id="627672037430076089">Ngăn các kết nối hỗ trợ từ xa đến máy này</translation> <translation id="6277314550042130537">Yêu cầu phê duyệt chính sách KDC trong quá trình xác thực HTTP</translation> <translation id="6278428485366576908">Giao diện</translation> +<translation id="6279010879606347019">Nếu bạn đặt chính sách này thành Bật, trang chủ của người dùng sẽ là trang Thẻ mới và mọi vị trí URL trang chủ sẽ bị bỏ qua. Nếu bạn đặt chính sách này thành Tắt, trang chủ của người dùng sẽ không bao giờ là trang Thẻ mới, trừ phi URL trang chủ của họ được đặt thành chrome://newtab. + +Nếu bạn đặt chính sách này, người dùng sẽ không thể thay đổi loại trang chủ của họ trong <ph name="PRODUCT_NAME" />. Nếu bạn không đặt chính sách này, người dùng sẽ quyết định liệu trang Thẻ mới có phải là trang chủ của họ hay không. + +Trên <ph name="MS_WIN_NAME" />, chính sách này chỉ có trên các phiên bản đã liên kết với một miền <ph name="MS_AD_NAME" />, <ph name="MS_AAD_NAME" /> hoặc đã đăng ký <ph name="CHROME_ENTERPRISE_CORE_NAME" />. + +Trên <ph name="MAC_OS_NAME" />, chính sách này chỉ có trên các phiên bản được quản lý qua MDM (Quản lý thiết bị di động), đã liên kết với một miền qua MCX hoặc đã đăng ký <ph name="CHROME_ENTERPRISE_CORE_NAME" />.</translation> <translation id="628084107912717806">Chỉ định xem hệ thống có thể gửi các mô-đun WebAssembly trên nhiều nguồn gốc hay không</translation> <translation id="6280973140313576289">Buộc hiển thị bộ chọn hồ sơ khi khởi động</translation> <translation id="6282524907402492171">Hiển thị cảnh báo về việc ngừng cung cấp <ph name="CLOUD_PRINT_NAME" /></translation> @@ -7891,6 +8089,13 @@ <translation id="6766216162565713893">Cho phép trang web yêu cầu người dùng cấp quyền truy cập vào thiết bị Bluetooth lân cận</translation> <translation id="6770454900105963262">Báo cáo thông tin về các phiên kiosk hiện hoạt</translation> <translation id="6774132787348495175">Không cho phép người dùng sử dụng máy ảo cần thiết để hỗ trợ các ứng dụng Linux</translation> +<translation id="678121785914414680">Danh sách những loại tệp tự động mở khi tải xuống. Bạn không được thêm dấu phân cách phía trước khi liệt kê loại tệp. Do đó, hãy dùng "txt" thay cho ".txt". + +Những tệp thuộc loại tự động mở sẽ vẫn phải trải qua các bước kiểm tra trong chế độ duyệt web an toàn mà người dùng đã bật. Các tệp này sẽ không mở nếu không vượt qua các bước kiểm tra đó. + +Nếu bạn không đặt chính sách này, chỉ những loại tệp mà người dùng đã chỉ định là tự động mở mới tự động mở khi tải xuống. + +Trên <ph name="MS_WIN_NAME" />, chính sách này chỉ có trên các phiên bản đã liên kết với một miền <ph name="MS_AD_NAME" />, <ph name="MS_AAD_NAME" /> hoặc đã đăng ký <ph name="CHROME_ENTERPRISE_CORE_NAME" />.</translation> <translation id="6782331708811245959">Bật tính năng báo cáo chế độ khởi động thiết bị</translation> <translation id="6783578496154221347">Sử dụng WeeklyTimeIntervalChecked trong mã mới.</translation> <translation id="6785201942412171878">Kiểm soát phím tắt dùng để kích hoạt phím PageUp/PageDown trong "cụm 6 phím"</translation> @@ -9546,6 +9751,13 @@ <translation id="8089200718228084417">Bật tính năng in privet đã ngừng hoạt động</translation> <translation id="8091982561085048989">Cờ boolean cho biết liệu có nên dùng IPP Everywhere để thiết lập máy in hay không. Cờ này được hỗ trợ trên <ph name="PRODUCT_OS_NAME" /> phiên bản 76 trở lên.</translation> <translation id="8094095107731619070">Bật tính năng tự động sửa lỗi khi nhập bằng bàn phím vật lý khi người dùng đánh máy</translation> +<translation id="8098760437853291958">Nếu bạn đặt chính sách này thành Bật hoặc không đặt, các tệp đã tải xuống sẽ được gửi đi để tính năng Duyệt web an toàn phân tích, ngay cả khi tệp được tải xuống từ một nguồn đáng tin cậy. + +Nếu bạn đặt chính sách này thành Tắt, các tệp đã tải xuống sẽ không được gửi đi để tính năng Duyệt web an toàn phân tích khi tệp được tải xuống từ một nguồn đáng tin cậy. + +Những hạn chế này áp dụng cho các tệp đã tải xuống được kích hoạt từ nội dung trang web, cũng như lựa chọn trình đơn Đường liên kết để tải xuống. Những hạn chế này không áp dụng cho việc lưu/tải trang đang hiển thị xuống, cũng như không áp dụng cho việc lưu ở dạng tệp PDF từ các lựa chọn in. + +Trên <ph name="MS_WIN_NAME" />, chính sách này chỉ có trên các phiên bản đã liên kết với một miền <ph name="MS_AD_NAME" />, <ph name="MS_AAD_NAME" /> hoặc đã đăng ký <ph name="CHROME_ENTERPRISE_CORE_NAME" />.</translation> <translation id="8099833343914898016">Danh sách phím tắt định sẵn bằng phím trình chạy tuyệt đối không thực hiện hành động nào, nhưng chỉ khi ứng dụng ở chế độ toàn màn hình.</translation> <translation id="8099880303030573137">Độ trễ khi không sử dụng khi chạy trên nguồn pin</translation> <translation id="8101381354936029836">Nhóm chính sách không thể phân chia:</translation> @@ -9679,6 +9891,43 @@ Xem thêm về dịch vụ Duyệt web an toàn (https://developers.google.com/safe-browsing).</translation> <translation id="8199823751103472868">Nếu bạn đặt chính sách này thì hệ thống sẽ bật bố cục Hindi Inscript trên <ph name="PRODUCT_OS_NAME" />. Nếu bạn đặt chính sách này thành sai hoặc không đặt thì bố cục này sẽ không được áp dụng.</translation> <translation id="8202834945144737726">Bật quy trình chứng thực <ph name="CHROME_ENTERPRISE_DEVICE_TRUST_CONNECTOR" /> cho một danh sách URL trên màn hình đăng nhập</translation> +<translation id="8210117014924235250">Chính sách này cung cấp một cách ghi đè danh sách các bộ mà trình duyệt dùng cho các tính năng của Bộ trang web có liên quan. + +Chính sách này ghi đè chính sách <ph name="FIRST_PARTY_SETS_OVERRIDES_POLICY_NAME" />. + +Mỗi bộ trong danh sách Bộ trang web có liên quan của trình duyệt đều phải đáp ứng các yêu cầu của Bộ trang web có liên quan. +Bộ trang web có liên quan phải chứa một trang web chính và tối thiểu một trang web thành viên. +Một bộ cũng có thể chứa danh sách trang web dịch vụ thuộc sở hữu của bộ đó và bản đồ từ một trang web đến tất cả biến thể ccTLD (miền cấp cao nhất theo mã quốc gia) của trang web đó. +Hãy truy cập https://github.com/WICG/first-party-sets để biết thêm thông tin về cách <ph name="PRODUCT_NAME" /> sử dụng Bộ trang web có liên quan. + + +Tất cả trang web trong một Bộ trang web có liên quan đều phải là miền có thể đăng ký và được phân phát qua HTTPS. Mỗi trang web trong một Bộ trang web có liên quan cũng phải là duy nhất, +nghĩa là mỗi trang web chỉ được liệt kê một lần trong một Bộ trang web có liên quan. + +Khi bạn cung cấp một từ điển trống cho chính sách này, trình duyệt sẽ sử dụng danh sách Bộ trang web có liên quan công khai. + +Đối với mọi trang web ở Bộ trang web có liên quan trong danh sách <ph name="REPLACEMENTS" />, nếu một trang web cũng xuất hiện +trong Bộ trang web có liên quan thuộc danh sách của trình duyệt thì trang web đó sẽ bị loại bỏ khỏi Bộ trang web có liên quan của trình duyệt. +Sau đó, Bộ trang web có liên quan của chính sách sẽ được thêm vào danh sách Bộ trang web có liên quan của trình duyệt. + +Đối với mọi trang web ở Bộ trang web có liên quan trong danh sách <ph name="ADDITIONS" />, nếu một trang web cũng xuất hiện +trong Bộ trang web có liên quan thuộc danh sách của trình duyệt thì Bộ trang web có liên quan của trình duyệt sẽ được cập nhật sao cho +có thể thêm Bộ trang web có liên quan mới vào danh sách của trình duyệt. Sau khi danh sách của trình duyệt được cập nhật, +Bộ trang web có liên quan của chính sách sẽ được thêm vào danh sách Bộ trang web có liên quan của trình duyệt. + +Danh sách Bộ trang web có liên quan của trình duyệt yêu cầu mỗi trang web thuộc danh sách này +chỉ được xuất hiện trong một bộ. Đây cũng là yêu cầu đối với cả danh sách <ph name="REPLACEMENTS" /> +và danh sách <ph name="ADDITIONS" />. Tương tự như vậy, một trang web không được xuất hiện trong cả +danh sách <ph name="REPLACEMENTS" /> và danh sách <ph name="ADDITIONS" />. + +Hệ thống không hỗ trợ việc dùng ký tự đại diện (*) làm giá trị chính sách, cũng như trong mọi Bộ trang web có liên quan thuộc những danh sách này. + +Mọi bộ mà chính sách cung cấp đều phải là Bộ trang web có liên quan hợp lệ. Nếu không, +lỗi tương ứng sẽ xảy ra. + +Trên <ph name="MS_WIN_NAME" />, chính sách này chỉ có trên các phiên bản đã liên kết với một miền <ph name="MS_AD_NAME" />, <ph name="MS_AAD_NAME" /> hoặc đã đăng ký <ph name="CHROME_ENTERPRISE_CORE_NAME" />. + +Trên <ph name="MAC_OS_NAME" />, chính sách này chỉ có trên các phiên bản được quản lý qua MDM (Quản lý thiết bị di động), đã liên kết với một miền qua MCX hoặc đã đăng ký <ph name="CHROME_ENTERPRISE_CORE_NAME" />.</translation> <translation id="8213475033260328041">Chọn lưu trữ dữ liệu được áp dụng từ <ph name="PRODUCT_NAME" /> ở một vị trí địa lý cụ thể. Nếu bạn không đặt chính sách này hoặc đặt thành <ph name="DATA_REGION_SETTING_NO_PREFERENCE_OPTION_NAME" /> (giá trị 0) thì dữ liệu được áp dụng có thể được lưu trữ ở vị trí địa lý bất kỳ. @@ -9777,6 +10026,23 @@ Nếu bạn không đặt chính sách này, thì các trang web có thể yêu cầu quyền truy cập nhưng người dùng được quyền thay đổi tùy chọn cài đặt này.</translation> <translation id="8267520984570984190">Thao tác đổi kích thước bàn phím ảo mặc định chưa được sửa đổi</translation> <translation id="8269238942896230153">Tài khoản được quản lý phải là tài khoản chính và người dùng có thể nhập dữ liệu duyệt web hiện có tại thời điểm tạo hồ sơ</translation> +<translation id="827020625039819798">Nếu bạn đặt chính sách này, hệ thống sẽ chỉ định một danh sách các ứng dụng và tiện ích tự động cài đặt mà không cần người dùng can thiệp, cũng như các ứng dụng và tiện ích mà người dùng không thể gỡ cài đặt hoặc tắt thông qua giao diện <ph name="PRODUCT_NAME" />. Các quyền được cấp theo mặc nhiên, kể cả cho các API tiện ích enterprise.deviceAttributes và enterprise.platformKeys. (Những ứng dụng và tiện ích không bị buộc cài đặt sẽ không dùng được 2 API này.) + +Mặc dù mục đích của <ph name="PRODUCT_NAME" /> là ngăn người dùng gỡ cài đặt các tiện ích này nhưng một số hệ điều hành lại khiến <ph name="PRODUCT_NAME" /> không thể bảo vệ hiệu quả để tiện ích khỏi bị sửa đổi từ bên ngoài, nên biện pháp ngăn chặn này đã là nỗ lực tối đa. + +Khi bạn không đặt chính sách này, các ứng dụng/tiện ích sẽ không được tự động cài đặt và người dùng có thể gỡ cài đặt mọi ứng dụng/tiện ích trong <ph name="PRODUCT_NAME" />. + +Chính sách này thay thế chính sách <ph name="EXTENSION_INSTALL_BLOCKLIST_POLICY_NAME" />. Nếu một ứng dụng/tiện ích trước đây bị buộc cài đặt và hiện bị xoá khỏi danh sách này, thì <ph name="PRODUCT_NAME" /> sẽ tự động gỡ cài đặt ứng dụng/tiện ích đó. + +Người dùng có thể thay đổi mã nguồn của mọi tiện ích thông qua các công cụ cho nhà phát triển (điều này có thể khiến tiện ích hoạt động không chính xác). Nếu bạn lo ngại về điều này, hãy đặt chính sách <ph name="DEVELOPER_TOOLS_DISABLED_POLICY_NAME" />. + +Mỗi mục trong danh sách của chính sách này là một chuỗi chứa một mã tiện ích và một URL cập nhật (không bắt buộc) được phân tách bằng dấu chấm phẩy (;). Mã tiện ích là một chuỗi gồm 32 chữ cái, chẳng hạn như mã tiện ích trên chrome://extensions khi ở Chế độ nhà phát triển. Nếu được chỉ định, URL cập nhật phải trỏ đến tài liệu XML (Ngôn ngữ đánh dấu mở rộng) của Tệp kê khai cập nhật (https://developer.chrome.com/extensions/autoupdate). URL cập nhật phải sử dụng một trong các giao thức sau: <ph name="HTTP_SCHEME" />, <ph name="HTTPS_SCHEME" /> hoặc <ph name="FILE_SCHEME" />. Theo mặc định, URL cập nhật của Cửa hàng Chrome trực tuyến sẽ được sử dụng. URL cập nhật được đặt trong chính sách này chỉ dùng cho lần cài đặt ban đầu. Các lần cập nhật tiện ích tiếp theo sẽ sử dụng URL cập nhật nêu trong tệp kê khai của tiện ích. Bạn có thể ghi đè url cập nhật cho những lần cập nhật tiếp theo bằng cách sử dụng chính sách <ph name="EXTENSION_SETTINGS_POLICY_NAME" />, hãy xem http://support.google.com/chrome/a?p=Configure_ExtensionSettings_policy. + +Trên các phiên bản <ph name="MS_WIN_NAME" />, bạn chỉ có thể buộc cài đặt các ứng dụng và tiện ích từ bên ngoài Cửa hàng Chrome trực tuyến nếu phiên bản đó đã liên kết với một miền <ph name="MS_AD_NAME" />, <ph name="MS_AAD_NAME" /> hoặc đã đăng ký <ph name="CHROME_ENTERPRISE_CORE_NAME" />. + +Trên các phiên bản <ph name="MAC_OS_NAME" />, bạn chỉ có thể buộc cài đặt các ứng dụng và tiện ích từ bên ngoài Cửa hàng Chrome trực tuyến nếu phiên bản đó được quản lý qua MDM (Quản lý thiết bị di động), đã liên kết với một miền qua MCX hoặc đã đăng ký <ph name="CHROME_ENTERPRISE_CORE_NAME" />. + +Lưu ý: Chính sách này không áp dụng cho chế độ ẩn danh. Tìm hiểu về việc lưu trữ các tiện ích (https://developer.chrome.com/extensions/hosting).</translation> <translation id="8270320981823560179">Drive</translation> <translation id="827054846390793641">Bật giao diện người dùng liên quan đến kết nối trên màn hình máy chủ khi đang có kết nối</translation> <translation id="8272422063636310696">Kiểm soát việc một trang sử dụng công nghệ cũ có được báo cáo dựa trên URL của trang đó hay không. @@ -10023,6 +10289,13 @@ <translation id="8452787853105404870">Gửi dữ liệu phần cứng cho Google để hỗ trợ cải tiến ChromeOS Flex</translation> <translation id="8453218444172088993">Tắt chế độ cài đặt Chủ đề quảng cáo của <ph name="PRIVACY_SANDBOX_NAME" /> cho người dùng của bạn.</translation> <translation id="8455529558077979314">Cài đặt màn hình bảo vệ quyền riêng tư</translation> +<translation id="8459662059679040042">Khi bạn đặt chính sách này thành Bật, nếu <ph name="CHROME_CLEANUP_NAME" /> phát hiện ra phần mềm không mong muốn thì tính năng này có thể báo cáo về quá trình quét cho Google theo chính sách do <ph name="SAFE_BROWSING_EXTENDED_REPORTING_ENABLED_POLICY_NAME" /> đặt ra. <ph name="CHROME_CLEANUP_NAME" /> sẽ hỏi người dùng xem họ có muốn dọn dẹp hay không. Tính năng này sẽ gửi kết quả tới Google. + +Khi bạn đặt chính sách này thành Tắt, nếu <ph name="CHROME_CLEANUP_NAME" /> phát hiện ra phần mềm không mong muốn thì tính năng này sẽ không báo cáo về quá trình quét cho Google, bất kể <ph name="SAFE_BROWSING_EXTENDED_REPORTING_ENABLED_POLICY_NAME" /> có giá trị nào. <ph name="CHROME_CLEANUP_NAME" /> sẽ hỏi người dùng xem họ có muốn dọn dẹp hay không. Tính năng này không báo cáo kết quả cho Google. + +Nếu bạn không đặt chính sách này, <ph name="CHROME_CLEANUP_NAME" /> có thể báo cáo về các lần quét tìm phần mềm không mong muốn cho Google, theo chính sách do <ph name="SAFE_BROWSING_EXTENDED_REPORTING_ENABLED_POLICY_NAME" /> đặt ra. <ph name="CHROME_CLEANUP_NAME" /> sẽ hỏi người dùng xem họ có muốn dọn dẹp hay không và chia sẻ kết quả với Google nhằm giúp phát hiện phần mềm không mong muốn trong tương lai. Những kết quả này có siêu dữ liệu tệp, tiện ích tự động cài đặt và khoá sổ đăng ký như mô tả trong Báo cáo chính thức về quyền riêng tư của Chrome. + +Trên <ph name="MS_WIN_NAME" />, chính sách này chỉ có trên các phiên bản đã liên kết với một miền <ph name="MS_AD_NAME" />, <ph name="MS_AAD_NAME" /> hoặc đã đăng ký <ph name="CHROME_ENTERPRISE_CORE_NAME" />.</translation> <translation id="8461914792118322307">Proxy</translation> <translation id="8465065632133292531">Tham số cho URL tức thì sử dụng POST</translation> <translation id="8466326735698755782">Cho phép tính năng So sánh các thẻ nhưng không tham gia cải tiến mô hình AI.</translation> @@ -10482,6 +10755,13 @@ <translation id="8801680448782904838">Thông báo cho người dùng biết họ cần hoặc bắt buộc phải chạy lại trình duyệt hoặc khởi động lại thiết bị</translation> <translation id="8802800226877198994">Bật hỗ trợ GIF.</translation> <translation id="8804685015028424497">Tắt chế độ Ẩn danh</translation> +<translation id="8806417793261941339">Chính sách này không được dùng nữa, vui lòng sử dụng <ph name="SAFE_BROWSING_ALLOWLIST_DOMAINS_POLICY_NAME" />. + + Khi bạn đặt chính sách này thành Bật, tính năng Duyệt web an toàn sẽ tin cậy các miền mà bạn chỉ định. Tính năng này sẽ không dò tìm tài nguyên nguy hiểm trong các miền đó, chẳng hạn như dò tìm hoạt động lừa đảo, phần mềm độc hại hoặc phần mềm không mong muốn. Dịch vụ bảo vệ tệp đã tải xuống của tính năng Duyệt web an toàn sẽ không kiểm tra các tệp đã tải xuống được lưu trữ trên những miền này. Dịch vụ bảo vệ mật khẩu của tính năng này sẽ không dò tìm mật khẩu trùng lặp. + + Khi bạn đặt chính sách này thành Tắt hoặc không đặt, dịch vụ bảo vệ mặc định của tính năng Duyệt web an toàn sẽ được áp dụng cho tất cả tài nguyên. + + Trên <ph name="MS_WIN_NAME" />, chức năng này chỉ có ở những phiên bản liên kết với một miền <ph name="MS_AD_NAME" />, chạy trên Windows 10 Pro hoặc đã đăng ký <ph name="CHROME_ENTERPRISE_CORE_NAME" />. Trên <ph name="MAC_OS_NAME" />, chức năng này chỉ có ở những phiên bản được quản lý qua MDM (Quản lý thiết bị di động) hoặc liên kết với một miền qua MCX.</translation> <translation id="8806478127647484805">Không cho phép người dùng kết thúc quá trình bằng trình quản lý tác vụ Chrome</translation> <translation id="8807274441692477185">Không hiển thị màn hình hướng cuộn của bàn di chuột trong khi đăng nhập</translation> <translation id="8807313206348471682">Hiển thị hộp thoại xác nhận đăng xuất</translation> @@ -10620,6 +10900,15 @@ <translation id="8897796778265450949">Giới hạn thời gian mà một người dùng được xác thực qua GAIA khi không có SAML có thể đăng nhập ở chế độ ngoại tuyến</translation> <translation id="889814528399907891">Cho phép người dùng bật <ph name="LACROS_NAME" /> và đặt trình duyệt này làm trình duyệt chính</translation> <translation id="8900312706328930425">Tần suất báo cáo trên đám mây tính theo giờ</translation> +<translation id="8902938589482529940">Chính sách này cho phép tải trước hình ảnh <ph name="ARC_VM" /> trên thiết bị đã cài đặt <ph name="PRODUCT_OS_FLEX_NAME" />. + +Nếu bạn đặt chính sách này thành Bật, thì hình ảnh <ph name="ARC_VM" /> sẽ được tải trước riêng biệt trên <ph name="PRODUCT_OS_FLEX_NAME" />. + +Nếu bạn đặt chính sách này thành Tắt hoặc không đặt, thì hình ảnh <ph name="ARC_VM" /> sẽ không được tải trước riêng biệt trên <ph name="PRODUCT_OS_FLEX_NAME" />. + +Nếu hình ảnh đã được tải xuống và sau đó chính sách được cập nhật, thì hình ảnh sẽ chỉ bị xoá sau khi người dùng đăng xuất hoặc khởi động lại thiết bị. + +Chính sách này chỉ kiểm soát <ph name="ARC_VM" /> trên <ph name="PRODUCT_OS_FLEX_NAME" />. Để biết thêm chi tiết về <ph name="PRODUCT_NAME" />, vui lòng xem chính sách <ph name="ARC_ENABLED_POLICY_NAME" />.</translation> <translation id="8903283771634816230">Nếu bạn đặt chính sách này thành Bật, <ph name="PRODUCT_NAME" /> sẽ sử dụng máy in mặc định của hệ điều hành làm máy in đích mặc định để xem trước bản in. Nếu bạn đặt thành Tắt hoặc không đặt chính sách này, thì <ph name="PRODUCT_NAME" /> sẽ sử dụng những máy in đã dùng gần đây nhất làm máy in đích mặc định để xem trước bản in.</translation>
diff --git a/components/policy/resources/policy_templates_zh-CN.xtb b/components/policy/resources/policy_templates_zh-CN.xtb index ffcaeee..8b35723 100644 --- a/components/policy/resources/policy_templates_zh-CN.xtb +++ b/components/policy/resources/policy_templates_zh-CN.xtb
@@ -3272,6 +3272,7 @@ 如果此政策设为 false，设备将不会尝试联系 Quirks Server 来下载配置文件。 如果未设置此政策或将其设为 true，<ph name="PRODUCT_OS_NAME" /> 将自动联系 Quirks Server 并下载配置文件（如果有），然后将这些文件存储在设备上。此类文件可能会用于多种目的，例如改善所接显示器的显示画质。</translation> +<translation id="3513864752694608929">不强制启用已启用的输入法</translation> <translation id="3515196503924273265">允许启用 NewBaseUrlInheritanceBehavior 功能</translation> <translation id="351654132746710200"><ph name="LACROS_NAME" /> 停用后，系统将不会执行数据迁移操作。系统会移除“<ph name="LACROS_NAME" />”文件夹，用户将可以继续使用其余数据。</translation> <translation id="3518293344797498431">将电池充至 80% 左右，以最大限度延长电池寿命。</translation> @@ -6618,6 +6619,7 @@ <translation id="6092073071805297119">允许使用无障碍性能过滤机制。</translation> <translation id="60925735895026302">不允许任何网站请求通过 WebPrinting API 访问本地打印机</translation> <translation id="6093156968240188330">允许远程用户在远程协助会话中操控提权后的窗口</translation> +<translation id="6093551397728373988">强制在用户会话中启用所有允许的输入法</translation> <translation id="6094314311474620462">停用打印功能</translation> <translation id="6097601282776163274">启用以网址为键的匿名化数据收集功能</translation> <translation id="6099853574908182288">默认打印颜色模式</translation> @@ -6813,6 +6815,11 @@ 如果此政策已停用，用户将无法运行 Chrome for Testing。用户仍然可以安装 Chrome for Testing，但无法在已停用此政策的个人资料中运行该版本。</translation> <translation id="6258658183356534534">控制 User-Agent Client Hints GREASE Update 功能。</translation> <translation id="6261643884958898336">报告机器标识信息</translation> +<translation id="6262668203803408414">如果此政策设为 true，系统会强制在 <ph name="PRODUCT_OS_NAME" /> 会话中启用 <ph name="ALLOWED_INPUT_METHODS_POLICY_NAME" /> 政策中的所有输入法。 +无法在用户会话中启用其他输入方法。 +如果此政策设为 false 或未设置，系统不会强制执行任何已启用的输入法，并且 <ph name="ALLOWED_INPUT_METHODS_POLICY_NAME" /> 政策仅配置用户可用的输入法。 + +如果 <ph name="ALLOWED_INPUT_METHODS_POLICY_NAME" /> 政策未设置或设为一个空列表，系统会忽略此政策，并且用户可以启用任何输入法。</translation> <translation id="6264247808139384018">如果此政策已启用或未设置，使用密码验证身份的用户便可以锁定屏幕。 如果此政策已停用，用户将无法锁定屏幕（只能退出用户会话）。</translation> @@ -8834,6 +8841,7 @@ 此政策只是暂时性措施，已在新的下载气泡界面全面推出后移除。</translation> <translation id="7736521021425189418">终端（自 117 版起受支持）</translation> +<translation id="7736846524371077454">强制启用所有允许的输入法</translation> <translation id="7740644123648617252">允许在首次运行时导入自动填充表单数据</translation> <translation id="7744253761377202223">使用交流电源供电时的屏幕亮度百分比</translation> <translation id="7747447585227954402">允许设备在 <ph name="PRODUCT_OS_NAME" />上使用 <ph name="PLUGIN_VM_NAME" /></translation>
diff --git a/components/strings/components_strings_ar.xtb b/components/strings/components_strings_ar.xtb index 3307616..ea13b492 100644 --- a/components/strings/components_strings_ar.xtb +++ b/components/strings/components_strings_ar.xtb
@@ -59,6 +59,7 @@ <translation id="1099928364755383720">فتح النوافذ في وضع "نافذة ضمن النافذة" تلقائيًا</translation> <translation id="1100782917270858593">زر استئناف سجلّ أنشطة البحث والتصفُّح: اضغط على مفتاح Enter لاستئناف سجلّ أنشطة البحث والتصفُّح والاطّلاع على النشاط ذي الصلة في سجلّ Chrome.</translation> <translation id="1101672080107056897">خطأ في الإجراء</translation> +<translation id="1101902632743388185">جداول المقارنة</translation> <translation id="1104409666019087579">بعض الحقول المطلوبة فارغة. يُرجى ملء هذه الحقول قبل الحفظ.</translation> <translation id="1104860668737945357">زر إدارة كلمات المرور: انقر على هذا الزر لعرض كلمات المرور وإدارتها في إعدادات Chrome.</translation> <translation id="1108464073729874771">A3x4</translation> @@ -583,6 +584,7 @@ <translation id="2025186561304664664">تم ضبط الخادم الوكيل على الإعداد التلقائي.</translation> <translation id="2025891858974379949">محتوى غير آمن</translation> <translation id="2027465737841872819">بلاستيك</translation> +<translation id="2027707238798802149">البطاقة غير متوفّرة</translation> <translation id="2029735183873159415">الأصل وعلم الأنساب</translation> <translation id="2032962459168915086"><ph name="BEGIN_LINK" />التحقق من الخادم الوكيل والجدار الناري<ph name="END_LINK" /></translation> <translation id="2033900728810589426">لا يمكن أن يكون الاختصار مطابقًا للكلمة الرئيسية لمزوِّد البحث التلقائي المحددة من قِبل <ph name="DEFAULT_SEARCH_PROVIDER_KEYWORD_POLICY_NAME" />: <ph name="SHORTCUT_NAME" /></translation> @@ -866,6 +868,7 @@ <translation id="2514548229949738417">منازل وحدائق</translation> <translation id="2515629240566999685">التحقّق من اتصال الإنترنت في منطقتك</translation> <translation id="2515761554693942801">لقد اخترت إثبات هويتك باستخدام ميزة Touch ID على المواقع الإلكترونية التي تستخدم مقدِّم الخدمة <ph name="PROVIDER_ORIGIN" />. قد يكون مقدِّم الخدمة احتفظ بمعلومات حول طريقة الدفع التي تم استخدامها، ويمكنك <ph name="LINK_TEXT" />.</translation> +<translation id="2518584823165598232">هذه البطاقة غير متوفّرة. يُرجى التواصل مع مقدِّم البطاقة.</translation> <translation id="2521385132275182522">وضع دبوس أسفل اليمين</translation> <translation id="2521736961081452453">إنشاء نموذج</translation> <translation id="2523886232349826891">سيتم حفظ البطاقة على هذا الجهاز فقط</translation> @@ -3344,6 +3347,7 @@ <translation id="7003322000677139268">إكسسوارات وقطع غيار مركبات</translation> <translation id="7004499039102548441">علامات التبويب الأخيرة</translation> <translation id="7006930604109697472">إرسال على أيّ حال</translation> +<translation id="7009364359744329733">هذه البطاقة غير متوفّرة حاليًا. يُرجى إعادة المحاولة لاحقًا.</translation> <translation id="7010658264061801199">أطعمة ومشروبات</translation> <translation id="7012363358306927923">China UnionPay</translation> <translation id="7013835112918108252">بإمكان الموقع الإلكتروني طلب قفل الماوس واستخدامه</translation>
diff --git a/components/strings/components_strings_bs.xtb b/components/strings/components_strings_bs.xtb index 5b3743b..9b840bc 100644 --- a/components/strings/components_strings_bs.xtb +++ b/components/strings/components_strings_bs.xtb
@@ -59,6 +59,7 @@ <translation id="1099928364755383720">automatsku sliku u slici</translation> <translation id="1100782917270858593">Dugme za nastavak iskustva pregledanja, pritisnite Enter da nastavite pregledati te da vidite relevantne aktivnosti u historiji Chromea</translation> <translation id="1101672080107056897">Postupak u slučaju greške</translation> +<translation id="1101902632743388185">Tabele poređenja</translation> <translation id="1104409666019087579">Neka obavezna polja su prazna. Popunite ih prije pohranjivanja.</translation> <translation id="1104860668737945357">Dugme Upravljaj lozinkama, aktivirajte da pregledate lozinke i upravljate lozinkama u postavkama Chromea</translation> <translation id="1108464073729874771">A3x4</translation> @@ -460,6 +461,7 @@ <translation id="1777422078676229054">Fotografija (arhivska)</translation> <translation id="1778646502362731194">JIS B0</translation> <translation id="1785118555253503473">Instalirati web aplikacije?</translation> +<translation id="1791415068765905273">Prikaži sve tablice za usporedbu</translation> <translation id="1791429645902722292">Google Smart Lock</translation> <translation id="1791820510173628507"><ph name="MANAGE_GOOGLE_ACCOUNT_FOCUSED_FRIENDLY_MATCH_TEXT" />, pritisnite Tab, a zatim Enter da upravljate informacijama, privatnošću i sigurnošću na Google računu</translation> <translation id="1793631236004319016">Posljednji put je korišteno prije <ph name="NUM_HOURS_MINUTES_SECONDS" /></translation> @@ -583,6 +585,7 @@ <translation id="2025186561304664664">Proksi server je postavljen na automatsku konfiguraciju.</translation> <translation id="2025891858974379949">Nesiguran sadržaj</translation> <translation id="2027465737841872819">Plastika</translation> +<translation id="2027707238798802149">Kartica nije dostupna</translation> <translation id="2029735183873159415">Preci i rodoslovlje</translation> <translation id="2032962459168915086"><ph name="BEGIN_LINK" />Provjeriti proksi server i firewall<ph name="END_LINK" /></translation> <translation id="2033900728810589426">Prečica ne može biti ista kao zadana ključna riječ pružaoca usluge pretraživanja koja je definirana pravilima <ph name="DEFAULT_SEARCH_PROVIDER_KEYWORD_POLICY_NAME" />: <ph name="SHORTCUT_NAME" /></translation> @@ -866,6 +869,7 @@ <translation id="2514548229949738417">Dom i vrt</translation> <translation id="2515629240566999685">Provjeriti signal u svojoj oblasti</translation> <translation id="2515761554693942801">Možete odabrati potvrdu pomoću Touch ID-a na web lokacijama koje koriste pružatelja usluga <ph name="PROVIDER_ORIGIN" />. Ovaj pružalac usluga je možda pohranio informacije o vašem načinu plaćanja, za koji možete <ph name="LINK_TEXT" />.</translation> +<translation id="2518584823165598232">Kartica nije dostupna. Kontaktirajte pružaoca usluge kartice.</translation> <translation id="2521385132275182522">Spajanje u donjem desnom uglu</translation> <translation id="2521736961081452453">Kreiraj obrazac</translation> <translation id="2523886232349826891">Pohranjuje se samo na ovom uređaju</translation> @@ -2194,6 +2198,7 @@ <translation id="4918221908152712722">Instalirajte aplikaciju <ph name="APP_NAME" /> (nije potrebno preuzeti)</translation> <translation id="4920457992177678649">Privatni smještaj i kratki boravci</translation> <translation id="4920710383559189047">Omotnica</translation> +<translation id="4920921410507315601">Tablice za usporedbu</translation> <translation id="4922104989726031751">Da koristite Upravitelj lozinki sa svojim operativnim sistemom, ponovo pokrenite Chromium i dozvolite pristup upravitelju lozinki računara. Kartice će se ponovo otvoriti nakon ponovnog pokretanja.</translation> <translation id="4923459931733593730">Plaćanje</translation> <translation id="4926049483395192435">Mora se navesti.</translation> @@ -2387,6 +2392,7 @@ <translation id="5278778426231952189">Otpremi sada</translation> <translation id="5279286380302340275">Upravljajte preuzimanjima</translation> <translation id="5280963125494874678">web aplikacije</translation> +<translation id="5282008206326321696">{count,plural, =0{# oznaka}=1{# oznaka}one{# oznaka}few{# oznake}other{# oznaka}}</translation> <translation id="5283044957620376778">B1</translation> <translation id="5284295735376057059">Osobine dokumenta</translation> <translation id="528468243742722775">Prekid</translation> @@ -2581,6 +2587,7 @@ <translation id="561165882404867731">Prevedite ovu stranicu pomoću Google Prevodioca</translation> <translation id="5612720917913232150"><ph name="URL" /> želi koristiti lokaciju vašeg računara</translation> <translation id="5614520971155863709">Kartaške igre</translation> +<translation id="5617785978844309968">Prikaži sve tablice za usporedbu</translation> <translation id="5617949217645503996">Host računar <ph name="HOST_NAME" /> vas je preusmjerio previše puta</translation> <translation id="5619721953841297650">Zadana postavka</translation> <translation id="5624120631404540903">Upravljajte lozinkama</translation> @@ -3291,6 +3298,7 @@ <translation id="6925267999184670015">North American B+</translation> <translation id="6926216138694948720">Body art</translation> <translation id="692638818576287323">Komercijalna vozila</translation> +<translation id="6933282894115597956">Vaša organizacija zahtijeva prijavu</translation> <translation id="6934236486840930310"><ph name="BEGIN_BOLD" />Zadani pretraživač vam omogućava da pretražujete web i omogućava funkcije Chromea<ph name="END_BOLD" /> kao što je pretraživanje iz trake za adresu i sa slika na web stranicama. Funkcije koje pretraživač ne podržava možda neće biti dostupne.</translation> <translation id="6934672428414710184">Ovaj naziv je s vašeg Google računa</translation> <translation id="6935082727755903526">Poslovi u računovodstvu i finansijama</translation> @@ -3342,6 +3350,7 @@ <translation id="7003322000677139268">Dijelovi i dodatna oprema za vozila</translation> <translation id="7004499039102548441">Nedavne kartice</translation> <translation id="7006930604109697472">Svejedno pošalji</translation> +<translation id="7009364359744329733">Kartica trenutno nije dostupna. Pokušajte ponovo kasnije.</translation> <translation id="7010658264061801199">Hrana i piće</translation> <translation id="7012363358306927923">China UnionPay</translation> <translation id="7013835112918108252">Može zatražiti da zaključa i koristi vaš miš</translation>
diff --git a/components/strings/components_strings_en-GB.xtb b/components/strings/components_strings_en-GB.xtb index aad1e6b..826b5c2d 100644 --- a/components/strings/components_strings_en-GB.xtb +++ b/components/strings/components_strings_en-GB.xtb
@@ -59,6 +59,7 @@ <translation id="1099928364755383720">automatic picture-in-picture</translation> <translation id="1100782917270858593">Resume your journey button, press Enter to resume your journey and see relevant activity in your Chrome history</translation> <translation id="1101672080107056897">Error action</translation> +<translation id="1101902632743388185">Your comparison tables</translation> <translation id="1104409666019087579">Some required fields are empty. Fill them before saving.</translation> <translation id="1104860668737945357">Manage passwords button, activate to view and manage your passwords in Chrome settings</translation> <translation id="1108464073729874771">A3 x 4</translation> @@ -583,6 +584,7 @@ <translation id="2025186561304664664">Proxy is set to auto-configured.</translation> <translation id="2025891858974379949">Insecure content</translation> <translation id="2027465737841872819">Plastic</translation> +<translation id="2027707238798802149">Card not available</translation> <translation id="2029735183873159415">Ancestry and genealogy</translation> <translation id="2032962459168915086"><ph name="BEGIN_LINK" />Checking the proxy and the firewall<ph name="END_LINK" /></translation> <translation id="2033900728810589426">Shortcut can't be the same as the default search provider keyword defined by <ph name="DEFAULT_SEARCH_PROVIDER_KEYWORD_POLICY_NAME" />: <ph name="SHORTCUT_NAME" /></translation> @@ -866,6 +868,7 @@ <translation id="2514548229949738417">Home and garden</translation> <translation id="2515629240566999685">Checking the signal in your area</translation> <translation id="2515761554693942801">You chose to verify with Touch ID on websites that use <ph name="PROVIDER_ORIGIN" />. This provider may have stored information about your payment method, which you can <ph name="LINK_TEXT" />.</translation> +<translation id="2518584823165598232">This card is not available. Please contact your card provider.</translation> <translation id="2521385132275182522">Staple bottom right</translation> <translation id="2521736961081452453">Create form</translation> <translation id="2523886232349826891">Saved on this device only</translation> @@ -3291,6 +3294,7 @@ <translation id="6925267999184670015">North American B+</translation> <translation id="6926216138694948720">Body art</translation> <translation id="692638818576287323">Commercial Vehicles</translation> +<translation id="6933282894115597956">Sign-in is required by your organisation</translation> <translation id="6934236486840930310"><ph name="BEGIN_BOLD" />Your default search engine lets you search the web and powers Chrome features<ph name="END_BOLD" /> like searching from the address bar and from images on web pages. A feature might not be available if your search engine doesn’t support it.</translation> <translation id="6934672428414710184">This name is from your Google Account</translation> <translation id="6935082727755903526">Accounting and Finance Jobs</translation> @@ -3342,6 +3346,7 @@ <translation id="7003322000677139268">Vehicle parts and accessories</translation> <translation id="7004499039102548441">Recent tabs</translation> <translation id="7006930604109697472">Send anyway</translation> +<translation id="7009364359744329733">This card is not available at the moment. Please try again later.</translation> <translation id="7010658264061801199">Food and drink</translation> <translation id="7012363358306927923">China UnionPay</translation> <translation id="7013835112918108252">Can ask to lock and use your mouse</translation>
diff --git a/components/strings/components_strings_et.xtb b/components/strings/components_strings_et.xtb index 3aee6ff..37df7863 100644 --- a/components/strings/components_strings_et.xtb +++ b/components/strings/components_strings_et.xtb
@@ -59,6 +59,7 @@ <translation id="1099928364755383720">automaatne pilt pildis režiim</translation> <translation id="1100782917270858593">Nupp Jätkake oma teekonda, teekonna jätkamiseks ja oma Chrome'i ajaloos asjakohaste tegevuste nägemiseks vajutage sisestusklahvi.</translation> <translation id="1101672080107056897">Veatoiming</translation> +<translation id="1101902632743388185">Teie võrdlustabelid</translation> <translation id="1104409666019087579">Mõned kohustuslikud väljad on tühjad. Täitke need enne salvestamist.</translation> <translation id="1104860668737945357">Nupp Paroolide haldamine, aktiveerige nupp Chrome'i seadetes paroolide vaatamiseks ja haldamiseks</translation> <translation id="1108464073729874771">A3 × 4</translation> @@ -361,7 +362,7 @@ <translation id="1615178538289490617">Juurdepääsu tühistamine: <ph name="PORT_NAME" /></translation> <translation id="1615402009686901181">Administraatori eeskirjad keelavad ekraanikuva jäädvustamise, kui konfidentsiaalne sisu on nähtaval</translation> <translation id="1617276713587758852">Mahturid</translation> -<translation id="1619007254056372606">Halda seadmes olevaid saidi andmeid</translation> +<translation id="1619007254056372606">Seadmes olevate saidiandmete haldamine</translation> <translation id="1619648179761984213"><ph name="USER_DISPLAY_NAME" /> eemaldas vahelehe</translation> <translation id="1620510694547887537">Kaamera</translation> <translation id="1622966923835127638">Äri/finants</translation> @@ -583,6 +584,7 @@ <translation id="2025186561304664664">Puhverserver seadistatakse automaatselt.</translation> <translation id="2025891858974379949">Ebaturvaline sisu</translation> <translation id="2027465737841872819">Plast</translation> +<translation id="2027707238798802149">Kaart ei ole saadaval</translation> <translation id="2029735183873159415">Päritolu ja genealoogia</translation> <translation id="2032962459168915086"><ph name="BEGIN_LINK" />Kontrollige puhverserverit ja tulemüüri<ph name="END_LINK" /></translation> <translation id="2033900728810589426">Otsetee ei tohi olla sama, mis vaikeotsingupakkuja märksõna, mille on määranud <ph name="DEFAULT_SEARCH_PROVIDER_KEYWORD_POLICY_NAME" />: <ph name="SHORTCUT_NAME" /></translation> @@ -866,6 +868,7 @@ <translation id="2514548229949738417">Kodu ja aed</translation> <translation id="2515629240566999685">Kontrollige oma piirkonna signaali</translation> <translation id="2515761554693942801">Valisite Touch ID-ga kinnitamise veebisaitide puhul, mis kasutavad pakkujat <ph name="PROVIDER_ORIGIN" />. See pakkuja võis teie makseviisi teabe salvestada. Võite <ph name="LINK_TEXT" />.</translation> +<translation id="2518584823165598232">See kaart ei ole saadaval. Võtke ühendust oma kaardi väljaandjaga.</translation> <translation id="2521385132275182522">Kirjaklamber paremal all</translation> <translation id="2521736961081452453">Loo vorm</translation> <translation id="2523886232349826891">Salvestatakse ainult sellesse seadmesse</translation> @@ -3342,6 +3345,7 @@ <translation id="7003322000677139268">Sõidukite osad ja tarvikud</translation> <translation id="7004499039102548441">Hiljutised vahelehed</translation> <translation id="7006930604109697472">Saada ikkagi</translation> +<translation id="7009364359744329733">See kaart pole praegu saadaval. Proovige hiljem uuesti.</translation> <translation id="7010658264061801199">Söök ja jook</translation> <translation id="7012363358306927923">Hiina UnionPay</translation> <translation id="7013835112918108252">Võib küsida teie hiire lukustamist ja kasutamist</translation>
diff --git a/components/strings/components_strings_fa.xtb b/components/strings/components_strings_fa.xtb index 91986fb7..80d8833 100644 --- a/components/strings/components_strings_fa.xtb +++ b/components/strings/components_strings_fa.xtb
@@ -59,6 +59,7 @@ <translation id="1099928364755383720">تصویر در تصویر خودکار</translation> <translation id="1100782917270858593">دکمه «ازسرگیری سفر جستجو»، برای ازسر گرفتن سفر جستجو و دیدن فعالیتهای مرتبط در سابقه Chrome، کلید «ورود» را فشار دهید</translation> <translation id="1101672080107056897">اقدام خطا</translation> +<translation id="1101902632743388185">جدولهای مقایسه شما</translation> <translation id="1104409666019087579">تعدادی از فیلدهای الزامی خالی است. آنها را قبلاز ذخیره کردن پر کنید.</translation> <translation id="1104860668737945357">دکمه «مدیریت گذرواژهها»، برای مشاهده و مدیریت گذرواژهها در تنظیمات Chrome، آن را فعال کنید</translation> <translation id="1108464073729874771">A3x4</translation> @@ -583,6 +584,7 @@ <translation id="2025186561304664664">پروکسی بر روی پیکربندی خودکار تنظیم شده است.</translation> <translation id="2025891858974379949">محتوای ناامن</translation> <translation id="2027465737841872819">پلاستیک</translation> +<translation id="2027707238798802149">کارت دردسترس نیست</translation> <translation id="2029735183873159415">شجرهنامه و سلسلهشناسی</translation> <translation id="2032962459168915086"><ph name="BEGIN_LINK" />بررسی پروکسی و دیوار آتش<ph name="END_LINK" /></translation> <translation id="2033900728810589426">میانبر نباید با کلیدواژه ارائهدهنده جستجوی پیشفرض که <ph name="DEFAULT_SEARCH_PROVIDER_KEYWORD_POLICY_NAME" /> تعریف کرده است یکسان باشد: <ph name="SHORTCUT_NAME" /></translation> @@ -866,6 +868,7 @@ <translation id="2514548229949738417">خانه و باغ</translation> <translation id="2515629240566999685">بررسی سیگنال در منطقهتان</translation> <translation id="2515761554693942801">قبلاً انتخاب کردهاید در وبسایتهایی که از <ph name="PROVIDER_ORIGIN" /> استفاده میکنند درستیسنجی با Touch ID انجام شود. این ارائهدهنده ممکن است اطلاعات روش پرداختتان را ذخیره کرده باشد، که میتوانید <ph name="LINK_TEXT" />.</translation> +<translation id="2518584823165598232">این کارت دردسترس نیست. لطفاً با ارائهدهنده کارت تماس بگیرید.</translation> <translation id="2521385132275182522">منگنه در پایین سمت راست</translation> <translation id="2521736961081452453">ایجاد فرم</translation> <translation id="2523886232349826891">فقط در این دستگاه ذخیره شد</translation> @@ -3291,6 +3294,7 @@ <translation id="6925267999184670015">B+ آمریکای شمالی</translation> <translation id="6926216138694948720">هنر بدن</translation> <translation id="692638818576287323">خودروهای تجاری</translation> +<translation id="6933282894115597956">سازمانتان ورود به سیستم را الزامی کرده است</translation> <translation id="6934236486840930310"><ph name="BEGIN_BOLD" />موتور جستجوی پیشفرض به شما امکان میدهد در وب جستجو کنید و ویژگیهای Chrome را تقویت میکند<ph name="END_BOLD" />، مثلاً جستجو از نوار نشانی و از تصاویر موجود در صفحههای وب. اگر موتور جستجوی شما از ویژگیای پشتیبانی نکند، شاید آن ویژگی دردسترس نباشد.</translation> <translation id="6934672428414710184">این نام از حساب Google شما گرفته شده است</translation> <translation id="6935082727755903526">مشاغل حسابداری و مالی</translation> @@ -3342,6 +3346,7 @@ <translation id="7003322000677139268">قطعات و لوازم جانبی خودرو</translation> <translation id="7004499039102548441">برگههای جدید</translation> <translation id="7006930604109697472">در هر حال فرستاده شود</translation> +<translation id="7009364359744329733">این کارت درحالحاضر دردسترس نیست. لطفاً بعداً دوباره امتحان کنید.</translation> <translation id="7010658264061801199">غذا و نوشیدنی</translation> <translation id="7012363358306927923">China UnionPay</translation> <translation id="7013835112918108252">میتواند برای قفل کردن و استفاده از موشواره درخواست دهد</translation>
diff --git a/components/strings/components_strings_fr.xtb b/components/strings/components_strings_fr.xtb index 56aa37a..00010f5 100644 --- a/components/strings/components_strings_fr.xtb +++ b/components/strings/components_strings_fr.xtb
@@ -529,7 +529,7 @@ <translation id="1919367280705858090">Obtenir de l'aide pour un message d'erreur spécifique</translation> <translation id="1919526244108283799">400 x 600 mm</translation> <translation id="192020519938775529">{COUNT,plural, =0{Aucun}=1{1 site}one{# site}other{# sites}}</translation> -<translation id="192095259937375524">Bouton "Partager cet onglet" à activer pour partager cet onglet en le castant, en créant un code QR, en partageant le lien, etc.</translation> +<translation id="192095259937375524">Bouton "Partager cet onglet" à activer pour partager cet onglet en le castant, en créant un QR code, en partageant le lien, etc.</translation> <translation id="1921479021518565778">Suggestions chargées</translation> <translation id="1924727005275031552">Nouvelle</translation> <translation id="1927439846988093361">Soins capillaires</translation> @@ -3555,7 +3555,7 @@ <translation id="739728382607845710">Icône du gestionnaire de paiement</translation> <translation id="7399616692258236448">Les demandes de localisation sont automatiquement bloquées pour tous les sites, sauf ceux que vous autorisez</translation> <translation id="7400418766976504921">URL</translation> -<translation id="7403392780200267761">Partagez cet onglet en le castant, en créant un code QR, en partageant le lien, etc.</translation> +<translation id="7403392780200267761">Partagez cet onglet en le castant, en créant un QR code, en partageant le lien, etc.</translation> <translation id="7403591733719184120">Votre <ph name="DEVICE_NAME" /> est géré</translation> <translation id="7405878640835614059"><ph name="ENROLLMENT_DOMAIN" /> a installé des applis permettant d'utiliser des fonctions supplémentaires. Ces applis ont accès à certaines de vos données.</translation> <translation id="7407424307057130981"><p>Ce message d'erreur s'affiche si le logiciel Superfish est installé sur votre ordinateur Windows.</p> @@ -4455,7 +4455,7 @@ <translation id="901834265349196618">e-mail</translation> <translation id="90196294733273307">La boîte de dialogue contenant les informations relatives à la carte de crédit s'est affichée</translation> <translation id="9020742383383852663">A8</translation> -<translation id="9021429684248523859"><ph name="SHARE_THIS_PAGE_FOCUSED_FRIENDLY_MATCH_TEXT" />, puis Tabulation, puis Entrée pour partager cet onglet en le castant, en créant un code QR, en partageant le lien, etc.</translation> +<translation id="9021429684248523859"><ph name="SHARE_THIS_PAGE_FOCUSED_FRIENDLY_MATCH_TEXT" />, puis Tabulation, puis Entrée pour partager cet onglet en le castant, en créant un QR code, en partageant le lien, etc.</translation> <translation id="9023536760430404133">Roues et pneus pour véhicules</translation> <translation id="9025348182339809926">(Non valide)</translation> <translation id="902590795160480390">Chargement du PDF…</translation>
diff --git a/components/strings/components_strings_gu.xtb b/components/strings/components_strings_gu.xtb index 28c3ffda2..42a194b 100644 --- a/components/strings/components_strings_gu.xtb +++ b/components/strings/components_strings_gu.xtb
@@ -3291,6 +3291,7 @@ <translation id="6925267999184670015">નૉર્થ અમેરિકન બી+</translation> <translation id="6926216138694948720">બૉડી આર્ટ</translation> <translation id="692638818576287323">વ્યાવસાયિક વાહનો</translation> +<translation id="6933282894115597956">તમારી સંસ્થા દ્વારા સાઇન-ઇન કરવાનું આવશ્યક બનવવામાં આવ્યું છે</translation> <translation id="6934236486840930310"><ph name="BEGIN_BOLD" />તમારા ડિફૉલ્ટ શોધ એન્જિન વડે તમે વેબ પર શોધ કરી શકો છો તેમજ તે Chromeની સુવિધાઓને સશક્ત કરે છે<ph name="END_BOLD" /> જેમ કે, ઍડ્રેસ બારમાંથી તેમજ વેેબપેજ પરની છબીઓમાંથી શોધ કરવા જેવી સુવિધાઓ. તમારું શોધ એન્જિન સપોર્ટ ન કરતું હોય તેવી સુવિધા ઉપલબ્ધ ન હોય એમ બની શકે છે.</translation> <translation id="6934672428414710184">આ નામ તમારા Google એકાઉન્ટમાંથી લીધું છે</translation> <translation id="6935082727755903526">એકાઉન્ટિંગ અને ફાઇનાન્સ ક્ષેત્રમાં નોકરીઓ</translation>
diff --git a/components/strings/components_strings_hr.xtb b/components/strings/components_strings_hr.xtb index 7163559b..833cfff5 100644 --- a/components/strings/components_strings_hr.xtb +++ b/components/strings/components_strings_hr.xtb
@@ -59,6 +59,7 @@ <translation id="1099928364755383720">automatska slika u slici</translation> <translation id="1100782917270858593">Gumb Nastavite putovanje, pritisnite Enter da biste nastavili putovanje i vidjeli relevantne aktivnosti u svojoj povijesti na Chromeu</translation> <translation id="1101672080107056897">Radnja zbog pogreške</translation> +<translation id="1101902632743388185">Vaše tablice za usporedbu</translation> <translation id="1104409666019087579">Neka su obavezna polja prazna. Ispunite ih prije spremanja.</translation> <translation id="1104860668737945357">Gumb Upravljaj zaporkama, aktivirajte ga za prikaz svojih zaporki i upravljanje njima u postavkama Chromea</translation> <translation id="1108464073729874771">A3x4</translation> @@ -460,6 +461,7 @@ <translation id="1777422078676229054">Fotografija (arhivski)</translation> <translation id="1778646502362731194">JIS B0</translation> <translation id="1785118555253503473">Instalirati web-aplikacije?</translation> +<translation id="1791415068765905273">Prikaži sve tablice za usporedbu</translation> <translation id="1791429645902722292">Google Smart Lock</translation> <translation id="1791820510173628507"><ph name="MANAGE_GOOGLE_ACCOUNT_FOCUSED_FRIENDLY_MATCH_TEXT" />, pritisnite Tab, a zatim Enter da biste upravljali podacima, privatnošću i sigurnošću na svojem Google računu</translation> <translation id="1793631236004319016">Posljednji put korišteno prije <ph name="NUM_HOURS_MINUTES_SECONDS" />.</translation> @@ -583,6 +585,7 @@ <translation id="2025186561304664664">Proxy je postavljen na automatsko konfiguriranje.</translation> <translation id="2025891858974379949">Nesiguran sadržaj</translation> <translation id="2027465737841872819">Plastika</translation> +<translation id="2027707238798802149">Kartica nije dostupna</translation> <translation id="2029735183873159415">Preci i genealogija</translation> <translation id="2032962459168915086"><ph name="BEGIN_LINK" />provjerite proxy i vatrozid<ph name="END_LINK" /></translation> <translation id="2033900728810589426">Prečac ne može biti isti kao ključna riječ zadanog davatelja usluge pretraživanja definirana pravilom <ph name="DEFAULT_SEARCH_PROVIDER_KEYWORD_POLICY_NAME" />: <ph name="SHORTCUT_NAME" /></translation> @@ -866,6 +869,7 @@ <translation id="2514548229949738417">Dom i vrt</translation> <translation id="2515629240566999685">provjerite jačinu signala na svom području</translation> <translation id="2515761554693942801">Odabrali ste potvrdu pomoću Touch ID-ja na web-lokacijama koje koriste <ph name="PROVIDER_ORIGIN" />. Taj je davatelj usluga možda pohranio podatke o vašem načinu plaćanja za koje možete <ph name="LINK_TEXT" />.</translation> +<translation id="2518584823165598232">Ova kartica nije dostupna. Obratite se davatelju kartice.</translation> <translation id="2521385132275182522">Spajanje pri dnu desno</translation> <translation id="2521736961081452453">Izradite obrazac</translation> <translation id="2523886232349826891">Sprema se samo na ovom uređaju</translation> @@ -2193,6 +2197,7 @@ <translation id="4918221908152712722">Instalirajte aplikaciju <ph name="APP_NAME" /> (preuzimanje nije potrebno)</translation> <translation id="4920457992177678649">Privatni i kratkoročni smještaj</translation> <translation id="4920710383559189047">Navlaka</translation> +<translation id="4920921410507315601">Tablice za usporedbu</translation> <translation id="4922104989726031751">Da biste upotrebljavali Upravitelj zaporki sa svojim operativnim sustavom, ponovo pokrenite Chromium i dopustite pristup upravitelju zaporki računala. Kartice će se ponovo otvoriti nakon ponovnog pokretanja.</translation> <translation id="4923459931733593730">Plaćanje</translation> <translation id="4926049483395192435">Mora biti određeno.</translation> @@ -2386,6 +2391,7 @@ <translation id="5278778426231952189">Prenesi odmah</translation> <translation id="5279286380302340275">Upravljajte preuzimanjima</translation> <translation id="5280963125494874678">web-aplikacije</translation> +<translation id="5282008206326321696">{count,plural, =0{# oznaka}=1{# oznaka}one{# oznaka}few{# oznake}other{# oznaka}}</translation> <translation id="5283044957620376778">B1</translation> <translation id="5284295735376057059">Svojstva dokumenta</translation> <translation id="528468243742722775">Završi</translation> @@ -2580,6 +2586,7 @@ <translation id="561165882404867731">Prevedite ovu stranicu pomoću Google prevoditelja</translation> <translation id="5612720917913232150"><ph name="URL" /> želi upotrijebiti lokaciju vašeg računala</translation> <translation id="5614520971155863709">Kartaške igre</translation> +<translation id="5617785978844309968">Prikaži sve tablice za usporedbu</translation> <translation id="5617949217645503996">Host <ph name="HOST_NAME" /> preusmjerio vas je previše puta.</translation> <translation id="5619721953841297650">Unaprijed definirana postavka</translation> <translation id="5624120631404540903">Upravljanje zaporkama</translation> @@ -3290,6 +3297,7 @@ <translation id="6925267999184670015">North American B+</translation> <translation id="6926216138694948720">Body art</translation> <translation id="692638818576287323">Komercijalna vozila</translation> +<translation id="6933282894115597956">Vaša organizacija zahtijeva prijavu</translation> <translation id="6934236486840930310"><ph name="BEGIN_BOLD" />Vaša zadana tražilica omogućuje vam pretraživanje weba i omogućuje Chromeove značajke<ph name="END_BOLD" /> kao što su pretraživanje iz adresne trake i slika na web-stranicama. Značajka možda neće biti dostupna ako je vaša tražilica ne podržava.</translation> <translation id="6934672428414710184">To je ime s vašeg Google računa</translation> <translation id="6935082727755903526">Računovodstveni i financijski poslovi</translation> @@ -3341,6 +3349,7 @@ <translation id="7003322000677139268">Rezervni automobilski dijelovi i oprema</translation> <translation id="7004499039102548441">Nedavne kartice</translation> <translation id="7006930604109697472">Svejedno pošalji</translation> +<translation id="7009364359744329733">Ova kartica trenutačno nije dostupna. Pokušajte ponovno kasnije.</translation> <translation id="7010658264061801199">Hrana i piće</translation> <translation id="7012363358306927923">China UnionPay</translation> <translation id="7013835112918108252">Može tražiti zaključavanje i korištenje miša</translation>
diff --git a/components/strings/components_strings_hu.xtb b/components/strings/components_strings_hu.xtb index e2f4e073..7f02ee9 100644 --- a/components/strings/components_strings_hu.xtb +++ b/components/strings/components_strings_hu.xtb
@@ -3288,6 +3288,7 @@ <translation id="6925267999184670015">„Észak-amerikai B+” méret</translation> <translation id="6926216138694948720">Testművészet</translation> <translation id="692638818576287323">Haszonjárművek</translation> +<translation id="6933282894115597956">Szervezete megköveteli a bejelentkezést</translation> <translation id="6934236486840930310"><ph name="BEGIN_BOLD" />Az alapértelmezett keresőmotor lehetővé teszi az internetes keresést, és biztosítja a Chrome-funkciókat<ph name="END_BOLD" />, például a címsávból és a weboldalakon található képek alapján történő keresést. Előfordulhat, hogy egy funkció nem áll rendelkezésre, ha a keresőmotor nem támogatja.</translation> <translation id="6934672428414710184">Ez a név a Google-fiókjából származik</translation> <translation id="6935082727755903526">Könyvviteli és pénzügyi állások</translation>
diff --git a/components/strings/components_strings_hy.xtb b/components/strings/components_strings_hy.xtb index 7ae1471..4623a00 100644 --- a/components/strings/components_strings_hy.xtb +++ b/components/strings/components_strings_hy.xtb
@@ -63,6 +63,7 @@ <translation id="1099928364755383720">«նկար նկարի մեջ» պատուհանի ավտոմատ ցուցադրում</translation> <translation id="1100782917270858593">«Շարունակել որոնումը» կոճակ։ Chrome-ի պատմության մեջ նման հարցումները դիտելու համար սեղմեք Enter։</translation> <translation id="1101672080107056897">Գործողություն սխալի դեպքում</translation> +<translation id="1101902632743388185">Համեմատման ձեր աղյուսակները</translation> <translation id="1104409666019087579">Չլրացված պարտադիր դաշտեր կան։ Պահելուց առաջ լրացրեք դրանք։</translation> <translation id="1104860668737945357">«Կառավարել գաղտնաբառերը» կոճակ․ ակտիվացրեք՝ Chrome-ի կարգավորումներում գաղտնաբառերը դիտելու և կառավարելու համար</translation> <translation id="1108464073729874771">A3x4</translation> @@ -587,6 +588,7 @@ <translation id="2025186561304664664">Պրոքսին ինքնակարգավորվում է:</translation> <translation id="2025891858974379949">Վտանգավոր բովանդակություն</translation> <translation id="2027465737841872819">Պլաստիկ</translation> +<translation id="2027707238798802149">Քարտն անհասանելի է</translation> <translation id="2029735183873159415">Տոհմածառ և ծագումնաբանություն</translation> <translation id="2032962459168915086"><ph name="BEGIN_LINK" />Ստուգել պրոքսի-սերվերի և հրապատի կազմաձևումը<ph name="END_LINK" /></translation> <translation id="2033900728810589426">Դյուրանցումը չի կարող լինել նույնը, ինչ կանխադրված որոնման մատակարարի հիմնաբառը՝ սահմանված <ph name="DEFAULT_SEARCH_PROVIDER_KEYWORD_POLICY_NAME" />-ի կողմից՝ <ph name="SHORTCUT_NAME" /></translation> @@ -870,6 +872,7 @@ <translation id="2514548229949738417">Տուն և պարտեզ</translation> <translation id="2515629240566999685">Ստուգել ազդանշանը ձեր տարածքում</translation> <translation id="2515761554693942801">Դուք ընտրել եք, որ կայքերում, որոնք օգտագործում են <ph name="PROVIDER_ORIGIN" /> աղբյուրը, հաստատումը կատարվի Touch ID-ի միջոցով։ Հնարավոր է՝ այս մատակարարը տեղեկություններ է պահել ձեր վճարման եղանակի մասին։ Դուք կարող եք այդ տեղեկությունների <ph name="LINK_TEXT" />։</translation> +<translation id="2518584823165598232">Այս քարտն անհասանելի է։ Դիմեք ձեր քարտի մատակարարին։</translation> <translation id="2521385132275182522">Ամրակ ներքևի աջ կողմում</translation> <translation id="2521736961081452453">Ստեղծել ձև</translation> <translation id="2523886232349826891">Կպահվի միայն այս սարքում</translation> @@ -3351,6 +3354,7 @@ <translation id="7003322000677139268">Մեքենաների պահեստամասեր և աքսեսուարներ</translation> <translation id="7004499039102548441">Վերջին բացած ներդիրները</translation> <translation id="7006930604109697472">Ուղարկել</translation> +<translation id="7009364359744329733">Այս քարտն այս պահին հասանելի չէ։ Փորձեք ավելի ուշ։</translation> <translation id="7010658264061801199">Սնունդ և խմիչք</translation> <translation id="7012363358306927923">China UnionPay</translation> <translation id="7013835112918108252">Կարող է խնդրել ձեր մկնիկը կողպելու և օգտագործելու թույլտվություն</translation>
diff --git a/components/strings/components_strings_is.xtb b/components/strings/components_strings_is.xtb index 5eec455..a1e2523 100644 --- a/components/strings/components_strings_is.xtb +++ b/components/strings/components_strings_is.xtb
@@ -59,6 +59,7 @@ <translation id="1099928364755383720">sjálfvirk mynd í mynd</translation> <translation id="1100782917270858593">Hnappur til að halda ferðinni áfram, ýttu á Enter til að halda ferðinni áfram og sjá viðkomandi virkni í Chrome ferlinum</translation> <translation id="1101672080107056897">Villuaðgerð</translation> +<translation id="1101902632743388185">Samanburðartöflurnar þínar</translation> <translation id="1104409666019087579">Einhverjir áskildir reitir eru auðir. Fylltu út í þá áður en þú vistar.</translation> <translation id="1104860668737945357">Hnappurinn „Stjórna aðgangsorðum“, virkjaðu til að skoða og stjórna aðgangsorðunum þínum í stillingum Chrome</translation> <translation id="1108464073729874771">A3x4</translation> @@ -583,6 +584,7 @@ <translation id="2025186561304664664">Proxy-þjónninn er stilltur á sjálfvirka stillingu.</translation> <translation id="2025891858974379949">Óöruggt efni</translation> <translation id="2027465737841872819">Plast</translation> +<translation id="2027707238798802149">Kort ekki tiltækt</translation> <translation id="2029735183873159415">Ætterni og ættfræði</translation> <translation id="2032962459168915086"><ph name="BEGIN_LINK" />Athuga staðgengilsþjóninn og eldvegginn<ph name="END_LINK" /></translation> <translation id="2033900728810589426">Flýtileiðin má ekki vera sú sama og sjálfgefið leitarorð leitarþjónustu sem skilgreint er af <ph name="DEFAULT_SEARCH_PROVIDER_KEYWORD_POLICY_NAME" />: <ph name="SHORTCUT_NAME" /></translation> @@ -866,6 +868,7 @@ <translation id="2514548229949738417">Heimili og garður</translation> <translation id="2515629240566999685">Athuga merkið á þínu svæði</translation> <translation id="2515761554693942801">Þú valdir að staðfesta með Touch ID á vefsvæðum sem nota <ph name="PROVIDER_ORIGIN" />. Þessi þjónustuaðili kann að hafa vistað upplýsingar um greiðslumátann þinn, sem þú getur <ph name="LINK_TEXT" />.</translation> +<translation id="2518584823165598232">Þetta kort er ekki tiltækt. Hafðu samband við kortaútgefandann.</translation> <translation id="2521385132275182522">Hefti neðst til hægri</translation> <translation id="2521736961081452453">Búa til eyðublað</translation> <translation id="2523886232349826891">Aðeins vistað í þessu tæki</translation> @@ -3342,6 +3345,7 @@ <translation id="7003322000677139268">Varahlutir og aukabúnaður fyrir bíla</translation> <translation id="7004499039102548441">Nýlegir flipar</translation> <translation id="7006930604109697472">Senda samt</translation> +<translation id="7009364359744329733">Þetta kort er ekki tiltækt sem stendur. Reyndu aftur síðar.</translation> <translation id="7010658264061801199">Matur og drykkur</translation> <translation id="7012363358306927923">China UnionPay</translation> <translation id="7013835112918108252">Getur beðið um að læsa og nota músina</translation>
diff --git a/components/strings/components_strings_it.xtb b/components/strings/components_strings_it.xtb index 31653f6..42392cc 100644 --- a/components/strings/components_strings_it.xtb +++ b/components/strings/components_strings_it.xtb
@@ -59,6 +59,7 @@ <translation id="1099928364755383720">modalità Picture in picture automatica</translation> <translation id="1100782917270858593">Pulsante Riprendi il percorso, premi Invio per riprendere il percorso e visualizzare le attività pertinenti nella tua cronologia di Chrome.</translation> <translation id="1101672080107056897">Azione errore</translation> +<translation id="1101902632743388185">Le tue tabelle di confronto</translation> <translation id="1104409666019087579">Ci sono alcuni campi obbligatori vuoti. Compilali prima di salvare.</translation> <translation id="1104860668737945357">Pulsante Gestisci password, attiva per visualizzare e gestire le tue password nelle impostazioni di Chrome</translation> <translation id="1108464073729874771">A3x4</translation> @@ -460,6 +461,7 @@ <translation id="1777422078676229054">Foto (archivio)</translation> <translation id="1778646502362731194">JIS B0</translation> <translation id="1785118555253503473">Vuoi installare le app web?</translation> +<translation id="1791415068765905273">Mostra tutte le tabelle di confronto</translation> <translation id="1791429645902722292">Google Smart Lock</translation> <translation id="1791820510173628507"><ph name="MANAGE_GOOGLE_ACCOUNT_FOCUSED_FRIENDLY_MATCH_TEXT" />, premi Tab e poi Invio per gestire le tue informazioni, la privacy e la sicurezza nel tuo Account Google</translation> <translation id="1793631236004319016">Ultimo utilizzo: <ph name="NUM_HOURS_MINUTES_SECONDS" /> fa</translation> @@ -583,6 +585,7 @@ <translation id="2025186561304664664">È stata impostata la configurazione automatica del proxy.</translation> <translation id="2025891858974379949">Contenuti non sicuri</translation> <translation id="2027465737841872819">Plastica</translation> +<translation id="2027707238798802149">Carta non disponibile</translation> <translation id="2029735183873159415">Antenati e genealogia</translation> <translation id="2032962459168915086"><ph name="BEGIN_LINK" />Controllare il proxy e firewall<ph name="END_LINK" /></translation> <translation id="2033900728810589426">La scorciatoia non può essere uguale alla parola chiave del provider di ricerca predefinito definita da <ph name="DEFAULT_SEARCH_PROVIDER_KEYWORD_POLICY_NAME" />: <ph name="SHORTCUT_NAME" /></translation> @@ -866,6 +869,7 @@ <translation id="2514548229949738417">Casa e giardino</translation> <translation id="2515629240566999685">Controllare il segnale nella tua area</translation> <translation id="2515761554693942801">Hai scelto di eseguire la verifica con Touch ID sui siti web che utilizzano <ph name="PROVIDER_ORIGIN" />. Questo fornitore potrebbe aver memorizzato informazioni sul tuo metodo di pagamento, che puoi <ph name="LINK_TEXT" />.</translation> +<translation id="2518584823165598232">Questa carta non è disponibile. Contatta il fornitore della carta.</translation> <translation id="2521385132275182522">Pinzatura in basso a destra</translation> <translation id="2521736961081452453">Crea modulo</translation> <translation id="2523886232349826891">Salvataggio effettuato solo su questo dispositivo</translation> @@ -2191,6 +2195,7 @@ <translation id="4918221908152712722">Installa <ph name="APP_NAME" /> (non è richiesto alcun download)</translation> <translation id="4920457992177678649">Case vacanze e soggiorni di breve durata</translation> <translation id="4920710383559189047">Manicotto</translation> +<translation id="4920921410507315601">Tabelle di confronto</translation> <translation id="4922104989726031751">Per usare Gestore delle password con il tuo sistema operativo, riavvia Chromium e consenti l'accesso al gestore delle password del tuo computer. Le schede verranno riaperte dopo il riavvio.</translation> <translation id="4923459931733593730">Pagamento</translation> <translation id="4926049483395192435">Deve essere specificato.</translation> @@ -2384,6 +2389,7 @@ <translation id="5278778426231952189">Carica ora</translation> <translation id="5279286380302340275">Gestisci i download</translation> <translation id="5280963125494874678">applicazioni web</translation> +<translation id="5282008206326321696">{count,plural, =0{# preferiti}=1{# preferito}other{# preferiti}}</translation> <translation id="5283044957620376778">B1</translation> <translation id="5284295735376057059">Proprietà documento</translation> <translation id="528468243742722775">Fine</translation> @@ -2578,6 +2584,7 @@ <translation id="561165882404867731">Traduci la pagina con Google Traduttore</translation> <translation id="5612720917913232150"><ph name="URL" /> vuole usare la posizione del computer</translation> <translation id="5614520971155863709">Giochi di carte</translation> +<translation id="5617785978844309968">Mostra tutte le tabelle di confronto</translation> <translation id="5617949217645503996"><ph name="HOST_NAME" /> ti ha reindirizzato troppe volte.</translation> <translation id="5619721953841297650">Preset</translation> <translation id="5624120631404540903">Gestisci password</translation> @@ -3287,6 +3294,7 @@ <translation id="6925267999184670015">B+ (America del Nord)</translation> <translation id="6926216138694948720">Body art</translation> <translation id="692638818576287323">Veicoli commerciali</translation> +<translation id="6933282894115597956">L'accesso è richiesto dalla tua organizzazione</translation> <translation id="6934236486840930310"><ph name="BEGIN_BOLD" />Il motore di ricerca predefinito ti consente di eseguire ricerche sul web e supporta le funzionalità di Chrome<ph name="END_BOLD" />, come la ricerca dalla barra degli indirizzi e dalle immagini nelle pagine web. Una funzionalità potrebbe non essere disponibile se il tuo motore di ricerca non la supporta.</translation> <translation id="6934672428414710184">Questo nome proviene dal tuo Account Google</translation> <translation id="6935082727755903526">Offerte di lavoro nel settore contabile e finanziario</translation> @@ -3338,6 +3346,7 @@ <translation id="7003322000677139268">Componenti e accessori per veicoli</translation> <translation id="7004499039102548441">Schede recenti</translation> <translation id="7006930604109697472">Invia comunque</translation> +<translation id="7009364359744329733">La carta non è al momento disponibile. Riprova più tardi.</translation> <translation id="7010658264061801199">Cibi e bevande</translation> <translation id="7012363358306927923">China UnionPay</translation> <translation id="7013835112918108252">Può chiedere di bloccare e usare il mouse</translation>
diff --git a/components/strings/components_strings_ka.xtb b/components/strings/components_strings_ka.xtb index 7195492..e556999 100644 --- a/components/strings/components_strings_ka.xtb +++ b/components/strings/components_strings_ka.xtb
@@ -461,6 +461,7 @@ <translation id="1777422078676229054">ფოტო (საარქივო)</translation> <translation id="1778646502362731194">JIS B0</translation> <translation id="1785118555253503473">გსურთ ვებ-აპების ინსტალაცია?</translation> +<translation id="1791415068765905273">შედარების ყველა ცხრილის ჩვენება</translation> <translation id="1791429645902722292">Google Smart Lock</translation> <translation id="1791820510173628507"><ph name="MANAGE_GOOGLE_ACCOUNT_FOCUSED_FRIENDLY_MATCH_TEXT" />, თქვენს Google ანგარიშში თქვენი ინფორმაციის, კონფიდენციალურობისა და უსაფრთხოების სამართავად დააჭირეთ კლავიშს Tab, შემდეგ კი Enter-ს</translation> <translation id="1793631236004319016">ბოლო გამოყენებიდან გავიდა <ph name="NUM_HOURS_MINUTES_SECONDS" /></translation> @@ -2197,6 +2198,7 @@ <translation id="4918221908152712722">დააინსტალირეთ <ph name="APP_NAME" /> (ჩამოტვირთვა აუცილებელი არ არის)</translation> <translation id="4920457992177678649">დასასვენებელი საცხოვრებლები და მოკლევადიანი სტუმრობა</translation> <translation id="4920710383559189047">ჰილზი</translation> +<translation id="4920921410507315601">შედარების ცხრილები</translation> <translation id="4922104989726031751">პაროლების მმართველის თქვენს ოპერაციულ სისტემასთან გამოსაყენებლად ხელახლა გაუშვით Chromium და მიანიჭეთ მას წვდომა თქვენი კომპიუტერის პაროლების მმართველზე. ხელახლა გაშვების შემდეგ თქვენი ჩანართები თავიდან გაიხსნება.</translation> <translation id="4923459931733593730">გადახდა</translation> <translation id="4926049483395192435">საჭიროა მიუთითოთ.</translation> @@ -2390,6 +2392,7 @@ <translation id="5278778426231952189">ახლავე ატვირთვა</translation> <translation id="5279286380302340275">ჩამოტვირთვების მართვა</translation> <translation id="5280963125494874678">ვებ-აპები</translation> +<translation id="5282008206326321696">{count,plural, =0{# სანიშნე}=1{# სანიშნე}other{# სანიშნე}}</translation> <translation id="5283044957620376778">B1</translation> <translation id="5284295735376057059">დოკუმენტის მახასიათებლები</translation> <translation id="528468243742722775">დასასრული</translation> @@ -2584,6 +2587,7 @@ <translation id="561165882404867731">თარგმნეთ ეს გვერდი Google Translate-ის მეშვეობით</translation> <translation id="5612720917913232150"><ph name="URL" /> ითხოვს თქვენი კომპიუტერის მდებარეობის გამოყენების ნებართვას</translation> <translation id="5614520971155863709">ბანქოს თამაშები</translation> +<translation id="5617785978844309968">შედარების ყველა ცხრილის ჩვენება</translation> <translation id="5617949217645503996"><ph name="HOST_NAME" />-მა მეტისმეტად ბევრჯერ გადაგამისამართათ.</translation> <translation id="5619721953841297650">წინასწარ დაყენებული</translation> <translation id="5624120631404540903">პაროლების მართვა</translation>
diff --git a/components/strings/components_strings_km.xtb b/components/strings/components_strings_km.xtb index 0019bc0f..2b28bce2 100644 --- a/components/strings/components_strings_km.xtb +++ b/components/strings/components_strings_km.xtb
@@ -3298,6 +3298,7 @@ <translation id="6925267999184670015">North American B+</translation> <translation id="6926216138694948720">សិល្បៈលើដងខ្លួន</translation> <translation id="692638818576287323">យានជំនិះពាណិជ្ជកម្ម</translation> +<translation id="6933282894115597956">តម្រូវឱ្យចូលគណនីដោយស្ថាប័នរបស់អ្នក</translation> <translation id="6934236486840930310"><ph name="BEGIN_BOLD" />ម៉ាស៊ីនស្វែងរកលំនាំដើមរបស់អ្នកអាចឱ្យអ្នកស្វែងរកលើអ៊ីនធឺណិត និងបង្កើនអានុភាពមុខងារ Chrome<ph name="END_BOLD" /> ដូចជាការស្វែងរកពីរបារអាសយដ្ឋាន និងពីរូបភាពនៅលើទំព័របណ្ដាញជាដើម។ អ្នកប្រហែលមិនអាចប្រើមុខងារមួយបានទេ ប្រសិនបើម៉ាស៊ីនស្វែងរករបស់អ្នកមិនស្គាល់មុខងារនោះ។</translation> <translation id="6934672428414710184">ឈ្មោះនេះបានមកពីគណនី Google របស់អ្នក</translation> <translation id="6935082727755903526">ការងារផ្នែកគណនេយ្យ និងហិរញ្ញវត្ថុ</translation>
diff --git a/components/strings/components_strings_lo.xtb b/components/strings/components_strings_lo.xtb index fd0905d..d19965e 100644 --- a/components/strings/components_strings_lo.xtb +++ b/components/strings/components_strings_lo.xtb
@@ -461,6 +461,7 @@ <translation id="1777422078676229054">ຮູບພາບ (Archival)</translation> <translation id="1778646502362731194">JIS B0</translation> <translation id="1785118555253503473">ຕິດຕັ້ງເວັບແອັບບໍ?</translation> +<translation id="1791415068765905273">ສະແດງຕາຕະລາງປຽບທຽບທັງໝົດ</translation> <translation id="1791429645902722292">ລັອກອັດສະລິຍະ Google</translation> <translation id="1791820510173628507"><ph name="MANAGE_GOOGLE_ACCOUNT_FOCUSED_FRIENDLY_MATCH_TEXT" />, ກົດ Tab ຈາກນັ້ນກົດ Enter ເພື່ອຈັດການຂໍ້ມູນ, ຄວາມເປັນສ່ວນຕົວ ແລະ ຄວາມປອດໄພຂອງທ່ານໃນບັນຊີ Google ທ່ານ</translation> <translation id="1793631236004319016">ໃຊ້ຫຼ້າສຸດ <ph name="NUM_HOURS_MINUTES_SECONDS" /> ກ່ອນ.</translation> @@ -2197,6 +2198,7 @@ <translation id="4918221908152712722">ຕິດຕັ້ງ <ph name="APP_NAME" /> (ບໍ່ຈໍາເປັນຕ້ອງດາວໂຫຼດ)</translation> <translation id="4920457992177678649">ບ່ອນພັກໃຫ້ເຊົ່າ ແລະ ການພັກເຊົາໄລຍະສັ້ນ</translation> <translation id="4920710383559189047">ເຈ້ຍຫຸ້ມ</translation> +<translation id="4920921410507315601">ຕາຕະລາງປຽບທຽບ</translation> <translation id="4922104989726031751">ເພື່ອໃຊ້ຕົວຈັດການລະຫັດຜ່ານກັບລະບົບປະຕິບັດການຂອງທ່ານ, ໃຫ້ເລີ່ມເປີດໃຊ້ Chromium ຄືນໃໝ່ ແລະ ອະນຸຍາດໃຫ້ເຂົ້າເຖິງຕົວຈັດການລະຫັດຜ່ານຂອງຄອມພິວເຕີຂອງທ່ານ. ແຖບຂອງທ່ານຈະເປີດຄືນໃໝ່ຫຼັງຈາກທີ່ເລີ່ມເປີດໃຊ້ໃໝ່.</translation> <translation id="4923459931733593730">ການຈ່າຍເງິນ</translation> <translation id="4926049483395192435">ຕ້ອງໄດ້ຮັບການລະບຸ.</translation> @@ -2390,6 +2392,7 @@ <translation id="5278778426231952189">ອັບໂຫຼດດຽວນີ້</translation> <translation id="5279286380302340275">ຈັດການການດາວໂຫຼດ</translation> <translation id="5280963125494874678">ໂປຣແກຣມນຳໃຊ້ຜ່ານເວັບ</translation> +<translation id="5282008206326321696">{count,plural, =0{# ບຸກມາກ}=1{# ບຸກມາກ}other{# ບຸກມາກ}}</translation> <translation id="5283044957620376778">B1</translation> <translation id="5284295735376057059">ຄຸນລັກສະນະຂອງເອກະສານ</translation> <translation id="528468243742722775">ສິ້ນສຸດ</translation> @@ -2584,6 +2587,7 @@ <translation id="561165882404867731">ແປໜ້ານີ້ດ້ວຍ Google ແປພາສາ</translation> <translation id="5612720917913232150"><ph name="URL" /> ຕ້ອງການໃຊ້ສະຖານທີ່ຂອງຄອມພິວເຕີຂອງທ່ານ</translation> <translation id="5614520971155863709">ເກມໄພ້</translation> +<translation id="5617785978844309968">ສະແດງຕາຕະລາງປຽບທຽບທັງໝົດ</translation> <translation id="5617949217645503996"><ph name="HOST_NAME" /> ໄດ້ປ່ຽນເສັ້ນທາງທ່ານຫຼາຍຄັ້ງເກີນໄປ.</translation> <translation id="5619721953841297650">ພຣີເຊັດ</translation> <translation id="5624120631404540903">ຈັດການລະຫັດຜ່ານ</translation> @@ -3294,6 +3298,7 @@ <translation id="6925267999184670015">North American B+</translation> <translation id="6926216138694948720">ສິນລະປະເທິງຮ່າງກາຍ</translation> <translation id="692638818576287323">ການຂັບລົດທາງການຄ້າ</translation> +<translation id="6933282894115597956">ເຂົ້າສູ່ລະບົບແມ່ນກຳນົດໂດຍອົງກອນຂອງທ່ານ</translation> <translation id="6934236486840930310"><ph name="BEGIN_BOLD" />ໂປຣແກຣມຊອກຫາເລີ່ມຕົ້ນຂອງທ່ານຈະໃຫ້ທ່ານຊອກຫາເວັບ ແລະ ນຳໃຊ້ຄຸນສົມບັດຕ່າງໆຂອງ Chrome<ph name="END_BOLD" /> ເຊັ່ນ: ການຊອກຫາຈາກແຖບທີ່ຢູ່ ແລະ ຈາກຮູບຢູ່ໜ້າເວັບ. ຄຸນສົມບັດອາດບໍ່ພ້ອມນຳໃຊ້ຫາກໂປຣແກຣມຊອກຫາຂອງທ່ານບໍ່ຮອງຮັບມັນ.</translation> <translation id="6934672428414710184">ຊື່ນີ້ມາຈາກບັນຊີ Google ຂອງທ່ານ</translation> <translation id="6935082727755903526">ວຽກບັນຊີ ແລະ ການເງິນ</translation>
diff --git a/components/strings/components_strings_lt.xtb b/components/strings/components_strings_lt.xtb index 472d02d..7e9bed97 100644 --- a/components/strings/components_strings_lt.xtb +++ b/components/strings/components_strings_lt.xtb
@@ -59,6 +59,7 @@ <translation id="1099928364755383720">automatinis vaizdas vaizde</translation> <translation id="1100782917270858593">Mygtukas „Tęsti veiksmus“; paspauskite „Enter“, kad tęstumėte veiksmus ir galėtumėte matyti atitinkamą veiklą „Chrome“ istorijoje.</translation> <translation id="1101672080107056897">Klaidos veiksmas</translation> +<translation id="1101902632743388185">Jūsų palyginimo lentelės</translation> <translation id="1104409666019087579">Kai kurie būtini laukai tušti. Užpildykite juos prieš išsaugodami.</translation> <translation id="1104860668737945357">Mygtukas „Tvarkyti slaptažodžius“; suaktyvinkite, jei norite peržiūrėti ir tvarkyti slaptažodžius „Chrome“ nustatymuose</translation> <translation id="1108464073729874771">A3x4</translation> @@ -583,6 +584,7 @@ <translation id="2025186561304664664">Nustatytas automatinis įgaliotojo serverio konfigūravimas.</translation> <translation id="2025891858974379949">Nesaugus turinys</translation> <translation id="2027465737841872819">Plastikas</translation> +<translation id="2027707238798802149">Kortelė nepasiekiama</translation> <translation id="2029735183873159415">Protėviai ir genealogija</translation> <translation id="2032962459168915086"><ph name="BEGIN_LINK" />Patikrinti tarpinį serverį ir užkardą<ph name="END_LINK" /></translation> <translation id="2033900728810589426">Spartusis klavišas negali būti toks pat kaip numatytasis paieškos teikėjo raktinis žodis, kurį nustatė „<ph name="DEFAULT_SEARCH_PROVIDER_KEYWORD_POLICY_NAME" />“: „<ph name="SHORTCUT_NAME" />“</translation> @@ -866,6 +868,7 @@ <translation id="2514548229949738417">Namai ir sodas</translation> <translation id="2515629240566999685">Patikrinti signalo stiprumą savo srityje</translation> <translation id="2515761554693942801">Svetainėse, kuriose naudojama <ph name="PROVIDER_ORIGIN" />, pasirinkote patvirtinti naudodami „Touch ID“. Šis teikėjas galėjo išsaugoti informaciją apie jūsų mokėjimo metodą, ir galite <ph name="LINK_TEXT" />.</translation> +<translation id="2518584823165598232">Ši kortelė nepasiekiama. Susisiekite su kortelę išdavusia įstaiga.</translation> <translation id="2521385132275182522">Sankabėlė apačioje dešinėje</translation> <translation id="2521736961081452453">Sukurti formą</translation> <translation id="2523886232349826891">Išsaugota tik šiame įrenginyje</translation> @@ -3343,6 +3346,7 @@ <translation id="7003322000677139268">Transporto priemonių dalys ir priedai</translation> <translation id="7004499039102548441">Naujausi skirtukai</translation> <translation id="7006930604109697472">Vis tiek siųsti</translation> +<translation id="7009364359744329733">Šiuo metu ši kortelė nepasiekiama. Vėliau bandykite dar kartą</translation> <translation id="7010658264061801199">Maistas ir gėrimai</translation> <translation id="7012363358306927923">China UnionPay</translation> <translation id="7013835112918108252">Gali paprašyti užrakinti ir naudoti pelę</translation>
diff --git a/components/strings/components_strings_ml.xtb b/components/strings/components_strings_ml.xtb index 49d5d39d..aa3284c 100644 --- a/components/strings/components_strings_ml.xtb +++ b/components/strings/components_strings_ml.xtb
@@ -59,6 +59,7 @@ <translation id="1099928364755383720">സ്വയമേവയുള്ള ചിത്രത്തിനുള്ളിൽ ചിത്രം</translation> <translation id="1100782917270858593">'ജേർണി പുനരാരംഭിക്കുക' ബട്ടൺ, നിങ്ങളുടെ Chrome ചരിത്രത്തിൽ പ്രസക്തമായ ആക്റ്റിവിറ്റി കാണാനും ജേർണി പുനരാരംഭിക്കാനും Enter അമർത്തുക</translation> <translation id="1101672080107056897">പിശക് പ്രവർത്തനം</translation> +<translation id="1101902632743388185">നിങ്ങളുടെ താരതമ്യ പട്ടികകൾ</translation> <translation id="1104409666019087579">പൂരിപ്പിക്കേണ്ട ചില ഭാഗങ്ങളിൽ ഒന്നുമില്ല. സംരക്ഷിക്കുന്നതിന് മുമ്പ് അവ പൂരിപ്പിക്കുക.</translation> <translation id="1104860668737945357">'പാസ്വേഡുകൾ മാനേജ് ചെയ്യുക' ബട്ടൺ, Chrome ക്രമീകരണത്തിൽ നിങ്ങളുടെ പാസ്വേഡുകൾ കാണാനും മാനേജ് ചെയ്യാനും സജീവമാക്കുക</translation> <translation id="1108464073729874771">A3x4</translation> @@ -583,6 +584,7 @@ <translation id="2025186561304664664">പ്രോക്സി സ്വയമേവ കോൺഫിഗർ ചെയ്യാൻ സജ്ജമാക്കി.</translation> <translation id="2025891858974379949">സുരക്ഷിതമല്ലാത്ത ഉള്ളടക്കം</translation> <translation id="2027465737841872819">പ്ലാസ്റ്റിക്</translation> +<translation id="2027707238798802149">കാർഡ് ലഭ്യമല്ല</translation> <translation id="2029735183873159415">വംശപരമ്പരയും വംശാവലിയും</translation> <translation id="2032962459168915086"><ph name="BEGIN_LINK" />പ്രോക്സിയും ഫയർവാളും പരിശോധിക്കുന്നു<ph name="END_LINK" /></translation> <translation id="2033900728810589426">കുറുക്കുവഴിയും <ph name="DEFAULT_SEARCH_PROVIDER_KEYWORD_POLICY_NAME" /> നിർവചിച്ചിരിക്കുന്ന തിരയൽ ദാതാവിന്റെ ഡിഫോൾട്ട് കീവേഡും സമാനമാകരുത്: <ph name="SHORTCUT_NAME" /></translation> @@ -866,6 +868,7 @@ <translation id="2514548229949738417">വീടും പൂന്തോട്ടവും</translation> <translation id="2515629240566999685">നിങ്ങളുടെ ഏരിയയിലെ സിഗ്നൽ പരിശോധിക്കുന്നു</translation> <translation id="2515761554693942801"><ph name="PROVIDER_ORIGIN" /> ഉപയോഗിക്കുന്ന വെബ്സൈറ്റുകളിൽ Touch ID ഉപയോഗിച്ച് പരിശോധിച്ചുറപ്പിക്കാൻ നിങ്ങൾ തിരഞ്ഞെടുത്തു. നിങ്ങളുടെ പേയ്മെന്റ് രീതിയുമായി ബന്ധപ്പെട്ട വിവരങ്ങൾ ഈ ദാതാവ് സംഭരിച്ചിട്ടുണ്ടാകാം, നിങ്ങൾക്ക് ഇത് <ph name="LINK_TEXT" />.</translation> +<translation id="2518584823165598232">ഈ കാർഡ് ലഭ്യമല്ല. കാർഡ് ദാതാവിനെ ബന്ധപ്പെടുക.</translation> <translation id="2521385132275182522">താഴെ വലതുവശത്ത് സ്റ്റേപ്പിൾ ചെയ്യുക</translation> <translation id="2521736961081452453">ഫോം സൃഷ്ടിക്കുക</translation> <translation id="2523886232349826891">ഈ ഉപകരണത്തിൽ മാത്രം സംരക്ഷിക്കപ്പെടും</translation> @@ -3341,6 +3344,7 @@ <translation id="7003322000677139268">വാഹന ഭാഗങ്ങളും ആക്സസറികളും</translation> <translation id="7004499039102548441">സമീപകാല ടാബുകൾ</translation> <translation id="7006930604109697472">എന്തായാലും അയയ്ക്കുക</translation> +<translation id="7009364359744329733">ഈ കാർഡ് ഇപ്പോൾ ലഭ്യമല്ല, പിന്നീട് വീണ്ടും ശ്രമിക്കുക.</translation> <translation id="7010658264061801199">ഭക്ഷണപാനീയങ്ങൾ</translation> <translation id="7012363358306927923">ചൈന UnionPay</translation> <translation id="7013835112918108252">ലോക്ക് ചെയ്യാനും മൗസ് ഉപയോഗിക്കാനും ആവശ്യപ്പെടാം</translation>
diff --git a/components/strings/components_strings_mr.xtb b/components/strings/components_strings_mr.xtb index 267b76b..797f37e 100644 --- a/components/strings/components_strings_mr.xtb +++ b/components/strings/components_strings_mr.xtb
@@ -59,6 +59,7 @@ <translation id="1099928364755383720">ऑटोमॅटिक चित्रात-चित्र</translation> <translation id="1100782917270858593">तुमचा प्रवास पुन्हा सुरू करा बटण, तुमचा प्रवास पुन्हा सुरू करण्यासाठी आणि Chrome इतिहासामध्ये संबंधित अॅक्टिव्हिटी पाहण्यासाठी एंटर प्रेस करा</translation> <translation id="1101672080107056897">कृतीमध्ये एरर</translation> +<translation id="1101902632743388185">तुमच्या तुलना सारण्या</translation> <translation id="1104409666019087579">भरणे आवश्यक असलेली फील्ड रिकामी आहेत. सेव्ह करण्याआधी ती भरा.</translation> <translation id="1104860668737945357">पासवर्ड व्यवस्थापित करा बटण, Chrome सेटिंग्जमध्ये तुमचे पासवर्ड पाहण्यासाठी आणि व्यवस्थापित करण्यासाठी अॅक्टिव्हेट करा</translation> <translation id="1108464073729874771">A3x4</translation> @@ -583,6 +584,7 @@ <translation id="2025186561304664664">प्रॉक्सी स्वयंचलित कॉन्फिगरेशनवर सेट करण्यात आली.</translation> <translation id="2025891858974379949">असुरक्षित आशय</translation> <translation id="2027465737841872819">प्लॅस्टिक</translation> +<translation id="2027707238798802149">कार्ड उपलब्ध नाही</translation> <translation id="2029735183873159415">पूर्वज आणि वंशावळ</translation> <translation id="2032962459168915086"><ph name="BEGIN_LINK" />प्रॉक्सी आणि फायरवॉल तपासणे<ph name="END_LINK" /></translation> <translation id="2033900728810589426">शॉर्टकट हा <ph name="DEFAULT_SEARCH_PROVIDER_KEYWORD_POLICY_NAME" /> द्वारे परिभाषित केलेल्या शोध पुरवठादाराच्या डीफॉल्ट कीवर्डसारखा असू शकत नाही: <ph name="SHORTCUT_NAME" /></translation> @@ -866,6 +868,7 @@ <translation id="2514548229949738417">घर आणि बाग</translation> <translation id="2515629240566999685">आपल्या क्षेत्रातील सिग्नल तपासणे</translation> <translation id="2515761554693942801">तुम्ही <ph name="PROVIDER_ORIGIN" /> वापरणाऱ्या वेबसाइटवर टच आयडी वापरून पडताळणी करण्याचे निवडले आहे. या पुरवठादाराने तुमच्या पेमेंट पद्धतीविषयी माहिती स्टोअर केलेली असू शकते, जी तुम्ही <ph name="LINK_TEXT" /> करू शकता.</translation> +<translation id="2518584823165598232">हे कार्ड उपलब्ध नाही. कृपया तुमच्या कार्ड पुरवठादाराशी संपर्क साधा.</translation> <translation id="2521385132275182522">स्टेपल बॉटम राइट</translation> <translation id="2521736961081452453">फॉर्म तयार करा</translation> <translation id="2523886232349826891">फक्त या डिव्हाइसवर सेव्ह केले जाईल</translation> @@ -3342,6 +3345,7 @@ <translation id="7003322000677139268">वाहनाचे भाग आणि ॲक्सेसरी</translation> <translation id="7004499039102548441">अलीकडील टॅब</translation> <translation id="7006930604109697472">तरीही पाठवा</translation> +<translation id="7009364359744329733">हे कार्ड सध्या उपलब्ध नाही. कृपया नंतर पुन्हा प्रयत्न करा.</translation> <translation id="7010658264061801199">खाद्यपदार्थ आणि पेय</translation> <translation id="7012363358306927923">China UnionPay</translation> <translation id="7013835112918108252">लॉक करण्यासाठी आणि तुमचा माउस वापरण्यासाठी विचारू शकते</translation>
diff --git a/components/strings/components_strings_ms.xtb b/components/strings/components_strings_ms.xtb index 0fdf633..b9e5e45 100644 --- a/components/strings/components_strings_ms.xtb +++ b/components/strings/components_strings_ms.xtb
@@ -461,6 +461,7 @@ <translation id="1777422078676229054">Foto (Arkib)</translation> <translation id="1778646502362731194">JIS B0</translation> <translation id="1785118555253503473">Pasang apl web?</translation> +<translation id="1791415068765905273">Paparkan Semua Jadual Perbandingan</translation> <translation id="1791429645902722292">Google Smart Lock</translation> <translation id="1791820510173628507"><ph name="MANAGE_GOOGLE_ACCOUNT_FOCUSED_FRIENDLY_MATCH_TEXT" />, tekan kekunci Tab kemudian Enter untuk mengurus maklumat, privasi dan keselamatan anda dalam Google Account anda</translation> <translation id="1793631236004319016">Terakhir digunakan <ph name="NUM_HOURS_MINUTES_SECONDS" /> yang lalu</translation> @@ -2198,6 +2199,7 @@ <translation id="4918221908152712722">Pasang <ph name="APP_NAME" /> (tidak perlu dimuat turun)</translation> <translation id="4920457992177678649">Sewaan Percutian & Penginapan Jangka Pendek</translation> <translation id="4920710383559189047">Sarung</translation> +<translation id="4920921410507315601">Jadual Perbandingan</translation> <translation id="4922104989726031751">Untuk menggunakan Password Manager dengan sistem pengendalian anda, lancarkan semula Chromium dan benarkan akses kepada pengurus kata laluan komputer anda. Tab anda akan dibuka semula selepas pelancaran semula.</translation> <translation id="4923459931733593730">Pembayaran</translation> <translation id="4926049483395192435">Mesti ditentukan.</translation> @@ -2391,6 +2393,7 @@ <translation id="5278778426231952189">Muat naik sekarang</translation> <translation id="5279286380302340275">Urus muat turun</translation> <translation id="5280963125494874678">aplikasi web</translation> +<translation id="5282008206326321696">{count,plural, =0{# penanda halaman}=1{# penanda halaman}other{# penanda halaman}}</translation> <translation id="5283044957620376778">B1</translation> <translation id="5284295735376057059">Sifat dokumen</translation> <translation id="528468243742722775">End</translation> @@ -2585,6 +2588,7 @@ <translation id="561165882404867731">Terjemahkan halaman ini dengan Google Translate</translation> <translation id="5612720917913232150"><ph name="URL" /> mahu menggunakan lokasi komputer anda</translation> <translation id="5614520971155863709">Permainan Kad</translation> +<translation id="5617785978844309968">Paparkan semua jadual perbandingan</translation> <translation id="5617949217645503996"><ph name="HOST_NAME" /> telah terlalu kerap mengubah hala anda.</translation> <translation id="5619721953841297650">Pratetapan</translation> <translation id="5624120631404540903">Urus kata laluan</translation> @@ -3295,6 +3299,7 @@ <translation id="6925267999184670015">Amerika Utara B+</translation> <translation id="6926216138694948720">Seni Badan</translation> <translation id="692638818576287323">Kenderaan Komersil</translation> +<translation id="6933282894115597956">Log masuk diperlukan oleh organisasi anda</translation> <translation id="6934236486840930310"><ph name="BEGIN_BOLD" />Enjin carian lalai anda membolehkan anda membuat carian pada web dan menguasakan ciri Chrome<ph name="END_BOLD" /> seperti membuat carian daripada bar alamat dan imej pada halaman web. Ciri mungkin tidak tersedia jika enjin carian anda tidak menyokong ciri tersebut.</translation> <translation id="6934672428414710184">Nama ini daripada Google Account anda</translation> <translation id="6935082727755903526">Pekerjaan Perakaunan & Kewangan</translation>
diff --git a/components/strings/components_strings_my.xtb b/components/strings/components_strings_my.xtb index c1a15a51..3c5fa9a 100644 --- a/components/strings/components_strings_my.xtb +++ b/components/strings/components_strings_my.xtb
@@ -59,6 +59,7 @@ <translation id="1099928364755383720">အလိုအလျောက် နှစ်ခုထပ်၍ကြည့်ခြင်း</translation> <translation id="1100782917270858593">သင်၏ခရီးစဉ်ကို ဆက်လုပ်ရန် ခလုတ်၊ သင့်ခရီးစဉ်ကို ဆက်လုပ်ရန်နှင့် သင်၏ Chrome မှတ်တမ်းရှိ သက်ဆိုင်ရာလုပ်ဆောင်ချက်ကို ကြည့်ရန် Enter နှိပ်ပါ</translation> <translation id="1101672080107056897">အမှား လုပ်ဆောင်ချက်</translation> +<translation id="1101902632743388185">သင့်နှိုင်းယှဉ်ဇယား</translation> <translation id="1104409666019087579">လိုအပ်သောအကွက်အချို့ အလွတ်ဖြစ်နေသည်။ မသိမ်းမီ ၎င်းတို့အားလုံးကို ဖြည့်ပါ။</translation> <translation id="1104860668737945357">Chrome ဆက်တင်များတွင် သင့်စကားဝှက်များ ကြည့်ရန်နှင့် စီမံရန်အတွက် ‘စကားဝှက်များ စီမံရန်’ ခလုတ်ကို နှိပ်နိုင်သည်</translation> <translation id="1108464073729874771">A3x4</translation> @@ -584,6 +585,7 @@ <translation id="2025186561304664664">ပရောက်စီအား အလိုအလျောက် ပြုပြင်ခြင်း သတ်မှတ်ထားသည်။</translation> <translation id="2025891858974379949">လုံခြုံမှုမရှိသည့် အကြောင်းအရာ</translation> <translation id="2027465737841872819">ပလတ်စတစ်</translation> +<translation id="2027707238798802149">ကတ်ကို မရနိုင်ပါ</translation> <translation id="2029735183873159415">မျိုးရိုး၊ ဗီဇပညာ</translation> <translation id="2032962459168915086"><ph name="BEGIN_LINK" />ပရော်စီနှင့် firewall ကိုစစ်ဆေးနေသည်<ph name="END_LINK" /></translation> <translation id="2033900728810589426">ဖြတ်လမ်းလင့်ခ်သည် <ph name="DEFAULT_SEARCH_PROVIDER_KEYWORD_POLICY_NAME" /> က သတ်မှတ်ထားသော မူရင်းရှာဖွေမှုပံ့ပိုးသူ အဓိကစကားလုံးနှင့် တူညီ၍မရပါ- <ph name="SHORTCUT_NAME" /></translation> @@ -867,6 +869,7 @@ <translation id="2514548229949738417">အိမ်နှင့် ဥယျာဉ်</translation> <translation id="2515629240566999685">သင့်နေရာဒေသရှိ လှိုင်းဆွဲအားကို စစ်ဆေးနေသည်</translation> <translation id="2515761554693942801"><ph name="PROVIDER_ORIGIN" /> သုံးသည့် ဝဘ်ဆိုက်များတွင် Touch ID ဖြင့် အတည်ပြုရန် သင်ရွေးထားသည်။ သင့်ငွေပေးချေနည်းလမ်း အချက်အလက်တွေကို ဤပံ့ပိုးသူက သိမ်းထားနိုင်ပြီး ၎င်းတို့ကို <ph name="LINK_TEXT" />နိုင်ပါသည်။</translation> +<translation id="2518584823165598232">ဤကတ်ကို မရနိုင်ပါ။ သင့်ကတ် ဝန်ဆောင်မှုပေးသူကို ဆက်သွယ်ပါ။</translation> <translation id="2521385132275182522">ညာဘက်အောက်ခြေတွင် ချုပ်စက်ဖြင့် ချုပ်ရန်</translation> <translation id="2521736961081452453">ဖောင်ပြုလုပ်ရန်</translation> <translation id="2523886232349826891">ဤစက်တွင်သာ သိမ်းထားသည်</translation> @@ -3342,6 +3345,7 @@ <translation id="7003322000677139268">ယာဉ်အစိတ်အပိုင်း၊ အပိုပစ္စည်း</translation> <translation id="7004499039102548441">မကြာမီက တဲဘ်များ</translation> <translation id="7006930604109697472">မည်သို့ပင်ဖြစ်စေ ပို့ရန်</translation> +<translation id="7009364359744329733">ဤကတ်ကို ယခုမရနိုင်ပါ။ နောက်မှ ထပ်စမ်းကြည့်ပါ။</translation> <translation id="7010658264061801199">အစားအသောက်</translation> <translation id="7012363358306927923">တရုတ် UnionPay</translation> <translation id="7013835112918108252">လော့ခ်ချရန်နှင့် မောက်စ်ကိုသုံးရန် တောင်းဆိုနိုင်သည်</translation>
diff --git a/components/strings/components_strings_no.xtb b/components/strings/components_strings_no.xtb index b859ab1..35aa1a6e 100644 --- a/components/strings/components_strings_no.xtb +++ b/components/strings/components_strings_no.xtb
@@ -59,6 +59,7 @@ <translation id="1099928364755383720">automatisk bilde-i-bilde</translation> <translation id="1100782917270858593">«Fortsett reisen»-knappen – trykk på Enter for å fortsette reisen og se relevant aktivitet i Chrome-loggen</translation> <translation id="1101672080107056897">Feilhandling</translation> +<translation id="1101902632743388185">Sammenligningstabellene dine</translation> <translation id="1104409666019087579">Enkelte obligatoriske felt er tomme. Fyll dem før du lagrer.</translation> <translation id="1104860668737945357">Knappen «Administrer passord» – aktiver for å se og administrere passord i Chrome-innstillingene</translation> <translation id="1108464073729874771">A3x4</translation> @@ -583,6 +584,7 @@ <translation id="2025186561304664664">Mellomtjeneren er innstilt på automatisk konfigurasjon.</translation> <translation id="2025891858974379949">Usikkert innhold</translation> <translation id="2027465737841872819">Plast</translation> +<translation id="2027707238798802149">Kortet er ikke tilgjengelig</translation> <translation id="2029735183873159415">Opphav og slektsforskning</translation> <translation id="2032962459168915086"><ph name="BEGIN_LINK" />Sjekk proxy-tjeneren og brannmuren<ph name="END_LINK" /></translation> <translation id="2033900728810589426">Snarveien kan ikke være lik søkeordet for standardsøkeleverandøren som er definert av <ph name="DEFAULT_SEARCH_PROVIDER_KEYWORD_POLICY_NAME" />: <ph name="SHORTCUT_NAME" /></translation> @@ -866,6 +868,7 @@ <translation id="2514548229949738417">Hus og hage</translation> <translation id="2515629240566999685">Sjekk signalet i området ditt</translation> <translation id="2515761554693942801">Du har valgt å bekrefte med Touch ID på nettsteder som bruker <ph name="PROVIDER_ORIGIN" />. Denne leverandøren kan ha lagret informasjon om betalingsmåten din, som du kan <ph name="LINK_TEXT" />.</translation> +<translation id="2518584823165598232">Dette kortet er ikke tilgjengelig. Kontakt kortutstederen.</translation> <translation id="2521385132275182522">Stift nede til høyre</translation> <translation id="2521736961081452453">Opprett skjema</translation> <translation id="2523886232349826891">Kun lagret på denne enheten</translation> @@ -3342,6 +3345,7 @@ <translation id="7003322000677139268">Bildeler og tilbehør</translation> <translation id="7004499039102548441">Nylige faner</translation> <translation id="7006930604109697472">Send likevel</translation> +<translation id="7009364359744329733">Dette kortet er ikke tilgjengelig akkurat nå. Prøv igjen senere.</translation> <translation id="7010658264061801199">Mat og drikke</translation> <translation id="7012363358306927923">China UnionPay</translation> <translation id="7013835112918108252">Kan be om å få låse og bruke musen</translation>
diff --git a/components/strings/components_strings_pt-PT.xtb b/components/strings/components_strings_pt-PT.xtb index b53e692..b514004 100644 --- a/components/strings/components_strings_pt-PT.xtb +++ b/components/strings/components_strings_pt-PT.xtb
@@ -461,6 +461,7 @@ <translation id="1777422078676229054">Foto (de arquivo)</translation> <translation id="1778646502362731194">JIS B0</translation> <translation id="1785118555253503473">Instalar apps Web?</translation> +<translation id="1791415068765905273">Mostrar todas as tabelas de comparação</translation> <translation id="1791429645902722292">Google Smart Lock</translation> <translation id="1791820510173628507"><ph name="MANAGE_GOOGLE_ACCOUNT_FOCUSED_FRIENDLY_MATCH_TEXT" />, prima Tab e, em seguida, Enter para gerir as suas informações, privacidade e segurança na Conta Google</translation> <translation id="1793631236004319016">Última utilização há <ph name="NUM_HOURS_MINUTES_SECONDS" /></translation> @@ -2197,6 +2198,7 @@ <translation id="4918221908152712722">Instale a aplicação <ph name="APP_NAME" /> (não é necessária qualquer transferência).</translation> <translation id="4920457992177678649">Alugueres de férias e estadias de curto prazo</translation> <translation id="4920710383559189047">Manga</translation> +<translation id="4920921410507315601">Tabelas de comparação</translation> <translation id="4922104989726031751">Para usar o Gestor de Palavras-passe com o seu sistema operativo, reinicie o Chromium e permita o acesso ao gestor de palavras-passe do computador. Os separadores reabrem depois de serem reiniciados.</translation> <translation id="4923459931733593730">Pagamento</translation> <translation id="4926049483395192435">Tem de ser especificado.</translation> @@ -2390,6 +2392,7 @@ <translation id="5278778426231952189">Carregar agora</translation> <translation id="5279286380302340275">Gerir transferências</translation> <translation id="5280963125494874678">apps Web</translation> +<translation id="5282008206326321696">{count,plural, =0{# marcadores}=1{# marcador}other{# marcadores}}</translation> <translation id="5283044957620376778">B1</translation> <translation id="5284295735376057059">Propriedades do documento</translation> <translation id="528468243742722775">Sair</translation> @@ -2584,6 +2587,7 @@ <translation id="561165882404867731">Traduza esta página com o Google Tradutor</translation> <translation id="5612720917913232150"><ph name="URL" /> quer utilizar a localização do seu computador.</translation> <translation id="5614520971155863709">Jogos de cartas</translation> +<translation id="5617785978844309968">Mostrar todas as tabelas de comparação</translation> <translation id="5617949217645503996"><ph name="HOST_NAME" /> redirecionou-o demasiadas vezes.</translation> <translation id="5619721953841297650">Predefinição</translation> <translation id="5624120631404540903">Gerir palavras-passe</translation>
diff --git a/components/strings/components_strings_sk.xtb b/components/strings/components_strings_sk.xtb index 28e317a16..e094f06 100644 --- a/components/strings/components_strings_sk.xtb +++ b/components/strings/components_strings_sk.xtb
@@ -59,6 +59,7 @@ <translation id="1099928364755383720">automatický obraz v obraze</translation> <translation id="1100782917270858593">Tlačidlo na pokračovanie v ceste, stlačením klávesa Enter pokračujte v ceste a zobrazte si relevantnú aktivitu v histórii Chromu</translation> <translation id="1101672080107056897">Chybová akcia</translation> +<translation id="1101902632743388185">Vaše porovnávacie tabuľky</translation> <translation id="1104409666019087579">Niektoré povinné polia sú prázdne. Pred uložením ich vyplňte.</translation> <translation id="1104860668737945357">Tlačidlo Spravovať heslá, ktorého aktivovaním môžete zobraziť a spravovať heslá v nastaveniach Chromu</translation> <translation id="1108464073729874771">A3×4</translation> @@ -583,6 +584,7 @@ <translation id="2025186561304664664">Proxy je nastavené na automatickú konfiguráciu.</translation> <translation id="2025891858974379949">Nezabezpečený obsah</translation> <translation id="2027465737841872819">Plast</translation> +<translation id="2027707238798802149">Karta nie je k dispozícii</translation> <translation id="2029735183873159415">Pôvod a genealógia</translation> <translation id="2032962459168915086"><ph name="BEGIN_LINK" />Skontrolovať proxy server a bránu firewall<ph name="END_LINK" /></translation> <translation id="2033900728810589426">Skratka nemôže byť rovnaká ako predvolené kľúčové slovo poskytovateľa vyhľadávania definované v dokumente <ph name="DEFAULT_SEARCH_PROVIDER_KEYWORD_POLICY_NAME" />: <ph name="SHORTCUT_NAME" /></translation> @@ -866,6 +868,7 @@ <translation id="2514548229949738417">Dom a záhrada</translation> <translation id="2515629240566999685">Skontrolovať signál vo vašej oblasti</translation> <translation id="2515761554693942801">Na weboch využívajúcich poskytovateľa <ph name="PROVIDER_ORIGIN" /> ste vybrali overenie pomocou funkcie Touch ID. Tento poskytovateľ mohol ukladať informácie o vašom spôsobe platby, o ktorých odstránenie môžete <ph name="LINK_TEXT" />.</translation> +<translation id="2518584823165598232">Táto karta nie je k dispozícii. Kontaktujte jej poskytovateľa.</translation> <translation id="2521385132275182522">Zošiť spinkou vpravo dolu</translation> <translation id="2521736961081452453">Vytvoriť formulár</translation> <translation id="2523886232349826891">Uložené iba na tomto zariadení</translation> @@ -3286,6 +3289,7 @@ <translation id="6925267999184670015">Severoamerický formát B+</translation> <translation id="6926216138694948720">Kreslenie na telo</translation> <translation id="692638818576287323">Komerčné vozidlá</translation> +<translation id="6933282894115597956">Vaša organizácia vyžaduje prihlásenie</translation> <translation id="6934236486840930310"><ph name="BEGIN_BOLD" />Predvolený vyhľadávač vám umožňuje vyhľadávať na internete a využívať funkcie Chromu<ph name="END_BOLD" />, ako je vyhľadávanie z panela s adresou alebo z obrázkov na webových stránkach. Funkcie, ktoré vyhľadávač nepodporuje, nebudú k dispozícii.</translation> <translation id="6934672428414710184">Meno pochádza z vášho účtu Google</translation> <translation id="6935082727755903526">Práca v oblasti účtovníctva a financií</translation> @@ -3337,6 +3341,7 @@ <translation id="7003322000677139268">Autosúčiastky a príslušenstvo</translation> <translation id="7004499039102548441">Nedávne karty</translation> <translation id="7006930604109697472">Aj tak odoslať</translation> +<translation id="7009364359744329733">Táto karta nie je momentálne k dispozícii. Skúste to neskôr.</translation> <translation id="7010658264061801199">Jedlo a pitie</translation> <translation id="7012363358306927923">China UnionPay</translation> <translation id="7013835112918108252">Môže požiadať o uzamknutie a používanie myši</translation>
diff --git a/components/strings/components_strings_sl.xtb b/components/strings/components_strings_sl.xtb index 3153e8f..6b1621ca 100644 --- a/components/strings/components_strings_sl.xtb +++ b/components/strings/components_strings_sl.xtb
@@ -59,6 +59,7 @@ <translation id="1099928364755383720">samodejni način slike v sliki</translation> <translation id="1100782917270858593">Gumb za nadaljevanje poti, pritisnite Enter, če želite nadaljevati pot in si ogledati pomembno dejavnost v zgodovini uporabe Chroma.</translation> <translation id="1101672080107056897">Dejanje ob napaki</translation> +<translation id="1101902632743388185">Vaše primerjalne tabele</translation> <translation id="1104409666019087579">Nekatera obvezna polja so prazna. Pred shranjevanjem jih izpolnite.</translation> <translation id="1104860668737945357">Gumb za upravljanje gesel, aktivirajte, če si želite ogledati in upravljati gesla v Chromovih nastavitvah</translation> <translation id="1108464073729874771">A3x4</translation> @@ -583,6 +584,7 @@ <translation id="2025186561304664664">Strežnik proxy je nastavljen na samodejno konfiguriranje.</translation> <translation id="2025891858974379949">Vsebina, ki ni varna</translation> <translation id="2027465737841872819">Plastic</translation> +<translation id="2027707238798802149">Kartica ni na voljo</translation> <translation id="2029735183873159415">Predniki in rodoslovje</translation> <translation id="2032962459168915086"><ph name="BEGIN_LINK" />preveriti strežnik proxy in požarni zid<ph name="END_LINK" /></translation> <translation id="2033900728810589426">Bližnjica ne sme biti enaka ključni besedi privzetega ponudnika iskanja, ki jo določa <ph name="DEFAULT_SEARCH_PROVIDER_KEYWORD_POLICY_NAME" />: <ph name="SHORTCUT_NAME" /></translation> @@ -866,6 +868,7 @@ <translation id="2514548229949738417">Dom in vrt</translation> <translation id="2515629240566999685">preveriti signal na svojem območju</translation> <translation id="2515761554693942801">Na spletnih mestih, ki uporabljajo <ph name="PROVIDER_ORIGIN" />, ste izbrali preverjanje s funkcijo Touch ID. Ta ponudnik je morda shranil podatke o vašem plačilnem sredstvu, za katere lahko <ph name="LINK_TEXT" />.</translation> +<translation id="2518584823165598232">Ta kartica ni na voljo. Obrnite se na ponudnika kartice.</translation> <translation id="2521385132275182522">Spenjanje spodaj desno</translation> <translation id="2521736961081452453">Ustvari obrazec</translation> <translation id="2523886232349826891">Shranjena samo v tej napravi</translation> @@ -3342,6 +3345,7 @@ <translation id="7003322000677139268">Nadomestni deli in dodatna oprema za vozila</translation> <translation id="7004499039102548441">Nedavni zavihki</translation> <translation id="7006930604109697472">Vseeno pošlji</translation> +<translation id="7009364359744329733">Ta kartica trenutno ni na voljo. Poskusite znova pozneje.</translation> <translation id="7010658264061801199">Hrana in pijača</translation> <translation id="7012363358306927923">China UnionPay</translation> <translation id="7013835112918108252">Lahko zahteva zaklepanje in uporabo miške</translation>
diff --git a/components/strings/components_strings_sr-Latn.xtb b/components/strings/components_strings_sr-Latn.xtb index c0b95ea2..1aaf0b1 100644 --- a/components/strings/components_strings_sr-Latn.xtb +++ b/components/strings/components_strings_sr-Latn.xtb
@@ -461,6 +461,7 @@ <translation id="1777422078676229054">Slika (arhivska)</translation> <translation id="1778646502362731194">JIS B0</translation> <translation id="1785118555253503473">Želite da instalirate veb-aplikacije?</translation> +<translation id="1791415068765905273">Prikaži sve tabele za poređenje</translation> <translation id="1791429645902722292">Google Smart Lock</translation> <translation id="1791820510173628507"><ph name="MANAGE_GOOGLE_ACCOUNT_FOCUSED_FRIENDLY_MATCH_TEXT" />, pritisnite Tab, pa Enter da biste upravljali informacijama, privatnošću i bezbednošću na Google nalogu</translation> <translation id="1793631236004319016">Poslednji put korišćena pre <ph name="NUM_HOURS_MINUTES_SECONDS" /></translation> @@ -2197,6 +2198,7 @@ <translation id="4918221908152712722">Instalirajte aplikaciju <ph name="APP_NAME" /> (ne treba da je preuzimate)</translation> <translation id="4920457992177678649">Iznajmljivanje smeštaja za odmor i kratkotrajni boravci</translation> <translation id="4920710383559189047">Navlaka</translation> +<translation id="4920921410507315601">Tabele za poređenje</translation> <translation id="4922104989726031751">Da biste koristili Menadžer lozinki sa operativnim sistemom, ponovo pokrenite Chromium i omogućite pristup menadžeru lozinki na računaru. Kartice će se ponovo otvoriti posle ponovnog pokretanja.</translation> <translation id="4923459931733593730">Plaćanje</translation> <translation id="4926049483395192435">Mora da bude navedeno.</translation> @@ -2390,6 +2392,7 @@ <translation id="5278778426231952189">Otpremi odmah</translation> <translation id="5279286380302340275">Upravljajte preuzimanjima</translation> <translation id="5280963125494874678">veb-aplikacije</translation> +<translation id="5282008206326321696">{count,plural, =0{# obeleživača}=1{# obeleživač}one{# obeleživač}few{# obeleživača}other{# obeleživača}}</translation> <translation id="5283044957620376778">B1</translation> <translation id="5284295735376057059">Svojstva dokumenta</translation> <translation id="528468243742722775">Završi</translation> @@ -2584,6 +2587,7 @@ <translation id="561165882404867731">Prevedite ovu stranicu pomoću Google prevodioca</translation> <translation id="5612720917913232150"><ph name="URL" /> želi da koristi lokaciju računara</translation> <translation id="5614520971155863709">Kartaške igre</translation> +<translation id="5617785978844309968">Prikaži sve tabele za poređenje</translation> <translation id="5617949217645503996">Host <ph name="HOST_NAME" /> vas je preusmerio preveliki broj puta.</translation> <translation id="5619721953841297650">Zadata podešavanja</translation> <translation id="5624120631404540903">Upravljaj lozinkama</translation>
diff --git a/components/strings/components_strings_sr.xtb b/components/strings/components_strings_sr.xtb index 5b164ea5..ff208167 100644 --- a/components/strings/components_strings_sr.xtb +++ b/components/strings/components_strings_sr.xtb
@@ -461,6 +461,7 @@ <translation id="1777422078676229054">Слика (архивска)</translation> <translation id="1778646502362731194">JIS B0</translation> <translation id="1785118555253503473">Желите да инсталирате веб-апликације?</translation> +<translation id="1791415068765905273">Прикажи све табеле за поређење</translation> <translation id="1791429645902722292">Google Smart Lock</translation> <translation id="1791820510173628507"><ph name="MANAGE_GOOGLE_ACCOUNT_FOCUSED_FRIENDLY_MATCH_TEXT" />, притисните Tab, па Enter да бисте управљали информацијама, приватношћу и безбедношћу на Google налогу</translation> <translation id="1793631236004319016">Последњи пут коришћена пре <ph name="NUM_HOURS_MINUTES_SECONDS" /></translation> @@ -2197,6 +2198,7 @@ <translation id="4918221908152712722">Инсталирајте апликацију <ph name="APP_NAME" /> (не треба да је преузимате)</translation> <translation id="4920457992177678649">Изнајмљивање смештаја за одмор и краткотрајни боравци</translation> <translation id="4920710383559189047">Навлака</translation> +<translation id="4920921410507315601">Табеле за поређење</translation> <translation id="4922104989726031751">Да бисте користили Менаџер лозинки са оперативним системом, поново покрените Chromium и омогућите приступ менаџеру лозинки на рачунару. Картице ће се поново отворити после поновног покретања.</translation> <translation id="4923459931733593730">Плаћање</translation> <translation id="4926049483395192435">Мора да буде наведено.</translation> @@ -2390,6 +2392,7 @@ <translation id="5278778426231952189">Отпреми одмах</translation> <translation id="5279286380302340275">Управљајте преузимањима</translation> <translation id="5280963125494874678">веб-апликације</translation> +<translation id="5282008206326321696">{count,plural, =0{# обележивача}=1{# обележивач}one{# обележивач}few{# обележивача}other{# обележивача}}</translation> <translation id="5283044957620376778">B1</translation> <translation id="5284295735376057059">Својства документа</translation> <translation id="528468243742722775">Заврши</translation> @@ -2584,6 +2587,7 @@ <translation id="561165882404867731">Преведите ову страницу помоћу Google преводиоца</translation> <translation id="5612720917913232150"><ph name="URL" /> жели да користи локацију рачунара</translation> <translation id="5614520971155863709">Карташке игре</translation> +<translation id="5617785978844309968">Прикажи све табеле за поређење</translation> <translation id="5617949217645503996">Хост <ph name="HOST_NAME" /> вас је преусмерио превелики број пута.</translation> <translation id="5619721953841297650">Задата подешавања</translation> <translation id="5624120631404540903">Управљај лозинкама</translation>
diff --git a/components/strings/components_strings_th.xtb b/components/strings/components_strings_th.xtb index 31cd870..92ed18b 100644 --- a/components/strings/components_strings_th.xtb +++ b/components/strings/components_strings_th.xtb
@@ -59,6 +59,7 @@ <translation id="1099928364755383720">การแสดงภาพซ้อนภาพอัตโนมัติ</translation> <translation id="1100782917270858593">ปุ่มสำรวจต่อ กด Enter เพื่อสำรวจต่อและดูกิจกรรมที่เกี่ยวข้องในประวัติการเข้าชมใน Chrome</translation> <translation id="1101672080107056897">การดำเนินการผิดพลาด</translation> +<translation id="1101902632743388185">ตารางเปรียบเทียบของคุณ</translation> <translation id="1104409666019087579">ไม่มีข้อมูลในช่องที่ต้องกรอกบางช่อง โปรดป้อนข้อมูลเหล่านี้ก่อนบันทึก</translation> <translation id="1104860668737945357">ปุ่มจัดการรหัสผ่าน เปิดใช้งานเพื่อดูและจัดการรหัสผ่านในการตั้งค่า Chrome</translation> <translation id="1108464073729874771">A3x4</translation> @@ -583,6 +584,7 @@ <translation id="2025186561304664664">พร็อกซีถูกตั้งค่าให้ทำการกำหนดค่าโดยอัตโนมัติ</translation> <translation id="2025891858974379949">เนื้อหาที่ไม่ปลอดภัย</translation> <translation id="2027465737841872819">พลาสติก</translation> +<translation id="2027707238798802149">บัตรใช้งานไม่ได้</translation> <translation id="2029735183873159415">เชื้อสายและพันธุศาสตร์</translation> <translation id="2032962459168915086"><ph name="BEGIN_LINK" />ตรวจสอบพร็อกซีและไฟร์วอลล์<ph name="END_LINK" /></translation> <translation id="2033900728810589426">ทางลัดต้องไม่เหมือนกับคีย์เวิร์ดของผู้ให้บริการการค้นหาเริ่มต้นที่กำหนดโดย <ph name="DEFAULT_SEARCH_PROVIDER_KEYWORD_POLICY_NAME" />: <ph name="SHORTCUT_NAME" /></translation> @@ -866,6 +868,7 @@ <translation id="2514548229949738417">บ้านและสวน</translation> <translation id="2515629240566999685">ตรวจสอบสัญญาณในพื้นที่ของคุณ</translation> <translation id="2515761554693942801">คุณเลือกยืนยันด้วย Touch ID ในเว็บไซต์ที่ใช้ <ph name="PROVIDER_ORIGIN" /> ผู้ให้บริการนี้อาจจัดเก็บข้อมูลเกี่ยวกับวิธีการชำระเงินของคุณไว้แล้ว โดยคุณ<ph name="LINK_TEXT" />ได้</translation> +<translation id="2518584823165598232">บัตรใบนี้ใช้งานไม่ได้ โปรดติดต่อผู้ให้บริการบัตร</translation> <translation id="2521385132275182522">เย็บด้วยลวดเย็บกระดาษด้านขวาล่าง</translation> <translation id="2521736961081452453">สร้างแบบฟอร์ม</translation> <translation id="2523886232349826891">บันทึกไว้เฉพาะในอุปกรณ์นี้</translation> @@ -3341,6 +3344,7 @@ <translation id="7003322000677139268">อุปกรณ์และอะไหล่รถยนต์</translation> <translation id="7004499039102548441">แท็บล่าสุด</translation> <translation id="7006930604109697472">ส่งเลย</translation> +<translation id="7009364359744329733">บัตรใบนี้ใช้งานไม่ได้ในขณะนี้ โปรดลองอีกครั้งในภายหลัง</translation> <translation id="7010658264061801199">อาหารและเครื่องดื่ม</translation> <translation id="7012363358306927923">China UnionPay</translation> <translation id="7013835112918108252">ขอล็อกและใช้เมาส์ของคุณได้</translation>
diff --git a/components/strings/components_strings_ur.xtb b/components/strings/components_strings_ur.xtb index 450b333..592baa0 100644 --- a/components/strings/components_strings_ur.xtb +++ b/components/strings/components_strings_ur.xtb
@@ -59,6 +59,7 @@ <translation id="1099928364755383720">خودکار تصویر میں تصویر</translation> <translation id="1100782917270858593">اپنا صارف کا تجربہ بٹن دوبارہ شروع کریں، اپنا صارف کا تجربہ دوبارہ شروع کرنے اور اپنے Chrome کی سرگزشت میں متعلقہ سرگرمی دیکھنے کیلئے اینٹر دبائیں</translation> <translation id="1101672080107056897">خرابی کی کارروائی</translation> +<translation id="1101902632743388185">آپ کے موازنہ ٹیبلز</translation> <translation id="1104409666019087579">کچھ مطلوبہ فیلڈز خالی ہیں۔ محفوظ کرنے سے پہلے انہیں پُر کریں۔</translation> <translation id="1104860668737945357">پاس ورڈز کا نظم کریں بٹن، Chrome کی ترتیبات میں اپنے پاس ورڈز کو دیکھنے اور ان کا نظم کرنے کے لیے فعال کریں</translation> <translation id="1108464073729874771">A3x4</translation> @@ -583,6 +584,7 @@ <translation id="2025186561304664664">پراکسی از خود کنفیگر کردہ پر سیٹ ہے۔</translation> <translation id="2025891858974379949">غیر محفوظ مواد</translation> <translation id="2027465737841872819">پلاسٹک</translation> +<translation id="2027707238798802149">کارڈ دستیاب نہیں ہے</translation> <translation id="2029735183873159415">شجرہ نسب اورعلم الانساب</translation> <translation id="2032962459168915086"><ph name="BEGIN_LINK" />پراکسی اور فائروال چیک کیا جا رہا ہے<ph name="END_LINK" /></translation> <translation id="2033900728810589426">شارٹ کٹ ڈیفالٹ تلاش فراہم کنندہ کلیدی لفظ جیسا نہیں ہو سکتا جس کی وضاحت <ph name="DEFAULT_SEARCH_PROVIDER_KEYWORD_POLICY_NAME" /> کے ذریعے کی گئی ہے: <ph name="SHORTCUT_NAME" /></translation> @@ -866,6 +868,7 @@ <translation id="2514548229949738417">گھر اور باغبانی</translation> <translation id="2515629240566999685">آپ کے علاقہ میں سگنل چیک کیا جا رہا ہے</translation> <translation id="2515761554693942801">آپ نے <ph name="PROVIDER_ORIGIN" /> استعمال کرنے والی ویب سائٹس پر Touch ID سے تصدیق کرنے کا انتخاب کیا۔ ممکن ہے کہ اس فراہم کنندہ کے پاس آپ کی ادائیگی کے طریقہ کے بارے میں معلومات اسٹور کردہ ہے جن کو <ph name="LINK_TEXT" />آپ کر سکتے ہیں۔</translation> +<translation id="2518584823165598232">یہ کارڈ دستیاب نہیں ہے۔ براہ کرم اپنے کارڈ فراہم کنندہ سے رابطہ کریں۔</translation> <translation id="2521385132275182522">نیچے بائیں طرف سٹیپل</translation> <translation id="2521736961081452453">فارم تخلیق کریں</translation> <translation id="2523886232349826891">صرف اس آلہ پر محفوظ ہے</translation> @@ -3344,6 +3347,7 @@ <translation id="7003322000677139268">گاڑی کے پرزے اور لوازمات</translation> <translation id="7004499039102548441">حالیہ ٹیبز</translation> <translation id="7006930604109697472">بہر صورت بھیجیں</translation> +<translation id="7009364359744329733">یہ کارڈ اس وقت دستیاب نہیں ہے براہ کرم دوبارہ کوشش کریں۔</translation> <translation id="7010658264061801199">غذا اور مشروب</translation> <translation id="7012363358306927923">China UnionPay</translation> <translation id="7013835112918108252">آپ کے ماؤس کو مقفل کرنے اور استعمال کرنے کے لیے کہہ سکتی ہے</translation>
diff --git a/components/url_formatter/elide_url.cc b/components/url_formatter/elide_url.cc index de566b83..551084220 100644 --- a/components/url_formatter/elide_url.cc +++ b/components/url_formatter/elide_url.cc
@@ -47,12 +47,14 @@ std::u16string path = path_prefix; // Build path from first |num_components| elements. - for (size_t j = 0; j < num_components; ++j) + for (size_t j = 0; j < num_components; ++j) { path += path_elements[j] + gfx::kForwardSlash; + } // Add |filename|, ellipsis if necessary. - if (num_components != (path_elements.size() - 1)) + if (num_components != (path_elements.size() - 1)) { path += std::u16string(gfx::kEllipsisUTF16) + gfx::kForwardSlash; + } path += filename; return path; @@ -91,8 +93,9 @@ // If the cutting point is at the beginning and nothing gets elided, return // failure even if the whole text could fit. TODO(crbug.com/40127834). - if (min_index == 0) + if (min_index == 0) { return std::u16string(); + } // Elide starting at |min_index|. return gfx::ElideText(elided_path_at_min_index + url_query, font_list, @@ -123,8 +126,9 @@ // strong RTL character. std::u16string HostForDisplay(std::string_view host_in_puny) { std::u16string host = url_formatter::IDNToUnicode(host_in_puny); - return base::i18n::StringContainsStrongRTLChars(host) ? - base::ASCIIToUTF16(host_in_puny) : host; + return base::i18n::StringContainsStrongRTLChars(host) + ? base::ASCIIToUTF16(host_in_puny) + : host; } } // namespace @@ -145,8 +149,9 @@ const std::u16string url_string = url_formatter::FormatUrl( url, url_formatter::kFormatUrlOmitDefaults, base::UnescapeRule::SPACES, &parsed, nullptr, nullptr); - if (available_pixel_width <= 0) + if (available_pixel_width <= 0) { return url_string; + } if (!url.IsStandard()) { return gfx::ElideText(url_string, font_list, available_pixel_width, @@ -157,8 +162,9 @@ // Fist pass - check to see whether entire url_string fits. const float pixel_width_url_string = gfx::GetStringWidthF(url_string, font_list); - if (available_pixel_width >= pixel_width_url_string) + if (available_pixel_width >= pixel_width_url_string) { return url_string; + } // Get the path substring, including query and reference. const size_t path_start_index = parsed.path.begin; @@ -207,17 +213,20 @@ const float pixel_width_url_host = gfx::GetStringWidthF(url_host, font_list); const float pixel_width_url_path = gfx::GetStringWidthF(url_path_query_etc, font_list); - if (available_pixel_width >= pixel_width_url_host + pixel_width_url_path) + if (available_pixel_width >= pixel_width_url_host + pixel_width_url_path) { return url_host + url_path_query_etc; + } // Third Pass: Subdomain, domain and entire path fits. const float pixel_width_url_domain = gfx::GetStringWidthF(url_domain, font_list); const float pixel_width_url_subdomain = gfx::GetStringWidthF(url_subdomain, font_list); - if (available_pixel_width >= - pixel_width_url_subdomain + pixel_width_url_domain + pixel_width_url_path) + if (available_pixel_width >= pixel_width_url_subdomain + + pixel_width_url_domain + + pixel_width_url_path) { return url_subdomain + url_domain + url_path_query_etc; + } // Query element. std::u16string url_query; @@ -261,8 +270,9 @@ std::u16string elided_path = ElideComponentizedPath( url_subdomain + url_domain, url_path_elements, url_filename, url_query, font_list, available_pixel_width); - if (!elided_path.empty()) + if (!elided_path.empty()) { return elided_path; + } } // Check with only domain. @@ -272,17 +282,19 @@ // which means that this case has been resolved earlier. std::u16string url_elided_domain = url_subdomain + url_domain; if (pixel_width_url_subdomain > kPixelWidthDotsTrailer) { - if (!url_subdomain.empty()) + if (!url_subdomain.empty()) { url_elided_domain = kEllipsisAndSlash[0] + url_domain; - else + } else { url_elided_domain = url_domain; + } if (url_path_number_of_elements > 0) { std::u16string elided_path = ElideComponentizedPath( url_elided_domain, url_path_elements, url_filename, url_query, font_list, available_pixel_width); - if (!elided_path.empty()) + if (!elided_path.empty()) { return elided_path; + } } } @@ -315,17 +327,20 @@ url_formatter::SplitHost(url, &url_host, &url_domain, &url_subdomain); const float pixel_width_url_host = gfx::GetStringWidthF(url_host, font_list); - if (available_pixel_width >= pixel_width_url_host) + if (available_pixel_width >= pixel_width_url_host) { return url_host; + } - if (url_subdomain.empty()) + if (url_subdomain.empty()) { return url_domain; + } const float pixel_width_url_domain = gfx::GetStringWidthF(url_domain, font_list); float subdomain_width = available_pixel_width - pixel_width_url_domain; - if (subdomain_width <= 0) + if (subdomain_width <= 0) { return std::u16string(gfx::kEllipsisUTF16) + kDot + url_domain; + } return gfx::ElideText(url_host, font_list, available_pixel_width, gfx::ELIDE_HEAD); @@ -335,8 +350,9 @@ std::u16string FormatUrlForSecurityDisplay(const GURL& url, const SchemeDisplay scheme_display) { - if (!url.is_valid() || url.is_empty() || !url.IsStandard()) + if (!url.is_valid() || url.is_empty() || !url.IsStandard()) { return url_formatter::FormatUrl(url); + } constexpr std::u16string_view colon(u":"); @@ -369,8 +385,9 @@ const int port = origin.IntPort(); const int default_port = url::DefaultPortForScheme(scheme); - if (port != url::PORT_UNSPECIFIED && port != default_port) + if (port != url::PORT_UNSPECIFIED && port != default_port) { result += base::StrCat({colon, base::UTF8ToUTF16(origin.port_piece())}); + } return result; } @@ -380,8 +397,9 @@ const SchemeDisplay scheme_display) { std::string_view scheme = origin.scheme(); std::string_view host = origin.host(); - if (scheme.empty() && host.empty()) + if (scheme.empty() && host.empty()) { return std::u16string(); + } constexpr std::u16string_view colon(u":"); @@ -394,8 +412,9 @@ int port = static_cast<int>(origin.port()); const int default_port = url::DefaultPortForScheme(scheme); - if (port != 0 && port != default_port) + if (port != 0 && port != default_port) { result += base::StrCat({colon, base::NumberToString16(origin.port())}); + } return result; } @@ -452,8 +471,9 @@ if (url_subdomain) { const size_t domain_start_index = url_host->find(*url_domain); constexpr std::u16string_view kWwwPrefix = u"www."; - if (domain_start_index != std::u16string::npos) + if (domain_start_index != std::u16string::npos) { *url_subdomain = url_host->substr(0, domain_start_index); + } if ((*url_subdomain == kWwwPrefix || url_subdomain->empty() || url.SchemeIsFile())) { url_subdomain->clear();
diff --git a/components/url_formatter/elide_url_unittest.cc b/components/url_formatter/elide_url_unittest.cc index e279fdc..4e6b31e6 100644 --- a/components/url_formatter/elide_url_unittest.cc +++ b/components/url_formatter/elide_url_unittest.cc
@@ -312,30 +312,30 @@ TEST(TextEliderTest, TestFileURLEliding) { const std::string kEllipsisStr(gfx::kEllipsis); const std::vector<ProgressiveTestcase> progressive_testcases = { - {"file:///C:/path1/path2/path3/filename", - { - /* clang-format off */ + {"file:///C:/path1/path2/path3/filename", + { + /* clang-format off */ "file:///C:/path1/path2/path3/filename", "/C:/path1/path2/path3/filename", "C:/path1/path2/path3/filename", "C:/path1/path2/" + kEllipsisStr + "/filename", - /* clang-format on */ - }}, + /* clang-format on */ + }}, // GURL parses "file:///C:path" differently on windows than it does on posix. #if BUILDFLAG(IS_WIN) - {"file:///C:path1/path2/path3/filename", - { - /* clang-format off */ + {"file:///C:path1/path2/path3/filename", + { + /* clang-format off */ "C:/path1/path2/path3/filename", "C:/path1/path2/" + kEllipsisStr + "/filename", "C:/path1/" + kEllipsisStr + "/filename", "C:/" + kEllipsisStr + "/filename", - /* clang-format on */ - }}, + /* clang-format on */ + }}, #endif // BUILDFLAG(IS_WIN) - {"file://filer/foo/bar/file", - { - /* clang-format off */ + {"file://filer/foo/bar/file", + { + /* clang-format off */ "file://filer/foo/bar/file", "filer/foo/bar/file", "filer/foo/" + kEllipsisStr + "/file", @@ -346,8 +346,8 @@ "filer/" + kEllipsisStr, "filer" + kEllipsisStr, "file" + kEllipsisStr, - /* clang-format on */ - }}, + /* clang-format on */ + }}, }; RunProgressiveElisionTest(progressive_testcases); @@ -363,20 +363,20 @@ TEST(TextEliderTest, TestHostEliding) { const std::string kEllipsisStr(gfx::kEllipsis); Testcase testcases[] = { - {"http://google.com", "google.com"}, - {"http://reallyreallyreallylongdomainname.com", - "reallyreallyreallylongdomainname.com"}, - {"http://foo", "foo"}, - {"http://foo.bar", "foo.bar"}, - {"http://subdomain.google.com", kEllipsisStr + ".google.com"}, - {"http://a.b.c.d.e.f.com", kEllipsisStr + "f.com"}, - {"http://subdomain.foo.bar", kEllipsisStr + "in.foo.bar"}, - {"http://subdomain.reallylongdomainname.com", - kEllipsisStr + "ain.reallylongdomainname.com"}, - {"http://a.b.c.d.e.f.com", kEllipsisStr + ".e.f.com"}, - // IDN - Greek alpha.beta.gamma.delta.epsilon.zeta.com - {"http://xn--mxa.xn--nxa.xn--oxa.xn--pxa.xn--qxa.xn--rxa.com", - kEllipsisStr + ".\xCE\xB5.\xCE\xB6.com"}, + {"http://google.com", "google.com"}, + {"http://reallyreallyreallylongdomainname.com", + "reallyreallyreallylongdomainname.com"}, + {"http://foo", "foo"}, + {"http://foo.bar", "foo.bar"}, + {"http://subdomain.google.com", kEllipsisStr + ".google.com"}, + {"http://a.b.c.d.e.f.com", kEllipsisStr + "f.com"}, + {"http://subdomain.foo.bar", kEllipsisStr + "in.foo.bar"}, + {"http://subdomain.reallylongdomainname.com", + kEllipsisStr + "ain.reallylongdomainname.com"}, + {"http://a.b.c.d.e.f.com", kEllipsisStr + ".e.f.com"}, + // IDN - Greek alpha.beta.gamma.delta.epsilon.zeta.com + {"http://xn--mxa.xn--nxa.xn--oxa.xn--pxa.xn--qxa.xn--rxa.com", + kEllipsisStr + ".\xCE\xB5.\xCE\xB6.com"}, }; for (const auto& testcase : testcases) {
diff --git a/components/url_formatter/spoof_checks/idn_spoof_checker.cc b/components/url_formatter/spoof_checks/idn_spoof_checker.cc index 9f066e7..120861b 100644 --- a/components/url_formatter/spoof_checks/idn_spoof_checker.cc +++ b/components/url_formatter/spoof_checks/idn_spoof_checker.cc
@@ -46,32 +46,37 @@ bool is_same_skeleton; - if (!reader->Next(&is_same_skeleton)) + if (!reader->Next(&is_same_skeleton)) { return false; + } TopDomainEntry top_domain; if (!reader->Next(&top_domain.is_top_bucket)) { return false; } uint32_t skeletontype_value; - if (!reader->Read(kSkeletonTypeBitLength, &skeletontype_value)) + if (!reader->Read(kSkeletonTypeBitLength, &skeletontype_value)) { return false; + } top_domain.skeleton_type = static_cast<url_formatter::SkeletonType>(skeletontype_value); if (is_same_skeleton) { top_domain.domain = search; } else { bool has_com_suffix = false; - if (!reader->Next(&has_com_suffix)) + if (!reader->Next(&has_com_suffix)) { return false; + } for (char c;; top_domain.domain += c) { huffman_decoder().Decode(reader, &c); - if (c == net::extras::PreloadDecoder::kEndOfTable) + if (c == net::extras::PreloadDecoder::kEndOfTable) { break; + } } - if (has_com_suffix) + if (has_com_suffix) { top_domain.domain += ".com"; + } } if (current_search_offset == 0) { *out_found = true; @@ -423,8 +428,9 @@ // - Japanese: Han, Hiragana, Katakana, Common // - Korean: Hangul, Han, Common result &= USPOOF_RESTRICTION_LEVEL_MASK; - if (result == USPOOF_ASCII) + if (result == USPOOF_ASCII) { return Result::kSafe; + } if (result == USPOOF_SINGLE_SCRIPT_RESTRICTIVE && kana_letters_exceptions_.containsNone(label_string) && @@ -439,8 +445,9 @@ } // Disallow domains that contain only numbers and number-spoofs. // This check is reached if domain characters come from single script. - if (IsDigitLookalike(label_string)) + if (IsDigitLookalike(label_string)) { return Result::kDigitLookalikes; + } return Result::kSafe; } @@ -450,8 +457,9 @@ // This is generally rare. An example case when it would return true is when // the domain contains Latin + Japanese characters that are also digit // lookalikes. - if (IsDigitLookalike(label_string)) + if (IsDigitLookalike(label_string)) { return Result::kDigitLookalikes; + } // Additional checks for |label| with multiple scripts, one of which is Latin. // Disallow non-ASCII Latin letters to mix with a non-Latin script. @@ -621,11 +629,13 @@ bool match = false; bool decoded = preload_decoder.Decode(partial_skeleton, &match); DCHECK(decoded); - if (!decoded) + if (!decoded) { return TopDomainEntry(); + } - if (match) + if (match) { return preload_decoder.matching_top_domain(); + } labels.erase(labels.begin()); } @@ -657,8 +667,9 @@ } void IDNSpoofChecker::SetAllowedUnicodeSet(UErrorCode* status) { - if (U_FAILURE(*status)) + if (U_FAILURE(*status)) { return; + } // The recommended set is a set of characters for identifiers in a // security-sensitive environment taken from UTR 39
diff --git a/components/url_formatter/spoof_checks/skeleton_generator.cc b/components/url_formatter/spoof_checks/skeleton_generator.cc index d48ab6f..6bbdb275 100644 --- a/components/url_formatter/spoof_checks/skeleton_generator.cc +++ b/components/url_formatter/spoof_checks/skeleton_generator.cc
@@ -173,8 +173,9 @@ // If input has any characters outside Latin-Greek-Cyrillic and [0-9._-], // there is no point in getting rid of diacritics because combining marks // attached to non-LGC characters are already blocked. - if (ShouldRemoveDiacriticsFromLabel(hostname)) + if (ShouldRemoveDiacriticsFromLabel(hostname)) { diacritic_remover_->transliterate(hostname); + } } std::u16string SkeletonGenerator::MaybeRemoveDiacritics( @@ -262,8 +263,9 @@ size_t length = host_alt.length(); char16_t* buffer = host_alt.getBuffer(-1); for (char16_t* uc = buffer + src_pos; uc < buffer + length; ++uc) { - if (*uc == src_char) + if (*uc == src_char) { *uc = mapped_char; + } } host_alt.releaseBuffer(length); UErrorCode status = U_ZERO_ERROR;
diff --git a/components/url_formatter/spoof_checks/top_domains/make_top_domain_skeletons.cc b/components/url_formatter/spoof_checks/top_domains/make_top_domain_skeletons.cc index 72d98a5d..d6b9d0e 100644 --- a/components/url_formatter/spoof_checks/top_domains/make_top_domain_skeletons.cc +++ b/components/url_formatter/spoof_checks/top_domains/make_top_domain_skeletons.cc
@@ -41,8 +41,9 @@ bool WriteToFile(const std::string& content, std::string_view basename) { base::FilePath path = GetPath(basename); bool succeeded = base::WriteFile(path, content.data()); - if (!succeeded) + if (!succeeded) { std::cerr << "Failed to write to " << path.AsUTF8Unsafe() << '\n'; + } return succeeded; } @@ -171,8 +172,9 @@ } } - if (!WriteToFile(output, output_file_name)) + if (!WriteToFile(output, output_file_name)) { return 1; + } std::cout << "The first domain with the largest number of labels is " << domain_with_max_labels << " and has " << max_labels
diff --git a/components/url_formatter/spoof_checks/top_domains/top_domain_state_generator.cc b/components/url_formatter/spoof_checks/top_domains/top_domain_state_generator.cc index b3d8574..b595884a 100644 --- a/components/url_formatter/spoof_checks/top_domains/top_domain_state_generator.cc +++ b/components/url_formatter/spoof_checks/top_domains/top_domain_state_generator.cc
@@ -125,8 +125,9 @@ TrieWriter writer(approximate_table, &huffman_builder); uint32_t root_position; - if (!writer.WriteEntries(raw_trie_entries, &root_position)) + if (!writer.WriteEntries(raw_trie_entries, &root_position)) { return std::string(); + } optimal_table = huffman_builder.ToTable(); TrieWriter new_writer(optimal_table, &huffman_builder); @@ -141,8 +142,9 @@ trie_entries.push_back(std::move(trie_entry)); } - if (!new_writer.WriteEntries(raw_trie_entries, &root_position)) + if (!new_writer.WriteEntries(raw_trie_entries, &root_position)) { return std::string(); + } uint32_t new_length = new_writer.position(); std::vector<uint8_t> huffman_tree = huffman_builder.ToVector();
diff --git a/components/url_formatter/spoof_checks/top_domains/top_domain_util.cc b/components/url_formatter/spoof_checks/top_domains/top_domain_util.cc index 42fd203..985d2d3 100644 --- a/components/url_formatter/spoof_checks/top_domains/top_domain_util.cc +++ b/components/url_formatter/spoof_checks/top_domains/top_domain_util.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "components/url_formatter/spoof_checks/top_domains/top_domain_util.h" + #include "base/strings/string_util.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/url_fixer.cc index dee4a6c1..5b542af 100644 --- a/components/url_formatter/url_fixer.cc +++ b/components/url_formatter/url_fixer.cc
@@ -55,8 +55,9 @@ url::Component UTF8ComponentToUTF16Component( const std::string& text_utf8, const url::Component& component_utf8) { - if (component_utf8.len == -1) + if (component_utf8.len == -1) { return url::Component(); + } std::string before_component_string = text_utf8.substr(0, component_utf8.begin); @@ -124,11 +125,13 @@ bool ValidPathForFile(const std::string& text, base::FilePath* full_path) { base::FilePath file_path = base::MakeAbsoluteFilePath(base::FilePath::FromUTF8Unsafe(text)); - if (file_path.empty()) + if (file_path.empty()) { return false; + } - if (!base::PathExists(file_path)) + if (!base::PathExists(file_path)) { return false; + } *full_path = file_path; return true; @@ -142,26 +145,29 @@ if (text.length() == 1 || text[1] == '/') { base::FilePath file_path; - if (home_directory_override) + if (home_directory_override) { file_path = base::FilePath(home_directory_override); - else + } else { base::PathService::Get(base::DIR_HOME, &file_path); + } // We'll probably break elsewhere if $HOME is undefined, but check here // just in case. - if (file_path.value().empty()) + if (file_path.value().empty()) { return text; + } // Append requires to be a relative path, so we have to cut all preceeding // '/' characters. size_t i = 1; - while (i < text.length() && text[i] == '/') + while (i < text.length() && text[i] == '/') { ++i; + } return file_path.Append(text.substr(i)).value(); } -// Otherwise, this is a path like ~foobar/baz, where we must expand to -// user foobar's home directory. Officially, we should use getpwent(), -// but that is a nasty blocking call. + // Otherwise, this is a path like ~foobar/baz, where we must expand to + // user foobar's home directory. Officially, we should use getpwent(), + // but that is a nasty blocking call. #if BUILDFLAG(IS_APPLE) static const char kHome[] = "/Users/"; @@ -186,13 +192,15 @@ PrepareStringForFileOps(input_path, &filename); // Fixup Windows-style drive letters, where "C:" gets rewritten to "C|". - if (filename.length() > 1 && filename[1] == '|') + if (filename.length() > 1 && filename[1] == '|') { filename[1] = ':'; + } #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) base::FilePath input_path(text); PrepareStringForFileOps(input_path, &filename); - if (filename.length() > 0 && filename[0] == '~') + if (filename.length() > 0 && filename[0] == '~') { filename = FixupHomedir(filename); + } #endif // Here, we know the input looks like a file. @@ -211,8 +219,9 @@ // Checks |domain| to see if a valid TLD is already present. If not, appends // |desired_tld| to the domain, and prepends "www." unless it's already present. void AddDesiredTLD(const std::string& desired_tld, std::string* domain) { - if (desired_tld.empty() || domain->empty()) + if (desired_tld.empty() || domain->empty()) { return; + } // Abort if we already have a known TLD. In the case of an invalid host, // HostHasRegistryControlledDomain will return false and we will try to @@ -222,15 +231,17 @@ // "mail.yahoo" and hit ctrl-enter to get "www.mail.yahoo.com". if (net::registry_controlled_domains::HostHasRegistryControlledDomain( *domain, net::registry_controlled_domains::EXCLUDE_UNKNOWN_REGISTRIES, - net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES)) + net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES)) { return; + } // Add the suffix at the end of the domain. const size_t domain_length(domain->length()); DCHECK_GT(domain_length, 0U); DCHECK_NE(desired_tld[0], '.'); - if ((*domain)[domain_length - 1] != '.') + if ((*domain)[domain_length - 1] != '.') { domain->push_back('.'); + } domain->append(desired_tld); // Now, if the domain begins with "www.", stop. @@ -244,8 +255,9 @@ inline void FixupUsername(const std::string& text, const url::Component& part, std::string* url) { - if (!part.is_valid()) + if (!part.is_valid()) { return; + } // We don't fix up the username at the moment. url->append(text, part.begin, part.len); @@ -256,8 +268,9 @@ inline void FixupPassword(const std::string& text, const url::Component& part, std::string* url) { - if (!part.is_valid()) + if (!part.is_valid()) { return; + } // We don't fix up the password at the moment. url->append(":"); @@ -269,8 +282,9 @@ bool has_scheme, const std::string& desired_tld, std::string* url) { - if (!part.is_valid()) + if (!part.is_valid()) { return; + } // Make domain valid. // Strip all leading dots and all but one trailing dot, unless the user only @@ -283,8 +297,9 @@ size_t last_nondot(domain.find_last_not_of('.')); DCHECK(last_nondot != std::string::npos); last_nondot += 2; // Point at second period in ending string - if (last_nondot < domain.length()) + if (last_nondot < domain.length()) { domain.erase(last_nondot); + } } // Add any user-specified TLD, if applicable. @@ -296,8 +311,9 @@ void FixupPort(const std::string& text, const url::Component& part, std::string* url) { - if (part.is_empty()) + if (part.is_empty()) { return; + } // We don't fix up the port at the moment. url->append(":"); @@ -320,8 +336,9 @@ inline void FixupQuery(const std::string& text, const url::Component& part, std::string* url) { - if (!part.is_valid()) + if (!part.is_valid()) { return; + } // We don't fix up the query at the moment. url->append("?"); @@ -331,8 +348,9 @@ inline void FixupRef(const std::string& text, const url::Component& part, std::string* url) { - if (!part.is_valid()) + if (!part.is_valid()) { return; + } // We don't fix up the ref at the moment. url->append("#"); @@ -354,8 +372,9 @@ } std::string_view port_piece(original_text.data() + port_start, port_end - port_start); - if (port_piece.empty()) + if (port_piece.empty()) { return false; + } // Scan the |port_piece| to see if it is entirely digits. Explicit check is // needed because base::StringToInt will silently ignore a leading '+' @@ -409,14 +428,16 @@ // // Note: This logic deviates from GURL, where "www.example.com:" would be // parsed as having "www.example.com" as the scheme with an empty hostname. - if (canon_scheme->find('.') != std::string::npos) + if (canon_scheme->find('.') != std::string::npos) { return false; + } // We need to fix up the segmentation for "www:123/". For this case, we // will add an HTTP scheme later and make the URL parser happy. // TODO(pkasting): Maybe we should try to use GURL's parser for this? - if (HasPort(text, *scheme_component)) + if (HasPort(text, *scheme_component)) { return false; + } // Everything checks out. return true; @@ -431,19 +452,22 @@ std::string trimmed; TrimWhitespaceUTF8(*text, base::TRIM_ALL, &trimmed); - if (trimmed.empty()) + if (trimmed.empty()) { return std::string(); // Nothing to segment. + } std::string scheme; #if BUILDFLAG(IS_WIN) int trimmed_length = static_cast<int>(trimmed.length()); if (url::DoesBeginWindowsDriveSpec(trimmed.data(), 0, trimmed_length) || - url::DoesBeginUNCPath(trimmed.data(), 0, trimmed_length, true)) + url::DoesBeginUNCPath(trimmed.data(), 0, trimmed_length, true)) { scheme = url::kFileScheme; + } #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) if (base::FilePath::IsSeparator(trimmed.data()[0]) || - trimmed.data()[0] == '~') + trimmed.data()[0] == '~') { scheme = url::kFileScheme; + } #endif // Otherwise, we need to look at things carefully. @@ -460,10 +484,11 @@ scheme.c_str(), url::Component(0, static_cast<int>(scheme.length()))) || scheme == url::kAboutScheme || scheme == kChromeUIScheme || - scheme == url::kFileScheme)) + scheme == url::kFileScheme)) { found_scheme = true; - else + } else { (*text)[semicolon] = ';'; + } } if (!found_scheme) { // Couldn't determine the scheme, so just default to http. @@ -512,8 +537,9 @@ std::string inserted_text(scheme); // Assume a leading colon was meant to be a scheme separator (which GURL will // fix up for us into the full "://"). Otherwise add the separator ourselves. - if (first_nonwhite == text->end() || *first_nonwhite != ':') + if (first_nonwhite == text->end() || *first_nonwhite != ':') { inserted_text.append(url::kStandardSchemeSeparator); + } std::string text_to_parse(text->begin(), first_nonwhite); text_to_parse.append(inserted_text); text_to_parse.append(first_nonwhite, text->end()); @@ -559,8 +585,9 @@ std::string trimmed; TrimWhitespaceUTF8(text, base::TRIM_ALL, &trimmed); - if (trimmed.empty()) + if (trimmed.empty()) { return GURL(); // Nothing here. + } // Segment the URL. url::Parsed parts; @@ -581,13 +608,15 @@ } // We handle the file scheme separately. - if (scheme == url::kFileScheme) + if (scheme == url::kFileScheme) { return GURL(parts.scheme.is_valid() ? text : FixupPath(text)); + } // We handle the filesystem scheme separately. if (scheme == url::kFileSystemScheme) { - if (parts.inner_parsed() && parts.inner_parsed()->scheme.is_valid()) + if (parts.inner_parsed() && parts.inner_parsed()->scheme.is_valid()) { return GURL(text); + } return GURL(); } @@ -595,8 +624,9 @@ // code and shouldn't use the chrome: scheme. if (base::EqualsCaseInsensitiveASCII(scheme, url::kAboutScheme)) { GURL about_url(base::ToLowerASCII(trimmed)); - if (about_url.IsAboutBlank() || about_url.IsAboutSrcdoc()) + if (about_url.IsAboutBlank() || about_url.IsAboutSrcdoc()) { return about_url; + } } // For some schemes whose layouts we understand, we rebuild the URL. @@ -620,8 +650,9 @@ } FixupHost(trimmed, parts.host, parts.scheme.is_valid(), desired_tld, &url); - if (chrome_url && !parts.host.is_valid()) + if (chrome_url && !parts.host.is_valid()) { url.append(kChromeUIDefaultHost); + } FixupPort(trimmed, parts.port, &url); FixupPath(trimmed, parts.path, &url); FixupQuery(trimmed, parts.query, &url); @@ -666,8 +697,9 @@ bool is_file = true; // Avoid recognizing definite non-file URLs as file paths. GURL gurl(trimmed); - if (gurl.is_valid() && gurl.IsStandard()) + if (gurl.is_valid() && gurl.IsStandard()) { is_file = false; + } base::FilePath full_path; if (is_file && !ValidPathForFile(trimmed, &full_path)) { // Not a path as entered, try unescaping it in case the user has @@ -684,15 +716,17 @@ } // Put back the current directory if we saved it. - if (!base_dir.empty()) + if (!base_dir.empty()) { base::SetCurrentDirectory(old_cur_directory); + } if (is_file) { GURL file_url = net::FilePathToFileURL(full_path); - if (file_url.is_valid()) + if (file_url.is_valid()) { return GURL(base::UTF16ToUTF8(url_formatter::FormatUrl( file_url, url_formatter::kFormatUrlOmitUsernamePassword, base::UnescapeRule::NORMAL, nullptr, nullptr, nullptr))); + } // Invalid files fall through to regular processing. } @@ -713,8 +747,9 @@ part->begin += offset; // This part might not have existed in the original text. - if (part->begin < 0) + if (part->begin < 0) { part->reset(); + } } }
diff --git a/components/url_formatter/url_fixer.h b/components/url_formatter/url_fixer.h index a7923688..148db57 100644 --- a/components/url_formatter/url_fixer.h +++ b/components/url_formatter/url_fixer.h
@@ -16,7 +16,7 @@ namespace url { struct Component; struct Parsed; -} +} // namespace url // These methods process user typed input that is meant to be a URL - like user // typing in the URL bar or command line switches. The output is NOT guaranteed
diff --git a/components/url_formatter/url_fixer_fuzzer.cc b/components/url_formatter/url_fixer_fuzzer.cc index 9e960bd..21a03360 100644 --- a/components/url_formatter/url_fixer_fuzzer.cc +++ b/components/url_formatter/url_fixer_fuzzer.cc
@@ -2,13 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "components/url_formatter/url_fixer.h" + +#include <fuzzer/FuzzedDataProvider.h> #include <stdint.h> #include <string> #include <tuple> -#include <fuzzer/FuzzedDataProvider.h> - #include "base/at_exit.h" #include "base/check.h" #include "base/files/file_path.h" @@ -17,7 +18,6 @@ #include "base/strings/escape.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" -#include "components/url_formatter/url_fixer.h" #include "components/url_formatter/url_formatter.h" #include "url/third_party/mozilla/url_parse.h"
diff --git a/components/url_formatter/url_fixer_unittest.cc b/components/url_formatter/url_fixer_unittest.cc index f4a944e..48833a2 100644 --- a/components/url_formatter/url_fixer_unittest.cc +++ b/components/url_formatter/url_fixer_unittest.cc
@@ -309,18 +309,21 @@ // Returns true if the given URL is a file: URL that matches the given file static bool IsMatchingFileURL(const std::string& url, const base::FilePath& full_file_path) { - if (url.length() <= 8) + if (url.length() <= 8) { return false; - if (std::string("file:///") != url.substr(0, 8)) + } + if (std::string("file:///") != url.substr(0, 8)) { return false; // no file:/// prefix - if (url.find('\\') != std::string::npos) + } + if (url.find('\\') != std::string::npos) { return false; // contains backslashes + } base::FilePath derived_path; net::FileURLToFilePath(GURL(url), &derived_path); return base::FilePath::CompareEqualIgnoreCase(derived_path.value(), - full_file_path.value()); + full_file_path.value()); } struct FixupCase { @@ -444,8 +447,9 @@ << "input: " << value.input; // Fixup URL should never translate a valid GURL into an invalid one. - if (GURL(value.input).is_valid()) + if (GURL(value.input).is_valid()) { EXPECT_TRUE(actual_output.is_valid()); + } } // Check the TLD-appending functionality. @@ -522,31 +526,32 @@ EXPECT_EQ(golden, url_formatter::FixupURL(cur, std::string())); FixupCase cases[] = { - {"c:\\Non-existent%20file.txt", "file:///C:/Non-existent%2520file.txt"}, + {"c:\\Non-existent%20file.txt", "file:///C:/Non-existent%2520file.txt"}, - // \\foo\bar.txt -> file://foo/bar.txt - // UNC paths, this file won't exist, but since there are no escapes, it - // should be returned just converted to a file: URL. - {"\\\\NonexistentHost\\foo\\bar.txt", "file://nonexistenthost/foo/bar.txt"}, - // We do this strictly, like IE8, which only accepts this form using - // backslashes and not forward ones. Turning "//foo" into "http" matches - // Firefox and IE, silly though it may seem (it falls out of adding "http" - // as the default protocol if you haven't entered one). - {"//NonexistentHost\\foo/bar.txt", "http://nonexistenthost/foo/bar.txt"}, - {"file:///C:/foo/bar", "file:///C:/foo/bar"}, + // \\foo\bar.txt -> file://foo/bar.txt + // UNC paths, this file won't exist, but since there are no escapes, it + // should be returned just converted to a file: URL. + {"\\\\NonexistentHost\\foo\\bar.txt", + "file://nonexistenthost/foo/bar.txt"}, + // We do this strictly, like IE8, which only accepts this form using + // backslashes and not forward ones. Turning "//foo" into "http" matches + // Firefox and IE, silly though it may seem (it falls out of adding "http" + // as the default protocol if you haven't entered one). + {"//NonexistentHost\\foo/bar.txt", "http://nonexistenthost/foo/bar.txt"}, + {"file:///C:/foo/bar", "file:///C:/foo/bar"}, - // Much of the work here comes from GURL's canonicalization stage. - {"file://C:/foo/bar", "file:///C:/foo/bar"}, - {"file:c:", "file:///C:"}, - {"file:c:WINDOWS", "file:///C:/WINDOWS"}, - {"file:c|Program Files", "file:///C:/Program%20Files"}, - {"file:/file", "file://file/"}, - {"file:////////c:\\foo", "file:///C:/foo"}, - {"file://server/folder/file", "file://server/folder/file"}, + // Much of the work here comes from GURL's canonicalization stage. + {"file://C:/foo/bar", "file:///C:/foo/bar"}, + {"file:c:", "file:///C:"}, + {"file:c:WINDOWS", "file:///C:/WINDOWS"}, + {"file:c|Program Files", "file:///C:/Program%20Files"}, + {"file:/file", "file://file/"}, + {"file:////////c:\\foo", "file:///C:/foo"}, + {"file://server/folder/file", "file://server/folder/file"}, - // These are fixups we don't do, but could consider: - // {"file:///foo:/bar", "file://foo/bar"}, - // {"file:/\\/server\\folder/file", "file://server/folder/file"}, + // These are fixups we don't do, but could consider: + // {"file:///foo:/bar", "file://foo/bar"}, + // {"file:/\\/server\\folder/file", "file://server/folder/file"}, }; #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) @@ -557,18 +562,18 @@ #endif url_formatter::home_directory_override = "/foo"; FixupCase cases[] = { - // File URLs go through GURL, which tries to escape intelligently. - {"/A%20non-existent file.txt", "file:///A%2520non-existent%20file.txt"}, - // A plain "/" refers to the root. - {"/", "file:///"}, + // File URLs go through GURL, which tries to escape intelligently. + {"/A%20non-existent file.txt", "file:///A%2520non-existent%20file.txt"}, + // A plain "/" refers to the root. + {"/", "file:///"}, - // These rely on the above home_directory_override. - {"~", "file:///foo"}, - {"~/bar", "file:///foo/bar"}, + // These rely on the above home_directory_override. + {"~", "file:///foo"}, + {"~/bar", "file:///foo/bar"}, - // References to other users' homedirs. - {"~foo", "file://" HOME "foo"}, - {"~x/blah", "file://" HOME "x/blah"}, + // References to other users' homedirs. + {"~foo", "file://" HOME "foo"}, + {"~x/blah", "file://" HOME "x/blah"}, }; #endif @@ -637,10 +642,10 @@ full_path)); // test file in the subdir with different slashes and escaping. - base::FilePath::StringType relative_file_str = sub_dir.value() + - FILE_PATH_LITERAL("/") + sub_file.value(); - base::ReplaceSubstringsAfterOffset(&relative_file_str, 0, - FILE_PATH_LITERAL(" "), FILE_PATH_LITERAL("%20")); + base::FilePath::StringType relative_file_str = + sub_dir.value() + FILE_PATH_LITERAL("/") + sub_file.value(); + base::ReplaceSubstringsAfterOffset( + &relative_file_str, 0, FILE_PATH_LITERAL(" "), FILE_PATH_LITERAL("%20")); EXPECT_TRUE(IsMatchingFileURL( url_formatter::FixupRelativeFile(temp_dir_.GetPath(), base::FilePath(relative_file_str)) @@ -650,7 +655,8 @@ // test relative directories and duplicate slashes // (should resolve to the same file as above) relative_file_str = sub_dir.value() + FILE_PATH_LITERAL("/../") + - sub_dir.value() + FILE_PATH_LITERAL("///./") + sub_file.value(); + sub_dir.value() + FILE_PATH_LITERAL("///./") + + sub_file.value(); EXPECT_TRUE(IsMatchingFileURL( url_formatter::FixupRelativeFile(temp_dir_.GetPath(), base::FilePath(relative_file_str))
diff --git a/components/url_formatter/url_formatter.cc b/components/url_formatter/url_formatter.cc index e832e4d..5e4f1321 100644 --- a/components/url_formatter/url_formatter.cc +++ b/components/url_formatter/url_formatter.cc
@@ -87,8 +87,9 @@ const std::string& component_text, base::OffsetAdjuster::Adjustments* adjustments) const override { // Nothing to change. - if (!trim_trivial_subdomains_ && !trim_mobile_prefix_) + if (!trim_trivial_subdomains_ && !trim_mobile_prefix_) { return IDNToUnicodeWithAdjustments(component_text, adjustments).result; + } std::string stripped_component_text = component_text; if (base::StartsWith(component_text, "www.m.") && @@ -112,8 +113,9 @@ // weren't a prefix, or it otherwise didn't meet conditions for stripping // "www." (such as intranet hostnames). In this case, no adjustments for // trivial subdomains are needed. - if (stripped_component_text == component_text) + if (stripped_component_text == component_text) { return IDNToUnicodeWithAdjustments(component_text, adjustments).result; + } base::OffsetAdjuster::Adjustments offset_adjustments; @@ -216,8 +218,9 @@ // If |component| is valid, its begin is incremented by |delta|. void AdjustComponent(int delta, url::Component* component) { - if (!component->is_valid()) + if (!component->is_valid()) { return; + } DCHECK(delta >= 0 || component->begin >= -delta); component->begin += delta; @@ -261,8 +264,9 @@ unescape_rules, new_parsed, prefix_end, adjustments)}); // Revise |adjustments| by shifting to the offsets to prefix that the above // call to FormatUrl didn't get to see. - for (auto& adjustment : *adjustments) + for (auto& adjustment : *adjustments) { adjustment.original_offset += kViewSource.size(); + } // Adjust positions of the parsed components. if (new_parsed->scheme.is_nonempty()) { @@ -274,8 +278,9 @@ } AdjustAllComponentsButScheme(kViewSource.size(), new_parsed); - if (prefix_end) + if (prefix_end) { *prefix_end += kViewSource.size(); + } return result; } @@ -310,8 +315,9 @@ std::string_view host, base::OffsetAdjuster::Adjustments* adjustments, bool ignore_spoof_check_results) { - if (adjustments) + if (adjustments) { adjustments->clear(); + } // Convert the ASCII input to a std::u16string for ICU. std::u16string host16; host16.reserve(host.length()); @@ -330,8 +336,9 @@ component_start < host16.length(); component_start = component_end + 1) { // Find the end of the component. component_end = host16.find('.', component_start); - if (component_end == std::u16string::npos) + if (component_end == std::u16string::npos) { component_end = host16.length(); // For getting the last component. + } size_t component_length = component_end - component_start; size_t new_component_start = out16.length(); ComponentResult component_result; @@ -356,8 +363,9 @@ } // Need to add the dot we just found (if we found one). - if (component_end < host16.length()) + if (component_end < host16.length()) { out16.push_back('.'); + } } result.result = out16; @@ -368,8 +376,9 @@ g_idn_spoof_checker.Get().GetSimilarTopDomain(out16); if (!ignore_spoof_check_results && !result.matching_top_domain.domain.empty()) { - if (adjustments) + if (adjustments) { adjustments->clear(); + } result.result = host16; } } @@ -459,8 +468,9 @@ std::u16string* out) { DCHECK(out); ComponentResult result; - if (comp.empty()) + if (comp.empty()) { return result; + } // Early return if the input cannot be an IDN component. // Valid punycode must not end with a dash. @@ -528,8 +538,9 @@ spec.remove_prefix(scheme.begin + scheme.len); // Consume the trailing colon. If it's not there, then `spec` didn't really // have the first view-source scheme. - if (spec.empty() || spec[0] != ':') + if (spec.empty() || spec[0] != ':') { return false; + } spec.remove_prefix(1); return url::FindAndCompareScheme( @@ -594,10 +605,11 @@ DCHECK(adjustments); adjustments->clear(); url::Parsed parsed_temp; - if (!new_parsed) + if (!new_parsed) { new_parsed = &parsed_temp; - else + } else { *new_parsed = url::Parsed(); + } // Special handling for view-source:. Don't use content::kViewSourceScheme // because this library shouldn't depend on chrome. Reject repeated @@ -652,16 +664,19 @@ AppendFormattedComponent(spec, parsed.username, NonHostComponentTransform(unescape_rules), &url_string, &new_parsed->username, adjustments); - if (parsed.password.is_valid()) + if (parsed.password.is_valid()) { url_string.push_back(':'); + } AppendFormattedComponent(spec, parsed.password, NonHostComponentTransform(unescape_rules), &url_string, &new_parsed->password, adjustments); - if (parsed.username.is_valid() || parsed.password.is_valid()) + if (parsed.username.is_valid() || parsed.password.is_valid()) { url_string.push_back('@'); + } } - if (prefix_end) + if (prefix_end) { *prefix_end = static_cast<size_t>(url_string.length()); + } // Host. bool trim_trivial_subdomains = @@ -688,12 +703,14 @@ !url.SchemeIsFile() && !url.SchemeIsFileSystem()) { size_t trimmed_length = parsed.path.len; // Remove query and the '?' delimeter. - if (parsed.query.is_valid()) + if (parsed.query.is_valid()) { trimmed_length += parsed.query.len + 1; + } // Remove ref and the '#" delimiter. - if (parsed.ref.is_valid()) + if (parsed.ref.is_valid()) { trimmed_length += parsed.ref.len + 1; + } adjustments->push_back( base::OffsetAdjuster::Adjustment(parsed.path.begin, trimmed_length, 0)); @@ -711,14 +728,16 @@ NonHostComponentTransform(unescape_rules), &url_string, &new_parsed->path, adjustments); - if (parsed.query.is_valid()) + if (parsed.query.is_valid()) { url_string.push_back('?'); + } AppendFormattedComponent(spec, parsed.query, NonHostComponentTransform(unescape_rules), &url_string, &new_parsed->query, adjustments); - if (parsed.ref.is_valid()) + if (parsed.ref.is_valid()) { url_string.push_back('#'); + } AppendFormattedComponent(spec, parsed.ref, NonHostComponentTransform(unescape_rules), &url_string, &new_parsed->ref, adjustments); @@ -770,8 +789,9 @@ adjustments->insert(adjustments->begin(), base::OffsetAdjuster::Adjustment(0, scheme_size, 0)); - if (prefix_end) + if (prefix_end) { *prefix_end -= scheme_size; + } // Adjust new_parsed. new_parsed->scheme.reset(); @@ -809,8 +829,9 @@ text, net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES); // If there is no domain and registry, we may be looking at an intranet // or otherwise non-standard host. Leave those alone. - if (domain_and_registry.empty()) + if (domain_and_registry.empty()) { return text; + } return text.size() - domain_and_registry.length() >= kWwwLength && base::StartsWith(text, kWww, base::CompareCase::SENSITIVE) ? text.substr(kWwwLength) @@ -819,8 +840,9 @@ void StripWWWFromHostComponent(const std::string& url, url::Component* host) { std::string host_str = url.substr(host->begin, host->len); - if (StripWWW(host_str) == host_str) + if (StripWWW(host_str) == host_str) { return; + } host->begin += kWwwLength; host->len -= kWwwLength; }
diff --git a/components/url_formatter/url_formatter.h b/components/url_formatter/url_formatter.h index 676a3d6..d8f8859 100644 --- a/components/url_formatter/url_formatter.h +++ b/components/url_formatter/url_formatter.h
@@ -32,7 +32,7 @@ namespace url { struct Component; struct Parsed; -} +} // namespace url namespace url_formatter {
diff --git a/components/url_formatter/url_formatter_android.cc b/components/url_formatter/url_formatter_android.cc index a8797551..be04ec1 100644 --- a/components/url_formatter/url_formatter_android.cc +++ b/components/url_formatter/url_formatter_android.cc
@@ -2,13 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "components/url_formatter/url_formatter.h" + #include <string> #include "base/android/jni_android.h" #include "base/android/jni_string.h" #include "components/url_formatter/elide_url.h" #include "components/url_formatter/url_fixer.h" -#include "components/url_formatter/url_formatter.h" #include "url/android/gurl_android.h" #include "url/gurl.h" #include "url/origin.h"
diff --git a/components/url_formatter/url_formatter_unittest.cc b/components/url_formatter/url_formatter_unittest.cc index 9876db3..5cdfae1 100644 --- a/components/url_formatter/url_formatter_unittest.cc +++ b/components/url_formatter/url_formatter_unittest.cc
@@ -26,8 +26,8 @@ namespace { -using base::WideToUTF16; using base::ASCIIToUTF16; +using base::WideToUTF16; const size_t kNpos = std::u16string::npos; @@ -51,8 +51,9 @@ const std::string& original_url, size_t position, const std::u16string& formatted_url) { - EXPECT_EQ(expected, actual) << "Original URL: " << original_url - << " (at char " << position << ")\nFormatted URL: " << formatted_url; + EXPECT_EQ(expected, actual) + << "Original URL: " << original_url << " (at char " << position + << ")\nFormatted URL: " << formatted_url; } void CheckAdjustedOffsets(const std::string& url_string, @@ -62,14 +63,16 @@ GURL url(url_string); size_t url_length = url_string.length(); std::vector<size_t> offsets; - for (size_t i = 0; i <= url_length + 1; ++i) + for (size_t i = 0; i <= url_length + 1; ++i) { offsets.push_back(i); + } offsets.push_back(500000); // Something larger than any input length. offsets.push_back(std::string::npos); std::u16string formatted_url = FormatUrlWithOffsets( url, format_types, unescape_rules, nullptr, nullptr, &offsets); - for (size_t i = 0; i < url_length; ++i) + for (size_t i = 0; i < url_length; ++i) { VerboseExpect(output_offsets[i], offsets[i], url_string, i, formatted_url); + } VerboseExpect(formatted_url.length(), offsets[url_length], url_string, url_length, formatted_url); VerboseExpect(std::u16string::npos, offsets[url_length + 1], url_string, @@ -698,64 +701,62 @@ CheckAdjustedOffsets(std::string(), kFormatUrlOmitNothing, base::UnescapeRule::NORMAL, nullptr); - const size_t basic_offsets[] = { - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - 21, 22, 23, 24, 25 - }; + const size_t basic_offsets[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, + 9, 10, 11, 12, 13, 14, 15, 16, 17, + 18, 19, 20, 21, 22, 23, 24, 25}; CheckAdjustedOffsets("http://www.google.com/foo/", kFormatUrlOmitNothing, base::UnescapeRule::NORMAL, basic_offsets); const size_t omit_auth_offsets_1[] = { - 0, 1, 2, 3, 4, 5, 6, 7, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, 7, - 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21 - }; + 0, 1, 2, 3, 4, 5, 6, 7, kNpos, kNpos, + kNpos, kNpos, kNpos, kNpos, kNpos, 7, 8, 9, 10, 11, + 12, 13, 14, 15, 16, 17, 18, 19, 20, 21}; CheckAdjustedOffsets("http://foo:bar@www.google.com/", kFormatUrlOmitUsernamePassword, base::UnescapeRule::NORMAL, omit_auth_offsets_1); const size_t omit_auth_offsets_2[] = { - 0, 1, 2, 3, 4, 5, 6, 7, kNpos, kNpos, kNpos, 7, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, 20, 21 - }; + 0, 1, 2, 3, 4, 5, 6, 7, kNpos, kNpos, kNpos, 7, 8, + 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21}; CheckAdjustedOffsets("http://foo@www.google.com/", kFormatUrlOmitUsernamePassword, base::UnescapeRule::NORMAL, omit_auth_offsets_2); const size_t dont_omit_auth_offsets[] = { - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, - kNpos, kNpos, 11, 12, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, - kNpos, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, - 30, 31 - }; + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + 10, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, 11, + 12, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, 13, + 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, + 24, 25, 26, 27, 28, 29, 30, 31}; // Unescape to "http://foo\x30B0:\x30B0bar@www.google.com". CheckAdjustedOffsets("http://foo%E3%82%B0:%E3%82%B0bar@www.google.com/", kFormatUrlOmitNothing, base::UnescapeRule::NORMAL, dont_omit_auth_offsets); const size_t view_source_offsets[] = { - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, kNpos, - kNpos, kNpos, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33 - }; + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, + 13, 14, 15, 16, 17, 18, 19, kNpos, kNpos, kNpos, 19, 20, 21, + 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33}; CheckAdjustedOffsets("view-source:http://foo@www.google.com/", kFormatUrlOmitUsernamePassword, base::UnescapeRule::NORMAL, view_source_offsets); const size_t idn_hostname_offsets_1[] = { - 0, 1, 2, 3, 4, 5, 6, 7, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, - kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, 12, - 13, 14, 15, 16, 17, 18, 19 - }; + 0, 1, 2, 3, 4, 5, 6, 7, kNpos, + kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, + kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, 12, 13, + 14, 15, 16, 17, 18, 19}; // Convert punycode to "http://\x671d\x65e5\x3042\x3055\x3072.jp/foo/". CheckAdjustedOffsets("http://xn--l8jvb1ey91xtjb.jp/foo/", kFormatUrlOmitNothing, base::UnescapeRule::NORMAL, idn_hostname_offsets_1); const size_t idn_hostname_offsets_2[] = { - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, kNpos, kNpos, kNpos, kNpos, kNpos, - kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, 14, 15, kNpos, kNpos, kNpos, - kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, - kNpos, 19, 20, 21, 22, 23, 24 - }; + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + 10, 11, 12, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, + kNpos, kNpos, kNpos, kNpos, 14, 15, kNpos, kNpos, kNpos, kNpos, + kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, + kNpos, 19, 20, 21, 22, 23, 24}; // Convert punycode to // "http://test.\x89c6\x9891.\x5317\x4eac\x5927\x5b78.test/". CheckAdjustedOffsets("http://test.xn--cy2a840a.xn--1lq90ic7f1rc.test/", @@ -763,12 +764,13 @@ idn_hostname_offsets_2); const size_t unescape_offsets[] = { - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - 21, 22, 23, 24, 25, kNpos, kNpos, 26, 27, 28, 29, 30, kNpos, kNpos, kNpos, - kNpos, kNpos, kNpos, kNpos, kNpos, 31, kNpos, kNpos, kNpos, kNpos, kNpos, - kNpos, kNpos, kNpos, 32, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, - kNpos, 33, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos - }; + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 20, 21, 22, 23, 24, 25, kNpos, kNpos, 26, 27, + 28, 29, 30, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, + kNpos, 31, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, + 32, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, 33, + kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos}; // Unescape to "http://www.google.com/foo bar/\x30B0\x30FC\x30B0\x30EB". CheckAdjustedOffsets( "http://www.google.com/foo%20bar/%E3%82%B0%E3%83%BC%E3%82%B0%E3%83%AB", @@ -787,23 +789,21 @@ ref_offsets); const size_t omit_http_offsets[] = { - 0, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 14 - }; + 0, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, 0, 1, 2, 3, + 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14}; CheckAdjustedOffsets("http://www.google.com/", kFormatUrlOmitHTTP, base::UnescapeRule::NORMAL, omit_http_offsets); const size_t omit_http_start_with_ftp_offsets[] = { - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21 - }; + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, + 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21}; CheckAdjustedOffsets("http://ftp.google.com/", kFormatUrlOmitHTTP, base::UnescapeRule::NORMAL, omit_http_start_with_ftp_offsets); const size_t omit_all_offsets[] = { - 0, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, 0, kNpos, kNpos, kNpos, kNpos, - 0, 1, 2, 3, 4, 5, 6, 7 - }; + 0, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, 0, kNpos, kNpos, + kNpos, kNpos, 0, 1, 2, 3, 4, 5, 6, 7}; CheckAdjustedOffsets("http://user@foo.com/", kFormatUrlOmitDefaults, base::UnescapeRule::NORMAL, omit_all_offsets);
diff --git a/components/webdata/common/web_data_request_manager.cc b/components/webdata/common/web_data_request_manager.cc index b85f3dc..25a0e4b 100644 --- a/components/webdata/common/web_data_request_manager.cc +++ b/components/webdata/common/web_data_request_manager.cc
@@ -20,8 +20,9 @@ WebDataRequest::~WebDataRequest() { WebDataRequestManager* manager = GetManager(); - if (manager) + if (manager) { manager->CancelRequest(handle_); + } } WebDataServiceBase::Handle WebDataRequest::GetHandle() const { @@ -70,9 +71,7 @@ // //////////////////////////////////////////////////////////////////////////////// -WebDataRequestManager::WebDataRequestManager() - : next_request_handle_(1) { -} +WebDataRequestManager::WebDataRequestManager() : next_request_handle_(1) {} std::unique_ptr<WebDataRequest> WebDataRequestManager::NewRequest( WebDataServiceConsumer* consumer) { @@ -91,8 +90,9 @@ // If the request was already cancelled, or has already completed, it won't // be in the pending_requests_ collection any more. auto i = pending_requests_.find(h); - if (i == pending_requests_.end()) + if (i == pending_requests_.end()) { return; + } i->second->MarkAsInactive(); pending_requests_.erase(i); } @@ -106,16 +106,18 @@ request->GetTaskRunner(); auto task = base::BindOnce(&WebDataRequestManager::RequestCompletedOnThread, this, std::move(request), std::move(result)); - if (task_runner) + if (task_runner) { task_runner->PostTask(FROM_HERE, std::move(task)); - else + } else { base::ThreadPool::PostTask(FROM_HERE, std::move(task)); + } } WebDataRequestManager::~WebDataRequestManager() { base::AutoLock l(pending_lock_); - for (auto i = pending_requests_.begin(); i != pending_requests_.end(); ++i) + for (auto i = pending_requests_.begin(); i != pending_requests_.end(); ++i) { i->second->MarkAsInactive(); + } pending_requests_.clear(); } @@ -125,8 +127,9 @@ // Check whether the request is active. It might have been cancelled in // another thread before this completion handler was invoked. This means the // request initiator is no longer interested in the result. - if (!request->IsActive()) + if (!request->IsActive()) { return; + } // Stop tracking the request. The request is already finished, so "stop // tracking" is the same as post-facto cancellation.
diff --git a/components/webdata/common/web_data_results.h b/components/webdata/common/web_data_results.h index 9d56c2b..d33c508d 100644 --- a/components/webdata/common/web_data_results.h +++ b/components/webdata/common/web_data_results.h
@@ -6,6 +6,7 @@ #define COMPONENTS_WEBDATA_COMMON_WEB_DATA_RESULTS_H_ #include <stdint.h> + #include <utility> #include "base/functional/callback.h" @@ -19,28 +20,28 @@ // Result types for WebDataService. // typedef enum { - BOOL_RESULT = 1, // WDResult<bool> - KEYWORDS_RESULT, // WDResult<WDKeywordsResult> - INT64_RESULT, // WDResult<int64_t> -#if BUILDFLAG(IS_WIN) // - PASSWORD_IE7_RESULT, // WDResult<IE7PasswordInfo> -#endif // - WEB_APP_IMAGES, // WDResult<WDAppImagesResult> - TOKEN_RESULT, // WDResult<TokenResult> - AUTOFILL_VALUE_RESULT, // WDResult<std::vector<AutofillEntry>> - AUTOFILL_CLEANUP_RESULT, // WDResult<size_t> - AUTOFILL_CHANGES, // WDResult<std::vector<AutofillChange>> - AUTOFILL_PROFILES_RESULT, // WDResult<std::vector<AutofillProfile>> - AUTOFILL_CLOUDTOKEN_RESULT, // WDResult<std::vector<std::unique_ptr< - // CreditCardCloudTokenData>>> - AUTOFILL_CREDITCARDS_RESULT, // WDResult<std::vector< - // std::unique_ptr<CreditCard>>> - AUTOFILL_IBANS_RESULT, // WDResult<std::vector< - // std::unique_ptr<Iban>>> - AUTOFILL_CUSTOMERDATA_RESULT, // WDResult<std::unique_ptr< - // PaymentsCustomerData>> - AUTOFILL_OFFER_DATA, // WDResult<std::vector<std::unique_ptr< - // AutofillOfferData>>> + BOOL_RESULT = 1, // WDResult<bool> + KEYWORDS_RESULT, // WDResult<WDKeywordsResult> + INT64_RESULT, // WDResult<int64_t> +#if BUILDFLAG(IS_WIN) // + PASSWORD_IE7_RESULT, // WDResult<IE7PasswordInfo> +#endif // + WEB_APP_IMAGES, // WDResult<WDAppImagesResult> + TOKEN_RESULT, // WDResult<TokenResult> + AUTOFILL_VALUE_RESULT, // WDResult<std::vector<AutofillEntry>> + AUTOFILL_CLEANUP_RESULT, // WDResult<size_t> + AUTOFILL_CHANGES, // WDResult<std::vector<AutofillChange>> + AUTOFILL_PROFILES_RESULT, // WDResult<std::vector<AutofillProfile>> + AUTOFILL_CLOUDTOKEN_RESULT, // WDResult<std::vector<std::unique_ptr< + // CreditCardCloudTokenData>>> + AUTOFILL_CREDITCARDS_RESULT, // WDResult<std::vector< + // std::unique_ptr<CreditCard>>> + AUTOFILL_IBANS_RESULT, // WDResult<std::vector< + // std::unique_ptr<Iban>>> + AUTOFILL_CUSTOMERDATA_RESULT, // WDResult<std::unique_ptr< + // PaymentsCustomerData>> + AUTOFILL_OFFER_DATA, // WDResult<std::vector<std::unique_ptr< + // AutofillOfferData>>> AUTOFILL_VIRTUAL_CARD_USAGE_DATA, // WDResult<std::vector< // VirtualCardUsageData>> CREDIT_CARD_BENEFIT_RESULT, // WDResult<std::vector<std::unique_ptr< @@ -50,18 +51,18 @@ // sync_pb::PaymentInstrument>> PAYMENT_INSTRUMENT_CREATION_OPTION_RESULT, // WDResult<std::vector< // sync_pb::PaymentInstrumentCreationOption>> -#if BUILDFLAG(USE_BLINK) // +#if BUILDFLAG(USE_BLINK) // // The browser bound key id is retrieved by the payments component // during secure payment confirmation requests and payment credential // creation. - BROWSER_BOUND_KEY, // WDResult<std::vector<uint8_t>> - PAYMENT_WEB_APP_MANIFEST, // WDResult<std::vector< - // mojom::WebAppManifestSectionPtr>> - PAYMENT_METHOD_MANIFEST, // WDResult<std::vector<std::string>> - SECURE_PAYMENT_CONFIRMATION, // WDResult<std::vector<std::unique_ptr< - // SecurePaymentConfirmationInstrument>>> -#endif // - PLUS_ADDRESS_RESULT, // WDResult<std::vector<PlusProfile>> + BROWSER_BOUND_KEY, // WDResult<std::vector<uint8_t>> + PAYMENT_WEB_APP_MANIFEST, // WDResult<std::vector< + // mojom::WebAppManifestSectionPtr>> + PAYMENT_METHOD_MANIFEST, // WDResult<std::vector<std::string>> + SECURE_PAYMENT_CONFIRMATION, // WDResult<std::vector<std::unique_ptr< + // SecurePaymentConfirmationInstrument>>> +#endif // + PLUS_ADDRESS_RESULT, // WDResult<std::vector<PlusProfile>> } WDResultType; //
diff --git a/components/webdata/common/web_data_service_base.cc b/components/webdata/common/web_data_service_base.cc index e2cf6b9..0856602e 100644 --- a/components/webdata/common/web_data_service_base.cc +++ b/components/webdata/common/web_data_service_base.cc
@@ -32,13 +32,15 @@ } void WebDataServiceBase::ShutdownDatabase() { - if (wdbs_) + if (wdbs_) { wdbs_->ShutdownDatabase(); + } } void WebDataServiceBase::CancelRequest(Handle h) { - if (wdbs_) + if (wdbs_) { wdbs_->CancelRequest(h); + } } WebDatabase* WebDataServiceBase::GetDatabase() {
diff --git a/components/webdata/common/web_database.h b/components/webdata/common/web_database.h index 952ff21..5ccdf89 100644 --- a/components/webdata/common/web_database.h +++ b/components/webdata/common/web_database.h
@@ -23,10 +23,7 @@ // This class manages a SQLite database that stores various web page meta data. class WEBDATA_EXPORT WebDatabase { public: - enum State { - COMMIT_NOT_NEEDED, - COMMIT_NEEDED - }; + enum State { COMMIT_NOT_NEEDED, COMMIT_NEEDED }; // Current database version number. // @@ -112,8 +109,7 @@ // Implementations may set |*update_compatible_version| to true if // the compatible version should be changed to |version|. // Implementations should otherwise not modify this parameter. - bool MigrateToVersion(int version, - bool* update_compatible_version); + bool MigrateToVersion(int version, bool* update_compatible_version); bool MigrateToVersion58DropWebAppsAndIntents(); bool MigrateToVersion79DropLoginsTable();
diff --git a/components/webdata/common/web_database_backend.cc b/components/webdata/common/web_database_backend.cc index 799dd05..68d288b 100644 --- a/components/webdata/common/web_database_backend.cc +++ b/components/webdata/common/web_database_backend.cc
@@ -48,14 +48,16 @@ // MaybeInitEncryptorOnUiSequence must be called first. CHECK(encryptor_); LoadDatabaseIfNecessary(); - if (delegate_) + if (delegate_) { delegate_->DBLoaded(init_status_, diagnostics_); + } } void WebDatabaseBackend::ShutdownDatabase() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - if (db_ && init_status_ == sql::INIT_OK) + if (db_ && init_status_ == sql::INIT_OK) { db_->CommitTransaction(); + } db_.reset(); init_complete_ = true; // Ensures the init sequence is not re-run. init_status_ = sql::INIT_FAILURE; @@ -66,8 +68,9 @@ std::unique_ptr<WebDataRequest> request) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); CHECK(init_complete_) << "Init must be complete before running a DB task."; - if (!request->IsActive()) + if (!request->IsActive()) { return; + } ExecuteWriteTask(std::move(task)); request_manager_->RequestCompleted(std::move(request), nullptr); } @@ -77,8 +80,9 @@ CHECK(init_complete_) << "Init must be complete before running a DB task."; if (db_ && init_status_ == sql::INIT_OK) { WebDatabase::State state = std::move(task).Run(db_.get()); - if (state == WebDatabase::COMMIT_NEEDED) + if (state == WebDatabase::COMMIT_NEEDED) { Commit(); + } } } @@ -87,8 +91,9 @@ std::unique_ptr<WebDataRequest> request) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); CHECK(init_complete_) << "Init must be complete before running a DB task."; - if (!request->IsActive()) + if (!request->IsActive()) { return; + } std::unique_ptr<WDTypedResult> result = ExecuteReadTask(std::move(task)); request_manager_->RequestCompleted(std::move(request), std::move(result)); } @@ -108,14 +113,16 @@ void WebDatabaseBackend::LoadDatabaseIfNecessary() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - if (init_complete_ || db_path_.empty()) + if (init_complete_ || db_path_.empty()) { return; + } init_complete_ = true; db_ = std::make_unique<WebDatabase>(); - for (const auto& table : tables_) + for (const auto& table : tables_) { db_->AddTable(table.get()); + } // Unretained to avoid a ref loop since we own |db_|. db_->set_error_callback(base::BindRepeating( @@ -130,8 +137,9 @@ } // A catastrophic error might have happened and recovered. - if (catastrophic_error_occurred_) + if (catastrophic_error_occurred_) { init_status_ = sql::INIT_OK_WITH_DATA_LOSS; + } db_->BeginTransaction(); }
diff --git a/components/webdata/common/web_database_migration_unittest.cc b/components/webdata/common/web_database_migration_unittest.cc index 04ec00d7..657c73d 100644 --- a/components/webdata/common/web_database_migration_unittest.cc +++ b/components/webdata/common/web_database_migration_unittest.cc
@@ -47,13 +47,16 @@ normalized.reserve(schema.size()); bool skip_following_spaces = false; for (char c : schema) { - if (base::Contains("\"[]`", c)) // Quotes + if (base::Contains("\"[]`", c)) { // Quotes continue; - if (c == ' ' && skip_following_spaces) + } + if (c == ' ' && skip_following_spaces) { continue; + } bool is_separator = base::Contains(",()", c); - if (is_separator && !normalized.empty() && normalized.back() == ' ') + if (is_separator && !normalized.empty() && normalized.back() == ' ') { normalized.pop_back(); + } normalized.push_back(c); skip_following_spaces = c == ' ' || is_separator; } @@ -134,8 +137,9 @@ // Get version. sql::Statement s(connection->GetUniqueStatement( "SELECT value FROM meta WHERE key='version'")); - if (!s.Step()) + if (!s.Step()) { return 0; + } return s.ColumnInt(0); }
diff --git a/components/webdata/common/web_database_service.cc b/components/webdata/common/web_database_service.cc index b0608e9d..54249d32 100644 --- a/components/webdata/common/web_database_service.cc +++ b/components/webdata/common/web_database_service.cc
@@ -49,6 +49,7 @@ FROM_HERE, base::BindOnce(&WebDatabaseService::OnDatabaseLoadDone, web_database_service_, status, diagnostics)); } + private: const base::WeakPtr<WebDatabaseService> web_database_service_; scoped_refptr<base::SequencedTaskRunner> callback_task_runner_; @@ -109,8 +110,9 @@ void WebDatabaseService::ShutdownDatabase() { error_callbacks_.clear(); weak_ptr_factory_.InvalidateWeakPtrs(); - if (!web_db_backend_) + if (!web_db_backend_) { return; + } db_task_runner_->PostTask( FROM_HERE, BindOnce(&WebDatabaseBackend::ShutdownDatabase, web_db_backend_)); @@ -157,8 +159,9 @@ } void WebDatabaseService::CancelRequest(WebDataServiceBase::Handle h) { - if (web_db_backend_) + if (web_db_backend_) { web_db_backend_->request_manager()->CancelRequest(h); + } } void WebDatabaseService::RegisterDBErrorCallback(DBLoadErrorCallback callback) { @@ -176,8 +179,9 @@ const std::string& diagnostics) { // The INIT_OK_WITH_DATA_LOSS status is an initialization success but with // suspected data loss, so we also run the error callbacks. - if (status == sql::INIT_OK) + if (status == sql::INIT_OK) { return; + } // Notify that the database load failed. while (!error_callbacks_.empty()) { @@ -188,7 +192,8 @@ // |error_callbacks_| before it accesses it. DBLoadErrorCallback error_callback = std::move(error_callbacks_.back()); error_callbacks_.pop_back(); - if (!error_callback.is_null()) + if (!error_callback.is_null()) { std::move(error_callback).Run(status, diagnostics); + } } }
diff --git a/components/webdata/common/web_database_service.h b/components/webdata/common/web_database_service.h index f958952..30a9ac6 100644 --- a/components/webdata/common/web_database_service.h +++ b/components/webdata/common/web_database_service.h
@@ -30,7 +30,7 @@ namespace base { class Location; class SequencedTaskRunner; -} +} // namespace base namespace os_crypt_async { class OSCryptAsync;
diff --git a/components/webdata/common/web_database_table.h b/components/webdata/common/web_database_table.h index 2e988e74..576d79f 100644 --- a/components/webdata/common/web_database_table.h +++ b/components/webdata/common/web_database_table.h
@@ -15,7 +15,7 @@ namespace sql { class Database; class MetaTable; -} +} // namespace sql // An abstract base class representing a table within a WebDatabase. // Each table should subclass this, adding type-specific methods as needed.
diff --git a/content/browser/back_forward_cache_browsertest.cc b/content/browser/back_forward_cache_browsertest.cc index f1d1b46..dacaf31 100644 --- a/content/browser/back_forward_cache_browsertest.cc +++ b/content/browser/back_forward_cache_browsertest.cc
@@ -893,9 +893,8 @@ FrameTreeNode* root = web_contents()->GetPrimaryFrameTree().root(); base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask( FROM_HERE, base::BindLambdaForTesting([&]() { - root->navigator().BeforeUnloadCompleted( - root, /*proceed=*/true, base::TimeTicks::Now(), - /*for_legacy=*/false, /*showed_dialog=*/false); + root->navigator().BeforeUnloadCompleted(root, true /* proceed */, + base::TimeTicks::Now()); })); // 7) Evict entry B. This will post a task (task #3) to restart the navigation
diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc index 11b5a15..cc3a158 100644 --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc
@@ -2241,7 +2241,6 @@ common_params_->url.spec(), "Net Error Code", net_error_); MaybeRecordTraceEventsAndHistograms(); } - MaybeRecordNavigationStartAdjustments(); // Abandon the prerender host reserved for activation if it exists. if (IsPrerenderedPageActivation()) { @@ -2417,20 +2416,6 @@ BeginNavigationImpl(); } -void NavigationRequest::UpdateNavigationStartTime(const base::TimeTicks& time, - bool for_legacy, - bool showed_dialog) { - // Should be called at most once per NavigationRequest. - CHECK(original_navigation_start_.is_null()); - - // Track the adjustment details for https://crbug.com/385170155. - original_navigation_start_ = common_params_->navigation_start; - navigation_start_adjustment_for_legacy_ = for_legacy; - beforeunload_dialog_shown_ = showed_dialog; - - common_params_->navigation_start = time; -} - bool NavigationRequest::MaybeStartPrerenderingActivationChecks() { // Find an available prerendered page for this request. If it's found, this // request may activate it instead of loading a page via network. @@ -11047,64 +11032,6 @@ #undef MAYBE_RECORD_TRACE_AND_HISTOGRAM1 } -void NavigationRequest::MaybeRecordNavigationStartAdjustments() { - // Only record metrics if we have a navigation start time. - if (common_params().navigation_start.is_null()) { - return; - } - - // Some navigations do not adjust the start time, in which case - // `original_navigation_start_` is left as null. - if (original_navigation_start_.is_null()) { - base::UmaHistogramEnumeration("Navigation.StartAdjustment", - NavigationStartAdjustmentType::kNone); - return; - } - - // Compute the adjustment made and what percentage of the total navigation - // time it includes (approximating now as the end of the navigation). - base::TimeDelta adjustment = - common_params().navigation_start - original_navigation_start_; - base::TimeDelta original_start_to_finish = - base::TimeTicks::Now() - original_navigation_start_; - // Note that in unit tests, all timestamps can be the same. Skip recording - // duration metrics if no time has elapsed during the navigation. - if (original_start_to_finish.is_zero()) { - return; - } - size_t percentage = 100 * adjustment / original_start_to_finish; - - // Report the adjustment in UMA metrics specific to the case that occurred. - NavigationStartAdjustmentType adjustment_type = - NavigationStartAdjustmentType::kNone; - std::string histogram_name = "Navigation.StartAdjustment"; - if (navigation_start_adjustment_for_legacy_) { - // No beforeunload handlers actually run in legacy mode. - CHECK(!beforeunload_dialog_shown_); - adjustment_type = NavigationStartAdjustmentType::kLegacyPostTask; - histogram_name += ".LegacyPostTask"; - } else if (!beforeunload_dialog_shown_) { - adjustment_type = NavigationStartAdjustmentType::kBeforeUnloadHandlers; - histogram_name += ".BeforeUnloadHandlers"; - } else { - adjustment_type = NavigationStartAdjustmentType::kBeforeUnloadDialog; - histogram_name += ".BeforeUnloadDialog"; - } - base::UmaHistogramEnumeration("Navigation.StartAdjustment", adjustment_type); - base::UmaHistogramTimes(histogram_name, adjustment); - base::UmaHistogramPercentage(histogram_name + ".Percentage", percentage); - - // Show trace events indicating where the adjustment occurred in time. - const auto trace_id = TRACE_ID_WITH_SCOPE("NavigationStartAdjustment", - TRACE_ID_LOCAL(navigation_id_)); - TRACE_EVENT_NESTABLE_ASYNC_BEGIN_WITH_TIMESTAMP1( - "navigation", "NavigationStartAdjustment", trace_id, - original_navigation_start_, "Percentage", percentage); - TRACE_EVENT_NESTABLE_ASYNC_END_WITH_TIMESTAMP0( - "navigation", "NavigationStartAdjustment", trace_id, - common_params().navigation_start); -} - void NavigationRequest::SanitizeDocumentIsolationPolicyHeader() { if (!response_head_) { return;
diff --git a/content/browser/renderer_host/navigation_request.h b/content/browser/renderer_host/navigation_request.h index a17ca3b..ca67aa8c 100644 --- a/content/browser/renderer_host/navigation_request.h +++ b/content/browser/renderer_host/navigation_request.h
@@ -481,30 +481,10 @@ return *commit_params_; } - // This describes the cases where the navigation start time is adjusted to be - // later in time, after BeforeUnloadCompleted. This enum is used in UMA - // histograms, so existing values should be neither reordered nor removed. - enum class NavigationStartAdjustmentType { - // No adjustment to the navigation start time was made. - kNone = 0, - // The start time was adjusted so that the navigation could proceed via a - // posted task, even though there were no beforeunload handlers registered. - kLegacyPostTask = 1, - // The start time was adjusted because beforeunload handlers ran, but no - // dialog was displayed to the user. - kBeforeUnloadHandlers = 2, - // The start time was adjusted because a beforeunload dialog was shown. - kBeforeUnloadDialog = 3, - kMaxValue = kBeforeUnloadDialog, - }; - - // Updates the navigation start time, after beforeunload has completed. - // `for_legacy` indicates that the navigation proceeded in a separate task for - // legacy reasons, without running beforeunload handlers. `showed_dialog` - // indicates whether the beforeunload handlers actually displayed a dialog. - void UpdateNavigationStartTime(const base::TimeTicks& time, - bool for_legacy, - bool showed_dialog); + // Updates the navigation start time. + void set_navigation_start_time(const base::TimeTicks& time) { + common_params_->navigation_start = time; + } void set_is_cross_site_cross_browsing_context_group( bool is_cross_site_cross_browsing_context_group) { @@ -2116,11 +2096,6 @@ void MaybeRecordTraceEventsAndHistograms(); - // Records how much the navigation start time was adjusted for beforeunload - // handlers, for various scenarios (legacy, beforeunload handlers only, and - // beforeunload dialogs). See https://crbug.com/385170155. - void MaybeRecordNavigationStartAdjustments(); - void ResetViewTransitionState(); // This check is to prevent a race condition where a parent fenced frame @@ -2396,18 +2371,6 @@ // Timing information of loading for the navigation. Used for recording UMAs. NavigationHandleTiming navigation_handle_timing_; - // The original value of navigation start for a given navigation, before any - // adjustment is made to avoid counting beforeunload dialogs. This is null - // (i.e., `TimeTicks()`) unless an adjustment was made. - base::TimeTicks original_navigation_start_; - - // Tracks whether an adjustment to the navigation start time was done for - // legacy PostTask reasons rather than for running a beforeunload handler. - bool navigation_start_adjustment_for_legacy_ = false; - - // Tracks whether a beforeunload dialog was shown as part of this navigation. - bool beforeunload_dialog_shown_ = false; - // The time this navigation was ready to commit. base::TimeTicks ready_to_commit_time_;
diff --git a/content/browser/renderer_host/navigator.cc b/content/browser/renderer_host/navigator.cc index e1816f1..bc6d0bae 100644 --- a/content/browser/renderer_host/navigator.cc +++ b/content/browser/renderer_host/navigator.cc
@@ -1123,9 +1123,7 @@ void Navigator::BeforeUnloadCompleted(FrameTreeNode* frame_tree_node, bool proceed, - const base::TimeTicks& proceed_time, - bool for_legacy, - bool showed_dialog) { + const base::TimeTicks& proceed_time) { DCHECK(frame_tree_node); NavigationRequest* navigation_request = frame_tree_node->navigation_request(); @@ -1159,8 +1157,7 @@ // Update the navigation start: it should be when it was determined that the // navigation will proceed. - navigation_request->UpdateNavigationStartTime(proceed_time, for_legacy, - showed_dialog); + navigation_request->set_navigation_start_time(proceed_time); DCHECK_EQ(NavigationRequest::WAITING_FOR_RENDERER_RESPONSE, navigation_request->state());
diff --git a/content/browser/renderer_host/navigator.h b/content/browser/renderer_host/navigator.h index 5db1e21ef..22051fa 100644 --- a/content/browser/renderer_host/navigator.h +++ b/content/browser/renderer_host/navigator.h
@@ -177,16 +177,12 @@ std::nullopt); // Called after BeforeUnloadCompleted callback is invoked from the renderer. - // If `frame_tree_node` has a NavigationRequest waiting for the renderer + // If |frame_tree_node| has a NavigationRequest waiting for the renderer // response, then the request is either started or canceled, depending on the - // value of `proceed`. If `for_legacy` is true, then this beforeunload flow - // was only used to post a task and no beforeunload handlers were run. If - // `showed_dialog` is true, then a beforeunload dialog was displayed. + // value of |proceed|. void BeforeUnloadCompleted(FrameTreeNode* frame_tree_node, bool proceed, - const base::TimeTicks& proceed_time, - bool for_legacy, - bool showed_dialog); + const base::TimeTicks& proceed_time); // Used to start a new renderer-initiated navigation, following a // BeginNavigation IPC from the renderer.
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc index 61e054b..ea77770f 100644 --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -6235,8 +6235,6 @@ send_before_unload_start_time_, for_legacy); } - bool showed_dialog = has_shown_beforeunload_dialog_; - // Resets beforeunload waiting state. is_waiting_for_beforeunload_completion_ = false; has_shown_beforeunload_dialog_ = false; @@ -6251,8 +6249,7 @@ base::OnceClosure task = base::BindOnce( [](base::WeakPtr<RenderFrameHostImpl> self, const base::TimeTicks& before_unload_end_time, bool proceed, - bool unload_ack_is_for_navigation, bool for_legacy, - bool showed_dialog) { + bool unload_ack_is_for_navigation) { if (!self) return; FrameTreeNode* frame = self->frame_tree_node(); @@ -6261,8 +6258,7 @@ // RenderFrameHostManager which handles closing. if (unload_ack_is_for_navigation) { frame->navigator().BeforeUnloadCompleted(frame, proceed, - before_unload_end_time, - for_legacy, showed_dialog); + before_unload_end_time); } else { frame->render_manager()->BeforeUnloadCompleted(proceed); } @@ -6273,7 +6269,7 @@ // which is tricky. weak_ptr_factory_.GetWeakPtr(), before_unload_end_time - browser_to_renderer_ipc_time_delta, proceed, - unload_ack_is_for_navigation_, for_legacy, showed_dialog); + unload_ack_is_for_navigation_); if (is_frame_being_destroyed) { DCHECK(proceed);
diff --git a/content/browser/renderer_host/render_frame_host_impl_browsertest.cc b/content/browser/renderer_host/render_frame_host_impl_browsertest.cc index 490f489e1..8eb9c811 100644 --- a/content/browser/renderer_host/render_frame_host_impl_browsertest.cc +++ b/content/browser/renderer_host/render_frame_host_impl_browsertest.cc
@@ -217,9 +217,6 @@ class RenderFrameHostImplBrowserTest : public ContentBrowserTest { public: using LifecycleStateImpl = RenderFrameHostImpl::LifecycleStateImpl; - using NavigationStartAdjustmentType = - NavigationRequest::NavigationStartAdjustmentType; - RenderFrameHostImplBrowserTest() : https_server_(net::EmbeddedTestServer::TYPE_HTTPS) {} ~RenderFrameHostImplBrowserTest() override = default; @@ -746,13 +743,8 @@ TestJavaScriptDialogManager dialog_manager; web_contents()->SetDelegate(&dialog_manager); - { - base::HistogramTester histogram_tester; - EXPECT_TRUE(NavigateToURL( - shell(), GetTestUrl("render_frame_host", "beforeunload.html"))); - histogram_tester.ExpectUniqueSample( - "Navigation.StartAdjustment", NavigationStartAdjustmentType::kNone, 1); - } + EXPECT_TRUE(NavigateToURL( + shell(), GetTestUrl("render_frame_host", "beforeunload.html"))); // Disable the hang monitor, otherwise there will be a race between the // beforeunload dialog and the beforeunload hang timer. web_contents() @@ -761,18 +753,8 @@ // Reload. There should be no beforeunload dialog because there was no gesture // on the page. If there was, this WaitForLoadStop call will hang. - { - base::HistogramTester histogram_tester; - web_contents()->GetController().Reload(ReloadType::NORMAL, false); - EXPECT_TRUE(WaitForLoadStop(web_contents())); - histogram_tester.ExpectUniqueSample( - "Navigation.StartAdjustment", - NavigationStartAdjustmentType::kBeforeUnloadHandlers, 1); - histogram_tester.ExpectTotalCount( - "Navigation.StartAdjustment.BeforeUnloadHandlers", 1); - histogram_tester.ExpectTotalCount( - "Navigation.StartAdjustment.BeforeUnloadHandlers.Percentage", 1); - } + web_contents()->GetController().Reload(ReloadType::NORMAL, false); + EXPECT_TRUE(WaitForLoadStop(web_contents())); // Give the page a user gesture and try reloading again. This time there // should be a dialog. If there is no dialog, the call to Wait will hang. @@ -780,22 +762,12 @@ ->GetPrimaryMainFrame() ->ExecuteJavaScriptWithUserGestureForTests( std::u16string(), base::NullCallback(), ISOLATED_WORLD_ID_GLOBAL); - { - base::HistogramTester histogram_tester; - web_contents()->GetController().Reload(ReloadType::NORMAL, false); - dialog_manager.Wait(); + web_contents()->GetController().Reload(ReloadType::NORMAL, false); + dialog_manager.Wait(); - // Answer the dialog. - dialog_manager.Run(true, std::u16string()); - EXPECT_TRUE(WaitForLoadStop(web_contents())); - histogram_tester.ExpectUniqueSample( - "Navigation.StartAdjustment", - NavigationStartAdjustmentType::kBeforeUnloadDialog, 1); - histogram_tester.ExpectTotalCount( - "Navigation.StartAdjustment.BeforeUnloadDialog", 1); - histogram_tester.ExpectTotalCount( - "Navigation.StartAdjustment.BeforeUnloadDialog.Percentage", 1); - } + // Answer the dialog. + dialog_manager.Run(true, std::u16string()); + EXPECT_TRUE(WaitForLoadStop(web_contents())); // The reload should have cleared the user gesture bit, so upon leaving again // there should be no beforeunload dialog. @@ -2167,21 +2139,8 @@ ->GetHasPostData()); // Reload and verify the form was submitted. - { - base::HistogramTester histogram_tester; - web_contents()->GetController().Reload(ReloadType::NORMAL, false); - EXPECT_TRUE(WaitForLoadStop(web_contents())); - - // This browser-initiated reload adjusts navigation start time for a legacy - // PostTask, without any beforeunload handlers present. - histogram_tester.ExpectUniqueSample( - "Navigation.StartAdjustment", - NavigationStartAdjustmentType::kLegacyPostTask, 1); - histogram_tester.ExpectTotalCount( - "Navigation.StartAdjustment.LegacyPostTask", 1); - histogram_tester.ExpectTotalCount( - "Navigation.StartAdjustment.LegacyPostTask.Percentage", 1); - } + web_contents()->GetController().Reload(ReloadType::NORMAL, false); + EXPECT_TRUE(WaitForLoadStop(web_contents())); EXPECT_EQ("text=&select=a", base::UTF16ToASCII(web_contents()->GetTitle())); CHECK_EQ(2, post_counter); }
diff --git a/docs/adding_to_third_party.md b/docs/adding_to_third_party.md index 0988820..9f0b30e 100644 --- a/docs/adding_to_third_party.md +++ b/docs/adding_to_third_party.md
@@ -325,11 +325,10 @@ * Make sure you have the approval from Chrome ATLs as mentioned [above](#before-you-start). * Get security@chromium.org (or chrome-security@google.com, Google-only) - approval. Email the list with relevant details and a link to the CL. - Third party code is a hot spot for security vulnerabilities. - When adding a new package that could potentially carry security risk, make - sure to highlight risk to security@chromium.org. You may be asked to add - a README.security or, in dangerous cases, README.SECURITY.URGENTLY file. + approval. Document all security considerations, concerns, and risks in the + `Description:` field of the README.chromium. Third party code is a hot spot + for security vulnerabilities. Help people make informed decisions about + relying on this package by highlighting security considerations. * Add chromium-third-party@google.com as a reviewer on your change. This will trigger an automatic round-robin assignment to a reviewer who will check licensing matters. These reviewers may not be able to +1 a change so look for
diff --git a/ios/chrome/app/strings/resources/ios_google_chrome_strings_fr.xtb b/ios/chrome/app/strings/resources/ios_google_chrome_strings_fr.xtb index 996a537d..6d51118 100644 --- a/ios/chrome/app/strings/resources/ios_google_chrome_strings_fr.xtb +++ b/ios/chrome/app/strings/resources/ios_google_chrome_strings_fr.xtb
@@ -228,7 +228,7 @@ <translation id="7065813315247345131">Déplacer Chrome vers le Dock</translation> <translation id="7124339256045485976">Pour garder Chrome à jour</translation> <translation id="7161390184744336561">La version de Google Chrome est obsolète</translation> -<translation id="7165736900384873061">Commencer à utiliser le lecteur de code QR Google Chrome</translation> +<translation id="7165736900384873061">Commencer à utiliser le lecteur de QR code Google Chrome</translation> <translation id="7175129790242719365">Astuce Chromium : connectez-vous à Chrome</translation> <translation id="7187993566681480880">Ce mode vous protège dans Chrome et peut servir à renforcer votre sécurité dans d'autres applications Google lorsque vous êtes connecté.</translation> <translation id="7200524487407690471">Chrome effectue automatiquement un contrôle de sécurité tous les jours pour vous protéger, entre autres, contre les violations de données et les sites Web dangereux. Vous trouverez plus d'informations sur ce contrôle dans les paramètres.</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_af.xtb b/ios/chrome/app/strings/resources/ios_strings_af.xtb index 5c4ad7d..3b6ad70 100644 --- a/ios/chrome/app/strings/resources/ios_strings_af.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_af.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">Die relevantste kenmerke vir jou op verskillende tye.</translation> <translation id="2085876078937250610">Stoor …</translation> <translation id="2096239473850415494">Kon nie aflaai nie</translation> +<translation id="2096716221239095980">Vee alle data uit</translation> <translation id="2103075008456228677">Maak history.google.com oop</translation> <translation id="2104436223719117661">Soekneigings</translation> <translation id="21133533946938348">Speld oortjie vas</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_am.xtb b/ios/chrome/app/strings/resources/ios_strings_am.xtb index 2d54bb6c..79b9fca 100644 --- a/ios/chrome/app/strings/resources/ios_strings_am.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_am.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">በተለያዩ ጊዜያት ያሉ ለእርስዎ በጣም አግባብነት ያላቸው ባህሪያት።</translation> <translation id="2085876078937250610">አስቀምጥ…</translation> <translation id="2096239473850415494">ማውረድ አልተቻለም</translation> +<translation id="2096716221239095980">ሁሉንም ውሂብ ሰርዝ</translation> <translation id="2103075008456228677">history.google.comን ክፈት</translation> <translation id="2104436223719117661">በመታየት ላይ ያሉ ፍለጋዎች</translation> <translation id="21133533946938348">ትር አጣብቅ</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_ar.xtb b/ios/chrome/app/strings/resources/ios_strings_ar.xtb index cb7cea6b..8a85cc6 100644 --- a/ios/chrome/app/strings/resources/ios_strings_ar.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_ar.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">استكشِف الميزات الأكثر صلة باهتماماتك في أوقات مختلفة.</translation> <translation id="2085876078937250610">حفظ…</translation> <translation id="2096239473850415494">تعذَّر التنزيل</translation> +<translation id="2096716221239095980">حذف كل البيانات</translation> <translation id="2103075008456228677">فتح history.google.com</translation> <translation id="2104436223719117661">طلبات البحث الرائجة</translation> <translation id="21133533946938348">تثبيت علامة التبويب</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_as.xtb b/ios/chrome/app/strings/resources/ios_strings_as.xtb index 324ea06..1aa7be5 100644 --- a/ios/chrome/app/strings/resources/ios_strings_as.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_as.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">বিভিন্ন সময়ত আপোনাৰ বাবে আটাইতকৈ বেছি প্ৰাসংগিক সুবিধাসমূহ।</translation> <translation id="2085876078937250610">ছেভ কৰক…</translation> <translation id="2096239473850415494">ডাউনল’ড কৰিব পৰা নগ’ল</translation> +<translation id="2096716221239095980">আটাইবোৰ ডেটা মচক</translation> <translation id="2103075008456228677">history.google.com খোলক</translation> <translation id="2104436223719117661">ট্ৰেণ্ডিং সন্ধান</translation> <translation id="21133533946938348">টেব পিন কৰক</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_az.xtb b/ios/chrome/app/strings/resources/ios_strings_az.xtb index 543638b..bda1639 100644 --- a/ios/chrome/app/strings/resources/ios_strings_az.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_az.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">Fərqli vaxtlarda sizin üçün ən uyğun xüsusiyyətlər.</translation> <translation id="2085876078937250610">Yadda saxlanılır…</translation> <translation id="2096239473850415494">Endirilmədi</translation> +<translation id="2096716221239095980">Bütün datanı silin</translation> <translation id="2103075008456228677">history.google.com linkində açın</translation> <translation id="2104436223719117661">Populyar axtarışlar</translation> <translation id="21133533946938348">Tabı sancın</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_be.xtb b/ios/chrome/app/strings/resources/ios_strings_be.xtb index 2c80d8dd..afa25bf6 100644 --- a/ios/chrome/app/strings/resources/ios_strings_be.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_be.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">Самыя карысныя функцыі для розных сітуацый.</translation> <translation id="2085876078937250610">Захаваць…</translation> <translation id="2096239473850415494">Не ўдалося спампаваць</translation> +<translation id="2096716221239095980">Выдаліць усе даныя</translation> <translation id="2103075008456228677">Адкрыць history.google.com</translation> <translation id="2104436223719117661">Папулярныя пошукавыя запыты</translation> <translation id="21133533946938348">Замацаваць укладку</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_bg.xtb b/ios/chrome/app/strings/resources/ios_strings_bg.xtb index 9e9a99e..36c4548 100644 --- a/ios/chrome/app/strings/resources/ios_strings_bg.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_bg.xtb
@@ -108,6 +108,7 @@ <translation id="143681031165817424">Адресът е запазен само на това устройство</translation> <translation id="1445276840641906250">Един браузър за всичките ви раздели</translation> <translation id="1450170672351507823">Режимът за стандартна защита е включен. За още по-голяма сигурност използвайте подобрената защита.</translation> +<translation id="1454615514353469963">Паролите, ключовете за достъп и другите данни ще бъдат изтрити за постоянно от Google Мениджър на пароли</translation> <translation id="1455660774629812862">Без скриване</translation> <translation id="1460751212339734034">Пестете време, въвеждайте по-малко</translation> <translation id="1466035273550360103">Няма отворени раздели</translation> @@ -262,6 +263,7 @@ <translation id="2082906935540894275">Най-подходящите за вас функции по всяко време.</translation> <translation id="2085876078937250610">Запазване…</translation> <translation id="2096239473850415494">Неуспешно изтегляне</translation> +<translation id="2096716221239095980">Изтриване на всички данни</translation> <translation id="2103075008456228677">Към history.google.com</translation> <translation id="2104436223719117661">Набиращи популярност търсения</translation> <translation id="21133533946938348">Фиксиране на раздела</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_bn.xtb b/ios/chrome/app/strings/resources/ios_strings_bn.xtb index f03d2ff..8ceb99c 100644 --- a/ios/chrome/app/strings/resources/ios_strings_bn.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_bn.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">বিভিন্ন সময়ে আপনার জন্য সবচেয়ে প্রাসঙ্গিক ফিচার।</translation> <translation id="2085876078937250610">সেভ করুন…</translation> <translation id="2096239473850415494">ডাউনলোড করা যায়নি</translation> +<translation id="2096716221239095980">সব ডেটা মুছুন</translation> <translation id="2103075008456228677">history.google.com খুলুন</translation> <translation id="2104436223719117661">ট্রেন্ডিং সার্চ</translation> <translation id="21133533946938348">ট্যাব পিন করুন</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_bs.xtb b/ios/chrome/app/strings/resources/ios_strings_bs.xtb index 2e43f2d0..598ffae7f 100644 --- a/ios/chrome/app/strings/resources/ios_strings_bs.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_bs.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">Najrelevantnije funkcije za vas u različitim vremenima.</translation> <translation id="2085876078937250610">Sačuvaj…</translation> <translation id="2096239473850415494">Preuzimanje nije uspjelo</translation> +<translation id="2096716221239095980">Izbriši sve podatke</translation> <translation id="2103075008456228677">Otvori history.google.com</translation> <translation id="2104436223719117661">Popularna pretraživanja</translation> <translation id="21133533946938348">Zakači karticu</translation> @@ -1395,6 +1396,7 @@ <translation id="7248046129087111453"><ph name="BEGIN_LINK" />Historija pretraživanja<ph name="END_LINK" /> i <ph name="BEGIN_LINK" />drugi oblici aktivnosti<ph name="END_LINK" /> mogu biti sačuvani na Google računu.</translation> <translation id="7253951228444156601">Provjera lozinki…</translation> <translation id="7261217796641151584">Dijelite grupu</translation> +<translation id="7266578100016339897">Ta vam postavka pomaže da ostanete organizirani, a uvijek je možete promijeniti u postavkama.</translation> <translation id="7271220006028561438">Dozvoli automatske nadogradnje na pristupne ključeve</translation> <translation id="7272437679830969316">Nije moguće potvrditi identitet. Lozinka nije kopirana.</translation> <translation id="7293429513719260019">Odaberite jezik</translation> @@ -1589,6 +1591,7 @@ <translation id="8080028325999236607">Zatvori sve kartice</translation> <translation id="8084285576995584326">Kontrolirajte podatke Google računa</translation> <translation id="809543534949702122">Pretražite historiju</translation> +<translation id="8095985449280932182">{COUNT,plural, =1{Kartice koje ne upotrebljavate premještaju se ovdje nakon {COUNT} dan}one{Kartice koje ne upotrebljavate premještaju se ovdje nakon {COUNT} dan}few{Kartice koje ne upotrebljavate premještaju se ovdje nakon {COUNT} dana}other{Kartice koje ne upotrebljavate premještaju se ovdje nakon {COUNT} dana}}</translation> <translation id="8101409298456377967">Kreirajte i sačuvajte lozinke te upravljajte njima da se možete jednostavno prijaviti na web lokacije i u aplikacije. <ph name="BEGIN_LINK" />Saznajte više<ph name="END_LINK" /></translation> <translation id="8102130909719902723">N</translation> <translation id="8114753159095730575">Dostupno je preuzimanje fajla. Opcije koje su dostupne pri dnu ekrana.</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_ca.xtb b/ios/chrome/app/strings/resources/ios_strings_ca.xtb index d9e9e26..144d55d8 100644 --- a/ios/chrome/app/strings/resources/ios_strings_ca.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_ca.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">Les funcions més rellevants per a tu en diferents moments.</translation> <translation id="2085876078937250610">Desa…</translation> <translation id="2096239473850415494">No s'ha pogut baixar</translation> +<translation id="2096716221239095980">Suprimeix totes les dades</translation> <translation id="2103075008456228677">Obre history.google.com</translation> <translation id="2104436223719117661">Cerques del moment</translation> <translation id="21133533946938348">Fixa la pestanya</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_cs.xtb b/ios/chrome/app/strings/resources/ios_strings_cs.xtb index 48a1a20..479bb276 100644 --- a/ios/chrome/app/strings/resources/ios_strings_cs.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_cs.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">Nejrelevantnější funkce pro vás v různou dobu.</translation> <translation id="2085876078937250610">Uložit…</translation> <translation id="2096239473850415494">Stažení se nezdařilo</translation> +<translation id="2096716221239095980">Vymazat všechna data</translation> <translation id="2103075008456228677">Otevřít history.google.com</translation> <translation id="2104436223719117661">Populární vyhledávání</translation> <translation id="21133533946938348">Připnout kartu</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_cy.xtb b/ios/chrome/app/strings/resources/ios_strings_cy.xtb index e45abb64..046d19c6 100644 --- a/ios/chrome/app/strings/resources/ios_strings_cy.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_cy.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">Y nodweddion mwyaf perthnasol i chi ar wahanol adegau.</translation> <translation id="2085876078937250610">Cadw…</translation> <translation id="2096239473850415494">Wedi methu â lawrlwytho</translation> +<translation id="2096716221239095980">Dileu'r holl ddata</translation> <translation id="2103075008456228677">Agor history.google.com</translation> <translation id="2104436223719117661">Chwiliadau poblogaidd</translation> <translation id="21133533946938348">Pinio'r Tab</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_da.xtb b/ios/chrome/app/strings/resources/ios_strings_da.xtb index 5b36fb6..2dc9f9ea 100644 --- a/ios/chrome/app/strings/resources/ios_strings_da.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_da.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">De mest relevante funktioner til dig på forskellige tidspunkter.</translation> <translation id="2085876078937250610">Gem…</translation> <translation id="2096239473850415494">Download mislykkedes</translation> +<translation id="2096716221239095980">Slet alle data</translation> <translation id="2103075008456228677">Åbn history.google.com</translation> <translation id="2104436223719117661">Populære søgninger</translation> <translation id="21133533946938348">Fastgør fane</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_de.xtb b/ios/chrome/app/strings/resources/ios_strings_de.xtb index 604d494..7b06a236 100644 --- a/ios/chrome/app/strings/resources/ios_strings_de.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_de.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">Die relevantesten Funktionen zu verschiedenen Zeiten.</translation> <translation id="2085876078937250610">Speichern…</translation> <translation id="2096239473850415494">Fehler beim Download</translation> +<translation id="2096716221239095980">Alle Daten löschen</translation> <translation id="2103075008456228677">history.google.com öffnen</translation> <translation id="2104436223719117661">Trends bei Suchanfragen</translation> <translation id="21133533946938348">Tab anpinnen</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_el.xtb b/ios/chrome/app/strings/resources/ios_strings_el.xtb index 188d4ecd..352d05b 100644 --- a/ios/chrome/app/strings/resources/ios_strings_el.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_el.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">Οι πιο σχετικές λειτουργίες για εσάς σε διαφορετικές χρονικές στιγμές.</translation> <translation id="2085876078937250610">Αποθήκευση…</translation> <translation id="2096239473850415494">Δεν ήταν δυνατή η λήψη</translation> +<translation id="2096716221239095980">Διαγραφή όλων των δεδομένων</translation> <translation id="2103075008456228677">Ανοίξτε το history.google.com</translation> <translation id="2104436223719117661">Δημ. αναζ.</translation> <translation id="21133533946938348">Καρφίτσωμα καρτέλας</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_en-GB.xtb b/ios/chrome/app/strings/resources/ios_strings_en-GB.xtb index 242112d..a18c9c5 100644 --- a/ios/chrome/app/strings/resources/ios_strings_en-GB.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_en-GB.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">The most relevant features for you at different times.</translation> <translation id="2085876078937250610">Save…</translation> <translation id="2096239473850415494">Couldn't download</translation> +<translation id="2096716221239095980">Delete all data</translation> <translation id="2103075008456228677">Open history.google.com</translation> <translation id="2104436223719117661">Trending searches</translation> <translation id="21133533946938348">Pin tab</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_es-419.xtb b/ios/chrome/app/strings/resources/ios_strings_es-419.xtb index d9197bd2..f84debd 100644 --- a/ios/chrome/app/strings/resources/ios_strings_es-419.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_es-419.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">Las funciones más pertinentes para ti en diferentes momentos.</translation> <translation id="2085876078937250610">Guardar…</translation> <translation id="2096239473850415494">No se pudo descargar</translation> +<translation id="2096716221239095980">Borrar todos los datos</translation> <translation id="2103075008456228677">Abrir history.google.com</translation> <translation id="2104436223719117661">Tendencias de búsqueda</translation> <translation id="21133533946938348">Fijar pestaña</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_es.xtb b/ios/chrome/app/strings/resources/ios_strings_es.xtb index 0ee48d3..6e132435 100644 --- a/ios/chrome/app/strings/resources/ios_strings_es.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_es.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">Las funciones más relevantes para ti en diferentes momentos.</translation> <translation id="2085876078937250610">Guardar…</translation> <translation id="2096239473850415494">No se ha podido descargar</translation> +<translation id="2096716221239095980">Eliminar todos los datos</translation> <translation id="2103075008456228677">Abrir history.google.com</translation> <translation id="2104436223719117661">Tendencias de búsqueda</translation> <translation id="21133533946938348">Fijar pestaña</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_et.xtb b/ios/chrome/app/strings/resources/ios_strings_et.xtb index d554d45..665bbb3 100644 --- a/ios/chrome/app/strings/resources/ios_strings_et.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_et.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">Teie jaoks kõige asjakohasemad funktsioonid erinevatel aegadel.</translation> <translation id="2085876078937250610">Salvestamine …</translation> <translation id="2096239473850415494">Ei saanud alla laadida</translation> +<translation id="2096716221239095980">Kustuta kõik andmed</translation> <translation id="2103075008456228677">Ava history.google.com</translation> <translation id="2104436223719117661">Populaarsust koguvad otsingud</translation> <translation id="21133533946938348">Kinnita vaheleht</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_eu.xtb b/ios/chrome/app/strings/resources/ios_strings_eu.xtb index 8abc4ac0..66113ed 100644 --- a/ios/chrome/app/strings/resources/ios_strings_eu.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_eu.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">Zuretzat ordu ezberdinetan egokienak diren eginbideak.</translation> <translation id="2085876078937250610">Gorde…</translation> <translation id="2096239473850415494">Ezin izan da deskargatu</translation> +<translation id="2096716221239095980">Ezabatu datu guztiak</translation> <translation id="2103075008456228677">Ireki history.google.com</translation> <translation id="2104436223719117661">Pil-pilean dauden bilaketak</translation> <translation id="21133533946938348">Ainguratu fitxa</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_fa.xtb b/ios/chrome/app/strings/resources/ios_strings_fa.xtb index 8566a58f..b222277 100644 --- a/ios/chrome/app/strings/resources/ios_strings_fa.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_fa.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">مربوطترین ویژگیها برای شما در زمانهای مختلف.</translation> <translation id="2085876078937250610">ذخیره کردن…</translation> <translation id="2096239473850415494">بارگیری نشد</translation> +<translation id="2096716221239095980">حذف همه دادهها</translation> <translation id="2103075008456228677">باز کردن history.google.com</translation> <translation id="2104436223719117661">جستجوهای پرطرفدار</translation> <translation id="21133533946938348">کوچک کردن برگه</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_fi.xtb b/ios/chrome/app/strings/resources/ios_strings_fi.xtb index 0e98ac5..2a087da 100644 --- a/ios/chrome/app/strings/resources/ios_strings_fi.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_fi.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">Sopivimmat ominaisuudet eri aikoina.</translation> <translation id="2085876078937250610">Tallenna…</translation> <translation id="2096239473850415494">Lataus epäonnistui</translation> +<translation id="2096716221239095980">Poista kaikki data</translation> <translation id="2103075008456228677">Avaa history.google.com</translation> <translation id="2104436223719117661">Trendaavat haut</translation> <translation id="21133533946938348">Kiinnitä välilehti</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_fil.xtb b/ios/chrome/app/strings/resources/ios_strings_fil.xtb index 9498e2c9..278d4e9 100644 --- a/ios/chrome/app/strings/resources/ios_strings_fil.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_fil.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">Ang mga pinakanauugnay na feature para sa iyo sa iba't ibang pagkakataon.</translation> <translation id="2085876078937250610">I-save…</translation> <translation id="2096239473850415494">Hindi ma-download</translation> +<translation id="2096716221239095980">I-delete ang lahat ng data</translation> <translation id="2103075008456228677">Buksan ang history.google.com</translation> <translation id="2104436223719117661">Mga trending na paghahanap</translation> <translation id="21133533946938348">Pin Tab</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_fr-CA.xtb b/ios/chrome/app/strings/resources/ios_strings_fr-CA.xtb index bd011b5..a6365f1 100644 --- a/ios/chrome/app/strings/resources/ios_strings_fr-CA.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_fr-CA.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">Les fonctionnalités les plus pertinentes pour vous en fonction de l'heure.</translation> <translation id="2085876078937250610">Enregistrer…</translation> <translation id="2096239473850415494">Impossible de télécharger</translation> +<translation id="2096716221239095980">Supprimer toutes les données</translation> <translation id="2103075008456228677">Ouvrir history.google.com</translation> <translation id="2104436223719117661">Recherches tendance</translation> <translation id="21133533946938348">Épingler l'onglet</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_fr.xtb b/ios/chrome/app/strings/resources/ios_strings_fr.xtb index a25d0713..cf952098 100644 --- a/ios/chrome/app/strings/resources/ios_strings_fr.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_fr.xtb
@@ -136,7 +136,7 @@ <translation id="1536390784834419204">Traduire la page</translation> <translation id="1540800554400757039">Adresse 1</translation> <translation id="154312949627292154">Ouvrez les onglets reçus à partir de vos autres appareils depuis l'écran de verrouillage.</translation> -<translation id="1545749641540134597">Scanner le code QR</translation> +<translation id="1545749641540134597">Scanner le QR code</translation> <translation id="1554477036522844996">Nouvelle fenêtre</translation> <translation id="1558391695376153246">Fermer onglets nav. privée</translation> <translation id="1571780780926010134">Onglets de navigation privée</translation> @@ -262,6 +262,7 @@ <translation id="2082906935540894275">Les fonctionnalités les plus pertinentes pour vous à différents moments.</translation> <translation id="2085876078937250610">Enregistrer…</translation> <translation id="2096239473850415494">Téléchargement impossible</translation> +<translation id="2096716221239095980">Supprimer toutes les données</translation> <translation id="2103075008456228677">Ouvrir history.google.com</translation> <translation id="2104436223719117661">Recherches populaires</translation> <translation id="21133533946938348">Épingler l'onglet</translation> @@ -275,14 +276,14 @@ <translation id="2149973817440762519">Modifier le favori</translation> <translation id="2161446265348023004">Passer à une autre fenêtre ouverte</translation> <translation id="2164946989711475905">Connexion…</translation> -<translation id="2175927920773552910">Code QR</translation> +<translation id="2175927920773552910">QR code</translation> <translation id="2194856509914051091">Éléments à prendre en compte</translation> <translation id="2196428379625389579">Rechercher sur le Web</translation> <translation id="2199562093267256223">Le groupe sera supprimé de tous les appareils connectés à <ph name="USER_EMAIL" />.</translation> <translation id="2202084845446535117">Aucun compte messag.</translation> <translation id="2214453882118345682">Achetez, traduisez et identifiez ce que vous voyez avec votre appareil photo.</translation> <translation id="2220529011494928058">Signaler un problème</translation> -<translation id="2223461067862937305">Créer un code QR</translation> +<translation id="2223461067862937305">Créer un QR code</translation> <translation id="2230173723195178503">Page Web chargée</translation> <translation id="2236949375853147973">Mon activité</translation> <translation id="2240256190924001613">Profil de configuration disponible</translation> @@ -440,7 +441,7 @@ <translation id="2894757982205307093">Nouvel onglet dans le groupe</translation> <translation id="2902312830803030883">Autres actions</translation> <translation id="2905479111267140204">Vous avez <ph name="NUMBER_OF_PASSWORDS" /> mots de passe réutilisés qui peuvent compromettre votre sécurité.</translation> -<translation id="291754862089661335">Positionnez le code QR ou le code-barres dans ce cadre</translation> +<translation id="291754862089661335">Positionnez le QR code ou le code-barres dans ce cadre</translation> <translation id="2918688092312652908">Marquer comme non lu</translation> <translation id="2920866371965792875">Appuyez ici pour suivre l'actualité de ce site.</translation> <translation id="2922210239002704889">Accédez à la page d'accueil ou au clavier</translation> @@ -709,7 +710,7 @@ <translation id="4263576668337963058">Afficher les actions de page disponibles</translation> <translation id="4267586310863245665">{COUNT,plural, =1{Vous avez ignoré {COUNT} avertissement}one{Vous avez ignoré {COUNT} avertissement}other{Vous avez ignoré {COUNT} avertissements}}</translation> <translation id="4271575273430679392">Appuyez deux fois et maintenez la pression pour ouvrir l'historique</translation> -<translation id="4272631900155121838">Pour scanner un code QR, activez l'appareil photo depuis les paramètres</translation> +<translation id="4272631900155121838">Pour scanner un QR code, activez l'appareil photo depuis les paramètres</translation> <translation id="4277990410970811858">Navigation sécurisée</translation> <translation id="4279431713294750185">Vous pouvez balayer l'écran à partir du bord pour avancer.</translation> <translation id="4282944936010261425">Vous n'avez aucun problème de sécurité à résoudre.</translation> @@ -1076,7 +1077,7 @@ <translation id="5896576662943111387">Conçu pour iOS</translation> <translation id="5897749768294722429">Pour revenir rapidement aux sites que vous avez consultés, synchronisez vos onglets et votre historique.</translation> <translation id="5898848375214731122">Masse</translation> -<translation id="5899314093904173337">Pour partager un contenu avec des personnes à proximité, laissez-les scanner ce code QR avec leur appareil photo ou leur application de lecture de codes QR</translation> +<translation id="5899314093904173337">Pour partager un contenu avec des personnes à proximité, laissez-les scanner ce QR code avec leur appareil photo ou leur application de lecture de QR codes</translation> <translation id="5911030830365207728">Google Traduction</translation> <translation id="5922999516621365983">Faites glisser l'onglet ici pour l'épingler.</translation> <translation id="5936006948844852401">Gérer l'espace de stockage</translation> @@ -1084,13 +1085,13 @@ <translation id="5937560539988385583">Page traduite</translation> <translation id="5938160824633642847">Votre appareil est presque saturé. Libérez de l'espace et réessayez.</translation> <translation id="594324569139756587">Bloquer les cookies tiers</translation> -<translation id="5944869793365969636">Scanner le code QR</translation> +<translation id="5944869793365969636">Scanner le QR code</translation> <translation id="5948291296578561264">Cela vous permet d'enregistrer des photos dans votre bibliothèque.</translation> <translation id="5952641243319721872">Voulez-vous vraiment annuler votre sélection ?</translation> <translation id="5956112131836209882">Onglet dans le groupe d'onglets. <ph name="TAB_INDEX_IN_GROUP" /> sur <ph name="NUMBER_OF_TABS_IN_GROUP" />.</translation> <translation id="595769230373966252">Rechercher avec <ph name="SEARCH_PROVIDER" /></translation> <translation id="5963939892571022323">Impossible de créer un lien vers le texte en surbrillance.</translation> -<translation id="5971459446352190251">Rechercher via un code QR</translation> +<translation id="5971459446352190251">Rechercher via un QR code</translation> <translation id="5971872012779224351">{count,plural, =1{1 favori supprimé}one{{count} favori supprimé}other{{count} favoris supprimés}}</translation> <translation id="5972844218283131174">Tout désélectionner</translation> <translation id="5977976211062815271">Sur cet appareil</translation> @@ -1269,7 +1270,7 @@ <translation id="6641465290890659327">Partager une copie de votre mot de passe</translation> <translation id="6642362222295953972">Passer à un onglet existant</translation> <translation id="6644512095122093795">Proposer d'enregistrer les mots de passe</translation> -<translation id="6645899968535965230">Code QR : <ph name="PAGE_TITLE" /></translation> +<translation id="6645899968535965230">QR code : <ph name="PAGE_TITLE" /></translation> <translation id="6647441008198474441">Les URL que vous consultez sont envoyées à Google pour prédire les sites que vous êtes susceptible de visiter plus tard</translation> <translation id="6657585470893396449">Mot de passe</translation> <translation id="6659660757330712663">Vous pouvez balayer la barre d'outils pour passer d'un onglet à l'autre.</translation> @@ -1308,7 +1309,7 @@ <translation id="6851516051005285358">Voir la version pour ordinateur</translation> <translation id="6858718102216837409">Ajouter une langue…</translation> <translation id="6858855187367714033">Scanné</translation> -<translation id="6859944681507688231">Pour scanner un code QR ou une carte de crédit, activez l'appareil photo dans Réglages.</translation> +<translation id="6859944681507688231">Pour scanner un QR code ou une carte de crédit, activez l'appareil photo dans Réglages.</translation> <translation id="6867369562105931222">mot de passe</translation> <translation id="6867400383614725881">Nouvel onglet de navigation privée</translation> <translation id="686831807558000905">Ne pas se connecter</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_gl.xtb b/ios/chrome/app/strings/resources/ios_strings_gl.xtb index 95ec61f..182ef6a7 100644 --- a/ios/chrome/app/strings/resources/ios_strings_gl.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_gl.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">As funcións máis relevantes para ti segundo o momento.</translation> <translation id="2085876078937250610">Gardar…</translation> <translation id="2096239473850415494">Non se puido descargar</translation> +<translation id="2096716221239095980">Eliminar todos os datos</translation> <translation id="2103075008456228677">Abrir history.google.com</translation> <translation id="2104436223719117661">Buscas populares</translation> <translation id="21133533946938348">Ancorar pestana</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_gu.xtb b/ios/chrome/app/strings/resources/ios_strings_gu.xtb index cf25090..fca7dee 100644 --- a/ios/chrome/app/strings/resources/ios_strings_gu.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_gu.xtb
@@ -108,6 +108,7 @@ <translation id="143681031165817424">માત્ર આ ડિવાઇસ પર સરનામું સાચવવામાં આવે છે</translation> <translation id="1445276840641906250">તમારા બધા ટૅબ એક જ બ્રાઉઝરમાં</translation> <translation id="1450170672351507823">માનક સુરક્ષા ચાલુ છે. વધુ સઘન સુરક્ષા માટે, વધારેલા સંરક્ષણનો ઉપયોગ કરો.</translation> +<translation id="1454615514353469963">Google Password Managerમાંથી પાસવર્ડ, પાસકી અને અન્ય ડેટા કાયમ માટે ડિલીટ કરવામાં આવશે</translation> <translation id="1455660774629812862">છુપાવશો નહીં</translation> <translation id="1460751212339734034">સમય બચાવો, ઓછું ટાઇપ કરો</translation> <translation id="1466035273550360103">કોઈ ખુલ્લું ટૅબ નથી</translation> @@ -262,6 +263,7 @@ <translation id="2082906935540894275">અલગ-અલગ સમયે તમારા માટે સૌથી વધુ સંબંધિત સુવિધાઓ.</translation> <translation id="2085876078937250610">સાચવો…</translation> <translation id="2096239473850415494">ડાઉનલોડ કરી શકતા નથી</translation> +<translation id="2096716221239095980">બધો ડેટા ડિલીટ કરો</translation> <translation id="2103075008456228677">history.google.com ખોલો</translation> <translation id="2104436223719117661">વલણમાં છે એ શોધો</translation> <translation id="21133533946938348">ટૅબ પિન કરો</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_hi.xtb b/ios/chrome/app/strings/resources/ios_strings_hi.xtb index ca45e5f5..0cb275b5 100644 --- a/ios/chrome/app/strings/resources/ios_strings_hi.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_hi.xtb
@@ -108,6 +108,7 @@ <translation id="143681031165817424">यह पता सिर्फ़ इस डिवाइस पर सेव किया गया है</translation> <translation id="1445276840641906250">एक ही ब्राउज़र में आपके सभी टैब</translation> <translation id="1450170672351507823">सामान्य सुरक्षा की सुविधा चालू है. इससे भी ज़्यादा सुरक्षा के लिए, बेहतर सुरक्षा की सुविधा का इस्तेमाल करें.</translation> +<translation id="1454615514353469963">Google Password Manager से पासवर्ड, पासकी, और अन्य डेटा हमेशा के लिए मिटा दिया जाएगा</translation> <translation id="1455660774629812862">छिपाएं नहीं</translation> <translation id="1460751212339734034">समय बचाएं, कम टाइप करें</translation> <translation id="1466035273550360103">खुला हुआ कोई भी टैब मौजूद नहीं है</translation> @@ -262,6 +263,7 @@ <translation id="2082906935540894275">आपके लिए, अलग-अलग समय पर सबसे ज़्यादा काम की सुविधाएं.</translation> <translation id="2085876078937250610">सेव करें…</translation> <translation id="2096239473850415494">डाउनलोड नहीं किया जा सका</translation> +<translation id="2096716221239095980">सारा डेटा मिटाएं</translation> <translation id="2103075008456228677">history.google.com खोलें</translation> <translation id="2104436223719117661">रुझान में चल रही खोजें</translation> <translation id="21133533946938348">टैब छोटा करें</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_hr.xtb b/ios/chrome/app/strings/resources/ios_strings_hr.xtb index 324531c..d094711 100644 --- a/ios/chrome/app/strings/resources/ios_strings_hr.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_hr.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">Najrelevantnije značajke za vas u različita vremena.</translation> <translation id="2085876078937250610">Spremite…</translation> <translation id="2096239473850415494">Preuzimanje nije uspjelo</translation> +<translation id="2096716221239095980">Izbriši sve podatke</translation> <translation id="2103075008456228677">Otvori history.google.com</translation> <translation id="2104436223719117661">Pretraživanja u trendu</translation> <translation id="21133533946938348">Pričvrsti karticu</translation> @@ -1395,6 +1396,7 @@ <translation id="7248046129087111453"><ph name="BEGIN_LINK" />Povijest pretraživanja<ph name="END_LINK" /> i <ph name="BEGIN_LINK" />drugi oblici aktivnosti<ph name="END_LINK" /> mogu se spremati na vaš Google račun.</translation> <translation id="7253951228444156601">Provjera zaporki…</translation> <translation id="7261217796641151584">Dijeli grupu</translation> +<translation id="7266578100016339897">Ta vam postavka pomaže da ostanete organizirani, a uvijek je možete promijeniti u postavkama.</translation> <translation id="7271220006028561438">Dopusti automatske nadogradnje pristupnih ključeva</translation> <translation id="7272437679830969316">Potvrda identiteta nije moguća. Zaporka nije kopirana.</translation> <translation id="7293429513719260019">Odaberite jezik</translation> @@ -1589,6 +1591,7 @@ <translation id="8080028325999236607">Zatvori sve kartice</translation> <translation id="8084285576995584326">Upravljajte podacima svojeg Google računa</translation> <translation id="809543534949702122">Povijest pretraživanja</translation> +<translation id="8095985449280932182">{COUNT,plural, =1{Kartice koje ne upotrebljavate premještaju se ovdje nakon {COUNT} dan}one{Kartice koje ne upotrebljavate premještaju se ovdje nakon {COUNT} dan}few{Kartice koje ne upotrebljavate premještaju se ovdje nakon {COUNT} dana}other{Kartice koje ne upotrebljavate premještaju se ovdje nakon {COUNT} dana}}</translation> <translation id="8101409298456377967">Izradite i spremite zaporke te upravljajte njima kako biste se lako prijavljivali na web-lokacije i u aplikacije. <ph name="BEGIN_LINK" />Saznajte više<ph name="END_LINK" /></translation> <translation id="8102130909719902723">N</translation> <translation id="8114753159095730575">Dostupno je preuzimanje datoteka. Opcije su dostupne pri dnu zaslona.</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_hu.xtb b/ios/chrome/app/strings/resources/ios_strings_hu.xtb index dd6f8bd..8cffb8f 100644 --- a/ios/chrome/app/strings/resources/ios_strings_hu.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_hu.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">Az Ön számára legrelevánsabb funkciók különböző időpontokban.</translation> <translation id="2085876078937250610">Mentés…</translation> <translation id="2096239473850415494">Nem sikerült letölteni</translation> +<translation id="2096716221239095980">Minden adat törlése</translation> <translation id="2103075008456228677">A history.google.com megnyitása</translation> <translation id="2104436223719117661">Felkapott keresések</translation> <translation id="21133533946938348">Lap rögzítése</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_hy.xtb b/ios/chrome/app/strings/resources/ios_strings_hy.xtb index 540b461..e5a50189 100644 --- a/ios/chrome/app/strings/resources/ios_strings_hy.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_hy.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">Ամենակարևոր գործառույթների արագ հասանելիություն։</translation> <translation id="2085876078937250610">Պահել…</translation> <translation id="2096239473850415494">Չհաջողվեց ներբեռնել</translation> +<translation id="2096716221239095980">Ջնջել բոլոր տվյալները</translation> <translation id="2103075008456228677">Բացել history.google.com էջը</translation> <translation id="2104436223719117661">Թրենդային որոնումներ</translation> <translation id="21133533946938348">Ամրացնել ներդիրը</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_id.xtb b/ios/chrome/app/strings/resources/ios_strings_id.xtb index f4fff22ff..6d26d3db 100644 --- a/ios/chrome/app/strings/resources/ios_strings_id.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_id.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">Fitur yang paling relevan untuk Anda pada waktu tertentu.</translation> <translation id="2085876078937250610">Simpan…</translation> <translation id="2096239473850415494">Tidak dapat mendownload</translation> +<translation id="2096716221239095980">Hapus semua data</translation> <translation id="2103075008456228677">Buka history.google.com</translation> <translation id="2104436223719117661">Penelusuran trending</translation> <translation id="21133533946938348">Sematkan Tab</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_is.xtb b/ios/chrome/app/strings/resources/ios_strings_is.xtb index 7875f00e..c2ecfe43 100644 --- a/ios/chrome/app/strings/resources/ios_strings_is.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_is.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">Eiginleikarnir sem eiga best við fyrir þig á ólíkum tímum.</translation> <translation id="2085876078937250610">Vista…</translation> <translation id="2096239473850415494">Ekki hægt að sækja</translation> +<translation id="2096716221239095980">Eyða öllum gögnum</translation> <translation id="2103075008456228677">Opna history.google.com</translation> <translation id="2104436223719117661">Vinsælar leitir</translation> <translation id="21133533946938348">Festa flipa</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_it.xtb b/ios/chrome/app/strings/resources/ios_strings_it.xtb index 814ead6d..06514057 100644 --- a/ios/chrome/app/strings/resources/ios_strings_it.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_it.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">Le funzionalità più pertinenti per te in momenti diversi.</translation> <translation id="2085876078937250610">Salva…</translation> <translation id="2096239473850415494">Download non riuscito</translation> +<translation id="2096716221239095980">Elimina tutti i dati</translation> <translation id="2103075008456228677">Apri la pagina history.google.com</translation> <translation id="2104436223719117661">Ricerche di tendenza</translation> <translation id="21133533946938348">Blocca scheda</translation> @@ -1395,6 +1396,7 @@ <translation id="7248046129087111453">La <ph name="BEGIN_LINK" />cronologia delle ricerche<ph name="END_LINK" /> e <ph name="BEGIN_LINK" />altri tipi di attività<ph name="END_LINK" /> potrebbero essere salvati nel tuo Account Google.</translation> <translation id="7253951228444156601">Controllo delle password…</translation> <translation id="7261217796641151584">Condividi gruppo</translation> +<translation id="7266578100016339897">In questo modo, è più semplice organizzarsi. Puoi modificare questa opzione nelle impostazioni in qualsiasi momento.</translation> <translation id="7271220006028561438">Consenti upgrade automatici delle passkey</translation> <translation id="7272437679830969316">Impossibile verificare la tua identità. Password non copiata.</translation> <translation id="7293429513719260019">Seleziona lingua</translation> @@ -1589,6 +1591,7 @@ <translation id="8080028325999236607">Chiudi tutte le schede</translation> <translation id="8084285576995584326">Controlla i dati del tuo Account Google</translation> <translation id="809543534949702122">Cerca nella cronologia</translation> +<translation id="8095985449280932182">{COUNT,plural, =1{Le schede che non usi vengono spostate qui dopo {COUNT} giorno}other{Le schede che non usi vengono spostate qui dopo {COUNT} giorni}}</translation> <translation id="8101409298456377967">Crea, salva e gestisci le tue password in modo da poter accedere facilmente ai siti e alle app. <ph name="BEGIN_LINK" />Scopri di più<ph name="END_LINK" /></translation> <translation id="8102130909719902723">N</translation> <translation id="8114753159095730575">È possibile il download dei file. Le opzioni sono disponibili nella parte inferiore della schermata.</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_iw.xtb b/ios/chrome/app/strings/resources/ios_strings_iw.xtb index ba6ec4f..57d5385 100644 --- a/ios/chrome/app/strings/resources/ios_strings_iw.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_iw.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">התכונות הכי רלוונטיות בשבילך בזמנים שונים.</translation> <translation id="2085876078937250610">שמירה…</translation> <translation id="2096239473850415494">לא ניתן לבצע את ההורדה</translation> +<translation id="2096716221239095980">מחיקת כל הנתונים</translation> <translation id="2103075008456228677">פתיחת history.google.com</translation> <translation id="2104436223719117661">שאילתות חיפוש פופולריות</translation> <translation id="21133533946938348">הצמדת כרטיסייה</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_ja.xtb b/ios/chrome/app/strings/resources/ios_strings_ja.xtb index 4a391c9..9905cea 100644 --- a/ios/chrome/app/strings/resources/ios_strings_ja.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_ja.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">その時々で最も関連性が高い機能を表示。</translation> <translation id="2085876078937250610">保存…</translation> <translation id="2096239473850415494">ダウンロードできませんでした</translation> +<translation id="2096716221239095980">すべてのデータを削除</translation> <translation id="2103075008456228677">history.google.com を開く</translation> <translation id="2104436223719117661">急上昇ワード</translation> <translation id="21133533946938348">タブを固定</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_ka.xtb b/ios/chrome/app/strings/resources/ios_strings_ka.xtb index 874fcbd..b65c6cd 100644 --- a/ios/chrome/app/strings/resources/ios_strings_ka.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_ka.xtb
@@ -108,6 +108,7 @@ <translation id="143681031165817424">მისამართი შეინახა მხოლოდ ამ მოწყობილობაზე</translation> <translation id="1445276840641906250">თქვენი ყველა ჩანართი ერთ ბრაუზერში</translation> <translation id="1450170672351507823">სტანდარტული დაცვა ჩართულია. გირჩევთ დამატებითი დაცვის გამოყენებასაც.</translation> +<translation id="1454615514353469963">პაროლები, წვდომის გასაღებები და სხვა მონაცემები სამუდამოდ წაიშლება Google პაროლების მმართველიდან</translation> <translation id="1455660774629812862">არ დაიმალოს</translation> <translation id="1460751212339734034">დაზოგეთ დრო, აკრიფეთ ნაკლები</translation> <translation id="1466035273550360103">გახსნილი ჩანართები არ არის</translation> @@ -262,6 +263,7 @@ <translation id="2082906935540894275">თქვენთვის სხვადასხვა დროს ყველაზე აქტუალური ფუნქციები.</translation> <translation id="2085876078937250610">შენახვა…</translation> <translation id="2096239473850415494">ჩამოტვირთვა ვერ მოხერხდა</translation> +<translation id="2096716221239095980">ყველა მონაცემის წაშლა</translation> <translation id="2103075008456228677">history.google.com-ის გახსნა</translation> <translation id="2104436223719117661">პოპულარული ძიებები</translation> <translation id="21133533946938348">ჩანართის ჩამაგრება</translation> @@ -1395,6 +1397,7 @@ <translation id="7248046129087111453">თქვენს Google ანგარიშში, შესაძლოა, შეინახოს <ph name="BEGIN_LINK" />ძიების ისტორია<ph name="END_LINK" /> და <ph name="BEGIN_LINK" />სხვა ტიპის აქტივობა<ph name="END_LINK" />.</translation> <translation id="7253951228444156601">მიმდინარეობს პაროლების შემოწმება…</translation> <translation id="7261217796641151584">ჯგუფის გაზიარება</translation> +<translation id="7266578100016339897">ეს გეხმარებათ ორგანიზებაში. ამის შეცვლა ნებისმიერ დროს შეგიძლიათ პარამეტრებიდან.</translation> <translation id="7271220006028561438">წვდომის გასაღებების ავტომატური განახლების დაშვება</translation> <translation id="7272437679830969316">თქვენი ვინაობა ვერ დადასტურდა. პაროლი არ დაკოპირდა.</translation> <translation id="7293429513719260019">აირჩიეთ ენა</translation> @@ -1589,6 +1592,7 @@ <translation id="8080028325999236607">ყველა ჩანართის დახურვა</translation> <translation id="8084285576995584326">მართეთ თქვენი Google ანგარიშის მონაცემები</translation> <translation id="809543534949702122">ძიების ისტორია</translation> +<translation id="8095985449280932182">{COUNT,plural, =1{გამოუყენებელი ჩანართები გადმოვა აქ {COUNT} დღის შემდეგ}other{გამოუყენებელი ჩანართები გადმოვა აქ {COUNT} დღის შემდეგ}}</translation> <translation id="8101409298456377967">შექმენით, შეინახეთ და მართეთ თქვენი პაროლები, რომ მარტივად შეხვიდეთ საიტებსა და აპებში. <ph name="BEGIN_LINK" />შეიტყვეთ მეტი<ph name="END_LINK" /></translation> <translation id="8102130909719902723">ა</translation> <translation id="8114753159095730575">შესაძლებელია ფაილის ჩამოტვირთვა. ვარიანტები ხელმისაწვდომია ეკრანის ქვედა ნაწილთან.</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_kk.xtb b/ios/chrome/app/strings/resources/ios_strings_kk.xtb index bc89596..55da7f9 100644 --- a/ios/chrome/app/strings/resources/ios_strings_kk.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_kk.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">Әртүрлі уақытқа сай сізге арналған функциялар.</translation> <translation id="2085876078937250610">Сақтау…</translation> <translation id="2096239473850415494">Жүктеп алынбады</translation> +<translation id="2096716221239095980">Барлық деректі жою</translation> <translation id="2103075008456228677">history.google.com сайтын ашу</translation> <translation id="2104436223719117661">Танымал іздеу сұраулары</translation> <translation id="21133533946938348">Қойындыны бекіту</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_km.xtb b/ios/chrome/app/strings/resources/ios_strings_km.xtb index 2545487..15468a9 100644 --- a/ios/chrome/app/strings/resources/ios_strings_km.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_km.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">មុខងារដែលពាក់ព័ន្ធបំផុតសម្រាប់អ្នកនៅពេលវេលាផ្សេងៗគ្នា។</translation> <translation id="2085876078937250610">រក្សាទុក…</translation> <translation id="2096239473850415494">មិនអាចទាញយកបានទេ</translation> +<translation id="2096716221239095980">លុបទិន្នន័យទាំងអស់</translation> <translation id="2103075008456228677">បើក history.google.com</translation> <translation id="2104436223719117661">ការស្វែងរកដែលកំពុងពេញនិយម</translation> <translation id="21133533946938348">ដៅផ្ទាំង</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_kn.xtb b/ios/chrome/app/strings/resources/ios_strings_kn.xtb index 3907dca5..23fc2fa 100644 --- a/ios/chrome/app/strings/resources/ios_strings_kn.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_kn.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">ವಿವಿಧ ಸಮಯಗಳಲ್ಲಿ ನಿಮಗಾಗಿ ಹೆಚ್ಚು ಸೂಕ್ತವಾದ ಫೀಚರ್ಗಳು.</translation> <translation id="2085876078937250610">ಸೇವ್ ಮಾಡಿ…</translation> <translation id="2096239473850415494">ಡೌನ್ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ</translation> +<translation id="2096716221239095980">ಎಲ್ಲಾ ಡೇಟಾವನ್ನು ಅಳಿಸಿ</translation> <translation id="2103075008456228677">history.google.com ತೆರೆಯಿರಿ</translation> <translation id="2104436223719117661">ಟ್ರೆಂಡಿಂಗ್ ಹುಡುಕಾಟಗಳು</translation> <translation id="21133533946938348">ಪಿನ್ ಟ್ಯಾಬ್</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_ko.xtb b/ios/chrome/app/strings/resources/ios_strings_ko.xtb index 70d438b..f4f9d03 100644 --- a/ios/chrome/app/strings/resources/ios_strings_ko.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_ko.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">시간대에 따라 가장 관련성이 높은 기능을 제공합니다</translation> <translation id="2085876078937250610">저장…</translation> <translation id="2096239473850415494">다운로드할 수 없음</translation> +<translation id="2096716221239095980">모든 데이터 삭제</translation> <translation id="2103075008456228677">history.google.com 열기</translation> <translation id="2104436223719117661">인기 급상승 검색어</translation> <translation id="21133533946938348">탭 고정</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_ky.xtb b/ios/chrome/app/strings/resources/ios_strings_ky.xtb index 1d304b02..c3ff084 100644 --- a/ios/chrome/app/strings/resources/ios_strings_ky.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_ky.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">Ар кандай убакта көрсөтүлүүчү эң ылайыктуу функциялар.</translation> <translation id="2085876078937250610">Сактоо…</translation> <translation id="2096239473850415494">Жүктөлүп алынган жок</translation> +<translation id="2096716221239095980">Бардык нерселерди өчүрүү</translation> <translation id="2103075008456228677">history.google.com сайтын ачуу</translation> <translation id="2104436223719117661">Көп изделген нерселер</translation> <translation id="21133533946938348">Өтмөк кадоо</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_lo.xtb b/ios/chrome/app/strings/resources/ios_strings_lo.xtb index 9fcf5ab..92c1af0 100644 --- a/ios/chrome/app/strings/resources/ios_strings_lo.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_lo.xtb
@@ -108,6 +108,7 @@ <translation id="143681031165817424">ບັນທຶກທີ່ຢູ່ໃນອຸປະກອນເຄື່ອງນີ້ເທົ່ານັ້ນ</translation> <translation id="1445276840641906250">ແຖບທັງໝົດຂອງທ່ານໃນໂປຣແກຣມທ່ອງເວັບດຽວ</translation> <translation id="1450170672351507823">ການປົກປ້ອງມາດຕະຖານເປີດຢູ່. ເພື່ອຄວາມປອດໄພຍິ່ງຂຶ້ນ, ກະລຸນາໃຊ້ການປົກປ້ອງທີ່ປັບປຸງໃຫ້ດີຂຶ້ນ.</translation> +<translation id="1454615514353469963">ລະຫັດຜ່ານ, ກະແຈຜ່ານ ແລະ ຂໍ້ມູນອື່ນໆຈະຖືກລຶບຢ່າງຖາວອນຈາກຕົວຈັດການລະຫັດຜ່ານ Google</translation> <translation id="1455660774629812862">ບໍ່ຕ້ອງເຊື່ອງ</translation> <translation id="1460751212339734034">ປະຢັດເວລາດ້ວຍການພິມໜ້ອຍລົງ</translation> <translation id="1466035273550360103">ບໍ່ມີແຖບທີ່ເປີດຢູ່</translation> @@ -262,6 +263,7 @@ <translation id="2082906935540894275">ຄຸນສົມບັດທີ່ກ່ຽວຂ້ອງທີ່ສຸດສຳລັບທ່ານໃນເວລາທີ່ແຕກຕ່າງກັນ.</translation> <translation id="2085876078937250610">ບັນທຶກ…</translation> <translation id="2096239473850415494">ບໍ່ສາມາດດາວໂຫຼດໄດ້</translation> +<translation id="2096716221239095980">ລຶບຂໍ້ມູນທັງໝົດ</translation> <translation id="2103075008456228677">ເປີດ history.google.com</translation> <translation id="2104436223719117661">ການຊອກຫາມາແຮງ</translation> <translation id="21133533946938348">ປັກໝຸດແຖບ</translation> @@ -1395,6 +1397,7 @@ <translation id="7248046129087111453">ລະບົບອາດບັນທຶກ <ph name="BEGIN_LINK" />ປະຫວັດການຊອກຫາ<ph name="END_LINK" /> ແລະ <ph name="BEGIN_LINK" />ການເຄື່ອນໄຫວຮູບແບບອື່ນ<ph name="END_LINK" /> ໄວ້ໃນບັນຊີ Google ຂອງທ່ານ.</translation> <translation id="7253951228444156601">ກຳລັງກວດລະຫັດຜ່ານ…</translation> <translation id="7261217796641151584">ແບ່ງປັນກຸ່ມ</translation> +<translation id="7266578100016339897">ສິ່ງນີ້ຊ່ວຍໃຫ້ທ່ານຈັດລະບຽບໄດ້. ທ່ານສາມາດປ່ຽນສິ່ງນີ້ຕອນໃດກໍໄດ້ໃນການຕັ້ງຄ່າ.</translation> <translation id="7271220006028561438">ອະນຸຍາດການອັບເກຣດກະແຈຜ່ານອັດຕະໂນມັດ</translation> <translation id="7272437679830969316">ບໍ່ສາມາດພິສູດຢືນຢັນຕົວຕົນຂອງທ່ານໄດ້. ບໍ່ໄດ້ສຳເນົາລະຫັດຜ່ານ.</translation> <translation id="7293429513719260019">ເລືອກພາສາ</translation> @@ -1589,6 +1592,7 @@ <translation id="8080028325999236607">ປິດທຸກແຖບ</translation> <translation id="8084285576995584326">ຄວບຄຸມຂໍ້ມູນບັນຊີ Google ຂອງທ່ານ</translation> <translation id="809543534949702122">ປະຫວັດການຊອກຫາ</translation> +<translation id="8095985449280932182">{COUNT,plural, =1{ແຖບທີ່ທ່ານບໍ່ໄດ້ໃຊ້ຈະຖືກຍ້າຍມາບ່ອນນີ້ຫຼັງຈາກ {COUNT} ມື້}other{ແຖບທີ່ທ່ານບໍ່ໄດ້ໃຊ້ຈະຖືກຍ້າຍມາບ່ອນນີ້ຫຼັງຈາກ {COUNT} ມື້}}</translation> <translation id="8101409298456377967">ສ້າງ, ບັນທຶກ ແລະ ຈັດການລະຫັດຜ່ານຂອງທ່ານເພື່ອໃຫ້ທ່ານສາມາດເຂົ້າສູ່ລະບົບຫາເວັບໄຊ ແລະ ແອັບໄດ້ຢ່າງງ່າຍດາຍ. <ph name="BEGIN_LINK" />ສຶກສາເພີ່ມເຕີມ<ph name="END_LINK" /></translation> <translation id="8102130909719902723">N</translation> <translation id="8114753159095730575">ການດາວໂຫຼດໄຟລ໌ບໍ່ສາມາດໃຊ້ໄດ້. ມີຕົວເລືອກຕ່າງໆຢູ່ໃກ້ສ່ວນລຸ່ມຂອງໜ້າຈໍ.</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_lt.xtb b/ios/chrome/app/strings/resources/ios_strings_lt.xtb index 77a26f7..2bf7ef5 100644 --- a/ios/chrome/app/strings/resources/ios_strings_lt.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_lt.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">Jums aktualiausios funkcijos skirtingu laiku.</translation> <translation id="2085876078937250610">Išsaugoti…</translation> <translation id="2096239473850415494">Nepavyko atsisiųsti</translation> +<translation id="2096716221239095980">Ištrinti visus duomenis</translation> <translation id="2103075008456228677">Atidaryti history.google.com</translation> <translation id="2104436223719117661">Populiarios paieškos</translation> <translation id="21133533946938348">Pažymėti skirtuką</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_lv.xtb b/ios/chrome/app/strings/resources/ios_strings_lv.xtb index 8709a82..645420cc 100644 --- a/ios/chrome/app/strings/resources/ios_strings_lv.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_lv.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">Jums dažādos brīžos visatbilstošākās funkcijas.</translation> <translation id="2085876078937250610">Saglabāt…</translation> <translation id="2096239473850415494">Nevarēja lejupielādēt</translation> +<translation id="2096716221239095980">Dzēst visus datus</translation> <translation id="2103075008456228677">Atvērt history.google.com</translation> <translation id="2104436223719117661">Populāri meklēšanas vaicājumi</translation> <translation id="21133533946938348">Piespraust cilni</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_mk.xtb b/ios/chrome/app/strings/resources/ios_strings_mk.xtb index 44f60e54..720925b 100644 --- a/ios/chrome/app/strings/resources/ios_strings_mk.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_mk.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">Најрелевантните функции за вас во различни времиња.</translation> <translation id="2085876078937250610">Зачувај…</translation> <translation id="2096239473850415494">Не можеше да се преземе</translation> +<translation id="2096716221239095980">Избриши ги сите податоци</translation> <translation id="2103075008456228677">Отвори ја history.google.com</translation> <translation id="2104436223719117661">Пребарувања во тренд</translation> <translation id="21133533946938348">Прикачи картичка</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_ml.xtb b/ios/chrome/app/strings/resources/ios_strings_ml.xtb index c305be7..f808e60 100644 --- a/ios/chrome/app/strings/resources/ios_strings_ml.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_ml.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">വ്യത്യസ്ത സമയങ്ങളിൽ നിങ്ങൾക്ക് ഏറ്റവും പ്രസക്തമായ ഫീച്ചറുകൾ.</translation> <translation id="2085876078937250610">സംരക്ഷിക്കുക…</translation> <translation id="2096239473850415494">ഡൗൺലോഡ് ചെയ്യാനായില്ല</translation> +<translation id="2096716221239095980">എല്ലാ ഡാറ്റയും ഇല്ലാതാക്കുക</translation> <translation id="2103075008456228677">history.google.com തുറക്കുക</translation> <translation id="2104436223719117661">ട്രെൻഡിംഗ് തിരയലുകൾ</translation> <translation id="21133533946938348">ടാബ് പിൻ ചെയ്യുക</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_mn.xtb b/ios/chrome/app/strings/resources/ios_strings_mn.xtb index 78242510..fcd2750 100644 --- a/ios/chrome/app/strings/resources/ios_strings_mn.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_mn.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">Өөр өөр цагт танд хамгийн хамааралтай онцлогууд.</translation> <translation id="2085876078937250610">Хадгалах…</translation> <translation id="2096239473850415494">Татаж чадсангүй</translation> +<translation id="2096716221239095980">Бүх өгөгдлийг устгах</translation> <translation id="2103075008456228677">History.google.com-г нээх</translation> <translation id="2104436223719117661">Тренд болж буй хайлтууд</translation> <translation id="21133533946938348">Цонхыг урд талд гаргах</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_mr.xtb b/ios/chrome/app/strings/resources/ios_strings_mr.xtb index 2c503171..3bc929e 100644 --- a/ios/chrome/app/strings/resources/ios_strings_mr.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_mr.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">विविध वेळांदरम्यान तुमच्यासाठी सर्वात सुसंबद्ध वैशिष्ट्ये.</translation> <translation id="2085876078937250610">सेव्ह करा…</translation> <translation id="2096239473850415494">डाउनलोड करता आली नाही</translation> +<translation id="2096716221239095980">सर्व डेटा हटवा</translation> <translation id="2103075008456228677">history.google.com उघडा</translation> <translation id="2104436223719117661">ट्रेंडिंग शोध</translation> <translation id="21133533946938348">टॅब पिन करा</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_ms.xtb b/ios/chrome/app/strings/resources/ios_strings_ms.xtb index d2f302d..4a06cae 100644 --- a/ios/chrome/app/strings/resources/ios_strings_ms.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_ms.xtb
@@ -108,6 +108,7 @@ <translation id="143681031165817424">Alamat disimpan pada peranti ini sahaja</translation> <translation id="1445276840641906250">Semua tab anda dalam satu penyemak imbas</translation> <translation id="1450170672351507823">Perlindungan standard dihidupkan. Untuk mendapatkan keselamatan, gunakan perlindungan Dipertingkat.</translation> +<translation id="1454615514353469963">Kata laluan, kunci laluan dan data yang lain akan dipadamkan secara kekal daripada Google Password Manager</translation> <translation id="1455660774629812862">Jangan sembunyikan</translation> <translation id="1460751212339734034">Jimatkan masa, kurangkan menaip</translation> <translation id="1466035273550360103">Tiada tab terbuka</translation> @@ -262,6 +263,7 @@ <translation id="2082906935540894275">Ciri yang paling berkaitan untuk anda pada masa yang berbeza.</translation> <translation id="2085876078937250610">Simpan…</translation> <translation id="2096239473850415494">Tidak dapat memuat turun</translation> +<translation id="2096716221239095980">Padamkan semua data</translation> <translation id="2103075008456228677">Buka history.google.com</translation> <translation id="2104436223719117661">Carian sohor kini</translation> <translation id="21133533946938348">Pin Tab</translation> @@ -1395,6 +1397,7 @@ <translation id="7248046129087111453"><ph name="BEGIN_LINK" />Sejarah carian<ph name="END_LINK" /> dan<ph name="BEGIN_LINK" /> bentuk aktiviti yang lain<ph name="END_LINK" /> mungkin disimpan pada Google Account anda.</translation> <translation id="7253951228444156601">Menyemak kata laluan…</translation> <translation id="7261217796641151584">Kumpulan Kongsi</translation> +<translation id="7266578100016339897">Langkah ini membantu anda kekal teratur. Anda boleh menukar pilihan ini dalam tetapan pada bila-bila masa.</translation> <translation id="7271220006028561438">Benarkan peningkatan kunci laluan automatik</translation> <translation id="7272437679830969316">Tidak dapat mengesahkan identiti anda. Kata laluan tidak disalin.</translation> <translation id="7293429513719260019">Pilih bahasa</translation> @@ -1589,6 +1592,7 @@ <translation id="8080028325999236607">Tutup Semua Tab</translation> <translation id="8084285576995584326">Kawal data Google Account anda</translation> <translation id="809543534949702122">Sejarah Carian</translation> +<translation id="8095985449280932182">{COUNT,plural, =1{Tab yang tidak anda gunakan dialihkan ke sini selepas {COUNT} hari}other{Tab yang tidak anda gunakan dialihkan ke sini selepas {COUNT} hari}}</translation> <translation id="8101409298456377967">Buat, simpan dan urus kata laluan anda supaya anda dapat log masuk ke laman dan apl dengan mudah. <ph name="BEGIN_LINK" />Ketahui lebih lanjut<ph name="END_LINK" /></translation> <translation id="8102130909719902723">N</translation> <translation id="8114753159095730575">Muat turun fail tersedia. Pilihan tersedia di bahagian bawah skrin.</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_my.xtb b/ios/chrome/app/strings/resources/ios_strings_my.xtb index 346badd..8fbf98a8 100644 --- a/ios/chrome/app/strings/resources/ios_strings_my.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_my.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">အချိန်အလိုက် သင့်အတွက် သက်ဆိုင်မှုအရှိဆုံး ဝန်ဆောင်မှုများ။</translation> <translation id="2085876078937250610">သိမ်းရန်…</translation> <translation id="2096239473850415494">ဒေါင်းလုဒ်လုပ်၍မရပါ</translation> +<translation id="2096716221239095980">ဒေတာအားလုံး ဖျက်ရန်</translation> <translation id="2103075008456228677">history.google.com ကိုဖွင့်ပါ</translation> <translation id="2104436223719117661">ခေတ်စားနေသည့် ရှာဖွေမှုများ</translation> <translation id="21133533946938348">တဘ် ပင်ထိုးရန်</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_ne.xtb b/ios/chrome/app/strings/resources/ios_strings_ne.xtb index c85e67f3..51492fb 100644 --- a/ios/chrome/app/strings/resources/ios_strings_ne.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_ne.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">विभिन्न समयमा तपाईंका लागि सबैभन्दा सान्दर्भिक सुविधाहरू।</translation> <translation id="2085876078937250610">सेभ गर्नुहोस्…</translation> <translation id="2096239473850415494">डाउनलोड गर्न सकिएन</translation> +<translation id="2096716221239095980">सबै डेटा मेटाउनुहोस्</translation> <translation id="2103075008456228677">history.google.com लाई खोल्नुहोस्</translation> <translation id="2104436223719117661">ट्रेन्डिङ खोजहरू</translation> <translation id="21133533946938348">ट्याबलाई पिन गर्नुहोस्</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_nl.xtb b/ios/chrome/app/strings/resources/ios_strings_nl.xtb index 3057277..ec9cbc2 100644 --- a/ios/chrome/app/strings/resources/ios_strings_nl.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_nl.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">De meest relevante functies voor jou op verschillende momenten.</translation> <translation id="2085876078937250610">Opslaan…</translation> <translation id="2096239473850415494">Kan niet downloaden</translation> +<translation id="2096716221239095980">Alle gegevens verwijderen</translation> <translation id="2103075008456228677">history.google.com openen</translation> <translation id="2104436223719117661">Trending zoekopdrachten</translation> <translation id="21133533946938348">Tabblad vastzetten</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_no.xtb b/ios/chrome/app/strings/resources/ios_strings_no.xtb index 5a027fc..786b810 100644 --- a/ios/chrome/app/strings/resources/ios_strings_no.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_no.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">Funksjonene som er mest relevante for deg til forskjellige tider.</translation> <translation id="2085876078937250610">Lagre …</translation> <translation id="2096239473850415494">Kunne ikke laste ned</translation> +<translation id="2096716221239095980">Slett alle data</translation> <translation id="2103075008456228677">Åpne history.google.com</translation> <translation id="2104436223719117661">Populære søk</translation> <translation id="21133533946938348">Fest fanen</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_or.xtb b/ios/chrome/app/strings/resources/ios_strings_or.xtb index 9840fa2..722bd8f 100644 --- a/ios/chrome/app/strings/resources/ios_strings_or.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_or.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">ବିଭିନ୍ନ ସମୟରେ ଆପଣଙ୍କ ପାଇଁ ସବୁଠାରୁ ପ୍ରାସଙ୍ଗିକ ଫିଚରଗୁଡ଼ିକ।</translation> <translation id="2085876078937250610">ସେଭ୍ କରନ୍ତୁ…</translation> <translation id="2096239473850415494">ଡାଉନଲୋଡ କରାଯାଇପାରିଲା ନାହିଁ</translation> +<translation id="2096716221239095980">ସମସ୍ତ ଡାଟାକୁ ଡିଲିଟ କରନ୍ତୁ</translation> <translation id="2103075008456228677">history.google.com ଖୋଲନ୍ତୁ</translation> <translation id="2104436223719117661">ଟ୍ରେଣ୍ଡିଂ ସର୍ଚ୍ଚ</translation> <translation id="21133533946938348">ଟାବ୍ ପିନ୍ କରନ୍ତୁ</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_pa.xtb b/ios/chrome/app/strings/resources/ios_strings_pa.xtb index 20d7acb..caaa1f30 100644 --- a/ios/chrome/app/strings/resources/ios_strings_pa.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_pa.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">ਵੱਖ-ਵੱਖ ਸਮਿਆਂ 'ਤੇ ਤੁਹਾਡੇ ਲਈ ਸਭ ਤੋਂ ਢੁਕਵੀਆਂ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ।</translation> <translation id="2085876078937250610">ਰੱਖਿਅਤ ਕਰੋ…</translation> <translation id="2096239473850415494">ਡਾਊਨਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ</translation> +<translation id="2096716221239095980">ਸਾਰਾ ਡਾਟਾ ਮਿਟਾਓ</translation> <translation id="2103075008456228677">history.google.com ਖੋਲ੍ਹੋ</translation> <translation id="2104436223719117661">ਪ੍ਰਚਲਿਤ ਖੋਜਾਂ</translation> <translation id="21133533946938348">ਟੈਬ ਪਿੰਨ ਕਰੋ</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_pl.xtb b/ios/chrome/app/strings/resources/ios_strings_pl.xtb index a70c2d7..9be614a9 100644 --- a/ios/chrome/app/strings/resources/ios_strings_pl.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_pl.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">Najbardziej przydatne funkcje w różnych momentach.</translation> <translation id="2085876078937250610">Zapisz…</translation> <translation id="2096239473850415494">Nie udało się pobrać</translation> +<translation id="2096716221239095980">Usuń wszystkie dane</translation> <translation id="2103075008456228677">Otwórz history.google.com</translation> <translation id="2104436223719117661">Wyszukiwania zyskujące popularność</translation> <translation id="21133533946938348">Przypnij kartę</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_pt-BR.xtb b/ios/chrome/app/strings/resources/ios_strings_pt-BR.xtb index 002be586..47fab35 100644 --- a/ios/chrome/app/strings/resources/ios_strings_pt-BR.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_pt-BR.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">Os recursos mais relevantes sempre que você precisa deles.</translation> <translation id="2085876078937250610">Salvar…</translation> <translation id="2096239473850415494">Falha no download</translation> +<translation id="2096716221239095980">Excluir todos os dados</translation> <translation id="2103075008456228677">Abrir history.google.com</translation> <translation id="2104436223719117661">Pesquisas em alta</translation> <translation id="21133533946938348">Fixar guia</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_pt-PT.xtb b/ios/chrome/app/strings/resources/ios_strings_pt-PT.xtb index 62449eb..72f3bb1 100644 --- a/ios/chrome/app/strings/resources/ios_strings_pt-PT.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_pt-PT.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">As funcionalidades mais relevantes para si em alturas diferentes.</translation> <translation id="2085876078937250610">Guardar…</translation> <translation id="2096239473850415494">Não foi possível transferir</translation> +<translation id="2096716221239095980">Eliminar todos os dados</translation> <translation id="2103075008456228677">Abrir history.google.com</translation> <translation id="2104436223719117661">Pesquisas populares</translation> <translation id="21133533946938348">Fixar Separador</translation> @@ -1395,6 +1396,7 @@ <translation id="7248046129087111453">O <ph name="BEGIN_LINK" />histórico de pesquisas<ph name="END_LINK" /> e <ph name="BEGIN_LINK" />outras formas de atividade<ph name="END_LINK" /> podem ser guardados na sua Conta Google.</translation> <translation id="7253951228444156601">A verificar palavras-passe…</translation> <translation id="7261217796641151584">Partilhar grupo</translation> +<translation id="7266578100016339897">Isto ajuda a manter a organização. Pode alterar esta opção nas definições em qualquer altura.</translation> <translation id="7271220006028561438">Permitir atualizações automáticas de chaves de acesso</translation> <translation id="7272437679830969316">Não é possível validar a sua identidade. Palavra-passe não copiada.</translation> <translation id="7293429513719260019">Selecionar idioma</translation> @@ -1589,6 +1591,7 @@ <translation id="8080028325999236607">Fechar Todos os Separadores</translation> <translation id="8084285576995584326">Controle os dados da sua Conta Google</translation> <translation id="809543534949702122">Histórico de pesquisas</translation> +<translation id="8095985449280932182">{COUNT,plural, =1{Os separadores que não usa são movidos para aqui após {COUNT} dia}other{Os separadores que não usa são movidos para aqui após {COUNT} dias}}</translation> <translation id="8101409298456377967">Crie, guarde e faça a gestão das suas palavras-passe para poder iniciar sessão facilmente nos sites e apps. <ph name="BEGIN_LINK" />Saiba mais<ph name="END_LINK" /></translation> <translation id="8102130909719902723">N</translation> <translation id="8114753159095730575">A transferência de ficheiros está disponível. Opções disponíveis junto à parte inferior do ecrã.</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_ro.xtb b/ios/chrome/app/strings/resources/ios_strings_ro.xtb index c28d8dd..a598cacb 100644 --- a/ios/chrome/app/strings/resources/ios_strings_ro.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_ro.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">Cele mai relevante funcții pentru tine la diferite ore.</translation> <translation id="2085876078937250610">Salvează…</translation> <translation id="2096239473850415494">Nu s-a putut descărca</translation> +<translation id="2096716221239095980">Șterge toate datele</translation> <translation id="2103075008456228677">Deschide history.google.com</translation> <translation id="2104436223719117661">Căutări populare</translation> <translation id="21133533946938348">Fixează fila</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_ru.xtb b/ios/chrome/app/strings/resources/ios_strings_ru.xtb index 21a5f45..94570da 100644 --- a/ios/chrome/app/strings/resources/ios_strings_ru.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_ru.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">Быстрый доступ к самым важным функциям</translation> <translation id="2085876078937250610">Сохранить</translation> <translation id="2096239473850415494">Не удалось скачать</translation> +<translation id="2096716221239095980">Удалить все данные</translation> <translation id="2103075008456228677">Открыть history.google.com</translation> <translation id="2104436223719117661">Популярное</translation> <translation id="21133533946938348">Закрепить вкладку</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_si.xtb b/ios/chrome/app/strings/resources/ios_strings_si.xtb index fcc87e50..79bf2f2 100644 --- a/ios/chrome/app/strings/resources/ios_strings_si.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_si.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">විවිධ කාලවල දී ඔබට වඩාත් ම අදාළ විශේෂාංග.</translation> <translation id="2085876078937250610">සුරකින්න…</translation> <translation id="2096239473850415494">බාගැනීමට නොහැකි විය</translation> +<translation id="2096716221239095980">සියලු දත්ත මකන්න</translation> <translation id="2103075008456228677">history.google.com විවෘත කරන්න</translation> <translation id="2104436223719117661">නැඟී එන සෙවීම්</translation> <translation id="21133533946938348">ටැබය වෙත අමුණන්න</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_sk.xtb b/ios/chrome/app/strings/resources/ios_strings_sk.xtb index 6f0c0be..a79b75f7 100644 --- a/ios/chrome/app/strings/resources/ios_strings_sk.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_sk.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">Funkcie, ktoré sú pre vás najrelevantnejšie v rôznych časoch.</translation> <translation id="2085876078937250610">Uložiť…</translation> <translation id="2096239473850415494">Nepodarilo sa stiahnuť</translation> +<translation id="2096716221239095980">Odstrániť všetky dáta</translation> <translation id="2103075008456228677">Otvoriť history.google.com</translation> <translation id="2104436223719117661">Populárne vyhľadávania</translation> <translation id="21133533946938348">Pripnúť kartu</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_sl.xtb b/ios/chrome/app/strings/resources/ios_strings_sl.xtb index 4c4d867..76458983b 100644 --- a/ios/chrome/app/strings/resources/ios_strings_sl.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_sl.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">Najustreznejše funkcije za vas ob različnih časih.</translation> <translation id="2085876078937250610">Shrani …</translation> <translation id="2096239473850415494">Ni bilo mogoče prenesti</translation> +<translation id="2096716221239095980">Izbriši vse podatke</translation> <translation id="2103075008456228677">Odpri history.google.com</translation> <translation id="2104436223719117661">Iskanja v trendu</translation> <translation id="21133533946938348">Pripni zavihek</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_sq.xtb b/ios/chrome/app/strings/resources/ios_strings_sq.xtb index a68657f4..9b59e14 100644 --- a/ios/chrome/app/strings/resources/ios_strings_sq.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_sq.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">Veçoritë më të përshtatshme për ty në kohë të ndryshme.</translation> <translation id="2085876078937250610">Ruaj…</translation> <translation id="2096239473850415494">Nuk mund të shkarkohej</translation> +<translation id="2096716221239095980">Fshi të gjitha të dhënat</translation> <translation id="2103075008456228677">Hap history.google.com</translation> <translation id="2104436223719117661">Kërkimet në tendencë</translation> <translation id="21133533946938348">Gozhdimi i skedës</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_sr-Latn.xtb b/ios/chrome/app/strings/resources/ios_strings_sr-Latn.xtb index e6efa9e..fa7c256 100644 --- a/ios/chrome/app/strings/resources/ios_strings_sr-Latn.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_sr-Latn.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">Najrelevantnije funkcije za vas u različitim periodima.</translation> <translation id="2085876078937250610">Sačuvaj…</translation> <translation id="2096239473850415494">Preuzimanje nije uspelo</translation> +<translation id="2096716221239095980">Izbriši sve podatke</translation> <translation id="2103075008456228677">Otvori history.google.com</translation> <translation id="2104436223719117661">Pretrage u trendu</translation> <translation id="21133533946938348">Zakači karticu</translation> @@ -1395,6 +1396,7 @@ <translation id="7248046129087111453"><ph name="BEGIN_LINK" />Istorija pretrage<ph name="END_LINK" /> i <ph name="BEGIN_LINK" />drugi oblici aktivnosti<ph name="END_LINK" /> mogu da budu sačuvani na Google nalogu</translation> <translation id="7253951228444156601">Proveravaju se lozinke…</translation> <translation id="7261217796641151584">Deli grupu</translation> +<translation id="7266578100016339897">To vam pomaže da ostanete organizovani. To možete da promenite u podešavanjima u bilo kom trenutku.</translation> <translation id="7271220006028561438">Dozvoli automatsku nadogradnju pristupnih ključeva</translation> <translation id="7272437679830969316">Verifikacija identiteta nije uspela. Lozinka nije kopirana.</translation> <translation id="7293429513719260019">Izaberite jezik</translation> @@ -1589,6 +1591,7 @@ <translation id="8080028325999236607">Zatvori sve kartice</translation> <translation id="8084285576995584326">Kontrolišite podatke Google naloga</translation> <translation id="809543534949702122">Istorija pretrage</translation> +<translation id="8095985449280932182">{COUNT,plural, =1{Kartice koje ne koristite premeštaju se ovde posle {COUNT} dana}one{Kartice koje ne koristite premeštaju se ovde posle {COUNT} dana}few{Kartice koje ne koristite premeštaju se ovde posle {COUNT} dana}other{Kartice koje ne koristite premeštaju se ovde posle {COUNT} dana}}</translation> <translation id="8101409298456377967">Pravite i čuvajte lozinke i upravljajte njima da biste se lako prijavljivali na sajtove i u aplikacije. <ph name="BEGIN_LINK" />Saznajte više<ph name="END_LINK" /></translation> <translation id="8102130909719902723">N</translation> <translation id="8114753159095730575">Preuzimanje datoteke nije dostupno. Opcije su navedene u dnu ekrana.</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_sr.xtb b/ios/chrome/app/strings/resources/ios_strings_sr.xtb index 4774920..b2e48c2 100644 --- a/ios/chrome/app/strings/resources/ios_strings_sr.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_sr.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">Најрелевантније функције за вас у различитим периодима.</translation> <translation id="2085876078937250610">Сачувај…</translation> <translation id="2096239473850415494">Преузимање није успело</translation> +<translation id="2096716221239095980">Избриши све податке</translation> <translation id="2103075008456228677">Отвори history.google.com</translation> <translation id="2104436223719117661">Претраге у тренду</translation> <translation id="21133533946938348">Закачи картицу</translation> @@ -1395,6 +1396,7 @@ <translation id="7248046129087111453"><ph name="BEGIN_LINK" />Историја претраге<ph name="END_LINK" /> и <ph name="BEGIN_LINK" />други облици активности<ph name="END_LINK" /> могу да буду сачувани на Google налогу</translation> <translation id="7253951228444156601">Проверавају се лозинке…</translation> <translation id="7261217796641151584">Дели групу</translation> +<translation id="7266578100016339897">То вам помаже да останете организовани. То можете да промените у подешавањима у било ком тренутку.</translation> <translation id="7271220006028561438">Дозволи аутоматску надоградњу приступних кључева</translation> <translation id="7272437679830969316">Верификација идентитета није успела. Лозинка није копирана.</translation> <translation id="7293429513719260019">Изаберите језик</translation> @@ -1589,6 +1591,7 @@ <translation id="8080028325999236607">Затвори све картице</translation> <translation id="8084285576995584326">Контролишите податке Google налога</translation> <translation id="809543534949702122">Историја претраге</translation> +<translation id="8095985449280932182">{COUNT,plural, =1{Картице које не користите премештају се овде после {COUNT} дана}one{Картице које не користите премештају се овде после {COUNT} дана}few{Картице које не користите премештају се овде после {COUNT} дана}other{Картице које не користите премештају се овде после {COUNT} дана}}</translation> <translation id="8101409298456377967">Правите и чувајте лозинке и управљајте њима да бисте се лако пријављивали на сајтове и у апликације. <ph name="BEGIN_LINK" />Сазнајте више<ph name="END_LINK" /></translation> <translation id="8102130909719902723">Н</translation> <translation id="8114753159095730575">Преузимање датотеке није доступно. Опције су наведене у дну екрана.</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_sv.xtb b/ios/chrome/app/strings/resources/ios_strings_sv.xtb index a6aa70f..b7ed14c 100644 --- a/ios/chrome/app/strings/resources/ios_strings_sv.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_sv.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">Funktionerna som är mest relevanta för dig vid olika tidpunkter.</translation> <translation id="2085876078937250610">Spara …</translation> <translation id="2096239473850415494">Det gick inte att ladda ned</translation> +<translation id="2096716221239095980">Radera all data</translation> <translation id="2103075008456228677">Öppna history.google.com</translation> <translation id="2104436223719117661">Populära sökningar</translation> <translation id="21133533946938348">Fäst flik</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_sw.xtb b/ios/chrome/app/strings/resources/ios_strings_sw.xtb index a70f76a..52d8e1f 100644 --- a/ios/chrome/app/strings/resources/ios_strings_sw.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_sw.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">Vipengele vinavyokufaa zaidi nyakati tofauti.</translation> <translation id="2085876078937250610">Hifadhi…</translation> <translation id="2096239473850415494">Imeshindwa kupakua</translation> +<translation id="2096716221239095980">Futa data yote</translation> <translation id="2103075008456228677">Fungua history.google.com</translation> <translation id="2104436223719117661">Hoja za utafutaji zinazovuma</translation> <translation id="21133533946938348">Bandikiza Kichupo</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_ta.xtb b/ios/chrome/app/strings/resources/ios_strings_ta.xtb index 59e3a12..adc2f9d 100644 --- a/ios/chrome/app/strings/resources/ios_strings_ta.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_ta.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">வெவ்வேறு நேரங்களில் உங்களுக்கு மிகவும் தொடர்புடைய அம்சங்கள்.</translation> <translation id="2085876078937250610">சேமி…</translation> <translation id="2096239473850415494">பதிவிறக்க முடியவில்லை</translation> +<translation id="2096716221239095980">அனைத்து தரவையும் நீக்கு</translation> <translation id="2103075008456228677">history.google.comஐத் திற</translation> <translation id="2104436223719117661">பிரபலமான தேடல்கள்</translation> <translation id="21133533946938348">தாவலைப் பொருத்து</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_te.xtb b/ios/chrome/app/strings/resources/ios_strings_te.xtb index 4c6313f5..22feb190 100644 --- a/ios/chrome/app/strings/resources/ios_strings_te.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_te.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">వేర్వేరు సమయాల్లో మీ కోసం అత్యంత సంబంధిత ఫీచర్లు.</translation> <translation id="2085876078937250610">సేవ్ చేయండి…</translation> <translation id="2096239473850415494">డౌన్లోడ్ చేయడం సాధ్యపడలేదు</translation> +<translation id="2096716221239095980">మొత్తం డేటాను తొలగించండి</translation> <translation id="2103075008456228677">history.google.com తెరువు</translation> <translation id="2104436223719117661">ట్రెండింగ్లో ఉన్న సెర్చ్ క్వెరీలు</translation> <translation id="21133533946938348">ట్యాబ్ను పిన్ చేయి</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_th.xtb b/ios/chrome/app/strings/resources/ios_strings_th.xtb index 8f1a97cb..45e0935 100644 --- a/ios/chrome/app/strings/resources/ios_strings_th.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_th.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">ฟีเจอร์ที่เกี่ยวข้องกับคุณมากที่สุดในช่วงเวลาต่างๆ</translation> <translation id="2085876078937250610">บันทึก…</translation> <translation id="2096239473850415494">ดาวน์โหลดไม่ได้</translation> +<translation id="2096716221239095980">ลบข้อมูลทั้งหมด</translation> <translation id="2103075008456228677">เปิด history.google.com</translation> <translation id="2104436223719117661">การค้นหาที่มาแรง</translation> <translation id="21133533946938348">ปักหมุดแท็บ</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_tr.xtb b/ios/chrome/app/strings/resources/ios_strings_tr.xtb index ede3b5d..d1eeee86 100644 --- a/ios/chrome/app/strings/resources/ios_strings_tr.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_tr.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">Farklı zamanlarda sizin için en alakalı özellikler.</translation> <translation id="2085876078937250610">Kaydet…</translation> <translation id="2096239473850415494">İndirilemedi</translation> +<translation id="2096716221239095980">Tüm verileri sil</translation> <translation id="2103075008456228677">history.google.com'u aç</translation> <translation id="2104436223719117661">Trend olan aramalar</translation> <translation id="21133533946938348">Sekmeyi İğnele</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_uk.xtb b/ios/chrome/app/strings/resources/ios_strings_uk.xtb index 99d1b725..f23a8b5 100644 --- a/ios/chrome/app/strings/resources/ios_strings_uk.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_uk.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">Швидкий доступ до найважливіших функцій.</translation> <translation id="2085876078937250610">Зберегти…</translation> <translation id="2096239473850415494">Не вдалося завантажити</translation> +<translation id="2096716221239095980">Видалити всі дані</translation> <translation id="2103075008456228677">Відкрити history.google.com</translation> <translation id="2104436223719117661">Популярні запити</translation> <translation id="21133533946938348">Закріпити вкладку</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_ur.xtb b/ios/chrome/app/strings/resources/ios_strings_ur.xtb index 70857d59..8b4da2b 100644 --- a/ios/chrome/app/strings/resources/ios_strings_ur.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_ur.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">مختلف اوقات میں آپ کیلئے سب سے زیادہ متعلقہ خصوصیات۔</translation> <translation id="2085876078937250610">محفوظ کریں…</translation> <translation id="2096239473850415494">ڈاؤن لوڈ نہیں کی جا سکی</translation> +<translation id="2096716221239095980">سبھی ڈیٹا حذف کریں</translation> <translation id="2103075008456228677">history.google.com کھولیں</translation> <translation id="2104436223719117661">رجحان ساز تلاشیں</translation> <translation id="21133533946938348">ٹیب کو پن کریں</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_uz.xtb b/ios/chrome/app/strings/resources/ios_strings_uz.xtb index 84b1783..507839d 100644 --- a/ios/chrome/app/strings/resources/ios_strings_uz.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_uz.xtb
@@ -108,6 +108,7 @@ <translation id="143681031165817424">Manzil faqat bu qurilmada saqlangan</translation> <translation id="1445276840641906250">Barcha varaqlar yagona brauzerda</translation> <translation id="1450170672351507823">Standart himoya yoniq. Yanada kuchli himoyalanish uchun kengaytirilgan himoyadan foydalaning.</translation> +<translation id="1454615514353469963">Google Parollar menejeridagi parollar, kalitlar va boshqa maʼlumotlar butunlay oʻchirib tashlanadi.</translation> <translation id="1455660774629812862">Berkitilmasin</translation> <translation id="1460751212339734034">Vaqtni tejang, kamroq yozing</translation> <translation id="1466035273550360103">Ochiq varaqlar topilmadi</translation> @@ -262,6 +263,7 @@ <translation id="2082906935540894275">Turli vaqtdagi eng mos funksiyalar.</translation> <translation id="2085876078937250610">Saqlash…</translation> <translation id="2096239473850415494">Yuklab olinmadi</translation> +<translation id="2096716221239095980">Hammasini oʻchirish</translation> <translation id="2103075008456228677">history.google.com sahifasini ochish</translation> <translation id="2104436223719117661">Trenddagi qidiruvlar</translation> <translation id="21133533946938348">Ichki oynani qadab qo‘yish</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_vi.xtb b/ios/chrome/app/strings/resources/ios_strings_vi.xtb index 24c8440..9e5a241 100644 --- a/ios/chrome/app/strings/resources/ios_strings_vi.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_vi.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">Các tính năng phù hợp với bạn nhất vào những thời điểm khác nhau.</translation> <translation id="2085876078937250610">Lưu…</translation> <translation id="2096239473850415494">Không thể tải xuống</translation> +<translation id="2096716221239095980">Xoá mọi dữ liệu</translation> <translation id="2103075008456228677">Mở history.google.com</translation> <translation id="2104436223719117661">Nội dung tìm kiếm thịnh hành</translation> <translation id="21133533946938348">Ghim Thẻ</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_zh-CN.xtb b/ios/chrome/app/strings/resources/ios_strings_zh-CN.xtb index 1dfed88..b1cc344 100644 --- a/ios/chrome/app/strings/resources/ios_strings_zh-CN.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_zh-CN.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">在不同时间为您提供最相关的功能。</translation> <translation id="2085876078937250610">保存…</translation> <translation id="2096239473850415494">无法下载</translation> +<translation id="2096716221239095980">删除所有数据</translation> <translation id="2103075008456228677">打开 history.google.com</translation> <translation id="2104436223719117661">热搜</translation> <translation id="21133533946938348">固定标签页</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_zh-HK.xtb b/ios/chrome/app/strings/resources/ios_strings_zh-HK.xtb index b31ed1ad..f0010d5 100644 --- a/ios/chrome/app/strings/resources/ios_strings_zh-HK.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_zh-HK.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">不同時間最切合你所需的功能。</translation> <translation id="2085876078937250610">儲存…</translation> <translation id="2096239473850415494">無法下載</translation> +<translation id="2096716221239095980">刪除所有資料</translation> <translation id="2103075008456228677">開啟 history.google.com</translation> <translation id="2104436223719117661">熱門搜尋</translation> <translation id="21133533946938348">固定分頁</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_zh-TW.xtb b/ios/chrome/app/strings/resources/ios_strings_zh-TW.xtb index 79019b0..e8f0f0e82 100644 --- a/ios/chrome/app/strings/resources/ios_strings_zh-TW.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_zh-TW.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">在不同時間提供你最需要的功能。</translation> <translation id="2085876078937250610">儲存…</translation> <translation id="2096239473850415494">無法下載</translation> +<translation id="2096716221239095980">刪除所有資料</translation> <translation id="2103075008456228677">開啟 history.google.com</translation> <translation id="2104436223719117661">熱門搜尋</translation> <translation id="21133533946938348">固定分頁</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_zu.xtb b/ios/chrome/app/strings/resources/ios_strings_zu.xtb index 49527f4..0aa1497 100644 --- a/ios/chrome/app/strings/resources/ios_strings_zu.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_zu.xtb
@@ -262,6 +262,7 @@ <translation id="2082906935540894275">Izakhi ezihambisana kakhulu kuwe ngezikhathi ezahlukahlukene.</translation> <translation id="2085876078937250610">Londoloza…</translation> <translation id="2096239473850415494">Ayikwazanga ukudawuniloda</translation> +<translation id="2096716221239095980">Sula yonke idatha</translation> <translation id="2103075008456228677">Vula ku-history.google.com</translation> <translation id="2104436223719117661">Usesho oluwundabuzekwayo</translation> <translation id="21133533946938348">Phina ithebhu</translation>
diff --git a/ios/chrome/widget_kit_extension/strings/resources/ios_widget_kit_extension_strings_fr.xtb b/ios/chrome/widget_kit_extension/strings/resources/ios_widget_kit_extension_strings_fr.xtb index b80b70a..b6eacf8a 100644 --- a/ios/chrome/widget_kit_extension/strings/resources/ios_widget_kit_extension_strings_fr.xtb +++ b/ios/chrome/widget_kit_extension/strings/resources/ios_widget_kit_extension_strings_fr.xtb
@@ -12,7 +12,7 @@ <translation id="3501428580460217920">Effectuez une recherche ou naviguez dans un nouvel onglet de navigation privée dans Chrome.</translation> <translation id="3528874492835415837">Rechercher ou saisir une URL</translation> <translation id="3798529146539130967">Lancez une recherche vocale dans Chrome.</translation> -<translation id="405442954313519726">Effectuez une recherche ou naviguez dans un nouvel onglet, en mode navigation privée, en utilisant votre voix ou avec un code QR.</translation> +<translation id="405442954313519726">Effectuez une recherche ou naviguez dans un nouvel onglet, en mode navigation privée, en utilisant votre voix ou avec un QR code.</translation> <translation id="4557098988773644458">Jouer à Chrome Dino</translation> <translation id="4678859075583681103">Faites une nouvelle recherche ou ouvrez vos sites les plus consultés depuis la page d'accueil de votre iPhone.</translation> <translation id="4954445889641385956">Rechercher ou saisir une URL</translation> @@ -33,7 +33,7 @@ <translation id="7010831364920321713">Recherche en navigation privée</translation> <translation id="7048549665319929185">Rechercher ou saisir une URL</translation> -<translation id="7317302007099170473">Scanner le code QR</translation> +<translation id="7317302007099170473">Scanner le QR code</translation> <translation id="744668050028871192">Rechercher</translation> <translation id="7730705312376865830">Raccourcis Chrome</translation> <translation id="8104498668011127805">Jouer au jeu du dinosaure sur Chrome</translation>
diff --git a/ios/google_internal/frameworks/ChromeExtensionKeychainInternal.framework.dSYM.ios.zip.sha1 b/ios/google_internal/frameworks/ChromeExtensionKeychainInternal.framework.dSYM.ios.zip.sha1 index 178e95e..107217a0 100644 --- a/ios/google_internal/frameworks/ChromeExtensionKeychainInternal.framework.dSYM.ios.zip.sha1 +++ b/ios/google_internal/frameworks/ChromeExtensionKeychainInternal.framework.dSYM.ios.zip.sha1
@@ -1 +1 @@ -27adad40a8bd7aaa4f08b3803a41fff01f3ff4ba \ No newline at end of file +5213c8f3b6278bf5219a8ce6e3bb0b7eaa021f8c \ No newline at end of file
diff --git a/ios/google_internal/frameworks/ChromeExtensionKeychainInternal.framework.dSYM.ios_asan.zip.sha1 b/ios/google_internal/frameworks/ChromeExtensionKeychainInternal.framework.dSYM.ios_asan.zip.sha1 index 807835b..366f4b4 100644 --- a/ios/google_internal/frameworks/ChromeExtensionKeychainInternal.framework.dSYM.ios_asan.zip.sha1 +++ b/ios/google_internal/frameworks/ChromeExtensionKeychainInternal.framework.dSYM.ios_asan.zip.sha1
@@ -1 +1 @@ -a7882e675136f6c3b2ee8279162c02eecbbda784 \ No newline at end of file +d6ad4d344626d43e9d1c57497fb45db430d83ba0 \ No newline at end of file
diff --git a/ios/google_internal/frameworks/ChromeInternal.framework.dSYM.ios.zip.sha1 b/ios/google_internal/frameworks/ChromeInternal.framework.dSYM.ios.zip.sha1 index 0b15543..3ba5194 100644 --- a/ios/google_internal/frameworks/ChromeInternal.framework.dSYM.ios.zip.sha1 +++ b/ios/google_internal/frameworks/ChromeInternal.framework.dSYM.ios.zip.sha1
@@ -1 +1 @@ -05914f6b70f817266d877687dcede50f69f7426f \ No newline at end of file +063661fc34d89b3fab732bf79d776595694b31ae \ No newline at end of file
diff --git a/ios/google_internal/frameworks/ChromeInternal.framework.dSYM.ios_asan.zip.sha1 b/ios/google_internal/frameworks/ChromeInternal.framework.dSYM.ios_asan.zip.sha1 index b17db13c..86cf3e5 100644 --- a/ios/google_internal/frameworks/ChromeInternal.framework.dSYM.ios_asan.zip.sha1 +++ b/ios/google_internal/frameworks/ChromeInternal.framework.dSYM.ios_asan.zip.sha1
@@ -1 +1 @@ -c677a66789707912f5543bd6c94852b30f92dce9 \ No newline at end of file +1878b37a5417bc4897b7a3c2ae2bf12c5ba4b290 \ No newline at end of file
diff --git a/ios/google_internal/frameworks/ChromeSSOInternal.framework.dSYM.ios.zip.sha1 b/ios/google_internal/frameworks/ChromeSSOInternal.framework.dSYM.ios.zip.sha1 index f9a439a..c84655a4 100644 --- a/ios/google_internal/frameworks/ChromeSSOInternal.framework.dSYM.ios.zip.sha1 +++ b/ios/google_internal/frameworks/ChromeSSOInternal.framework.dSYM.ios.zip.sha1
@@ -1 +1 @@ -925307843717b4b7aacebbed00773fa9e348ea10 \ No newline at end of file +f7c6ec5a709a017522433ab9f29751ba47fb0569 \ No newline at end of file
diff --git a/ios/google_internal/frameworks/ChromeSSOInternal.framework.dSYM.ios_asan.zip.sha1 b/ios/google_internal/frameworks/ChromeSSOInternal.framework.dSYM.ios_asan.zip.sha1 index ab977b54..81d5261c 100644 --- a/ios/google_internal/frameworks/ChromeSSOInternal.framework.dSYM.ios_asan.zip.sha1 +++ b/ios/google_internal/frameworks/ChromeSSOInternal.framework.dSYM.ios_asan.zip.sha1
@@ -1 +1 @@ -372e07b881e087705b9d9c64ce87a3f5446ebae7 \ No newline at end of file +fe76c7a6260b3a9fdde98b4e7fd176de2cd8bf32 \ No newline at end of file
diff --git a/ios/google_internal/frameworks/chrome_extension_keychain_internal_dynamic_framework.ios.zip.sha1 b/ios/google_internal/frameworks/chrome_extension_keychain_internal_dynamic_framework.ios.zip.sha1 index ff33fae..6a5ca56 100644 --- a/ios/google_internal/frameworks/chrome_extension_keychain_internal_dynamic_framework.ios.zip.sha1 +++ b/ios/google_internal/frameworks/chrome_extension_keychain_internal_dynamic_framework.ios.zip.sha1
@@ -1 +1 @@ -0232f6aa08d6095c812cf74a26fc7e4e3170e761 \ No newline at end of file +d0c2e678cc5c19b854b6a7c98f47ce341da8f14a \ No newline at end of file
diff --git a/ios/google_internal/frameworks/chrome_extension_keychain_internal_dynamic_framework.ios_asan.zip.sha1 b/ios/google_internal/frameworks/chrome_extension_keychain_internal_dynamic_framework.ios_asan.zip.sha1 index d1962ddd..a6f2a972 100644 --- a/ios/google_internal/frameworks/chrome_extension_keychain_internal_dynamic_framework.ios_asan.zip.sha1 +++ b/ios/google_internal/frameworks/chrome_extension_keychain_internal_dynamic_framework.ios_asan.zip.sha1
@@ -1 +1 @@ -df377344e639f7d8719f36c866e4370d7a0bb9c7 \ No newline at end of file +a54e1348faf41936a60ecb80bac6f93e3a708540 \ No newline at end of file
diff --git a/ios/google_internal/frameworks/chrome_extension_keychain_internal_dynamic_framework.iossimulator.zip.sha1 b/ios/google_internal/frameworks/chrome_extension_keychain_internal_dynamic_framework.iossimulator.zip.sha1 index e56addb0..fe75899 100644 --- a/ios/google_internal/frameworks/chrome_extension_keychain_internal_dynamic_framework.iossimulator.zip.sha1 +++ b/ios/google_internal/frameworks/chrome_extension_keychain_internal_dynamic_framework.iossimulator.zip.sha1
@@ -1 +1 @@ -4c0dd636b10f16b836fd6589f3b33d591df57df4 \ No newline at end of file +9717c7c51e1aa947f8907f9289f4aeffc23a1107 \ No newline at end of file
diff --git a/ios/google_internal/frameworks/chrome_extension_keychain_internal_dynamic_framework.iossimulator_asan.zip.sha1 b/ios/google_internal/frameworks/chrome_extension_keychain_internal_dynamic_framework.iossimulator_asan.zip.sha1 index 37d0b55..e240758 100644 --- a/ios/google_internal/frameworks/chrome_extension_keychain_internal_dynamic_framework.iossimulator_asan.zip.sha1 +++ b/ios/google_internal/frameworks/chrome_extension_keychain_internal_dynamic_framework.iossimulator_asan.zip.sha1
@@ -1 +1 @@ -c88e676eca40e30221d1c6fac8d37b8e6b3aab6e \ No newline at end of file +158d484b9df172ee51a4f31e2b02674aa4dbd0c4 \ No newline at end of file
diff --git a/ios/google_internal/frameworks/chrome_internal_dynamic_framework.ios.zip.sha1 b/ios/google_internal/frameworks/chrome_internal_dynamic_framework.ios.zip.sha1 index 81cf73d..e5cdf03 100644 --- a/ios/google_internal/frameworks/chrome_internal_dynamic_framework.ios.zip.sha1 +++ b/ios/google_internal/frameworks/chrome_internal_dynamic_framework.ios.zip.sha1
@@ -1 +1 @@ -377de4d352ce74fe448b8aa4e0197c81eeb9cd5c \ No newline at end of file +e2b99b7ff56b7db2f3427d43b57fa909517d024f \ No newline at end of file
diff --git a/ios/google_internal/frameworks/chrome_internal_dynamic_framework.ios_asan.zip.sha1 b/ios/google_internal/frameworks/chrome_internal_dynamic_framework.ios_asan.zip.sha1 index 8640dcd..487d9df03 100644 --- a/ios/google_internal/frameworks/chrome_internal_dynamic_framework.ios_asan.zip.sha1 +++ b/ios/google_internal/frameworks/chrome_internal_dynamic_framework.ios_asan.zip.sha1
@@ -1 +1 @@ -9a86e697ca8aa62462f59311e52c9bc61054f055 \ No newline at end of file +7634304caa82885d7a69c97aff19b7c95c6552da \ No newline at end of file
diff --git a/ios/google_internal/frameworks/chrome_internal_dynamic_framework.iossimulator.zip.sha1 b/ios/google_internal/frameworks/chrome_internal_dynamic_framework.iossimulator.zip.sha1 index c890d06..629997e 100644 --- a/ios/google_internal/frameworks/chrome_internal_dynamic_framework.iossimulator.zip.sha1 +++ b/ios/google_internal/frameworks/chrome_internal_dynamic_framework.iossimulator.zip.sha1
@@ -1 +1 @@ -3c5731c0045bf95bdd2d7ae0bad6f60d10994226 \ No newline at end of file +32329bb21e6d077a5214374e65aa5b58aeceb476 \ No newline at end of file
diff --git a/ios/google_internal/frameworks/chrome_internal_dynamic_framework.iossimulator_asan.zip.sha1 b/ios/google_internal/frameworks/chrome_internal_dynamic_framework.iossimulator_asan.zip.sha1 index 8883789..fbc3fac9 100644 --- a/ios/google_internal/frameworks/chrome_internal_dynamic_framework.iossimulator_asan.zip.sha1 +++ b/ios/google_internal/frameworks/chrome_internal_dynamic_framework.iossimulator_asan.zip.sha1
@@ -1 +1 @@ -5480dbc57410ebb15e97ca965f67c1691229136b \ No newline at end of file +a3d5a565e066d34bf4124d46cf4ddce0aaaf62e2 \ No newline at end of file
diff --git a/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.ios.zip.sha1 b/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.ios.zip.sha1 index 476c446..64d2b57 100644 --- a/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.ios.zip.sha1 +++ b/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.ios.zip.sha1
@@ -1 +1 @@ -4c78fc20bc956452b8ca4d39c308f701394ae900 \ No newline at end of file +ae9c3ffcb16427b02ba115224f0b7d254bde7684 \ No newline at end of file
diff --git a/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.ios_asan.zip.sha1 b/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.ios_asan.zip.sha1 index 5771867..2189f3c3 100644 --- a/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.ios_asan.zip.sha1 +++ b/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.ios_asan.zip.sha1
@@ -1 +1 @@ -bd7672b3db992805dc04ecee36342bf0bb08f4e2 \ No newline at end of file +99a89e6d22fa92a8bfd4084ed265f6548fc15600 \ No newline at end of file
diff --git a/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.iossimulator.zip.sha1 b/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.iossimulator.zip.sha1 index f523e7b..1987e1c 100644 --- a/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.iossimulator.zip.sha1 +++ b/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.iossimulator.zip.sha1
@@ -1 +1 @@ -96ffe447bfb8436f1a632e30dae108f4e0925092 \ No newline at end of file +0edf1713995c55a62420f0887f0909ba93a6fa8a \ No newline at end of file
diff --git a/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.iossimulator_asan.zip.sha1 b/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.iossimulator_asan.zip.sha1 index c2666850..f8449f5a 100644 --- a/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.iossimulator_asan.zip.sha1 +++ b/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.iossimulator_asan.zip.sha1
@@ -1 +1 @@ -e0fda49d0293fdff9b1ea9043de1712145302bf7 \ No newline at end of file +83aac2de4aac8cfe7e2358e40b54c6f89c13d37d \ No newline at end of file
diff --git a/ios/google_internal/frameworks/chrome_test_internal_dynamic_framework.ios.zip.sha1 b/ios/google_internal/frameworks/chrome_test_internal_dynamic_framework.ios.zip.sha1 index 7bf0070b..e7a04772 100644 --- a/ios/google_internal/frameworks/chrome_test_internal_dynamic_framework.ios.zip.sha1 +++ b/ios/google_internal/frameworks/chrome_test_internal_dynamic_framework.ios.zip.sha1
@@ -1 +1 @@ -23464bed5da13b5b7de672d070a0e98aae0c5980 \ No newline at end of file +cd123d0bbc8351716b80c673e6f00b3d396c66c8 \ No newline at end of file
diff --git a/ios/google_internal/frameworks/chrome_test_internal_dynamic_framework.iossimulator.zip.sha1 b/ios/google_internal/frameworks/chrome_test_internal_dynamic_framework.iossimulator.zip.sha1 index 4ee8be65..565a193 100644 --- a/ios/google_internal/frameworks/chrome_test_internal_dynamic_framework.iossimulator.zip.sha1 +++ b/ios/google_internal/frameworks/chrome_test_internal_dynamic_framework.iossimulator.zip.sha1
@@ -1 +1 @@ -c712f873f8f3d17e8387de888194742cf44aa62b \ No newline at end of file +4c384c64909fe3ac4338f98d6c58adb0e9fd6475 \ No newline at end of file
diff --git a/ios/google_internal/frameworks/remoting_internal_dynamic_framework.ios.zip.sha1 b/ios/google_internal/frameworks/remoting_internal_dynamic_framework.ios.zip.sha1 index e9ed5f7..fce1253 100644 --- a/ios/google_internal/frameworks/remoting_internal_dynamic_framework.ios.zip.sha1 +++ b/ios/google_internal/frameworks/remoting_internal_dynamic_framework.ios.zip.sha1
@@ -1 +1 @@ -3357224f3e4471b8fa17eed77dd44c875b1c7ceb \ No newline at end of file +7e69ccba6728a584824a9726859e8dae7e7e0d85 \ No newline at end of file
diff --git a/ios/google_internal/frameworks/remoting_internal_dynamic_framework.ios_asan.zip.sha1 b/ios/google_internal/frameworks/remoting_internal_dynamic_framework.ios_asan.zip.sha1 index fc5ab42..ebbd774df 100644 --- a/ios/google_internal/frameworks/remoting_internal_dynamic_framework.ios_asan.zip.sha1 +++ b/ios/google_internal/frameworks/remoting_internal_dynamic_framework.ios_asan.zip.sha1
@@ -1 +1 @@ -b7f8ceb42738d941c12a62cff1fad6dd48ec9a34 \ No newline at end of file +1e0381c032ceb02dde3c40243e9e29235141fb6e \ No newline at end of file
diff --git a/ios/google_internal/frameworks/remoting_internal_dynamic_framework.iossimulator.zip.sha1 b/ios/google_internal/frameworks/remoting_internal_dynamic_framework.iossimulator.zip.sha1 index 6d8da48..33f157b 100644 --- a/ios/google_internal/frameworks/remoting_internal_dynamic_framework.iossimulator.zip.sha1 +++ b/ios/google_internal/frameworks/remoting_internal_dynamic_framework.iossimulator.zip.sha1
@@ -1 +1 @@ -c96c97dadef77a0361de3a6816206f65b089ec12 \ No newline at end of file +11b430b81c9ba677b7b82de7325a93ac9c9c7205 \ No newline at end of file
diff --git a/ios/google_internal/frameworks/remoting_internal_dynamic_framework.iossimulator_asan.zip.sha1 b/ios/google_internal/frameworks/remoting_internal_dynamic_framework.iossimulator_asan.zip.sha1 index a751038..2e46ce9 100644 --- a/ios/google_internal/frameworks/remoting_internal_dynamic_framework.iossimulator_asan.zip.sha1 +++ b/ios/google_internal/frameworks/remoting_internal_dynamic_framework.iossimulator_asan.zip.sha1
@@ -1 +1 @@ -9fa722870e6c765c7e622cc88798be44d799ecfc \ No newline at end of file +8780faf22233182fa4054ffa71df4c8af94c00ed \ No newline at end of file
diff --git a/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.ios.zip.sha1 b/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.ios.zip.sha1 index e860c50..03e6f55 100644 --- a/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.ios.zip.sha1 +++ b/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.ios.zip.sha1
@@ -1 +1 @@ -19c5cc14e2ed14adf02bfdd9d5b7d30b9bffa6e4 \ No newline at end of file +d55b3e51df3b18a1c9cc119d747efc8b3f2ad658 \ No newline at end of file
diff --git a/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.ios_asan.zip.sha1 b/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.ios_asan.zip.sha1 index 60b0ea1..fc613fe 100644 --- a/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.ios_asan.zip.sha1 +++ b/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.ios_asan.zip.sha1
@@ -1 +1 @@ -09f50b09f99ab2b67e4390b3b80aaaf5a39c1e4f \ No newline at end of file +28606eba881fa4339d7db1f2be91799c711b64ff \ No newline at end of file
diff --git a/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.iossimulator.zip.sha1 b/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.iossimulator.zip.sha1 index 4710c247..911a481 100644 --- a/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.iossimulator.zip.sha1 +++ b/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.iossimulator.zip.sha1
@@ -1 +1 @@ -099f9fc3f360315ee07f015bebeb92aa622de2ed \ No newline at end of file +61068f0cb015ccb7993946b0404d52c94c16d0d0 \ No newline at end of file
diff --git a/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.iossimulator_asan.zip.sha1 b/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.iossimulator_asan.zip.sha1 index db88fa45..3ef75ae6 100644 --- a/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.iossimulator_asan.zip.sha1 +++ b/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.iossimulator_asan.zip.sha1
@@ -1 +1 @@ -b0205bd314b26f7a75a1fa07a4be9766f3ef68d1 \ No newline at end of file +75b41c5d0b8ba85d142b14af51d4d5042812e8a7 \ No newline at end of file
diff --git a/ios/third_party/material_components_ios/src b/ios/third_party/material_components_ios/src index 554b1f5..24a0ffb 160000 --- a/ios/third_party/material_components_ios/src +++ b/ios/third_party/material_components_ios/src
@@ -1 +1 @@ -Subproject commit 554b1f5b861658d1e14bc83764a84621d38512bf +Subproject commit 24a0ffbd03f2168492465662825ef38f0308c7b6
diff --git a/ios_internal b/ios_internal index 156f000..d4240f6 160000 --- a/ios_internal +++ b/ios_internal
@@ -1 +1 @@ -Subproject commit 156f0000208f3f45680ec110953276b784deec94 +Subproject commit d4240f6c622349bab9877c20fcacba15f5da9ae9
diff --git a/net/base/features.cc b/net/base/features.cc index d777a55c..2f581dc 100644 --- a/net/base/features.cc +++ b/net/base/features.cc
@@ -158,10 +158,6 @@ BASE_FEATURE(kUseMLKEM, "UseMLKEM", base::FEATURE_ENABLED_BY_DEFAULT); -BASE_FEATURE(kNetUnusedIdleSocketTimeout, - "NetUnusedIdleSocketTimeout", - base::FEATURE_DISABLED_BY_DEFAULT); - BASE_FEATURE(kShortLaxAllowUnsafeThreshold, "ShortLaxAllowUnsafeThreshold", base::FEATURE_DISABLED_BY_DEFAULT);
diff --git a/net/base/features.h b/net/base/features.h index 66bcf331..e24a5c7 100644 --- a/net/base/features.h +++ b/net/base/features.h
@@ -210,9 +210,6 @@ // stable without issues. NET_EXPORT BASE_DECLARE_FEATURE(kUseMLKEM); -// Changes the timeout after which unused sockets idle sockets are cleaned up. -NET_EXPORT BASE_DECLARE_FEATURE(kNetUnusedIdleSocketTimeout); - // When enabled, the time threshold for Lax-allow-unsafe cookies will be lowered // from 2 minutes to 10 seconds. This time threshold refers to the age cutoff // for which cookies that default into SameSite=Lax, which are newer than the
diff --git a/net/base/registry_controlled_domains/registry_controlled_domain.cc b/net/base/registry_controlled_domains/registry_controlled_domain.cc index 44ef7de..32b6c1d 100644 --- a/net/base/registry_controlled_domains/registry_controlled_domain.cc +++ b/net/base/registry_controlled_domains/registry_controlled_domain.cc
@@ -347,8 +347,9 @@ std::string_view GetDomainAndRegistryAsStringPiece( std::string_view host, PrivateRegistryFilter filter) { - if (host.empty() || url::HostIsIPAddress(host)) + if (host.empty() || url::HostIsIPAddress(host)) { return std::string_view(); + } return GetDomainAndRegistryImpl(host, filter); } @@ -378,8 +379,9 @@ // Advance to next "." or end. current = host.find('.', begin); - if (current == std::string::npos) + if (current == std::string::npos) { current = host.length(); + } MappedHostComponent mapping; mapping.original_begin = begin; @@ -400,8 +402,9 @@ mapping.canonical_end = canon_output.length(); components.push_back(mapping); - if (current < host.length()) + if (current < host.length()) { canon_output.push_back('.'); + } } canon_output.Complete(); @@ -467,12 +470,14 @@ url::Component( current_try, static_cast<int>(mapping.original_end) - current_try), - &try_output)) + &try_output)) { continue; // Invalid substring, skip. + } try_output.Complete(); - if (try_string == canonical_rcd) + if (try_string == canonical_rcd) { return host.length() - current_try; + } } } @@ -486,13 +491,15 @@ std::string_view host2, PrivateRegistryFilter filter) { // Quickly reject cases where either host is empty. - if (host1.empty() || host2.empty()) + if (host1.empty() || host2.empty()) { return false; + } // Check for exact host matches, which is faster than looking up the domain // and registry. - if (host1 == host2) + if (host1 == host2) { return true; + } // Check for a domain and registry match. std::string_view domain1 = GetDomainAndRegistryAsStringPiece(host1, filter); @@ -517,8 +524,9 @@ PrivateRegistryFilter filter) { url::CanonHostInfo host_info; const std::string canon_host(CanonicalizeHost(host, &host_info)); - if (canon_host.empty() || host_info.IsIPAddress()) + if (canon_host.empty() || host_info.IsIPAddress()) { return std::string(); + } return std::string(GetDomainAndRegistryImpl(canon_host, filter)); } @@ -528,10 +536,9 @@ return GetDomainAndRegistryAsStringPiece(origin.host(), filter); } -bool SameDomainOrHost( - const GURL& gurl1, - const GURL& gurl2, - PrivateRegistryFilter filter) { +bool SameDomainOrHost(const GURL& gurl1, + const GURL& gurl2, + PrivateRegistryFilter filter) { return SameDomainOrHost(gurl1.host_piece(), gurl2.host_piece(), filter); } @@ -554,10 +561,9 @@ return SameDomainOrHost(gurl.host_piece(), origin.host(), filter); } -size_t GetRegistryLength( - const GURL& gurl, - UnknownRegistryFilter unknown_filter, - PrivateRegistryFilter private_filter) { +size_t GetRegistryLength(const GURL& gurl, + UnknownRegistryFilter unknown_filter, + PrivateRegistryFilter private_filter) { return GetRegistryLengthImpl(gurl.host_piece(), unknown_filter, private_filter) .registry_length;
diff --git a/net/base/registry_controlled_domains/registry_controlled_domain.h b/net/base/registry_controlled_domains/registry_controlled_domain.h index 7e0a2c0..e59b22f 100644 --- a/net/base/registry_controlled_domains/registry_controlled_domain.h +++ b/net/base/registry_controlled_domains/registry_controlled_domain.h
@@ -208,7 +208,8 @@ // URLs. Note that this means the trailing dot, if any, must match too. // Effectively, callers can use this function to check whether the input URLs // represent hosts "on the same site". -NET_EXPORT bool SameDomainOrHost(const GURL& gurl1, const GURL& gurl2, +NET_EXPORT bool SameDomainOrHost(const GURL& gurl1, + const GURL& gurl2, PrivateRegistryFilter filter); NET_EXPORT bool SameDomainOrHost(const url::Origin& origin1, const url::Origin& origin2, @@ -309,7 +310,7 @@ UnknownRegistryFilter unknown_filter, PrivateRegistryFilter private_filter); -typedef const struct DomainRule* (*FindDomainPtr)(const char *, unsigned int); +typedef const struct DomainRule* (*FindDomainPtr)(const char*, unsigned int); // Used for unit tests. Uses default domains. NET_EXPORT_PRIVATE void ResetFindDomainGraphForTesting();
diff --git a/net/base/registry_controlled_domains/registry_controlled_domain_unittest.cc b/net/base/registry_controlled_domains/registry_controlled_domain_unittest.cc index 080eb51..444d7a8a 100644 --- a/net/base/registry_controlled_domains/registry_controlled_domain_unittest.cc +++ b/net/base/registry_controlled_domains/registry_controlled_domain_unittest.cc
@@ -45,19 +45,16 @@ return GetDomainAndRegistry(host, EXCLUDE_PRIVATE_REGISTRIES); } -size_t GetRegistryLengthFromURL( - const std::string& url, - UnknownRegistryFilter unknown_filter) { - return GetRegistryLength(GURL(url), - unknown_filter, +size_t GetRegistryLengthFromURL(const std::string& url, + UnknownRegistryFilter unknown_filter) { + return GetRegistryLength(GURL(url), unknown_filter, EXCLUDE_PRIVATE_REGISTRIES); } size_t GetRegistryLengthFromURLIncludingPrivate( const std::string& url, UnknownRegistryFilter unknown_filter) { - return GetRegistryLength(GURL(url), - unknown_filter, + return GetRegistryLength(GURL(url), unknown_filter, INCLUDE_PRIVATE_REGISTRIES); } @@ -296,17 +293,17 @@ EXPECT_EQ(4U, GetRegistryLengthFromURL("http://baz.com.", INCLUDE_UNKNOWN_REGISTRIES)); // none + EXPECT_EQ(std::string::npos, GetRegistryLengthFromURL( + std::string(), EXCLUDE_UNKNOWN_REGISTRIES)); EXPECT_EQ(std::string::npos, - GetRegistryLengthFromURL(std::string(), EXCLUDE_UNKNOWN_REGISTRIES)); + GetRegistryLengthFromURL("http://", EXCLUDE_UNKNOWN_REGISTRIES)); EXPECT_EQ(std::string::npos, - GetRegistryLengthFromURL("http://", EXCLUDE_UNKNOWN_REGISTRIES)); - EXPECT_EQ(std::string::npos, - GetRegistryLengthFromURL("file:///C:/file.html", - EXCLUDE_UNKNOWN_REGISTRIES)); + GetRegistryLengthFromURL("file:///C:/file.html", + EXCLUDE_UNKNOWN_REGISTRIES)); EXPECT_EQ(0U, GetRegistryLengthFromURL("http://foo.com..", EXCLUDE_UNKNOWN_REGISTRIES)); - EXPECT_EQ(0U, GetRegistryLengthFromURL("http://...", - EXCLUDE_UNKNOWN_REGISTRIES)); + EXPECT_EQ(0U, + GetRegistryLengthFromURL("http://...", EXCLUDE_UNKNOWN_REGISTRIES)); EXPECT_EQ(0U, GetRegistryLengthFromURL("http://192.168.0.1", EXCLUDE_UNKNOWN_REGISTRIES)); EXPECT_EQ(0U, GetRegistryLengthFromURL("http://localhost", @@ -422,13 +419,13 @@ EXPECT_FALSE(CompareDomains("http://a.com/file.html", // a.com "http://b.com/file.html")); // b.com EXPECT_TRUE(CompareDomains("http://a.x.com/file.html", - "http://b.x.com/file.html")); // x.com + "http://b.x.com/file.html")); // x.com EXPECT_TRUE(CompareDomains("http://a.x.com/file.html", - "http://.x.com/file.html")); // x.com + "http://.x.com/file.html")); // x.com EXPECT_TRUE(CompareDomains("http://a.x.com/file.html", - "http://..b.x.com/file.html")); // x.com + "http://..b.x.com/file.html")); // x.com EXPECT_TRUE(CompareDomains("http://intranet/file.html", - "http://intranet/file.html")); // intranet + "http://intranet/file.html")); // intranet EXPECT_FALSE(CompareDomains("http://intranet1/file.html", "http://intranet2/file.html")); // intranet EXPECT_TRUE(CompareDomains( @@ -439,7 +436,7 @@ EXPECT_FALSE(CompareDomains("http://192.168.0.1/file.html", // 192.168.0.1 "http://127.0.0.1/file.html")); // 127.0.0.1 EXPECT_FALSE(CompareDomains("file:///C:/file.html", - "file:///C:/file.html")); // no host + "file:///C:/file.html")); // no host // The trailing dot means different sites - see also // https://github.com/mikewest/sec-metadata/issues/15. @@ -462,7 +459,7 @@ EXPECT_EQ(0U, GetRegistryLengthFromURL("http://nowhere.notavaliddomain", EXCLUDE_UNKNOWN_REGISTRIES)); EXPECT_EQ(15U, GetRegistryLengthFromURL("http://nowhere.notavaliddomain", - INCLUDE_UNKNOWN_REGISTRIES)); + INCLUDE_UNKNOWN_REGISTRIES)); } TEST_F(RegistryControlledDomainTest, TestPrivateRegistryHandling) { @@ -492,30 +489,22 @@ INCLUDE_UNKNOWN_REGISTRIES)); // Private registries. - EXPECT_EQ(0U, - GetRegistryLengthFromURLIncludingPrivate("http://priv.no", - EXCLUDE_UNKNOWN_REGISTRIES)); - EXPECT_EQ(7U, - GetRegistryLengthFromURLIncludingPrivate("http://foo.priv.no", - EXCLUDE_UNKNOWN_REGISTRIES)); - EXPECT_EQ(2U, - GetRegistryLengthFromURLIncludingPrivate("http://foo.jp", - EXCLUDE_UNKNOWN_REGISTRIES)); - EXPECT_EQ(2U, - GetRegistryLengthFromURLIncludingPrivate("http://www.foo.jp", - EXCLUDE_UNKNOWN_REGISTRIES)); - EXPECT_EQ(0U, - GetRegistryLengthFromURLIncludingPrivate("http://private", - EXCLUDE_UNKNOWN_REGISTRIES)); - EXPECT_EQ(7U, - GetRegistryLengthFromURLIncludingPrivate("http://foo.private", - EXCLUDE_UNKNOWN_REGISTRIES)); - EXPECT_EQ(0U, - GetRegistryLengthFromURLIncludingPrivate("http://private", - INCLUDE_UNKNOWN_REGISTRIES)); - EXPECT_EQ(7U, - GetRegistryLengthFromURLIncludingPrivate("http://foo.private", - INCLUDE_UNKNOWN_REGISTRIES)); + EXPECT_EQ(0U, GetRegistryLengthFromURLIncludingPrivate( + "http://priv.no", EXCLUDE_UNKNOWN_REGISTRIES)); + EXPECT_EQ(7U, GetRegistryLengthFromURLIncludingPrivate( + "http://foo.priv.no", EXCLUDE_UNKNOWN_REGISTRIES)); + EXPECT_EQ(2U, GetRegistryLengthFromURLIncludingPrivate( + "http://foo.jp", EXCLUDE_UNKNOWN_REGISTRIES)); + EXPECT_EQ(2U, GetRegistryLengthFromURLIncludingPrivate( + "http://www.foo.jp", EXCLUDE_UNKNOWN_REGISTRIES)); + EXPECT_EQ(0U, GetRegistryLengthFromURLIncludingPrivate( + "http://private", EXCLUDE_UNKNOWN_REGISTRIES)); + EXPECT_EQ(7U, GetRegistryLengthFromURLIncludingPrivate( + "http://foo.private", EXCLUDE_UNKNOWN_REGISTRIES)); + EXPECT_EQ(0U, GetRegistryLengthFromURLIncludingPrivate( + "http://private", INCLUDE_UNKNOWN_REGISTRIES)); + EXPECT_EQ(7U, GetRegistryLengthFromURLIncludingPrivate( + "http://foo.private", INCLUDE_UNKNOWN_REGISTRIES)); } TEST_F(RegistryControlledDomainTest, TestDafsaTwoByteOffsets) {
diff --git a/net/http/transport_security_state_static.pins b/net/http/transport_security_state_static.pins index f0bef1bf..d3595a3 100644 --- a/net/http/transport_security_state_static.pins +++ b/net/http/transport_security_state_static.pins
@@ -43,9 +43,9 @@ # hash function for preloaded entries again (we have already done so once). # -# Last updated: 2024-12-20 12:54 UTC +# Last updated: 2024-12-22 12:58 UTC PinsListTimestamp -1734699297 +1734872329 TestSPKI sha256/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
diff --git a/net/http/transport_security_state_static_pins.json b/net/http/transport_security_state_static_pins.json index 5caf2805..b66cd13e 100644 --- a/net/http/transport_security_state_static_pins.json +++ b/net/http/transport_security_state_static_pins.json
@@ -31,7 +31,7 @@ // the 'static_spki_hashes' and 'bad_static_spki_hashes' fields in 'pinsets' // refer to, and the timestamp at which the pins list was last updated. // -// Last updated: 2024-12-20 12:54 UTC +// Last updated: 2024-12-22 12:58 UTC // { "pinsets": [
diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket_pool_manager.cc index 9a873e3..6a399c4 100644 --- a/net/socket/client_socket_pool_manager.cc +++ b/net/socket/client_socket_pool_manager.cc
@@ -207,9 +207,8 @@ // static base::TimeDelta ClientSocketPoolManager::unused_idle_socket_timeout( HttpNetworkSession::SocketPoolType pool_type) { - return base::Seconds(base::GetFieldTrialParamByFeatureAsInt( - net::features::kNetUnusedIdleSocketTimeout, - "unused_idle_socket_timeout_seconds", 60)); + constexpr int kPreconnectIntervalSec = 60; + return base::Seconds(kPreconnectIntervalSec); } int InitSocketHandleForHttpRequest(
diff --git a/net/socket/transport_client_socket_pool_unittest.cc b/net/socket/transport_client_socket_pool_unittest.cc index b8ffc52..f476feb0 100644 --- a/net/socket/transport_client_socket_pool_unittest.cc +++ b/net/socket/transport_client_socket_pool_unittest.cc
@@ -2816,139 +2816,6 @@ base::test::TaskEnvironment::TimeSource::MOCK_TIME) {} }; -// Tests that changing the idle unused socket timeout using the experiment -// works. The test first sets the value of timeout duration for idle sockets. -// Next, it opens |kNumIdleSockets| sockets. To trigger the cleanup of idle -// sockets that may have timedout, it then opens one more socket. This is -// required since requesting a new socket triggers cleanup of idle timedout -// sockets. Next, the test verifies the count of idle timed-out sockets. -TEST_F(TransportClientSocketPoolMockNowSourceTest, IdleUnusedSocketTimeout) { - const url::SchemeHostPort kSchemeHostPort1(url::kHttpScheme, "www.foo.com", - 80); - const url::SchemeHostPort kSchemeHostPort2(url::kHttpScheme, "www.bar.com", - 80); - - const struct { - bool use_first_socket; - int fast_forward_seconds; - int unused_idle_socket_timeout_seconds; - bool expect_idle_socket; - } kTests[] = { - // When the clock is fast forwarded by a duration longer than - // |unused_idle_socket_timeout_seconds|, the first unused idle socket is - // expected to be timedout, and cleared. - {false, 0, 0, false}, - {false, 9, 10, true}, - {false, 11, 10, false}, - {false, 19, 20, true}, - {false, 21, 20, false}, - // If |use_first_socket| is true, then the test would write some data to - // the socket, thereby marking it as "used". Thereafter, this idle socket - // should be timedout based on used idle socket timeout, and changing - // |unused_idle_socket_timeout_seconds| should not affect the - // |expected_idle_sockets|. - {true, 0, 0, true}, - {true, 9, 10, true}, - {true, 11, 10, true}, - {true, 19, 20, true}, - {true, 21, 20, true}, - }; - - for (const auto& test : kTests) { - SpdySessionDependencies session_deps( - ConfiguredProxyResolutionService::CreateDirect()); - std::unique_ptr<HttpNetworkSession> session( - SpdySessionDependencies::SpdyCreateSession(&session_deps)); - - base::test::ScopedFeatureList scoped_feature_list_; - std::map<std::string, std::string> parameters; - parameters["unused_idle_socket_timeout_seconds"] = - base::NumberToString(test.unused_idle_socket_timeout_seconds); - scoped_feature_list_.InitAndEnableFeatureWithParameters( - net::features::kNetUnusedIdleSocketTimeout, parameters); - - const char kWriteData[] = "1"; - const MockWrite kWrites[] = {MockWrite(SYNCHRONOUS, kWriteData)}; - - SequencedSocketData provider_socket_1(MockConnect(ASYNC, OK), - base::span<MockRead>(), kWrites); - { - // Create 1 socket. - scoped_refptr<ClientSocketPool::SocketParams> socket_params = - ClientSocketPool::SocketParams::CreateForHttpForTesting(); - session_deps.socket_factory->AddSocketDataProvider(&provider_socket_1); - ClientSocketHandle connection; - TestCompletionCallback callback; - int rv = connection.Init( - ClientSocketPool::GroupId( - kSchemeHostPort1, PrivacyMode::PRIVACY_MODE_DISABLED, - NetworkAnonymizationKey(), SecureDnsPolicy::kAllow, - /*disable_cert_network_fetches=*/false), - ClientSocketPool::SocketParams::CreateForHttpForTesting(), - /*proxy_annotation_tag=*/std::nullopt, MEDIUM, SocketTag(), - ClientSocketPool::RespectLimits::ENABLED, callback.callback(), - ClientSocketPool::ProxyAuthCallback(), - session->GetSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL, - ProxyChain::Direct()), - NetLogWithSource()); - EXPECT_THAT(callback.GetResult(rv), IsOk()); - EXPECT_FALSE(connection.socket()->WasEverUsed()); - - // Writing some data to the socket should set WasEverUsed. - if (test.use_first_socket) { - // Generate |socket_write_data| from kMockWriteData by appending null - // character to the latter. - auto write_buffer = base::MakeRefCounted<StringIOBuffer>(kWriteData); - TestCompletionCallback write_callback; - rv = connection.socket()->Write( - write_buffer.get(), write_buffer->size(), write_callback.callback(), - TRAFFIC_ANNOTATION_FOR_TESTS); - EXPECT_EQ(rv, 1); - EXPECT_TRUE(connection.socket()->WasEverUsed()); - } - } - - EXPECT_EQ(1, session - ->GetSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL, - ProxyChain::Direct()) - ->IdleSocketCount()); - - // Moving the clock forward may cause the idle socket to be timedout. - FastForwardBy(base::Seconds(test.fast_forward_seconds)); - - { - // Request a new socket to trigger cleanup of idle timedout sockets. - scoped_refptr<ClientSocketPool::SocketParams> socket_params = - ClientSocketPool::SocketParams::CreateForHttpForTesting(); - SequencedSocketData provider_socket_2(MockConnect(ASYNC, OK), - base::span<MockRead>(), - base::span<MockWrite>()); - session_deps.socket_factory->AddSocketDataProvider(&provider_socket_2); - ClientSocketHandle connection; - TestCompletionCallback callback; - int rv = connection.Init( - ClientSocketPool::GroupId( - kSchemeHostPort2, PrivacyMode::PRIVACY_MODE_DISABLED, - NetworkAnonymizationKey(), SecureDnsPolicy::kAllow, - /*disable_cert_network_fetches=*/false), - socket_params, /*proxy_annotation_tag=*/std::nullopt, MEDIUM, - SocketTag(), ClientSocketPool::RespectLimits::ENABLED, - callback.callback(), ClientSocketPool::ProxyAuthCallback(), - session->GetSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL, - ProxyChain::Direct()), - NetLogWithSource()); - EXPECT_THAT(callback.GetResult(rv), IsOk()); - connection.socket()->Disconnect(); - } - - EXPECT_EQ(test.expect_idle_socket ? 1 : 0, - session - ->GetSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL, - ProxyChain::Direct()) - ->IdleSocketCount()); - } -} - } // namespace } // namespace net
diff --git a/services/network/public/cpp/sri_message_signatures.cc b/services/network/public/cpp/sri_message_signatures.cc index d305878..bdb0ae7 100644 --- a/services/network/public/cpp/sri_message_signatures.cc +++ b/services/network/public/cpp/sri_message_signatures.cc
@@ -277,12 +277,8 @@ // Process the parameters, according to the validation requirements at // https://wicg.github.io/signature-based-sri/#profile for (const auto& param : input_entry.params) { - if (param.first == "alg" && param.second.is_string() && - param.second.GetString() == "ed25519") { - message_signature->alg = - mojom::SRIMessageSignature::Algorithm::kEd25519; - } else if (param.first == "created" && param.second.is_integer() && - param.second.GetInteger() >= 0) { + if (param.first == "created" && param.second.is_integer() && + param.second.GetInteger() >= 0) { message_signature->created = param.second.GetInteger(); } else if (param.first == "expires" && param.second.is_integer() && param.second.GetInteger() >= 0) { @@ -301,6 +297,11 @@ param.second.GetString() == "sri") { message_signature->tag = "sri"; } else { + // The `alg` parameter must not be included in the signature input. Any + // other parameters that aren't defined in the registry also + // invalidate the signature. + // + // https://www.iana.org/assignments/http-message-signature/http-message-signature.xhtml#signature-metadata-parameters message_signature.reset(); break; } @@ -308,8 +309,7 @@ if (message_signature) { // Check required fields, and punt the signature if any are missing. - if (!message_signature->alg || !message_signature->keyid || - !message_signature->tag) { + if (!message_signature->keyid || !message_signature->tag) { continue; }
diff --git a/services/network/public/cpp/sri_message_signatures_unittest.cc b/services/network/public/cpp/sri_message_signatures_unittest.cc index 2f1da093..8b2a03d 100644 --- a/services/network/public/cpp/sri_message_signatures_unittest.cc +++ b/services/network/public/cpp/sri_message_signatures_unittest.cc
@@ -58,16 +58,17 @@ // Content-Type: application/json // Identity-Digest: sha-256=:X48E9qOokqqrvdts8nOJRJN3OWDUoyWxBf7kbu9DBPE=: // Content-Length: 18 -// Signature-Input: signature=("identity-digest";sf);alg="ed25519"; \ -// keyid="JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=";tag="sri" -// Signature: signature=:TUznBT2ikFq6VrtoZeC5znRtZugu1U8OHJWoBkOLDTJA2FglSR34Q \ -// Y9j+BwN79PT4H0p8aIosnv4rXSKfIZVDA==: +// Signature-Input: signature=("identity-digest";sf); \ +// keyid="JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs="; \ +// tag="sri" +// Signature: signature=:eTKYITprfJYJmsOZlRTmu0szHbt0yLxHYBU0oXDdkx8najLl59IPO \ +// 0zUofe5T23RGuquHLdZx177tBX45CUcAg==: // // {"hello": "world"} // ``` const char* kSignature = - "TUznBT2ikFq6VrtoZeC5znRtZugu1U8OHJWoBkOLDTJA2FglSR34QY9j+BwN79PT4H0p8aIosn" - "v4rXSKfIZVDA=="; + "eTKYITprfJYJmsOZlRTmu0szHbt0yLxHYBU0oXDdkx8najLl59IPO0zUofe5T23RGuquHLdZx1" + "77tBX45CUcAg=="; const char* kValidDigestHeader = "sha-256=:X48E9qOokqqrvdts8nOJRJN3OWDUoyWxBf7kbu9DBPE=:"; @@ -77,11 +78,11 @@ // A basic signature header set with no expiration. const char* kValidSignatureInputHeader = - "signature=(\"identity-digest\";sf);alg=\"ed25519\";keyid=\"JrQLj5P/" - "89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=\";tag=\"sri\""; + "signature=(\"identity-digest\";sf);keyid=\"JrQLj5P/89iXES9+vFgrIy29clF9CC/" + "oPPsw3c5D0bs=\";tag=\"sri\""; const char* kValidSignatureHeader = - "signature=:TUznBT2ikFq6VrtoZeC5znRtZugu1U8OHJWoBkOLDTJA2FglSR34QY9j+BwN79P" - "T4H0p8aIosnv4rXSKfIZVDA==:"; + "signature=:eTKYITprfJYJmsOZlRTmu0szHbt0yLxHYBU0oXDdkx8najLl59IPO0zUofe5T23" + "RGuquHLdZx177tBX45CUcAg==:"; // The following signature was generated using test-key-ed25519 from RFC 9421 // (https://datatracker.ietf.org/doc/html/rfc9421#appendix-B.1.4), @@ -89,11 +90,11 @@ // // A valid signature header set with expiration in the future (2142-12-30). const char* kValidExpiringSignatureInputHeader = - "signature=(\"identity-digest\";sf);alg=\"ed25519\";expires=5459212800;" + "signature=(\"identity-digest\";sf);expires=5459212800;" "keyid=\"JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=\";tag=\"sri\""; const char* kValidExpiringSignatureHeader = - "signature=:cQNpdSxWJp2rV5m1omnG780Ei/paw/b2CTFtnxD8YkKWmMFIMcepxB67cK8f836" - "W5IZhw4zG6wFnvd+T1BG3CQ==:"; + "signature=:a3oS5RVl6PYHwBa83M0OB1+sEBzRcmU4pLyWywTeBqWfwUQmasxYaJKJxM9hkEW" + "dFNjzkC5ako2YKEyTdRuFDg==:"; const int64_t kValidExpiringSignatureExpiresAt = 5459212800; constexpr std::string_view kAcceptSignature = "accept-signature"; @@ -123,7 +124,6 @@ void ValidateBasicTestHeader(const mojom::SRIMessageSignaturePtr& sig) { EXPECT_EQ("signature", sig->label); - EXPECT_EQ(mojom::SRIMessageSignature::Algorithm::kEd25519, sig->alg); EXPECT_EQ(std::nullopt, sig->created); EXPECT_EQ(std::nullopt, sig->expires); EXPECT_EQ(kPublicKey, sig->keyid); @@ -336,8 +336,8 @@ // Tack valid parameters onto the test string so that we're actually // just testing the component parsing. - std::string test_with_params = base::StrCat( - {test, ";alg=\"ed25519\";keyid=\"", kPublicKey, "\";tag=\"sri\""}); + std::string test_with_params = + base::StrCat({test, ";keyid=\"", kPublicKey, "\";tag=\"sri\""}); auto headers = GetHeaders(kValidSignatureHeader, test_with_params.c_str()); std::vector<mojom::SRIMessageSignaturePtr> result = ParseSRIMessageSignaturesFromHeaders(*headers); @@ -350,24 +350,17 @@ TEST_F(SRIMessageSignatureParserTest, MalformedSignatureInputParameters) { const char* cases[] = { // Missing a required parameter: - "alg=\"ed25519\"", - "alg=\"ed25519\";keyid=\"[KEY]\"", - "alg=\"ed25519\";tag=\"sri\"", "keyid=\"[KEY]\"", - "keyid=\"[KEY]\";tag=\"sri\"", "tag=\"sri\"", // Duplication (insofar as the invalid value comes last): - "alg=\"ed25519\";alg=\"not-ed25519\";keyid=\"[KEY]\";tag=\"sri\"", - "alg=\"ed25519\";keyid=\"[KEY]\";keyid=\"not-[KEY]\";tag=\"sri\"", - "alg=\"ed25519\";keyid=\"[KEY]\";tag=\"sri\";tag=\"not-sri\"", + "keyid=\"[KEY]\";keyid=\"not-[KEY]\";tag=\"sri\"", + "keyid=\"[KEY]\";tag=\"sri\";tag=\"not-sri\"", // Unknown parameter: - "alg=\"ed25519\";keyid=\"[KEY]\";tag=\"sri\";unknown=1", + "keyid=\"[KEY]\";tag=\"sri\";unknown=1", - // Invalid alg: - // - // - Types: + // Alg is present: "alg=;keyid=\"[KEY]\";tag=\"sri\"", "alg=1;keyid=\"[KEY]\";tag=\"sri\"", "alg=1.1;keyid=\"[KEY]\";tag=\"sri\"", @@ -376,76 +369,75 @@ "alg=@12345;keyid=\"[KEY]\";tag=\"sri\"", "alg=%\"display\";keyid=\"[KEY]\";tag=\"sri\"", "alg=:badbeef:;keyid=\"[KEY]\";tag=\"sri\"", - // - Values - "alg=\"not-ed25519\";keyid=\"[KEY]\";tag=\"sri\"", + "alg=\"ed25519\";keyid=\"[KEY]\";tag=\"sri\"", // Invalid `created`: // // - Types: - "alg=\"ed25519\";created=;keyid=\"[KEY]\";tag=\"sri\"", - "alg=\"ed25519\";created=1.1;keyid=\"[KEY]\";tag=\"sri\"", - "alg=\"ed25519\";created=\"string\";keyid=\"[KEY]\";tag=\"sri\"", - "alg=\"ed25519\";created=token;keyid=\"[KEY]\";tag=\"sri\"", - "alg=\"ed25519\";created=?0;keyid=\"[KEY]\";tag=\"sri\"", - "alg=\"ed25519\";created=@12345;keyid=\"[KEY]\";tag=\"sri\"", - "alg=\"ed25519\";created=%\"display\";keyid=\"[KEY]\";tag=\"sri\"", - "alg=\"ed25519\";created=:badbeef:;keyid=\"[KEY]\";tag=\"sri\"", + "created=;keyid=\"[KEY]\";tag=\"sri\"", + "created=1.1;keyid=\"[KEY]\";tag=\"sri\"", + "created=\"string\";keyid=\"[KEY]\";tag=\"sri\"", + "created=token;keyid=\"[KEY]\";tag=\"sri\"", + "created=?0;keyid=\"[KEY]\";tag=\"sri\"", + "created=@12345;keyid=\"[KEY]\";tag=\"sri\"", + "created=%\"display\";keyid=\"[KEY]\";tag=\"sri\"", + "created=:badbeef:;keyid=\"[KEY]\";tag=\"sri\"", // - Values - "alg=\"ed25519\";created=-1;keyid=\"[KEY]\";tag=\"sri\"", + "created=-1;keyid=\"[KEY]\";tag=\"sri\"", // Invalid `expires`: // // - Types: - "alg=\"ed25519\";expires=;keyid=\"[KEY]\";tag=\"sri\"", - "alg=\"ed25519\";expires=1.1;keyid=\"[KEY]\";tag=\"sri\"", - "alg=\"ed25519\";expires=\"string\";keyid=\"[KEY]\";tag=\"sri\"", - "alg=\"ed25519\";expires=token;keyid=\"[KEY]\";tag=\"sri\"", - "alg=\"ed25519\";expires=?0;keyid=\"[KEY]\";tag=\"sri\"", - "alg=\"ed25519\";expires=@12345;keyid=\"[KEY]\";tag=\"sri\"", - "alg=\"ed25519\";expires=%\"display\";keyid=\"[KEY]\";tag=\"sri\"", - "alg=\"ed25519\";expires=:badbeef:;keyid=\"[KEY]\";tag=\"sri\"", + "expires=;keyid=\"[KEY]\";tag=\"sri\"", + "expires=1.1;keyid=\"[KEY]\";tag=\"sri\"", + "expires=\"string\";keyid=\"[KEY]\";tag=\"sri\"", + "expires=token;keyid=\"[KEY]\";tag=\"sri\"", + "expires=?0;keyid=\"[KEY]\";tag=\"sri\"", + "expires=@12345;keyid=\"[KEY]\";tag=\"sri\"", + "expires=%\"display\";keyid=\"[KEY]\";tag=\"sri\"", + "expires=:badbeef:;keyid=\"[KEY]\";tag=\"sri\"", // - Values - "alg=\"ed25519\";expires=-1;keyid=\"[KEY]\";tag=\"sri\"", + "expires=-1;keyid=\"[KEY]\";tag=\"sri\"", // Invalid `keyid`: // // - Types - "alg=\"ed25519\";keyid=;tag=\"sri\"", - "alg=\"ed25519\";keyid=1;tag=\"sri\"", - "alg=\"ed25519\";keyid=1.1;tag=\"sri\"", - "alg=\"ed25519\";keyid=token;tag=\"sri\"", - "alg=\"ed25519\";keyid=?0;tag=\"sri\"", - "alg=\"ed25519\";keyid=@12345;tag=\"sri\"", - "alg=\"ed25519\";keyid=%\"display\";tag=\"sri\"", - "alg=\"ed25519\";keyid=:badbeef:;tag=\"sri\"", + "keyid=;tag=\"sri\"", + "keyid=1;tag=\"sri\"", + "keyid=1.1;tag=\"sri\"", + "keyid=token;tag=\"sri\"", + "keyid=?0;tag=\"sri\"", + "keyid=@12345;tag=\"sri\"", + "keyid=%\"display\";tag=\"sri\"", + "keyid=:badbeef:;tag=\"sri\"", // - Values - "alg=\"ed25519\";keyid=\"not a base64-encoded key\";tag=\"sri\"", + "keyid=\"not a base64-encoded key\";tag=\"sri\"", // Invalid `nonce`: // // - Types - "alg=\"ed25519\";keyid=\"[KEY]\";nonce=;tag=\"not-sri\"", - "alg=\"ed25519\";keyid=\"[KEY]\";nonce=1;tag=\"not-sri\"", - "alg=\"ed25519\";keyid=\"[KEY]\";nonce=1.1;tag=\"not-sri\"", - "alg=\"ed25519\";keyid=\"[KEY]\";nonce=token;tag=\"not-sri\"", - "alg=\"ed25519\";keyid=\"[KEY]\";nonce=?0;tag=\"not-sri\"", - "alg=\"ed25519\";keyid=\"[KEY]\";nonce=@12345;tag=\"not-sri\"", - "alg=\"ed25519\";keyid=\"[KEY]\";nonce=%\"display\";tag=\"not-sri\"", - "alg=\"ed25519\";keyid=\"[KEY]\";nonce=:badbeef:;tag=\"not-sri\"", + "keyid=\"[KEY]\";nonce=;tag=\"not-sri\"", + "keyid=\"[KEY]\";nonce=1;tag=\"not-sri\"", + "keyid=\"[KEY]\";nonce=1.1;tag=\"not-sri\"", + "keyid=\"[KEY]\";nonce=token;tag=\"not-sri\"", + "keyid=\"[KEY]\";nonce=?0;tag=\"not-sri\"", + "keyid=\"[KEY]\";nonce=@12345;tag=\"not-sri\"", + "keyid=\"[KEY]\";nonce=%\"display\";tag=\"not-sri\"", + "keyid=\"[KEY]\";nonce=:badbeef:;tag=\"not-sri\"", // Invalid `tag`: // // - Types - "alg=\"ed25519\";keyid=\"[KEY]\";tag=", - "alg=\"ed25519\";keyid=\"[KEY]\";tag=1", - "alg=\"ed25519\";keyid=\"[KEY]\";tag=1.1", - "alg=\"ed25519\";keyid=\"[KEY]\";tag=token", - "alg=\"ed25519\";keyid=\"[KEY]\";tag=?0", - "alg=\"ed25519\";keyid=\"[KEY]\";tag=@12345", - "alg=\"ed25519\";keyid=\"[KEY]\";tag=%\"display\"", - "alg=\"ed25519\";keyid=\"[KEY]\";tag=:badbeef:", + "keyid=\"[KEY]\";tag=", + "keyid=\"[KEY]\";tag=1", + "keyid=\"[KEY]\";tag=1.1", + "keyid=\"[KEY]\";tag=token", + "keyid=\"[KEY]\";tag=?0", + "keyid=\"[KEY]\";tag=@12345", + "keyid=\"[KEY]\";tag=%\"display\"", + "keyid=\"[KEY]\";tag=:badbeef:", // - Values - "alg=\"ed25519\";keyid=\"[KEY]\";tag=\"not-sri\"", + "keyid=\"[KEY]\";tag=\"not-sri\"", }; for (const char* test : cases) { @@ -480,9 +472,9 @@ // Tack valid parameters onto the test string so that we're actually // just testing the component parsing. - std::string test_with_params = base::StrCat({"signature=(", test.components, - ");alg=\"ed25519\";keyid=\"", - kPublicKey, "\";tag=\"sri\""}); + std::string test_with_params = + base::StrCat({"signature=(", test.components, ");keyid=\"", kPublicKey, + "\";tag=\"sri\""}); auto headers = GetHeaders(kValidSignatureHeader, test_with_params.c_str()); std::vector<mojom::SRIMessageSignaturePtr> result = ParseSRIMessageSignaturesFromHeaders(*headers); @@ -506,9 +498,9 @@ SCOPED_TRACE(testing::Message() << "Created value: `" << test << "`"); // Build the header. - std::string processed_input = base::StrCat( - {"signature=(\"identity-digest\";sf);alg=\"ed25519\";created=", test, - ";keyid=\"[KEY]\";tag=\"sri\""}); + std::string processed_input = + base::StrCat({"signature=(\"identity-digest\";sf);created=", test, + ";keyid=\"[KEY]\";tag=\"sri\""}); size_t key_pos = processed_input.find("[KEY]"); if (key_pos != std::string::npos) { processed_input.replace(key_pos, 5, kPublicKey); @@ -537,9 +529,9 @@ SCOPED_TRACE(testing::Message() << "Expires value: `" << test << "`"); // Build the header. - std::string processed_input = base::StrCat( - {"signature=(\"identity-digest\";sf);alg=\"ed25519\";expires=", test, - ";keyid=\"[KEY]\";tag=\"sri\""}); + std::string processed_input = + base::StrCat({"signature=(\"identity-digest\";sf);expires=", test, + ";keyid=\"[KEY]\";tag=\"sri\""}); size_t key_pos = processed_input.find("[KEY]"); if (key_pos != std::string::npos) { processed_input.replace(key_pos, 5, kPublicKey); @@ -568,9 +560,9 @@ SCOPED_TRACE(testing::Message() << "Nonce value: `" << test << "`"); // Build the header. - std::string processed_input = base::StrCat( - {"signature=(\"identity-digest\";sf);alg=\"ed25519\";keyid=\"[KEY]\";", - "nonce=\"", test, "\";tag=\"sri\""}); + std::string processed_input = + base::StrCat({"signature=(\"identity-digest\";sf);keyid=\"[KEY]\";", + "nonce=\"", test, "\";tag=\"sri\""}); size_t key_pos = processed_input.find("[KEY]"); if (key_pos != std::string::npos) { processed_input.replace(key_pos, 5, kPublicKey); @@ -587,7 +579,6 @@ TEST_F(SRIMessageSignatureParserTest, ParameterSorting) { std::vector<const char*> params = { - "alg=\"ed25519\"", "created=12345", "expires=12345", "keyid=\"JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=\"", @@ -650,7 +641,7 @@ std::string expected_base = base::StrCat({"\"identity-digest\";sf: ", kValidDigestHeader, "\n\"@signature-params\": " - "(\"identity-digest\";sf);alg=\"ed25519\";keyid=\"", + "(\"identity-digest\";sf);keyid=\"", kPublicKey, "\";tag=\"sri\""}); EXPECT_EQ(expected_base, result.value()); } @@ -660,25 +651,25 @@ // serialized. const char* cases[] = { // Base - ("signature=(\"identity-digest\";sf);alg=\"ed25519\";keyid=\"JrQLj5P/" + ("signature=(\"identity-digest\";sf);keyid=\"JrQLj5P/" "89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=\";tag=\"sri\""), // Leading space. - (" signature=(\"identity-digest\";sf);alg=\"ed25519\";keyid=\"JrQLj5P/" + (" signature=(\"identity-digest\";sf);keyid=\"JrQLj5P/" "89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=\";tag=\"sri\""), // Space before inner-list item. - ("signature=( \"identity-digest\";sf);alg=\"ed25519\";keyid=\"JrQLj5P/" + ("signature=( \"identity-digest\";sf);keyid=\"JrQLj5P/" "89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=\";tag=\"sri\""), // Space after `;` in a param. - ("signature=(\"identity-digest\"; sf);alg=\"ed25519\";keyid=\"JrQLj5P/" + ("signature=(\"identity-digest\"; sf);keyid=\"JrQLj5P/" "89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=\";tag=\"sri\""), // Space after inner-list item. - ("signature=(\"identity-digest\";sf );alg=\"ed25519\";keyid=\"JrQLj5P/" + ("signature=(\"identity-digest\";sf );keyid=\"JrQLj5P/" "89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=\";tag=\"sri\""), // Trailing space. - ("signature=(\"identity-digest\";sf);alg=\"ed25519\";keyid=\"JrQLj5P/" + ("signature=(\"identity-digest\";sf);keyid=\"JrQLj5P/" "89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=\";tag=\"sri\" "), // All valid spaces. - (" signature=( \"identity-digest\"; sf ); alg=\"ed25519\"; keyid=" + (" signature=( \"identity-digest\"; sf ); keyid=" "\"JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=\"; tag=\"sri\" ")}; for (auto* const test : cases) { @@ -693,7 +684,7 @@ std::string expected_base = base::StrCat({"\"identity-digest\";sf: ", kValidDigestHeader, "\n\"@signature-params\": " - "(\"identity-digest\";sf);alg=\"ed25519\";keyid=\"", + "(\"identity-digest\";sf);keyid=\"", kPublicKey, "\";tag=\"sri\""}); EXPECT_EQ(expected_base, result.value()); } @@ -720,16 +711,16 @@ for (const auto& test : cases) { SCOPED_TRACE(test.url); - std::string input_header = base::StrCat( - {"signature=(\"identity-digest\";sf \"@path\";req);", - "alg=\"ed25519\";keyid=\"", kPublicKey, "\";tag=\"sri\""}); + std::string input_header = + base::StrCat({"signature=(\"identity-digest\";sf \"@path\";req);", + "keyid=\"", kPublicKey, "\";tag=\"sri\""}); std::stringstream expected_base; expected_base << "\"identity-digest\";sf: " << kValidDigestHeader << '\n' << "\"@path\";req: " << test.path << '\n' << "\"@signature-params\": (\"identity-digest\";sf \"@path\";req);" - << "alg=\"ed25519\";keyid=\"" << kPublicKey << "\";tag=\"sri\""; + << "keyid=\"" << kPublicKey << "\";tag=\"sri\""; auto headers = ValidHeadersPlusInput(input_header.c_str()); auto signatures = ParseSRIMessageSignaturesFromHeaders(*headers); @@ -765,12 +756,11 @@ // Construct the header and the expectations based on the test case: std::stringstream input_header; - input_header << "signature=(\"identity-digest\";sf);alg=\"ed25519\""; + input_header << "signature=(\"identity-digest\";sf)"; std::stringstream expected_base; - expected_base - << "\"identity-digest\";sf: " << kValidDigestHeader << '\n' - << "\"@signature-params\": (\"identity-digest\";sf);alg=\"ed25519\""; + expected_base << "\"identity-digest\";sf: " << kValidDigestHeader << '\n' + << "\"@signature-params\": (\"identity-digest\";sf)"; if (test.created) { input_header << ";created=" << test.created; expected_base << ";created=" << test.created; @@ -801,7 +791,6 @@ TEST_F(SRIMessageSignatureBaseTest, ParameterSorting) { std::vector<const char*> params = { - "alg=\"ed25519\"", "created=12345", "expires=12345", "keyid=\"JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=\"", @@ -865,7 +854,7 @@ std::string SignatureInputHeader(std::string_view name, std::string_view keyid) { return base::StrCat({name, - "=(\"identity-digest\";sf);alg=\"ed25519\";" + "=(\"identity-digest\";sf);" "keyid=\"", keyid, "\";tag=\"sri\""}); }
diff --git a/services/network/public/mojom/sri_message_signature.mojom b/services/network/public/mojom/sri_message_signature.mojom index 7d54aa27..7b42fc4 100644 --- a/services/network/public/mojom/sri_message_signature.mojom +++ b/services/network/public/mojom/sri_message_signature.mojom
@@ -38,10 +38,6 @@ // * Signature: https://www.rfc-editor.org/rfc/rfc9421.html#section-4.2 // * Validation requirements: https://wicg.github.io/signature-based-sri/#profile struct SRIMessageSignature { - enum Algorithm { - kEd25519 - }; - string label; // The asserted signature, stored as an array<uint8> rather than a string for @@ -54,7 +50,9 @@ // registry: // // https://www.iana.org/assignments/http-message-signature/http-message-signature.xhtml#signature-metadata-parameters - Algorithm? alg; + // + // Note: `alg` must not be present, per the SRI HTTP Message Signature profile + // https://wicg.github.io/signature-based-sri/#profile int64? created; int64? expires; string? keyid;
diff --git a/services/tracing/perfetto/system_test_utils.cc b/services/tracing/perfetto/system_test_utils.cc index 24370e5c..92c9c257 100644 --- a/services/tracing/perfetto/system_test_utils.cc +++ b/services/tracing/perfetto/system_test_utils.cc
@@ -44,7 +44,10 @@ // multiple tests run we need to restore the value so each test is // hermetic. - old_tmpdir_ = getenv("TMPDIR"); + const auto* old_tmpdir = getenv("TMPDIR"); + if (old_tmpdir) { + old_tmpdir_ = old_tmpdir; + } setenv("TMPDIR", tmp_dir.GetPath().value().c_str(), true); // Set up the system socket locations in a valid tmp directory. producer_ = tmp_dir.GetPath().Append(FILE_PATH_LITERAL("producer")).value(); @@ -59,7 +62,7 @@ if (used_tmpdir_) { if (old_tmpdir_) { // Restore the old value back to its initial value. - setenv("TMPDIR", old_tmpdir_, true); + setenv("TMPDIR", old_tmpdir_->c_str(), true); } else { // TMPDIR wasn't set originally so unset it. unsetenv("TMPDIR");
diff --git a/services/tracing/perfetto/system_test_utils.h b/services/tracing/perfetto/system_test_utils.h index fd3c56f..06bef90 100644 --- a/services/tracing/perfetto/system_test_utils.h +++ b/services/tracing/perfetto/system_test_utils.h
@@ -40,7 +40,7 @@ void StartService(); const bool used_tmpdir_; - const char* old_tmpdir_ = nullptr; + std::optional<std::string> old_tmpdir_; std::string consumer_; std::string producer_; std::unique_ptr<perfetto::ServiceIPCHost> service_;
diff --git a/services/tracing/public/cpp/system_tracing_service.cc b/services/tracing/public/cpp/system_tracing_service.cc index 57ca7d9..86df2a5e 100644 --- a/services/tracing/public/cpp/system_tracing_service.cc +++ b/services/tracing/public/cpp/system_tracing_service.cc
@@ -68,6 +68,10 @@ if (socket_fd_.get() == -1) { return base::unexpected(errno); } + if (producer_sock_name.size() > sizeof(sockaddr_un::sun_path) - 1) { + DVLOG(3) << "Oversized producer socket name " << producer_sock_name; + return base::unexpected(EINVAL); + } struct sockaddr_un saddr; memset(&saddr, 0, sizeof(saddr));
diff --git a/services/tracing/public/cpp/system_tracing_service_unittest.cc b/services/tracing/public/cpp/system_tracing_service_unittest.cc index bf6358c7..b98b9ab 100644 --- a/services/tracing/public/cpp/system_tracing_service_unittest.cc +++ b/services/tracing/public/cpp/system_tracing_service_unittest.cc
@@ -4,8 +4,10 @@ #include "services/tracing/public/cpp/system_tracing_service.h" +#include <sys/un.h> #include <unistd.h> +#include <cstdint> #include <optional> #include "base/files/scoped_temp_dir.h" @@ -33,21 +35,26 @@ ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); system_service_ = std::make_unique<MockSystemService>(temp_dir_); + // Save the current producer socket name from env if currently set. + const auto* producer_sock_name_env = getenv(kProducerSockEnvName); + if (producer_sock_name_env) { + saved_producer_sock_env_ = producer_sock_name_env; + } // Override the default system producer socket. - saved_producer_sock_env_ = getenv(kProducerSockEnvName); ASSERT_EQ(0, setenv(kProducerSockEnvName, system_service_->producer().c_str(), 1)); } void TearDown() override { - system_service_ = nullptr; // Restore the value of Perfetto producer socket name env variable. if (saved_producer_sock_env_) { - ASSERT_EQ(0, - setenv(kProducerSockEnvName, saved_producer_sock_env_, true)); + ASSERT_EQ(0, setenv(kProducerSockEnvName, + saved_producer_sock_env_->c_str(), 1)); } else { ASSERT_EQ(0, unsetenv(kProducerSockEnvName)); } + + system_service_ = nullptr; task_environment_.RunUntilIdle(); } @@ -57,7 +64,7 @@ base::SingleThreadTaskRunner::GetCurrentDefault()}; base::ScopedTempDir temp_dir_; std::unique_ptr<MockSystemService> system_service_; - const char* saved_producer_sock_env_ = nullptr; + std::optional<std::string> saved_producer_sock_env_; }; // Test the OpenProducerSocket implementation. Expect a valid socket file @@ -93,7 +100,6 @@ bool callback_called = false; // Set the producer socket name to a nonexistent path. - saved_producer_sock_env_ = getenv(kProducerSockEnvName); ASSERT_EQ(0, setenv(kProducerSockEnvName, "nonexistent_socket", 1)); base::RunLoop run_loop; @@ -147,7 +153,6 @@ bool callback_called = false; // Set the producer socket name to a nonexistent path. - saved_producer_sock_env_ = getenv(kProducerSockEnvName); ASSERT_EQ(0, setenv(kProducerSockEnvName, "nonexistent_socket", 1)); // Bind the pending remote on the current thread. @@ -167,5 +172,34 @@ ASSERT_TRUE(callback_called); } +TEST_F(SystemTracingServiceTest, BindAndPassPendingRemote_NonexistentLong) { + auto sts = std::make_unique<SystemTracingService>(); + bool callback_called = false; + + // Set the producer socket name to a long nonexistent path. + std::string sock_name; + while (sock_name.size() < 1024) { + sock_name.append("nonexistent/"); + } + ASSERT_GT(sock_name.size(), sizeof(sockaddr_un::sun_path)); + ASSERT_EQ(0, setenv(kProducerSockEnvName, sock_name.c_str(), 1)); + + // Bind the pending remote on the current thread. + mojo::Remote<mojom::SystemTracingService> remote; + remote.Bind(sts->BindAndPassPendingRemote(), nullptr); + + base::RunLoop run_loop; + auto callback = base::BindLambdaForTesting([&](base::File file) { + callback_called = true; + ASSERT_FALSE(file.IsValid()); + run_loop.Quit(); + }); + + remote->OpenProducerSocket(std::move(callback)); + ASSERT_FALSE(callback_called); + run_loop.Run(); + ASSERT_TRUE(callback_called); +} + } // namespace } // namespace tracing
diff --git a/third_party/blink/renderer/core/layout/inline/fragment_items.cc b/third_party/blink/renderer/core/layout/inline/fragment_items.cc index 299bdc5..bcfa987 100644 --- a/third_party/blink/renderer/core/layout/inline/fragment_items.cc +++ b/third_party/blink/renderer/core/layout/inline/fragment_items.cc
@@ -115,8 +115,13 @@ // formatting context. The non-atomic inline boxes themselves also don't // contribute to having inflow content, as they may just be wrappers // around such floats. We need something "real", such as text or a - // non-atomic inline. - found_inflow_content = !item.IsFloating() && !item.IsInlineBox(); + // non-atomic inline. Blocks in inlines cannot unconditionally count as + // "real" here, since it's possible that they only contain fragmented + // parallel flows (e.g. floats). We *could* examine this situation more + // closely, since there might indeed be real in-flow content in there, + // but let's keep this as simple as possible. + found_inflow_content = !item.IsFloating() && !item.IsInlineBox() && + !item.IsBlockInInline(); } LayoutObject* const layout_object = item.GetMutableLayoutObject(); DCHECK(!layout_object->IsOutOfFlowPositioned());
diff --git a/third_party/blink/renderer/core/loader/resource/image_resource_content.h b/third_party/blink/renderer/core/loader/resource/image_resource_content.h index 2fe417b..999558f 100644 --- a/third_party/blink/renderer/core/loader/resource/image_resource_content.h +++ b/third_party/blink/renderer/core/loader/resource/image_resource_content.h
@@ -155,10 +155,6 @@ void EmulateLoadStartedForInspector(ResourceFetcher*, const AtomicString& initiator_name); - void SetNotRefetchableDataFromDiskCache() { - is_refetchable_data_from_disk_cache_ = false; - } - // The following public methods should be called from ImageResource only. // UpdateImage() is the single control point of image content modification @@ -207,9 +203,6 @@ bool HasObservers() const { return !observers_.empty() || !finished_observers_.empty(); } - bool IsRefetchableDataFromDiskCache() const { - return is_refetchable_data_from_disk_cache_; - } ImageDecoder::CompressionFormat GetCompressionFormat() const; @@ -269,10 +262,6 @@ ResourceStatus content_status_ = ResourceStatus::kNotStarted; - // Indicates if this resource's encoded image data can be purged and refetched - // from disk cache to save memory usage. See crbug/664437. - bool is_refetchable_data_from_disk_cache_ = true; - mutable bool is_add_remove_observer_prohibited_ = false; Image::SizeAvailability size_available_ = Image::kSizeUnavailable;
diff --git a/third_party/blink/renderer/core/style/style_fetched_image.cc b/third_party/blink/renderer/core/style/style_fetched_image.cc index a8300a86..a439e099 100644 --- a/third_party/blink/renderer/core/style/style_fetched_image.cc +++ b/third_party/blink/renderer/core/style/style_fetched_image.cc
@@ -53,9 +53,6 @@ image_ = image; image_->AddObserver(this); - // ResourceFetcher is not determined from StyleFetchedImage and it is - // impossible to send a request for refetching. - image_->SetNotRefetchableDataFromDiskCache(); } StyleFetchedImage::~StyleFetchedImage() = default;
diff --git a/third_party/blink/renderer/platform/image-decoders/bmp/bmp_image_decoder.h b/third_party/blink/renderer/platform/image-decoders/bmp/bmp_image_decoder.h index 9d8562cd..b80c03c 100644 --- a/third_party/blink/renderer/platform/image-decoders/bmp/bmp_image_decoder.h +++ b/third_party/blink/renderer/platform/image-decoders/bmp/bmp_image_decoder.h
@@ -6,6 +6,7 @@ #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_IMAGE_DECODERS_BMP_BMP_IMAGE_DECODER_H_ #include <memory> + #include "third_party/blink/renderer/platform/image-decoders/image_decoder.h" namespace blink {
diff --git a/third_party/blink/renderer/platform/image-decoders/gif/gif_image_decoder_test.cc b/third_party/blink/renderer/platform/image-decoders/gif/gif_image_decoder_test.cc index 354b383..aca7316e 100644 --- a/third_party/blink/renderer/platform/image-decoders/gif/gif_image_decoder_test.cc +++ b/third_party/blink/renderer/platform/image-decoders/gif/gif_image_decoder_test.cc
@@ -10,6 +10,7 @@ #include "third_party/blink/renderer/platform/image-decoders/gif/gif_image_decoder.h" #include <memory> + #include "testing/gtest/include/gtest/gtest.h" #include "third_party/blink/public/platform/web_data.h" #include "third_party/blink/renderer/platform/image-decoders/image_decoder_test_helpers.h"
diff --git a/third_party/blink/renderer/platform/image-decoders/ico/ico_image_decoder_test.cc b/third_party/blink/renderer/platform/image-decoders/ico/ico_image_decoder_test.cc index 68ca14a..f250fea 100644 --- a/third_party/blink/renderer/platform/image-decoders/ico/ico_image_decoder_test.cc +++ b/third_party/blink/renderer/platform/image-decoders/ico/ico_image_decoder_test.cc
@@ -10,6 +10,7 @@ #include "third_party/blink/renderer/platform/image-decoders/ico/ico_image_decoder.h" #include <memory> + #include "base/files/file_util.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/blink/renderer/platform/image-decoders/image_decoder_base_test.h"
diff --git a/third_party/blink/renderer/platform/image-decoders/image_decoder.cc b/third_party/blink/renderer/platform/image-decoders/image_decoder.cc index bdbbe08..8da7882 100644 --- a/third_party/blink/renderer/platform/image-decoders/image_decoder.cc +++ b/third_party/blink/renderer/platform/image-decoders/image_decoder.cc
@@ -350,7 +350,7 @@ // 'size' and a four-byte 'type'. struct { uint8_t size[4]; // unsigned int(32) size; - char type[4]; // unsigned int(32) type = boxtype; + char type[4]; // unsigned int(32) type = boxtype; } box; static_assert(sizeof(box) == 8, ""); static_assert(8 <= kLongestSignatureLength, "");
diff --git a/third_party/blink/renderer/platform/image-decoders/image_decoder_base_test.h b/third_party/blink/renderer/platform/image-decoders/image_decoder_base_test.h index 9dc58c32..827b65f2 100644 --- a/third_party/blink/renderer/platform/image-decoders/image_decoder_base_test.h +++ b/third_party/blink/renderer/platform/image-decoders/image_decoder_base_test.h
@@ -9,9 +9,7 @@ #include "base/compiler_specific.h" #include "base/files/file_path.h" - #include "testing/gtest/include/gtest/gtest.h" - #include "third_party/blink/renderer/platform/image-decoders/image_decoder.h" namespace blink {
diff --git a/third_party/blink/renderer/platform/image-decoders/image_decoder_test.cc b/third_party/blink/renderer/platform/image-decoders/image_decoder_test.cc index bb8d962..65d41f6 100644 --- a/third_party/blink/renderer/platform/image-decoders/image_decoder_test.cc +++ b/third_party/blink/renderer/platform/image-decoders/image_decoder_test.cc
@@ -10,6 +10,7 @@ #include "third_party/blink/renderer/platform/image-decoders/image_decoder.h" #include <memory> + #include "build/build_config.h" #include "media/media_buildflags.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc b/third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc index ab3d902..8dfe00c9 100644 --- a/third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc +++ b/third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc
@@ -57,6 +57,7 @@ extern "C" { #include <setjmp.h> #include <stdio.h> // jpeglib.h needs stdio FILE. + #include "jpeglib.h" }
diff --git a/third_party/blink/renderer/platform/image-decoders/png/png_image_reader.cc b/third_party/blink/renderer/platform/image-decoders/png/png_image_reader.cc index a4893ae..1f3860d 100644 --- a/third_party/blink/renderer/platform/image-decoders/png/png_image_reader.cc +++ b/third_party/blink/renderer/platform/image-decoders/png/png_image_reader.cc
@@ -44,6 +44,7 @@ #include "third_party/blink/renderer/platform/image-decoders/png/png_image_reader.h" #include <memory> + #include "base/numerics/checked_math.h" #include "third_party/blink/renderer/platform/image-decoders/fast_shared_buffer_reader.h" #include "third_party/blink/renderer/platform/image-decoders/png/png_image_decoder.h"
diff --git a/third_party/blink/renderer/platform/image-decoders/rw_buffer.cc b/third_party/blink/renderer/platform/image-decoders/rw_buffer.cc index 343484d1..83e6a0df 100644 --- a/third_party/blink/renderer/platform/image-decoders/rw_buffer.cc +++ b/third_party/blink/renderer/platform/image-decoders/rw_buffer.cc
@@ -4,16 +4,16 @@ #include "third_party/blink/renderer/platform/image-decoders/rw_buffer.h" +#include <algorithm> +#include <atomic> +#include <new> + #include "base/atomic_ref_count.h" #include "base/check.h" #include "base/check_op.h" #include "base/memory/raw_ptr.h" #include "third_party/blink/renderer/platform/wtf/allocator/partitions.h" -#include <algorithm> -#include <atomic> -#include <new> - namespace blink { namespace { @@ -25,7 +25,7 @@ struct RWBuffer::BufferBlock { raw_ptr<RWBuffer::BufferBlock> next_; // updated by the writer - size_t used_; // updated by the writer + size_t used_; // updated by the writer const size_t capacity_; explicit BufferBlock(size_t capacity)
diff --git a/third_party/blink/renderer/platform/image-decoders/skia/skia_image_decoder_base.cc b/third_party/blink/renderer/platform/image-decoders/skia/skia_image_decoder_base.cc index 26a44bf0..4359339 100644 --- a/third_party/blink/renderer/platform/image-decoders/skia/skia_image_decoder_base.cc +++ b/third_party/blink/renderer/platform/image-decoders/skia/skia_image_decoder_base.cc
@@ -267,7 +267,8 @@ wtf_size_t previous_frame_index = current_frame.previous_frame_index; frames_to_decode.pop(); - if (!codec_ || segment_stream_->IsCleared() || IsFailedFrameIndex(current_frame_index)) { + if (!codec_ || segment_stream_->IsCleared() || + IsFailedFrameIndex(current_frame_index)) { continue; } @@ -295,16 +296,18 @@ // has been visited already, then if a viable reference frame exists. // If neither, decode required_previous_frame_index. if (previous_frame_index == kNotFound) { - previous_frame_index = GetViableReferenceFrameIndex(current_frame_index); + previous_frame_index = + GetViableReferenceFrameIndex(current_frame_index); if (previous_frame_index == kNotFound) { - frames_to_decode.push({current_frame_index, required_previous_frame_index}); + frames_to_decode.push( + {current_frame_index, required_previous_frame_index}); frames_to_decode.push({required_previous_frame_index, kNotFound}); continue; } } if (IsFailedFrameIndex(previous_frame_index)) { - continue; + continue; } // We try to reuse |previous_frame| as starting state to avoid copying. @@ -313,7 +316,7 @@ // In that case copy the data instead. ImageFrame& previous_frame = frame_buffer_cache_[previous_frame_index]; if ((!CanReusePreviousFrameBuffer(current_frame_index) || - !frame.TakeBitmapDataIfWritable(&previous_frame)) && + !frame.TakeBitmapDataIfWritable(&previous_frame)) && !frame.CopyBitmapData(previous_frame)) { SetFailedFrameIndex(current_frame_index); continue; @@ -324,7 +327,8 @@ if (frame.GetStatus() == ImageFrame::kFrameInitialized) { SkCodec::FrameInfo frame_info; - bool frame_info_received = codec_->getFrameInfo(current_frame_index, &frame_info); + bool frame_info_received = + codec_->getFrameInfo(current_frame_index, &frame_info); DCHECK(frame_info_received); SkAlphaType alpha_type = kOpaque_SkAlphaType; @@ -359,7 +363,7 @@ SkCodec::Result start_incremental_decode_result = codec_->startIncrementalDecode(image_info, frame.Bitmap().getPixels(), - frame.Bitmap().rowBytes(), &options); + frame.Bitmap().rowBytes(), &options); switch (start_incremental_decode_result) { case SkCodec::kSuccess: break; @@ -376,7 +380,8 @@ switch (incremental_decode_result) { case SkCodec::kSuccess: { SkCodec::FrameInfo frame_info; - bool frame_info_received = codec_->getFrameInfo(current_frame_index, &frame_info); + bool frame_info_received = + codec_->getFrameInfo(current_frame_index, &frame_info); DCHECK(frame_info_received); frame.SetHasAlpha(frame_info.fAlphaType != SkAlphaType::kOpaque_SkAlphaType);
diff --git a/third_party/blink/renderer/platform/image-decoders/webp/webp_image_decoder.h b/third_party/blink/renderer/platform/image-decoders/webp/webp_image_decoder.h index 66b22a09..a73f706 100644 --- a/third_party/blink/renderer/platform/image-decoders/webp/webp_image_decoder.h +++ b/third_party/blink/renderer/platform/image-decoders/webp/webp_image_decoder.h
@@ -5,11 +5,10 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_IMAGE_DECODERS_WEBP_WEBP_IMAGE_DECODER_H_ #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_IMAGE_DECODERS_WEBP_WEBP_IMAGE_DECODER_H_ -#include "third_party/blink/renderer/platform/image-decoders/image_decoder.h" - #include <stddef.h> #include "base/functional/callback.h" +#include "third_party/blink/renderer/platform/image-decoders/image_decoder.h" #include "third_party/blink/renderer/platform/wtf/vector.h" #include "webp/decode.h" #include "webp/demux.h"
diff --git a/third_party/blink/renderer/platform/loader/subresource_integrity_test.cc b/third_party/blink/renderer/platform/loader/subresource_integrity_test.cc index 7339cb80..19d5ddf6 100644 --- a/third_party/blink/renderer/platform/loader/subresource_integrity_test.cc +++ b/third_party/blink/renderer/platform/loader/subresource_integrity_test.cc
@@ -829,11 +829,11 @@ String kValidDigestHeader = "sha-256=:X48E9qOokqqrvdts8nOJRJN3OWDUoyWxBf7kbu9DBPE=:"; String kValidSignatureInputHeader = - "signature=(\"identity-digest\";sf);alg=\"ed25519\";" + "signature=(\"identity-digest\";sf);" "keyid=\"JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=\";tag=\"sri\""; String kValidSignatureHeader = - "signature=:H7AqWWgo1DJ7VdyF9DKotG/4hvatKDfRTq2mpuY/hvJupSn+EYzus5p24qPK7" - "DtVQcxJFhzSYDj4RBq9grZTAQ==:"; + "signature=:eTKYITprfJYJmsOZlRTmu0szHbt0yLxHYBU0oXDdkx8najLl59IPO0zUofe5T" + "23RGuquHLdZx177tBX45CUcAg==:"; String raw_headers = "HTTP/1.1 200 OK\r\n"
diff --git a/third_party/blink/renderer/platform/network/http_parsers.cc b/third_party/blink/renderer/platform/network/http_parsers.cc index f8fceefe..5ba1c55 100644 --- a/third_party/blink/renderer/platform/network/http_parsers.cc +++ b/third_party/blink/renderer/platform/network/http_parsers.cc
@@ -299,17 +299,6 @@ } } -std::optional<blink::SRIMessageSignature::Algorithm> ConvertToBlink( - std::optional<SRIMessageSignature::Algorithm> in) { - if (!in.has_value()) { - return std::nullopt; - } - switch (in.value()) { - case SRIMessageSignature::Algorithm::kEd25519: - return blink::SRIMessageSignature::Algorithm::kEd25519; - } -} - blink::SRIMessageSignatureComponentPtr ConvertToBlink( const SRIMessageSignatureComponentPtr& in) { DCHECK(in); @@ -321,8 +310,8 @@ DCHECK(in); return blink::SRIMessageSignature::New( ConvertToBlink(in->label), ConvertToBlink(in->signature), - ConvertToBlink(in->components), ConvertToBlink(in->alg), in->created, - in->expires, ConvertToBlink(in->keyid), ConvertToBlink(in->nonce), + ConvertToBlink(in->components), in->created, in->expires, + ConvertToBlink(in->keyid), ConvertToBlink(in->nonce), ConvertToBlink(in->tag), ConvertToBlink(in->serialized_signature_params)); }
diff --git a/third_party/blink/renderer/platform/network/http_parsers_test.cc b/third_party/blink/renderer/platform/network/http_parsers_test.cc index cac24e1..b2d232fc 100644 --- a/third_party/blink/renderer/platform/network/http_parsers_test.cc +++ b/third_party/blink/renderer/platform/network/http_parsers_test.cc
@@ -890,7 +890,7 @@ "xNIlLOzNI3FkrnG2k52UxXJprz89+2aOwEAz3w6KjjZuGkdrOUwxhBQ==:"), // No `Signature` header. ("HTTP/1.1 200 OK\r\nSignature-Input: signature=(\"identity-digest\";sf);" - "alg=\"ed25519\";keyid=\"JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=\";" + "keyid=\"JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=\";" "tag=\"sri\"")}; for (const char* test : cases) { SCOPED_TRACE(test); @@ -904,15 +904,13 @@ "HTTP/1.1 200 OK\r\n" "Signature: signature=:amDAmvl9bsfIcfA/bIJsBuBvInjJAaxxNIlLOzNI3FkrnG2k52" "UxXJprz89+2aOwEAz3w6KjjZuGkdrOUwxhBQ==:\r\n" - "Signature-Input: signature=(\"identity-digest\";sf);alg=\"ed25519\";" + "Signature-Input: signature=(\"identity-digest\";sf);" "keyid=\"JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=\";" "tag=\"sri\"\r\n\r\n"; auto result = ParseSRIMessageSignaturesFromHeaders(raw_header); EXPECT_EQ(1u, result.size()); EXPECT_EQ("signature", result[0]->label); - EXPECT_EQ(network::mojom::blink::SRIMessageSignature::Algorithm::kEd25519, - result[0]->alg); EXPECT_FALSE(result[0]->created.has_value()); EXPECT_FALSE(result[0]->expires.has_value()); EXPECT_EQ("JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=", result[0]->keyid);
diff --git a/third_party/blink/web_tests/TestLists/headless_shell.filter b/third_party/blink/web_tests/TestLists/headless_shell.filter index a1d2e8f..cb45e09 100644 --- a/third_party/blink/web_tests/TestLists/headless_shell.filter +++ b/third_party/blink/web_tests/TestLists/headless_shell.filter
@@ -287,13 +287,18 @@ -external/wpt/css/css-highlight-api/painting/custom-highlight-painting-vertical-writing-mode-001.html -external/wpt/css/css-inline/baseline-source/baseline-source-first-textarea-002.tentative.html -external/wpt/css/css-inline/baseline-source/baseline-source-last-textarea-002.tentative.html +-external/wpt/css/css-inline/initial-letter/initial-letter-block-position-raise-over-ruby.html -external/wpt/css/css-inline/initial-letter/initial-letter-block-position-drop-over-ruby-tall.html -external/wpt/css/css-inline/initial-letter/initial-letter-block-position-drop-under-ruby.html -external/wpt/css/css-inline/initial-letter/initial-letter-block-position-margins-rtl.html +-external/wpt/css/css-inline/initial-letter/initial-letter-block-position-margins-srl.html -external/wpt/css/css-inline/initial-letter/initial-letter-block-position-margins-vlr.html -external/wpt/css/css-inline/initial-letter/initial-letter-block-position-margins-vrl.html -external/wpt/css/css-inline/initial-letter/initial-letter-breaking-srl.html +-external/wpt/css/css-inline/initial-letter/initial-letter-drop-initial-rtl.html +-external/wpt/css/css-inline/initial-letter/initial-letter-raise-initial-vrl.html -external/wpt/css/css-inline/initial-letter/initial-letter-short-para-initial-letter-clears.html +-external/wpt/css/css-inline/initial-letter/initial-letter-sunk-initial.html?class= -external/wpt/css/css-layout-api/baseline/orthogonal-baseline.https.html -external/wpt/css/css-layout-api/fallback-intrinsic-sizes/constructor-error.https.html -external/wpt/css/css-layout-api/fallback-layout/constructor-error.https.html @@ -306,6 +311,8 @@ -external/wpt/css/css-lists/list-marker-with-lineheight-and-overflow-hidden-001.html -external/wpt/css/css-lists/list-style-type-string-005b.html -external/wpt/css/css-masking/clip-path/clip-path-inline-003.html +-external/wpt/css/css-masking/clip-path/clip-path-inline-004.html +-external/wpt/css/css-masking/clip-path/clip-path-inline-006.html -external/wpt/css/css-masking/clip-path/clip-path-inline-010.html -external/wpt/css/css-masking/mask-image/mask-opacity-1e.html -external/wpt/css/css-multicol/getclientrects-000.html @@ -353,6 +360,9 @@ -external/wpt/css/css-page/margin-boxes/dimensions-006-print.html -external/wpt/css/css-page/margin-boxes/dimensions-007-print.html -external/wpt/css/css-page/margin-boxes/dimensions-008-print.html +-external/wpt/css/css-page/margin-boxes/dimensions-009-print.html +-external/wpt/css/css-page/margin-boxes/dimensions-011-print.html +-external/wpt/css/css-page/margin-boxes/dimensions-012-print.html -external/wpt/css/css-page/margin-boxes/dimensions-013-print.html -external/wpt/css/css-page/margin-boxes/dimensions-014-print.html -external/wpt/css/css-page/margin-boxes/inapplicable-properties-print.html @@ -1017,6 +1027,7 @@ -external/wpt/webcodecs/videoFrame-construction.any.html -external/wpt/webcodecs/videoFrame-texImage.any.html -external/wpt/webcodecs/videoFrame-texImage.any.worker.html +-external/wpt/webgl/* -external/wpt/webrtc* -external/wpt/websockets/binary/004.html?wpt_flags=h2 -external/wpt/websockets/Close-1000.any.html?wpt_flags=h2 @@ -1054,9 +1065,7 @@ -external/wpt/webvtt/rendering/cues-with-video/processing-model/audio_has_no_subtitles.html -external/wpt/webvtt/rendering/cues-with-video/processing-model/embedded_style_media_queries_resized.html -external/wpt/webvtt/rendering/cues-with-video/processing-model/selectors/cue/inherit_values_from_media_element.html --external/wpt/webxr/dom-overlay/nested_fullscreen.https.html --external/wpt/webxr/xrSession_requestReferenceSpace_features.https.html --external/wpt/webxr/xr_viewport_scale.https.html +-external/wpt/webxr/* -external/wpt/workers/baseurl/alpha/sharedworker-in-worker.html -external/wpt/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-same-origin.sub.any.worker.html -external/wpt/workers/postMessage_block.https.html @@ -1081,9 +1090,7 @@ -virtual/dialog-close-when-open-removed-disabled/external/wpt/html/semantics/interactive-elements/the-dialog-element/dialog-canceling.html -virtual/dialog-close-when-open-removed-disabled/external/wpt/html/semantics/interactive-elements/the-dialog-element/top-layer-stacking.tentative.html -virtual/dialog-light-dismiss-disabled/external/wpt/html/semantics/interactive-elements/the-dialog-element/dialog-canceling.html --virtual/direct-sockets/external/wpt/direct-sockets/disabled-by-permissions-policy.https.sub.html --virtual/direct-sockets/external/wpt/direct-sockets/tcp_socket.https.html --virtual/direct-sockets/external/wpt/direct-sockets/udp_socket.https.html +-virtual/direct-sockets/* -virtual/disable-css-line-clamp/external/wpt/css/css-overflow/line-clamp/webkit-line-clamp-024.html -virtual/disable-css-line-clamp/external/wpt/css/css-overflow/line-clamp/webkit-line-clamp-025.html -virtual/disable-css-line-clamp/external/wpt/css/css-overflow/line-clamp/webkit-line-clamp-036.html @@ -1111,6 +1118,7 @@ -virtual/fenced-frame-mparch/external/wpt/fenced-frame/prerender.https.html -virtual/fenced-frame-mparch/external/wpt/fenced-frame/resize-lock* -virtual/fenced-frame-mparch/external/wpt/fenced-frame/window-outer-dimensions.https.html +-virtual/force-eager/* -virtual/fractional-scroll-offsets/external/wpt/css/css-position/sticky/position-sticky-hyperlink.html -virtual/fractional-scroll-offsets/external/wpt/css/css-position/sticky/position-sticky-inline.html -virtual/fractional-scroll-offsets/external/wpt/css/css-position/sticky/position-sticky-large-top* @@ -1134,13 +1142,7 @@ -virtual/keepalive-in-browser-migration/external/wpt/fetch/stale-while-revalidate/stale-* -virtual/main-thread-clip-path-animation/external/wpt/css/css-masking/clip-path/animations/clip-path-animation-custom-timing-function.html -virtual/main-thread-clip-path-animation/external/wpt/css/css-masking/clip-path/animations/clip-path-animation-fixed-position-rounding-error.html --virtual/media-foundation-for-clear-dcomp/external/wpt/media-source/last-frame-dimensions.html --virtual/media-foundation-for-clear-dcomp/external/wpt/media-source/mediasource-config-change-mp4-v-bitrate.html --virtual/media-foundation-for-clear-dcomp/external/wpt/media-source/mediasource-config-change-mp4-v-framerate.html --virtual/media-foundation-for-clear-dcomp/external/wpt/media-source/mediasource-correct-frames-after-reappend.html --virtual/media-foundation-for-clear-dcomp/external/wpt/media-source/mediasource-correct-frames.html --virtual/media-foundation-for-clear-dcomp/external/wpt/media-source/mediasource-getvideoplaybackquality.html --virtual/media-foundation-for-clear-dcomp/external/wpt/media-source/SourceBuffer-short-frame-endOfStream.html +-virtual/media-foundation-for-clear-dcomp/* -virtual/no-auto-wpt-origin-isolation/external/wpt/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-nav-location-replace-set-src.html -virtual/no-auto-wpt-origin-isolation/external/wpt/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-nav-form-submit.html -virtual/no-auto-wpt-origin-isolation/external/wpt/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-nav-meta-refresh.optional.html
diff --git a/third_party/blink/web_tests/external/wpt/css/css-break/block-in-inline-012.html b/third_party/blink/web_tests/external/wpt/css/css-break/block-in-inline-012.html new file mode 100644 index 0000000..24f553d --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/css/css-break/block-in-inline-012.html
@@ -0,0 +1,43 @@ +<!DOCTYPE html> +<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org"> +<link rel="help" href="https://issues.chromium.org/issues/346876226"> +<link rel="stylesheet" type="text/css" href="/fonts/ahem.css"> +<link rel="match" href="../reference/ref-filled-green-100px-square.xht"> +<style> + .multicol { + position: relative; + overflow: hidden; + font: 16px/16px Ahem; + columns: 4; + gap: 0; + column-fill: auto; + width: 100px; + height: 100px; + orphans: 1; + widows: 1; + background: red; + } + .filler { + position: absolute; + top: 0; + bottom: 0; + width: 16px; + background: green; + } + grinch { + color: green; + } +</style> +<p>Test passes if there is a filled green square and <strong>no red</strong>.</p> +<div class="multicol"> + <div class="filler" style="left:0; top:16px;"></div> + <div class="filler" style="left:25px;"></div> + <div class="filler" style="left:50px;"></div> + <div class="filler" style="left:75px; bottom:16px;"></div> + <grinch> + <div> + <div style="float:right; width:9px; height:384px; background:green;"></div> + </div> + x xx + </grinch> +</div>
diff --git a/third_party/blink/web_tests/external/wpt/subresource-integrity/signatures/tentative/fetch.any.js b/third_party/blink/web_tests/external/wpt/subresource-integrity/signatures/tentative/fetch.any.js index 4840451..2bfb2b4 100644 --- a/third_party/blink/web_tests/external/wpt/subresource-integrity/signatures/tentative/fetch.any.js +++ b/third_party/blink/web_tests/external/wpt/subresource-integrity/signatures/tentative/fetch.any.js
@@ -13,7 +13,7 @@ // Content-Type: application/json // Identity-Digest: sha-256=:X48E9qOokqqrvdts8nOJRJN3OWDUoyWxBf7kbu9DBPE=: // Content-Length: 18 -// Signature-Input: signature=("identity-digest";sf);alg="ed25519"; \ +// Signature-Input: signature=("identity-digest";sf); \ // keyid="JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs="; \ // tag="sri" // Signature: signature=:TUznBT2ikFq6VrtoZeC5znRtZugu1U8OHJWoBkOLDTJA2FglSR34Q \ @@ -26,8 +26,8 @@ const kRequestWithValidSignature = { body: `{"hello": "world"}`, digest: `sha-256=:X48E9qOokqqrvdts8nOJRJN3OWDUoyWxBf7kbu9DBPE=:`, - signature: `signature=:TUznBT2ikFq6VrtoZeC5znRtZugu1U8OHJWoBkOLDTJA2FglSR34QY9j+BwN79PT4H0p8aIosnv4rXSKfIZVDA==:`, - signatureInput: `signature=("identity-digest";sf);alg="ed25519";keyid="${kValidKeys['rfc']}";tag="sri"` + signature: `signature=:eTKYITprfJYJmsOZlRTmu0szHbt0yLxHYBU0oXDdkx8najLl59IPO0zUofe5T23RGuquHLdZx177tBX45CUcAg==:`, + signatureInput: `signature=("identity-digest";sf);keyid="${kValidKeys['rfc']}";tag="sri"` }; // Metadata from the response above, but with an incorrect signature: @@ -35,7 +35,7 @@ body: `{"hello": "world"}`, digest: `sha-256=:X48E9qOokqqrvdts8nOJRJN3OWDUoyWxBf7kbu9DBPE=:`, signature: `signature=:AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==:`, - signatureInput: `signature=("identity-digest";sf);alg="ed25519";keyid="${kValidKeys['rfc']}";tag="sri"` + signatureInput: `signature=("identity-digest";sf);keyid="${kValidKeys['rfc']}";tag="sri"` }; generate_fetch_test({}, "", EXPECT_LOADED,
diff --git a/third_party/blink/web_tests/external/wpt/subresource-integrity/signatures/tentative/path.window.js b/third_party/blink/web_tests/external/wpt/subresource-integrity/signatures/tentative/path.window.js index 37a6c04..f4d31118 100644 --- a/third_party/blink/web_tests/external/wpt/subresource-integrity/signatures/tentative/path.window.js +++ b/third_party/blink/web_tests/external/wpt/subresource-integrity/signatures/tentative/path.window.js
@@ -13,7 +13,7 @@ // Content-Type: application/json // Identity-Digest: sha-256=:X48E9qOokqqrvdts8nOJRJN3OWDUoyWxBf7kbu9DBPE=: // Content-Length: 18 -// Signature-Input: signature=("identity-digest";sf "@path";req);alg="ed25519"; \ +// Signature-Input: signature=("identity-digest";sf "@path";req); \ // keyid="JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs="; \ // tag="sri" // Signature: signature=:oVQ+s/OqXLAVdfvgZ3HaPiyzkpNXZSit9l6e1FB/gOOL3t8FOrIRDV \ @@ -33,26 +33,26 @@ // ``` // "identity-digest";sf: sha-256=:PZJ+9CdAAIacg7wfUe4t/RkDQJVKM0mCZ2K7qiRhHFc=: // "@path";req: /subresource-integrity/signatures/tentative/resource.py - // "@signature-params": ("identity-digest";sf "@path";req);alg="ed25519";keyid="JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=";tag="sri" + // "@signature-params": ("identity-digest";sf "@path";req);keyid="JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=";tag="sri" // ``` { body: "window.hello = `world`;", digest: "sha-256=:PZJ+9CdAAIacg7wfUe4t/RkDQJVKM0mCZ2K7qiRhHFc=:", - signature: `signature=:AEW2XbDmmBK71KBle0Dx1JAWAO7B4QdEH2Tw71c9nntjUmx8xF5t8xbsETRHFwULrvJ4STBFtdMVm5a7QIw5Cw==:`, - signatureInput: `signature=("identity-digest";sf "@path";req);alg="ed25519";keyid="${kValidKeys['rfc']}";tag="sri"` + signature: `signature=:W54PPjO6aWHvhTmDICG4EGLs461FrwYxXE/UkBH7dz9V5lnCtv3N6ZTmOxPRMkmADhRilem6W/Zq5SH9tVoxAg==:`, + signatureInput: `signature=("identity-digest";sf "@path";req);keyid="${kValidKeys['rfc']}";tag="sri"` }, // `@path` then `identity-digest`, with the following signature base: // // ``` // "@path";req: /subresource-integrity/signatures/tentative/resource.py // "identity-digest";sf: sha-256=:PZJ+9CdAAIacg7wfUe4t/RkDQJVKM0mCZ2K7qiRhHFc=: - // "@signature-params": ("@path";req "identity-digest";sf);alg="ed25519";keyid="JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=";tag="sri" + // "@signature-params": ("@path";req "identity-digest";sf);keyid="JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=";tag="sri" // ``` { body: "window.hello = `world`;", digest: "sha-256=:PZJ+9CdAAIacg7wfUe4t/RkDQJVKM0mCZ2K7qiRhHFc=:", - signature: `signature=:NEmnhhW1aKxO+ReWQmmSF17i49ZEdtDC4lRI2CJDw2E/rz9j2a8f8kIwVk7W/BIuQ6kejTAQ2FReGmmkREXPDg==:`, - signatureInput: `signature=("@path";req "identity-digest";sf);alg="ed25519";keyid="${kValidKeys['rfc']}";tag="sri"` + signature: `signature=:qF/RJ9L8bCpRx5cm6QW9qvqw7nU0ziwi6lLD6KkhT/ZgLS2c6O9s4UFXieM9+waU71YtNfTXQAQ4PeMSAVKlDQ==:`, + signatureInput: `signature=("@path";req "identity-digest";sf);keyid="${kValidKeys['rfc']}";tag="sri"` } ];
diff --git a/third_party/blink/web_tests/external/wpt/subresource-integrity/signatures/tentative/script.window.js b/third_party/blink/web_tests/external/wpt/subresource-integrity/signatures/tentative/script.window.js index c9ccee3..11355ca6 100644 --- a/third_party/blink/web_tests/external/wpt/subresource-integrity/signatures/tentative/script.window.js +++ b/third_party/blink/web_tests/external/wpt/subresource-integrity/signatures/tentative/script.window.js
@@ -13,15 +13,15 @@ signatures: { // ``` // "identity-digest";sf: sha-256=:PZJ+9CdAAIacg7wfUe4t/RkDQJVKM0mCZ2K7qiRhHFc=: - // "@signature-params": ("identity-digest";sf);alg="ed25519";keyid="JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=";tag="sri" + // "@signature-params": ("identity-digest";sf);keyid="JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=";tag="sri" // ``` - rfc: "pRcIRwdXaZL4XqkAo1a7mXIlzETMgG93JWWgqDlx6XhWe8mC8umiEgbI3afULpzT1Buro4ZJfzEXwy8tC5HaCA==", + rfc: "lDlqBb5/GLDB8GnVt3DqiytUJwFj4OPA7pO9eXBowN0qpqa2uNIHZz5IR+IdwOLKe5tBTLvmiMCsnvku3ecUAQ==", // ``` // "identity-digest";sf: sha-256=:PZJ+9CdAAIacg7wfUe4t/RkDQJVKM0mCZ2K7qiRhHFc=: - // "@signature-params": ("identity-digest";sf);alg="ed25519";keyid="xDnP380zcL4rJ76rXYjeHlfMyPZEOqpJYjsjEppbuXE=";tag="sri" + // "@signature-params": ("identity-digest";sf);keyid="xDnP380zcL4rJ76rXYjeHlfMyPZEOqpJYjsjEppbuXE=";tag="sri" // ``` - arbitrary: "6zUKqibVA3CzFvQj6a+irKnOB9ZY2ky5opG7TMpFF0BtvJ1oAjoVjW3uObPlD/PBOrmkXFNRNwv3PVerE12FDQ==" + arbitrary: "kTzkz6pMEMAOWxI7JPhcNGsPVdIeM1dLEGVIVDdHELY0KDp4TQILxmTElrWGib68KgalaV2oQMz3+XA2sk/ICA==" } }; @@ -32,15 +32,15 @@ signatures: { // ``` // "identity-digest";sf: sha-256=:FUSFR1N3vTmSGbI7q9jaMbHq+ogNeBfpznOIufaIfpc=: - // "@signature-params": ("identity-digest";sf);alg="ed25519";keyid="JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=";tag="sri" + // "@signature-params": ("identity-digest";sf);keyid="JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=";tag="sri" // ``` - rfc: "mXbPPr9LIwClnGOoPM/7mlRT3PfgCHnF4E5te6LocGWplqcxS6qKQoUPo/rnU8BxCY56/nI4BuGtgyjPr2lQCg==", + rfc: "IhHp/w0zpKnHvYStc2QuURfHyQBzgOHELlTt6RwspfvL23p/1CUzAnIu2WCKWtAFlZv6aZfggjLmiHJAHiWxAw==", // ``` // "identity-digest";sf: sha-256=:FUSFR1N3vTmSGbI7q9jaMbHq+ogNeBfpznOIufaIfpc=: - // "@signature-params": ("identity-digest";sf);alg="ed25519";keyid="xDnP380zcL4rJ76rXYjeHlfMyPZEOqpJYjsjEppbuXE";tag="sri" + // "@signature-params": ("identity-digest";sf);keyid="xDnP380zcL4rJ76rXYjeHlfMyPZEOqpJYjsjEppbuXE";tag="sri" // ``` - arbitrary: "FGQbZOeQIqXQLbooOWExK2M756WCcT4rcszNsXX6+Z6Wdofh4GKuXoFcFSdiYiGNamFMHEW6/BRMoVVjtnGwAg==" + arbitrary: "ghFEMST5TCy9a+cY7igV/RpdbOt26F9iJGNu7QTGQbJ1bZeaiqnH0WHWcfqRriFuzg1R7YAE3taZ94TA8K4ECg==" } }; @@ -63,13 +63,13 @@ const kSignedShouldExecute = { body: kScriptToExecute['body'], digest: `sha-256=:${kScriptToExecute['hash']}:`, - signatureInput: `signature=("identity-digest";sf);alg="ed25519";keyid="${kValidKeys['rfc']}";tag="sri"`, + signatureInput: `signature=("identity-digest";sf);keyid="${kValidKeys['rfc']}";tag="sri"`, signature: `signature=:${kScriptToExecute['signatures']['rfc']}:` }; const kSignedShouldBlock = { body: kScriptToBlock['body'], digest: `sha-256=:${kScriptToBlock['hash']}:`, - signatureInput: `signature=("identity-digest";sf);alg="ed25519";keyid="${kValidKeys['rfc']}";tag="sri"`, + signatureInput: `signature=("identity-digest";sf);keyid="${kValidKeys['rfc']}";tag="sri"`, signature: `signature=:${kScriptToBlock['signatures']['rfc']}:` }; @@ -91,16 +91,16 @@ const kMultiplySignedShouldExecute = { body: kScriptToExecute['body'], digest: `sha-256=:${kScriptToExecute['hash']}:`, - signatureInput: `signature1=("identity-digest";sf);alg="ed25519";keyid="${kValidKeys['rfc']}";tag="sri", ` + - `signature2=("identity-digest";sf);alg="ed25519";keyid="${kValidKeys['arbitrary']}";tag="sri"`, + signatureInput: `signature1=("identity-digest";sf);keyid="${kValidKeys['rfc']}";tag="sri", ` + + `signature2=("identity-digest";sf);keyid="${kValidKeys['arbitrary']}";tag="sri"`, signature: `signature1=:${kScriptToExecute['signatures']['rfc']}:, ` + `signature2=:${kScriptToExecute['signatures']['arbitrary']}:` }; const kMultiplySignedShouldBlock = { body: kScriptToBlock['body'], digest: `sha-256=:${kScriptToBlock['hash']}:`, - signatureInput: `signature1=("identity-digest";sf);alg="ed25519";keyid="${kValidKeys['rfc']}";tag="sri", ` + - `signature2=("identity-digest";sf);alg="ed25519";keyid="${kValidKeys['arbitrary']}";tag="sri"`, + signatureInput: `signature1=("identity-digest";sf);keyid="${kValidKeys['rfc']}";tag="sri", ` + + `signature2=("identity-digest";sf);keyid="${kValidKeys['arbitrary']}";tag="sri"`, signature: `signature1=:${kScriptToBlock['signatures']['rfc']}:, ` + `signature2=:${kScriptToBlock['signatures']['arbitrary']}:` };
diff --git a/third_party/dawn b/third_party/dawn index 158ed9a..23bb5c0 160000 --- a/third_party/dawn +++ b/third_party/dawn
@@ -1 +1 @@ -Subproject commit 158ed9a7b3205341e4e5ece2dda413e7b2020afc +Subproject commit 23bb5c06534109dcbdcf41174be544f2836b430f
diff --git a/third_party/libc++/src b/third_party/libc++/src index ec4ac17..11c38d9 160000 --- a/third_party/libc++/src +++ b/third_party/libc++/src
@@ -1 +1 @@ -Subproject commit ec4ac17a44a46b162c28d38f313f157f76236a6c +Subproject commit 11c38d901d29bc91aee3efb53652f7141f72f47f
diff --git a/third_party/perfetto b/third_party/perfetto index 1e7633e..7bf1bcb 160000 --- a/third_party/perfetto +++ b/third_party/perfetto
@@ -1 +1 @@ -Subproject commit 1e7633eb8271449051555e5b8f6488c6e0189dd0 +Subproject commit 7bf1bcbc57dff90be8ff68c017832c47a1d03a24
diff --git a/third_party/skia b/third_party/skia index a38c4ae..46df6fe 160000 --- a/third_party/skia +++ b/third_party/skia
@@ -1 +1 @@ -Subproject commit a38c4ae0287a1d6d4a57db85b8b52c0d43965deb +Subproject commit 46df6fed41442f0c28bf56534530bbd6e24193e5
diff --git a/third_party/webrtc b/third_party/webrtc index 39f41d3..d243359 160000 --- a/third_party/webrtc +++ b/third_party/webrtc
@@ -1 +1 @@ -Subproject commit 39f41d369962364cf1023f9e2aa4ec3cce2936ca +Subproject commit d243359901730e1c46e4b0bdf35baa0eb4b0198e
diff --git a/tools/metrics/histograms/metadata/arc/enums.xml b/tools/metrics/histograms/metadata/arc/enums.xml index ef247aa..4c795ff 100644 --- a/tools/metrics/histograms/metadata/arc/enums.xml +++ b/tools/metrics/histograms/metadata/arc/enums.xml
@@ -631,6 +631,9 @@ <int value="22" label="Under /data/user_de/0 (src)"/> <int value="23" label="Under /data/user_de/0 (dest)"/> <int value="24" label="Under /data/user_de/0 (src or dest)"/> + <int value="25" label="Under /data/fonts (src)"/> + <int value="26" label="Under /data/fonts (dest)"/> + <int value="27" label="Under /data/fonts (src or dest)"/> </enum> <enum name="ArcVmDataMigrationFinishReason">
diff --git a/tools/metrics/histograms/metadata/arc/histograms.xml b/tools/metrics/histograms/metadata/arc/histograms.xml index 64d1ee0..b78d500 100644 --- a/tools/metrics/histograms/metadata/arc/histograms.xml +++ b/tools/metrics/histograms/metadata/arc/histograms.xml
@@ -2410,7 +2410,7 @@ </histogram> <histogram name="Arc.VmDataMigration.BatteryConsumption" units="%" - expires_after="2024-12-31"> + expires_after="2025-06-30"> <owner>momohatt@google.com</owner> <owner>youkichihosoi@google.com</owner> <owner>arc-storage@google.com</owner> @@ -2525,7 +2525,7 @@ </histogram> <histogram name="Arc.VmDataMigration.InitialFreeSpace" units="MB" - expires_after="2024-12-31"> + expires_after="2025-06-30"> <owner>momohatt@google.com</owner> <owner>youkichihosoi@google.com</owner> <owner>arc-storage@google.com</owner> @@ -2537,7 +2537,7 @@ </histogram> <histogram name="Arc.VmDataMigration.MigrationFinishReason{ArcUserTypes}" - enum="ArcVmDataMigrationFinishReason" expires_after="2024-12-31"> + enum="ArcVmDataMigrationFinishReason" expires_after="2025-06-30"> <owner>momohatt@google.com</owner> <owner>youkichihosoi@google.com</owner> <owner>arc-storage@google.com</owner> @@ -2548,7 +2548,7 @@ </histogram> <histogram name="Arc.VmDataMigration.MigrationStatusOnArcStarted{ArcUserTypes}" - enum="ArcVmDataMigrationStatus" expires_after="2024-12-31"> + enum="ArcVmDataMigrationStatus" expires_after="2025-06-30"> <owner>momohatt@google.com</owner> <owner>youkichihosoi@google.com</owner> <owner>arc-storage@google.com</owner> @@ -2560,7 +2560,7 @@ </histogram> <histogram name="Arc.VmDataMigration.NoSpaceFailureFreeSpace" units="MB" - expires_after="2024-12-31"> + expires_after="2025-06-30"> <owner>momohatt@google.com</owner> <owner>youkichihosoi@google.com</owner> <owner>arc-storage@google.com</owner> @@ -2571,8 +2571,8 @@ </summary> </histogram> -<histogram name="Arc.VmDataMigration.NoSpaceXattrSize" units="bytes" - expires_after="2024-12-31"> +<histogram name="Arc.VmDataMigration.NoSpaceFailureXattrSize" units="bytes" + expires_after="2025-06-30"> <owner>momohatt@google.com</owner> <owner>youkichihosoi@google.com</owner> <owner>arc-storage@google.com</owner> @@ -2587,7 +2587,7 @@ </histogram> <histogram name="Arc.VmDataMigration.NotificationShownForTheFirstTime" - enum="BooleanEnabled" expires_after="2024-12-31"> + enum="BooleanEnabled" expires_after="2025-06-30"> <owner>momohatt@google.com</owner> <owner>youkichihosoi@google.com</owner> <owner>arc-storage@google.com</owner> @@ -2625,7 +2625,7 @@ <histogram name="Arc.VmDataMigration.RequiredFreeDiskSpaceInGB.{SatisfiedOrNot}" - units="GB" expires_after="2024-12-31"> + units="GB" expires_after="2025-06-30"> <owner>momohatt@google.com</owner> <owner>youkichihosoi@google.com</owner> <owner>arc-storage@google.com</owner> @@ -2641,7 +2641,7 @@ </histogram> <histogram name="Arc.VmDataMigration.ResumeNotificationShown" - enum="BooleanEnabled" expires_after="2024-12-31"> + enum="BooleanEnabled" expires_after="2025-06-30"> <owner>momohatt@google.com</owner> <owner>youkichihosoi@google.com</owner> <owner>arc-storage@google.com</owner> @@ -2655,7 +2655,7 @@ </histogram> <histogram name="Arc.VmDataMigration.ScreenEvent.On{ArcVmDataMigrationType}" - enum="ArcVmDataMigrationScreenEvent" expires_after="2024-12-31"> + enum="ArcVmDataMigrationScreenEvent" expires_after="2025-06-30"> <owner>momohatt@google.com</owner> <owner>youkichihosoi@google.com</owner> <owner>arc-storage@google.com</owner> @@ -2668,7 +2668,7 @@ <histogram name="Arc.VmDataMigration.ScreenInitialState.On{ArcVmDataMigrationType}" - enum="ArcVmDataMigrationScreenInitialState" expires_after="2024-12-31"> + enum="ArcVmDataMigrationScreenInitialState" expires_after="2025-06-30"> <owner>momohatt@google.com</owner> <owner>youkichihosoi@google.com</owner> <owner>arc-storage@google.com</owner>
diff --git a/tools/metrics/histograms/metadata/autofill/histograms.xml b/tools/metrics/histograms/metadata/autofill/histograms.xml index 62de4d2..943a168 100644 --- a/tools/metrics/histograms/metadata/autofill/histograms.xml +++ b/tools/metrics/histograms/metadata/autofill/histograms.xml
@@ -6119,7 +6119,7 @@ </token> </histogram> -<histogram name="Autofill.TimingInterval.{Caller}.{Callee}.{Event}" +<histogram name="Autofill.TimingInterval.{Callee}.{Caller}.{Event}" units="microseconds" expires_after="2025-12-12"> <owner>schwering@google.com</owner> <owner>jkeitel@google.com</owner>
diff --git a/tools/metrics/histograms/metadata/navigation/enums.xml b/tools/metrics/histograms/metadata/navigation/enums.xml index 6ef84e6..656ca991 100644 --- a/tools/metrics/histograms/metadata/navigation/enums.xml +++ b/tools/metrics/histograms/metadata/navigation/enums.xml
@@ -353,13 +353,6 @@ <int value="1" label="Requires dedicated process"/> </enum> -<enum name="NavigationStartAdjustmentType"> - <int value="0" label="No adjustment made"/> - <int value="1" label="Legacy PostTask without BeforeUnload"/> - <int value="2" label="BeforeUnload handlers without dialog"/> - <int value="3" label="BeforeUnload dialog shown"/> -</enum> - <enum name="NavigationSuddenTerminationDisabler"> <int value="0" label="Subframe-None"/> <int value="1" label="MainFrame-None"/>
diff --git a/tools/metrics/histograms/metadata/navigation/histograms.xml b/tools/metrics/histograms/metadata/navigation/histograms.xml index 8d52088..c900729 100644 --- a/tools/metrics/histograms/metadata/navigation/histograms.xml +++ b/tools/metrics/histograms/metadata/navigation/histograms.xml
@@ -2057,81 +2057,6 @@ <token key="FrameType" variants="FrameTypes"/> </histogram> -<histogram name="Navigation.StartAdjustment" - enum="NavigationStartAdjustmentType" expires_after="2025-12-20"> - <owner>creis@chromium.org</owner> - <owner>alexmos@chromium.org</owner> - <summary> - Records whether an adjustment was made to the navigation start time, and - what the reason was if so. This metric is recorded each time a navigation - finishes. - </summary> -</histogram> - -<histogram name="Navigation.StartAdjustment.BeforeUnloadDialog" units="ms" - expires_after="2025-12-20"> - <owner>creis@chromium.org</owner> - <owner>alexmos@chromium.org</owner> - <summary> - Records how many milliseconds the navigation start time was delayed, in - cases where it was adjusted to after a beforeunload dialog was displayed. - </summary> -</histogram> - -<histogram name="Navigation.StartAdjustment.BeforeUnloadDialog.Percentage" - units="%" expires_after="2025-12-20"> - <owner>creis@chromium.org</owner> - <owner>alexmos@chromium.org</owner> - <summary> - Records the percentage of navigation time that was ignored, in cases where - the start time was adjusted to after a beforeunload dialog was displayed. - </summary> -</histogram> - -<histogram name="Navigation.StartAdjustment.BeforeUnloadHandlers" units="ms" - expires_after="2025-12-20"> - <owner>creis@chromium.org</owner> - <owner>alexmos@chromium.org</owner> - <summary> - Records how many milliseconds the navigation start time was delayed, in - cases where it was adjusted to after beforeunload handlers ran, when no - dialog was displayed. - </summary> -</histogram> - -<histogram name="Navigation.StartAdjustment.BeforeUnloadHandlers.Percentage" - units="%" expires_after="2025-12-20"> - <owner>creis@chromium.org</owner> - <owner>alexmos@chromium.org</owner> - <summary> - Records the percentage of navigation time that was ignored, in cases where - the start time was adjusted to after beforeunload handlers ran, when no - dialog was displayed. - </summary> -</histogram> - -<histogram name="Navigation.StartAdjustment.LegacyPostTask" units="ms" - expires_after="2025-12-20"> - <owner>creis@chromium.org</owner> - <owner>alexmos@chromium.org</owner> - <summary> - Records how many milliseconds the navigation start time was delayed, in - cases where it was adjusted to after a legacy PostTask was run, when no - beforeunload handlers were registered. - </summary> -</histogram> - -<histogram name="Navigation.StartAdjustment.LegacyPostTask.Percentage" - units="%" expires_after="2025-12-20"> - <owner>creis@chromium.org</owner> - <owner>alexmos@chromium.org</owner> - <summary> - Records the percentage of navigation time that was ignored, in cases where - the start time was adjusted to after a legacy PostTask was run, when no - beforeunload handlers were registered. - </summary> -</histogram> - <histogram name="Navigation.StartToCommit" units="ms" expires_after="2025-06-01"> <owner>nasko@chromium.org</owner>
diff --git a/tools/metrics/histograms/metadata/uma/enums.xml b/tools/metrics/histograms/metadata/uma/enums.xml index a008c16..f91f6a9e 100644 --- a/tools/metrics/histograms/metadata/uma/enums.xml +++ b/tools/metrics/histograms/metadata/uma/enums.xml
@@ -80,7 +80,7 @@ <int value="2" label="From backup"/> <int value="3" label="New"/> <int value="4" label="From provisional id"/> - <int value="5" label="From external"/> + <int value="5" label="(Deprecated) From external"/> </enum> <enum name="FileMetricsProviderAccessResult">
diff --git a/tools/perf/core/perfetto_binary_roller/binary_deps.json b/tools/perf/core/perfetto_binary_roller/binary_deps.json index b5de9e1..5acff86a8 100644 --- a/tools/perf/core/perfetto_binary_roller/binary_deps.json +++ b/tools/perf/core/perfetto_binary_roller/binary_deps.json
@@ -5,8 +5,8 @@ "full_remote_path": "perfetto-luci-artifacts/5bf4e2a65d76d5a603ff175222d1513f71d28a0b/linux-arm64/trace_processor_shell" }, "win": { - "hash": "fd3e40af5ed15794b4ce050d6ec096527f245753", - "full_remote_path": "chromium-telemetry/perfetto_binaries/trace_processor_shell/win/1e7633eb8271449051555e5b8f6488c6e0189dd0/trace_processor_shell.exe" + "hash": "931fac38c28e4fa9b6c214a8da15a3aff7ead560", + "full_remote_path": "chromium-telemetry/perfetto_binaries/trace_processor_shell/win/7bf1bcbc57dff90be8ff68c017832c47a1d03a24/trace_processor_shell.exe" }, "linux_arm": { "hash": "e250187786aa190a66288bc9443a5e1f5888f8d7", @@ -21,8 +21,8 @@ "full_remote_path": "perfetto-luci-artifacts/5bf4e2a65d76d5a603ff175222d1513f71d28a0b/mac-arm64/trace_processor_shell" }, "linux": { - "hash": "0a0eaa928585335d4dd653c07ced18595eb0b7c3", - "full_remote_path": "chromium-telemetry/perfetto_binaries/trace_processor_shell/linux/1e7633eb8271449051555e5b8f6488c6e0189dd0/trace_processor_shell" + "hash": "940c199a27cbf212f148c3ef9b35e67bf46139d7", + "full_remote_path": "chromium-telemetry/perfetto_binaries/trace_processor_shell/linux/7bf1bcbc57dff90be8ff68c017832c47a1d03a24/trace_processor_shell" } }, "power_profile.sql": {
diff --git a/ui/accelerated_widget_mac/ca_layer_tree_coordinator.mm b/ui/accelerated_widget_mac/ca_layer_tree_coordinator.mm index b99461d5..fd4356bd 100644 --- a/ui/accelerated_widget_mac/ca_layer_tree_coordinator.mm +++ b/ui/accelerated_widget_mac/ca_layer_tree_coordinator.mm
@@ -202,6 +202,9 @@ feedback.flags = gfx::PresentationFeedback::kHWCompletion | gfx::PresentationFeedback::kVSync; } +#else + // Disable -Wunused-private-field warning. + (void)new_presentation_feedback_timestamps_; #endif base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask(
diff --git a/ui/accessibility/BUILD.gn b/ui/accessibility/BUILD.gn index f4b88f3..1b254d1 100644 --- a/ui/accessibility/BUILD.gn +++ b/ui/accessibility/BUILD.gn
@@ -203,8 +203,6 @@ "ax_tree_update_util.h", "null_ax_action_target.cc", "null_ax_action_target.h", - "test_single_ax_tree_manager.cc", - "test_single_ax_tree_manager.h", ] deps = [ @@ -266,6 +264,8 @@ "test_ax_node_helper.h", "test_ax_tree_update.cc", "test_ax_tree_update.h", + "test_single_ax_tree_manager.cc", + "test_single_ax_tree_manager.h", "tree_generator.cc", "tree_generator.h", ]
diff --git a/ui/accessibility/platform/ax_platform_node_cocoa.mm b/ui/accessibility/platform/ax_platform_node_cocoa.mm index bd5f12f..b47b4d5 100644 --- a/ui/accessibility/platform/ax_platform_node_cocoa.mm +++ b/ui/accessibility/platform/ax_platform_node_cocoa.mm
@@ -2386,7 +2386,7 @@ (0 != strcmp([parameter objCType], @encode(NSRange)))) return nil; - return [[self getAXValueAsString] substringWithRange:[parameter rangeValue]]; + return [self accessibilityStringForRange:[parameter rangeValue]]; } - (id)AXRangeForPosition:(id)parameter { @@ -3281,10 +3281,10 @@ // LINT.ThenChange(AXVisibleCharacterRange) - (NSString*)accessibilityStringForRange:(NSRange)range { - if (!_node) + if (![self instanceActive]) { return nil; - - return (NSString*)[self AXStringForRange:[NSValue valueWithRange:range]]; + } + return [[self getAXValueAsString] substringWithRange:range]; } - (NSAttributedString*)accessibilityAttributedStringForRange:(NSRange)range {
diff --git a/ui/accessibility/platform/ax_platform_node_cocoa_unittest.mm b/ui/accessibility/platform/ax_platform_node_cocoa_unittest.mm index 83cc7b64..a604262 100644 --- a/ui/accessibility/platform/ax_platform_node_cocoa_unittest.mm +++ b/ui/accessibility/platform/ax_platform_node_cocoa_unittest.mm
@@ -797,6 +797,18 @@ [row node]->GetUniqueId()); } +// accessibilityStringForRange +TEST_P(AXPlatformNodeCocoaTest, AccessibilityStringForRange) { + Init(std::string(R"HTML( + ++1 kRootWebArea + ++++2 kStaticText name="heybullfrog" + )HTML")); + + AXPlatformNodeCocoa* text_field = GetCocoaNode(2); + NSString* string = [text_field accessibilityStringForRange:NSMakeRange(0, 3)]; + EXPECT_TRUE([string isEqualToString:@"hey"]); +} + // Non-header cells should not support accessibilitySortDirection, even if // there's a sort direction in the AXNodeData. Their sort order is "unknown". TEST_P(AXPlatformNodeCocoaTest, AccessibilitySortDirectionOnCell) {
diff --git a/ui/accessibility/platform/browser_accessibility_cocoa.h b/ui/accessibility/platform/browser_accessibility_cocoa.h index cb2923d..6d4814a 100644 --- a/ui/accessibility/platform/browser_accessibility_cocoa.h +++ b/ui/accessibility/platform/browser_accessibility_cocoa.h
@@ -76,7 +76,6 @@ // Return the method name for the given attribute. For testing only. - (NSString*)methodNameForAttribute:(NSString*)attribute; -- (NSString*)valueForRange:(NSRange)range; - (NSRect)frameForRange:(NSRange)range; // Find the index of the given row among the descendants of this object
diff --git a/ui/accessibility/platform/browser_accessibility_cocoa.mm b/ui/accessibility/platform/browser_accessibility_cocoa.mm index 2e92925..85b96bb4 100644 --- a/ui/accessibility/platform/browser_accessibility_cocoa.mm +++ b/ui/accessibility/platform/browser_accessibility_cocoa.mm
@@ -1700,18 +1700,6 @@ return [gAttributeToMethodNameMap objectForKey:attribute]; } -- (NSString*)valueForRange:(NSRange)range { - if (![self instanceActive]) - return nil; - - std::u16string textContent = _owner->GetTextContentUTF16(); - if (NSMaxRange(range) > textContent.length()) - return nil; - - return base::SysUTF16ToNSString( - textContent.substr(range.location, range.length)); -} - - (NSRect)frameForRange:(NSRange)range { if (!_owner->IsText() && !_owner->IsAtomicTextField()) return CGRectNull; @@ -1747,9 +1735,18 @@ return [super accessibilityAttributeValue:attribute]; } -- (id)AXStringForRange:(id)parameter { - DCHECK([parameter isKindOfClass:[NSValue class]]); - return [self valueForRange:[(NSValue*)parameter rangeValue]]; +- (NSString*)accessibilityStringForRange:(NSRange)range { + if (![self instanceActive]) { + return nil; + } + + std::u16string textContent = _owner->GetTextContentUTF16(); + if (NSMaxRange(range) > textContent.length()) { + return nil; + } + + return base::SysUTF16ToNSString( + textContent.substr(range.location, range.length)); } - (id)AXLineForIndex:(id)parameter { @@ -1811,11 +1808,6 @@ return nil; } - if ([attribute isEqualToString: - NSAccessibilityStringForRangeParameterizedAttribute]) { - return [self AXStringForRange:parameter]; - } - if ([attribute isEqualToString:NSAccessibilityLineForIndexParameterizedAttribute]) { return [self AXLineForIndex:parameter]; @@ -2401,7 +2393,6 @@ [attributeNames addObjectsFromArray:@[ NSAccessibilityLineForIndexParameterizedAttribute, NSAccessibilityRangeForLineParameterizedAttribute, - NSAccessibilityStringForRangeParameterizedAttribute, NSAccessibilityRangeForPositionParameterizedAttribute, NSAccessibilityRangeForIndexParameterizedAttribute, NSAccessibilityBoundsForRangeParameterizedAttribute,
diff --git a/ui/accessibility/test_single_ax_tree_manager.cc b/ui/accessibility/test_single_ax_tree_manager.cc index 16ec9d8f..425e9fdc 100644 --- a/ui/accessibility/test_single_ax_tree_manager.cc +++ b/ui/accessibility/test_single_ax_tree_manager.cc
@@ -7,6 +7,7 @@ #include "ui/accessibility/ax_node.h" #include "ui/accessibility/ax_tree_data.h" #include "ui/accessibility/ax_tree_manager_map.h" +#include "ui/accessibility/test_ax_tree_update.h" namespace ui { @@ -72,6 +73,10 @@ return ax_tree_.get(); } +AXTree* TestSingleAXTreeManager::Init(const std::string& tree_update) { + return Init(TestAXTreeUpdate(tree_update)); +} + AXTree* TestSingleAXTreeManager::Init( const AXNodeData& node1, const AXNodeData& node2 /* = AXNodeData() */,
diff --git a/ui/accessibility/test_single_ax_tree_manager.h b/ui/accessibility/test_single_ax_tree_manager.h index ede0074..7b60c1c 100644 --- a/ui/accessibility/test_single_ax_tree_manager.h +++ b/ui/accessibility/test_single_ax_tree_manager.h
@@ -21,7 +21,7 @@ // // A basic implementation of AXTreeManager that supports a single tree, // and doesn't perform any walking across multiple trees. -class AX_EXPORT TestSingleAXTreeManager : public AXTreeManager { +class TestSingleAXTreeManager : public AXTreeManager { public: // This constructor does not create an empty AXTree. Call "SetTree" if you // need to manage a specific tree. Useful when you need to test for the @@ -49,6 +49,9 @@ // Creates and set the tree by a given AXTreeUpdate instance. AXTree* Init(AXTreeUpdate tree_update); + // Creates and set the tree from AXTreeUpdate represented by a string. + AXTree* Init(const std::string& tree_update); + // Convenience functions to initialize directly from a few AXNodeData objects. AXTree* Init(const AXNodeData& node1, const AXNodeData& node2 = AXNodeData(),
diff --git a/ui/color/chromeos/native_color_mixers_chromeos.cc b/ui/color/chromeos/native_color_mixers_chromeos.cc index e6eb861..9f833e9a 100644 --- a/ui/color/chromeos/native_color_mixers_chromeos.cc +++ b/ui/color/chromeos/native_color_mixers_chromeos.cc
@@ -2,12 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/color/color_mixers.h" - #include "third_party/material_color_utilities/src/cpp/palettes/tones.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/color/color_id.h" #include "ui/color/color_mixer.h" +#include "ui/color/color_mixers.h" #include "ui/color/color_provider.h" #include "ui/color/color_provider_manager.h" #include "ui/color/color_recipe.h"
diff --git a/ui/color/color_mixer.cc b/ui/color/color_mixer.cc index 3d335b2e..1237960 100644 --- a/ui/color/color_mixer.cc +++ b/ui/color/color_mixer.cc
@@ -34,9 +34,8 @@ previous_mixer_getter_ ? previous_mixer_getter_.Run() : nullptr; // Don't log transitions to previous mixers unless the logging level is a // little higher. - DVLOG_IF(3, previous_mixer) - << "GetInputColor: ColorId " << ColorIdName(id) << " not found. " - << "Checking previous mixer."; + DVLOG_IF(3, previous_mixer) << "GetInputColor: ColorId " << ColorIdName(id) + << " not found. " << "Checking previous mixer."; // If there's no previous mixer, always log color id misses. DVLOG_IF(2, !previous_mixer) << "GetInputColor: ColorId " << ColorIdName(id) << " not found. "
diff --git a/ui/color/color_provider_manager.cc b/ui/color/color_provider_manager.cc index 452f80c..aabe789 100644 --- a/ui/color/color_provider_manager.cc +++ b/ui/color/color_provider_manager.cc
@@ -69,8 +69,9 @@ // static ColorProviderManager& ColorProviderManager::GetForTesting() { std::optional<GlobalManager>& manager = GetGlobalManager(); - if (!manager.has_value()) + if (!manager.has_value()) { manager.emplace(); + } return manager.value(); } @@ -86,8 +87,9 @@ } void ColorProviderManager::ResetColorProviderCache() { - if (!color_providers_.empty()) + if (!color_providers_.empty()) { color_providers_.clear(); + } } void ColorProviderManager::AppendColorProviderInitializer( @@ -106,8 +108,9 @@ auto provider = std::make_unique<ColorProvider>(); DCHECK(initializer_list_); - if (!initializer_list_->empty()) + if (!initializer_list_->empty()) { initializer_list_->Notify(provider.get(), key); + } RecordTimeSpentInitializingColorProvider(timer.Elapsed()); ++num_providers_initialized_;
diff --git a/ui/color/color_provider_source_observer.cc b/ui/color/color_provider_source_observer.cc index cb1f995..0364579 100644 --- a/ui/color/color_provider_source_observer.cc +++ b/ui/color/color_provider_source_observer.cc
@@ -35,8 +35,9 @@ color_provider_source_observation_.Reset(); source_ = source; - if (source_) + if (source_) { color_provider_source_observation_.Observe(source); + } // Notify both when a new source is observed and when an observation is reset // (i.e. when Observe() is called with nullptr).
diff --git a/ui/color/color_provider_utils.cc b/ui/color/color_provider_utils.cc index 7760a89..e4e6958 100644 --- a/ui/color/color_provider_utils.cc +++ b/ui/color/color_provider_utils.cc
@@ -206,12 +206,14 @@ static constexpr const auto color_id_map = base::MakeFixedFlatMap<ColorId, const char*>({COLOR_IDS}); auto i = color_id_map.find(color_id); - if (i != color_id_map.cend()) + if (i != color_id_map.cend()) { return {i->second}; + } std::string_view color_name; if (g_color_provider_utils_callbacks && - g_color_provider_utils_callbacks->ColorIdName(color_id, &color_name)) + g_color_provider_utils_callbacks->ColorIdName(color_id, &color_name)) { return std::string(color_name.data(), color_name.length()); + } return base::StringPrintf("ColorId(%d)", color_id); } @@ -330,8 +332,9 @@ color = SkColorSetA(color, color_alpha != 0 ? SK_AlphaOPAQUE : color_alpha); auto i = color_name_map.find(color); if (i != color_name_map.cend()) { - if (SkColorGetA(color_with_alpha) == SkColorGetA(color)) + if (SkColorGetA(color_with_alpha) == SkColorGetA(color)) { return i->second; + } return base::StringPrintf("rgba(%s, %f)", i->second, 1.0 / color_alpha); } return color_utils::SkColorToRgbaString(color); @@ -341,8 +344,9 @@ color_id_name.replace(color_id_name.begin(), color_id_name.begin() + 1, "-"); std::string css_color_id_name; for (char i : color_id_name) { - if (base::IsAsciiUpper(i)) + if (base::IsAsciiUpper(i)) { css_color_id_name += std::string("-"); + } css_color_id_name += base::ToLowerASCII(i); } return css_color_id_name; @@ -369,8 +373,9 @@ std::make_unique<ColorProvider>(); ui::ColorMixer& mixer = color_provider->AddMixer(); - for (const auto& table : kRendererColorIdMap) + for (const auto& table : kRendererColorIdMap) { mixer[table.color_id] = {renderer_color_map.at(table.renderer_color_id)}; + } return color_provider; }
diff --git a/ui/color/color_provider_utils_unittest.cc b/ui/color/color_provider_utils_unittest.cc index 1860ec5..8beacb4 100644 --- a/ui/color/color_provider_utils_unittest.cc +++ b/ui/color/color_provider_utils_unittest.cc
@@ -47,8 +47,9 @@ // enum is generated in the resulting RendererColorMap. ui::ColorProvider color_provider; ui::ColorMixer& mixer = color_provider.AddMixer(); - for (int i = ui::kUiColorsStart + 1; i < ui::kUiColorsEnd; ++i) + for (int i = ui::kUiColorsStart + 1; i < ui::kUiColorsEnd; ++i) { mixer[i] = {static_cast<SkColor>(i)}; + } // The size of the RendererColorMap should match number of defined // RendererColorIds.
diff --git a/ui/color/color_recipe.cc b/ui/color/color_recipe.cc index e76a1289..e1e7aff4b 100644 --- a/ui/color/color_recipe.cc +++ b/ui/color/color_recipe.cc
@@ -42,8 +42,9 @@ SkColor ColorRecipe::GenerateResult(SkColor input, const ColorMixer& mixer) const { SkColor output_color = input; - for (const auto& transform : transforms_) + for (const auto& transform : transforms_) { output_color = transform.Run(output_color, mixer); + } DVLOG(2) << "ColorRecipe::GenerateResult: Input Color " << SkColorName(input) << " Result Color " << SkColorName(output_color); return output_color;
diff --git a/ui/color/color_transform.cc b/ui/color/color_transform.cc index e0e067b..ca91257 100644 --- a/ui/color/color_transform.cc +++ b/ui/color/color_transform.cc
@@ -21,9 +21,8 @@ ColorTransform::ColorTransform(SkColor color) : invariant_(true) { const auto generator = [](SkColor color, SkColor input_color, const ColorMixer& mixer) { - DVLOG(2) << "ColorTransform From Color:" - << " Input Color:" << SkColorName(input_color) - << " Color: " << SkColorName(color) + DVLOG(2) << "ColorTransform From Color:" << " Input Color:" + << SkColorName(input_color) << " Color: " << SkColorName(color) << " Result Color: " << SkColorName(color); return color; }; @@ -34,9 +33,8 @@ const auto generator = [](ColorId id, SkColor input_color, const ColorMixer& mixer) { SkColor result_color = mixer.GetResultColor(id); - DVLOG(2) << "ColorTransform FromMixer:" - << " Input Color:" << SkColorName(input_color) - << " Color Id: " << ColorIdName(id) + DVLOG(2) << "ColorTransform FromMixer:" << " Input Color:" + << SkColorName(input_color) << " Color Id: " << ColorIdName(id) << " Result Color: " << SkColorName(result_color); return result_color; }; @@ -66,8 +64,8 @@ background_transform.Run(input_color, mixer); const SkColor result_color = color_utils::AlphaBlend(foreground_color, background_color, alpha); - DVLOG(2) << "ColorTransform AlphaBlend:" - << " Input Color: " << SkColorName(input_color) + DVLOG(2) << "ColorTransform AlphaBlend:" << " Input Color: " + << SkColorName(input_color) << " FG Transform: " << SkColorName(foreground_color) << " BG Transform: " << SkColorName(background_color) << " Alpha: " << base::NumberToString(alpha) @@ -132,8 +130,8 @@ const SkColor transform_color = transform.Run(input_color, mixer); const SkColor result_color = color_utils::BlendTowardMaxContrast(transform_color, alpha); - DVLOG(2) << "ColorTransform BlendTowardMaxContrast:" - << " Input Color:" << SkColorName(input_color) + DVLOG(2) << "ColorTransform BlendTowardMaxContrast:" << " Input Color:" + << SkColorName(input_color) << " Transform Color: " << SkColorName(transform_color) << " Alpha: " << base::NumberToString(alpha) << " Result Color: " << SkColorName(result_color); @@ -156,8 +154,8 @@ color_utils::BlendForMinContrast(foreground, near_endpoint, std::nullopt, contrast_ratio) .color; - DVLOG(2) << "ColorTransform ContrastInvert:" - << " Input Color: " << SkColorName(input_color) + DVLOG(2) << "ColorTransform ContrastInvert:" << " Input Color: " + << SkColorName(input_color) << " Foreground: " << SkColorName(foreground) << " Far End: " << SkColorName(far_endpoint) << " Near End: " << SkColorName(near_endpoint) @@ -174,8 +172,8 @@ const SkColor transform_color = transform.Run(input_color, mixer); const SkColor result_color = color_utils::DeriveDefaultIconColor(transform_color); - DVLOG(2) << "ColorTransform DeriveDefaultIconColor:" - << " Input Color: " << SkColorName(input_color) + DVLOG(2) << "ColorTransform DeriveDefaultIconColor:" << " Input Color: " + << SkColorName(input_color) << " Transform Color: " << SkColorName(transform_color) << " Result Color: " << SkColorName(result_color); return result_color; @@ -185,8 +183,8 @@ ColorTransform FromTransformInput() { const auto generator = [](SkColor input_color, const ColorMixer& mixer) { - DVLOG(2) << "ColorTransform FromTransformInput: " - << " Input/Result Color: " << SkColorName(input_color); + DVLOG(2) << "ColorTransform FromTransformInput: " << " Input/Result Color: " + << SkColorName(input_color); return input_color; }; return base::BindRepeating(generator); @@ -198,8 +196,8 @@ const SkColor transform_color = transform.Run(input_color, mixer); const SkColor result_color = color_utils::GetColorWithMaxContrast(transform_color); - DVLOG(2) << "ColorTransform GetColorWithMaxContrast:" - << " Input Color: " << SkColorName(input_color) + DVLOG(2) << "ColorTransform GetColorWithMaxContrast:" << " Input Color: " + << SkColorName(input_color) << " Transform Color: " << SkColorName(transform_color) << " Result Color: " << SkColorName(result_color); return result_color; @@ -233,8 +231,8 @@ background_transform.Run(input_color, mixer); const SkColor result_color = color_utils::GetResultingPaintColor(foreground_color, background_color); - DVLOG(2) << "ColorTransform GetResultingPaintColor:" - << " Input Color: " << SkColorName(input_color) + DVLOG(2) << "ColorTransform GetResultingPaintColor:" << " Input Color: " + << SkColorName(input_color) << " FG Transform Color: " << SkColorName(foreground_color) << " BG Transform Color: " << SkColorName(background_color) << " Result Color: " << SkColorName(result_color); @@ -257,8 +255,8 @@ ? output_transform_for_dark_input : output_transform_for_light_input; const SkColor result_color = output_transform.Run(input_color, mixer); - DVLOG(2) << "ColorTransform SelectBasedOnDarkInput:" - << " Input Color: " << SkColorName(input_color) + DVLOG(2) << "ColorTransform SelectBasedOnDarkInput:" << " Input Color: " + << SkColorName(input_color) << " Input Transform: " << SkColorName(color) << " IsDark: " << (color_utils::IsDark(color) ? "true" : "false") << " Result Color: " << SkColorName(result_color); @@ -274,8 +272,8 @@ SkColor input_color, const ColorMixer& mixer) { const SkColor transform_color = transform.Run(input_color, mixer); const SkColor result_color = SkColorSetA(transform_color, alpha); - DVLOG(2) << "ColorTransform SetAlpha:" - << " Input Color: " << SkColorName(input_color) + DVLOG(2) << "ColorTransform SetAlpha:" << " Input Color: " + << SkColorName(input_color) << " Transform Color: " << SkColorName(transform_color) << " Alpha: " << base::NumberToString(alpha) << " Result Color: " << SkColorName(result_color); @@ -288,25 +286,25 @@ ColorTransform background_transform, float min_contrast, float max_contrast) { - const auto generator = - [](ColorTransform foreground_transform, - ColorTransform background_transform, float min_contrast, - float max_contrast, SkColor input_color, const ColorMixer& mixer) { - const SkColor foreground_color = - foreground_transform.Run(input_color, mixer); - const SkColor background_color = - background_transform.Run(input_color, mixer); - const SkColor result_color = color_utils::PickGoogleColor( - foreground_color, background_color, min_contrast, max_contrast); - DVLOG(2) << "ColorTransform PickGoogleColor:" - << " Input Color: " << SkColorName(input_color) - << " Foreground Color: " << SkColorName(foreground_color) - << " Background Color: " << SkColorName(background_color) - << " Min Contrast: " << base::NumberToString(min_contrast) - << " Max Contrast: " << base::NumberToString(max_contrast) - << " Result Color: " << SkColorName(result_color); - return result_color; - }; + const auto generator = [](ColorTransform foreground_transform, + ColorTransform background_transform, + float min_contrast, float max_contrast, + SkColor input_color, const ColorMixer& mixer) { + const SkColor foreground_color = + foreground_transform.Run(input_color, mixer); + const SkColor background_color = + background_transform.Run(input_color, mixer); + const SkColor result_color = color_utils::PickGoogleColor( + foreground_color, background_color, min_contrast, max_contrast); + DVLOG(2) << "ColorTransform PickGoogleColor:" << " Input Color: " + << SkColorName(input_color) + << " Foreground Color: " << SkColorName(foreground_color) + << " Background Color: " << SkColorName(background_color) + << " Min Contrast: " << base::NumberToString(min_contrast) + << " Max Contrast: " << base::NumberToString(max_contrast) + << " Result Color: " << SkColorName(result_color); + return result_color; + }; return base::BindRepeating(generator, std::move(foreground_transform), std::move(background_transform), min_contrast, max_contrast); @@ -333,8 +331,8 @@ const SkColor result_color = color_utils::PickGoogleColorTwoBackgrounds( foreground_color, background_a_color, background_b_color, min_contrast, max_contrast_against_nearer); - DVLOG(2) << "ColorTransform PickGoogleColor:" - << " Foreground Color: " << ui::SkColorName(foreground_color) + DVLOG(2) << "ColorTransform PickGoogleColor:" << " Foreground Color: " + << ui::SkColorName(foreground_color) << " Background Color A: " << ui::SkColorName(background_a_color) << " Background Color B: " << ui::SkColorName(background_b_color) << " Min Contrast: " << base::NumberToString(min_contrast) @@ -354,8 +352,8 @@ SkColor input_color, const ColorMixer& mixer) { const SkColor transform_color = transform.Run(input_color, mixer); const SkColor result_color = color_utils::HSLShift(transform_color, hsl); - DVLOG(2) << "ColorTransform HSLShift:" - << " Input Color: " << SkColorName(input_color) + DVLOG(2) << "ColorTransform HSLShift:" << " Input Color: " + << SkColorName(input_color) << " Transform Color: " << SkColorName(transform_color) << " HSL: {" << base::NumberToString(hsl.h) << ", " << base::NumberToString(hsl.s) << ", "
diff --git a/ui/color/color_transform_unittest.cc b/ui/color/color_transform_unittest.cc index 1c4967c..94c3428 100644 --- a/ui/color/color_transform_unittest.cc +++ b/ui/color/color_transform_unittest.cc
@@ -225,8 +225,9 @@ TEST(ColorTransformTest, SetAlpha) { constexpr SkAlpha kAlpha = 0x20; const ColorTransform transform = SetAlpha(FromTransformInput(), kAlpha); - for (auto color : {SK_ColorBLACK, SK_ColorRED, SK_ColorTRANSPARENT}) + for (auto color : {SK_ColorBLACK, SK_ColorRED, SK_ColorTRANSPARENT}) { EXPECT_EQ(SkColorSetA(color, kAlpha), transform.Run(color, ColorMixer())); + } } // Tests that PickGoogleColor() produces a transform that picks a Google color
diff --git a/ui/color/mac/native_color_mixers_mac.mm b/ui/color/mac/native_color_mixers_mac.mm index b7ce155a..e2bce365 100644 --- a/ui/color/mac/native_color_mixers_mac.mm +++ b/ui/color/mac/native_color_mixers_mac.mm
@@ -2,14 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/color/color_mixers.h" - #import <Cocoa/Cocoa.h> #include "base/containers/fixed_flat_set.h" #import "skia/ext/skia_utils_mac.h" #include "ui/color/color_id.h" #include "ui/color/color_mixer.h" +#include "ui/color/color_mixers.h" #include "ui/color/color_provider.h" #include "ui/color/color_provider_key.h" #include "ui/color/color_recipe.h" @@ -142,8 +141,9 @@ for (ColorId id = kUiColorsStart; id < kUiColorsEnd; ++id) { // Apply system tint to non-OS colors. - if (!kNativeOSColorIds.contains(id)) + if (!kNativeOSColorIds.contains(id)) { mixer[id] += ApplySystemControlTintIfNeeded(); + } } }
diff --git a/ui/color/mac/native_color_transform.mm b/ui/color/mac/native_color_transform.mm index b77a298..b232045 100644 --- a/ui/color/mac/native_color_transform.mm +++ b/ui/color/mac/native_color_transform.mm
@@ -2,13 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/color/color_transform.h" - #import <Cocoa/Cocoa.h> #include "third_party/skia/include/core/SkColor.h" #include "ui/color/color_id.h" #include "ui/color/color_mixer.h" +#include "ui/color/color_transform.h" #include "ui/color/mac/system_color_utils.h" #include "ui/gfx/color_utils.h"
diff --git a/ui/color/mac/system_color_utils.mm b/ui/color/mac/system_color_utils.mm index 59d81e8..53a80d7 100644 --- a/ui/color/mac/system_color_utils.mm +++ b/ui/color/mac/system_color_utils.mm
@@ -15,8 +15,9 @@ namespace ui { bool IsSystemGraphiteTinted() { - if (graphite_tint_test_override) + if (graphite_tint_test_override) { return true; + } return NSColor.currentControlTint == NSGraphiteControlTint; }
diff --git a/ui/color/win/accent_color_observer.cc b/ui/color/win/accent_color_observer.cc index 59a9bf2..547c89d 100644 --- a/ui/color/win/accent_color_observer.cc +++ b/ui/color/win/accent_color_observer.cc
@@ -64,8 +64,9 @@ // is a solid color or was just changed to a slideshow. It's unclear what // that value's supposed to mean, so change it to 80 to match Edge's // behavior. - if (colorization_color_balance > 100) + if (colorization_color_balance > 100) { colorization_color_balance = 80; + } // colorization_color's high byte is not an alpha value, so replace it // with 0xff to make an opaque ARGB color.
diff --git a/ui/native_theme/caption_style.cc b/ui/native_theme/caption_style.cc index 85682535..3db5f93 100644 --- a/ui/native_theme/caption_style.cc +++ b/ui/native_theme/caption_style.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "ui/native_theme/caption_style.h" + #include "base/json/json_reader.h" #include "base/values.h" #include "build/build_config.h"
diff --git a/ui/native_theme/caption_style_mac.mm b/ui/native_theme/caption_style_mac.mm index 4c95304b..483cf72 100644 --- a/ui/native_theme/caption_style_mac.mm +++ b/ui/native_theme/caption_style_mac.mm
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "ui/native_theme/caption_style.h" + #include <AppKit/AppKit.h> #include <MediaAccessibility/MediaAccessibility.h> @@ -12,7 +14,6 @@ #include "skia/ext/skia_utils_mac.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/gfx/color_utils.h" -#include "ui/native_theme/caption_style.h" namespace ui { @@ -133,14 +134,16 @@ base::apple::ScopedCFTypeRef<CFStringRef> ct_font_family_name( base::apple::CFCast<CFStringRef>(CTFontDescriptorCopyAttribute( ct_font_desc.get(), kCTFontFamilyNameAttribute))); - if (ct_font_family_name) + if (ct_font_family_name) { *font_family = base::SysCFStringRefToUTF8(ct_font_family_name.get()); + } base::apple::ScopedCFTypeRef<CFStringRef> ct_font_face_name( base::apple::CFCast<CFStringRef>(CTFontDescriptorCopyAttribute( ct_font_desc.get(), kCTFontNameAttribute))); - if (ct_font_face_name) + if (ct_font_face_name) { *font_variant = base::SysCFStringRefToUTF8(ct_font_face_name.get()); + } } std::string GetMAWindowColorAsCSSColor() {
diff --git a/ui/native_theme/caption_style_win.cc b/ui/native_theme/caption_style_win.cc index 8d248c3..a868f60 100644 --- a/ui/native_theme/caption_style_win.cc +++ b/ui/native_theme/caption_style_win.cc
@@ -176,56 +176,66 @@ HRESULT hr = base::win::RoGetActivationFactory( closed_caption_properties_string.get(), IID_PPV_ARGS(&closed_caption_properties_statics)); - if (FAILED(hr)) + if (FAILED(hr)) { return std::nullopt; + } CC::ClosedCaptionSize font_size = CC::ClosedCaptionSize_Default; hr = closed_caption_properties_statics->get_FontSize(&font_size); - if (FAILED(hr)) + if (FAILED(hr)) { return std::nullopt; + } CC::ClosedCaptionEdgeEffect edge_effect = CC::ClosedCaptionEdgeEffect_Default; hr = closed_caption_properties_statics->get_FontEffect(&edge_effect); - if (FAILED(hr)) + if (FAILED(hr)) { return std::nullopt; + } CC::ClosedCaptionStyle font_family = CC::ClosedCaptionStyle_Default; hr = closed_caption_properties_statics->get_FontStyle(&font_family); - if (FAILED(hr)) + if (FAILED(hr)) { return std::nullopt; + } CC::ClosedCaptionColor font_color = CC::ClosedCaptionColor_Default; hr = closed_caption_properties_statics->get_FontColor(&font_color); - if (FAILED(hr)) + if (FAILED(hr)) { return std::nullopt; + } CC::ClosedCaptionOpacity font_opacity = CC::ClosedCaptionOpacity_Default; hr = closed_caption_properties_statics->get_FontOpacity(&font_opacity); - if (FAILED(hr)) + if (FAILED(hr)) { return std::nullopt; + } CC::ClosedCaptionColor background_color = CC::ClosedCaptionColor_Default; hr = closed_caption_properties_statics->get_BackgroundColor(&background_color); - if (FAILED(hr)) + if (FAILED(hr)) { return std::nullopt; + } CC::ClosedCaptionOpacity background_opacity = CC::ClosedCaptionOpacity_Default; hr = closed_caption_properties_statics->get_BackgroundOpacity( &background_opacity); - if (FAILED(hr)) + if (FAILED(hr)) { return std::nullopt; + } CC::ClosedCaptionColor region_color = CC::ClosedCaptionColor_Default; hr = closed_caption_properties_statics->get_RegionColor(®ion_color); - if (FAILED(hr)) + if (FAILED(hr)) { return std::nullopt; + } CC::ClosedCaptionOpacity region_opacity = CC::ClosedCaptionOpacity_Default; hr = closed_caption_properties_statics->get_RegionOpacity(®ion_opacity); - if (FAILED(hr)) + if (FAILED(hr)) { return std::nullopt; + } CaptionStyle caption_style; if (font_family != CC::ClosedCaptionStyle_Default) { @@ -235,8 +245,9 @@ caption_style.font_variant = AddCSSImportant(caption_style.font_variant); } - if (font_size != CC::ClosedCaptionSize_Default) + if (font_size != CC::ClosedCaptionSize_Default) { caption_style.text_size = AddCSSImportant(GetCaptionSizeString(font_size)); + } if (edge_effect != CC::ClosedCaptionEdgeEffect_Default) { caption_style.text_shadow =
diff --git a/ui/native_theme/common_theme.h b/ui/native_theme/common_theme.h index f9cb3fc..c80850d 100644 --- a/ui/native_theme/common_theme.h +++ b/ui/native_theme/common_theme.h
@@ -5,7 +5,6 @@ #ifndef UI_NATIVE_THEME_COMMON_THEME_H_ #define UI_NATIVE_THEME_COMMON_THEME_H_ - #include "ui/color/color_id.h" #include "ui/native_theme/native_theme.h" #include "ui/native_theme/native_theme_export.h"
diff --git a/ui/native_theme/native_theme.cc b/ui/native_theme/native_theme.cc index 728069cf..04e3441 100644 --- a/ui/native_theme/native_theme.cc +++ b/ui/native_theme/native_theme.cc
@@ -225,8 +225,9 @@ NativeTheme::PlatformHighContrastColorScheme NativeTheme::GetPlatformHighContrastColorScheme() const { - if (GetDefaultSystemColorScheme() != ColorScheme::kPlatformHighContrast) + if (GetDefaultSystemColorScheme() != ColorScheme::kPlatformHighContrast) { return PlatformHighContrastColorScheme::kNone; + } return (GetPreferredColorScheme() == PreferredColorScheme::kDark) ? PlatformHighContrastColorScheme::kDark : PlatformHighContrastColorScheme::kLight; @@ -275,8 +276,9 @@ void NativeTheme::SetPreferredContrast( NativeTheme::PreferredContrast preferred_contrast) { - if (preferred_contrast_ == preferred_contrast) + if (preferred_contrast_ == preferred_contrast) { return; + } preferred_contrast_ = preferred_contrast; NotifyOnPreferredContrastUpdated(); }
diff --git a/ui/native_theme/native_theme.h b/ui/native_theme/native_theme.h index 12aba4a..8489d25 100644 --- a/ui/native_theme/native_theme.h +++ b/ui/native_theme/native_theme.h
@@ -35,7 +35,7 @@ class Insets; class Rect; class Size; -} +} // namespace gfx namespace ui { @@ -109,9 +109,9 @@ enum State { // IDs defined as specific values for use in arrays. kDisabled = 0, - kHovered = 1, - kNormal = 2, - kPressed = 3, + kHovered = 1, + kNormal = 2, + kPressed = 3, kNumStates = kPressed + 1, };
diff --git a/ui/native_theme/native_theme_android.cc b/ui/native_theme/native_theme_android.cc index f30109c..4ff1be5 100644 --- a/ui/native_theme/native_theme_android.cc +++ b/ui/native_theme/native_theme_android.cc
@@ -14,7 +14,7 @@ // These are the default dimensions of radio buttons and checkboxes on Android. const int kCheckboxAndRadioWidth = 16; const int kCheckboxAndRadioHeight = 16; -} +} // namespace #if !defined(USE_AURA) // static @@ -36,8 +36,9 @@ gfx::Size NativeThemeAndroid::GetPartSize(Part part, State state, const ExtraParams& extra) const { - if (part == kCheckbox || part == kRadio) + if (part == kCheckbox || part == kRadio) { return gfx::Size(kCheckboxAndRadioWidth, kCheckboxAndRadioHeight); + } return NativeThemeBase::GetPartSize(part, state, extra); } @@ -139,10 +140,8 @@ return GetControlColor(color_id, color_scheme, color_provider); } -NativeThemeAndroid::NativeThemeAndroid() { -} +NativeThemeAndroid::NativeThemeAndroid() {} -NativeThemeAndroid::~NativeThemeAndroid() { -} +NativeThemeAndroid::~NativeThemeAndroid() {} } // namespace ui
diff --git a/ui/native_theme/native_theme_aura.cc b/ui/native_theme/native_theme_aura.cc index c7962993..8b30878 100644 --- a/ui/native_theme/native_theme_aura.cc +++ b/ui/native_theme/native_theme_aura.cc
@@ -307,8 +307,9 @@ const ScrollbarThumbExtraParams& extra_params, ColorScheme color_scheme) const { // Do not paint if state is disabled. - if (state == kDisabled) + if (state == kDisabled) { return; + } TRACE_EVENT0("blink", "NativeThemeAura::PaintScrollbarThumb"); @@ -316,8 +317,9 @@ cc::PaintFlags fill_flags; if (use_overlay_scrollbar()) { - if (state == NativeTheme::kDisabled) + if (state == NativeTheme::kDisabled) { return; + } const bool hovered = state != kNormal; @@ -340,10 +342,11 @@ gfx::InsetsF stroke_insets(kStrokeWidth / 2.f); // The edge to which the scrollbar is attached shouldn't have a border. gfx::Insets edge_adjust_insets; - if (part == NativeTheme::kScrollbarHorizontalThumb) + if (part == NativeTheme::kScrollbarHorizontalThumb) { edge_adjust_insets.set_bottom(-kStrokeWidth); - else + } else { edge_adjust_insets.set_right(-kStrokeWidth); + } stroke_rect.Inset(stroke_insets + gfx::InsetsF(edge_adjust_insets)); canvas->drawRect(gfx::RectFToSkRect(stroke_rect), stroke_flags);
diff --git a/ui/native_theme/native_theme_base.cc b/ui/native_theme/native_theme_base.cc index 271b538..a2cdfff 100644 --- a/ui/native_theme/native_theme_base.cc +++ b/ui/native_theme/native_theme_base.cc
@@ -218,8 +218,9 @@ ColorScheme color_scheme, bool in_forced_colors, const std::optional<SkColor>& accent_color) const { - if (rect.IsEmpty()) + if (rect.IsEmpty()) { return; + } canvas->save(); canvas->clipRect(gfx::RectToSkRect(rect)); @@ -285,10 +286,11 @@ case kScrollbarUpArrow: case kScrollbarLeftArrow: case kScrollbarRightArrow: - if (scrollbar_button_length_ > 0) + if (scrollbar_button_length_ > 0) { PaintArrowButton(canvas, color_provider, rect, part, state, color_scheme, in_forced_colors, absl::get<ScrollbarArrowExtraParams>(extra)); + } break; case kScrollbarHorizontalThumb: case kScrollbarVerticalThumb: @@ -557,10 +559,11 @@ flags.setColor(SaturateAndBrighten(thumb, 0, 0.02f)); SkIRect skrect; - if (vertical) + if (vertical) { skrect.setLTRB(rect.x(), rect.y(), midx + 1, rect.y() + rect.height()); - else + } else { skrect.setLTRB(rect.x(), rect.y(), rect.x() + rect.width(), midy + 1); + } canvas->drawIRect(skrect, flags); @@ -1014,10 +1017,11 @@ float border_width = AdjustBorderWidthByZoom(kBorderWidth, slider.zoom); // Shrink the track by 1 pixel so the thumb can completely cover the track // on both ends. - if (slider.vertical) + if (slider.vertical) { track_rect.inset(0, 1); - else + } else { track_rect.inset(1, 0); + } float border_radius = GetBorderRadiusForPart(kSliderTrack, rect.width(), rect.height()); canvas->drawRoundRect(track_rect, border_radius, border_radius, flags); @@ -1046,8 +1050,9 @@ SkColor border_color = ControlsBorderColorForState(state, color_scheme, color_provider); if (!UserHasContrastPreference() && state != kDisabled && - color_scheme != ColorScheme::kDark) + color_scheme != ColorScheme::kDark) { border_color = SkColorSetA(border_color, 0x80); + } flags.setColor(border_color); track_rect.inset(border_width / 2, border_width / 2); canvas->drawRoundRect(track_rect, border_radius, border_radius, flags); @@ -1093,15 +1098,17 @@ const InnerSpinButtonExtraParams& spin_button, ColorScheme color_scheme, bool in_forced_colors) const { - if (spin_button.read_only) + if (spin_button.read_only) { state = kDisabled; + } State north_state = state; State south_state = state; - if (spin_button.spin_up) + if (spin_button.spin_up) { south_state = south_state != kDisabled ? kNormal : kDisabled; - else + } else { north_state = north_state != kDisabled ? kNormal : kDisabled; + } gfx::Rect half = rect; ScrollbarArrowExtraParams arrow = ScrollbarArrowExtraParams(); @@ -1167,11 +1174,13 @@ // If adjusted thickness is not zero, make sure it is equal or larger than // kMinimumProgressInlineValue. if (slider.vertical) { - if (adjusted_height > 0) + if (adjusted_height > 0) { adjusted_height = std::max(kMinimumProgressInlineValue, adjusted_height); + } } else { - if (adjusted_width > 0) + if (adjusted_width > 0) { adjusted_width = std::max(kMinimumProgressInlineValue, adjusted_width); + } } gfx::Rect original_value_rect(progress_bar.value_rect_x, progress_bar.value_rect_y, adjusted_width, @@ -1194,8 +1203,9 @@ flags.setStyle(cc::PaintFlags::kStroke_Style); flags.setStrokeWidth(border_width); SkColor border_color = GetControlColor(kBorder, color_scheme, color_provider); - if (!UserHasContrastPreference() && color_scheme != ColorScheme::kDark) + if (!UserHasContrastPreference() && color_scheme != ColorScheme::kDark) { border_color = SkColorSetA(border_color, 0x80); + } flags.setColor(border_color); track_rect.inset(border_width / 2, border_width / 2); canvas->drawRoundRect(track_rect, border_radius, border_radius, flags); @@ -1233,8 +1243,9 @@ State state, ColorScheme color_scheme, const ColorProvider* color_provider) const { - if (state != kDisabled) + if (state != kDisabled) { return GetColor(kArrowDisabledColor, color_scheme); + } SkScalar track_hsv[3]; SkColorToHSV(GetColor(kTrackColor, color_scheme), track_hsv); @@ -1308,8 +1319,9 @@ SkScalar min_diff = std::clamp((hsv1[1] + hsv2[1]) * 1.2f, 0.28f, 0.5f); SkScalar diff = std::clamp(fabsf(hsv1[2] - hsv2[2]) / 2, min_diff, 0.5f); - if (hsv1[2] + hsv2[2] > 1.0) + if (hsv1[2] + hsv2[2] > 1.0) { diff = -diff; + } return SaturateAndBrighten(hsv2, -0.2f, diff); } @@ -1433,11 +1445,13 @@ ControlColorId color_id, ColorScheme color_scheme, const ColorProvider* color_provider) const { - if (IsColorPipelineSupportedForControlColorId(color_provider, color_id)) + if (IsColorPipelineSupportedForControlColorId(color_provider, color_id)) { return GetControlColorFromColorProvider(color_id, color_provider); + } - if (color_scheme == ColorScheme::kDark) + if (color_scheme == ColorScheme::kDark) { return GetDarkModeControlColor(color_id); + } switch (color_id) { case kBorder:
diff --git a/ui/native_theme/native_theme_base.h b/ui/native_theme/native_theme_base.h index e23b4a0..8d1bfa1 100644 --- a/ui/native_theme/native_theme_base.h +++ b/ui/native_theme/native_theme_base.h
@@ -12,7 +12,7 @@ namespace gfx { class Rect; class Size; -} +} // namespace gfx namespace ui {
diff --git a/ui/native_theme/native_theme_fluent_unittest.cc b/ui/native_theme/native_theme_fluent_unittest.cc index 168809d..bf8a4ae4 100644 --- a/ui/native_theme/native_theme_fluent_unittest.cc +++ b/ui/native_theme/native_theme_fluent_unittest.cc
@@ -51,8 +51,9 @@ } void VerifyArrowRectIsIntRect(const gfx::RectF& arrow_rect) const { - if (theme_.ArrowIconsAvailable()) + if (theme_.ArrowIconsAvailable()) { return; + } // Verify that an arrow rect with triangular arrows is an integer rect. EXPECT_TRUE(IsNearestRectWithinDistance(arrow_rect, 0.01f)); @@ -96,8 +97,9 @@ base::ClampFloor(kFluentScrollbarThickness * ScaleFromDIP()); if (part == NativeTheme::kScrollbarUpArrow || - part == NativeTheme::kScrollbarDownArrow) + part == NativeTheme::kScrollbarDownArrow) { return gfx::RectF(0, 0, track_thickness, button_length); + } return gfx::RectF(0, 0, button_length, track_thickness); }
diff --git a/ui/native_theme/native_theme_mac.mm b/ui/native_theme/native_theme_mac.mm index dc1224ca..cbd47df4 100644 --- a/ui/native_theme/native_theme_mac.mm +++ b/ui/native_theme/native_theme_mac.mm
@@ -143,11 +143,13 @@ bool in_forced_colors, const std::optional<SkColor>& accent_color) const { ColorScheme color_scheme_updated = color_scheme; - if (color_scheme_updated == ColorScheme::kDefault) + if (color_scheme_updated == ColorScheme::kDefault) { color_scheme_updated = GetDefaultSystemColorScheme(); + } - if (rect.IsEmpty()) + if (rect.IsEmpty()) { return; + } switch (part) { case kScrollbarHorizontalThumb: @@ -176,11 +178,13 @@ void ConstrainInsets(int old_width, int min_width, int* left, int* right) { int requested_total_inset = *left + *right; - if (requested_total_inset == 0) + if (requested_total_inset == 0) { return; + } int max_total_inset = old_width - min_width; - if (requested_total_inset < max_total_inset) + if (requested_total_inset < max_total_inset) { return; + } if (max_total_inset < 0) { *left = *right = 0; return; @@ -216,8 +220,9 @@ const gfx::Rect& rect, ColorScheme color_scheme, bool is_corner) const { - if (is_corner && extra_params.is_overlay) + if (is_corner && extra_params.is_overlay) { return; + } PaintScrollBarTrackGradient(canvas, rect, extra_params, is_corner, color_scheme); PaintScrollbarTrackInnerBorder(canvas, rect, extra_params, is_corner, @@ -306,17 +311,20 @@ // Compute the rect for the border. gfx::Rect inner_border(rect); - if (extra_params.orientation == ScrollbarOrientation::kVerticalOnLeft) + if (extra_params.orientation == ScrollbarOrientation::kVerticalOnLeft) { inner_border.set_x(rect.right() - ScrollbarTrackBorderWidth(extra_params.scale_from_dip)); + } if (is_corner || - extra_params.orientation == ScrollbarOrientation::kHorizontal) + extra_params.orientation == ScrollbarOrientation::kHorizontal) { inner_border.set_height( ScrollbarTrackBorderWidth(extra_params.scale_from_dip)); + } if (is_corner || - extra_params.orientation != ScrollbarOrientation::kHorizontal) + extra_params.orientation != ScrollbarOrientation::kHorizontal) { inner_border.set_width( ScrollbarTrackBorderWidth(extra_params.scale_from_dip)); + } // And draw. cc::PaintFlags flags; @@ -359,9 +367,10 @@ gfx::Rect outer_border(rect); outer_border.set_width( ScrollbarTrackBorderWidth(extra_params.scale_from_dip)); - if (extra_params.orientation == ScrollbarOrientation::kVerticalOnRight) + if (extra_params.orientation == ScrollbarOrientation::kVerticalOnRight) { outer_border.set_x(rect.right() - ScrollbarTrackBorderWidth( extra_params.scale_from_dip)); + } paint_canvas.DrawRect(outer_border, flags); } } @@ -432,13 +441,15 @@ if (extra_params.thumb_color.has_value()) { return extra_params.thumb_color.value(); } - if (extra_params.is_overlay) + if (extra_params.is_overlay) { return dark_mode ? SkColorSetARGB(0x80, 0xFF, 0xFF, 0xFF) : SkColorSetARGB(0x80, 0, 0, 0); + } - if (dark_mode) + if (dark_mode) { return extra_params.is_hovering ? SkColorSetRGB(0x93, 0x93, 0x93) : SkColorSetRGB(0x6B, 0x6B, 0x6B); + } return extra_params.is_hovering ? SkColorSetARGB(0x80, 0, 0, 0) : SkColorSetARGB(0x3A, 0, 0, 0); @@ -447,9 +458,10 @@ return extra_params.track_color.value(); } - if (extra_params.is_overlay) + if (extra_params.is_overlay) { return dark_mode ? SkColorSetARGB(0x33, 0xE5, 0xE5, 0xE5) : SkColorSetARGB(0xF9, 0xDF, 0xDF, 0xDF); + } return dark_mode ? SkColorSetRGB(0x3D, 0x3D, 0x3D) : SkColorSetRGB(0xE8, 0xE8, 0xE8); @@ -457,9 +469,10 @@ if (extra_params.track_color.has_value()) { return extra_params.track_color.value(); } - if (extra_params.is_overlay) + if (extra_params.is_overlay) { return dark_mode ? SkColorSetARGB(0x28, 0xD8, 0xD8, 0xD8) : SkColorSetARGB(0xC6, 0xE8, 0xE8, 0xE8); + } return dark_mode ? SkColorSetRGB(0x51, 0x51, 0x51) : SkColorSetRGB(0xED, 0xED, 0xED); @@ -528,8 +541,9 @@ NativeThemeMac::NativeThemeMac(bool configure_web_instance, bool should_only_use_dark_colors) : NativeThemeBase(should_only_use_dark_colors) { - if (!should_only_use_dark_colors) + if (!should_only_use_dark_colors) { InitializeDarkModeStateAndObserver(); + } set_prefers_reduced_transparency(PrefersReducedTransparency()); set_inverted_colors(InvertedColors()); @@ -553,8 +567,9 @@ theme->NotifyOnNativeThemeUpdated(); }]; - if (configure_web_instance) + if (configure_web_instance) { ConfigureWebInstance(); + } } NativeThemeMac::~NativeThemeMac() {
diff --git a/ui/native_theme/native_theme_win.cc b/ui/native_theme/native_theme_win.cc index 1b098cb..d34f90e 100644 --- a/ui/native_theme/native_theme_win.cc +++ b/ui/native_theme/native_theme_win.cc
@@ -75,7 +75,7 @@ // Create a 2x2 checkerboard pattern using the 3D face and highlight colors. const SkColor face = color_utils::GetSysSkColor(COLOR_3DFACE); const SkColor highlight = color_utils::GetSysSkColor(COLOR_3DHILIGHT); - SkColor buffer[] = { face, highlight, highlight, face }; + SkColor buffer[] = {face, highlight, highlight, face}; // Confusing bit: we first create a temporary bitmap with our desired pattern, // then copy it to another bitmap. The temporary bitmap doesn't take // ownership of the pixel data, and so will point to garbage when this @@ -86,8 +86,9 @@ SkBitmap temp_bitmap; temp_bitmap.installPixels(info, buffer, info.minRowBytes()); SkBitmap bitmap; - if (bitmap.tryAllocPixels(info)) + if (bitmap.tryAllocPixels(info)) { temp_bitmap.readPixels(info, bitmap.getPixels(), bitmap.rowBytes(), 0, 0); + } // Align the pattern with the upper corner of |align_rect|. SkMatrix local_matrix; @@ -141,8 +142,9 @@ // Selects |handle| to bitmap into DC. Returns false if handle is not valid. bool SelectBitmap(base::win::ScopedBitmap::element_type handle) { bitmap_.reset(handle); - if (!bitmap_.is_valid()) + if (!bitmap_.is_valid()) { return false; + } SelectObject(dc_.Get(), bitmap_.get()); return true; @@ -240,8 +242,9 @@ case kScrollbarHorizontalTrack: case kScrollbarVerticalTrack: { int size = display::win::ScreenWin::GetSystemMetricsInDIP(SM_CXVSCROLL); - if (size == 0) + if (size == 0) { size = 17; + } return gfx::Size(size, size); } default: @@ -255,14 +258,15 @@ SIZE size; HANDLE handle = GetThemeHandle(GetThemeName(part)); if (handle && SUCCEEDED(GetThemePartSize(handle, screen_dc, part_id, state_id, - nullptr, TS_TRUE, &size))) + nullptr, TS_TRUE, &size))) { return gfx::Size(size.cx, size.cy); + } // TODO(rogerta): For now, we need to support radio buttons and checkboxes // when theming is not enabled. Support for other parts can be added // if/when needed. - return (part == kCheckbox || part == kRadio) ? - gfx::Size(13, 13) : gfx::Size(); + return (part == kCheckbox || part == kRadio) ? gfx::Size(13, 13) + : gfx::Size(); } void NativeThemeWin::Paint(cc::PaintCanvas* canvas, @@ -274,8 +278,9 @@ ColorScheme color_scheme, bool in_forced_colors, const std::optional<SkColor>& accent_color) const { - if (rect.IsEmpty()) + if (rect.IsEmpty()) { return; + } switch (part) { case kMenuPopupGutter: @@ -344,8 +349,9 @@ memset(theme_handles_, 0, sizeof(theme_handles_)); - if (configure_web_instance) + if (configure_web_instance) { ConfigureWebInstance(); + } } void NativeThemeWin::ConfigureWebInstance() { @@ -403,17 +409,19 @@ void NativeThemeWin::OnSysColorChange() { UpdateSystemColors(); - if (!IsForcedHighContrast()) + if (!IsForcedHighContrast()) { set_forced_colors(IsUsingHighContrastThemeInternal()); + } set_preferred_color_scheme(CalculatePreferredColorScheme()); SetPreferredContrast(CalculatePreferredContrast()); NotifyOnNativeThemeUpdated(); } void NativeThemeWin::UpdateSystemColors() { - for (int sys_color : kSysColors) + for (int sys_color : kSysColors) { system_colors_[SysColorToSystemThemeColor(sys_color)] = color_utils::GetSysSkColor(sys_color); + } } void NativeThemeWin::PaintMenuSeparator( @@ -512,8 +520,9 @@ case kTrackbarTrack: case kWindowResizeGripper: DrawThemeBackground(handle, hdc, part_id, state_id, &rect_win, nullptr); - if (part == kProgressBar) + if (part == kProgressBar) { break; // Further painting to do below. + } return; case kScrollbarDownArrow: case kScrollbarHorizontalGripper: @@ -676,15 +685,17 @@ // Windows high contrast modes are entirely different themes, // so let them take priority over dark mode. // ...unless --force-dark-mode was specified in which case caveat emptor. - if (InForcedColorsMode() && !IsForcedDarkMode()) + if (InForcedColorsMode() && !IsForcedDarkMode()) { return false; + } return NativeTheme::ShouldUseDarkColors(); } NativeTheme::PreferredColorScheme NativeThemeWin::CalculatePreferredColorScheme() const { - if (!InForcedColorsMode()) + if (!InForcedColorsMode()) { return NativeTheme::CalculatePreferredColorScheme(); + } // According to the spec, the preferred color scheme for web content is 'dark' // if 'Canvas' has L<33% and 'light' if L>67%. On Windows, the 'Canvas' @@ -693,15 +704,17 @@ // https://www.w3.org/TR/css-color-adjust-1/#forced SkColor bg_color = system_colors_[SystemThemeColor::kWindow]; float luminance = color_utils::GetRelativeLuminance(bg_color); - if (luminance < 0.33) + if (luminance < 0.33) { return NativeTheme::PreferredColorScheme::kDark; + } return NativeTheme::PreferredColorScheme::kLight; } NativeTheme::PreferredContrast NativeThemeWin::CalculatePreferredContrast() const { - if (!InForcedColorsMode()) + if (!InForcedColorsMode()) { return NativeTheme::CalculatePreferredContrast(); + } // TODO(sartang@microsoft.com): Update the spec page at // https://www.w3.org/TR/css-color-adjust-1/#forced, it currently does not @@ -731,8 +744,9 @@ SkColor bg_color = system_colors_[SystemThemeColor::kWindow]; SkColor fg_color = system_colors_[SystemThemeColor::kWindowText]; float contrast_ratio = color_utils::GetContrastRatio(bg_color, fg_color); - if (contrast_ratio >= 7) + if (contrast_ratio >= 7) { return NativeTheme::PreferredContrast::kMore; + } return contrast_ratio <= 2.5 ? NativeTheme::PreferredContrast::kLess : NativeTheme::PreferredContrast::kCustom; } @@ -757,12 +771,14 @@ // If this process doesn't have access to GDI, we'd need to use shared memory // segment instead but that is not supported right now. - if (!base::win::IsUser32AndGdi32Available()) + if (!base::win::IsUser32AndGdi32Available()) { return; + } ScopedCreateDCWithBitmap offscreen_hdc(CreateCompatibleDC(nullptr)); - if (!offscreen_hdc.IsValid()) + if (!offscreen_hdc.IsValid()) { return; + } skia::InitializeDC(offscreen_hdc.Get()); HRGN clip = CreateRectRgn(0, 0, rect.width(), rect.height()); @@ -773,16 +789,18 @@ base::win::ScopedBitmap hbitmap = skia::CreateHBitmapXRGB8888( rect.width(), rect.height(), nullptr, nullptr); - if (!offscreen_hdc.SelectBitmap(hbitmap.release())) + if (!offscreen_hdc.SelectBitmap(hbitmap.release())) { return; + } // Will be NULL if lower-level Windows calls fail, or if the backing // allocated is 0 pixels in size (which should never happen according to // Windows documentation). sk_sp<SkSurface> offscreen_surface = skia::MapPlatformSurface(offscreen_hdc.Get()); - if (!offscreen_surface) + if (!offscreen_surface) { return; + } SkCanvas* offscreen_canvas = offscreen_surface->getCanvas(); DCHECK(offscreen_canvas); @@ -819,8 +837,8 @@ break; } // Draw the theme controls using existing HDC-drawing code. - PaintDirect(offscreen_canvas, offscreen_hdc.Get(), part, state, - adjusted_rect, adjusted_extra); + PaintDirect(offscreen_canvas, offscreen_hdc.Get(), part, state, adjusted_rect, + adjusted_extra); SkBitmap offscreen_bitmap = skia::MapPlatformBitmap(offscreen_hdc.Get()); @@ -834,10 +852,9 @@ pixels[i] = SkPackARGB32(0, 0, 0, 0); } else if (SkGetPackedA32(pixels[i]) == 0) { // Pixel was touched but has incorrect alpha of 0, make it fully opaque. - pixels[i] = SkPackARGB32(0xFF, - SkGetPackedR32(pixels[i]), - SkGetPackedG32(pixels[i]), - SkGetPackedB32(pixels[i])); + pixels[i] = + SkPackARGB32(0xFF, SkGetPackedR32(pixels[i]), + SkGetPackedG32(pixels[i]), SkGetPackedB32(pixels[i])); } } @@ -866,13 +883,15 @@ NOTREACHED(); } - if (state == kDisabled) + if (state == kDisabled) { classic_state |= DFCS_INACTIVE; - else if (state == kPressed) + } else if (state == kPressed) { classic_state |= DFCS_PUSHED; + } - if (extra.checked) + if (extra.checked) { classic_state |= DFCS_CHECKED; + } if ((part == kPushButton) && ((state == kPressed) || extra.is_default)) { // Pressed or defaulted buttons have a shadow replacing the outer 1 px. @@ -986,8 +1005,9 @@ SetCheckerboardShader(&paint, align_rect); canvas->drawIRect(skia::RECTToSkIRect(*rect), paint); } - if (extra.classic_state & DFCS_PUSHED) + if (extra.classic_state & DFCS_PUSHED) { InvertRect(hdc, rect); + } } void NativeThemeWin::PaintHorizontalTrackbarThumbClassic( @@ -1122,12 +1142,14 @@ HBRUSH bg_brush, RECT* rect, const TextFieldExtraParams& extra) const { - if (extra.draw_edges) + if (extra.draw_edges) { DrawEdge(hdc, rect, EDGE_SUNKEN, BF_RECT | BF_ADJUST); + } if (extra.fill_content_area) { - if (extra.classic_state & DFCS_INACTIVE) + if (extra.classic_state & DFCS_INACTIVE) { bg_brush = reinterpret_cast<HBRUSH>(COLOR_BTNFACE + 1); + } FillRect(hdc, rect, bg_brush); } } @@ -1530,13 +1552,14 @@ // DrawFrameControl for menu arrow/check wants a monochrome bitmap. base::win::ScopedBitmap mask_bitmap(CreateBitmap(width, height, 1, 1, NULL)); - if (mask_bitmap == NULL) + if (mask_bitmap == NULL) { return E_OUTOFMEMORY; + } base::win::ScopedCreateDC bitmap_dc(CreateCompatibleDC(NULL)); base::win::ScopedSelectObject select_bitmap(bitmap_dc.Get(), mask_bitmap.get()); - RECT local_rect = { 0, 0, width, height }; + RECT local_rect = {0, 0, width, height}; DrawFrameControl(bitmap_dc.Get(), &local_rect, type, state); // We're going to use BitBlt with a b&w mask. This results in using the dest @@ -1571,55 +1594,57 @@ } HANDLE NativeThemeWin::GetThemeHandle(ThemeName theme_name) const { - if (theme_name < 0 || theme_name >= LAST) + if (theme_name < 0 || theme_name >= LAST) { return nullptr; + } - if (theme_handles_[theme_name]) + if (theme_handles_[theme_name]) { return theme_handles_[theme_name]; + } // Not found, try to load it. HANDLE handle = nullptr; switch (theme_name) { - case BUTTON: - handle = OpenThemeData(nullptr, L"Button"); - break; - case LIST: - handle = OpenThemeData(nullptr, L"Listview"); - break; - case MENU: - handle = OpenThemeData(nullptr, L"Menu"); - break; - case MENULIST: - handle = OpenThemeData(nullptr, L"Combobox"); - break; - case SCROLLBAR: - handle = OpenThemeData(nullptr, supports_windows_dark_mode_ - ? L"Explorer::Scrollbar" - : L"Scrollbar"); - break; - case STATUS: - handle = OpenThemeData(nullptr, L"Status"); - break; - case TAB: - handle = OpenThemeData(nullptr, L"Tab"); - break; - case TEXTFIELD: - handle = OpenThemeData(nullptr, L"Edit"); - break; - case TRACKBAR: - handle = OpenThemeData(nullptr, L"Trackbar"); - break; - case WINDOW: - handle = OpenThemeData(nullptr, L"Window"); - break; - case PROGRESS: - handle = OpenThemeData(nullptr, L"Progress"); - break; - case SPIN: - handle = OpenThemeData(nullptr, L"Spin"); - break; - case LAST: - NOTREACHED(); + case BUTTON: + handle = OpenThemeData(nullptr, L"Button"); + break; + case LIST: + handle = OpenThemeData(nullptr, L"Listview"); + break; + case MENU: + handle = OpenThemeData(nullptr, L"Menu"); + break; + case MENULIST: + handle = OpenThemeData(nullptr, L"Combobox"); + break; + case SCROLLBAR: + handle = OpenThemeData(nullptr, supports_windows_dark_mode_ + ? L"Explorer::Scrollbar" + : L"Scrollbar"); + break; + case STATUS: + handle = OpenThemeData(nullptr, L"Status"); + break; + case TAB: + handle = OpenThemeData(nullptr, L"Tab"); + break; + case TEXTFIELD: + handle = OpenThemeData(nullptr, L"Edit"); + break; + case TRACKBAR: + handle = OpenThemeData(nullptr, L"Trackbar"); + break; + case WINDOW: + handle = OpenThemeData(nullptr, L"Window"); + break; + case PROGRESS: + handle = OpenThemeData(nullptr, L"Progress"); + break; + case SPIN: + handle = OpenThemeData(nullptr, L"Spin"); + break; + case LAST: + NOTREACHED(); } theme_handles_[theme_name] = handle; return handle; @@ -1685,15 +1710,15 @@ DWORD active = 0; hkcu_color_filtering_regkey_.ReadValueDW(L"Active", &active); if (active == 1) { - // 0 = Greyscale - // 1 = Invert - // 2 = Greyscale Inverted - // 3 = Deuteranopia - // 4 = Protanopia - // 5 = Tritanopia - DWORD filter_type = 0; - hkcu_color_filtering_regkey_.ReadValueDW(L"FilterType", &filter_type); - inverted_colors = (filter_type == 1); + // 0 = Greyscale + // 1 = Invert + // 2 = Greyscale Inverted + // 3 = Deuteranopia + // 4 = Protanopia + // 5 = Tritanopia + DWORD filter_type = 0; + hkcu_color_filtering_regkey_.ReadValueDW(L"FilterType", &filter_type); + inverted_colors = (filter_type == 1); } } set_inverted_colors(inverted_colors);
diff --git a/ui/native_theme/native_theme_win_unittest.cc b/ui/native_theme/native_theme_win_unittest.cc index 66f32fe..79c691d6 100644 --- a/ui/native_theme/native_theme_win_unittest.cc +++ b/ui/native_theme/native_theme_win_unittest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "ui/native_theme/native_theme_win.h" + #include <cmath> #include "base/time/time.h"
diff --git a/ui/native_theme/scrollbar_animator_mac.cc b/ui/native_theme/scrollbar_animator_mac.cc index 6628a0331..a6f08934 100644 --- a/ui/native_theme/scrollbar_animator_mac.cc +++ b/ui/native_theme/scrollbar_animator_mac.cc
@@ -44,8 +44,9 @@ double current_time = base::Time::Now().InSecondsFSinceUnixEpoch(); double delta = current_time - start_time_; - if (delta >= duration_) + if (delta >= duration_) { timer_.Stop(); + } double fraction = delta / duration_; fraction = std::clamp(fraction, 0.0, 1.0); @@ -75,28 +76,33 @@ void OverlayScrollbarAnimatorMac::MouseDidEnter() { // If the scrollbar is completely hidden, ignore this. We will initialize // the `mouse_in_track_` state if there's a scroll. - if (thumb_alpha_ == 0.f) + if (thumb_alpha_ == 0.f) { return; + } - if (mouse_in_track_) + if (mouse_in_track_) { return; + } mouse_in_track_ = true; // Cancel any in-progress fade-out, and ensure that the fade-out timer be // disabled. - if (fade_out_animation_) + if (fade_out_animation_) { FadeOutAnimationCancel(); + } FadeOutTimerUpdate(); // Start the fade-in animation (unless it is in progress or has already // completed). - if (!fade_in_track_animation_ && track_alpha_ != 1.f) + if (!fade_in_track_animation_ && track_alpha_ != 1.f) { FadeInTrackAnimationStart(); + } // Start the expand-thumb animation (unless it is in progress or has already // completed). - if (!expand_thumb_animation_ && thumb_width_ != thumb_width_expanded_) + if (!expand_thumb_animation_ && thumb_width_ != thumb_width_expanded_) { ExpandThumbAnimationStart(); + } } void OverlayScrollbarAnimatorMac::MouseDidExit() { @@ -159,8 +165,9 @@ thumb_width_ = (1 - progress) * thumb_width_unexpanded_ + progress * thumb_width_expanded_; client_->SetThumbNeedsDisplay(); - if (progress == 1) + if (progress == 1) { expand_thumb_animation_.reset(); + } } void OverlayScrollbarAnimatorMac::FadeInTrackAnimationStart() {
diff --git a/ui/native_theme/test_native_theme.cc b/ui/native_theme/test_native_theme.cc index 2032fdc44..3b60fb9 100644 --- a/ui/native_theme/test_native_theme.cc +++ b/ui/native_theme/test_native_theme.cc
@@ -51,8 +51,9 @@ } NativeTheme::ColorScheme TestNativeTheme::GetDefaultSystemColorScheme() const { - if (is_platform_high_contrast_) + if (is_platform_high_contrast_) { return ColorScheme::kPlatformHighContrast; + } return NativeTheme::GetDefaultSystemColorScheme(); }
diff --git a/ui/views/accessibility/accessibility_alert_window.cc b/ui/views/accessibility/accessibility_alert_window.cc index 08f6a13..98d89c2 100644 --- a/ui/views/accessibility/accessibility_alert_window.cc +++ b/ui/views/accessibility/accessibility_alert_window.cc
@@ -29,8 +29,9 @@ AccessibilityAlertWindow::~AccessibilityAlertWindow() = default; void AccessibilityAlertWindow::HandleAlert(const std::string& alert_string) { - if (!alert_window_ || !alert_window_->parent()) + if (!alert_window_ || !alert_window_->parent()) { return; + } alert_window_->SetTitle(base::UTF8ToUTF16(alert_string)); cache_->FireEvent(cache_->GetOrCreate(alert_window_.get()),
diff --git a/ui/views/accessibility/accessibility_alert_window_unittest.cc b/ui/views/accessibility/accessibility_alert_window_unittest.cc index 498d2507..619220f 100644 --- a/ui/views/accessibility/accessibility_alert_window_unittest.cc +++ b/ui/views/accessibility/accessibility_alert_window_unittest.cc
@@ -25,8 +25,9 @@ void OnChildWindowRemoved(AXAuraObjWrapper* parent) override {} void OnEvent(AXAuraObjWrapper* aura_obj, ax::mojom::Event event_type) override { - if (event_type == ax::mojom::Event::kAlert) + if (event_type == ax::mojom::Event::kAlert) { count_++; + } } int count() { return count_; }
diff --git a/ui/views/accessibility/accessibility_paint_checks.cc b/ui/views/accessibility/accessibility_paint_checks.cc index 7ad2cc9..a735ccb5 100644 --- a/ui/views/accessibility/accessibility_paint_checks.cc +++ b/ui/views/accessibility/accessibility_paint_checks.cc
@@ -22,11 +22,13 @@ // Note that none of these checks run if DCHECKs are off. Dead-code // elimination should remove the following. This is done instead of #ifs to // make sure that the code compiles regardless of DCHECK availability. - if (!DCHECK_IS_ON()) + if (!DCHECK_IS_ON()) { return; + } - if (view->GetProperty(kSkipAccessibilityPaintChecks)) + if (view->GetProperty(kSkipAccessibilityPaintChecks)) { return; + } // Get accessible node data from ViewAccessibility instead of View, because // some additional fields are processed and set there. @@ -34,8 +36,9 @@ view->GetViewAccessibility().GetAccessibleNodeData(&node_data); // No checks for unfocusable items yet. - if (!node_data.HasState(ax::mojom::State::kFocusable)) + if (!node_data.HasState(ax::mojom::State::kFocusable)) { return; + } // TODO(crbug.com/40185544): Enable these DCHECKs on ash. One of the current // failures seem to be SearchResultPageView marking itself as ignored @@ -74,8 +77,10 @@ // AXNodedata.SetNameExplicitlyEmpty(). // It has a name, we're done. - if (!node_data.GetStringAttribute(ax::mojom::StringAttribute::kName).empty()) + if (!node_data.GetStringAttribute(ax::mojom::StringAttribute::kName) + .empty()) { return; + } // Text fields are allowed to have a placeholder instead. if (node_data.role == ax::mojom::Role::kTextField &&
diff --git a/ui/views/accessibility/atomic_view_ax_tree_manager.cc b/ui/views/accessibility/atomic_view_ax_tree_manager.cc index 01e3f1d..859db31 100644 --- a/ui/views/accessibility/atomic_view_ax_tree_manager.cc +++ b/ui/views/accessibility/atomic_view_ax_tree_manager.cc
@@ -5,6 +5,7 @@ #include "ui/views/accessibility/atomic_view_ax_tree_manager.h" #include <memory> + #include "ui/accessibility/ax_serializable_tree.h" #include "ui/accessibility/ax_tree_manager_map.h" #include "ui/accessibility/ax_tree_update.h"
diff --git a/ui/views/accessibility/atomic_view_ax_tree_manager.h b/ui/views/accessibility/atomic_view_ax_tree_manager.h index 768ec5cc..9dbd6cc8 100644 --- a/ui/views/accessibility/atomic_view_ax_tree_manager.h +++ b/ui/views/accessibility/atomic_view_ax_tree_manager.h
@@ -7,6 +7,7 @@ #include <memory> #include <string> + #include "base/memory/raw_ptr.h" #include "ui/accessibility/ax_tree.h" #include "ui/accessibility/ax_tree_manager.h"
diff --git a/ui/views/accessibility/ax_aura_obj_cache.cc b/ui/views/accessibility/ax_aura_obj_cache.cc index 72028340..009fe8d 100644 --- a/ui/views/accessibility/ax_aura_obj_cache.cc +++ b/ui/views/accessibility/ax_aura_obj_cache.cc
@@ -31,8 +31,9 @@ namespace { aura::client::FocusClient* GetFocusClient(aura::Window* root_window) { - if (!root_window) + if (!root_window) { return nullptr; + } return aura::client::GetFocusClient(root_window); } @@ -52,8 +53,9 @@ void Observe() { observer_.Reset(); aura::Window* a11y_override_window = cache_->a11y_override_window_; - if (a11y_override_window) + if (a11y_override_window) { observer_.Observe(a11y_override_window); + } } private: @@ -74,8 +76,9 @@ AXAuraObjWrapper* AXAuraObjCache::GetOrCreate(View* view) { // Avoid problems with transient focus events. https://crbug.com/729449 - if (!view->GetWidget()) + if (!view->GetWidget()) { return nullptr; + } DCHECK(view_to_id_map_.find(view) != view_to_id_map_.end() || // This is either a new view or we're erroneously here during ~View. @@ -86,8 +89,9 @@ AXAuraObjWrapper* AXAuraObjCache::GetOrCreate(AXVirtualView* virtual_view) { if (!virtual_view->GetOwnerView() || - !virtual_view->GetOwnerView()->GetWidget()) + !virtual_view->GetOwnerView()->GetWidget()) { return nullptr; + } return CreateInternal<AXVirtualViewWrapper>(virtual_view, &virtual_view_to_id_map_); } @@ -130,8 +134,9 @@ void AXAuraObjCache::RemoveViewSubtree(View* view) { Remove(view); - for (View* child : view->children()) + for (View* child : view->children()) { RemoveViewSubtree(child); + } } void AXAuraObjCache::Remove(Widget* widget) { @@ -140,19 +145,22 @@ // When an entire widget is deleted, it doesn't always send a notification // on each of its views, so we need to explore them recursively. auto* view = widget->GetRootView(); - if (view) + if (view) { RemoveViewSubtree(view); + } } void AXAuraObjCache::Remove(aura::Window* window, aura::Window* parent) { int id = GetIDInternal(parent, window_to_id_map_); AXAuraObjWrapper* parent_window_obj = Get(id); RemoveInternal(window, &window_to_id_map_); - if (parent && delegate_) + if (parent && delegate_) { delegate_->OnChildWindowRemoved(parent_window_obj); + } - if (focused_window_ == window) + if (focused_window_ == window) { focused_window_ = nullptr; + } } AXAuraObjWrapper* AXAuraObjCache::Get(int32_t id) { @@ -162,8 +170,9 @@ void AXAuraObjCache::GetTopLevelWindows( std::vector<raw_ptr<AXAuraObjWrapper, VectorExperimental>>* children) { - for (aura::Window* root : root_windows_) + for (aura::Window* root : root_windows_) { children->push_back(GetOrCreate(root)); + } } AXAuraObjWrapper* AXAuraObjCache::GetFocus() { @@ -174,8 +183,9 @@ focused_view = focused_view->parent(); } - if (!focused_view) + if (!focused_view) { return nullptr; + } if (focused_view->GetViewAccessibility().FocusedVirtualChild()) { return focused_view->GetViewAccessibility() @@ -188,14 +198,16 @@ void AXAuraObjCache::OnFocusedViewChanged() { View* view = GetFocusedView(); - if (view) + if (view) { view->NotifyAccessibilityEvent(ax::mojom::Event::kFocus, true); + } } void AXAuraObjCache::FireEvent(AXAuraObjWrapper* aura_obj, ax::mojom::Event event_type) { - if (delegate_) + if (delegate_) { delegate_->OnEvent(aura_obj, event_type); + } } AXAuraObjCache::AXAuraObjCache() @@ -206,13 +218,15 @@ // Remove all focus observers from |root_windows_|. for (aura::Window* window : root_windows_) { aura::client::FocusClient* focus_client = GetFocusClient(window); - if (focus_client) + if (focus_client) { focus_client->RemoveObserver(this); + } } root_windows_.clear(); - for (auto& entry : virtual_view_to_id_map_) + for (auto& entry : virtual_view_to_id_map_) { entry.first->set_cache(nullptr); + } } View* AXAuraObjCache::GetFocusedView() { @@ -236,29 +250,34 @@ } } - if (!focused_window) + if (!focused_window) { return nullptr; + } focused_widget = Widget::GetWidgetForNativeView(focused_window); while (!focused_widget) { focused_window = focused_window->parent(); - if (!focused_window) + if (!focused_window) { break; + } focused_widget = Widget::GetWidgetForNativeView(focused_window); } } - if (!focused_widget) + if (!focused_widget) { return nullptr; + } FocusManager* focus_manager = focused_widget->GetFocusManager(); - if (!focus_manager) + if (!focus_manager) { return nullptr; + } View* focused_view = focus_manager->GetFocusedView(); - if (focused_view) + if (focused_view) { return focused_view; + } // No view has focus, but a child tree might have focus. if (focused_window) { @@ -289,8 +308,9 @@ } void AXAuraObjCache::OnRootWindowObjCreated(aura::Window* window) { - if (root_windows_.empty() && GetFocusClient(window)) + if (root_windows_.empty() && GetFocusClient(window)) { GetFocusClient(window)->AddObserver(this); + } // Do not allow duplicate entries. if (!base::Contains(root_windows_, window)) { @@ -302,11 +322,13 @@ std::erase_if(root_windows_, [window](aura::Window* current_window) { return current_window == window; }); - if (root_windows_.empty() && GetFocusClient(window)) + if (root_windows_.empty() && GetFocusClient(window)) { GetFocusClient(window)->RemoveObserver(this); + } - if (focused_window_ == window) + if (focused_window_ == window) { focused_window_ = nullptr; + } } void AXAuraObjCache::SetA11yOverrideWindow(aura::Window* a11y_override_window) { @@ -318,13 +340,15 @@ AXAuraObjWrapper* AXAuraObjCache::CreateInternal( AuraView* aura_view, std::map<AuraView*, int32_t>* aura_view_to_id_map) { - if (!aura_view) + if (!aura_view) { return nullptr; + } auto it = aura_view_to_id_map->find(aura_view); - if (it != aura_view_to_id_map->end()) + if (it != aura_view_to_id_map->end()) { return Get(it->second); + } auto wrapper = std::make_unique<AuraViewWrapper>(this, aura_view); ui::AXNodeID id = wrapper->GetUniqueId(); @@ -343,8 +367,9 @@ int32_t AXAuraObjCache::GetIDInternal( AuraView* aura_view, const std::map<AuraView*, int32_t>& aura_view_to_id_map) const { - if (!aura_view) + if (!aura_view) { return ui::kInvalidAXNodeID; + } auto it = aura_view_to_id_map.find(aura_view); return it != aura_view_to_id_map.end() ? it->second : ui::kInvalidAXNodeID; @@ -355,8 +380,9 @@ AuraView* aura_view, std::map<AuraView*, int32_t>* aura_view_to_id_map) { int32_t id = GetID(aura_view); - if (id == ui::kInvalidAXNodeID) + if (id == ui::kInvalidAXNodeID) { return; + } aura_view_to_id_map->erase(aura_view); cache_.erase(id); }
diff --git a/ui/views/accessibility/ax_aura_obj_cache_unittest.cc b/ui/views/accessibility/ax_aura_obj_cache_unittest.cc index 3905c2a..b94fd5a3 100644 --- a/ui/views/accessibility/ax_aura_obj_cache_unittest.cc +++ b/ui/views/accessibility/ax_aura_obj_cache_unittest.cc
@@ -33,11 +33,13 @@ namespace { bool HasNodeWithName(ui::AXNode* node, const std::string& name) { - if (node->GetStringAttribute(ax::mojom::StringAttribute::kName) == name) + if (node->GetStringAttribute(ax::mojom::StringAttribute::kName) == name) { return true; + } for (ui::AXNode* child : node->children()) { - if (HasNodeWithName(child, name)) + if (HasNodeWithName(child, name)) { return true; + } } return false; }
diff --git a/ui/views/accessibility/ax_root_obj_wrapper.cc b/ui/views/accessibility/ax_root_obj_wrapper.cc index 72ea621..0a2e50f 100644 --- a/ui/views/accessibility/ax_root_obj_wrapper.cc +++ b/ui/views/accessibility/ax_root_obj_wrapper.cc
@@ -45,8 +45,9 @@ out_node_data->role = ax::mojom::Role::kDesktop; display::Screen* screen = display::Screen::GetScreen(); - if (!screen) + if (!screen) { return; + } const display::Display& display = screen->GetPrimaryDisplay(); @@ -57,10 +58,11 @@ // portrait. We use this rather than |rotation| because some devices default // to landscape, some in portrait. Encode landscape as horizontal state, // portrait as vertical state. - if (display.bounds().width() > display.bounds().height()) + if (display.bounds().width() > display.bounds().height()) { out_node_data->AddState(ax::mojom::State::kHorizontal); - else + } else { out_node_data->AddState(ax::mojom::State::kVertical); + } } ui::AXNodeID AXRootObjWrapper::GetUniqueId() const {
diff --git a/ui/views/accessibility/ax_system_caret_win_interactive_uitest.cc b/ui/views/accessibility/ax_system_caret_win_interactive_uitest.cc index f7542baee..a49de4b0 100644 --- a/ui/views/accessibility/ax_system_caret_win_interactive_uitest.cc +++ b/ui/views/accessibility/ax_system_caret_win_interactive_uitest.cc
@@ -142,8 +142,9 @@ void WinAccessibilityCaretEventMonitor::WaitForNextEvent(DWORD* out_event, UINT* out_role, UINT* out_state) { - if (event_queue_.empty()) + if (event_queue_.empty()) { loop_runner_.Run(); + } EventInfo event_info = event_queue_.front(); event_queue_.pop_front(); @@ -157,16 +158,18 @@ child_variant.Receive())); base::win::ScopedVariant role_variant; - if (S_OK == acc_obj->get_accRole(child_variant, role_variant.Receive())) + if (S_OK == acc_obj->get_accRole(child_variant, role_variant.Receive())) { *out_role = V_I4(role_variant.ptr()); - else + } else { *out_role = 0; + } base::win::ScopedVariant state_variant; - if (S_OK == acc_obj->get_accState(child_variant, state_variant.Receive())) + if (S_OK == acc_obj->get_accState(child_variant, state_variant.Receive())) { *out_state = V_I4(state_variant.ptr()); - else + } else { *out_state = 0; + } } void WinAccessibilityCaretEventMonitor::OnWinEventHook(HWINEVENTHOOK handle,
diff --git a/ui/views/accessibility/ax_tree_source_views.cc b/ui/views/accessibility/ax_tree_source_views.cc index 49b6c5f..360d738c 100644 --- a/ui/views/accessibility/ax_tree_source_views.cc +++ b/ui/views/accessibility/ax_tree_source_views.cc
@@ -39,8 +39,9 @@ } AXAuraObjWrapper* obj = GetFromId(id); - if (obj) + if (obj) { obj->HandleAccessibleAction(action); + } } bool AXTreeSourceViews::GetTreeData(ui::AXTreeData* tree_data) const { @@ -48,8 +49,9 @@ tree_data->loaded = true; tree_data->loading_progress = 1.0; AXAuraObjWrapper* focus = cache_->GetFocus(); - if (focus) + if (focus) { tree_data->focus_id = focus->GetUniqueId(); + } return true; } @@ -60,8 +62,9 @@ AXAuraObjWrapper* AXTreeSourceViews::GetFromId(int32_t id) const { AXAuraObjWrapper* root = GetRoot(); // Root might not be in the cache. - if (id == root->GetUniqueId()) + if (id == root->GetUniqueId()) { return root; + } AXAuraObjWrapper* wrapper = cache_->Get(id); // We must do a lookup in AXVirtualView as well if the main cache doesn't hold @@ -108,18 +111,21 @@ AXAuraObjWrapper* AXTreeSourceViews::GetParent(AXAuraObjWrapper* node) const { AXAuraObjWrapper* root = GetRoot(); // The root has no parent by definition. - if (node->GetUniqueId() == root->GetUniqueId()) + if (node->GetUniqueId() == root->GetUniqueId()) { return nullptr; + } AXAuraObjWrapper* parent = node->GetParent(); // A top-level widget doesn't have a parent, so return the root. - if (!parent) + if (!parent) { return root; + } return parent; } bool AXTreeSourceViews::IsIgnored(AXAuraObjWrapper* node) const { - if (!node) + if (!node) { return false; + } ui::AXNodeData out_data; node->Serialize(&out_data); return out_data.IsIgnored(); @@ -154,8 +160,9 @@ // a location changed event), its descendants all move relative to // it by default. AXAuraObjWrapper* parent = node->GetParent(); - if (!parent) + if (!parent) { return; + } ui::AXNodeData parent_data; parent->Serialize(&parent_data); out_data->relative_bounds.bounds.Offset( @@ -173,8 +180,9 @@ root->GetChildren(&children); prefix += prefix[0]; - for (AXAuraObjWrapper* child : children) + for (AXAuraObjWrapper* child : children) { output += ToString(child, prefix); + } return output; }
diff --git a/ui/views/accessibility/ax_view_obj_wrapper.cc b/ui/views/accessibility/ax_view_obj_wrapper.cc index 2fcd64b7..6e5539d 100644 --- a/ui/views/accessibility/ax_view_obj_wrapper.cc +++ b/ui/views/accessibility/ax_view_obj_wrapper.cc
@@ -19,8 +19,9 @@ AXViewObjWrapper::AXViewObjWrapper(AXAuraObjCache* aura_obj_cache, View* view) : AXAuraObjWrapper(aura_obj_cache), view_(view) { - if (view->GetWidget()) + if (view->GetWidget()) { aura_obj_cache_->GetOrCreate(view->GetWidget()); + } observation_.Observe(view); } @@ -29,14 +30,16 @@ AXAuraObjWrapper* AXViewObjWrapper::GetParent() { if (view_->parent()) { if (view_->parent()->GetViewAccessibility().GetChildTreeID() != - ui::AXTreeIDUnknown()) + ui::AXTreeIDUnknown()) { return nullptr; + } return aura_obj_cache_->GetOrCreate(view_->parent()); } - if (view_->GetWidget()) + if (view_->GetWidget()) { return aura_obj_cache_->GetOrCreate(view_->GetWidget()); + } return nullptr; } @@ -46,8 +49,9 @@ const ViewAccessibility& view_accessibility = view_->GetViewAccessibility(); // Ignore this view's descendants if it has a child tree. - if (view_accessibility.GetChildTreeID() != ui::AXTreeIDUnknown()) + if (view_accessibility.GetChildTreeID() != ui::AXTreeIDUnknown()) { return; + } if (view_accessibility.IsLeaf()) { return; @@ -55,12 +59,14 @@ // TODO(dtseng): Need to handle |Widget| child of |View|. for (View* child : view_->children()) { - if (child->GetVisible()) + if (child->GetVisible()) { out_children->push_back(aura_obj_cache_->GetOrCreate(child)); + } } - for (const auto& child : view_accessibility.virtual_children()) + for (const auto& child : view_accessibility.virtual_children()) { out_children->push_back(child->GetOrCreateWrapper(aura_obj_cache_)); + } } void AXViewObjWrapper::Serialize(ui::AXNodeData* out_node_data) {
diff --git a/ui/views/accessibility/ax_virtual_view.cc b/ui/views/accessibility/ax_virtual_view.cc index dc44650..27c19c5 100644 --- a/ui/views/accessibility/ax_virtual_view.cc +++ b/ui/views/accessibility/ax_virtual_view.cc
@@ -72,15 +72,17 @@ } #if defined(USE_AURA) - if (ax_aura_obj_cache_) + if (ax_aura_obj_cache_) { ax_aura_obj_cache_->Remove(this); + } #endif } void AXVirtualView::AddChildView(std::unique_ptr<AXVirtualView> view) { DCHECK(view); - if (view->virtual_parent_view_ == this) + if (view->virtual_parent_view_ == this) { return; // Already a child of this virtual view. + } AddChildViewAt(std::move(view), children_.size()); } @@ -110,12 +112,14 @@ index = std::min(index, children_.size() - 1); DCHECK_EQ(view->virtual_parent_view_, this); - if (children_[index].get() == view) + if (children_[index].get() == view) { return; + } auto cur_index = GetIndexOf(view); - if (!cur_index.has_value()) + if (!cur_index.has_value()) { return; + } std::unique_ptr<AXVirtualView> child = std::move(children_[cur_index.value()]); @@ -129,8 +133,9 @@ } std::unique_ptr<AXVirtualView> AXVirtualView::RemoveFromParentView() { - if (parent_view_) + if (parent_view_) { return parent_view_->RemoveVirtualChildView(this); + } // This virtual view hasn't been added to a parent view yet. CHECK(virtual_parent_view_) @@ -142,8 +147,9 @@ AXVirtualView* view) { DCHECK(view); auto cur_index = GetIndexOf(view); - if (!cur_index.has_value()) + if (!cur_index.has_value()) { return {}; + } bool focus_changed = false; if (GetOwnerView()) { @@ -163,8 +169,9 @@ child->populate_data_callback_.Reset(); if (GetOwnerView()) { - if (focus_changed) + if (focus_changed) { GetOwnerView()->GetViewAccessibility().OverrideFocus(nullptr); + } GetOwnerView()->NotifyAccessibilityEvent(ax::mojom::Event::kChildrenChanged, true); } @@ -173,15 +180,17 @@ } void AXVirtualView::RemoveAllChildViews() { - while (!children_.empty()) + while (!children_.empty()) { RemoveChildView(children_.back().get()); + } } bool AXVirtualView::Contains(const AXVirtualView* view) const { DCHECK(view); for (const AXVirtualView* v = view; v; v = v->virtual_parent_view_) { - if (v == this) + if (v == this) { return true; + } } return false; } @@ -216,8 +225,9 @@ if (GetOwnerView()) { const ViewAccessibility::AccessibilityEventsCallback& events_callback = GetOwnerView()->GetViewAccessibility().accessibility_events_callback(); - if (events_callback) + if (events_callback) { events_callback.Run(this, event_type); + } } // This is used on platforms that have a native accessibility API. @@ -250,17 +260,21 @@ node_data.id = GetUniqueId(); - if (!GetOwnerView() || !GetOwnerView()->GetEnabled()) + if (!GetOwnerView() || !GetOwnerView()->GetEnabled()) { node_data.SetRestriction(ax::mojom::Restriction::kDisabled); + } - if (!GetOwnerView() || !GetOwnerView()->IsDrawn()) + if (!GetOwnerView() || !GetOwnerView()->IsDrawn()) { node_data.AddState(ax::mojom::State::kInvisible); + } - if (GetOwnerView() && GetOwnerView()->context_menu_controller()) + if (GetOwnerView() && GetOwnerView()->context_menu_controller()) { node_data.AddAction(ax::mojom::Action::kShowContextMenu); + } - if (populate_data_callback_ && GetOwnerView()) + if (populate_data_callback_ && GetOwnerView()) { populate_data_callback_.Run(&node_data); + } if (pruned_) { node_data.AddState(ax::mojom::State::kIgnored); @@ -296,12 +310,14 @@ for (const std::unique_ptr<AXVirtualView>& child : children_) { if (child->IsIgnored()) { size_t child_count = child->GetChildCount(); - if (index < child_count) + if (index < child_count) { return child->ChildAtIndex(index); + } index -= child_count; } else { - if (index == 0) + if (index == 0) { return child->GetNativeObject(); + } --index; } } @@ -321,14 +337,16 @@ gfx::NativeViewAccessible AXVirtualView::GetParent() const { if (parent_view_) { - if (!parent_view_->GetIsIgnored()) + if (!parent_view_->GetIsIgnored()) { return parent_view_->GetNativeObject(); + } return GetDelegate()->GetParent(); } if (virtual_parent_view_) { - if (virtual_parent_view_->IsIgnored()) + if (virtual_parent_view_->IsIgnored()) { return virtual_parent_view_->GetParent(); + } return virtual_parent_view_->GetNativeObject(); } @@ -344,8 +362,9 @@ // TODO(nektar): Implement bounds that are relative to the parent. gfx::Rect bounds = gfx::ToEnclosingRect(GetData().relative_bounds.bounds); View* owner_view = GetOwnerView(); - if (owner_view && owner_view->GetWidget()) + if (owner_view && owner_view->GetWidget()) { View::ConvertRectToScreen(owner_view, &bounds); + } switch (coordinate_system) { case ui::AXCoordinateSystem::kScreenDIPs: return bounds; @@ -353,8 +372,9 @@ float scale_factor = 1.0; if (owner_view && owner_view->GetWidget()) { gfx::NativeView native_view = owner_view->GetWidget()->GetNativeView(); - if (native_view) + if (native_view) { scale_factor = ui::GetScaleFactorForNativeView(native_view); + } } return gfx::ScaleToEnclosingRect(bounds, scale_factor); } @@ -368,8 +388,9 @@ gfx::NativeViewAccessible AXVirtualView::HitTestSync( int screen_physical_pixel_x, int screen_physical_pixel_y) const { - if (GetData().IsInvisible()) + if (GetData().IsInvisible()) { return nullptr; + } // Check if the point is within any of the virtual children of this view. // AXVirtualView's HitTestSync is a recursive function that will return the @@ -379,8 +400,9 @@ base::Reversed(children_)) { gfx::NativeViewAccessible result = child->HitTestSync(screen_physical_pixel_x, screen_physical_pixel_y); - if (result) + if (result) { return result; + } } // If it's not inside any of our virtual children, and it's inside the bounds @@ -421,10 +443,12 @@ bool AXVirtualView::AccessibilityPerformAction(const ui::AXActionData& data) { bool result = false; - if (custom_data_.HasAction(data.action)) + if (custom_data_.HasAction(data.action)) { result = HandleAccessibleAction(data); - if (!result && GetOwnerView()) + } + if (!result && GetOwnerView()) { return HandleAccessibleActionInOwnerView(data); + } return result; } @@ -446,8 +470,9 @@ // events to be routed correctly. gfx::AcceleratedWidget AXVirtualView::GetTargetForNativeAccessibilityEvent() { #if BUILDFLAG(IS_WIN) - if (GetOwnerView()) + if (GetOwnerView()) { return HWNDForView(GetOwnerView()); + } #endif return gfx::kNullAcceleratedWidget; } @@ -467,8 +492,9 @@ bool AXVirtualView::HandleAccessibleAction( const ui::AXActionData& action_data) { - if (!GetOwnerView()) + if (!GetOwnerView()) { return false; + } switch (action_data.action) { case ax::mojom::Action::kShowContextMenu: { @@ -502,19 +528,22 @@ void AXVirtualView::set_cache(AXAuraObjCache* cache) { #if defined(USE_AURA) - if (ax_aura_obj_cache_ && cache) + if (ax_aura_obj_cache_ && cache) { ax_aura_obj_cache_->Remove(this); + } #endif ax_aura_obj_cache_ = cache; } View* AXVirtualView::GetOwnerView() const { - if (parent_view_) + if (parent_view_) { return parent_view_->view(); + } - if (virtual_parent_view_) + if (virtual_parent_view_) { return virtual_parent_view_->GetOwnerView(); + } // This virtual view hasn't been added to a parent view yet. return nullptr;
diff --git a/ui/views/accessibility/ax_virtual_view_mac.mm b/ui/views/accessibility/ax_virtual_view_mac.mm index 99eba17c..f1c4592 100644 --- a/ui/views/accessibility/ax_virtual_view_mac.mm +++ b/ui/views/accessibility/ax_virtual_view_mac.mm
@@ -11,17 +11,20 @@ gfx::NativeViewAccessible AXVirtualView::GetNSWindow() { View* owner = GetOwnerView(); - if (!owner) + if (!owner) { return nil; + } Widget* widget = owner->GetWidget(); - if (!widget) + if (!widget) { return nil; + } auto* window_host = NativeWidgetMacNSWindowHost::GetFromNativeWindow( widget->GetNativeWindow()); - if (!window_host) + if (!window_host) { return nil; + } return window_host->GetNativeViewAccessibleForNSWindow(); }
diff --git a/ui/views/accessibility/ax_virtual_view_unittest.cc b/ui/views/accessibility/ax_virtual_view_unittest.cc index 243a001..eef8ce1d 100644 --- a/ui/views/accessibility/ax_virtual_view_unittest.cc +++ b/ui/views/accessibility/ax_virtual_view_unittest.cc
@@ -99,8 +99,9 @@ void TearDown() override { virtual_label_ = nullptr; button_ = nullptr; - if (!widget_->IsClosed()) + if (!widget_->IsClosed()) { widget_->Close(); + } widget_.reset(); ViewsTestBase::TearDown(); }
diff --git a/ui/views/accessibility/ax_virtual_view_wrapper.cc b/ui/views/accessibility/ax_virtual_view_wrapper.cc index d288b6e..932b1b99 100644 --- a/ui/views/accessibility/ax_virtual_view_wrapper.cc +++ b/ui/views/accessibility/ax_virtual_view_wrapper.cc
@@ -27,16 +27,18 @@ return const_cast<AXVirtualView*>(virtual_view_->virtual_parent_view()) ->GetOrCreateWrapper(aura_obj_cache_); } - if (virtual_view_->GetOwnerView()) + if (virtual_view_->GetOwnerView()) { return aura_obj_cache_->GetOrCreate(virtual_view_->GetOwnerView()); + } return nullptr; } void AXVirtualViewWrapper::GetChildren( std::vector<raw_ptr<AXAuraObjWrapper, VectorExperimental>>* out_children) { - for (const auto& child : virtual_view_->children()) + for (const auto& child : virtual_view_->children()) { out_children->push_back(child->GetOrCreateWrapper(aura_obj_cache_)); + } } void AXVirtualViewWrapper::Serialize(ui::AXNodeData* out_node_data) {
diff --git a/ui/views/accessibility/ax_window_obj_wrapper.cc b/ui/views/accessibility/ax_window_obj_wrapper.cc index e1ce08f0..9448f0f 100644 --- a/ui/views/accessibility/ax_window_obj_wrapper.cc +++ b/ui/views/accessibility/ax_window_obj_wrapper.cc
@@ -29,8 +29,9 @@ Widget* GetWidgetForWindow(aura::Window* window) { Widget* widget = Widget::GetWidgetForNativeView(window); - if (!widget) + if (!widget) { return nullptr; + } // Under mus/mash both the WindowTreeHost's root aura::Window and the content // aura::Window will return the same Widget for GetWidgetForNativeView(). Only @@ -56,8 +57,9 @@ cache->FireEvent(cache->GetOrCreate(widget), event); views::View* root_view = widget->GetRootView(); - if (root_view) + if (root_view) { root_view->NotifyAccessibilityEvent(event, true); + } } } @@ -75,8 +77,9 @@ std::string GetWindowName(aura::Window* window) { std::string class_name = window->GetName(); - if (class_name.empty()) + if (class_name.empty()) { class_name = "aura::Window"; + } return class_name; } @@ -89,15 +92,17 @@ is_root_window_(window->IsRootWindow()) { observation_.Observe(window); - if (is_root_window_) + if (is_root_window_) { aura_obj_cache_->OnRootWindowObjCreated(window); + } // This is a top level root window. if (window->IsRootWindow() && !window->parent()) { // On desktop aura there is one WindowTreeHost per top-level window. aura::WindowTreeHost* window_tree_host = window->GetHost(); - if (window_tree_host) + if (window_tree_host) { ime_observation_.Observe(window_tree_host->GetInputMethod()); + } } } @@ -114,8 +119,9 @@ AXAuraObjWrapper* AXWindowObjWrapper::GetParent() { aura::Window* parent = window_->parent(); - if (!parent) + if (!parent) { return nullptr; + } if (parent->GetProperty(ui::kChildAXTreeID) && ui::AXTreeID::FromString(*(parent->GetProperty(ui::kChildAXTreeID))) != @@ -136,8 +142,9 @@ } // Ignore this window's children if it is forced to be invisible. - if (window_->GetProperty(ui::kAXConsiderInvisibleAndIgnoreChildren)) + if (window_->GetProperty(ui::kAXConsiderInvisibleAndIgnoreChildren)) { return; + } for (aura::Window* child : window_->children()) { out_children->push_back(aura_obj_cache_->GetOrCreate(child)); @@ -145,8 +152,9 @@ // Also consider any associated widgets as children. Widget* widget = GetWidgetForWindow(window_); - if (widget && widget->IsVisible()) + if (widget && widget->IsVisible()) { out_children->push_back(aura_obj_cache_->GetOrCreate(widget)); + } } void AXWindowObjWrapper::Serialize(ui::AXNodeData* out_node_data) { @@ -165,10 +173,11 @@ out_node_data->id = GetUniqueId(); ax::mojom::Role role = window_->GetProperty(ui::kAXRoleOverride); - if (role != ax::mojom::Role::kNone) + if (role != ax::mojom::Role::kNone) { out_node_data->role = role; - else + } else { out_node_data->role = ax::mojom::Role::kWindow; + } out_node_data->AddStringAttribute(ax::mojom::StringAttribute::kName, base::UTF16ToUTF8(window_->GetTitle())); if (!window_->IsVisible() || @@ -227,8 +236,9 @@ } void AXWindowObjWrapper::OnWindowDestroyed(aura::Window* window) { - if (is_root_window_) + if (is_root_window_) { aura_obj_cache_->OnRootWindowObjDestroyed(window_); + } aura_obj_cache_->Remove(window, nullptr); } @@ -240,8 +250,10 @@ void AXWindowObjWrapper::OnWindowHierarchyChanged( const HierarchyChangeParams& params) { - if (params.phase == WindowObserver::HierarchyChangeParams::HIERARCHY_CHANGED) + if (params.phase == + WindowObserver::HierarchyChangeParams::HIERARCHY_CHANGED) { aura_obj_cache_->Remove(params.target, params.old_parent); + } } void AXWindowObjWrapper::OnWindowBoundsChanged( @@ -249,18 +261,21 @@ const gfx::Rect& old_bounds, const gfx::Rect& new_bounds, ui::PropertyChangeReason reason) { - if (window_destroying_) + if (window_destroying_) { return; + } - if (window == window_) + if (window == window_) { FireLocationChangesRecursively(window_, aura_obj_cache_); + } } void AXWindowObjWrapper::OnWindowPropertyChanged(aura::Window* window, const void* key, intptr_t old) { - if (window_destroying_ || window != window_) + if (window_destroying_ || window != window_) { return; + } if (key == ui::kChildAXTreeID || key == ui::kAXConsiderInvisibleAndIgnoreChildren) { @@ -270,24 +285,28 @@ void AXWindowObjWrapper::OnWindowVisibilityChanged(aura::Window* window, bool visible) { - if (window_destroying_) + if (window_destroying_) { return; + } FireEvent(ax::mojom::Event::kStateChanged); } void AXWindowObjWrapper::OnWindowTransformed(aura::Window* window, ui::PropertyChangeReason reason) { - if (window_destroying_) + if (window_destroying_) { return; + } - if (window == window_) + if (window == window_) { FireLocationChangesRecursively(window_, aura_obj_cache_); + } } void AXWindowObjWrapper::OnWindowTitleChanged(aura::Window* window) { - if (window_destroying_) + if (window_destroying_) { return; + } FireEventOnWindowChildWidgetAndRootView( window_, ax::mojom::Event::kTreeChanged, aura_obj_cache_);
diff --git a/ui/views/accessibility/view_accessibility.cc b/ui/views/accessibility/view_accessibility.cc index 3ca1e78..dda1f71 100644 --- a/ui/views/accessibility/view_accessibility.cc +++ b/ui/views/accessibility/view_accessibility.cc
@@ -100,8 +100,9 @@ DCHECK(virtual_view); DCHECK_LE(index, virtual_children_.size()); - if (virtual_view->parent_view() == this) + if (virtual_view->parent_view() == this) { return; + } DCHECK(!virtual_view->parent_view()) << "This |view| already has a View " "parent. Call RemoveVirtualChildView " "first."; @@ -118,8 +119,9 @@ AXVirtualView* virtual_view) { DCHECK(virtual_view); auto cur_index = GetIndexOf(virtual_view); - if (!cur_index.has_value()) + if (!cur_index.has_value()) { return {}; + } std::unique_ptr<AXVirtualView> child = std::move(virtual_children_[cur_index.value()]); @@ -127,14 +129,16 @@ static_cast<ptrdiff_t>(cur_index.value())); child->set_parent_view(nullptr); child->UnsetPopulateDataCallback(); - if (focused_virtual_child_ && child->Contains(focused_virtual_child_)) + if (focused_virtual_child_ && child->Contains(focused_virtual_child_)) { OverrideFocus(nullptr); + } return child; } void ViewAccessibility::RemoveAllVirtualChildViews() { - while (!virtual_children_.empty()) + while (!virtual_children_.empty()) { RemoveVirtualChildView(virtual_children_.back().get()); + } } bool ViewAccessibility::Contains(const AXVirtualView* virtual_view) const { @@ -142,8 +146,9 @@ for (const auto& virtual_child : virtual_children_) { // AXVirtualView::Contains() also checks if the provided virtual view is the // same as |this|. - if (virtual_child->Contains(virtual_view)) + if (virtual_child->Contains(virtual_view)) { return true; + } } return false; } @@ -1005,17 +1010,19 @@ } void ViewAccessibility::SetNextFocus(Widget* widget) { - if (widget) + if (widget) { next_focus_ = widget->GetWeakPtr(); - else + } else { next_focus_ = nullptr; + } } void ViewAccessibility::SetPreviousFocus(Widget* widget) { - if (widget) + if (widget) { previous_focus_ = widget->GetWeakPtr(); - else + } else { previous_focus_ = nullptr; + } } Widget* ViewAccessibility::GetNextWindowFocus() const { @@ -1217,8 +1224,9 @@ } gfx::NativeViewAccessible ViewAccessibility::GetFocusedDescendant() { - if (focused_virtual_child_) + if (focused_virtual_child_) { return focused_virtual_child_->GetNativeObject(); + } return view_->GetNativeViewAccessible(); }
diff --git a/ui/views/accessibility/view_accessibility_utils.cc b/ui/views/accessibility/view_accessibility_utils.cc index c968490..323307c 100644 --- a/ui/views/accessibility/view_accessibility_utils.cc +++ b/ui/views/accessibility/view_accessibility_utils.cc
@@ -21,11 +21,13 @@ Widget* ViewAccessibilityUtils::GetFocusedChildWidgetForAccessibility( const View* view) { const FocusManager* focus_manager = view->GetFocusManager(); - if (!focus_manager) + if (!focus_manager) { return nullptr; + } const View* focused_view = view->GetFocusManager()->GetFocusedView(); - if (!focused_view) + if (!focused_view) { return nullptr; + } std::set<raw_ptr<Widget, SetExperimental>> child_widgets; Widget::GetAllOwnedWidgets(view->GetWidget()->GetNativeView(),
diff --git a/ui/views/accessibility/view_accessibility_utils.h b/ui/views/accessibility/view_accessibility_utils.h index b5c7487..fc0cd0c 100644 --- a/ui/views/accessibility/view_accessibility_utils.h +++ b/ui/views/accessibility/view_accessibility_utils.h
@@ -6,6 +6,7 @@ #define UI_VIEWS_ACCESSIBILITY_VIEW_ACCESSIBILITY_UTILS_H_ #include <unordered_set> + #include "ui/accessibility/ax_enums.mojom-forward.h" #include "ui/accessibility/ax_node_data.h" #include "ui/views/view.h"
diff --git a/ui/views/accessibility/view_ax_platform_node_delegate.cc b/ui/views/accessibility/view_ax_platform_node_delegate.cc index dcbdf40..03d8595 100644 --- a/ui/views/accessibility/view_ax_platform_node_delegate.cc +++ b/ui/views/accessibility/view_ax_platform_node_delegate.cc
@@ -78,30 +78,35 @@ // being a non-keyboard-focusable child of a keyboard-focusable ancestor. E.g., // LabelButtons contain Labels, but a11y should just show that there's a button. bool IsViewUnfocusableDescendantOfFocusableAncestor(View* view) { - if (IsAccessibilityFocusableWhenEnabled(view)) + if (IsAccessibilityFocusableWhenEnabled(view)) { return false; + } while (view->parent()) { view = view->parent(); - if (IsAccessibilityFocusableWhenEnabled(view)) + if (IsAccessibilityFocusableWhenEnabled(view)) { return true; + } } return false; } ui::AXPlatformNode* FromNativeWindow(gfx::NativeWindow native_window) { Widget* widget = Widget::GetWidgetForNativeWindow(native_window); - if (!widget) + if (!widget) { return nullptr; + } View* view = widget->GetRootView(); - if (!view) + if (!view) { return nullptr; + } gfx::NativeViewAccessible native_view_accessible = view->GetNativeViewAccessible(); - if (!native_view_accessible) + if (!native_view_accessible) { return nullptr; + } return ui::AXPlatformNode::FromNativeViewAccessible(native_view_accessible); } @@ -114,16 +119,18 @@ void FireEvent(QueuedEvent event) { ui::AXPlatformNode* node = PlatformNodeFromNodeID(event.node_id); - if (node) + if (node) { node->NotifyAccessibilityEvent(event.type); + } } void FlushQueue() { DCHECK(g_is_queueing_events); g_is_queueing_events = false; g_is_flushing = true; - for (QueuedEvent event : g_event_queue.Get()) + for (QueuedEvent event : g_event_queue.Get()) { FireEvent(event); + } g_is_flushing = false; g_event_queue.Get().clear(); } @@ -209,8 +216,9 @@ while (focused_node) { ui::AXPlatformNodeBase* deeper_focus = static_cast<ui::AXPlatformNodeBase*>( ui::AXPlatformNode::FromNativeViewAccessible(focused_node->GetFocus())); - if (!deeper_focus || deeper_focus == focused_node) + if (!deeper_focus || deeper_focus == focused_node) { break; + } focused_node = deeper_focus; } if (focused_node) { @@ -351,8 +359,9 @@ // (We could try to move this logic to ViewAccessibility, but // that would require ensuring that Chrome OS invalidates the whole // subtree when a View changes its visibility state.) - if (!view()->IsDrawn()) + if (!view()->IsDrawn()) { data_.AddState(ax::mojom::State::kInvisible); + } // Make sure this element is excluded from the a11y tree if there's a // focusable parent. All keyboard focusable elements should be leaf nodes. @@ -362,8 +371,9 @@ // because we needed a way to mark a View as a leaf node in the // accessibility tree. We need to replace this with a cross-platform // solution that works for ChromeVox, too, and move it to ViewAccessibility. - if (IsViewUnfocusableDescendantOfFocusableAncestor(view())) + if (IsViewUnfocusableDescendantOfFocusableAncestor(view())) { data_.AddState(ax::mojom::State::kIgnored); + } #if BUILDFLAG(IS_WIN) if (view()->GetViewAccessibility().needs_ax_tree_manager()) { @@ -445,12 +455,14 @@ virtual_children()) { if (virtual_child->IsIgnored()) { size_t virtual_child_count = virtual_child->GetChildCount(); - if (index < virtual_child_count) + if (index < virtual_child_count) { return virtual_child->ChildAtIndex(index); + } index -= virtual_child_count; } else { - if (index == 0) + if (index == 0) { return virtual_child->GetNativeObject(); + } --index; } } @@ -483,12 +495,14 @@ static_cast<ViewAXPlatformNodeDelegate*>(&view_accessibility); DCHECK(child_view_delegate); size_t child_count = child_view_delegate->GetChildCount(); - if (index < child_count) + if (index < child_count) { return child_view_delegate->ChildAtIndex(index); + } index -= child_count; } else { - if (index == 0) + if (index == 0) { return view_accessibility.view()->GetNativeViewAccessible(); + } --index; } } @@ -598,8 +612,9 @@ if (Widget* widget = view()->GetWidget()) { Widget* top_widget = widget->GetTopLevelWidget(); - if (top_widget && widget != top_widget && top_widget->GetRootView()) + if (top_widget && widget != top_widget && top_widget->GetRootView()) { return top_widget->GetRootView()->GetNativeViewAccessible(); + } } return nullptr; @@ -621,8 +636,9 @@ // Note: only used on Desktop Linux. Other platforms don't have an application // node so this would never return true. ui::AXNodeData data = GetData(); - if (data.role != ax::mojom::Role::kWindow) + if (data.role != ax::mojom::Role::kWindow) { return false; + } AXPlatformNodeDelegate* parent = GetParentDelegate(); return parent && parent->GetData().role == ax::mojom::Role::kApplication; @@ -740,8 +756,9 @@ gfx::NativeViewAccessible ViewAXPlatformNodeDelegate::HitTestSync( int screen_physical_pixel_x, int screen_physical_pixel_y) const { - if (!view() || !view()->GetWidget()) + if (!view() || !view()->GetWidget()) { return nullptr; + } if (IsLeaf()) { return GetNativeViewAccessible(); @@ -754,13 +771,15 @@ for (Widget* child_widget : GetChildWidgets().child_widgets) { View* child_root_view = child_widget->GetRootView(); View::ConvertPointFromScreen(child_root_view, &point); - if (child_root_view->HitTestPoint(point)) + if (child_root_view->HitTestPoint(point)) { return child_root_view->GetNativeViewAccessible(); + } } View::ConvertPointFromScreen(view(), &point); - if (!view()->HitTestPoint(point)) + if (!view()->HitTestPoint(point)) { return nullptr; + } // Check if the point is within any of the virtual children of this view. // AXVirtualView's HitTestSync is a recursive function that will return the @@ -771,8 +790,9 @@ base::Reversed(virtual_children())) { gfx::NativeViewAccessible result = child->HitTestSync(screen_physical_pixel_x, screen_physical_pixel_y); - if (result) + if (result) { return result; + } } // If it's not inside any of our virtual children, it's inside this view. return GetNativeViewAccessible(); @@ -783,12 +803,14 @@ // do a recursive hit test if we return anything other than |this| or NULL. View* v = view(); const auto is_point_in_child = [point, v](View* child) { - if (!child->GetVisible()) + if (!child->GetVisible()) { return false; + } ui::AXNodeData child_data; child->GetViewAccessibility().GetAccessibleNodeData(&child_data); - if (child_data.IsInvisible()) + if (child_data.IsInvisible()) { return false; + } gfx::Point point_in_child_coords = point; v->ConvertPointToTarget(v, child, &point_in_child_coords); return child->HitTestPoint(point_in_child_coords); @@ -803,15 +825,17 @@ gfx::NativeViewAccessible ViewAXPlatformNodeDelegate::GetFocus() const { gfx::NativeViewAccessible focus_override = ui::AXPlatformNode::GetPopupFocusOverride(); - if (focus_override) + if (focus_override) { return focus_override; + } FocusManager* focus_manager = view()->GetFocusManager(); View* focused_view = focus_manager ? focus_manager->GetFocusedView() : nullptr; - if (!focused_view) + if (!focused_view) { return nullptr; + } // The accessibility focus will be either on the |focused_view| or on one of // its virtual children. @@ -849,8 +873,9 @@ const View* v = view(); if (v) { const int view_id = v->GetID(); - if (view_id) + if (view_id) { return u"view_" + base::NumberToString16(view_id); + } } return std::u16string(); @@ -882,8 +907,9 @@ return false; } - if (ui::ShouldHaveReadonlyStateByDefault(GetData().role)) + if (ui::ShouldHaveReadonlyStateByDefault(GetData().role)) { return true; + } // When readonly is not supported, we assume that the node is always // read-only and mark it as such since this is the default behavior. @@ -944,13 +970,15 @@ std::optional<int32_t> ViewAXPlatformNodeDelegate::GetCellId( int row_index, int col_index) const { - if (virtual_children().empty() || !GetAncestorTableView()) + if (virtual_children().empty() || !GetAncestorTableView()) { return std::nullopt; + } AXVirtualView* ax_cell = GetAncestorTableView()->GetVirtualAccessibilityCell( static_cast<size_t>(row_index), static_cast<size_t>(col_index)); - if (!ax_cell) + if (!ax_cell) { return std::nullopt; + } const ui::AXNodeData& cell_data = ax_cell->GetData(); if (cell_data.role == ax::mojom::Role::kCell || @@ -965,8 +993,9 @@ ui::AXNodeData data; view()->GetViewAccessibility().GetAccessibleNodeData(&data); - if (!ui::IsTableLike(data.role)) + if (!ui::IsTableLike(data.role)) { return nullptr; + } return static_cast<TableView*>(view()); } @@ -986,17 +1015,20 @@ std::optional<int> ViewAXPlatformNodeDelegate::GetPosInSet() const { // Consider overridable attributes first. const ui::AXNodeData& data = GetData(); - if (data.HasIntAttribute(ax::mojom::IntAttribute::kPosInSet)) + if (data.HasIntAttribute(ax::mojom::IntAttribute::kPosInSet)) { return data.GetIntAttribute(ax::mojom::IntAttribute::kPosInSet); + } std::vector<raw_ptr<View, VectorExperimental>> views_in_group; GetViewsInGroupForSet(&views_in_group); - if (views_in_group.empty()) + if (views_in_group.empty()) { return std::nullopt; + } // Check this is in views_in_group; it may be removed if it is ignored. auto found_view = base::ranges::find(views_in_group, view()); - if (found_view == views_in_group.end()) + if (found_view == views_in_group.end()) { return std::nullopt; + } int pos_in_set = base::checked_cast<int>( std::distance(views_in_group.begin(), found_view)); @@ -1007,17 +1039,20 @@ std::optional<int> ViewAXPlatformNodeDelegate::GetSetSize() const { // Consider overridable attributes first. const ui::AXNodeData& data = GetData(); - if (data.HasIntAttribute(ax::mojom::IntAttribute::kSetSize)) + if (data.HasIntAttribute(ax::mojom::IntAttribute::kSetSize)) { return data.GetIntAttribute(ax::mojom::IntAttribute::kSetSize); + } std::vector<raw_ptr<View, VectorExperimental>> views_in_group; GetViewsInGroupForSet(&views_in_group); - if (views_in_group.empty()) + if (views_in_group.empty()) { return std::nullopt; + } // Check this is in views_in_group; it may be removed if it is ignored. auto found_view = base::ranges::find(views_in_group, view()); - if (found_view == views_in_group.end()) + if (found_view == views_in_group.end()) { return std::nullopt; + } return base::checked_cast<int>(views_in_group.size()); } @@ -1025,14 +1060,16 @@ void ViewAXPlatformNodeDelegate::GetViewsInGroupForSet( std::vector<raw_ptr<View, VectorExperimental>>* views_in_group) const { const int group_id = view()->GetGroup(); - if (group_id < 0) + if (group_id < 0) { return; + } View* view_to_check = view(); // If this view has a parent, check from the parent, to make sure we catch any // siblings. - if (view()->parent()) + if (view()->parent()) { view_to_check = view()->parent(); + } view_to_check->GetViewsInGroup(group_id, views_in_group); // Remove any views that are ignored in the accessibility tree. @@ -1058,8 +1095,9 @@ Widget* widget = view()->GetWidget(); // Note that during window close, a Widget may exist in a state where it has // no NativeView, but hasn't yet torn down its view hierarchy. - if (!widget || !widget->GetNativeView() || widget->GetRootView() != view()) + if (!widget || !widget->GetNativeView() || widget->GetRootView() != view()) { return ChildWidgetsResult(); + } std::set<raw_ptr<Widget, SetExperimental>> owned_widgets; Widget::GetAllOwnedWidgets(widget->GetNativeView(), &owned_widgets); @@ -1081,8 +1119,9 @@ // In order to support the "read title (NVDAKey+T)" and "read window // (NVDAKey+B)" commands in the NVDA screen reader, hide the rest of the UI // from the accessibility tree when a modal dialog is showing. - if (i != visible_widgets.cend()) + if (i != visible_widgets.cend()) { return ChildWidgetsResult({*i}, true /* is_tab_modal_showing */); + } return ChildWidgetsResult(visible_widgets, false /* is_tab_modal_showing */); }
diff --git a/ui/views/accessibility/view_ax_platform_node_delegate_auralinux.cc b/ui/views/accessibility/view_ax_platform_node_delegate_auralinux.cc index b3a810a..cefa65d 100644 --- a/ui/views/accessibility/view_ax_platform_node_delegate_auralinux.cc +++ b/ui/views/accessibility/view_ax_platform_node_delegate_auralinux.cc
@@ -34,18 +34,21 @@ // Return the widget of any parent window of |widget|, first checking for // transient parent windows. Widget* GetWidgetOfParentWindowIncludingTransient(Widget* widget) { - if (!widget) + if (!widget) { return nullptr; + } aura::Window* window = widget->GetNativeWindow(); - if (!window) + if (!window) { return nullptr; + } // Look for an ancestor window with a Widget, and if found, return // the NativeViewAccessible for its RootView. aura::Window* ancestor_window = GetWindowParentIncludingTransient(window); - if (!ancestor_window) + if (!ancestor_window) { return nullptr; + } return Widget::GetWidgetForNativeView(ancestor_window); } @@ -54,8 +57,10 @@ // parents of transient windows. Widget* GetToplevelWidgetIncludingTransientWindows(Widget* widget) { widget = widget->GetTopLevelWidget(); - if (Widget* parent_widget = GetWidgetOfParentWindowIncludingTransient(widget)) + if (Widget* parent_widget = + GetWidgetOfParentWindowIncludingTransient(widget)) { return GetToplevelWidgetIncludingTransientWindows(parent_widget); + } return widget; } @@ -82,8 +87,9 @@ // Add the top-level widget to our registry so that we can enumerate all // top-level widgets. void RegisterWidget(Widget* widget) { - if (!widget) + if (!widget) { return; + } widget = GetToplevelWidgetIncludingTransientWindows(widget); if (!widget || !widget->native_widget() || @@ -95,8 +101,9 @@ widget_observations_.AddObservation(widget); aura::Window* window = widget->GetNativeWindow(); - if (window) + if (window) { window_observations_.AddObservation(window); + } } gfx::NativeViewAccessible GetNativeViewAccessible() override { @@ -111,22 +118,26 @@ widget_observations_.RemoveObservation(widget); aura::Window* window = widget->GetNativeWindow(); - if (window && window_observations_.IsObservingSource(window)) + if (window && window_observations_.IsObservingSource(window)) { window_observations_.RemoveObservation(window); + } auto iter = base::ranges::find(widgets_, widget); - if (iter != widgets_.end()) + if (iter != widgets_.end()) { widgets_.erase(iter); + } } void OnWindowVisibilityChanged(aura::Window* window, bool visible) override { for (Widget* widget : widgets_) { - if (widget->GetNativeWindow() != window) + if (widget->GetNativeWindow() != window) { continue; + } View* root_view = widget->GetRootView(); - if (!root_view) + if (!root_view) { continue; + } root_view->NotifyAccessibilityEvent( ax::mojom::Event::kWindowVisibilityChanged, true); @@ -153,8 +164,9 @@ size_t GetChildCount() const override { return widgets_.size(); } gfx::NativeViewAccessible ChildAtIndex(size_t index) const override { - if (index >= GetChildCount()) + if (index >= GetChildCount()) { return nullptr; + } Widget* widget = widgets_[index]; CHECK(widget); @@ -231,8 +243,9 @@ Widget* parent_widget = GetWidgetOfParentWindowIncludingTransient(view()->GetWidget()); - if (parent_widget) + if (parent_widget) { return parent_widget->GetRootView()->GetNativeViewAccessible(); + } return AuraLinuxApplication::GetInstance().GetNativeViewAccessible(); } @@ -246,8 +259,9 @@ void ViewAXPlatformNodeDelegateAuraLinux::OnViewHierarchyChanged( View* observed_view, const ViewHierarchyChangedDetails& details) { - if (view() != details.child || !details.is_add) + if (view() != details.child || !details.is_add) { return; + } static_cast<ui::AXPlatformNodeAuraLinux*>(ax_platform_node()) ->OnParentChanged(); }
diff --git a/ui/views/accessibility/view_ax_platform_node_delegate_mac.h b/ui/views/accessibility/view_ax_platform_node_delegate_mac.h index 43a52ff1..0bc7f357 100644 --- a/ui/views/accessibility/view_ax_platform_node_delegate_mac.h +++ b/ui/views/accessibility/view_ax_platform_node_delegate_mac.h
@@ -5,10 +5,10 @@ #ifndef UI_VIEWS_ACCESSIBILITY_VIEW_AX_PLATFORM_NODE_DELEGATE_MAC_H_ #define UI_VIEWS_ACCESSIBILITY_VIEW_AX_PLATFORM_NODE_DELEGATE_MAC_H_ -#include "ui/views/accessibility/view_ax_platform_node_delegate.h" - #include <string> +#include "ui/views/accessibility/view_ax_platform_node_delegate.h" + namespace views { // Mac-specific accessibility class for |ViewAXPlatformNodeDelegate|.
diff --git a/ui/views/accessibility/view_ax_platform_node_delegate_mac.mm b/ui/views/accessibility/view_ax_platform_node_delegate_mac.mm index 3935beec..4bab47a 100644 --- a/ui/views/accessibility/view_ax_platform_node_delegate_mac.mm +++ b/ui/views/accessibility/view_ax_platform_node_delegate_mac.mm
@@ -28,29 +28,34 @@ gfx::NativeViewAccessible ViewAXPlatformNodeDelegateMac::GetNSWindow() { auto* widget = view()->GetWidget(); - if (!widget) + if (!widget) { return nil; + } auto* window_host = NativeWidgetMacNSWindowHost::GetFromNativeWindow( widget->GetNativeWindow()); - if (!window_host) + if (!window_host) { return nil; + } return window_host->GetNativeViewAccessibleForNSWindow(); } gfx::NativeViewAccessible ViewAXPlatformNodeDelegateMac::GetParent() const { - if (view()->parent()) + if (view()->parent()) { return ViewAXPlatformNodeDelegate::GetParent(); + } auto* widget = view()->GetWidget(); - if (!widget) + if (!widget) { return nil; + } auto* window_host = NativeWidgetMacNSWindowHost::GetFromNativeWindow( view()->GetWidget()->GetNativeWindow()); - if (!window_host) + if (!window_host) { return nil; + } return window_host->GetNativeViewAccessibleForNSView(); }
diff --git a/ui/views/accessibility/view_ax_platform_node_delegate_unittest.cc b/ui/views/accessibility/view_ax_platform_node_delegate_unittest.cc index 2f9d537f..a12d9d9 100644 --- a/ui/views/accessibility/view_ax_platform_node_delegate_unittest.cc +++ b/ui/views/accessibility/view_ax_platform_node_delegate_unittest.cc
@@ -189,8 +189,9 @@ View* parent_view = widget_->GetRootView()->AddChildView(std::make_unique<View>()); View::Views views{parent_view}; - for (int i = 0; i < 4; i++) + for (int i = 0; i < 4; i++) { views.push_back(parent_view->AddChildView(std::make_unique<View>())); + } return views; } @@ -319,8 +320,9 @@ } void TearDown() override { - if (owner_) + if (owner_) { owner_->CloseNow(); + } ViewAXPlatformNodeDelegateTest::TearDown(); }
diff --git a/ui/views/accessibility/view_ax_platform_node_delegate_win.cc b/ui/views/accessibility/view_ax_platform_node_delegate_win.cc index 504c9be0..dfa5e4c 100644 --- a/ui/views/accessibility/view_ax_platform_node_delegate_win.cc +++ b/ui/views/accessibility/view_ax_platform_node_delegate_win.cc
@@ -46,33 +46,38 @@ gfx::NativeViewAccessible ViewAXPlatformNodeDelegateWin::GetParent() const { // If the View has a parent View, return that View's IAccessible. - if (view()->parent()) + if (view()->parent()) { return ViewAXPlatformNodeDelegate::GetParent(); + } // Otherwise we must be the RootView, get the corresponding Widget // and Window. Widget* widget = view()->GetWidget(); - if (!widget) + if (!widget) { return nullptr; + } aura::Window* window = widget->GetNativeWindow(); - if (!window) + if (!window) { return nullptr; + } // Look for an ancestor window with a Widget, and if found, return // the NativeViewAccessible for its RootView. aura::Window* ancestor_window = GetWindowParentIncludingTransient(window); while (ancestor_window) { Widget* ancestor_widget = Widget::GetWidgetForNativeView(ancestor_window); - if (ancestor_widget && ancestor_widget->GetRootView()) + if (ancestor_widget && ancestor_widget->GetRootView()) { return ancestor_widget->GetRootView()->GetNativeViewAccessible(); + } ancestor_window = GetWindowParentIncludingTransient(ancestor_window); } // If that fails, return the NativeViewAccessible for our owning HWND. HWND hwnd = HWNDForView(view()); - if (!hwnd) + if (!hwnd) { return nullptr; + } IAccessible* parent; if (SUCCEEDED(
diff --git a/ui/views/accessibility/view_ax_platform_node_delegate_win_unittest.cc b/ui/views/accessibility/view_ax_platform_node_delegate_win_unittest.cc index 100715f..6b3d999 100644 --- a/ui/views/accessibility/view_ax_platform_node_delegate_win_unittest.cc +++ b/ui/views/accessibility/view_ax_platform_node_delegate_win_unittest.cc
@@ -54,11 +54,13 @@ // Whether |left| represents the same COM object as |right|. template <typename T, typename U> bool IsSameObject(T* left, U* right) { - if (!left && !right) + if (!left && !right) { return true; + } - if (!left || !right) + if (!left || !right) { return false; + } ComPtr<IUnknown> left_unknown; left->QueryInterface(IID_PPV_ARGS(&left_unknown)); @@ -661,8 +663,9 @@ } void TearDown() override { - if (!widget_->IsClosed()) + if (!widget_->IsClosed()) { widget_->Close(); + } ViewAXPlatformNodeDelegateWinTest::TearDown(); }
diff --git a/ui/views/accessibility/views_utilities_aura.cc b/ui/views/accessibility/views_utilities_aura.cc index d727373..fa2a378a 100644 --- a/ui/views/accessibility/views_utilities_aura.cc +++ b/ui/views/accessibility/views_utilities_aura.cc
@@ -27,8 +27,9 @@ aura::Window* GetWindowParentIncludingTransient(aura::Window* window) { aura::Window* transient_parent = wm::GetTransientParent(window); - if (transient_parent) + if (transient_parent) { return transient_parent; + } return window->parent(); }
diff --git a/ui/views/accessibility/widget_ax_tree_id_map.cc b/ui/views/accessibility/widget_ax_tree_id_map.cc index 3e42076..f8c8a63 100644 --- a/ui/views/accessibility/widget_ax_tree_id_map.cc +++ b/ui/views/accessibility/widget_ax_tree_id_map.cc
@@ -36,8 +36,9 @@ ui::AXTreeID WidgetAXTreeIDMap::GetWidgetTreeID(Widget* widget) { DCHECK(widget); - if (!base::Contains(widget_map_, widget)) + if (!base::Contains(widget_map_, widget)) { return ui::AXTreeIDUnknown(); + } return widget_map_.at(widget); } @@ -46,8 +47,9 @@ std::vector<Widget*> widgets; widgets.reserve(widget_map_.size()); - for (auto iter : widget_map_) + for (auto iter : widget_map_) { widgets.push_back(iter.first); + } return widgets; }
diff --git a/ui/views/accessible_pane_view.cc b/ui/views/accessible_pane_view.cc index ba19985..19f059f6 100644 --- a/ui/views/accessible_pane_view.cc +++ b/ui/views/accessible_pane_view.cc
@@ -62,15 +62,18 @@ } bool AccessiblePaneView::SetPaneFocus(views::View* initial_focus) { - if (!GetVisible()) + if (!GetVisible()) { return false; + } - if (!focus_manager_) + if (!focus_manager_) { focus_manager_ = GetFocusManager(); + } View* focused_view = focus_manager_->GetFocusedView(); - if (focused_view && !ContainsForFocusSearch(this, focused_view)) + if (focused_view && !ContainsForFocusSearch(this, focused_view)) { last_focused_view_tracker_->SetView(focused_view); + } // Use the provided initial focus if it's visible and enabled, otherwise // use the first focusable child. @@ -80,8 +83,9 @@ } // Return false if there are no focusable children. - if (!initial_focus) + if (!initial_focus) { return false; + } focus_manager_->SetFocusedView(initial_focus); @@ -95,8 +99,9 @@ focus_manager_->AdvanceFocusIfNecessary(); // If we already have pane focus, we're done. - if (pane_has_focus_) + if (pane_has_focus_) { return true; + } // Otherwise, set accelerators and start listening for focus change events. pane_has_focus_ = true; @@ -165,17 +170,19 @@ // View overrides: views::FocusTraversable* AccessiblePaneView::GetPaneFocusTraversable() { - if (pane_has_focus_) + if (pane_has_focus_) { return this; - else + } else { return nullptr; + } } bool AccessiblePaneView::AcceleratorPressed( const ui::Accelerator& accelerator) { views::View* focused_view = focus_manager_->GetFocusedView(); - if (!ContainsForFocusSearch(this, focused_view)) + if (!ContainsForFocusSearch(this, focused_view)) { return false; + } // "Previous" and "Next" directions depend on UI direction. bool rtl = base::i18n::IsRTL(); @@ -186,8 +193,9 @@ RemovePaneFocus(); View* last_focused_view = last_focused_view_tracker_->view(); // Ignore |last_focused_view| if it's no longer in the same widget. - if (last_focused_view && GetWidget() != last_focused_view->GetWidget()) + if (last_focused_view && GetWidget() != last_focused_view->GetWidget()) { last_focused_view = nullptr; + } if (last_focused_view) { focus_manager_->SetFocusedViewWithReason( last_focused_view, FocusChangeReason::kFocusRestore); @@ -237,8 +245,9 @@ void AccessiblePaneView::OnDidChangeFocus(views::View* focused_before, views::View* focused_now) { - if (!focused_now) + if (!focused_now) { return; + } views::FocusManager::FocusChangeReason reason = focus_manager_->focus_change_reason();
diff --git a/ui/views/animation/animation_abort_handle.cc b/ui/views/animation/animation_abort_handle.cc index 801ffab..73dde88 100644 --- a/ui/views/animation/animation_abort_handle.cc +++ b/ui/views/animation/animation_abort_handle.cc
@@ -18,13 +18,15 @@ DCHECK_NE(animation_state_, AnimationState::kNotStarted) << "You can't destroy the handle before the animation starts."; - if (observer_) + if (observer_) { observer_->SetAbortHandle(nullptr); + } if (animation_state_ != AnimationState::kEnded) { for (ui::Layer* layer : tracked_layers_) { - if (deleted_layers_.find(layer) != deleted_layers_.end()) + if (deleted_layers_.find(layer) != deleted_layers_.end()) { continue; + } layer->GetAnimator()->AbortAllAnimations(); } @@ -32,8 +34,9 @@ // Remove the abort handle itself from the alive tracked layers. for (ui::Layer* layer : tracked_layers_) { - if (deleted_layers_.find(layer) != deleted_layers_.end()) + if (deleted_layers_.find(layer) != deleted_layers_.end()) { continue; + } layer->RemoveObserver(this); } } @@ -49,8 +52,9 @@ bool inserted = tracked_layers_.insert(layer).second; // In case that one layer is added to the abort handle multiple times. - if (inserted) + if (inserted) { layer->AddObserver(this); + } } void AnimationAbortHandle::OnAnimationStarted() {
diff --git a/ui/views/animation/animation_builder.cc b/ui/views/animation/animation_builder.cc index 4a22f47..22d5fb5 100644 --- a/ui/views/animation/animation_builder.cc +++ b/ui/views/animation/animation_builder.cc
@@ -36,12 +36,14 @@ DCHECK(attached_to_sequence_) << "You must register callbacks and get abort handle before " << "creating a sequence block."; - if (abort_handle_) + if (abort_handle_) { abort_handle_->OnObserverDeleted(); + } base::RepeatingClosure& on_observer_deleted = AnimationBuilder::GetObserverDeletedCallback(); - if (on_observer_deleted) + if (on_observer_deleted) { on_observer_deleted.Run(); + } } void AnimationBuilder::Observer::SetOnStarted(base::OnceClosure callback) { @@ -80,8 +82,9 @@ AnimationAbortHandle::AnimationState::kNotStarted) { abort_handle_->OnAnimationStarted(); } - if (on_started_) + if (on_started_) { std::move(on_started_).Run(); + } } void AnimationBuilder::Observer::SetAbortHandle( @@ -102,15 +105,17 @@ std::move(on_ended_).Run(); } if (abort_handle_ && abort_handle_->animation_state() == - AnimationAbortHandle::AnimationState::kRunning) + AnimationAbortHandle::AnimationState::kRunning) { abort_handle_->OnAnimationEnded(); + } } } void AnimationBuilder::Observer::OnLayerAnimationWillRepeat( ui::LayerAnimationSequence* sequence) { - if (!on_will_repeat_) + if (!on_will_repeat_) { return; + } // First time through, initialize the repeat_map_ with the sequences. if (repeat_map_.empty()) { for (ui::LayerAnimationSequence* seq : attached_sequences()) { @@ -139,14 +144,16 @@ std::move(on_aborted_).Run(); } if (abort_handle_ && abort_handle_->animation_state() == - AnimationAbortHandle::AnimationState::kRunning) + AnimationAbortHandle::AnimationState::kRunning) { abort_handle_->OnAnimationEnded(); + } } void AnimationBuilder::Observer::OnLayerAnimationScheduled( ui::LayerAnimationSequence* sequence) { - if (on_scheduled_) + if (on_scheduled_) { std::move(on_scheduled_).Run(); + } } void AnimationBuilder::Observer::OnAttachedToSequence( @@ -158,8 +165,9 @@ void AnimationBuilder::Observer::OnDetachedFromSequence( ui::LayerAnimationSequence* sequence) { - if (attached_sequences().empty()) + if (attached_sequences().empty()) { delete this; + } } bool AnimationBuilder::Observer::RequiresNotificationWhenAnimatorDestroyed() @@ -202,20 +210,23 @@ // The observer needs to outlive the AnimationBuilder and will manage its own // lifetime. GetAttachedToSequence should not return false here. This is // DCHECKed in the observer’s destructor. - if (animation_observer_ && animation_observer_->GetAttachedToSequence()) + if (animation_observer_ && animation_observer_->GetAttachedToSequence()) { animation_observer_.release(); + } for (auto it = layer_animation_sequences_.begin(); it != layer_animation_sequences_.end();) { auto* const target = it->first; auto end_it = layer_animation_sequences_.upper_bound(target); - if (abort_handle_) + if (abort_handle_) { abort_handle_->AddLayer(target); + } ui::ScopedLayerAnimationSettings settings(target->GetAnimator()); - if (preemption_strategy_) + if (preemption_strategy_) { settings.SetPreemptionStrategy(preemption_strategy_.value()); + } std::vector<ui::LayerAnimationSequence*> sequences; std::transform(it, end_it, std::back_inserter(sequences), [](auto& it) { return it.second.release(); }); @@ -296,8 +307,9 @@ for (auto& pair : values_) { auto sequence = std::make_unique<ui::LayerAnimationSequence>(); sequence->set_is_repeating(repeating); - if (animation_observer_) + if (animation_observer_) { sequence->AddObserver(animation_observer_.get()); + } base::TimeDelta start; ui::LayerAnimationElement::AnimatableProperties properties = @@ -338,8 +350,9 @@ } AnimationBuilder::Observer* AnimationBuilder::GetObserver() { - if (!next_animation_observer_) + if (!next_animation_observer_) { next_animation_observer_ = std::make_unique<Observer>(); + } return next_animation_observer_.get(); } @@ -355,14 +368,16 @@ // Ensure to terminate the current sequence block before touching the // animation sequence observer so that the sequence observer is attached to // the layer animation sequence. - if (current_sequence_) + if (current_sequence_) { current_sequence_.reset(); + } // The observer needs to outlive the AnimationBuilder and will manage its own // lifetime. GetAttachedToSequence should not return false here. This is // DCHECKed in the observer’s destructor. - if (animation_observer_ && animation_observer_->GetAttachedToSequence()) + if (animation_observer_ && animation_observer_->GetAttachedToSequence()) { animation_observer_.release(); + } if (next_animation_observer_) { animation_observer_ = std::move(next_animation_observer_); next_animation_observer_.reset();
diff --git a/ui/views/animation/animation_builder_unittest.cc b/ui/views/animation/animation_builder_unittest.cc index 1933d242..2dff650 100644 --- a/ui/views/animation/animation_builder_unittest.cc +++ b/ui/views/animation/animation_builder_unittest.cc
@@ -91,8 +91,9 @@ animator_controllers_.clear(); AnimationBuilder::SetObserverDeletedCallbackForTesting( base::NullCallback()); - if (expected_observers_deleted_) + if (expected_observers_deleted_) { EXPECT_EQ(expected_observers_deleted_.value(), deleted_observers_); + } } // Call this function to also ensure any implicitly created observers have
diff --git a/ui/views/animation/animation_delegate_views.cc b/ui/views/animation/animation_delegate_views.cc index d03c65a..dc5260bf2 100644 --- a/ui/views/animation/animation_delegate_views.cc +++ b/ui/views/animation/animation_delegate_views.cc
@@ -16,24 +16,28 @@ AnimationDelegateViews::AnimationDelegateViews(View* view, const base::Location& location) : view_(view), location_(location) { - if (view) + if (view) { scoped_observation_.Observe(view); + } } AnimationDelegateViews::~AnimationDelegateViews() { // Reset the delegate so that we don't attempt to notify our observer from // the destructor. - if (container_) + if (container_) { container_->set_observer(nullptr); + } } void AnimationDelegateViews::AnimationContainerWasSet( gfx::AnimationContainer* container) { - if (container_ == container) + if (container_ == container) { return; + } - if (container_) + if (container_) { container_->set_observer(nullptr); + } container_ = container; container_->set_observer(this); @@ -73,8 +77,9 @@ return; } - if (!container_ || container_->has_custom_animation_runner()) + if (!container_ || container_->has_custom_animation_runner()) { return; + } auto compositor_animation_runner = std::make_unique<CompositorAnimationRunner>(view_->GetWidget(), location); @@ -89,8 +94,9 @@ compositor_animation_runner_ = nullptr; // TODO(crbug.com/41457352): make sure the container has a correct // compositor-assisted runner. - if (container_) + if (container_) { container_->SetAnimationRunner(nullptr); + } } } // namespace views
diff --git a/ui/views/animation/bounds_animator.cc b/ui/views/animation/bounds_animator.cc index 41d7c4d..6c4e7b3 100644 --- a/ui/views/animation/bounds_animator.cc +++ b/ui/views/animation/bounds_animator.cc
@@ -38,8 +38,9 @@ // that it won't call AnimationCanceled(). ViewToDataMap data; data.swap(data_); - for (auto& entry : data) + for (auto& entry : data) { CleanupData(false, &entry.second); + } } void BoundsAnimator::AnimateViewTo( @@ -55,8 +56,9 @@ // bounds. if (is_animating && target == data_[view].target_bounds) { // If this animation specifies a different delegate, swap them out. - if (delegate && delegate != data_[view].delegate) + if (delegate && delegate != data_[view].delegate) { SetAnimationDelegate(view, std::move(delegate)); + } return; } @@ -123,10 +125,11 @@ void BoundsAnimator::SetTargetBounds(View* view, const gfx::Rect& target) { const auto i = data_.find(view); - if (i == data_.end()) + if (i == data_.end()) { AnimateViewTo(view, target); - else + } else { i->second.target_bounds = target; + } } gfx::Rect BoundsAnimator::GetTargetBounds(const View* view) const { @@ -150,8 +153,9 @@ void BoundsAnimator::StopAnimatingView(View* view) { const auto i = data_.find(view); - if (i != data_.end()) + if (i != data_.end()) { i->second.animation->Stop(); + } } bool BoundsAnimator::IsAnimating(View* view) const { @@ -163,22 +167,26 @@ } void BoundsAnimator::Complete() { - if (data_.empty()) + if (data_.empty()) { return; + } - while (!data_.empty()) + while (!data_.empty()) { data_.begin()->second.animation->End(); + } // Invoke AnimationContainerProgressed to force a repaint and notify delegate. AnimationContainerProgressed(container_.get()); } void BoundsAnimator::Cancel() { - if (data_.empty()) + if (data_.empty()) { return; + } - while (!data_.empty()) + while (!data_.empty()) { data_.begin()->second.animation->Stop(); + } // Invoke AnimationContainerProgressed to force a repaint and notify delegate. AnimationContainerProgressed(container_.get()); @@ -221,8 +229,9 @@ } void BoundsAnimator::CleanupData(bool send_cancel, Data* data) { - if (send_cancel && data->delegate) + if (send_cancel && data->delegate) { data->delegate->AnimationCanceled(data->animation.get()); + } data->delegate.reset(); @@ -235,8 +244,9 @@ std::unique_ptr<gfx::Animation> BoundsAnimator::ResetAnimationForView( View* view) { const auto i = data_.find(view); - if (i == data_.end()) + if (i == data_.end()) { return nullptr; + } std::unique_ptr<gfx::Animation> old_animation = std::move(i->second.animation); @@ -319,8 +329,9 @@ } } - if (data.delegate) + if (data.delegate) { data.delegate->AnimationProgressed(animation); + } } void BoundsAnimator::AnimationEnded(const gfx::Animation* animation) { @@ -357,8 +368,9 @@ views::View* removed) { DCHECK_EQ(parent_, observed_view); const auto iter = data_.find(removed); - if (iter == data_.end()) + if (iter == data_.end()) { return; + } AnimationCanceled(iter->second.animation.get()); }
diff --git a/ui/views/animation/bounds_animator_unittest.cc b/ui/views/animation/bounds_animator_unittest.cc index d72af98..495d9f6 100644 --- a/ui/views/animation/bounds_animator_unittest.cc +++ b/ui/views/animation/bounds_animator_unittest.cc
@@ -73,10 +73,11 @@ void OnDidSchedulePaint(const gfx::Rect& r) override { ++repaint_count_; - if (dirty_rect_.IsEmpty()) + if (dirty_rect_.IsEmpty()) { dirty_rect_ = r; - else + } else { dirty_rect_.Union(r); + } } const gfx::Rect& dirty_rect() const { return dirty_rect_; } @@ -191,8 +192,9 @@ // Run the message loop; the delegate exits the loop when the animation is // done. - if (use_long_duration) + if (use_long_duration) { task_environment_.FastForwardBy(animation_duration); + } loop.Run(); // Make sure the bounds match of the view that was animated match and the
diff --git a/ui/views/animation/bubble_slide_animator.cc b/ui/views/animation/bubble_slide_animator.cc index 20c5264..8489ede0 100644 --- a/ui/views/animation/bubble_slide_animator.cc +++ b/ui/views/animation/bubble_slide_animator.cc
@@ -81,8 +81,9 @@ const gfx::Rect current_bounds = gfx::Tween::RectValueBetween( value, starting_bubble_bounds_, target_bubble_bounds_); - if (current_bounds == target_bubble_bounds_ && desired_anchor_view_) + if (current_bounds == target_bubble_bounds_ && desired_anchor_view_) { bubble_delegate_->SetAnchorView(desired_anchor_view_); + } bubble_delegate_->GetWidget()->SetBounds(current_bounds); slide_progressed_callbacks_.Notify(this, value);
diff --git a/ui/views/animation/bubble_slide_animator_unittest.cc b/ui/views/animation/bubble_slide_animator_unittest.cc index d4f4ef4..e7e4509 100644 --- a/ui/views/animation/bubble_slide_animator_unittest.cc +++ b/ui/views/animation/bubble_slide_animator_unittest.cc
@@ -97,8 +97,9 @@ void TearDown() override { CloseWidget(); - if (anchor_widget_ && !anchor_widget_->IsClosed()) + if (anchor_widget_ && !anchor_widget_->IsClosed()) { anchor_widget_->CloseNow(); + } test::WidgetTest::TearDown(); }
diff --git a/ui/views/animation/compositor_animation_runner.cc b/ui/views/animation/compositor_animation_runner.cc index 4346598..c211b2d 100644 --- a/ui/views/animation/compositor_animation_runner.cc +++ b/ui/views/animation/compositor_animation_runner.cc
@@ -21,8 +21,9 @@ CompositorAnimationRunner::~CompositorAnimationRunner() { // Make sure we're not observing |compositor_|. - if (widget_) + if (widget_) { OnWidgetDestroying(widget_); + } DCHECK(!compositor_ || !compositor_->HasAnimationObserver(this)); CHECK(!IsInObserverList()); } @@ -32,8 +33,9 @@ } void CompositorAnimationRunner::OnAnimationStep(base::TimeTicks timestamp) { - if (timestamp - last_tick_ < min_interval_) + if (timestamp - last_tick_ < min_interval_) { return; + } last_tick_ = timestamp; Step(last_tick_); @@ -52,8 +54,9 @@ void CompositorAnimationRunner::OnStart(base::TimeDelta min_interval, base::TimeDelta elapsed) { - if (!widget_) + if (!widget_) { return; + } ui::Compositor* current_compositor = widget_->GetCompositor(); if (!current_compositor) { @@ -62,8 +65,9 @@ } if (current_compositor != compositor_) { - if (compositor_ && compositor_->HasAnimationObserver(this)) + if (compositor_ && compositor_->HasAnimationObserver(this)) { compositor_->RemoveAnimationObserver(this); + } compositor_ = current_compositor; } @@ -74,8 +78,9 @@ } void CompositorAnimationRunner::StopInternal() { - if (compositor_ && compositor_->HasAnimationObserver(this)) + if (compositor_ && compositor_->HasAnimationObserver(this)) { compositor_->RemoveAnimationObserver(this); + } min_interval_ = base::TimeDelta::Max(); compositor_ = nullptr;
diff --git a/ui/views/animation/compositor_animation_runner_unittest.cc b/ui/views/animation/compositor_animation_runner_unittest.cc index 67d7f0b..5e98a03 100644 --- a/ui/views/animation/compositor_animation_runner_unittest.cc +++ b/ui/views/animation/compositor_animation_runner_unittest.cc
@@ -36,8 +36,9 @@ EXPECT_TRUE(delegate.container()->has_custom_animation_runner()); interval_timer.Start(FROM_HERE, kDuration, base::BindLambdaForTesting([&]() { - if (animation.is_animating()) + if (animation.is_animating()) { return; + } interval_timer.Stop(); run_loop.Quit(); @@ -104,8 +105,9 @@ EXPECT_TRUE(delegate.container()->has_custom_animation_runner()); interval_timer.Start(FROM_HERE, kDuration, base::BindLambdaForTesting([&]() { - if (animation.is_animating()) + if (animation.is_animating()) { return; + } interval_timer.Stop(); tracker1.Stop(); @@ -130,8 +132,9 @@ EXPECT_TRUE(animation.is_animating()); interval_timer.Start(FROM_HERE, kDuration, base::BindLambdaForTesting([&]() { - if (animation.is_animating()) + if (animation.is_animating()) { return; + } interval_timer.Stop(); tracker2.Stop(); @@ -171,8 +174,9 @@ base::RunLoop run_loop; interval_timer.Start(FROM_HERE, kDuration, base::BindLambdaForTesting([&]() { - if (animation.is_animating()) + if (animation.is_animating()) { return; + } interval_timer.Stop(); run_loop.Quit(); })); @@ -192,8 +196,9 @@ base::RunLoop run_loop; interval_timer.Start(FROM_HERE, kDuration, base::BindLambdaForTesting([&]() { - if (animation.is_animating()) + if (animation.is_animating()) { return; + } interval_timer.Stop(); run_loop.Quit();
diff --git a/ui/views/animation/ink_drop_event_handler.cc b/ui/views/animation/ink_drop_event_handler.cc index a3899c3..f0ff092 100644 --- a/ui/views/animation/ink_drop_event_handler.cc +++ b/ui/views/animation/ink_drop_event_handler.cc
@@ -55,8 +55,9 @@ // state the transition have no visual effect. The call to GetInkDrop() will // lazily create the ink drop when called. Avoid creating the ink drop in // these cases to prevent the creation of unnecessary layers. - if (delegate_->HasInkDrop() || InkDropStateIsVisible(state)) + if (delegate_->HasInkDrop() || InkDropStateIsVisible(state)) { delegate_->GetInkDrop()->AnimateToState(state); + } } ui::LocatedEvent* InkDropEventHandler::GetLastRippleTriggeringEvent() const { @@ -64,8 +65,9 @@ } void InkDropEventHandler::OnGestureEvent(ui::GestureEvent* event) { - if (!host_view_->GetEnabled() || !delegate_->SupportsGestureEvents()) + if (!host_view_->GetEnabled() || !delegate_->SupportsGestureEvents()) { return; + } InkDropState current_ink_drop_state = delegate_->GetInkDrop()->GetTargetInkDropState(); @@ -73,13 +75,15 @@ InkDropState ink_drop_state = InkDropState::HIDDEN; switch (event->type()) { case ui::EventType::kGestureTapDown: - if (current_ink_drop_state == InkDropState::ACTIVATED) + if (current_ink_drop_state == InkDropState::ACTIVATED) { return; + } ink_drop_state = InkDropState::ACTION_PENDING; break; case ui::EventType::kGestureLongPress: - if (current_ink_drop_state == InkDropState::ACTIVATED) + if (current_ink_drop_state == InkDropState::ACTIVATED) { return; + } ink_drop_state = InkDropState::ALTERNATE_ACTION_PENDING; break; case ui::EventType::kGestureLongTap: @@ -88,8 +92,9 @@ case ui::EventType::kGestureEnd: case ui::EventType::kGestureScrollBegin: case ui::EventType::kGestureTapCancel: - if (current_ink_drop_state == InkDropState::ACTIVATED) + if (current_ink_drop_state == InkDropState::ACTIVATED) { return; + } ink_drop_state = InkDropState::HIDDEN; break; default: @@ -159,8 +164,9 @@ void InkDropEventHandler::OnViewBoundsChanged(View* observed_view) { DCHECK_EQ(host_view_, observed_view); - if (delegate_->HasInkDrop()) + if (delegate_->HasInkDrop()) { delegate_->GetInkDrop()->HostSizeChanged(host_view_->size()); + } } void InkDropEventHandler::OnViewFocused(View* observed_view) {
diff --git a/ui/views/animation/ink_drop_highlight.cc b/ui/views/animation/ink_drop_highlight.cc index 5556bd5..6664cd8 100644 --- a/ui/views/animation/ink_drop_highlight.cc +++ b/ui/views/animation/ink_drop_highlight.cc
@@ -120,8 +120,9 @@ ? visible_opacity_ : kHiddenOpacity; views::AnimationBuilder builder; - if (effective_duration.is_positive()) + if (effective_duration.is_positive()) { animation_abort_handle_ = builder.GetAbortHandle(); + } builder .SetPreemptionStrategy( ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET) @@ -141,8 +142,9 @@ gfx::Transform InkDropHighlight::CalculateTransform() const { gfx::Transform transform; // No transform needed for a solid color layer. - if (!layer_delegate_) + if (!layer_delegate_) { return transform; + } transform.Translate(center_point_.x(), center_point_.y()); gfx::Vector2dF layer_offset = layer_delegate_->GetCenteringOffset(); @@ -156,8 +158,9 @@ } void InkDropHighlight::AnimationStartedCallback(AnimationType animation_type) { - if (observer_) + if (observer_) { observer_->AnimationStarted(animation_type); + } } void InkDropHighlight::AnimationEndedCallback( @@ -165,11 +168,13 @@ InkDropAnimationEndedReason reason) { // AnimationEndedCallback() may be invoked when this is being destroyed and // |layer_| may be null. - if (animation_type == AnimationType::kFadeOut && layer_) + if (animation_type == AnimationType::kFadeOut && layer_) { layer_->SetVisible(false); + } - if (observer_) + if (observer_) { observer_->AnimationEnded(animation_type, reason); + } } } // namespace views
diff --git a/ui/views/animation/ink_drop_highlight_unittest.cc b/ui/views/animation/ink_drop_highlight_unittest.cc index 0cff55b1..01f7ff8 100644 --- a/ui/views/animation/ink_drop_highlight_unittest.cc +++ b/ui/views/animation/ink_drop_highlight_unittest.cc
@@ -101,8 +101,9 @@ TEST_F(InkDropHighlightTest, VerifyObserversAreNotified) { // TODO(bruthig): Re-enable! For some reason these tests fail on some win // trunk builds. See crbug.com/731811. - if (!gfx::Animation::ShouldRenderRichAnimation()) + if (!gfx::Animation::ShouldRenderRichAnimation()) { return; + } ink_drop_highlight()->FadeIn(base::Seconds(1)); @@ -149,8 +150,9 @@ TEST_F(InkDropHighlightTest, VerifyObserversAreNotifiedOfPreemptedAnimations) { // TODO(bruthig): Re-enable! For some reason these tests fail on some win // trunk builds. See crbug.com/731811. - if (!gfx::Animation::ShouldRenderRichAnimation()) + if (!gfx::Animation::ShouldRenderRichAnimation()) { return; + } ink_drop_highlight()->FadeIn(base::Seconds(1)); ink_drop_highlight()->FadeOut(base::Seconds(1)); @@ -179,8 +181,9 @@ TEST_F(InkDropHighlightTest, AnimationsAbortedDuringDeletion) { // TODO(bruthig): Re-enable! For some reason these tests fail on some win // trunk builds. See crbug.com/731811. - if (!gfx::Animation::ShouldRenderRichAnimation()) + if (!gfx::Animation::ShouldRenderRichAnimation()) { return; + } ink_drop_highlight()->FadeIn(base::Seconds(1)); DestroyHighlight();
diff --git a/ui/views/animation/ink_drop_impl.cc b/ui/views/animation/ink_drop_impl.cc index 4627304..a977519 100644 --- a/ui/views/animation/ink_drop_impl.cc +++ b/ui/views/animation/ink_drop_impl.cc
@@ -317,26 +317,30 @@ highlight_after_ripple_timer_(nullptr) {} void InkDropImpl::HideHighlightOnRippleHiddenState::ShowOnHoverChanged() { - if (GetInkDrop()->GetTargetInkDropState() != InkDropState::HIDDEN) + if (GetInkDrop()->GetTargetInkDropState() != InkDropState::HIDDEN) { return; + } NoAutoHighlightHiddenState::ShowOnHoverChanged(); } void InkDropImpl::HideHighlightOnRippleHiddenState::OnHoverChanged() { - if (GetInkDrop()->GetTargetInkDropState() != InkDropState::HIDDEN) + if (GetInkDrop()->GetTargetInkDropState() != InkDropState::HIDDEN) { return; + } NoAutoHighlightHiddenState::OnHoverChanged(); } void InkDropImpl::HideHighlightOnRippleHiddenState::ShowOnFocusChanged() { - if (GetInkDrop()->GetTargetInkDropState() != InkDropState::HIDDEN) + if (GetInkDrop()->GetTargetInkDropState() != InkDropState::HIDDEN) { return; + } NoAutoHighlightHiddenState::ShowOnFocusChanged(); } void InkDropImpl::HideHighlightOnRippleHiddenState::OnFocusChanged() { - if (GetInkDrop()->GetTargetInkDropState() != InkDropState::HIDDEN) + if (GetInkDrop()->GetTargetInkDropState() != InkDropState::HIDDEN) { return; + } NoAutoHighlightHiddenState::OnFocusChanged(); } @@ -350,8 +354,9 @@ // issue instead. See https://crbug.com/663335. InkDropImpl* ink_drop = GetInkDrop(); HighlightStateFactory* highlight_state_factory = state_factory(); - if (ink_drop->ink_drop_ripple_) + if (ink_drop->ink_drop_ripple_) { ink_drop->ink_drop_ripple_->SnapToHidden(); + } // |this| may be destroyed after SnapToHidden(), so be sure not to access // |any members. ink_drop->SetHighlightState( @@ -478,26 +483,30 @@ animation_duration) {} void InkDropImpl::ShowHighlightOnRippleVisibleState::ShowOnHoverChanged() { - if (GetInkDrop()->GetTargetInkDropState() != InkDropState::HIDDEN) + if (GetInkDrop()->GetTargetInkDropState() != InkDropState::HIDDEN) { return; + } NoAutoHighlightVisibleState::ShowOnHoverChanged(); } void InkDropImpl::ShowHighlightOnRippleVisibleState::OnHoverChanged() { - if (GetInkDrop()->GetTargetInkDropState() != InkDropState::HIDDEN) + if (GetInkDrop()->GetTargetInkDropState() != InkDropState::HIDDEN) { return; + } NoAutoHighlightVisibleState::OnHoverChanged(); } void InkDropImpl::ShowHighlightOnRippleVisibleState::ShowOnFocusChanged() { - if (GetInkDrop()->GetTargetInkDropState() != InkDropState::HIDDEN) + if (GetInkDrop()->GetTargetInkDropState() != InkDropState::HIDDEN) { return; + } NoAutoHighlightVisibleState::ShowOnFocusChanged(); } void InkDropImpl::ShowHighlightOnRippleVisibleState::OnFocusChanged() { - if (GetInkDrop()->GetTargetInkDropState() != InkDropState::HIDDEN) + if (GetInkDrop()->GetTargetInkDropState() != InkDropState::HIDDEN) { return; + } NoAutoHighlightVisibleState::OnFocusChanged(); } @@ -610,8 +619,9 @@ } InkDropState InkDropImpl::GetTargetInkDropState() const { - if (!ink_drop_ripple_) + if (!ink_drop_ripple_) { return InkDropState::HIDDEN; + } return ink_drop_ripple_->target_ink_drop_state(); } @@ -619,12 +629,14 @@ // Never animate hidden -> hidden, since that will add layers which may never // be needed. Other same-state transitions may restart animations. if (ink_drop_state == InkDropState::HIDDEN && - GetTargetInkDropState() == InkDropState::HIDDEN) + GetTargetInkDropState() == InkDropState::HIDDEN) { return; + } DestroyHiddenTargetedAnimations(); - if (!ink_drop_ripple_) + if (!ink_drop_ripple_) { CreateInkDropRipple(); + } ink_drop_ripple_->AnimateToState(ink_drop_state); } @@ -638,15 +650,17 @@ void InkDropImpl::SnapToActivated() { DestroyHiddenTargetedAnimations(); - if (!ink_drop_ripple_) + if (!ink_drop_ripple_) { CreateInkDropRipple(); + } ink_drop_ripple_->SnapToActivated(); } void InkDropImpl::SnapToHidden() { DestroyHiddenTargetedAnimations(); - if (!ink_drop_ripple_) + if (!ink_drop_ripple_) { return; + } ink_drop_ripple_->SnapToHidden(); } @@ -693,8 +707,9 @@ } void InkDropImpl::DestroyInkDropRipple() { - if (!ink_drop_ripple_) + if (!ink_drop_ripple_) { return; + } // Ensures no observer callback happens from removing from |root_layer_| // or destroying |ink_drop_ripple_|. Speculative fix for crashes in @@ -715,8 +730,9 @@ // If the platform provides HC colors, we need to show them fully on hover and // press. - if (views::UsingPlatformHighContrastInkDrop(ink_drop_host_->host_view())) + if (views::UsingPlatformHighContrastInkDrop(ink_drop_host_->host_view())) { highlight_->set_visible_opacity(1.0f); + } highlight_->set_observer(this); root_layer_->Add(highlight_->layer()); @@ -724,8 +740,9 @@ } void InkDropImpl::DestroyInkDropHighlight() { - if (!highlight_) + if (!highlight_) { return; + } // Ensures no observer callback happens from removing from |root_layer_| // or destroying |highlight_|. Speculative fix for crashes in @@ -767,11 +784,13 @@ InkDropAnimationEndedReason reason) { highlight_state_->AnimationEnded(ink_drop_state, reason); NotifyInkDropRippleAnimationEnded(ink_drop_state); - if (reason != InkDropAnimationEndedReason::SUCCESS) + if (reason != InkDropAnimationEndedReason::SUCCESS) { return; + } // |ink_drop_ripple_| might be null during destruction. - if (!ink_drop_ripple_) + if (!ink_drop_ripple_) { return; + } if (ShouldAnimateToHidden(ink_drop_state)) { ink_drop_ripple_->AnimateToState(views::InkDropState::HIDDEN); } else if (ink_drop_state == views::InkDropState::HIDDEN) { @@ -800,8 +819,9 @@ void InkDropImpl::SetHighlight(bool should_highlight, base::TimeDelta animation_duration) { - if (IsHighlightFadingInOrVisible() == should_highlight) + if (IsHighlightFadingInOrVisible() == should_highlight) { return; + } if (should_highlight) { CreateInkDropHighlight();
diff --git a/ui/views/animation/ink_drop_impl_unittest.cc b/ui/views/animation/ink_drop_impl_unittest.cc index 264b85e..100311f6 100644 --- a/ui/views/animation/ink_drop_impl_unittest.cc +++ b/ui/views/animation/ink_drop_impl_unittest.cc
@@ -198,8 +198,9 @@ TEST_F(InkDropImplTest, LayersRemovedFromHostAfterInkDrop) { // TODO(bruthig): Re-enable! For some reason these tests fail on some win // trunk builds. See crbug.com/731811. - if (!gfx::Animation::ShouldRenderRichAnimation()) + if (!gfx::Animation::ShouldRenderRichAnimation()) { return; + } EXPECT_FALSE(AreLayersAddedToHost()); @@ -508,8 +509,9 @@ TEST_P(InkDropImplHideAutoHighlightTest, DeactivatedAnimatesWhenNotFocused) { // TODO(bruthig): Re-enable! For some reason these tests fail on some win // trunk builds. See crbug.com/731811. - if (!gfx::Animation::ShouldRenderRichAnimation()) + if (!gfx::Animation::ShouldRenderRichAnimation()) { return; + } test_api().SetShouldHighlight(false);
diff --git a/ui/views/animation/ink_drop_ripple.cc b/ui/views/animation/ink_drop_ripple.cc index 6332a484..9a15ca5 100644 --- a/ui/views/animation/ink_drop_ripple.cc +++ b/ui/views/animation/ink_drop_ripple.cc
@@ -51,10 +51,11 @@ void InkDropRipple::SnapToState(InkDropState ink_drop_state) { AbortAllAnimations(); - if (ink_drop_state == InkDropState::ACTIVATED) + if (ink_drop_state == InkDropState::ACTIVATED) { SetStateToActivated(); - else if (ink_drop_state == InkDropState::HIDDEN) + } else if (ink_drop_state == InkDropState::HIDDEN) { SetStateToHidden(); + } target_ink_drop_state_ = ink_drop_state; animation_observer_ = CreateAnimationObserver(ink_drop_state); animation_observer_->SetActive(); @@ -89,20 +90,23 @@ void InkDropRipple::AnimationStartedCallback( InkDropState ink_drop_state, const ui::CallbackLayerAnimationObserver& observer) { - if (observer_) + if (observer_) { observer_->AnimationStarted(ink_drop_state); + } } bool InkDropRipple::AnimationEndedCallback( InkDropState ink_drop_state, const ui::CallbackLayerAnimationObserver& observer) { - if (ink_drop_state == InkDropState::HIDDEN) + if (ink_drop_state == InkDropState::HIDDEN) { SetStateToHidden(); - if (observer_) + } + if (observer_) { observer_->AnimationEnded(ink_drop_state, observer.aborted_count() ? InkDropAnimationEndedReason::PRE_EMPTED : InkDropAnimationEndedReason::SUCCESS); + } // |this| may be deleted! return false; }
diff --git a/ui/views/animation/ink_drop_ripple_unittest.cc b/ui/views/animation/ink_drop_ripple_unittest.cc index 800c449..fd2945c 100644 --- a/ui/views/animation/ink_drop_ripple_unittest.cc +++ b/ui/views/animation/ink_drop_ripple_unittest.cc
@@ -191,8 +191,9 @@ TEST_P(InkDropRippleTest, AnimationsAbortedDuringDeletion) { // TODO(bruthig): Re-enable! For some reason these tests fail on some win // trunk builds. See crbug.com/731811. - if (!gfx::Animation::ShouldRenderRichAnimation()) + if (!gfx::Animation::ShouldRenderRichAnimation()) { return; + } ink_drop_ripple_->AnimateToState(views::InkDropState::ACTION_PENDING); ResetInkDropRipple(); @@ -207,8 +208,9 @@ TEST_P(InkDropRippleTest, VerifyObserversAreNotified) { // TODO(bruthig): Re-enable! For some reason these tests fail on some win // trunk builds. See crbug.com/731811. - if (!gfx::Animation::ShouldRenderRichAnimation()) + if (!gfx::Animation::ShouldRenderRichAnimation()) { return; + } ink_drop_ripple_->AnimateToState(InkDropState::ACTION_PENDING); @@ -239,8 +241,9 @@ TEST_P(InkDropRippleTest, VerifyObserversAreNotifiedOfPreemptedAnimations) { // TODO(bruthig): Re-enable! For some reason these tests fail on some win // trunk builds. See crbug.com/731811. - if (!gfx::Animation::ShouldRenderRichAnimation()) + if (!gfx::Animation::ShouldRenderRichAnimation()) { return; + } ink_drop_ripple_->AnimateToState(InkDropState::ACTION_PENDING); ink_drop_ripple_->AnimateToState(InkDropState::ALTERNATE_ACTION_PENDING); @@ -283,8 +286,9 @@ TEST_P(InkDropRippleTest, SnapToHiddenWithActiveAnimations) { // TODO(bruthig): Re-enable! For some reason these tests fail on some win // trunk builds. See crbug.com/731811. - if (!gfx::Animation::ShouldRenderRichAnimation()) + if (!gfx::Animation::ShouldRenderRichAnimation()) { return; + } ink_drop_ripple_->AnimateToState(views::InkDropState::ACTION_PENDING); EXPECT_TRUE(test_api_->HasActiveAnimations()); @@ -333,8 +337,9 @@ TEST_P(InkDropRippleTest, SnapToActivatedWithActiveAnimations) { // TODO(bruthig): Re-enable! For some reason these tests fail on some win // trunk builds. See crbug.com/731811. - if (!gfx::Animation::ShouldRenderRichAnimation()) + if (!gfx::Animation::ShouldRenderRichAnimation()) { return; + } ink_drop_ripple_->AnimateToState(views::InkDropState::ACTION_PENDING); EXPECT_TRUE(test_api_->HasActiveAnimations()); @@ -372,8 +377,9 @@ EXPECT_EQ(views::InkDropState::ACTION_PENDING, observer_.target_state_at_last_animation_started()); // Animation would end if rich_animation_rendering_mode is disabled. - if (gfx::Animation::ShouldRenderRichAnimation()) + if (gfx::Animation::ShouldRenderRichAnimation()) { EXPECT_FALSE(observer_.AnimationHasEnded()); + } ink_drop_ripple_->AnimateToState(views::InkDropState::HIDDEN); @@ -389,8 +395,9 @@ ink_drop_ripple_->AnimateToState(views::InkDropState::ACTION_PENDING); // Animation would end if rich_animation_rendering_mode is disabled. - if (gfx::Animation::ShouldRenderRichAnimation()) + if (gfx::Animation::ShouldRenderRichAnimation()) { EXPECT_FALSE(observer_.AnimationHasEnded()); + } ink_drop_ripple_->AnimateToState(views::InkDropState::HIDDEN);
diff --git a/ui/views/animation/ink_drop_util.cc b/ui/views/animation/ink_drop_util.cc index 84fd5b9..a1f323a6 100644 --- a/ui/views/animation/ink_drop_util.cc +++ b/ui/views/animation/ink_drop_util.cc
@@ -42,10 +42,12 @@ gfx::Point3F offset = transform_corrected.MapPoint(gfx::Point3F()); offset.Scale(device_scale_factor); - if (!std::isnan(offset.x())) + if (!std::isnan(offset.x())) { DCHECK_LT(std::abs(std::round(offset.x()) - offset.x()), kEpsilon); - if (!std::isnan(offset.y())) + } + if (!std::isnan(offset.y())) { DCHECK_LT(std::abs(std::round(offset.y()) - offset.y()), kEpsilon); + } #endif return subpixel_correction; }
diff --git a/ui/views/animation/scroll_animator.cc b/ui/views/animation/scroll_animator.cc index 5b4959c..5ad8bd4 100644 --- a/ui/views/animation/scroll_animator.cc +++ b/ui/views/animation/scroll_animator.cc
@@ -16,8 +16,9 @@ // Assumes that d0 == 0.0f float GetPosition(float v0, float a, float t) { float max_t = -v0 / a; - if (t > max_t) + if (t > max_t) { t = max_t; + } return t * (v0 + 0.5f * a * t); } @@ -39,8 +40,9 @@ } void ScrollAnimator::Start(float velocity_x, float velocity_y) { - if (acceleration_ >= 0.0f) + if (acceleration_ >= 0.0f) { acceleration_ = kDefaultAcceleration; + } float v = std::max(fabs(velocity_x), fabs(velocity_y)); last_t_ = 0.0f; velocity_x_ = velocity_x * velocity_multiplier_;
diff --git a/ui/views/animation/slide_out_controller.cc b/ui/views/animation/slide_out_controller.cc index bd0aba8..bb1f5d0b 100644 --- a/ui/views/animation/slide_out_controller.cc +++ b/ui/views/animation/slide_out_controller.cc
@@ -39,8 +39,9 @@ SlideOutController::~SlideOutController() = default; void SlideOutController::CaptureControlOpenState() { - if (!has_swipe_control_) + if (!has_swipe_control_) { return; + } if ((mode_ == SlideMode::kFull || mode_ == SlideMode::kPartial) && fabs(gesture_amount_) >= swipe_control_width_) { control_open_state_ = gesture_amount_ < 0 @@ -73,8 +74,9 @@ return; } - if (!event->IsScrollGestureEvent()) + if (!event->IsScrollGestureEvent()) { return; + } if (event->type() == ui::EventType::kGestureScrollBegin) { switch (control_open_state_) { @@ -213,8 +215,9 @@ } void SlideOutController::SetOpacityIfNecessary(float opacity) { - if (update_opacity_) + if (update_opacity_) { delegate_->GetSlideOutLayer()->SetOpacity(opacity); + } opacity_ = opacity; } @@ -258,8 +261,9 @@ !is_completely_slid_out; delegate_->OnSlideChanged(in_progress); - if (!is_completely_slid_out) + if (!is_completely_slid_out) { return; + } // Call SlideOutControllerDelegate::OnSlideOut() if this animation came from // SlideOutAndClose(). @@ -282,8 +286,9 @@ } void SlideOutController::CloseSwipeControl() { - if (!has_swipe_control_) + if (!has_swipe_control_) { return; + } gesture_amount_ = 0; CaptureControlOpenState(); RestoreVisualState();
diff --git a/ui/views/animation/square_ink_drop_ripple.cc b/ui/views/animation/square_ink_drop_ripple.cc index 77d868570..dea2c0f 100644 --- a/ui/views/animation/square_ink_drop_ripple.cc +++ b/ui/views/animation/square_ink_drop_ripple.cc
@@ -272,8 +272,9 @@ } break; case InkDropState::ACTION_PENDING: { - if (old_ink_drop_state == new_ink_drop_state) + if (old_ink_drop_state == new_ink_drop_state) { return; + } DLOG_IF(WARNING, InkDropState::HIDDEN != old_ink_drop_state) << "Invalid InkDropState transition. old_ink_drop_state=" << ToString(old_ink_drop_state) @@ -411,8 +412,9 @@ void SquareInkDropRipple::AbortAllAnimations() { root_layer_.GetAnimator()->AbortAllAnimations(); - for (auto& painted_layer : painted_layers_) + for (auto& painted_layer : painted_layers_) { painted_layer->GetAnimator()->AbortAllAnimations(); + } } void SquareInkDropRipple::SetTransforms(const InkDropTransforms transforms) {
diff --git a/ui/views/animation/test/square_ink_drop_ripple_test_api.cc b/ui/views/animation/test/square_ink_drop_ripple_test_api.cc index ae86240..9e9c64c7 100644 --- a/ui/views/animation/test/square_ink_drop_ripple_test_api.cc +++ b/ui/views/animation/test/square_ink_drop_ripple_test_api.cc
@@ -42,8 +42,9 @@ std::vector<ui::LayerAnimator*> animators = InkDropRippleTestApi::GetLayerAnimators(); animators.push_back(ink_drop_ripple()->GetRootLayer()->GetAnimator()); - for (auto& painted_layer : ink_drop_ripple()->painted_layers_) + for (auto& painted_layer : ink_drop_ripple()->painted_layers_) { animators.push_back(painted_layer->GetAnimator()); + } return animators; }
diff --git a/ui/views/animation/test/test_ink_drop.cc b/ui/views/animation/test/test_ink_drop.cc index 07c9c29a..4ca682c 100644 --- a/ui/views/animation/test/test_ink_drop.cc +++ b/ui/views/animation/test/test_ink_drop.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "ui/views/animation/test/test_ink_drop.h" + #include "ui/gfx/geometry/transform.h" namespace views::test {
diff --git a/ui/views/animation/test/test_ink_drop_animation_observer_helper.h b/ui/views/animation/test/test_ink_drop_animation_observer_helper.h index 14a3675..e27d124 100644 --- a/ui/views/animation/test/test_ink_drop_animation_observer_helper.h +++ b/ui/views/animation/test/test_ink_drop_animation_observer_helper.h
@@ -90,8 +90,9 @@ // Passes *_TRUE assertions when an AnimationStarted() event has NOT been // observed. testing::AssertionResult AnimationHasNotStarted() { - if (last_animation_started_ordinal() < 0) + if (last_animation_started_ordinal() < 0) { return testing::AssertionSuccess(); + } return testing::AssertionFailure() << "Animations were started at ordinal=" << last_animation_started_ordinal() << "."; @@ -110,8 +111,9 @@ // Passes *_TRUE assertions when an AnimationEnded() event has NOT been // observed. testing::AssertionResult AnimationHasNotEnded() { - if (last_animation_ended_ordinal() < 0) + if (last_animation_ended_ordinal() < 0) { return testing::AssertionSuccess(); + } return testing::AssertionFailure() << "Animations were ended at ordinal=" << last_animation_ended_ordinal() << "."; } @@ -142,18 +144,21 @@ : (testing::AssertionFailure() << "Expected != Actual: {"); for (auto eit = expected_contexts.begin(), ait = actual_contexts.begin(); eit != expected_contexts.end() || ait != actual_contexts.end();) { - if (eit != expected_contexts.begin()) + if (eit != expected_contexts.begin()) { result << ", "; + } const bool eexists = eit != expected_contexts.end(); const bool aexists = ait != actual_contexts.end(); const bool item_match = eexists && aexists && *eit == *ait; result << (eexists ? ToString(*eit) : "<none>") << (item_match ? " == " : " != ") << (aexists ? ToString(*ait) : "<none>"); - if (eexists) + if (eexists) { eit++; - if (aexists) + } + if (aexists) { ait++; + } } result << "}"; return result;
diff --git a/ui/views/animation/test/test_ink_drop_host.cc b/ui/views/animation/test/test_ink_drop_host.cc index af383ed2..644348c4 100644 --- a/ui/views/animation/test/test_ink_drop_host.cc +++ b/ui/views/animation/test/test_ink_drop_host.cc
@@ -47,8 +47,9 @@ ~TestInkDropRipple() override = default; test::InkDropRippleTestApi* GetTestApi() override { - if (!test_api_) + if (!test_api_) { test_api_ = std::make_unique<test::SquareInkDropRippleTestApi>(this); + } return test_api_.get(); } @@ -72,8 +73,9 @@ ~TestInkDropHighlight() override = default; test::InkDropHighlightTestApi* GetTestApi() override { - if (!test_api_) + if (!test_api_) { test_api_ = std::make_unique<test::InkDropHighlightTestApi>(this); + } return test_api_.get(); } @@ -99,8 +101,9 @@ [](TestInkDropHost* host) -> std::unique_ptr<views::InkDropHighlight> { auto highlight = std::make_unique<TestInkDropHighlight>( host->size(), 0, gfx::PointF(), SK_ColorBLACK); - if (host->disable_timers_for_test_) + if (host->disable_timers_for_test_) { highlight->GetTestApi()->SetDisableAnimationTimers(true); + } host->num_ink_drop_highlights_created_++; return highlight; }, @@ -110,8 +113,9 @@ auto ripple = std::make_unique<TestInkDropRipple>( InkDrop::Get(host), host->size(), 0, host->size(), 0, gfx::Point(), SK_ColorBLACK, 0.175f); - if (host->disable_timers_for_test_) + if (host->disable_timers_for_test_) { ripple->GetTestApi()->SetDisableAnimationTimers(true); + } host->num_ink_drop_ripples_created_++; return ripple; },
diff --git a/ui/views/animation/widget_fade_animator.cc b/ui/views/animation/widget_fade_animator.cc index f8a71c8c..0f548d4 100644 --- a/ui/views/animation/widget_fade_animator.cc +++ b/ui/views/animation/widget_fade_animator.cc
@@ -17,8 +17,9 @@ WidgetFadeAnimator::~WidgetFadeAnimator() = default; void WidgetFadeAnimator::FadeIn() { - if (IsFadingIn()) + if (IsFadingIn()) { return; + } DCHECK(widget_); @@ -32,24 +33,27 @@ } void WidgetFadeAnimator::CancelFadeIn() { - if (!IsFadingIn()) + if (!IsFadingIn()) { return; + } fade_animation_.Stop(); animation_type_ = FadeType::kNone; } void WidgetFadeAnimator::FadeOut() { - if (IsFadingOut() || !widget_) + if (IsFadingOut() || !widget_) { return; + } // If the widget is already hidden, then there is no current animation and // nothing to do. If the animation is close-on-hide, however, we should still // close the widget. if (!widget_->IsVisible()) { DCHECK(!IsFadingIn()); - if (close_on_hide_) + if (close_on_hide_) { widget_->Close(); + } fade_complete_callbacks_.Notify(this, FadeType::kFadeOut); return; } @@ -60,8 +64,9 @@ } void WidgetFadeAnimator::CancelFadeOut() { - if (!IsFadingOut()) + if (!IsFadingOut()) { return; + } fade_animation_.Stop(); animation_type_ = FadeType::kNone; @@ -78,16 +83,18 @@ double value = gfx::Tween::CalculateValue(tween_type_, animation->GetCurrentValue()); float opacity = 0.0f; - if (IsFadingOut()) + if (IsFadingOut()) { opacity = gfx::Tween::FloatValueBetween(value, 1.0f, 0.0f); - else if (IsFadingIn()) + } else if (IsFadingIn()) { opacity = gfx::Tween::FloatValueBetween(value, 0.0f, 1.0f); + } if (IsFadingOut() && opacity == 0.0f) { - if (close_on_hide_) + if (close_on_hide_) { widget_->Close(); - else + } else { widget_->Hide(); + } } else { widget_->SetOpacity(opacity); }
diff --git a/ui/views/animation/widget_fade_animator_unittest.cc b/ui/views/animation/widget_fade_animator_unittest.cc index e236e98..dcac141 100644 --- a/ui/views/animation/widget_fade_animator_unittest.cc +++ b/ui/views/animation/widget_fade_animator_unittest.cc
@@ -55,8 +55,9 @@ } void TearDown() override { - if (widget_ && !widget_->IsClosed()) + if (widget_ && !widget_->IsClosed()) { widget_->CloseNow(); + } test::WidgetTest::TearDown(); }
diff --git a/ui/views/bubble/bubble_border.cc b/ui/views/bubble/bubble_border.cc index ed266042..8d9c739 100644 --- a/ui/views/bubble/bubble_border.cc +++ b/ui/views/bubble/bubble_border.cc
@@ -224,8 +224,9 @@ color_provider->GetColor(ui::kColorShadowBase), shadow_type); - if (flag_map->find(key) != flag_map->end()) + if (flag_map->find(key) != flag_map->end()) { return flag_map->find(key)->second; + } cc::PaintFlags flags; flags.setColor(color_provider->GetColor(ui::kColorBubbleBorder)); @@ -325,8 +326,9 @@ // If |avoid_shadow_overlap_| is true, the shadow part of the inset is also // applied now, to ensure that the shadow itself doesn't overlap the anchor. - if (avoid_shadow_overlap_) + if (avoid_shadow_overlap_) { contents_bounds.Inset(-shadow_insets); + } // Adjust the contents to align with the arrow. The `anchor_point` is the // point on `anchor_rect` to offset from; it is also used as part of the @@ -341,19 +343,22 @@ // used to position the bubble origin according to |anchor_rect|. DCHECK(shadow_ != NO_SHADOW || insets_.has_value() || shadow_insets.IsEmpty() || visible_arrow_); - if (!avoid_shadow_overlap_) + if (!avoid_shadow_overlap_) { contents_bounds.Inset(-shadow_insets); + } // |arrow_offset_| is used to adjust bubbles that would normally be // partially offscreen. - if (is_arrow_on_horizontal(arrow_)) + if (is_arrow_on_horizontal(arrow_)) { contents_bounds += gfx::Vector2d(-arrow_offset_, 0); - else + } else { contents_bounds += gfx::Vector2d(0, -arrow_offset_); + } // If no visible arrow is shown, return the content bounds. - if (!visible_arrow_) + if (!visible_arrow_) { return contents_bounds; + } // Finally, get the needed movement vector of |contents_bounds| to create the // space needed to place the visible arrow. adjustments because we don't want @@ -448,8 +453,9 @@ view.GetColorProvider(), ShouldDrawStroke(), md_shadow_elevation_, shadow_); - if (visible_arrow_) + if (visible_arrow_) { PaintVisibleArrow(view, canvas); + } } // static @@ -688,8 +694,9 @@ view ? view->GetColorProvider()->GetColor(color_id_) : gfx::kPlaceholderColor; color_ = requested_color_.value_or(computed_color); - if (view) + if (view) { view->SchedulePaint(); + } } void BubbleBorder::PaintNoShadow(const View& view, gfx::Canvas* canvas) {
diff --git a/ui/views/bubble/bubble_dialog_delegate_view.cc b/ui/views/bubble/bubble_dialog_delegate_view.cc index 9871070..8d7beefd 100644 --- a/ui/views/bubble/bubble_dialog_delegate_view.cc +++ b/ui/views/bubble/bubble_dialog_delegate_view.cc
@@ -180,10 +180,11 @@ bubble_params.autosize = bubble->is_autosized(); // Use a window default shadow if the bubble doesn't provides its own. - if (bubble->GetShadow() == BubbleBorder::NO_SHADOW) + if (bubble->GetShadow() == BubbleBorder::NO_SHADOW) { bubble_params.shadow_type = Widget::InitParams::ShadowType::kDefault; - else + } else { bubble_params.shadow_type = Widget::InitParams::ShadowType::kNone; + } gfx::NativeView parent = gfx::NativeView(); if (bubble->has_parent()) { if (bubble->parent_window()) { @@ -254,14 +255,16 @@ auto iter = vector.cend() - 1; bool latest_anchor_bubble_will_change = (*iter == parent_); - if (!latest_anchor_bubble_will_change) + if (!latest_anchor_bubble_will_change) { iter = std::find(vector.cbegin(), iter, parent_); + } DCHECK(iter != vector.cend()); vector.erase(iter); - if (!vector.empty() && latest_anchor_bubble_will_change) + if (!vector.empty() && latest_anchor_bubble_will_change) { vector.back()->NotifyAnchoredBubbleIsPrimary(); + } } const raw_ptr<BubbleDialogDelegate> parent_; @@ -317,8 +320,9 @@ // aura::WindowObserver: void OnWindowTransformed(aura::Window* window, ui::PropertyChangeReason reason) override { - if (window->is_destroying()) + if (window->is_destroying()) { return; + } // Update the anchor bounds when the transform animation is complete, or // when the transform is set without animation. @@ -438,8 +442,9 @@ BubbleDialogDelegate::CloseOnDeactivatePin::~CloseOnDeactivatePin() { Pins* const pins = pins_.get(); - if (pins) + if (pins) { pins->RemovePin(this); + } } BubbleDialogDelegate::BubbleDialogDelegate(View* anchor_view, @@ -661,16 +666,17 @@ } #endif - if (!active) + if (!active) { OnDeactivate(); + } } void BubbleDialogDelegate::OnAnchorWidgetBoundsChanged() { - if (GetBubbleFrameView()) + if (GetBubbleFrameView()) { SizeToContents(); + } } - BubbleBorder::Shadow BubbleDialogDelegate::GetShadow() const { if (!Widget::IsWindowCompositingSupported()) { return BubbleBorder::Shadow::NO_SHADOW; @@ -679,8 +685,9 @@ } View* BubbleDialogDelegate::GetAnchorView() const { - if (!anchor_view_observer_) + if (!anchor_view_observer_) { return nullptr; + } return anchor_view_observer_->anchor_view(); } @@ -688,11 +695,13 @@ // Adding a main image while the bubble is showing is not supported (but // changing it is). Adding an image while it's showing would require a jarring // re-layout. - if (main_image_.IsEmpty()) + if (main_image_.IsEmpty()) { DCHECK(!GetBubbleFrameView()); + } main_image_ = std::move(main_image); - if (GetBubbleFrameView()) + if (GetBubbleFrameView()) { GetBubbleFrameView()->UpdateMainImage(); + } } bool BubbleDialogDelegate::ShouldCloseOnDeactivate() const { @@ -709,40 +718,47 @@ bool visible = GetWidget() && GetWidget()->IsVisible(); // If the Widget is visible, ensure the old highlight (if any) is removed // when the highlighted view changes. - if (visible && highlighted_button != highlighted_button_tracker_.view()) + if (visible && highlighted_button != highlighted_button_tracker_.view()) { UpdateHighlightedButton(false); + } highlighted_button_tracker_.SetView(highlighted_button); - if (visible) + if (visible) { UpdateHighlightedButton(true); + } } void BubbleDialogDelegate::SetArrow(BubbleBorder::Arrow arrow) { SetArrowWithoutResizing(arrow); // If SetArrow() is called before CreateWidget(), there's no need to update // the BubbleFrameView. - if (GetBubbleFrameView()) + if (GetBubbleFrameView()) { SizeToContents(); + } } void BubbleDialogDelegate::SetArrowWithoutResizing(BubbleBorder::Arrow arrow) { - if (base::i18n::IsRTL()) + if (base::i18n::IsRTL()) { arrow = BubbleBorder::horizontal_mirror(arrow); - if (arrow_ == arrow) + } + if (arrow_ == arrow) { return; + } arrow_ = arrow; // If SetArrow() is called before CreateWidget(), there's no need to update // the BubbleFrameView. - if (GetBubbleFrameView()) + if (GetBubbleFrameView()) { GetBubbleFrameView()->SetArrow(arrow); + } } gfx::Rect BubbleDialogDelegate::GetAnchorRect() const { // TODO(tluk) eliminate the need for GetAnchorRect() to return an empty rect // if neither an |anchor_rect_| or an anchor view have been set. View* anchor_view = GetAnchorView(); - if (!anchor_view) + if (!anchor_view) { return anchor_rect_.value_or(gfx::Rect()); + } anchor_rect_ = anchor_view->GetAnchorBoundsInScreen(); @@ -754,9 +770,10 @@ if (anchor_widget_) { gfx::Transform transform = anchor_widget_->GetNativeWindow()->layer()->GetTargetTransform(); - if (!transform.IsIdentity()) + if (!transform.IsIdentity()) { anchor_rect_->Offset( -gfx::ToRoundedVector2d(transform.To2dTranslation())); + } } #endif @@ -765,8 +782,9 @@ BubbleFrameView* frame_view = GetBubbleFrameView(); if (frame_view && frame_view->GetDisplayVisibleArrow()) { gfx::Insets* padding = anchor_view->GetProperty(kInternalPaddingKey); - if (padding != nullptr) + if (padding != nullptr) { anchor_rect_->Inset(*padding); + } } return anchor_rect_.value(); @@ -856,8 +874,9 @@ } void BubbleDialogDelegate::OnAnchorBoundsChanged() { - if (!GetWidget()) + if (!GetWidget()) { return; + } // TODO(pbos): Reconsider whether to update the anchor when the view isn't // drawn. SizeToContents(); @@ -867,8 +886,9 @@ } void BubbleDialogDelegate::UpdateInputProtectorsTimeStamp() { - if (auto* dialog = GetDialogClientView()) + if (auto* dialog = GetDialogClientView()) { dialog->UpdateInputProtectorTimeStamp(); + } GetBubbleFrameView()->UpdateInputProtectorTimeStamp(); } @@ -953,13 +973,15 @@ WidgetDelegate::GetAccessibleWindowRole(); // If the accessible role has been explicitly set to anything else than its // default, use it. The rest translates kWindow to kDialog or kAlertDialog. - if (accessible_role != ax::mojom::Role::kWindow) + if (accessible_role != ax::mojom::Role::kWindow) { return accessible_role; + } // If something in the dialog has initial focus, use the dialog role. // Screen readers understand what to announce when focus moves within one. - if (GetInitiallyFocusedView()) + if (GetInitiallyFocusedView()) { return ax::mojom::Role::kDialog; + } // Otherwise, return |ax::mojom::Role::kAlertDialog| which will make screen // readers announce the contents of the bubble dialog as soon as it appears, @@ -1003,8 +1025,9 @@ anchor_widget_observer_.reset(); } if (GetAnchorView()) { - if (GetAnchorView()->GetProperty(kAnchoredDialogKey) == this) + if (GetAnchorView()->GetProperty(kAnchoredDialogKey) == this) { GetAnchorView()->ClearProperty(kAnchoredDialogKey); + } anchor_view_observer_.reset(); } @@ -1012,8 +1035,9 @@ // change as well. if (!anchor_view || anchor_widget() != anchor_view->GetWidget()) { if (anchor_widget()) { - if (GetWidget() && GetWidget()->IsVisible()) + if (GetWidget() && GetWidget()->IsVisible()) { UpdateHighlightedButton(false); + } anchor_widget_ = nullptr; } if (anchor_view) { @@ -1044,8 +1068,9 @@ void BubbleDialogDelegate::SetAnchorRect(const gfx::Rect& rect) { anchor_rect_ = rect; - if (GetWidget()) + if (GetWidget()) { OnAnchorBoundsChanged(); + } } void BubbleDialogDelegate::SizeToContents() { @@ -1057,12 +1082,14 @@ } void BubbleDialogDelegate::SetSubtitle(const std::u16string& subtitle) { - if (subtitle_ == subtitle) + if (subtitle_ == subtitle) { return; + } subtitle_ = subtitle; BubbleFrameView* frame_view = GetBubbleFrameView(); - if (frame_view) + if (frame_view) { frame_view->UpdateSubtitle(); + } } bool BubbleDialogDelegate::GetSubtitleAllowCharacterBreak() const { @@ -1088,8 +1115,9 @@ ui::kColorBubbleBackground)); } BubbleFrameView* frame_view = GetBubbleFrameView(); - if (frame_view) + if (frame_view) { frame_view->SetBackgroundColor(color()); + } // When there's an opaque layer, the bubble border background won't show // through, so explicitly paint a background color. @@ -1171,8 +1199,9 @@ // It is possible that a view anchors more than one widgets, // but among them there should be at most one widget that is focusable. auto* old_anchored_dialog = anchor_view->GetProperty(kAnchoredDialogKey); - if (old_anchored_dialog && old_anchored_dialog != this) + if (old_anchored_dialog && old_anchored_dialog != this) { DLOG(WARNING) << "|anchor_view| has already anchored a focusable widget."; + } anchor_view->SetProperty(kAnchoredDialogKey, static_cast<DialogDelegate*>(this)); }
diff --git a/ui/views/bubble/bubble_dialog_delegate_view_interactive_uitest_aura.cc b/ui/views/bubble/bubble_dialog_delegate_view_interactive_uitest_aura.cc index 601618e..6cdbec9 100644 --- a/ui/views/bubble/bubble_dialog_delegate_view_interactive_uitest_aura.cc +++ b/ui/views/bubble/bubble_dialog_delegate_view_interactive_uitest_aura.cc
@@ -2,13 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/views/bubble/bubble_dialog_delegate_view.h" - #include "base/functional/bind.h" #include "base/functional/callback.h" #include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/aura/window.h" +#include "ui/views/bubble/bubble_dialog_delegate_view.h" #include "ui/views/buildflags.h" #include "ui/views/test/widget_activation_waiter.h" #include "ui/views/test/widget_test.h" @@ -51,8 +50,9 @@ #if BUILDFLAG(ENABLE_DESKTOP_AURA) // Create DesktopNativeWidgetAura for toplevel widgets, NativeWidgetAura // otherwise. - if (!params.parent) + if (!params.parent) { return new DesktopNativeWidgetAura(delegate); + } #endif // BUILDFLAG(ENABLE_DESKTOP_AURA) return new NativeWidgetAura(delegate); }
diff --git a/ui/views/bubble/bubble_dialog_model_host.cc b/ui/views/bubble/bubble_dialog_model_host.cc index 55f02b1..f4fe730 100644 --- a/ui/views/bubble/bubble_dialog_model_host.cc +++ b/ui/views/bubble/bubble_dialog_model_host.cc
@@ -1006,16 +1006,18 @@ // TODO(pbos): Try to prevent uses of GetInitiallyFocusedView() after Close() // and turn this in to a DCHECK for |model_| existence. This should fix // https://crbug.com/1130181 for now. - if (!model_) + if (!model_) { return BubbleDialogDelegate::GetInitiallyFocusedView(); + } // TODO(pbos): Reconsider the uniqueness requirement, maybe this should select // the first one? If so add corresponding GetFirst query to DialogModel. ui::ElementIdentifier unique_id = model_->initially_focused_field(DialogModelHost::GetPassKey()); - if (!unique_id) + if (!unique_id) { return BubbleDialogDelegate::GetInitiallyFocusedView(); + } if (ui::DialogModel::Button* const ok_button = model_->ok_button(DialogModelHost::GetPassKey()); @@ -1216,8 +1218,9 @@ void BubbleDialogModelHost::OnWindowClosing() { // If the model has been removed we have already notified it of closing on the // ::Close() stack. - if (!model_) + if (!model_) { return; + } model_->OnDialogDestroying(DialogModelHost::GetPassKey()); // TODO(pbos): Do we need to reset `model_` and destroy contents? See Close(). }
diff --git a/ui/views/bubble/bubble_frame_view.cc b/ui/views/bubble/bubble_frame_view.cc index 96226ae..331840f 100644 --- a/ui/views/bubble/bubble_frame_view.cc +++ b/ui/views/bubble/bubble_frame_view.cc
@@ -60,8 +60,9 @@ int GetOverflowLength(const gfx::Rect& available_bounds, const gfx::Rect& window_bounds, bool vertical) { - if (available_bounds.IsEmpty() || available_bounds.Contains(window_bounds)) + if (available_bounds.IsEmpty() || available_bounds.Contains(window_bounds)) { return 0; + } // window_bounds // +---------------------------------+ @@ -71,9 +72,10 @@ // | +------------------+ | // | bottom | // +---------------------------------+ - if (vertical) + if (vertical) { return std::max(0, available_bounds.y() - window_bounds.y()) + std::max(0, window_bounds.bottom() - available_bounds.bottom()); + } return std::max(0, available_bounds.x() - window_bounds.x()) + std::max(0, window_bounds.right() - available_bounds.right()); } @@ -108,8 +110,9 @@ auto minimize = CreateMinimizeButton(base::BindRepeating( [](BubbleFrameView* view, const ui::Event& event) { - if (view->input_protector_.IsPossiblyUnintendedInteraction(event)) + if (view->input_protector_.IsPossiblyUnintendedInteraction(event)) { return; + } view->GetWidget()->Minimize(); }, this)); @@ -119,8 +122,9 @@ auto close = CreateCloseButton(base::BindRepeating( [](BubbleFrameView* view, const ui::Event& event) { - if (view->input_protector_.IsPossiblyUnintendedInteraction(event)) + if (view->input_protector_.IsPossiblyUnintendedInteraction(event)) { return; + } view->GetWidget()->CloseWithReason( Widget::ClosedReason::kCloseButtonClicked); }, @@ -246,18 +250,22 @@ #if !BUILDFLAG(IS_WIN) // Windows will automatically create a tooltip for the button based on // the HTCLOSE or the HTMINBUTTON - if (close_->GetVisible() && close_->GetMirroredBounds().Contains(point)) + if (close_->GetVisible() && close_->GetMirroredBounds().Contains(point)) { return HTCLOSE; - if (minimize_->GetVisible() && minimize_->GetMirroredBounds().Contains(point)) + } + if (minimize_->GetVisible() && + minimize_->GetMirroredBounds().Contains(point)) { return HTMINBUTTON; + } #endif // Convert to RRectF to accurately represent the rounded corners of the // dialog and allow events to pass through the shadows. gfx::RRectF round_contents_bounds(gfx::RectF(GetContentsBounds()), bubble_border_->corner_radius()); - if (bubble_border_->shadow() != BubbleBorder::NO_SHADOW) + if (bubble_border_->shadow() != BubbleBorder::NO_SHADOW) { round_contents_bounds.Outset(BubbleBorder::kBorderThicknessDip); + } gfx::RectF rectf_point(point.x(), point.y(), 1, 1); if (!round_contents_bounds.Contains(rectf_point)) { return HTTRANSPARENT; @@ -283,15 +291,17 @@ void BubbleFrameView::GetWindowMask(const gfx::Size& size, SkPath* window_mask) { if (bubble_border_->shadow() != BubbleBorder::STANDARD_SHADOW && - bubble_border_->shadow() != BubbleBorder::NO_SHADOW) + bubble_border_->shadow() != BubbleBorder::NO_SHADOW) { return; + } // We don't return a mask for windows with arrows unless they use // BubbleBorder::NO_SHADOW. if (bubble_border_->shadow() != BubbleBorder::NO_SHADOW && bubble_border_->arrow() != BubbleBorder::NONE && - bubble_border_->arrow() != BubbleBorder::FLOAT) + bubble_border_->arrow() != BubbleBorder::FLOAT) { return; + } // Use a window mask roughly matching the border in the image assets. const int kBorderStrokeSize = @@ -708,8 +718,9 @@ void BubbleFrameView::SetBubbleBorder(std::unique_ptr<BubbleBorder> border) { bubble_border_ = border.get(); - if (footnote_container_) + if (footnote_container_) { footnote_container_->SetCornerRadius(border->corner_radius()); + } // Update the background, which relies on the border. First set it to null to // avoid dangling pointers, and then update it. @@ -923,8 +934,9 @@ GetWidget()->widget_delegate()->AsBubbleDialogDelegate(); if (bubble_delegate_view) { views::View* const anchor_view = bubble_delegate_view->GetAnchorView(); - if (anchor_view && anchor_view->GetWidget()) + if (anchor_view && anchor_view->GetWidget()) { return anchor_view->GetWidget()->GetWindowBoundsInScreen(); + } } return gfx::Rect(); } @@ -1006,8 +1018,9 @@ preferred_arrow_adjustment_ == PreferredArrowAdjustment::kOffset); gfx::Rect window_bounds(bubble_border_->GetBounds(anchor_rect, client_size)); - if (available_bounds.IsEmpty() || available_bounds.Contains(window_bounds)) + if (available_bounds.IsEmpty() || available_bounds.Contains(window_bounds)) { return; + } // Calculate off-screen adjustment. const bool is_horizontal = BubbleBorder::is_arrow_on_horizontal(arrow); @@ -1017,10 +1030,11 @@ // offset the window to fit as much of it in the available bounds as // possible without exiting the other side of the available bounds. if (window_bounds.width() > available_bounds.width()) { - if (window_bounds.x() < available_bounds.x()) + if (window_bounds.x() < available_bounds.x()) { offscreen_adjust = available_bounds.right() - window_bounds.right(); - else + } else { offscreen_adjust = available_bounds.x() - window_bounds.x(); + } } else if (window_bounds.x() < available_bounds.x()) { offscreen_adjust = available_bounds.x() - window_bounds.x(); } else if (window_bounds.right() > available_bounds.right()) { @@ -1028,10 +1042,11 @@ } } else { if (window_bounds.height() > available_bounds.height()) { - if (window_bounds.y() < available_bounds.y()) + if (window_bounds.y() < available_bounds.y()) { offscreen_adjust = available_bounds.bottom() - window_bounds.bottom(); - else + } else { offscreen_adjust = available_bounds.y() - window_bounds.y(); + } } else if (window_bounds.y() < available_bounds.y()) { offscreen_adjust = available_bounds.y() - window_bounds.y(); } else if (window_bounds.bottom() > available_bounds.bottom()) { @@ -1074,8 +1089,9 @@ // Only account for footnote_container_'s height if it's visible, because // content_margins_ adds extra padding even if all child views are invisible. - if (footnote_container_ && footnote_container_->GetVisible()) + if (footnote_container_ && footnote_container_->GetVisible()) { size.Enlarge(0, footnote_container_->GetHeightForWidth(size.width())); + } if (main_image_->GetVisible()) { size.set_height(
diff --git a/ui/views/bubble/footnote_container_view.cc b/ui/views/bubble/footnote_container_view.cc index ad77259037..65ca5f7 100644 --- a/ui/views/bubble/footnote_container_view.cc +++ b/ui/views/bubble/footnote_container_view.cc
@@ -71,8 +71,9 @@ void FootnoteContainerView::SetCornerRadius(float corner_radius) { corner_radius_ = corner_radius; - if (GetWidget()) + if (GetWidget()) { ResetBackground(); + } } void FootnoteContainerView::OnThemeChanged() { @@ -87,8 +88,9 @@ } void FootnoteContainerView::ResetBackground() { - if (!GetWidget()) + if (!GetWidget()) { return; + } SkColor background_color = GetColorProvider()->GetColor(ui::kColorBubbleFooterBackground); SetBackground(std::make_unique<HalfRoundedRectBackground>(background_color, @@ -96,8 +98,9 @@ } void FootnoteContainerView::ResetBorder() { - if (!GetWidget()) + if (!GetWidget()) { return; + } SetBorder(CreateSolidSidedBorder( gfx::Insets::TLBR(1, 0, 0, 0), GetColorProvider()->GetColor(ui::kColorBubbleFooterBorder)));
diff --git a/ui/views/bubble/info_bubble.cc b/ui/views/bubble/info_bubble.cc index 753fb14..f5aebd1 100644 --- a/ui/views/bubble/info_bubble.cc +++ b/ui/views/bubble/info_bubble.cc
@@ -85,8 +85,9 @@ void InfoBubble::Hide() { Widget* widget = GetWidget(); - if (widget && !widget->IsClosed()) + if (widget && !widget->IsClosed()) { widget->Close(); + } } std::unique_ptr<NonClientFrameView> InfoBubble::CreateNonClientFrameView( @@ -103,8 +104,9 @@ gfx::Size InfoBubble::CalculatePreferredSize( const SizeBounds& available_size) const { - if (preferred_width_ == 0) + if (preferred_width_ == 0) { return BubbleDialogDelegateView::CalculatePreferredSize(available_size); + } int pref_width = preferred_width_; pref_width -= frame_->GetInsets().width(); @@ -116,14 +118,16 @@ void InfoBubble::OnWidgetBoundsChanged(Widget* widget, const gfx::Rect& new_bounds) { BubbleDialogDelegateView::OnWidgetBoundsChanged(widget, new_bounds); - if (anchor_widget() == widget) + if (anchor_widget() == widget) { frame_->set_available_bounds(widget->GetWindowBoundsInScreen()); + } } void InfoBubble::UpdatePosition() { Widget* const widget = GetWidget(); - if (!widget) + if (!widget) { return; + } if (anchor_widget()->IsVisible() && !GetAnchorView()->GetVisibleBounds().IsEmpty()) {
diff --git a/ui/views/bubble/tooltip_icon.cc b/ui/views/bubble/tooltip_icon.cc index 45336de2..d9030fa 100644 --- a/ui/views/bubble/tooltip_icon.cc +++ b/ui/views/bubble/tooltip_icon.cc
@@ -135,8 +135,9 @@ } void TooltipIcon::ShowBubble() { - if (bubble_) + if (bubble_) { return; + } SetDrawAsHovered(true); @@ -160,8 +161,9 @@ } void TooltipIcon::HideBubble() { - if (bubble_) + if (bubble_) { bubble_->Hide(); + } } void TooltipIcon::OnWidgetDestroyed(Widget* widget) {
diff --git a/ui/views/button_drag_utils.cc b/ui/views/button_drag_utils.cc index 3a81a1b..e7e139e 100644 --- a/ui/views/button_drag_utils.cc +++ b/ui/views/button_drag_utils.cc
@@ -114,10 +114,11 @@ button->SetBoundsRect(gfx::Rect(size)); gfx::Vector2d press_point; - if (press_pt) + if (press_pt) { press_point = press_pt->OffsetFromOrigin(); - else + } else { press_point = gfx::Vector2d(size.width() / 2, size.height() / 2); + } SkBitmap bitmap; float raster_scale = ScaleFactorForDragFromWidget(drag_widget.get());
diff --git a/ui/views/cascading_property.h b/ui/views/cascading_property.h index 6177ac0c..1e5ffc6 100644 --- a/ui/views/cascading_property.h +++ b/ui/views/cascading_property.h
@@ -34,10 +34,12 @@ View* view, const ui::ClassProperty<CascadingProperty<T>*>* property_key) { const CascadingProperty<T>* property = view->GetProperty(property_key); - if (property != nullptr) + if (property != nullptr) { return property; - if (!view->parent()) + } + if (!view->parent()) { return nullptr; + } return GetCascadingPropertyObject(view->parent(), property_key); }
diff --git a/ui/views/cocoa/bridged_native_widget_interactive_uitest.mm b/ui/views/cocoa/bridged_native_widget_interactive_uitest.mm index d99ffa0..74b4a11b 100644 --- a/ui/views/cocoa/bridged_native_widget_interactive_uitest.mm +++ b/ui/views/cocoa/bridged_native_widget_interactive_uitest.mm
@@ -2,12 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "components/remote_cocoa/app_shim/native_widget_ns_window_bridge.h" - #import <Cocoa/Cocoa.h> #import "base/mac/mac_util.h" #include "base/run_loop.h" +#import "components/remote_cocoa/app_shim/native_widget_ns_window_bridge.h" #import "ui/base/cocoa/nswindow_test_util.h" #include "ui/base/hit_test.h" #include "ui/base/test/ui_controls.h"
diff --git a/ui/views/cocoa/bridged_native_widget_unittest.mm b/ui/views/cocoa/bridged_native_widget_unittest.mm index 101500c3..d87f9eb5 100644 --- a/ui/views/cocoa/bridged_native_widget_unittest.mm +++ b/ui/views/cocoa/bridged_native_widget_unittest.mm
@@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "components/remote_cocoa/app_shim/native_widget_ns_window_bridge.h" - #import <Cocoa/Cocoa.h> #include <objc/runtime.h> @@ -22,6 +20,7 @@ #include "base/test/task_environment.h" #import "components/remote_cocoa/app_shim/bridged_content_view.h" #import "components/remote_cocoa/app_shim/native_widget_mac_nswindow.h" +#import "components/remote_cocoa/app_shim/native_widget_ns_window_bridge.h" #import "components/remote_cocoa/app_shim/views_nswindow_delegate.h" #import "testing/gtest_mac.h" #include "ui/base/cocoa/find_pasteboard.h" @@ -46,10 +45,10 @@ #include "ui/views/widget/widget_observer.h" using base::ASCIIToUTF16; -using base::SysNSStringToUTF8; using base::SysNSStringToUTF16; -using base::SysUTF8ToNSString; +using base::SysNSStringToUTF8; using base::SysUTF16ToNSString; +using base::SysUTF8ToNSString; #define EXPECT_EQ_RANGE(a, b) \ EXPECT_EQ(a.location, b.location); \ @@ -145,8 +144,9 @@ composition.selection = gfx::Range(caret_pos); composition.text = composition_text; client->SetCompositionText(composition); - if (caret_range) + if (caret_range) { *caret_range = NSMakeRange(caret_pos, 0); + } } // Returns a zero width rectangle corresponding to current caret position. @@ -186,8 +186,8 @@ // Uses the NSTextInputClient protocol to extract a substring from |view|. NSString* GetViewStringForRange(NSView<NSTextInputClient>* view, NSRange range) { - return [[view attributedSubstringForProposedRange:range actualRange:nullptr] - string]; + return [[view attributedSubstringForProposedRange:range + actualRange:nullptr] string]; } // The behavior of NSTextView for RTL strings is buggy for some move and select @@ -483,8 +483,9 @@ init_params.bounds = bounds_; init_params.shadow_type = shadow_type_; - if (native_widget_mac_) + if (native_widget_mac_) { native_widget_mac_->GetWidget()->Init(std::move(init_params)); + } } void TearDown() override { @@ -500,8 +501,9 @@ } NSWindow* bridge_window() const { - if (auto* bridge = native_widget_mac_->GetInProcessNSWindowBridge()) + if (auto* bridge = native_widget_mac_->GetInProcessNSWindowBridge()) { return bridge->ns_window(); + } return nil; } @@ -783,8 +785,9 @@ bool BridgedNativeWidgetTest::HandleKeyEvent(Textfield* sender, const ui::KeyEvent& key_event) { - if (handle_key_event_callback_) + if (handle_key_event_callback_) { return handle_key_event_callback_.Run(sender, key_event); + } return false; } @@ -889,8 +892,9 @@ // Bail out early for selection-modifying commands that are buggy in // Cocoa, since the selected text will not match. - if (test_case.is_rtl && i != j && IsRTLSelectBuggy(sel)) + if (test_case.is_rtl && i != j && IsRTLSelectBuggy(sel)) { continue; + } PerformCommand(sel); EXPECT_NSEQ(GetExpectedSelectedText(), GetActualSelectedText()); @@ -1486,8 +1490,9 @@ // doCommandBySelector: (it calls -insertText: directly instead). [selectors addObjectsFromArray:kMiscActions]; - for (NSString* selector in selectors) + for (NSString* selector in selectors) { [ns_view_ doCommandBySelector:NSSelectorFromString(selector)]; + } [ns_view_ insertText:@""]; }
diff --git a/ui/views/cocoa/cocoa_mouse_capture_unittest.mm b/ui/views/cocoa/cocoa_mouse_capture_unittest.mm index bc59e54..b3a0ba2 100644 --- a/ui/views/cocoa/cocoa_mouse_capture_unittest.mm +++ b/ui/views/cocoa/cocoa_mouse_capture_unittest.mm
@@ -2,10 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "components/remote_cocoa/app_shim/mouse_capture.h" - #import <Cocoa/Cocoa.h> +#import "components/remote_cocoa/app_shim/mouse_capture.h" #import "components/remote_cocoa/app_shim/mouse_capture_delegate.h" #import "ui/base/test/cocoa_helper.h" #import "ui/events/test/cocoa_test_event_utils.h"
diff --git a/ui/views/cocoa/drag_drop_client_mac.mm b/ui/views/cocoa/drag_drop_client_mac.mm index 476fd01..29e4f187 100644 --- a/ui/views/cocoa/drag_drop_client_mac.mm +++ b/ui/views/cocoa/drag_drop_client_mac.mm
@@ -109,11 +109,10 @@ source_operation_ = ui::DragDropTypes::NSDragOperationToDragOperation( sender.draggingSourceOperationMask); } - last_operation_ = - drop_helper_.OnDragOver(*exchange_data_, - LocationInView(sender.draggingLocation, - sender.draggingDestinationWindow), - source_operation_); + last_operation_ = drop_helper_.OnDragOver( + *exchange_data_, + LocationInView(sender.draggingLocation, sender.draggingDestinationWindow), + source_operation_); return ui::DragDropTypes::DragOperationToNSDragOperation(last_operation_); } @@ -133,14 +132,16 @@ is_drag_source_ = false; // Allow a test to invoke EndDrag() without spinning the nested run loop. - if (!quit_closure_.is_null()) + if (!quit_closure_.is_null()) { std::move(quit_closure_).Run(); + } } void DragDropClientMac::DragExit() { drop_helper_.OnDragExit(); - if (!is_drag_source_) + if (!is_drag_source_) { exchange_data_.reset(); + } } gfx::Point DragDropClientMac::LocationInView(NSPoint point) const {
diff --git a/ui/views/cocoa/drag_drop_client_mac_unittest.mm b/ui/views/cocoa/drag_drop_client_mac_unittest.mm index 7801c16b..8fa96d3 100644 --- a/ui/views/cocoa/drag_drop_client_mac_unittest.mm +++ b/ui/views/cocoa/drag_drop_client_mac_unittest.mm
@@ -105,13 +105,13 @@ } - (void) -enumerateDraggingItemsWithOptions:(NSDraggingItemEnumerationOptions)enumOpts - forView:(NSView*)view - classes:(NSArray*)classArray - searchOptions:(NSDictionary*)searchOptions - usingBlock:(void (^)(NSDraggingItem* draggingItem, - NSInteger idx, - BOOL* stop))block { + enumerateDraggingItemsWithOptions:(NSDraggingItemEnumerationOptions)enumOpts + forView:(NSView*)view + classes:(NSArray*)classArray + searchOptions:(NSDictionary*)searchOptions + usingBlock:(void (^)(NSDraggingItem* draggingItem, + NSInteger idx, + BOOL* stop))block { } - (void)resetSpringLoading { @@ -215,8 +215,9 @@ void TearDown() override { target_ = nullptr; - if (widget_) + if (widget_) { widget_->CloseNow(); + } WidgetTest::TearDown(); }
diff --git a/ui/views/cocoa/fullscreen_controller_unittest.cc b/ui/views/cocoa/fullscreen_controller_unittest.cc index 822e8c8..99baf18 100644 --- a/ui/views/cocoa/fullscreen_controller_unittest.cc +++ b/ui/views/cocoa/fullscreen_controller_unittest.cc
@@ -2,9 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/remote_cocoa/app_shim/native_widget_ns_window_fullscreen_controller.h" - #include "base/test/task_environment.h" +#include "components/remote_cocoa/app_shim/native_widget_ns_window_fullscreen_controller.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/ui/views/cocoa/native_widget_mac_ns_window_host.mm b/ui/views/cocoa/native_widget_mac_ns_window_host.mm index 65f84a6..f7ddd05 100644 --- a/ui/views/cocoa/native_widget_mac_ns_window_host.mm +++ b/ui/views/cocoa/native_widget_mac_ns_window_host.mm
@@ -287,8 +287,9 @@ NativeWidgetMacNSWindowHost* NativeWidgetMacNSWindowHost::GetFromId( uint64_t bridged_native_widget_id) { auto found = GetIdToWidgetHostImplMap().find(bridged_native_widget_id); - if (found == GetIdToWidgetHostImplMap().end()) + if (found == GetIdToWidgetHostImplMap().end()) { return nullptr; + } return found->second; } @@ -348,8 +349,9 @@ gfx::NativeViewAccessible NativeWidgetMacNSWindowHost::GetNativeViewAccessibleForNSView() const { - if (in_process_ns_window_bridge_) + if (in_process_ns_window_bridge_) { return in_process_ns_window_bridge_->ns_view(); + } return remote_view_accessible_; } @@ -370,10 +372,12 @@ remote_cocoa::mojom::NativeWidgetNSWindow* NativeWidgetMacNSWindowHost::GetNSWindowMojo() const { - if (remote_ns_window_remote_) + if (remote_ns_window_remote_) { return remote_ns_window_remote_.get(); - if (in_process_ns_window_bridge_) + } + if (in_process_ns_window_bridge_) { return in_process_ns_window_bridge_.get(); + } return nullptr; } @@ -438,8 +442,9 @@ Widget* widget = GetWidget(); widget_type_ = params.type; bool is_tooltip = params.type == Widget::InitParams::TYPE_TOOLTIP; - if (!is_tooltip) + if (!is_tooltip) { tooltip_manager_ = std::make_unique<TooltipManagerMac>(GetNSWindowMojo()); + } is_headless_mode_window_ = params.ShouldInitAsHeadless(); if (params.workspace.length()) { @@ -500,22 +505,25 @@ widget->GetMinimumSize()); // Widgets for UI controls (usually layered above web contents) start visible. - if (widget_type_ == Widget::InitParams::TYPE_CONTROL) + if (widget_type_ == Widget::InitParams::TYPE_CONTROL) { SetVisibilityState(WindowVisibilityState::kShowInactive); + } } void NativeWidgetMacNSWindowHost::CloseWindowNow() { bool is_out_of_process = !in_process_ns_window_bridge_; // Note that CloseWindowNow may delete |this| for in-process windows. - if (GetNSWindowMojo()) + if (GetNSWindowMojo()) { GetNSWindowMojo()->CloseWindowNow(); + } // If it is out-of-process, then simulate the calls that would have been // during window closure. if (is_out_of_process) { OnWindowWillClose(); - while (!children_.empty()) + while (!children_.empty()) { children_.front()->CloseWindowNow(); + } OnWindowHasClosed(); } } @@ -584,10 +592,11 @@ // called until the current transition completes). target_fullscreen_state_ = fullscreen; - if (target_fullscreen_state_) + if (target_fullscreen_state_) { GetNSWindowMojo()->EnterFullscreen(target_display_id); - else + } else { GetNSWindowMojo()->ExitFullscreen(); + } } void NativeWidgetMacNSWindowHost::SetRootView(views::View* root_view) { @@ -637,16 +646,18 @@ // frames for screenshooting and screencasting. UpdateCompositorProperties(); layer()->SetVisible(is_visible_); - if (is_visible_ || is_headless_mode_window_) + if (is_visible_ || is_headless_mode_window_) { compositor_->Unsuspend(); + } // Register the CGWindowID (used to identify this window for video capture) // when it is received. Note that this is done at this moment (as opposed to // as a callback to CreateWindow) so that we can associate the CGWindowID with // the (now existing) compositor. auto lambda = [](NativeWidgetMacNSWindowHost* host, uint32_t cg_window_id) { - if (!host->compositor_) + if (!host->compositor_) { return; + } host->scoped_cg_window_id_ = std::make_unique<remote_cocoa::ScopedCGWindowID>( cg_window_id, host->compositor_->compositor()->frame_sink_id()); @@ -656,8 +667,9 @@ } void NativeWidgetMacNSWindowHost::UpdateCompositorProperties() { - if (!compositor_) + if (!compositor_) { return; + } layer()->SetBounds(gfx::Rect(content_bounds_in_screen_.size())); // Mac device scale factor is always an integer so the result here is an // integer pixel size. @@ -678,16 +690,18 @@ layer()->CompleteAllAnimations(); } DestroyLayer(); - if (!compositor_) + if (!compositor_) { return; + } compositor_->widget()->ResetNSView(); compositor_->compositor()->SetRootLayer(nullptr); compositor_.reset(); } bool NativeWidgetMacNSWindowHost::SetWindowTitle(const std::u16string& title) { - if (window_title_ == title) + if (window_title_ == title) { return false; + } window_title_ = title; GetNSWindowMojo()->SetWindowTitle(window_title_); return true; @@ -706,8 +720,9 @@ bool NativeWidgetMacNSWindowHost::RedispatchKeyEvent(NSEvent* event) { // If the target window is in-process, then redispatch the event directly, // and give an accurate return value. - if (in_process_ns_window_bridge_) + if (in_process_ns_window_bridge_) { return in_process_ns_window_bridge_->RedispatchKeyEvent(event); + } // If the target window is out of process then always report the event as // handled (because it should never be handled in this process). @@ -720,8 +735,9 @@ } gfx::Rect NativeWidgetMacNSWindowHost::GetRestoredBounds() const { - if (target_fullscreen_state_ || in_fullscreen_transition_) + if (target_fullscreen_state_ || in_fullscreen_transition_) { return window_bounds_before_fullscreen_; + } return window_bounds_in_screen_; } @@ -732,24 +748,27 @@ void NativeWidgetMacNSWindowHost::SetNativeWindowProperty(const char* name, void* value) { - if (value) + if (value) { native_window_properties_[name] = value; - else + } else { native_window_properties_.erase(name); + } } void* NativeWidgetMacNSWindowHost::GetNativeWindowProperty( const char* name) const { auto found = native_window_properties_.find(name); - if (found == native_window_properties_.end()) + if (found == native_window_properties_.end()) { return nullptr; + } return found->second; } void NativeWidgetMacNSWindowHost::SetParent( NativeWidgetMacNSWindowHost* new_parent) { - if (new_parent == parent_) + if (new_parent == parent_) { return; + } if (parent_) { auto found = base::ranges::find(parent_->children_, this); @@ -842,16 +861,19 @@ View* view, std::vector<NSView*>* order) const { auto found = attached_native_view_host_views_.find(view); - if (found != attached_native_view_host_views_.end()) + if (found != attached_native_view_host_views_.end()) { order->push_back(found->second); - for (View* child : view->children()) + } + for (View* child : view->children()) { GetAttachedNativeViewHostViewsRecursive(child, order); + } } void NativeWidgetMacNSWindowHost::UpdateLocalWindowFrame( const gfx::Rect& frame) { - if (!remote_ns_window_remote_) + if (!remote_ns_window_remote_) { return; + } [in_process_ns_window_ setFrame:gfx::ScreenRectToNSRect(frame) display:NO animate:NO]; @@ -888,8 +910,9 @@ NativeWidgetMacNSWindowHost::AddEventMonitor( NativeWidgetMacEventMonitor::Client* client) { // Enable the local event monitor if this is the first registered monitor. - if (event_monitors_.empty()) + if (event_monitors_.empty()) { GetNSWindowMojo()->SetLocalEventMonitorEnabled(true); + } // Add the new monitor to `event_monitors_`. auto* monitor = new NativeWidgetMacEventMonitor(client); @@ -898,16 +921,18 @@ // Set up `monitor`'s remove closure to remove it from `event_monitors_`. auto remove_lambda = [](base::WeakPtr<NativeWidgetMacNSWindowHost> weak_this, NativeWidgetMacEventMonitor* monitor) { - if (!weak_this) + if (!weak_this) { return; + } auto found = base::ranges::find(weak_this->event_monitors_, monitor); CHECK(found != weak_this->event_monitors_.end()); weak_this->event_monitors_.erase(found); // If this was the last monitor to be removed, disable the local // event monitor. - if (weak_this->event_monitors_.empty()) + if (weak_this->event_monitors_.empty()) { weak_this->GetNSWindowMojo()->SetLocalEventMonitorEnabled(false); + } }; monitor->remove_closure_runner_.ReplaceClosure( base::BindOnce(remove_lambda, weak_factory_.GetWeakPtr(), monitor)); @@ -1003,8 +1028,9 @@ // but may not be destroyed before |this| is destroyed, which would violate // tear-down assumptions). This would have been done by the bridge, had it // shut down cleanly. - while (!children_.empty()) + while (!children_.empty()) { children_.front()->OnApplicationHostDestroying(host); + } OnWindowHasClosed(); } @@ -1093,12 +1119,14 @@ for (auto* event_monitor : event_monitors_snapshot) { // Ensure `event_monitor` was not removed from `event_monitors_` by a // previous call to NativeWidgetMacEventMonitorOnEvent. - if (!base::Contains(event_monitors_, event_monitor)) + if (!base::Contains(event_monitors_, event_monitor)) { continue; + } event_monitor->client_->NativeWidgetMacEventMonitorOnEvent(event.get(), event_handled); - if (!weak_this) + if (!weak_this) { return true; + } } return true; } @@ -1130,8 +1158,9 @@ } views::FocusManager* focus_manager = root_view_->GetWidget()->GetFocusManager(); - if (focus_manager) + if (focus_manager) { focus_manager->SetKeyboardAccessible(enabled); + } } void NativeWidgetMacNSWindowHost::OnIsFirstResponderChanged( @@ -1190,12 +1219,14 @@ } views::View* target = root_view_->GetEventHandlerForPoint(location_in_content); - if (!target) + if (!target) { return; + } views::WordLookupClient* word_lookup_client = target->GetWordLookupClient(); - if (!word_lookup_client) + if (!word_lookup_client) { return; + } gfx::Point location_in_target = location_in_content; views::View::ConvertPointToTarget(root_view_, target, &location_in_target); @@ -1263,8 +1294,9 @@ in_fullscreen_transition_ = true; // If going into fullscreen, store an answer for GetRestoredBounds(). - if (target_fullscreen_state) + if (target_fullscreen_state) { window_bounds_before_fullscreen_ = window_bounds_in_screen_; + } // Notify that fullscreen state is changing. native_widget_mac_->OnWindowFullscreenTransitionStart(); @@ -1344,8 +1376,9 @@ } // Explicitly set the keyboard accessibility state on regaining key // window status. - if (is_key && is_content_first_responder) + if (is_key && is_content_first_responder) { SetKeyboardAccessible(full_keyboard_access_enabled); + } accessibility_focus_overrider_.SetWindowIsKey(is_key); is_window_key_ = is_key; native_widget_mac_->OnWindowKeyStatusChanged(is_key, @@ -1459,9 +1492,10 @@ *can_window_close = true; views::NonClientView* non_client_view = root_view_ ? root_view_->GetWidget()->non_client_view() : nullptr; - if (non_client_view) + if (non_client_view) { *can_window_close = non_client_view->OnWindowCloseRequested() == CloseRequestResult::kCanClose; + } return true; } @@ -1775,8 +1809,9 @@ // NativeWidgetMacNSWindowHost, AcceleratedWidgetMac: void NativeWidgetMacNSWindowHost::AcceleratedWidgetCALayerParamsUpdated() { - if (const auto* ca_layer_params = compositor_->widget()->GetCALayerParams()) + if (const auto* ca_layer_params = compositor_->widget()->GetCALayerParams()) { GetNSWindowMojo()->SetCALayerParams(*ca_layer_params); + } } ////////////////////////////////////////////////////////////////////////////////
diff --git a/ui/views/cocoa/native_window_tracker_cocoa.h b/ui/views/cocoa/native_window_tracker_cocoa.h index f2c0eec..84f1c99 100644 --- a/ui/views/cocoa/native_window_tracker_cocoa.h +++ b/ui/views/cocoa/native_window_tracker_cocoa.h
@@ -5,10 +5,9 @@ #ifndef UI_VIEWS_COCOA_NATIVE_WINDOW_TRACKER_COCOA_H_ #define UI_VIEWS_COCOA_NATIVE_WINDOW_TRACKER_COCOA_H_ -#include "ui/views/native_window_tracker.h" - #include <memory> +#include "ui/views/native_window_tracker.h" #include "ui/views/views_export.h" namespace views {
diff --git a/ui/views/cocoa/text_input_host.mm b/ui/views/cocoa/text_input_host.mm index f8105c3..d3df1ee7 100644 --- a/ui/views/cocoa/text_input_host.mm +++ b/ui/views/cocoa/text_input_host.mm
@@ -28,8 +28,9 @@ // Set up default return values, to be returned in case of unusual cases. gfx::Rect default_rect; *actual_range = gfx::Range::InvalidRange(); - if (!client) + if (!client) { return default_rect; + } default_rect = client->GetCaretBounds(); default_rect.set_width(0); @@ -58,8 +59,9 @@ const bool request_is_composition_end = from == composition_range.length(); const size_t first_index = request_is_composition_end ? from - 1 : from; gfx::Rect union_rect; - if (!client->GetCompositionCharacterBounds(first_index, &union_rect)) + if (!client->GetCompositionCharacterBounds(first_index, &union_rect)) { return default_rect; + } // If requested_range is empty, return a zero width rectangle corresponding to // it. @@ -105,8 +107,9 @@ std::u16string substring; gfx::Range text_range; *actual_range = gfx::Range::InvalidRange(); - if (!client || !client->GetTextRange(&text_range)) + if (!client || !client->GetTextRange(&text_range)) { return substring; + } // gfx::Range::Intersect() behaves a bit weirdly. If B is an empty range // contained inside a non-empty range A, B intersection A returns @@ -118,8 +121,9 @@ // This is a special case for which the complete string should should be // returned. NSTextView also follows this, though the same is not mentioned in // NSTextInputClient documentation. - if (!requested_range.IsValid()) + if (!requested_range.IsValid()) { *actual_range = text_range; + } client->GetTextFromRange(*actual_range, &substring); return substring; @@ -204,16 +208,18 @@ // If the textInputClient_ does not exist, return nil since this view does not // conform to NSTextInputClient protocol. - if (!pending_text_input_client_) + if (!pending_text_input_client_) { return true; + } // If a menu is active, and -[NSView interpretKeyEvents:] asks for the // input context, return nil. This ensures the action message is sent to // the view, rather than any NSTextInputClient a subview has installed. bool has_menu_controller = false; host_impl_->GetHasMenuController(&has_menu_controller); - if (has_menu_controller) + if (has_menu_controller) { return true; + } // When not in an editable mode, or while entering passwords // (http://crbug.com/23219), we don't want to show IME candidate windows. @@ -246,18 +252,21 @@ bool TextInputHost::GetSelectionText(bool* out_result, std::u16string* out_text) { *out_result = false; - if (!text_input_client_) + if (!text_input_client_) { return true; + } gfx::Range selection_range; - if (!text_input_client_->GetEditableSelectionRange(&selection_range)) + if (!text_input_client_->GetEditableSelectionRange(&selection_range)) { return true; + } *out_result = text_input_client_->GetTextFromRange(selection_range, out_text); return true; } void TextInputHost::InsertText(const std::u16string& text, bool as_character) { - if (!text_input_client_) + if (!text_input_client_) { return; + } if (as_character) { // If a single character is inserted by keyDown's call to // interpretKeyEvents: then use InsertChar() to allow editing events to be @@ -276,16 +285,18 @@ } void TextInputHost::DeleteRange(const gfx::Range& range) { - if (!text_input_client_) + if (!text_input_client_) { return; + } text_input_client_->DeleteRange(range); } void TextInputHost::SetCompositionText(const std::u16string& text, const gfx::Range& selected_range, const gfx::Range& replacement_range) { - if (!text_input_client_) + if (!text_input_client_) { return; + } text_input_client_->DeleteRange(replacement_range); ui::CompositionText composition; @@ -307,25 +318,29 @@ } void TextInputHost::ConfirmCompositionText() { - if (!text_input_client_) + if (!text_input_client_) { return; + } text_input_client_->ConfirmCompositionText(/* keep_selection */ false); } bool TextInputHost::HasCompositionText(bool* out_has_composition_text) { *out_has_composition_text = false; - if (!text_input_client_) + if (!text_input_client_) { return true; + } *out_has_composition_text = text_input_client_->HasCompositionText(); return true; } bool TextInputHost::GetCompositionTextRange(gfx::Range* out_composition_range) { *out_composition_range = gfx::Range::InvalidRange(); - if (!text_input_client_) + if (!text_input_client_) { return true; - if (!text_input_client_->HasCompositionText()) + } + if (!text_input_client_->HasCompositionText()) { return true; + } text_input_client_->GetCompositionTextRange(out_composition_range); return true; }
diff --git a/ui/views/cocoa/tooltip_manager_mac.h b/ui/views/cocoa/tooltip_manager_mac.h index 33b054b0..b98a080 100644 --- a/ui/views/cocoa/tooltip_manager_mac.h +++ b/ui/views/cocoa/tooltip_manager_mac.h
@@ -5,9 +5,8 @@ #ifndef UI_VIEWS_COCOA_TOOLTIP_MANAGER_MAC_H_ #define UI_VIEWS_COCOA_TOOLTIP_MANAGER_MAC_H_ -#include "ui/views/widget/tooltip_manager.h" - #include "base/memory/raw_ptr.h" +#include "ui/views/widget/tooltip_manager.h" namespace remote_cocoa::mojom { class NativeWidgetNSWindow;
diff --git a/ui/views/color_chooser/color_chooser_unittest.cc b/ui/views/color_chooser/color_chooser_unittest.cc index 84ed469..197eb858 100644 --- a/ui/views/color_chooser/color_chooser_unittest.cc +++ b/ui/views/color_chooser/color_chooser_unittest.cc
@@ -92,8 +92,9 @@ SkColor GetTextualColor() const { std::u16string text = chooser_->textfield_for_testing()->GetText(); - if (text.empty() || text[0] != '#') + if (text.empty() || text[0] != '#') { return SK_ColorTRANSPARENT; + } uint32_t color; return base::HexStringToUInt(base::UTF16ToUTF8(text.substr(1)), &color)
diff --git a/ui/views/color_chooser/color_chooser_view.cc b/ui/views/color_chooser/color_chooser_view.cc index 3c7f973..2601805 100644 --- a/ui/views/color_chooser/color_chooser_view.cc +++ b/ui/views/color_chooser/color_chooser_view.cc
@@ -60,14 +60,16 @@ } bool GetColorFromText(const std::u16string& text, SkColor* result) { - if (text.size() != 6 && !(text.size() == 7 && text[0] == '#')) + if (text.size() != 6 && !(text.size() == 7 && text[0] == '#')) { return false; + } std::string input = base::UTF16ToUTF8((text.size() == 6) ? text : text.substr(1)); std::array<uint8_t, 3> hex; - if (!base::HexStringToSpan(input, hex)) + if (!base::HexStringToSpan(input, hex)) { return false; + } *result = SkColorSetRGB(hex[0], hex[1], hex[2]); return true; @@ -123,10 +125,11 @@ SkColor4f::FromColor(end_color)}; SkPoint points[2]; points[0].iset(0, 0); - if (is_horizontal) + if (is_horizontal) { points[1].iset(rect.width() + 1, 0); - else + } else { points[1].iset(0, rect.height() + 1); + } cc::PaintFlags flags; flags.setShader(cc::PaintShader::MakeLinearGradient(points, colors, nullptr, 2, SkTileMode::kClamp)); @@ -324,16 +327,18 @@ void SaturationValueView::OnSaturationValueChanged(SkScalar saturation, SkScalar value) { - if (saturation_ == saturation && value_ == value) + if (saturation_ == saturation && value_ == value) { return; + } saturation_ = saturation; value_ = value; SkScalar scalar_size = SkIntToScalar(kSaturationValueSize - 1); int x = SkScalarFloorToInt(saturation * scalar_size) + kBorderWidth; int y = SkScalarFloorToInt((SK_Scalar1 - value) * scalar_size) + kBorderWidth; - if (gfx::Point(x, y) == marker_position_) + if (gfx::Point(x, y) == marker_position_) { return; + } marker_position_.set_x(x); marker_position_.set_y(y); @@ -420,10 +425,11 @@ } void SelectedColorPatchView::SetColor(SkColor color) { - if (!background()) + if (!background()) { SetBackground(CreateSolidBackground(color)); - else + } else { background()->SetNativeControlColor(color); + } SchedulePaint(); }
diff --git a/ui/views/context_menu_controller.cc b/ui/views/context_menu_controller.cc index 0a2e7db11..fcda4415 100644 --- a/ui/views/context_menu_controller.cc +++ b/ui/views/context_menu_controller.cc
@@ -18,8 +18,9 @@ const gfx::Point& point, ui::mojom::MenuSourceType source_type) { // Use a boolean flag to early-exit out of re-entrant behavior. - if (is_opening_) + if (is_opening_) { return; + } is_opening_ = true; // We might get deleted while showing the context menu (including as a result @@ -29,8 +30,9 @@ ShowContextMenuForViewImpl(source, point, source_type); - if (!weak_ptr) + if (!weak_ptr) { return; + } is_opening_ = false; }
diff --git a/ui/views/controls/animated_image_view.cc b/ui/views/controls/animated_image_view.cc index 5450101..8610d55 100644 --- a/ui/views/controls/animated_image_view.cc +++ b/ui/views/controls/animated_image_view.cc
@@ -53,8 +53,9 @@ void AnimatedImageView::Play( std::optional<lottie::Animation::PlaybackConfig> playback_config) { DCHECK(animated_image_); - if (state_ == State::kPlaying) + if (state_ == State::kPlaying) { return; + } state_ = State::kPlaying; @@ -75,8 +76,9 @@ } void AnimatedImageView::Stop() { - if (state_ == State::kStopped) + if (state_ == State::kStopped) { return; + } DCHECK(animated_image_); ClearCurrentCompositor(); @@ -92,8 +94,9 @@ void AnimatedImageView::OnPaint(gfx::Canvas* canvas) { View::OnPaint(canvas); - if (!animated_image_) + if (!animated_image_) { return; + } canvas->Save(); gfx::Vector2d translation = GetImageBounds().origin().OffsetFromOrigin(); @@ -118,8 +121,9 @@ ClearCurrentCompositor(); // Restore the Play() state with the new compositor. - if (state_ == State::kPlaying) + if (state_ == State::kPlaying) { SetCompositorFromWidget(); + } } }
diff --git a/ui/views/controls/animated_image_view_unittest.cc b/ui/views/controls/animated_image_view_unittest.cc index 95eb88c..2f778e45 100644 --- a/ui/views/controls/animated_image_view_unittest.cc +++ b/ui/views/controls/animated_image_view_unittest.cc
@@ -31,14 +31,16 @@ const T* FindPaintOp(const cc::PaintRecord& paint_record, cc::PaintOpType paint_op_type) { for (const cc::PaintOp& op : paint_record) { - if (op.GetType() == paint_op_type) + if (op.GetType() == paint_op_type) { return static_cast<const T*>(&op); + } if (op.GetType() == cc::PaintOpType::kDrawRecord) { const T* record_op_result = FindPaintOp<T>( static_cast<const cc::DrawRecordOp&>(op).record, paint_op_type); - if (record_op_result) + if (record_op_result) { return static_cast<const T*>(record_op_result); + } } } return nullptr;
diff --git a/ui/views/controls/bulleted_label_list/bulleted_label_list_view.cc b/ui/views/controls/bulleted_label_list/bulleted_label_list_view.cc index 7d743f0..9c1fe4b2 100644 --- a/ui/views/controls/bulleted_label_list/bulleted_label_list_view.cc +++ b/ui/views/controls/bulleted_label_list/bulleted_label_list_view.cc
@@ -24,7 +24,7 @@ namespace { class BulletView : public View { - METADATA_HEADER(BulletView, View) + METADATA_HEADER(BulletView, View) public: explicit BulletView(size_t line_height); @@ -99,4 +99,3 @@ END_METADATA } // namespace views -
diff --git a/ui/views/controls/button/button.cc b/ui/views/controls/button/button.cc index 99835f95..a2503ba 100644 --- a/ui/views/controls/button/button.cc +++ b/ui/views/controls/button/button.cc
@@ -172,8 +172,9 @@ // static Button* Button::AsButton(views::View* view) { - if (view && view->GetProperty(kIsButtonProperty)) + if (view && view->GetProperty(kIsButtonProperty)) { return static_cast<Button*>(view); + } return nullptr; } @@ -435,15 +436,17 @@ Button::KeyClickAction Button::GetKeyClickActionForEvent( const ui::KeyEvent& event) { - if (event.key_code() == ui::VKEY_SPACE) + if (event.key_code() == ui::VKEY_SPACE) { return PlatformStyle::kKeyClickActionOnSpace; + } // Note that default buttons also have VKEY_RETURN installed as an accelerator // in LabelButton::SetIsDefault(). On platforms where // PlatformStyle::kReturnClicksFocusedControl, the logic here will take // precedence over that. if (event.key_code() == ui::VKEY_RETURN && - PlatformStyle::kReturnClicksFocusedControl) + PlatformStyle::kReturnClicksFocusedControl) { return KeyClickAction::kOnKeyPress; + } return KeyClickAction::kNone; } @@ -467,16 +470,18 @@ } View::ConvertPointToScreen(this, &menu_position); - if (base::i18n::IsRTL()) + if (base::i18n::IsRTL()) { menu_position.Offset(-kMenuOffset.x(), kMenuOffset.y()); - else + } else { menu_position += kMenuOffset; + } DCHECK(GetWidget()); const int max_x_coordinate = GetWidget()->GetWorkAreaBoundsInScreen().right() - 1; - if (max_x_coordinate && max_x_coordinate <= menu_position.x()) + if (max_x_coordinate && max_x_coordinate <= menu_position.x()) { menu_position.set_x(max_x_coordinate - 1); + } return menu_position; } @@ -631,8 +636,9 @@ } void Button::ViewHierarchyChanged(const ViewHierarchyChangedDetails& details) { - if (!details.is_add && state_ != STATE_DISABLED && details.child == this) + if (!details.is_add && state_ != STATE_DISABLED && details.child == this) { SetState(STATE_NORMAL); + } View::ViewHierarchyChanged(details); } @@ -784,8 +790,9 @@ } void Button::OnEnabledChanged() { - if (GetEnabled() ? (state_ != STATE_DISABLED) : (state_ == STATE_DISABLED)) + if (GetEnabled() ? (state_ != STATE_DISABLED) : (state_ == STATE_DISABLED)) { return; + } if (GetEnabled()) { bool should_enter_hover_state = ShouldEnterHoveredState();
diff --git a/ui/views/controls/button/button_controller.cc b/ui/views/controls/button/button_controller.cc index 897562e..0acec72 100644 --- a/ui/views/controls/button/button_controller.cc +++ b/ui/views/controls/button/button_controller.cc
@@ -21,8 +21,9 @@ ButtonController::~ButtonController() = default; bool ButtonController::OnMousePressed(const ui::MouseEvent& event) { - if (button_->GetState() == Button::STATE_DISABLED) + if (button_->GetState() == Button::STATE_DISABLED) { return true; + } if (button_->GetState() != Button::STATE_PRESSED && button_controller_delegate_->ShouldEnterPushedState(event) && button_->HitTestPoint(event.location())) { @@ -55,8 +56,9 @@ } } } - if (notify_action_ == ButtonController::NotifyAction::kOnRelease) + if (notify_action_ == ButtonController::NotifyAction::kOnRelease) { button_controller_delegate_->OnClickCanceled(event); + } } void ButtonController::OnMouseMoved(const ui::MouseEvent& event) { @@ -68,20 +70,23 @@ } void ButtonController::OnMouseEntered(const ui::MouseEvent& event) { - if (button_->GetState() != Button::STATE_DISABLED) + if (button_->GetState() != Button::STATE_DISABLED) { button_->SetState(Button::STATE_HOVERED); + } } void ButtonController::OnMouseExited(const ui::MouseEvent& event) { // Starting a drag results in a MouseExited, we need to ignore it. if (button_->GetState() != Button::STATE_DISABLED && - !button_controller_delegate_->InDrag()) + !button_controller_delegate_->InDrag()) { button_->SetState(Button::STATE_NORMAL); + } } bool ButtonController::OnKeyPressed(const ui::KeyEvent& event) { - if (button_->GetState() == Button::STATE_DISABLED) + if (button_->GetState() == Button::STATE_DISABLED) { return false; + } switch (button_->GetKeyClickActionForEvent(event)) { case Button::KeyClickAction::kOnKeyRelease: @@ -107,8 +112,9 @@ const bool click_button = button_->GetState() == Button::STATE_PRESSED && button_->GetKeyClickActionForEvent(event) == Button::KeyClickAction::kOnKeyRelease; - if (!click_button) + if (!click_button) { return false; + } button_->SetState(Button::STATE_NORMAL); button_controller_delegate_->NotifyClick(event); @@ -116,8 +122,9 @@ } void ButtonController::OnGestureEvent(ui::GestureEvent* event) { - if (button_->GetState() == Button::STATE_DISABLED) + if (button_->GetState() == Button::STATE_DISABLED) { return; + } if (event->type() == ui::EventType::kGestureTap && button_controller_delegate_->IsTriggerableEvent(*event)) {
diff --git a/ui/views/controls/button/button_unittest.cc b/ui/views/controls/button/button_unittest.cc index ba0137e9..550711a 100644 --- a/ui/views/controls/button/button_unittest.cc +++ b/ui/views/controls/button/button_unittest.cc
@@ -97,8 +97,9 @@ ~TestButton() override = default; KeyClickAction GetKeyClickActionForEvent(const ui::KeyEvent& event) override { - if (custom_key_click_action_ == KeyClickAction::kNone) + if (custom_key_click_action_ == KeyClickAction::kNone) { return Button::GetKeyClickActionForEvent(event); + } return custom_key_click_action_; } @@ -805,8 +806,9 @@ public: VisibilityTestButton() : TestButton(false) {} ~VisibilityTestButton() override { - if (layer()) + if (layer()) { ADD_FAILURE(); + } } void AddLayerToRegion(ui::Layer* layer, views::LayerRegion region) override {
diff --git a/ui/views/controls/button/checkbox.cc b/ui/views/controls/button/checkbox.cc index 0617b178..82a28cbd 100644 --- a/ui/views/controls/button/checkbox.cc +++ b/ui/views/controls/button/checkbox.cc
@@ -47,7 +47,7 @@ constexpr gfx::Size kCheckboxInkDropSize = gfx::Size(24, 24); constexpr float kCheckboxIconDipSize = 16; constexpr int kCheckboxIconCornerRadius = 2; -} +} // namespace class Checkbox::FocusRingHighlightPathGenerator : public views::HighlightPathGenerator { @@ -152,8 +152,9 @@ Checkbox::~Checkbox() = default; void Checkbox::SetChecked(bool checked) { - if (GetChecked() == checked) + if (GetChecked() == checked) { return; + } checked_ = checked; UpdateImage(); OnPropertyChanged(&checked_, kPropertyEffectsNone); @@ -172,8 +173,9 @@ } void Checkbox::SetMultiLine(bool multi_line) { - if (GetMultiLine() == multi_line) + if (GetMultiLine() == multi_line) { return; + } label()->SetMultiLine(multi_line); // TODO(pkasting): Remove this and forward callback subscriptions to the // underlying label property when Label is converted to properties.
diff --git a/ui/views/controls/button/image_button.cc b/ui/views/controls/button/image_button.cc index 84516bd..7bf9aeab 100644 --- a/ui/views/controls/button/image_button.cc +++ b/ui/views/controls/button/image_button.cc
@@ -66,8 +66,9 @@ void ImageButton::SetImageModel(ButtonState for_state, const ui::ImageModel& image_model) { - if (for_state == STATE_HOVERED) + if (for_state == STATE_HOVERED) { SetAnimateOnStateChange(!image_model.IsEmpty()); + } const gfx::Size old_preferred_size = GetPreferredSize({}); images_[for_state] = image_model; @@ -102,15 +103,17 @@ } void ImageButton::SetImageHorizontalAlignment(HorizontalAlignment h_alignment) { - if (GetImageHorizontalAlignment() == h_alignment) + if (GetImageHorizontalAlignment() == h_alignment) { return; + } h_alignment_ = h_alignment; OnPropertyChanged(&h_alignment_, kPropertyEffectsPaint); } void ImageButton::SetImageVerticalAlignment(VerticalAlignment v_alignment) { - if (GetImageVerticalAlignment() == v_alignment) + if (GetImageVerticalAlignment() == v_alignment) { return; + } v_alignment_ = v_alignment; OnPropertyChanged(&v_alignment_, kPropertyEffectsPaint); } @@ -120,8 +123,9 @@ } void ImageButton::SetMinimumImageSize(const gfx::Size& size) { - if (GetMinimumImageSize() == size) + if (GetMinimumImageSize() == size) { return; + } minimum_image_size_ = size; OnPropertyChanged(&minimum_image_size_, kPropertyEffectsPreferredSizeChanged); } @@ -132,8 +136,9 @@ gfx::Size ImageButton::CalculatePreferredSize( const SizeBounds& available_size) const { gfx::Size size(kDefaultWidth, kDefaultHeight); - if (!images_[STATE_NORMAL].IsEmpty()) + if (!images_[STATE_NORMAL].IsEmpty()) { size = images_[STATE_NORMAL].Size(); + } size.SetToMax(GetMinimumImageSize()); @@ -282,25 +287,28 @@ HorizontalAlignment h_alignment = GetImageHorizontalAlignment(); VerticalAlignment v_alignment = GetImageVerticalAlignment(); if (draw_image_mirrored_) { - if (h_alignment == ALIGN_RIGHT) + if (h_alignment == ALIGN_RIGHT) { h_alignment = ALIGN_LEFT; - else if (h_alignment == ALIGN_LEFT) + } else if (h_alignment == ALIGN_LEFT) { h_alignment = ALIGN_RIGHT; + } } const gfx::Rect rect = GetContentsBounds(); int x = 0; - if (h_alignment == ALIGN_CENTER) + if (h_alignment == ALIGN_CENTER) { x = (rect.width() - image.width()) / 2; - else if (h_alignment == ALIGN_RIGHT) + } else if (h_alignment == ALIGN_RIGHT) { x = rect.width() - image.width(); + } int y = 0; - if (v_alignment == ALIGN_MIDDLE) + if (v_alignment == ALIGN_MIDDLE) { y = (rect.height() - image.height()) / 2; - else if (v_alignment == ALIGN_BOTTOM) + } else if (v_alignment == ALIGN_BOTTOM) { y = rect.height() - image.height(); + } return rect.origin() + gfx::Vector2d(x, y); } @@ -321,8 +329,9 @@ } void ToggleImageButton::SetToggled(bool toggled) { - if (toggled == toggled_) + if (toggled == toggled_) { return; + } for (size_t i = 0; i < STATE_COUNT; ++i) { std::swap(images_[i], alternate_images_[i]); @@ -347,8 +356,9 @@ const ui::ImageModel& image_model) { if (toggled_) { images_[image_state] = image_model; - if (GetState() == image_state) + if (GetState() == image_state) { SchedulePaint(); + } } else { alternate_images_[image_state] = image_model; } @@ -366,8 +376,9 @@ } void ToggleImageButton::SetToggledTooltipText(const std::u16string& tooltip) { - if (tooltip == toggled_tooltip_text_) + if (tooltip == toggled_tooltip_text_) { return; + } toggled_tooltip_text_ = tooltip; UpdateAccessibleName(); UpdateTooltipText(); @@ -379,8 +390,9 @@ } void ToggleImageButton::SetToggledAccessibleName(const std::u16string& name) { - if (name == toggled_accessible_name_) + if (name == toggled_accessible_name_) { return; + } toggled_accessible_name_ = name; UpdateAccessibleName(); OnPropertyChanged(&toggled_accessible_name_, kPropertyEffectsNone); @@ -390,8 +402,9 @@ // ToggleImageButton, ImageButton overrides: gfx::ImageSkia ToggleImageButton::GetImage(ButtonState image_state) const { - if (toggled_) + if (toggled_) { return alternate_images_[image_state].Rasterize(GetColorProvider()); + } return images_[image_state].Rasterize(GetColorProvider()); } @@ -401,8 +414,9 @@ alternate_images_[image_state] = image_model; } else { images_[image_state] = image_model; - if (GetState() == image_state) + if (GetState() == image_state) { SchedulePaint(); + } } PreferredSizeChanged(); UpdateAccessibleCheckedState();
diff --git a/ui/views/controls/button/image_button_unittest.cc b/ui/views/controls/button/image_button_unittest.cc index f7c91cb..63b4437 100644 --- a/ui/views/controls/button/image_button_unittest.cc +++ b/ui/views/controls/button/image_button_unittest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "ui/views/controls/button/image_button.h" + #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/image/image_unittest_util.h"
diff --git a/ui/views/controls/button/label_button.cc b/ui/views/controls/button/label_button.cc index f0ba9bf..07e805f 100644 --- a/ui/views/controls/button/label_button.cc +++ b/ui/views/controls/button/label_button.cc
@@ -140,8 +140,9 @@ } void LabelButton::ShrinkDownThenClearText() { - if (GetText().empty()) + if (GetText().empty()) { return; + } // First, we recalculate preferred size for the new mode (without the label). shrinking_down_label_ = true; PreferredSizeChanged(); @@ -151,10 +152,11 @@ void LabelButton::SetTextColor(ButtonState for_state, SkColor color) { button_state_colors_[for_state] = color; - if (for_state == STATE_DISABLED) + if (for_state == STATE_DISABLED) { label_->SetDisabledColor(color); - else if (for_state == GetState()) + } else if (for_state == GetState()) { label_->SetEnabledColor(color); + } explicitly_set_colors_[for_state] = true; } @@ -235,8 +237,9 @@ void LabelButton::SetHorizontalAlignment(gfx::HorizontalAlignment alignment) { DCHECK_NE(gfx::ALIGN_TO_HEAD, alignment); - if (GetHorizontalAlignment() == alignment) + if (GetHorizontalAlignment() == alignment) { return; + } horizontal_alignment_ = alignment; OnPropertyChanged(&min_size_, kPropertyEffectsLayout); } @@ -250,8 +253,9 @@ } void LabelButton::SetMinSize(const gfx::Size& min_size) { - if (GetMinSize() == min_size) + if (GetMinSize() == min_size) { return; + } min_size_ = min_size; OnPropertyChanged(&min_size_, kPropertyEffectsPreferredSizeChanged); } @@ -261,8 +265,9 @@ } void LabelButton::SetMaxSize(const gfx::Size& max_size) { - if (GetMaxSize() == max_size) + if (GetMaxSize() == max_size) { return; + } max_size_ = max_size; OnPropertyChanged(&max_size_, kPropertyEffectsPreferredSizeChanged); } @@ -273,8 +278,9 @@ void LabelButton::SetIsDefault(bool is_default) { // TODO(estade): move this to MdTextButton once |style_| is removed. - if (GetIsDefault() == is_default) + if (GetIsDefault() == is_default) { return; + } is_default_ = is_default; // The default button has an accelerator for VKEY_RETURN, which clicks it. @@ -282,10 +288,11 @@ // button is focused, that button's VKEY_RETURN handler will take precedence. // See Button::GetKeyClickActionForEvent(). ui::Accelerator accel(ui::VKEY_RETURN, ui::EF_NONE); - if (is_default) + if (is_default) { AddAccelerator(accel); - else + } else { RemoveAccelerator(accel); + } GetViewAccessibility().SetIsDefault(is_default); OnPropertyChanged(&is_default_, UpdateStyleToIndicateDefaultStatus()); } @@ -295,8 +302,9 @@ } void LabelButton::SetImageLabelSpacing(int spacing) { - if (GetImageLabelSpacing() == spacing) + if (GetImageLabelSpacing() == spacing) { return; + } image_label_spacing_ = spacing; OnPropertyChanged(&image_label_spacing_, kPropertyEffectsPreferredSizeChanged); @@ -307,8 +315,9 @@ } void LabelButton::SetImageCentered(bool image_centered) { - if (GetImageCentered() == image_centered) + if (GetImageCentered() == image_centered) { return; + } image_centered_ = image_centered; OnPropertyChanged(&image_centered_, kPropertyEffectsLayout); } @@ -360,17 +369,20 @@ // Clamp size to max size (if valid). const gfx::Size max_size = GetMaxSize(); - if (max_size.width() > 0) + if (max_size.width() > 0) { size.set_width(std::min(max_size.width(), size.width())); - if (max_size.height() > 0) + } + if (max_size.height() > 0) { size.set_height(std::min(max_size.height(), size.height())); + } return size; } gfx::Size LabelButton::GetMinimumSize() const { - if (label_->GetElideBehavior() == gfx::ElideBehavior::NO_ELIDE) + if (label_->GetElideBehavior() == gfx::ElideBehavior::NO_ELIDE) { return GetPreferredSize({0, 0}); + } gfx::Size size = image_container_view()->GetPreferredSize({}); const gfx::Insets insets(GetInsets()); @@ -378,10 +390,12 @@ size.SetToMax(GetMinSize()); const gfx::Size max_size = GetMaxSize(); - if (max_size.width() > 0) + if (max_size.width() > 0) { size.set_width(std::min(max_size.width(), size.width())); - if (max_size.height() > 0) + } + if (max_size.height() > 0) { size.set_height(std::min(max_size.height(), size.height())); + } return size; } @@ -411,10 +425,11 @@ const auto horizontal_alignment = GetHorizontalAlignment(); if (!image_size.IsEmpty()) { int image_space = image_size.width() + GetImageLabelSpacing(); - if (horizontal_alignment == gfx::ALIGN_RIGHT) + if (horizontal_alignment == gfx::ALIGN_RIGHT) { label_area.Inset(gfx::Insets::TLBR(0, 0, 0, image_space)); - else + } else { label_area.Inset(gfx::Insets::TLBR(0, image_space, 0, 0)); + } } gfx::Size label_size( @@ -517,8 +532,9 @@ } void LabelButton::UpdateImage() { - if (GetWidget()) + if (GetWidget()) { image_container()->UpdateImage(this); + } } void LabelButton::AddLayerToRegion(ui::Layer* new_layer, @@ -603,8 +619,9 @@ Button::OnThemeChanged(); ResetColorsFromNativeTheme(); UpdateImage(); - if (!explicitly_set_border_) + if (!explicitly_set_border_) { View::SetBorder(CreateDefaultBorder()); + } ResetLabelEnabledColor(); // The entire button has to be repainted here, since the native theme can // define the tint for the entire background/border/focus ring. @@ -649,12 +666,14 @@ size.Enlarge(insets.width(), insets.height()); // Accommodate for spacing between image and text if both are present. - if (image_size.width() > 0 && !GetText().empty() && !shrinking_down_label_) + if (image_size.width() > 0 && !GetText().empty() && !shrinking_down_label_) { size.Enlarge(GetImageLabelSpacing(), 0); + } // Make the size at least as large as the minimum size needed by the border. - if (GetBorder()) + if (GetBorder()) { size.SetToMax(GetBorder()->GetMinimumSize()); + } return size; } @@ -669,8 +688,9 @@ // Paint as inactive if neither this widget nor its parent should paint as // active. if (!widget->ShouldPaintAsActive() && - !(widget->parent() && widget->parent()->ShouldPaintAsActive())) + !(widget->parent() && widget->parent()->ShouldPaintAsActive())) { return STATE_DISABLED; + } return GetState(); }
diff --git a/ui/views/controls/button/label_button_border.cc b/ui/views/controls/button/label_button_border.cc index e4ffd18..0aaace38 100644 --- a/ui/views/controls/button/label_button_border.cc +++ b/ui/views/controls/button/label_button_border.cc
@@ -40,8 +40,9 @@ if (!painter && button.is_focused) { painter = border->GetPainter(false, Button::GetButtonStateFrom(state)); } - if (painter) + if (painter) { Painter::PaintPainterAt(canvas, painter, rect); + } } } // namespace @@ -130,8 +131,9 @@ gfx::Size minimum_size; for (const auto& painters_for_focus_state : painters_) { for (const auto& painter_for_button_state : painters_for_focus_state) { - if (painter_for_button_state) + if (painter_for_button_state) { minimum_size.SetToMax(painter_for_button_state->GetMinimumSize()); + } } } return minimum_size;
diff --git a/ui/views/controls/button/label_button_label.cc b/ui/views/controls/button/label_button_label.cc index e144641b..b4ae0bb 100644 --- a/ui/views/controls/button/label_button_label.cc +++ b/ui/views/controls/button/label_button_label.cc
@@ -21,8 +21,9 @@ void LabelButtonLabel::SetDisabledColor(SkColor color) { requested_disabled_color_ = color; - if (!GetEnabled()) + if (!GetEnabled()) { Label::SetEnabledColor(color); + } } void LabelButtonLabel::SetDisabledColorId(std::optional<ui::ColorId> color_id) { @@ -44,8 +45,9 @@ void LabelButtonLabel::SetEnabledColor(SkColor color) { requested_enabled_color_ = color; - if (GetEnabled()) + if (GetEnabled()) { Label::SetEnabledColor(color); + } } void LabelButtonLabel::SetEnabledColorId(std::optional<ui::ColorId> color_id) {
diff --git a/ui/views/controls/button/label_button_unittest.cc b/ui/views/controls/button/label_button_unittest.cc index 589b6218..0f0f7aa9d 100644 --- a/ui/views/controls/button/label_button_unittest.cc +++ b/ui/views/controls/button/label_button_unittest.cc
@@ -231,10 +231,11 @@ for (bool is_multiline : {false, true}) { button()->SetMultiLine(is_multiline); for (bool set_image : {false, true}) { - if (set_image) + if (set_image) { button()->SetImageModel(Button::STATE_NORMAL, ui::ImageModel::FromImageSkia( gfx::test::CreateImageSkia(/*size=*/16))); + } bool preferred_size_is_sometimes_narrower_than_max = false; bool preferred_height_shrinks_as_max_width_grows = false; @@ -249,17 +250,20 @@ const gfx::Size preferred_size = button()->GetPreferredSize({}); EXPECT_LE(preferred_size.width(), width_case); - if (preferred_size.width() < width_case) + if (preferred_size.width() < width_case) { preferred_size_is_sometimes_narrower_than_max = true; + } - if (preferred_size.height() < old_preferred_size.height()) + if (preferred_size.height() < old_preferred_size.height()) { preferred_height_shrinks_as_max_width_grows = true; + } } } EXPECT_TRUE(preferred_size_is_sometimes_narrower_than_max); - if (is_multiline) + if (is_multiline) { EXPECT_TRUE(preferred_height_shrinks_as_max_width_grows); + } } } }
diff --git a/ui/views/controls/button/md_text_button.cc b/ui/views/controls/button/md_text_button.cc index 9f6f3929..2eef602 100644 --- a/ui/views/controls/button/md_text_button.cc +++ b/ui/views/controls/button/md_text_button.cc
@@ -116,8 +116,9 @@ const std::optional<SkColor>& color) { CHECK(!bg_color_id_override_.has_value()); - if (color == bg_color_override_) + if (color == bg_color_override_) { return; + } bg_color_override_ = color; UpdateColors(); OnPropertyChanged(&bg_color_override_, kPropertyEffectsNone); @@ -280,8 +281,9 @@ } void MdTextButton::UpdateTextColor() { - if (explicitly_set_normal_color()) + if (explicitly_set_normal_color()) { return; + } style::TextStyle text_style = style::STYLE_PRIMARY; if (style_ == ui::ButtonStyle::kProminent) {
diff --git a/ui/views/controls/button/md_text_button_unittest.cc b/ui/views/controls/button/md_text_button_unittest.cc index e7a68e1..adccc39 100644 --- a/ui/views/controls/button/md_text_button_unittest.cc +++ b/ui/views/controls/button/md_text_button_unittest.cc
@@ -33,8 +33,9 @@ TEST_F(MdTextButtonTest, BackgroundColorChangesWithWidgetActivation) { // Test whether the button's background color changes when its containing // widget's activation changes. - if (!PlatformStyle::kInactiveWidgetControlsAppearDisabled) + if (!PlatformStyle::kInactiveWidgetControlsAppearDisabled) { GTEST_SKIP() << "Button colors do not change with widget activation here."; + } std::unique_ptr<Widget> widget = CreateTestWidget(Widget::InitParams::CLIENT_OWNS_WIDGET);
diff --git a/ui/views/controls/button/md_text_button_with_down_arrow.cc b/ui/views/controls/button/md_text_button_with_down_arrow.cc index 3bc5a955..cfae6a5e 100644 --- a/ui/views/controls/button/md_text_button_with_down_arrow.cc +++ b/ui/views/controls/button/md_text_button_with_down_arrow.cc
@@ -11,9 +11,9 @@ #include "ui/gfx/color_utils.h" #include "ui/gfx/paint_vector_icon.h" #include "ui/views/border.h" +#include "ui/views/controls/button/md_text_button.h" #include "ui/views/layout/layout_provider.h" #include "ui/views/vector_icons.h" -#include "ui/views/controls/button/md_text_button.h" namespace views { constexpr int kDropdownArrowSize = 20;
diff --git a/ui/views/controls/button/menu_button_controller.cc b/ui/views/controls/button/menu_button_controller.cc index 914566c..cd63dd69 100644 --- a/ui/views/controls/button/menu_button_controller.cc +++ b/ui/views/controls/button/menu_button_controller.cc
@@ -73,8 +73,9 @@ } MenuButtonController::PressedLock::~PressedLock() { - if (menu_button_controller_) + if (menu_button_controller_) { menu_button_controller_->DecrementPressedLocked(); + } } //////////////////////////////////////////////////////////////////////////////// @@ -105,16 +106,18 @@ is_intentional_menu_trigger_ = (TimeTicks::Now() - menu_closed_time_) >= kMinimumTimeBetweenButtonClicks; - if (button()->GetRequestFocusOnPress()) + if (button()->GetRequestFocusOnPress()) { button()->RequestFocus(); + } if (button()->GetState() != Button::STATE_DISABLED && button()->HitTestPoint(event.location()) && IsTriggerableEvent(event)) { return Activate(&event); } // If this is an unintentional trigger do not display the inkdrop. - if (!is_intentional_menu_trigger_) + if (!is_intentional_menu_trigger_) { InkDrop::Get(button())->AnimateToState(InkDropState::HIDDEN, &event); + } return true; } @@ -124,31 +127,36 @@ button()->HitTestPoint(event.location()) && !delegate()->InDrag()) { Activate(&event); } else { - if (button()->GetHideInkDropWhenShowingContextMenu()) + if (button()->GetHideInkDropWhenShowingContextMenu()) { InkDrop::Get(button())->AnimateToState(InkDropState::HIDDEN, &event); + } ButtonController::OnMouseReleased(event); } } void MenuButtonController::OnMouseMoved(const ui::MouseEvent& event) { - if (pressed_lock_count_ == 0) // Ignore mouse movement if state is locked. + if (pressed_lock_count_ == 0) { // Ignore mouse movement if state is locked. ButtonController::OnMouseMoved(event); + } } void MenuButtonController::OnMouseEntered(const ui::MouseEvent& event) { - if (pressed_lock_count_ == 0) // Ignore mouse movement if state is locked. + if (pressed_lock_count_ == 0) { // Ignore mouse movement if state is locked. ButtonController::OnMouseEntered(event); + } } void MenuButtonController::OnMouseExited(const ui::MouseEvent& event) { - if (pressed_lock_count_ == 0) // Ignore mouse movement if state is locked. + if (pressed_lock_count_ == 0) { // Ignore mouse movement if state is locked. ButtonController::OnMouseExited(event); + } } bool MenuButtonController::OnKeyPressed(const ui::KeyEvent& event) { // Alt-space on windows should show the window menu. - if (event.key_code() == ui::VKEY_SPACE && event.IsAltDown()) + if (event.key_code() == ui::VKEY_SPACE && event.IsAltDown()) { return false; + } // If Return doesn't normally click buttons, don't do it here either. if (event.key_code() == ui::VKEY_RETURN && @@ -202,15 +210,17 @@ // button listener and has handled the gesture event. So, there is no need // to further process the gesture event here. However, if the listener // didn't run menu code, we should make sure to reset our state. - if (ref && button()->GetState() == Button::STATE_HOVERED) + if (ref && button()->GetState() == Button::STATE_HOVERED) { button()->SetState(Button::STATE_NORMAL); + } return; } if (event->type() == ui::EventType::kGestureTapDown) { event->SetHandled(); - if (pressed_lock_count_ == 0) + if (pressed_lock_count_ == 0) { button()->SetState(Button::STATE_HOVERED); + } } else if (button()->GetState() == Button::STATE_HOVERED && (event->type() == ui::EventType::kGestureTapCancel || event->type() == ui::EventType::kGestureEnd) && @@ -255,8 +265,9 @@ // to ShowAppMenu which now provides none. ui::KeyEvent fake_event(ui::EventType::kKeyPressed, ui::VKEY_SPACE, ui::EF_IS_SYNTHESIZED); - if (!event) + if (!event) { event = &fake_event; + } // We don't set our state here. It's handled in the MenuController code or // by the callback. callback_.Run(*event); @@ -291,8 +302,9 @@ // trigger button actions. For example, menus should only active on left // mouse button, to prevent a menu from being activated when a right-click // would also activate a context menu. - if (!(mouse_event->button_flags() & button()->GetTriggerableEventFlags())) + if (!(mouse_event->button_flags() & button()->GetTriggerableEventFlags())) { return false; + } // Activate on release if dragging, otherwise activate based on // notify_action. @@ -315,8 +327,9 @@ bool snap_ink_drop_to_activated, const ui::LocatedEvent* event) { ++pressed_lock_count_; - if (increment_pressed_lock_called_) + if (increment_pressed_lock_called_) { *increment_pressed_lock_called_ = true; + } if (!state_changed_subscription_) { state_changed_subscription_ = button()->AddStateChangedCallback(base::BindRepeating( @@ -325,10 +338,11 @@ } should_disable_after_press_ = button()->GetState() == Button::STATE_DISABLED; if (button()->GetState() != Button::STATE_PRESSED) { - if (snap_ink_drop_to_activated) + if (snap_ink_drop_to_activated) { delegate()->GetInkDrop()->SnapToActivated(); - else + } else { InkDrop::Get(button())->AnimateToState(InkDropState::ACTIVATED, event); + } } button()->SetState(Button::STATE_PRESSED); delegate()->GetInkDrop()->SetHovered(false); @@ -355,9 +369,11 @@ button()->SetState(desired_state); // The widget may be null during shutdown. If so, it doesn't make sense to // try to add an ink drop effect. - if (button()->GetWidget() && button()->GetState() != Button::STATE_PRESSED) + if (button()->GetWidget() && + button()->GetState() != Button::STATE_PRESSED) { InkDrop::Get(button())->AnimateToState(InkDropState::DEACTIVATED, nullptr /* event */); + } } } @@ -366,10 +382,11 @@ // pressed state. This shouldn't happen, but conceivably could if a caller // tries to switch from enabled to disabled or vice versa while the button is // pressed. - if (button()->GetState() == Button::STATE_NORMAL) + if (button()->GetState() == Button::STATE_NORMAL) { should_disable_after_press_ = false; - else if (button()->GetState() == Button::STATE_DISABLED) + } else if (button()->GetState() == Button::STATE_DISABLED) { should_disable_after_press_ = true; + } } } // namespace views
diff --git a/ui/views/controls/button/menu_button_controller_unittest.cc b/ui/views/controls/button/menu_button_controller_unittest.cc index a0e05f6b..85497da 100644 --- a/ui/views/controls/button/menu_button_controller_unittest.cc +++ b/ui/views/controls/button/menu_button_controller_unittest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "ui/views/controls/button/menu_button_controller.h" + #include "base/functional/bind.h" #include "ui/views/controls/button/button.h" #include "ui/views/test/views_test_base.h"
diff --git a/ui/views/controls/button/menu_button_unittest.cc b/ui/views/controls/button/menu_button_unittest.cc index 40cc30a..2697e1dd 100644 --- a/ui/views/controls/button/menu_button_unittest.cc +++ b/ui/views/controls/button/menu_button_unittest.cc
@@ -151,8 +151,9 @@ private: void ButtonPressed() { pressed_lock_ = button_controller()->TakeLock(); - if (release_lock_) + if (release_lock_) { ReleasePressedLock(); + } } bool release_lock_; @@ -234,8 +235,9 @@ const gfx::Point& screen_location, int allowed_operations, ui::mojom::DragEventSource source) { - if (IsDragDropInProgress()) + if (IsDragDropInProgress()) { return DragOperation::kNone; + } drag_in_progress_ = true; target_ = root_window; return ui::PreferredDragOperation(allowed_operations); @@ -250,8 +252,9 @@ } void TestDragDropClient::OnMouseEvent(ui::MouseEvent* event) { - if (!IsDragDropInProgress()) + if (!IsDragDropInProgress()) { return; + } switch (event->type()) { case ui::EventType::kMouseDragged: event->StopPropagation();
diff --git a/ui/views/controls/button/radio_button.cc b/ui/views/controls/button/radio_button.cc index 62150b9..a49e492 100644 --- a/ui/views/controls/button/radio_button.cc +++ b/ui/views/controls/button/radio_button.cc
@@ -86,8 +86,9 @@ // Take focus only if another radio button in the group has focus. Views views; GetViewsInGroupFromParent(GetGroup(), &views); - if (base::ranges::any_of(views, [](View* v) { return v->HasFocus(); })) + if (base::ranges::any_of(views, [](View* v) { return v->HasFocus(); })) { RequestFocus(); + } } void RadioButton::NotifyClick(const ui::Event& event) {
diff --git a/ui/views/controls/combobox/combobox.cc b/ui/views/controls/combobox/combobox.cc index 0f251eb8..ffc42742 100644 --- a/ui/views/controls/combobox/combobox.cc +++ b/ui/views/controls/combobox/combobox.cc
@@ -191,8 +191,9 @@ } void Combobox::SetSelectedIndex(std::optional<size_t> index) { - if (selected_index_ == index) + if (selected_index_ == index) { return; + } // TODO(pbos): Add (D)CHECKs to validate the selected index. selected_index_ = index; @@ -267,13 +268,15 @@ } void Combobox::SetInvalid(bool invalid) { - if (invalid == invalid_) + if (invalid == invalid_) { return; + } invalid_ = invalid; - if (views::FocusRing::Get(this)) + if (views::FocusRing::Get(this)) { views::FocusRing::Get(this)->SetInvalid(invalid); + } UpdateBorder(); OnPropertyChanged(&selected_index_, kPropertyEffectsPaint); @@ -310,8 +313,9 @@ } void Combobox::SetSizeToLargestLabel(bool size_to_largest_label) { - if (size_to_largest_label_ == size_to_largest_label) + if (size_to_largest_label_ == size_to_largest_label) { return; + } size_to_largest_label_ = size_to_largest_label; content_size_ = GetContentSize(); @@ -338,8 +342,9 @@ void Combobox::SetSelectedRow(std::optional<size_t> row) { std::optional<size_t> prev_index = selected_index_; SetSelectedIndex(row); - if (selected_index_ != prev_index) + if (selected_index_ != prev_index) { OnPerformAction(); + } } std::u16string Combobox::GetTextForRow(size_t row) { @@ -412,8 +417,9 @@ const auto index_at_or_after = [](ui::ComboboxModel* model, size_t index) -> std::optional<size_t> { for (; index < model->GetItemCount(); ++index) { - if (!model->IsItemSeparatorAt(index) && model->IsItemEnabledAt(index)) + if (!model->IsItemSeparatorAt(index) && model->IsItemEnabledAt(index)) { return index; + } } return std::nullopt; }; @@ -421,8 +427,9 @@ size_t index) -> std::optional<size_t> { for (; index > 0; --index) { const auto prev = index - 1; - if (!model->IsItemSeparatorAt(prev) && model->IsItemEnabledAt(prev)) + if (!model->IsItemSeparatorAt(prev) && model->IsItemEnabledAt(prev)) { return prev; + } } return std::nullopt; }; @@ -431,8 +438,9 @@ switch (e.key_code()) { // Show the menu on F4 without modifiers. case ui::VKEY_F4: - if (e.IsAltDown() || e.IsAltGrDown() || e.IsControlDown()) + if (e.IsAltDown() || e.IsAltGrDown() || e.IsControlDown()) { return false; + } ShowDropDownMenu(ui::mojom::MenuSourceType::kKeyboard); return true; @@ -486,8 +494,9 @@ } void Combobox::OnFocus() { - if (GetInputMethod()) + if (GetInputMethod()) { GetInputMethod()->SetFocusedTextInputClient(GetPrefixSelector()); + } View::OnFocus(); // Border renders differently when focused. @@ -495,11 +504,13 @@ } void Combobox::OnBlur() { - if (GetInputMethod()) + if (GetInputMethod()) { GetInputMethod()->DetachTextInputClient(GetPrefixSelector()); + } - if (selector_) + if (selector_) { selector_->OnViewBlur(); + } // Border renders differently when focused. SchedulePaint(); } @@ -645,13 +656,16 @@ } void Combobox::ArrowButtonPressed(const ui::Event& event) { - if (!GetEnabled()) + if (!GetEnabled()) { return; + } // TODO(hajimehoshi): Fix the problem that the arrow button blinks when // cliking this while the dropdown menu is opened. - if ((base::TimeTicks::Now() - closed_time_) > kMinimumTimeBetweenButtonClicks) + if ((base::TimeTicks::Now() - closed_time_) > + kMinimumTimeBetweenButtonClicks) { ShowDropDownMenu(ui::GetMenuSourceTypeForEvent(event)); + } } void Combobox::ShowDropDownMenu(ui::mojom::MenuSourceType source_type) { @@ -671,8 +685,9 @@ gfx::Rect bounds(menu_position, lb.size()); // If check marks exist in the combobox, adjust with bounds width to account // for them. - if (!size_to_largest_label_) + if (!size_to_largest_label_) { bounds.set_width(MaybeAdjustWidthForCheckmarks(bounds.width())); + } Button::ButtonState original_state = arrow_button_->GetState(); arrow_button_->SetState(Button::STATE_PRESSED); @@ -716,8 +731,9 @@ void Combobox::OnPerformAction() { SchedulePaint(); - if (callback_) + if (callback_) { callback_.Run(); + } // Note |this| may be deleted by |callback_|. } @@ -727,8 +743,9 @@ int height = font_list.GetHeight(); int width = 0; for (size_t i = 0; i < GetModel()->GetItemCount(); ++i) { - if (model_->IsItemSeparatorAt(i)) + if (model_->IsItemSeparatorAt(i)) { continue; + } if (size_to_largest_label_ || i == selected_index_) { int item_width = 0; @@ -736,8 +753,9 @@ std::u16string text = GetModel()->GetItemAt(i); if (!icon.IsEmpty()) { gfx::ImageSkia icon_skia; - if (GetWidget()) + if (GetWidget()) { icon_skia = icon.Rasterize(GetColorProvider()); + } item_width += icon_skia.width(); height = std::max(height, icon_skia.height()); @@ -754,8 +772,9 @@ item_width += gfx::GetStringWidth(GetModel()->GetItemAt(i), font_list); } - if (size_to_largest_label_) + if (size_to_largest_label_) { item_width = MaybeAdjustWidthForCheckmarks(item_width); + } width = std::max(width, item_width); } } @@ -776,8 +795,9 @@ } PrefixSelector* Combobox::GetPrefixSelector() { - if (!selector_) + if (!selector_) { selector_ = std::make_unique<PrefixSelector>(this, this); + } return selector_.get(); }
diff --git a/ui/views/controls/combobox/combobox.h b/ui/views/controls/combobox/combobox.h index 8463d2c..45c14a70 100644 --- a/ui/views/controls/combobox/combobox.h +++ b/ui/views/controls/combobox/combobox.h
@@ -34,7 +34,7 @@ namespace test { class ComboboxTestApi; class InteractionTestUtilSimulatorViews; -} +} // namespace test class MenuRunner; class PrefixSelector;
diff --git a/ui/views/controls/combobox/combobox_unittest.cc b/ui/views/controls/combobox/combobox_unittest.cc index 704aa04..303116f 100644 --- a/ui/views/controls/combobox/combobox_unittest.cc +++ b/ui/views/controls/combobox/combobox_unittest.cc
@@ -79,8 +79,9 @@ std::optional<size_t> GetDefaultIndex() const override { // Return the first index that is not a separator. for (size_t index = 0; index < kItemCount; ++index) { - if (separators_.find(index) == separators_.end()) + if (separators_.find(index) == separators_.end()) { return index; + } } NOTREACHED(); } @@ -97,8 +98,9 @@ private: void OnModelChanged() { - for (auto& observer : observers()) + for (auto& observer : observers()) { observer.OnComboboxModelChanged(this); + } } std::set<size_t> separators_; @@ -131,8 +133,9 @@ } void ValuesChanged() { - for (auto& observer : observers()) + for (auto& observer : observers()) { observer.OnComboboxModelChanged(this); + } } private: @@ -207,8 +210,9 @@ void InitCombobox(const std::set<size_t>* separators) { model_ = std::make_unique<TestComboboxModel>(); - if (separators) + if (separators) { model_->SetSeparators(*separators); + } ASSERT_FALSE(combobox()); auto box = std::make_unique<TestCombobox>(model_.get()); @@ -1066,15 +1070,17 @@ public: explicit ConfigurableComboboxModel(bool* destroyed = nullptr) : destroyed_(destroyed) { - if (destroyed_) + if (destroyed_) { *destroyed_ = false; + } } ConfigurableComboboxModel(ConfigurableComboboxModel&) = delete; ConfigurableComboboxModel& operator=(const ConfigurableComboboxModel&) = delete; ~ConfigurableComboboxModel() override { - if (destroyed_) + if (destroyed_) { *destroyed_ = true; + } } // ui::ComboboxModel:
diff --git a/ui/views/controls/editable_combobox/editable_combobox.cc b/ui/views/controls/editable_combobox/editable_combobox.cc index b919f05..ed906ec 100644 --- a/ui/views/controls/editable_combobox/editable_combobox.cc +++ b/ui/views/controls/editable_combobox/editable_combobox.cc
@@ -285,7 +285,7 @@ // The strategy used to customize the display of the dropdown menu. std::unique_ptr<MenuDecorationStrategy> decoration_strategy_; - raw_ptr<EditableCombobox> owner_; // Weak. Owns |this|. + raw_ptr<EditableCombobox> owner_; // Weak. Owns |this|. std::unique_ptr<ui::ComboboxModel> combobox_model_; // Whether to adapt the items shown to the textfield content.
diff --git a/ui/views/controls/editable_combobox/editable_combobox_unittest.cc b/ui/views/controls/editable_combobox/editable_combobox_unittest.cc index 76b4ec5..c24974ef 100644 --- a/ui/views/controls/editable_combobox/editable_combobox_unittest.cc +++ b/ui/views/controls/editable_combobox/editable_combobox_unittest.cc
@@ -188,8 +188,9 @@ const bool filter_on_edit, const bool show_on_empty) { std::vector<ui::SimpleComboboxModel::Item> items; - for (int i = 0; i < item_count; ++i) + for (int i = 0; i < item_count; ++i) { items.emplace_back(ASCIIToUTF16(base::StringPrintf("item[%i]", i))); + } InitEditableCombobox(items, filter_on_edit, show_on_empty); } @@ -198,8 +199,9 @@ bool filter_on_edit, bool show_on_empty) { std::vector<ui::SimpleComboboxModel::Item> items; - for (const auto& item_str : strings) + for (const auto& item_str : strings) { items.emplace_back(item_str); + } InitEditableCombobox(items, filter_on_edit, show_on_empty); } @@ -685,10 +687,10 @@ #if BUILDFLAG(IS_LINUX) // Flaky on Linux. https://crbug.com/1204584 #define MAYBE_RefocusingReopensMenuBasedOnLatestContent \ - DISABLED_RefocusingReopensMenuBasedOnLatestContent + DISABLED_RefocusingReopensMenuBasedOnLatestContent #else #define MAYBE_RefocusingReopensMenuBasedOnLatestContent \ - RefocusingReopensMenuBasedOnLatestContent + RefocusingReopensMenuBasedOnLatestContent #endif TEST_F(EditableComboboxTest, MAYBE_RefocusingReopensMenuBasedOnLatestContent) { std::vector<std::u16string> items = {u"abc", u"abd", u"bac", u"bad", u"bac2"}; @@ -961,15 +963,17 @@ public: explicit ConfigurableComboboxModel(bool* destroyed = nullptr) : destroyed_(destroyed) { - if (destroyed_) + if (destroyed_) { *destroyed_ = false; + } } ConfigurableComboboxModel(ConfigurableComboboxModel&) = delete; ConfigurableComboboxModel& operator=(const ConfigurableComboboxModel&) = delete; ~ConfigurableComboboxModel() override { - if (destroyed_) + if (destroyed_) { *destroyed_ = true; + } } // ui::ComboboxModel:
diff --git a/ui/views/controls/focus_ring.cc b/ui/views/controls/focus_ring.cc index 25791fcb..d4c475b 100644 --- a/ui/views/controls/focus_ring.cc +++ b/ui/views/controls/focus_ring.cc
@@ -51,10 +51,12 @@ SkColor GetPaintColor(FocusRing* focus_ring, bool valid) { const auto* cp = focus_ring->GetColorProvider(); - if (!valid) + if (!valid) { return cp->GetColor(ui::kColorAlertHighSeverity); - if (auto color_id = focus_ring->GetColorId(); color_id.has_value()) + } + if (auto color_id = focus_ring->GetColorId(); color_id.has_value()) { return cp->GetColor(color_id.value()); + } return GetCascadingAccentColor(focus_ring); } @@ -71,8 +73,9 @@ SkPath highlight_path = path_generator->GetHighlightPath(view); // The generated path might be empty or otherwise unusable. If that's the // case we should fall back on the default path. - if (IsPathUsable(highlight_path)) + if (IsPathUsable(highlight_path)) { return highlight_path; + } } gfx::Rect client_rect = view->GetLocalBounds(); @@ -115,8 +118,9 @@ // Note that the FocusRing is owned by the View hierarchy, so we can't just // clear the key. FocusRing* const focus_ring = FocusRing::Get(host); - if (!focus_ring) + if (!focus_ring) { return; + } host->RemoveChildViewT(focus_ring); host->ClearProperty(kFocusRingIdKey); } @@ -145,8 +149,9 @@ } void FocusRing::SetColorId(std::optional<ui::ColorId> color_id) { - if (color_id_ == color_id) + if (color_id_ == color_id) { return; + } color_id_ = color_id; OnPropertyChanged(&color_id_, PropertyEffects::kPropertyEffectsPaint); } @@ -160,15 +165,17 @@ } void FocusRing::SetHaloThickness(float halo_thickness) { - if (halo_thickness_ == halo_thickness) + if (halo_thickness_ == halo_thickness) { return; + } halo_thickness_ = halo_thickness; OnPropertyChanged(&halo_thickness_, PropertyEffects::kPropertyEffectsPaint); } void FocusRing::SetHaloInset(float halo_inset) { - if (halo_inset_ == halo_inset) + if (halo_inset_ == halo_inset) { return; + } halo_inset_ = halo_inset; OnPropertyChanged(&halo_inset_, PropertyEffects::kPropertyEffectsPaint); } @@ -230,8 +237,9 @@ void FocusRing::ViewHierarchyChanged( const ViewHierarchyChangedDetails& details) { - if (details.child != this) + if (details.child != this) { return; + } if (details.is_add) { // Need to start observing the parent. @@ -297,8 +305,9 @@ void FocusRing::OnThemeChanged() { View::OnThemeChanged(); - if (invalid_ || color_id_.has_value()) + if (invalid_ || color_id_.has_value()) { SchedulePaint(); + } } void FocusRing::OnViewFocused(View* view) { @@ -339,8 +348,9 @@ SkPath path; if (path_generator_) { path = path_generator_->GetHighlightPath(parent()); - if (IsPathUsable(path)) + if (IsPathUsable(path)) { return path; + } } // If there's no path generator or the generated path is unusable, fall back
diff --git a/ui/views/controls/focusable_border.cc b/ui/views/controls/focusable_border.cc index bd98936..bf1fe756 100644 --- a/ui/views/controls/focusable_border.cc +++ b/ui/views/controls/focusable_border.cc
@@ -77,8 +77,9 @@ SkColor FocusableBorder::GetCurrentColor(const View& view) const { ui::ColorId color_id = ui::kColorFocusableBorderUnfocused; - if (override_color_id_) + if (override_color_id_) { color_id = *override_color_id_; + } SkColor color = view.GetColorProvider()->GetColor(color_id); return view.GetEnabled() ? color
diff --git a/ui/views/controls/highlight_path_generator.cc b/ui/views/controls/highlight_path_generator.cc index c9343b1..227aa36 100644 --- a/ui/views/controls/highlight_path_generator.cc +++ b/ui/views/controls/highlight_path_generator.cc
@@ -56,8 +56,9 @@ gfx::Rect bounds = use_contents_bounds_ ? view->GetContentsBounds() : view->GetLocalBounds(); bounds.Inset(insets_); - if (use_mirrored_rect_) + if (use_mirrored_rect_) { bounds = view->GetMirroredRect(bounds); + } return GetRoundRect(gfx::RectF(bounds)); }
diff --git a/ui/views/controls/image_view.cc b/ui/views/controls/image_view.cc index 05f8284..63e99bb 100644 --- a/ui/views/controls/image_view.cc +++ b/ui/views/controls/image_view.cc
@@ -72,12 +72,14 @@ void ImageView::OnPaintImage(gfx::Canvas* canvas) { gfx::ImageSkia image = GetPaintImage(canvas->image_scale()); - if (image.isNull()) + if (image.isNull()) { return; + } gfx::Rect image_bounds(GetImageBounds()); - if (image_bounds.IsEmpty()) + if (image_bounds.IsEmpty()) { return; + } if (image_bounds.size() != gfx::Size(image.width(), image.height())) { // Resize case @@ -93,20 +95,24 @@ } gfx::ImageSkia ImageView::GetPaintImage(float scale) { - if (image_model_.IsEmpty()) + if (image_model_.IsEmpty()) { return gfx::ImageSkia(); + } if (image_model_.IsImage() || image_model_.IsImageGenerator()) { const gfx::ImageSkia image = image_model_.Rasterize(GetColorProvider()); - if (image.isNull()) + if (image.isNull()) { return image; + } const gfx::ImageSkiaRep& rep = image.GetRepresentation(scale); - if (rep.scale() == scale || rep.unscaled()) + if (rep.scale() == scale || rep.unscaled()) { return image; + } - if (scaled_image_.HasRepresentation(scale)) + if (scaled_image_.HasRepresentation(scale)) { return scaled_image_; + } // Only caches one image rep for the current scale. scaled_image_ = gfx::ImageSkia();
diff --git a/ui/views/controls/label.cc b/ui/views/controls/label.cc index d6bba51..ec4f1bf8 100644 --- a/ui/views/controls/label.cc +++ b/ui/views/controls/label.cc
@@ -107,8 +107,9 @@ } void Label::SetText(const std::u16string& new_text) { - if (new_text == GetText()) + if (new_text == GetText()) { return; + } std::u16string current_text = GetText(); full_text_->SetText(new_text); @@ -158,15 +159,17 @@ } void Label::SetTextContext(int text_context) { - if (text_context == text_context_) + if (text_context == text_context_) { return; + } text_context_ = text_context; full_text_->SetFontList( TypographyProvider::Get().GetFont(text_context_, text_style_)); full_text_->SetMinLineHeight(GetLineHeight()); ClearDisplayText(); - if (GetWidget()) + if (GetWidget()) { UpdateColorsFromTheme(); + } GetViewAccessibility().SetRole(text_context_ == style::CONTEXT_DIALOG_TITLE ? ax::mojom::Role::kTitleBar @@ -180,8 +183,9 @@ } void Label::SetTextStyle(int style) { - if (style == text_style_) + if (style == text_style_) { return; + } text_style_ = style; ApplyBaselineTextStyle(); @@ -192,8 +196,9 @@ TypographyProvider::Get().GetFont(text_context_, text_style_)); full_text_->SetMinLineHeight(GetLineHeight()); ClearDisplayText(); - if (GetWidget()) + if (GetWidget()) { UpdateColorsFromTheme(); + } OnPropertyChanged(&text_style_, kPropertyEffectsPreferredSizeChanged); } @@ -224,8 +229,9 @@ void Label::SetAutoColorReadabilityEnabled( bool auto_color_readability_enabled) { - if (auto_color_readability_enabled_ == auto_color_readability_enabled) + if (auto_color_readability_enabled_ == auto_color_readability_enabled) { return; + } auto_color_readability_enabled_ = auto_color_readability_enabled; RecalculateColors(); OnPropertyChanged(&auto_color_readability_enabled_, kPropertyEffectsPaint); @@ -236,8 +242,9 @@ } void Label::SetEnabledColor(SkColor color) { - if (enabled_color_set_ && requested_enabled_color_ == color) + if (enabled_color_set_ && requested_enabled_color_ == color) { return; + } enabled_color_set_ = true; requested_enabled_color_ = color; @@ -251,8 +258,9 @@ } void Label::SetEnabledColorId(std::optional<ui::ColorId> enabled_color_id) { - if (enabled_color_id_ == enabled_color_id) + if (enabled_color_id_ == enabled_color_id) { return; + } enabled_color_id_ = enabled_color_id; if (GetWidget()) { @@ -267,8 +275,9 @@ } void Label::SetBackgroundColor(SkColor color) { - if (background_color_set_ && background_color_ == color) + if (background_color_set_ && background_color_ == color) { return; + } background_color_ = color; background_color_set_ = true; if (GetWidget()) { @@ -281,8 +290,9 @@ void Label::SetBackgroundColorId( std::optional<ui::ColorId> background_color_id) { - if (background_color_id_ == background_color_id) + if (background_color_id_ == background_color_id) { return; + } background_color_id_ = background_color_id; if (GetWidget()) { @@ -296,8 +306,9 @@ } void Label::SetSelectionTextColor(SkColor color) { - if (selection_text_color_set_ && requested_selection_text_color_ == color) + if (selection_text_color_set_ && requested_selection_text_color_ == color) { return; + } requested_selection_text_color_ = color; selection_text_color_set_ = true; RecalculateColors(); @@ -309,8 +320,9 @@ } void Label::SetSelectionBackgroundColor(SkColor color) { - if (selection_background_color_set_ && selection_background_color_ == color) + if (selection_background_color_set_ && selection_background_color_ == color) { return; + } selection_background_color_ = color; selection_background_color_set_ = true; RecalculateColors(); @@ -322,8 +334,9 @@ } void Label::SetShadows(const gfx::ShadowValues& shadows) { - if (full_text_->shadows() == shadows) + if (full_text_->shadows() == shadows) { return; + } full_text_->set_shadows(shadows); ClearDisplayText(); OnPropertyChanged( @@ -336,8 +349,9 @@ } void Label::SetSubpixelRenderingEnabled(bool subpixel_rendering_enabled) { - if (subpixel_rendering_enabled_ == subpixel_rendering_enabled) + if (subpixel_rendering_enabled_ == subpixel_rendering_enabled) { return; + } subpixel_rendering_enabled_ = subpixel_rendering_enabled; ApplyTextColors(); OnPropertyChanged(&subpixel_rendering_enabled_, kPropertyEffectsPaint); @@ -365,8 +379,9 @@ void Label::SetHorizontalAlignment(gfx::HorizontalAlignment alignment) { alignment = gfx::MaybeFlipForRTL(alignment); - if (GetHorizontalAlignment() == alignment) + if (GetHorizontalAlignment() == alignment) { return; + } full_text_->SetHorizontalAlignment(alignment); ClearDisplayText(); OnPropertyChanged(ui::metadata::MakeUniquePropertyKey( @@ -383,8 +398,9 @@ } void Label::SetVerticalAlignment(gfx::VerticalAlignment alignment) { - if (GetVerticalAlignment() == alignment) + if (GetVerticalAlignment() == alignment) { return; + } full_text_->SetVerticalAlignment(alignment); ClearDisplayText(); OnPropertyChanged( @@ -401,8 +417,9 @@ } void Label::SetLineHeight(int line_height) { - if (line_height_ == line_height) + if (line_height_ == line_height) { return; + } line_height_ = line_height; full_text_->SetMinLineHeight(line_height); ClearDisplayText(); @@ -418,8 +435,9 @@ void Label::SetMultiLine(bool multi_line) { DCHECK(!multi_line || (elide_behavior_ == gfx::ELIDE_TAIL || elide_behavior_ == gfx::NO_ELIDE)); - if (this->GetMultiLine() == multi_line) + if (this->GetMultiLine() == multi_line) { return; + } multi_line_ = multi_line; // `max_width_` and `max_width_single_line_` are mutually exclusive. max_width_single_line_ = 0; @@ -433,8 +451,9 @@ } void Label::SetMaxLines(size_t max_lines) { - if (max_lines_ == max_lines) + if (max_lines_ == max_lines) { return; + } max_lines_ = max_lines; OnPropertyChanged(&max_lines_, kPropertyEffectsPreferredSizeChanged); } @@ -444,12 +463,14 @@ } void Label::SetObscured(bool obscured) { - if (this->GetObscured() == obscured) + if (this->GetObscured() == obscured) { return; + } full_text_->SetObscured(obscured); ClearDisplayText(); - if (obscured) + if (obscured) { SetSelectable(false); + } UpdateTooltipText(); @@ -467,8 +488,9 @@ bool Label::IsDisplayTextClipped() const { MaybeBuildDisplayText(); - if (!full_text_ || full_text_->text().empty()) + if (!full_text_ || full_text_->text().empty()) { return false; + } auto text_bounds = GetTextBounds(); return text_bounds.width() > GetContentsBounds().width() || text_bounds.height() > GetContentsBounds().height(); @@ -491,8 +513,9 @@ void Label::SetAllowCharacterBreak(bool allow_character_break) { const gfx::WordWrapBehavior behavior = allow_character_break ? gfx::WRAP_LONG_WORDS : gfx::TRUNCATE_LONG_WORDS; - if (full_text_->word_wrap_behavior() == behavior) + if (full_text_->word_wrap_behavior() == behavior) { return; + } full_text_->SetWordWrapBehavior(behavior); ClearDisplayText(); OnPropertyChanged(ui::metadata::MakeUniquePropertyKey( @@ -515,8 +538,9 @@ void Label::SetElideBehavior(gfx::ElideBehavior elide_behavior) { DCHECK(!GetMultiLine() || (elide_behavior == gfx::ELIDE_TAIL || elide_behavior == gfx::NO_ELIDE)); - if (elide_behavior_ == elide_behavior) + if (elide_behavior_ == elide_behavior) { return; + } elide_behavior_ = elide_behavior; UpdateFullTextElideBehavior(); @@ -576,8 +600,9 @@ } void Label::SetHandlesTooltips(bool enabled) { - if (handles_tooltips_ == enabled) + if (handles_tooltips_ == enabled) { return; + } handles_tooltips_ = enabled; UpdateTooltipText(); @@ -602,16 +627,18 @@ void Label::SetMaximumWidth(int max_width) { DCHECK(GetMultiLine()); DCHECK_EQ(0, fixed_width_); - if (max_width_ == max_width) + if (max_width_ == max_width) { return; + } max_width_ = max_width; OnPropertyChanged(&max_width_, kPropertyEffectsPreferredSizeChanged); } void Label::SetMaximumWidthSingleLine(int max_width) { DCHECK(!GetMultiLine()); - if (max_width_single_line_ == max_width) + if (max_width_single_line_ == max_width) { return; + } max_width_single_line_ = max_width; UpdateFullTextElideBehavior(); OnPropertyChanged(&max_width_single_line_, @@ -623,8 +650,9 @@ } void Label::SetCollapseWhenHidden(bool value) { - if (collapse_when_hidden_ == value) + if (collapse_when_hidden_ == value) { return; + } collapse_when_hidden_ = value; OnPropertyChanged(&collapse_when_hidden_, kPropertyEffectsPreferredSizeChanged); @@ -652,8 +680,9 @@ } bool Label::SetSelectable(bool value) { - if (value == GetSelectable()) + if (value == GetSelectable()) { return true; + } if (!value) { ClearSelection(); @@ -663,8 +692,9 @@ } DCHECK(!stored_selection_range_.IsValid()); - if (!IsSelectionSupported()) + if (!IsSelectionSupported()) { return false; + } selection_controller_ = std::make_unique<SelectionController>(this); return true; @@ -684,24 +714,27 @@ void Label::SelectAll() { gfx::RenderText* render_text = GetRenderTextForSelectionController(); - if (!render_text) + if (!render_text) { return; + } render_text->SelectAll(false); SchedulePaint(); } void Label::ClearSelection() { gfx::RenderText* render_text = GetRenderTextForSelectionController(); - if (!render_text) + if (!render_text) { return; + } render_text->ClearSelection(); SchedulePaint(); } void Label::SelectRange(const gfx::Range& range) { gfx::RenderText* render_text = GetRenderTextForSelectionController(); - if (render_text && render_text->SelectRange(range)) + if (render_text && render_text->SelectRange(range)) { SchedulePaint(); + } } std::vector<gfx::Rect> Label::GetSubstringBounds(const gfx::Range& range) { @@ -758,8 +791,9 @@ } gfx::Size Label::GetMinimumSize() const { - if (!GetVisible() && collapse_when_hidden_) + if (!GetVisible() && collapse_when_hidden_) { return gfx::Size(); + } // Always reserve vertical space for at least one line. gfx::Size size(0, GetLineHeight()); @@ -867,8 +901,9 @@ // Setup render text for selection controller. if (GetSelectable()) { render_text->set_focused(HasFocus()); - if (stored_selection_range_.IsValid()) + if (stored_selection_range_.IsValid()) { render_text->SelectRange(stored_selection_range_); + } } return render_text; @@ -877,8 +912,9 @@ gfx::Rect Label::GetTextBounds() const { MaybeBuildDisplayText(); - if (!display_text_) + if (!display_text_) { return gfx::Rect(GetTextSize()); + } return gfx::Rect(gfx::Point() + display_text_->GetLineOffset(0), display_text_->GetStringSize()); @@ -887,8 +923,9 @@ int Label::GetFontListY() const { MaybeBuildDisplayText(); - if (!display_text_) + if (!display_text_) { return 0; + } return GetInsets().top() + display_text_->GetBaseline() - font_list().GetBaseline(); @@ -897,8 +934,9 @@ void Label::PaintText(gfx::Canvas* canvas) { MaybeBuildDisplayText(); - if (display_text_) + if (display_text_) { display_text_->Draw(canvas); + } #if DCHECK_IS_ON() && !BUILDFLAG(IS_CHROMEOS) // TODO(crbug.com/40725997): Enable this DCHECK on ChromeOS by fixing either @@ -922,8 +960,9 @@ // text bounds. This is not necessarily true as the background could be // inset from the parent bounds, and get_color() does not imply that all of // the background is painted with the same opaque color. - if (view->background() && IsOpaque(view->background()->get_color())) + if (view->background() && IsOpaque(view->background()->get_color())) { break; + } if (view->layer()) { // If we aren't painted to an opaque background, we must paint to an @@ -979,8 +1018,9 @@ } bool Label::OnMousePressed(const ui::MouseEvent& event) { - if (!GetRenderTextForSelectionController()) + if (!GetRenderTextForSelectionController()) { return false; + } const bool had_focus = HasFocus(); @@ -998,8 +1038,9 @@ if (ui::Clipboard::IsSupportedClipboardBuffer( ui::ClipboardBuffer::kSelection)) { - if (event.IsOnlyMiddleMouseButton() && GetFocusManager() && !had_focus) + if (event.IsOnlyMiddleMouseButton() && GetFocusManager() && !had_focus) { GetFocusManager()->SetFocusedView(this); + } } return selection_controller_->OnMousePressed( @@ -1010,29 +1051,33 @@ } bool Label::OnMouseDragged(const ui::MouseEvent& event) { - if (!GetRenderTextForSelectionController()) + if (!GetRenderTextForSelectionController()) { return false; + } return selection_controller_->OnMouseDragged(event); } void Label::OnMouseReleased(const ui::MouseEvent& event) { - if (!GetRenderTextForSelectionController()) + if (!GetRenderTextForSelectionController()) { return; + } selection_controller_->OnMouseReleased(event); } void Label::OnMouseCaptureLost() { - if (!GetRenderTextForSelectionController()) + if (!GetRenderTextForSelectionController()) { return; + } selection_controller_->OnMouseCaptureLost(); } bool Label::OnKeyPressed(const ui::KeyEvent& event) { - if (!GetRenderTextForSelectionController()) + if (!GetRenderTextForSelectionController()) { return false; + } const bool shift = event.IsShiftDown(); const bool control = event.IsControlDown(); @@ -1147,15 +1192,17 @@ } void Label::VisibilityChanged(View* starting_from, bool is_visible) { - if (!is_visible) + if (!is_visible) { ClearDisplayText(); + } } void Label::ShowContextMenuForViewImpl(View* source, const gfx::Point& point, ui::mojom::MenuSourceType source_type) { - if (!GetRenderTextForSelectionController()) + if (!GetRenderTextForSelectionController()) { return; + } context_menu_runner_ = std::make_unique<MenuRunner>( &context_menu_contents_, @@ -1225,8 +1272,9 @@ void Label::OnAfterPointerAction(bool text_changed, bool selection_changed) { DCHECK(!text_changed); - if (selection_changed) + if (selection_changed) { SchedulePaint(); + } } bool Label::PasteSelectionClipboard() { @@ -1299,8 +1347,9 @@ } const gfx::RenderText* Label::GetRenderTextForSelectionController() const { - if (!GetSelectable()) + if (!GetSelectable()) { return nullptr; + } MaybeBuildDisplayText(); // This may be null when the content bounds of the view are empty. @@ -1340,12 +1389,14 @@ } void Label::MaybeBuildDisplayText() const { - if (display_text_) + if (display_text_) { return; + } gfx::Rect rect = GetContentsBounds(); - if (rect.IsEmpty()) + if (rect.IsEmpty()) { return; + } rect.Inset(-gfx::ShadowValue::GetMargin(GetShadows())); display_text_ = CreateRenderText(); @@ -1422,8 +1473,9 @@ } void Label::ApplyTextColors() const { - if (!display_text_) + if (!display_text_) { return; + } display_text_->SetColor(actual_enabled_color_); display_text_->set_selection_color(actual_selection_text_color_); @@ -1474,8 +1526,9 @@ void Label::ClearDisplayText() { // The HasSelection() call below will build |display_text_| in case it is // empty. Return early to avoid this. - if (!display_text_) + if (!display_text_) { return; + } // Persist the selection range if there is an active selection. if (HasSelection()) { @@ -1494,8 +1547,9 @@ } void Label::CopyToClipboard() { - if (!HasSelection() || GetObscured()) + if (!HasSelection() || GetObscured()) { return; + } ui::ScopedClipboardWriter(ui::ClipboardBuffer::kCopyPaste) .WriteText(GetSelectedText()); }
diff --git a/ui/views/controls/label_unittest.cc b/ui/views/controls/label_unittest.cc index 22f8ea86..7d01203f 100644 --- a/ui/views/controls/label_unittest.cc +++ b/ui/views/controls/label_unittest.cc
@@ -917,8 +917,9 @@ // splitting the words into up to one character per line if necessary. // Incorrect word splitting may cause infinite loops in text layout. gfx::Size required_size = label()->GetPreferredSize({}); - for (int i = 1; i < required_size.width(); ++i) + for (int i = 1; i < required_size.width(); ++i) { EXPECT_GT(label()->GetHeightForWidth(i), 0); + } } // Verifies if SetAllowCharacterBreak(true) doesn't change the preferred size.
diff --git a/ui/views/controls/link.cc b/ui/views/controls/link.cc index 48f5528..0bd5768 100644 --- a/ui/views/controls/link.cc +++ b/ui/views/controls/link.cc
@@ -4,10 +4,9 @@ #include "ui/views/controls/link.h" -#include "build/build_config.h" - #include "base/check.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "ui/accessibility/ax_enums.mojom.h" #include "ui/base/cursor/cursor.h" #include "ui/base/metadata/metadata_impl_macros.h" @@ -49,11 +48,13 @@ // TODO(crbug.com/40268779): Use TypographyProvider::GetColorId(). const ui::ColorProvider* color_provider = GetColorProvider(); DCHECK(color_provider); - if (!GetEnabled()) + if (!GetEnabled()) { return color_provider->GetColor(ui::kColorLinkForegroundDisabled); + } - if (requested_enabled_color_.has_value()) + if (requested_enabled_color_.has_value()) { return requested_enabled_color_.value(); + } if (GetTextContext() == style::CONTEXT_BUBBLE_FOOTER) { return color_provider->GetColor( @@ -66,8 +67,9 @@ } void Link::SetForceUnderline(bool force_underline) { - if (force_underline_ == force_underline) + if (force_underline_ == force_underline) { return; + } force_underline_ = force_underline; RecalculateFont(); @@ -78,8 +80,9 @@ } ui::Cursor Link::GetCursor(const ui::MouseEvent& event) { - if (!GetEnabled()) + if (!GetEnabled()) { return ui::Cursor(); + } return ui::mojom::CursorType::kHand; } @@ -99,8 +102,9 @@ bool Link::OnMousePressed(const ui::MouseEvent& event) { if (!GetEnabled() || - (!event.IsLeftMouseButton() && !event.IsMiddleMouseButton())) + (!event.IsLeftMouseButton() && !event.IsMiddleMouseButton())) { return false; + } SetPressed(true); return true; } @@ -118,8 +122,9 @@ OnMouseCaptureLost(); if (GetEnabled() && (event.IsLeftMouseButton() || event.IsMiddleMouseButton()) && - HitTestPoint(event.location())) + HitTestPoint(event.location())) { OnClick(event); + } } void Link::OnMouseCaptureLost() { @@ -131,8 +136,9 @@ (event.flags() & ui::EF_ALT_DOWN) == 0) || (event.key_code() == ui::VKEY_RETURN && PlatformStyle::kReturnClicksFocusedControl)); - if (!activate) + if (!activate) { return false; + } SetPressed(false); OnClick(event); @@ -140,8 +146,9 @@ } void Link::OnGestureEvent(ui::GestureEvent* event) { - if (!GetEnabled()) + if (!GetEnabled()) { return; + } if (event->type() == ui::EventType::kGestureTapDown) { SetPressed(true); @@ -195,8 +202,9 @@ void Link::SetEnabledColor(SkColor color) { requested_enabled_color_ = color; - if (GetWidget()) + if (GetWidget()) { Label::SetEnabledColor(GetColor()); + } } bool Link::IsSelectionSupported() const { @@ -214,8 +222,9 @@ void Link::OnClick(const ui::Event& event) { RequestFocus(); - if (callback_) + if (callback_) { callback_.Run(event); + } } void Link::RecalculateFont() { @@ -225,8 +234,9 @@ ? (style | gfx::Font::UNDERLINE) : (style & ~gfx::Font::UNDERLINE); - if (style != intended_style) + if (style != intended_style) { Label::SetFontList(font_list().DeriveWithStyle(intended_style)); + } } void Link::ConfigureFocus() {
diff --git a/ui/views/controls/menu/menu_cocoa_watcher_mac.mm b/ui/views/controls/menu/menu_cocoa_watcher_mac.mm index 7112379b..9aececb 100644 --- a/ui/views/controls/menu/menu_cocoa_watcher_mac.mm +++ b/ui/views/controls/menu/menu_cocoa_watcher_mac.mm
@@ -77,8 +77,9 @@ object:nil queue:nil usingBlock:^(NSNotification* notification) { - if (ShouldIgnoreNotification(notification)) + if (ShouldIgnoreNotification(notification)) { return; + } // Only destroy menus if the browser is losing focus, not if // it's gaining focus. This is to ensure that we can invoke
diff --git a/ui/views/controls/menu/menu_controller.cc b/ui/views/controls/menu/menu_controller.cc index ae2302dd..68d61ad 100644 --- a/ui/views/controls/menu/menu_controller.cc +++ b/ui/views/controls/menu/menu_controller.cc
@@ -176,8 +176,9 @@ // Returns true if |menu| doesn't have a mnemonic and first character of the its // title is |key|. bool TitleMatchesMnemonic(MenuItemView* menu, char16_t key) { - if (menu->GetMnemonic()) + if (menu->GetMnemonic()) { return false; + } std::u16string lower_title = base::i18n::ToLower(menu->title()); return !lower_title.empty() && lower_title[0] == key; @@ -185,16 +186,19 @@ // Returns the first descendant of |view| that is hot tracked. Button* GetFirstHotTrackedView(View* view) { - if (!view) + if (!view) { return nullptr; + } Button* button = Button::AsButton(view); - if (button && button->IsHotTracked()) + if (button && button->IsHotTracked()) { return button; + } for (View* child : view->children()) { Button* hot_view = GetFirstHotTrackedView(child); - if (hot_view) + if (hot_view) { return hot_view; + } } return nullptr; } @@ -267,8 +271,9 @@ View::Views::const_iterator pos) { for (auto i = pos; i != view->children().cend(); ++i) { View* deepest = GetFirstFocusableViewForward(*i, (*i)->children().cbegin()); - if (deepest) + if (deepest) { return deepest; + } } return view->IsFocusable() ? view : nullptr; } @@ -279,8 +284,9 @@ for (auto i = pos; i != view->children().crend(); ++i) { View* deepest = GetFirstFocusableViewBackward(*i, (*i)->children().crbegin()); - if (deepest) + if (deepest) { return deepest; + } } return view->IsFocusable() ? view : nullptr; } @@ -306,8 +312,9 @@ ? GetFirstFocusableViewForward(new_parent, std::next(pos)) : GetFirstFocusableViewBackward( new_parent, std::make_reverse_iterator(pos)); - if (next) + if (next) { return next; + } parent = new_parent; } while (parent != ancestor); return nullptr; @@ -327,8 +334,9 @@ return; } - if (!native_view) + if (!native_view) { return; + } gfx::Point screen_loc_pixels = display::win::ScreenWin::DIPToScreenPoint(screen_loc); @@ -386,14 +394,16 @@ return; } - if (!window) + if (!window) { return; + } aura::Window* root = window->GetRootWindow(); aura::client::ScreenPositionClient* spc = aura::client::GetScreenPositionClient(root); - if (!spc) + if (!spc) { return; + } gfx::Point root_loc(screen_loc); spc->ConvertPointFromScreen(root, &root_loc); @@ -637,11 +647,13 @@ } else { showing_ = true; - if (owner_) + if (owner_) { owner_->RemoveObserver(this); + } owner_ = parent; - if (owner_) + if (owner_) { owner_->AddObserver(this); + } native_view_for_gestures_ = native_view_for_gestures; @@ -713,8 +725,9 @@ // If the menu has already been destroyed, no further cancellation is // needed. We especially don't want to set the |exit_type_| to a lesser // value. - if (exit_type_ == ExitType::kDestroyed || exit_type_ == type) + if (exit_type_ == ExitType::kDestroyed || exit_type_ == type) { return; + } if (!showing_) { // This occurs if we're in the process of notifying the delegate for a drop @@ -748,15 +761,17 @@ // the release of ViewsDelegate leads immediately to shutdown, which can // trigger nested calls to Cancel. We want to reject these to prevent // attempting a nested tear down of this and |delegate_|. - if (type == ExitType::kAll) + if (type == ExitType::kAll) { showing_ = false; + } // On Windows and Linux the destruction of this menu's Widget leads to the // teardown of the platform specific drag-and-drop Widget. Do not shutdown // while dragging, leave the Widget hidden until drag-and-drop has completed, // at which point all menus will be destroyed. - if (!drag_in_progress_) + if (!drag_in_progress_) { ExitMenu(); + } } void MenuController::AddNestedDelegate( @@ -815,8 +830,9 @@ View* view = forward_to_root->GetEventHandlerForPoint(event_for_root.location()); Button* button = Button::AsButton(view); - if (hot_button_ != button) + if (hot_button_ != button) { SetHotTrackedButton(button); + } // Empty menu items are always handled by the menu controller. if (!IsViewClass<EmptyMenuMenuItem>(view)) { @@ -824,8 +840,9 @@ bool processed = forward_to_root->ProcessMousePressed(event_for_root); // This object may be destroyed as a result of a mouse press event (some // item may close the menu). - if (!this_ref) + if (!this_ref) { return true; + } // If the event was processed, the root view becomes our current mouse // handler... @@ -834,8 +851,9 @@ } // ...and we always return the result of the current handler. - if (current_mouse_event_target_) + if (current_mouse_event_target_) { return processed; + } } } @@ -855,12 +873,14 @@ MenuPart part = GetMenuPart(source, event.location()); UpdateScrolling(part); - if (for_drop_) + if (for_drop_) { return false; + } if (possible_drag_) { - if (View::ExceededDragThreshold(event.location() - press_pt_)) + if (View::ExceededDragThreshold(event.location() - press_pt_)) { StartDrag(source, press_pt_); + } return true; } MenuItemView* mouse_menu = nullptr; @@ -869,10 +889,11 @@ // with an empty menu item within a submenu. These cannot become selection // targets for mouse interaction, so do not attempt to update selection. if (part.menu || !part.submenu) { - if (!part.menu) + if (!part.menu) { part.menu = source->GetMenuItem(); - else + } else { mouse_menu = part.menu; + } SetSelection(part.menu ? part.menu.get() : state_.item.get(), SELECTION_OPEN_SUBMENU); } @@ -904,8 +925,9 @@ // because there's a chance that the event will open a nested (and blocking) // menu, and we need to not have a forwarded root view. MenuHostRootView* cached_event_target = current_mouse_event_target_; - if (!current_mouse_pressed_state_) + if (!current_mouse_pressed_state_) { current_mouse_event_target_ = nullptr; + } cached_event_target->ProcessMouseReleased( ConvertLocatedEventForRootView(*source, *cached_event_target, event)); return; @@ -1022,8 +1044,9 @@ // Updating the hot tracked button should be after `HandleMouseLocation()` // which may reset the current hot tracked button. - if (new_hot_tracked_button) + if (new_hot_tracked_button) { SetHotTrackedButton(new_hot_tracked_button); + } MaybeForwardToAnnotation(source, event); } @@ -1073,8 +1096,9 @@ View* view = root_view->GetEventHandlerForPoint( ConvertLocatedEventForRootView(*source, *root_view, *event).location()); Button* button = Button::AsButton(view); - if (hot_button_ && hot_button_ != button) + if (hot_button_ && hot_button_ != button) { SetHotTrackedButton(nullptr); + } } MenuPart part = GetMenuPart(source, event->location()); @@ -1119,18 +1143,21 @@ event->StopPropagation(); } - if (event->stopped_propagation()) + if (event->stopped_propagation()) { return; + } - if (!part.submenu) + if (!part.submenu) { return; + } part.submenu->OnGestureEvent(event); } void MenuController::OnTouchEvent(SubmenuView* source, ui::TouchEvent* event) { // Bail if owner wants the current active gesture sequence. - if (owner_ && send_gesture_events_to_owner()) + if (owner_ && send_gesture_events_to_owner()) { return; + } if (event->type() == ui::EventType::kTouchPressed) { MenuPart part = GetMenuPart(source, event->location()); @@ -1170,8 +1197,9 @@ hot_button_ = nullptr; for (auto& nested_state : menu_stack_) { State& state = nested_state.first; - if (details.child == state.hot_button) + if (details.child == state.hot_button) { state.hot_button = nullptr; + } } } } @@ -1206,8 +1234,9 @@ const gfx::Point screen_loc = View::ConvertPointToScreen(source, event.location()); - if (valid_drop_coordinates_ && screen_loc == drop_pt_) + if (valid_drop_coordinates_ && screen_loc == drop_pt_) { return last_drop_operation_; + } drop_pt_ = screen_loc; valid_drop_coordinates_ = true; @@ -1220,8 +1249,9 @@ // `GetTooltipHandlerForPoint` does not have this restriction. menu_item = AsViewClass<EmptyMenuMenuItem>( source->GetTooltipHandlerForPoint(event.location())); - if (menu_item) + if (menu_item) { over_empty_menu = true; + } } MenuDelegate::DropPosition drop_position = MenuDelegate::DropPosition::kNone; int drop_operation = ui::DragDropTypes::DRAG_NONE; @@ -1254,8 +1284,9 @@ : SELECTION_DEFAULT); if (drop_position == MenuDelegate::DropPosition::kNone || - drop_operation == ui::DragDropTypes::DRAG_NONE) + drop_operation == ui::DragDropTypes::DRAG_NONE) { menu_item = nullptr; + } } else { SetSelection(source->GetMenuItem(), SELECTION_OPEN_SUBMENU); } @@ -1411,8 +1442,9 @@ key_handled = OnKeyPressed(*event); #endif - if (key_handled) + if (key_handled) { event->StopPropagation(); + } // Key events can lead to this being deleted. if (!this_ref) { @@ -1467,8 +1499,9 @@ ui::VKEY_DOWN, ui::VKEY_UP, ui::VKEY_ESCAPE, ui::VKEY_F4, ui::VKEY_RETURN}; if (kKeysThatDontPropagate.find(event->key_code()) == - kKeysThatDontPropagate.end()) + kKeysThatDontPropagate.end()) { return ui::POST_DISPATCH_PERFORM_DEFAULT; + } } event->SetSkipped(); return ui::POST_DISPATCH_NONE; @@ -1518,8 +1551,9 @@ void MenuController::OnMenuItemDestroying(MenuItemView* menu_item) { #if BUILDFLAG(IS_MAC) - if (menu_closure_animation_ && menu_closure_animation_->item() == menu_item) + if (menu_closure_animation_ && menu_closure_animation_->item() == menu_item) { menu_closure_animation_.reset(); + } #endif UnregisterAlertedItem(menu_item); } @@ -1530,8 +1564,9 @@ // Schedule paints at each alerted menu item. The menu items pull the // animation's current value in their OnPaint methods. for (MenuItemView* item : alerted_items_) { - if (item->GetParentMenuItem()->SubmenuIsShowing()) + if (item->GetParentMenuItem()->SubmenuIsShowing()) { item->SchedulePaint(); + } } } @@ -1554,8 +1589,9 @@ pending_state_.submenu_open != !!(selection_types & SELECTION_OPEN_SUBMENU); - if (pending_item_changed && pending_state_.item) + if (pending_item_changed && pending_state_.item) { SetHotTrackedButton(nullptr); + } // Notify an accessibility focus event on all menu items except for the root. bool ensure_focus_within_popup = @@ -1610,8 +1646,9 @@ // Stop timers. StopCancelAllTimer(); // Resets show timer only when pending menu item is changed. - if (pending_item_changed) + if (pending_item_changed) { StopShowTimer(); + } if (selection_types & SELECTION_UPDATE_IMMEDIATELY) { CommitPendingSelection(); @@ -1633,20 +1670,23 @@ void MenuController::SetSelectionOnPointerDown(SubmenuView* source, const ui::LocatedEvent* event) { - if (for_drop_) + if (for_drop_) { return; + } DCHECK(!active_mouse_view_tracker_->view()); MenuPart part = GetMenuPart(source, event->location()); - if (part.is_scroll()) + if (part.is_scroll()) { return; // Ignore presses on scroll buttons. + } // When this menu is opened through a touch event, a simulated right-click // is sent before the menu appears. Ignore it. if ((event->flags() & ui::EF_RIGHT_MOUSE_BUTTON) && - (event->flags() & ui::EF_FROM_TOUCH)) + (event->flags() & ui::EF_FROM_TOUCH)) { return; + } if (part.type == MenuPartType::kNone || (part.type == MenuPartType::kMenuItem && part.menu && @@ -1678,8 +1718,9 @@ possible_drag_ = true; press_pt_ = event->location(); } - if (part.menu->HasSubmenu() && part.should_submenu_show) + if (part.menu->HasSubmenu() && part.should_submenu_show) { selection_types |= SELECTION_OPEN_SUBMENU; + } } SetSelection(part.menu, selection_types); } @@ -1727,22 +1768,25 @@ DCHECK_EQ(event.type(), ui::EventType::kKeyPressed); // Do not process while performing drag-and-drop. - if (for_drop_) + if (for_drop_) { return false; + } bool handled_key_code = false; const ui::KeyboardCode key_code = event.key_code(); switch (key_code) { case ui::VKEY_HOME: - if (IsEditableCombobox()) + if (IsEditableCombobox()) { break; + } MoveSelectionToFirstOrLastItem(INCREMENT_SELECTION_DOWN); break; case ui::VKEY_END: - if (IsEditableCombobox()) + if (IsEditableCombobox()) { break; + } MoveSelectionToFirstOrLastItem(INCREMENT_SELECTION_UP); break; @@ -1759,21 +1803,25 @@ // Handling of VK_RIGHT and VK_LEFT is different depending on the UI // layout. case ui::VKEY_RIGHT: - if (IsEditableCombobox()) + if (IsEditableCombobox()) { break; - if (base::i18n::IsRTL()) + } + if (base::i18n::IsRTL()) { CloseSubmenu(); - else + } else { OpenSubmenuChangeSelectionIfCan(); + } break; case ui::VKEY_LEFT: - if (IsEditableCombobox()) + if (IsEditableCombobox()) { break; - if (base::i18n::IsRTL()) + } + if (base::i18n::IsRTL()) { OpenSubmenuChangeSelectionIfCan(); - else + } else { CloseSubmenu(); + } break; // On Mac, treat space the same as return. @@ -1784,8 +1832,9 @@ #endif case ui::VKEY_F4: - if (!IsCombobox()) + if (!IsCombobox()) { break; + } // Fallthrough to accept or dismiss combobox menus on F4, like windows. [[fallthrough]]; case ui::VKEY_RETURN: @@ -1805,10 +1854,11 @@ if (pending_state_.item->HasSubmenu()) { if ((key_code == ui::VKEY_F4 || (key_code == ui::VKEY_RETURN && IsEditableCombobox())) && - pending_state_.item->GetSubmenu()->IsShowing()) + pending_state_.item->GetSubmenu()->IsShowing()) { Cancel(ExitType::kAll); - else + } else { OpenSubmenuChangeSelectionIfCan(); + } } else { handled_key_code = true; if (!SendAcceleratorToHotTrackedView(event.flags()) && @@ -1890,10 +1940,12 @@ MenuController::~MenuController() { DCHECK(!showing_); - if (owner_) + if (owner_) { owner_->RemoveObserver(this); - if (active_instance_ == this) + } + if (active_instance_ == this) { active_instance_ = nullptr; + } StopShowTimer(); StopCancelAllTimer(); CHECK(!IsInObserverList()); @@ -1901,8 +1953,9 @@ bool MenuController::SendAcceleratorToHotTrackedView(int event_flags) { Button* hot_view = GetFirstHotTrackedView(pending_state_.item); - if (!hot_view) + if (!hot_view) { return false; + } base::WeakPtr<MenuController> this_ref = AsWeakPtr(); ui::Accelerator accelerator(ui::VKEY_RETURN, event_flags); @@ -1941,8 +1994,9 @@ // static MenuAnchorPosition MenuController::AdjustAnchorPositionForRtl( MenuAnchorPosition position) { - if (!base::i18n::IsRTL()) + if (!base::i18n::IsRTL()) { return position; + } // Reverse anchor position for RTL languages. switch (position) { case MenuAnchorPosition::kTopLeft: @@ -1973,8 +2027,9 @@ // is closed. if (item) { const ui::ElementIdentifier id = item->GetProperty(kElementIdentifierKey); - if (id) + if (id) { views::ElementTrackerViews::GetInstance()->NotifyViewActivated(id, item); + } } // EndPopupFocusOverride before closing the menu, the focus should move on @@ -2020,8 +2075,9 @@ bool MenuController::ShowSiblingMenu(SubmenuView* source, const gfx::Point& mouse_location) { - if (!menu_stack_.empty() || !pressed_lock_.get()) + if (!menu_stack_.empty() || !pressed_lock_.get()) { return false; + } if (Contains(*source, mouse_location)) { // The mouse is over the menu, no need to continue. @@ -2043,8 +2099,10 @@ MenuItemView* alt_menu = source->GetMenuItem()->GetDelegate()->GetSiblingMenu( source->GetMenuItem()->GetRootMenuItem(), screen_point, &anchor, &has_mnemonics, &button); - if (!alt_menu || (state_.item && state_.item->GetRootMenuItem() == alt_menu)) + if (!alt_menu || + (state_.item && state_.item->GetRootMenuItem() == alt_menu)) { return false; + } delegate_->SiblingMenuCreated(alt_menu); @@ -2075,8 +2133,9 @@ // Set the selection immediately, making sure the submenu is only open // if it already was. int selection_types = SELECTION_UPDATE_IMMEDIATELY; - if (state_.item == pending_state_.item && state_.submenu_open) + if (state_.item == pending_state_.item && state_.submenu_open) { selection_types |= SELECTION_OPEN_SUBMENU; + } SetSelection(pending_state_.item, selection_types); if (menu_item->GetDelegate()->ShowContextMenu( @@ -2161,15 +2220,17 @@ part->submenu && part->menu && (part->menu->GetType() == MenuItemView::Type::kSubMenu || IsLocationOverSubmenuAreaOfActionableSubmenu(part->menu, screen_loc)); - if (!part->menu) + if (!part->menu) { part->parent = menu->GetMenuItem(); + } return true; } // Return false for points on ash system UI menu shadows, to search parent // menus. - if (use_ash_system_ui_layout_) + if (use_ash_system_ui_layout_) { return false; + } // While the mouse isn't over a menu item or the scroll buttons of menu, it // is contained by menu and so we return true. If we didn't return true other @@ -2189,12 +2250,14 @@ bool MenuController::IsLocationOverSubmenuAreaOfActionableSubmenu( MenuItemView* item, const gfx::Point& screen_loc) const { - if (!item || item->GetType() != MenuItemView::Type::kActionableSubMenu) + if (!item || item->GetType() != MenuItemView::Type::kActionableSubMenu) { return false; + } gfx::Point view_loc = View::ConvertPointFromScreen(item, screen_loc); - if (base::i18n::IsRTL()) + if (base::i18n::IsRTL()) { view_loc.set_x(item->GetMirroredXInView(view_loc.x())); + } return item->GetSubmenuAreaOfActionableSubmenu().Contains(view_loc); } @@ -2223,8 +2286,9 @@ // Open all the submenus preceeding the last menu item (last menu item is // handled next). if (new_path.size() > 1) { - for (auto i = new_path.begin(); i != new_path.end() - 1; ++i) + for (auto i = new_path.begin(); i != new_path.end() - 1; ++i) { OpenMenu(*i); + } } if (state_.submenu_open) { @@ -2247,18 +2311,21 @@ found = (item->SubmenuIsShowing() && item->GetSubmenu() == scroll_task_->submenu()); } - if (!found) + if (!found) { StopScrollingViaButton(); + } } } void MenuController::CloseMenu(MenuItemView* item) { DCHECK(item); - if (!item->HasSubmenu()) + if (!item->HasSubmenu()) { return; + } - for (MenuItemView* subitem : item->GetSubmenu()->GetMenuItems()) + for (MenuItemView* subitem : item->GetSubmenu()->GetMenuItems()) { UnregisterAlertedItem(subitem); + } item->GetSubmenu()->Hide(); } @@ -2305,8 +2372,9 @@ // Register alerted MenuItemViews so we can animate them. We do this here to // handle both newly-opened submenus and submenus that have changed. for (MenuItemView* subitem : item->GetSubmenu()->GetMenuItems()) { - if (subitem->is_alerted()) + if (subitem->is_alerted()) { RegisterAlertedItem(subitem); + } } if (show) { @@ -2324,10 +2392,11 @@ } else if (state_.context_menu) { if (!menu_stack_.empty()) { auto* last_menu_item = menu_stack_.back().first.item.get(); - if (last_menu_item->SubmenuIsShowing()) + if (last_menu_item->SubmenuIsShowing()) { params.context = last_menu_item->GetSubmenu()->GetWidget(); - else + } else { params.context = last_menu_item->GetWidget(); + } } else { params.context = owner_; } @@ -2369,24 +2438,29 @@ DCHECK(!active_mouse_view_tracker_->view()); // If needed, refresh the AX index assignments. - if (item->GetProperty(kOrderedMenuChildren)) + if (item->GetProperty(kOrderedMenuChildren)) { SetSelectionIndices(item); + } // If the current item or pending item is a descendant of the item // that changed, move the selection back to the changed item. const MenuItemView* ancestor = state_.item; - while (ancestor && ancestor != item) + while (ancestor && ancestor != item) { ancestor = ancestor->GetParentMenuItem(); + } if (!ancestor) { ancestor = pending_state_.item; - while (ancestor && ancestor != item) + while (ancestor && ancestor != item) { ancestor = ancestor->GetParentMenuItem(); - if (!ancestor) + } + if (!ancestor) { return; + } } SetSelection(item, SELECTION_OPEN_SUBMENU | SELECTION_UPDATE_IMMEDIATELY); - if (item->HasSubmenu()) + if (item->HasSubmenu()) { OpenMenuImpl(item, false); + } } void MenuController::BuildPathsAndCalculateDiff( @@ -2405,8 +2479,9 @@ void MenuController::BuildMenuItemPath(MenuItemView* item, std::vector<MenuItemView*>* path) { - if (!item) + if (!item) { return; + } BuildMenuItemPath(item->GetParentMenuItem(), path); path->push_back(item); } @@ -2505,8 +2580,9 @@ menu_bounds.set_x(create_on_right ? right_of_parent : left_of_parent); // Everything after this check requires monitor bounds to be non-empty. - if (ShouldIgnoreScreenBoundsForMenus() || monitor_bounds.IsEmpty()) + if (ShouldIgnoreScreenBoundsForMenus() || monitor_bounds.IsEmpty()) { return menu_bounds; + } // Menu does not actually fit where it was placed, move it to the other side // and update `resulting_direction`. @@ -2540,8 +2616,9 @@ menu_bounds.set_x(horizontally_centered); menu_bounds.set_y(above_anchor - kTouchYPadding); if (!ShouldIgnoreScreenBoundsForMenus() && - menu_bounds.y() < monitor_bounds.y()) + menu_bounds.y() < monitor_bounds.y()) { menu_bounds.set_y(anchor_bounds.y() + kTouchYPadding); + } } if (item->actual_menu_position() == MenuPosition::kAboveBounds) { @@ -2550,8 +2627,9 @@ } // Everything beyond this point requires monitor bounds to be non-empty. - if (ShouldIgnoreScreenBoundsForMenus() || monitor_bounds.IsEmpty()) + if (ShouldIgnoreScreenBoundsForMenus() || monitor_bounds.IsEmpty()) { return menu_bounds; + } // If the menu position is below or above the anchor bounds, force it to fit // on the screen. Otherwise, try to fit the menu in the following locations: @@ -2586,14 +2664,16 @@ // Prefer menu to right of anchor bounds but move it to left if it // doesn't fit. menu_bounds.set_x(right_of_anchor); - if (menu_bounds.right() > monitor_bounds.right()) + if (menu_bounds.right() > monitor_bounds.right()) { menu_bounds.set_x(left_of_anchor); + } } else { // Prefer menu to left of anchor bounds but move it to right if it // doesn't fit. menu_bounds.set_x(left_of_anchor); - if (menu_bounds.x() < monitor_bounds.x()) + if (menu_bounds.x() < monitor_bounds.x()) { menu_bounds.set_x(right_of_anchor); + } } } else { // The delegate doesn't want the menu repositioned to the side, and it @@ -2751,7 +2831,7 @@ case MenuAnchorPosition::kBubbleBottomRight: case MenuAnchorPosition::kTopLeft: x = x_menu_on_right + menu_size.width() - border_insets.right() <= - monitor_bounds.right() + monitor_bounds.right() ? x_menu_on_right : x_menu_on_left; break; @@ -2937,8 +3017,9 @@ SubmenuView* const submenu = parent->GetSubmenu(); for (MenuItemView* item : submenu->GetMenuItems()) { - if (!item->IsTraversableByKeyboard()) + if (!item->IsTraversableByKeyboard()) { continue; + } bool found_focusable = false; if (!item->children().empty()) { @@ -2948,16 +3029,18 @@ found_focusable = true; } } - if (!found_focusable) + if (!found_focusable) { ordering.push_back(item); + } } parent->SetProperty(kOrderedMenuChildren, std::make_unique<std::vector<ViewTracker>>( ordering.begin(), ordering.end())); - if (ordering.empty()) + if (ordering.empty()) { return; + } const size_t set_size = ordering.size(); for (size_t i = 0; i < set_size; ++i) { @@ -2973,8 +3056,9 @@ MenuItemView* submenu = nullptr; if (pending_state_.submenu_open && item->SubmenuIsShowing()) { - if (item->GetSubmenu()->GetMenuItems().empty()) + if (item->GetSubmenu()->GetMenuItems().empty()) { return; + } // A menu is selected and open, but none of its children are selected, // select the first or last menu item that is visible and enabled. @@ -2994,14 +3078,16 @@ if (direction == INCREMENT_SELECTION_DOWN) { for (size_t index = 0; index < parent_count; ++index) { MenuItemView* child = parent->GetSubmenu()->GetMenuItemAt(index); - if (child->IsTraversableByKeyboard()) + if (child->IsTraversableByKeyboard()) { return child; + } } } else { for (size_t index = parent_count; index > 0; --index) { MenuItemView* child = parent->GetSubmenu()->GetMenuItemAt(index - 1); - if (child->IsTraversableByKeyboard()) + if (child->IsTraversableByKeyboard()) { return child; + } } } return nullptr; @@ -3009,20 +3095,23 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() { MenuItemView* item = pending_state_.item; - if (!item->HasSubmenu() || !item->GetEnabled()) + if (!item->HasSubmenu() || !item->GetEnabled()) { return; + } // Show the sub-menu. SetSelection(item, SELECTION_OPEN_SUBMENU | SELECTION_UPDATE_IMMEDIATELY); MenuItemView* to_select = nullptr; - if (!item->GetSubmenu()->GetMenuItems().empty()) + if (!item->GetSubmenu()->GetMenuItems().empty()) { to_select = FindInitialSelectableMenuItem(item, INCREMENT_SELECTION_DOWN); + } if (to_select) { // Selection is going from the ACTIONABLE to the SUBMENU region of the // ACTIONABLE_SUBMENU, so highlight the SUBMENU area. - if (item->type_ == MenuItemView::Type::kActionableSubMenu) + if (item->type_ == MenuItemView::Type::kActionableSubMenu) { item->SetSelectionOfActionableSubmenu(true); + } SetSelection(to_select, SELECTION_UPDATE_IMMEDIATELY); } } @@ -3030,12 +3119,14 @@ void MenuController::CloseSubmenu() { MenuItemView* item = state_.item; DCHECK(item); - if (!item->GetParentMenuItem()) + if (!item->GetParentMenuItem()) { return; - if (item->SubmenuIsShowing()) + } + if (item->SubmenuIsShowing()) { SetSelection(item, SELECTION_UPDATE_IMMEDIATELY); - else if (item->GetParentMenuItem()->GetParentMenuItem()) + } else if (item->GetParentMenuItem()->GetParentMenuItem()) { SetSelection(item->GetParentMenuItem(), SELECTION_UPDATE_IMMEDIATELY); + } } MenuController::SelectByCharDetails MenuController::FindChildForMnemonic( @@ -3050,8 +3141,9 @@ for (size_t i = 0; i < menu_items.size(); ++i) { MenuItemView* child = menu_items[i]; if (child->GetEnabled() && child->GetVisible()) { - if (child == pending_state_.item) + if (child == pending_state_.item) { details.index_of_item = i; + } if (match_function(child, key)) { if (!details.first_match.has_value()) { details.first_match = i; @@ -3059,8 +3151,9 @@ details.has_multiple = true; } if (!details.next_match.has_value() && - details.index_of_item.has_value() && i > details.index_of_item) + details.index_of_item.has_value() && i > details.index_of_item) { details.next_match = i; + } } } } @@ -3094,21 +3187,25 @@ void MenuController::SelectByChar(char16_t character) { // Do not process while performing drag-and-drop. - if (for_drop_) + if (for_drop_) { return; - if (!character) + } + if (!character) { return; + } char16_t char_array[] = {character, 0}; char16_t key = base::i18n::ToLower(char_array)[0]; MenuItemView* item = pending_state_.item; - if (!item->SubmenuIsShowing()) + if (!item->SubmenuIsShowing()) { item = item->GetParentMenuItem(); + } DCHECK(item); DCHECK(item->HasSubmenu()); DCHECK(item->GetSubmenu()); - if (item->GetSubmenu()->GetMenuItems().empty()) + if (item->GetSubmenu()->GetMenuItems().empty()) { return; + } // Look for matches based on mnemonic first. SelectByCharDetails details = @@ -3126,8 +3223,9 @@ } else { // If no mnemonics found, look at first character of titles. details = FindChildForMnemonic(item, key, &TitleMatchesMnemonic); - if (details.first_match.has_value()) + if (details.first_match.has_value()) { AcceptOrSelect(item, details); + } } } @@ -3161,8 +3259,9 @@ } // Reposting the event may have deleted this, if so exit. - if (!this_ref) + if (!this_ref) { return; + } } #endif @@ -3194,8 +3293,9 @@ void MenuController::SetDropMenuItem(MenuItemView* new_target, MenuDelegate::DropPosition new_position) { - if (new_target == drop_target_ && new_position == drop_position_) + if (new_target == drop_target_ && new_position == drop_position_) { return; + } if (drop_target_) { drop_target_->GetParentMenuItem()->GetSubmenu()->SetDropMenuItem( @@ -3214,8 +3314,9 @@ return; } - if (!scroll_task_.get()) + if (!scroll_task_.get()) { scroll_task_ = std::make_unique<MenuScrollTask>(); + } scroll_task_->Update(part); } @@ -3236,8 +3337,9 @@ target_menu_loc = ConvertToScreen(*event_source, target_menu_loc); View::ConvertPointFromScreen(target_menu, &target_menu_loc); target = target_menu->GetEventHandlerForPoint(target_menu_loc); - if (target == target_menu || !target->GetEnabled()) + if (target == target_menu || !target->GetEnabled()) { target = nullptr; + } } View* active_mouse_view = active_mouse_view_tracker_->view(); if (target != active_mouse_view) { @@ -3272,8 +3374,9 @@ void MenuController::SendMouseReleaseToActiveView(SubmenuView* event_source, const ui::MouseEvent& event) { View* active_mouse_view = active_mouse_view_tracker_->view(); - if (!active_mouse_view) + if (!active_mouse_view) { return; + } const gfx::Point target_loc = View::ConvertPointFromScreen( active_mouse_view, ConvertToScreen(*event_source, event.location())); @@ -3288,8 +3391,9 @@ void MenuController::SendMouseCaptureLostToActiveView() { View* active_mouse_view = active_mouse_view_tracker_->view(); - if (!active_mouse_view) + if (!active_mouse_view) { return; + } // Reset the active mouse view before sending mouse capture lost. That way if // it calls back to us, we aren't in a weird state. @@ -3311,8 +3415,9 @@ delegate->OnMenuClosed(internal::MenuControllerDelegate::NOTIFY_DELEGATE, result, accept_event_flags); // |delegate| may have deleted this. - if (this_ref && nested && exit_type_ == ExitType::kAll) + if (this_ref && nested && exit_type_ == ExitType::kAll) { ExitMenu(); + } } MenuItemView* MenuController::ExitTopMostMenu() { @@ -3385,34 +3490,39 @@ SetSelection(nullptr, SELECTION_UPDATE_IMMEDIATELY | SELECTION_EXIT); // Set exit_all_, which makes sure all nested loops exit immediately. - if (exit_type_ != ExitType::kDestroyed) + if (exit_type_ != ExitType::kDestroyed) { SetExitType(ExitType::kAll); + } } // Reset our pressed lock and hot-tracked state to the previous state's, if // they were active. The lock handles the case if the button was destroyed. pressed_lock_ = std::move(nested_pressed_lock); - if (hot_button_) + if (hot_button_) { hot_button_->SetHotTracked(true); + } return result; } void MenuController::HandleMouseLocation(SubmenuView* source, const gfx::Point& mouse_location) { - if (showing_submenu_) + if (showing_submenu_) { return; + } // Ignore mouse events if we're closing the menu. - if (exit_type_ != ExitType::kNone) + if (exit_type_ != ExitType::kNone) { return; + } MenuPart part = GetMenuPart(source, mouse_location); UpdateScrolling(part); - if (for_drop_) + if (for_drop_) { return; + } if (part.type == MenuPartType::kNone && ShowSiblingMenu(source, mouse_location)) { @@ -3435,8 +3545,9 @@ void MenuController::SetInitialHotTrackedView( MenuItemView* item, SelectionIncrementDirectionType direction) { - if (!item) + if (!item) { return; + } SetSelection(item, SELECTION_DEFAULT); View* hot_view = GetInitialFocusableView(item, direction == INCREMENT_SELECTION_DOWN); @@ -3447,12 +3558,14 @@ MenuItemView* item, SelectionIncrementDirectionType direction) { MenuItemView* parent = item->GetParentMenuItem(); - if (!parent) + if (!parent) { return; + } const auto menu_items = parent->GetSubmenu()->GetMenuItems(); const size_t num_menu_items = menu_items.size(); - if (num_menu_items <= 1) + if (num_menu_items <= 1) { return; + } const auto i = base::ranges::find(menu_items, item); DCHECK(i != menu_items.cend()); auto index = static_cast<size_t>(std::distance(menu_items.cbegin(), i)); @@ -3468,8 +3581,9 @@ direction == INCREMENT_SELECTION_UP ? (num_menu_items - 1) : 1; while (true) { index = (index + delta) % num_menu_items; - if (index == stop_index) + if (index == stop_index) { return; + } // Stop on the next keyboard-traversable item. MenuItemView* child = parent->GetSubmenu()->GetMenuItemAt(index); if (child->IsTraversableByKeyboard()) { @@ -3502,8 +3616,9 @@ bool MenuController::ShouldContinuePrefixSelection() const { MenuItemView* item = pending_state_.item; - if (!item->SubmenuIsShowing()) + if (!item->SubmenuIsShowing()) { item = item->GetParentMenuItem(); + } return item->GetSubmenu()->GetPrefixSelector()->ShouldContinueSelection(); } @@ -3520,8 +3635,9 @@ void MenuController::UnregisterAlertedItem(MenuItemView* item) { alerted_items_.erase(item); // Stop animation if necessary. - if (alerted_items_.empty()) + if (alerted_items_.empty()) { alert_animation_.Stop(); + } } void MenuController::SetAnchorParametersForItem(MenuItemView* item,
diff --git a/ui/views/controls/menu/menu_host.cc b/ui/views/controls/menu/menu_host.cc index 4e87636..a462f65 100644 --- a/ui/views/controls/menu/menu_host.cc +++ b/ui/views/controls/menu/menu_host.cc
@@ -155,8 +155,9 @@ // If MenuHost has no parent widget, it needs to be marked // Activatable, so that calling Show in ShowMenuHost will // get keyboard focus. - if (init_params.parent == nullptr) + if (init_params.parent == nullptr) { params.activatable = Widget::InitParams::Activatable::kYes; + } #if BUILDFLAG(IS_WIN) // On Windows use the software compositor to ensure that we don't block @@ -275,8 +276,9 @@ } void MenuHost::ReleaseMenuHostCapture() { - if (native_widget_private()->HasCapture()) + if (native_widget_private()->HasCapture()) { native_widget_private()->ReleaseCapture(); + } } //////////////////////////////////////////////////////////////////////////////// @@ -287,16 +289,19 @@ } void MenuHost::OnMouseCaptureLost() { - if (destroying_ || ignore_capture_lost_) + if (destroying_ || ignore_capture_lost_) { return; + } - if (!ViewsDelegate::GetInstance()->ShouldCloseMenuIfMouseCaptureLost()) + if (!ViewsDelegate::GetInstance()->ShouldCloseMenuIfMouseCaptureLost()) { return; + } MenuController* menu_controller = submenu_->GetMenuItem()->GetMenuController(); - if (menu_controller && !menu_controller->drag_in_progress()) + if (menu_controller && !menu_controller->drag_in_progress()) { menu_controller->Cancel(MenuController::ExitType::kAll); + } Widget::OnMouseCaptureLost(); } @@ -311,13 +316,15 @@ } void MenuHost::OnOwnerClosing() { - if (destroying_) + if (destroying_) { return; + } MenuController* menu_controller = submenu_->GetMenuItem()->GetMenuController(); - if (menu_controller && !menu_controller->drag_in_progress()) + if (menu_controller && !menu_controller->drag_in_progress()) { menu_controller->Cancel(MenuController::ExitType::kAll); + } } void MenuHost::OnDragWillStart() { @@ -330,12 +337,14 @@ void MenuHost::OnDragComplete() { // If we are being destroyed there is no guarantee that the menu items are // available. - if (destroying_) + if (destroying_) { return; + } MenuController* menu_controller = submenu_->GetMenuItem()->GetMenuController(); - if (!menu_controller) + if (!menu_controller) { return; + } bool should_close = menu_controller->exit_type() != MenuController::ExitType::kNone;
diff --git a/ui/views/controls/menu/menu_host_root_view.cc b/ui/views/controls/menu/menu_host_root_view.cc index a4a72b8..c4c25b8 100644 --- a/ui/views/controls/menu/menu_host_root_view.cc +++ b/ui/views/controls/menu/menu_host_root_view.cc
@@ -25,13 +25,15 @@ } void MenuHostRootView::OnMouseReleased(const ui::MouseEvent& event) { - if (GetMenuControllerForInputEvents()) + if (GetMenuControllerForInputEvents()) { GetMenuControllerForInputEvents()->OnMouseReleased(submenu_, event); + } } void MenuHostRootView::OnMouseMoved(const ui::MouseEvent& event) { - if (GetMenuControllerForInputEvents()) + if (GetMenuControllerForInputEvents()) { GetMenuControllerForInputEvents()->OnMouseMoved(submenu_, event); + } } bool MenuHostRootView::OnMouseWheel(const ui::MouseWheelEvent& event) { @@ -48,8 +50,9 @@ void MenuHostRootView::ViewHierarchyChanged( const ViewHierarchyChangedDetails& details) { - if (GetMenuControllerForInputEvents()) + if (GetMenuControllerForInputEvents()) { GetMenuControllerForInputEvents()->ViewHierarchyChanged(submenu_, details); + } RootView::ViewHierarchyChanged(details); } @@ -81,8 +84,9 @@ // TODO(tdanderson): Investigate whether this should be moved into a // post-target handler installed on |this| instead // (invoked only if event->target() == this). - if (event->IsGestureEvent() && !event->handled() && GetMenuController()) + if (event->IsGestureEvent() && !event->handled() && GetMenuController()) { GetMenuController()->OnGestureEvent(submenu_, event->AsGestureEvent()); + } } MenuController* MenuHostRootView::GetMenuController() {
diff --git a/ui/views/controls/menu/menu_item_view.cc b/ui/views/controls/menu/menu_item_view.cc index 3a40d2e4..9e94823 100644 --- a/ui/views/controls/menu/menu_item_view.cc +++ b/ui/views/controls/menu/menu_item_view.cc
@@ -120,8 +120,9 @@ void MenuItemView::OnThemeChanged() { View::OnThemeChanged(); // Force updating as the colors may have changed. - if (!IsScheduledForDeletion()) + if (!IsScheduledForDeletion()) { UpdateSelectionBasedState(ShouldPaintAsSelected(PaintMode::kNormal)); + } // Update the name when the theme changes, as the name depends on few // attributes like title, minor_text, which are likely to change with the @@ -239,13 +240,15 @@ // If the creator/owner of the MenuItemView has explicitly set the focus // behavior to something other than the default NEVER, don't override it. View::FocusBehavior focus_behavior = View::GetFocusBehavior(); - if (focus_behavior != FocusBehavior::NEVER) + if (focus_behavior != FocusBehavior::NEVER) { return focus_behavior; + } // Some MenuItemView types are presumably never focusable, even by assistive // technologies. - if (type_ == Type::kEmpty || type_ == Type::kSeparator) + if (type_ == Type::kEmpty || type_ == Type::kSeparator) { return FocusBehavior::NEVER; + } // The rest of the MenuItemView types are presumably focusable, at least by // assistive technologies. But if they lack presentable information, then @@ -290,8 +293,9 @@ accessible_name.substr(index + 1)); // Special case for "&&" (escaped for "&"). - if (accessible_name[index] == '&') + if (accessible_name[index] == '&') { ++index; + } } // Append subtext. @@ -361,8 +365,9 @@ if (type == Type::kHighlighted) { item->set_vertical_margin(MenuConfig::instance().footnote_vertical_margin); } - if (GetDelegate() && !GetDelegate()->IsCommandVisible(item_id)) + if (GetDelegate() && !GetDelegate()->IsCommandVisible(item_id)) { item->SetVisible(false); + } auto* added_item = submenu_->AddChildViewAt(item, index); added_item->UpdateTooltipText(); @@ -436,8 +441,9 @@ } SubmenuView* MenuItemView::CreateSubmenu() { - if (submenu_) + if (submenu_) { return submenu_.get(); + } submenu_ = std::make_unique<SubmenuView>(/*parent=*/this); submenu_->SetProperty(kElementIdentifierKey, submenu_id_); @@ -461,8 +467,9 @@ // Force an update as `submenu_arrow_image_view_` needs to be updated. The // state is also updated when the theme changes (which is also called when // added to a widget). - if (GetWidget()) + if (GetWidget()) { UpdateSelectionBasedState(ShouldPaintAsSelected(PaintMode::kNormal)); + } SchedulePaint(); @@ -513,8 +520,9 @@ } void MenuItemView::SetSelected(bool selected) { - if (selected_ == selected) + if (selected_ == selected) { return; + } selected_ = selected; UpdateAccessibleSelection(); @@ -572,8 +580,9 @@ RemoveChildViewT(icon_view_.ExtractAsDangling()); } - if (icon_view) + if (icon_view) { icon_view_ = AddChildView(std::move(icon_view)); + } } UpdateSelectionBasedStateIfChanged(PaintMode::kNormal); @@ -619,8 +628,9 @@ } const MenuItemView::MenuItemDimensions& MenuItemView::GetDimensions() const { - if (!is_dimensions_valid()) + if (!is_dimensions_valid()) { dimensions_ = CalculateDimensions(); + } DCHECK(is_dimensions_valid()); return dimensions_; } @@ -688,14 +698,17 @@ } MenuItemView* MenuItemView::GetMenuItemByID(int id) { - if (GetCommand() == id) + if (GetCommand() == id) { return this; - if (!HasSubmenu()) + } + if (!HasSubmenu()) { return nullptr; + } for (MenuItemView* item : GetSubmenu()->GetMenuItems()) { MenuItemView* result = item->GetMenuItemByID(id); - if (result) + if (result) { return result; + } } return nullptr; } @@ -826,8 +839,9 @@ } void MenuItemView::SetForcedVisualSelection(bool selected) { - if (selected == forced_visual_selection_) + if (selected == forced_visual_selection_) { return; + } forced_visual_selection_ = selected; UpdateSelectionBasedStateIfChanged(PaintMode::kNormal); @@ -893,14 +907,16 @@ UpdateAccessibleCheckedState(); } - if (type_ == Type::kActionableSubMenu) + if (type_ == Type::kActionableSubMenu) { vertical_separator_ = AddChildView(std::make_unique<VerticalSeparator>()); + } // Don't request enabled status from the root menu item as it is just // a container for real items. kEmpty items will be disabled. MenuDelegate* root_delegate = GetDelegate(); - if (parent && type != Type::kEmpty && root_delegate) + if (parent && type != Type::kEmpty && root_delegate) { SetEnabled(root_delegate->IsCommandEnabled(command)); + } SetLayoutManager(std::make_unique<DelegatingLayoutManager>(this)); visible_changed_callback_ = AddVisibleChangedCallback(base::BindRepeating( @@ -968,8 +984,9 @@ const std::optional<SkColor> MenuItemView::GetMenuLabelColor() const { if (const MenuDelegate* delegate = GetDelegate()) { - if (const auto& label_color = delegate->GetLabelColor(GetCommand())) + if (const auto& label_color = delegate->GetLabelColor(GetCommand())) { return label_color; + } } return std::nullopt; } @@ -1050,8 +1067,9 @@ gfx::Rect text_bounds(label_start, top_margin, width, text_height); text_bounds.set_x(GetMirroredXForRect(text_bounds)); int flags = GetDrawStringFlags(); - if (mode == PaintMode::kForDrag) + if (mode == PaintMode::kForDrag) { flags |= gfx::Canvas::NO_SUBPIXEL_RENDERING; + } canvas->DrawStringRectWithFlags(title(), font_list, colors.fg_color, text_bounds, flags); @@ -1238,8 +1256,9 @@ std::u16string MenuItemView::CalculateAccessibleName() const { std::u16string item_text = View::GetViewAccessibility().GetCachedName(); - if (!item_text.empty()) + if (!item_text.empty()) { return item_text; + } // Use the default accessible name if none is provided. if (IsContainer()) { @@ -1255,27 +1274,33 @@ } void MenuItemView::DestroyAllMenuHosts() { - if (!HasSubmenu()) + if (!HasSubmenu()) { return; + } submenu_->Close(); - for (MenuItemView* item : submenu_->GetMenuItems()) + for (MenuItemView* item : submenu_->GetMenuItems()) { item->DestroyAllMenuHosts(); + } } gfx::Size MenuItemView::GetChildPreferredSize() const { - if (children().empty()) + if (children().empty()) { return gfx::Size(); + } - if (IsContainer()) + if (IsContainer()) { return children().front()->GetPreferredSize({}); + } const auto add_width = [this](int width, const View* child) { if (child == icon_view_ || child == radio_check_image_view_ || - child == submenu_arrow_image_view_ || child == vertical_separator_) + child == submenu_arrow_image_view_ || child == vertical_separator_) { return width; - if (width) + } + if (width) { width += kChildHorizontalPadding; + } return width + child->GetPreferredSize({}).width(); }; const int width = @@ -1471,12 +1496,14 @@ // Selection state depends upon NativeTheme. Selection based state could also // depend on the menu model so avoid the update if the item is scheduled to be // deleted. - if (!GetWidget() || IsScheduledForDeletion()) + if (!GetWidget() || IsScheduledForDeletion()) { return; + } const bool paint_as_selected = ShouldPaintAsSelected(mode); - if (paint_as_selected != last_paint_as_selected_) + if (paint_as_selected != last_paint_as_selected_) { UpdateSelectionBasedState(paint_as_selected); + } } void MenuItemView::UpdateSelectionBasedState(bool paint_as_selected) {
diff --git a/ui/views/controls/menu/menu_pre_target_handler_aura.cc b/ui/views/controls/menu/menu_pre_target_handler_aura.cc index 697188f..ea8ce147 100644 --- a/ui/views/controls/menu/menu_pre_target_handler_aura.cc +++ b/ui/views/controls/menu/menu_pre_target_handler_aura.cc
@@ -45,8 +45,9 @@ wm::ActivationChangeObserver::ActivationReason reason, aura::Window* gained_active, aura::Window* lost_active) { - if (!controller_->drag_in_progress()) + if (!controller_->drag_in_progress()) { controller_->Cancel(MenuController::ExitType::kAll); + } } void MenuPreTargetHandlerAura::OnWindowDestroying(aura::Window* window) { @@ -109,12 +110,14 @@ } void MenuPreTargetHandlerAura::Cleanup() { - if (!root_) + if (!root_) { return; + } // The ActivationClient may have been destroyed by the time we get here. wm::ActivationClient* client = wm::GetActivationClient(root_); - if (client) + if (client) { client->RemoveObserver(this); + } root_->RemoveObserver(this); root_ = nullptr; }
diff --git a/ui/views/controls/menu/menu_pre_target_handler_mac.mm b/ui/views/controls/menu/menu_pre_target_handler_mac.mm index 188faa3..b33180d 100644 --- a/ui/views/controls/menu/menu_pre_target_handler_mac.mm +++ b/ui/views/controls/menu/menu_pre_target_handler_mac.mm
@@ -29,10 +29,12 @@ void MenuPreTargetHandlerMac::NativeWidgetMacEventMonitorOnEvent( ui::Event* ui_event, bool* was_handled) { - if (*was_handled) + if (*was_handled) { return; - if (!ui_event->IsKeyEvent()) + } + if (!ui_event->IsKeyEvent()) { return; + } *was_handled = controller_->OnWillDispatchKeyEvent(ui_event->AsKeyEvent()) != ui::POST_DISPATCH_PERFORM_DEFAULT; }
diff --git a/ui/views/controls/menu/menu_runner_cocoa_unittest.mm b/ui/views/controls/menu/menu_runner_cocoa_unittest.mm index c78d98ee..4325285 100644 --- a/ui/views/controls/menu/menu_runner_cocoa_unittest.mm +++ b/ui/views/controls/menu/menu_runner_cocoa_unittest.mm
@@ -56,8 +56,9 @@ void ExecuteCommand(int command_id, int event_flags) override {} void OnMenuWillShow(SimpleMenuModel* source) override { - if (!model_->menu_open_callback_.is_null()) + if (!model_->menu_open_callback_.is_null()) { std::move(model_->menu_open_callback_).Run(); + } } bool GetAcceleratorForCommandId( @@ -119,10 +120,11 @@ base::RepeatingClosure on_close = base::BindRepeating( &MenuRunnerCocoaTest::MenuCloseCallback, base::Unretained(this)); - if (GetParam() == MenuType::NATIVE) + if (GetParam() == MenuType::NATIVE) { runner_ = new internal::MenuRunnerImplCocoa(menu_.get(), on_close); - else + } else { runner_ = new internal::MenuRunnerImplAdapter(menu_.get(), on_close); + } EXPECT_FALSE(runner_->IsRunning()); } @@ -198,8 +200,9 @@ } NSMenu* GetNativeNSMenu() { - if (GetParam() == MenuType::VIEWS) + if (GetParam() == MenuType::VIEWS) { return nil; + } internal::MenuRunnerImplCocoa* cocoa_runner = static_cast<internal::MenuRunnerImplCocoa*>(runner_); @@ -255,8 +258,9 @@ // Run a nested run loop so that async and sync menus can be tested the // same way. void MaybeRunAsync() { - if (!IsAsync()) + if (!IsAsync()) { return; + } base::RunLoop run_loop; quit_closure_ = run_loop.QuitClosure();
diff --git a/ui/views/controls/menu/menu_runner_impl.cc b/ui/views/controls/menu/menu_runner_impl.cc index 13fd4d8..bf7f7c6 100644 --- a/ui/views/controls/menu/menu_runner_impl.cc +++ b/ui/views/controls/menu/menu_runner_impl.cc
@@ -80,8 +80,9 @@ void MenuRunnerImpl::Release() { if (running_) { - if (delete_after_run_) + if (delete_after_run_) { return; // We already canceled. + } // The menu is running a nested run loop, we can't delete it now // otherwise the stack would be in a really bad state (many frames would @@ -91,8 +92,9 @@ // Swap in a different delegate. That way we know the original MenuDelegate // won't be notified later on (when it's likely already been deleted). - if (!empty_delegate_.get()) + if (!empty_delegate_.get()) { empty_delegate_ = std::make_unique<MenuDelegate>(); + } menu_->set_delegate(empty_delegate_.get()); // Verify that the MenuController is still active. It may have been @@ -167,12 +169,13 @@ DCHECK((run_types & MenuRunner::COMBOBOX) == 0 || (run_types & MenuRunner::EDITABLE_COMBOBOX) == 0); using ComboboxType = MenuController::ComboboxType; - if (run_types & MenuRunner::COMBOBOX) + if (run_types & MenuRunner::COMBOBOX) { controller->set_combobox_type(ComboboxType::kReadonly); - else if (run_types & MenuRunner::EDITABLE_COMBOBOX) + } else if (run_types & MenuRunner::EDITABLE_COMBOBOX) { controller->set_combobox_type(ComboboxType::kEditable); - else + } else { controller->set_combobox_type(ComboboxType::kNone); + } controller->set_send_gesture_events_to_owner( (run_types & MenuRunner::SEND_GESTURE_EVENTS_TO_OWNER) != 0); controller->set_use_ash_system_ui_layout( @@ -194,8 +197,9 @@ } void MenuRunnerImpl::Cancel() { - if (running_) + if (running_) { controller_->Cancel(MenuController::ExitType::kAll); + } } base::TimeTicks MenuRunnerImpl::GetClosingEventTime() const { @@ -209,8 +213,9 @@ if (controller_) { closing_event_time_ = controller_->closing_event_time(); // Get a pointer to the parent widget before destroying the menu. - if (controller_->owner()) + if (controller_->owner()) { parent_widget = controller_->owner()->GetWeakPtr(); + } } menu_->set_controller(nullptr); @@ -239,8 +244,9 @@ mouse_event_flags); } // Only notify the delegate if it did not delete this. - if (ref && type == NOTIFY_DELEGATE) + if (ref && type == NOTIFY_DELEGATE) { menu_->GetDelegate()->OnMenuClosed(menu); + } } FireFocusAfterMenuClose(parent_widget); }
diff --git a/ui/views/controls/menu/menu_runner_impl_cocoa.h b/ui/views/controls/menu/menu_runner_impl_cocoa.h index e315ccc4..f5b0936 100644 --- a/ui/views/controls/menu/menu_runner_impl_cocoa.h +++ b/ui/views/controls/menu/menu_runner_impl_cocoa.h
@@ -6,6 +6,7 @@ #define UI_VIEWS_CONTROLS_MENU_MENU_RUNNER_IMPL_COCOA_H_ #include <stdint.h> + #include <string> #include "base/functional/callback.h"
diff --git a/ui/views/controls/menu/menu_runner_impl_cocoa.mm b/ui/views/controls/menu/menu_runner_impl_cocoa.mm index 52f3f0b..e1e3f0d 100644 --- a/ui/views/controls/menu/menu_runner_impl_cocoa.mm +++ b/ui/views/controls/menu/menu_runner_impl_cocoa.mm
@@ -46,8 +46,9 @@ void MenuRunnerImplCocoa::Release() { if (IsRunning()) { - if (delete_after_run_) + if (delete_after_run_) { return; // We already canceled. + } delete_after_run_ = true; @@ -105,8 +106,9 @@ // Don't invoke the callback if Release() was called, since that usually means // the owning instance is being destroyed. - if (!on_menu_closed_callback_.is_null()) + if (!on_menu_closed_callback_.is_null()) { on_menu_closed_callback_.Run(); + } } void MenuRunnerImplCocoa::Cancel() {
diff --git a/ui/views/controls/menu/menu_runner_unittest.cc b/ui/views/controls/menu/menu_runner_unittest.cc index a96c4ef..42e1ceeb 100644 --- a/ui/views/controls/menu/menu_runner_unittest.cc +++ b/ui/views/controls/menu/menu_runner_unittest.cc
@@ -107,8 +107,9 @@ // ViewsTestBase: void TearDown() override { ResetMenuItemView(); - if (owner_) + if (owner_) { owner_->CloseNow(); + } #if BUILDFLAG(IS_MAC) MenuCocoaWatcherMac::SetNotificationFilterForTesting( @@ -207,8 +208,9 @@ #define MAYBE_LatinMnemonic LatinMnemonic #endif TEST_F(MenuRunnerTest, MAYBE_LatinMnemonic) { - if (!MenuSupportsMnemonics()) + if (!MenuSupportsMnemonics()) { return; + } views::test::DisableMenuClosureAnimations(); InitMenuRunner(0); @@ -231,8 +233,9 @@ // Tests that a key press on a non-US keyboard layout activates the correct menu // item. Disabled on Windows because a WM_CHAR event does not activate an item. TEST_F(MenuRunnerTest, NonLatinMnemonic) { - if (!MenuSupportsMnemonics()) + if (!MenuSupportsMnemonics()) { return; + } views::test::DisableMenuClosureAnimations(); InitMenuRunner(0); @@ -255,8 +258,9 @@ #endif // !BUILDFLAG(IS_WIN) TEST_F(MenuRunnerTest, MenuItemViewShowsMnemonics) { - if (!MenuSupportsMnemonics()) + if (!MenuSupportsMnemonics()) { return; + } InitMenuRunner(MenuRunner::HAS_MNEMONICS | MenuRunner::SHOULD_SHOW_MNEMONICS); @@ -268,8 +272,9 @@ } TEST_F(MenuRunnerTest, MenuItemViewDoesNotShowMnemonics) { - if (!MenuSupportsMnemonics()) + if (!MenuSupportsMnemonics()) { return; + } InitMenuRunner(MenuRunner::HAS_MNEMONICS); @@ -281,8 +286,9 @@ } TEST_F(MenuRunnerTest, PrefixSelect) { - if (!MenuConfig::instance().all_menus_use_prefix_selection) + if (!MenuConfig::instance().all_menus_use_prefix_selection) { return; + } base::SimpleTestTickClock clock; @@ -334,8 +340,9 @@ // activates menu items. #if BUILDFLAG(IS_MAC) TEST_F(MenuRunnerTest, SpaceActivatesItem) { - if (!MenuConfig::instance().all_menus_use_prefix_selection) + if (!MenuConfig::instance().all_menus_use_prefix_selection) { return; + } views::test::DisableMenuClosureAnimations(); InitMenuRunner(0); @@ -741,8 +748,9 @@ // This is not expected to run, however this is from the origin ASAN stack // traces. So regressions will be caught with the same stack trace. - if (menu_controller.controller()) + if (menu_controller.controller()) { menu_controller.controller()->Cancel(MenuController::ExitType::kAll); + } EXPECT_EQ(nullptr, menu_controller.controller()); } @@ -834,8 +842,9 @@ [](bool* focus_after_menu_close_sent, const ui::AXPlatformNodeDelegate* delegate, const ax::mojom::Event event_type) { - if (event_type == ax::mojom::Event::kFocusAfterMenuClose) + if (event_type == ax::mojom::Event::kFocusAfterMenuClose) { *focus_after_menu_close_sent = true; + } }, &focus_after_menu_close_sent); button->GetViewAccessibility().set_accessibility_events_callback( @@ -896,8 +905,9 @@ [](bool* focus_after_menu_close_sent, const ui::AXPlatformNodeDelegate* delegate, const ax::mojom::Event event_type) { - if (event_type == ax::mojom::Event::kFocusAfterMenuClose) + if (event_type == ax::mojom::Event::kFocusAfterMenuClose) { *focus_after_menu_close_sent = true; + } }, &focus_after_menu_close_sent); button->GetViewAccessibility().set_accessibility_events_callback( @@ -918,8 +928,9 @@ // This is not expected to run, however this is from the origin ASAN stack // traces. So regressions will be caught with the same stack trace. - if (menu_controller.controller()) + if (menu_controller.controller()) { menu_controller.controller()->Cancel(MenuController::ExitType::kAll); + } EXPECT_EQ(nullptr, menu_controller.controller()); }
diff --git a/ui/views/controls/menu/menu_scroll_view_container.cc b/ui/views/controls/menu/menu_scroll_view_container.cc index 3dc4156..1da21319 100644 --- a/ui/views/controls/menu/menu_scroll_view_container.cc +++ b/ui/views/controls/menu/menu_scroll_view_container.cc
@@ -185,15 +185,17 @@ // NOTE: this assumes we only want to scroll in the y direction. // If the rect is already visible, do not scroll. - if (GetLocalBounds().Contains(rect)) + if (GetLocalBounds().Contains(rect)) { return; + } // Scroll just enough so that the rect is visible. int dy = 0; - if (rect.bottom() > GetLocalBounds().bottom()) + if (rect.bottom() > GetLocalBounds().bottom()) { dy = rect.bottom() - GetLocalBounds().bottom(); - else + } else { dy = rect.y(); + } // Convert rect.y() to view's coordinates and make sure we don't show past // the bottom of the view. @@ -207,15 +209,19 @@ const int min_y = 0; const int max_y = -(child->GetPreferredSize({}).height() - this->height()); - if (old_y == min_y && old_y != y) + if (old_y == min_y && old_y != y) { owner_->DidScrollAwayFromTop(); - if (old_y == max_y && old_y != y) + } + if (old_y == max_y && old_y != y) { owner_->DidScrollAwayFromBottom(); + } - if (y == min_y) + if (y == min_y) { owner_->DidScrollToTop(); - if (y == max_y) + } + if (y == max_y) { owner_->DidScrollToBottom(); + } } // Returns the contents, which is the SubmenuView. @@ -305,13 +311,15 @@ gfx::RoundedCornersF MenuScrollViewContainer::GetRoundedCorners() const { // The controller could be null during context menu being closed. auto* menu_controller = content_view_->GetMenuItem()->GetMenuController(); - if (!menu_controller) + if (!menu_controller) { return gfx::RoundedCornersF(corner_radius_); + } std::optional<gfx::RoundedCornersF> rounded_corners = menu_controller->rounded_corners(); - if (rounded_corners.has_value()) + if (rounded_corners.has_value()) { return rounded_corners.value(); + } return gfx::RoundedCornersF(corner_radius_); } @@ -320,7 +328,6 @@ return View::GetInsets() + additional_insets_; } - gfx::Size MenuScrollViewContainer::CalculatePreferredSize( const SizeBounds& available_size) const { gfx::Size prefsize = @@ -337,8 +344,9 @@ } // ChromeOS system UI menu uses 'background_view_' to paint background. - if (use_ash_system_ui_layout_ && background_view_->background()) + if (use_ash_system_ui_layout_ && background_view_->background()) { return; + } gfx::Rect bounds(0, 0, width(), height()); ui::NativeTheme::MenuBackgroundExtraParams menu_background; @@ -377,8 +385,9 @@ scroll_up_button_->GetVisible() || scroll_down_button_->GetVisible(); MenuItemView* const footnote = GetFootnote(); - if (footnote) + if (footnote) { footnote->SetCornerRadius(any_scroll_button_visible ? 0 : corner_radius_); + } } void MenuScrollViewContainer::DidScrollToTop() {
diff --git a/ui/views/controls/menu/menu_separator.cc b/ui/views/controls/menu/menu_separator.cc index 67a3ca8..7712ce74 100644 --- a/ui/views/controls/menu/menu_separator.cc +++ b/ui/views/controls/menu/menu_separator.cc
@@ -34,8 +34,9 @@ int y = 0; int separator_thickness = menu_config.separator_thickness; - if (type_ == ui::DOUBLE_SEPARATOR) + if (type_ == ui::DOUBLE_SEPARATOR) { separator_thickness = menu_config.double_separator_thickness; + } switch (type_) { case ui::LOWER_SEPARATOR: y = height() - separator_thickness; @@ -104,8 +105,9 @@ } void MenuSeparator::SetType(ui::MenuSeparatorType type) { - if (type_ == type) + if (type_ == type) { return; + } type_ = type; OnPropertyChanged(&type_, kPropertyEffectsPreferredSizeChanged);
diff --git a/ui/views/controls/menu/native_menu_win.cc b/ui/views/controls/menu/native_menu_win.cc index 2a3e5b36..c877ec4 100644 --- a/ui/views/controls/menu/native_menu_win.cc +++ b/ui/views/controls/menu/native_menu_win.cc
@@ -63,10 +63,11 @@ for (size_t model_index = 0; model_index < model_->GetItemCount(); ++model_index) { size_t menu_index = model_index + first_item_index_; - if (model_->GetTypeAt(model_index) == ui::MenuModel::TYPE_SEPARATOR) + if (model_->GetTypeAt(model_index) == ui::MenuModel::TYPE_SEPARATOR) { AddSeparatorItemAt(menu_index, model_index); - else + } else { AddMenuItemAt(menu_index, model_index); + } } } @@ -83,8 +84,9 @@ model_->GetLabelAt(model_index)); } NativeMenuWin* submenu = item->submenu.get(); - if (submenu) + if (submenu) { submenu->UpdateStates(); + } ++model_index; } } @@ -117,8 +119,9 @@ mii.hSubMenu = item_data->submenu->menu_; GetNativeMenuWinFromHMENU(mii.hSubMenu)->parent_ = this; } else { - if (type == ui::MenuModel::TYPE_RADIO) + if (type == ui::MenuModel::TYPE_RADIO) { mii.fType |= MFT_RADIOCHECK; + } mii.wID = static_cast<UINT>(model_->GetCommandIdAt(model_index)); } item_data->native_menu_win = this; @@ -147,14 +150,17 @@ bool enabled, bool checked, bool is_default) { - if (IsSeparatorItemAt(menu_index)) + if (IsSeparatorItemAt(menu_index)) { return; + } UINT state = enabled ? MFS_ENABLED : MFS_DISABLED; - if (checked) + if (checked) { state |= MFS_CHECKED; - if (is_default) + } + if (is_default) { state |= MFS_DEFAULT; + } MENUITEMINFO mii = {0}; mii.cbSize = sizeof(mii); @@ -166,8 +172,9 @@ void NativeMenuWin::SetMenuItemLabel(size_t menu_index, size_t model_index, const std::u16string& label) { - if (IsSeparatorItemAt(menu_index)) + if (IsSeparatorItemAt(menu_index)) { return; + } MENUITEMINFO mii = {0}; mii.cbSize = sizeof(mii);
diff --git a/ui/views/controls/menu/submenu_view.cc b/ui/views/controls/menu/submenu_view.cc index 329bb9a..f0e92f1 100644 --- a/ui/views/controls/menu/submenu_view.cc +++ b/ui/views/controls/menu/submenu_view.cc
@@ -171,8 +171,9 @@ } void SubmenuView::ChildPreferredSizeChanged(View* child) { - if (!resize_open_menu_) + if (!resize_open_menu_) { return; + } MenuItemView* item = parent_menu_item_; MenuController* controller = item->GetMenuController(); @@ -375,38 +376,44 @@ auto i = base::ranges::lower_bound(menu_items, vis_bounds.y(), {}, &MenuItemView::y); - if (i == menu_items.cend()) + if (i == menu_items.cend()) { return true; + } // If the first item isn't entirely visible, make it visible, otherwise make // the next/previous one entirely visible. If enough wasn't scrolled to show // any new rows, then just scroll the amount so that smooth scrolling using // the trackpad is possible. int delta = abs(e.y_offset() / ui::MouseWheelEvent::kWheelDelta); - if (delta == 0) + if (delta == 0) { return OnScroll(0, e.y_offset()); + } const auto scrolled_to_top = [&vis_bounds](const MenuItemView* item) { return item->y() == vis_bounds.y(); }; - if (i != menu_items.cbegin() && !scrolled_to_top(*i)) + if (i != menu_items.cbegin() && !scrolled_to_top(*i)) { --i; + } for (bool scroll_up = (e.y_offset() > 0); delta != 0; --delta) { int scroll_target; if (scroll_up) { if (scrolled_to_top(*i)) { - if (i == menu_items.cbegin()) + if (i == menu_items.cbegin()) { break; + } --i; } scroll_target = (*i)->y(); } else { const auto next_iter = std::next(i); - if (next_iter == menu_items.cend()) + if (next_iter == menu_items.cend()) { break; + } scroll_target = (*next_iter)->y(); - if (scrolled_to_top(*i)) + if (scrolled_to_top(*i)) { i = next_iter; + } } ScrollRectToVisible( gfx::Rect(gfx::Point(0, scroll_target), vis_bounds.size())); @@ -428,22 +435,25 @@ case ui::EventType::kGestureScrollEnd: break; case ui::EventType::kScrollFlingStart: - if (event->details().velocity_y() != 0.0f) + if (event->details().velocity_y() != 0.0f) { scroll_animator_->Start(0, event->details().velocity_y()); + } break; case ui::EventType::kGestureTapDown: case ui::EventType::kScrollFlingCancel: - if (scroll_animator_->is_scrolling()) + if (scroll_animator_->is_scrolling()) { scroll_animator_->Stop(); - else + } else { handled = false; + } break; default: handled = false; break; } - if (handled) + if (handled) { event->SetHandled(); + } } size_t SubmenuView::GetRowCount() { @@ -541,20 +551,23 @@ GetViewAccessibility().EndPopupFocusOverride(); } // Fire these kMenuPopupEnd for each menu/submenu that closes/hides. - if (host_->IsVisible()) + if (host_->IsVisible()) { NotifyAccessibilityEvent(ax::mojom::Event::kMenuPopupEnd, true); + } host_->HideMenuHost(); GetMenuItem()->UpdateAccessibleExpandedCollapsedState(); } - if (scroll_animator_->is_scrolling()) + if (scroll_animator_->is_scrolling()) { scroll_animator_->Stop(); + } } void SubmenuView::ReleaseCapture() { - if (host_) + if (host_) { host_->ReleaseMenuHostCapture(); + } } bool SubmenuView::SkipDefaultKeyEventProcessing(const ui::KeyEvent& e) { @@ -567,8 +580,9 @@ void SubmenuView::SetDropMenuItem(MenuItemView* item, MenuDelegate::DropPosition position) { - if (drop_item_ == item && drop_position_ == position) + if (drop_item_ == item && drop_position_ == position) { return; + } SchedulePaintForDropIndicator(drop_item_, drop_position_); MenuItemView* old_drop_item = std::exchange(drop_item_, item); drop_position_ = position; @@ -588,10 +602,12 @@ } } } else { - if (old_drop_item && old_drop_item != drop_item_) + if (old_drop_item && old_drop_item != drop_item_) { old_drop_item->OnDropOrSelectionStatusMayHaveChanged(); - if (drop_item_) + } + if (drop_item_) { drop_item_->OnDropOrSelectionStatusMayHaveChanged(); + } } SchedulePaintForDropIndicator(drop_item_, drop_position_); } @@ -627,8 +643,9 @@ void SubmenuView::MenuHostDestroyed() { host_ = nullptr; MenuController* controller = parent_menu_item_->GetMenuController(); - if (controller) + if (controller) { controller->Cancel(MenuController::ExitType::kDestroyed); + } } void SubmenuView::OnBoundsChanged(const gfx::Rect& previous_bounds) { @@ -638,8 +655,9 @@ void SubmenuView::SchedulePaintForDropIndicator( MenuItemView* item, MenuDelegate::DropPosition position) { - if (item == nullptr) + if (item == nullptr) { return; + } if (position == MenuDelegate::DropPosition::kOn) { item->SchedulePaint();
diff --git a/ui/views/controls/message_box_view.cc b/ui/views/controls/message_box_view.cc index 21a41d9..ddeffa5 100644 --- a/ui/views/controls/message_box_view.cc +++ b/ui/views/controls/message_box_view.cc
@@ -158,8 +158,9 @@ // Don't enable text selection if multiple labels are used, since text // selection can't span multiple labels. - if (message_labels_.size() == 1u) + if (message_labels_.size() == 1u) { message_labels_[0]->SetSelectable(true); + } ResetLayoutManager(); } @@ -186,8 +187,9 @@ void MessageBoxView::SetCheckBoxLabel(const std::u16string& label) { DCHECK(checkbox_); - if (checkbox_->GetVisible() && checkbox_->GetText() == label) + if (checkbox_->GetVisible() && checkbox_->GetText() == label) { return; + } checkbox_->SetText(label); checkbox_->SetVisible(true); @@ -196,8 +198,9 @@ void MessageBoxView::SetCheckBoxSelected(bool selected) { // Only update the checkbox's state after the checkbox is shown. - if (!checkbox_->GetVisible()) + if (!checkbox_->GetVisible()) { return; + } checkbox_->SetChecked(selected); } @@ -208,24 +211,27 @@ DCHECK(link_); link_->SetCallback(std::move(callback)); - if (link_->GetVisible() && link_->GetText() == text) + if (link_->GetVisible() && link_->GetText() == text) { return; + } link_->SetText(text); link_->SetVisible(true); ResetLayoutManager(); } void MessageBoxView::SetInterRowVerticalSpacing(int spacing) { - if (inter_row_vertical_spacing_ == spacing) + if (inter_row_vertical_spacing_ == spacing) { return; + } inter_row_vertical_spacing_ = spacing; ResetLayoutManager(); } void MessageBoxView::SetMessageWidth(int width) { - if (message_width_ == width) + if (message_width_ == width) { return; + } message_width_ = width; ResetLayoutManager(); @@ -233,8 +239,10 @@ void MessageBoxView::SetPromptField(const std::u16string& default_prompt) { DCHECK(prompt_field_); - if (prompt_field_->GetVisible() && prompt_field_->GetText() == default_prompt) + if (prompt_field_->GetVisible() && + prompt_field_->GetText() == default_prompt) { return; + } prompt_field_->SetText(default_prompt); prompt_field_->SetVisible(true); prompt_field_->GetViewAccessibility().SetIsIgnored(false); @@ -257,8 +265,9 @@ void MessageBoxView::ViewHierarchyChanged( const ViewHierarchyChangedDetails& details) { if (details.child == this && details.is_add) { - if (prompt_field_ && prompt_field_->GetVisible()) + if (prompt_field_ && prompt_field_->GetVisible()) { prompt_field_->SelectAll(true); + } } } @@ -267,13 +276,15 @@ DCHECK(accelerator.key_code() == 'C' && accelerator.IsCtrlDown()); // We must not intercept Ctrl-C when we have a text box and it's focused. - if (prompt_field_ && prompt_field_->HasFocus()) + if (prompt_field_ && prompt_field_->HasFocus()) { return false; + } // Don't intercept Ctrl-C if we only use a single message label supporting // text selection. - if (message_labels_.size() == 1u && message_labels_[0]->GetSelectable()) + if (message_labels_.size() == 1u && message_labels_[0]->GetSelectable()) { return false; + } ui::ScopedClipboardWriter scw(ui::ClipboardBuffer::kCopyPaste); scw.WriteText(std::accumulate(message_labels_.cbegin(), @@ -293,20 +304,23 @@ views::DialogContentType trailing_content_type = views::DialogContentType::kText; - if (prompt_field_->GetVisible()) + if (prompt_field_->GetVisible()) { trailing_content_type = views::DialogContentType::kControl; + } bool checkbox_is_visible = checkbox_->GetVisible(); - if (checkbox_is_visible) + if (checkbox_is_visible) { trailing_content_type = views::DialogContentType::kText; + } // Ignored views are not in the accessibility tree, but their children // still can be exposed. Leaf views have no accessible children. checkbox_->GetViewAccessibility().SetIsIgnored(!checkbox_is_visible); checkbox_->GetViewAccessibility().SetIsLeaf(!checkbox_is_visible); - if (link_->GetVisible()) + if (link_->GetVisible()) { trailing_content_type = views::DialogContentType::kText; + } const LayoutProvider* provider = LayoutProvider::Get(); gfx::Insets border_insets = provider->GetDialogInsetsForContentType(
diff --git a/ui/views/controls/native/native_view_host.cc b/ui/views/controls/native/native_view_host.cc index 5716fb2..3e34779 100644 --- a/ui/views/controls/native/native_view_host.cc +++ b/ui/views/controls/native/native_view_host.cc
@@ -45,12 +45,14 @@ // updates the visibility of the NativeView. The call to Layout() only happens // if |this| is drawn. Call hide if not drawn as otherwise the NativeView // could be visible when |this| is not. - if (!IsDrawn()) + if (!IsDrawn()) { native_wrapper_->HideWidget(); + } Widget* widget = Widget::GetWidgetForNativeView(native_view); - if (widget) + if (widget) { widget->SetNativeWindowProperty(kWidgetNativeViewHostKey, this); + } } void NativeViewHost::Detach() { @@ -58,14 +60,16 @@ } void NativeViewHost::SetParentAccessible(gfx::NativeViewAccessible accessible) { - if (!native_wrapper_) + if (!native_wrapper_) { return; + } native_wrapper_->SetParentAccessible(accessible); } gfx::NativeViewAccessible NativeViewHost::GetParentAccessible() { - if (!native_wrapper_) + if (!native_wrapper_) { return nullptr; + } return native_wrapper_->GetParentAccessible(); } @@ -82,8 +86,9 @@ } void NativeViewHost::SetNativeViewSize(const gfx::Size& size) { - if (native_view_size_ == size) + if (native_view_size_ == size) { return; + } native_view_size_ = size; InvalidateLayout(); } @@ -111,8 +116,9 @@ // NativeViewHost, View overrides: void NativeViewHost::Layout(PassKey) { - if (!native_view_ || !native_wrapper_.get()) + if (!native_view_ || !native_wrapper_.get()) { return; + } gfx::Rect vis_bounds = GetVisibleBounds(); bool visible = !vis_bounds.IsEmpty(); @@ -215,8 +221,9 @@ } if (details.is_add && this_widget) { - if (!native_wrapper_.get()) + if (!native_wrapper_.get()) { native_wrapper_.reset(NativeViewHostWrapper::CreateWrapper(this)); + } native_wrapper_->AddedToWidget(); } else if (!details.is_add && native_wrapper_) { native_wrapper_->RemovedFromWidget(); @@ -224,8 +231,9 @@ } void NativeViewHost::OnFocus() { - if (native_view_) + if (native_view_) { native_wrapper_->SetFocus(); + } NotifyAccessibilityEvent(ax::mojom::Event::kFocus, true); } @@ -233,8 +241,9 @@ if (native_wrapper_.get()) { gfx::NativeViewAccessible accessible_view = native_wrapper_->GetNativeViewAccessible(); - if (accessible_view) + if (accessible_view) { return accessible_view; + } } return View::GetNativeViewAccessible(); @@ -245,8 +254,9 @@ } void NativeViewHost::SetVisible(bool visible) { - if (native_view_) + if (native_view_) { native_wrapper_->SetVisible(visible); + } View::SetVisible(visible); } @@ -271,8 +281,9 @@ if (native_view_) { if (!destroyed) { Widget* widget = Widget::GetWidgetForNativeView(native_view_); - if (widget) + if (widget) { widget->SetNativeWindowProperty(kWidgetNativeViewHostKey, nullptr); + } ClearFocus(); } native_wrapper_->NativeViewDetaching(destroyed); @@ -282,15 +293,17 @@ void NativeViewHost::ClearFocus() { FocusManager* focus_manager = GetFocusManager(); - if (!focus_manager || !focus_manager->GetFocusedView()) + if (!focus_manager || !focus_manager->GetFocusedView()) { return; + } Widget::Widgets widgets; Widget::GetAllChildWidgets(native_view(), &widgets); for (Widget* widget : widgets) { focus_manager->ViewRemoved(widget->GetRootView()); - if (!focus_manager->GetFocusedView()) + if (!focus_manager->GetFocusedView()) { return; + } } }
diff --git a/ui/views/controls/native/native_view_host_aura.cc b/ui/views/controls/native/native_view_host_aura.cc index 0d813ef..cc312b2 100644 --- a/ui/views/controls/native/native_view_host_aura.cc +++ b/ui/views/controls/native/native_view_host_aura.cc
@@ -87,16 +87,18 @@ host_->native_view()->ClearProperty( aura::client::kParentNativeViewAccessibleKey); clipping_window_->ClearProperty(views::kHostViewKey); - if (host_->native_view()->parent() == clipping_window_.get()) + if (host_->native_view()->parent() == clipping_window_.get()) { clipping_window_->RemoveChild(host_->native_view()); + } } } //////////////////////////////////////////////////////////////////////////////// // NativeViewHostAura, NativeViewHostWrapper implementation: void NativeViewHostAura::AttachNativeView() { - if (!clipping_window_) + if (!clipping_window_) { CreateClippingWindow(); + } clipping_window_delegate_->set_native_view(host_->native_view()); host_->native_view()->AddObserver(this); host_->native_view()->SetProperty(views::kHostViewKey, @@ -128,8 +130,9 @@ // that occlusion is recomputed at the end of the method instead of after each // change. std::optional<aura::WindowOcclusionTracker::ScopedPause> pause_occlusion; - if (clipping_window_) + if (clipping_window_) { pause_occlusion.emplace(); + } clipping_window_delegate_->set_native_view(nullptr); RemoveClippingWindow(); @@ -139,23 +142,27 @@ host_->native_view()->ClearProperty(aura::client::kHostWindowKey); host_->native_view()->ClearProperty( aura::client::kParentNativeViewAccessibleKey); - if (original_transform_changed_) + if (original_transform_changed_) { host_->native_view()->SetTransform(original_transform_); + } host_->native_view()->Hide(); - if (host_->native_view()->parent()) + if (host_->native_view()->parent()) { Widget::ReparentNativeView(host_->native_view(), nullptr); + } } } void NativeViewHostAura::AddedToWidget() { - if (!host_->native_view()) + if (!host_->native_view()) { return; + } AddClippingWindow(); - if (host_->IsDrawn()) + if (host_->IsDrawn()) { host_->native_view()->Show(); - else + } else { host_->native_view()->Hide(); + } host_->InvalidateLayout(); } @@ -167,8 +174,9 @@ host_->native_view()->ClearProperty(aura::client::kHostWindowKey); host_->native_view()->Hide(); - if (host_->native_view()->parent()) + if (host_->native_view()->parent()) { host_->native_view()->parent()->RemoveChild(host_->native_view()); + } RemoveClippingWindow(); } } @@ -181,8 +189,9 @@ } void NativeViewHostAura::SetHitTestTopInset(int top_inset) { - if (top_inset_ == top_inset) + if (top_inset_ == top_inset) { return; + } top_inset_ = top_inset; UpdateInsets(); } @@ -245,8 +254,9 @@ void NativeViewHostAura::SetFocus() { aura::Window* window = host_->native_view(); aura::client::FocusClient* client = aura::client::GetFocusClient(window); - if (client) + if (client) { client->FocusWindow(window); + } } gfx::NativeView NativeViewHostAura::GetNativeViewContainer() const { @@ -258,16 +268,18 @@ } ui::Cursor NativeViewHostAura::GetCursor(int x, int y) { - if (host_->native_view()) + if (host_->native_view()) { return host_->native_view()->GetCursor(gfx::Point(x, y)); + } return ui::Cursor(); } void NativeViewHostAura::SetVisible(bool visible) { - if (!visible) + if (!visible) { host_->native_view()->Hide(); - else + } else { host_->native_view()->Show(); + } } void NativeViewHostAura::OnWindowDestroying(aura::Window* window) { @@ -314,8 +326,9 @@ void NativeViewHostAura::RemoveClippingWindow() { clipping_window_->Hide(); - if (host_->native_view()) + if (host_->native_view()) { host_->native_view()->ClearProperty(aura::client::kHostWindowKey); + } if (host_->native_view()->parent() == clipping_window_.get()) { if (host_->GetWidget() && host_->GetWidget()->GetNativeView()) { @@ -325,13 +338,15 @@ clipping_window_->RemoveChild(host_->native_view()); } } - if (clipping_window_->parent()) + if (clipping_window_->parent()) { clipping_window_->parent()->RemoveChild(clipping_window_.get()); + } } void NativeViewHostAura::ApplyRoundedCorners() { - if (!host_->native_view()) + if (!host_->native_view()) { return; + } ui::Layer* layer = host_->native_view()->layer(); if (layer->rounded_corner_radii() != corner_radii_) { @@ -341,8 +356,9 @@ } void NativeViewHostAura::UpdateInsets() { - if (!clipping_window_) + if (!clipping_window_) { return; + } if (top_inset_ == 0) { // The window targeter needs to be uninstalled when not used; keeping empty
diff --git a/ui/views/controls/native/native_view_host_aura_unittest.cc b/ui/views/controls/native/native_view_host_aura_unittest.cc index b59615a8..5feac9c 100644 --- a/ui/views/controls/native/native_view_host_aura_unittest.cc +++ b/ui/views/controls/native/native_view_host_aura_unittest.cc
@@ -78,8 +78,9 @@ // Dedupe events as a single Hide() call can result in several // notifications. - if (events_.size() == 0u || events_.back() != event) + if (events_.size() == 0u || events_.back() != event) { events_.push_back(event); + } } void OnWindowBoundsChanged(aura::Window* window,
diff --git a/ui/views/controls/native/native_view_host_mac.mm b/ui/views/controls/native/native_view_host_mac.mm index 6b692fc..e9bd8290 100644 --- a/ui/views/controls/native/native_view_host_mac.mm +++ b/ui/views/controls/native/native_view_host_mac.mm
@@ -83,16 +83,18 @@ remote_cocoa::mojom::Application* NativeViewHostMac::GetRemoteCocoaApplication() const { if (auto* window_host = GetNSWindowHost()) { - if (auto* application_host = window_host->application_host()) + if (auto* application_host = window_host->application_host()) { return application_host->GetApplication(); + } } return nullptr; } uint64_t NativeViewHostMac::GetNSViewId() const { auto* window_host = GetNSWindowHost(); - if (window_host) + if (window_host) { return window_host->GetRootViewNSViewId(); + } return 0; } @@ -175,8 +177,9 @@ EnsureNativeViewHasNoChildWidgets(native_view_); auto* window_host = GetNSWindowHost(); // NativeWidgetNSWindowBridge can be null when Widget is closing. - if (window_host) + if (window_host) { window_host->OnNativeViewHostDetach(host_); + } // If the previous call to AttachNativeView() removed the native_view_ from // its window (and it was the window's contentView), remove the reference we @@ -199,16 +202,18 @@ } void NativeViewHostMac::AddedToWidget() { - if (!host_->native_view()) + if (!host_->native_view()) { return; + } AttachNativeView(); host_->DeprecatedLayoutImmediately(); } void NativeViewHostMac::RemovedFromWidget() { - if (!host_->native_view()) + if (!host_->native_view()) { return; + } NativeViewDetaching(false); } @@ -272,18 +277,20 @@ } void NativeViewHostMac::HideWidget() { - if (native_view_hostable_) + if (native_view_hostable_) { native_view_hostable_->ViewsHostableSetVisible(false); - else + } else { [native_view_ setHidden:YES]; + } } void NativeViewHostMac::SetFocus() { if (native_view_hostable_) { native_view_hostable_->ViewsHostableMakeFirstResponder(); } else { - if ([native_view_ acceptsFirstResponder]) + if ([native_view_ acceptsFirstResponder]) { [[native_view_ window] makeFirstResponder:native_view_]; + } } } @@ -293,10 +300,11 @@ } gfx::NativeViewAccessible NativeViewHostMac::GetNativeViewAccessible() { - if (native_view_hostable_) + if (native_view_hostable_) { return native_view_hostable_->ViewsHostableGetAccessibilityElement(); - else + } else { return native_view_; + } } ui::Cursor NativeViewHostMac::GetCursor(int x, int y) { @@ -314,10 +322,11 @@ } void NativeViewHostMac::SetVisible(bool visible) { - if (native_view_hostable_) + if (native_view_hostable_) { native_view_hostable_->ViewsHostableSetVisible(visible); - else + } else { [native_view_ setHidden:!visible]; + } } void NativeViewHostMac::SetParentAccessible(
diff --git a/ui/views/controls/native/native_view_host_mac_unittest.mm b/ui/views/controls/native/native_view_host_mac_unittest.mm index 73f2263..835542d 100644 --- a/ui/views/controls/native/native_view_host_mac_unittest.mm +++ b/ui/views/controls/native/native_view_host_mac_unittest.mm
@@ -25,8 +25,7 @@ private: // ui::ViewsHostableView: - void ViewsHostableAttach(ui::ViewsHostableView::Host* host) override { - } + void ViewsHostableAttach(ui::ViewsHostableView::Host* host) override {} void ViewsHostableDetach() override { parent_accessibility_element_ = nil; } void ViewsHostableSetBounds(const gfx::Rect& bounds_in_window) override {} void ViewsHostableSetVisible(bool visible) override {} @@ -45,7 +44,7 @@ id parent_accessibility_element_ = nil; }; -@interface TestViewsHostableView : NSView<ViewsHostable> +@interface TestViewsHostableView : NSView <ViewsHostable> @property(nonatomic, assign) ui::ViewsHostableView* viewsHostableView; @end @implementation TestViewsHostableView
diff --git a/ui/views/controls/native/native_view_host_unittest.cc b/ui/views/controls/native/native_view_host_unittest.cc index 85fc592..f1d4e2f 100644 --- a/ui/views/controls/native/native_view_host_unittest.cc +++ b/ui/views/controls/native/native_view_host_unittest.cc
@@ -86,8 +86,9 @@ NativeViewHost::ViewHierarchyChanged(details); gfx::NativeView parent_after = native_view() ? GetNativeParent(native_view()) : nullptr; - if (parent_before != parent_after) + if (parent_before != parent_after) { ++num_parent_changes_; + } } private:
diff --git a/ui/views/controls/prefix_selector.cc b/ui/views/controls/prefix_selector.cc index a11f747..4e9cfe2 100644 --- a/ui/views/controls/prefix_selector.cc +++ b/ui/views/controls/prefix_selector.cc
@@ -238,12 +238,14 @@ // that they are control characters and will not affect the currently-active // prefix. if (text.length() == 1 && - (text[0] == L'\t' || text[0] == L'\r' || text[0] == L'\n')) + (text[0] == L'\t' || text[0] == L'\r' || text[0] == L'\n')) { return; + } const size_t row_count = prefix_delegate_->GetRowCount(); - if (row_count == 0) + if (row_count == 0) { return; + } // Search for |text| if it has been a while since the user typed, otherwise // append |text| to |current_text_| and search for that. If it has been a @@ -254,8 +256,9 @@ current_text_ += text; } else { current_text_ = text; - if (prefix_delegate_->GetSelectedRow().has_value()) + if (prefix_delegate_->GetSelectedRow().has_value()) { row = (row + 1) % row_count; + } } time_of_last_key_ = tick_clock_->NowTicks();
diff --git a/ui/views/controls/resize_area.cc b/ui/views/controls/resize_area.cc index e5728f31..b10f9a5 100644 --- a/ui/views/controls/resize_area.cc +++ b/ui/views/controls/resize_area.cc
@@ -39,16 +39,18 @@ } bool ResizeArea::OnMousePressed(const ui::MouseEvent& event) { - if (!event.IsOnlyLeftMouseButton()) + if (!event.IsOnlyLeftMouseButton()) { return false; + } SetInitialPosition(event.x()); return true; } bool ResizeArea::OnMouseDragged(const ui::MouseEvent& event) { - if (!event.IsLeftMouseButton()) + if (!event.IsLeftMouseButton()) { return false; + } ReportResizeAmount(event.x(), false); return true;
diff --git a/ui/views/controls/scroll_view.cc b/ui/views/controls/scroll_view.cc index a525fbf1..0aebc5e 100644 --- a/ui/views/controls/scroll_view.cc +++ b/ui/views/controls/scroll_view.cc
@@ -252,10 +252,11 @@ contents->layer()->type() == ui::LAYER_TEXTURED; }}; - if (!contents || has_textured_layer(contents)) + if (!contents || has_textured_layer(contents)) { return ui::LAYER_NOT_DRAWN; - else + } else { return ui::LAYER_TEXTURED; + } } // Initializes or updates the layer of |contents_viewport|. @@ -571,8 +572,9 @@ } void ScrollView::ClipHeightTo(int min_height, int max_height) { - if (min_height != min_height_ || max_height != max_height_) + if (min_height != min_height_ || max_height != max_height_) { PreferredSizeChanged(); + } min_height_ = min_height; max_height_ = max_height; @@ -856,8 +858,9 @@ processed = vert_sb_->OnKeyPressed(event); } - if (!processed && IsHorizontalScrollEnabled()) + if (!processed && IsHorizontalScrollEnabled()) { processed = horiz_sb_->OnKeyPressed(event); + } return processed; } @@ -872,8 +875,9 @@ : e; // TODO(crbug.com/40471184): Use composited scrolling. - if (IsVerticalScrollEnabled()) + if (IsVerticalScrollEnabled()) { processed = vert_sb_->OnMouseWheel(to_propagate); + } if (IsHorizontalScrollEnabled()) { // When there is no vertical scrollbar, allow vertical scroll events to be @@ -1006,8 +1010,9 @@ } ScrollToOffset(offset); - if (!ScrollsWithLayers()) + if (!ScrollsWithLayers()) { contents_->SchedulePaintInRect(contents_->GetVisibleBounds()); + } } int ScrollView::GetScrollIncrement(ScrollBar* source, @@ -1041,10 +1046,11 @@ if (has_layer == needs_layer) { return; } - if (needs_layer) + if (needs_layer) { EnableViewportLayer(); - else + } else { contents_viewport_->DestroyLayer(); + } } View* ScrollView::ReplaceChildView(View* parent, @@ -1419,8 +1425,9 @@ // Align the row on the previous page to to the top of the view. int last_page_y = y - vis_height; RowInfo last_page_info = GetRowInfo(std::max(0, last_page_y)); - if (last_page_y != last_page_info.origin) + if (last_page_y != last_page_info.origin) { return std::max(0, y - last_page_info.origin - last_page_info.height); + } return std::max(0, y - last_page_info.origin); } }
diff --git a/ui/views/controls/scroll_view.h b/ui/views/controls/scroll_view.h index 87cb5994..c899874 100644 --- a/ui/views/controls/scroll_view.h +++ b/ui/views/controls/scroll_view.h
@@ -25,7 +25,7 @@ namespace gfx { class PointF; class RoundedCornersF; -} +} // namespace gfx namespace views { namespace test {
diff --git a/ui/views/controls/scroll_view_unittest.cc b/ui/views/controls/scroll_view_unittest.cc index 590b30d..ec8c8ec 100644 --- a/ui/views/controls/scroll_view_unittest.cc +++ b/ui/views/controls/scroll_view_unittest.cc
@@ -407,8 +407,9 @@ // use them for impl-side scrolling. Note that simply RunUntilIdle() works // when tests are run in isolation, but compositor scheduling can interact // between test runs in the general case. - if (commit_layers) + if (commit_layers) { WaitForCommit(); + } return scroll_view; } @@ -517,8 +518,9 @@ IsTestingRtl() ? gfx::Point(kDefaultWidth - 1, 1) : gfx::Point(1, 1); gfx::Point point = test_mouse_point_in_root; View::ConvertPointToTarget(widget()->GetRootView(), target, &point); - if (flip_result) + if (flip_result) { return gfx::Point(target->GetMirroredXInView(point.x()), point.y()); + } return point; } @@ -1433,8 +1435,9 @@ ScrollView* scroll_view = AddScrollViewWithContents(std::move(contents_ptr)); ScrollViewTestApi test_api(scroll_view); - if (test_api.contents_viewport()->layer()) + if (test_api.contents_viewport()->layer()) { return; + } View* child = contents->AddChildView(std::make_unique<View>()); child->SetPaintToLayer(ui::LAYER_TEXTURED); @@ -1463,8 +1466,9 @@ View* contents = InstallContents(); ScrollViewTestApi test_api(scroll_view_.get()); - if (test_api.contents_viewport()->layer()) + if (test_api.contents_viewport()->layer()) { return; + } scroll_view_->SetPaintToLayer(); @@ -2261,15 +2265,17 @@ View* left_indicator = scroll_view_->SetCustomOverflowIndicator( OverflowIndicatorAlignment::kLeft, std::make_unique<View>(), 1, true); EXPECT_EQ(gfx::Rect(0, 0, 1, 100), left_indicator->bounds()); - if (left_indicator->layer()) + if (left_indicator->layer()) { EXPECT_TRUE(left_indicator->layer()->fills_bounds_opaquely()); + } // A larger, but still reasonable, indicator that is not opaque. View* top_indicator = scroll_view_->SetCustomOverflowIndicator( OverflowIndicatorAlignment::kTop, std::make_unique<View>(), 20, false); EXPECT_EQ(gfx::Rect(0, 0, 100, 20), top_indicator->bounds()); - if (top_indicator->layer()) + if (top_indicator->layer()) { EXPECT_FALSE(top_indicator->layer()->fills_bounds_opaquely()); + } // Negative thickness doesn't make sense. It should be treated like zero. View* right_indicator = scroll_view_->SetCustomOverflowIndicator( @@ -2562,11 +2568,13 @@ deepest_view->AddChildView(partial_view); partial_view->ScrollViewToVisible(); int x_offset_in_cell = kCellWidth - partial_view->width(); - if (!scroll_view->horizontal_scroll_bar()->OverlapsContent()) + if (!scroll_view->horizontal_scroll_bar()->OverlapsContent()) { x_offset_in_cell -= scroll_view->horizontal_scroll_bar()->GetThickness(); + } int y_offset_in_cell = kCellHeight - partial_view->height(); - if (!scroll_view->vertical_scroll_bar()->OverlapsContent()) + if (!scroll_view->vertical_scroll_bar()->OverlapsContent()) { y_offset_in_cell -= scroll_view->vertical_scroll_bar()->GetThickness(); + } EXPECT_EQ(gfx::PointF(kCellWidth * i - x_offset_in_cell, kCellHeight * i - y_offset_in_cell), test_api.CurrentOffset()); @@ -2610,8 +2618,9 @@ // The following only makes sense when layered scrolling is enabled. View* container = scroll_view->contents(); EXPECT_EQ(IsTestingLayers(), !!container->layer()); - if (!container->layer()) + if (!container->layer()) { return; + } // Container and viewport should have layers. EXPECT_TRUE(container->layer());
diff --git a/ui/views/controls/scrollbar/base_scroll_bar_thumb.cc b/ui/views/controls/scrollbar/base_scroll_bar_thumb.cc index 3737f0a..0cafa2b58 100644 --- a/ui/views/controls/scrollbar/base_scroll_bar_thumb.cc +++ b/ui/views/controls/scrollbar/base_scroll_bar_thumb.cc
@@ -33,8 +33,9 @@ } int BaseScrollBarThumb::GetLength() const { - if (IsHorizontal()) + if (IsHorizontal()) { return width(); + } return height(); } @@ -51,8 +52,9 @@ int BaseScrollBarThumb::GetPosition() const { gfx::Rect track_bounds = scroll_bar_->GetTrackBounds(); - if (IsHorizontal()) + if (IsHorizontal()) { return x() - track_bounds.x(); + } return y() - track_bounds.y(); } @@ -100,8 +102,9 @@ } if (IsHorizontal()) { int thumb_x = event.x() - mouse_offset_; - if (base::i18n::IsRTL()) + if (base::i18n::IsRTL()) { thumb_x *= -1; + } scroll_bar_->ScrollToThumbPosition(GetPosition() + thumb_x, false); } else { int thumb_y = event.y() - mouse_offset_; @@ -124,8 +127,9 @@ } void BaseScrollBarThumb::SetState(Button::ButtonState state) { - if (state_ == state) + if (state_ == state) { return; + } state_ = state; OnStateChanged();
diff --git a/ui/views/controls/scrollbar/cocoa_scroll_bar.mm b/ui/views/controls/scrollbar/cocoa_scroll_bar.mm index 1e70b09b..8be86962 100644 --- a/ui/views/controls/scrollbar/cocoa_scroll_bar.mm +++ b/ui/views/controls/scrollbar/cocoa_scroll_bar.mm
@@ -2,12 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/memory/raw_ptr.h" - #import "ui/views/controls/scrollbar/cocoa_scroll_bar.h" #include "base/functional/bind.h" #include "base/i18n/rtl.h" +#include "base/memory/raw_ptr.h" #include "cc/paint/paint_shader.h" #include "third_party/abseil-cpp/absl/types/variant.h" #include "third_party/skia/include/core/SkColor.h" @@ -91,8 +90,9 @@ void CocoaScrollBarThumb::UpdateIsMouseOverTrack(bool mouse_over_track) { // The state should not change if the thumb is pressed. The thumb will be // set back to its hover or normal state when the mouse is released. - if (IsStatePressed()) + if (IsStatePressed()) { return; + } SetState(mouse_over_track ? Button::STATE_HOVERED : Button::STATE_NORMAL); } @@ -119,8 +119,9 @@ bool CocoaScrollBarThumb::OnMousePressed(const ui::MouseEvent& event) { // Ignore the mouse press if the scrollbar is hidden. - if (cocoa_scroll_bar_->IsScrollbarFullyHidden()) + if (cocoa_scroll_bar_->IsScrollbarFullyHidden()) { return false; + } return BaseScrollBarThumb::OnMousePressed(event); } @@ -139,8 +140,9 @@ // The thumb should remain pressed when dragged, even if the mouse leaves // the scrollview. The thumb will be set back to its hover or normal state // when the mouse is released. - if (GetState() != Button::STATE_PRESSED) + if (GetState() != Button::STATE_PRESSED) { SetState(Button::STATE_NORMAL); + } } ////////////////////////////////////////////////////////////////// @@ -195,15 +197,11 @@ gfx::Rect thumb_bounds(GetThumb()->bounds()); gfx::Rect track_bounds(GetTrackBounds()); if (GetOrientation() == Orientation::kHorizontal) { - GetThumb()->SetBounds(thumb_bounds.x(), - track_bounds.y(), - thumb_bounds.width(), - track_bounds.height()); + GetThumb()->SetBounds(thumb_bounds.x(), track_bounds.y(), + thumb_bounds.width(), track_bounds.height()); } else { - GetThumb()->SetBounds(track_bounds.x(), - thumb_bounds.y(), - track_bounds.width(), - thumb_bounds.height()); + GetThumb()->SetBounds(track_bounds.x(), thumb_bounds.y(), + track_bounds.width(), thumb_bounds.height()); } } @@ -213,8 +211,9 @@ } void CocoaScrollBar::OnPaint(gfx::Canvas* canvas) { - if (!has_scrolltrack_) + if (!has_scrolltrack_) { return; + } auto params = GetPainterParams(); auto& scrollbar = absl::get<ui::NativeTheme::ScrollbarExtraParams>(params); // Transparency of the track is handled by the View opacity, so always draw @@ -238,8 +237,9 @@ bool CocoaScrollBar::OnMousePressed(const ui::MouseEvent& event) { // Ignore the mouse press if the scrollbar is hidden. - if (IsScrollbarFullyHidden()) + if (IsScrollbarFullyHidden()) { return false; + } return ScrollBar::OnMousePressed(event); } @@ -252,13 +252,15 @@ void CocoaScrollBar::OnMouseEntered(const ui::MouseEvent& event) { GetCocoaScrollBarThumb()->UpdateIsMouseOverTrack(true); - if (scroller_style_ == NSScrollerStyleLegacy) + if (scroller_style_ == NSScrollerStyleLegacy) { return; + } // If the scrollbar thumb did not completely fade away, then reshow it when // the mouse enters the scrollbar thumb. - if (!IsScrollbarFullyHidden()) + if (!IsScrollbarFullyHidden()) { ShowScrollbar(); + } // Expand the scrollbar. If the scrollbar is hidden, don't animate it. if (!is_expanded_) { @@ -295,13 +297,15 @@ // change can also change the offset; show the scroller in these cases. This // is consistent with WebContents (Cocoa will also show a scroller with any // mouse-initiated layout, but not programmatic size changes). - if (contents_scroll_offset == last_contents_scroll_offset_) + if (contents_scroll_offset == last_contents_scroll_offset_) { return; + } last_contents_scroll_offset_ = contents_scroll_offset; - if (GetCocoaScrollBarThumb()->IsStatePressed()) + if (GetCocoaScrollBarThumb()->IsStatePressed()) { did_start_dragging_ = true; + } if (scroller_style_ == NSScrollerStyleOverlay) { ShowScrollbar(); @@ -321,8 +325,9 @@ // indicate possible scroll directions, but do not start the hide timer. if (event.momentum_phase() == ui::EventMomentumPhase::MAY_BEGIN) { // Show only if the direction isn't yet known. - if (event.x_offset() == 0 && event.y_offset() == 0) + if (event.x_offset() == 0 && event.y_offset() == 0) { ShowScrollbar(); + } return; } @@ -340,10 +345,11 @@ // immediately finish the first fade animation. if (layer()->GetTargetOpacity() != 0) { // If canceling rather than picking a direction, fade out after a delay. - if (event.momentum_phase() == ui::EventMomentumPhase::END) + if (event.momentum_phase() == ui::EventMomentumPhase::END) { hide_scrollbar_timer_.Reset(); - else + } else { HideScrollbar(); // Fade out immediately. + } } } @@ -353,8 +359,9 @@ void CocoaScrollBar::OnScrollerStyleChanged() { NSScrollerStyle scroller_style = [ViewsScrollbarBridge preferredScrollerStyle]; - if (scroller_style_ == scroller_style) + if (scroller_style_ == scroller_style) { return; + } // Cancel all of the animations. thickness_animation_.Reset(); @@ -363,8 +370,9 @@ scroller_style_ = scroller_style; // Ensure that the ScrollView updates the scrollbar's layout. - if (parent()) + if (parent()) { parent()->InvalidateLayout(); + } if (scroller_style_ == NSScrollerStyleOverlay) { // Hide the scrollbar, but don't fade out. @@ -407,8 +415,9 @@ // CocoaScrollBar, public: int CocoaScrollBar::ScrollbarThickness() const { - if (scroller_style_ == NSScrollerStyleLegacy) + if (scroller_style_ == NSScrollerStyleLegacy) { return kScrollbarThickness; + } return thickness_animation_.CurrentValueBetween( kOverlayScrollbarThickness, kExpandedOverlayScrollbarThickness); @@ -477,9 +486,7 @@ bool CocoaScrollBar::IsHoverOrPressedState() const { CocoaScrollBarThumb* thumb = GetCocoaScrollBarThumb(); - return thumb->IsStateHovered() || - thumb->IsStatePressed() || - IsMouseHovered(); + return thumb->IsStateHovered() || thumb->IsStatePressed() || IsMouseHovered(); } void CocoaScrollBar::UpdateScrollbarThickness() {
diff --git a/ui/views/controls/scrollbar/overlay_scroll_bar.cc b/ui/views/controls/scrollbar/overlay_scroll_bar.cc index c007120e..f679a07 100644 --- a/ui/views/controls/scrollbar/overlay_scroll_bar.cc +++ b/ui/views/controls/scrollbar/overlay_scroll_bar.cc
@@ -113,8 +113,9 @@ const gfx::Rect& previous_bounds) { scroll_bar_->Show(); // Don't start the hide countdown if the thumb is still hovered or pressed. - if (GetState() == Button::STATE_NORMAL) + if (GetState() == Button::STATE_NORMAL) { scroll_bar_->StartHideCountdown(); + } } void OverlayScrollBar::Thumb::OnStateChanged() { @@ -126,8 +127,9 @@ IsHorizontal() ? kThumbHoverOffset : 0)); layer()->SetTransform(translation); - if (GetWidget()) + if (GetWidget()) { scroll_bar_->StartHideCountdown(); + } } else { layer()->SetTransform(gfx::Transform()); } @@ -193,8 +195,9 @@ } void OverlayScrollBar::StartHideCountdown() { - if (IsMouseHovered()) + if (IsMouseHovered()) { return; + } hide_timer_.Start( FROM_HERE, ui::kOverlayScrollbarFadeDelay, base::BindOnce(&OverlayScrollBar::Hide, base::Unretained(this)));
diff --git a/ui/views/controls/scrollbar/scroll_bar.cc b/ui/views/controls/scrollbar/scroll_bar.cc index f56dadbc..bdea30a 100644 --- a/ui/views/controls/scrollbar/scroll_bar.cc +++ b/ui/views/controls/scrollbar/scroll_bar.cc
@@ -49,8 +49,9 @@ bool ScrollBar::ScrollByAmount(ScrollAmount amount) { auto desired_offset = GetDesiredScrollOffset(amount); - if (!desired_offset) + if (!desired_offset) { return false; + } SetContentsScrollOffset(desired_offset.value()); ScrollContentsToOffset(); @@ -68,8 +69,9 @@ bool ScrollBar::ScrollByContentsOffset(int contents_offset) { int old_offset = contents_scroll_offset_; SetContentsScrollOffset(contents_scroll_offset_ - contents_offset); - if (old_offset == contents_scroll_offset_) + if (old_offset == contents_scroll_offset_) { return false; + } ScrollContentsToOffset(); return true; @@ -91,8 +93,9 @@ // ScrollBar, View implementation: bool ScrollBar::OnMousePressed(const ui::MouseEvent& event) { - if (event.IsOnlyLeftMouseButton()) + if (event.IsOnlyLeftMouseButton()) { ProcessPressEvent(event); + } return true; } @@ -167,8 +170,9 @@ } if (event->type() == ui::EventType::kGestureScrollUpdate) { - if (scroll_status_ == ScrollStatus::kScrollStarted) + if (scroll_status_ == ScrollStatus::kScrollStarted) { scroll_status_ = ScrollStatus::kScrollInProgress; + } float scroll_amount_f; int scroll_amount; @@ -181,8 +185,9 @@ scroll_amount = base::ClampRound(scroll_amount_f); roundoff_error_.set_y(scroll_amount - scroll_amount_f); } - if (ScrollByContentsOffset(scroll_amount)) + if (ScrollByContentsOffset(scroll_amount)) { event->SetHandled(); + } return; } @@ -367,8 +372,9 @@ scroll_status_ = ScrollStatus::kScrollStarted; break; case ui::EventType::kScroll: - if (scroll_status_ == ScrollStatus::kScrollStarted) + if (scroll_status_ == ScrollStatus::kScrollStarted) { scroll_status_ = ScrollStatus::kScrollInProgress; + } break; case ui::EventType::kScrollFlingStart: scroll_status_ = ScrollStatus::kScrollEnded; @@ -396,8 +402,9 @@ void ScrollBar::SetFlingMultiplier(float fling_multiplier) { fling_multiplier_ = fling_multiplier; // `scroll_animator_` is lazily created when needed. - if (!scroll_animator_) + if (!scroll_animator_) { return; + } GetOrCreateScrollAnimator()->set_velocity_multiplier(fling_multiplier_); } @@ -480,10 +487,12 @@ bool scroll_to_middle) const { float thumb_size = static_cast<float>(thumb_->GetLength()); int track_size = GetTrackSize(); - if (track_size == thumb_size) + if (track_size == thumb_size) { return 0; - if (scroll_to_middle) + } + if (scroll_to_middle) { thumb_position = thumb_position - (thumb_size / 2); + } float result = (thumb_position * (contents_size_ - viewport_size_)) / (track_size - thumb_size); return base::ClampRound(result);
diff --git a/ui/views/controls/scrollbar/scroll_bar_button.cc b/ui/views/controls/scrollbar/scroll_bar_button.cc index c547b408..8e12c8e9 100644 --- a/ui/views/controls/scrollbar/scroll_bar_button.cc +++ b/ui/views/controls/scrollbar/scroll_bar_button.cc
@@ -35,8 +35,9 @@ gfx::Size ScrollBarButton::CalculatePreferredSize( const SizeBounds& /*available_size*/) const { - if (!GetWidget()) + if (!GetWidget()) { return gfx::Size(); + } return GetNativeTheme()->GetPartSize( GetNativeThemePart(), GetNativeThemeState(), GetNativeThemeParams()); }
diff --git a/ui/views/controls/scrollbar/scroll_bar_views.cc b/ui/views/controls/scrollbar/scroll_bar_views.cc index d6dfd80..af4ecff 100644 --- a/ui/views/controls/scrollbar/scroll_bar_views.cc +++ b/ui/views/controls/scrollbar/scroll_bar_views.cc
@@ -58,8 +58,9 @@ gfx::Size ScrollBarThumb::CalculatePreferredSize( const SizeBounds& /*available_size*/) const { - if (!GetWidget()) + if (!GetWidget()) { return gfx::Size(); + } return GetNativeTheme()->GetPartSize( GetNativeThemePart(), GetNativeThemeState(), GetNativeThemeParams()); } @@ -180,8 +181,9 @@ void ScrollBarViews::OnPaint(gfx::Canvas* canvas) { gfx::Rect bounds = GetTrackBounds(); - if (bounds.IsEmpty()) + if (bounds.IsEmpty()) { return; + } ui::NativeTheme::ScrollbarTrackExtraParams scrollbar_track; scrollbar_track.track_x = bounds.x();
diff --git a/ui/views/controls/scrollbar/scrollbar_unittest.cc b/ui/views/controls/scrollbar/scrollbar_unittest.cc index c75400ed..64275ef 100644 --- a/ui/views/controls/scrollbar/scrollbar_unittest.cc +++ b/ui/views/controls/scrollbar/scrollbar_unittest.cc
@@ -43,8 +43,9 @@ last_is_page = is_page; last_is_positive = is_positive; - if (is_page) + if (is_page) { return 20; + } return 10; } @@ -115,7 +116,6 @@ UniqueWidgetPtr widget_; - // Keep track of the size of the track. This is how we can tell when we // scroll to the middle. int track_size_;
diff --git a/ui/views/controls/separator.cc b/ui/views/controls/separator.cc index 6b3fa6b..14c2e6e 100644 --- a/ui/views/controls/separator.cc +++ b/ui/views/controls/separator.cc
@@ -26,8 +26,9 @@ } void Separator::SetColorId(ui::ColorId color_id) { - if (color_id_ == color_id) + if (color_id_ == color_id) { return; + } color_id_ = color_id; OnPropertyChanged(&color_id_, kPropertyEffectsPaint); @@ -38,8 +39,9 @@ } void Separator::SetPreferredLength(int length) { - if (preferred_length_ == length) + if (preferred_length_ == length) { return; + } preferred_length_ = length; OnPropertyChanged(&preferred_length_, kPropertyEffectsPreferredSizeChanged); @@ -67,8 +69,9 @@ gfx::Size Separator::CalculatePreferredSize( const SizeBounds& /*available_size*/) const { gfx::Size size(kThickness, preferred_length_); - if (orientation_ == Orientation::kHorizontal) + if (orientation_ == Orientation::kHorizontal) { size.Transpose(); + } gfx::Insets insets = GetInsets(); size.Enlarge(insets.width(), insets.height());
diff --git a/ui/views/controls/slider.cc b/ui/views/controls/slider.cc index 68aa085e..cd97e03 100644 --- a/ui/views/controls/slider.cc +++ b/ui/views/controls/slider.cc
@@ -51,20 +51,24 @@ float GetNearestAllowedValue(const base::flat_set<float>& allowed_values, float suggested_value) { - if (allowed_values.empty()) + if (allowed_values.empty()) { return suggested_value; + } const base::flat_set<float>::const_iterator greater = allowed_values.upper_bound(suggested_value); - if (greater == allowed_values.end()) + if (greater == allowed_values.end()) { return *allowed_values.rbegin(); + } - if (greater == allowed_values.begin()) + if (greater == allowed_values.begin()) { return *allowed_values.cbegin(); + } // Select a value nearest to the |suggested_value|. - if ((*greater - suggested_value) > (suggested_value - *std::prev(greater))) + if ((*greater - suggested_value) > (suggested_value - *std::prev(greater))) { return *std::prev(greater); + } return *greater; } @@ -110,8 +114,9 @@ } void Slider::SetEnableAccessibilityEvents(bool enabled) { - if (accessibility_events_enabled_ == enabled) + if (accessibility_events_enabled_ == enabled) { return; + } accessibility_events_enabled_ = enabled; OnPropertyChanged(&accessibility_events_enabled_, kPropertyEffectsNone); } @@ -141,8 +146,9 @@ const float new_value = (position == allowed_values_.end()) ? *allowed_values_.cbegin() : *position; - if (new_value != value_) + if (new_value != value_) { SetValue(new_value); + } } float Slider::GetAnimatingValue() const { @@ -153,10 +159,11 @@ } void Slider::SetHighlighted(bool is_highlighted) { - if (is_highlighted) + if (is_highlighted) { highlight_animation_.Show(); - else + } else { highlight_animation_.Hide(); + } } void Slider::AnimationProgressed(const gfx::Animation* animation) { @@ -180,17 +187,20 @@ bool old_value_valid = value_is_valid_; value_is_valid_ = true; - if (value < 0.0) + if (value < 0.0) { value = 0.0; - else if (value > 1.0) + } else if (value > 1.0) { value = 1.0; + } value = GetNearestAllowedValue(allowed_values_, value); - if (value_ == value) + if (value_ == value) { return; + } float old_value = value_; value_ = value; - if (listener_) + if (listener_) { listener_->SliderValueChanged(this, value_, old_value, reason); + } if (old_value_valid && base::CurrentThread::Get()) { // Do not animate when setting the value of the slider for the first time. @@ -225,10 +235,11 @@ const int thumb_x = value * (content.width() - 2 * value_indicator_radius_); const int candidate_x = GetMirroredXInView(new_x - inset.left()) - thumb_x; if (candidate_x >= value_indicator_radius_ - kThumbRadius && - candidate_x < value_indicator_radius_ + kThumbRadius) + candidate_x < value_indicator_radius_ + kThumbRadius) { initial_button_offset_ = candidate_x; - else + } else { initial_button_offset_ = value_indicator_radius_; + } } void Slider::MoveButtonTo(const gfx::Point& point) { @@ -244,14 +255,16 @@ void Slider::OnSliderDragStarted() { SetHighlighted(true); - if (listener_) + if (listener_) { listener_->SliderDragStarted(this); + } } void Slider::OnSliderDragEnded() { SetHighlighted(false); - if (listener_) + if (listener_) { listener_->SliderDragEnded(this); + } } gfx::Size Slider::CalculatePreferredSize( @@ -264,8 +277,9 @@ } bool Slider::OnMousePressed(const ui::MouseEvent& event) { - if (!event.IsOnlyLeftMouseButton()) + if (!event.IsOnlyLeftMouseButton()) { return false; + } OnSliderDragStarted(); PrepareForMove(event.location().x()); MoveButtonTo(event.location()); @@ -410,8 +424,9 @@ } void Slider::ApplyPendingAccessibleValueUpdate() { - if (!pending_accessibility_value_change_) + if (!pending_accessibility_value_change_) { return; + } UpdateAccessibleValue(); pending_accessibility_value_change_ = false; @@ -433,8 +448,9 @@ case ui::EventType::kGestureEnd: MoveButtonTo(event->location()); event->SetHandled(); - if (event->details().touch_points() <= 1) + if (event->details().touch_points() <= 1) { OnSliderDragEnded(); + } break; default: break;
diff --git a/ui/views/controls/slider_unittest.cc b/ui/views/controls/slider_unittest.cc index bd72d40..a4b36e92 100644 --- a/ui/views/controls/slider_unittest.cc +++ b/ui/views/controls/slider_unittest.cc
@@ -206,15 +206,17 @@ } float SliderTest::GetMinValue() const { - if (GetParam() == TestSliderType::kContinuousTest) + if (GetParam() == TestSliderType::kContinuousTest) { return 0.0f; + } return *values().cbegin(); } float SliderTest::GetMaxValue() const { - if (GetParam() == TestSliderType::kContinuousTest) + if (GetParam() == TestSliderType::kContinuousTest) { return 1.0f; + } return *values().crbegin(); }
diff --git a/ui/views/controls/styled_label.cc b/ui/views/controls/styled_label.cc index c08e7e8..3b2505c 100644 --- a/ui/views/controls/styled_label.cc +++ b/ui/views/controls/styled_label.cc
@@ -351,8 +351,9 @@ const gfx::Insets insets = GetInsets(); width = std::max(width, insets.width()); if (width >= layout_size_info_.total_size.width() && - width <= layout_size_info_.max_valid_width) + width <= layout_size_info_.max_valid_width) { return; + } layout_size_info_ = LayoutSizeInfo(width); layout_views_ = std::make_unique<LayoutViews>(); @@ -446,8 +447,9 @@ // unless this is the first line, in which case we strip leading // whitespace and try again. if ((line_size.width() != 0) || - (layout_views_->views_per_line.size() > 1)) + (layout_views_->views_per_line.size() > 1)) { break; + } can_trim_leading_whitespace = true; continue; } @@ -482,8 +484,9 @@ } } - if (chunk.size() > range.end() - position) + if (chunk.size() > range.end() - position) { chunk = chunk.substr(0, range.end() - position); + } if (!custom_view) { label = @@ -499,8 +502,9 @@ } } else { chunk = substrings[0]; - if (position + chunk.size() > range.start()) + if (position + chunk.size() > range.start()) { chunk = chunk.substr(0, range.start() - position); + } // This chunk is normal text. label = @@ -568,8 +572,9 @@ text, text_context_, *style_info.text_style, *previous_link_fragment); *previous_link_fragment = link.get(); link->SetCallback(style_info.callback); - if (!style_info.accessible_name.empty()) + if (!style_info.accessible_name.empty()) { link->GetViewAccessibility().SetName(style_info.accessible_name); + } result = std::move(link); } else if (style_info.custom_font) { @@ -591,8 +596,9 @@ if (!style_info.tooltip.empty()) { result->SetTooltipText(style_info.tooltip); } - if (!style_info.accessible_name.empty()) + if (!style_info.accessible_name.empty()) { result->GetViewAccessibility().SetName(style_info.accessible_name); + } if (absl::holds_alternative<SkColor>(displayed_on_background_color_)) { result->SetBackgroundColor( absl::get<SkColor>(displayed_on_background_color_));
diff --git a/ui/views/controls/tabbed_pane/tabbed_pane.cc b/ui/views/controls/tabbed_pane/tabbed_pane.cc index 831f7ac..e8f57fc0 100644 --- a/ui/views/controls/tabbed_pane/tabbed_pane.cc +++ b/ui/views/controls/tabbed_pane/tabbed_pane.cc
@@ -168,8 +168,9 @@ } bool TabbedPaneTab::OnMousePressed(const ui::MouseEvent& event) { - if (GetEnabled() && event.IsOnlyLeftMouseButton()) + if (GetEnabled() && event.IsOnlyLeftMouseButton()) { tab_strip_->SelectTab(this); + } return true; } @@ -234,8 +235,9 @@ // If the assistive tool sends kSetSelection, handle it like kDoDefault. // These generate a click event handled in TabbedPaneTab::OnMousePressed. ui::AXActionData action_data_copy(action_data); - if (action_data.action == ax::mojom::Action::kSetSelection) + if (action_data.action == ax::mojom::Action::kSetSelection) { action_data_copy.action = ax::mojom::Action::kDoDefault; + } return View::HandleAccessibleAction(action_data_copy); } @@ -661,10 +663,11 @@ } size_t TabbedPaneTabStrip::GetSelectedTabIndex() const { - for (size_t i = 0; i < children().size(); ++i) + for (size_t i = 0; i < children().size(); ++i) { if (GetTabAtIndex(i)->selected()) { return i; } + } return kNoSelectedTab; } @@ -843,8 +846,9 @@ bool scrollable) { CHECK(IsValidOrientationStyleCombo(orientation, style)); - if (orientation == TabbedPane::Orientation::kHorizontal) + if (orientation == TabbedPane::Orientation::kHorizontal) { SetOrientation(views::LayoutOrientation::kVertical); + } auto tab_strip = std::make_unique<TabbedPaneTabStrip>(orientation, style, this);
diff --git a/ui/views/controls/tabbed_pane/tabbed_pane_accessibility_mac_unittest.mm b/ui/views/controls/tabbed_pane/tabbed_pane_accessibility_mac_unittest.mm index 4c0c229..1e03be8a 100644 --- a/ui/views/controls/tabbed_pane/tabbed_pane_accessibility_mac_unittest.mm +++ b/ui/views/controls/tabbed_pane/tabbed_pane_accessibility_mac_unittest.mm
@@ -2,12 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/memory/raw_ptr.h" - #import <Cocoa/Cocoa.h> #import "base/apple/foundation_util.h" #import "base/mac/mac_util.h" +#include "base/memory/raw_ptr.h" #include "base/strings/utf_string_conversions.h" #import "testing/gtest_mac.h" #include "ui/gfx/geometry/point.h"
diff --git a/ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc b/ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc index 7e34987..ce9915a 100644 --- a/ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc +++ b/ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc
@@ -387,8 +387,9 @@ // This is needed for FocusManager::SetFocusedViewWithReason to notify // observers observers of focus changes. - if (widget_ && !widget_->IsActive()) + if (widget_ && !widget_->IsActive()) { widget_->Activate(); + } EXPECT_EQ(0u, tabbed_pane_->GetSelectedTabIndex());
diff --git a/ui/views/controls/table/table_header.cc b/ui/views/controls/table/table_header.cc index f777a2d0..e7bbbfd 100644 --- a/ui/views/controls/table/table_header.cc +++ b/ui/views/controls/table/table_header.cc
@@ -71,14 +71,16 @@ // HighlightPathGenerator: SkPath GetHighlightPath(const View* view) override { - if (!PlatformStyle::kTableViewSupportsKeyboardNavigationByCell) + if (!PlatformStyle::kTableViewSupportsKeyboardNavigationByCell) { return SkPath(); + } const TableHeader* const header = static_cast<const TableHeader*>(view); // If there's no focus indicator fall back on the default highlight path // (highlights entire view instead of active cell). - if (!header->HasFocusIndicator()) + if (!header->HasFocusIndicator()) { return SkPath(); + } // Draw a focus indicator around the active cell. gfx::Rect bounds = header->GetActiveHeaderCellBounds(); @@ -174,8 +176,9 @@ const int x = column.x + horizontal_padding; int width = column.width - horizontal_padding - horizontal_padding; - if (width <= 0) + if (width <= 0) { continue; + } const int title_width = gfx::GetStringWidth(column.column.title, font_list_); @@ -183,8 +186,9 @@ (column.column.id == sorted_column_id && title_width + sort_indicator_width <= width); - if (paint_sort_indicator) + if (paint_sort_indicator) { width -= sort_indicator_width; + } canvas->DrawStringRectWithFlags( column.column.title, font_list_, text_color, @@ -287,8 +291,9 @@ void TableHeader::OnMouseReleased(const ui::MouseEvent& event) { const bool was_resizing = resize_details_ != nullptr; resize_details_.reset(); - if (!was_resizing && event.IsOnlyLeftMouseButton()) + if (!was_resizing && event.IsOnlyLeftMouseButton()) { ToggleSortOrder(event); + } } void TableHeader::OnMouseCaptureLost() { @@ -302,8 +307,9 @@ void TableHeader::OnGestureEvent(ui::GestureEvent* event) { switch (event->type()) { case ui::EventType::kGestureTap: - if (!resize_details_.get()) + if (!resize_details_.get()) { ToggleSortOrder(*event); + } break; case ui::EventType::kGestureScrollBegin: StartResize(*event); @@ -366,13 +372,15 @@ } bool TableHeader::StartResize(const ui::LocatedEvent& event) { - if (is_resizing()) + if (is_resizing()) { return false; + } const std::optional<size_t> index = GetResizeColumn(GetMirroredXInView(event.x())); - if (!index.has_value()) + if (!index.has_value()) { return false; + } resize_details_ = std::make_unique<ColumnResizeDetails>(); resize_details_->column_index = index.value(); @@ -383,8 +391,9 @@ } void TableHeader::ContinueResize(const ui::LocatedEvent& event) { - if (!is_resizing()) + if (!is_resizing()) { return; + } const int scale = base::i18n::IsRTL() ? -1 : 1; const int delta = @@ -401,13 +410,15 @@ } void TableHeader::ToggleSortOrder(const ui::LocatedEvent& event) { - if (table_->visible_columns().empty()) + if (table_->visible_columns().empty()) { return; + } const int x = GetMirroredXInView(event.x()); const std::optional<size_t> index = GetClosestVisibleColumnIndex(*table_, x); - if (!index.has_value()) + if (!index.has_value()) { return; + } const TableView::VisibleColumn& column( table_->GetVisibleColumn(index.value())); if (x >= column.x && x < column.x + column.width && event.y() >= 0 && @@ -418,8 +429,9 @@ std::optional<size_t> TableHeader::GetResizeColumn(int x) const { const Columns& columns(table_->visible_columns()); - if (columns.empty()) + if (columns.empty()) { return std::nullopt; + } const std::optional<size_t> index = GetClosestVisibleColumnIndex(*table_, x); DCHECK(index.has_value());
diff --git a/ui/views/controls/table/table_utils.cc b/ui/views/controls/table/table_utils.cc index 275703a..818c9b9 100644 --- a/ui/views/controls/table/table_utils.cc +++ b/ui/views/controls/table/table_utils.cc
@@ -27,9 +27,10 @@ const ui::TableColumn& column, ui::TableModel* model) { int width = header_padding; - if (!column.title.empty()) + if (!column.title.empty()) { width = gfx::GetStringWidth(column.title, header_font_list) + header_padding; + } for (size_t i = 0, row_count = model->RowCount(); i < row_count; ++i) { const int cell_width = @@ -64,8 +65,9 @@ content_widths[i] = WidthForContent(header_font_list, content_font_list, padding, header_padding, column, model); - if (i == 0) + if (i == 0) { content_widths[i] += first_column_padding; + } } non_percent_width += content_widths[i]; } else { @@ -113,19 +115,22 @@ std::optional<size_t> GetClosestVisibleColumnIndex(const TableView& table, int x) { const std::vector<TableView::VisibleColumn>& columns(table.visible_columns()); - if (columns.empty()) + if (columns.empty()) { return std::nullopt; + } for (size_t i = 0; i < columns.size(); ++i) { - if (x <= columns[i].x + columns[i].width) + if (x <= columns[i].x + columns[i].width) { return i; + } } return columns.size() - 1; } ui::TableColumn::Alignment GetMirroredTableColumnAlignment( ui::TableColumn::Alignment alignment) { - if (!base::i18n::IsRTL()) + if (!base::i18n::IsRTL()) { return alignment; + } switch (alignment) { case ui::TableColumn::LEFT:
diff --git a/ui/views/controls/table/table_utils_unittest.cc b/ui/views/controls/table/table_utils_unittest.cc index 3dc8c9e..7fbe2ff5 100644 --- a/ui/views/controls/table/table_utils_unittest.cc +++ b/ui/views/controls/table/table_utils_unittest.cc
@@ -23,8 +23,9 @@ std::string IntVectorToString(const std::vector<int>& values) { std::string result; for (size_t i = 0; i < values.size(); ++i) { - if (i != 0) + if (i != 0) { result += ","; + } result += base::NumberToString(values[i]); } return result;
diff --git a/ui/views/controls/table/table_view.cc b/ui/views/controls/table/table_view.cc index e4be470..b0d2d5ef 100644 --- a/ui/views/controls/table/table_view.cc +++ b/ui/views/controls/table/table_view.cc
@@ -76,8 +76,9 @@ GroupRange range; grouper->GetGroupRange(model_index, &range); DCHECK_GT(range.length, 0u); - for (size_t i = model_index; i < model_index + range.length; ++i) + for (size_t i = model_index; i < model_index + range.length; ++i) { (*model_index_to_range_start)[i] = model_index; + } model_index += range.length; } } @@ -155,14 +156,16 @@ // HighlightPathGenerator: SkPath GetHighlightPath(const views::View* view) override { - if (!PlatformStyle::kTableViewSupportsKeyboardNavigationByCell) + if (!PlatformStyle::kTableViewSupportsKeyboardNavigationByCell) { return SkPath(); + } const TableView* const table = static_cast<const TableView*>(view); // If there's no focus indicator fall back on the default highlight path // (highlights entire view instead of active cell). - if (!table->GetHasFocusIndicator()) + if (!table->GetHasFocusIndicator()) { return SkPath(); + } // Draw a focus indicator around the active cell. gfx::Rect bounds = table->GetActiveCellBounds(); @@ -212,8 +215,9 @@ } TableView::~TableView() { - if (model_) + if (model_) { model_->SetObserver(nullptr); + } } // static @@ -254,11 +258,13 @@ // TODO(sky): this doesn't support arbitrarily changing the model, rename this // to ClearModel() or something. void TableView::SetModel(ui::TableModel* model) { - if (model == model_) + if (model == model_) { return; + } - if (model_) + if (model_) { model_->SetObserver(nullptr); + } model_ = model; selection_model_.Clear(); if (model_) { @@ -288,8 +294,9 @@ } void TableView::SetTableType(TableType table_type) { - if (table_type_ == table_type) + if (table_type_ == table_type) { return; + } table_type_ = table_type; OnPropertyChanged(&table_type_, PropertyEffects::kPropertyEffectsLayout); } @@ -299,8 +306,9 @@ } void TableView::SetSingleSelection(bool single_selection) { - if (single_selection_ == single_selection) + if (single_selection_ == single_selection) { return; + } single_selection_ = single_selection; OnPropertyChanged(&single_selection_, PropertyEffects::kPropertyEffectsPaint); } @@ -319,8 +327,9 @@ } void TableView::Select(std::optional<size_t> model_row) { - if (!model_) + if (!model_) { return; + } SelectByViewIndex(model_row.has_value() ? std::make_optional(ModelToView(model_row.value())) @@ -328,8 +337,9 @@ } void TableView::SetSelectionAll(bool select) { - if (!GetRowCount()) + if (!GetRowCount()) { return; + } ui::ListSelectionModel selection_model; @@ -353,8 +363,9 @@ // TODO(dpenning) : Prevent the last column from being closed. See // crbug.com/1324306 for details. void TableView::SetColumnVisibility(int id, bool is_visible) { - if (is_visible == IsColumnVisible(id)) + if (is_visible == IsColumnVisible(id)) { return; + } if (is_visible) { VisibleColumn visible_column; @@ -367,11 +378,12 @@ if (i != visible_columns_.end()) { visible_columns_.erase(i); if (active_visible_column_index_.has_value() && - active_visible_column_index_.value() >= visible_columns_.size()) + active_visible_column_index_.value() >= visible_columns_.size()) { SetActiveVisibleColumnIndex( visible_columns_.empty() ? std::nullopt : std::make_optional(visible_columns_.size() - 1)); + } } GetViewAccessibility().SetTableColumnCount( @@ -382,8 +394,9 @@ PreferredSizeChanged(); SchedulePaint(); - if (header_) + if (header_) { header_->SchedulePaint(); + } // This will clear and create the entire accessibility tree, to optimize this // further, removing/adding the cell's dynamically could be done instead. @@ -393,8 +406,9 @@ void TableView::ToggleSortOrder(size_t visible_column_index) { DCHECK(visible_column_index < visible_columns_.size()); const ui::TableColumn& column = visible_columns_[visible_column_index].column; - if (!column.sortable) + if (!column.sortable) { return; + } SortDescriptors sort(sort_descriptors_); if (!sort.empty() && sort[0].column_id == column.id) { if (sort[0].ascending == column.initial_sort_is_ascending) { @@ -414,8 +428,9 @@ SortDescriptor descriptor(column.id, column.initial_sort_is_ascending); sort.insert(sort.begin(), descriptor); // Only persist two sort descriptors. - if (sort.size() > 2) + if (sort.size() > 2) { sort.resize(2); + } GetViewAccessibility().AnnounceText(l10n_util::GetStringFUTF16( sort[0].ascending ? IDS_APP_TABLE_COLUMN_SORTED_ASC_ACCNAME : IDS_APP_TABLE_COLUMN_SORTED_DESC_ACCNAME, @@ -428,8 +443,9 @@ void TableView::SetSortDescriptors(const SortDescriptors& sort_descriptors) { sort_descriptors_ = sort_descriptors; SortItemsAndUpdateMapping(/*schedule_paint=*/true); - if (header_) + if (header_) { header_->SchedulePaint(); + } } bool TableView::IsColumnVisible(int id) const { @@ -448,8 +464,9 @@ } void TableView::SetObserver(TableViewObserver* observer) { - if (observer_ == observer) + if (observer_ == observer) { return; + } observer_ = observer; OnPropertyChanged(&observer_, PropertyEffects::kPropertyEffectsNone); } @@ -465,8 +482,9 @@ void TableView::SetVisibleColumnWidth(size_t index, int width) { DCHECK(index < visible_columns_.size()); - if (visible_columns_[index].width == width) + if (visible_columns_[index].width == width) { return; + } base::AutoReset<bool> reseter(&in_set_visible_column_width_, true); visible_columns_[index].width = width; for (size_t i = index + 1; i < visible_columns_.size(); ++i) { @@ -480,8 +498,9 @@ } size_t TableView::ModelToView(size_t model_index) const { - if (!GetIsSorted()) + if (!GetIsSorted()) { return model_index; + } CHECK_LT(model_index, model_to_view_.size()) << " out of bounds model_index " << model_index; return model_to_view_[model_index]; @@ -489,8 +508,9 @@ size_t TableView::ViewToModel(size_t view_index) const { CHECK_LT(view_index, GetRowCount()); - if (!GetIsSorted()) + if (!GetIsSorted()) { return view_index; + } DCHECK_LT(view_index, view_to_model_.size()) << " out of bounds view_index " << view_index; return view_to_model_[view_index]; @@ -501,8 +521,9 @@ } void TableView::SetSelectOnRemove(bool select_on_remove) { - if (select_on_remove_ == select_on_remove) + if (select_on_remove_ == select_on_remove) { return; + } select_on_remove_ = select_on_remove; OnPropertyChanged(&select_on_remove_, kPropertyEffectsNone); @@ -513,8 +534,9 @@ } void TableView::SetSortOnPaint(bool sort_on_paint) { - if (sort_on_paint_ == sort_on_paint) + if (sort_on_paint_ == sort_on_paint) { return; + } sort_on_paint_ = sort_on_paint; OnPropertyChanged(&sort_on_paint_, kPropertyEffectsNone); @@ -522,8 +544,9 @@ ax::mojom::SortDirection TableView::GetFirstSortDescriptorDirection() const { DCHECK(!sort_descriptors().empty()); - if (sort_descriptors()[0].ascending) + if (sort_descriptors()[0].ascending) { return ax::mojom::SortDirection::kAscending; + } return ax::mojom::SortDirection::kDescending; } @@ -563,8 +586,9 @@ gfx::Size TableView::CalculatePreferredSize( const SizeBounds& /*available_size*/) const { int width = 50; - if (header_ && !visible_columns_.empty()) + if (header_ && !visible_columns_.empty()) { width = visible_columns_.back().x + visible_columns_.back().width; + } return gfx::Size(width, static_cast<int>(GetRowCount()) * row_height_); } @@ -579,8 +603,9 @@ } bool TableView::OnKeyPressed(const ui::KeyEvent& event) { - if (!HasFocus()) + if (!HasFocus()) { return false; + } switch (event.key_code()) { case ui::VKEY_A: @@ -592,24 +617,29 @@ break; case ui::VKEY_HOME: - if (header_row_is_active_) + if (header_row_is_active_) { break; - if (GetRowCount()) + } + if (GetRowCount()) { SelectByViewIndex(size_t{0}); + } return true; case ui::VKEY_END: - if (header_row_is_active_) + if (header_row_is_active_) { break; - if (GetRowCount()) + } + if (GetRowCount()) { SelectByViewIndex(GetRowCount() - 1); + } return true; case ui::VKEY_UP: #if BUILDFLAG(IS_MAC) if (event.IsAltDown()) { - if (GetRowCount()) + if (GetRowCount()) { SelectByViewIndex(size_t{0}); + } } else { AdvanceSelection(AdvanceDirection::kDecrement); } @@ -621,8 +651,9 @@ case ui::VKEY_DOWN: #if BUILDFLAG(IS_MAC) if (event.IsAltDown()) { - if (GetRowCount()) + if (GetRowCount()) { SelectByViewIndex(GetRowCount() - 1); + } } else { AdvanceSelection(AdvanceDirection::kIncrement); } @@ -694,24 +725,28 @@ break; } - if (observer_) + if (observer_) { observer_->OnKeyDown(event.key_code()); + } return false; } bool TableView::OnMousePressed(const ui::MouseEvent& event) { RequestFocus(); - if (!event.IsOnlyLeftMouseButton()) + if (!event.IsOnlyLeftMouseButton()) { return true; + } const int row = event.y() / row_height_; - if (row < 0 || static_cast<size_t>(row) >= GetRowCount()) + if (row < 0 || static_cast<size_t>(row) >= GetRowCount()) { return true; + } if (event.GetClickCount() == 2) { SelectByViewIndex(static_cast<size_t>(row)); - if (observer_) + if (observer_) { observer_->OnDoubleClick(); + } } else if (event.GetClickCount() == 1) { ui::ListSelectionModel new_model; ConfigureSelectionModelForEvent(event, &new_model); @@ -729,8 +764,9 @@ RequestFocus(); const int row = event->y() / row_height_; - if (row < 0 || static_cast<size_t>(row) >= GetRowCount()) + if (row < 0 || static_cast<size_t>(row) >= GetRowCount()) { return; + } event->StopPropagation(); ui::ListSelectionModel new_model; @@ -754,15 +790,17 @@ } const size_t model_row = ViewToModel(static_cast<size_t>(row)); - if (column.value() == 0 && !model_->GetTooltip(model_row).empty()) + if (column.value() == 0 && !model_->GetTooltip(model_row).empty()) { return model_->GetTooltip(model_row); + } return model_->GetText(model_row, visible_columns_[column.value()].column.id); } bool TableView::HandleAccessibleAction(const ui::AXActionData& action_data) { const size_t row_count = GetRowCount(); - if (!row_count) + if (!row_count) { return false; + } // On CrOS, the table wrapper node is not a AXVirtualView // and thus |ax_view| will be null. @@ -790,8 +828,9 @@ // If the ax focus is on the full table, select the row as indicated by // the model. SelectByViewIndex(ModelToView(active_row)); - if (observer_) + if (observer_) { observer_->OnDoubleClick(); + } } break; @@ -899,11 +938,13 @@ GetFirstSelectedRow(); std::optional<size_t> previously_selected_view_index = previously_selected_model_index; - if (previously_selected_model_index.has_value() && GetIsSorted()) + if (previously_selected_model_index.has_value() && GetIsSorted()) { previously_selected_view_index = model_to_view_[previously_selected_model_index.value()]; - for (size_t i = 0; i < length; ++i) + } + for (size_t i = 0; i < length; ++i) { selection_model_.DecrementFrom(start); + } // Update the `view_to_model_` and `model_to_view_` mappings prior to updating // TableView's virtual children below. We do this because at this point the @@ -934,23 +975,27 @@ if (!selection_model_.empty()) { const size_t selected_model_index = *selection_model_.selected_indices().begin(); - if (!selection_model_.active().has_value()) + if (!selection_model_.active().has_value()) { selection_model_.set_active(selected_model_index); - if (!selection_model_.anchor().has_value()) + } + if (!selection_model_.anchor().has_value()) { selection_model_.set_anchor(selected_model_index); + } } // Remove the virtual views that are no longer needed. auto& virtual_children = GetViewAccessibility().virtual_children(); - for (size_t i = start; !virtual_children.empty() && i < start + length; i++) + for (size_t i = start; !virtual_children.empty() && i < start + length; i++) { virtual_children[virtual_children.size() - 1]->RemoveFromParentView(); + } GetViewAccessibility().SetTableRowCount(static_cast<int32_t>(GetRowCount())); UpdateVirtualAccessibilityChildrenBounds(); PreferredSizeChanged(); NotifyAccessibilityEvent(ax::mojom::Event::kChildrenChanged, true); - if (observer_) + if (observer_) { observer_->OnSelectionChanged(); + } } gfx::Point TableView::GetKeyboardContextMenuLocation() { @@ -965,8 +1010,9 @@ } } gfx::Point screen_loc(0, y); - if (base::i18n::IsRTL()) + if (base::i18n::IsRTL()) { screen_loc.set_x(width()); + } ConvertPointToScreen(this, &screen_loc); return screen_loc; } @@ -990,20 +1036,23 @@ void TableView::OnPaintImpl(gfx::Canvas* canvas) { // Don't invoke View::OnPaint so that we can render our own focus border. - if (sort_on_paint_) + if (sort_on_paint_) { SortItemsAndUpdateMapping(/*schedule_paint=*/false); + } ui::ColorProvider* color_provider = GetColorProvider(); const SkColor default_bg_color = color_provider->GetColor(ui::kColorTableBackground); canvas->DrawColor(default_bg_color); - if (!GetRowCount() || visible_columns_.empty()) + if (!GetRowCount() || visible_columns_.empty()) { return; + } const PaintRegion region(GetPaintRegion(GetPaintBounds(canvas))); - if (region.min_column == visible_columns_.size()) + if (region.min_column == visible_columns_.size()) { return; // No need to paint anything. + } const SkColor selected_bg_color = color_provider->GetColor(text_background_color_id(HasFocus())); @@ -1017,10 +1066,11 @@ for (size_t i = region.min_row; i < region.max_row; ++i) { const size_t model_index = ViewToModel(i); const bool is_selected = selection_model_.IsSelected(model_index); - if (is_selected) + if (is_selected) { canvas->FillRect(GetRowBounds(i), selected_bg_color); - else if (alternate_bg_color != default_bg_color && (i % 2)) + } else if (alternate_bg_color != default_bg_color && (i % 2)) { canvas->FillRect(GetRowBounds(i), alternate_bg_color); + } for (size_t j = region.min_column; j < region.max_column; ++j) { const gfx::Rect cell_bounds = GetCellBounds(i, j); gfx::Rect text_bounds = cell_bounds; @@ -1069,8 +1119,9 @@ } } - if (!grouper_ || region.min_column > 0) + if (!grouper_ || region.min_column > 0) { return; + } const SkColor grouping_color = color_provider->GetColor(ui::kColorTableGroupingIndicator); @@ -1111,7 +1162,6 @@ DISTANCE_RELATED_LABEL_HORIZONTAL); } - void TableView::SortItemsAndUpdateMapping(bool schedule_paint) { const size_t row_count = GetRowCount(); @@ -1127,8 +1177,9 @@ model_to_view_.resize(row_count); // Resets the mapping so it can be sorted again. - for (size_t view_index = 0; view_index < row_count; ++view_index) + for (size_t view_index = 0; view_index < row_count; ++view_index) { view_to_model_[view_index] = view_index; + } if (grouper_) { GroupSortHelper sort_helper(this); @@ -1155,8 +1206,9 @@ GetViewAccessibility().SetTableRowCount(static_cast<int32_t>(GetRowCount())); UpdateVirtualAccessibilityChildrenBounds(); - if (schedule_paint) + if (schedule_paint) { SchedulePaint(); + } } int TableView::CompareRows(size_t model_row1, size_t model_row2) { @@ -1179,16 +1231,18 @@ gfx::Rect TableView::GetCellBounds(size_t row, size_t visible_column_index) const { - if (!header_) + if (!header_) { return GetRowBounds(row); + } const VisibleColumn& vis_col(visible_columns_[visible_column_index]); return gfx::Rect(vis_col.x, static_cast<int>(row) * row_height_, vis_col.width, row_height_); } gfx::Rect TableView::GetActiveCellBounds() const { - if (!selection_model_.active().has_value()) + if (!selection_model_.active().has_value()) { return gfx::Rect(); + } return GetCellBounds(ModelToView(selection_model_.active().value()), active_visible_column_index_.value()); } @@ -1199,8 +1253,9 @@ const int cell_element_spacing = GetCellElementSpacing(); int text_x = cell_margin + bounds->x(); if (visible_column_index == 0) { - if (grouper_) + if (grouper_) { text_x += kGroupingIndicatorSize + cell_element_spacing; + } if (table_type_ == TableType::kIconAndText) { text_x += ui::TableModel::kIconSize + cell_element_spacing; } @@ -1226,12 +1281,14 @@ } void TableView::UpdateVisibleColumnSizes() { - if (!header_) + if (!header_) { return; + } std::vector<ui::TableColumn> columns; - for (const auto& visible_column : visible_columns_) + for (const auto& visible_column : visible_columns_) { columns.push_back(visible_column.column); + } const int cell_margin = GetCellMargin(); const int cell_element_spacing = GetCellElementSpacing(); @@ -1239,8 +1296,9 @@ if (table_type_ == TableType::kIconAndText && header_) { first_column_padding += ui::TableModel::kIconSize + cell_element_spacing; } - if (grouper_) + if (grouper_) { first_column_padding += kGroupingIndicatorSize + cell_element_spacing; + } std::vector<int> sizes = views::CalculateTableColumnSizes( layout_width_, first_column_padding, header_->font_list(), font_list_, @@ -1310,8 +1368,9 @@ std::clamp(bounds.y() / row_height_, 0, base::saturated_cast<int>(GetRowCount() - 1))); region.max_row = static_cast<size_t>(bounds.bottom() / row_height_); - if (bounds.bottom() % row_height_ != 0) + if (bounds.bottom() % row_height_ != 0) { region.max_row++; + } region.max_row = std::min(region.max_row, GetRowCount()); if (!header_) { @@ -1324,8 +1383,9 @@ region.min_column = region.max_column = visible_columns_.size(); for (size_t i = 0; i < visible_columns_.size(); ++i) { int max_x = visible_columns_[i].x + visible_columns_[i].width; - if (region.min_column == visible_columns_.size() && max_x >= paint_x) + if (region.min_column == visible_columns_.size() && max_x >= paint_x) { region.min_column = i; + } if (region.min_column != visible_columns_.size() && visible_columns_[i].x >= paint_max_x) { region.max_column = i; @@ -1337,8 +1397,9 @@ gfx::Rect TableView::GetPaintBounds(gfx::Canvas* canvas) const { SkRect sk_clip_rect; - if (canvas->sk_canvas()->getLocalClipBounds(&sk_clip_rect)) + if (canvas->sk_canvas()->getLocalClipBounds(&sk_clip_rect)) { return gfx::ToEnclosingRect(gfx::SkRectToRectF(sk_clip_rect)); + } return GetVisibleBounds(); } @@ -1428,8 +1489,9 @@ } void TableView::SetSelectionModel(ui::ListSelectionModel new_selection) { - if (new_selection == selection_model_) + if (new_selection == selection_model_) { return; + } SchedulePaintForSelection(); selection_model_ = std::move(new_selection); @@ -1446,16 +1508,18 @@ vis_rect.set_height(end_y - start_y); ScrollRectToVisible(vis_rect); - if (!active_visible_column_index_.has_value()) + if (!active_visible_column_index_.has_value()) { SetActiveVisibleColumnIndex(size_t{0}); + } } else if (!header_row_is_active_) { SetActiveVisibleColumnIndex(std::nullopt); } UpdateFocusRings(); ScheduleUpdateAccessibilityFocusIfNeeded(); - if (observer_) + if (observer_) { observer_->OnSelectionChanged(); + } } void TableView::AdvanceSelection(AdvanceDirection direction) { @@ -1510,15 +1574,17 @@ // |view_index| are selected. // shift: reset selection so that only rows between anchor and |view_index| // are selected. - if (IsCmdOrCtrl(event) && event.IsShiftDown()) + if (IsCmdOrCtrl(event) && event.IsShiftDown()) { *model = selection_model_; - else + } else { model->set_anchor(selection_model_.anchor()); + } DCHECK(model->anchor().has_value()); const size_t anchor_index = ModelToView(model->anchor().value()); const auto [min, max] = std::minmax(view_index, anchor_index); - for (size_t i = min; i <= max; ++i) + for (size_t i = min; i <= max; ++i) { SelectRowsInRangeFrom(i, true, model); + } model->set_active(ViewToModel(view_index)); } else { DCHECK(IsCmdOrCtrl(event)); @@ -1746,8 +1812,9 @@ } row_data.SetDefaultActionVerb(ax::mojom::DefaultActionVerb::kSelect); - if (!single_selection_) + if (!single_selection_) { row_data.AddState(ax::mojom::State::kMultiselectable); + } for (size_t visible_column_index = 0; visible_column_index < visible_columns_.size(); ++visible_column_index) { @@ -1785,8 +1852,9 @@ static_cast<int32_t>(column_index)); cell_data.AddIntAttribute(ax::mojom::IntAttribute::kTableCellColumnSpan, 1); - if (base::i18n::IsRTL()) + if (base::i18n::IsRTL()) { cell_data.SetTextDirection(ax::mojom::WritingDirection::kRtl); + } auto sort_direction = ax::mojom::SortDirection::kUnsorted; const std::optional<int> primary_sorted_column_id = @@ -1806,8 +1874,9 @@ void TableView::UpdateFocusRings() { views::FocusRing::Get(this)->SchedulePaint(); - if (header_) + if (header_) { header_->UpdateFocusState(); + } } std::unique_ptr<AXVirtualView> TableView::CreateHeaderAccessibilityView() { @@ -1862,8 +1931,9 @@ int previous_view_index = row_data.GetIntAttribute(ax::mojom::IntAttribute::kTableRowIndex); - if (previous_view_index == view_index) + if (previous_view_index == view_index) { return false; + } row_data.AddIntAttribute(ax::mojom::IntAttribute::kTableRowIndex, static_cast<int32_t>(view_index)); @@ -1883,8 +1953,9 @@ // updating (e.g. showing or hiding a column) but the virtual accessibility // children haven't been updated yet to reflect the new model. auto& virtual_children = GetViewAccessibility().virtual_children(); - if (virtual_children.empty()) + if (virtual_children.empty()) { return; + } // Update the bounds for the header first, if applicable. if (header_) { @@ -1914,8 +1985,9 @@ // Update the bounds for the table's content rows. for (size_t row_index = 0; row_index < GetRowCount(); row_index++) { const size_t ax_row_index = header_ ? row_index + 1 : row_index; - if (ax_row_index >= virtual_children.size()) + if (ax_row_index >= virtual_children.size()) { break; + } auto& ax_row = virtual_children[ax_row_index]; ui::AXNodeData& row_data = ax_row->GetCustomData(); @@ -1973,8 +2045,9 @@ } void TableView::ScheduleUpdateAccessibilityFocusIfNeeded() { - if (update_accessibility_focus_pending_) + if (update_accessibility_focus_pending_) { return; + } update_accessibility_focus_pending_ = true; base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask( @@ -1988,8 +2061,9 @@ DCHECK(update_accessibility_focus_pending_); update_accessibility_focus_pending_ = false; - if (!HasFocus()) + if (!HasFocus()) { return; + } if (header_ && header_row_is_active_) { AXVirtualView* ax_header_row = GetVirtualAccessibilityHeaderRow(); @@ -2035,8 +2109,9 @@ AXVirtualView* TableView::GetVirtualAccessibilityBodyRow(size_t row) const { DCHECK_LT(row, GetRowCount()); - if (header_) + if (header_) { ++row; + } CHECK_LT(row, GetViewAccessibility().virtual_children().size()) << "|row| not found. Did you forget to call " "RebuildVirtualAccessibilityChildren()?";
diff --git a/ui/views/controls/table/table_view_unittest.cc b/ui/views/controls/table/table_view_unittest.cc index d8d4e11..5aa543df 100644 --- a/ui/views/controls/table/table_view_unittest.cc +++ b/ui/views/controls/table/table_view_unittest.cc
@@ -248,8 +248,9 @@ new_row.push_back(c1_value); new_row.push_back(c2_value); rows_.insert(rows_.begin() + row, new_row); - if (observer_) + if (observer_) { observer_->OnItemsAdded(row, 1); + } } void TestTableModel2::AddRows(size_t row, size_t length, int value_multiplier) { @@ -263,15 +264,17 @@ } } - if (observer_ && length > 0) + if (observer_ && length > 0) { observer_->OnItemsAdded(row, length); + } } void TestTableModel2::RemoveRow(size_t row) { DCHECK(row < rows_.size()); rows_.erase(rows_.begin() + row); - if (observer_) + if (observer_) { observer_->OnItemsRemoved(row, 1); + } } void TestTableModel2::RemoveRows(size_t row, size_t length) { @@ -281,16 +284,18 @@ rows_.begin() + std::clamp(row + length, size_t{0}, rows_.size())); } - if (observer_ && length > 0) + if (observer_ && length > 0) { observer_->OnItemsRemoved(row, length); + } } void TestTableModel2::ChangeRow(size_t row, int c1_value, int c2_value) { DCHECK(row < rows_.size()); rows_[row][0] = c1_value; rows_[row][1] = c2_value; - if (observer_) + if (observer_) { observer_->OnItemsChanged(row, 1); + } } void TestTableModel2::MoveRows(size_t row_from, size_t length, size_t row_to) { @@ -302,8 +307,9 @@ std::vector<std::vector<int>> temp(old_start, old_start + length); rows_.erase(old_start, old_start + length); rows_.insert(rows_.begin() + row_to, temp.begin(), temp.end()); - if (observer_) + if (observer_) { observer_->OnItemsMoved(row_from, length, row_to); + } } void TestTableModel2::SetTooltip(const std::u16string& tooltip) { @@ -334,8 +340,9 @@ std::string GetViewToModelAsString(TableView* table) { std::string result; for (size_t i = 0; i < table->GetRowCount(); ++i) { - if (i != 0) + if (i != 0) { result += " "; + } result += base::NumberToString(table->ViewToModel(i)); } return result; @@ -345,8 +352,9 @@ std::string GetModelToViewAsString(TableView* table) { std::string result; for (size_t i = 0; i < table->GetRowCount(); ++i) { - if (i != 0) + if (i != 0) { result += " "; + } result += base::NumberToString(table->ModelToView(i)); } return result; @@ -357,15 +365,17 @@ std::string GetRowsInViewOrderAsString(TableView* table) { std::string result; for (size_t i = 0; i < table->GetRowCount(); ++i) { - if (i != 0) + if (i != 0) { result += ", "; // Comma between each row. + } // Format row |i| like this: "[value1, value2, value3]" result += "["; for (size_t j = 0; j < table->visible_columns().size(); ++j) { const ui::TableColumn& column = table->GetVisibleColumn(j).column; - if (j != 0) + if (j != 0) { result += ", "; // Comma between each value in the row. + } result += base::UTF16ToUTF8( table->model()->GetText(table->ViewToModel(i), column.id)); @@ -382,8 +392,9 @@ std::string result; for (size_t row_index = 0; row_index < virtual_children.size(); row_index++) { - if (row_index != 0) + if (row_index != 0) { result += ", "; // Comma between each row. + } const auto& row = virtual_children[row_index]; @@ -391,8 +402,9 @@ for (size_t cell_index = 0; cell_index < row->children().size(); cell_index++) { - if (cell_index != 0) + if (cell_index != 0) { result += ", "; // Comma between each value in the row. + } const auto& cell = row->children()[cell_index]; const ui::AXNodeData& cell_data = cell->GetData(); @@ -411,8 +423,9 @@ for (size_t col_index = 0; col_index < table->visible_columns().size(); ++col_index) { - if (col_index != 0) + if (col_index != 0) { result += ", "; // Comma between each column. + } result += base::UTF16ToUTF8(table->GetVisibleColumn(col_index).column.title); @@ -606,10 +619,11 @@ ASSERT_TRUE(cell); const ui::AXNodeData& cell_data = cell->GetData(); - if (row_index == 0) + if (row_index == 0) { EXPECT_EQ(ax::mojom::Role::kColumnHeader, cell_data.role); - else + } else { EXPECT_EQ(ax::mojom::Role::kGridCell, cell_data.role); + } // Add 1 to get the cell's index into |expected_bounds| since the first // entry is the row's bounds. @@ -906,16 +920,18 @@ table_->GetViewAccessibility().set_accessibility_events_callback( base::BindLambdaForTesting( [&](const ui::AXPlatformNodeDelegate*, const ax::mojom::Event event) { - if (event == ax::mojom::Event::kTextChanged) + if (event == ax::mojom::Event::kTextChanged) { ++text_changed_count; + } })); // First we make sure that simply accessing the data will not fire the event. const AXVirtualView* cell = helper_->GetVirtualAccessibilityCell(0, 0); ASSERT_TRUE(cell); ui::AXNodeData cell_data; - for (int i = 0; i < 100; ++i) + for (int i = 0; i < 100; ++i) { cell_data = cell->GetData(); + } EXPECT_EQ(0, text_changed_count); // A kTextChanged event is fired when a cell's data is changed and @@ -1328,8 +1344,10 @@ void GetGroupRange(size_t model_index, GroupRange* range) override { size_t offset = 0; size_t range_index = 0; - for (; range_index < ranges_.size() && offset < model_index; ++range_index) + for (; range_index < ranges_.size() && offset < model_index; + ++range_index) { offset += ranges_[range_index]; + } if (offset == model_index) { range->start = model_index;
diff --git a/ui/views/controls/textarea/textarea_unittest.cc b/ui/views/controls/textarea/textarea_unittest.cc index 5e53bf6..393e0fa 100644 --- a/ui/views/controls/textarea/textarea_unittest.cc +++ b/ui/views/controls/textarea/textarea_unittest.cc
@@ -184,20 +184,22 @@ // to cover the whole line. SendHomeEvent(true); - if (Textarea::kLineSelectionBehavior == gfx::SELECTION_EXTEND) + if (Textarea::kLineSelectionBehavior == gfx::SELECTION_EXTEND) { EXPECT_EQ(u"34567 89", textarea_->GetSelectedText()); - else + } else { EXPECT_EQ(u"345", textarea_->GetSelectedText()); + } EXPECT_TRUE(textarea_->GetSelectedRange().is_reversed()); // Select line towards right. SendEndEvent(true); - if (Textarea::kLineSelectionBehavior == gfx::SELECTION_EXTEND) + if (Textarea::kLineSelectionBehavior == gfx::SELECTION_EXTEND) { EXPECT_EQ(u"34567 89", textarea_->GetSelectedText()); - else + } else { EXPECT_EQ(u"67 89", textarea_->GetSelectedText()); + } EXPECT_FALSE(textarea_->GetSelectedRange().is_reversed()); } @@ -267,10 +269,11 @@ GetTextfieldTestApi().ExecuteTextEditCommand( ui::TextEditCommand::MOVE_PAGE_DOWN_AND_MODIFY_SELECTION); - if (Textarea::kLineSelectionBehavior == gfx::SELECTION_EXTEND) + if (Textarea::kLineSelectionBehavior == gfx::SELECTION_EXTEND) { EXPECT_EQ(gfx::Range(0, 11), textarea_->GetSelectedRange()); - else + } else { EXPECT_EQ(gfx::Range(6, 11), textarea_->GetSelectedRange()); + } } // Ensure the textarea breaks the long word and scrolls on overflow.
diff --git a/ui/views/controls/textfield/textfield.cc b/ui/views/controls/textfield/textfield.cc index 1991c85..e31ea23 100644 --- a/ui/views/controls/textfield/textfield.cc +++ b/ui/views/controls/textfield/textfield.cc
@@ -146,8 +146,9 @@ return ui::TextEditCommand::PASTE; case Textfield::kDelete: // The DELETE menu action only works in case of an active selection. - if (has_selection) + if (has_selection) { return ui::TextEditCommand::DELETE_FORWARD; + } break; case Textfield::kSelectAll: return ui::TextEditCommand::SELECT_ALL; @@ -170,8 +171,9 @@ DCHECK_GT(fromVKPropertyArray.size(), ui::kPropertyFromVKIsMirroringIndex); uint8_t is_mirroring = fromVKPropertyArray[ui::kPropertyFromVKIsMirroringIndex]; - if (!is_mirroring) + if (!is_mirroring) { return base::Seconds(1); + } } return base::TimeDelta(); } @@ -297,16 +299,18 @@ } void Textfield::SetReadOnly(bool read_only) { - if (read_only_ == read_only) + if (read_only_ == read_only) { return; + } // Update read-only without changing the focusable state (or active, etc.). read_only_ = read_only; if (GetEnabled()) { GetViewAccessibility().SetReadOnly(read_only_); } - if (GetInputMethod()) + if (GetInputMethod()) { GetInputMethod()->OnTextInputTypeChanged(this); + } if (GetWidget()) { SetColor(GetTextColor()); UpdateBackgroundColor(); @@ -317,22 +321,25 @@ } void Textfield::SetTextInputType(ui::TextInputType type) { - if (text_input_type_ == type) + if (text_input_type_ == type) { return; + } GetRenderText()->SetObscured(type == ui::TEXT_INPUT_TYPE_PASSWORD); text_input_type_ = type; GetViewAccessibility().SetIsProtected(type == ui::TEXT_INPUT_TYPE_PASSWORD); - if (GetInputMethod()) + if (GetInputMethod()) { GetInputMethod()->OnTextInputTypeChanged(this); + } OnCaretBoundsChanged(); OnPropertyChanged(&text_input_type_, kPropertyEffectsPaint); UpdateAfterChange(TextChangeType::kInternal, false); } void Textfield::SetTextInputFlags(int flags) { - if (text_input_flags_ == flags) + if (text_input_flags_ == flags) { return; + } text_input_flags_ = flags; OnPropertyChanged(&text_input_flags_, kPropertyEffectsNone); @@ -364,15 +371,17 @@ } void Textfield::AppendText(const std::u16string& new_text) { - if (new_text.empty()) + if (new_text.empty()) { return; + } model_->Append(new_text); UpdateAfterChange(TextChangeType::kInternal, false); } void Textfield::InsertOrReplaceText(const std::u16string& new_text) { - if (new_text.empty()) + if (new_text.empty()) { return; + } model_->InsertText(new_text); UpdateAfterChange(TextChangeType::kUserTriggered, true); } @@ -383,8 +392,9 @@ void Textfield::SelectAll(bool reversed) { model_->SelectAll(reversed); - if (HasSelection() && performing_user_action_) + if (HasSelection() && performing_user_action_) { UpdateSelectionClipboard(); + } UpdateAfterChange(TextChangeType::kNone, true); } @@ -419,8 +429,9 @@ void Textfield::SetTextColor(SkColor color) { text_color_ = color; - if (GetWidget()) + if (GetWidget()) { SetColor(color); + } } SkColor Textfield::GetBackgroundColor() const { @@ -431,8 +442,9 @@ void Textfield::SetBackgroundColor(SkColor color) { background_color_ = color; - if (GetWidget()) + if (GetWidget()) { UpdateBackgroundColor(); + } } bool Textfield::GetBackgroundEnabled() const { @@ -468,8 +480,9 @@ } void Textfield::SetCursorEnabled(bool enabled) { - if (GetRenderText()->cursor_enabled() == enabled) + if (GetRenderText()->cursor_enabled() == enabled) { return; + } GetRenderText()->SetCursorEnabled(enabled); UpdateAfterChange(TextChangeType::kNone, true, false); @@ -503,8 +516,9 @@ } void Textfield::SetPlaceholderText(const std::u16string& text) { - if (placeholder_text_ == text) + if (placeholder_text_ == text) { return; + } placeholder_text_ = text; GetViewAccessibility().SetPlaceholder(base::UTF16ToUTF8(text)); @@ -525,8 +539,9 @@ void Textfield::ShowVirtualKeyboardIfEnabled() { // GetInputMethod() may return nullptr in tests. - if (GetEnabled() && !GetReadOnly() && GetInputMethod()) + if (GetEnabled() && !GetReadOnly() && GetInputMethod()) { GetInputMethod()->SetVirtualKeyboardVisibilityIfEnabled(true); + } } bool Textfield::IsIMEComposing() const { @@ -597,12 +612,14 @@ } void Textfield::SetInvalid(bool invalid) { - if (invalid == invalid_) + if (invalid == invalid_) { return; + } invalid_ = invalid; UpdateDefaultBorder(); - if (FocusRing::Get(this)) + if (FocusRing::Get(this)) { FocusRing::Get(this)->SetInvalid(invalid); + } OnPropertyChanged(&invalid_, kPropertyEffectsNone); } @@ -672,8 +689,9 @@ gfx::Size Textfield::GetMinimumSize() const { DCHECK_LE(minimum_width_in_chars_, default_width_in_chars_); gfx::Size minimum_size = View::GetMinimumSize(); - if (minimum_width_in_chars_ >= 0) + if (minimum_width_in_chars_ >= 0) { minimum_size.set_width(CharsToDips(minimum_width_in_chars_)); + } return minimum_size; } @@ -702,13 +720,15 @@ } // If the controller triggered the focus, then record the focus reason as // other. - if (!had_focus && HasFocus()) + if (!had_focus && HasFocus()) { focus_reason_ = ui::TextInputClient::FOCUS_REASON_OTHER; + } if (!handled && (event.IsOnlyLeftMouseButton() || event.IsOnlyRightMouseButton())) { - if (!had_focus) + if (!had_focus) { RequestFocusWithPointer(ui::EventPointerType::kMouse); + } #if !BUILDFLAG(IS_WIN) ShowVirtualKeyboardIfEnabled(); #endif @@ -716,8 +736,9 @@ if (ui::Clipboard::IsSupportedClipboardBuffer( ui::ClipboardBuffer::kSelection)) { - if (!handled && !had_focus && event.IsOnlyMiddleMouseButton()) + if (!handled && !had_focus && event.IsOnlyMiddleMouseButton()) { RequestFocusWithPointer(ui::EventPointerType::kMouse); + } } return selection_controller_.OnMousePressed( @@ -732,8 +753,9 @@ } void Textfield::OnMouseReleased(const ui::MouseEvent& event) { - if (controller_) + if (controller_) { controller_->HandleMouseEvent(this, event); + } selection_controller_.OnMouseReleased(event); } @@ -750,8 +772,9 @@ } bool Textfield::OnKeyPressed(const ui::KeyEvent& event) { - if (PreHandleKeyPressed(event)) + if (PreHandleKeyPressed(event)) { return true; + } ui::TextEditCommand edit_command = scheduled_text_edit_command_; scheduled_text_edit_command_ = ui::TextEditCommand::INVALID_COMMAND; @@ -762,8 +785,9 @@ bool handled = controller_ && controller_->HandleKeyEvent(this, event); - if (!textfield) + if (!textfield) { return handled; + } #if BUILDFLAG(IS_LINUX) auto* linux_ui = ui::LinuxUi::instance(); @@ -783,8 +807,9 @@ base::AutoReset<bool> show_rejection_ui(&show_rejection_ui_if_any_, true); - if (edit_command == ui::TextEditCommand::INVALID_COMMAND) + if (edit_command == ui::TextEditCommand::INVALID_COMMAND) { edit_command = GetCommandForKeyEvent(event); + } if (!handled && IsTextEditCommandEnabled(edit_command)) { ExecuteTextEditCommand(edit_command); @@ -884,8 +909,9 @@ // If touch selection is enabled, the context menu on long tap will be // shown by the |touch_selection_controller_|, hence we mark the event // handled so Views does not try to show context menu on it. - if (touch_selection_controller_) + if (touch_selection_controller_) { event->SetHandled(); + } break; case ui::EventType::kGestureScrollBegin: if (HasFocus()) { @@ -957,8 +983,9 @@ const auto is_enabled = [this](const auto& command) { return IsTextEditCommandEnabled(command.command()); }; - if (base::ranges::any_of(commands, is_enabled)) + if (base::ranges::any_of(commands, is_enabled)) { return true; + } } #endif @@ -971,12 +998,14 @@ bool Textfield::GetDropFormats( int* formats, std::set<ui::ClipboardFormatType>* format_types) { - if (!GetEnabled() || GetReadOnly()) + if (!GetEnabled() || GetReadOnly()) { return false; + } // TODO(msw): Can we support URL, FILENAME, etc.? *formats = ui::OSExchangeData::STRING; - if (controller_) + if (controller_) { controller_->AppendDropFormats(formats, format_types); + } return true; } @@ -1004,8 +1033,9 @@ StopBlinkingCursor(); if (initiating_drag_) { - if (in_selection) + if (in_selection) { return ui::DragDropTypes::DRAG_NONE; + } return event.IsControlDown() ? ui::DragDropTypes::DRAG_COPY : ui::DragDropTypes::DRAG_MOVE; } @@ -1014,8 +1044,9 @@ void Textfield::OnDragExited() { drop_cursor_visible_ = false; - if (ShouldBlinkCursor()) + if (ShouldBlinkCursor()) { StartBlinkingCursor(); + } SchedulePaint(); } @@ -1027,8 +1058,9 @@ if (controller_) { auto cb = controller_->CreateDropCallback(event); - if (!cb.is_null()) + if (!cb.is_null()) { return cb; + } } DCHECK(!initiating_drag_ || @@ -1100,8 +1132,9 @@ } // Remaining actions cannot be performed on readonly fields. - if (GetReadOnly()) + if (GetReadOnly()) { return View::HandleAccessibleAction(action_data); + } if (action_data.action == ax::mojom::Action::kSetValue) { SetText(base::UTF8ToUTF16(action_data.value)); @@ -1125,8 +1158,9 @@ } void Textfield::OnVisibleBoundsChanged() { - if (touch_selection_controller_) + if (touch_selection_controller_) { touch_selection_controller_->SelectionChanged(); + } } void Textfield::OnPaint(gfx::Canvas* canvas) { @@ -1139,18 +1173,21 @@ is_processing_focus_ = true; // Set focus reason if focused was gained without mouse or touch input. - if (focus_reason_ == ui::TextInputClient::FOCUS_REASON_NONE) + if (focus_reason_ == ui::TextInputClient::FOCUS_REASON_NONE) { focus_reason_ = ui::TextInputClient::FOCUS_REASON_OTHER; + } #if BUILDFLAG(IS_MAC) - if (text_input_type_ == ui::TEXT_INPUT_TYPE_PASSWORD) + if (text_input_type_ == ui::TEXT_INPUT_TYPE_PASSWORD) { password_input_enabler_ = std::make_unique<ui::ScopedPasswordInputEnabler>(); + } #endif // BUILDFLAG(IS_MAC) GetRenderText()->set_focused(true); - if (GetInputMethod()) + if (GetInputMethod()) { GetInputMethod()->SetFocusedTextInputClient(this); + } UpdateAfterChange(TextChangeType::kNone, true); View::OnFocus(); @@ -1202,8 +1239,9 @@ // Textfield, TextfieldModel::Delegate overrides: void Textfield::OnCompositionTextConfirmedOrCleared() { - if (!skip_input_method_cancel_composition_) + if (!skip_input_method_cancel_composition_) { GetInputMethod()->CancelComposition(this); + } } void Textfield::OnTextChanged() { @@ -1258,8 +1296,9 @@ constexpr gfx::Vector2d kOffset(-15, 0); gfx::ImageSkia image = gfx::ImageSkia::CreateFromBitmap(bitmap, raster_scale); data->provider().SetDragImage(image, kOffset); - if (controller_) + if (controller_) { controller_->OnWriteDragData(data); + } } int Textfield::GetDragOperationsForView(View* sender, const gfx::Point& p) { @@ -1271,8 +1310,9 @@ drag_operations = ui::DragDropTypes::DRAG_MOVE | ui::DragDropTypes::DRAG_COPY; } - if (controller_) + if (controller_) { controller_->OnGetDragOperationsForTextfield(&drag_operations); + } return drag_operations; } @@ -1598,8 +1638,9 @@ } void Textfield::SetCompositionText(const ui::CompositionText& composition) { - if (GetTextInputType() == ui::TEXT_INPUT_TYPE_NONE) + if (GetTextInputType() == ui::TEXT_INPUT_TYPE_NONE) { return; + } OnBeforeUserAction(); skip_input_method_cancel_composition_ = true; @@ -1615,8 +1656,9 @@ if (keep_selection) { NOTIMPLEMENTED_LOG_ONCE(); } - if (!model_->HasCompositionText()) + if (!model_->HasCompositionText()) { return 0; + } OnBeforeUserAction(); skip_input_method_cancel_composition_ = true; const size_t confirmed_text_length = model_->ConfirmCompositionText(); @@ -1627,8 +1669,9 @@ } void Textfield::ClearCompositionText() { - if (!model_->HasCompositionText()) + if (!model_->HasCompositionText()) { return; + } OnBeforeUserAction(); skip_input_method_cancel_composition_ = true; @@ -1645,8 +1688,9 @@ IsValidCharToInsert); if (GetTextInputType() == ui::TEXT_INPUT_TYPE_NONE || - filtered_new_text.empty()) + filtered_new_text.empty()) { return; + } // TODO(crbug.com/1155331): Handle |cursor_behavior| correctly. OnBeforeUserAction(); @@ -1671,8 +1715,9 @@ const bool should_insert_char = IsValidCharToInsert(ch) && !ui::IsSystemKeyModifier(event.flags()) && !IsControlKeyModifier(event.flags()); - if (GetTextInputType() == ui::TEXT_INPUT_TYPE_NONE || !should_insert_char) + if (GetTextInputType() == ui::TEXT_INPUT_TYPE_NONE || !should_insert_char) { return; + } DoInsertChar(ch); @@ -1689,8 +1734,9 @@ } ui::TextInputType Textfield::GetTextInputType() const { - if (GetReadOnly() || !GetEnabled()) + if (GetReadOnly() || !GetEnabled()) { return ui::TEXT_INPUT_TYPE_NONE; + } return text_input_type_; } @@ -1743,22 +1789,25 @@ bool Textfield::GetCompositionCharacterBounds(size_t index, gfx::Rect* rect) const { DCHECK(rect); - if (!HasCompositionText()) + if (!HasCompositionText()) { return false; + } gfx::Range composition_range; model_->GetCompositionTextRange(&composition_range); DCHECK(!composition_range.is_empty()); size_t text_index = composition_range.start() + index; - if (composition_range.end() <= text_index) + if (composition_range.end() <= text_index) { return false; + } gfx::RenderText* render_text = GetRenderText(); if (!render_text->IsValidCursorIndex(text_index)) { text_index = render_text->IndexOfAdjacentGrapheme(text_index, gfx::CURSOR_BACKWARD); } - if (text_index < composition_range.start()) + if (text_index < composition_range.start()) { return false; + } const gfx::SelectionModel caret(text_index, gfx::CURSOR_BACKWARD); *rect = render_text->GetCursorBounds(caret, false); ConvertRectToScreen(this, rect); @@ -1774,31 +1823,35 @@ } bool Textfield::GetTextRange(gfx::Range* range) const { - if (!ImeEditingAllowed()) + if (!ImeEditingAllowed()) { return false; + } model_->GetTextRange(range); return true; } bool Textfield::GetCompositionTextRange(gfx::Range* range) const { - if (!ImeEditingAllowed()) + if (!ImeEditingAllowed()) { return false; + } model_->GetCompositionTextRange(range); return true; } bool Textfield::GetEditableSelectionRange(gfx::Range* range) const { - if (!ImeEditingAllowed()) + if (!ImeEditingAllowed()) { return false; + } *range = GetRenderText()->selection(); return true; } bool Textfield::SetEditableSelectionRange(const gfx::Range& range) { - if (!ImeEditingAllowed() || !range.IsValid()) + if (!ImeEditingAllowed() || !range.IsValid()) { return false; + } OnBeforeUserAction(); SetSelectedRange(range); OnAfterUserAction(); @@ -1806,8 +1859,9 @@ } bool Textfield::DeleteRange(const gfx::Range& range) { - if (!ImeEditingAllowed() || range.is_empty()) + if (!ImeEditingAllowed() || range.is_empty()) { return false; + } OnBeforeUserAction(); model_->SelectRange(range); @@ -1821,12 +1875,14 @@ bool Textfield::GetTextFromRange(const gfx::Range& range, std::u16string* range_text) const { - if (!ImeEditingAllowed() || !range.IsValid()) + if (!ImeEditingAllowed() || !range.IsValid()) { return false; + } gfx::Range text_range; - if (!GetTextRange(&text_range) || !range.IsBoundedBy(text_range)) + if (!GetTextRange(&text_range) || !range.IsBoundedBy(text_range)) { return false; + } *range_text = model_->GetTextFromRange(range); return true; @@ -1852,8 +1908,9 @@ // been modified. bool dir_from_text = modes_match && GetHorizontalAlignment() == gfx::ALIGN_TO_HEAD; - if (!dir_from_text && GetHorizontalAlignment() != gfx::ALIGN_CENTER) + if (!dir_from_text && GetHorizontalAlignment() != gfx::ALIGN_CENTER) { SetHorizontalAlignment(default_rtl ? gfx::ALIGN_RIGHT : gfx::ALIGN_LEFT); + } SchedulePaint(); UpdateAccessibilityTextDirection(); return true; @@ -1867,14 +1924,16 @@ // observable bad behaviors before checked_cast was added. However, range // clipping or dropping should be the last resort because a checkfail // indicates that we run into bad states somewhere earlier on the stack. - if (range.start() < before) + if (range.start() < before) { return; + } range.set_start(range.start() - before); range.set_end(range.end() + after); gfx::Range text_range; - if (GetTextRange(&text_range) && text_range.Contains(range)) + if (GetTextRange(&text_range) && text_range.Contains(range)) { DeleteRange(range); + } UpdateAccessibleTextSelection(); } @@ -1997,8 +2056,9 @@ } bool Textfield::ShouldDoLearning() { - if (should_do_learning_.has_value()) + if (should_do_learning_.has_value()) { return should_do_learning_.value(); + } NOTIMPLEMENTED_LOG_ONCE(); DVLOG(1) << "This Textfield instance does not support ShouldDoLearning"; @@ -2118,8 +2178,9 @@ // We only execute the commands enabled in Textfield::IsTextEditCommandEnabled // below. Hence don't do a virtual IsTextEditCommandEnabled call. - if (!IsTextEditCommandEnabled(command)) + if (!IsTextEditCommandEnabled(command)) { return; + } OnBeforeUserAction(); @@ -2127,8 +2188,9 @@ auto [text_changed, cursor_changed] = DoExecuteTextEditCommand(command); cursor_changed |= (GetSelectionModel() != selection_model); - if (cursor_changed && HasSelection()) + if (cursor_changed && HasSelection()) { UpdateSelectionClipboard(); + } UpdateAfterChange( text_changed ? TextChangeType::kUserTriggered : TextChangeType::kNone, cursor_changed); @@ -2154,8 +2216,9 @@ [[fallthrough]]; case ui::TextEditCommand::DELETE_WORD_BACKWARD: case ui::TextEditCommand::DELETE_WORD_FORWARD: - if (HasSelection()) + if (HasSelection()) { command = ui::TextEditCommand::DELETE_FORWARD; + } break; default: break; @@ -2356,8 +2419,9 @@ } void Textfield::RequestFocusWithPointer(ui::EventPointerType pointer_type) { - if (HasFocus()) + if (HasFocus()) { return; + } switch (pointer_type) { case ui::EventPointerType::kMouse: @@ -2386,8 +2450,9 @@ #endif RequestFocusWithPointer(details.primary_pointer_type()); - if (show_virtual_keyboard) + if (show_virtual_keyboard) { ShowVirtualKeyboardIfEnabled(); + } } base::CallbackListSubscription Textfield::AddTextChangedCallback( @@ -2415,8 +2480,9 @@ const bool alt = event.IsAltDown() || event.IsAltGrDown(); switch (event.key_code()) { case ui::VKEY_Z: - if (control && !shift && !alt) + if (control && !shift && !alt) { return ui::TextEditCommand::UNDO; + } return (control && shift && !alt) ? ui::TextEditCommand::REDO : ui::TextEditCommand::INVALID_COMMAND; case ui::VKEY_Y: @@ -2436,8 +2502,9 @@ : ui::TextEditCommand::INVALID_COMMAND; case ui::VKEY_RIGHT: // Ignore alt+right, which may be a browser navigation shortcut. - if (alt) + if (alt) { return ui::TextEditCommand::INVALID_COMMAND; + } if (!shift) { return control ? ui::TextEditCommand::MOVE_WORD_RIGHT : ui::TextEditCommand::MOVE_RIGHT; @@ -2446,8 +2513,9 @@ : ui::TextEditCommand::MOVE_RIGHT_AND_MODIFY_SELECTION; case ui::VKEY_LEFT: // Ignore alt+left, which may be a browser navigation shortcut. - if (alt) + if (alt) { return ui::TextEditCommand::INVALID_COMMAND; + } if (!shift) { return control ? ui::TextEditCommand::MOVE_WORD_LEFT : ui::TextEditCommand::MOVE_LEFT; @@ -2465,8 +2533,9 @@ return ui::TextEditCommand::MOVE_TO_BEGINNING_OF_LINE; #endif case ui::VKEY_END: - if (shift) + if (shift) { return ui::TextEditCommand::MOVE_TO_END_OF_LINE_AND_MODIFY_SELECTION; + } #if BUILDFLAG(IS_MAC) return ui::TextEditCommand::SCROLL_TO_END_OF_DOCUMENT; #else @@ -2478,8 +2547,9 @@ return ui::TextEditCommand:: MOVE_PARAGRAPH_BACKWARD_AND_MODIFY_SELECTION; } - if (command) + if (command) { return ui::TextEditCommand::MOVE_TO_BEGINNING_OF_DOCUMENT; + } return shift ? ui::TextEditCommand:: MOVE_TO_BEGINNING_OF_LINE_AND_MODIFY_SELECTION : ui::TextEditCommand::MOVE_UP; @@ -2493,8 +2563,9 @@ if (control && shift) { return ui::TextEditCommand::MOVE_PARAGRAPH_FORWARD_AND_MODIFY_SELECTION; } - if (command) + if (command) { return ui::TextEditCommand::MOVE_TO_END_OF_DOCUMENT; + } return shift ? ui::TextEditCommand::MOVE_TO_END_OF_LINE_AND_MODIFY_SELECTION : ui::TextEditCommand::MOVE_DOWN; @@ -2506,30 +2577,35 @@ case ui::VKEY_BACK: if (!control) { #if BUILDFLAG(IS_WIN) - if (alt) + if (alt) { return shift ? ui::TextEditCommand::REDO : ui::TextEditCommand::UNDO; + } #endif return ui::TextEditCommand::DELETE_BACKWARD; } #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) // Only erase by line break on Linux and ChromeOS. - if (shift) + if (shift) { return ui::TextEditCommand::DELETE_TO_BEGINNING_OF_LINE; + } #endif return ui::TextEditCommand::DELETE_WORD_BACKWARD; case ui::VKEY_DELETE: #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) // Only erase by line break on Linux and ChromeOS. - if (shift && control) + if (shift && control) { return ui::TextEditCommand::DELETE_TO_END_OF_LINE; + } #endif - if (control) + if (control) { return ui::TextEditCommand::DELETE_WORD_FORWARD; + } return shift ? ui::TextEditCommand::CUT : ui::TextEditCommand::DELETE_FORWARD; case ui::VKEY_INSERT: - if (control && !shift) + if (control && !shift) { return ui::TextEditCommand::COPY; + } return (shift && !control) ? ui::TextEditCommand::PASTE : ui::TextEditCommand::INVALID_COMMAND; case ui::VKEY_PRIOR: @@ -2584,8 +2660,9 @@ void Textfield::OnBeforePointerAction() { OnBeforeUserAction(); - if (model_->HasCompositionText()) + if (model_->HasCompositionText()) { model_->ConfirmCompositionText(); + } } void Textfield::OnAfterPointerAction(bool text_changed, @@ -2600,8 +2677,9 @@ DCHECK(performing_user_action_); DCHECK(!GetReadOnly()); const std::u16string selection_clipboard_text = GetSelectionClipboardText(); - if (selection_clipboard_text.empty()) + if (selection_clipboard_text.empty()) { return false; + } model_->InsertText(selection_clipboard_text); return true; @@ -2613,8 +2691,9 @@ if (text_input_type_ != ui::TEXT_INPUT_TYPE_PASSWORD) { ui::ScopedClipboardWriter(ui::ClipboardBuffer::kSelection) .WriteText(GetSelectedText()); - if (controller_) + if (controller_) { controller_->OnAfterCutOrCopy(ui::ClipboardBuffer::kSelection); + } } } } @@ -2704,8 +2783,9 @@ bool cursor_changed, std::optional<bool> notify_caret_bounds_changed) { if (text_change_type != TextChangeType::kNone) { - if ((text_change_type == TextChangeType::kUserTriggered) && controller_) + if ((text_change_type == TextChangeType::kUserTriggered) && controller_) { controller_->ContentsChanged(this, GetText()); + } UpdateAccessibleValue(); } UpdateAccessibilityTextDirection(); @@ -2715,10 +2795,12 @@ } const bool anything_changed = (text_change_type != TextChangeType::kNone) || cursor_changed; - if (notify_caret_bounds_changed.value_or(anything_changed)) + if (notify_caret_bounds_changed.value_or(anything_changed)) { OnCaretBoundsChanged(); - if (anything_changed) + } + if (anything_changed) { SchedulePaint(); + } UpdateAccessibleTextSelection(); } @@ -2750,10 +2832,11 @@ // its visibility. cursor_view_->layer()->SetOpacity(kOpaque); #endif - if (ShouldBlinkCursor()) + if (ShouldBlinkCursor()) { StartBlinkingCursor(); - else + } else { StopBlinkingCursor(); + } } bool Textfield::IsMenuShowing() const { @@ -2795,8 +2878,9 @@ // because it draws incorrect colors around the glyphs in that case. // See crbug.com/786343 int placeholder_text_draw_flags = placeholder_text_draw_flags_; - if (SkColorGetA(GetBackgroundColor()) != SK_AlphaOPAQUE) + if (SkColorGetA(GetBackgroundColor()) != SK_AlphaOPAQUE) { placeholder_text_draw_flags |= gfx::Canvas::NO_SUBPIXEL_RENDERING; + } canvas->DrawStringRectWithFlags( GetPlaceholderText(), placeholder_font_list_.value_or(GetFontList()), @@ -2821,15 +2905,18 @@ } void Textfield::MoveCursorTo(const gfx::Point& point, bool select) { - if (model_->MoveCursorTo(point, select)) + if (model_->MoveCursorTo(point, select)) { UpdateAfterChange(TextChangeType::kNone, true); + } } void Textfield::OnCaretBoundsChanged() { - if (GetInputMethod()) + if (GetInputMethod()) { GetInputMethod()->OnCaretBoundsChanged(this); - if (touch_selection_controller_) + } + if (touch_selection_controller_) { touch_selection_controller_->SelectionChanged(); + } // Screen reader users don't expect notifications about unfocused textfields. if (HasFocus()) { @@ -2855,13 +2942,15 @@ void Textfield::OnBeforeUserAction() { DCHECK(!performing_user_action_); performing_user_action_ = true; - if (controller_) + if (controller_) { controller_->OnBeforeUserAction(this); + } } void Textfield::OnAfterUserAction() { - if (controller_) + if (controller_) { controller_->OnAfterUserAction(this); + } DCHECK(performing_user_action_); performing_user_action_ = false; } @@ -2869,8 +2958,9 @@ bool Textfield::Cut() { if (!GetReadOnly() && text_input_type_ != ui::TEXT_INPUT_TYPE_PASSWORD && model_->Cut()) { - if (controller_) + if (controller_) { controller_->OnAfterCutOrCopy(ui::ClipboardBuffer::kCopyPaste); + } UpdateAccessibleTextSelection(); return true; } @@ -2879,8 +2969,9 @@ bool Textfield::Copy() { if (text_input_type_ != ui::TEXT_INPUT_TYPE_PASSWORD && model_->Copy()) { - if (controller_) + if (controller_) { controller_->OnAfterCutOrCopy(ui::ClipboardBuffer::kCopyPaste); + } return true; } return false; @@ -2888,8 +2979,9 @@ bool Textfield::Paste() { if (!GetReadOnly() && model_->Paste()) { - if (controller_) + if (controller_) { controller_->OnAfterPaste(); + } UpdateAccessibleTextSelection(); return true; } @@ -2915,8 +3007,9 @@ // If the controller adds menu commands, also override ExecuteCommand() and // IsCommandIdEnabled() as appropriate, for the commands added. - if (controller_) + if (controller_) { controller_->UpdateContextMenu(context_menu_contents_.get()); + } text_services_context_menu_ = ViewsTextServicesContextMenu::Create(context_menu_contents_.get(), this); @@ -2948,8 +3041,9 @@ } void Textfield::CreateTouchSelectionControllerAndNotifyIt() { - if (!HasFocus()) + if (!HasFocus()) { return; + } if (!touch_selection_controller_) { #if defined(USE_AURA) @@ -2957,8 +3051,9 @@ std::make_unique<TouchSelectionControllerImpl>(this); #endif } - if (touch_selection_controller_) + if (touch_selection_controller_) { touch_selection_controller_->SelectionChanged(); + } } void Textfield::OnEditFailed() { @@ -3031,8 +3126,9 @@ } void Textfield::OnEnabledChanged() { - if (GetInputMethod()) + if (GetInputMethod()) { GetInputMethod()->OnTextInputTypeChanged(this); + } UpdateDefaultBorder(); // Only expose readonly if enabled. Don't overwrite the disabled restriction.
diff --git a/ui/views/controls/textfield/textfield_model.cc b/ui/views/controls/textfield/textfield_model.cc index f7de9b1..ee951e7b 100644 --- a/ui/views/controls/textfield/textfield_model.cc +++ b/ui/views/controls/textfield/textfield_model.cc
@@ -36,8 +36,9 @@ size_t adjust_position_for_removals(size_t position, std::vector<gfx::Range> ranges) { size_t adjustment = 0; - for (auto range : ranges) + for (auto range : ranges) { adjustment += range.Intersect(gfx::Range(0, position)).length(); + } return position - adjustment; } @@ -165,8 +166,9 @@ // Remove |new_text_|. old_texts.erase(new_text_start_, new_text_.length()); // Add |old_texts_| in reverse order since we're undoing an edit. - for (size_t i = old_texts_.size(); i != 0; i--) + for (size_t i = old_texts_.size(); i != 0; i--) { old_texts.insert(old_text_starts_[i - 1], old_texts_[i - 1]); + } merge_type_ = MergeType::kDoNotMerge; old_texts_ = {old_texts}; @@ -221,8 +223,9 @@ // Reject other edit types, and inserts starting somewhere other than where // this insert ended. if (edit->type() != Type::kInsert || - new_text_end() != edit->new_text_start_) + new_text_end() != edit->new_text_start_) { return false; + } new_text_ += edit->new_text_; new_cursor_pos_ = edit->new_cursor_pos_; return true; @@ -263,10 +266,12 @@ if (edit->type() == Type::kDelete || edit->old_texts_.size() > 1 || new_text_end() != edit->new_text_start_ || (!edit->old_text_starts_.empty() && - new_text_end() != edit->old_text_starts_[0])) + new_text_end() != edit->old_text_starts_[0])) { return false; - if (edit->old_texts_.size() == 1) + } + if (edit->old_texts_.size() == 1) { old_texts_[0] += edit->old_texts_[0]; + } new_text_ += edit->new_text_; new_cursor_pos_ = edit->new_cursor_pos_; return true; @@ -298,8 +303,9 @@ // where |this| ended. E.g. If |this| changed "ab|c" to "a|c" an edit to "|c" // can be merged. bool DoMerge(const Edit* edit) override { - if (edit->type() != Type::kDelete) + if (edit->type() != Type::kDelete) { return false; + } // Deletions with selections are marked kDoNotMerge and should not get here. DCHECK(old_secondary_selections_.empty()); DCHECK(old_primary_selection_.is_empty()); @@ -310,16 +316,18 @@ // Backspace can be merged only with backspace at the same position. if (!edit->delete_backward_ || old_text_starts_[0] != - edit->old_text_starts_[0] + edit->old_texts_[0].length()) + edit->old_text_starts_[0] + edit->old_texts_[0].length()) { return false; + } old_text_starts_[0] = edit->old_text_starts_[0]; old_texts_[0] = edit->old_texts_[0] + old_texts_[0]; new_cursor_pos_ = edit->new_cursor_pos_; } else { // Delete can be merged only with delete at the same position. if (edit->delete_backward_ || - old_text_starts_[0] != edit->old_text_starts_[0]) + old_text_starts_[0] != edit->old_text_starts_[0]) { return false; + } old_texts_[0] += edit->old_texts_[0]; } return true; @@ -335,8 +343,9 @@ // there is no such a range. gfx::Range GetFirstEmphasizedRange(const ui::CompositionText& composition) { for (const auto& underline : composition.ime_text_spans) { - if (underline.thickness == ui::ImeTextSpan::Thickness::kThick) + if (underline.thickness == ui::ImeTextSpan::Thickness::kThick) { return gfx::Range(underline.start_offset, underline.end_offset); + } } return gfx::Range::InvalidRange(); } @@ -402,8 +411,9 @@ changed = true; } if (text() != new_text) { - if (changed) // No need to remember composition. + if (changed) { // No need to remember composition. Undo(); + } // If there is a composition text, don't merge with previous edit. // Otherwise, force merge the edits. ExecuteAndRecordReplace( @@ -415,8 +425,9 @@ } void TextfieldModel::Append(const std::u16string& new_text) { - if (HasCompositionText()) + if (HasCompositionText()) { ConfirmCompositionText(); + } size_t save = GetCursorPosition(); MoveCursor(gfx::LINE_BREAK, render_text_->GetVisualDirectionOfLogicalEnd(), gfx::SELECTION_NONE); @@ -436,8 +447,9 @@ } if (HasSelection()) { - if (add_to_kill_buffer) + if (add_to_kill_buffer) { SetKillBuffer(GetSelectedText()); + } DeleteSelection(); return true; } @@ -446,8 +458,9 @@ size_t next_grapheme_index = render_text_->IndexOfAdjacentGrapheme( cursor_position, gfx::CURSOR_FORWARD); gfx::Range range_to_delete(cursor_position, next_grapheme_index); - if (add_to_kill_buffer) + if (add_to_kill_buffer) { SetKillBuffer(GetTextFromRange(range_to_delete)); + } ExecuteAndRecordDelete({range_to_delete}, true); return true; } @@ -465,8 +478,9 @@ } if (HasSelection()) { - if (add_to_kill_buffer) + if (add_to_kill_buffer) { SetKillBuffer(GetSelectedText()); + } DeleteSelection(); return true; } @@ -474,8 +488,9 @@ if (cursor_position > 0) { gfx::Range range_to_delete( PlatformStyle::RangeToDeleteBackwards(text(), cursor_position)); - if (add_to_kill_buffer) + if (add_to_kill_buffer) { SetKillBuffer(GetTextFromRange(range_to_delete)); + } ExecuteAndRecordDelete({range_to_delete}, true); return true; } @@ -489,8 +504,9 @@ void TextfieldModel::MoveCursor(gfx::BreakType break_type, gfx::VisualCursorDirection direction, gfx::SelectionBehavior selection_behavior) { - if (HasCompositionText()) + if (HasCompositionText()) { ConfirmCompositionText(); + } render_text_->MoveCursor(break_type, direction, selection_behavior); } @@ -500,8 +516,9 @@ // ConfirmCompositionText() updates cursor position. Need to reflect it in // the SelectionModel parameter of MoveCursorTo(). gfx::Range range(render_text_->selection().start(), cursor.caret_pos()); - if (!range.is_empty()) + if (!range.is_empty()) { return render_text_->SelectRange(range); + } return render_text_->SetSelection( gfx::SelectionModel(cursor.caret_pos(), cursor.caret_affinity())); } @@ -513,8 +530,9 @@ } bool TextfieldModel::MoveCursorTo(const gfx::Point& point, bool select) { - if (HasCompositionText()) + if (HasCompositionText()) { ConfirmCompositionText(); + } return render_text_->MoveCursorToPoint(point, select); } @@ -523,32 +541,37 @@ } void TextfieldModel::SelectRange(const gfx::Range& range, bool primary) { - if (HasCompositionText()) + if (HasCompositionText()) { ConfirmCompositionText(); + } render_text_->SelectRange(range, primary); } void TextfieldModel::SelectSelectionModel(const gfx::SelectionModel& sel) { - if (HasCompositionText()) + if (HasCompositionText()) { ConfirmCompositionText(); + } render_text_->SetSelection(sel); } void TextfieldModel::SelectAll(bool reversed) { - if (HasCompositionText()) + if (HasCompositionText()) { ConfirmCompositionText(); + } render_text_->SelectAll(reversed); } void TextfieldModel::SelectWord() { - if (HasCompositionText()) + if (HasCompositionText()) { ConfirmCompositionText(); + } render_text_->SelectWord(); } void TextfieldModel::ClearSelection() { - if (HasCompositionText()) + if (HasCompositionText()) { ConfirmCompositionText(); + } render_text_->ClearSelection(); } @@ -557,8 +580,9 @@ } bool TextfieldModel::CanRedo() { - if (edit_history_.empty()) + if (edit_history_.empty()) { return false; + } // There is no redo iff the current edit is the last element in the history. auto iter = current_edit_; return iter == edit_history_.end() || // at the top. @@ -566,35 +590,41 @@ } bool TextfieldModel::Undo() { - if (!CanUndo()) + if (!CanUndo()) { return false; + } DCHECK(!HasCompositionText()); - if (HasCompositionText()) + if (HasCompositionText()) { CancelCompositionText(); + } std::u16string old = text(); size_t old_cursor = GetCursorPosition(); (*current_edit_)->Commit(); (*current_edit_)->Undo(this); - if (current_edit_ == edit_history_.begin()) + if (current_edit_ == edit_history_.begin()) { current_edit_ = edit_history_.end(); - else + } else { --current_edit_; + } return old != text() || old_cursor != GetCursorPosition(); } bool TextfieldModel::Redo() { - if (!CanRedo()) + if (!CanRedo()) { return false; + } DCHECK(!HasCompositionText()); - if (HasCompositionText()) + if (HasCompositionText()) { CancelCompositionText(); + } - if (current_edit_ == edit_history_.end()) + if (current_edit_ == edit_history_.end()) { current_edit_ = edit_history_.begin(); - else + } else { ++current_edit_; + } std::u16string old = text(); size_t old_cursor = GetCursorPosition(); (*current_edit_)->Redo(this); @@ -626,8 +656,9 @@ std::u16string text; ui::Clipboard::GetForCurrentThread()->ReadText( ui::ClipboardBuffer::kCopyPaste, /* data_dst = */ nullptr, &text); - if (text.empty()) + if (text.empty()) { return false; + } if (render_text()->multiline()) { InsertTextInternal(text, false); @@ -642,16 +673,18 @@ // CollapseWhitespace(). base::TrimWhitespace(text, base::TRIM_ALL, &text); // If the clipboard contains all whitespace then paste a single space. - if (text.empty()) + if (text.empty()) { text = u" "; + } InsertTextInternal(text, false); return true; } bool TextfieldModel::Transpose() { - if (HasCompositionText() || HasSelection()) + if (HasCompositionText() || HasSelection()) { return false; + } size_t cur = GetCursorPosition(); size_t next = render_text_->IndexOfAdjacentGrapheme(cur, gfx::CURSOR_FORWARD); @@ -667,8 +700,9 @@ // This happens at the beginning of the line or when the line has less than // two graphemes. - if (gfx::UTF16IndexToOffset(text(), prev, next) != 2) + if (gfx::UTF16IndexToOffset(text(), prev, next) != 2) { return false; + } SelectRange(gfx::Range(prev, next)); std::u16string text = GetSelectedText(); @@ -689,8 +723,9 @@ } bool TextfieldModel::HasSelection(bool primary_only) const { - if (primary_only) + if (primary_only) { return !render_text_->selection().is_empty(); + } return base::ranges::any_of( render_text_->GetAllSelections(), [](const auto& selection) { return !selection.is_empty(); }); @@ -706,8 +741,9 @@ const std::u16string& new_text, size_t position) { using MergeType = internal::MergeType; - if (HasCompositionText()) + if (HasCompositionText()) { CancelCompositionText(); + } // We don't use |ExecuteAndRecordReplaceSelection| because that assumes the // insertion occurs at the cursor. ExecuteAndRecordReplace(MergeType::kDoNotMerge, {render_text_->selection()}, @@ -724,13 +760,15 @@ void TextfieldModel::SetCompositionText( const ui::CompositionText& composition) { - if (HasCompositionText()) + if (HasCompositionText()) { CancelCompositionText(); - else if (HasSelection()) + } else if (HasSelection()) { DeleteSelection(); + } - if (composition.text.empty()) + if (composition.text.empty()) { return; + } size_t cursor = GetCursorPosition(); std::u16string new_text = text(); @@ -739,10 +777,11 @@ // Don't render IME spans with thickness "kNone". if (composition.ime_text_spans.size() > 0 && composition.ime_text_spans[0].thickness != - ui::ImeTextSpan::Thickness::kNone) + ui::ImeTextSpan::Thickness::kNone) { render_text_->SetCompositionRange(composition_range_); - else + } else { render_text_->SetCompositionRange(gfx::Range::InvalidRange()); + } gfx::Range emphasized_range = GetFirstEmphasizedRange(composition); if (emphasized_range.IsValid()) { // This is a workaround due to the lack of support in RenderText to draw @@ -782,8 +821,9 @@ false, composition, composition_range_.start())); render_text_->SetCursorPosition(composition_range_.end()); ClearComposition(); - if (delegate_) + if (delegate_) { delegate_->OnCompositionTextConfirmedOrCleared(); + } return composition_length; } @@ -794,8 +834,9 @@ std::u16string new_text = text(); SetRenderTextText(new_text.erase(range.start(), range.length())); render_text_->SetCursorPosition(range.start()); - if (delegate_) + if (delegate_) { delegate_->OnCompositionTextConfirmedOrCleared(); + } } void TextfieldModel::ClearComposition() { @@ -844,18 +885,20 @@ // with |new_text|. So, need to find the index of next grapheme first. size_t next = render_text_->IndexOfAdjacentGrapheme(cursor, gfx::CURSOR_FORWARD); - if (next == model.caret_pos()) + if (next == model.caret_pos()) { render_text_->SetSelection(model); - else + } else { render_text_->SelectRange(gfx::Range(next, model.caret_pos())); + } } // Edit history is recorded in InsertText. InsertTextInternal(new_text, mergeable); } void TextfieldModel::ClearRedoHistory() { - if (edit_history_.begin() == edit_history_.end()) + if (edit_history_.begin() == edit_history_.end()) { return; + } if (current_edit_ == edit_history_.end()) { ClearEditHistory(); return; @@ -965,24 +1008,29 @@ std::u16string old_text = text(); ClearComposition(); - for (auto deletion : deletions) + for (auto deletion : deletions) { old_text.erase(deletion.start(), deletion.length()); - for (size_t i = 0; i < insertion_texts.size(); ++i) + } + for (size_t i = 0; i < insertion_texts.size(); ++i) { old_text.insert(insertion_positions[i], insertion_texts[i]); + } SetRenderTextText(old_text); - if (primary_selection.start() == primary_selection.end()) + if (primary_selection.start() == primary_selection.end()) { render_text_->SetCursorPosition(primary_selection.start()); - else + } else { render_text_->SelectRange(primary_selection); - for (auto secondary_selection : secondary_selections) + } + for (auto secondary_selection : secondary_selections) { render_text_->SelectRange(secondary_selection, false); + } } void TextfieldModel::SetRenderTextText(const std::u16string& text) { render_text_->SetText(text); - if (delegate_) + if (delegate_) { delegate_->OnTextChanged(); + } } // static
diff --git a/ui/views/controls/textfield/textfield_model_unittest.cc b/ui/views/controls/textfield/textfield_model_unittest.cc index 06f07bd..c0db572 100644 --- a/ui/views/controls/textfield/textfield_model_unittest.cc +++ b/ui/views/controls/textfield/textfield_model_unittest.cc
@@ -63,8 +63,9 @@ const std::vector<std::u16string> GetAllSelectionTexts( TextfieldModel* model) const { std::vector<std::u16string> selected_texts; - for (auto range : model->render_text()->GetAllSelections()) + for (auto range : model->render_text()->GetAllSelections()) { selected_texts.push_back(model->GetTextFromRange(range)); + } return selected_texts; } @@ -73,8 +74,9 @@ std::vector<std::u16string> expected_selected_texts) const { std::vector<std::u16string> selected_texts = GetAllSelectionTexts(model); EXPECT_EQ(expected_selected_texts.size(), selected_texts.size()); - for (size_t i = 0; i < selected_texts.size(); ++i) + for (size_t i = 0; i < selected_texts.size(); ++i) { EXPECT_EQ(expected_selected_texts[i], selected_texts[i]); + } } bool composition_text_confirmed_or_cleared_ = false; @@ -963,9 +965,10 @@ 0); for (size_t i = 0; i < word_and_cursor.size(); ++i) { model.MoveCursor(gfx::LINE_BREAK, gfx::CURSOR_LEFT, gfx::SELECTION_NONE); - for (size_t j = 0; j < i; ++j) + for (size_t j = 0; j < i; ++j) { model.MoveCursor(gfx::CHARACTER_BREAK, gfx::CURSOR_RIGHT, gfx::SELECTION_NONE); + } model.SelectWord(); SelectWordTestVerifier(model, base::WideToUTF16(word_and_cursor[i].word), word_and_cursor[i].cursor);
diff --git a/ui/views/controls/textfield/textfield_unittest.cc b/ui/views/controls/textfield/textfield_unittest.cc index c787254..4f580ea 100644 --- a/ui/views/controls/textfield/textfield_unittest.cc +++ b/ui/views/controls/textfield/textfield_unittest.cc
@@ -120,8 +120,9 @@ // TextfieldController: bool HandleKeyEvent(Textfield* sender, const ui::KeyEvent& key_event) override { - if (target_) + if (target_) { target_->OnBlur(); + } target_.reset(); return false; } @@ -174,8 +175,9 @@ void CancelComposition(const ui::TextInputClient* client) override; bool IsCandidatePopupOpen() const override; void SetVirtualKeyboardVisibilityIfEnabled(bool visibility) override { - if (visibility) + if (visibility) { count_show_virtual_keyboard_++; + } } #if BUILDFLAG(IS_WIN) @@ -244,8 +246,9 @@ // still needs to be mocked, since it's not possible to generate test events // which trigger the appropriate NSResponder action messages for composition. #if BUILDFLAG(IS_MAC) - if (key->is_char()) + if (key->is_char()) { return DispatchKeyEventPostIME(key); + } #endif // Checks whether the key event is from EventGenerator on Windows which will @@ -269,24 +272,28 @@ dispatch_details = DispatchKeyEventPostIME(key); } - if (key->handled() || dispatch_details.dispatcher_destroyed) + if (key->handled() || dispatch_details.dispatcher_destroyed) { return dispatch_details; + } ui::TextInputClient* client = GetTextInputClient(); if (client) { if (handled) { - if (result_text_.length()) + if (result_text_.length()) { client->InsertText(result_text_, ui::TextInputClient::InsertTextCursorBehavior:: kMoveCursorAfterText); - if (composition_.text.length()) + } + if (composition_.text.length()) { client->SetCompositionText(composition_); - else + } else { client->ClearCompositionText(); + } } else if (key->type() == ui::EventType::kKeyPressed) { char16_t ch = key->GetCharacter(); - if (ch) + if (ch) { client->InsertChar(*key); + } } } @@ -296,8 +303,9 @@ } void MockInputMethod::OnTextInputTypeChanged(ui::TextInputClient* client) { - if (IsTextInputClientFocused(client)) + if (IsTextInputClientFocused(client)) { text_input_type_changed_ = true; + } InputMethodBase::OnTextInputTypeChanged(client); } @@ -316,8 +324,9 @@ ui::TextInputClient* focused_before, ui::TextInputClient* focused) { ui::TextInputClient* client = GetTextInputClient(); - if (client && client->HasCompositionText()) + if (client && client->HasCompositionText()) { client->ConfirmCompositionText(/* keep_selection */ false); + } ClearComposition(); } @@ -410,8 +419,9 @@ base::WeakPtr<TestTextfield> textfield(weak_ptr_factory_.GetWeakPtr()); views::View::OnKeyEvent(event); - if (!textfield) + if (!textfield) { return; + } key_handled_ = event->handled(); @@ -456,8 +466,9 @@ void TextfieldTest::TearDown() { textfield_ = nullptr; event_target_ = nullptr; - if (widget_) + if (widget_) { widget_->Close(); + } // Clear kill buffer used for "Yank" text editing command so that no state // persists between tests. TextfieldModel::ClearKillBuffer(); @@ -578,8 +589,9 @@ // By default, swap control and command for native events on Mac. This // handles most cases. - if (TestingNativeMac()) + if (TestingNativeMac()) { std::swap(control, command); + } int flags = (shift ? ui::EF_SHIFT_DOWN : 0) | (control ? ui::EF_CONTROL_DOWN : 0) | @@ -684,26 +696,29 @@ // Sends Shift+Delete if supported, otherwise Cmd+X again. void TextfieldTest::SendAlternateCut() { - if (TestingNativeMac()) + if (TestingNativeMac()) { SendKeyEvent(ui::VKEY_X, false, true); - else + } else { SendKeyEvent(ui::VKEY_DELETE, true, false); + } } // Sends Ctrl+Insert if supported, otherwise Cmd+C again. void TextfieldTest::SendAlternateCopy() { - if (TestingNativeMac()) + if (TestingNativeMac()) { SendKeyEvent(ui::VKEY_C, false, true); - else + } else { SendKeyEvent(ui::VKEY_INSERT, false, true); + } } // Sends Shift+Insert if supported, otherwise Cmd+V again. void TextfieldTest::SendAlternatePaste() { - if (TestingNativeMac()) + if (TestingNativeMac()) { SendKeyEvent(ui::VKEY_V, false, true); - else + } else { SendKeyEvent(ui::VKEY_INSERT, true, false); + } } View* TextfieldTest::GetFocusedView() { @@ -1017,8 +1032,8 @@ // After undo, the cursor and selected range should reflect the state prior to // the edit. - textfield_->InsertOrReplaceText(u"xyz"); // 2nd edit - SendKeyEvent(ui::VKEY_Z, false, true); // Undo 2nd edit + textfield_->InsertOrReplaceText(u"xyz"); // 2nd edit + SendKeyEvent(ui::VKEY_Z, false, true); // Undo 2nd edit EXPECT_EQ(textfield_->GetCursorPosition(), 15u); EXPECT_EQ(textfield_->GetSelectedRange(), gfx::Range(10, 15)); @@ -1032,8 +1047,8 @@ // After undo, the cursor and selected range should reflect the state prior to // the edit, even if that differs than the state after the current (1st) edit. - textfield_->InsertOrReplaceText(u"xyz"); // (2')nd edit - SendKeyEvent(ui::VKEY_Z, false, true); // Undo (2')nd edit + textfield_->InsertOrReplaceText(u"xyz"); // (2')nd edit + SendKeyEvent(ui::VKEY_Z, false, true); // Undo (2')nd edit EXPECT_EQ(textfield_->GetCursorPosition(), 20u); EXPECT_EQ(textfield_->GetSelectedRange(), gfx::Range(20, 20)); } @@ -1051,10 +1066,11 @@ SendKeyEvent(ui::VKEY_1, false, false, false, true); // On Mac, Caps+Shift remains uppercase. - if (TestingNativeMac()) + if (TestingNativeMac()) { EXPECT_EQ(u"TeXT!1!1", textfield_->GetText()); - else + } else { EXPECT_EQ(u"TexT!1!1", textfield_->GetText()); + } } #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -1115,12 +1131,13 @@ SendKeyPress(ui::VKEY_OEM_MINUS, ctrl); SendKeyPress(ui::VKEY_OEM_MINUS, ctrl | shift); - if (TestingNativeCrOs()) + if (TestingNativeCrOs()) { EXPECT_EQ(u"TeTEx34", textfield_->GetText()); - else if (TestingNativeMac()) + } else if (TestingNativeMac()) { EXPECT_EQ(u"TheTxE134", textfield_->GetText()); - else + } else { EXPECT_EQ(u"TeTEx234", textfield_->GetText()); + } } TEST_F(TextfieldTest, AccessibleTextSelectBound) { @@ -1463,17 +1480,20 @@ TEST_F(TextfieldTest, InsertionDeletionTest) { // Insert a test string in a textfield. InitTextfield(); - for (size_t i = 0; i < 10; ++i) + for (size_t i = 0; i < 10; ++i) { SendKeyEvent(static_cast<ui::KeyboardCode>(ui::VKEY_A + i)); + } EXPECT_EQ(u"abcdefghij", textfield_->GetText()); // Test the delete and backspace keys. textfield_->SetSelectedRange(gfx::Range(5)); - for (size_t i = 0; i < 3; ++i) + for (size_t i = 0; i < 3; ++i) { SendKeyEvent(ui::VKEY_BACK); + } EXPECT_EQ(u"abfghij", textfield_->GetText()); - for (size_t i = 0; i < 3; ++i) + for (size_t i = 0; i < 3; ++i) { SendKeyEvent(ui::VKEY_DELETE); + } EXPECT_EQ(u"abij", textfield_->GetText()); // Select all and replace with "k". @@ -3358,8 +3378,9 @@ InitTextfield(); std::u16string str; - for (size_t i = 0; i < 500; ++i) + for (size_t i = 0; i < 500; ++i) { SendKeyEvent('a'); + } SendKeyEvent(kHebrewLetterSamekh); EXPECT_TRUE(GetDisplayRect().Contains(GetCursorBounds())); @@ -3371,8 +3392,9 @@ SendKeyEvent(ui::VKEY_A, false, true); SendKeyEvent(ui::VKEY_DELETE); - for (size_t i = 0; i < 500; ++i) + for (size_t i = 0; i < 500; ++i) { SendKeyEvent(kHebrewLetterSamekh); + } SendKeyEvent('a'); EXPECT_TRUE(GetDisplayRect().Contains(GetCursorBounds())); @@ -3387,8 +3409,9 @@ InitTextfield(); std::u16string str; - for (size_t i = 0; i < 500; ++i) + for (size_t i = 0; i < 500; ++i) { SendKeyEvent('a'); + } SendKeyEvent(kHebrewLetterSamekh); EXPECT_TRUE(GetDisplayRect().Contains(GetCursorBounds())); @@ -3399,8 +3422,9 @@ SendKeyEvent(ui::VKEY_A, false, true); SendKeyEvent(ui::VKEY_DELETE); - for (size_t i = 0; i < 500; ++i) + for (size_t i = 0; i < 500; ++i) { SendKeyEvent(kHebrewLetterSamekh); + } SendKeyEvent('a'); EXPECT_TRUE(GetDisplayRect().Contains(GetCursorBounds())); @@ -4324,9 +4348,10 @@ EXPECT_EQ(gfx::Rect(1, 2, 3, 4), gfx::ToEnclosingRect(actual.relative_bounds.bounds)); - EXPECT_EQ(textfield_->GetBoundsInScreen(), - delegate->GetBoundsRect(ui::AXCoordinateSystem::kScreenDIPs, - ui::AXClippingBehavior::kUnclipped, nullptr)); + EXPECT_EQ( + textfield_->GetBoundsInScreen(), + delegate->GetBoundsRect(ui::AXCoordinateSystem::kScreenDIPs, + ui::AXClippingBehavior::kUnclipped, nullptr)); } #endif
diff --git a/ui/views/controls/textfield/textfield_unittest.h b/ui/views/controls/textfield/textfield_unittest.h index cf434bb..75d77900 100644 --- a/ui/views/controls/textfield/textfield_unittest.h +++ b/ui/views/controls/textfield/textfield_unittest.h
@@ -5,8 +5,6 @@ #ifndef UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_UNITTEST_H_ #define UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_UNITTEST_H_ -#include "ui/views/controls/textfield/textfield.h" - #include <memory> #include <string> #include <utility> @@ -14,6 +12,7 @@ #include "base/memory/raw_ptr.h" #include "ui/base/clipboard/clipboard.h" #include "ui/events/event_constants.h" +#include "ui/views/controls/textfield/textfield.h" #include "ui/views/controls/textfield/textfield_controller.h" #include "ui/views/test/views_test_base.h"
diff --git a/ui/views/controls/theme_tracking_image_view.cc b/ui/views/controls/theme_tracking_image_view.cc index 6ca7887..73449f28 100644 --- a/ui/views/controls/theme_tracking_image_view.cc +++ b/ui/views/controls/theme_tracking_image_view.cc
@@ -47,15 +47,17 @@ void ThemeTrackingImageView::SetLightImage( const ui::ImageModel& light_image_model) { light_image_model_ = light_image_model; - if (!color_utils::IsDark(get_background_color_callback_.Run())) + if (!color_utils::IsDark(get_background_color_callback_.Run())) { SetImage(light_image_model_); + } } void ThemeTrackingImageView::SetDarkImage( const ui::ImageModel& dark_image_model) { dark_image_model_ = dark_image_model; - if (color_utils::IsDark(get_background_color_callback_.Run())) + if (color_utils::IsDark(get_background_color_callback_.Run())) { SetImage(dark_image_model_); + } } BEGIN_METADATA(ThemeTrackingImageView)
diff --git a/ui/views/controls/throbber.cc b/ui/views/controls/throbber.cc index 0a9b572..bb67f6d9 100644 --- a/ui/views/controls/throbber.cc +++ b/ui/views/controls/throbber.cc
@@ -41,8 +41,9 @@ } void Throbber::Start() { - if (IsRunning()) + if (IsRunning()) { return; + } start_time_ = base::TimeTicks::Now(); timer_.Start( @@ -52,8 +53,9 @@ } void Throbber::Stop() { - if (!IsRunning()) + if (!IsRunning()) { return; + } timer_.Stop(); SchedulePaint(); @@ -64,8 +66,9 @@ } void Throbber::SetChecked(bool checked) { - if (checked == checked_) + if (checked == checked_) { return; + } checked_ = checked; OnPropertyChanged(&checked_, kPropertyEffectsPaint); @@ -128,8 +131,9 @@ } void SmoothedThrobber::Stop() { - if (!IsRunning()) + if (!IsRunning()) { start_timer_.Stop(); + } stop_timer_.Stop(); stop_timer_.Start(FROM_HERE, stop_delay_, this, @@ -141,8 +145,9 @@ } void SmoothedThrobber::SetStartDelay(const base::TimeDelta& start_delay) { - if (start_delay == start_delay_) + if (start_delay == start_delay_) { return; + } start_delay_ = start_delay; OnPropertyChanged(&start_delay_, kPropertyEffectsNone); } @@ -152,8 +157,9 @@ } void SmoothedThrobber::SetStopDelay(const base::TimeDelta& stop_delay) { - if (stop_delay == stop_delay_) + if (stop_delay == stop_delay_) { return; + } stop_delay_ = stop_delay; OnPropertyChanged(&stop_delay_, kPropertyEffectsNone); }
diff --git a/ui/views/controls/tree/tree_view.cc b/ui/views/controls/tree/tree_view.cc index 5c7b6ed..0f24437 100644 --- a/ui/views/controls/tree/tree_view.cc +++ b/ui/views/controls/tree/tree_view.cc
@@ -108,8 +108,9 @@ } TreeView::~TreeView() { - if (model_) + if (model_) { model_->RemoveObserver(this); + } if (GetInputMethod() && selector_.get()) { // TreeView should have been blurred before destroy. @@ -131,10 +132,12 @@ } void TreeView::SetModel(TreeModel* model) { - if (model == model_) + if (model == model_) { return; - if (model_) + } + if (model_) { model_->RemoveObserver(this); + } CancelEdit(); @@ -158,18 +161,20 @@ root_.set_is_expanded(true); UpdateAccessiblePositionalPropertiesForNodeAndChildren(&root_); - if (root_shown_) + if (root_shown_) { SetSelectedNode(root_.model_node()); - else if (!root_.children().empty()) + } else if (!root_.children().empty()) { SetSelectedNode(root_.children().front().get()->model_node()); + } } DrawnNodesChanged(); } void TreeView::SetEditable(bool editable) { - if (editable == editable_) + if (editable == editable_) { return; + } editable_ = editable; CancelEdit(); } @@ -179,12 +184,14 @@ // Cancel the current edit. CancelEdit(); // Make sure all ancestors are expanded. - if (model_->GetParent(node)) + if (model_->GetParent(node)) { Expand(model_->GetParent(node)); + } // Select the node, else if the user commits the edit the selection reverts. SetSelectedNode(node); - if (GetSelectedNode() != node) + if (GetSelectedNode() != node) { return; // Selection failed for some reason, don't start editing. + } DCHECK(!editing_); editing_ = true; if (!editor_) { @@ -209,8 +216,9 @@ // Listen for focus changes so that we can cancel editing. focus_manager_ = GetFocusManager(); - if (focus_manager_) + if (focus_manager_) { focus_manager_->AddFocusChangeListener(this); + } // Accelerators to commit/cancel edit. AddAccelerator(ui::Accelerator(ui::VKEY_RETURN, ui::EF_NONE)); @@ -218,8 +226,9 @@ } void TreeView::CancelEdit() { - if (!editing_) + if (!editing_) { return; + } // WARNING: don't touch |selected_node_|, it may be bogus. @@ -236,8 +245,9 @@ } void TreeView::CommitEdit() { - if (!editing_) + if (!editing_) { return; + } DCHECK(selected_node_); const bool editor_has_focus = editor_->HasFocus(); @@ -246,8 +256,9 @@ GetSelectedNode()->GetAccessibleTitle()); selected_node_->UpdateAccessibleName(); CancelEdit(); - if (editor_has_focus) + if (editor_has_focus) { RequestFocus(); + } } TreeModelNode* TreeView::GetEditingNode() { @@ -273,18 +284,21 @@ void TreeView::Collapse(ui::TreeModelNode* model_node) { // Don't collapse the root if the root isn't shown, otherwise nothing is // displayed. - if (model_node == root_.model_node() && !root_shown_) + if (model_node == root_.model_node() && !root_shown_) { return; + } InternalNode* node = GetInternalNodeForModelNode( model_node, CreateType::kDontCreateIfNotLoaded); - if (!node) + if (!node) { return; + } bool was_expanded = IsExpanded(model_node); if (node->is_expanded()) { - if (selected_node_ && selected_node_->HasAncestor(node)) + if (selected_node_ && selected_node_->HasAncestor(node)) { UpdateSelection(model_node, SelectionType::kActiveAndSelected); - else if (active_node_ && active_node_->HasAncestor(node)) + } else if (active_node_ && active_node_->HasAncestor(node)) { UpdateSelection(model_node, SelectionType::kActive); + } node->set_is_expanded(false); UpdateAccessiblePositionalPropertiesForNodeAndChildren(node); } @@ -322,8 +336,9 @@ // And recursively expand all the children. const auto& children = model_->GetChildren(node); for (TreeModelNode* child : base::Reversed(children)) { - if (ExpandImpl(child)) + if (ExpandImpl(child)) { expanded_at_least_one = true; + } } if (expanded_at_least_one) { DrawnNodesChanged(); @@ -347,28 +362,32 @@ } InternalNode* node = GetInternalNodeForModelNode( model_node, CreateType::kDontCreateIfNotLoaded); - if (!node) + if (!node) { return false; + } while (node) { - if (!node->is_expanded()) + if (!node->is_expanded()) { return false; + } node = node->parent(); } return true; } void TreeView::SetRootShown(bool root_shown) { - if (root_shown_ == root_shown) + if (root_shown_ == root_shown) { return; + } root_shown_ = root_shown; if (!root_shown_ && (selected_node_ == &root_ || active_node_ == &root_)) { const auto& children = model_->GetChildren(root_.model_node()); TreeModelNode* first_child = children.empty() ? nullptr : children.front(); - if (selected_node_ == &root_) + if (selected_node_ == &root_) { UpdateSelection(first_child, SelectionType::kActiveAndSelected); - else if (active_node_ == &root_) + } else if (active_node_ == &root_) { UpdateSelection(first_child, SelectionType::kActive); + } } AXVirtualView* ax_view = root_.accessibility_view(); @@ -389,8 +408,9 @@ int TreeView::GetRowForNode(ui::TreeModelNode* node) { InternalNode* internal_node = GetInternalNodeForModelNode(node, CreateType::kDontCreateIfNotLoaded); - if (!internal_node) + if (!internal_node) { return -1; + } int depth = 0; return GetRowForInternalNode(internal_node, &depth); } @@ -443,29 +463,33 @@ void TreeView::OnGestureEvent(ui::GestureEvent* event) { if (event->type() == ui::EventType::kGestureTap) { - if (OnClickOrTap(*event)) + if (OnClickOrTap(*event)) { event->SetHandled(); + } } } void TreeView::ShowContextMenu(const gfx::Point& p, ui::mojom::MenuSourceType source_type) { - if (!model_) + if (!model_) { return; + } if (source_type == ui::mojom::MenuSourceType::kMouse) { // Only invoke View's implementation (which notifies the // ContextMenuController) if over a node. gfx::Point local_point(p); ConvertPointFromScreen(this, &local_point); - if (!GetNodeAtPoint(local_point)) + if (!GetNodeAtPoint(local_point)) { return; + } } View::ShowContextMenu(p, source_type); } bool TreeView::HandleAccessibleAction(const ui::AXActionData& action_data) { - if (!model_) + if (!model_) { return false; + } AXVirtualView* ax_view = AXVirtualView::GetFromId(action_data.target_node_id); InternalNode* node = @@ -473,10 +497,12 @@ if (!node) { switch (action_data.action) { case ax::mojom::Action::kFocus: - if (active_node_) + if (active_node_) { return false; - if (!HasFocus()) + } + if (!HasFocus()) { RequestFocus(); + } return true; case ax::mojom::Action::kBlur: case ax::mojom::Action::kScrollToMakeVisible: @@ -489,18 +515,21 @@ switch (action_data.action) { case ax::mojom::Action::kDoDefault: SetSelectedNode(node->model_node()); - if (!HasFocus()) + if (!HasFocus()) { RequestFocus(); - if (IsExpanded(node->model_node())) + } + if (IsExpanded(node->model_node())) { Collapse(node->model_node()); - else + } else { Expand(node->model_node()); + } break; case ax::mojom::Action::kFocus: SetSelectedNode(node->model_node()); - if (!HasFocus()) + if (!HasFocus()) { RequestFocus(); + } break; case ax::mojom::Action::kScrollToMakeVisible: @@ -512,8 +541,9 @@ case ax::mojom::Action::kShowContextMenu: SetSelectedNode(node->model_node()); - if (!HasFocus()) + if (!HasFocus()) { RequestFocus(); + } ShowContextMenu(GetBoundsInScreen().CenterPoint(), ui::mojom::MenuSourceType::kKeyboard); break; @@ -530,8 +560,9 @@ size_t index) { InternalNode* parent_node = GetInternalNodeForModelNode(parent, CreateType::kDontCreateIfNotLoaded); - if (!parent_node || !parent_node->loaded_children()) + if (!parent_node || !parent_node->loaded_children()) { return; + } const auto& children = model_->GetChildren(parent); auto child = std::make_unique<InternalNode>(); @@ -561,8 +592,9 @@ InternalNode* parent_node = GetInternalNodeForModelNode(parent, CreateType::kDontCreateIfNotLoaded); - if (!parent_node || !parent_node->loaded_children()) + if (!parent_node || !parent_node->loaded_children()) { return; + } bool reset_selected_node = false; bool reset_active_node = false; @@ -600,10 +632,11 @@ } else if (parent != root_.model_node() || root_shown_) { nearest_node = parent; } - if (reset_selected_node) + if (reset_selected_node) { UpdateSelection(nearest_node, SelectionType::kActiveAndSelected); - else if (reset_active_node) + } else if (reset_active_node) { UpdateSelection(nearest_node, SelectionType::kActive); + } } if (IsExpanded(parent)) { @@ -615,8 +648,9 @@ void TreeView::TreeNodeChanged(TreeModel* model, TreeModelNode* model_node) { InternalNode* node = GetInternalNodeForModelNode( model_node, CreateType::kDontCreateIfNotLoaded); - if (!node) + if (!node) { return; + } int old_width = node->text_width(); UpdateNodeTextWidth(node); if (old_width != node->text_width() && @@ -662,8 +696,9 @@ size_t TreeView::GetRowCount() { size_t row_count = root_.NumExpandedNodes(); - if (!root_shown_) + if (!root_shown_) { row_count--; + } return row_count; } @@ -671,8 +706,9 @@ // Type-ahead searches should be relative to the active node, so return the // row of the active node for |PrefixSelector|. ui::TreeModelNode* model_node = GetActiveNode(); - if (!model_node) + if (!model_node) { return std::nullopt; + } const int row = GetRowForNode(model_node); return (row == -1) ? std::nullopt : std::make_optional(static_cast<size_t>(row)); @@ -697,22 +733,25 @@ int y = 0; if (active_node_) { gfx::Rect node_bounds(GetForegroundBoundsForNode(active_node_)); - if (node_bounds.Intersects(vis_bounds)) + if (node_bounds.Intersects(vis_bounds)) { node_bounds.Intersect(vis_bounds); + } gfx::Point menu_point(node_bounds.CenterPoint()); x = std::clamp(menu_point.x(), vis_bounds.x(), vis_bounds.right()); y = std::clamp(menu_point.y(), vis_bounds.y(), vis_bounds.bottom()); } gfx::Point screen_loc(x, y); - if (base::i18n::IsRTL()) + if (base::i18n::IsRTL()) { screen_loc.set_x(vis_bounds.width() - screen_loc.x()); + } ConvertPointToScreen(this, &screen_loc); return screen_loc; } bool TreeView::OnKeyPressed(const ui::KeyEvent& event) { - if (!HasFocus()) + if (!HasFocus()) { return false; + } switch (event.key_code()) { case ui::VKEY_F2: @@ -733,17 +772,19 @@ return true; case ui::VKEY_LEFT: - if (base::i18n::IsRTL()) + if (base::i18n::IsRTL()) { ExpandOrSelectChild(); - else + } else { CollapseOrSelectParent(); + } return true; case ui::VKEY_RIGHT: - if (base::i18n::IsRTL()) + if (base::i18n::IsRTL()) { CollapseOrSelectParent(); - else + } else { ExpandOrSelectChild(); + } return true; default: @@ -774,41 +815,48 @@ int min_row = std::max(0, min_y / row_height_); int max_row = max_y / row_height_; - if (max_y % row_height_ != 0) + if (max_y % row_height_ != 0) { max_row++; + } int current_row = root_row(); PaintRows(canvas, min_row, max_row, &root_, root_depth(), ¤t_row); } void TreeView::OnFocus() { - if (GetInputMethod()) + if (GetInputMethod()) { GetInputMethod()->SetFocusedTextInputClient(GetPrefixSelector()); + } View::OnFocus(); SchedulePaintForNode(selected_node_); // Notify the InputMethod so that it knows to query the TextInputClient. - if (GetInputMethod()) + if (GetInputMethod()) { GetInputMethod()->OnCaretBoundsChanged(GetPrefixSelector()); + } SetHasFocusIndicator(true); } void TreeView::OnBlur() { - if (GetInputMethod()) + if (GetInputMethod()) { GetInputMethod()->DetachTextInputClient(GetPrefixSelector()); + } SchedulePaintForNode(selected_node_); - if (selector_) + if (selector_) { selector_->OnViewBlur(); + } SetHasFocusIndicator(false); } void TreeView::UpdateSelection(TreeModelNode* model_node, SelectionType selection_type) { CancelEdit(); - if (model_node && model_->GetParent(model_node)) + if (model_node && model_->GetParent(model_node)) { Expand(model_->GetParent(model_node)); - if (model_node && model_node == root_.model_node() && !root_shown_) + } + if (model_node && model_node == root_.model_node() && !root_shown_) { return; // Ignore requests for the root when not shown. + } InternalNode* node = model_node ? GetInternalNodeForModelNode( model_node, CreateType::kCreateIfNotLoaded) @@ -822,8 +870,9 @@ (!selected_node_ || selected_node_ != node)); // Update tree view states to new values. - if (active_changed) + if (active_changed) { active_node_ = node; + } if (selection_changed) { SchedulePaintForNode(selected_node_); @@ -840,8 +889,9 @@ // TODO(crbug.com/40204541): We should not be doing synchronous layout here // but instead we should call into this asynchronously after the Views // tree has processed a layout pass which happens asynchronously. - if (auto* widget = GetWidget()) + if (auto* widget = GetWidget()) { widget->LayoutRootViewIfNecessary(); + } ScrollRectToVisible(GetMirroredRect(GetForegroundBoundsForNode(node))); } @@ -857,15 +907,17 @@ if (selection_changed) { AXVirtualView* ax_selected_view = node ? node->accessibility_view() : nullptr; - if (ax_selected_view) + if (ax_selected_view) { ax_selected_view->NotifyAccessibilityEvent(ax::mojom::Event::kSelection); - else + } else { NotifyAccessibilityEvent(ax::mojom::Event::kSelection, true); + } } // Notify controller of state changes. - if (selection_changed && controller_) + if (selection_changed && controller_) { controller_->OnTreeViewSelectionChanged(this); + } } bool TreeView::OnClickOrTap(const ui::LocatedEvent& event) { @@ -874,19 +926,22 @@ InternalNode* node = GetNodeAtPoint(event.location()); if (node) { bool hits_arrow = IsPointInExpandControl(node, event.location()); - if (!hits_arrow) + if (!hits_arrow) { SetSelectedNode(node->model_node()); + } if (hits_arrow || EventIsDoubleTapOrClick(event)) { - if (node->is_expanded()) + if (node->is_expanded()) { Collapse(node->model_node()); - else + } else { Expand(node->model_node()); + } } } - if (!HasFocus()) + if (!HasFocus()) { RequestFocus(); + } return true; } @@ -1025,8 +1080,9 @@ void TreeView::UpdatePreferredSize() { preferred_size_ = gfx::Size(); - if (!model_) + if (!model_) { return; + } preferred_size_.SetSize( root_.GetMaxWidth(this, text_offset_, root_shown_ ? 1 : 0) + @@ -1047,8 +1103,9 @@ } void TreeView::LayoutEditor() { - if (!editing_) + if (!editing_) { return; + } DCHECK(selected_node_); // Position the editor so that its text aligns with the text we drew. @@ -1087,8 +1144,9 @@ } void TreeView::SchedulePaintForNode(InternalNode* node) { - if (!node) + if (!node) { return; // Explicitly allow NULL to be passed in. + } SchedulePaintInRect(GetBoundsForNode(node)); } @@ -1098,17 +1156,21 @@ InternalNode* node, int depth, int* row) { - if (*row >= max_row) + if (*row >= max_row) { return; + } - if (*row >= min_row && *row < max_row) + if (*row >= min_row && *row < max_row) { PaintRow(canvas, node, *row, depth); + } (*row)++; - if (!node->is_expanded()) + if (!node->is_expanded()) { return; + } depth++; - for (size_t i = 0; i < node->children().size() && *row < max_row; ++i) + for (size_t i = 0; i < node->children().size() && *row < max_row; ++i) { PaintRows(canvas, min_row, max_row, node->children()[i].get(), depth, row); + } } void TreeView::PaintRow(gfx::Canvas* canvas, @@ -1125,20 +1187,24 @@ canvas->FillRect(GetBackgroundBoundsForNode(node), selected_row_bg_color); } - if (!model_->GetChildren(node->model_node()).empty()) + if (!model_->GetChildren(node->model_node()).empty()) { PaintExpandControl(canvas, bounds, node->is_expanded()); + } - if (drawing_provider()->ShouldDrawIconForNode(this, node->model_node())) + if (drawing_provider()->ShouldDrawIconForNode(this, node->model_node())) { PaintNodeIcon(canvas, node, bounds); + } // Paint the text background and text. In edit mode, the selected node is a // separate editing control, so it does not need to be painted here. - if (editing_ && selected_node_ == node) + if (editing_ && selected_node_ == node) { return; + } gfx::Rect text_bounds(GetTextBoundsForNode(node)); - if (base::i18n::IsRTL()) + if (base::i18n::IsRTL()) { text_bounds.set_x(bounds.x()); + } // Paint the background on the selected row. if (!PlatformStyle::kTreeViewSelectionPaintsEntireRow && @@ -1215,8 +1281,9 @@ const gfx::ImageSkia& icon = icons_[icon_index.value()].Rasterize(GetColorProvider()); icon_x += (folder_icon_.Size().width() - icon.width()) / 2; - if (base::i18n::IsRTL()) + if (base::i18n::IsRTL()) { icon_x = bounds.width() - icon_x - icon.width(); + } PaintRowIcon(canvas, icon, icon_x, bounds); } } @@ -1224,12 +1291,14 @@ TreeView::InternalNode* TreeView::GetInternalNodeForModelNode( ui::TreeModelNode* model_node, CreateType create_type) { - if (model_node == root_.model_node()) + if (model_node == root_.model_node()) { return &root_; + } InternalNode* parent_internal_node = GetInternalNodeForModelNode(model_->GetParent(model_node), create_type); - if (!parent_internal_node) + if (!parent_internal_node) { return nullptr; + } if (!parent_internal_node->loaded_children()) { if (create_type == CreateType::kDontCreateIfNotLoaded) { return nullptr; @@ -1244,13 +1313,15 @@ TreeView::InternalNode* TreeView::GetInternalNodeForVirtualView( AXVirtualView* ax_view) { - if (ax_view == root_.accessibility_view()) + if (ax_view == root_.accessibility_view()) { return &root_; + } DCHECK(ax_view); InternalNode* parent_internal_node = GetInternalNodeForVirtualView(ax_view->virtual_parent_view()); - if (!parent_internal_node) + if (!parent_internal_node) { return nullptr; + } DCHECK(parent_internal_node->loaded_children()); AXVirtualView* parent_ax_view = parent_internal_node->accessibility_view(); DCHECK(parent_ax_view); @@ -1278,10 +1349,11 @@ gfx::Rect TreeView::GetTextBoundsForNode(InternalNode* node) { gfx::Rect bounds(GetForegroundBoundsForNode(node)); - if (drawing_provider()->ShouldDrawIconForNode(this, node->model_node())) + if (drawing_provider()->ShouldDrawIconForNode(this, node->model_node())) { bounds.Inset(gfx::Insets::TLBR(0, text_offset_, 0, 0)); - else + } else { bounds.Inset(gfx::Insets::TLBR(0, kArrowRegionSize, 0, 0)); + } return bounds; } @@ -1296,8 +1368,9 @@ kAuxiliaryTextLineEndPadding : bounds().width() - text_bounds.right() - kTextHorizontalPadding - kAuxiliaryTextLineEndPadding; - if (width < 0) + if (width < 0) { return gfx::Rect(); + } int x = base::i18n::IsRTL() ? kAuxiliaryTextLineEndPadding : bounds().right() - width - kAuxiliaryTextLineEndPadding; @@ -1344,13 +1417,15 @@ int row = point.y() / row_height_; int depth = -1; InternalNode* node = GetNodeByRow(row, &depth); - if (!node) + if (!node) { return nullptr; + } // If the entire row gets a selected background, clicking anywhere in the row // serves to hit this node. - if (PlatformStyle::kTreeViewSelectionPaintsEntireRow) + if (PlatformStyle::kTreeViewSelectionPaintsEntireRow) { return node; + } gfx::Rect bounds(GetForegroundBoundsForNodeImpl(node, row, depth)); return bounds.Contains(point) ? node : nullptr; } @@ -1376,21 +1451,24 @@ for (const auto& child : node->children()) { InternalNode* result = GetNodeByRowImpl( child.get(), target_row, current_depth, current_row, node_depth); - if (result) + if (result) { return result; + } } } return nullptr; } void TreeView::IncrementSelection(IncrementType type) { - if (!model_) + if (!model_) { return; + } if (!active_node_) { // If nothing is selected select the first or last node. - if (root_.children().empty()) + if (root_.children().empty()) { return; + } if (type == IncrementType::kPrevious) { size_t row_count = GetRowCount(); int depth = 0; @@ -1411,26 +1489,29 @@ int row = GetRowForInternalNode(active_node_, &depth); int new_row = std::clamp(row + delta, 0, base::checked_cast<int>(GetRowCount()) - 1); - if (new_row == row) + if (new_row == row) { return; // At the end/beginning. + } SetSelectedNode(GetNodeByRow(new_row, &depth)->model_node()); } void TreeView::CollapseOrSelectParent() { if (active_node_) { - if (active_node_->is_expanded()) + if (active_node_->is_expanded()) { Collapse(active_node_->model_node()); - else if (active_node_->parent()) + } else if (active_node_->parent()) { SetSelectedNode(active_node_->parent()->model_node()); + } } } void TreeView::ExpandOrSelectChild() { if (active_node_) { - if (!active_node_->is_expanded()) + if (!active_node_->is_expanded()) { Expand(active_node_->model_node()); - else if (!active_node_->children().empty()) + } else if (!active_node_->children().empty()) { SetSelectedNode(active_node_->children().front()->model_node()); + } } } @@ -1451,8 +1532,9 @@ GetInternalNodeForModelNode(model_node, CreateType::kCreateIfNotLoaded); DCHECK(internal_node); if (!internal_node->is_expanded()) { - if (!internal_node->loaded_children()) + if (!internal_node->loaded_children()) { LoadChildren(internal_node); + } internal_node->set_is_expanded(true); UpdateAccessiblePositionalPropertiesForNodeAndChildren(internal_node); return_value = true; @@ -1461,15 +1543,17 @@ } PrefixSelector* TreeView::GetPrefixSelector() { - if (!selector_) + if (!selector_) { selector_ = std::make_unique<PrefixSelector>(this, this); + } return selector_.get(); } bool TreeView::IsPointInExpandControl(InternalNode* node, const gfx::Point& point) { - if (model_->GetChildren(node->model_node()).empty()) + if (model_->GetChildren(node->model_node()).empty()) { return false; + } int depth = -1; int row = GetRowForInternalNode(node, &depth); @@ -1477,8 +1561,9 @@ int arrow_dx = depth * kIndent + kHorizontalInset; gfx::Rect arrow_bounds(arrow_dx, row * row_height_, kArrowRegionSize, row_height_); - if (base::i18n::IsRTL()) + if (base::i18n::IsRTL()) { arrow_bounds.set_x(width() - arrow_dx - kArrowRegionSize); + } return arrow_bounds.Contains(point); } @@ -1487,8 +1572,9 @@ // ScrollView for the focus ring instead of this View so that the focus ring // won't be scrolled. ScrollView* scroll_view = ScrollView::GetScrollViewForContents(this); - if (scroll_view) + if (scroll_view) { scroll_view->SetHasFocusIndicator(shows); + } } // InternalNode ---------------------------------------------------------------- @@ -1530,10 +1616,12 @@ size_t TreeView::InternalNode::NumExpandedNodes() const { size_t result = 1; // For this. - if (!is_expanded_) + if (!is_expanded_) { return result; - for (const auto& child : children()) + } + for (const auto& child : children()) { result += child->NumExpandedNodes(); + } return result; } @@ -1555,8 +1643,9 @@ bool has_icon = tree->drawing_provider()->ShouldDrawIconForNode(tree, model_node()); int max_width = (has_icon ? text_width_ : kArrowRegionSize) + indent * depth; - if (!is_expanded_) + if (!is_expanded_) { return max_width; + } for (const auto& child : children()) { max_width = std::max(max_width, child->GetMaxWidth(tree, indent, depth + 1));
diff --git a/ui/views/controls/tree/tree_view_unittest.cc b/ui/views/controls/tree/tree_view_unittest.cc index 16dc0456..9e1a535 100644 --- a/ui/views/controls/tree/tree_view_unittest.cc +++ b/ui/views/controls/tree/tree_view_unittest.cc
@@ -217,8 +217,9 @@ std::string TreeViewTest::TreeViewAccessibilityContentsAsString() const { AXVirtualView* ax_view = GetRootAccessibilityView(); - if (!ax_view) + if (!ax_view) { return "Empty"; + } return AccessibilityViewAsString(*ax_view); } @@ -256,8 +257,9 @@ parent_view = parent_view->virtual_parent_view(); } - if (!parent_view) + if (!parent_view) { break; + } } return {}; @@ -332,8 +334,9 @@ parent_view = parent_view->virtual_parent_view(); } - if (!parent_view) + if (!parent_view) { break; + } } return nullptr; @@ -358,12 +361,14 @@ TestNode* TreeViewTest::GetNodeByTitleImpl(TestNode* node, const std::u16string& title) { - if (node->GetTitle() == title) + if (node->GetTitle() == title) { return node; + } for (auto& child : node->children()) { TestNode* matching_node = GetNodeByTitleImpl(child.get(), title); - if (matching_node) + if (matching_node) { return matching_node; + } } return nullptr; }
diff --git a/ui/views/controls/views_text_services_context_menu_mac.mm b/ui/views/controls/views_text_services_context_menu_mac.mm index dace758..eefbac5 100644 --- a/ui/views/controls/views_text_services_context_menu_mac.mm +++ b/ui/views/controls/views_text_services_context_menu_mac.mm
@@ -82,20 +82,22 @@ } bool ViewsTextServicesContextMenuMac::IsCommandIdEnabled(int command_id) const { - if (text_services_menu_.SupportsCommand(command_id)) + if (text_services_menu_.SupportsCommand(command_id)) { return text_services_menu_.IsCommandIdEnabled(command_id); + } return (command_id == IDS_CONTENT_CONTEXT_LOOK_UP) || ViewsTextServicesContextMenuBase::IsCommandIdEnabled(command_id); } void ViewsTextServicesContextMenuMac::ExecuteCommand(int command_id, int event_flags) { - if (text_services_menu_.SupportsCommand(command_id)) + if (text_services_menu_.SupportsCommand(command_id)) { text_services_menu_.ExecuteCommand(command_id, event_flags); - else if (command_id == IDS_CONTENT_CONTEXT_LOOK_UP) + } else if (command_id == IDS_CONTENT_CONTEXT_LOOK_UP) { LookUpInDictionary(); - else + } else { ViewsTextServicesContextMenuBase::ExecuteCommand(command_id, event_flags); + } } bool ViewsTextServicesContextMenuMac::SupportsCommand(int command_id) const { @@ -112,15 +114,17 @@ bool ViewsTextServicesContextMenuMac::IsTextDirectionEnabled( base::i18n::TextDirection direction) const { - if (client()->force_text_directionality()) + if (client()->force_text_directionality()) { return false; + } return direction != base::i18n::UNKNOWN_DIRECTION; } bool ViewsTextServicesContextMenuMac::IsTextDirectionChecked( base::i18n::TextDirection direction) const { - if (client()->force_text_directionality()) + if (client()->force_text_directionality()) { return direction == base::i18n::UNKNOWN_DIRECTION; + } return IsTextDirectionEnabled(direction) && client()->GetTextDirection() == direction; }
diff --git a/ui/views/controls/webview/unhandled_keyboard_event_handler.cc b/ui/views/controls/webview/unhandled_keyboard_event_handler.cc index a7b1395..5826f882 100644 --- a/ui/views/controls/webview/unhandled_keyboard_event_handler.cc +++ b/ui/views/controls/webview/unhandled_keyboard_event_handler.cc
@@ -42,8 +42,9 @@ // set the flag and fix it if no event was handled. ignore_next_char_event_ = true; - if (focus_manager->ProcessAccelerator(accelerator)) + if (focus_manager->ProcessAccelerator(accelerator)) { return true; + } // ProcessAccelerator didn't handle the accelerator, so we know both // that |this| is still valid, and that we didn't want to set the flag.
diff --git a/ui/views/controls/webview/unhandled_keyboard_event_handler_default.cc b/ui/views/controls/webview/unhandled_keyboard_event_handler_default.cc index d28600f..b4ad7e2 100644 --- a/ui/views/controls/webview/unhandled_keyboard_event_handler_default.cc +++ b/ui/views/controls/webview/unhandled_keyboard_event_handler_default.cc
@@ -2,10 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/views/controls/webview/unhandled_keyboard_event_handler.h" - #include "components/input/native_web_keyboard_event.h" #include "ui/events/event.h" +#include "ui/views/controls/webview/unhandled_keyboard_event_handler.h" #include "ui/views/focus/focus_manager.h" namespace views {
diff --git a/ui/views/controls/webview/unhandled_keyboard_event_handler_ozone.cc b/ui/views/controls/webview/unhandled_keyboard_event_handler_ozone.cc index 279e683e..2dbf64d 100644 --- a/ui/views/controls/webview/unhandled_keyboard_event_handler_ozone.cc +++ b/ui/views/controls/webview/unhandled_keyboard_event_handler_ozone.cc
@@ -2,12 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/views/controls/webview/unhandled_keyboard_event_handler.h" - #include "components/input/native_web_keyboard_event.h" #include "ui/events/event.h" #include "ui/ozone/public/ozone_platform.h" #include "ui/ozone/public/platform_utils.h" +#include "ui/views/controls/webview/unhandled_keyboard_event_handler.h" #include "ui/views/focus/focus_manager.h" namespace views { @@ -22,8 +21,9 @@ // Note: FocusManager::OnKeyEvent returns true iff the given event // needs to continue to propagated. So, negate the condition to calculate // whether it is consumed. - if (!focus_manager->OnKeyEvent(key_event)) + if (!focus_manager->OnKeyEvent(key_event)) { return true; + } } // Send it back to the platform via Ozone.
diff --git a/ui/views/controls/webview/web_contents_set_background_color.cc b/ui/views/controls/webview/web_contents_set_background_color.cc index 16952390..a375d75a 100644 --- a/ui/views/controls/webview/web_contents_set_background_color.cc +++ b/ui/views/controls/webview/web_contents_set_background_color.cc
@@ -15,8 +15,9 @@ void WebContentsSetBackgroundColor::CreateForWebContentsWithColor( content::WebContents* web_contents, SkColor color) { - if (FromWebContents(web_contents)) + if (FromWebContents(web_contents)) { return; + } // SupportsUserData::Data takes ownership over the // WebContentsSetBackgroundColor instance and will destroy it when the @@ -41,8 +42,9 @@ // We set the background color just on the outermost main frame's widget. // Other frames that are local roots would have a widget of their own, but // their background colors are part of, and controlled by, the webpage. - if (!render_frame_host->GetParentOrOuterDocument()) + if (!render_frame_host->GetParentOrOuterDocument()) { render_frame_host->GetView()->SetBackgroundColor(color_); + } } WEB_CONTENTS_USER_DATA_KEY_IMPL(WebContentsSetBackgroundColor);
diff --git a/ui/views/controls/webview/web_dialog_view.cc b/ui/views/controls/webview/web_dialog_view.cc index 1a3b4a9..d51816a 100644 --- a/ui/views/controls/webview/web_dialog_view.cc +++ b/ui/views/controls/webview/web_dialog_view.cc
@@ -48,11 +48,13 @@ content::RenderFrameHost* render_frame_host, const GURL& validated_url) { // Only listen to the primary main frame. - if (!render_frame_host->IsInPrimaryMainFrame()) + if (!render_frame_host->IsInPrimaryMainFrame()) { return; + } - if (delegate_) + if (delegate_) { delegate_->OnWebContentsFinishedLoad(); + } } void ObservableWebView::ResetDelegate() { @@ -84,8 +86,9 @@ AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE)); if (delegate_) { - for (const auto& accelerator : delegate_->GetAccelerators()) + for (const auto& accelerator : delegate_->GetAccelerators()) { AddAccelerator(accelerator); + } RegisterWindowWillCloseCallback(base::BindOnce( &WebDialogView::NotifyDialogWillClose, base::Unretained(this))); } @@ -126,25 +129,29 @@ gfx::Size WebDialogView::CalculatePreferredSize( const SizeBounds& available_size) const { gfx::Size out; - if (delegate_) + if (delegate_) { delegate_->GetDialogSize(&out); + } return out; } gfx::Size WebDialogView::GetMinimumSize() const { gfx::Size out; - if (delegate_) + if (delegate_) { delegate_->GetMinimumDialogSize(&out); + } return out; } bool WebDialogView::AcceleratorPressed(const ui::Accelerator& accelerator) { - if (delegate_ && delegate_->AcceleratorPressed(accelerator)) + if (delegate_ && delegate_->AcceleratorPressed(accelerator)) { return true; + } DCHECK_EQ(ui::VKEY_ESCAPE, accelerator.key_code()); - if (delegate_ && !delegate_->ShouldCloseDialogOnEscape()) + if (delegate_ && !delegate_->ShouldCloseDialogOnEscape()) { return false; + } // Pressing Escape closes the dialog. if (GetWidget()) { @@ -157,8 +164,9 @@ void WebDialogView::ViewHierarchyChanged( const ViewHierarchyChangedDetails& details) { - if (details.is_add && GetWidget()) + if (details.is_add && GetWidget()) { InitDialog(); + } } views::CloseRequestResult WebDialogView::OnWindowCloseRequested() { @@ -166,8 +174,9 @@ // clicking on "x" button or pressing Escape shortcut key on hosting // dialog. if (!is_attempting_close_dialog_ && !delegate_->OnDialogCloseRequested()) { - if (!close_contents_called_) + if (!close_contents_called_) { return views::CloseRequestResult::kCannotClose; + } // This is a web dialog, if the WebContents has been closed, there is no // reason to keep the dialog alive. LOG(ERROR) << "delegate tries to stop closing when CloseContents() has " @@ -196,26 +205,30 @@ // WebDialogView, views::WidgetDelegate implementation: bool WebDialogView::CanMaximize() const { - if (delegate_) + if (delegate_) { return delegate_->CanMaximizeDialog(); + } return false; } std::u16string WebDialogView::GetWindowTitle() const { - if (delegate_) + if (delegate_) { return delegate_->GetDialogTitle(); + } return std::u16string(); } std::u16string WebDialogView::GetAccessibleWindowTitle() const { - if (delegate_) + if (delegate_) { return delegate_->GetAccessibleDialogTitle(); + } return GetWindowTitle(); } std::string WebDialogView::GetWindowName() const { - if (delegate_) + if (delegate_) { return delegate_->GetDialogName(); + } return std::string(); } @@ -223,8 +236,9 @@ // If we still have a delegate that means we haven't notified it of the // dialog closing. This happens if the user clicks the Close button on the // dialog. - if (delegate_) + if (delegate_) { OnDialogClosed(""); + } } views::View* WebDialogView::GetContentsView() { @@ -237,8 +251,9 @@ std::unique_ptr<NonClientFrameView> WebDialogView::CreateNonClientFrameView( Widget* widget) { - if (!delegate_) + if (!delegate_) { return WidgetDelegate::CreateNonClientFrameView(widget); + } switch (delegate_->GetWebDialogFrameKind()) { case WebDialogDelegate::FrameKind::kNonClient: @@ -270,8 +285,9 @@ // WebDialogDelegate implementation: ui::mojom::ModalType WebDialogView::GetDialogModalType() const { - if (delegate_) + if (delegate_) { return delegate_->GetDialogModalType(); + } return ui::mojom::ModalType::kNone; } @@ -280,43 +296,50 @@ } GURL WebDialogView::GetDialogContentURL() const { - if (delegate_) + if (delegate_) { return delegate_->GetDialogContentURL(); + } return GURL(); } void WebDialogView::GetWebUIMessageHandlers( std::vector<WebUIMessageHandler*>* handlers) { - if (delegate_) + if (delegate_) { delegate_->GetWebUIMessageHandlers(handlers); + } } void WebDialogView::GetDialogSize(gfx::Size* size) const { - if (delegate_) + if (delegate_) { delegate_->GetDialogSize(size); + } } void WebDialogView::GetMinimumDialogSize(gfx::Size* size) const { - if (delegate_) + if (delegate_) { delegate_->GetMinimumDialogSize(size); + } } std::string WebDialogView::GetDialogArgs() const { - if (delegate_) + if (delegate_) { return delegate_->GetDialogArgs(); + } return std::string(); } void WebDialogView::OnDialogShown(content::WebUI* webui) { - if (delegate_) + if (delegate_) { delegate_->OnDialogShown(webui); + } } void WebDialogView::OnDialogClosed(const std::string& json_retval) { Detach(); - if (GetWidget()) + if (GetWidget()) { GetWidget()->Close(); + } if (delegate_) { delegate_->OnDialogClosed(json_retval); @@ -329,40 +352,46 @@ void WebDialogView::OnDialogCloseFromWebUI(const std::string& json_retval) { closed_via_webui_ = true; dialog_close_retval_ = json_retval; - if (GetWidget()) + if (GetWidget()) { GetWidget()->Close(); + } } void WebDialogView::OnCloseContents(WebContents* source, bool* out_close_dialog) { DCHECK(out_close_dialog); - if (delegate_) + if (delegate_) { delegate_->OnCloseContents(source, out_close_dialog); + } } bool WebDialogView::ShouldShowDialogTitle() const { - if (delegate_) + if (delegate_) { return delegate_->ShouldShowDialogTitle(); + } return true; } bool WebDialogView::ShouldCenterDialogTitleText() const { - if (delegate_) + if (delegate_) { return delegate_->ShouldCenterDialogTitleText(); + } return false; } bool WebDialogView::ShouldShowCloseButton() const { - if (delegate_) + if (delegate_) { return delegate_->ShouldShowCloseButton(); + } return true; } bool WebDialogView::HandleContextMenu( content::RenderFrameHost& render_frame_host, const content::ContextMenuParams& params) { - if (delegate_) + if (delegate_) { return delegate_->HandleContextMenu(render_frame_host, params); + } return WebDialogWebContentsDelegate::HandleContextMenu(render_frame_host, params); } @@ -403,8 +432,9 @@ close_contents_called_ = true; bool close_dialog = false; OnCloseContents(source, &close_dialog); - if (close_dialog) + if (close_dialog) { OnDialogClosed(closed_via_webui_ ? dialog_close_retval_ : std::string()); + } } content::WebContents* WebDialogView::OpenURLFromTab( @@ -441,8 +471,9 @@ void WebDialogView::LoadingStateChanged(content::WebContents* source, bool should_show_loading_ui) { - if (delegate_) + if (delegate_) { delegate_->OnLoadingStateChanged(source); + } } void WebDialogView::BeforeUnloadFired(content::WebContents* tab, @@ -458,8 +489,9 @@ const GURL& opener_url, const std::string& frame_name, const GURL& target_url) { - if (delegate_) + if (delegate_) { return delegate_->HandleShouldOverrideWebContentsCreation(); + } return false; } @@ -496,8 +528,9 @@ void WebDialogView::InitDialog() { content::WebContents* web_contents = web_view_->GetWebContents(); - if (web_contents->GetDelegate() == this) + if (web_contents->GetDelegate() == this) { return; + } web_contents->SetDelegate(this); @@ -505,13 +538,15 @@ // the comment above WebDialogUI in its header file for why. WebDialogUIBase::SetDelegate(web_contents, this); - if (!disable_url_load_for_test_) + if (!disable_url_load_for_test_) { web_view_->LoadInitialURL(GetDialogContentURL()); + } } void WebDialogView::NotifyDialogWillClose() { - if (delegate_) + if (delegate_) { delegate_->OnDialogWillClose(); + } } void WebDialogView::UpdateAccessibleNameForRootView() {
diff --git a/ui/views/controls/webview/web_dialog_view_unittest.cc b/ui/views/controls/webview/web_dialog_view_unittest.cc index 08d5cab..8ddda00 100644 --- a/ui/views/controls/webview/web_dialog_view_unittest.cc +++ b/ui/views/controls/webview/web_dialog_view_unittest.cc
@@ -132,8 +132,9 @@ ASSERT_TRUE(web_dialog_view_->GetFocusManager() != nullptr); ASSERT_TRUE(widget_ != nullptr); ui::KeyEvent event_copy = event; - if (web_dialog_view_->GetFocusManager()->OnKeyEvent(event_copy)) + if (web_dialog_view_->GetFocusManager()->OnKeyEvent(event_copy)) { widget_->OnKeyEvent(&event_copy); + } } private:
diff --git a/ui/views/controls/webview/webview.cc b/ui/views/controls/webview/webview.cc index 73fdf31..3b8ddf4 100644 --- a/ui/views/controls/webview/webview.cc +++ b/ui/views/controls/webview/webview.cc
@@ -492,7 +492,7 @@ content::RenderFrameHost* rfh = web_contents() ? web_contents()->GetPrimaryMainFrame() : nullptr; GetViewAccessibility().SetChildTreeID(rfh ? rfh->GetAXTreeID() - : ui::AXTreeIDUnknown()); + : ui::AXTreeIDUnknown()); } NotifyAccessibilityEvent(ax::mojom::Event::kChildrenChanged, false); }
diff --git a/ui/views/controls/webview/webview_unittest.cc b/ui/views/controls/webview/webview_unittest.cc index 5eb3857..68641f4 100644 --- a/ui/views/controls/webview/webview_unittest.cc +++ b/ui/views/controls/webview/webview_unittest.cc
@@ -54,8 +54,9 @@ const WebViewTestWebContentsObserver&) = delete; ~WebViewTestWebContentsObserver() override { - if (web_contents_) + if (web_contents_) { content::WebContentsObserver::Observe(nullptr); + } } void WebContentsDestroyed() override {
diff --git a/ui/views/corewm/test/tooltip_aura_test_api.h b/ui/views/corewm/test/tooltip_aura_test_api.h index 4a967c5..d09d7a5 100644 --- a/ui/views/corewm/test/tooltip_aura_test_api.h +++ b/ui/views/corewm/test/tooltip_aura_test_api.h
@@ -14,7 +14,7 @@ class Rect; class RenderText; class Size; -} +} // namespace gfx namespace ui { struct AXNodeData;
diff --git a/ui/views/corewm/tooltip_aura.cc b/ui/views/corewm/tooltip_aura.cc index 737c143..e2a9a6d1 100644 --- a/ui/views/corewm/tooltip_aura.cc +++ b/ui/views/corewm/tooltip_aura.cc
@@ -159,8 +159,9 @@ // If tooltip is out of bounds on the y axis, we flip it to appear above the // mouse cursor instead of below. - if (tooltip_rect.bottom() > display_bounds.bottom()) + if (tooltip_rect.bottom() > display_bounds.bottom()) { tooltip_rect.set_y(anchor_point.y() - tooltip_size.height()); + } tooltip_rect.AdjustToFit(display_bounds); return tooltip_rect; @@ -181,8 +182,9 @@ params.z_order = ui::ZOrderLevel::kFloatingUIElement; params.accept_events = false; params.bounds = bounds; - if (CanUseTranslucentTooltipWidget()) + if (CanUseTranslucentTooltipWidget()) { params.opacity = views::Widget::InitParams::WindowOpacity::kTranslucent; + } params.shadow_type = views::Widget::InitParams::ShadowType::kNone; // Use software compositing to avoid using unnecessary hardware resources // which just amount to overkill for this UI.
diff --git a/ui/views/corewm/tooltip_controller.cc b/ui/views/corewm/tooltip_controller.cc index f178602..1b614c5 100644 --- a/ui/views/corewm/tooltip_controller.cc +++ b/ui/views/corewm/tooltip_controller.cc
@@ -37,8 +37,9 @@ // |event_target| is the original target from the event and |target| the window // at the same location. bool IsValidTarget(aura::Window* event_target, aura::Window* target) { - if (!target || (event_target == target)) + if (!target || (event_target == target)) { return true; + } // If `target` is contained in `event_target`, it's valid. // This case may happen on exo surfaces. @@ -80,8 +81,9 @@ case ui::EventType::kMouseMoved: case ui::EventType::kMouseDragged: { aura::Window* event_target = static_cast<aura::Window*>(event.target()); - if (!event_target) + if (!event_target) { return nullptr; + } // If a window other than |event_target| has capture, ignore the event. // This can happen when RootWindow creates events when showing/hiding, or @@ -96,8 +98,9 @@ if (capture_client) { aura::Window* capture_window = capture_client->GetGlobalCaptureWindow(); - if (capture_window && event_target != capture_window) + if (capture_window && event_target != capture_window) { return nullptr; + } } } return event_target; @@ -108,14 +111,16 @@ const gfx::Point screen_loc = event.target()->GetScreenLocation(event); display::Screen* screen = display::Screen::GetScreen(); aura::Window* target = screen->GetWindowAtScreenPoint(screen_loc); - if (!target) + if (!target) { return nullptr; + } gfx::Point target_loc(screen_loc); aura::client::GetScreenPositionClient(target->GetRootWindow()) ->ConvertPointFromScreen(target, &target_loc); aura::Window* screen_target = target->GetEventHandlerForPoint(target_loc); - if (!IsValidTarget(event_target, screen_target)) + if (!IsValidTarget(event_target, screen_target)) { return nullptr; + } aura::Window::ConvertPointToTarget(screen_target, target, &target_loc); *location = target_loc; @@ -136,15 +141,18 @@ : activation_client_(activation_client), state_manager_( std::make_unique<TooltipStateManager>(std::move(tooltip))) { - if (activation_client_) + if (activation_client_) { activation_client_->AddObserver(this); + } } TooltipController::~TooltipController() { - if (observed_window_) + if (observed_window_) { observed_window_->RemoveObserver(this); - if (activation_client_) + } + if (activation_client_) { activation_client_->RemoveObserver(this); + } } void TooltipController::AddObserver(wm::TooltipObserver* observer) { @@ -206,8 +214,9 @@ } void TooltipController::SetTooltipsEnabled(bool enable) { - if (tooltips_enabled_ == enable) + if (tooltips_enabled_ == enable) { return; + } tooltips_enabled_ = enable; UpdateTooltip(observed_window_); } @@ -254,8 +263,9 @@ case ui::EventType::kMouseDragged: { // Synthesized mouse moves shouldn't cause us to show a tooltip. See // https://crbug.com/1146981. - if (event->IsSynthesized()) + if (event->IsSynthesized()) { break; + } #if BUILDFLAG(IS_WIN) // Showing a tooltip causes Windows to generate a MOUSE_MOVED @@ -304,8 +314,9 @@ break; case ui::EventType::kMousewheel: // Hide the tooltip for click, release, drag, wheel events. - if (state_manager_->IsVisible()) + if (state_manager_->IsVisible()) { state_manager_->HideAndReset(); + } break; default: break; @@ -343,8 +354,9 @@ void TooltipController::OnWindowVisibilityChanged(aura::Window* window, bool visible) { // If window is not drawn, skip modifying tooltip. - if (!visible && window->layer()->type() != ui::LAYER_NOT_DRAWN) + if (!visible && window->layer()->type() != ui::LAYER_NOT_DRAWN) { HideAndReset(); + } } void TooltipController::OnWindowDestroying(aura::Window* window) { @@ -377,8 +389,9 @@ aura::Window* gained_active, aura::Window* lost_active) { // We want to hide tooltips whenever the client is losing user focus. - if (lost_active) + if (lost_active) { HideAndReset(); + } } void TooltipController::SetShowTooltipDelay(aura::Window* target, @@ -431,19 +444,22 @@ } bool TooltipController::IsDragDropInProgress() const { - if (!observed_window_) + if (!observed_window_) { return false; + } aura::client::DragDropClient* client = aura::client::GetDragDropClient(observed_window_->GetRootWindow()); return client && client->IsDragDropInProgress(); } bool TooltipController::IsCursorVisible() const { - if (!observed_window_) + if (!observed_window_) { return false; + } aura::Window* root = observed_window_->GetRootWindow(); - if (!root) + if (!root) { return false; + } aura::client::CursorClient* cursor_client = aura::client::GetCursorClient(root); // |cursor_client| may be NULL in tests, treat NULL as always visible. @@ -463,14 +479,16 @@ base::TimeDelta TooltipController::GetHideTooltipDelay() { std::map<aura::Window*, base::TimeDelta>::const_iterator it = hide_tooltip_timeout_map_.find(observed_window_); - if (it == hide_tooltip_timeout_map_.end()) + if (it == hide_tooltip_timeout_map_.end()) { return kDefaultHideTooltipDelay; + } return it->second; } void TooltipController::SetObservedWindow(aura::Window* target) { - if (observed_window_ == target) + if (observed_window_ == target) { return; + } // When we are setting the |observed_window_| to nullptr, it is generally // because the cursor is over a window not owned by Chromium. To prevent a @@ -483,11 +501,13 @@ state_manager_->HideAndReset(); } - if (observed_window_) + if (observed_window_) { observed_window_->RemoveObserver(this); + } observed_window_ = target; - if (observed_window_) + if (observed_window_) { observed_window_->AddObserver(this); + } } bool TooltipController::IsTooltipIdUpdateNeeded() const { @@ -531,8 +551,9 @@ // actual text to show. // TODO(crbug.com/40246278): Remove or update this special path when tooltip // identifier is implemented. - if (wm::GetTooltipText(observed_window_).empty()) + if (wm::GetTooltipText(observed_window_).empty()) { return false; + } return tooltip_window_at_mouse_press() && observed_window_ == tooltip_window_at_mouse_press() &&
diff --git a/ui/views/corewm/tooltip_controller.h b/ui/views/corewm/tooltip_controller.h index a69dbc1..ded314f 100644 --- a/ui/views/corewm/tooltip_controller.h +++ b/ui/views/corewm/tooltip_controller.h
@@ -33,7 +33,7 @@ namespace wm { class ActivationClient; class TooltipObserver; -} +} // namespace wm namespace views::corewm {
diff --git a/ui/views/corewm/tooltip_controller_unittest.cc b/ui/views/corewm/tooltip_controller_unittest.cc index d4d07b1..48dd8479 100644 --- a/ui/views/corewm/tooltip_controller_unittest.cc +++ b/ui/views/corewm/tooltip_controller_unittest.cc
@@ -1090,8 +1090,9 @@ std::move(tooltip), /* activation_client */ nullptr); auto* tooltip_controller = static_cast<TooltipController*>(wm::GetTooltipClient(GetRootWindow())); - if (tooltip_controller) + if (tooltip_controller) { GetRootWindow()->RemovePreTargetHandler(tooltip_controller); + } GetRootWindow()->AddPreTargetHandler(controller_.get()); SetTooltipClient(GetRootWindow(), controller_.get()); helper_ = std::make_unique<TooltipControllerTestHelper>(GetRootWindow());
diff --git a/ui/views/corewm/tooltip_state_manager.cc b/ui/views/corewm/tooltip_state_manager.cc index e791677..a1935191 100644 --- a/ui/views/corewm/tooltip_state_manager.cc +++ b/ui/views/corewm/tooltip_state_manager.cc
@@ -80,8 +80,9 @@ // If the string consists entirely of whitespace, then don't both showing it // (an empty tooltip is useless). - if (trimmed_text.empty()) + if (trimmed_text.empty()) { return; + } // Initialize the one-shot timer to show the tooltip after a delay. Any // running timers have already been canceled by calling HideAndReset above. @@ -99,16 +100,18 @@ // the first place. Otherwise, for example, the position of a keyboard // triggered tooltip could be updated by an unrelated mouse exited event. The // tooltip would then show up at the wrong location. - if (!will_show_tooltip_timer_.IsRunning() || trigger != tooltip_trigger_) + if (!will_show_tooltip_timer_.IsRunning() || trigger != tooltip_trigger_) { return; + } position_ = position; } void TooltipStateManager::ShowNow(const std::u16string& trimmed_text, const base::TimeDelta hide_delay) { - if (!tooltip_parent_window_) + if (!tooltip_parent_window_) { return; + } if (!tooltip_parent_window_->GetRootWindow()) { // This can happen if the window is in the process of closing.
diff --git a/ui/views/corewm/tooltip_view_aura.h b/ui/views/corewm/tooltip_view_aura.h index f0c6c959..792e4e1 100644 --- a/ui/views/corewm/tooltip_view_aura.h +++ b/ui/views/corewm/tooltip_view_aura.h
@@ -6,6 +6,7 @@ #define UI_VIEWS_COREWM_TOOLTIP_VIEW_AURA_H_ #include <memory> + #include "ui/base/metadata/metadata_header_macros.h" #include "ui/gfx/font_list.h" #include "ui/gfx/render_text.h"
diff --git a/ui/views/debug/debugger_utils.cc b/ui/views/debug/debugger_utils.cc index 0b44d30..8441103 100644 --- a/ui/views/debug/debugger_utils.cc +++ b/ui/views/debug/debugger_utils.cc
@@ -52,8 +52,9 @@ void AddPtrAttributeString(AttributeStrings& attributes, const std::string& name, const std::optional<intptr_t>& value) { - if (!value) + if (!value) { return; + } attributes.push_back(name + "=\"" + PtrToString(value.value()) + "\""); }
diff --git a/ui/views/debug_utils.cc b/ui/views/debug_utils.cc index 12db5230..4748759 100644 --- a/ui/views/debug_utils.cc +++ b/ui/views/debug_utils.cc
@@ -33,12 +33,14 @@ *out << view; *out << '\n'; - if (!view->children().empty()) + if (!view->children().empty()) { PrintFocusHierarchyImp(view->children().front(), indent + 2, out); + } const View* next_focusable = view->GetNextFocusableView(); - if (next_focusable) + if (next_focusable) { PrintFocusHierarchyImp(next_focusable, indent, out); + } } #if !defined(NDEBUG) @@ -47,10 +49,11 @@ const std::string class_name(view->GetClassName()); size_t base_name_index = class_name.find_last_of('/'); - if (base_name_index == std::string::npos) + if (base_name_index == std::string::npos) { base_name_index = 0; - else + } else { base_name_index++; + } // Information about current node. result.append(" N"); @@ -73,16 +76,19 @@ } result.append("\""); - if (!view->parent()) + if (!view->parent()) { result.append(", shape=box"); + } if (view->layer()) { - if (view->layer()->has_external_content()) + if (view->layer()->has_external_content()) { result.append(", color=green"); - else + } else { result.append(", color=red"); + } - if (view->layer()->fills_bounds_opaquely()) + if (view->layer()->fills_bounds_opaquely()) { result.append(", style=filled"); + } } result.append("]\n"); @@ -91,8 +97,9 @@ result.append(base::StringPrintf(" N%p -> N%p\n", view->parent(), view)); } - for (const View* child : view->children()) + for (const View* child : view->children()) { result.append(PrintViewGraphImpl(child)); + } return result; } @@ -106,16 +113,18 @@ *out << " name=" << widget.GetName(); *out << " (" << &widget << ")"; - if (widget.parent()) + if (widget.parent()) { *out << " parent=" << widget.parent(); - else + } else { *out << " parent=none"; + } const ui::Layer* layer = widget.GetLayer(); - if (layer) + if (layer) { *out << " layer=" << layer; - else + } else { *out << " layer=none"; + } *out << (widget.is_top_level() ? " [top_level]" : " [!top_level]"); @@ -129,8 +138,9 @@ *out << (widget.IsMinimized() ? " [minimized]" : ""); *out << (widget.IsFullscreen() ? " [fullscreen]" : ""); - if (detailed) + if (detailed) { *out << " " << widget.GetWindowBoundsInScreen().ToString(); + } *out << '\n'; }
diff --git a/ui/views/drag_utils_aura.cc b/ui/views/drag_utils_aura.cc index 11de376..08e8d084 100644 --- a/ui/views/drag_utils_aura.cc +++ b/ui/views/drag_utils_aura.cc
@@ -2,11 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/views/drag_utils.h" - #include "ui/aura/client/drag_drop_client.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" +#include "ui/views/drag_utils.h" #include "ui/wm/core/coordinate_conversion.h" namespace views {
diff --git a/ui/views/event_monitor_aura.cc b/ui/views/event_monitor_aura.cc index 667627b..7ce0bef 100644 --- a/ui/views/event_monitor_aura.cc +++ b/ui/views/event_monitor_aura.cc
@@ -87,8 +87,9 @@ } void EventMonitorAura::TearDown() { - if (event_observer_) + if (event_observer_) { aura::Env::GetInstance()->RemoveEventObserver(event_observer_); + } event_observer_ = nullptr; }
diff --git a/ui/views/examples/animated_image_view_example.cc b/ui/views/examples/animated_image_view_example.cc index 74519e2..24d574c 100644 --- a/ui/views/examples/animated_image_view_example.cc +++ b/ui/views/examples/animated_image_view_example.cc
@@ -122,10 +122,11 @@ private: void Update() { - if (size_ > 24) + if (size_ > 24) { animated_image_view_->SetImageSize(gfx::Size(size_, size_)); - else + } else { animated_image_view_->ResetImageSize(); + } InvalidateLayout(); }
diff --git a/ui/views/examples/animation_example.cc b/ui/views/examples/animation_example.cc index 8d1f195..b33daa6 100644 --- a/ui/views/examples/animation_example.cc +++ b/ui/views/examples/animation_example.cc
@@ -182,8 +182,9 @@ squares_container->layer()->SetFillsBoundsOpaquely(true); squares_container->SetLayoutManager(std::make_unique<SquaresLayoutManager>()); - for (size_t i = 0; i < 5; ++i) + for (size_t i = 0; i < 5; ++i) { squares_container->AddChildView(std::make_unique<AnimatingSquare>(i)); + } { gfx::RoundedCornersF rounded_corners(12.0f, 12.0f, 12.0f, 12.0f);
diff --git a/ui/views/examples/box_layout_example.cc b/ui/views/examples/box_layout_example.cc index 2b670e5..8516e234 100644 --- a/ui/views/examples/box_layout_example.cc +++ b/ui/views/examples/box_layout_example.cc
@@ -129,10 +129,11 @@ for (View* child : panel->children()) { const int flex = static_cast<ChildPanel*>(child)->GetFlex(); - if (flex < 0) + if (flex < 0) { layout_->ClearFlexForView(child); - else + } else { layout_->SetFlexForView(child, flex); + } } }
diff --git a/ui/views/examples/bubble_example.cc b/ui/views/examples/bubble_example.cc index a5120bc..68d650b 100644 --- a/ui/views/examples/bubble_example.cc +++ b/ui/views/examples/bubble_example.cc
@@ -132,10 +132,11 @@ static const int count = std::size(arrows); arrow_index = (arrow_index + count + (event.IsShiftDown() ? -1 : 1)) % count; BubbleBorder::Arrow arrow = arrows[arrow_index]; - if (event.IsControlDown()) + if (event.IsControlDown()) { arrow = BubbleBorder::NONE; - else if (event.IsAltDown()) + } else if (event.IsAltDown()) { arrow = BubbleBorder::FLOAT; + } auto* provider = (*button)->GetColorProvider(); // |bubble| will be destroyed by its widget when the widget is destroyed. @@ -143,8 +144,9 @@ bubble->set_color( provider->GetColor(colors[(color_index++) % std::size(colors)])); bubble->set_shadow(shadow); - if (persistent) + if (persistent) { bubble->set_close_on_deactivate(false); + } BubbleDialogDelegateView::CreateBubble(std::move(bubble))->Show();
diff --git a/ui/views/examples/button_example.cc b/ui/views/examples/button_example.cc index 7dfbe09..21d07d6 100644 --- a/ui/views/examples/button_example.cc +++ b/ui/views/examples/button_example.cc
@@ -262,10 +262,10 @@ PrintStatus(base::StringPrintf("Label Button Pressed! count: %d", ++count_)); if (event.IsControlDown()) { if (event.IsShiftDown()) { - label_button->SetText( - label_button->GetText().empty() - ? kLongText - : label_button->GetText().length() > 50 ? kLabelButton : u""); + label_button->SetText(label_button->GetText().empty() ? kLongText + : label_button->GetText().length() > 50 + ? kLabelButton + : u""); } else if (event.IsAltDown()) { label_button->SetImageModel( Button::STATE_NORMAL,
diff --git a/ui/views/examples/button_sticker_sheet.cc b/ui/views/examples/button_sticker_sheet.cc index cb929c2..a661cec 100644 --- a/ui/views/examples/button_sticker_sheet.cc +++ b/ui/views/examples/button_sticker_sheet.cc
@@ -29,8 +29,9 @@ auto* layout = host->SetLayoutManager(std::make_unique<views::TableLayout>()); for (int i = 0; i < ncols; ++i) { - if (i != 0) + if (i != 0) { layout->AddPaddingColumn(kPaddingResizesEqually, kPaddingWidth); + } layout->AddColumn(LayoutAlignment::kStretch, LayoutAlignment::kStretch, TableLayout::kFixedSize, TableLayout::ColumnSize::kFixed, kColumnWidth, kColumnWidth); @@ -48,8 +49,9 @@ const std::string& label_text, std::vector<std::unique_ptr<T>> views) { parent->AddChildView(MakePlainLabel(label_text)); - for (auto& view : views) + for (auto& view : views) { parent->AddChildView(std::move(view)); + } } // Constructs a pair of MdTextButtons in the specified |state| with the
diff --git a/ui/views/examples/create_examples.h b/ui/views/examples/create_examples.h index 4760303..b3fc913 100644 --- a/ui/views/examples/create_examples.h +++ b/ui/views/examples/create_examples.h
@@ -5,7 +5,6 @@ #ifndef UI_VIEWS_EXAMPLES_CREATE_EXAMPLES_H_ #define UI_VIEWS_EXAMPLES_CREATE_EXAMPLES_H_ - #include "ui/views/examples/example_base.h" #include "ui/views/examples/views_examples_export.h"
diff --git a/ui/views/examples/designer_example.cc b/ui/views/examples/designer_example.cc index 44f2feeb..e277b0f 100644 --- a/ui/views/examples/designer_example.cc +++ b/ui/views/examples/designer_example.cc
@@ -77,8 +77,9 @@ void DesignerSurface::SetGridSize(int grid_size) { if (grid_size_ != grid_size) { grid_size_ = grid_size; - if (GetWidget()) + if (GetWidget()) { RebuildGridImage(); + } } } @@ -278,8 +279,9 @@ bool IsViewParent(View* parent, View* view) { while (view) { - if (view == parent) + if (view == parent) { return true; + } view = view->parent(); } return false; @@ -313,8 +315,9 @@ void DesignerExample::GrabHandle::UpdatePosition(bool reorder) { if (GetVisible() && attached_view_) { PositionOnView(); - if (reorder) + if (reorder) { parent()->ReorderChildView(this, parent()->children().size()); + } } } @@ -378,21 +381,25 @@ gfx::Point edge_position; if (IsTop(position_)) { edge_position.set_y(view_bounds.y()); - if (position_ == GrabHandlePosition::kTop) + if (position_ == GrabHandlePosition::kTop) { edge_position.set_x(view_bounds.top_center().x()); + } } else if (IsBottom(position_)) { edge_position.set_y(view_bounds.bottom()); - if (position_ == GrabHandlePosition::kBottom) + if (position_ == GrabHandlePosition::kBottom) { edge_position.set_x(view_bounds.bottom_center().x()); + } } if (IsLeft(position_)) { edge_position.set_x(view_bounds.x()); - if (position_ == GrabHandlePosition::kLeft) + if (position_ == GrabHandlePosition::kLeft) { edge_position.set_y(view_bounds.left_center().y()); + } } else if (IsRight(position_)) { edge_position.set_x(view_bounds.right()); - if (position_ == GrabHandlePosition::kRight) + if (position_ == GrabHandlePosition::kRight) { edge_position.set_y(view_bounds.right_center().y()); + } } SetPosition(edge_position - (bounds().CenterPoint() - origin())); } @@ -406,15 +413,17 @@ (view_center.y() - view_bounds.y())); view_bounds.set_y(view_center.y()); } - if (IsBottom(position_)) + if (IsBottom(position_)) { view_bounds.set_height(view_center.y() - view_bounds.y()); + } if (IsLeft(position_)) { view_bounds.set_width(view_bounds.width() - (view_center.x() - view_bounds.x())); view_bounds.set_x(view_center.x()); } - if (IsRight(position_)) + if (IsRight(position_)) { view_bounds.set_width(view_center.x() - view_bounds.x()); + } attached_view_->SetBoundsRect(view_bounds); } @@ -462,8 +471,9 @@ } void DesignerExample::GrabHandles::SetAttachedView(View* view) { - for (GrabHandle* grab_handle : grab_handles_) + for (GrabHandle* grab_handle : grab_handles_) { grab_handle->SetAttachedView(view); + } } bool DesignerExample::GrabHandles::IsGrabHandle(View* view) { @@ -473,8 +483,9 @@ DesignerExample::DesignerExample() : ExampleBase("Designer") {} DesignerExample::~DesignerExample() { - if (tracker_.view()) + if (tracker_.view()) { inspector_->SetModel(nullptr); + } } void DesignerExample::CreateExampleView(View* container) { @@ -568,8 +579,9 @@ break; case ui::EventType::kMouseDragged: if (dragging_) { - if (grab_handles_.IsGrabHandle(dragging_)) + if (grab_handles_.IsGrabHandle(dragging_)) { return; + } gfx::Point new_position = selected_->origin() + SnapToGrid(mouse_event->location() - last_mouse_pos_); @@ -587,8 +599,9 @@ if (dragging_) { bool dragging_handle = grab_handles_.IsGrabHandle(dragging_); dragging_ = nullptr; - if (!dragging_handle) + if (!dragging_handle) { event->SetHandled(); + } return; } break; @@ -602,11 +615,13 @@ selected_ = view; selected_members_.clear(); if (selected_) { - for (auto* member : *selected_->GetClassMetaData()) + for (auto* member : *selected_->GetClassMetaData()) { selected_members_.push_back(member); + } } - if (model_observer_) + if (model_observer_) { model_observer_->OnModelChanged(); + } } } @@ -635,8 +650,9 @@ std::u16string DesignerExample::GetText(size_t row, int column_id) { if (selected_) { ui::metadata::MemberMetaDataBase* member = selected_members_[row]; - if (column_id == 0) + if (column_id == 0) { return base::ASCIIToUTF16(member->member_name()); + } return member->GetValueAsString(selected_); } return std::u16string();
diff --git a/ui/views/examples/dialog_example.cc b/ui/views/examples/dialog_example.cc index fc40432..e395e87 100644 --- a/ui/views/examples/dialog_example.cc +++ b/ui/views/examples/dialog_example.cc
@@ -228,15 +228,17 @@ Label** created_label, bool pad_last_col) { Label* row_label = parent->AddChildView(std::make_unique<Label>(label)); - if (created_label) + if (created_label) { *created_label = row_label; + } auto textfield = std::make_unique<Textfield>(); textfield->set_controller(this); textfield->SetText(value); textfield->GetViewAccessibility().SetName(*row_label); *member = parent->AddChildView(std::move(textfield)); - if (pad_last_col) + if (pad_last_col) { parent->AddChildView(std::make_unique<View>()); + } } void DialogExample::AddCheckbox(View* parent, @@ -247,8 +249,9 @@ auto checkbox = std::make_unique<Checkbox>( std::u16string(), base::BindRepeating(callback, base::Unretained(this))); checkbox->SetChecked(true); - if (label) + if (label) { checkbox->GetViewAccessibility().SetName(*label); + } *member = parent->AddChildView(std::move(checkbox)); } @@ -259,18 +262,21 @@ // other than changing modality on the fly like this. In fact, it should be // impossible to change modality in a live dialog at all, and this example // should stop doing it. - if (mode_->GetSelectedIndex() == kFakeModeless) + if (mode_->GetSelectedIndex() == kFakeModeless) { return ui::mojom::ModalType::kWindow; + } return static_cast<ui::mojom::ModalType>(mode_->GetSelectedIndex().value()); } int DialogExample::GetDialogButtons() const { int buttons = 0; - if (has_ok_button_->GetChecked()) + if (has_ok_button_->GetChecked()) { buttons |= static_cast<int>(ui::mojom::DialogButton::kOk); - if (has_cancel_button_->GetChecked()) + } + if (has_cancel_button_->GetChecked()) { buttons |= static_cast<int>(ui::mojom::DialogButton::kCancel); + } return buttons; } @@ -316,8 +322,9 @@ // constrained_window::CreateBrowserModalDialogViews() allows dialogs to // be created as MODAL_TYPE_WINDOW without specifying a parent. gfx::NativeView parent = gfx::NativeView(); - if (mode_->GetSelectedIndex() != kFakeModeless) + if (mode_->GetSelectedIndex() != kFakeModeless) { parent = example_view()->GetWidget()->GetNativeView(); + } DialogDelegate::CreateDialogWidget( dialog, example_view()->GetWidget()->GetNativeWindow(), parent); @@ -353,11 +360,13 @@ void DialogExample::ContentsChanged(Textfield* sender, const std::u16string& new_contents) { - if (!last_dialog_) + if (!last_dialog_) { return; + } - if (sender == extra_button_label_) + if (sender == extra_button_label_) { PrintStatus("DialogDelegate can never refresh the extra view."); + } if (sender == title_) { last_dialog_->GetWidget()->UpdateWindowTitle();
diff --git a/ui/views/examples/examples_main_proc.cc b/ui/views/examples/examples_main_proc.cc index 7789602..c3858f9 100644 --- a/ui/views/examples/examples_main_proc.cc +++ b/ui/views/examples/examples_main_proc.cc
@@ -94,8 +94,9 @@ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); - if (CheckCommandLineUsage()) + if (CheckCommandLineUsage()) { return ExamplesExitCode::kSucceeded; + } ui::AXPlatformForTest ax_platform; @@ -108,8 +109,9 @@ command_line->GetSwitchValueASCII(switches::kEnableFeatures), command_line->GetSwitchValueASCII(switches::kDisableFeatures)); - if (under_test) + if (under_test) { command_line->AppendSwitch(switches::kEnablePixelOutputInTests); + } #if BUILDFLAG(IS_OZONE) ui::OzonePlatform::InitParams params;
diff --git a/ui/views/examples/examples_skia_gold_pixel_diff.cc b/ui/views/examples/examples_skia_gold_pixel_diff.cc index 2f8801de..c45fcd6 100644 --- a/ui/views/examples/examples_skia_gold_pixel_diff.cc +++ b/ui/views/examples/examples_skia_gold_pixel_diff.cc
@@ -54,8 +54,9 @@ }, &screenshot_, run_loop.QuitClosure())); run_loop.Run(); - if (screenshot_.IsEmpty()) + if (screenshot_.IsEmpty()) { return ExamplesExitCode::kImageEmpty; + } return pixel_diff_->CompareScreenshot( ui::test::SkiaGoldPixelDiff::GetGoldenImageName( screenshot_prefix_, screenshot_name,
diff --git a/ui/views/examples/examples_themed_label.cc b/ui/views/examples/examples_themed_label.cc index 0e8b6b8a..8489f11 100644 --- a/ui/views/examples/examples_themed_label.cc +++ b/ui/views/examples/examples_themed_label.cc
@@ -19,8 +19,9 @@ void ThemedLabel::SetEnabledColorId( std::optional<ui::ColorId> enabled_color_id) { - if (enabled_color_id == enabled_color_id_) + if (enabled_color_id == enabled_color_id_) { return; + } enabled_color_id_ = enabled_color_id; OnPropertyChanged(&enabled_color_id_, kPropertyEffectsPaint); } @@ -28,8 +29,9 @@ // View: void ThemedLabel::OnThemeChanged() { Label::OnThemeChanged(); - if (enabled_color_id_) + if (enabled_color_id_) { SetEnabledColor(GetColorProvider()->GetColor(enabled_color_id_.value())); + } } BEGIN_METADATA(ThemedLabel)
diff --git a/ui/views/examples/examples_window.cc b/ui/views/examples/examples_window.cc index b7f90b9..474c060 100644 --- a/ui/views/examples/examples_window.cc +++ b/ui/views/examples/examples_window.cc
@@ -145,8 +145,9 @@ std::u16string GetWindowTitle() const override { return u"Views Examples"; } void WindowClosing() override { instance_ = nullptr; - if (on_close_) + if (on_close_) { std::move(on_close_).Run(); + } } gfx::Size CalculatePreferredSize( const SizeBounds& /*available_size*/) const override {
diff --git a/ui/views/examples/examples_with_content_main.cc b/ui/views/examples/examples_with_content_main.cc index c0577ac..a7512da 100644 --- a/ui/views/examples/examples_with_content_main.cc +++ b/ui/views/examples/examples_with_content_main.cc
@@ -74,8 +74,9 @@ ui::ViewsContentClient views_content_client(argc, argv); #endif - if (views::examples::CheckCommandLineUsage()) + if (views::examples::CheckCommandLineUsage()) { return 0; + } #if BUILDFLAG(IS_MAC) base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); @@ -87,8 +88,9 @@ sandbox::SeatbeltExecServer::CreateFromArguments( command_line->GetProgram().value().c_str(), argc, const_cast<char**>(argv)); - if (seatbelt.sandbox_required) + if (seatbelt.sandbox_required) { CHECK(seatbelt.server->InitializeSandbox()); + } #endif views_content_client.set_on_resources_loaded_callback(
diff --git a/ui/views/examples/flex_layout_example.cc b/ui/views/examples/flex_layout_example.cc index 8c905627..647d52f 100644 --- a/ui/views/examples/flex_layout_example.cc +++ b/ui/views/examples/flex_layout_example.cc
@@ -94,10 +94,11 @@ void FlexLayoutExample::UpdateLayoutManager() { for (View* child : layout_panel()->children()) { const int flex = static_cast<ChildPanel*>(child)->GetFlex(); - if (flex < 0) + if (flex < 0) { child->ClearProperty(views::kFlexBehaviorKey); - else + } else { child->SetProperty(views::kFlexBehaviorKey, GetFlexSpecification(flex)); + } } }
diff --git a/ui/views/examples/layout_example_base.cc b/ui/views/examples/layout_example_base.cc index 3152ec6..a2641854 100644 --- a/ui/views/examples/layout_example_base.cc +++ b/ui/views/examples/layout_example_base.cc
@@ -99,8 +99,9 @@ bool LayoutExampleBase::ChildPanel::OnMousePressed( const ui::MouseEvent& event) { - if (event.IsOnlyLeftMouseButton()) + if (event.IsOnlyLeftMouseButton()) { SetSelected(true); + } return true; } @@ -157,8 +158,9 @@ OnThemeChanged(); if (selected_ && parent()) { for (View* child : parent()->children()) { - if (child != this && child->GetGroup() == GetGroup()) + if (child != this && child->GetGroup() == GetGroup()) { static_cast<ChildPanel*>(child)->SetSelected(false); + } } } margin_.left->SetVisible(selected_); @@ -188,10 +190,11 @@ Textfield* sender, const std::u16string& new_contents) { const gfx::Insets margins = LayoutExampleBase::TextfieldsToInsets(margin_); - if (!margins.IsEmpty()) + if (!margins.IsEmpty()) { SetProperty(kMarginsKey, margins); - else + } else { ClearProperty(kMarginsKey); + } example_->RefreshLayoutPanel(sender == flex_); } @@ -218,8 +221,9 @@ } void LayoutExampleBase::RefreshLayoutPanel(bool update_layout) { - if (update_layout) + if (update_layout) { UpdateLayoutManager(); + } layout_panel_->InvalidateLayout(); layout_panel_->SchedulePaint(); } @@ -228,14 +232,18 @@ const InsetTextfields& textfields, const gfx::Insets& default_insets) { int top, left, bottom, right; - if (!base::StringToInt(textfields.top->GetText(), &top)) + if (!base::StringToInt(textfields.top->GetText(), &top)) { top = default_insets.top(); - if (!base::StringToInt(textfields.left->GetText(), &left)) + } + if (!base::StringToInt(textfields.left->GetText(), &left)) { left = default_insets.left(); - if (!base::StringToInt(textfields.bottom->GetText(), &bottom)) + } + if (!base::StringToInt(textfields.bottom->GetText(), &bottom)) { bottom = default_insets.bottom(); - if (!base::StringToInt(textfields.right->GetText(), &right)) + } + if (!base::StringToInt(textfields.right->GetText(), &right)) { right = default_insets.right(); + } return gfx::Insets::TLBR(std::max(0, top), std::max(0, left), std::max(0, bottom), std::max(0, right)); } @@ -353,12 +361,14 @@ gfx::Size LayoutExampleBase::GetNewChildPanelPreferredSize() { int width; - if (!base::StringToInt(preferred_width_view_->GetText(), &width)) + if (!base::StringToInt(preferred_width_view_->GetText(), &width)) { width = kLayoutExampleDefaultChildSize.width(); + } int height; - if (!base::StringToInt(preferred_height_view_->GetText(), &height)) + if (!base::StringToInt(preferred_height_view_->GetText(), &height)) { height = kLayoutExampleDefaultChildSize.height(); + } return gfx::Size(std::max(0, width), std::max(0, height)); }
diff --git a/ui/views/examples/menu_example.cc b/ui/views/examples/menu_example.cc index a8fe0e4..a9812c20 100644 --- a/ui/views/examples/menu_example.cc +++ b/ui/views/examples/menu_example.cc
@@ -124,12 +124,14 @@ bool ExampleMenuModel::IsCommandIdChecked(int command_id) const { // Radio items. - if (command_id == current_encoding_command_id_) + if (command_id == current_encoding_command_id_) { return true; + } // Check items. - if (checked_fruits_.find(command_id) != checked_fruits_.end()) + if (checked_fruits_.find(command_id) != checked_fruits_.end()) { return true; + } return false; } @@ -169,12 +171,13 @@ case COMMAND_CHECK_KIWI: { // Print what fruit is checked. const char* checked_fruit = ""; - if (command_id == COMMAND_CHECK_APPLE) + if (command_id == COMMAND_CHECK_APPLE) { checked_fruit = "Apple"; - else if (command_id == COMMAND_CHECK_ORANGE) + } else if (command_id == COMMAND_CHECK_ORANGE) { checked_fruit = "Orange"; - else if (command_id == COMMAND_CHECK_KIWI) + } else if (command_id == COMMAND_CHECK_KIWI) { checked_fruit = "Kiwi"; + } // Update the check status. auto iter = checked_fruits_.find(command_id); @@ -213,8 +216,9 @@ } ui::SimpleMenuModel* ExampleMenuButton::GetMenuModel() { - if (!menu_model_) + if (!menu_model_) { menu_model_ = std::make_unique<ExampleMenuModel>(); + } return menu_model_.get(); }
diff --git a/ui/views/examples/multiline_example.cc b/ui/views/examples/multiline_example.cc index 3da1cf86..37cbce7 100644 --- a/ui/views/examples/multiline_example.cc +++ b/ui/views/examples/multiline_example.cc
@@ -142,8 +142,9 @@ void UpdateColors() { const auto* cp = GetColorProvider(); - if (!cp) + if (!cp) { return; + } render_text_->SetColor( cp->GetColor(ExamplesColorIds::kColorMultilineExampleForeground)); render_text_->set_selection_color(cp->GetColor( @@ -230,8 +231,9 @@ void MultilineExample::ContentsChanged(Textfield* sender, const std::u16string& new_contents) { render_text_view_->SetText(new_contents); - if (label_checkbox_->GetChecked()) + if (label_checkbox_->GetChecked()) { label_->SetText(new_contents); + } example_view()->InvalidateLayout(); example_view()->SchedulePaint(); }
diff --git a/ui/views/examples/scroll_view_example.cc b/ui/views/examples/scroll_view_example.cc index 562a150..93f469b9 100644 --- a/ui/views/examples/scroll_view_example.cc +++ b/ui/views/examples/scroll_view_example.cc
@@ -66,8 +66,9 @@ std::pair<SkColor, SkColor> GetColors() const { auto* const cp = GetColorProvider(); - if (!cp) + if (!cp) { return {gfx::kPlaceholderColor, gfx::kPlaceholderColor}; + } return {cp->GetColor(from_color_id_), cp->GetColor(to_color_id_)}; } @@ -146,8 +147,9 @@ gfx::Rect(20, 500, 1000, 500)), GetStringUTF16(IDS_SCROLL_VIEW_SCROLL_TO_LABEL))); - for (View* child : button_panel->children()) + for (View* child : button_panel->children()) { child->SetProperty(views::kFlexBehaviorKey, full_flex); + } } void ScrollViewExample::ButtonPressed(gfx::Rect bounds,
diff --git a/ui/views/examples/tabbed_pane_example.cc b/ui/views/examples/tabbed_pane_example.cc index 72bc280..fc9c2f22 100644 --- a/ui/views/examples/tabbed_pane_example.cc +++ b/ui/views/examples/tabbed_pane_example.cc
@@ -63,8 +63,9 @@ const auto full_flex = FlexSpecification(MinimumFlexSizeRule::kScaleToZero, MaximumFlexSizeRule::kUnbounded) .WithWeight(1); - for (View* view : button_panel->children()) + for (View* view : button_panel->children()) { view->SetProperty(views::kFlexBehaviorKey, full_flex); + } CreateTabbedPane(container, TabbedPane::Orientation::kHorizontal, TabbedPane::TabStripStyle::kBorder); @@ -79,8 +80,9 @@ TabbedPane::Orientation orientation, TabbedPane::TabStripStyle style) { // Tabbed panes only support highlighted style for vertical tabs. - if (orientation == TabbedPane::Orientation::kHorizontal) + if (orientation == TabbedPane::Orientation::kHorizontal) { style = TabbedPane::TabStripStyle::kBorder; + } tabbed_pane_ = container->AddChildViewAt( std::make_unique<TabbedPane>(orientation, style), 0); @@ -139,8 +141,9 @@ } void TabbedPaneExample::SelectAt() { - if (tabbed_pane_->GetTabCount() > 1) + if (tabbed_pane_->GetTabCount() > 1) { tabbed_pane_->SelectTabAt(1); + } } } // namespace views::examples
diff --git a/ui/views/examples/text_example.cc b/ui/views/examples/text_example.cc index 2ad52b6..152a0fd 100644 --- a/ui/views/examples/text_example.cc +++ b/ui/views/examples/text_example.cc
@@ -37,10 +37,11 @@ // Toggles bit |flag| on |flags| based on state of |checkbox|. void SetFlagFromCheckbox(Checkbox* checkbox, int* flags, int flag) { - if (checkbox->GetChecked()) + if (checkbox->GetChecked()) { *flags |= flag; - else + } else { *flags &= ~flag; + } } } // namespace
diff --git a/ui/views/examples/textfield_example.cc b/ui/views/examples/textfield_example.cc index 7f2eece..11db2dfb 100644 --- a/ui/views/examples/textfield_example.cc +++ b/ui/views/examples/textfield_example.cc
@@ -185,14 +185,16 @@ } void TextfieldExample::SetStyleButtonPressed() { - if (name_->GetText().empty()) + if (name_->GetText().empty()) { return; + } auto* const cp = name_->GetColorProvider(); name_->SetColor(cp->GetColor(ExamplesColorIds::kColorTextfieldExampleName)); const size_t fifth = name_->GetText().length() / 5; - if (!fifth) + if (!fifth) { return; + } const gfx::Range big_range(1 * fifth, 4 * fifth); name_->ApplyStyle(gfx::TEXT_STYLE_UNDERLINE, true, big_range);
diff --git a/ui/views/examples/throbber_example.cc b/ui/views/examples/throbber_example.cc index ae9917b..000cd62 100644 --- a/ui/views/examples/throbber_example.cc +++ b/ui/views/examples/throbber_example.cc
@@ -62,13 +62,15 @@ } bool OnMousePressed(const ui::MouseEvent& event) override { - if (GetEventHandlerForPoint(event.location()) != throbber_) + if (GetEventHandlerForPoint(event.location()) != throbber_) { return false; + } - if (is_checked_) + if (is_checked_) { throbber_->Start(); - else + } else { throbber_->Stop(); + } throbber_->SetChecked(!is_checked_); is_checked_ = !is_checked_; return true;
diff --git a/ui/views/examples/tree_view_example.cc b/ui/views/examples/tree_view_example.cc index b160694d..040daff9 100644 --- a/ui/views/examples/tree_view_example.cc +++ b/ui/views/examples/tree_view_example.cc
@@ -32,8 +32,9 @@ std::u16string GetAuxiliaryTextForNode(views::TreeView* tree_view, ui::TreeModelNode* node) override { - if (tree_view->GetSelectedNode() == node) + if (tree_view->GetSelectedNode() == node) { return GetStringUTF16(IDS_TREE_VIEW_SELECTED_LABEL); + } return views::TreeViewDrawingProvider::GetAuxiliaryTextForNode(tree_view, node); } @@ -132,15 +133,17 @@ remove_ = button_panel->AddChildView(std::move(remove)); change_title_ = button_panel->AddChildView(std::move(change_title)); - for (View* view : button_panel->children()) + for (View* view : button_panel->children()) { view->SetProperty(views::kFlexBehaviorKey, full_flex); + } } void TreeViewExample::AddNewNode() { NodeType* selected_node = static_cast<NodeType*>(tree_view_->GetSelectedNode()); - if (!selected_node) + if (!selected_node) { selected_node = model_.GetRoot(); + } NodeType* new_node = model_.Add( selected_node, std::make_unique<NodeType>(selected_node->GetTitle(), 1)); tree_view_->SetSelectedNode(new_node);
diff --git a/ui/views/examples/vector_example.cc b/ui/views/examples/vector_example.cc index abd2258..d09b521f 100644 --- a/ui/views/examples/vector_example.cc +++ b/ui/views/examples/vector_example.cc
@@ -129,17 +129,19 @@ void ContentsChanged(Textfield* sender, const std::u16string& new_contents) override { if (sender == size_input_) { - if (base::StringToInt(new_contents, &size_) && (size_ > 0)) + if (base::StringToInt(new_contents, &size_) && (size_ > 0)) { Update(); - else + } else { size_input_->SetText(std::u16string()); + } return; } DCHECK_EQ(color_input_, sender); - if (new_contents.size() != 8u) + if (new_contents.size() != 8u) { return; + } unsigned new_color = strtoul(base::UTF16ToASCII(new_contents).c_str(), nullptr, 16); if (new_color <= 0xffffffff) {
diff --git a/ui/views/examples/widget_example.cc b/ui/views/examples/widget_example.cc index f0964f9..d6f935c5 100644 --- a/ui/views/examples/widget_example.cc +++ b/ui/views/examples/widget_example.cc
@@ -81,8 +81,9 @@ std::make_unique<Label>(GetStringUTF16(IDS_WIDGET_FOOTNOTE_LABEL))); dialog->AddChildView(std::make_unique<Label>( GetStringUTF16(IDS_WIDGET_DIALOG_CONTENTS_LABEL))); - if (modal) + if (modal) { dialog->SetModalType(ui::mojom::ModalType::kWindow); + } DialogDelegate::CreateDialogWidget(dialog.release(), nullptr, sender->GetWidget()->GetNativeView()) ->Show();
diff --git a/ui/views/focus/external_focus_tracker.cc b/ui/views/focus/external_focus_tracker.cc index 4e5234c..2a9cb7d7 100644 --- a/ui/views/focus/external_focus_tracker.cc +++ b/ui/views/focus/external_focus_tracker.cc
@@ -19,13 +19,15 @@ last_focused_view_tracker_(std::make_unique<ViewTracker>()) { DCHECK(parent_view); // Store the view which is focused when we're created. - if (focus_manager_) + if (focus_manager_) { StartTracking(); + } } ExternalFocusTracker::~ExternalFocusTracker() { - if (focus_manager_) + if (focus_manager_) { focus_manager_->RemoveFocusChangeListener(this); + } } void ExternalFocusTracker::OnWillChangeFocus(View* focused_before, @@ -42,16 +44,19 @@ void ExternalFocusTracker::FocusLastFocusedExternalView() { View* last_focused_view = last_focused_view_tracker_->view(); - if (last_focused_view) + if (last_focused_view) { last_focused_view->RequestFocus(); + } } void ExternalFocusTracker::SetFocusManager(FocusManager* focus_manager) { - if (focus_manager_) + if (focus_manager_) { focus_manager_->RemoveFocusChangeListener(this); + } focus_manager_ = focus_manager; - if (focus_manager_) + if (focus_manager_) { StartTracking(); + } } void ExternalFocusTracker::StoreLastFocusedView(View* view) { @@ -62,8 +67,9 @@ View* current_focused_view = focus_manager_->GetFocusedView(); // During focus restore events, it's possible for focus to already be within // the parent_view_. - if (!parent_view_->Contains(current_focused_view)) + if (!parent_view_->Contains(current_focused_view)) { StoreLastFocusedView(current_focused_view); + } focus_manager_->AddFocusChangeListener(this); }
diff --git a/ui/views/focus/focus_manager.cc b/ui/views/focus/focus_manager.cc index e37cd28..24ea3835d 100644 --- a/ui/views/focus/focus_manager.cc +++ b/ui/views/focus/focus_manager.cc
@@ -40,8 +40,9 @@ } FocusManager::~FocusManager() { - if (focused_view_) + if (focused_view_) { focused_view_->RemoveObserver(this); + } } bool FocusManager::OnKeyEvent(const ui::KeyEvent& event) { @@ -52,12 +53,13 @@ return false; } - if (shortcut_handling_suspended()) + if (shortcut_handling_suspended()) { return true; + } ui::Accelerator accelerator(event); - // If the focused view wants to process the key event as is, let it be. + // If the focused view wants to process the key event as is, let it be. if (focused_view_ && focused_view_->SkipDefaultKeyEventProcessing(event) && !accelerator_manager_.HasPriorityHandler(accelerator)) { return true; @@ -95,12 +97,13 @@ View::Views::const_iterator i = base::ranges::find(views, focused_view_); DCHECK(i != views.end()); auto index = static_cast<size_t>(i - views.begin()); - if (next && index == views.size() - 1) + if (next && index == views.size() - 1) { index = 0; - else if (!next && index == 0) + } else if (!next && index == 0) { index = views.size() - 1; - else + } else { index = next ? (index + 1) : (index - 1); + } SetFocusedViewWithReason(views[index], FocusChangeReason::kFocusTraversal); return false; @@ -137,8 +140,9 @@ v->AboutToRequestFocusFromTabTraversal(reverse); // AboutToRequestFocusFromTabTraversal() may have changed focus. If it did, // don't change focus again. - if (focused_view != focused_view_) + if (focused_view != focused_view_) { return; + } // Note that GetNextFocusableView may have returned a View in a different // FocusManager. @@ -150,8 +154,9 @@ // the top-level widget may report IsActive()==true because it's // active even though it isn't focused. Explicitly activate the // widget to ensure that case is handled. - if (v->GetWidget()->GetFocusManager() != this) + if (v->GetWidget()->GetFocusManager() != this) { v->GetWidget()->Activate(); + } } } @@ -218,8 +223,9 @@ // Traverse the FocusTraversable tree down to find the focusable view. View* v = FindFocusableView(focus_traversable, starting_view, reverse); - if (v) + if (v) { return v; + } // Let's go up in the FocusTraversable tree. FocusTraversable* parent_focus_traversable = @@ -247,8 +253,9 @@ v = FindFocusableView(new_focus_traversable, nullptr, reverse); } - if (v) + if (v) { return v; + } starting_view = focus_traversable->GetFocusTraversableParentView(); parent_focus_traversable = @@ -258,22 +265,25 @@ // If we get here, we have reached the end of the focus hierarchy, let's // loop. Make sure there was at least a view to start with, to prevent // infinitely looping in empty windows. - if (dont_loop || !original_starting_view) + if (dont_loop || !original_starting_view) { return nullptr; + } // Easy, just clear the selection and press tab again. // By calling with nullptr as the starting view, we'll start from either // the starting views widget or |widget_|. Widget* widget = starting_view ? starting_view->GetWidget() : original_starting_view->GetWidget(); - if (widget->widget_delegate()->focus_traverses_out()) + if (widget->widget_delegate()->focus_traverses_out()) { widget = widget_; + } return GetNextFocusableView(nullptr, widget, reverse, true); } void FocusManager::SetKeyboardAccessible(bool keyboard_accessible) { - if (keyboard_accessible == keyboard_accessible_) + if (keyboard_accessible == keyboard_accessible_) { return; + } keyboard_accessible_ = keyboard_accessible; // Disabling keyboard accessibility may cause the focused view to become not @@ -287,8 +297,9 @@ void FocusManager::SetFocusedViewWithReason(View* view, FocusChangeReason reason) { - if (focused_view_ == view) + if (focused_view_ == view) { return; + } // TODO(oshima|achuith): This is to diagnose crbug.com/687232. // Change this to DCHECK once it's resolved. @@ -343,8 +354,9 @@ void FocusManager::SetFocusedView(View* view) { FocusChangeReason reason = FocusChangeReason::kDirectFocusChange; - if (in_restoring_focused_view_) + if (in_restoring_focused_view_) { reason = FocusChangeReason::kFocusRestore; + } SetFocusedViewWithReason(view, reason); } @@ -361,15 +373,17 @@ void FocusManager::AdvanceFocusIfNecessary() { // If widget is inactive, there is no focused view to check. The stored view // will also be checked for focusability when it is being restored. - if (!widget_->IsActive()) + if (!widget_->IsActive()) { return; + } // If widget is active and focused view is not focusable, advance focus or, // if not possible, clear focus. if (focused_view_ && !IsFocusable(focused_view_)) { AdvanceFocus(false); - if (focused_view_ && !IsFocusable(focused_view_)) + if (focused_view_ && !IsFocusable(focused_view_)) { ClearFocus(); + } } } @@ -377,8 +391,9 @@ View* focused_view = focused_view_; // Don't do anything if no focused view. Storing the view (which is nullptr), // in this case, would clobber the view that was previously saved. - if (!focused_view_) + if (!focused_view_) { return; + } View* v = focused_view_; @@ -395,8 +410,9 @@ SetStoredFocusView(focused_view); } - if (v) + if (v) { v->SchedulePaint(); // Remove focus border. + } } bool FocusManager::RestoreFocusedView() { @@ -477,10 +493,12 @@ } bool FocusManager::ProcessAccelerator(const ui::Accelerator& accelerator) { - if (accelerator_manager_.Process(accelerator)) + if (accelerator_manager_.Process(accelerator)) { return true; - if (delegate_ && delegate_->ProcessAccelerator(accelerator)) + } + if (delegate_ && delegate_->ProcessAccelerator(accelerator)) { return true; + } #if BUILDFLAG(IS_MAC) // On MacOS accelerators are processed when a bubble is opened without @@ -514,8 +532,9 @@ // (and in turn ClearNativeFocus()) here because ViewRemoved() can // be called while the top level widget is being destroyed. DCHECK(removed); - if (removed->Contains(focused_view_)) + if (removed->Contains(focused_view_)) { SetFocusedView(nullptr); + } } void FocusManager::AddFocusChangeListener(FocusChangeListener* listener) { @@ -528,8 +547,9 @@ bool FocusManager::ProcessArrowKeyTraversal(const ui::KeyEvent& event) { if (event.IsShiftDown() || event.IsControlDown() || event.IsAltDown() || - event.IsAltGrDown()) + event.IsAltGrDown()) { return false; + } const ui::KeyboardCode key = event.key_code(); if (key != ui::VKEY_UP && key != ui::VKEY_DOWN && key != ui::VKEY_LEFT && @@ -566,19 +586,22 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWidget( const ui::Accelerator& accelerator) { - if (!widget_->widget_delegate()) + if (!widget_->widget_delegate()) { return false; + } views::BubbleDialogDelegate* widget_delegate = widget_->widget_delegate()->AsBubbleDialogDelegate(); Widget* anchor_widget = widget_delegate ? widget_delegate->anchor_widget() : nullptr; - if (!anchor_widget) + if (!anchor_widget) { return false; + } FocusManager* focus_manager = anchor_widget->GetFocusManager(); - if (!focus_manager->IsAcceleratorRegistered(accelerator)) + if (!focus_manager->IsAcceleratorRegistered(accelerator)) { return false; + } #if BUILDFLAG(IS_LINUX) // Processing an accelerator can delete things. Because we
diff --git a/ui/views/focus/focus_manager_factory.cc b/ui/views/focus/focus_manager_factory.cc index fd7d7ba5..867c02e 100644 --- a/ui/views/focus/focus_manager_factory.cc +++ b/ui/views/focus/focus_manager_factory.cc
@@ -36,15 +36,17 @@ // static std::unique_ptr<FocusManager> FocusManagerFactory::Create(Widget* widget) { - if (!g_focus_manager_factory) + if (!g_focus_manager_factory) { g_focus_manager_factory = new DefaultFocusManagerFactory(); + } return g_focus_manager_factory->CreateFocusManager(widget); } // static void FocusManagerFactory::Install(FocusManagerFactory* f) { - if (f == g_focus_manager_factory) + if (f == g_focus_manager_factory) { return; + } delete g_focus_manager_factory; g_focus_manager_factory = f ? f : new DefaultFocusManagerFactory(); }
diff --git a/ui/views/focus/focus_manager_unittest.cc b/ui/views/focus/focus_manager_unittest.cc index 54e5774..8104e77 100644 --- a/ui/views/focus/focus_manager_unittest.cc +++ b/ui/views/focus/focus_manager_unittest.cc
@@ -607,8 +607,9 @@ void SetUp() override { if (testing::UnitTest::GetInstance()->current_test_info()->value_param()) { is_rtl_ = GetParam(); - if (is_rtl_) + if (is_rtl_) { base::i18n::SetICUDefaultLocale("he"); + } } FocusManagerTest::SetUp();
diff --git a/ui/views/focus/focus_search.cc b/ui/views/focus/focus_search.cc index 457a014..51fd0bb 100644 --- a/ui/views/focus/focus_search.cc +++ b/ui/views/focus/focus_search.cc
@@ -40,8 +40,9 @@ View* initial_starting_view = starting_view; int starting_view_group = -1; - if (starting_view) + if (starting_view) { starting_view_group = starting_view->GetGroup(); + } if (!starting_view) { // Default to the first/last child @@ -76,8 +77,9 @@ } // Don't set the focus to something outside of this view hierarchy. - if (v && v != root_ && !Contains(root_, v)) + if (v && v != root_ && !Contains(root_, v)) { v = nullptr; + } // If we should go into a sub-FocusTraversable (such as an anchored bubble), a // null View is returned and |focus_traversable| is set appropriately. Handle @@ -119,19 +121,22 @@ DCHECK(!(accessibility_mode_ && root_->GetWidget()->GetFocusManager()->keyboard_accessible())); if (accessibility_mode_ || - root_->GetWidget()->GetFocusManager()->keyboard_accessible()) + root_->GetWidget()->GetFocusManager()->keyboard_accessible()) { return v && v->GetViewAccessibility().IsAccessibilityFocusable(); + } return v && v->IsFocusable(); } View* FocusSearch::FindSelectedViewForGroup(View* view) { if (view->IsGroupFocusTraversable() || - view->GetGroup() == -1) // No group for that view. + view->GetGroup() == -1) { // No group for that view. return view; + } View* selected_view = view->GetSelectedViewForGroup(view->GetGroup()); - if (selected_view) + if (selected_view) { return selected_view; + } // No view selected for that group, default to the specified view. return view; @@ -176,8 +181,9 @@ View* v = FindSelectedViewForGroup(starting_view); // The selected view might not be focusable (if it is disabled for // example). - if (IsFocusable(v)) + if (IsFocusable(v)) { return v; + } } *focus_traversable = starting_view->GetFocusTraversable(); @@ -197,8 +203,9 @@ view, StartingViewPolicy::kCheckStartingView, false, true, can_go_into_anchored_dialog, skip_group_id, seen_views, focus_traversable, focus_traversable_view); - if (v || *focus_traversable) + if (v || *focus_traversable) { return v; + } } // Check to see if we should navigate into a dialog anchored at this view. @@ -220,8 +227,9 @@ sibling, FocusSearch::StartingViewPolicy::kCheckStartingView, false, true, can_go_into_anchored_dialog, skip_group_id, seen_views, focus_traversable, focus_traversable_view); - if (v || *focus_traversable) + if (v || *focus_traversable) { return v; + } } // Then go up to the parent sibling. @@ -319,8 +327,9 @@ view, StartingViewPolicy::kCheckStartingView, false, true, can_go_into_anchored_dialog, skip_group_id, seen_views, focus_traversable, focus_traversable_view); - if (v || *focus_traversable) + if (v || *focus_traversable) { return v; + } } } @@ -331,8 +340,9 @@ View* v = FindSelectedViewForGroup(starting_view); // The selected view might not be focusable (if it is disabled for // example). - if (IsFocusable(v)) + if (IsFocusable(v)) { return v; + } } // Then try the left sibling. @@ -347,11 +357,12 @@ // Then go up the parent. if (can_go_up) { View* parent = GetParent(starting_view); - if (parent) + if (parent) { return FindPreviousFocusableViewImpl( parent, StartingViewPolicy::kCheckStartingView, true, false, can_go_into_anchored_dialog, skip_group_id, seen_views, focus_traversable, focus_traversable_view); + } } // We found nothing.
diff --git a/ui/views/focus/focus_traversal_unittest.cc b/ui/views/focus/focus_traversal_unittest.cc index 13a17de..4e4cbc5 100644 --- a/ui/views/focus/focus_traversal_unittest.cc +++ b/ui/views/focus/focus_traversal_unittest.cc
@@ -213,17 +213,21 @@ View* FindViewByID(int id) { View* view = GetContentsView()->GetViewByID(id); - if (view) + if (view) { return view; - if (style_tab_) + } + if (style_tab_) { view = style_tab_ ->GetTabContentsForTesting(style_tab_->GetSelectedTabIndex()) ->GetViewByID(id); - if (view) + } + if (view) { return view; + } view = search_border_view_->GetContentsRootView()->GetViewByID(id); - if (view) + if (view) { return view; + } return nullptr; } @@ -239,9 +243,10 @@ GetFocusManager()->AdvanceFocus(reverse); View* focused_view = GetFocusManager()->GetFocusedView(); EXPECT_NE(nullptr, focused_view); - if (focused_view) + if (focused_view) { EXPECT_EQ(traversal_ids[reverse ? traversal_ids.size() - j - 1 : j], focused_view->GetID()); + } } } } @@ -266,8 +271,9 @@ base::flat_set<View*> seen_views = {}) { std::vector<raw_ptr<View, VectorExperimental>> children_views = parent->children(); - if (children_views.empty()) + if (children_views.empty()) { return; + } View* first_child = children_views[0]; std::vector<raw_ptr<View, VectorExperimental>> children_in_focus_order; @@ -281,8 +287,9 @@ seen_views.insert(child); children_in_focus_order.push_back(child); - if (child != first_child) + if (child != first_child) { child->InsertBeforeInFocusList(first_child); + } ReverseChildrenFocusOrderImpl(child, seen_views); }
diff --git a/ui/views/input_event_activation_protector.cc b/ui/views/input_event_activation_protector.cc index f85a21d1..d20cdc8 100644 --- a/ui/views/input_event_activation_protector.cc +++ b/ui/views/input_event_activation_protector.cc
@@ -20,8 +20,9 @@ } void InputEventActivationProtector::VisibilityChanged(bool is_visible) { - if (is_visible) + if (is_visible) { view_protected_time_stamp_ = base::TimeTicks::Now(); + } } void InputEventActivationProtector::MaybeUpdateViewProtectedTimeStamp(
diff --git a/ui/views/interaction/element_tracker_views.cc b/ui/views/interaction/element_tracker_views.cc index ea68d96..87bda0a 100644 --- a/ui/views/interaction/element_tracker_views.cc +++ b/ui/views/interaction/element_tracker_views.cc
@@ -59,8 +59,9 @@ ~ElementDataViews() override = default; void AddView(View* view) { - if (base::Contains(view_data_lookup_, view)) + if (base::Contains(view_data_lookup_, view)) { return; + } const auto it = view_data_.insert(view_data_.end(), ViewData(view, GetContextForView(view))); @@ -72,8 +73,9 @@ void RemoveView(View* view) { const auto it = view_data_lookup_.find(view); - if (it == view_data_lookup_.end()) + if (it == view_data_lookup_.end()) { return; + } if (it->second->visible()) { ui::ElementTracker::GetFrameworkDelegate()->NotifyElementHidden( it->second->element.get()); @@ -81,8 +83,9 @@ view_observer_.RemoveObservation(view); view_data_.erase(it->second); view_data_lookup_.erase(it); - if (view_data_.empty()) + if (view_data_.empty()) { tracker_->element_data_.erase(id_); + } } TrackedElementViews* GetElementForView(View* view) { @@ -118,8 +121,9 @@ View* FindFirstViewInContext(ui::ElementContext context) { for (const ViewData& data : view_data_) { - if (data.context == context) + if (data.context == context) { return data.view; + } } return nullptr; } @@ -127,8 +131,9 @@ ViewList FindAllViewsInContext(ui::ElementContext context) { ViewList result; for (const ViewData& data : view_data_) { - if (data.context == context) + if (data.context == context) { result.push_back(data.view); + } } return result; } @@ -180,11 +185,13 @@ // hierarchy and widget into account. bool IsViewVisibleToUser(View* view) { const Widget* const widget = view->GetWidget(); - if (!widget || widget->IsClosed() || !tracker_->IsWidgetVisible(widget)) + if (!widget || widget->IsClosed() || !tracker_->IsWidgetVisible(widget)) { return false; + } for (; view; view = view->parent()) { - if (!view->GetVisible()) + if (!view->GetVisible()) { return false; + } } return true; } @@ -331,8 +338,9 @@ bool assign_temporary_id) { ui::ElementIdentifier identifier = view->GetProperty(kElementIdentifierKey); if (!identifier) { - if (!assign_temporary_id) + if (!assign_temporary_id) { return nullptr; + } // We shouldn't be assigning temporary IDs to views which are not yet on // widgets (how did we even get a reference to the view?) @@ -368,8 +376,9 @@ View* ElementTrackerViews::GetFirstMatchingView(ui::ElementIdentifier id, ui::ElementContext context) { const auto it = element_data_.find(id); - if (it == element_data_.end()) + if (it == element_data_.end()) { return nullptr; + } return it->second.FindFirstViewInContext(context); } @@ -377,24 +386,27 @@ ui::ElementIdentifier id, ui::ElementContext context) { const auto it = element_data_.find(id); - if (it == element_data_.end()) + if (it == element_data_.end()) { return ViewList(); + } return it->second.FindAllViewsInContext(context); } ElementTrackerViews::ViewList ElementTrackerViews::GetAllMatchingViewsInAnyContext(ui::ElementIdentifier id) { const auto it = element_data_.find(id); - if (it == element_data_.end()) + if (it == element_data_.end()) { return ViewList(); + } return it->second.GetAllViews(); } Widget* ElementTrackerViews::GetWidgetForContext(ui::ElementContext context) { for (auto& [id, data] : element_data_) { auto* const view = data.FindFirstViewInContext(context); - if (view) + if (view) { return view->GetWidget(); + } } return nullptr; } @@ -403,8 +415,9 @@ ui::CustomElementEventType event_type, View* view) { auto* const element = GetElementForView(view, /* assign_temporary_id =*/true); - if (!element) + if (!element) { return false; + } ui::ElementTracker::GetFrameworkDelegate()->NotifyCustomEvent(element, event_type); return true; @@ -441,14 +454,16 @@ } void ElementTrackerViews::MaybeTrackWidget(Widget* widget) { - if (!widget || widget->IsVisible()) + if (!widget || widget->IsVisible()) { return; + } widget_trackers_.try_emplace(widget, this, widget); } bool ElementTrackerViews::IsWidgetVisible(const Widget* widget) const { - if (widget->IsVisible()) + if (widget->IsVisible()) { return true; + } const auto it = widget_trackers_.find(widget); return it != widget_trackers_.end() && it->second.visible();
diff --git a/ui/views/interaction/element_tracker_views.h b/ui/views/interaction/element_tracker_views.h index a039848..693b2e39 100644 --- a/ui/views/interaction/element_tracker_views.h +++ b/ui/views/interaction/element_tracker_views.h
@@ -194,8 +194,9 @@ T* ElementTrackerViews::GetUniqueViewAs(ui::ElementIdentifier id, ui::ElementContext context) { views::View* const view = GetUniqueView(id, context); - if (!view) + if (!view) { return nullptr; + } T* const result = views::AsViewClass<T>(view); DCHECK(result); return result; @@ -205,8 +206,9 @@ T* ElementTrackerViews::GetFirstMatchingViewAs(ui::ElementIdentifier id, ui::ElementContext context) { views::View* const view = GetFirstMatchingView(id, context); - if (!view) + if (!view) { return nullptr; + } T* const result = views::AsViewClass<T>(view); DCHECK(result); return result;
diff --git a/ui/views/interaction/element_tracker_views_unittest.cc b/ui/views/interaction/element_tracker_views_unittest.cc index 0081aa6f..97b42670 100644 --- a/ui/views/interaction/element_tracker_views_unittest.cc +++ b/ui/views/interaction/element_tracker_views_unittest.cc
@@ -95,8 +95,9 @@ private: void OnEvent(ui::TrackedElement* element) { - if (event_type_ != ElementEventType::kCustom) + if (event_type_ != ElementEventType::kCustom) { EXPECT_EQ(id_, element->identifier()); + } last_view_ = ElementToView(element); ++event_count_; }
diff --git a/ui/views/interaction/interaction_sequence_views.cc b/ui/views/interaction/interaction_sequence_views.cc index 2c40c37..191bc25 100644 --- a/ui/views/interaction/interaction_sequence_views.cc +++ b/ui/views/interaction/interaction_sequence_views.cc
@@ -26,9 +26,10 @@ // key off of that element. auto* const element = ElementTrackerViews::GetInstance()->GetElementForView(view); - if (element) + if (element) { return ui::InteractionSequence::WithInitialElement( element, std::move(start_callback), std::move(end_callback)); + } // Otherwise, use the element's identifier and context. ui::ElementContext context = ElementTrackerViews::GetContextForView(view);
diff --git a/ui/views/interaction/interaction_test_util_mouse.cc b/ui/views/interaction/interaction_test_util_mouse.cc index 69bfdbeae..cb8f2bf 100644 --- a/ui/views/interaction/interaction_test_util_mouse.cc +++ b/ui/views/interaction/interaction_test_util_mouse.cc
@@ -398,8 +398,9 @@ base::AutoReset<bool> performing_gestures(&performing_gestures_, true); canceled_ = false; for (auto& gesture : gestures) { - if (canceled_) + if (canceled_) { break; + } bool force_async = false; #if BUILDFLAG(IS_MAC) @@ -550,8 +551,9 @@ // static void InteractionTestUtilMouse::AddGestures(MouseGestures& gestures, MouseGestures to_add) { - for (auto& gesture : to_add) + for (auto& gesture : to_add) { gestures.emplace_back(std::move(gesture)); + } } } // namespace views::test
diff --git a/ui/views/interaction/interaction_test_util_views.cc b/ui/views/interaction/interaction_test_util_views.cc index 5723688..1699337 100644 --- a/ui/views/interaction/interaction_test_util_views.cc +++ b/ui/views/interaction/interaction_test_util_views.cc
@@ -242,8 +242,9 @@ for (views::View* child : from->children()) { auto* const item = AsViewClass<MenuItemView>(child); if (item) { - if (index == 0U) + if (index == 0U) { return item; + } --index; } else if (auto* result = FindMenuItem(child, index)) { return result; @@ -314,8 +315,9 @@ // Verify that the button is not destroyed after the key-down before trying // to send the key-up. - if (!tracker.view()) + if (!tracker.view()) { return false; + } tracker.view()->OnKeyReleased(ui::KeyEvent(ui::EventType::kKeyReleased, code, flags, ui::EventTimeForNow())); @@ -333,12 +335,14 @@ ui::test::ActionResult InteractionTestUtilSimulatorViews::PressButton( ui::TrackedElement* element, InputType input_type) { - if (!element->IsA<TrackedElementViews>()) + if (!element->IsA<TrackedElementViews>()) { return ui::test::ActionResult::kNotAttempted; + } auto* const button = Button::AsButton(element->AsA<TrackedElementViews>()->view()); - if (!button) + if (!button) { return ui::test::ActionResult::kNotAttempted; + } PressButton(button, input_type); return ui::test::ActionResult::kSucceeded; @@ -347,18 +351,21 @@ ui::test::ActionResult InteractionTestUtilSimulatorViews::SelectMenuItem( ui::TrackedElement* element, InputType input_type) { - if (!element->IsA<TrackedElementViews>()) + if (!element->IsA<TrackedElementViews>()) { return ui::test::ActionResult::kNotAttempted; + } auto* const menu_item = AsViewClass<MenuItemView>(element->AsA<TrackedElementViews>()->view()); - if (!menu_item) + if (!menu_item) { return ui::test::ActionResult::kNotAttempted; + } #if BUILDFLAG(IS_MAC) // Keyboard input isn't reliable on Mac for submenus, so unless the test // specifically calls for keyboard input, prefer mouse. - if (input_type == ui::test::InteractionTestUtil::InputType::kDontCare) + if (input_type == ui::test::InteractionTestUtil::InputType::kDontCare) { input_type = ui::test::InteractionTestUtil::InputType::kMouse; + } #endif // BUILDFLAG(IS_MAC) auto* const host = menu_item->GetWidget()->GetRootView(); @@ -394,8 +401,9 @@ ui::test::ActionResult InteractionTestUtilSimulatorViews::DoDefaultAction( ui::TrackedElement* element, InputType input_type) { - if (!element->IsA<TrackedElementViews>()) + if (!element->IsA<TrackedElementViews>()) { return ui::test::ActionResult::kNotAttempted; + } if (!DoDefaultAction(element->AsA<TrackedElementViews>()->view(), input_type)) { LOG(ERROR) << "Failed to send default action to " << *element; @@ -412,12 +420,14 @@ // collections (e.g. browsers and tabstrips) may be supported by a different // kind of simulator specific to browser code, so if this is not a supported // View type, just return false instead of sending an error. - if (!tab_collection->IsA<TrackedElementViews>()) + if (!tab_collection->IsA<TrackedElementViews>()) { return ui::test::ActionResult::kNotAttempted; + } auto* const pane = views::AsViewClass<TabbedPane>( tab_collection->AsA<TrackedElementViews>()->view()); - if (!pane) + if (!pane) { return ui::test::ActionResult::kNotAttempted; + } // Unlike with the element type, an out-of-bounds tab is always an error. auto* const tab = pane->GetTabAt(index); @@ -473,13 +483,15 @@ ui::TrackedElement* dropdown, size_t index, InputType input_type) { - if (!dropdown->IsA<TrackedElementViews>()) + if (!dropdown->IsA<TrackedElementViews>()) { return ui::test::ActionResult::kNotAttempted; + } auto* const view = dropdown->AsA<TrackedElementViews>()->view(); auto* const combobox = views::AsViewClass<Combobox>(view); auto* const editable_combobox = views::AsViewClass<EditableCombobox>(view); - if (!combobox && !editable_combobox) + if (!combobox && !editable_combobox) { return ui::test::ActionResult::kNotAttempted; + } auto* const model = combobox ? combobox->GetModel() : editable_combobox->GetComboboxModel(); if (index >= model->GetItemCount()) { @@ -510,8 +522,9 @@ // This is required in case we want to repeatedly test a combobox; otherwise // it will refuse to open the second time. - if (combobox) + if (combobox) { combobox->closed_time_ = base::TimeTicks(); + } // The highest-fidelity input simulation involves actually opening the // drop-down and selecting an item from the list. @@ -553,15 +566,17 @@ ui::TrackedElement* element, std::u16string text, TextEntryMode mode) { - if (!element->IsA<TrackedElementViews>()) + if (!element->IsA<TrackedElementViews>()) { return ui::test::ActionResult::kNotAttempted; + } auto* const view = element->AsA<TrackedElementViews>()->view(); // Currently, Textfields (and derived types like Textareas) are supported, as // well as EditableCombobox. Textfield* textfield = AsViewClass<Textfield>(view); - if (!textfield && IsViewClass<EditableCombobox>(view)) + if (!textfield && IsViewClass<EditableCombobox>(view)) { textfield = AsViewClass<EditableCombobox>(view)->textfield_; + } if (!textfield) { return ui::test::ActionResult::kNotAttempted; @@ -605,8 +620,9 @@ ui::test::ActionResult InteractionTestUtilSimulatorViews::ActivateSurface( ui::TrackedElement* element) { - if (!element->IsA<TrackedElementViews>()) + if (!element->IsA<TrackedElementViews>()) { return ui::test::ActionResult::kNotAttempted; + } auto* const widget = element->AsA<TrackedElementViews>()->view()->GetWidget(); if (!widget) { @@ -620,8 +636,9 @@ ui::test::ActionResult InteractionTestUtilSimulatorViews::SendAccelerator( ui::TrackedElement* element, ui::Accelerator accelerator) { - if (!element->IsA<TrackedElementViews>()) + if (!element->IsA<TrackedElementViews>()) { return ui::test::ActionResult::kNotAttempted; + } element->AsA<TrackedElementViews>() ->view() @@ -632,8 +649,9 @@ ui::test::ActionResult InteractionTestUtilSimulatorViews::Confirm( ui::TrackedElement* element) { - if (!element->IsA<TrackedElementViews>()) + if (!element->IsA<TrackedElementViews>()) { return ui::test::ActionResult::kNotAttempted; + } auto* const view = element->AsA<TrackedElementViews>()->view(); // Currently, only dialogs can be confirmed. Fetch the delegate and call @@ -645,8 +663,9 @@ delegate = bubble->AsDialogDelegate(); } - if (!delegate) + if (!delegate) { return ui::test::ActionResult::kNotAttempted; + } if (!delegate->GetOkButton()) { LOG(ERROR) << "Confirm(): cannot confirm dialog that has no OK button.";
diff --git a/ui/views/interaction/interaction_test_util_views.h b/ui/views/interaction/interaction_test_util_views.h index fcbfa67..eaa4e4d1 100644 --- a/ui/views/interaction/interaction_test_util_views.h +++ b/ui/views/interaction/interaction_test_util_views.h
@@ -6,6 +6,7 @@ #define UI_VIEWS_INTERACTION_INTERACTION_TEST_UTIL_VIEWS_H_ #include <string> + #include "ui/base/interaction/element_tracker.h" #include "ui/base/interaction/interaction_test_util.h" @@ -17,7 +18,7 @@ class Button; class View; class Widget; -} +} // namespace views namespace views::test {
diff --git a/ui/views/interaction/interaction_test_util_views_unittest.cc b/ui/views/interaction/interaction_test_util_views_unittest.cc index adedfe1..3f25dc7 100644 --- a/ui/views/interaction/interaction_test_util_views_unittest.cc +++ b/ui/views/interaction/interaction_test_util_views_unittest.cc
@@ -198,8 +198,9 @@ void TearDown() override { test_util_.reset(); - if (menu_runner_) + if (menu_runner_) { CloseMenu(); + } contents_ = nullptr; widget_.reset(); ViewsTestBase::TearDown(); @@ -312,8 +313,9 @@ TEST_P(InteractionTestUtilViewsTest, SelectDropdownItem_Combobox) { #if BUILDFLAG(IS_MAC) // Only kDontCare is supported on Mac. - if (GetParam() != ui::test::InteractionTestUtil::InputType::kDontCare) + if (GetParam() != ui::test::InteractionTestUtil::InputType::kDontCare) { GTEST_SKIP(); + } #endif auto* const box = contents_->AddChildView( @@ -336,8 +338,9 @@ TEST_P(InteractionTestUtilViewsTest, SelectDropdownItem_EditableCombobox) { #if BUILDFLAG(IS_MAC) // Only kDontCare is supported on Mac. - if (GetParam() != ui::test::InteractionTestUtil::InputType::kDontCare) + if (GetParam() != ui::test::InteractionTestUtil::InputType::kDontCare) { GTEST_SKIP(); + } #endif auto* const box = contents_->AddChildView( @@ -360,8 +363,9 @@ TEST_P(InteractionTestUtilViewsTest, SelectDropdownItem_Combobox_NoArrow) { #if BUILDFLAG(IS_MAC) // Only kDontCare is supported on Mac. - if (GetParam() != ui::test::InteractionTestUtil::InputType::kDontCare) + if (GetParam() != ui::test::InteractionTestUtil::InputType::kDontCare) { GTEST_SKIP(); + } #endif auto* const box = contents_->AddChildView( @@ -386,8 +390,9 @@ SelectDropdownItem_EditableCombobox_NoArrow) { #if BUILDFLAG(IS_MAC) // Only kDontCare is supported on Mac. - if (GetParam() != ui::test::InteractionTestUtil::InputType::kDontCare) + if (GetParam() != ui::test::InteractionTestUtil::InputType::kDontCare) { GTEST_SKIP(); + } #endif // These cases are not supported for editable combobox without an arrow
diff --git a/ui/views/interaction/interactive_views_test.cc b/ui/views/interaction/interactive_views_test.cc index da402ad..8265562 100644 --- a/ui/views/interaction/interactive_views_test.cc +++ b/ui/views/interaction/interactive_views_test.cc
@@ -292,12 +292,14 @@ ViewMatcher& matcher, bool recursive) { for (views::View* const child : from->children()) { - if (matcher.Run(child)) + if (matcher.Run(child)) { return child; + } if (recursive) { auto* const result = FindMatchingView(child, matcher, true); - if (result) + if (result) { return result; + } } } return nullptr;
diff --git a/ui/views/interaction/interactive_views_test_internal.cc b/ui/views/interaction/interactive_views_test_internal.cc index e402e4b..39a208f 100644 --- a/ui/views/interaction/interactive_views_test_internal.cc +++ b/ui/views/interaction/interactive_views_test_internal.cc
@@ -250,8 +250,9 @@ } void SetWindow(gfx::NativeWindow window) { - if (window_ == window) + if (window_ == window) { return; + } window_ = window; tracker_ = window ? views::NativeWindowTracker::Create(window) : nullptr; } @@ -303,8 +304,9 @@ // If not, see if the window can be extracted from the context (perhaps via // the cache). - if (!window) + if (!window) { window = GetNativeWindowFromContext(el->context()); + } // If a window was found, then a cache entry may need to be inserted/updated. if (window) { @@ -327,11 +329,13 @@ window = widget->GetNativeWindow(); // Most of those that don't are sub-widgets that are hard-parented to // another widget. - if (!window && widget->parent()) + if (!window && widget->parent()) { window = widget->parent()->GetNativeWindow(); + } // At worst case, fall back to the primary window. - if (!window) + if (!window) { window = widget->GetPrimaryWindowWidget()->GetNativeWindow(); + } } return window; }
diff --git a/ui/views/interaction/interactive_views_test_internal.h b/ui/views/interaction/interactive_views_test_internal.h index 5e4c69e..f8f4ee8d 100644 --- a/ui/views/interaction/interactive_views_test_internal.h +++ b/ui/views/interaction/interactive_views_test_internal.h
@@ -30,7 +30,7 @@ namespace views { class NativeWindowTracker; class View; -} +} // namespace views namespace views::test {
diff --git a/ui/views/layout/animating_layout_manager.cc b/ui/views/layout/animating_layout_manager.cc index 4deb472c..dade389 100644 --- a/ui/views/layout/animating_layout_manager.cc +++ b/ui/views/layout/animating_layout_manager.cc
@@ -37,14 +37,16 @@ // nullptr if not found. const ChildLayout* FindChildViewInLayout(const ProposedLayout& layout, const View* view) { - if (!view) + if (!view) { return nullptr; + } // The number of children should be small enough that this is more efficient // than caching a lookup set. for (auto& child_layout : layout.child_layouts) { - if (child_layout.child_view == view) + if (child_layout.child_view == view) { return &child_layout; + } } return nullptr; } @@ -189,10 +191,11 @@ animation_->SetContainer(container_); View* const host_view = layout_manager->host_view(); DCHECK(host_view); - if (host_view->GetWidget()) + if (host_view->GetWidget()) { MakeReadyForAnimation(); - else + } else { scoped_observation_.Observe(host_view); + } UpdateAnimationParameters(); } @@ -251,8 +254,9 @@ } void AnimatingLayoutManager::AnimationDelegate::Reset() { - if (!ready_to_animate_) + if (!ready_to_animate_) { return; + } base::AutoReset<bool> setter(&resetting_animation_, true); animation_->Reset(); if (fade_in_opacity_animation_.get()) { @@ -291,8 +295,9 @@ void AnimatingLayoutManager::AnimationDelegate::AnimationEnded( const gfx::Animation* animation) { - if (resetting_animation_) + if (resetting_animation_) { return; + } DCHECK(animation_.get() == animation); target_layout_manager_->AnimateTo(1.0, 1.0, 0.0); } @@ -315,16 +320,18 @@ base::TimeDelta animation_duration) { DCHECK_GE(animation_duration, base::TimeDelta()); animation_duration_ = animation_duration; - if (animation_delegate_) + if (animation_delegate_) { animation_delegate_->UpdateAnimationParameters(); + } return *this; } AnimatingLayoutManager& AnimatingLayoutManager::SetTweenType( gfx::Tween::Type tween_type) { tween_type_ = tween_type; - if (animation_delegate_) + if (animation_delegate_) { animation_delegate_->UpdateAnimationParameters(); + } return *this; } @@ -363,8 +370,9 @@ } void AnimatingLayoutManager::ResetLayout() { - if (!target_layout_manager()) + if (!target_layout_manager()) { return; + } ResetLayoutToTargetSize(); InvalidateHost(false); } @@ -395,8 +403,10 @@ // view immediately. const ChildLayout* const current_layout = FindChildViewInLayout(current_layout_, child_view); - if ((!current_layout || !current_layout->visible) && child_view->GetVisible()) + if ((!current_layout || !current_layout->visible) && + child_view->GetVisible()) { SetViewVisibility(child_view, false); + } // Indicate that the view should become hidden in the layout without // immediately changing its visibility. Instead, this triggers an animation @@ -437,13 +447,15 @@ } void AnimatingLayoutManager::AddObserver(Observer* observer) { - if (!observers_.HasObserver(observer)) + if (!observers_.HasObserver(observer)) { observers_.AddObserver(observer); + } } void AnimatingLayoutManager::RemoveObserver(Observer* observer) { - if (observers_.HasObserver(observer)) + if (observers_.HasObserver(observer)) { observers_.RemoveObserver(observer); + } } bool AnimatingLayoutManager::HasObserver(Observer* observer) const { @@ -451,13 +463,15 @@ } gfx::Size AnimatingLayoutManager::GetPreferredSize(const View* host) const { - if (!target_layout_manager()) + if (!target_layout_manager()) { return gfx::Size(); + } // If animation is disabled, preferred size does not change with current // animation state. - if (!gfx::Animation::ShouldRenderRichAnimation()) + if (!gfx::Animation::ShouldRenderRichAnimation()) { return target_layout_manager()->GetPreferredSize(host); + } switch (bounds_animation_mode_) { case BoundsAnimationMode::kUseHostBounds: @@ -507,8 +521,9 @@ } gfx::Size AnimatingLayoutManager::GetMinimumSize(const View* host) const { - if (!target_layout_manager()) + if (!target_layout_manager()) { return gfx::Size(); + } // TODO(dfried): consider cases where the minimum size might not be just the // minimum size of the embedded layout. gfx::Size minimum_size = target_layout_manager()->GetMinimumSize(host); @@ -531,8 +546,9 @@ int AnimatingLayoutManager::GetPreferredHeightForWidth(const View* host, int width) const { - if (!target_layout_manager()) + if (!target_layout_manager()) { return 0; + } // TODO(dfried): revisit this computation. if (bounds_animation_mode_ == BoundsAnimationMode::kAnimateBothAxes || @@ -547,8 +563,9 @@ AnimatingLayoutManager::GetChildViewsInPaintOrder(const View* host) const { DCHECK_EQ(host_view(), host); - if (!is_animating()) + if (!is_animating()) { return LayoutManagerBase::GetChildViewsInPaintOrder(host); + } std::vector<raw_ptr<View, VectorExperimental>> result; std::set<View*> fading; @@ -561,8 +578,9 @@ // Add the result of the views. for (View* child : host->children()) { - if (!base::Contains(fading, child)) + if (!base::Contains(fading, child)) { result.push_back(child); + } } return result; @@ -597,8 +615,9 @@ void AnimatingLayoutManager::PostOrQueueAction(base::OnceClosure action) { queued_actions_.push_back(std::move(action)); - if (!is_animating() && !hold_queued_actions_for_layout_) + if (!is_animating() && !hold_queued_actions_for_layout_) { PostQueuedActions(); + } } FlexRule AnimatingLayoutManager::GetDefaultFlexRule() const { @@ -708,8 +727,9 @@ // Send animating stopped events on layout so the current layout during the // event represents the final state instead of an intermediate state. - if (is_animating_ && current_offset_ == 1.0) + if (is_animating_ && current_offset_ == 1.0) { EndAnimation(); + } if (hold_queued_actions_for_layout_ && !is_animating_) { hold_queued_actions_for_layout_ = false; @@ -728,8 +748,9 @@ } fade_infos_.clear(); hold_queued_actions_for_layout_ = true; - if (std::exchange(is_animating_, false)) + if (std::exchange(is_animating_, false)) { NotifyIsAnimatingChanged(); + } } void AnimatingLayoutManager::ResetLayoutToTargetSize() { @@ -737,8 +758,9 @@ } void AnimatingLayoutManager::ResetLayoutToSize(const gfx::Size& target_size) { - if (animation_delegate_) + if (animation_delegate_) { animation_delegate_->Reset(); + } ResolveFades(); @@ -753,8 +775,9 @@ bool AnimatingLayoutManager::RecalculateTarget() { constexpr double kResetAnimationThreshold = 0.8; - if (!target_layout_manager()) + if (!target_layout_manager()) { return false; + } if (!cached_layout_size() || !animation_delegate_ || !animation_delegate_->ready_to_animate()) { @@ -770,8 +793,9 @@ const ProposedLayout proposed_layout = target_layout_manager()->GetProposedLayout(target_size); - if (target_layout_ == proposed_layout) + if (target_layout_ == proposed_layout) { return false; + } target_layout_ = proposed_layout; if (current_offset_ > kResetAnimationThreshold) { @@ -817,8 +841,9 @@ DCHECK_LE(value, 1.0); DCHECK_GE(value, starting_offset_); DCHECK_GE(value, current_offset_); - if (current_offset_ == value) + if (current_offset_ == value) { return; + } current_offset_ = value; const double percent = (current_offset_ - starting_offset_) / (1.0 - starting_offset_); @@ -834,21 +859,24 @@ void AnimatingLayoutManager::RunQueuedActions() { run_queued_actions_is_pending_ = false; std::vector<base::OnceClosure> actions = std::move(queued_actions_to_run_); - for (auto& action : actions) + for (auto& action : actions) { std::move(action).Run(); + } } void AnimatingLayoutManager::PostQueuedActions() { // Move queued actions over to actions that should run during the next // PostTask(). This prevents a race between old PostTask() calls and new // delayed actions. See the header for more detail. - for (auto& action : queued_actions_) + for (auto& action : queued_actions_) { queued_actions_to_run_.push_back(std::move(action)); + } queued_actions_.clear(); // Early return to prevent multiple RunQueuedAction() tasks. - if (run_queued_actions_is_pending_) + if (run_queued_actions_is_pending_) { return; + } // Post to self (instead of posting the queued actions directly) which lets // us: @@ -940,10 +968,11 @@ ChildLayout* const to_overwrite = FindChildViewInLayout(¤t_layout_, fade_info.child_view); - if (to_overwrite) + if (to_overwrite) { *to_overwrite = child_layout; - else + } else { current_layout_.child_layouts.push_back(child_layout); + } } } @@ -951,8 +980,9 @@ // Save any views that were previously fading so we don't try to key off of // them when calculating leading/trailing edge. std::set<const View*> previously_fading; - for (const auto& fade_info : fade_infos_) + for (const auto& fade_info : fade_infos_) { previously_fading.insert(fade_info.child_view); + } fade_infos_.clear(); @@ -972,8 +1002,9 @@ // Collect some bookkeping info to prevent linear searches later. for (View* child : host_view()->children()) { - if (IsChildIncludedInLayout(child, /* include hidden */ true)) + if (IsChildIncludedInLayout(child, /* include hidden */ true)) { child_to_info.emplace(child, ChildInfo()); + } } for (size_t i = 0; i < starting_layout_.child_layouts.size(); ++i) { @@ -1174,14 +1205,16 @@ double scale_percent, bool slide_from_leading) const { // Fall back to kScaleFromMinimum if there is no edge to slide out from. - if (!fade_info.prev_view && !fade_info.next_view) + if (!fade_info.prev_view && !fade_info.next_view) { return CalculateScaleFade(fade_info, scale_percent, false); + } // Slide from the other direction if against the edge of the host view. - if (slide_from_leading && !fade_info.prev_view) + if (slide_from_leading && !fade_info.prev_view) { slide_from_leading = false; - else if (!slide_from_leading && !fade_info.next_view) + } else if (!slide_from_leading && !fade_info.next_view) { slide_from_leading = true; + } NormalizedRect new_bounds = fade_info.reference_bounds; @@ -1298,8 +1331,9 @@ // Returns the space in which to calculate the target layout. gfx::Size AnimatingLayoutManager::GetAvailableTargetLayoutSize() { - if (bounds_animation_mode_ == BoundsAnimationMode::kUseHostBounds) + if (bounds_animation_mode_ == BoundsAnimationMode::kUseHostBounds) { return host_view()->size(); + } const SizeBounds bounds = GetAvailableHostSize(); last_available_host_size_ = bounds;
diff --git a/ui/views/layout/box_layout_view.cc b/ui/views/layout/box_layout_view.cc index 4c8af25..a70afd5 100644 --- a/ui/views/layout/box_layout_view.cc +++ b/ui/views/layout/box_layout_view.cc
@@ -24,8 +24,9 @@ default_flex_(layout_->GetDefaultFlex()) {} void BoxLayoutView::SetOrientation(BoxLayout::Orientation orientation) { - if (orientation_ == orientation) + if (orientation_ == orientation) { return; + } layout_->SetOrientation(orientation); orientation_ = orientation; OnPropertyChanged(&orientation_, kPropertyEffectsLayout); @@ -37,8 +38,9 @@ void BoxLayoutView::SetMainAxisAlignment( BoxLayout::MainAxisAlignment main_axis_alignment) { - if (main_axis_alignment_ == main_axis_alignment) + if (main_axis_alignment_ == main_axis_alignment) { return; + } layout_->set_main_axis_alignment(main_axis_alignment); main_axis_alignment_ = main_axis_alignment; OnPropertyChanged(&main_axis_alignment_, kPropertyEffectsLayout); @@ -50,8 +52,9 @@ void BoxLayoutView::SetCrossAxisAlignment( BoxLayout::CrossAxisAlignment cross_axis_alignment) { - if (cross_axis_alignment_ == cross_axis_alignment) + if (cross_axis_alignment_ == cross_axis_alignment) { return; + } layout_->set_cross_axis_alignment(cross_axis_alignment); cross_axis_alignment_ = cross_axis_alignment; OnPropertyChanged(&cross_axis_alignment_, kPropertyEffectsLayout); @@ -62,8 +65,9 @@ } void BoxLayoutView::SetInsideBorderInsets(const gfx::Insets& insets) { - if (inside_border_insets_ == insets) + if (inside_border_insets_ == insets) { return; + } layout_->set_inside_border_insets(insets); inside_border_insets_ = insets; OnPropertyChanged(&inside_border_insets_, kPropertyEffectsLayout); @@ -74,8 +78,9 @@ } void BoxLayoutView::SetMinimumCrossAxisSize(int size) { - if (minimum_cross_axis_size_ == size) + if (minimum_cross_axis_size_ == size) { return; + } layout_->set_minimum_cross_axis_size(size); minimum_cross_axis_size_ = size; OnPropertyChanged(&minimum_cross_axis_size_, kPropertyEffectsLayout); @@ -86,8 +91,9 @@ } void BoxLayoutView::SetBetweenChildSpacing(int spacing) { - if (between_child_spacing_ == spacing) + if (between_child_spacing_ == spacing) { return; + } layout_->set_between_child_spacing(spacing); between_child_spacing_ = spacing; OnPropertyChanged(&between_child_spacing_, kPropertyEffectsLayout); @@ -98,8 +104,9 @@ } void BoxLayoutView::SetCollapseMarginsSpacing(bool collapse_margins_spacing) { - if (collapse_margins_spacing_ == collapse_margins_spacing) + if (collapse_margins_spacing_ == collapse_margins_spacing) { return; + } layout_->SetCollapseMarginsSpacing(collapse_margins_spacing); collapse_margins_spacing_ = collapse_margins_spacing; OnPropertyChanged(&collapse_margins_spacing_, kPropertyEffectsLayout); @@ -110,8 +117,9 @@ } void BoxLayoutView::SetDefaultFlex(int default_flex) { - if (default_flex_ == default_flex) + if (default_flex_ == default_flex) { return; + } layout_->SetDefaultFlex(default_flex); default_flex_ = default_flex; OnPropertyChanged(&default_flex_, kPropertyEffectsLayout);
diff --git a/ui/views/layout/composite_layout_tests.cc b/ui/views/layout/composite_layout_tests.cc index 5020c01..d753ee85 100644 --- a/ui/views/layout/composite_layout_tests.cc +++ b/ui/views/layout/composite_layout_tests.cc
@@ -178,8 +178,9 @@ void AddIcons(std::vector<bool> visibility) { int insertion_point = children().size() - 1; - for (bool visible : visibility) + for (bool visible : visibility) { AddIconAt(insertion_point++, visible); + } } void AddIconAt(int position, bool initially_visible) { @@ -187,8 +188,9 @@ DCHECK_LT(position, static_cast<int>(children().size())); auto new_child = std::make_unique<StaticSizedView>(kIconSize); new_child->SetVisible(initially_visible); - if (initially_visible) + if (initially_visible) { visible_views_.insert(new_child.get()); + } AddChildViewAt(std::move(new_child), position); } @@ -248,8 +250,9 @@ EXPECT_EQ(kIconSize, child->size()) << " icon " << i; } } - if (expected_num_icons.has_value()) + if (expected_num_icons.has_value()) { EXPECT_GE(num_visible, expected_num_icons.value()); + } } else { // Calculate how many icons *should* be visible given the available space. SizeBounds available_size = parent()->GetAvailableSize(this); @@ -260,8 +263,9 @@ (available_size.width().value() - kIconDimension) / kIconDimension); } DCHECK_LT(num_visible, static_cast<int>(children().size())); - if (expected_num_icons.has_value()) + if (expected_num_icons.has_value()) { EXPECT_EQ(expected_num_icons.value(), num_visible); + } // Verify that the correct icons are visible and are in the correct place // with the correct size. int x = 0; @@ -368,10 +372,11 @@ avatar_->EnsureLayout(); EXPECT_EQ(gfx::Rect(gfx::Point(avatar_->bounds().right(), 0), kIconSize), children()[4]->bounds()); - if (location()->width() == kBarMinimumWidth) + if (location()->width() == kBarMinimumWidth) { EXPECT_LE(width(), children()[4]->bounds().right()); - else + } else { EXPECT_EQ(width(), children()[4]->bounds().right()); + } } private: @@ -425,10 +430,12 @@ void AdvanceAnimations(int ms) { const auto delta = base::Milliseconds(ms); - if (avatar()->layout()->is_animating()) + if (avatar()->layout()->is_animating()) { avatar_test_api_->IncrementTime(delta); - if (extensions()->layout()->is_animating()) + } + if (extensions()->layout()->is_animating()) { extensions_test_api_->IncrementTime(delta); + } views::test::RunScheduledLayout(toolbar()); } @@ -449,8 +456,9 @@ // animation could lead to another so basing our limit only on the current // animation durations is not necessarily reliable. for (int i = 0; i < 100; ++i) { - if (!IsAnimating()) + if (!IsAnimating()) { return; + } // Advance by a small but significant step (1/10 of a second). AdvanceAnimations(100); }
diff --git a/ui/views/layout/flex_layout.cc b/ui/views/layout/flex_layout.cc index c1472a22..399918f 100644 --- a/ui/views/layout/flex_layout.cc +++ b/ui/views/layout/flex_layout.cc
@@ -80,15 +80,18 @@ bool* is_default = nullptr) { T* found_value = view->GetProperty(property); if (found_value) { - if (is_default) + if (is_default) { *is_default = false; + } return *found_value; } - if (is_default) + if (is_default) { *is_default = true; + } found_value = defaults.GetProperty(property); - if (found_value) + if (found_value) { return *found_value; + } return T(); } @@ -172,8 +175,9 @@ } int FlexLayout::ChildViewSpacing::GetLeadingInset() const { - if (leading_spacings_.empty()) + if (leading_spacings_.empty()) { return 0; + } return leading_spacings_.begin()->second; } @@ -199,8 +203,9 @@ const SizeBound& available_space) const { DCHECK_GE(available_space, 0); - if (HasViewIndex(view_index)) + if (HasViewIndex(view_index)) { return current_size + available_space; + } DCHECK_EQ(0, current_size); // Making the child visible may result in the addition of margin space, which @@ -232,30 +237,35 @@ const int leading_space = get_view_spacing_.Run(prev, view_index); const int trailing_space = get_view_spacing_.Run(view_index, next); leading_spacings_[view_index] = leading_space; - if (next) + if (next) { leading_spacings_[*next] = trailing_space; - else + } else { trailing_space_ = trailing_space; + } - if (new_leading) + if (new_leading) { *new_leading = leading_space; - if (new_trailing) + } + if (new_trailing) { *new_trailing = trailing_space; + } } std::optional<size_t> FlexLayout::ChildViewSpacing::GetPreviousViewIndex( size_t view_index) const { const auto it = leading_spacings_.lower_bound(view_index); - if (it == leading_spacings_.begin()) + if (it == leading_spacings_.begin()) { return std::nullopt; + } return std::prev(it)->first; } std::optional<size_t> FlexLayout::ChildViewSpacing::GetNextViewIndex( size_t view_index) const { const auto it = leading_spacings_.upper_bound(view_index); - if (it == leading_spacings_.end()) + if (it == leading_spacings_.end()) { return std::nullopt; + } return it->first; } @@ -514,8 +524,9 @@ const SizeBound& available_cross) const { const NormalizedSize default_size = Normalize(orientation(), rule.Run(child, SizeBounds())); - if (!available_cross.is_bounded()) + if (!available_cross.is_bounded()) { return default_size; + } // Do the height-for-width calculation. const NormalizedSize stretch_size = Normalize( @@ -535,8 +546,9 @@ if (orientation() == LayoutOrientation::kVertical) { const LayoutAlignment cross_align = GetViewProperty(child, layout_defaults_, kCrossAxisAlignmentKey); - if (cross_align == LayoutAlignment::kStretch) + if (cross_align == LayoutAlignment::kStretch) { return stretch_size; + } size.set_main(std::max(size.main(), stretch_size.main())); } @@ -562,8 +574,9 @@ // and setting up initial minimal visibility. const bool main_axis_bounded = bounds.main().is_bounded(); for (View* child : host_view()->children()) { - if (!IsChildIncludedInLayout(child)) + if (!IsChildIncludedInLayout(child)) { continue; + } const size_t view_index = data.num_children(); data.layout.child_layouts.emplace_back(ChildLayout{child}); @@ -612,8 +625,9 @@ flex_child.maximum_size.main() > flex_child.preferred_size.main()); // Add views that have the potential to flex to the appropriate order list. - if (can_flex) + if (can_flex) { flex_order_to_index[flex_child.flex.order()].push_back(view_index); + } if (main_axis_bounded) { flex_child.flex_base_content_size = std::min<NormalizedSize>( @@ -692,8 +706,9 @@ // non-flex views get their space first, these views will have access to the // entire budget of remaining space in the layout. for (size_t index = 0; index < data.child_data.size(); ++index) { - if (base::Contains(all_flex_indices, index)) + if (base::Contains(all_flex_indices, index)) { continue; + } // Cross-axis available size is already set in InitializeChildData(), so // just set the main axis here. @@ -793,15 +808,17 @@ } // We don't have to deal with invisible children any further than this. - if (!is_visible) + if (!is_visible) { continue; + } // Calculate main-axis size and upper-left main axis coordinate. int leading_space; - if (child_spacing.HasViewIndex(i)) + if (child_spacing.HasViewIndex(i)) { leading_space = child_spacing.GetLeadingSpace(i); - else + } else { child_spacing.AddViewIndex(i, &leading_space); + } data.total_size.Enlarge(leading_space, 0); const int size_main = flex_child.current_size.main(); @@ -1188,10 +1205,12 @@ gfx::Size FlexLayout::DefaultFlexRuleImpl(const FlexLayout* flex_layout, const View* view, const SizeBounds& size_bounds) { - if (size_bounds == SizeBounds()) + if (size_bounds == SizeBounds()) { return flex_layout->GetPreferredSize(view); - if (size_bounds == SizeBounds(0, 0)) + } + if (size_bounds == SizeBounds(0, 0)) { return flex_layout->GetMinimumSize(view); + } return flex_layout->CalculateProposedLayout(size_bounds).host_size; }
diff --git a/ui/views/layout/flex_layout_types.cc b/ui/views/layout/flex_layout_types.cc index 55d80e8..ea356f5 100644 --- a/ui/views/layout/flex_layout_types.cc +++ b/ui/views/layout/flex_layout_types.cc
@@ -58,8 +58,9 @@ const gfx::Size* operator->() const { return get(); } const gfx::Size& operator*() const { return *get(); } const gfx::Size* get() const { - if (!size_) + if (!size_) { size_ = (view_->*size_func_)(); + } return &size_.value(); } LazyDimension width() const {
diff --git a/ui/views/layout/flex_layout_unittest.cc b/ui/views/layout/flex_layout_unittest.cc index 19d1b9e..cebf0a1 100644 --- a/ui/views/layout/flex_layout_unittest.cc +++ b/ui/views/layout/flex_layout_unittest.cc
@@ -115,15 +115,17 @@ const Size large_size = view->GetPreferredSize({}); const Size small_size = Size(large_size.width() / 2, large_size.height() / 2); int horizontal = 0; - if (maximum_size.width() >= large_size.width()) + if (maximum_size.width() >= large_size.width()) { horizontal = large_size.width(); - else if (maximum_size.width() >= small_size.width() || !snap_to_zero) + } else if (maximum_size.width() >= small_size.width() || !snap_to_zero) { horizontal = small_size.width(); + } int vertical = 0; - if (maximum_size.height() >= large_size.height()) + if (maximum_size.height() >= large_size.height()) { vertical = large_size.height(); - else if (maximum_size.height() >= small_size.height() || !snap_to_zero) + } else if (maximum_size.height() >= small_size.height() || !snap_to_zero) { vertical = small_size.height(); + } return Size(horizontal, vertical); } @@ -147,10 +149,12 @@ bool visible = true) { MockView* const child = new MockView(); child->set_preferred_size(preferred_size); - if (minimum_size.has_value()) + if (minimum_size.has_value()) { child->SetMinimumSize(minimum_size.value()); - if (!visible) + } + if (!visible) { child->SetVisible(false); + } parent->AddChildView(child); return child; } @@ -3496,8 +3500,9 @@ EXPECT_EQ(expected, child_views_[2]->origin().y()); // Expect child views to retain their preferred sizes. - for (size_t i = 0; i < kNumChildren; ++i) + for (size_t i = 0; i < kNumChildren; ++i) { EXPECT_EQ(kChildSizes[i].height(), child_views_[i]->size().height()); + } } TEST_F(FlexLayoutCrossAxisFitTest, Layout_CrossEnd) { @@ -4151,8 +4156,9 @@ param.rules.max_main_rule, param.rules.use_height_for_width, param.rules.min_cross_rule)); - if (param.rules.use_height_for_width) + if (param.rules.use_height_for_width) { child2->set_size_mode(MockView::SizeMode::kFixedArea); + } host_->SetSize(param.size); EXPECT_EQ(param.expected, GetChildBounds())
diff --git a/ui/views/layout/flex_layout_view.cc b/ui/views/layout/flex_layout_view.cc index 0959998e..84786e3 100644 --- a/ui/views/layout/flex_layout_view.cc +++ b/ui/views/layout/flex_layout_view.cc
@@ -29,8 +29,9 @@ FlexLayoutView::~FlexLayoutView() = default; void FlexLayoutView::SetOrientation(LayoutOrientation orientation) { - if (orientation_ == orientation) + if (orientation_ == orientation) { return; + } layout_->SetOrientation(orientation); orientation_ = orientation; OnPropertyChanged(&orientation_, kPropertyEffectsLayout); @@ -41,8 +42,9 @@ } void FlexLayoutView::SetMainAxisAlignment(LayoutAlignment main_axis_alignment) { - if (main_axis_alignment_ == main_axis_alignment) + if (main_axis_alignment_ == main_axis_alignment) { return; + } layout_->SetMainAxisAlignment(main_axis_alignment); main_axis_alignment_ = main_axis_alignment; OnPropertyChanged(&main_axis_alignment_, kPropertyEffectsLayout); @@ -54,8 +56,9 @@ void FlexLayoutView::SetCrossAxisAlignment( LayoutAlignment cross_axis_alignment) { - if (cross_axis_alignment_ == cross_axis_alignment) + if (cross_axis_alignment_ == cross_axis_alignment) { return; + } layout_->SetCrossAxisAlignment(cross_axis_alignment); cross_axis_alignment_ = cross_axis_alignment; OnPropertyChanged(&cross_axis_alignment_, kPropertyEffectsLayout); @@ -66,8 +69,9 @@ } void FlexLayoutView::SetInteriorMargin(const gfx::Insets& interior_margin) { - if (interior_margin_ == interior_margin) + if (interior_margin_ == interior_margin) { return; + } layout_->SetInteriorMargin(interior_margin); interior_margin_ = interior_margin; OnPropertyChanged(&interior_margin_, kPropertyEffectsLayout); @@ -78,8 +82,9 @@ } void FlexLayoutView::SetMinimumCrossAxisSize(int size) { - if (minimum_cross_axis_size_ == size) + if (minimum_cross_axis_size_ == size) { return; + } layout_->SetMinimumCrossAxisSize(size); minimum_cross_axis_size_ = size; OnPropertyChanged(&minimum_cross_axis_size_, kPropertyEffectsLayout); @@ -90,8 +95,9 @@ } void FlexLayoutView::SetCollapseMargins(bool collapse_margins) { - if (collapse_margins_ == collapse_margins) + if (collapse_margins_ == collapse_margins) { return; + } layout_->SetCollapseMargins(collapse_margins); collapse_margins_ = collapse_margins; OnPropertyChanged(&collapse_margins_, kPropertyEffectsLayout); @@ -103,8 +109,9 @@ void FlexLayoutView::SetIncludeHostInsetsInLayout( bool include_host_insets_in_layout) { - if (include_host_insets_in_layout_ == include_host_insets_in_layout) + if (include_host_insets_in_layout_ == include_host_insets_in_layout) { return; + } layout_->SetIncludeHostInsetsInLayout(include_host_insets_in_layout); include_host_insets_in_layout_ = include_host_insets_in_layout; OnPropertyChanged(&include_host_insets_in_layout_, kPropertyEffectsLayout); @@ -130,8 +137,9 @@ void FlexLayoutView::SetFlexAllocationOrder( FlexAllocationOrder flex_allocation_order) { - if (flex_allocation_order_ == flex_allocation_order) + if (flex_allocation_order_ == flex_allocation_order) { return; + } layout_->SetFlexAllocationOrder(flex_allocation_order); flex_allocation_order_ = flex_allocation_order; OnPropertyChanged(&flex_allocation_order_, kPropertyEffectsLayout);
diff --git a/ui/views/layout/layout_manager.cc b/ui/views/layout/layout_manager.cc index 7e004cf..c744e00 100644 --- a/ui/views/layout/layout_manager.cc +++ b/ui/views/layout/layout_manager.cc
@@ -51,8 +51,9 @@ // for most legacy layouts (none of which override this method). // TODO(dfried): Remove this if/when LayoutManager and LayoutManagerBase can // be merged. - if (old_visibility != new_visibility) + if (old_visibility != new_visibility) { host->InvalidateLayout(); + } } void LayoutManager::SetViewVisibility(View* view, bool visible) {
diff --git a/ui/views/layout/layout_manager_base.cc b/ui/views/layout/layout_manager_base.cc index 3024fe03..09b3a8a 100644 --- a/ui/views/layout/layout_manager_base.cc +++ b/ui/views/layout/layout_manager_base.cc
@@ -33,10 +33,12 @@ if (host && host->parent() && available_size != SizeBounds()) { SizeBounds host_additional_size = host->parent()->GetAvailableSize(host); host_additional_size.Enlarge(-host->width(), -host->height()); - if (host_additional_size.width().is_bounded()) + if (host_additional_size.width().is_bounded()) { available_size.width() += host_additional_size.width(); - if (host_additional_size.height().is_bounded()) + } + if (host_additional_size.height().is_bounded()) { available_size.height() += host_additional_size.height(); + } } return available_size; } @@ -51,8 +53,9 @@ gfx::Size LayoutManagerBase::GetPreferredSize(const View* host) const { DCHECK_EQ(host_view_, host); - if (!cached_preferred_size_) + if (!cached_preferred_size_) { cached_preferred_size_ = CalculateProposedLayout(SizeBounds()).host_size; + } return *cached_preferred_size_; } @@ -69,8 +72,9 @@ gfx::Size LayoutManagerBase::GetMinimumSize(const View* host) const { DCHECK_EQ(host_view_, host); - if (!cached_minimum_size_) + if (!cached_minimum_size_) { cached_minimum_size_ = CalculateProposedLayout(SizeBounds(0, 0)).host_size; + } return *cached_minimum_size_; } @@ -88,14 +92,16 @@ SizeBounds LayoutManagerBase::GetAvailableSize(const View* host, const View* view) const { DCHECK_EQ(host_view_, host); - if (!cached_layout_size_) + if (!cached_layout_size_) { GetProposedLayout(host->size()); + } if (cached_layout_size_) { - for (const auto& child_layout : cached_layout_.child_layouts) + for (const auto& child_layout : cached_layout_.child_layouts) { if (child_layout.child_view == view) { return AdjustAvailableSizeForParentAvailableSize( host, child_layout.available_size); } + } } return SizeBounds(); } @@ -170,8 +176,9 @@ // During callbacks when a child is removed we can get in a state where a view // in the child list of the host view is not in |child_infos_|. In that case, // the view is being removed and is not part of the layout. - if (it == child_infos_.end()) + if (it == child_infos_.end()) { return false; + } return it->second.included_in_layout && (include_hidden || it->second.can_be_visible); @@ -216,8 +223,9 @@ !child_layout.bounds.IsEmpty()) { const bool size_changed = child_view->bounds().size() != child_layout.bounds.size(); - if (child_view->bounds() != child_layout.bounds) + if (child_view->bounds() != child_layout.bounds) { child_view->SetBoundsRect(child_layout.bounds); + } // Child layouts which are not invalid will not be laid out by the default // View::Layout() implementation, but if there is an available size // constraint it's important that the child view be laid out. So we'll do @@ -315,8 +323,9 @@ base::AutoReset<bool> setter(&suppress_invalidate_, true); const bool invalidate = PropagateViewAdded(host, view); - if (invalidate || view->GetVisible()) + if (invalidate || view->GetVisible()) { InvalidateHost(false); + } } void LayoutManagerBase::ViewRemoved(View* host, View* view) { @@ -333,8 +342,9 @@ base::AutoReset<bool> setter(&suppress_invalidate_, true); const bool invalidate = PropagateViewRemoved(host, view); - if (invalidate || removed_visible) + if (invalidate || removed_visible) { InvalidateHost(false); + } } void LayoutManagerBase::ViewVisibilitySet(View* host, @@ -393,8 +403,9 @@ LayoutManagerBase* LayoutManagerBase::GetRootLayoutManager() { LayoutManagerBase* result = this; - while (result->parent_layout_) + while (result->parent_layout_) { result = result->parent_layout_; + } return result; } @@ -418,8 +429,9 @@ bool result = false; - for (auto& owned_layout : owned_layouts_) + for (auto& owned_layout : owned_layouts_) { result |= owned_layout->PropagateViewAdded(host, view); + } result |= OnViewAdded(host, view); return result; @@ -430,8 +442,9 @@ bool result = false; - for (auto& owned_layout : owned_layouts_) + for (auto& owned_layout : owned_layouts_) { result |= owned_layout->PropagateViewRemoved(host, view); + } result |= OnViewRemoved(host, view); return result; @@ -444,8 +457,9 @@ bool result = false; - for (auto& owned_layout : owned_layouts_) + for (auto& owned_layout : owned_layouts_) { result |= owned_layout->PropagateViewVisibilitySet(host, view, visible); + } result |= OnViewVisibilitySet(host, view, visible); return result; @@ -459,15 +473,17 @@ .included_in_layout = IncludeInLayout(child)}); } - for (auto& owned_layout : owned_layouts_) + for (auto& owned_layout : owned_layouts_) { owned_layout->PropagateInstalled(host); + } OnInstalled(host); } void LayoutManagerBase::PropagateInvalidateLayout() { - for (auto& owned_layout : owned_layouts_) + for (auto& owned_layout : owned_layouts_) { owned_layout->PropagateInvalidateLayout(); + } OnLayoutChanged(); }
diff --git a/ui/views/layout/layout_manager_base_unittest.cc b/ui/views/layout/layout_manager_base_unittest.cc index 5e94a79..7c46d03 100644 --- a/ui/views/layout/layout_manager_base_unittest.cc +++ b/ui/views/layout/layout_manager_base_unittest.cc
@@ -50,8 +50,9 @@ // LayoutManagerBase: ProposedLayout CalculateProposedLayout( const SizeBounds& size_bounds) const override { - if (forced_layout_) + if (forced_layout_) { return *forced_layout_; + } ProposedLayout layout; layout.host_size.set_width(std::clamp<SizeBound>(size_bounds.width(), @@ -97,8 +98,9 @@ ProposedLayout layout; layout.host_size = {kChildViewPadding, kChildViewPadding}; for (views::View* it : host_view()->children()) { - if (!IsChildIncludedInLayout(it)) + if (!IsChildIncludedInLayout(it)) { continue; + } const gfx::Size preferred_size = it->GetPreferredSize({}); bool visible = false; gfx::Rect bounds;
diff --git a/ui/views/layout/layout_provider.cc b/ui/views/layout/layout_provider.cc index 8c30054..5748617 100644 --- a/ui/views/layout/layout_provider.cc +++ b/ui/views/layout/layout_provider.cc
@@ -27,8 +27,9 @@ } LayoutProvider::~LayoutProvider() { - if (this == g_layout_delegate) + if (this == g_layout_delegate) { g_layout_delegate = nullptr; + } } // static
diff --git a/ui/views/layout/layout_types.cc b/ui/views/layout/layout_types.cc index e909c12..cea58202 100644 --- a/ui/views/layout/layout_types.cc +++ b/ui/views/layout/layout_types.cc
@@ -15,17 +15,19 @@ // SizeBound ------------------------------------------------------------------- void SizeBound::operator+=(const SizeBound& rhs) { - if (!rhs.is_bounded()) + if (!rhs.is_bounded()) { bound_.reset(); - else if (is_bounded()) + } else if (is_bounded()) { *bound_ += rhs.value(); + } } void SizeBound::operator-=(const SizeBound& rhs) { - if (!rhs.is_bounded()) + if (!rhs.is_bounded()) { bound_ = 0; - else if (is_bounded()) + } else if (is_bounded()) { *bound_ -= rhs.value(); + } } std::string SizeBound::ToString() const {
diff --git a/ui/views/layout/proposed_layout.cc b/ui/views/layout/proposed_layout.cc index c9c4a84..e3e5e4d7 100644 --- a/ui/views/layout/proposed_layout.cc +++ b/ui/views/layout/proposed_layout.cc
@@ -79,10 +79,11 @@ oss << "{" << host_size.ToString() << " {"; bool first = true; for (const auto& child_layout : child_layouts) { - if (first) + if (first) { first = false; - else + } else { oss << ", "; + } oss << child_layout.ToString(); } oss << "}}"; @@ -92,8 +93,9 @@ ProposedLayout ProposedLayoutBetween(double value, const ProposedLayout& start, const ProposedLayout& target) { - if (value >= 1.0) + if (value >= 1.0) { return target; + } ProposedLayout layout; @@ -104,8 +106,9 @@ // The views may not be listed in the same order and some views might be // omitted from either the |start| or |target| layout. std::map<const views::View*, size_t> start_view_to_index; - for (size_t i = 0; i < start.child_layouts.size(); ++i) + for (size_t i = 0; i < start.child_layouts.size(); ++i) { start_view_to_index.emplace(start.child_layouts[i].child_view, i); + } for (const ChildLayout& target_child : target.child_layouts) { // Try to match the view from the target with the view from the start. const auto start_match = start_view_to_index.find(target_child.child_view);
diff --git a/ui/views/layout/table_layout.cc b/ui/views/layout/table_layout.cc index 9064d89..8dbda07 100644 --- a/ui/views/layout/table_layout.cc +++ b/ui/views/layout/table_layout.cc
@@ -71,26 +71,30 @@ // Invokes ResetSize on all the layout elements. template <class T> void ResetSizes(std::vector<T>& elements) { - for (auto& element : elements) + for (auto& element : elements) { element.ResetSize(); + } } // Distributes delta among the resizable elements. Each resizable element is // given (resize() / total_resize * delta) DIP of extra space. template <class T> void DistributeDelta(int delta, std::vector<T>& elements) { - if (delta == 0) + if (delta == 0) { return; + } float total_resize = 0; int resize_count = 0; for (auto& element : elements) { total_resize += element.resize(); - if (element.resize() > 0) + if (element.resize() > 0) { ++resize_count; + } } - if (total_resize == 0) + if (total_resize == 0) { return; + } int remaining_delta = delta; for (auto& element : elements) { if (element.resize() > 0) { @@ -120,8 +124,9 @@ // Advances `index` past any padding elements. template <class T> void SkipPadding(size_t& index, const std::vector<T>& elements) { - while (index < elements.size() && elements[index].is_padding()) + while (index < elements.size() && elements[index].is_padding()) { ++index; + } } void CalculateLocationAndSize(int pref_size, @@ -179,8 +184,9 @@ ~Column() override = default; void AdjustSize(int size) override { - if (size_type_ == ColumnSize::kUsePreferred) + if (size_type_ == ColumnSize::kUsePreferred) { LayoutElement::AdjustSize(size); + } } void ResetSize() override { @@ -190,14 +196,16 @@ // Determines the max size of all linked columns, and sets each column to that // size. void UnifyLinkedColumnSizes(const std::optional<int>& size_limit) { - if (linked_columns_.empty() || linked_columns_.front() != this) + if (linked_columns_.empty() || linked_columns_.front() != this) { return; + } // Accumulate the size first. int size = 0; for (views::TableLayout::Column* column : linked_columns_) { - if (!size_limit || column->size() <= *size_limit) + if (!size_limit || column->size() <= *size_limit) { size = std::max(size, column->size()); + } } // Then apply it. @@ -335,8 +343,9 @@ } TableLayout& TableLayout::AddRows(size_t n, float vertical_resize, int height) { - for (size_t i = 0; i < n; ++i) + for (size_t i = 0; i < n; ++i) { rows_.emplace_back(vertical_resize, height, false); + } return *this; } @@ -434,19 +443,23 @@ SkipPadding(row, rows_); SkipPadding(col, columns_); for (auto it = row_spans.begin(); it != row_spans.end();) { - if (col < (*it)->start_col) + if (col < (*it)->start_col) { break; + } const size_t last_row_of_span = (*it)->start_row + (*it)->row_span - 1; - if (row <= last_row_of_span) + if (row <= last_row_of_span) { col = std::max(col, (*it)->start_col + (*it)->col_span); - if (row >= last_row_of_span) + } + if (row >= last_row_of_span) { it = row_spans.erase(it); - else + } else { ++it; + } SkipPadding(col, columns_); } - if (col < columns_.size()) + if (col < columns_.size()) { break; + } col = 0; } CHECK_LT(row, rows_.size()) @@ -500,8 +513,9 @@ SetViewStates(); gfx::Size pref; - if (rows_.empty()) + if (rows_.empty()) { return pref; + } // Calculate the preferred width of each of the columns. Some views' // preferred heights are derived from their width, as such we need to @@ -520,8 +534,9 @@ ResetSizes(rows_); for (auto& view_state : view_states_by_row_span_) { - if (view_state->v_align == LayoutAlignment::kBaseline) + if (view_state->v_align == LayoutAlignment::kBaseline) { view_state->baseline = view_state->view->GetBaseline(); + } // If the view is given a different width than its preferred width, requery // for the preferred height. This is necessary as the preferred height may @@ -531,8 +546,9 @@ int x = 0; // Not used in this stage. CalculateLocationAndSize(view_state->width, view_state->h_align, &x, &actual_width); - if (actual_width != view_state->width) + if (actual_width != view_state->width) { view_state->height = view_state->view->GetHeightForWidth(actual_width); + } view_state->remaining_height = view_state->height; } @@ -622,8 +638,9 @@ } void TableLayout::UnifyLinkedColumnSizes() const { - for (auto& column : columns_) + for (auto& column : columns_) { column.UnifyLinkedColumnSizes(linked_column_size_limit_); + } } void TableLayout::DistributeRemainingWidth(ViewState& view_state) const { @@ -632,8 +649,9 @@ // kUsePreferred, or not resizable. This results in slightly different // handling for distributing unaccounted size. int width = view_state.remaining_width; - if (width <= 0) + if (width <= 0) { return; + } // Determine which columns are resizable, and which have a size type of // kUsePreferred. @@ -674,8 +692,9 @@ if (columns_[i].size_type() == ColumnSize::kUsePreferred) { width -= column_delta; // If there is slop, we're on the last row; give it all the slop. - if (width < column_delta) + if (width < column_delta) { column_delta += width; + } columns_[i].set_size(columns_[i].size() + column_delta); } } @@ -700,10 +719,12 @@ // This relies on MINIMUM being calculated immediately after PREFERRED, // which the rest of this code relies on as well. size = view_state->view->GetMinimumSize(); - if (size.width() > view_state->width) + if (size.width() > view_state->width) { size.set_width(view_state->width); - if (size.height() > view_state->height) + } + if (size.height() > view_state->height) { size.set_height(view_state->height); + } } else { size = view_state->view->GetPreferredSize({/* Unbounded */}); view_state->pref_size = size; @@ -776,8 +797,9 @@ total_delta = std::abs(total_delta); std::vector<int> preferred_column_sizes(columns_.size()); - for (size_t i = 0; i < columns_.size(); ++i) + for (size_t i = 0; i < columns_.size(); ++i) { preferred_column_sizes[i] = columns_[i].size(); + } // Recalculate the sizes using the min. We don't want to touch the proposed // widths and heights, so copy the ViewStates to a temporary location so @@ -804,13 +826,15 @@ DCHECK_GE(available, 0); // Set the size back to preferred. We'll reset the size if necessary later. column.set_size(preferred_column_sizes[i]); - if (!column.resizable() || available == 0) + if (!column.resizable() || available == 0) { continue; + } resize_data.push_back({&column, available, 0}); total_resize += column.resize(); } - if (resize_data.empty()) + if (resize_data.empty()) { return; + } // Loop through the columns updating the amount available and the amount to // resize. This may take multiple iterations if the column min is hit. @@ -827,8 +851,9 @@ base::ClampFloor(total_delta * data.column->resize() / total_resize)); // Make sure at least one column is resized (rounding errors may prevent // that). - if (i == 1 && delta == 0 && next_iteration_delta == total_delta) + if (i == 1 && delta == 0 && next_iteration_delta == total_delta) { delta = 1; + } next_iteration_delta -= delta; data.delta += delta; data.available -= delta; @@ -843,8 +868,9 @@ total_resize = next_iteration_total_resize; } - for (const ColumnMinResizeData& data : resize_data) + for (const ColumnMinResizeData& data : resize_data) { data.column->set_size(data.column->size() - data.delta); + } } bool TableLayout::CanUseMinimum(const ViewState& view_state) const {
diff --git a/ui/views/layout/table_layout_unittest.cc b/ui/views/layout/table_layout_unittest.cc index c2210ecf..06417b3 100644 --- a/ui/views/layout/table_layout_unittest.cc +++ b/ui/views/layout/table_layout_unittest.cc
@@ -461,8 +461,9 @@ layout().AddRows(kRowCount, TableLayout::kFixedSize); for (size_t row = 0; row < kRowCount; ++row) { - for (size_t column = 0; column < kColumnCount; ++column) + for (size_t column = 0; column < kColumnCount; ++column) { host()->AddChildView(CreateSizedView(gfx::Size(kPrefWidth, kPrefHeight))); + } } layout().Layout(host());
diff --git a/ui/views/masked_targeter_delegate.cc b/ui/views/masked_targeter_delegate.cc index 4b7e54a..230fdd7 100644 --- a/ui/views/masked_targeter_delegate.cc +++ b/ui/views/masked_targeter_delegate.cc
@@ -15,13 +15,15 @@ const gfx::Rect& rect) const { // Early return if |rect| does not even intersect the rectangular bounds // of |target|. - if (!ViewTargeterDelegate::DoesIntersectRect(target, rect)) + if (!ViewTargeterDelegate::DoesIntersectRect(target, rect)) { return false; + } // Early return if |mask| is not a valid hit test mask. SkPath mask; - if (!GetHitTestMask(&mask)) + if (!GetHitTestMask(&mask)) { return false; + } // Return whether or not |rect| intersects the custom hit test mask // of |target|.
diff --git a/ui/views/metadata/view_factory.h b/ui/views/metadata/view_factory.h index 8c9fd2d6..fa56f94 100644 --- a/ui/views/metadata/view_factory.h +++ b/ui/views/metadata/view_factory.h
@@ -274,8 +274,9 @@ template <typename... Args> Builder& AddChildrenImpl(Args*... args) & { std::vector<internal::ViewBuilderCore*> children = {args...}; - for (auto* child : children) + for (auto* child : children) { children_.emplace_back(std::make_pair(child->Release(), std::nullopt)); + } return *static_cast<Builder*>(this); }
diff --git a/ui/views/metadata/view_factory_internal.cc b/ui/views/metadata/view_factory_internal.cc index d6c254d..ad87719 100644 --- a/ui/views/metadata/view_factory_internal.cc +++ b/ui/views/metadata/view_factory_internal.cc
@@ -27,16 +27,18 @@ void ViewBuilderCore::CreateChildren(View* parent) { for (auto& builder : children_) { - if (builder.second) + if (builder.second) { parent->AddChildViewAt(builder.first->DoBuild(), builder.second.value()); - else + } else { parent->AddChildView(builder.first->DoBuild()); + } } } void ViewBuilderCore::SetProperties(View* view) { - for (auto& property : property_list_) + for (auto& property : property_list_) { property->SetProperty(view); + } } } // namespace views::internal
diff --git a/ui/views/mouse_watcher.cc b/ui/views/mouse_watcher.cc index 829ea15..9aec1c1 100644 --- a/ui/views/mouse_watcher.cc +++ b/ui/views/mouse_watcher.cc
@@ -111,8 +111,9 @@ MouseWatcher::~MouseWatcher() = default; void MouseWatcher::Start(gfx::NativeWindow window) { - if (!is_observing()) + if (!is_observing()) { observer_ = std::make_unique<Observer>(this, window); + } } void MouseWatcher::Stop() {
diff --git a/ui/views/mouse_watcher_view_host.cc b/ui/views/mouse_watcher_view_host.cc index 99192f92..e66c5c3 100644 --- a/ui/views/mouse_watcher_view_host.cc +++ b/ui/views/mouse_watcher_view_host.cc
@@ -19,8 +19,9 @@ bool MouseWatcherViewHost::Contains(const gfx::Point& screen_point, EventType type) { bool in_view = IsCursorInViewZone(screen_point); - if (!in_view || (type == EventType::kExit && !IsMouseOverWindow())) + if (!in_view || (type == EventType::kExit && !IsMouseOverWindow())) { return false; + } return true; } @@ -42,8 +43,9 @@ // Returns true if the mouse is over the view's window. bool MouseWatcherViewHost::IsMouseOverWindow() { const Widget* const widget = view_->GetWidget(); - if (!widget) + if (!widget) { return false; + } return display::Screen::GetScreen()->IsWindowUnderCursor( widget->GetNativeWindow());
diff --git a/ui/views/native_window_tracker_aura.cc b/ui/views/native_window_tracker_aura.cc index b7f3ec2..b2d11cf 100644 --- a/ui/views/native_window_tracker_aura.cc +++ b/ui/views/native_window_tracker_aura.cc
@@ -16,8 +16,9 @@ } NativeWindowTrackerAura::~NativeWindowTrackerAura() { - if (window_) + if (window_) { window_->RemoveObserver(this); + } } bool NativeWindowTrackerAura::WasNativeWindowDestroyed() const {
diff --git a/ui/views/paint_info.cc b/ui/views/paint_info.cc index 2279071..394cfdd 100644 --- a/ui/views/paint_info.cc +++ b/ui/views/paint_info.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "ui/views/paint_info.h" + #include "base/feature_list.h" #include "ui/views/views_features.h" @@ -27,15 +28,17 @@ bool empty = paint_recording_bounds.IsEmpty(); - if (right == parent_size.width() && !empty) + if (right == parent_size.width() && !empty) { new_right = paint_recording_bounds.width(); - else + } else { new_right = std::round(right * device_scale_factor); + } - if (bottom == parent_size.height() && !empty) + if (bottom == parent_size.height() && !empty) { new_bottom = paint_recording_bounds.height(); - else + } else { new_bottom = std::round(bottom * device_scale_factor); + } return gfx::Rect(new_x + paint_recording_bounds.x(), new_y + paint_recording_bounds.y(), new_right - new_x, @@ -49,8 +52,9 @@ // edges. Such cases should be handled case by case basis. gfx::Rect GetViewsLayerRecordingBounds(const ui::PaintContext& context, const gfx::Rect& child_bounds) { - if (!context.is_pixel_canvas()) + if (!context.is_pixel_canvas()) { return gfx::Rect(child_bounds.size()); + } return gfx::Rect(GetSnappedRecordingBoundsInternal( gfx::Rect(), context.device_scale_factor(), gfx::Size() /* not used */, child_bounds) @@ -145,8 +149,9 @@ gfx::Rect PaintInfo::GetSnappedRecordingBounds( const gfx::Size& parent_size, const gfx::Rect& child_bounds) const { - if (!IsPixelCanvas()) + if (!IsPixelCanvas()) { return (child_bounds + paint_recording_bounds_.OffsetFromOrigin()); + } return GetSnappedRecordingBoundsInternal(paint_recording_bounds_, context().device_scale_factor(),
diff --git a/ui/views/painter.cc b/ui/views/painter.cc index a0ec852..f395f19 100644 --- a/ui/views/painter.cc +++ b/ui/views/painter.cc
@@ -90,8 +90,9 @@ cc::PaintFlags flags; flags.setBlendMode(blend_mode_); - if (antialias_) + if (antialias_) { flags.setAntiAlias(true); + } flags.setStyle(cc::PaintFlags::kFill_Style); flags.setColor(bg_color_); SkPath fill_path; @@ -263,8 +264,9 @@ void Painter::PaintFocusPainter(View* view, gfx::Canvas* canvas, Painter* focus_painter) { - if (focus_painter && view->HasFocus()) + if (focus_painter && view->HasFocus()) { PaintPainterAt(canvas, focus_painter, view->GetLocalBounds()); + } } // static
diff --git a/ui/views/selection_controller.cc b/ui/views/selection_controller.cc index 89ab2a5..b1a4514 100644 --- a/ui/views/selection_controller.cc +++ b/ui/views/selection_controller.cc
@@ -37,13 +37,15 @@ DCHECK(render_text); TrackMouseClicks(event); - if (handled) + if (handled) { return true; + } if (event.IsOnlyLeftMouseButton()) { first_drag_location_ = event.location(); - if (delegate_->SupportsDrag()) + if (delegate_->SupportsDrag()) { delegate_->SetTextBeingDragged(false); + } switch (aggregated_clicks_) { case 0: @@ -104,8 +106,9 @@ last_drag_location_ = event.location(); // Don't adjust the cursor on a potential drag and drop. - if (delegate_->HasTextBeingDragged() || !event.IsOnlyLeftMouseButton()) + if (delegate_->HasTextBeingDragged() || !event.IsOnlyLeftMouseButton()) { return true; + } // A timer is used to continuously scroll while selecting beyond side edges. const int x = event.location().x(); @@ -141,11 +144,13 @@ delegate_->OnAfterPointerAction(false, selection_changed); } - if (delegate_->SupportsDrag()) + if (delegate_->SupportsDrag()) { delegate_->SetTextBeingDragged(false); + } - if (handles_selection_clipboard_ && !render_text->selection().is_empty()) + if (handles_selection_clipboard_ && !render_text->selection().is_empty()) { delegate_->UpdateSelectionClipboard(); + } } void SelectionController::OnMouseCaptureLost() { @@ -154,8 +159,9 @@ drag_selection_timer_.Stop(); - if (handles_selection_clipboard_ && !render_text->selection().is_empty()) + if (handles_selection_clipboard_ && !render_text->selection().is_empty()) { delegate_->UpdateSelectionClipboard(); + } } void SelectionController::OffsetDoubleClickWord(size_t offset) { @@ -235,9 +241,11 @@ std::vector<gfx::Rect> bounds_rects = render_text->GetSubstringBounds( gfx::Range(0, render_text->text().length())); - for (const auto& bounds : bounds_rects) - if (bounds.Contains(point)) + for (const auto& bounds : bounds_rects) { + if (bounds.Contains(point)) { return true; + } + } return false; }
diff --git a/ui/views/selection_controller_unittest.cc b/ui/views/selection_controller_unittest.cc index 24bb39d..85098e4 100644 --- a/ui/views/selection_controller_unittest.cc +++ b/ui/views/selection_controller_unittest.cc
@@ -182,19 +182,21 @@ SetText("abc def"); RightMouseDown(CenterRight(BoundsOfChar(0))); - if (PlatformStyle::kSelectAllOnRightClickWhenUnfocused) + if (PlatformStyle::kSelectAllOnRightClickWhenUnfocused) { EXPECT_EQ("abc def", GetSelectedText()); - else + } else { EXPECT_EQ("", GetSelectedText()); + } } TEST_F(SelectionControllerTest, RightClickSelectsWord) { SetText("abc def"); RightMouseDown(CenterRight(BoundsOfChar(5)), true); - if (PlatformStyle::kSelectWordOnRightClick) + if (PlatformStyle::kSelectWordOnRightClick) { EXPECT_EQ("def", GetSelectedText()); - else + } else { EXPECT_EQ("", GetSelectedText()); + } } // Regression test for https://crbug.com/856609 @@ -222,10 +224,11 @@ EXPECT_EQ("", GetSelectedText()); DragMouse(TranslatePointX(point, -1)); - if (gfx::RenderText::kDragToEndIfOutsideVerticalBounds) + if (gfx::RenderText::kDragToEndIfOutsideVerticalBounds) { EXPECT_EQ("abc def", GetSelectedText()); - else + } else { EXPECT_EQ("", GetSelectedText()); + } DragMouse(TranslatePointX(point, 1)); EXPECT_EQ("", GetSelectedText());
diff --git a/ui/views/style/platform_style_mac.mm b/ui/views/style/platform_style_mac.mm index 869d1f5..b42155a 100644 --- a/ui/views/style/platform_style_mac.mm +++ b/ui/views/style/platform_style_mac.mm
@@ -68,8 +68,9 @@ // static gfx::Range PlatformStyle::RangeToDeleteBackwards(const std::u16string& text, size_t cursor_position) { - if (cursor_position == 0) + if (cursor_position == 0) { return gfx::Range(); + } base::apple::ScopedCFTypeRef<CFStringRef> cf_string( CFStringCreateWithCharacters( @@ -79,8 +80,9 @@ cf_string.get(), base::checked_cast<CFIndex>(cursor_position - 1), kCFStringBackwardDeletionCluster); - if (range_to_delete.location == NSNotFound) + if (range_to_delete.location == NSNotFound) { return gfx::Range(); + } // The range needs to be reversed to undo correctly. return gfx::Range(base::checked_cast<size_t>(range_to_delete.location +
diff --git a/ui/views/test/capture_tracking_view.cc b/ui/views/test/capture_tracking_view.cc index 29de27f4..d66443b 100644 --- a/ui/views/test/capture_tracking_view.cc +++ b/ui/views/test/capture_tracking_view.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "ui/views/test/capture_tracking_view.h" + #include "ui/base/metadata/metadata_impl_macros.h" namespace views::test {
diff --git a/ui/views/test/desktop_test_views_delegate_aura.cc b/ui/views/test/desktop_test_views_delegate_aura.cc index 110eab7..18281d9a 100644 --- a/ui/views/test/desktop_test_views_delegate_aura.cc +++ b/ui/views/test/desktop_test_views_delegate_aura.cc
@@ -2,10 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/views/test/desktop_test_views_delegate.h" - #include "build/build_config.h" #include "ui/views/buildflags.h" +#include "ui/views/test/desktop_test_views_delegate.h" #include "ui/views/widget/native_widget_aura.h" #if BUILDFLAG(ENABLE_DESKTOP_AURA) @@ -24,8 +23,9 @@ #if BUILDFLAG(ENABLE_DESKTOP_AURA) // If we already have a native_widget, we don't have to try to come // up with one. - if (params->native_widget) + if (params->native_widget) { return; + } if (params->parent && params->type != views::Widget::InitParams::TYPE_MENU && params->type != views::Widget::InitParams::TYPE_TOOLTIP) {
diff --git a/ui/views/test/desktop_test_views_delegate_mac.mm b/ui/views/test/desktop_test_views_delegate_mac.mm index b884c9c..33c7f077 100644 --- a/ui/views/test/desktop_test_views_delegate_mac.mm +++ b/ui/views/test/desktop_test_views_delegate_mac.mm
@@ -17,8 +17,9 @@ internal::NativeWidgetDelegate* delegate) { // If we already have a native_widget, we don't have to try to come // up with one. - if (params->native_widget) + if (params->native_widget) { return; + } if (params->parent && params->type != views::Widget::InitParams::TYPE_MENU) { params->native_widget = new NativeWidgetMac(delegate);
diff --git a/ui/views/test/dialog_test.cc b/ui/views/test/dialog_test.cc index 3fab2648..7f8d5517 100644 --- a/ui/views/test/dialog_test.cc +++ b/ui/views/test/dialog_test.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "ui/views/test/dialog_test.h" + #include "ui/views/test/widget_test.h" #include "ui/views/widget/widget.h" #include "ui/views/window/dialog_delegate.h"
diff --git a/ui/views/test/event_generator_delegate_mac.mm b/ui/views/test/event_generator_delegate_mac.mm index 1f14a47..c2c6977 100644 --- a/ui/views/test/event_generator_delegate_mac.mm +++ b/ui/views/test/event_generator_delegate_mac.mm
@@ -2,12 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/memory/raw_ptr.h" - #import <Cocoa/Cocoa.h> #include <stddef.h> #import "base/apple/scoped_objc_class_swizzler.h" +#include "base/memory/raw_ptr.h" #include "base/memory/singleton.h" #include "base/time/time.h" #include "ui/display/screen.h" @@ -70,10 +69,12 @@ NSEventType left, NSEventType right, NSEventType other) { - if (flags & ui::EF_LEFT_MOUSE_BUTTON) + if (flags & ui::EF_LEFT_MOUSE_BUTTON) { return left; - if (flags & ui::EF_RIGHT_MOUSE_BUTTON) + } + if (flags & ui::EF_RIGHT_MOUSE_BUTTON) { return right; + } return other; } @@ -82,8 +83,9 @@ NSEventType EventTypeToNative(ui::EventType ui_event_type, int flags, NSUInteger* modifiers) { - if (modifiers) + if (modifiers) { *modifiers = EventFlagsToModifiers(flags); + } switch (ui_event_type) { case ui::EventType::kKeyPressed: return NSEventTypeKeyDown; @@ -197,12 +199,13 @@ NSUInteger click_count = 0; if (event_type == ui::EventType::kMousePressed || event_type == ui::EventType::kMouseReleased) { - if (flags & ui::EF_IS_TRIPLE_CLICK) + if (flags & ui::EF_IS_TRIPLE_CLICK) { click_count = 3; - else if (flags & ui::EF_IS_DOUBLE_CLICK) + } else if (flags & ui::EF_IS_DOUBLE_CLICK) { click_count = 2; - else + } else { click_count = 1; + } } NSPoint point = ConvertRootPointToTarget(window, point_in_root); NSUInteger modifiers = 0; @@ -387,8 +390,9 @@ // constructor was used, it should be the actual |target_window|. // TODO(tluk) fix use of the API so this doesn't have to be assumed. // (crbug.com/1071628) - if (!target_window) + if (!target_window) { target_window = root_window; + } swizzle_pressed_.reset(); swizzle_location_.reset(); @@ -476,8 +480,9 @@ [target_window_ sendEvent:ns_event]; break; case Target::WIDGET: - if ([fake_menu_ performKeyEquivalent:ns_event]) + if ([fake_menu_ performKeyEquivalent:ns_event]) { return; + } EmulateSendEvent(target_window_, ns_event); break; @@ -533,8 +538,9 @@ in_trackpad_scroll = false; // Assume a zero time delta means no fling. Just end the event phase. - if (event->time_stamp() == last_scroll_timestamp_) + if (event->time_stamp() == last_scroll_timestamp_) { return; + } // Otherwise, switch phases for the "fling". std::swap(event_phase, momentum_phase); @@ -635,25 +641,30 @@ // active generator. + (NSUInteger)pressedMouseButtons { ui::test::EventGenerator* generator = GetActiveGenerator(); - if (!generator) + if (!generator) { return [NSEventDonor pressedMouseButtons]; // Call original implementation. + } int flags = generator->flags(); NSUInteger bitmask = 0; - if (flags & ui::EF_LEFT_MOUSE_BUTTON) + if (flags & ui::EF_LEFT_MOUSE_BUTTON) { bitmask |= 1; - if (flags & ui::EF_RIGHT_MOUSE_BUTTON) + } + if (flags & ui::EF_RIGHT_MOUSE_BUTTON) { bitmask |= 1 << 1; - if (flags & ui::EF_MIDDLE_MOUSE_BUTTON) + } + if (flags & ui::EF_MIDDLE_MOUSE_BUTTON) { bitmask |= 1 << 2; + } return bitmask; } // Donate +[NSEvent mouseLocation] by retrieving the current position on screen. + (NSPoint)mouseLocation { ui::test::EventGenerator* generator = GetActiveGenerator(); - if (!generator) + if (!generator) { return [NSEventDonor mouseLocation]; // Call original implementation. + } // The location is the point in the root window which, for desktop widgets, is // the widget itself. @@ -668,8 +679,9 @@ @implementation NSApplicationDonor - (NSEvent*)currentEvent { - if (g_current_event) + if (g_current_event) { return g_current_event; + } // Find the original implementation and invoke it. return EventGeneratorDelegateMac::instance()->OriginalCurrentEvent(self,
diff --git a/ui/views/test/focus_manager_test.cc b/ui/views/test/focus_manager_test.cc index 47ea871..3794352 100644 --- a/ui/views/test/focus_manager_test.cc +++ b/ui/views/test/focus_manager_test.cc
@@ -37,8 +37,9 @@ } void FocusManagerTest::TearDown() { - if (focus_change_listener_) + if (focus_change_listener_) { GetFocusManager()->RemoveFocusChangeListener(focus_change_listener_); + } if (widget_focus_change_listener_) { WidgetFocusManager::GetInstance()->RemoveFocusChangeListener( widget_focus_change_listener_);
diff --git a/ui/views/test/menu_test_utils.cc b/ui/views/test/menu_test_utils.cc index 27d6a7b..a487bd3 100644 --- a/ui/views/test/menu_test_utils.cc +++ b/ui/views/test/menu_test_utils.cc
@@ -90,14 +90,16 @@ MenuControllerTestApi::~MenuControllerTestApi() = default; void MenuControllerTestApi::ClearState() { - if (!controller_) + if (!controller_) { return; + } controller_->ClearStateForTest(); } void MenuControllerTestApi::SetShowing(bool showing) { - if (!controller_) + if (!controller_) { return; + } controller_->showing_ = showing; } @@ -121,8 +123,9 @@ ReleaseRefTestViewsDelegate::~ReleaseRefTestViewsDelegate() = default; void ReleaseRefTestViewsDelegate::ReleaseRef() { - if (!release_ref_callback_.is_null()) + if (!release_ref_callback_.is_null()) { release_ref_callback_.Run(); + } } } // namespace views::test
diff --git a/ui/views/test/mock_drag_controller.h b/ui/views/test/mock_drag_controller.h index 47842aed..5172727b 100644 --- a/ui/views/test/mock_drag_controller.h +++ b/ui/views/test/mock_drag_controller.h
@@ -5,9 +5,8 @@ #ifndef UI_VIEWS_TEST_MOCK_DRAG_CONTROLLER_H_ #define UI_VIEWS_TEST_MOCK_DRAG_CONTROLLER_H_ -#include "ui/views/drag_controller.h" - #include "testing/gmock/include/gmock/gmock.h" +#include "ui/views/drag_controller.h" namespace gfx { class Point;
diff --git a/ui/views/test/native_widget_factory.cc b/ui/views/test/native_widget_factory.cc index 3265be3..b2bc092 100644 --- a/ui/views/test/native_widget_factory.cc +++ b/ui/views/test/native_widget_factory.cc
@@ -32,10 +32,9 @@ #endif #endif -NativeWidget* CreatePlatformNativeWidgetImpl( - Widget* widget, - uint32_t type, - bool* destroyed) { +NativeWidget* CreatePlatformNativeWidgetImpl(Widget* widget, + uint32_t type, + bool* destroyed) { return new TestPlatformNativeWidget<PlatformNativeWidget>( widget, type == kStubCapture, destroyed); }
diff --git a/ui/views/test/native_widget_factory.h b/ui/views/test/native_widget_factory.h index 84ae26d..9efe60bca 100644 --- a/ui/views/test/native_widget_factory.h +++ b/ui/views/test/native_widget_factory.h
@@ -25,10 +25,9 @@ // Creates the appropriate platform specific non-desktop NativeWidget // implementation. If |destroyed| is non-null it it set to true from the // destructor of the NativeWidget. -NativeWidget* CreatePlatformNativeWidgetImpl( - Widget* widget, - uint32_t behavior, - bool* destroyed); +NativeWidget* CreatePlatformNativeWidgetImpl(Widget* widget, + uint32_t behavior, + bool* destroyed); // Creates the appropriate platform specific non-desktop NativeWidget // implementation. Creates the appropriate platform specific desktop
diff --git a/ui/views/test/scoped_views_test_helper_cocoa.mm b/ui/views/test/scoped_views_test_helper_cocoa.mm index b15e46dc5..f17020e1 100644 --- a/ui/views/test/scoped_views_test_helper_cocoa.mm +++ b/ui/views/test/scoped_views_test_helper_cocoa.mm
@@ -2,10 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/views/test/scoped_views_test_helper.h" - #include <Cocoa/Cocoa.h> +#include "ui/views/test/scoped_views_test_helper.h" #include "ui/views/widget/widget.h" namespace views {
diff --git a/ui/views/test/test_layout_provider.cc b/ui/views/test/test_layout_provider.cc index 822fbfa..e2d6e19 100644 --- a/ui/views/test/test_layout_provider.cc +++ b/ui/views/test/test_layout_provider.cc
@@ -25,8 +25,9 @@ } int TestLayoutProvider::GetDistanceMetric(int metric) const { - if (distance_metrics_.count(metric)) + if (distance_metrics_.count(metric)) { return distance_metrics_.find(metric)->second; + } return LayoutProvider::GetDistanceMetric(metric); }
diff --git a/ui/views/test/test_platform_native_widget.h b/ui/views/test/test_platform_native_widget.h index e3d2b22..0761540 100644 --- a/ui/views/test/test_platform_native_widget.h +++ b/ui/views/test/test_platform_native_widget.h
@@ -46,24 +46,28 @@ TestPlatformNativeWidget& operator=(const TestPlatformNativeWidget&) = delete; ~TestPlatformNativeWidget() override { - if (destroyed_) + if (destroyed_) { *destroyed_ = true; - if (destroyed_callback_) + } + if (destroyed_callback_) { std::move(destroyed_callback_).Run(); + } } // PlatformNativeWidget: void SetCapture() override { - if (mock_capture_) + if (mock_capture_) { mouse_capture_ = true; - else + } else { PlatformNativeWidget::SetCapture(); + } } void ReleaseCapture() override { if (mock_capture_) { - if (mouse_capture_) + if (mouse_capture_) { PlatformNativeWidget::GetWidget()->OnMouseCaptureLost(); + } mouse_capture_ = false; } else { PlatformNativeWidget::ReleaseCapture();
diff --git a/ui/views/test/test_views.cc b/ui/views/test/test_views.cc index 2cabd4a..31662985 100644 --- a/ui/views/test/test_views.cc +++ b/ui/views/test/test_views.cc
@@ -72,8 +72,9 @@ GetWidget()->native_widget_private()->CloseNow(); } else { View::OnEvent(event); - if (!event->IsTouchEvent()) + if (!event->IsTouchEvent()) { event->SetHandled(); + } } } @@ -117,8 +118,9 @@ void EventCountView::RecordEvent(ui::Event* event) { ++event_count_[event->type()]; last_flags_ = event->flags(); - if (handle_mode_ == CONSUME_EVENTS) + if (handle_mode_ == CONSUME_EVENTS) { event->SetHandled(); + } } BEGIN_METADATA(EventCountView)
diff --git a/ui/views/test/test_views_delegate_aura.cc b/ui/views/test/test_views_delegate_aura.cc index be4cbea..105d4b6 100644 --- a/ui/views/test/test_views_delegate_aura.cc +++ b/ui/views/test/test_views_delegate_aura.cc
@@ -2,10 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/views/test/test_views_delegate.h" - #include "build/build_config.h" #include "ui/views/buildflags.h" +#include "ui/views/test/test_views_delegate.h" #if BUILDFLAG(ENABLE_DESKTOP_AURA) #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" @@ -27,8 +26,9 @@ Widget::InitParams* params, internal::NativeWidgetDelegate* delegate) { #if BUILDFLAG(IS_CHROMEOS) - if (!params->parent && !params->context) + if (!params->parent && !params->context) { params->context = context_; + } #endif if (params->opacity == Widget::InitParams::WindowOpacity::kInferred) { params->opacity = use_transparent_windows_ @@ -36,8 +36,9 @@ : Widget::InitParams::WindowOpacity::kOpaque; } #if BUILDFLAG(ENABLE_DESKTOP_AURA) - if (!params->native_widget && use_desktop_native_widgets_) + if (!params->native_widget && use_desktop_native_widgets_) { params->native_widget = new DesktopNativeWidgetAura(delegate); + } #endif // BUILDFLAG(ENABLE_DESKTOP_AURA) }
diff --git a/ui/views/test/test_views_delegate_mac.mm b/ui/views/test/test_views_delegate_mac.mm index d16933f..6be08ca 100644 --- a/ui/views/test/test_views_delegate_mac.mm +++ b/ui/views/test/test_views_delegate_mac.mm
@@ -21,8 +21,9 @@ : Widget::InitParams::WindowOpacity::kOpaque; } // TODO(tapted): This should return a *Desktop*NativeWidgetMac. - if (!params->native_widget && use_desktop_native_widgets_) + if (!params->native_widget && use_desktop_native_widgets_) { params->native_widget = new NativeWidgetMac(delegate); + } } ui::ContextFactory* TestViewsDelegate::GetContextFactory() {
diff --git a/ui/views/test/test_widget_observer.cc b/ui/views/test/test_widget_observer.cc index f75b5d8..0060c01 100644 --- a/ui/views/test/test_widget_observer.cc +++ b/ui/views/test/test_widget_observer.cc
@@ -14,8 +14,9 @@ } TestWidgetObserver::~TestWidgetObserver() { - if (widget_) + if (widget_) { widget_->RemoveObserver(this); + } CHECK(!IsInObserverList()); }
diff --git a/ui/views/test/view_skia_gold_pixel_diff_unittest.cc b/ui/views/test/view_skia_gold_pixel_diff_unittest.cc index 99093f36..82578460 100644 --- a/ui/views/test/view_skia_gold_pixel_diff_unittest.cc +++ b/ui/views/test/view_skia_gold_pixel_diff_unittest.cc
@@ -56,8 +56,9 @@ views::View* AddChildViewToWidget(views::Widget* widget) { auto view_unique_ptr = std::make_unique<views::View>(); - if (widget->client_view()) + if (widget->client_view()) { return widget->client_view()->AddChildView(std::move(view_unique_ptr)); + } return widget->SetContentsView(std::move(view_unique_ptr)); }
diff --git a/ui/views/test/views_test_helper.cc b/ui/views/test/views_test_helper.cc index 71b9e81..31e3c9ee 100644 --- a/ui/views/test/views_test_helper.cc +++ b/ui/views/test/views_test_helper.cc
@@ -16,8 +16,9 @@ void ViewsTestHelper::SetUpTestViewsDelegate( TestViewsDelegate* delegate, std::optional<ViewsDelegate::NativeWidgetFactory> factory) { - if (factory.has_value()) + if (factory.has_value()) { delegate->set_native_widget_factory(factory.value()); + } } void ViewsTestHelper::TearDownTestViewsDelegate(TestViewsDelegate* delegate) {}
diff --git a/ui/views/test/views_test_helper_mac.mm b/ui/views/test/views_test_helper_mac.mm index 21ede87b1..2ffce92 100644 --- a/ui/views/test/views_test_helper_mac.mm +++ b/ui/views/test/views_test_helper_mac.mm
@@ -51,8 +51,9 @@ // down, but on Mac we need to be more explicit. @autoreleasepool { NSArray* native_windows = NSApp.windows; - for (NSWindow* window : native_windows) + for (NSWindow* window : native_windows) { DCHECK(!Widget::GetWidgetForNativeWindow(window)) << "Widget not closed."; + } ui::test::EventGeneratorDelegate::SetFactoryFunction( ui::test::EventGeneratorDelegate::FactoryFunction());
diff --git a/ui/views/test/views_test_utils.cc b/ui/views/test/views_test_utils.cc index eb8ca9f01..51b608e 100644 --- a/ui/views/test/views_test_utils.cc +++ b/ui/views/test/views_test_utils.cc
@@ -27,10 +27,12 @@ return; } View* parent_view = view; - while (parent_view->parent()) + while (parent_view->parent()) { parent_view = parent_view->parent(); - if (parent_view->needs_layout()) + } + if (parent_view->needs_layout()) { parent_view->DeprecatedLayoutImmediately(); + } } bool IsOzoneBubblesUsingPlatformWidgets() {
diff --git a/ui/views/test/widget_animation_waiter.cc b/ui/views/test/widget_animation_waiter.cc index 68e903f2..63f58217 100644 --- a/ui/views/test/widget_animation_waiter.cc +++ b/ui/views/test/widget_animation_waiter.cc
@@ -46,9 +46,10 @@ void WidgetAnimationWaiter::OnLayerAnimationScheduled( ui::LayerAnimationSequence* sequence) { animation_scheduled_ = true; - if (!target_bounds_.IsEmpty()) + if (!target_bounds_.IsEmpty()) { EXPECT_NE(widget_observation_.GetSource()->GetLayer()->transform(), gfx::Transform()); + } } void WidgetAnimationWaiter::WaitForAnimation() {
diff --git a/ui/views/test/widget_test.cc b/ui/views/test/widget_test.cc index dc26e5ce..a482048 100644 --- a/ui/views/test/widget_test.cc +++ b/ui/views/test/widget_test.cc
@@ -37,16 +37,18 @@ } // namespace View* AnyViewMatchingPredicate(View* view, const ViewPredicate& predicate) { - if (predicate.Run(view)) + if (predicate.Run(view)) { return view; + } // Note that we randomize the order of the children, to avoid this function // always choosing the same View to return out of a set of possible Views. // If we didn't do this, client code could accidentally depend on a specific // search order. for (views::View* child : ShuffledChildren(view)) { auto* found = AnyViewMatchingPredicate(child, predicate); - if (found) + if (found) { return found; + } } return nullptr; } @@ -192,8 +194,9 @@ } TestDesktopWidgetDelegate::~TestDesktopWidgetDelegate() { - if (widget_) + if (widget_) { widget_->CloseNow(); + } EXPECT_FALSE(widget_); }
diff --git a/ui/views/test/widget_test_aura.cc b/ui/views/test/widget_test_aura.cc index 8884f9f..c9ae263 100644 --- a/ui/views/test/widget_test_aura.cc +++ b/ui/views/test/widget_test_aura.cc
@@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/views/test/widget_test.h" - #include "base/memory/raw_ptr.h" #include "base/memory/raw_ptr_exclusion.h" #include "build/build_config.h" @@ -13,6 +11,7 @@ #include "ui/aura/window_delegate.h" #include "ui/aura/window_tree_host.h" #include "ui/compositor/layer.h" +#include "ui/views/test/widget_test.h" #include "ui/views/widget/widget.h" #include "ui/wm/core/shadow_controller.h" @@ -39,15 +38,18 @@ return *first == nullptr; } - if (child == *first) + if (child == *first) { *first = nullptr; + } - if (FindLayersInOrder(child->children(), first, second)) + if (FindLayersInOrder(child->children(), first, second)) { return true; + } // If second is cleared without success, exit early with failure. - if (!*second) + if (!*second) { return false; + } } return false; } @@ -63,8 +65,9 @@ BOOL CALLBACK FindAllWindowsCallback(HWND hwnd, LPARAM param) { FindAllWindowsData* data = reinterpret_cast<FindAllWindowsData*>(param); if (aura::WindowTreeHost* host = - aura::WindowTreeHost::GetForAcceleratedWidget(hwnd)) + aura::WindowTreeHost::GetForAcceleratedWidget(hwnd)) { data->windows->push_back(host->window()); + } return TRUE; } @@ -87,8 +90,9 @@ // Chrome OS browser tests must use ash::Shell::GetAllRootWindows. DCHECK(aura_test_helper) << "Can't find all widgets without a test helper"; #endif - if (aura_test_helper) + if (aura_test_helper) { roots.push_back(aura_test_helper->GetContext()); + } return roots; } @@ -149,14 +153,16 @@ // static bool WidgetTest::WidgetHasInProcessShadow(Widget* widget) { aura::Window* window = widget->GetNativeWindow(); - if (wm::ShadowController::GetShadowForWindow(window)) + if (wm::ShadowController::GetShadowForWindow(window)) { return true; + } // If the Widget's native window is the content window for a // DesktopWindowTreeHost, then giving the root window a shadow also has the // effect of drawing a shadow around the window. - if (window->parent() == window->GetRootWindow()) + if (window->parent() == window->GetRootWindow()) { return wm::ShadowController::GetShadowForWindow(window->GetRootWindow()); + } return false; } @@ -164,8 +170,9 @@ // static Widget::Widgets WidgetTest::GetAllWidgets() { Widget::Widgets all_widgets; - for (aura::Window* window : GetAllTopLevelWindows()) + for (aura::Window* window : GetAllTopLevelWindows()) { Widget::GetAllChildWidgets(window->GetRootWindow(), &all_widgets); + } return all_widgets; }
diff --git a/ui/views/test/widget_test_mac.mm b/ui/views/test/widget_test_mac.mm index 2521d65..9f94ec1 100644 --- a/ui/views/test/widget_test_mac.mm +++ b/ui/views/test/widget_test_mac.mm
@@ -59,11 +59,13 @@ NSWindow* second = below->GetNativeWindow().GetNativeNSWindow(); for (NSWindow* window in NSApp.orderedWindows) { - if (window == second) + if (window == second) { return !first; + } - if (window == first) + if (window == first) { first = nil; + } } return false; } @@ -100,8 +102,9 @@ Widget::Widgets WidgetTest::GetAllWidgets() { Widget::Widgets all_widgets; for (NSWindow* window : [NSApp windows]) { - if (Widget* widget = Widget::GetWidgetForNativeWindow(window)) + if (Widget* widget = Widget::GetWidgetForNativeWindow(window)) { all_widgets.insert(widget); + } } return all_widgets; }
diff --git a/ui/views/test/widget_test_unittest.cc b/ui/views/test/widget_test_unittest.cc index 9b7c923b..643a384 100644 --- a/ui/views/test/widget_test_unittest.cc +++ b/ui/views/test/widget_test_unittest.cc
@@ -28,8 +28,9 @@ std::vector<Widget*> widgets, const char* message) { SCOPED_TRACE(message); - for (Widget* widget : widgets) + for (Widget* widget : widgets) { EXPECT_EQ(1u, expected->erase(widget)); + } widgets[0]->CloseNow(); EXPECT_TRUE(base::ranges::equal(*expected, WidgetTest::GetAllWidgets())); }
diff --git a/ui/views/touchui/touch_selection_controller_impl.cc b/ui/views/touchui/touch_selection_controller_impl.cc index 51a3dc9..5da87e3b 100644 --- a/ui/views/touchui/touch_selection_controller_impl.cc +++ b/ui/views/touchui/touch_selection_controller_impl.cc
@@ -313,14 +313,16 @@ // or right handle image. If selection handles are dragged to be located // at the same spot, the |bound|'s type here will be CENTER for both of // them. In this case do not update the type of the |selection_bound_|. - if (bound.type() != gfx::SelectionBound::CENTER || is_cursor_handle_) + if (bound.type() != gfx::SelectionBound::CENTER || is_cursor_handle_) { update_bound_type = true; + } } if (update_bound_type) { selection_bound_.set_type(bound.type()); handle_image_ = GetHandleVectorIcon(bound.type()); - if (is_visible) + if (is_visible) { SchedulePaint(); + } } if (is_visible) { @@ -381,8 +383,9 @@ aura::Window* client_window = client_view_->GetNativeView(); client_widget_ = Widget::GetTopLevelWidgetForNativeView(client_window); // Observe client widget moves and resizes to update the selection handles. - if (client_widget_) + if (client_widget_) { client_widget_->AddObserver(this); + } // Observe certain event types sent to any event target, to hide this ui. aura::Env* env = aura::Env::GetInstance(); @@ -582,8 +585,9 @@ bool TouchSelectionControllerImpl::ShouldShowHandleFor( const gfx::SelectionBound& bound) const { - if (bound.GetHeight() < kSelectionHandleBarMinHeight) + if (bound.GetHeight() < kSelectionHandleBarMinHeight) { return false; + } gfx::Rect client_bounds = client_view_->GetBounds(); client_bounds.Inset( gfx::Insets::TLBR(0, 0, -kSelectionHandleBarBottomAllowance, 0)); @@ -632,8 +636,9 @@ if (event.IsMouseEvent()) { auto* cursor = aura::client::GetCursorClient( client_view_->GetNativeView()->GetRootWindow()); - if (cursor && !cursor->IsMouseEventsEnabled()) + if (cursor && !cursor->IsMouseEventsEnabled()) { return; + } // Windows OS unhandled WM_POINTER* may be redispatched as WM_MOUSE*. // Avoid adjusting the handles on synthesized events or events generated @@ -655,8 +660,9 @@ } gfx::Rect menu_anchor = GetQuickMenuAnchorRect(); - if (menu_anchor == gfx::Rect()) + if (menu_anchor == gfx::Rect()) { return; + } gfx::Size handle_image_size; if (selection_handle_1_widget_->IsClosed() || @@ -673,8 +679,9 @@ } void TouchSelectionControllerImpl::StartQuickMenuTimer() { - if (quick_menu_timer_.IsRunning()) + if (quick_menu_timer_.IsRunning()) { return; + } quick_menu_timer_.Start(FROM_HERE, base::Milliseconds(kQuickMenuDelayInMs), this, &TouchSelectionControllerImpl::QuickMenuTimerFired); @@ -711,14 +718,15 @@ // the middle of the end points on the top. Else, we show it above the visible // handle. If no handle is visible, we do not show the menu. gfx::Rect menu_anchor; - if (ShouldShowHandleFor(b1) && ShouldShowHandleFor(b2)) + if (ShouldShowHandleFor(b1) && ShouldShowHandleFor(b2)) { menu_anchor = gfx::RectBetweenSelectionBounds(b1_in_screen, b2_in_screen); - else if (ShouldShowHandleFor(b1)) + } else if (ShouldShowHandleFor(b1)) { menu_anchor = BoundToRect(b1_in_screen); - else if (ShouldShowHandleFor(b2)) + } else if (ShouldShowHandleFor(b2)) { menu_anchor = BoundToRect(b2_in_screen); - else + } else { return menu_anchor; + } // Enlarge the anchor rect so that the menu is offset from the text at least // by the same distance the handles are offset from the text.
diff --git a/ui/views/touchui/touch_selection_controller_impl_unittest.cc b/ui/views/touchui/touch_selection_controller_impl_unittest.cc index 7691c28..d585799 100644 --- a/ui/views/touchui/touch_selection_controller_impl_unittest.cc +++ b/ui/views/touchui/touch_selection_controller_impl_unittest.cc
@@ -63,8 +63,9 @@ b1.edge_start().x() < b2.edge_start().x()) { return -1; } - if (b1 == b2) + if (b1 == b2) { return 0; + } return 1; } @@ -167,10 +168,11 @@ void SimulateSelectionHandleDrag(gfx::Vector2d v, int selection_handle) { TouchSelectionControllerImpl* controller = GetSelectionController(); views::View* handle = nullptr; - if (selection_handle == 1) + if (selection_handle == 1) { handle = controller->GetHandle1View(); - else + } else { handle = controller->GetHandle2View(); + } gfx::Point grip_location = gfx::Point(handle->size().width() / 2, handle->size().height() / 2); @@ -315,8 +317,9 @@ CreateTextfield(); std::string some_text("some text"); std::string textfield_text; - for (int i = 0; i < 10; ++i) + for (int i = 0; i < 10; ++i) { textfield_text += some_text; + } textfield_->SetText(ASCIIToUTF16(textfield_text)); // Tap the textfield to invoke selection. @@ -1110,14 +1113,16 @@ void ConvertPointToScreen(gfx::Point* point) override { aura::client::ScreenPositionClient* screen_position_client = aura::client::GetScreenPositionClient(window_->GetRootWindow()); - if (screen_position_client) + if (screen_position_client) { screen_position_client->ConvertPointToScreen(window_, point); + } } void ConvertPointFromScreen(gfx::Point* point) override { aura::client::ScreenPositionClient* screen_position_client = aura::client::GetScreenPositionClient(window_->GetRootWindow()); - if (screen_position_client) + if (screen_position_client) { screen_position_client->ConvertPointFromScreen(window_, point); + } } void OpenContextMenu(const gfx::Point& anchor) override { NOTREACHED(); } void DestroyTouchSelection() override { NOTREACHED(); }
diff --git a/ui/views/touchui/touch_selection_menu_runner_views.cc b/ui/views/touchui/touch_selection_menu_runner_views.cc index bf77eae..07bb99c5 100644 --- a/ui/views/touchui/touch_selection_menu_runner_views.cc +++ b/ui/views/touchui/touch_selection_menu_runner_views.cc
@@ -78,16 +78,18 @@ DCHECK(client); CloseMenu(); - if (!TouchSelectionMenuViews::IsMenuAvailable(client.get())) + if (!TouchSelectionMenuViews::IsMenuAvailable(client.get())) { return; + } menu_ = new TouchSelectionMenuViews(this, client, context); menu_->ShowMenu(anchor_rect, handle_image_size); } void TouchSelectionMenuRunnerViews::CloseMenu() { - if (!menu_) + if (!menu_) { return; + } // Closing the menu sets |menu_| to nullptr and eventually deletes the object. menu_->CloseMenu();
diff --git a/ui/views/touchui/touch_selection_menu_views.cc b/ui/views/touchui/touch_selection_menu_views.cc index 67473b2..6a50768 100644 --- a/ui/views/touchui/touch_selection_menu_views.cc +++ b/ui/views/touchui/touch_selection_menu_views.cc
@@ -94,9 +94,10 @@ // passing down the cumulative width occupied by the handles within // |anchor_rect| plus the handle image height instead of |handle_image_size|. // Perhaps we should also allow for some minimum padding. - if (menu_width > anchor_rect.width() - handle_image_size.width()) + if (menu_width > anchor_rect.width() - handle_image_size.width()) { adjusted_anchor_rect.Inset( gfx::Insets::TLBR(0, 0, -handle_image_size.height(), 0)); + } adjusted_anchor_rect.Outset(kMenuAnchorRectPadding); SetAnchorRect(adjusted_anchor_rect); @@ -129,12 +130,14 @@ } void TouchSelectionMenuViews::CloseMenu() { - if (owner_) + if (owner_) { DisconnectOwner(); + } // Closing the widget will self-destroy this object. Widget* widget = GetWidget(); - if (widget && !widget->IsClosed()) + if (widget && !widget->IsClosed()) { widget->Close(); + } } TouchSelectionMenuViews::~TouchSelectionMenuViews() = default; @@ -199,8 +202,9 @@ void TouchSelectionMenuViews::WindowClosing() { DCHECK(!owner_ || owner_->menu_ == this); BubbleDialogDelegateView::WindowClosing(); - if (owner_) + if (owner_) { DisconnectOwner(); + } } void TouchSelectionMenuViews::ButtonPressed(int command,
diff --git a/ui/views/view_model.cc b/ui/views/view_model.cc index e391d90a..06e09a4 100644 --- a/ui/views/view_model.cc +++ b/ui/views/view_model.cc
@@ -24,8 +24,9 @@ check_index(index); check_index(target_index); - if (index == target_index) + if (index == target_index) { return; + } Entry entry(entries_[index]); entries_.erase(entries_.begin() + static_cast<ptrdiff_t>(index)); entries_.insert(entries_.begin() + static_cast<ptrdiff_t>(target_index), @@ -35,13 +36,15 @@ void ViewModelBase::MoveViewOnly(size_t index, size_t target_index) { if (target_index < index) { View* view = entries_[index].view; - for (size_t i = index; i > target_index; --i) + for (size_t i = index; i > target_index; --i) { entries_[i].view = entries_[i - 1].view; + } entries_[target_index].view = view; } else if (target_index > index) { View* view = entries_[index].view; - for (size_t i = index; i < target_index; ++i) + for (size_t i = index; i < target_index; ++i) { entries_[i].view = entries_[i + 1].view; + } entries_[target_index].view = view; } } @@ -49,8 +52,9 @@ void ViewModelBase::Clear() { Entries entries; entries.swap(entries_); - for (const auto& entry : entries) + for (const auto& entry : entries) { delete entry.view; + } } std::optional<size_t> ViewModelBase::GetIndexOfView(const View* view) const {
diff --git a/ui/views/view_model_unittest.cc b/ui/views/view_model_unittest.cc index 666768ec..bda5044 100644 --- a/ui/views/view_model_unittest.cc +++ b/ui/views/view_model_unittest.cc
@@ -18,8 +18,9 @@ std::string BoundsString(const ViewModel& model) { std::string result; for (size_t i = 0; i < model.view_size(); ++i) { - if (i != 0) + if (i != 0) { result += " "; + } result += base::NumberToString(model.ideal_bounds(i).x()); } return result; @@ -29,8 +30,9 @@ std::string ViewIDsString(const ViewModel& model) { std::string result; for (size_t i = 0; i < model.view_size(); ++i) { - if (i != 0) + if (i != 0) { result += " "; + } result += base::NumberToString(model.view_at(i)->GetID()); } return result;
diff --git a/ui/views/view_model_utils.cc b/ui/views/view_model_utils.cc index f3b37f4e9..9406255 100644 --- a/ui/views/view_model_utils.cc +++ b/ui/views/view_model_utils.cc
@@ -23,8 +23,9 @@ // static void ViewModelUtils::SetViewBoundsToIdealBounds(const ViewModelBase& model) { - for (auto& entry : model.entries()) + for (auto& entry : model.entries()) { entry.view->SetBoundsRect(entry.ideal_bounds); + } } // static @@ -49,12 +50,14 @@ for (; iter->view != view; ++iter) { const int mid_point = primary_axis_coordinate( is_horizontal, iter->ideal_bounds.CenterPoint()); - if (value < mid_point) + if (value < mid_point) { return static_cast<size_t>(std::distance(entries.begin(), iter)); + } } - if (std::next(iter) == entries.end()) + if (std::next(iter) == entries.end()) { return static_cast<size_t>(std::distance(entries.begin(), iter)); + } // For indices after the current index ignore the bounds of the view being // dragged. This keeps the view from bouncing around as moved. @@ -66,8 +69,9 @@ const int mid_point = primary_axis_coordinate( is_horizontal, iter->ideal_bounds.CenterPoint()) - delta; - if (value < mid_point) + if (value < mid_point) { return static_cast<size_t>(std::distance(entries.begin(), iter)) - 1; + } } return entries.size() - 1; }
diff --git a/ui/views/view_shadow.cc b/ui/views/view_shadow.cc index f89a747..814130f 100644 --- a/ui/views/view_shadow.cc +++ b/ui/views/view_shadow.cc
@@ -13,8 +13,9 @@ ViewShadow::ViewShadow(View* view, int elevation) : view_(view), shadow_(std::make_unique<ui::Shadow>()) { - if (!view_->layer()) + if (!view_->layer()) { view_->SetPaintToLayer(); + } shadow_->Init(elevation); view_->AddLayerToRegion(shadow_->layer(), LayerRegion::kBelow); shadow_->SetContentBounds(view_->layer()->bounds()); @@ -23,8 +24,9 @@ } ViewShadow::~ViewShadow() { - if (view_) + if (view_) { OnViewIsDeleting(view_); + } } void ViewShadow::SetRoundedCornerRadius(int corner_radius) { @@ -32,8 +34,9 @@ } void ViewShadow::OnLayerRecreated(ui::Layer* old_layer) { - if (!view_) + if (!view_) { return; + } view_->RemoveLayerFromRegionsKeepInLayerTree(old_layer); view_->AddLayerToRegion(shadow_->layer(), LayerRegion::kBelow); }
diff --git a/ui/views/view_targeter.cc b/ui/views/view_targeter.cc index af2c062..80cbea9 100644 --- a/ui/views/view_targeter.cc +++ b/ui/views/view_targeter.cc
@@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "ui/views/view_targeter.h" + #include <memory> #include <utility> -#include "ui/views/view_targeter.h" - #include "ui/events/event_target.h" #include "ui/views/focus/focus_manager.h" #include "ui/views/view.h" @@ -39,11 +39,13 @@ ui::Event* event) { View* const view = static_cast<View*>(root); - if (event->IsKeyEvent()) + if (event->IsKeyEvent()) { return FindTargetForKeyEvent(view, *event->AsKeyEvent()); + } - if (event->IsScrollEvent()) + if (event->IsScrollEvent()) { return FindTargetForScrollEvent(view, *event->AsScrollEvent()); + } CHECK(event->IsGestureEvent()) << "ViewTargeter does not yet support this event type."; @@ -57,8 +59,9 @@ ui::EventTarget* ViewTargeter::FindNextBestTarget( ui::EventTarget* previous_target, ui::Event* event) { - if (!previous_target) + if (!previous_target) { return nullptr; + } if (event->IsGestureEvent()) { ui::GestureEvent* gesture = event->AsGestureEvent(); @@ -72,8 +75,9 @@ } View* ViewTargeter::FindTargetForKeyEvent(View* root, const ui::KeyEvent& key) { - if (root->GetFocusManager()) + if (root->GetFocusManager()) { return root->GetFocusManager()->GetFocusedView(); + } return nullptr; }
diff --git a/ui/views/view_targeter_delegate.cc b/ui/views/view_targeter_delegate.cc index c8c5678..811d7b6 100644 --- a/ui/views/view_targeter_delegate.cc +++ b/ui/views/view_targeter_delegate.cc
@@ -46,23 +46,27 @@ View::Views children = root->GetChildrenInZOrder(); DCHECK_EQ(root->children().size(), children.size()); for (views::View* child : base::Reversed(children)) { - if (!child->GetCanProcessEventsWithinSubtree() || !child->GetEnabled()) + if (!child->GetCanProcessEventsWithinSubtree() || !child->GetEnabled()) { continue; + } // Ignore any children which are invisible or do not intersect |rect|. - if (!child->GetVisible()) + if (!child->GetVisible()) { continue; + } gfx::RectF rect_in_child_coords_f(rect); View::ConvertRectToTarget(root, child, &rect_in_child_coords_f); gfx::Rect rect_in_child_coords = gfx::ToEnclosingRect(rect_in_child_coords_f); - if (!child->HitTestRect(rect_in_child_coords)) + if (!child->HitTestRect(rect_in_child_coords)) { continue; + } View* cur_view = child->GetEventHandlerForRect(rect_in_child_coords); - if (views::UsePointBasedTargeting(rect)) + if (views::UsePointBasedTargeting(rect)) { return cur_view; + } gfx::RectF cur_view_bounds_f(cur_view->GetLocalBounds()); View::ConvertRectToTarget(cur_view, root, &cur_view_bounds_f); @@ -81,13 +85,15 @@ // Rect-based targeting has not yielded any candidates so far. Check // if point-based targeting would have selected |cur_view|. gfx::Point point_in_child_coords(rect_in_child_coords.CenterPoint()); - if (child->HitTestPoint(point_in_child_coords)) + if (child->HitTestPoint(point_in_child_coords)) { point_view = child->GetEventHandlerForPoint(point_in_child_coords); + } } } - if (views::UsePointBasedTargeting(rect) || (!rect_view && !point_view)) + if (views::UsePointBasedTargeting(rect) || (!rect_view && !point_view)) { return root; + } return rect_view ? rect_view : point_view; }
diff --git a/ui/views/view_tracker.cc b/ui/views/view_tracker.cc index ee8a319..51232b8 100644 --- a/ui/views/view_tracker.cc +++ b/ui/views/view_tracker.cc
@@ -18,13 +18,15 @@ ViewTracker::~ViewTracker() = default; void ViewTracker::SetView(View* view) { - if (view == view_) + if (view == view_) { return; + } observation_.Reset(); view_ = view; - if (view_) + if (view_) { observation_.Observe(view_.get()); + } } void ViewTracker::SetIsDeletingCallback(
diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc index 9671852e..c5a0f55 100644 --- a/ui/views/view_unittest.cc +++ b/ui/views/view_unittest.cc
@@ -88,24 +88,27 @@ // Returns true if |ancestor| is an ancestor of |layer|. bool LayerIsAncestor(const ui::Layer* ancestor, const ui::Layer* layer) { - while (layer && layer != ancestor) + while (layer && layer != ancestor) { layer = layer->parent(); + } return layer == ancestor; } // Convenience functions for walking a View tree. const views::View* FirstView(const views::View* view) { const views::View* v = view; - while (!v->children().empty()) + while (!v->children().empty()) { v = v->children().front(); + } return v; } const views::View* NextView(const views::View* view) { const views::View* v = view; const views::View* parent = v->parent(); - if (!parent) + if (!parent) { return nullptr; + } const auto next = std::next(parent->FindChild(v)); return (next == parent->children().cend()) ? parent : FirstView(*next); } @@ -113,15 +116,17 @@ // Convenience functions for walking a Layer tree. const ui::Layer* FirstLayer(const ui::Layer* layer) { const ui::Layer* l = layer; - while (!l->children().empty()) + while (!l->children().empty()) { l = l->children().front(); + } return l; } const ui::Layer* NextLayer(const ui::Layer* layer) { const ui::Layer* parent = layer->parent(); - if (!parent) + if (!parent) { return nullptr; + } const std::vector<raw_ptr<ui::Layer, VectorExperimental>> children = parent->children(); const auto i = base::ranges::find(children, layer) + 1; @@ -136,35 +141,42 @@ const ui::Layer* l = FirstLayer(layer); while (v && l) { // Find the view with a layer. - while (v && !v->layer()) + while (v && !v->layer()) { v = NextView(v); + } EXPECT_TRUE(v); - if (!v) + if (!v) { return false; + } // Check if the View tree and the Layer tree are in sync. EXPECT_EQ(l, v->layer()); - if (v->layer() != l) + if (v->layer() != l) { return false; + } // Check if the visibility states of the View and the Layer are in sync. EXPECT_EQ(l->IsVisible(), v->IsDrawn()); if (v->IsDrawn() != l->IsVisible()) { - for (const views::View* vv = v; vv; vv = vv->parent()) + for (const views::View* vv = v; vv; vv = vv->parent()) { LOG(ERROR) << "V: " << vv << " " << vv->GetVisible() << " " << vv->IsDrawn() << " " << vv->layer(); - for (const ui::Layer* ll = l; ll; ll = ll->parent()) + } + for (const ui::Layer* ll = l; ll; ll = ll->parent()) { LOG(ERROR) << "L: " << ll << " " << ll->IsVisible(); + } return false; } // Check if the size of the View and the Layer are in sync. EXPECT_EQ(l->bounds(), v->bounds()); - if (v->bounds() != l->bounds()) + if (v->bounds() != l->bounds()) { return false; + } - if (v == view || l == layer) + if (v == view || l == layer) { return v == view && l == layer; + } v = NextView(v); l = NextLayer(l); @@ -175,27 +187,32 @@ // Constructs a View tree with the specified depth. void ConstructTree(views::View* view, int depth) { - if (depth == 0) + if (depth == 0) { return; + } int count = base::RandInt(1, 5); for (int i = 0; i < count; i++) { views::View* v = new views::View; view->AddChildView(v); - if (base::RandDouble() > 0.5) + if (base::RandDouble() > 0.5) { v->SetPaintToLayer(); - if (base::RandDouble() < 0.2) + } + if (base::RandDouble() < 0.2) { v->SetVisible(false); + } ConstructTree(v, depth - 1); } } void ScrambleTree(views::View* view) { - if (view->children().empty()) + if (view->children().empty()) { return; + } - for (views::View* child : view->children()) + for (views::View* child : view->children()) { ScrambleTree(child); + } size_t count = view->children().size(); if (count > 1) { @@ -211,11 +228,13 @@ } } - if (!view->layer() && base::RandDouble() < 0.1) + if (!view->layer() && base::RandDouble() < 0.1) { view->SetPaintToLayer(); + } - if (base::RandDouble() < 0.1) + if (base::RandDouble() < 0.1) { view->SetVisible(!view->GetVisible()); + } } } // namespace @@ -2945,8 +2964,9 @@ widget_->Init(std::move(params)); View* root = widget_->GetRootView(); view_ = root->AddChildView(std::move(view)); - if (show_after_init) + if (show_after_init) { widget_->Show(); + } EXPECT_TRUE(widget_->GetFocusManager()); } @@ -4380,14 +4400,16 @@ View* child1 = root->AddChildView(std::make_unique<View>()); - for (size_t i = 0; i < 2; ++i) + for (size_t i = 0; i < 2; ++i) { root->AddChildView(std::make_unique<View>()); + } View* foo = child1->AddChildView(std::make_unique<View>()); // Add some nodes to |foo|. - for (size_t i = 0; i < 3; ++i) + for (size_t i = 0; i < 3; ++i) { foo->AddChildView(std::make_unique<View>()); + } EXPECT_EQ(3u, root->children().size()); EXPECT_EQ(1u, child1->children().size()); @@ -6205,8 +6227,9 @@ } void RemovedFromWidget() override { - if (removed_from_widget_) + if (removed_from_widget_) { std::move(removed_from_widget_).Run(); + } } private: @@ -6280,8 +6303,9 @@ const size_t kNumChildren = 4; auto view = std::make_unique<OrderableView>(); view->SetPaintToLayer(); - for (size_t i = 0; i < kNumChildren; ++i) + for (size_t i = 0; i < kNumChildren; ++i) { AddViewWithChildLayer(view.get()); + } View::Views children = view->GetChildrenInZOrder(); const std::vector<raw_ptr<ui::Layer, VectorExperimental>>& layers = view->layer()->children();
diff --git a/ui/views/view_unittest_aura.cc b/ui/views/view_unittest_aura.cc index d6cc10e..b16b0355 100644 --- a/ui/views/view_unittest_aura.cc +++ b/ui/views/view_unittest_aura.cc
@@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/views/view.h" - #include <memory> #include "ui/aura/window.h" @@ -12,6 +10,7 @@ #include "ui/compositor/test/test_layers.h" #include "ui/gfx/geometry/rect.h" #include "ui/views/test/views_test_base.h" +#include "ui/views/view.h" #include "ui/views/view_constants_aura.h" #include "ui/views/widget/widget.h" #include "ui/wm/core/window_util.h"
diff --git a/ui/views/view_unittest_mac.mm b/ui/views/view_unittest_mac.mm index c78a08a..6dbb1205 100644 --- a/ui/views/view_unittest_mac.mm +++ b/ui/views/view_unittest_mac.mm
@@ -2,14 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/views/view.h" - #import <Cocoa/Cocoa.h> #include "ui/base/metadata/metadata_header_macros.h" #include "ui/base/metadata/metadata_impl_macros.h" #include "ui/events/gesture_event_details.h" #include "ui/views/test/widget_test.h" +#include "ui/views/view.h" // We can't create NSEventTypeSwipe using normal means, and rely on duck typing // instead.
diff --git a/ui/views/view_utils.cc b/ui/views/view_utils.cc index bc9da36..1565ea9f 100644 --- a/ui/views/view_utils.cc +++ b/ui/views/view_utils.cc
@@ -21,8 +21,9 @@ namespace { std::string GetViewTreeAsString(View* view) { - if (!view->parent()) + if (!view->parent()) { return view->GetClassName(); + } return GetViewTreeAsString(view->parent()) + " -> " + view->GetClassName(); } @@ -64,8 +65,9 @@ } std::vector<debug::ViewDebugWrapper*> child_ptrs; - for (auto& child : children_) + for (auto& child : children_) { child_ptrs.push_back(child.get()); + } return child_ptrs; }
diff --git a/ui/views/views_test_suite.h b/ui/views/views_test_suite.h index 902ebf4..a32572d 100644 --- a/ui/views/views_test_suite.h +++ b/ui/views/views_test_suite.h
@@ -7,7 +7,6 @@ #include "base/memory/raw_ptr.h" #include "base/test/test_suite.h" - #include "build/build_config.h" #if defined(USE_AURA)
diff --git a/ui/views/widget/any_widget_observer_singleton.cc b/ui/views/widget/any_widget_observer_singleton.cc index 38fc8a82..3a70c88 100644 --- a/ui/views/widget/any_widget_observer_singleton.cc +++ b/ui/views/widget/any_widget_observer_singleton.cc
@@ -3,10 +3,10 @@ // found in the LICENSE file. #include "ui/views/widget/any_widget_observer_singleton.h" -#include "ui/views/widget/any_widget_observer.h" #include "base/no_destructor.h" #include "base/observer_list.h" +#include "ui/views/widget/any_widget_observer.h" namespace views::internal {
diff --git a/ui/views/widget/ax_native_widget_mac_unittest.mm b/ui/views/widget/ax_native_widget_mac_unittest.mm index 9182d06..e5a0ebf 100644 --- a/ui/views/widget/ax_native_widget_mac_unittest.mm +++ b/ui/views/widget/ax_native_widget_mac_unittest.mm
@@ -717,9 +717,8 @@ AXObjectHandlesSelector(ax_node, @selector(setAccessibilityValue:))); EXPECT_NSEQ(NSAccessibilityTextFieldRole, ax_node.accessibilityRole); - NSString* kShownValue = - @"•" - @"••••••••••••••••"; + NSString* kShownValue = @"•" + @"••••••••••••••••"; // Sanity check. EXPECT_EQ(static_cast<NSUInteger>(kTestStringLength), [kShownValue length]); EXPECT_NSEQ(kShownValue, ax_node.accessibilityValue);
diff --git a/ui/views/widget/desktop_aura/desktop_capture_client.cc b/ui/views/widget/desktop_aura/desktop_capture_client.cc index 78bdbb3..a89aeade 100644 --- a/ui/views/widget/desktop_aura/desktop_capture_client.cc +++ b/ui/views/widget/desktop_aura/desktop_capture_client.cc
@@ -32,15 +32,17 @@ // static aura::Window* DesktopCaptureClient::GetCaptureWindowGlobal() { for (const auto& client : *clients_) { - if (client && client->capture_window_) + if (client && client->capture_window_) { return client->capture_window_; + } } return nullptr; } DesktopCaptureClient::DesktopCaptureClient(aura::Window* root) : root_(root) { - if (!clients_) + if (!clients_) { clients_ = new ClientSet(&CompareWeakPtrs); + } clients_->insert(weak_factory_.GetWeakPtr()); aura::client::SetCaptureClient(root, this); } @@ -51,8 +53,9 @@ } void DesktopCaptureClient::SetCapture(aura::Window* new_capture_window) { - if (capture_window_ == new_capture_window) + if (capture_window_ == new_capture_window) { return; + } // We should only ever be told to capture a child of |root_|. Otherwise // things are going to be really confused. @@ -71,8 +74,9 @@ tracker.Add(new_capture_window); aura::Env::GetInstance()->gesture_recognizer()->CancelActiveTouchesExcept( new_capture_window); - if (!tracker.Contains(new_capture_window)) + if (!tracker.Contains(new_capture_window)) { new_capture_window = nullptr; + } } capture_window_ = new_capture_window; @@ -103,8 +107,9 @@ } void DesktopCaptureClient::ReleaseCapture(aura::Window* window) { - if (capture_window_ == window) + if (capture_window_ == window) { SetCapture(nullptr); + } } aura::Window* DesktopCaptureClient::GetCaptureWindow() {
diff --git a/ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc b/ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc index ebe809c5..988569b 100644 --- a/ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc +++ b/ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc
@@ -123,8 +123,7 @@ DesktopDragDropClientOzone::DesktopDragDropClientOzone( aura::Window* root_window, ui::WmDragHandler* drag_handler) - : root_window_(root_window), - drag_handler_(drag_handler) {} + : root_window_(root_window), drag_handler_(drag_handler) {} DesktopDragDropClientOzone::~DesktopDragDropClientOzone() { ResetDragDropTarget();
diff --git a/ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone_linux.cc b/ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone_linux.cc index 65d1ed8..29798ab 100644 --- a/ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone_linux.cc +++ b/ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone_linux.cc
@@ -34,8 +34,9 @@ const gfx::Point& screen_point_px) { DCHECK(drag_context()); - if (!drag_context()->widget) + if (!drag_context()->widget) { return; + } const bool dispatch_mouse_event = !drag_context()->last_screen_location_px; drag_context()->last_screen_location_px = screen_point_px; if (dispatch_mouse_event) { @@ -54,8 +55,9 @@ ui::mojom::DragOperation operation) { aura::client::CursorClient* cursor_client = aura::client::GetCursorClient(root_window()); - if (!cursor_client) + if (!cursor_client) { return; + } ui::mojom::CursorType cursor_type = ui::mojom::CursorType::kNull; switch (operation) { @@ -78,17 +80,19 @@ std::optional<gfx::AcceleratedWidget> DesktopDragDropClientOzoneLinux::GetDragWidget() { DCHECK(drag_context()); - if (drag_context()->widget) + if (drag_context()->widget) { return drag_context() ->widget->GetNativeWindow() ->GetHost() ->GetAcceleratedWidget(); + } return std::nullopt; } void DesktopDragDropClientOzoneLinux::UpdateDragWidgetLocation() { - if (!drag_context()) + if (!drag_context()) { return; + } float scale_factor = ui::GetScaleFactorForNativeView( drag_context()->widget->GetNativeWindow());
diff --git a/ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone_unittest.cc b/ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone_unittest.cc index 0ecd005..4e57417 100644 --- a/ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone_unittest.cc +++ b/ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone_unittest.cc
@@ -134,31 +134,35 @@ std::unique_ptr<OSExchangeData> data, int operation) { ui::WmDropHandler* drop_handler = ui::GetWmDropHandler(*this); - if (!drop_handler) + if (!drop_handler) { return; + } drop_handler->OnDragEnter(point, operation, modifiers_); drop_handler->OnDragDataAvailable(std::move(data)); } int OnDragMotion(const gfx::PointF& point, int operation) { ui::WmDropHandler* drop_handler = ui::GetWmDropHandler(*this); - if (!drop_handler) + if (!drop_handler) { return 0; + } return drop_handler->OnDragMotion(point, operation, modifiers_); } void OnDragDrop() { ui::WmDropHandler* drop_handler = ui::GetWmDropHandler(*this); - if (!drop_handler) + if (!drop_handler) { return; + } drop_handler->OnDragDrop(modifiers_); } void OnDragLeave() { ui::WmDropHandler* drop_handler = ui::GetWmDropHandler(*this); - if (!drop_handler) + if (!drop_handler) { return; + } drop_handler->OnDragLeave(); }
diff --git a/ui/views/widget/desktop_aura/desktop_drag_drop_client_win.cc b/ui/views/widget/desktop_aura/desktop_drag_drop_client_win.cc index 450530b..642ea66 100644 --- a/ui/views/widget/desktop_aura/desktop_drag_drop_client_win.cc +++ b/ui/views/widget/desktop_aura/desktop_drag_drop_client_win.cc
@@ -26,15 +26,15 @@ aura::Window* root_window, HWND window, DesktopWindowTreeHostWin* desktop_host) - : drag_drop_in_progress_(false), - desktop_host_(desktop_host) { + : drag_drop_in_progress_(false), desktop_host_(desktop_host) { drop_target_ = new DesktopDropTargetWin(root_window); drop_target_->Init(window); } DesktopDragDropClientWin::~DesktopDragDropClientWin() { - if (drag_drop_in_progress_) + if (drag_drop_in_progress_) { DragCancel(); + } } ui::mojom::DragOperation DesktopDragDropClientWin::StartDragAndDrop( @@ -108,11 +108,13 @@ } drag_source_copy->set_data(nullptr); - if (alive) + if (alive) { drag_drop_in_progress_ = false; + } - if (result != DRAGDROP_S_DROP) + if (result != DRAGDROP_S_DROP) { effect = DROPEFFECT_NONE; + } return ui::PreferredDragOperation( ui::DragDropTypes::DropEffectToDragOperation(effect));
diff --git a/ui/views/widget/desktop_aura/desktop_drop_target_win.cc b/ui/views/widget/desktop_aura/desktop_drop_target_win.cc index 4fec195..885f19e 100644 --- a/ui/views/widget/desktop_aura/desktop_drop_target_win.cc +++ b/ui/views/widget/desktop_aura/desktop_drop_target_win.cc
@@ -28,18 +28,24 @@ int ConvertKeyStateToAuraEventFlags(DWORD key_state) { int flags = 0; - if (key_state & MK_CONTROL) + if (key_state & MK_CONTROL) { flags |= ui::EF_CONTROL_DOWN; - if (key_state & MK_ALT) + } + if (key_state & MK_ALT) { flags |= ui::EF_ALT_DOWN; - if (key_state & MK_SHIFT) + } + if (key_state & MK_SHIFT) { flags |= ui::EF_SHIFT_DOWN; - if (key_state & MK_LBUTTON) + } + if (key_state & MK_LBUTTON) { flags |= ui::EF_LEFT_MOUSE_BUTTON; - if (key_state & MK_MBUTTON) + } + if (key_state & MK_MBUTTON) { flags |= ui::EF_MIDDLE_MOUSE_BUTTON; - if (key_state & MK_RBUTTON) + } + if (key_state & MK_RBUTTON) { flags |= ui::EF_RIGHT_MOUSE_BUTTON; + } return flags; } @@ -75,8 +81,9 @@ std::unique_ptr<ui::DropTargetEvent> event; DragDropDelegate* delegate; Translate(data_object, key_state, position, effect, &data, &event, &delegate); - if (delegate) + if (delegate) { drag_operation = delegate->OnDragUpdated(*event).drag_operation; + } return ui::DragDropTypes::DragOperationToDropEffect(drag_operation); } @@ -96,9 +103,10 @@ Translate(data_object, key_state, position, effect, &data, &event, &delegate); if (delegate) { auto drop_cb = delegate->GetDropCallback(*event); - if (drop_cb) + if (drop_cb) { std::move(drop_cb).Run(std::move(data), drag_operation, /*drag_image_layer_owner=*/nullptr); + } } target_window_observation_.Reset(); return ui::DragDropTypes::DragOperationToDropEffect( @@ -158,8 +166,9 @@ } DragDropDelegate* delegate = aura::client::GetDragDropDelegate(target_window_observation_.GetSource()); - if (delegate) + if (delegate) { delegate->OnDragExited(); + } target_window_observation_.Reset(); }
diff --git a/ui/views/widget/desktop_aura/desktop_focus_rules.cc b/ui/views/widget/desktop_aura/desktop_focus_rules.cc index 56e4e93..223446a 100644 --- a/ui/views/widget/desktop_aura/desktop_focus_rules.cc +++ b/ui/views/widget/desktop_aura/desktop_focus_rules.cc
@@ -20,16 +20,18 @@ bool DesktopFocusRules::CanActivateWindow(const aura::Window* window) const { // The RootWindow is not activatable, only |content_window_| and children of // the RootWindow are considered activatable. - if (window && window->IsRootWindow()) + if (window && window->IsRootWindow()) { return false; + } if (window && IsToplevelWindow(window) && content_window_->GetRootWindow()->Contains(window) && wm::WindowStateIs(window->GetRootWindow(), ui::mojom::WindowShowState::kMinimized)) { return true; } - if (!BaseFocusRules::CanActivateWindow(window)) + if (!BaseFocusRules::CanActivateWindow(window)) { return false; + } // Never activate a window that is not a child of the root window. Transients // spanning different DesktopNativeWidgetAuras may trigger this. return !window || content_window_->GetRootWindow()->Contains(window); @@ -63,8 +65,9 @@ wm::BaseFocusRules::GetToplevelWindow(window); // In Desktop-Aura, only the content_window or children of the RootWindow are // considered as top level windows. - if (top_level_window == content_window_->parent()) + if (top_level_window == content_window_->parent()) { return content_window_; + } return top_level_window; } @@ -76,8 +79,9 @@ // should never be activated. We should return the content_window_ if it // can be activated in this case. if (next_activatable_window == content_window_->parent() && - CanActivateWindow(content_window_)) + CanActivateWindow(content_window_)) { return content_window_; + } return next_activatable_window; }
diff --git a/ui/views/widget/desktop_aura/desktop_native_cursor_manager_win.cc b/ui/views/widget/desktop_aura/desktop_native_cursor_manager_win.cc index c2be6f8..b28de8a 100644 --- a/ui/views/widget/desktop_aura/desktop_native_cursor_manager_win.cc +++ b/ui/views/widget/desktop_aura/desktop_native_cursor_manager_win.cc
@@ -85,8 +85,9 @@ } void DesktopNativeCursorManagerWin::RegisterCursorRegkeyObserver() { - if (!hkcu_cursor_regkey_.Valid()) + if (!hkcu_cursor_regkey_.Valid()) { return; + } hkcu_cursor_regkey_.StartWatching(base::BindOnce( [](DesktopNativeCursorManagerWin* manager) {
diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc index 8309efe2..5cc1d3b 100644 --- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc +++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
@@ -119,8 +119,9 @@ #if BUILDFLAG(IS_WIN) // For menus, on Windows versions that support drop shadow remove // the standard frame in order to keep just the shadow. - if (init_params.type == Widget::InitParams::TYPE_MENU) + if (init_params.type == Widget::InitParams::TYPE_MENU) { init_params.remove_standard_frame = true; + } #endif init_params.bounds = bounds; init_params.layer_type = ui::LAYER_NOT_DRAWN; @@ -197,8 +198,9 @@ // The position of the window may have changed. Hence we use SetBounds in // place of SetSize. We need to pass the bounds in screen coordinates to // the Widget::SetBounds function. - if (top_level_widget_ && window == child_window_) + if (top_level_widget_ && window == child_window_) { top_level_widget_->SetBounds(window->GetBoundsInScreen()); + } } private: @@ -243,8 +245,9 @@ ui::ZOrderLevel root_z_order = ui::ZOrderLevel::kNormal; internal::NativeWidgetPrivate* native_widget = DesktopNativeWidgetAura::ForWindow(root_window_); - if (native_widget) + if (native_widget) { root_z_order = native_widget->GetZOrderLevel(); + } return DesktopNativeWidgetTopLevelHandler::CreateParentWindow( window, root_window_ /* context */, bounds, is_fullscreen, is_menu, @@ -325,15 +328,17 @@ // The WindowModalityController is at the front of the event pretarget // handler list. We destroy it first to preserve order symantics. - if (window_modality_controller_) + if (window_modality_controller_) { window_modality_controller_.reset(); + } // Make sure we don't have capture. Otherwise CaptureController and // WindowEventDispatcher are left referencing a deleted Window. { aura::Window* capture_window = capture_client_->GetCaptureWindow(); - if (capture_window && host_->window()->Contains(capture_window)) + if (capture_window && host_->window()->Contains(capture_window)) { capture_window->ReleaseCapture(); + } } // DesktopWindowTreeHost owns the ActivationController which ShadowController @@ -379,10 +384,12 @@ bool should_delete_this = (ownership_ == Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET) || (ownership_ == Widget::InitParams::CLIENT_OWNS_WIDGET); - if (native_widget_delegate_) + if (native_widget_delegate_) { native_widget_delegate_->OnNativeWidgetDestroyed(); - if (should_delete_this) + } + if (should_delete_this) { delete this; + } } void DesktopNativeWidgetAura::OnDesktopWindowTreeHostDestroyed( @@ -412,8 +419,9 @@ void DesktopNativeWidgetAura::NotifyAccessibilityEvent( ax::mojom::Event event_type) { - if (!GetWidget() || !GetWidget()->GetRootView()) + if (!GetWidget() || !GetWidget()->GetRootView()) { return; + } GetWidget()->GetRootView()->NotifyAccessibilityEvent(event_type, true); } @@ -425,8 +433,9 @@ } wm::ActivationClient* activation_client = wm::GetActivationClient(host_->window()); - if (!activation_client) + if (!activation_client) { return; + } // Update `should_activate_` with the new activation state of this widget // while handling this change. We do this to ensure that the activation client @@ -516,8 +525,9 @@ } void DesktopNativeWidgetAura::UpdateWindowTransparency() { - if (!desktop_window_tree_host_->ShouldUpdateWindowTransparency()) + if (!desktop_window_tree_host_->ShouldUpdateWindowTransparency()) { return; + } const bool transparent = desktop_window_tree_host_->ShouldWindowContentsBeTransparent(); @@ -541,9 +551,10 @@ widget_type_ = params.type; name_ = params.name; - if (ownership_ == Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET) + if (ownership_ == Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET) { owned_native_widget_delegate = base::WrapUnique(native_widget_delegate_.get()); + } content_window_->AcquireAllPropertiesFrom( std::move(params.init_properties_container)); @@ -571,9 +582,10 @@ // The WindowsModalityController event filter should be at the head of the // pre target handlers list. This ensures that it handles input events first // when modal windows are at the top of the Zorder. - if (widget_type_ == Widget::InitParams::TYPE_WINDOW) + if (widget_type_ == Widget::InitParams::TYPE_WINDOW) { window_modality_controller_ = std::make_unique<wm::WindowModalityController>(host_->window()); + } // |root_window_event_filter_| must be created before // OnWindowTreeHostCreated() is invoked. @@ -631,8 +643,9 @@ drag_drop_client_ = desktop_window_tree_host_->CreateDragDropClient(); // Mus returns null from CreateDragDropClient(). - if (drag_drop_client_) + if (drag_drop_client_) { aura::client::SetDragDropClient(host_->window(), drag_drop_client_.get()); + } wm::SetActivationDelegate(content_window_, this); @@ -736,8 +749,9 @@ } void DesktopNativeWidgetAura::ReorderNativeViews() { - if (!content_window_) + if (!content_window_) { return; + } // Reordering native views causes multiple changes to the window tree. // Instantiate a ScopedPause to recompute occlusion once at the end of this @@ -754,8 +768,9 @@ void DesktopNativeWidgetAura::SetNativeWindowProperty(const char* name, void* value) { - if (content_window_) + if (content_window_) { content_window_->SetNativeWindowProperty(name, value); + } } void* DesktopNativeWidgetAura::GetNativeWindowProperty(const char* name) const { @@ -768,15 +783,17 @@ } void DesktopNativeWidgetAura::SetCapture() { - if (!content_window_) + if (!content_window_) { return; + } content_window_->SetCapture(); } void DesktopNativeWidgetAura::ReleaseCapture() { - if (!content_window_) + if (!content_window_) { return; + } content_window_->ReleaseCapture(); } @@ -791,31 +808,36 @@ } void DesktopNativeWidgetAura::CenterWindow(const gfx::Size& size) { - if (desktop_window_tree_host_) + if (desktop_window_tree_host_) { desktop_window_tree_host_->CenterWindow(size); + } } void DesktopNativeWidgetAura::GetWindowPlacement( gfx::Rect* bounds, ui::mojom::WindowShowState* maximized) const { - if (desktop_window_tree_host_) + if (desktop_window_tree_host_) { desktop_window_tree_host_->GetWindowPlacement(bounds, maximized); + } } bool DesktopNativeWidgetAura::SetWindowTitle(const std::u16string& title) { - if (!desktop_window_tree_host_) + if (!desktop_window_tree_host_) { return false; + } return desktop_window_tree_host_->SetWindowTitle(title); } void DesktopNativeWidgetAura::SetWindowIcons(const gfx::ImageSkia& window_icon, const gfx::ImageSkia& app_icon) { - if (desktop_window_tree_host_) + if (desktop_window_tree_host_) { desktop_window_tree_host_->SetWindowIcons(window_icon, app_icon); + } - if (content_window_) + if (content_window_) { NativeWidgetAura::AssignIconToAuraWindow(content_window_, window_icon, app_icon); + } } void DesktopNativeWidgetAura::InitModalType(ui::mojom::ModalType modal_type) { @@ -856,30 +878,35 @@ } void DesktopNativeWidgetAura::SetBounds(const gfx::Rect& bounds) { - if (!desktop_window_tree_host_) + if (!desktop_window_tree_host_) { return; + } desktop_window_tree_host_->SetBoundsInDIP(bounds); } void DesktopNativeWidgetAura::SetBoundsConstrained(const gfx::Rect& bounds) { - if (!content_window_) + if (!content_window_) { return; + } SetBounds(NativeWidgetPrivate::ConstrainBoundsToDisplayWorkArea(bounds)); } void DesktopNativeWidgetAura::SetSize(const gfx::Size& size) { - if (desktop_window_tree_host_) + if (desktop_window_tree_host_) { desktop_window_tree_host_->SetSize(size); + } } void DesktopNativeWidgetAura::StackAbove(gfx::NativeView native_view) { - if (desktop_window_tree_host_) + if (desktop_window_tree_host_) { desktop_window_tree_host_->StackAbove(native_view); + } } void DesktopNativeWidgetAura::StackAtTop() { - if (desktop_window_tree_host_) + if (desktop_window_tree_host_) { desktop_window_tree_host_->StackAtTop(); + } } bool DesktopNativeWidgetAura::IsStackedAbove(gfx::NativeView native_view) { @@ -889,33 +916,39 @@ void DesktopNativeWidgetAura::SetShape( std::unique_ptr<Widget::ShapeRects> shape) { - if (desktop_window_tree_host_) + if (desktop_window_tree_host_) { desktop_window_tree_host_->SetShape(std::move(shape)); + } } void DesktopNativeWidgetAura::Close() { - if (desktop_window_tree_host_) + if (desktop_window_tree_host_) { desktop_window_tree_host_->Close(); + } } void DesktopNativeWidgetAura::CloseNow() { - if (desktop_window_tree_host_) + if (desktop_window_tree_host_) { desktop_window_tree_host_->CloseNow(); + } } void DesktopNativeWidgetAura::Show(ui::mojom::WindowShowState show_state, const gfx::Rect& restore_bounds) { - if (!desktop_window_tree_host_) + if (!desktop_window_tree_host_) { return; + } desktop_window_tree_host_->Show(show_state, restore_bounds); } void DesktopNativeWidgetAura::Hide() { - if (desktop_window_tree_host_) + if (desktop_window_tree_host_) { desktop_window_tree_host_->AsWindowTreeHost()->Hide(); - if (content_window_) + } + if (content_window_) { content_window_->Hide(); + } } bool DesktopNativeWidgetAura::IsVisible() const { @@ -940,14 +973,17 @@ // since if client code is calling Widget::Activate() they probably // want that particular widget to be activated, not just something // within that widget hierarchy. - if (was_tree_active && focus_client_->GetFocusedWindow() != content_window_) + if (was_tree_active && + focus_client_->GetFocusedWindow() != content_window_) { focus_client_->FocusWindow(content_window_); + } } } void DesktopNativeWidgetAura::Deactivate() { - if (desktop_window_tree_host_) + if (desktop_window_tree_host_) { desktop_window_tree_host_->Deactivate(); + } } bool DesktopNativeWidgetAura::IsActive() const { @@ -963,19 +999,22 @@ } void DesktopNativeWidgetAura::SetZOrderLevel(ui::ZOrderLevel order) { - if (content_window_) + if (content_window_) { desktop_window_tree_host_->SetZOrderLevel(order); + } } ui::ZOrderLevel DesktopNativeWidgetAura::GetZOrderLevel() const { - if (desktop_window_tree_host_) + if (desktop_window_tree_host_) { return desktop_window_tree_host_->GetZOrderLevel(); + } return ui::ZOrderLevel::kNormal; } void DesktopNativeWidgetAura::SetVisibleOnAllWorkspaces(bool always_visible) { - if (desktop_window_tree_host_) + if (desktop_window_tree_host_) { desktop_window_tree_host_->SetVisibleOnAllWorkspaces(always_visible); + } } bool DesktopNativeWidgetAura::IsVisibleOnAllWorkspaces() const { @@ -984,13 +1023,15 @@ } void DesktopNativeWidgetAura::Maximize() { - if (desktop_window_tree_host_) + if (desktop_window_tree_host_) { desktop_window_tree_host_->Maximize(); + } } void DesktopNativeWidgetAura::Minimize() { - if (desktop_window_tree_host_) + if (desktop_window_tree_host_) { desktop_window_tree_host_->Minimize(); + } internal::RootView* root_view = static_cast<internal::RootView*>(GetWidget()->GetRootView()); root_view->ResetEventHandlers(); @@ -1005,14 +1046,16 @@ } void DesktopNativeWidgetAura::Restore() { - if (desktop_window_tree_host_) + if (desktop_window_tree_host_) { desktop_window_tree_host_->Restore(); + } } void DesktopNativeWidgetAura::SetFullscreen(bool fullscreen, int64_t target_display_id) { - if (desktop_window_tree_host_) + if (desktop_window_tree_host_) { desktop_window_tree_host_->SetFullscreen(fullscreen, target_display_id); + } } bool DesktopNativeWidgetAura::IsFullscreen() const { @@ -1023,19 +1066,22 @@ bool can_appear_in_existing_fullscreen_spaces) {} void DesktopNativeWidgetAura::SetOpacity(float opacity) { - if (desktop_window_tree_host_) + if (desktop_window_tree_host_) { desktop_window_tree_host_->SetOpacity(opacity); + } } void DesktopNativeWidgetAura::SetAspectRatio(const gfx::SizeF& aspect_ratio, const gfx::Size& excluded_margin) { - if (desktop_window_tree_host_) + if (desktop_window_tree_host_) { desktop_window_tree_host_->SetAspectRatio(aspect_ratio, excluded_margin); + } } void DesktopNativeWidgetAura::FlashFrame(bool flash_frame) { - if (desktop_window_tree_host_) + if (desktop_window_tree_host_) { desktop_window_tree_host_->FlashFrame(flash_frame); + } } void DesktopNativeWidgetAura::RunShellDrag( @@ -1043,8 +1089,9 @@ const gfx::Point& location, int operation, ui::mojom::DragEventSource source) { - if (!content_window_) + if (!content_window_) { return; + } views::RunShellDrag(content_window_, std::move(data), location, operation, source); @@ -1059,31 +1106,35 @@ } void DesktopNativeWidgetAura::SchedulePaintInRect(const gfx::Rect& rect) { - if (content_window_) + if (content_window_) { content_window_->SchedulePaintInRect(rect); + } } void DesktopNativeWidgetAura::ScheduleLayout() { // ScheduleDraw() triggers a callback to // WindowDelegate::UpdateVisualState(). - if (content_window_) + if (content_window_) { content_window_->ScheduleDraw(); + } } void DesktopNativeWidgetAura::SetCursor(const ui::Cursor& cursor) { cursor_ = cursor; aura::client::CursorClient* cursor_client = aura::client::GetCursorClient(host_->window()); - if (cursor_client) + if (cursor_client) { cursor_client->SetCursor(cursor); + } } bool DesktopNativeWidgetAura::IsMouseEventsEnabled() const { // We explicitly check |host_| here because it can be null during the process // of widget shutdown (even if |content_window_| is not), and must be valid to // determine if mouse events are enabled. - if (!content_window_ || !host_) + if (!content_window_ || !host_) { return false; + } aura::client::CursorClient* cursor_client = aura::client::GetCursorClient(host_->window()); return cursor_client ? cursor_client->IsMouseEventsEnabled() : true; @@ -1118,21 +1169,24 @@ const gfx::Vector2d& drag_offset, Widget::MoveLoopSource source, Widget::MoveLoopEscapeBehavior escape_behavior) { - if (!desktop_window_tree_host_) + if (!desktop_window_tree_host_) { return Widget::MoveLoopResult::kCanceled; + } return desktop_window_tree_host_->RunMoveLoop(drag_offset, source, escape_behavior); } void DesktopNativeWidgetAura::EndMoveLoop() { - if (desktop_window_tree_host_) + if (desktop_window_tree_host_) { desktop_window_tree_host_->EndMoveLoop(); + } } void DesktopNativeWidgetAura::SetVisibilityChangedAnimationsEnabled( bool value) { - if (desktop_window_tree_host_) + if (desktop_window_tree_host_) { desktop_window_tree_host_->SetVisibilityChangedAnimationsEnabled(value); + } } void DesktopNativeWidgetAura::SetVisibilityAnimationDuration( @@ -1169,8 +1223,9 @@ } void DesktopNativeWidgetAura::OnSizeConstraintsChanged() { - if (!desktop_window_tree_host_) + if (!desktop_window_tree_host_) { return; + } NativeWidgetAura::SetResizeBehaviorFromDelegate( GetWidget()->widget_delegate(), content_window_); desktop_window_tree_host_->SizeConstraintsChanged(); @@ -1236,8 +1291,9 @@ } void DesktopNativeWidgetAura::OnCaptureLost() { - if (native_widget_delegate_) + if (native_widget_delegate_) { native_widget_delegate_->OnMouseCaptureLost(); + } } void DesktopNativeWidgetAura::OnPaint(const ui::PaintContext& context) { @@ -1274,13 +1330,15 @@ } void DesktopNativeWidgetAura::GetHitTestMask(SkPath* mask) const { - if (native_widget_delegate_) + if (native_widget_delegate_) { native_widget_delegate_->GetHitTestMask(mask); + } } void DesktopNativeWidgetAura::UpdateVisualState() { - if (native_widget_delegate_) + if (native_widget_delegate_) { native_widget_delegate_->LayoutRootViewIfNecessary(); + } } //////////////////////////////////////////////////////////////////////////////// @@ -1296,10 +1354,12 @@ } // Renderer may send a key event back to us if the key event wasn't handled, // and the window may be invisible by that time. - if (!content_window_->IsVisible()) + if (!content_window_->IsVisible()) { return; - if (native_widget_delegate_) + } + if (native_widget_delegate_) { native_widget_delegate_->OnKeyEvent(event); + } } void DesktopNativeWidgetAura::OnMouseEvent(ui::MouseEvent* event) { @@ -1318,36 +1378,42 @@ } #endif - if (tooltip_manager_.get()) + if (tooltip_manager_.get()) { tooltip_manager_->UpdateTooltip(); + } TooltipManagerAura::UpdateTooltipManagerForCapture(this); - if (native_widget_delegate_) + if (native_widget_delegate_) { native_widget_delegate_->OnMouseEvent(event); + } // WARNING: we may have been deleted. } void DesktopNativeWidgetAura::OnScrollEvent(ui::ScrollEvent* event) { - if (!native_widget_delegate_) + if (!native_widget_delegate_) { return; + } if (event->type() == ui::EventType::kScroll) { native_widget_delegate_->OnScrollEvent(event); - if (event->handled()) + if (event->handled()) { return; + } // Convert unprocessed scroll events into wheel events. ui::MouseWheelEvent mwe(*event->AsScrollEvent()); native_widget_delegate_->OnMouseEvent(&mwe); - if (mwe.handled()) + if (mwe.handled()) { event->SetHandled(); + } } else { native_widget_delegate_->OnScrollEvent(event); } } void DesktopNativeWidgetAura::OnGestureEvent(ui::GestureEvent* event) { - if (native_widget_delegate_) + if (native_widget_delegate_) { native_widget_delegate_->OnGestureEvent(event); + } } std::string_view DesktopNativeWidgetAura::GetLogContext() const { @@ -1375,14 +1441,16 @@ // For OS_LINUX, desktop native widget may not be activated when child // widgets gets aura activation changes. Only when desktop native widget is // active, we can rely on aura activation to restore focused view. - if (GetWidget() && GetWidget()->IsActive()) + if (GetWidget() && GetWidget()->IsActive()) { GetWidget()->GetFocusManager()->RestoreFocusedView(); + } } else if (lost_active == content_window_ && GetWidget()->HasFocusManager()) { DCHECK(!restore_focus_on_activate_); restore_focus_on_activate_ = true; // Pass in false so that ClearNativeFocus() isn't invoked. - if (GetWidget()) + if (GetWidget()) { GetWidget()->GetFocusManager()->StoreFocusedView(false); + } } // This widget is considered active when both its window tree host and its @@ -1420,8 +1488,9 @@ void DesktopNativeWidgetAura::OnWindowFocused(aura::Window* gained_focus, aura::Window* lost_focus) { - if (!native_widget_delegate_) + if (!native_widget_delegate_) { return; + } if (content_window_ == gained_focus) { native_widget_delegate_->OnNativeFocus(); @@ -1476,11 +1545,13 @@ // Don't update the bounds of the child layers when animating closed. If we // did it would force a paint, which we don't want. We don't want the paint // as we can't assume any of the children are valid. - if (desktop_window_tree_host_->IsAnimatingClosed()) + if (desktop_window_tree_host_->IsAnimatingClosed()) { return; + } - if (!native_widget_delegate_) + if (!native_widget_delegate_) { return; + } gfx::Rect new_bounds = gfx::Rect(host->window()->bounds().size()); content_window_->SetBounds(new_bounds); @@ -1489,14 +1560,16 @@ void DesktopNativeWidgetAura::OnHostWorkspaceChanged( aura::WindowTreeHost* host) { - if (native_widget_delegate_) + if (native_widget_delegate_) { native_widget_delegate_->OnNativeWidgetWorkspaceChanged(); + } } void DesktopNativeWidgetAura::OnHostMovedInPixels(aura::WindowTreeHost* host) { TRACE_EVENT0("views", "DesktopNativeWidgetAura::OnHostMovedInPixels"); - if (native_widget_delegate_) + if (native_widget_delegate_) { native_widget_delegate_->OnNativeWidgetMove(); + } } //////////////////////////////////////////////////////////////////////////////// @@ -1518,12 +1591,14 @@ std::unique_ptr<ui::OSExchangeData> data, ui::mojom::DragOperation& output_drag_op, std::unique_ptr<ui::LayerTreeOwner> drag_image_layer_owner) { - if (ShouldActivate()) + if (ShouldActivate()) { Activate(); + } - if (drop_cb) + if (drop_cb) { std::move(drop_cb).Run(std::move(data), output_drag_op, std::move(drag_image_layer_owner)); + } } } // namespace views
diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura_interactive_uitest.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura_interactive_uitest.cc index 68c3c99..5db4109d 100644 --- a/ui/views/widget/desktop_aura/desktop_native_widget_aura_interactive_uitest.cc +++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura_interactive_uitest.cc
@@ -2,11 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" - #include "ui/views/test/native_widget_factory.h" #include "ui/views/test/widget_activation_waiter.h" #include "ui/views/test/widget_test.h" +#include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" #include "ui/wm/public/activation_client.h" namespace views::test {
diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc index 30ef909..cb6265d 100644 --- a/ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc +++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc
@@ -755,8 +755,9 @@ ui::MouseEvent release_event(ui::EventType::kMouseReleased, end_point, end_point, ui::EventTimeForNow(), 0, 0); details = sink->OnEventFromSource(&release_event); - if (details.dispatcher_destroyed) + if (details.dispatcher_destroyed) { return; + } } // Creates a widget and invokes GenerateMouseEvents() with |last_event_type|.
diff --git a/ui/views/widget/desktop_aura/desktop_screen_ozone.cc b/ui/views/widget/desktop_aura/desktop_screen_ozone.cc index c83e690..f4cdb9c 100644 --- a/ui/views/widget/desktop_aura/desktop_screen_ozone.cc +++ b/ui/views/widget/desktop_aura/desktop_screen_ozone.cc
@@ -19,8 +19,9 @@ gfx::NativeWindow DesktopScreenOzone::GetNativeWindowFromAcceleratedWidget( gfx::AcceleratedWidget widget) const { - if (!widget) + if (!widget) { return nullptr; + } return views::DesktopWindowTreeHostPlatform::GetContentWindowForWidget( widget); }
diff --git a/ui/views/widget/desktop_aura/desktop_screen_position_client.cc b/ui/views/widget/desktop_aura/desktop_screen_position_client.cc index e24b959..d746f59 100644 --- a/ui/views/widget/desktop_aura/desktop_screen_position_client.cc +++ b/ui/views/widget/desktop_aura/desktop_screen_position_client.cc
@@ -13,8 +13,9 @@ // Returns true if bounds passed to window in SetBounds should be treated as // though they are in screen coordinates. bool PositionWindowInScreenCoordinates(aura::Window* window) { - if (window->GetType() == aura::client::WINDOW_TYPE_POPUP) + if (window->GetType() == aura::client::WINDOW_TYPE_POPUP) { return true; + } Widget* widget = Widget::GetWidgetForNativeView(window); return widget && widget->is_top_level();
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc index 102fcca..e1c1215 100644 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc
@@ -100,10 +100,11 @@ } void DesktopWindowTreeHostLinux::LowerWindow() { - if (GetX11Extension()) + if (GetX11Extension()) { GetX11Extension()->LowerXWindow(); - else + } else { NOTIMPLEMENTED_LOG_ONCE(); + } } base::OnceClosure DesktopWindowTreeHostLinux::DisableEventListening() { @@ -185,8 +186,9 @@ Widget::MoveLoopResult result = DesktopWindowTreeHostPlatform::RunMoveLoop( drag_offset, source, escape_behavior); - if (weak_this.get()) + if (weak_this.get()) { GetContentWindow()->ReleaseCapture(); + } return result; } @@ -218,8 +220,9 @@ GetRootTransform().InverseMapPoint(location).value_or(location); hit_test_code = GetContentWindow()->delegate()->GetNonClientComponent( gfx::ToRoundedPoint(location_in_dip)); - if (hit_test_code != HTCLIENT && hit_test_code != HTNOWHERE) + if (hit_test_code != HTCLIENT && hit_test_code != HTNOWHERE) { flags |= ui::EF_IS_NON_CLIENT; + } located_event->SetFlags(flags); } @@ -227,8 +230,9 @@ // it on mouse clicks because we can call FlashFrame() on an active window. if (located_event->IsMouseEvent() && (located_event->AsMouseEvent()->IsAnyButton() || - located_event->IsMouseWheelEvent())) + located_event->IsMouseWheelEvent())) { FlashFrame(false); + } } // Prehandle the event as long as as we are not able to track if it is handled @@ -241,8 +245,9 @@ hit_test_code, event->AsLocatedEvent()); } - if (!event->handled()) + if (!event->handled()) { WindowTreeHostPlatform::DispatchEvent(event); + } } void DesktopWindowTreeHostLinux::OnClosed() { @@ -275,8 +280,9 @@ #if BUILDFLAG(USE_ATK) bool DesktopWindowTreeHostLinux::OnAtkKeyEvent(AtkKeyEventStruct* atk_event, bool transient) { - if (!transient && !IsActive() && !HasCapture()) + if (!transient && !IsActive() && !HasCapture()) { return false; + } return ui::AtkUtilAuraLinux::HandleAtkKeyEvent(atk_event) == ui::DiscardAtkKeyEvent::Discard; } @@ -332,15 +338,17 @@ base::flat_map<std::string, std::string> DesktopWindowTreeHostLinux::GetKeyboardLayoutMap() { - if (auto* linux_ui = ui::LinuxUi::instance()) + if (auto* linux_ui = ui::LinuxUi::instance()) { return linux_ui->GetKeyboardLayoutMap(); + } return WindowTreeHostPlatform::GetKeyboardLayoutMap(); } void DesktopWindowTreeHostLinux::OnCompleteSwapWithNewSize( const gfx::Size& size) { - if (GetX11Extension()) + if (GetX11Extension()) { GetX11Extension()->OnCompleteSwapAfterResize(); + } } void DesktopWindowTreeHostLinux::CreateNonClientEventFilter() { @@ -359,8 +367,9 @@ void DesktopWindowTreeHostLinux::EnableEventListening() { DCHECK_GT(modal_dialog_counter_, 0UL); - if (!--modal_dialog_counter_) + if (!--modal_dialog_counter_) { targeter_for_modal_.reset(); + } } // static
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc index 156cbebe..d582318e 100644 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
@@ -143,8 +143,9 @@ properties.opacity = GetPlatformWindowOpacity(params.opacity); properties.shadow_type = GetPlatformWindowShadowType(params.shadow_type); - if (params.parent && params.parent->GetHost()) + if (params.parent && params.parent->GetHost()) { properties.parent_widget = params.parent->GetHost()->GetAcceleratedWidget(); + } #if BUILDFLAG(IS_OZONE) if (ui::OzonePlatform::GetInstance() @@ -160,8 +161,9 @@ // WindowTreeHost::Create, which we don't want to have as a context (this // happens in tests - called by TestScreen, AuraTestHelper, // aura::DemoMain, and SitePerProcessBrowserTest). - if (host && host->window()->GetProperty(kHostForRootWindow)) + if (host && host->window()->GetProperty(kHostForRootWindow)) { properties.parent_widget = host->GetAcceleratedWidget(); + } } } properties.inhibit_keyboard_shortcuts = params.inhibit_keyboard_shortcuts; @@ -233,13 +235,15 @@ // static void DesktopWindowTreeHostPlatform::CleanUpWindowList( void (*func)(aura::Window* window)) { - if (!open_windows_) + if (!open_windows_) { return; + } while (!open_windows_->empty()) { gfx::AcceleratedWidget widget = open_windows_->front(); func(DesktopWindowTreeHostPlatform::GetContentWindowForWidget(widget)); - if (!open_windows_->empty() && open_windows_->front() == widget) + if (!open_windows_->empty() && open_windows_->front() == widget) { open_windows_->erase(open_windows_->begin()); + } } delete open_windows_; @@ -251,8 +255,9 @@ } void DesktopWindowTreeHostPlatform::Init(const Widget::InitParams& params) { - if (params.type == Widget::InitParams::TYPE_WINDOW) + if (params.type == Widget::InitParams::TYPE_WINDOW) { GetContentWindow()->SetProperty(aura::client::kAnimationsDisabledKey, true); + } ui::PlatformWindowInitProperties properties = ConvertWidgetInitParamsToInitProperties(params); @@ -356,8 +361,9 @@ void DesktopWindowTreeHostPlatform::Close() { // If we are in process of closing or the PlatformWindow has already been // closed, do nothing. - if (close_widget_factory_.HasWeakPtrs() || !platform_window()) + if (close_widget_factory_.HasWeakPtrs() || !platform_window()) { return; + } platform_window()->PrepareForShutdown(); @@ -378,16 +384,18 @@ } void DesktopWindowTreeHostPlatform::CloseNow() { - if (!platform_window()) + if (!platform_window()) { return; + } #if BUILDFLAG(IS_OZONE) SetWmDropHandler(platform_window(), nullptr); #endif ReleaseCapture(); - if (native_widget_delegate_) + if (native_widget_delegate_) { native_widget_delegate_->OnNativeWidgetDestroying(); + } // If we have children, close them. Use a copy for iteration because they'll // remove themselves. @@ -420,8 +428,9 @@ void DesktopWindowTreeHostPlatform::Show(ui::mojom::WindowShowState show_state, const gfx::Rect& restore_bounds) { OnAcceleratedWidgetMadeVisible(true); - if (compositor()) + if (compositor()) { SetVisible(true); + } platform_window()->Show(DetermineInactivity(show_state)); @@ -480,8 +489,9 @@ } void DesktopWindowTreeHostPlatform::StackAbove(aura::Window* window) { - if (!window || !window->GetRootWindow()) + if (!window || !window->GetRootWindow()) { return; + } platform_window()->StackAbove(window->GetHost()->GetAcceleratedWidget()); } @@ -521,16 +531,17 @@ ui::mojom::WindowShowState* show_state) const { *bounds = GetRestoredBounds(); - if (IsFullscreen()) + if (IsFullscreen()) { *show_state = ui::mojom::WindowShowState::kFullscreen; - else if (IsMinimized()) + } else if (IsMinimized()) { *show_state = ui::mojom::WindowShowState::kMinimized; - else if (IsMaximized()) + } else if (IsMaximized()) { *show_state = ui::mojom::WindowShowState::kMaximized; - else if (!IsActive()) + } else if (!IsActive()) { *show_state = ui::mojom::WindowShowState::kInactive; - else + } else { *show_state = ui::mojom::WindowShowState::kNormal; + } } gfx::Rect DesktopWindowTreeHostPlatform::GetWindowBoundsInScreen() const { @@ -553,8 +564,9 @@ // When window is resized, |restored bounds| is not set and empty. // If |restored bounds| is empty, it returns the current window size. - if (!restored_bounds.IsEmpty()) + if (!restored_bounds.IsEmpty()) { return restored_bounds; + } return GetWindowBoundsInScreen(); } @@ -602,8 +614,9 @@ void DesktopWindowTreeHostPlatform::Maximize() { platform_window()->Maximize(); - if (IsMinimized()) + if (IsMinimized()) { Show(ui::mojom::WindowShowState::kNormal, gfx::Rect()); + } } void DesktopWindowTreeHostPlatform::Minimize() { @@ -641,8 +654,9 @@ void DesktopWindowTreeHostPlatform::SetVisibleOnAllWorkspaces( bool always_visible) { auto* workspace_extension = ui::GetWorkspaceExtension(*platform_window()); - if (workspace_extension) + if (workspace_extension) { workspace_extension->SetVisibleOnAllWorkspaces(always_visible); + } } bool DesktopWindowTreeHostPlatform::IsVisibleOnAllWorkspaces() const { @@ -653,8 +667,9 @@ bool DesktopWindowTreeHostPlatform::SetWindowTitle( const std::u16string& title) { - if (window_title_ == title) + if (window_title_ == title) { return false; + } window_title_ = title; platform_window()->SetTitle(window_title_); @@ -683,15 +698,17 @@ Widget::MoveLoopSource source, Widget::MoveLoopEscapeBehavior escape_behavior) { auto* move_loop_handler = ui::GetWmMoveLoopHandler(*platform_window()); - if (move_loop_handler && move_loop_handler->RunMoveLoop(drag_offset)) + if (move_loop_handler && move_loop_handler->RunMoveLoop(drag_offset)) { return Widget::MoveLoopResult::kSuccessful; + } return Widget::MoveLoopResult::kCanceled; } void DesktopWindowTreeHostPlatform::EndMoveLoop() { auto* move_loop_handler = ui::GetWmMoveLoopHandler(*platform_window()); - if (move_loop_handler) + if (move_loop_handler) { move_loop_handler->EndMoveLoop(); + } } void DesktopWindowTreeHostPlatform::SetVisibilityChangedAnimationsEnabled( @@ -736,16 +753,18 @@ // Replace the frame and layout the contents. Even though we don't have a // swappable glass frame like on Windows, we still replace the frame because // the button assets don't update otherwise. - if (GetWidget()->non_client_view()) + if (GetWidget()->non_client_view()) { GetWidget()->non_client_view()->UpdateFrame(); + } } void DesktopWindowTreeHostPlatform::SetFullscreen(bool fullscreen, int64_t target_display_id) { auto weak_ptr = GetWeakPtr(); platform_window()->SetFullscreen(fullscreen, target_display_id); - if (!weak_ptr) + if (!weak_ptr) { return; + } if (!base::FeatureList::IsEnabled(features::kAsyncFullscreenWindowState)) { // The state must change synchronously to let media react on fullscreen @@ -818,12 +837,14 @@ void DesktopWindowTreeHostPlatform::UpdateWindowShapeIfNeeded( const ui::PaintContext& context) { - if (is_shape_explicitly_set_) + if (is_shape_explicitly_set_) { return; + } SkPath clip_path = GetWindowMaskForClipping(); - if (clip_path.isEmpty()) + if (clip_path.isEmpty()) { return; + } ui::PaintRecorder recorder(context, GetWindowBoundsInScreen().size()); recorder.canvas()->ClipPath(clip_path, true); @@ -982,8 +1003,9 @@ open_windows().remove(widget); open_windows().insert(open_windows().begin(), widget); } - if (is_active_ == active) + if (is_active_ == active) { return; + } is_active_ = active; aura::WindowTreeHostPlatform::OnActivationChanged(active); desktop_native_widget_aura_->HandleActivationChanged(active); @@ -1090,8 +1112,9 @@ NonClientView* non_client_view = widget->non_client_view(); // non_client_view may be NULL, especially during creation. if (non_client_view) { - if (non_client_view->frame_view()) + if (non_client_view->frame_view()) { non_client_view->frame_view()->InvalidateLayout(); + } non_client_view->client_view()->InvalidateLayout(); non_client_view->InvalidateLayout(); // Once |NonClientView| is invalidateLayout, @@ -1103,8 +1126,9 @@ } void DesktopWindowTreeHostPlatform::SetVisible(bool visible) { - if (compositor()) + if (compositor()) { compositor()->SetVisible(visible); + } native_widget_delegate_->OnNativeWidgetVisibilityChanged(visible); } @@ -1114,8 +1138,9 @@ ui::PlatformWindowInitProperties* properties) {} SkPath DesktopWindowTreeHostPlatform::GetWindowMaskForClipping() const { - if (!platform_window()->ShouldUpdateWindowShape()) + if (!platform_window()->ShouldUpdateWindowShape()) { return SkPath(); + } return GetWindowMask(GetWidget()); } @@ -1162,8 +1187,9 @@ // static std::list<gfx::AcceleratedWidget>& DesktopWindowTreeHostPlatform::open_windows() { - if (!open_windows_) + if (!open_windows_) { open_windows_ = new std::list<gfx::AcceleratedWidget>(); + } return *open_windows_; }
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_platform_impl_unittest.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_platform_impl_unittest.cc index 6e9650ac..4ac1d4b 100644 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_platform_impl_unittest.cc +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_platform_impl_unittest.cc
@@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/views/widget/desktop_aura/desktop_window_tree_host_platform.h" - #include <utility> #include "base/command_line.h" @@ -16,6 +14,7 @@ #include "ui/platform_window/platform_window.h" #include "ui/views/test/views_test_base.h" #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" +#include "ui/views/widget/desktop_aura/desktop_window_tree_host_platform.h" #include "ui/views/widget/widget_delegate.h" namespace views { @@ -42,8 +41,9 @@ } int NonClientHitTest(const gfx::Point& point) override { // Fake bottom for non client event test. - if (point == gfx::Point(500, 500)) + if (point == gfx::Point(500, 500)) { return HTBOTTOM; + } return HTNOWHERE; } void GetWindowMask(const gfx::Size& size, SkPath* window_mask) override {
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_platform_unittest.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_platform_unittest.cc index b713c523..6100957 100644 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_platform_unittest.cc +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_platform_unittest.cc
@@ -68,12 +68,14 @@ void WaitForChange(Change change, bool old_value) { switch (change) { case Change::kVisibility: - if (old_value == visible_) + if (old_value == visible_) { Wait(); + } break; case Change::kDestroying: - if (old_value == on_widget_destroying_) + if (old_value == on_widget_destroying_) { Wait(); + } break; default: NOTREACHED() << "unknown value"; @@ -105,8 +107,9 @@ } void StopWaiting() { - if (!run_loop_) + if (!run_loop_) { return; + } ASSERT_TRUE(run_loop_->running()); run_loop_->Quit(); } @@ -210,8 +213,9 @@ auto* host_platform = DesktopWindowTreeHostPlatform::GetHostForWidget( widget->GetNativeWindow()->GetHost()->GetAcceleratedWidget()); ASSERT_TRUE(host_platform); - if (!host_platform->platform_window()->ShouldUpdateWindowShape()) + if (!host_platform->platform_window()->ShouldUpdateWindowShape()) { return; + } auto* content_window = DesktopWindowTreeHostPlatform::GetContentWindowForWidget(
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc index 8a37f2e..f144ed9 100644 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
@@ -173,8 +173,9 @@ wm::SetAnimationHost(content_window(), this); if (params.type == Widget::InitParams::TYPE_WINDOW && - !params.remove_standard_frame) + !params.remove_standard_frame) { content_window()->SetProperty(aura::client::kAnimationsDisabledKey, true); + } message_handler_ = HWNDMessageHandler::Create( this, native_widget_delegate_->AsWidget()->GetName(), @@ -185,8 +186,9 @@ native_widget_delegate_.get()); HWND parent_hwnd = nullptr; - if (params.parent && params.parent->GetHost()) + if (params.parent && params.parent->GetHost()) { parent_hwnd = params.parent->GetHost()->GetAcceleratedWidget(); + } remove_standard_frame_ = params.remove_standard_frame; has_non_client_view_ = Widget::RequiresNonClientView(params.type); @@ -214,8 +216,9 @@ // The cursor is not necessarily visible when the root window is created. aura::client::CursorClient* cursor_client = aura::client::GetCursorClient(window()); - if (cursor_client) + if (cursor_client) { is_cursor_visible_ = cursor_client->IsCursorVisible(); + } window()->SetProperty(kContentWindowForRootWindow, content_window()); window()->SetProperty(kDesktopWindowTreeHostKey, this); @@ -251,8 +254,9 @@ if (should_animate_window_close_) { pending_close_ = true; // Animation may not start for a number of reasons. - if (!window_layer->GetAnimator()->is_animating()) + if (!window_layer->GetAnimator()->is_animating()) { message_handler_->Close(); + } // else case, OnWindowHidingAnimationCompleted does the actual Close. } else { message_handler_->Close(); @@ -302,8 +306,9 @@ void DesktopWindowTreeHostWin::StackAbove(aura::Window* window) { HWND hwnd = HWNDForNativeView(window); - if (hwnd) + if (hwnd) { message_handler_->StackAbove(hwnd); + } } void DesktopWindowTreeHostWin::StackAtTop() { @@ -386,8 +391,9 @@ } shape.setRects(&sk_rects[0], static_cast<int>(sk_rects.size())); } else { - for (const gfx::Rect& rect : *native_shape) + for (const gfx::Rect& rect : *native_shape) { shape.op(gfx::RectToSkIRect(rect), SkRegion::kUnion_Op); + } } message_handler_->SetRegion(gfx::CreateHRGNFromSkRegion(shape)); @@ -449,8 +455,9 @@ bool window_always_on_top = message_handler_->IsAlwaysOnTop(); bool level_always_on_top = z_order_ != ui::ZOrderLevel::kNormal; - if (window_always_on_top == level_always_on_top) + if (window_always_on_top == level_always_on_top) { return z_order_; + } // If something external has forced a window to be always-on-top, map it to // kFloatingWindow as a reasonable equivalent. @@ -464,11 +471,13 @@ // Child windows are always above their parent windows. // Check to see if HWNDs have a Parent-Child relationship. - if (IsChild(below, above)) + if (IsChild(below, above)) { return true; + } - if (IsChild(above, below)) + if (IsChild(above, below)) { return false; + } // Check all HWNDs with lower z order than current HWND // to see if it matches or is a parent to the "below" HWND. @@ -561,8 +570,9 @@ int64_t target_display_id) { auto weak_ptr = GetWeakPtr(); message_handler_->SetFullscreen(fullscreen, target_display_id); - if (!weak_ptr) + if (!weak_ptr) { return; + } // TODO(sky): workaround for ScopedFullscreenVisibility showing window // directly. Instead of this should listen for visibility changes and then // update window. @@ -638,8 +648,9 @@ } void DesktopWindowTreeHostWin::HideImpl() { - if (!pending_close_) + if (!pending_close_) { message_handler_->Hide(); + } } // GetBoundsInPixels and SetBoundsInPixels work in pixel coordinates, whereas @@ -688,13 +699,15 @@ gfx::Rect DesktopWindowTreeHostWin::GetBoundsInAcceleratedWidgetPixelCoordinates() { - if (message_handler_->IsMinimized()) + if (message_handler_->IsMinimized()) { return gfx::Rect(); + } const gfx::Rect client_bounds = message_handler_->GetClientAreaBoundsInScreen(); const gfx::Rect window_bounds = message_handler_->GetWindowBoundsInScreen(); - if (window_bounds == client_bounds) + if (window_bounds == client_bounds) { return gfx::Rect(window_bounds.size()); + } const gfx::Vector2d offset = client_bounds.origin() - window_bounds.origin(); DCHECK(offset.x() >= 0 && offset.y() >= 0); return gfx::Rect(gfx::Point() + offset, client_bounds.size()); @@ -748,8 +761,9 @@ } void DesktopWindowTreeHostWin::OnCursorVisibilityChangedNative(bool show) { - if (is_cursor_visible_ == show) + if (is_cursor_visible_ == show) { return; + } is_cursor_visible_ = show; ::ShowCursor(!!show); } @@ -789,8 +803,9 @@ } void DesktopWindowTreeHostWin::OnWindowHidingAnimationCompleted() { - if (pending_close_) + if (pending_close_) { message_handler_->Close(); + } } //////////////////////////////////////////////////////////////////////////////// @@ -851,8 +866,9 @@ } bool DesktopWindowTreeHostWin::CanActivate() const { - if (IsModalWindowActive()) + if (IsModalWindowActive()) { return true; + } return native_widget_delegate_ ? native_widget_delegate_->CanActivate() : false; } @@ -962,8 +978,9 @@ // This can be invoked from HWNDMessageHandler::Init(), at which point we're // not in a good state and need to ignore it. // TODO(beng): Do we need this still now the host owns the dispatcher? - if (!dispatcher()) + if (!dispatcher()) { return; + } desktop_native_widget_aura_->HandleActivationChanged(active); } @@ -1087,17 +1104,19 @@ return; } - if (restored) + if (restored) { window()->Show(); - else + } else { window()->Hide(); + } } void DesktopWindowTreeHostWin::HandleClientSizeChanged( const gfx::Size& new_size) { CheckForMonitorChange(); - if (dispatcher()) + if (dispatcher()) { OnHostResizedInPixels(new_size); + } } void DesktopWindowTreeHostWin::HandleFrameChanged() { @@ -1117,8 +1136,9 @@ bool DesktopWindowTreeHostWin::HandleMouseEvent(ui::MouseEvent* event) { // Ignore native platform events for test purposes - if (ui::PlatformEventSource::ShouldIgnoreNativePlatformEvents()) + if (ui::PlatformEventSource::ShouldIgnoreNativePlatformEvents()) { return true; + } SendEventToSink(event); return event->handled(); @@ -1224,8 +1244,9 @@ void DesktopWindowTreeHostWin::HandlePaintAccelerated( const gfx::Rect& invalid_rect) { - if (compositor()) + if (compositor()) { compositor()->ScheduleRedrawRect(invalid_rect); + } } void DesktopWindowTreeHostWin::HandleMenuLoop(bool in_menu_loop) { @@ -1258,8 +1279,9 @@ } void DesktopWindowTreeHostWin::HandleWindowSizeChanging() { - if (compositor()) + if (compositor()) { compositor()->DisableSwapUntilResize(); + } } void DesktopWindowTreeHostWin::HandleWindowSizeUnchanged() { @@ -1267,8 +1289,9 @@ // changed (can occur on Windows 10 when snapping a window to the side of // the screen). In that case do a resize to the current size to reenable // swaps. - if (compositor()) + if (compositor()) { compositor()->ReenableSwap(); + } } void DesktopWindowTreeHostWin::HandleWindowScaleFactorChanged( @@ -1355,8 +1378,9 @@ bool DesktopWindowTreeHostWin::IsModalWindowActive() const { // This function can get called during window creation which occurs before // dispatcher() has been created. - if (!dispatcher()) + if (!dispatcher()) { return false; + } const auto is_active = [](const aura::Window* child) { return child->GetProperty(aura::client::kModalKey) != @@ -1369,8 +1393,9 @@ void DesktopWindowTreeHostWin::CheckForMonitorChange() { HMONITOR monitor_from_window = ::MonitorFromWindow(GetHWND(), MONITOR_DEFAULTTOPRIMARY); - if (monitor_from_window == last_monitor_from_window_) + if (monitor_from_window == last_monitor_from_window_) { return; + } last_monitor_from_window_ = monitor_from_window; OnHostDisplayChanged(); }
diff --git a/ui/views/widget/desktop_aura/window_event_filter_linux.cc b/ui/views/widget/desktop_aura/window_event_filter_linux.cc index 15e211a..5c0d20c 100644 --- a/ui/views/widget/desktop_aura/window_event_filter_linux.cc +++ b/ui/views/widget/desktop_aura/window_event_filter_linux.cc
@@ -126,11 +126,13 @@ case ui::LinuxUi::WindowFrameAction::kMenu: views::Widget* widget = views::Widget::GetWidgetForNativeView(content_window); - if (!widget) + if (!widget) { break; + } views::View* view = widget->GetContentsView(); - if (!view || !view->context_menu_controller()) + if (!view || !view->context_menu_controller()) { break; + } // Controller requires locations to be in DIP, while |this| receives the // location in px. gfx::PointF location = desktop_window_tree_host_->GetRootTransform() @@ -148,8 +150,9 @@ void WindowEventFilterLinux::OnClickedMaximizeButton(ui::MouseEvent* event) { auto* content_window = desktop_window_tree_host_->GetContentWindow(); views::Widget* widget = views::Widget::GetWidgetForNativeView(content_window); - if (!widget) + if (!widget) { return; + } gfx::Rect display_work_area = display::Screen::GetScreen() ->GetDisplayNearestWindow(content_window) @@ -174,10 +177,11 @@ return; } - if (desktop_window_tree_host_->IsMaximized()) + if (desktop_window_tree_host_->IsMaximized()) { desktop_window_tree_host_->Restore(); - else + } else { desktop_window_tree_host_->Maximize(); + } } void WindowEventFilterLinux::LowerWindow() { @@ -189,14 +193,17 @@ void WindowEventFilterLinux::MaybeDispatchHostWindowDragMovement( int hittest, ui::LocatedEvent* event) { - if (!event->IsMouseEvent() && !event->IsGestureEvent()) + if (!event->IsMouseEvent() && !event->IsGestureEvent()) { return; + } - if (event->IsMouseEvent() && !event->AsMouseEvent()->IsLeftMouseButton()) + if (event->IsMouseEvent() && !event->AsMouseEvent()->IsLeftMouseButton()) { return; + } - if (!handler_ || !ui::CanPerformDragOrResize(hittest)) + if (!handler_ || !ui::CanPerformDragOrResize(hittest)) { return; + } // Some platforms (eg X11) may require last pointer location not in the // local surface coordinates, but rather in the screen coordinates for @@ -211,8 +218,9 @@ // it'd prevent the Gesture{Provider,Detector} machirery to get triggered, // breaking gestures including tapping, double tapping, show press and // long press. - if (event->IsMouseEvent()) + if (event->IsMouseEvent()) { event->StopPropagation(); + } } void WindowEventFilterLinux::OnGestureEvent(ui::GestureEvent* event) {
diff --git a/ui/views/widget/drop_helper.cc b/ui/views/widget/drop_helper.cc index 1db650c..583c3d7d 100644 --- a/ui/views/widget/drop_helper.cc +++ b/ui/views/widget/drop_helper.cc
@@ -46,10 +46,12 @@ } void DropHelper::ResetTargetViewIfEquals(View* view) { - if (target_view_ == view) + if (target_view_ == view) { target_view_ = nullptr; - if (deepest_view_ == view) + } + if (deepest_view_ == view) { deepest_view_ = nullptr; + } } int DropHelper::OnDragOver(const OSExchangeData& data, @@ -71,8 +73,9 @@ g_drag_entered_callback_view->Contains(deepest_view_) && !g_drag_entered_callback_view->Contains(old_deepest_view)) { auto* callback = GetDragEnteredCallback(); - if (!callback->is_null()) + if (!callback->is_null()) { callback->Run(); + } } return NotifyDragOver(data, root_view_location, drag_operation); @@ -88,8 +91,9 @@ int drag_operation) { View* drop_view = target_view_; deepest_view_ = target_view_ = nullptr; - if (!drop_view) + if (!drop_view) { return DragOperation::kNone; + } if (drag_operation == ui::DragDropTypes::DRAG_NONE) { drop_view->OnDragExited(); @@ -115,8 +119,9 @@ int drag_operation) { View* drop_view = target_view_; deepest_view_ = target_view_ = nullptr; - if (!drop_view) + if (!drop_view) { return base::NullCallback(); + } if (drag_operation == ui::DragDropTypes::DRAG_NONE) { drop_view->OnDragExited(); @@ -131,8 +136,9 @@ drag_operation); auto drop_view_cb = drop_view->GetDropCallback(drop_event); - if (!drop_view_cb) + if (!drop_view_cb) { return base::NullCallback(); + } return base::BindOnce( [](const ui::DropTargetEvent& drop_event, View::DropCallback drop_cb, @@ -164,11 +170,12 @@ // The view the mouse is over hasn't changed; reuse the target. return target_view_; } - if (deepest_view) + if (deepest_view) { *deepest_view = view; - // TODO(sky): for the time being these are separate. Once I port chrome menu - // I can switch to the #else implementation and nuke the OS_WIN - // implementation. + } + // TODO(sky): for the time being these are separate. Once I port chrome menu + // I can switch to the #else implementation and nuke the OS_WIN + // implementation. #if BUILDFLAG(IS_WIN) // View under mouse changed, which means a new view may want the drop. // Walk the tree, stopping at target_view_ as we know it'll accept the @@ -198,8 +205,9 @@ void DropHelper::NotifyDragEntered(const OSExchangeData& data, const gfx::Point& root_view_location, int drag_operation) { - if (!target_view_) + if (!target_view_) { return; + } gfx::Point target_view_location(root_view_location); View::ConvertPointToTarget(root_view_, target_view_, &target_view_location); @@ -212,8 +220,9 @@ int DropHelper::NotifyDragOver(const OSExchangeData& data, const gfx::Point& root_view_location, int drag_operation) { - if (!target_view_) + if (!target_view_) { return ui::DragDropTypes::DRAG_NONE; + } gfx::Point target_view_location(root_view_location); View::ConvertPointToTarget(root_view_, target_view_, &target_view_location); @@ -224,8 +233,9 @@ } void DropHelper::NotifyDragExit() { - if (target_view_) + if (target_view_) { target_view_->OnDragExited(); + } } } // namespace views
diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc index cfa0957..b435794 100644 --- a/ui/views/widget/native_widget_aura.cc +++ b/ui/views/widget/native_widget_aura.cc
@@ -98,10 +98,11 @@ void SetIcon(aura::Window* window, const aura::WindowProperty<gfx::ImageSkia*>* key, const gfx::ImageSkia& value) { - if (value.isNull()) + if (value.isNull()) { window->ClearProperty(key); - else + } else { window->SetProperty(key, value); + } } bool FindLayersInOrder( @@ -114,15 +115,18 @@ return *first == nullptr; } - if (child == *first) + if (child == *first) { *first = nullptr; + } - if (FindLayersInOrder(child->children(), first, second)) + if (FindLayersInOrder(child->children(), first, second)) { return true; + } // If second is cleared without success, exit early with failure. - if (!*second) + if (!*second) { return false; + } } return false; } @@ -196,17 +200,21 @@ // static void NativeWidgetAura::SetResizeBehaviorFromDelegate(WidgetDelegate* delegate, aura::Window* window) { - if (!window) + if (!window) { return; + } int behavior = aura::client::kResizeBehaviorNone; if (delegate) { - if (delegate->CanResize()) + if (delegate->CanResize()) { behavior |= aura::client::kResizeBehaviorCanResize; - if (delegate->CanMaximize()) + } + if (delegate->CanMaximize()) { behavior |= aura::client::kResizeBehaviorCanMaximize; - if (delegate->CanMinimize()) + } + if (delegate->CanMinimize()) { behavior |= aura::client::kResizeBehaviorCanMinimize; + } if (delegate->CanFullscreen()) { behavior |= aura::client::kResizeBehaviorCanFullscreen; } @@ -222,8 +230,9 @@ DCHECK(params.parent || params.context); ownership_ = params.ownership; - if (ownership_ == Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET) + if (ownership_ == Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET) { owned_delegate_ = base::WrapUnique(delegate_.get()); + } window_->AcquireAllPropertiesFrom( std::move(params.init_properties_container)); @@ -255,8 +264,9 @@ window_->SetProperty(aura::client::kWindowWorkspaceKey, desk_index); } - if (params.type == Widget::InitParams::TYPE_BUBBLE) + if (params.type == Widget::InitParams::TYPE_BUBBLE) { wm::SetHideOnDeactivate(window_, true); + } window_->SetTransparent(params.opacity == Widget::InitParams::WindowOpacity::kTranslucent); @@ -267,8 +277,9 @@ window_->Init(params.layer_type); // Set name after layer init so it propagates to layer. window_->SetName(params.name.empty() ? "NativeWidgetAura" : params.name); - if (params.type == Widget::InitParams::TYPE_CONTROL) + if (params.type == Widget::InitParams::TYPE_CONTROL) { window_->Show(); + } delegate_->OnNativeWidgetCreated(); @@ -282,8 +293,9 @@ // LayoutManager knows the window has a transient parent. if (parent && parent->GetType() != aura::client::WINDOW_TYPE_UNKNOWN) { wm::AddTransientChild(parent, window_); - if (!context) + if (!context) { context = parent; + } parent = nullptr; // Generally transient bubbles are showing state associated to the parent @@ -340,8 +352,9 @@ params.accept_events ? aura::EventTargetingPolicy::kTargetAndDescendants : aura::EventTargetingPolicy::kNone); DCHECK(GetWidget()->GetRootView()); - if (params.type != Widget::InitParams::TYPE_TOOLTIP) + if (params.type != Widget::InitParams::TYPE_TOOLTIP) { tooltip_manager_ = std::make_unique<views::TooltipManagerAura>(this); + } drop_helper_ = std::make_unique<DropHelper>(GetWidget()->GetRootView()); if (params.type != Widget::InitParams::TYPE_TOOLTIP && @@ -426,8 +439,9 @@ } void NativeWidgetAura::SetNativeWindowProperty(const char* name, void* value) { - if (window_) + if (window_) { window_->SetNativeWindowProperty(name, value); + } } void* NativeWidgetAura::GetNativeWindowProperty(const char* name) const { @@ -439,13 +453,15 @@ } void NativeWidgetAura::SetCapture() { - if (window_) + if (window_) { window_->SetCapture(); + } } void NativeWidgetAura::ReleaseCapture() { - if (window_) + if (window_) { window_->ReleaseCapture(); + } } bool NativeWidgetAura::HasCapture() const { @@ -453,15 +469,17 @@ } ui::InputMethod* NativeWidgetAura::GetInputMethod() { - if (!window_) + if (!window_) { return nullptr; + } aura::Window* root_window = window_->GetRootWindow(); return root_window ? root_window->GetHost()->GetInputMethod() : nullptr; } void NativeWidgetAura::CenterWindow(const gfx::Size& size) { - if (!window_) + if (!window_) { return; + } window_->SetProperty(aura::client::kPreferredSize, size); @@ -491,8 +509,9 @@ wm::GetTransientParent(window_)->GetBoundsInRootWindow(); transient_parent_rect.Intersect(work_area); if (transient_parent_rect.height() >= size.height() && - transient_parent_rect.width() >= size.width()) + transient_parent_rect.width() >= size.width()) { parent_bounds = transient_parent_rect; + } } gfx::Rect window_bounds( @@ -521,10 +540,12 @@ } bool NativeWidgetAura::SetWindowTitle(const std::u16string& title) { - if (!window_) + if (!window_) { return false; - if (window_->GetTitle() == title) + } + if (window_->GetTitle() == title) { return false; + } window_->SetTitle(title); return true; } @@ -562,8 +583,9 @@ } gfx::Rect NativeWidgetAura::GetRestoredBounds() const { - if (!window_) + if (!window_) { return gfx::Rect(); + } // Restored bounds should only be relevant if the window is minimized, // maximized, or fullscreen. However, in some places the code expects @@ -573,8 +595,9 @@ // Restore bounds are in screen coordinates, no need to convert. gfx::Rect* restore_bounds = window_->GetProperty(aura::client::kRestoreBoundsKey); - if (restore_bounds) + if (restore_bounds) { return *restore_bounds; + } } // Prefer getting the window bounds and converting them to screen bounds since @@ -605,8 +628,9 @@ } void NativeWidgetAura::SetBounds(const gfx::Rect& bounds) { - if (!window_) + if (!window_) { return; + } SetBoundsInternal(bounds, std::nullopt); } @@ -628,8 +652,9 @@ } void NativeWidgetAura::SetBoundsConstrained(const gfx::Rect& bounds) { - if (!window_) + if (!window_) { return; + } gfx::Rect new_bounds(bounds); if (window_->parent()) { @@ -644,24 +669,28 @@ } void NativeWidgetAura::SetSize(const gfx::Size& size) { - if (window_) + if (window_) { window_->SetBounds(gfx::Rect(window_->bounds().origin(), size)); + } } void NativeWidgetAura::StackAbove(gfx::NativeView native_view) { if (window_ && window_->parent() && - window_->parent() == native_view->parent()) + window_->parent() == native_view->parent()) { window_->parent()->StackChildAbove(window_, native_view); + } } void NativeWidgetAura::StackAtTop() { - if (window_) + if (window_) { window_->parent()->StackChildAtTop(window_); + } } bool NativeWidgetAura::IsStackedAbove(gfx::NativeView native_view) { - if (!window_) + if (!window_) { return false; + } // If the root windows are not shared between two native views // it is likely that they are child windows of different top level windows. @@ -678,8 +707,9 @@ } void NativeWidgetAura::SetShape(std::unique_ptr<Widget::ShapeRects> shape) { - if (window_) + if (window_) { window_->layer()->SetAlphaShape(std::move(shape)); + } } void NativeWidgetAura::Close() { @@ -706,8 +736,9 @@ // in `window_`. `ClearAndDelete` would have cleared the value in `window_` // first before deleting `window_` causing problem in `OnWindowDestroying`. - if (window_) + if (window_) { delete window_; + } // `window_` destructor may delete this `NativeWidgetAura` instance. Therefore // we must NOT access anything through `this` after `delete window_`. @@ -716,8 +747,9 @@ void NativeWidgetAura::Show(ui::mojom::WindowShowState show_state, const gfx::Rect& restore_bounds) { - if (!window_) + if (!window_) { return; + } if ((show_state == ui::mojom::WindowShowState::kMaximized || show_state == ui::mojom::WindowShowState::kMinimized) && @@ -759,8 +791,9 @@ } void NativeWidgetAura::Hide() { - if (window_) + if (window_) { window_->Hide(); + } } bool NativeWidgetAura::IsVisible() const { @@ -768,20 +801,24 @@ } void NativeWidgetAura::Activate() { - if (!window_) + if (!window_) { return; + } // We don't necessarily have a root window yet. This can happen with // constrained windows. - if (window_->GetRootWindow()) + if (window_->GetRootWindow()) { wm::GetActivationClient(window_->GetRootWindow())->ActivateWindow(window_); - if (window_->GetProperty(aura::client::kDrawAttentionKey)) + } + if (window_->GetProperty(aura::client::kDrawAttentionKey)) { window_->SetProperty(aura::client::kDrawAttentionKey, false); + } } void NativeWidgetAura::Deactivate() { - if (!window_) + if (!window_) { return; + } wm::GetActivationClient(window_->GetRootWindow())->DeactivateWindow(window_); } @@ -790,13 +827,15 @@ } void NativeWidgetAura::SetZOrderLevel(ui::ZOrderLevel order) { - if (window_) + if (window_) { window_->SetProperty(aura::client::kZOrderingKey, order); + } } ui::ZOrderLevel NativeWidgetAura::GetZOrderLevel() const { - if (window_) + if (window_) { return window_->GetProperty(aura::client::kZOrderingKey); + } return ui::ZOrderLevel::kNormal; } @@ -814,15 +853,17 @@ } void NativeWidgetAura::Maximize() { - if (window_) + if (window_) { window_->SetProperty(aura::client::kShowStateKey, ui::mojom::WindowShowState::kMaximized); + } } void NativeWidgetAura::Minimize() { - if (window_) + if (window_) { window_->SetProperty(aura::client::kShowStateKey, ui::mojom::WindowShowState::kMinimized); + } } bool NativeWidgetAura::IsMaximized() const { @@ -836,8 +877,9 @@ } void NativeWidgetAura::Restore() { - if (window_) + if (window_) { wm::Restore(window_); + } } void NativeWidgetAura::SetFullscreen(bool fullscreen, @@ -857,8 +899,9 @@ bool can_appear_in_existing_fullscreen_spaces) {} void NativeWidgetAura::SetOpacity(float opacity) { - if (window_) + if (window_) { window_->layer()->SetOpacity(opacity); + } } void NativeWidgetAura::SetAspectRatio(const gfx::SizeF& aspect_ratio, @@ -875,16 +918,18 @@ } void NativeWidgetAura::FlashFrame(bool flash) { - if (window_) + if (window_) { window_->SetProperty(aura::client::kDrawAttentionKey, flash); + } } void NativeWidgetAura::RunShellDrag(std::unique_ptr<ui::OSExchangeData> data, const gfx::Point& location, int operation, ui::mojom::DragEventSource source) { - if (window_) + if (window_) { views::RunShellDrag(window_, std::move(data), location, operation, source); + } } void NativeWidgetAura::CancelShellDrag(View* view) { @@ -894,27 +939,31 @@ } void NativeWidgetAura::SchedulePaintInRect(const gfx::Rect& rect) { - if (window_) + if (window_) { window_->SchedulePaintInRect(rect); + } } void NativeWidgetAura::ScheduleLayout() { // ScheduleDraw() triggers a callback to WindowDelegate::UpdateVisualState(). - if (window_) + if (window_) { window_->ScheduleDraw(); + } } void NativeWidgetAura::SetCursor(const ui::Cursor& cursor) { cursor_ = cursor; aura::client::CursorClient* cursor_client = aura::client::GetCursorClient(window_->GetRootWindow()); - if (cursor_client) + if (cursor_client) { cursor_client->SetCursor(cursor); + } } bool NativeWidgetAura::IsMouseEventsEnabled() const { - if (!window_) + if (!window_) { return false; + } aura::client::CursorClient* cursor_client = aura::client::GetCursorClient(window_->GetRootWindow()); return cursor_client ? cursor_client->IsMouseEventsEnabled() : true; @@ -926,13 +975,15 @@ void NativeWidgetAura::ClearNativeFocus() { aura::client::FocusClient* client = aura::client::GetFocusClient(window_); - if (window_ && client && window_->Contains(client->GetFocusedWindow())) + if (window_ && client && window_->Contains(client->GetFocusedWindow())) { client->ResetFocusWithinActiveWindow(window_); + } } gfx::Rect NativeWidgetAura::GetWorkAreaBoundsInScreen() const { - if (!window_) + if (!window_) { return gfx::Rect(); + } return display::Screen::GetScreen() ->GetDisplayNearestWindow(window_) .work_area(); @@ -944,12 +995,14 @@ Widget::MoveLoopEscapeBehavior escape_behavior) { // |escape_behavior| is only needed on windows when running the native message // loop. - if (!window_ || !window_->GetRootWindow()) + if (!window_ || !window_->GetRootWindow()) { return Widget::MoveLoopResult::kCanceled; + } wm::WindowMoveClient* move_client = wm::GetWindowMoveClient(window_->GetRootWindow()); - if (!move_client) + if (!move_client) { return Widget::MoveLoopResult::kCanceled; + } SetCapture(); wm::WindowMoveSource window_move_source = @@ -963,17 +1016,20 @@ } void NativeWidgetAura::EndMoveLoop() { - if (!window_ || !window_->GetRootWindow()) + if (!window_ || !window_->GetRootWindow()) { return; + } wm::WindowMoveClient* move_client = wm::GetWindowMoveClient(window_->GetRootWindow()); - if (move_client) + if (move_client) { move_client->EndMoveLoop(); + } } void NativeWidgetAura::SetVisibilityChangedAnimationsEnabled(bool value) { - if (window_) + if (window_) { window_->SetProperty(aura::client::kAnimationsDisabledKey, !value); + } } void NativeWidgetAura::SetVisibilityAnimationDuration( @@ -1063,8 +1119,9 @@ (old_bounds == gfx::Rect(0, 0, 0, 0) && !new_bounds.IsEmpty()))) { delegate_->OnNativeWidgetMove(); } - if (delegate_ && (old_bounds.size() != new_bounds.size())) + if (delegate_ && (old_bounds.size() != new_bounds.size())) { delegate_->OnNativeWidgetSizeChanged(new_bounds.size()); + } } gfx::NativeCursor NativeWidgetAura::GetCursor(const gfx::Point& point) { @@ -1088,13 +1145,15 @@ } void NativeWidgetAura::OnCaptureLost() { - if (delegate_) + if (delegate_) { delegate_->OnMouseCaptureLost(); + } } void NativeWidgetAura::OnPaint(const ui::PaintContext& context) { - if (delegate_) + if (delegate_) { delegate_->OnNativeWidgetPaint(context); + } } void NativeWidgetAura::OnDeviceScaleFactorChanged( @@ -1111,8 +1170,9 @@ if (wm::TransientWindowManager::GetIfExists(window_)) { wm::TransientWindowManager::GetOrCreate(window_)->RemoveObserver(this); } - if (delegate_) + if (delegate_) { delegate_->OnNativeWidgetDestroying(); + } // If the aura::Window is destroyed, we can no longer show tooltips. tooltip_manager_.reset(); @@ -1127,15 +1187,18 @@ bool should_delete_this = (ownership_ == Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET) || (ownership_ == Widget::InitParams::CLIENT_OWNS_WIDGET); - if (delegate_) + if (delegate_) { delegate_->OnNativeWidgetDestroyed(); - if (should_delete_this) + } + if (should_delete_this) { delete this; + } } void NativeWidgetAura::OnWindowTargetVisibilityChanged(bool visible) { - if (delegate_) + if (delegate_) { delegate_->OnNativeWidgetVisibilityChanged(visible); + } } bool NativeWidgetAura::HasHitTestMask() const { @@ -1144,13 +1207,15 @@ void NativeWidgetAura::GetHitTestMask(SkPath* mask) const { DCHECK(mask); - if (delegate_) + if (delegate_) { delegate_->GetHitTestMask(mask); + } } void NativeWidgetAura::UpdateVisualState() { - if (delegate_) + if (delegate_) { delegate_->LayoutRootViewIfNecessary(); + } } //////////////////////////////////////////////////////////////////////////////// @@ -1159,32 +1224,38 @@ void NativeWidgetAura::OnWindowPropertyChanged(aura::Window* window, const void* key, intptr_t old) { - if (delegate_ && key == aura::client::kShowStateKey) + if (delegate_ && key == aura::client::kShowStateKey) { delegate_->OnNativeWidgetWindowShowStateChanged(); + } - if (delegate_ && key == aura::client::kWindowWorkspaceKey) + if (delegate_ && key == aura::client::kWindowWorkspaceKey) { delegate_->OnNativeWidgetWorkspaceChanged(); + } } void NativeWidgetAura::OnResizeLoopStarted(aura::Window* window) { - if (delegate_) + if (delegate_) { delegate_->OnNativeWidgetBeginUserBoundsChange(); + } } void NativeWidgetAura::OnResizeLoopEnded(aura::Window* window) { - if (delegate_) + if (delegate_) { delegate_->OnNativeWidgetEndUserBoundsChange(); + } } void NativeWidgetAura::OnWindowAddedToRootWindow(aura::Window* window) { - if (delegate_) + if (delegate_) { delegate_->OnNativeWidgetAddedToCompositor(); + } } void NativeWidgetAura::OnWindowRemovingFromRootWindow(aura::Window* window, aura::Window* new_root) { - if (delegate_) + if (delegate_) { delegate_->OnNativeWidgetRemovingFromCompositor(); + } } //////////////////////////////////////////////////////////////////////////////// @@ -1194,11 +1265,13 @@ DCHECK(window_); // Renderer may send a key event back to us if the key event wasn't handled, // and the window may be invisible by that time. - if (!window_->IsVisible()) + if (!window_->IsVisible()) { return; + } - if (delegate_) + if (delegate_) { delegate_->OnKeyEvent(event); + } } void NativeWidgetAura::OnMouseEvent(ui::MouseEvent* event) { @@ -1209,24 +1282,28 @@ return; } - if (tooltip_manager_.get()) + if (tooltip_manager_.get()) { tooltip_manager_->UpdateTooltip(); + } TooltipManagerAura::UpdateTooltipManagerForCapture(this); - if (delegate_) + if (delegate_) { delegate_->OnMouseEvent(event); + } } void NativeWidgetAura::OnScrollEvent(ui::ScrollEvent* event) { - if (delegate_) + if (delegate_) { delegate_->OnScrollEvent(event); + } } void NativeWidgetAura::OnGestureEvent(ui::GestureEvent* event) { DCHECK(window_); DCHECK(window_->IsVisible() || event->IsEndingEvent()); - if (delegate_) + if (delegate_) { delegate_->OnGestureEvent(event); + } } //////////////////////////////////////////////////////////////////////////////// @@ -1245,13 +1322,15 @@ aura::Window* lost_active) { DCHECK(window_ == gained_active || window_ == lost_active); if (GetWidget() && GetWidget()->GetFocusManager()) { - if (window_ == gained_active) + if (window_ == gained_active) { GetWidget()->GetFocusManager()->RestoreFocusedView(); - else if (window_ == lost_active) + } else if (window_ == lost_active) { GetWidget()->GetFocusManager()->StoreFocusedView(true); + } } - if (delegate_) + if (delegate_) { delegate_->OnNativeWidgetActivationChanged(window_ == gained_active); + } } //////////////////////////////////////////////////////////////////////////////// @@ -1259,10 +1338,11 @@ void NativeWidgetAura::OnWindowFocused(aura::Window* gained_focus, aura::Window* lost_focus) { - if (delegate_ && window_ == gained_focus) + if (delegate_ && window_ == gained_focus) { delegate_->OnNativeFocus(); - else if (delegate_ && window_ == lost_focus) + } else if (delegate_ && window_ == lost_focus) { delegate_->OnNativeBlur(); + } } //////////////////////////////////////////////////////////////////////////////// @@ -1300,8 +1380,9 @@ // NativeWidgetAura, wm::TransientWindowObserver implementation: void NativeWidgetAura::OnTransientParentChanged(aura::Window* new_parent) { - if (delegate_) + if (delegate_) { delegate_->OnNativeWidgetParentChanged(new_parent); + } } //////////////////////////////////////////////////////////////////////////////// @@ -1325,8 +1406,9 @@ void NativeWidgetAura::SetInitialFocus(ui::mojom::WindowShowState show_state) { // The window does not get keyboard messages unless we focus it. - if (!GetWidget()->SetInitialFocus(show_state)) + if (!GetWidget()->SetInitialFocus(show_state)) { window_->Focus(); + } } //////////////////////////////////////////////////////////////////////////////// @@ -1337,12 +1419,13 @@ void CloseWindow(aura::Window* window) { if (window) { Widget* widget = Widget::GetWidgetForNativeView(window); - if (widget && widget->is_secondary_widget()) + if (widget && widget->is_secondary_widget()) { // To avoid the delay in shutdown caused by using Close which may wait // for animations, use CloseNow. Because this is only used on secondary // widgets it seems relatively safe to skip the extra processing of // Close. widget->CloseNow(); + } } } #endif @@ -1413,8 +1496,9 @@ // Code expects widget for |native_view| to be added to |children|. NativeWidgetPrivate* native_widget = static_cast<NativeWidgetPrivate*>( GetNativeWidgetForNativeView(native_view)); - if (native_widget && native_widget->GetWidget()) + if (native_widget && native_widget->GetWidget()) { children->insert(native_widget->GetWidget()); + } } for (aura::Window* child_window : native_view->children()) { @@ -1429,14 +1513,16 @@ for (aura::Window* transient_child : wm::GetTransientChildren(native_view)) { NativeWidgetPrivate* native_widget = static_cast<NativeWidgetPrivate*>( GetNativeWidgetForNativeView(transient_child)); - if (native_widget && native_widget->GetWidget()) + if (native_widget && native_widget->GetWidget()) { owned->insert(native_widget->GetWidget()); + } GetAllOwnedWidgets(transient_child, owned); } // Add all child windows. - for (aura::Window* child : native_view->children()) + for (aura::Window* child : native_view->children()) { GetAllChildWidgets(child, owned); + } } // static @@ -1445,8 +1531,9 @@ DCHECK(native_view != new_parent); gfx::NativeView previous_parent = native_view->parent(); - if (previous_parent == new_parent) + if (previous_parent == new_parent) { return; + } Widget::Widgets widgets; GetAllChildWidgets(native_view, &widgets); @@ -1476,8 +1563,9 @@ gfx::NativeView native_view) { aura::client::CaptureClient* capture_client = aura::client::GetCaptureClient(native_view->GetRootWindow()); - if (!capture_client) + if (!capture_client) { return nullptr; + } return capture_client->GetGlobalCaptureWindow(); }
diff --git a/ui/views/widget/native_widget_aura_unittest.cc b/ui/views/widget/native_widget_aura_unittest.cc index afdf663..b1750ce 100644 --- a/ui/views/widget/native_widget_aura_unittest.cc +++ b/ui/views/widget/native_widget_aura_unittest.cc
@@ -211,8 +211,9 @@ } *step_count -= 1; - if (*step_count) + if (*step_count) { return; + } // Do not interrupt the gesture scroll until the last gesture update event // is handled. @@ -313,8 +314,9 @@ void OnWindowPropertyChanged(aura::Window* window, const void* key, intptr_t old) override { - if (key != aura::client::kShowStateKey) + if (key != aura::client::kShowStateKey) { return; + } count_++; state_ = window_observation_.GetSource()->GetProperty( aura::client::kShowStateKey); @@ -418,10 +420,11 @@ } void OnNativeWidgetSizeChanged(const gfx::Size& new_size) override { - if (last_size_.IsEmpty()) + if (last_size_.IsEmpty()) { last_size_ = new_size; - else if (!did_size_change_more_than_once_ && new_size != last_size_) + } else if (!did_size_change_more_than_once_ && new_size != last_size_) { did_size_change_more_than_once_ = true; + } Widget::OnNativeWidgetSizeChanged(new_size); } @@ -530,8 +533,9 @@ // View overrides: void OnGestureEvent(ui::GestureEvent* event) override { got_gesture_event_ = true; - if (consume_gesture_event_) + if (consume_gesture_event_) { event->StopPropagation(); + } } private:
diff --git a/ui/views/widget/native_widget_mac.mm b/ui/views/widget/native_widget_mac.mm index 574524b..822d5bb 100644 --- a/ui/views/widget/native_widget_mac.mm +++ b/ui/views/widget/native_widget_mac.mm
@@ -70,8 +70,9 @@ } // TODO(tapted): Determine better masks when there are use cases for it. - if (params.remove_standard_frame) + if (params.remove_standard_frame) { return NSWindowStyleMaskBorderless; + } if (params.type == Widget::InitParams::TYPE_WINDOW) { return NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | @@ -86,15 +87,17 @@ case ui::ZOrderLevel::kNormal: return kCGNormalWindowLevel; case ui::ZOrderLevel::kFloatingWindow: - if (type == Widget::InitParams::TYPE_MENU) + if (type == Widget::InitParams::TYPE_MENU) { return kCGPopUpMenuWindowLevel; - else + } else { return kCGFloatingWindowLevel; + } case ui::ZOrderLevel::kFloatingUIElement: - if (type == Widget::InitParams::TYPE_DRAG) + if (type == Widget::InitParams::TYPE_DRAG) { return kCGDraggingWindowLevel; - else + } else { return kCGStatusWindowLevel; + } case ui::ZOrderLevel::kSecuritySurface: return kCGScreenSaverWindowLevel - 1; } @@ -109,11 +112,13 @@ ~ZoomFocusMonitor() override = default; void OnWillChangeFocus(View* focused_before, View* focused_now) override {} void OnDidChangeFocus(View* focused_before, View* focused_now) override { - if (!focused_now || !UAZoomEnabled()) + if (!focused_now || !UAZoomEnabled()) { return; + } // Web content handles its own zooming. - if (strcmp("WebView", focused_now->GetClassName()) == 0) + if (strcmp("WebView", focused_now->GetClassName()) == 0) { return; + } NSRect rect = NSRectFromCGRect(focused_now->GetBoundsInScreen().ToCGRect()); UAZoomChangeFocus(&rect, nullptr, kUAZoomFocusTypeOther); } @@ -129,10 +134,11 @@ ns_window_host_(new NativeWidgetMacNSWindowHost(this)) {} NativeWidgetMac::~NativeWidgetMac() { - if (ownership_ == Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET) + if (ownership_ == Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET) { owned_delegate_.reset(); - else + } else { CloseNow(); + } } void NativeWidgetMac::WindowDestroying() { @@ -154,8 +160,9 @@ if (delegate_) { delegate_->OnNativeWidgetDestroyed(); } - if (should_delete_this) + if (should_delete_this) { delete this; + } } void NativeWidgetMac::OnWindowKeyStatusChanged( @@ -167,8 +174,9 @@ } // The contentView is the BridgedContentView hosting the views::RootView. The // focus manager will already know if a native subview has focus. - if (!is_content_first_responder) + if (!is_content_first_responder) { return; + } if (is_key) { widget->OnNativeFocus(); @@ -263,8 +271,9 @@ // Only set the z-order here if it is non-default since setting it may affect // how the window is treated by Expose. - if (params.EffectiveZOrderLevel() != ui::ZOrderLevel::kNormal) + if (params.EffectiveZOrderLevel() != ui::ZOrderLevel::kNormal) { SetZOrderLevel(params.EffectiveZOrderLevel()); + } GetNSWindowMojo()->SetIgnoresMouseEvents(!params.accept_events); GetNSWindowMojo()->SetVisibleOnAllSpaces(params.visible_on_all_workspaces); @@ -279,8 +288,9 @@ GetNSWindowMojo()->MakeFirstResponder(); // Only one ZoomFocusMonitor is needed per FocusManager, so create one only // for top-level widgets. - if (GetWidget()->is_top_level()) + if (GetWidget()->is_top_level()) { zoom_focus_monitor_ = std::make_unique<ZoomFocusMonitor>(); + } SetFocusManager(focus_manager); } ns_window_host_->CreateCompositor(params); @@ -404,44 +414,51 @@ } void NativeWidgetMac::ReorderNativeViews() { - if (ns_window_host_) + if (ns_window_host_) { ns_window_host_->ReorderChildViews(); + } } void NativeWidgetMac::ViewRemoved(View* view) { DragDropClientMac* client = ns_window_host_ ? ns_window_host_->drag_drop_client() : nullptr; - if (client) + if (client) { client->drop_helper()->ResetTargetViewIfEquals(view); + } } void NativeWidgetMac::SetNativeWindowProperty(const char* name, void* value) { - if (ns_window_host_) + if (ns_window_host_) { ns_window_host_->SetNativeWindowProperty(name, value); + } } void* NativeWidgetMac::GetNativeWindowProperty(const char* name) const { - if (ns_window_host_) + if (ns_window_host_) { return ns_window_host_->GetNativeWindowProperty(name); + } return nullptr; } TooltipManager* NativeWidgetMac::GetTooltipManager() const { - if (ns_window_host_) + if (ns_window_host_) { return ns_window_host_->tooltip_manager(); + } return nullptr; } void NativeWidgetMac::SetCapture() { - if (GetNSWindowMojo()) + if (GetNSWindowMojo()) { GetNSWindowMojo()->AcquireCapture(); + } } void NativeWidgetMac::ReleaseCapture() { - if (GetNSWindowMojo()) + if (GetNSWindowMojo()) { GetNSWindowMojo()->ReleaseCapture(); + } } bool NativeWidgetMac::HasCapture() const { @@ -468,17 +485,19 @@ gfx::Rect* bounds, ui::mojom::WindowShowState* show_state) const { *bounds = GetRestoredBounds(); - if (IsFullscreen()) + if (IsFullscreen()) { *show_state = ui::mojom::WindowShowState::kFullscreen; - else if (IsMinimized()) + } else if (IsMinimized()) { *show_state = ui::mojom::WindowShowState::kMinimized; - else + } else { *show_state = ui::mojom::WindowShowState::kNormal; + } } bool NativeWidgetMac::SetWindowTitle(const std::u16string& title) { - if (!ns_window_host_) + if (!ns_window_host_) { return false; + } return ns_window_host_->SetWindowTitle(title); } @@ -538,8 +557,9 @@ const gfx::Rect& bounds) const { // If there isn't a parent widget, then bounds cannot be relative to the // parent. - if (!ns_window_host_ || !ns_window_host_->parent() || !GetWidget()) + if (!ns_window_host_ || !ns_window_host_->parent() || !GetWidget()) { return bounds; + } // Replicate the logic in desktop_aura/desktop_screen_position_client.cc. if (GetAuraWindowTypeForWidgetType(type_) == @@ -550,8 +570,9 @@ // Empty bounds are only allowed to be specified at initialization and are // expected not to be translated. - if (bounds.IsEmpty()) + if (bounds.IsEmpty()) { return bounds; + } gfx::Rect bounds_in_screen = bounds; bounds_in_screen.Offset( @@ -560,14 +581,16 @@ } void NativeWidgetMac::SetBounds(const gfx::Rect& bounds) { - if (!ns_window_host_) + if (!ns_window_host_) { return; + } ns_window_host_->SetBoundsInScreen(ConvertBoundsToScreenIfNeeded(bounds)); } void NativeWidgetMac::SetBoundsConstrained(const gfx::Rect& bounds) { - if (!ns_window_host_) + if (!ns_window_host_) { return; + } gfx::Rect new_bounds(bounds); if (ns_window_host_->parent()) { new_bounds.AdjustToFit( @@ -579,14 +602,16 @@ } void NativeWidgetMac::SetSize(const gfx::Size& size) { - if (!ns_window_host_) + if (!ns_window_host_) { return; + } ns_window_host_->SetSize(size); } void NativeWidgetMac::StackAbove(gfx::NativeView native_view) { - if (!GetNSWindowMojo()) + if (!GetNSWindowMojo()) { return; + } auto* sibling_host = NativeWidgetMacNSWindowHost::GetFromNativeView(native_view); @@ -611,24 +636,28 @@ } void NativeWidgetMac::StackAtTop() { - if (GetNSWindowMojo()) + if (GetNSWindowMojo()) { GetNSWindowMojo()->StackAtTop(); + } } bool NativeWidgetMac::IsStackedAbove(gfx::NativeView native_view) { - if (!GetNSWindowMojo()) + if (!GetNSWindowMojo()) { return false; + } // -[NSApplication orderedWindows] are ordered front-to-back. NSWindow* first = GetNativeWindow().GetNativeNSWindow(); NSWindow* second = [native_view.GetNativeNSView() window]; for (NSWindow* window in [NSApp orderedWindows]) { - if (window == second) + if (window == second) { return !first; + } - if (window == first) + if (window == first) { first = nil; + } } return false; @@ -639,13 +668,15 @@ } void NativeWidgetMac::Close() { - if (GetNSWindowMojo()) + if (GetNSWindowMojo()) { GetNSWindowMojo()->CloseWindow(); + } } void NativeWidgetMac::CloseNow() { - if (ns_window_host_) + if (ns_window_host_) { ns_window_host_->CloseWindowNow(); + } // Note: |ns_window_host_| will be deleted here, and |this| will be deleted // here when ownership_ == NATIVE_WIDGET_OWNS_WIDGET, } @@ -714,8 +745,9 @@ } void NativeWidgetMac::SetZOrderLevel(ui::ZOrderLevel order) { - if (!GetNSWindowMojo()) + if (!GetNSWindowMojo()) { return; + } z_order_level_ = order; GetNSWindowMojo()->SetWindowLevel(CGWindowLevelForZOrderLevel(order, type_)); } @@ -725,8 +757,9 @@ } void NativeWidgetMac::SetVisibleOnAllWorkspaces(bool always_visible) { - if (!GetNSWindowMojo()) + if (!GetNSWindowMojo()) { return; + } GetNSWindowMojo()->SetVisibleOnAllSpaces(always_visible); } @@ -735,32 +768,37 @@ } void NativeWidgetMac::Maximize() { - if (!GetNSWindowMojo()) + if (!GetNSWindowMojo()) { return; + } GetNSWindowMojo()->SetZoomed(true); } void NativeWidgetMac::Minimize() { - if (!GetNSWindowMojo()) + if (!GetNSWindowMojo()) { return; + } GetNSWindowMojo()->SetMiniaturized(true); } bool NativeWidgetMac::IsMaximized() const { - if (!ns_window_host_) + if (!ns_window_host_) { return false; + } return ns_window_host_->IsZoomed(); } bool NativeWidgetMac::IsMinimized() const { - if (!ns_window_host_) + if (!ns_window_host_) { return false; + } return ns_window_host_->IsMiniaturized(); } void NativeWidgetMac::Restore() { - if (!GetNSWindowMojo()) + if (!GetNSWindowMojo()) { return; + } GetNSWindowMojo()->ExitFullscreen(); GetNSWindowMojo()->SetMiniaturized(false); GetNSWindowMojo()->SetZoomed(false); @@ -768,8 +806,9 @@ void NativeWidgetMac::SetFullscreen(bool fullscreen, int64_t target_display_id) { - if (!ns_window_host_) + if (!ns_window_host_) { return; + } ns_window_host_->SetFullscreen(fullscreen, target_display_id); } @@ -779,22 +818,25 @@ void NativeWidgetMac::SetCanAppearInExistingFullscreenSpaces( bool can_appear_in_existing_fullscreen_spaces) { - if (!GetNSWindowMojo()) + if (!GetNSWindowMojo()) { return; + } GetNSWindowMojo()->SetCanAppearInExistingFullscreenSpaces( can_appear_in_existing_fullscreen_spaces); } void NativeWidgetMac::SetOpacity(float opacity) { - if (!GetNSWindowMojo()) + if (!GetNSWindowMojo()) { return; + } GetNSWindowMojo()->SetOpacity(opacity); } void NativeWidgetMac::SetAspectRatio(const gfx::SizeF& aspect_ratio, const gfx::Size& excluded_margin) { - if (!GetNSWindowMojo()) + if (!GetNSWindowMojo()) { return; + } GetNSWindowMojo()->SetAspectRatio(aspect_ratio, excluded_margin); } @@ -806,8 +848,9 @@ const gfx::Point& location, int operation, ui::mojom::DragEventSource source) { - if (!ns_window_host_) + if (!ns_window_host_) { return; + } ns_window_host_->drag_drop_client()->StartDragAndDrop(std::move(data), operation, source); } @@ -829,26 +872,30 @@ target_rect.origin.y = NSHeight(client_rect) - target_rect.origin.y - NSHeight(target_rect); [GetNativeView().GetNativeNSView() setNeedsDisplayInRect:target_rect]; - if (ns_window_host_ && ns_window_host_->layer()) + if (ns_window_host_ && ns_window_host_->layer()) { ns_window_host_->layer()->SchedulePaint(rect); + } } void NativeWidgetMac::ScheduleLayout() { ui::Compositor* compositor = GetCompositor(); - if (compositor) + if (compositor) { compositor->ScheduleDraw(); + } } void NativeWidgetMac::SetCursor(const ui::Cursor& cursor) { - if (GetNSWindowMojo()) + if (GetNSWindowMojo()) { GetNSWindowMojo()->SetCursor(cursor); + } } void NativeWidgetMac::ShowEmojiPanel() { // We must plumb the call to ui::ShowEmojiPanel() over the bridge so that it // is called from the correct process. - if (GetNSWindowMojo()) + if (GetNSWindowMojo()) { GetNSWindowMojo()->ShowEmojiPanel(); + } } bool NativeWidgetMac::IsMouseEventsEnabled() const { @@ -866,8 +913,9 @@ // To quote DesktopWindowTreeHostX11, "This method is weird and misnamed." // The goal is to set focus to the content window, thereby removing focus from // any NSView in the window that doesn't belong to toolkit-views. - if (!GetNSWindowMojo()) + if (!GetNSWindowMojo()) { return; + } GetNSWindowMojo()->MakeFirstResponder(); } @@ -880,8 +928,9 @@ const gfx::Vector2d& drag_offset, Widget::MoveLoopSource source, Widget::MoveLoopEscapeBehavior escape_behavior) { - if (!GetInProcessNSWindowBridge()) + if (!GetInProcessNSWindowBridge()) { return Widget::MoveLoopResult::kCanceled; + } ReleaseCapture(); return GetInProcessNSWindowBridge()->RunMoveLoop(drag_offset) @@ -890,13 +939,15 @@ } void NativeWidgetMac::EndMoveLoop() { - if (GetInProcessNSWindowBridge()) + if (GetInProcessNSWindowBridge()) { GetInProcessNSWindowBridge()->EndMoveLoop(); + } } void NativeWidgetMac::SetVisibilityChangedAnimationsEnabled(bool value) { - if (GetNSWindowMojo()) + if (GetNSWindowMojo()) { GetNSWindowMojo()->SetAnimationEnabled(value); + } } void NativeWidgetMac::SetVisibilityAnimationDuration( @@ -922,8 +973,9 @@ transitions = remote_cocoa::mojom::VisibilityTransition::kBoth; break; } - if (GetNSWindowMojo()) + if (GetNSWindowMojo()) { GetNSWindowMojo()->SetTransitionsToAnimate(transitions); + } } ui::GestureRecognizer* NativeWidgetMac::GetGestureRecognizer() { @@ -1025,19 +1077,23 @@ void NativeWidgetMac::SetFocusManager(FocusManager* new_focus_manager) { if (focus_manager_) { - if (View* old_focus = focus_manager_->GetFocusedView()) + if (View* old_focus = focus_manager_->GetFocusedView()) { OnDidChangeFocus(old_focus, nullptr); + } focus_manager_->RemoveFocusChangeListener(this); - if (zoom_focus_monitor_) + if (zoom_focus_monitor_) { focus_manager_->RemoveFocusChangeListener(zoom_focus_monitor_.get()); + } } focus_manager_ = new_focus_manager; if (focus_manager_) { - if (View* new_focus = focus_manager_->GetFocusedView()) + if (View* new_focus = focus_manager_->GetFocusedView()) { OnDidChangeFocus(nullptr, new_focus); + } focus_manager_->AddFocusChangeListener(this); - if (zoom_focus_monitor_) + if (zoom_focus_monitor_) { focus_manager_->AddFocusChangeListener(zoom_focus_monitor_.get()); + } if (!widget_observation_.IsObserving()) { CHECK(GetWidget()); @@ -1052,8 +1108,9 @@ void NativeWidgetMac::OnDidChangeFocus(View* focused_before, View* focused_now) { ui::InputMethod* input_method = GetWidget()->GetInputMethod(); - if (!input_method) + if (!input_method) { return; + } ui::TextInputClient* new_text_input_client = input_method->GetTextInputClient(); @@ -1070,10 +1127,11 @@ ui::EventDispatchDetails NativeWidgetMac::DispatchKeyEventPostIME( ui::KeyEvent* key) { DCHECK(focus_manager_); - if (!focus_manager_->OnKeyEvent(*key)) + if (!focus_manager_->OnKeyEvent(*key)) { key->StopPropagation(); - else + } else { GetWidget()->OnKeyEvent(key); + } return ui::EventDispatchDetails(); } @@ -1096,8 +1154,9 @@ // Ignore any windows that couldn't have been created by NativeWidgetMac or // a subclass. GetNativeWidgetForNativeWindow() will later interrogate the // NSWindow delegate, but we can't trust that delegate to be a valid object. - if (![window isKindOfClass:[NativeWidgetMacNSWindow class]]) + if (![window isKindOfClass:[NativeWidgetMacNSWindow class]]) { continue; + } // Record a crash key to detect when client code may destroy a // WidgetObserver without removing it (possibly leaking the Widget). @@ -1111,8 +1170,9 @@ value); Widget* widget = GetWidgetForNativeWindow(window); - if (widget && widget->is_secondary_widget()) + if (widget && widget->is_secondary_widget()) { [window close]; + } } } @@ -1148,15 +1208,17 @@ gfx::NativeView native_view) { NativeWidgetMacNSWindowHost* window_host = NativeWidgetMacNSWindowHost::GetFromNativeView(native_view); - if (!window_host) + if (!window_host) { return nullptr; + } while (window_host->parent()) { if (!window_host->native_widget_mac()->GetWidget()) { return nullptr; } - if (window_host->native_widget_mac()->GetWidget()->is_top_level()) + if (window_host->native_widget_mac()->GetWidget()->is_top_level()) { break; + } window_host = window_host->parent(); } return window_host->native_widget_mac(); @@ -1173,14 +1235,16 @@ // are. Support returning Widgets that are parented to the NSWindow, except: // - Ignore requests for children of an NSView that is not a contentView. // - We do not add a Widget for |native_view| to |children| (there is none). - if ([[ns_view window] contentView] != ns_view) + if ([[ns_view window] contentView] != ns_view) { return; + } // Collect -sheets and -childWindows. A window should never appear in both, // since that causes AppKit to glitch. NSArray* sheet_children = [[ns_view window] sheets]; - for (NSWindow* native_child in sheet_children) + for (NSWindow* native_child in sheet_children) { GetAllChildWidgets([native_child contentView], children); + } for (NSWindow* native_child in [[ns_view window] childWindows]) { DCHECK(![sheet_children containsObject:native_child]); @@ -1195,19 +1259,22 @@ // |native_view|, not the Widget for |native_view|. |native_view| doesn't have // a corresponding Widget of its own in this case (and so can't have Widget // children of its own on Mac). - if (window_host->native_widget_mac()->GetNativeView() != native_view) + if (window_host->native_widget_mac()->GetNativeView() != native_view) { return; + } // Code expects widget for |native_view| to be added to |children|. - if (window_host->native_widget_mac()->GetWidget()) + if (window_host->native_widget_mac()->GetWidget()) { children->insert(window_host->native_widget_mac()->GetWidget()); + } // When the NSWindow *is* a Widget, only consider children(). I.e. do not // look through -[NSWindow childWindows] as done for the (!window_host) case // above. -childWindows does not support hidden windows, and anything in there // which is not in children() would have been added by AppKit. - for (NativeWidgetMacNSWindowHost* child : window_host->children()) + for (NativeWidgetMacNSWindowHost* child : window_host->children()) { GetAllChildWidgets(child->native_widget_mac()->GetNativeView(), children); + } } // static @@ -1219,10 +1286,12 @@ GetAllChildWidgets(native_view, owned); return; } - if (window_host->native_widget_mac()->GetNativeView() != native_view) + if (window_host->native_widget_mac()->GetNativeView() != native_view) { return; - for (NativeWidgetMacNSWindowHost* child : window_host->children()) + } + for (NativeWidgetMacNSWindowHost* child : window_host->children()) { GetAllChildWidgets(child->native_widget_mac()->GetNativeView(), owned); + } } // static
diff --git a/ui/views/widget/native_widget_mac_interactive_uitest.mm b/ui/views/widget/native_widget_mac_interactive_uitest.mm index 0e28bdd2..d117d80 100644 --- a/ui/views/widget/native_widget_mac_interactive_uitest.mm +++ b/ui/views/widget/native_widget_mac_interactive_uitest.mm
@@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/views/widget/native_widget_mac.h" - #import <Cocoa/Cocoa.h> #import "base/mac/mac_util.h" @@ -18,6 +16,7 @@ #include "ui/views/test/test_widget_observer.h" #include "ui/views/test/widget_activation_waiter.h" #include "ui/views/test/widget_test.h" +#include "ui/views/widget/native_widget_mac.h" #include "ui/views/widget/widget_interactive_uitest_utils.h" namespace views::test { @@ -63,10 +62,11 @@ Observer& operator=(const Observer&) = delete; void OnWidgetActivationChanged(Widget* widget, bool active) override { - if (active) + if (active) { parent_->activation_count_++; - else + } else { parent_->deactivation_count_++; + } } private:
diff --git a/ui/views/widget/native_widget_mac_unittest.mm b/ui/views/widget/native_widget_mac_unittest.mm index 433ee2e6..5e3697c 100644 --- a/ui/views/widget/native_widget_mac_unittest.mm +++ b/ui/views/widget/native_widget_mac_unittest.mm
@@ -223,8 +223,9 @@ WidgetChangeObserver& operator=(const WidgetChangeObserver&) = delete; void WaitForVisibleCounts(int gained, int lost) { - if (gained_visible_count_ >= gained && lost_visible_count_ >= lost) + if (gained_visible_count_ >= gained && lost_visible_count_ >= lost) { return; + } target_gained_visible_count_ = gained; target_lost_visible_count_ = lost; @@ -242,12 +243,12 @@ private: // WidgetObserver: - void OnWidgetVisibilityChanged(Widget* widget, - bool visible) override { + void OnWidgetVisibilityChanged(Widget* widget, bool visible) override { ++(visible ? gained_visible_count_ : lost_visible_count_); if (run_loop_ && gained_visible_count_ >= target_gained_visible_count_ && - lost_visible_count_ >= target_lost_visible_count_) + lost_visible_count_ >= target_lost_visible_count_) { run_loop_->Quit(); + } } int gained_visible_count_ = 0; @@ -418,9 +419,9 @@ NativeWidgetMacNSWindowHost::GetFromNativeWindow(native_parent); EXPECT_FALSE(window_host->native_widget_mac()->WillExecuteCommand( - 5001, WindowOpenDisposition::CURRENT_TAB, true)); + 5001, WindowOpenDisposition::CURRENT_TAB, true)); EXPECT_FALSE(window_host->native_widget_mac()->ExecuteCommand( - 5001, WindowOpenDisposition::CURRENT_TAB, true)); + 5001, WindowOpenDisposition::CURRENT_TAB, true)); [native_parent close]; } @@ -456,13 +457,15 @@ void OnPaint(gfx::Canvas* canvas) override { EXPECT_TRUE(GetWidget()->IsVisible()); ++paint_count_; - if (run_loop_ && paint_count_ == target_paint_count_) + if (run_loop_ && paint_count_ == target_paint_count_) { run_loop_->Quit(); + } } void WaitForPaintCount(int target) { - if (paint_count_ == target) + if (paint_count_ == target) { return; + } target_paint_count_ = target; base::RunLoop run_loop; @@ -1243,8 +1246,9 @@ } void WaitForMethod() { - if (method_called_) + if (method_called_) { return; + } base::RunLoop run_loop; base::SingleThreadTaskRunner::GetCurrentDefault()->PostDelayedTask( @@ -1260,8 +1264,9 @@ void CallMethodInternal(id receiver, SEL selector) { DCHECK(!method_called_); method_called_ = true; - if (run_loop_) + if (run_loop_) { run_loop_->Quit(); + } swizzler_.InvokeOriginal<void>(receiver, selector); } @@ -1858,38 +1863,38 @@ // Create a regular widget (TYPE_WINDOW). Widget* regular_widget = CreateTopLevelNativeWidget(); EXPECT_TRUE([regular_widget->GetNativeWindow().GetNativeNSWindow() - canBecomeKeyWindow]); + canBecomeKeyWindow]); EXPECT_TRUE([regular_widget->GetNativeWindow().GetNativeNSWindow() - canBecomeMainWindow]); + canBecomeMainWindow]); // Disabling activation should prevent key and main status. regular_widget->widget_delegate()->SetCanActivate(false); EXPECT_FALSE([regular_widget->GetNativeWindow().GetNativeNSWindow() - canBecomeKeyWindow]); + canBecomeKeyWindow]); EXPECT_FALSE([regular_widget->GetNativeWindow().GetNativeNSWindow() - canBecomeMainWindow]); + canBecomeMainWindow]); // Create a dialog widget (also TYPE_WINDOW), but with a DialogDelegate. Widget* dialog_widget = views::DialogDelegate::CreateDialogWidget( MakeModalDialog(ui::mojom::ModalType::kChild), nullptr, regular_widget->GetNativeView()); EXPECT_TRUE([dialog_widget->GetNativeWindow().GetNativeNSWindow() - canBecomeKeyWindow]); + canBecomeKeyWindow]); // Dialogs shouldn't take main status away from their parent. EXPECT_FALSE([dialog_widget->GetNativeWindow().GetNativeNSWindow() - canBecomeMainWindow]); + canBecomeMainWindow]); // Create a bubble widget (with a parent): also shouldn't get main. BubbleDialogDelegateView* bubble_view = new SimpleBubbleView(); bubble_view->set_parent_window(regular_widget->GetNativeView()); Widget* bubble_widget = BubbleDialogDelegateView::CreateBubble(bubble_view); EXPECT_TRUE([bubble_widget->GetNativeWindow().GetNativeNSWindow() - canBecomeKeyWindow]); + canBecomeKeyWindow]); EXPECT_FALSE([bubble_widget->GetNativeWindow().GetNativeNSWindow() - canBecomeMainWindow]); + canBecomeMainWindow]); EXPECT_EQ(NSWindowCollectionBehaviorTransient, [bubble_widget->GetNativeWindow().GetNativeNSWindow() - collectionBehavior] & + collectionBehavior] & NSWindowCollectionBehaviorTransient); regular_widget->CloseNow(); @@ -2422,7 +2427,7 @@ views::DialogDelegate::CreateDialogWidget(delegate, nullptr, nullptr); NSView* content = [delegate->GetWidget()->GetNativeWindow().GetNativeNSWindow() - contentView]; + contentView]; // Constants from bridged_content_view_touch_bar.mm. NSString* const kTouchBarOKId = @"com.google.chrome-OK";
diff --git a/ui/views/widget/native_widget_private.cc b/ui/views/widget/native_widget_private.cc index a3032d2..5177574 100644 --- a/ui/views/widget/native_widget_private.cc +++ b/ui/views/widget/native_widget_private.cc
@@ -20,8 +20,9 @@ gfx::Rect new_bounds(bounds); gfx::Rect work_area = display::Screen::GetScreen()->GetDisplayMatching(bounds).work_area(); - if (!work_area.IsEmpty()) + if (!work_area.IsEmpty()) { new_bounds.AdjustToFit(work_area); + } return new_bounds; }
diff --git a/ui/views/widget/root_view.cc b/ui/views/widget/root_view.cc index 532c366..e8246ae 100644 --- a/ui/views/widget/root_view.cc +++ b/ui/views/widget/root_view.cc
@@ -212,12 +212,14 @@ CHECK_EQ(ui::EP_PRETARGET, event->phase()); // macOS doesn't have keyboard-triggered context menus. #if !BUILDFLAG(IS_MAC) - if (event->handled()) + if (event->handled()) { return; + } View* v = nullptr; - if (owner_->GetFocusManager()) // Can be NULL in unittests. + if (owner_->GetFocusManager()) { // Can be NULL in unittests. v = owner_->GetFocusManager()->GetFocusedView(); + } // Special case to handle keyboard-triggered context menus. if (v && v->GetEnabled() && ((event->key_code() == ui::VKEY_APPS) || @@ -258,8 +260,9 @@ // Overridden from ui::EventHandler: void OnGestureEvent(ui::GestureEvent* event) override { DCHECK_EQ(ui::EP_POSTTARGET, event->phase()); - if (event->handled()) + if (event->handled()) { return; + } View* target = static_cast<View*>(event->target()); @@ -342,8 +345,9 @@ // The ContentsView must be set up _after_ the window is created so that its // Widget pointer is valid. SetUseDefaultFillLayout(true); - if (!children().empty()) + if (!children().empty()) { RemoveAllChildViews(); + } AddChildView(contents_view); } @@ -447,8 +451,9 @@ void RootView::OnEventProcessingStarted(ui::Event* event) { VLOG(5) << "RootView::OnEventProcessingStarted(" << event->ToString() << ")"; - if (!event->IsGestureEvent()) + if (!event->IsGestureEvent()) { return; + } ui::GestureEvent* gesture_event = event->AsGestureEvent(); @@ -519,8 +524,9 @@ drag_info_.Reset(); ui::EventDispatchDetails dispatch_details = DispatchEvent(mouse_pressed_handler_, &mouse_pressed_event); - if (dispatch_details.dispatcher_destroyed) + if (dispatch_details.dispatcher_destroyed) { return true; + } return true; } DCHECK(!explicit_mouse_handler_); @@ -540,14 +546,16 @@ // Remove the double-click flag if the handler is different than the // one which got the first click part of the double-click. - if (mouse_pressed_handler_ != last_click_handler_) + if (mouse_pressed_handler_ != last_click_handler_) { mouse_pressed_event.SetFlags(event.flags() & ~ui::EF_IS_DOUBLE_CLICK); + } drag_info_.Reset(); ui::EventDispatchDetails dispatch_details = DispatchEvent(mouse_pressed_handler_, &mouse_pressed_event); - if (dispatch_details.dispatcher_destroyed) + if (dispatch_details.dispatcher_destroyed) { return mouse_pressed_event.handled(); + } // The view could have removed itself from the tree when handling // OnMousePressed(). In this case, the removal notification will have @@ -556,8 +564,9 @@ // // NOTE: Don't return true here, because we don't want the frame to // forward future events to us when there's no handler. - if (!mouse_pressed_handler_) + if (!mouse_pressed_handler_) { break; + } // If the view handled the event, leave mouse_pressed_handler_ set and // return true, which will cause subsequent drag/release events to get @@ -591,8 +600,9 @@ mouse_pressed_handler_.get()); ui::EventDispatchDetails dispatch_details = DispatchEvent(mouse_pressed_handler_, &mouse_event); - if (dispatch_details.dispatcher_destroyed) + if (dispatch_details.dispatcher_destroyed) { return false; + } return true; } return false; @@ -614,8 +624,9 @@ SetMouseAndGestureHandler(nullptr); ui::EventDispatchDetails dispatch_details = DispatchEvent(mouse_pressed_handler, &mouse_released); - if (dispatch_details.dispatcher_destroyed) + if (dispatch_details.dispatcher_destroyed) { return; + } } } @@ -634,10 +645,11 @@ View* mouse_pressed_handler = mouse_pressed_handler_; View* gesture_handler = gesture_handler_; SetMouseAndGestureHandler(nullptr); - if (mouse_pressed_handler) + if (mouse_pressed_handler) { mouse_pressed_handler->OnMouseCaptureLost(); - else + } else { gesture_handler->OnMouseCaptureLost(); + } // WARNING: we may have been deleted. } } @@ -655,15 +667,17 @@ MouseEnterExitEvent exited(event, ui::EventType::kMouseExited); ui::EventDispatchDetails dispatch_details = DispatchEvent(mouse_move_handler_, &exited); - if (dispatch_details.dispatcher_destroyed) + if (dispatch_details.dispatcher_destroyed) { return; + } // The mouse_move_handler_ could have been destroyed in the context of the // mouse exit event. b/312400341 if (!dispatch_details.target_destroyed && mouse_move_handler_) { dispatch_details = NotifyEnterExitOfDescendant( event, ui::EventType::kMouseExited, mouse_move_handler_, nullptr); - if (dispatch_details.dispatcher_destroyed) + if (dispatch_details.dispatcher_destroyed) { return; + } } mouse_move_handler_ = nullptr; } @@ -686,12 +700,14 @@ #if defined(USE_AURA) ui::GestureRecognizer* gesture_recognizer = (gesture_handler_ && widget_ ? widget_->GetGestureRecognizer() : nullptr); - if (!gesture_recognizer) + if (!gesture_recognizer) { return; + } ui::GestureConsumer* gesture_consumer = widget_->GetGestureConsumer(); - if (!gesture_recognizer->DoesConsumerHaveActiveTouch(gesture_consumer)) + if (!gesture_recognizer->DoesConsumerHaveActiveTouch(gesture_consumer)) { return; + } gesture_recognizer->SendSynthesizedEndEvents(gesture_consumer); #endif @@ -700,8 +716,9 @@ void RootView::SetMouseAndGestureHandler(View* new_handler) { SetMouseHandler(new_handler); - if (new_handler == gesture_handler_) + if (new_handler == gesture_handler_) { return; + } MaybeNotifyGestureHandlerBeforeReplacement(); gesture_handler_ = new_handler; @@ -787,24 +804,28 @@ if (!layer()) { gfx::Rect xrect = ConvertRectToParent(rect); gfx::Rect invalid_rect = gfx::IntersectRects(GetLocalBounds(), xrect); - if (!invalid_rect.IsEmpty()) + if (!invalid_rect.IsEmpty()) { widget_->SchedulePaintInRect(invalid_rect); + } } } void RootView::OnPaint(gfx::Canvas* canvas) { - if (!layer() || !layer()->fills_bounds_opaquely()) + if (!layer() || !layer()->fills_bounds_opaquely()) { canvas->DrawColor(SK_ColorTRANSPARENT, SkBlendMode::kClear); + } View::OnPaint(canvas); } View::LayerOffsetData RootView::CalculateOffsetToAncestorWithLayer( ui::Layer** layer_parent) { - if (layer() || !widget_->GetLayer()) + if (layer() || !widget_->GetLayer()) { return View::CalculateOffsetToAncestorWithLayer(layer_parent); - if (layer_parent) + } + if (layer_parent) { *layer_parent = widget_->GetLayer(); + } return LayerOffsetData(widget_->GetLayer()->device_scale_factor()); } @@ -949,10 +970,12 @@ View* view, View* sibling) { for (View* p = view->parent(); p; p = p->parent()) { - if (!p->GetNotifyEnterExitOnChild()) + if (!p->GetNotifyEnterExitOnChild()) { continue; - if (sibling && p->Contains(sibling)) + } + if (sibling && p->Contains(sibling)) { break; + } // It is necessary to recreate the notify-event for each dispatch, since one // of the callbacks can mark the event as handled, and that would cause // incorrect event dispatch. @@ -996,15 +1019,17 @@ if (event.type() == ui::EventType::kGestureEnd) { // In case a drag was in progress, reset all the handlers. Otherwise, just // reset the gesture handler. - if (gesture_handler_ && gesture_handler_ == mouse_pressed_handler_) + if (gesture_handler_ && gesture_handler_ == mouse_pressed_handler_) { SetMouseAndGestureHandler(nullptr); - else + } else { gesture_handler_ = nullptr; + } } DispatchDetails details; - if (target != event_dispatch_target_) + if (target != event_dispatch_target_) { details.target_destroyed = true; + } event_dispatch_target_ = old_dispatch_target_; old_dispatch_target_ = nullptr;
diff --git a/ui/views/widget/root_view_targeter.cc b/ui/views/widget/root_view_targeter.cc index fbc77266e..988ca3d 100644 --- a/ui/views/widget/root_view_targeter.cc +++ b/ui/views/widget/root_view_targeter.cc
@@ -65,8 +65,9 @@ // the GESTURE_END event corresponding to the removal of the last touch // point. In either case, no further re-targeting of |gesture| should be // permitted. - if (!root_view_->gesture_handler_) + if (!root_view_->gesture_handler_) { return nullptr; + } return previous_target->GetParentTarget(); }
diff --git a/ui/views/widget/root_view_unittest.cc b/ui/views/widget/root_view_unittest.cc index 0dc6645..96ffb78 100644 --- a/ui/views/widget/root_view_unittest.cc +++ b/ui/views/widget/root_view_unittest.cc
@@ -51,8 +51,9 @@ RootViewTestStateInit init = {}) { Widget::InitParams init_params = delegate->CreateParams( Widget::InitParams::CLIENT_OWNS_WIDGET, init.type); - if (init.bounds != gfx::Rect()) + if (init.bounds != gfx::Rect()) { init_params.bounds = init.bounds; + } widget_.Init(std::move(init_params)); widget_.Show(); widget_.SetContentsView(std::make_unique<View>()); @@ -498,8 +499,9 @@ ~DeleteViewOnEvent() override { *was_destroyed_ = true; } void OnEvent(ui::Event* event) override { - if (event->type() == delete_event_type_) + if (event->type() == delete_event_type_) { delete this; + } } private: @@ -526,8 +528,9 @@ RemoveViewOnEvent& operator=(const RemoveViewOnEvent&) = delete; void OnEvent(ui::Event* event) override { - if (event->type() == remove_event_type_) + if (event->type() == remove_event_type_) { parent()->RemoveChildView(this); + } } private:
diff --git a/ui/views/widget/sublevel_manager_mac_unittest.mm b/ui/views/widget/sublevel_manager_mac_unittest.mm index d72b714..9e42b09 100644 --- a/ui/views/widget/sublevel_manager_mac_unittest.mm +++ b/ui/views/widget/sublevel_manager_mac_unittest.mm
@@ -44,10 +44,11 @@ // Call Show() or ShowInactive() depending on WidgetShowType. void ShowWidget(const std::unique_ptr<Widget>& widget) { WidgetShowType show_type = std::get<WidgetShowType>(GetParam()); - if (show_type == WidgetShowType::kShowActive) + if (show_type == WidgetShowType::kShowActive) { widget->Show(); - else + } else { widget->ShowInactive(); + } test::WidgetVisibleWaiter(widget.get()).Wait(); }
diff --git a/ui/views/widget/sublevel_manager_unittest.cc b/ui/views/widget/sublevel_manager_unittest.cc index 4936fb2..7a0bf2ea6 100644 --- a/ui/views/widget/sublevel_manager_unittest.cc +++ b/ui/views/widget/sublevel_manager_unittest.cc
@@ -52,10 +52,11 @@ // Call Show() or ShowInactive() depending on WidgetShowType. void ShowWidget(const std::unique_ptr<Widget>& widget) { WidgetShowType show_type = std::get<WidgetShowType>(GetParam()); - if (show_type == WidgetShowType::kShowActive) + if (show_type == WidgetShowType::kShowActive) { widget->Show(); - else + } else { widget->ShowInactive(); + } test::WidgetVisibleWaiter(widget.get()).Wait(); } @@ -306,8 +307,9 @@ ShowWidget(children[i]); // Hide the second widget. - if (i == 1) + if (i == 1) { children[i]->Hide(); + } } EXPECT_TRUE(test::WidgetTest::IsWindowStackedAbove(children[2].get(),
diff --git a/ui/views/widget/tooltip_manager.h b/ui/views/widget/tooltip_manager.h index 4e68109..668919e 100644 --- a/ui/views/widget/tooltip_manager.h +++ b/ui/views/widget/tooltip_manager.h
@@ -5,7 +5,6 @@ #ifndef UI_VIEWS_WIDGET_TOOLTIP_MANAGER_H_ #define UI_VIEWS_WIDGET_TOOLTIP_MANAGER_H_ - #include "ui/views/views_export.h" namespace gfx {
diff --git a/ui/views/widget/tooltip_manager_aura.cc b/ui/views/widget/tooltip_manager_aura.cc index 5b68965e..e301e6a8 100644 --- a/ui/views/widget/tooltip_manager_aura.cc +++ b/ui/views/widget/tooltip_manager_aura.cc
@@ -38,40 +38,47 @@ // static void TooltipManagerAura::UpdateTooltipManagerForCapture( internal::NativeWidgetPrivate* source) { - if (!source->HasCapture()) + if (!source->HasCapture()) { return; + } aura::Window* root_window = source->GetNativeView()->GetRootWindow(); - if (!root_window) + if (!root_window) { return; + } gfx::Point screen_loc( root_window->GetHost()->dispatcher()->GetLastMouseLocationInRoot()); aura::client::ScreenPositionClient* screen_position_client = aura::client::GetScreenPositionClient(root_window); - if (!screen_position_client) + if (!screen_position_client) { return; + } screen_position_client->ConvertPointToScreen(root_window, &screen_loc); display::Screen* screen = display::Screen::GetScreen(); aura::Window* target = screen->GetWindowAtScreenPoint(screen_loc); - if (!target) + if (!target) { return; + } gfx::Point target_loc(screen_loc); screen_position_client = aura::client::GetScreenPositionClient(target->GetRootWindow()); - if (!screen_position_client) + if (!screen_position_client) { return; + } screen_position_client->ConvertPointFromScreen(target, &target_loc); target = target->GetEventHandlerForPoint(target_loc); while (target) { internal::NativeWidgetPrivate* target_native_widget = internal::NativeWidgetPrivate::GetNativeWidgetForNativeView(target); - if (target_native_widget == source) + if (target_native_widget == source) { return; + } if (target_native_widget) { - if (target_native_widget->GetTooltipManager()) + if (target_native_widget->GetTooltipManager()) { target_native_widget->GetTooltipManager()->UpdateTooltip(); + } return; } target = target->parent(); @@ -126,8 +133,9 @@ root_window->GetHost()->dispatcher()->GetLastMouseLocationInRoot(); aura::Window::ConvertPointToTarget(root_window, GetWindow(), &view_point); View* target = GetViewUnderPoint(view_point); - if (target != view) + if (target != view) { return; + } UpdateTooltipForTarget(view, view_point, root_window); } } @@ -137,8 +145,9 @@ ? native_widget_->GetWidget()->GetRootView() : nullptr; - if (root_view) + if (root_view) { return root_view->GetTooltipHandlerForPoint(point); + } return nullptr; }
diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc index 270152d..51a8f185 100644 --- a/ui/views/widget/widget.cc +++ b/ui/views/widget/widget.cc
@@ -79,8 +79,9 @@ if (view->layer()) { views->push_back(view); } else { - for (View* child : view->children()) + for (View* child : view->children()) { BuildViewsWithLayers(child, views); + } } } @@ -89,24 +90,28 @@ // Finally, make a default one. NativeWidget* CreateNativeWidget(const Widget::InitParams& params, internal::NativeWidgetDelegate* delegate) { - if (params.native_widget) + if (params.native_widget) { return params.native_widget; + } const auto& factory = ViewsDelegate::GetInstance()->native_widget_factory(); if (!factory.is_null()) { NativeWidget* native_widget = factory.Run(params, delegate); - if (native_widget) + if (native_widget) { return native_widget; + } } return internal::NativeWidgetPrivate::CreateNativeWidget(delegate); } void NotifyCaretBoundsChanged(ui::InputMethod* input_method) { - if (!input_method) + if (!input_method) { return; + } ui::TextInputClient* client = input_method->GetTextInputClient(); - if (client) + if (client) { input_method->OnCaretBoundsChanged(client); + } } } // namespace @@ -154,8 +159,9 @@ ~PaintAsActiveLockImpl() override { Widget* const widget = widget_.get(); - if (widget) + if (widget) { widget->UnlockPaintAsActive(); + } } private: @@ -176,16 +182,18 @@ Widget::InitParams::~InitParams() = default; bool Widget::InitParams::CanActivate() const { - if (activatable != InitParams::Activatable::kDefault) + if (activatable != InitParams::Activatable::kDefault) { return activatable == InitParams::Activatable::kYes; + } return type != InitParams::TYPE_CONTROL && type != InitParams::TYPE_POPUP && type != InitParams::TYPE_MENU && type != InitParams::TYPE_TOOLTIP && type != InitParams::TYPE_DRAG; } ui::ZOrderLevel Widget::InitParams::EffectiveZOrderLevel() const { - if (z_order.has_value()) + if (z_order.has_value()) { return z_order.value(); + } switch (type) { case TYPE_MENU: @@ -303,8 +311,9 @@ // static Widget* Widget::GetWidgetForNativeView(gfx::NativeView native_view) { - if (!native_view) + if (!native_view) { return nullptr; + } internal::NativeWidgetPrivate* native_widget = internal::NativeWidgetPrivate::GetNativeWidgetForNativeView(native_view); @@ -313,8 +322,9 @@ // static Widget* Widget::GetWidgetForNativeWindow(gfx::NativeWindow native_window) { - if (!native_window) + if (!native_window) { return nullptr; + } internal::NativeWidgetPrivate* native_widget = internal::NativeWidgetPrivate::GetNativeWidgetForNativeWindow( @@ -324,8 +334,9 @@ // static Widget* Widget::GetTopLevelWidgetForNativeView(gfx::NativeView native_view) { - if (!native_view) + if (!native_view) { return nullptr; + } internal::NativeWidgetPrivate* native_widget = internal::NativeWidgetPrivate::GetTopLevelNativeWidget(native_view); @@ -335,16 +346,18 @@ // static void Widget::GetAllChildWidgets(gfx::NativeView native_view, Widgets* children) { - if (!native_view) + if (!native_view) { return; + } internal::NativeWidgetPrivate::GetAllChildWidgets(native_view, children); } // static void Widget::GetAllOwnedWidgets(gfx::NativeView native_view, Widgets* owned) { - if (!native_view) + if (!native_view) { return; + } internal::NativeWidgetPrivate::GetAllOwnedWidgets(native_view, owned); } @@ -357,8 +370,9 @@ Widget* child_widget = GetWidgetForNativeView(native_view); Widget* parent_widget = new_parent ? GetWidgetForNativeView(new_parent) : nullptr; - if (child_widget) + if (child_widget) { child_widget->SetParent(parent_widget); + } } // static @@ -408,8 +422,9 @@ params.name = params.delegate->internal_name(); // If an internal name was not provided the class name of the contents view // is a reasonable default. - if (params.name.empty() && params.delegate->GetContentsView()) + if (params.name.empty() && params.delegate->GetContentsView()) { params.name = params.delegate->GetContentsView()->GetClassName(); + } } if (params.parent && GetWidgetForNativeView(params.parent)) { @@ -449,8 +464,9 @@ DCHECK(widget_delegate_); - if (params.opacity == views::Widget::InitParams::WindowOpacity::kInferred) + if (params.opacity == views::Widget::InitParams::WindowOpacity::kInferred) { params.opacity = views::Widget::InitParams::WindowOpacity::kOpaque; + } bool can_activate = params.CanActivate(); params.activatable = can_activate ? InitParams::Activatable::kYes @@ -509,8 +525,9 @@ #endif native_widget_->InitNativeWidget(std::move(params)); - if (type == InitParams::TYPE_MENU) + if (type == InitParams::TYPE_MENU) { is_mouse_button_pressed_ = native_widget_->IsMouseButtonDown(); + } if (RequiresNonClientView(type)) { non_client_view_ = new NonClientView(widget_delegate_->CreateClientView(this)); @@ -570,16 +587,18 @@ native_widget_initialized_ = true; native_widget_->OnWidgetInitDone(); - if (delegate) + if (delegate) { delegate->WidgetInitialized(); + } internal::AnyWidgetObserverSingleton::GetInstance()->OnAnyWidgetInitialized( this); } void Widget::ShowEmojiPanel() { - if (native_widget_) + if (native_widget_) { native_widget_->ShowEmojiPanel(); + } } // Unconverted methods (see header) -------------------------------------------- @@ -625,19 +644,23 @@ void Widget::ViewHierarchyChanged(const ViewHierarchyChangedDetails& details) { if (!details.is_add) { - if (details.child == dragged_view_) + if (details.child == dragged_view_) { dragged_view_ = nullptr; + } FocusManager* focus_manager = GetFocusManager(); - if (focus_manager) + if (focus_manager) { focus_manager->ViewRemoved(details.child); - if (native_widget_) + } + if (native_widget_) { native_widget_->ViewRemoved(details.child); + } } } void Widget::NotifyNativeViewHierarchyWillChange() { - if (!native_widget_) + if (!native_widget_) { return; + } // During tear-down the top-level focus manager becomes unavailable to // GTK tabbed panes and their children, so normal deregistration via // |FocusManager::ViewRemoved()| calls are fouled. We clear focus here @@ -648,8 +671,9 @@ } void Widget::NotifyNativeViewHierarchyChanged() { - if (!native_widget_) + if (!native_widget_) { return; + } native_widget_->OnNativeViewHierarchyChanged(); root_view_->NotifyNativeViewHierarchyChanged(); } @@ -671,8 +695,9 @@ // property is gone after gobject gets deleted. Short circuit here // for toplevel so that InputMethod can remove itself from // focus manager. - if (is_top_level()) + if (is_top_level()) { return this; + } return native_widget_ ? native_widget_->GetTopLevelWidget() : nullptr; } @@ -686,8 +711,9 @@ void Widget::SetContentsView(View* view) { // Do not SetContentsView() again if it is already set to the same view. - if (view == GetContentsView()) + if (view == GetContentsView()) { return; + } // |non_client_view_| can only be non-null here if RequiresNonClientView() was // true when the widget was initialized. Creating widgets with non-client @@ -736,13 +762,15 @@ } void Widget::SetBounds(const gfx::Rect& bounds) { - if (native_widget_) + if (native_widget_) { native_widget_->SetBounds(bounds); + } } void Widget::SetSize(const gfx::Size& size) { - if (native_widget_) + if (native_widget_) { native_widget_->SetSize(size); + } } gfx::Size Widget::GetSize() const { @@ -754,28 +782,33 @@ } void Widget::CenterWindow(const gfx::Size& size) { - if (native_widget_) + if (native_widget_) { native_widget_->CenterWindow(size); + } } void Widget::SetBoundsConstrained(const gfx::Rect& bounds) { - if (native_widget_) + if (native_widget_) { native_widget_->SetBoundsConstrained(bounds); + } } void Widget::SetVisibilityChangedAnimationsEnabled(bool value) { - if (native_widget_) + if (native_widget_) { native_widget_->SetVisibilityChangedAnimationsEnabled(value); + } } void Widget::SetVisibilityAnimationDuration(const base::TimeDelta& duration) { - if (native_widget_) + if (native_widget_) { native_widget_->SetVisibilityAnimationDuration(duration); + } } void Widget::SetVisibilityAnimationTransition(VisibilityTransition transition) { - if (native_widget_) + if (native_widget_) { native_widget_->SetVisibilityAnimationTransition(transition); + } } bool Widget::IsMoveLoopSupported() const { @@ -786,30 +819,35 @@ const gfx::Vector2d& drag_offset, MoveLoopSource source, MoveLoopEscapeBehavior escape_behavior) { - if (!native_widget_) + if (!native_widget_) { return MoveLoopResult::kCanceled; + } return native_widget_->RunMoveLoop(drag_offset, source, escape_behavior); } void Widget::EndMoveLoop() { - if (native_widget_) + if (native_widget_) { native_widget_->EndMoveLoop(); + } } void Widget::StackAboveWidget(Widget* widget) { - if (native_widget_) + if (native_widget_) { native_widget_->StackAbove(widget->GetNativeView()); + } } void Widget::StackAbove(gfx::NativeView native_view) { - if (native_widget_) + if (native_widget_) { native_widget_->StackAbove(native_view); + } } void Widget::StackAtTop() { - if (native_widget_) + if (native_widget_) { native_widget_->StackAtTop(); + } } bool Widget::IsStackedAbove(gfx::NativeView native_view) { @@ -817,8 +855,9 @@ } void Widget::SetShape(std::unique_ptr<ShapeRects> shape) { - if (native_widget_) + if (native_widget_) { native_widget_->SetShape(std::move(shape)); + } } void Widget::CloseWithReason(ClosedReason closed_reason) { @@ -849,8 +888,9 @@ return; } // This is the last chance to cancel closing. - if (widget_delegate_ && !widget_delegate_->OnCloseRequested(closed_reason)) + if (widget_delegate_ && !widget_delegate_->OnCloseRequested(closed_reason)) { return; + } // Cancel widget close on focus lost. This is used in UI Devtools to lock // bubbles and in some tests where we want to ignore spurious deactivation. @@ -875,11 +915,13 @@ internal::AnyWidgetObserverSingleton::GetInstance()->OnAnyWidgetClosing(this); - if (widget_delegate_) + if (widget_delegate_) { widget_delegate_->WindowWillClose(); + } - if (native_widget_) + if (native_widget_) { native_widget_->Close(); + } } void Widget::MakeCloseSynchronous( @@ -913,8 +955,9 @@ } void Widget::Show() { - if (!native_widget_) + if (!native_widget_) { return; + } const ui::Layer* layer = GetLayer(); TRACE_EVENT1("views", "Widget::Show", "layer", layer ? layer->name() : "none"); @@ -944,15 +987,17 @@ } void Widget::Hide() { - if (!native_widget_) + if (!native_widget_) { return; + } native_widget_->Hide(); internal::AnyWidgetObserverSingleton::GetInstance()->OnAnyWidgetHidden(this); } void Widget::ShowInactive() { - if (!native_widget_) + if (!native_widget_) { return; + } // If this gets called with saved_show_state_ == // ui::mojom::WindowShowState::kMaximized, call SetBounds()with the restored // bounds to set the correct size. This normally should not happen, but if it @@ -968,13 +1013,15 @@ } void Widget::Activate() { - if (CanActivate() && native_widget_) + if (CanActivate() && native_widget_) { native_widget_->Activate(); + } } void Widget::Deactivate() { - if (native_widget_) + if (native_widget_) { native_widget_->Deactivate(); + } } bool Widget::IsActive() const { @@ -986,8 +1033,9 @@ } void Widget::SetZOrderLevel(ui::ZOrderLevel order) { - if (native_widget_) + if (native_widget_) { native_widget_->SetZOrderLevel(order); + } } ui::ZOrderLevel Widget::GetZOrderLevel() const { @@ -1000,15 +1048,17 @@ } int Widget::GetZOrderSublevel() const { - if (!sublevel_manager_) + if (!sublevel_manager_) { return 0; + } return sublevel_manager_->GetSublevel(); } void Widget::SetVisibleOnAllWorkspaces(bool always_visible) { - if (native_widget_) + if (native_widget_) { native_widget_->SetVisibleOnAllWorkspaces(always_visible); + } } bool Widget::IsVisibleOnAllWorkspaces() const { @@ -1016,18 +1066,21 @@ } void Widget::Maximize() { - if (native_widget_) + if (native_widget_) { native_widget_->Maximize(); + } } void Widget::Minimize() { - if (native_widget_) + if (native_widget_) { native_widget_->Minimize(); + } } void Widget::Restore() { - if (native_widget_) + if (native_widget_) { native_widget_->Restore(); + } } bool Widget::IsMaximized() const { @@ -1039,11 +1092,13 @@ } void Widget::SetFullscreen(bool fullscreen, int64_t target_display_id) { - if (!native_widget_) + if (!native_widget_) { return; + } // It isn't valid to specify `target_display_id` when exiting fullscreen. - if (!fullscreen) + if (!fullscreen) { DCHECK(target_display_id == display::kInvalidDisplayId); + } if (IsFullscreen() == fullscreen && target_display_id == display::kInvalidDisplayId) { return; @@ -1051,11 +1106,13 @@ auto weak_ptr = GetWeakPtr(); native_widget_->SetFullscreen(fullscreen, target_display_id); - if (!weak_ptr) + if (!weak_ptr) { return; + } - if (non_client_view_) + if (non_client_view_) { non_client_view_->InvalidateLayout(); + } } bool Widget::IsFullscreen() const { @@ -1081,8 +1138,9 @@ void Widget::SetOpacity(float opacity) { DCHECK(opacity >= 0.0f); DCHECK(opacity <= 1.0f); - if (native_widget_) + if (native_widget_) { native_widget_->SetOpacity(opacity); + } } void Widget::SetAspectRatio(const gfx::SizeF& aspect_ratio) { @@ -1102,8 +1160,9 @@ } void Widget::FlashFrame(bool flash) { - if (native_widget_) + if (native_widget_) { native_widget_->FlashFrame(flash); + } } View* Widget::GetRootView() { @@ -1171,8 +1230,9 @@ CHECK_EQ(view->GetWidget(), this); } - if (!native_widget_) + if (!native_widget_) { return; + } dragged_view_ = view; OnDragWillStart(); @@ -1193,11 +1253,12 @@ } // The widget may be destroyed during the drag operation. - if (!widget_deletion_observer.IsWidgetAlive()) + if (!widget_deletion_observer.IsWidgetAlive()) { return; + } - // TODO(crbug.com/375959961): On X11, the native widget's mouse button state - // is not updated when the mouse button is released to end a drag. + // TODO(crbug.com/375959961): On X11, the native widget's mouse button state + // is not updated when the mouse button is released to end a drag. #if !BUILDFLAG(IS_OZONE_X11) is_mouse_button_pressed_ = native_widget_->IsMouseButtonDown(); #endif @@ -1225,8 +1286,9 @@ // This happens when DestroyRootView removes all children from the // RootView which triggers a SchedulePaint that ends up here. This happens // after in ~Widget after native_widget_ is destroyed. - if (native_widget_) + if (native_widget_) { native_widget_->SchedulePaintInRect(rect); + } } void Widget::OnRootViewLayoutInvalidated() { @@ -1249,13 +1311,15 @@ } void Widget::ScheduleLayout() { - if (native_widget_) + if (native_widget_) { native_widget_->ScheduleLayout(); + } } void Widget::SetCursor(const ui::Cursor& cursor) { - if (native_widget_) + if (native_widget_) { native_widget_->SetCursor(cursor); + } } bool Widget::IsMouseEventsEnabled() const { @@ -1263,8 +1327,9 @@ } void Widget::SetNativeWindowProperty(const char* name, void* value) { - if (native_widget_) + if (native_widget_) { native_widget_->SetNativeWindowProperty(name, value); + } } void* Widget::GetNativeWindowProperty(const char* name) const { @@ -1298,11 +1363,13 @@ } void Widget::UpdateWindowIcon() { - if (!native_widget_) + if (!native_widget_) { return; + } - if (non_client_view_) + if (non_client_view_) { non_client_view_->UpdateWindowIcon(); + } native_widget_->SetWindowIcons( widget_delegate_->GetWindowIcon().Rasterize(GetColorProvider()), @@ -1340,29 +1407,34 @@ } void Widget::ClearNativeFocus() { - if (native_widget_) + if (native_widget_) { native_widget_->ClearNativeFocus(); + } } std::unique_ptr<NonClientFrameView> Widget::CreateNonClientFrameView() { - if (!native_widget_) + if (!native_widget_) { return nullptr; + } auto frame_view = widget_delegate_->CreateNonClientFrameView(this); - if (!frame_view) + if (!frame_view) { frame_view = native_widget_->CreateNonClientFrameView(); + } if (!frame_view) { frame_view = ViewsDelegate::GetInstance()->CreateDefaultNonClientFrameView(this); } - if (frame_view) + if (frame_view) { return frame_view; + } return std::make_unique<CustomFrameView>(this); } bool Widget::ShouldUseNativeFrame() const { - if (frame_type_ != FrameType::kDefault) + if (frame_type_ != FrameType::kDefault) { return frame_type_ == FrameType::kForceNative; + } return native_widget_ ? native_widget_->ShouldUseNativeFrame() : false; } @@ -1372,8 +1444,9 @@ } void Widget::FrameTypeChanged() { - if (native_widget_) + if (native_widget_) { native_widget_->FrameTypeChanged(); + } } const ui::Compositor* Widget::GetCompositor() const { @@ -1385,8 +1458,9 @@ } void Widget::ReorderNativeViews() { - if (native_widget_) + if (native_widget_) { native_widget_->ReorderNativeViews(); + } } void Widget::LayerTreeChanged() { @@ -1405,15 +1479,17 @@ } void Widget::SetCapture(View* view) { - if (!native_widget_) + if (!native_widget_) { return; + } if (!native_widget_->HasCapture()) { native_widget_->SetCapture(); // Early return if setting capture was unsuccessful. - if (!native_widget_->HasCapture()) + if (!native_widget_->HasCapture()) { return; + } } is_mouse_button_pressed_ = native_widget_->IsMouseButtonDown(); @@ -1421,8 +1497,9 @@ } void Widget::ReleaseCapture() { - if (native_widget_ && native_widget_->HasCapture()) + if (native_widget_ && native_widget_->HasCapture()) { native_widget_->ReleaseCapture(); + } } bool Widget::HasCapture() { @@ -1446,8 +1523,9 @@ // In screen coordinate. gfx::Point mouse_location = display::Screen::GetScreen()->GetCursorScreenPoint(); - if (!GetWindowBoundsInScreen().Contains(mouse_location)) + if (!GetWindowBoundsInScreen().Contains(mouse_location)) { return; + } // Convert: screen coordinate -> widget coordinate. View::ConvertPointFromScreen(root_view_.get(), &mouse_location); @@ -1494,8 +1572,9 @@ ++paint_as_active_refcount_; if (ShouldPaintAsActive() != was_paint_as_active) { NotifyPaintAsActiveChanged(); - if (parent() && !parent_paint_as_active_lock_) + if (parent() && !parent_paint_as_active_lock_) { parent_paint_as_active_lock_ = parent()->LockPaintAsActive(); + } } return std::make_unique<PaintAsActiveLockImpl>( weak_ptr_factory_.GetWeakPtr()); @@ -1508,8 +1587,9 @@ bool Widget::ShouldPaintAsActive() const { // A transient bubble hits this code path when it loses focus. // Return false after Close() is called. - if (widget_closed_) + if (widget_closed_) { return false; + } return native_widget_active_ || paint_as_active_refcount_ || (parent() && parent()->ShouldPaintAsActive()); @@ -1519,18 +1599,21 @@ // |native_widget_| has already been deleted and |this| is being deleted so // that we don't have to handle the event and also it's unsafe to reference // |native_widget_| in this case. - if (!native_widget_) + if (!native_widget_) { return; + } // |native_widget_active| is being updated in // OnNativeWidgetActivationChanged(). Notification will be handled there. - if (native_widget_active_ != native_widget_->IsActive()) + if (native_widget_active_ != native_widget_->IsActive()) { return; + } // this->ShouldPaintAsActive() changes iff the native widget is // inactive and there's no lock on this widget. - if (!(native_widget_active_ || paint_as_active_refcount_)) + if (!(native_widget_active_ || paint_as_active_refcount_)) { NotifyPaintAsActiveChanged(); + } } void Widget::NotifyPaintAsActiveChanged() { @@ -1550,8 +1633,9 @@ const bool is_update = native_theme_ && (native_theme_ != native_theme); native_theme_ = native_theme; native_theme_observation_.Reset(); - if (native_theme) + if (native_theme) { native_theme_observation_.Observe(native_theme); + } if (is_update) { OnNativeThemeUpdated(native_theme); @@ -1582,58 +1666,66 @@ void Widget::SetX(int x) { gfx::Rect bounds = GetRestoredBounds(); - if (x == bounds.x()) + if (x == bounds.x()) { return; + } bounds.set_x(x); SetBounds(bounds); } void Widget::SetY(int y) { gfx::Rect bounds = GetRestoredBounds(); - if (y == bounds.y()) + if (y == bounds.y()) { return; + } bounds.set_y(y); SetBounds(bounds); } void Widget::SetWidth(int width) { gfx::Rect bounds = GetRestoredBounds(); - if (width == bounds.width()) + if (width == bounds.width()) { return; + } bounds.set_width(width); SetBounds(bounds); } void Widget::SetHeight(int height) { gfx::Rect bounds = GetRestoredBounds(); - if (height == bounds.height()) + if (height == bounds.height()) { return; + } bounds.set_height(height); SetBounds(bounds); } void Widget::SetVisible(bool visible) { - if (visible == IsVisible()) + if (visible == IsVisible()) { return; - if (visible) + } + if (visible) { Show(); - else + } else { Hide(); + } } //////////////////////////////////////////////////////////////////////////////// // Widget, NativeWidgetDelegate implementation: bool Widget::IsModal() const { - if (!widget_delegate_) + if (!widget_delegate_) { return false; + } return widget_delegate_->GetModalType() != ui::mojom::ModalType::kNone; } bool Widget::IsDialogBox() const { - if (!widget_delegate_) + if (!widget_delegate_) { return false; + } return !!widget_delegate_->AsDialogDelegate(); } @@ -1649,14 +1741,16 @@ } bool Widget::OnNativeWidgetActivationChanged(bool active) { - if (!ShouldHandleNativeWidgetActivationChanged(active)) + if (!ShouldHandleNativeWidgetActivationChanged(active)) { return false; + } // On windows we may end up here before we've completed initialization (from // an WM_NCACTIVATE). If that happens the WidgetDelegate likely doesn't know // the Widget and will crash attempting to access it. - if (!active && native_widget_initialized_) + if (!active && native_widget_initialized_) { SaveWindowPlacement(); + } observers_.Notify(&WidgetObserver::OnWidgetActivationChanged, this, active); @@ -1694,17 +1788,19 @@ // native widget to destroy this widget we ensure that resetting the paint // lock happens synchronously with the activation the next widget (see // crbug/1303549). - if (!active && !paint_as_active_refcount_ && !widget_closed_) + if (!active && !paint_as_active_refcount_ && !widget_closed_) { parent_paint_as_active_lock_.reset(); - else if (parent()) + } else if (parent()) { parent_paint_as_active_lock_ = parent()->LockPaintAsActive(); + } native_widget_active_ = active; // Notify controls (e.g. LabelButton) and children widgets about the // paint-as-active change. - if (ShouldPaintAsActive() != was_paint_as_active) + if (ShouldPaintAsActive() != was_paint_as_active) { NotifyPaintAsActiveChanged(); + } return true; } @@ -1727,16 +1823,19 @@ void Widget::OnNativeWidgetVisibilityChanged(bool visible) { View* root = GetRootView(); - if (root) + if (root) { root->PropagateVisibilityNotifications(root, visible); + } observers_.Notify(&WidgetObserver::OnWidgetVisibilityChanged, this, visible); - if (GetCompositor() && root && root->layer()) + if (GetCompositor() && root && root->layer()) { root->layer()->SetVisible(visible); + } } void Widget::OnNativeWidgetCreated() { - if (is_top_level()) + if (is_top_level()) { focus_manager_ = FocusManagerFactory::Create(this); + } DCHECK(native_widget_); DCHECK(widget_delegate_); @@ -1775,8 +1874,9 @@ void Widget::OnNativeWidgetMove() { TRACE_EVENT0("ui", "Widget::OnNativeWidgetMove"); - if (widget_delegate_) + if (widget_delegate_) { widget_delegate_->OnWidgetMove(); + } NotifyCaretBoundsChanged(GetInputMethod()); observers_.Notify(&WidgetObserver::OnWidgetBoundsChanged, this, @@ -1787,8 +1887,9 @@ TRACE_EVENT0("ui", "Widget::OnNativeWidgetSizeChanged"); View* root = GetRootView(); - if (root) + if (root) { root->SetSize(new_size); + } NotifyCaretBoundsChanged(GetInputMethod()); SaveWindowPlacementIfInitialized(); @@ -1806,13 +1907,15 @@ } void Widget::OnNativeWidgetBeginUserBoundsChange() { - if (widget_delegate_) + if (widget_delegate_) { widget_delegate_->OnWindowBeginUserBoundsChange(); + } } void Widget::OnNativeWidgetEndUserBoundsChange() { - if (widget_delegate_) + if (widget_delegate_) { widget_delegate_->OnWindowEndUserBoundsChange(); + } } void Widget::OnNativeWidgetAddedToCompositor() {} @@ -1826,8 +1929,9 @@ void Widget::OnNativeWidgetPaint(const ui::PaintContext& context) { // On Linux Aura, we can get here during Init() because of the // SetInitialBounds call. - if (!native_widget_initialized_) + if (!native_widget_initialized_) { return; + } GetRootView()->PaintFromPaintRoot(context); } @@ -1835,8 +1939,10 @@ int component = non_client_view_ ? non_client_view_->NonClientHitTest(point) : HTNOWHERE; - if (movement_disabled_ && (component == HTCAPTION || component == HTSYSMENU)) + if (movement_disabled_ && + (component == HTCAPTION || component == HTSYSMENU)) { return HTNOWHERE; + } return component; } @@ -1886,8 +1992,9 @@ current_capture == internal::NativeWidgetPrivate::GetGlobalCapture( native_widget_->GetNativeView())) { is_mouse_button_pressed_ = true; - if (!native_widget_->HasCapture()) + if (!native_widget_->HasCapture()) { native_widget_->SetCapture(); + } event->SetHandled(); } return; @@ -1901,8 +2008,9 @@ base::AutoReset<bool> resetter(&ignore_capture_loss_, true); native_widget_->ReleaseCapture(); } - if (root_view) + if (root_view) { root_view->OnMouseReleased(*event); + } if ((event->flags() & ui::EF_IS_NON_CLIENT) == 0 && // If none of the "normal" buttons are pressed, this event may be from // one of the newer mice that have buttons bound to browser forward @@ -1919,14 +2027,16 @@ case ui::EventType::kMouseDragged: if (native_widget_->HasCapture() && is_mouse_button_pressed_) { last_mouse_event_was_move_ = false; - if (root_view) + if (root_view) { root_view->OnMouseDragged(*event); + } } else if (!last_mouse_event_was_move_ || last_mouse_event_position_ != event->location()) { last_mouse_event_position_ = event->location(); last_mouse_event_was_move_ = true; - if (root_view) + if (root_view) { root_view->OnMouseMoved(*event); + } } return; @@ -1939,14 +2049,16 @@ case ui::EventType::kMouseExited: last_mouse_event_was_move_ = false; - if (root_view) + if (root_view) { root_view->OnMouseExited(*event); + } return; case ui::EventType::kMousewheel: if (root_view && root_view->OnMouseWheel( - static_cast<const ui::MouseWheelEvent&>(*event))) + static_cast<const ui::MouseWheelEvent&>(*event))) { event->SetHandled(); + } return; default: @@ -1955,12 +2067,14 @@ } void Widget::OnMouseCaptureLost() { - if (ignore_capture_loss_) + if (ignore_capture_loss_) { return; + } View* root_view = GetRootView(); - if (root_view) + if (root_view) { root_view->OnMouseCaptureLost(); + } is_mouse_button_pressed_ = false; } @@ -1984,22 +2098,25 @@ } bool Widget::ExecuteCommand(int command_id) { - if (!widget_delegate_) + if (!widget_delegate_) { return false; + } return widget_delegate_->ExecuteWindowsCommand(command_id); } bool Widget::HasHitTestMask() const { - if (!widget_delegate_) + if (!widget_delegate_) { return false; + } return widget_delegate_->WidgetHasHitTestMask(); } void Widget::GetHitTestMask(SkPath* mask) const { - if (!widget_delegate_) + if (!widget_delegate_) { return; + } DCHECK(mask); widget_delegate_->GetWidgetHitTestMask(mask); @@ -2015,16 +2132,18 @@ bool Widget::SetInitialFocus(ui::mojom::WindowShowState show_state) { FocusManager* focus_manager = GetFocusManager(); - if (!focus_manager || !widget_delegate_) + if (!focus_manager || !widget_delegate_) { return false; + } View* v = widget_delegate_->GetInitiallyFocusedView(); if (!focus_on_creation_ || show_state == ui::mojom::WindowShowState::kInactive || show_state == ui::mojom::WindowShowState::kMinimized) { // If not focusing the window now, tell the focus manager which view to // focus when the window is restored. - if (v) + if (v) { focus_manager->SetStoredFocusView(v); + } return true; } if (v) { @@ -2032,8 +2151,9 @@ // If the Widget is active (thus allowing its child Views to receive focus), // but the request for focus was unsuccessful, fall back to using the first // focusable View instead. - if (focus_manager->GetFocusedView() == nullptr && IsActive()) + if (focus_manager->GetFocusedView() == nullptr && IsActive()) { focus_manager->AdvanceFocus(false); + } } return !!focus_manager->GetFocusedView(); } @@ -2050,20 +2170,23 @@ } const View::Views& views_with_layers = GetViewsWithLayers(); - if (views_with_layers.empty()) + if (views_with_layers.empty()) { return true; + } // Don't descend into |child| if there is a view with a Layer that contains // the point and is stacked above |child_layer|. auto child_layer_iter = base::ranges::find(root_layer->children(), child_layer); - if (child_layer_iter == root_layer->children().end()) + if (child_layer_iter == root_layer->children().end()) { return true; + } for (View* view : base::Reversed(views_with_layers)) { // Skip views that don't process events. - if (!view->GetCanProcessEventsWithinSubtree()) + if (!view->GetCanProcessEventsWithinSubtree()) { continue; + } ui::Layer* layer = view->layer(); DCHECK(layer); if (layer->visible() && layer->bounds().Contains(location)) { @@ -2084,8 +2207,9 @@ gfx::Rect vis_bounds = view->GetVisibleBounds(); gfx::Point point_in_view = location; View::ConvertPointToTarget(GetRootView(), view, &point_in_view); - if (vis_bounds.Contains(point_in_view)) + if (vis_bounds.Contains(point_in_view)) { return false; + } } } return true; @@ -2237,15 +2361,19 @@ void Widget::OnDragComplete() {} const ui::NativeTheme* Widget::GetNativeTheme() const { - if (native_theme_) + if (native_theme_) { return native_theme_; + } - if (parent_) + if (parent_) { return parent_->GetNativeTheme(); + } #if BUILDFLAG(IS_LINUX) - if (auto* linux_ui_theme = ui::LinuxUiTheme::GetForWindow(GetNativeWindow())) + if (auto* linux_ui_theme = + ui::LinuxUiTheme::GetForWindow(GetNativeWindow())) { return linux_ui_theme->GetNativeTheme(); + } #endif return ui::NativeTheme::GetInstanceForNativeUi(); @@ -2260,8 +2388,9 @@ // WM_DESTROY, at which point the window delegate is likely gone. So just // bail. if (!widget_delegate_ || !widget_delegate_->ShouldSaveWindowPlacement() || - !native_widget_) + !native_widget_) { return; + } ui::mojom::WindowShowState show_state = ui::mojom::WindowShowState::kNormal; gfx::Rect bounds; native_widget_->GetWindowPlacement(&bounds, &show_state); @@ -2269,13 +2398,15 @@ } void Widget::SaveWindowPlacementIfInitialized() { - if (native_widget_initialized_) + if (native_widget_initialized_) { SaveWindowPlacement(); + } } void Widget::SetInitialBounds(const gfx::Rect& bounds) { - if (!non_client_view_) + if (!non_client_view_) { return; + } gfx::Rect saved_bounds; if (GetSavedWindowPlacement(&saved_bounds, &saved_show_state_)) { @@ -2313,8 +2444,9 @@ // No initial bounds supplied, so size the window to its content and // center over its parent if preferred size is provided. gfx::Size size = contents_view->GetPreferredSize({}); - if (!size.IsEmpty() && native_widget_) + if (!size.IsEmpty() && native_widget_) { native_widget_->CenterWindow(size); + } } else { // Use the supplied initial bounds. SetBounds(bounds); @@ -2322,8 +2454,9 @@ } void Widget::SetParent(Widget* parent) { - if (parent == parent_.get()) + if (parent == parent_.get()) { return; + } Widget* old_parent = parent_.get(); CHECK(!is_traversing_widget_tree_); @@ -2336,8 +2469,9 @@ // Lock and subscribe to parent's paint-as-active. if (parent) { - if (has_lock_on_parent || native_widget_active_) + if (has_lock_on_parent || native_widget_active_) { parent_paint_as_active_lock_ = parent->LockPaintAsActive(); + } parent_paint_as_active_subscription_ = parent->RegisterPaintAsActiveChangedCallback( base::BindRepeating(&Widget::OnParentShouldPaintAsActiveChanged, @@ -2361,16 +2495,19 @@ // a window is restored from maximized state, so we can't more accurately // track maximized state independently of sizing information. - if (!widget_delegate_->GetSavedWindowPlacement(this, bounds, show_state)) + if (!widget_delegate_->GetSavedWindowPlacement(this, bounds, show_state)) { return false; + } gfx::Size minimum_size = GetMinimumSize(); // Make sure the bounds are at least the minimum size. - if (bounds->width() < minimum_size.width()) + if (bounds->width() < minimum_size.width()) { bounds->set_width(minimum_size.width()); + } - if (bounds->height() < minimum_size.height()) + if (bounds->height() < minimum_size.height()) { bounds->set_height(minimum_size.height()); + } return true; } @@ -2388,19 +2525,22 @@ DCHECK_GT(paint_as_active_refcount_, 0U); --paint_as_active_refcount_; - if (!paint_as_active_refcount_ && !native_widget_active_) + if (!paint_as_active_refcount_ && !native_widget_active_) { parent_paint_as_active_lock_.reset(); + } - if (ShouldPaintAsActive() != was_paint_as_active) + if (ShouldPaintAsActive() != was_paint_as_active) { NotifyPaintAsActiveChanged(); + } } void Widget::ClearFocusFromWidget() { FocusManager* focus_manager = GetFocusManager(); // We are being removed from a window hierarchy. Treat this as // the root_view_ being removed. - if (focus_manager) + if (focus_manager) { focus_manager->ViewRemoved(root_view_.get()); + } } void Widget::HandleShowRequested() {
diff --git a/ui/views/widget/widget_delegate.cc b/ui/views/widget/widget_delegate.cc index e32e594..3997820 100644 --- a/ui/views/widget/widget_delegate.cc +++ b/ui/views/widget/widget_delegate.cc
@@ -210,8 +210,9 @@ ui::ImageModel WidgetDelegate::GetWindowAppIcon() { // Prefer app icon if available. - if (!params_.app_icon.IsEmpty()) + if (!params_.app_icon.IsEmpty()) { return params_.app_icon; + } // Fall back to the window icon. return GetWindowIcon(); } @@ -254,8 +255,9 @@ std::string window_name = GetWindowName(); if (window_name.empty() || !ViewsDelegate::GetInstance()->GetSavedWindowPlacement( - widget, window_name, bounds, show_state)) + widget, window_name, bounds, show_state)) { return false; + } // Try to find a display intersecting the saved bounds. const auto& display = display::Screen::GetScreen()->GetDisplayMatching(*bounds); @@ -273,8 +275,9 @@ } void WidgetDelegate::WidgetInitialized() { - for (auto&& callback : *widget_initialized_callbacks_) + for (auto&& callback : *widget_initialized_callbacks_) { std::move(callback).Run(); + } widget_initialized_callbacks_.reset(); OnWidgetInitialized(); } @@ -287,13 +290,15 @@ // TODO(ellyjones): For this and the other callback methods, establish whether // any other code calls these methods. If not, DCHECK here and below that // these methods are only called once. - for (auto&& callback : window_will_close_callbacks_) + for (auto&& callback : window_will_close_callbacks_) { std::move(callback).Run(); + } } void WidgetDelegate::WindowClosing() { - for (auto&& callback : window_closing_callbacks_) + for (auto&& callback : window_closing_callbacks_) { std::move(callback).Run(); + } } void WidgetDelegate::DeleteDelegate() { @@ -339,18 +344,21 @@ } View* WidgetDelegate::GetContentsView() { - if (unowned_contents_view_) + if (unowned_contents_view_) { return unowned_contents_view_; - if (!default_contents_view_) + } + if (!default_contents_view_) { default_contents_view_ = new View; + } return default_contents_view_; } View* WidgetDelegate::TransferOwnershipOfContentsView() { DCHECK(!contents_view_taken_); contents_view_taken_ = true; - if (owned_contents_view_) + if (owned_contents_view_) { owned_contents_view_.release(); + } return GetContentsView(); } @@ -405,20 +413,23 @@ void WidgetDelegate::SetCanMaximize(bool can_maximize) { bool old_can_maximize = std::exchange(params_.can_maximize, can_maximize); - if (GetWidget() && params_.can_maximize != old_can_maximize) + if (GetWidget() && params_.can_maximize != old_can_maximize) { GetWidget()->OnSizeConstraintsChanged(); + } } void WidgetDelegate::SetCanMinimize(bool can_minimize) { bool old_can_minimize = std::exchange(params_.can_minimize, can_minimize); - if (GetWidget() && params_.can_minimize != old_can_minimize) + if (GetWidget() && params_.can_minimize != old_can_minimize) { GetWidget()->OnSizeConstraintsChanged(); + } } void WidgetDelegate::SetCanResize(bool can_resize) { bool old_can_resize = std::exchange(params_.can_resize, can_resize); - if (GetWidget() && params_.can_resize != old_can_resize) + if (GetWidget() && params_.can_resize != old_can_resize) { GetWidget()->OnSizeConstraintsChanged(); + } } // TODO (kylixrd): This will be removed once Widget no longer "owns" the @@ -438,14 +449,16 @@ void WidgetDelegate::SetIcon(ui::ImageModel icon) { params_.icon = std::move(icon); - if (GetWidget()) + if (GetWidget()) { GetWidget()->UpdateWindowIcon(); + } } void WidgetDelegate::SetAppIcon(ui::ImageModel icon) { params_.app_icon = std::move(icon); - if (GetWidget()) + if (GetWidget()) { GetWidget()->UpdateWindowIcon(); + } } void WidgetDelegate::SetInitiallyFocusedView(View* initially_focused_view) { @@ -464,8 +477,9 @@ void WidgetDelegate::SetShowIcon(bool show_icon) { params_.show_icon = show_icon; - if (GetWidget()) + if (GetWidget()) { GetWidget()->UpdateWindowIcon(); + } } void WidgetDelegate::SetShowTitle(bool show_title) { @@ -473,11 +487,13 @@ } void WidgetDelegate::SetTitle(const std::u16string& title) { - if (params_.title == title) + if (params_.title == title) { return; + } params_.title = title; - if (GetWidget()) + if (GetWidget()) { GetWidget()->UpdateWindowTitle(); + } if (title_changed_callback_) { title_changed_callback_.Run();
diff --git a/ui/views/widget/widget_hwnd_utils.cc b/ui/views/widget/widget_hwnd_utils.cc index f28c1d1..0c37af2 100644 --- a/ui/views/widget/widget_hwnd_utils.cc +++ b/ui/views/widget/widget_hwnd_utils.cc
@@ -32,23 +32,28 @@ *class_style = CS_DBLCLKS; // Set type-independent style attributes. - if (params.child) + if (params.child) { *style |= WS_CHILD; + } if (params.show_state == ui::mojom::WindowShowState::kMaximized) { *style |= WS_MAXIMIZE; } if (params.show_state == ui::mojom::WindowShowState::kMinimized) { *style |= WS_MINIMIZE; } - if (!params.accept_events) + if (!params.accept_events) { *ex_style |= WS_EX_TRANSPARENT; + } DCHECK_NE(Widget::InitParams::Activatable::kDefault, params.activatable); - if (params.activatable == Widget::InitParams::Activatable::kNo) + if (params.activatable == Widget::InitParams::Activatable::kNo) { *ex_style |= WS_EX_NOACTIVATE; - if (params.EffectiveZOrderLevel() != ui::ZOrderLevel::kNormal) + } + if (params.EffectiveZOrderLevel() != ui::ZOrderLevel::kNormal) { *ex_style |= WS_EX_TOPMOST; - if (params.shadow_type == Widget::InitParams::ShadowType::kDrop) + } + if (params.shadow_type == Widget::InitParams::ShadowType::kDrop) { *class_style |= CS_DROPSHADOW; + } // Set type-dependent style attributes. switch (params.type) { @@ -57,14 +62,18 @@ // WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | // WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX *style |= WS_OVERLAPPEDWINDOW; - if (!widget_delegate->CanMaximize()) + if (!widget_delegate->CanMaximize()) { *style &= static_cast<DWORD>(~WS_MAXIMIZEBOX); - if (!widget_delegate->CanMinimize()) + } + if (!widget_delegate->CanMinimize()) { *style &= static_cast<DWORD>(~WS_MINIMIZEBOX); - if (!widget_delegate->CanResize()) + } + if (!widget_delegate->CanResize()) { *style &= static_cast<DWORD>(~(WS_THICKFRAME | WS_MAXIMIZEBOX)); - if (params.remove_standard_frame) + } + if (params.remove_standard_frame) { *style &= static_cast<DWORD>(~(WS_MINIMIZEBOX | WS_MAXIMIZEBOX)); + } if (native_widget_delegate->IsDialogBox()) { *style |= DS_MODALFRAME; @@ -83,8 +92,9 @@ native_widget_delegate->IsDialogBox() ? WS_EX_DLGMODALFRAME : 0; // See layered window comment below. - if (is_translucent) + if (is_translucent) { *style &= static_cast<DWORD>(~(WS_THICKFRAME | WS_CAPTION)); + } break; } case Widget::InitParams::TYPE_CONTROL: @@ -93,21 +103,24 @@ case Widget::InitParams::TYPE_BUBBLE: *style |= WS_POPUP; *style |= WS_CLIPCHILDREN; - if (!params.force_show_in_taskbar) + if (!params.force_show_in_taskbar) { *ex_style |= WS_EX_TOOLWINDOW; + } break; case Widget::InitParams::TYPE_POPUP: *style |= WS_POPUP; - if (!params.force_show_in_taskbar) + if (!params.force_show_in_taskbar) { *ex_style |= WS_EX_TOOLWINDOW; + } break; case Widget::InitParams::TYPE_MENU: *style |= WS_POPUP; if (params.remove_standard_frame) { *style |= WS_THICKFRAME; } - if (!params.force_show_in_taskbar) + if (!params.force_show_in_taskbar) { *ex_style |= WS_EX_TOOLWINDOW; + } break; case Widget::InitParams::TYPE_DRAG: case Widget::InitParams::TYPE_TOOLTIP:
diff --git a/ui/views/widget/widget_interactive_uitest.cc b/ui/views/widget/widget_interactive_uitest.cc index 9d956aa..5f4441b 100644 --- a/ui/views/widget/widget_interactive_uitest.cc +++ b/ui/views/widget/widget_interactive_uitest.cc
@@ -361,12 +361,15 @@ ui::mojom::WindowShowState GetWidgetShowState(const Widget* widget) { // Use IsMaximized/IsMinimized/IsFullScreen instead of GetWindowPlacement // because the former is implemented on all platforms but the latter is not. - if (widget->IsFullscreen()) + if (widget->IsFullscreen()) { return ui::mojom::WindowShowState::kFullscreen; - if (widget->IsMaximized()) + } + if (widget->IsMaximized()) { return ui::mojom::WindowShowState::kMaximized; - if (widget->IsMinimized()) + } + if (widget->IsMinimized()) { return ui::mojom::WindowShowState::kMinimized; + } return widget->IsActive() ? ui::mojom::WindowShowState::kNormal : ui::mojom::WindowShowState::kInactive; }
diff --git a/ui/views/widget/window_reorderer.cc b/ui/views/widget/window_reorderer.cc index c389973..fc73b523 100644 --- a/ui/views/widget/window_reorderer.cc +++ b/ui/views/widget/window_reorderer.cc
@@ -33,8 +33,9 @@ std::map<views::View*, aura::Window*>* hosted_windows) { for (aura::Window* child : parent_window.children()) { View* host_view = child->GetProperty(kHostViewKey); - if (host_view) + if (host_view) { (*hosted_windows)[host_view] = child; + } } } @@ -61,8 +62,9 @@ order->push_back(view); } - for (views::View* child : view->GetChildrenInZOrder()) + for (views::View* child : view->GetChildrenInZOrder()) { GetOrderOfViewsWithLayers(child, parent_layer, hosts, order); + } } } // namespace @@ -117,8 +119,9 @@ aura::Window* window, const void* key, intptr_t old) { - if (key == kHostViewKey) + if (key == kHostViewKey) { reorderer_->ReorderChildWindows(); + } } void WindowReorderer::AssociationObserver::OnWindowDestroying( @@ -185,11 +188,13 @@ } DCHECK(!layers.empty()); - if (window) + if (window) { parent_window.StackChildAtBottom(window); + } - for (ui::Layer* layer : layers) + for (ui::Layer* layer : layers) { children_layer_order.emplace_back(layer); + } } std::reverse(children_layer_order.begin(), children_layer_order.end()); parent_window.layer()->StackChildrenAtBottom(children_layer_order);
diff --git a/ui/views/widget/window_reorderer_unittest.cc b/ui/views/widget/window_reorderer_unittest.cc index 771a057..0a521ad 100644 --- a/ui/views/widget/window_reorderer_unittest.cc +++ b/ui/views/widget/window_reorderer_unittest.cc
@@ -29,8 +29,9 @@ std::string ChildWindowNamesAsString(const aura::Window& parent) { std::string names; for (const aura::Window* child : parent.children()) { - if (!names.empty()) + if (!names.empty()) { names += " "; + } names += child->GetName(); } return names;
diff --git a/ui/views/win/fullscreen_handler.cc b/ui/views/win/fullscreen_handler.cc index 750a6c4..7daa1fd 100644 --- a/ui/views/win/fullscreen_handler.cc +++ b/ui/views/win/fullscreen_handler.cc
@@ -37,8 +37,9 @@ HRESULT hr = ::CoCreateInstance(CLSID_TaskbarList, nullptr, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&task_bar_list_)); - if (SUCCEEDED(hr) && FAILED(task_bar_list_->HrInit())) + if (SUCCEEDED(hr) && FAILED(task_bar_list_->HrInit())) { task_bar_list_ = nullptr; + } } // As per MSDN marking the window as fullscreen should ensure that the @@ -46,8 +47,9 @@ // is activated. If the window is not fullscreen, the Shell falls back to // heuristics to determine how the window should be treated, which means // that it could still consider the window as fullscreen. :( - if (task_bar_list_) + if (task_bar_list_) { task_bar_list_->MarkFullscreenWindow(hwnd_, !!fullscreen); + } } gfx::Rect FullscreenHandler::GetRestoreBounds() const { @@ -152,8 +154,9 @@ SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED); } } - if (!ref) + if (!ref) { return; + } MarkFullscreen(fullscreen); }
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc index 509bbf3..20349af 100644 --- a/ui/views/win/hwnd_message_handler.cc +++ b/ui/views/win/hwnd_message_handler.cc
@@ -134,8 +134,9 @@ bool hide_on_escape) : host_(std::move(host)), hide_on_escape_(hide_on_escape) { // Only one instance can be active at a time. - if (instance_) + if (instance_) { instance_->Unhook(); + } mouse_hook_ = SetWindowsHookEx(WH_MOUSE, &MouseHook, nullptr, GetCurrentThreadId()); @@ -164,13 +165,15 @@ } void MoveLoopMouseWatcher::Unhook() { - if (instance_ != this) + if (instance_ != this) { return; + } DCHECK(mouse_hook_); UnhookWindowsHookEx(mouse_hook_); - if (key_hook_) + if (key_hook_) { UnhookWindowsHookEx(key_hook_); + } key_hook_ = nullptr; mouse_hook_ = nullptr; instance_ = nullptr; @@ -181,8 +184,9 @@ WPARAM w_param, LPARAM l_param) { DCHECK(instance_); - if (n_code == HC_ACTION && w_param == WM_LBUTTONUP) + if (n_code == HC_ACTION && w_param == WM_LBUTTONUP) { instance_->got_mouse_up_ = true; + } return CallNextHookEx(instance_->mouse_hook_, n_code, w_param, l_param); } @@ -195,8 +199,9 @@ DwmSetWindowAttribute(instance_->host_->hwnd(), DWMWA_TRANSITIONS_FORCEDISABLED, &value, sizeof(value)); - if (instance_->hide_on_escape_) + if (instance_->hide_on_escape_) { instance_->host_->Hide(); + } } return CallNextHookEx(instance_->key_hook_, n_code, w_param, l_param); } @@ -206,8 +211,9 @@ DWORD process_id; GetWindowThreadProcessId(hwnd, &process_id); UINT flags = RDW_INVALIDATE | RDW_NOCHILDREN | RDW_FRAME; - if (process_id == GetCurrentProcessId()) + if (process_id == GetCurrentProcessId()) { flags |= RDW_UPDATENOW; + } RedrawWindow(hwnd, nullptr, nullptr, flags); return TRUE; } @@ -222,12 +228,15 @@ constexpr int kAutoHideTaskbarThicknessPx = 2; ui::EventType GetTouchEventType(POINTER_FLAGS pointer_flags) { - if (pointer_flags & POINTER_FLAG_DOWN) + if (pointer_flags & POINTER_FLAG_DOWN) { return ui::EventType::kTouchPressed; - if (pointer_flags & POINTER_FLAG_UPDATE) + } + if (pointer_flags & POINTER_FLAG_UPDATE) { return ui::EventType::kTouchMoved; - if (pointer_flags & POINTER_FLAG_UP) + } + if (pointer_flags & POINTER_FLAG_UP) { return ui::EventType::kTouchReleased; + } return ui::EventType::kTouchMoved; } @@ -263,16 +272,21 @@ int GetFlagsFromRawInputMessage(RAWINPUT* input) { int flags = ui::EF_NONE; - if (input->data.mouse.usButtonFlags & RI_MOUSE_BUTTON_1_DOWN) + if (input->data.mouse.usButtonFlags & RI_MOUSE_BUTTON_1_DOWN) { flags |= ui::EF_LEFT_MOUSE_BUTTON; - if (input->data.mouse.usButtonFlags & RI_MOUSE_BUTTON_2_DOWN) + } + if (input->data.mouse.usButtonFlags & RI_MOUSE_BUTTON_2_DOWN) { flags |= ui::EF_RIGHT_MOUSE_BUTTON; - if (input->data.mouse.usButtonFlags & RI_MOUSE_BUTTON_3_DOWN) + } + if (input->data.mouse.usButtonFlags & RI_MOUSE_BUTTON_3_DOWN) { flags |= ui::EF_MIDDLE_MOUSE_BUTTON; - if (input->data.mouse.usButtonFlags & RI_MOUSE_BUTTON_4_DOWN) + } + if (input->data.mouse.usButtonFlags & RI_MOUSE_BUTTON_4_DOWN) { flags |= ui::EF_BACK_MOUSE_BUTTON; - if (input->data.mouse.usButtonFlags & RI_MOUSE_BUTTON_5_DOWN) + } + if (input->data.mouse.usButtonFlags & RI_MOUSE_BUTTON_5_DOWN) { flags |= ui::EF_FORWARD_MOUSE_BUTTON; + } return ui::GetModifiersFromKeyState() | flags; } @@ -352,16 +366,18 @@ should_lock_(owner_->IsVisible() && !owner->HasChildRenderingWindow() && ::IsWindow(hwnd_) && !owner_->IsHeadless() && (!(GetWindowLong(hwnd_, GWL_STYLE) & WS_CAPTION))) { - if (should_lock_) + if (should_lock_) { owner_->LockUpdates(); + } } ScopedRedrawLock(const ScopedRedrawLock&) = delete; ScopedRedrawLock& operator=(const ScopedRedrawLock&) = delete; ~ScopedRedrawLock() { - if (!cancel_unlock_ && should_lock_ && ::IsWindow(hwnd_)) + if (!cancel_unlock_ && should_lock_ && ::IsWindow(hwnd_)) { owner_->UnlockUpdates(); + } } // Cancel the unlock operation, call this if the Widget is being destroyed. @@ -465,8 +481,9 @@ } void HWNDMessageHandler::Close() { - if (!IsWindow(hwnd())) + if (!IsWindow(hwnd())) { return; // No need to do anything. + } // Let's hide ourselves right away. Hide(); @@ -496,8 +513,9 @@ // we need to check to see if we're still a window before trying to destroy // ourself. waiting_for_close_now_ = false; - if (IsWindow(hwnd())) + if (IsWindow(hwnd())) { DestroyWindow(hwnd()); + } } gfx::Rect HWNDMessageHandler::GetWindowBoundsInScreen() const { @@ -517,8 +535,9 @@ gfx::Rect HWNDMessageHandler::GetRestoredBounds() const { // If we're in fullscreen mode, we've changed the normal bounds to the monitor // rect, so return the saved bounds instead. - if (IsFullscreen()) + if (IsFullscreen()) { return fullscreen_handler_->GetRestoreBounds(); + } gfx::Rect bounds; GetWindowPlacement(&bounds, nullptr); @@ -526,10 +545,12 @@ } gfx::Rect HWNDMessageHandler::GetClientAreaBounds() const { - if (IsMinimized()) + if (IsMinimized()) { return gfx::Rect(); - if (delegate_->WidgetSizeIsClientSize()) + } + if (delegate_->WidgetSizeIsClientSize()) { return GetClientAreaBoundsInScreen(); + } return GetWindowBoundsInScreen(); } @@ -567,12 +588,13 @@ } if (show_state) { - if (wp.showCmd == SW_SHOWMAXIMIZED) + if (wp.showCmd == SW_SHOWMAXIMIZED) { *show_state = ui::mojom::WindowShowState::kMaximized; - else if (wp.showCmd == SW_SHOWMINIMIZED) + } else if (wp.showCmd == SW_SHOWMINIMIZED) { *show_state = ui::mojom::WindowShowState::kMinimized; - else + } else { *show_state = ui::mojom::WindowShowState::kNormal; + } } } @@ -605,8 +627,9 @@ void HWNDMessageHandler::SetDwmFrameExtension(DwmFrameState state) { if (!delegate_->HasFrame() && !is_translucent_) { MARGINS m = {0, 0, 0, 0}; - if (state == DwmFrameState::kOn && !IsMaximized()) + if (state == DwmFrameState::kOn && !IsMaximized()) { m = {0, 0, 1, 0}; + } DwmExtendFrameIntoClientArea(hwnd(), &m); } } @@ -709,11 +732,13 @@ // an existing window is already running it doesn't seem to be enough to use // one of these flags to activate the window. if (native_show_state == SW_SHOWNORMAL || - native_show_state == SW_SHOWMAXIMIZED) + native_show_state == SW_SHOWMAXIMIZED) { Activate(); + } - if (!delegate_->HandleInitialFocus(show_state)) + if (!delegate_->HandleInitialFocus(show_state)) { SetInitialFocus(); + } } void HWNDMessageHandler::Hide() { @@ -839,7 +864,7 @@ } void HWNDMessageHandler::ClearNativeFocus() { - ::SetFocus(hwnd()); + ::SetFocus(hwnd()); } void HWNDMessageHandler::SetCapture() { @@ -854,10 +879,11 @@ } void HWNDMessageHandler::ReleaseCapture() { - if (HasCapture() && !::ReleaseCapture()) + if (HasCapture() && !::ReleaseCapture()) { release_capture_errno_ = ::GetLastError(); - else + } else { release_capture_errno_ = 0; + } } bool HWNDMessageHandler::HasCapture() const { @@ -877,8 +903,9 @@ bool HWNDMessageHandler::SetTitle(const std::u16string& title) { std::wstring current_title; auto len_with_null = static_cast<size_t>(GetWindowTextLength(hwnd())) + 1; - if (len_with_null == 1 && title.length() == 0) + if (len_with_null == 1 && title.length() == 0) { return false; + } if (len_with_null - 1 == title.length() && GetWindowText(hwnd(), base::WriteInto(¤t_title, len_with_null), len_with_null) && @@ -900,10 +927,12 @@ void HWNDMessageHandler::FrameTypeChanged() { needs_dwm_frame_clear_ = true; - if (!custom_window_region_.is_valid() && IsFrameSystemDrawn()) + if (!custom_window_region_.is_valid() && IsFrameSystemDrawn()) { dwm_transition_desired_ = true; - if (!dwm_transition_desired_ || !IsFullscreen()) + } + if (!dwm_transition_desired_ || !IsFullscreen()) { PerformDwmTransition(); + } } void HWNDMessageHandler::PaintAsActiveChanged() { @@ -939,14 +968,16 @@ HMONITOR monitor = MonitorFromWindow(hwnd(), MONITOR_DEFAULTTOPRIMARY); FullscreenWindowMonitorMap::iterator iter = fullscreen_monitor_map_.Get().find(monitor); - if (iter != fullscreen_monitor_map_.Get().end()) + if (iter != fullscreen_monitor_map_.Get().end()) { fullscreen_monitor_map_.Get().erase(iter); + } background_fullscreen_hack_ = false; auto ref = msg_handler_weak_factory_.GetWeakPtr(); fullscreen_handler()->SetFullscreen(fullscreen, target_display_id); - if (!ref) + if (!ref) { return; + } // Add an entry in the fullscreen window map if the window is now fullscreen. if (fullscreen) { @@ -955,8 +986,9 @@ } // If we are out of fullscreen and there was a pending DWM transition for the // window, then go ahead and do it now. - if (!fullscreen && dwm_transition_desired_) + if (!fullscreen && dwm_transition_desired_) { PerformDwmTransition(); + } } void HWNDMessageHandler::SetAspectRatio(float aspect_ratio, @@ -984,15 +1016,17 @@ void HWNDMessageHandler::SizeConstraintsChanged() { LONG style = GetWindowLong(hwnd(), GWL_STYLE); // Ignore if this is not a standard window. - if (style & static_cast<LONG>(WS_POPUP | WS_CHILD)) + if (style & static_cast<LONG>(WS_POPUP | WS_CHILD)) { return; + } // Windows cannot have WS_THICKFRAME set if translucent. // See CalculateWindowStylesFromInitParams(). if (delegate_->CanResize() && !is_translucent_) { style |= WS_THICKFRAME | WS_MAXIMIZEBOX; - if (!delegate_->CanMaximize()) + if (!delegate_->CanMaximize()) { style &= ~WS_MAXIMIZEBOX; + } } else { style &= ~(WS_THICKFRAME | WS_MAXIMIZEBOX); } @@ -1066,8 +1100,10 @@ HWND window = hwnd(); LRESULT result = 0; - if (delegate_ && delegate_->PreHandleMSG(message, w_param, l_param, &result)) + if (delegate_ && + delegate_->PreHandleMSG(message, w_param, l_param, &result)) { return result; + } // Otherwise we handle everything else. // NOTE: We inline ProcessWindowMessage() as 'this' may be destroyed during @@ -1076,16 +1112,18 @@ base::WeakPtr<HWNDMessageHandler> ref(msg_handler_weak_factory_.GetWeakPtr()); const BOOL processed = _ProcessWindowMessage(window, message, w_param, l_param, result, 0); - if (!ref) + if (!ref) { return 0; + } msg_handled_ = old_msg_handled; if (!processed) { result = DefWindowProc(window, message, w_param, l_param); // DefWindowProc() may have destroyed the window and/or us in a nested // message loop. - if (!ref || !::IsWindow(window)) + if (!ref || !::IsWindow(window)) { return result; + } } if (delegate_) { @@ -1109,8 +1147,9 @@ void HWNDMessageHandler::OnCaretBoundsChanged( const ui::TextInputClient* client) { - if (!ax_system_caret_) + if (!ax_system_caret_) { ax_system_caret_ = std::make_unique<ui::AXSystemCaretWin>(hwnd()); + } if (!client || client->GetTextInputType() == ui::TEXT_INPUT_TYPE_NONE) { ax_system_caret_->Hide(); @@ -1127,8 +1166,9 @@ void HWNDMessageHandler::OnTextInputStateChanged( const ui::TextInputClient* client) { - if (!client || client->GetTextInputType() == ui::TEXT_INPUT_TYPE_NONE) + if (!client || client->GetTextInputType() == ui::TEXT_INPUT_TYPE_NONE) { OnCaretBoundsChanged(client); + } } void HWNDMessageHandler::OnInputMethodDestroyed( @@ -1154,10 +1194,11 @@ bool* handled) { base::WeakPtr<HWNDMessageHandler> ref(msg_handler_weak_factory_.GetWeakPtr()); LRESULT ret = 0; - if ((message == WM_CHAR) || (message == WM_SYSCHAR)) + if ((message == WM_CHAR) || (message == WM_SYSCHAR)) { ret = OnImeMessages(message, w_param, l_param); - else + } else { ret = OnKeyEvent(message, w_param, l_param); + } *handled = !ref.get() || msg_handled_; return ret; } @@ -1426,11 +1467,13 @@ // Prevent OnSize() from also calling HandleWindowMinimizedOrRestored. last_size_param_ = SIZE_RESTORED; } - if (delegate_->CanActivate()) + if (delegate_->CanActivate()) { delegate_->HandleActivationChanged(active); + } - if (!::IsWindow(window_gaining_or_losing_activation)) + if (!::IsWindow(window_gaining_or_losing_activation)) { window_gaining_or_losing_activation = ::GetForegroundWindow(); + } // If the window losing activation is a fullscreen window, we reduce the size // of the window by 1px. i.e. Not fullscreen. This is to work around an @@ -1452,8 +1495,9 @@ HMONITOR fullscreen_window_monitor = MonitorFromWindow(hwnd(), MONITOR_DEFAULTTOPRIMARY); - if (active_window_monitor == fullscreen_window_monitor) + if (active_window_monitor == fullscreen_window_monitor) { OnBackgroundFullscreen(); + } } } else if (background_fullscreen_hack_) { // Restore the bounds of the window to fullscreen. @@ -1492,8 +1536,9 @@ } void HWNDMessageHandler::ExecuteSystemMenuCommand(int command) { - if (command) + if (command) { SendMessage(hwnd(), WM_SYSCOMMAND, static_cast<WPARAM>(command), 0); + } } void HWNDMessageHandler::TrackMouseEvents(DWORD mouse_tracking_flags) { @@ -1530,8 +1575,9 @@ } auto ref = msg_handler_weak_factory_.GetWeakPtr(); delegate_->HandleClientSizeChanged(GetClientAreaBounds().size()); - if (!ref) + if (!ref) { return; + } current_window_size_message_++; sent_window_size_changing_ = false; @@ -1539,21 +1585,24 @@ bool HWNDMessageHandler::GetClientAreaInsets(gfx::Insets* insets, HMONITOR monitor) const { - if (delegate_->GetClientAreaInsets(insets, monitor)) + if (delegate_->GetClientAreaInsets(insets, monitor)) { return true; + } DCHECK(insets->IsEmpty()); // Returning false causes the default handling in OnNCCalcSize() to // be invoked. - if (!delegate_->HasNonClientView() || HasSystemFrame()) + if (!delegate_->HasNonClientView() || HasSystemFrame()) { return false; + } if (IsMaximized()) { // Windows automatically adds a standard width border to all sides when a // window is maximized. int frame_thickness = ui::GetFrameThickness(monitor); - if (!delegate_->HasFrame()) + if (!delegate_->HasFrame()) { frame_thickness -= 1; + } *insets = gfx::Insets(frame_thickness); return true; } @@ -1571,8 +1620,9 @@ // allow for a custom hit mask. if (!is_translucent_ && !custom_window_region_.is_valid() && (IsFrameSystemDrawn() || !delegate_->HasNonClientView())) { - if (force) + if (force) { SetWindowRgn(hwnd(), nullptr, redraw); + } return; } @@ -1601,8 +1651,9 @@ delegate_->GetWindowMask(gfx::Size(window_rect.right - window_rect.left, window_rect.bottom - window_rect.top), &window_mask); - if (!window_mask.isEmpty()) + if (!window_mask.isEmpty()) { new_region.reset(gfx::CreateHRGNFromSkPath(window_mask)); + } } const bool has_current_region = current_rgn != nullptr; @@ -1622,8 +1673,9 @@ // the WeakPtrFactory to avoid unlocking (and crashing) after destruction. base::WeakPtr<HWNDMessageHandler> ref(msg_handler_weak_factory_.GetWeakPtr()); LRESULT result = DefWindowProc(hwnd(), message, w_param, l_param); - if (!ref) + if (!ref) { lock.CancelUnlockOperation(); + } return result; } @@ -1646,8 +1698,9 @@ if (ui::IsWorkstationLocked()) { // Presents will continue to fail as long as the input desktop is // unavailable. - if (--attempts <= 0) + if (--attempts <= 0) { return; + } base::SingleThreadTaskRunner::GetCurrentDefault()->PostDelayedTask( FROM_HERE, base::BindOnce(&HWNDMessageHandler::ForceRedrawWindow, @@ -1674,8 +1727,9 @@ if (delegate_->HasNonClientView() && !active && thread_id != GetCurrentThreadId()) { // Update the native frame if it is rendering the non-client area. - if (HasSystemFrame()) + if (HasSystemFrame()) { DefWindowProcWithRedrawLock(WM_NCACTIVATE, FALSE, 0); + } } } @@ -1710,8 +1764,9 @@ HWND window) { // If the notification code is > 1 it means it is control specific and we // should ignore it. - if (notification_code > 1 || delegate_->HandleAppCommand(command)) + if (notification_code > 1 || delegate_->HandleAppCommand(command)) { SetMsgHandled(FALSE); + } } LRESULT HWNDMessageHandler::OnCreate(CREATESTRUCT* create_struct) { @@ -1756,8 +1811,9 @@ // If the window was initialized with a specific size/location then we know // the DPI and thus must initialize dpi_ now. See https://crbug.com/1282804 // for details. - if (initial_bounds_valid_) + if (initial_bounds_valid_) { dpi_ = display::win::ScreenWin::GetDPIForHWND(hwnd()); + } // TODO(beng): move more of NWW::OnCreate here. return 0; @@ -1772,14 +1828,16 @@ auto& map = fullscreen_monitor_map_.Get(); const auto i = base::ranges::find( map, this, &FullscreenWindowMonitorMap::value_type::second); - if (i != map.end()) + if (i != map.end()) { map.erase(i); + } // If we have ever returned a UIA object via WM_GETOBJECT, signal that all // objects associated with this HWND can be discarded. See: // https://docs.microsoft.com/en-us/windows/win32/api/uiautomationcoreapi/nf-uiautomationcoreapi-uiareturnrawelementprovider#remarks - if (did_return_uia_object_) + if (did_return_uia_object_) { UiaReturnRawElementProvider(hwnd(), 0, 0, nullptr); + } } void HWNDMessageHandler::OnDisplayChange(UINT bits_per_pixel, @@ -1797,8 +1855,9 @@ delegate_->HandleDisplayChange(); // HandleDisplayChange() may result in |this| being deleted. - if (!ref) + if (!ref) { return; + } // Force a WM_NCCALCSIZE to occur to ensure that we handle auto hide // taskbars correctly. @@ -1808,8 +1867,9 @@ LRESULT HWNDMessageHandler::OnDpiChanged(UINT msg, WPARAM w_param, LPARAM l_param) { - if (LOWORD(w_param) != HIWORD(w_param)) + if (LOWORD(w_param) != HIWORD(w_param)) { NOTIMPLEMENTED() << "Received non-square scaling factors"; + } TRACE_EVENT("ui", "HWNDMessageHandler::OnDpiChanged", [&](perfetto::EventContext ctx) { @@ -1852,8 +1912,9 @@ } void HWNDMessageHandler::OnEnterMenuLoop(BOOL from_track_popup_menu) { - if (menu_depth_++ == 0) + if (menu_depth_++ == 0) { delegate_->HandleMenuLoop(true); + } } void HWNDMessageHandler::OnEnterSizeMove() { @@ -1880,8 +1941,9 @@ } void HWNDMessageHandler::OnExitMenuLoop(BOOL is_shortcut_menu) { - if (--menu_depth_ == 0) + if (--menu_depth_ == 0) { delegate_->HandleMenuLoop(false); + } DCHECK_GE(0, menu_depth_); } @@ -1910,18 +1972,22 @@ min_window_size.Enlarge(window_rect.right - window_rect.left, window_rect.bottom - window_rect.top); // Either axis may be zero, so enlarge them independently. - if (max_window_size.width()) + if (max_window_size.width()) { max_window_size.Enlarge(window_rect.right - window_rect.left, 0); - if (max_window_size.height()) + } + if (max_window_size.height()) { max_window_size.Enlarge(0, window_rect.bottom - window_rect.top); + } } minmax_info->ptMinTrackSize.x = min_window_size.width(); minmax_info->ptMinTrackSize.y = min_window_size.height(); if (max_window_size.width() || max_window_size.height()) { - if (!max_window_size.width()) + if (!max_window_size.width()) { max_window_size.set_width(GetSystemMetrics(SM_CXMAXTRACK)); - if (!max_window_size.height()) + } + if (!max_window_size.height()) { max_window_size.set_height(GetSystemMetrics(SM_CYMAXTRACK)); + } minmax_info->ptMaxTrackSize.x = max_window_size.width(); minmax_info->ptMaxTrackSize.y = max_window_size.height(); } @@ -1986,8 +2052,9 @@ base::WeakPtr<HWNDMessageHandler> ref(msg_handler_weak_factory_.GetWeakPtr()); const bool msg_handled = delegate_->HandleIMEMessage(message, w_param, l_param, &result); - if (ref.get()) + if (ref.get()) { SetMsgHandled(msg_handled); + } return result; } @@ -2009,10 +2076,11 @@ EnableMenuItemByCommand(menu, SC_MINIMIZE, delegate_->CanMinimize() && !is_minimized); - if (is_maximized && delegate_->CanResize()) + if (is_maximized && delegate_->CanResize()) { ::SetMenuDefaultItem(menu, SC_RESTORE, FALSE); - else if (!is_maximized && delegate_->CanMaximize()) + } else if (!is_maximized && delegate_->CanMaximize()) { ::SetMenuDefaultItem(menu, SC_MAXIMIZE, FALSE); + } } void HWNDMessageHandler::OnInputLangChange(DWORD character_set, @@ -2028,10 +2096,12 @@ ui::KeyEvent key(msg); base::WeakPtr<HWNDMessageHandler> ref(msg_handler_weak_factory_.GetWeakPtr()); delegate_->HandleKeyEvent(&key); - if (!ref) + if (!ref) { return 0; - if (!key.handled()) + } + if (!key.handled()) { SetMsgHandled(FALSE); + } return 0; } @@ -2049,8 +2119,9 @@ LPARAM l_param) { // Please refer to the comments in the header for the touch_down_contexts_ // member for the if statement below. - if (touch_down_contexts_) + if (touch_down_contexts_) { return MA_NOACTIVATE; + } // On Windows, if we select the menu item by touch and if the window at the // location is another window on the same thread, that window gets a @@ -2067,14 +2138,17 @@ // TODO(beng): resolve this with the GetWindowLong() check on the subsequent // line. if (delegate_->HasNonClientView()) { - if (delegate_->CanActivate()) + if (delegate_->CanActivate()) { return MA_ACTIVATE; - if (delegate_->WantsMouseEventsWhenInactive()) + } + if (delegate_->WantsMouseEventsWhenInactive()) { return MA_NOACTIVATE; + } return MA_NOACTIVATEANDEAT; } - if (GetWindowLong(hwnd(), GWL_EXSTYLE) & WS_EX_NOACTIVATE) + if (GetWindowLong(hwnd(), GWL_EXSTYLE) & WS_EX_NOACTIVATE) { return MA_NOACTIVATE; + } SetMsgHandled(FALSE); return MA_ACTIVATE; } @@ -2124,8 +2198,7 @@ // properly. Since we don't need to distinguish between pens and fingers in // non-client area, route the messages to that method. if (pointer_type == PT_PEN && - (message == WM_NCPOINTERDOWN || - message == WM_NCPOINTERUP || + (message == WM_NCPOINTERDOWN || message == WM_NCPOINTERUP || message == WM_NCPOINTERUPDATE)) { pointer_type = PT_TOUCH; } @@ -2145,8 +2218,9 @@ LRESULT HWNDMessageHandler::OnInputEvent(UINT message, WPARAM w_param, LPARAM l_param) { - if (!using_wm_input_) + if (!using_wm_input_) { return -1; + } HRAWINPUT input_handle = reinterpret_cast<HRAWINPUT>(l_param); @@ -2217,8 +2291,9 @@ return 0; } - if (!delegate_->CanActivate()) + if (!delegate_->CanActivate()) { return TRUE; + } if (delegate_->GetFrameMode() == FrameMode::CUSTOM_DRAWN) { // TODO(beng, et al): Hack to redraw this window and child windows @@ -2234,8 +2309,9 @@ // The frame may need to redraw as a result of the activation change. // We can get WM_NCACTIVATE before we're actually visible. If we're not // visible, no need to paint. - if (IsVisible()) + if (IsVisible()) { delegate_->SchedulePaint(); + } // Calling DefWindowProc is only necessary if there's a system frame being // drawn. Otherwise it can draw an incorrect title bar and cause visual @@ -2308,8 +2384,9 @@ // treated as a "fullscreen app", which would cause the taskbars to // disappear. const int autohide_edges = GetAppbarAutohideEdges(monitor); - if (autohide_edges & ViewsDelegate::EDGE_LEFT) + if (autohide_edges & ViewsDelegate::EDGE_LEFT) { client_rect->left += kAutoHideTaskbarThicknessPx; + } if (autohide_edges & ViewsDelegate::EDGE_TOP) { if (IsFrameSystemDrawn()) { // Tricky bit. Due to a bug in DwmDefWindowProc()'s handling of @@ -2326,10 +2403,12 @@ client_rect->top += kAutoHideTaskbarThicknessPx; } } - if (autohide_edges & ViewsDelegate::EDGE_RIGHT) + if (autohide_edges & ViewsDelegate::EDGE_RIGHT) { client_rect->right -= kAutoHideTaskbarThicknessPx; - if (autohide_edges & ViewsDelegate::EDGE_BOTTOM) + } + if (autohide_edges & ViewsDelegate::EDGE_BOTTOM) { client_rect->bottom -= kAutoHideTaskbarThicknessPx; + } // We cannot return WVR_REDRAW when there is nonclient area, or Windows // exhibits bugs where client pixels and child HWNDs are mispositioned by @@ -2344,8 +2423,9 @@ // We special case when left or top insets are 0, since these conditions // actually require another repaint to correct the layout after glass gets // turned on and off. - if (insets.left() == 0 || insets.top() == 0) + if (insets.left() == 0 || insets.top() == 0) { return 0; + } return mode ? WVR_REDRAW : 0; } @@ -2381,8 +2461,9 @@ POINT temp = {point.x(), point.y()}; MapWindowPoints(HWND_DESKTOP, hwnd(), &temp, 1); int component = delegate_->GetNonClientComponent(gfx::Point(temp)); - if (component == HTCLIENT) + if (component == HTCLIENT) { return component; + } // If the DWM is rendering the window controls, we need to give the DWM's // default window procedure first chance to handle hit testing. @@ -2396,8 +2477,9 @@ } // If the point is specified as custom or system nonclient item, return it. - if (component != HTNOWHERE) + if (component != HTNOWHERE) { return component; + } // Otherwise, we let Windows do all the native frame non-client handling for // us. @@ -2577,8 +2659,9 @@ LPARAM l_param) { // Ignore system generated cursors likely caused by window management mouse // moves while the pen is active over the window client area. - if (is_pen_active_in_client_area_) + if (is_pen_active_in_client_area_) { return 1; + } // current_cursor_ must be a ui::WinCursor, so that custom image cursors are // properly ref-counted. cursor below is only used for system cursors and @@ -2653,8 +2736,9 @@ SWP_NOACTIVATE | SWP_NOOWNERZORDER); SetMsgHandled(TRUE); } else { - if (flags == SPI_SETWORKAREA) + if (flags == SPI_SETWORKAREA) { delegate_->HandleWorkAreaChanged(); + } SetMsgHandled(FALSE); } @@ -2662,13 +2746,15 @@ // broadcasting the WM_SETTINGCHANGE message due to changes in auto hide // settings, etc. Force a WM_NCCALCSIZE to occur to ensure that we handle // this correctly. - if (flags == SPI_SETWORKAREA) + if (flags == SPI_SETWORKAREA) { SendFrameChanged(); + } } void HWNDMessageHandler::OnSize(UINT param, const gfx::Size& size) { - if (DidMinimizedChange(last_size_param_, param) && IsTopLevelWindow(hwnd())) + if (DidMinimizedChange(last_size_param_, param) && IsTopLevelWindow(hwnd())) { delegate_->HandleWindowMinimizedOrRestored(param != SIZE_MINIMIZED); + } last_size_param_ = param; RedrawWindow(hwnd(), nullptr, nullptr, RDW_INVALIDATE | RDW_ALLCHILDREN); @@ -2679,8 +2765,9 @@ void HWNDMessageHandler::OnSizing(UINT param, RECT* rect) { // If the aspect ratio was not specified for the window, do nothing. - if (!aspect_ratio_.has_value()) + if (!aspect_ratio_.has_value()) { return; + } // Validate the window edge param because we are seeing DCHECKs caused by // invalid values. See https://crbug.com/1418231. @@ -2703,8 +2790,9 @@ // Ignore size/move/maximize in fullscreen mode. if (IsFullscreen() && (((notification_code & sc_mask) == SC_SIZE) || ((notification_code & sc_mask) == SC_MOVE) || - ((notification_code & sc_mask) == SC_MAXIMIZE))) + ((notification_code & sc_mask) == SC_MAXIMIZE))) { return; + } const bool window_control_action = (notification_code & sc_mask) == SC_MINIMIZE || @@ -2713,15 +2801,17 @@ const bool custom_controls_frame_mode = delegate_->GetFrameMode() == FrameMode::SYSTEM_DRAWN_NO_CONTROLS || delegate_->GetFrameMode() == FrameMode::CUSTOM_DRAWN; - if (custom_controls_frame_mode && window_control_action) + if (custom_controls_frame_mode && window_control_action) { delegate_->ResetWindowControls(); + } if (delegate_->GetFrameMode() == FrameMode::CUSTOM_DRAWN) { const bool window_bounds_change = (notification_code & sc_mask) == SC_MOVE || (notification_code & sc_mask) == SC_SIZE; - if (window_bounds_change || window_control_action) + if (window_bounds_change || window_control_action) { DestroyAXSystemCaret(); + } if (window_bounds_change && !IsVisible()) { // Circumvent ScopedRedrawLocks and force visibility before entering a // resize or move modal loop to get continuous sizing/moving feedback. @@ -2734,10 +2824,12 @@ // key and released it, so we should focus the menu bar. if ((notification_code & sc_mask) == SC_KEYMENU && point.x() == 0) { int modifiers = ui::EF_NONE; - if (ui::win::IsShiftPressed()) + if (ui::win::IsShiftPressed()) { modifiers |= ui::EF_SHIFT_DOWN; - if (ui::win::IsCtrlPressed()) + } + if (ui::win::IsCtrlPressed()) { modifiers |= ui::EF_CONTROL_DOWN; + } // Retrieve the status of shift and control keys to prevent consuming // shift+alt keys, which are used by Windows to change input languages. ui::Accelerator accelerator(ui::KeyboardCodeForWindowsKeyCode(VK_MENU), @@ -2746,8 +2838,9 @@ return; } - if (delegate_->HandleCommand(static_cast<int>(notification_code))) + if (delegate_->HandleCommand(static_cast<int>(notification_code))) { return; + } bool is_mouse_menu = (notification_code & sc_mask) == SC_MOUSEMENU; if (is_mouse_menu) { @@ -2767,8 +2860,9 @@ // If the delegate can't handle it, the system implementation will be called. DefWindowProc(hwnd(), WM_SYSCOMMAND, notification_code, MAKELPARAM(point.x(), point.y())); - if (is_mouse_menu && ref) + if (is_mouse_menu && ref) { handling_mouse_menu_ = false; + } } void HWNDMessageHandler::OnThemeChanged() { @@ -2836,11 +2930,12 @@ // Windows automatically adds a standard width border to all sides when // window is maximized. We should take this into account. gfx::Insets client_area_insets; - if (GetClientAreaInsets(&client_area_insets, monitor)) + if (GetClientAreaInsets(&client_area_insets, monitor)) { // Ceil the insets after scaling to make them exclude fractional parts // after scaling, since the result is negative. expected_maximized_bounds.Inset( gfx::ScaleToCeiledInsets(client_area_insets, -1)); + } } // Sometimes Windows incorrectly changes bounds of maximized windows after // attaching or detaching additional displays. In this case user can see @@ -2913,8 +3008,9 @@ RECT window_rect; gfx::Size old_size; - if (GetWindowRect(hwnd(), &window_rect)) + if (GetWindowRect(hwnd(), &window_rect)) { old_size = gfx::Rect(window_rect).size(); + } gfx::Size new_size = gfx::Size(window_pos->cx, window_pos->cy); if ((old_size != new_size && !(window_pos->flags & SWP_NOSIZE)) || window_pos->flags & SWP_FRAMECHANGED) { @@ -2932,8 +3028,9 @@ 0); // Copying the old bits can sometimes cause a flash of black when // resizing. See https://crbug.com/739724 - if (is_translucent_) + if (is_translucent_) { window_pos->flags |= SWP_NOCOPYBITS; + } } else { // The window size isn't changing so there are no exposed pixels. exposed_pixels_ = gfx::Size(); @@ -2945,8 +3042,9 @@ window_pos->flags &= static_cast<unsigned int>(~SWP_SHOWWINDOW); } - if (window_pos->flags & SWP_HIDEWINDOW) + if (window_pos->flags & SWP_HIDEWINDOW) { SetDwmFrameExtension(DwmFrameState::kOff); + } SetMsgHandled(FALSE); } @@ -2955,12 +3053,15 @@ TRACE_EVENT0("ui", "HWNDMessageHandler::OnWindowPosChanged"); base::WeakPtr<HWNDMessageHandler> ref(msg_handler_weak_factory_.GetWeakPtr()); - if (DidClientAreaSizeChange(window_pos)) + if (DidClientAreaSizeChange(window_pos)) { ClientAreaSizeChanged(); - if (!ref) + } + if (!ref) { return; - if (window_pos->flags & SWP_FRAMECHANGED) + } + if (window_pos->flags & SWP_FRAMECHANGED) { SetDwmFrameExtension(DwmFrameState::kOn); + } if (window_pos->flags & SWP_SHOWWINDOW) { delegate_->HandleVisibilityChanged(true); SetDwmFrameExtension(DwmFrameState::kOn); @@ -2976,8 +3077,9 @@ LPARAM l_param) { // Check if a newer WM_WINDOWPOSCHANGING or WM_WINDOWPOSCHANGED have been // received after this message was posted. - if (current_window_size_message_ != w_param) + if (current_window_size_message_ != w_param) { return 0; + } delegate_->HandleWindowSizeUnchanged(); sent_window_size_changing_ = false; @@ -2992,14 +3094,16 @@ const bool* is_current_session) { // Direct3D presents are ignored while the screen is locked, so force the // window to be redrawn on unlock. - if (status_code == WTS_SESSION_UNLOCK) + if (status_code == WTS_SESSION_UNLOCK) { ForceRedrawWindow(10); + } } void HWNDMessageHandler::HandleTouchEvents(const TouchEvents& touch_events) { base::WeakPtr<HWNDMessageHandler> ref(msg_handler_weak_factory_.GetWeakPtr()); - for (size_t i = 0; i < touch_events.size() && ref; ++i) + for (size_t i = 0; i < touch_events.size() && ref; ++i) { delegate_->HandleTouchEvent(const_cast<ui::TouchEvent*>(&touch_events[i])); + } } void HWNDMessageHandler::ResetTouchDownContext() { @@ -3035,8 +3139,9 @@ // Always DefWindowProc on the titlebar. We could let the event fall through // and the special handling in HandleMouseInputForCaption would take care of // this, but in the touch case Windows does a better job. - if (hittest == HTCAPTION || hittest == HTSYSMENU) + if (hittest == HTCAPTION || hittest == HTSYSMENU) { SetMsgHandled(FALSE); + } // We must let Windows handle the caption buttons if it's drawing them, or // they won't work. if (delegate_->GetFrameMode() == FrameMode::SYSTEM_DRAWN && @@ -3047,16 +3152,18 @@ // Let resize events fall through. Ignore everything else, as we're either // letting Windows handle it above or we've already handled the equivalent // touch message. - if (!IsHitTestOnResizeHandle(hittest)) + if (!IsHitTestOnResizeHandle(hittest)) { return 0; + } } // Certain logitech drivers send the WM_MOUSEHWHEEL message to the parent // followed by WM_MOUSEWHEEL messages to the child window causing a vertical // scroll. We treat these WM_MOUSEWHEEL messages as WM_MOUSEHWHEEL // messages. - if (message == WM_MOUSEHWHEEL) + if (message == WM_MOUSEHWHEEL) { last_mouse_hwheel_time_ = ::GetMessageTime(); + } if (message == WM_MOUSEWHEEL && ::GetMessageTime() == last_mouse_hwheel_time_) { @@ -3118,8 +3225,9 @@ static_cast<DWORD>(message_time), {CR_GET_X_LPARAM(l_param), CR_GET_Y_LPARAM(l_param)}}; ui::MouseEvent event(msg); - if (IsSynthesizedMouseMessage(message, message_time, l_param)) + if (IsSynthesizedMouseMessage(message, message_time, l_param)) { event.SetFlags(event.flags() | ui::EF_FROM_TOUCH); + } if (event.type() == ui::EventType::kMouseMoved && !HasCapture() && track_mouse) { @@ -3191,11 +3299,13 @@ // command menu. This prevents left clicking in the upper left hand corner of // an app window and then right clicking from sending the right click to the // renderer and bringing up a web contents context menu. - if (!handling_mouse_menu_ || message != WM_RBUTTONUP) + if (!handling_mouse_menu_ || message != WM_RBUTTONUP) { handled = delegate_->HandleMouseEvent(&event); + } - if (!ref.get()) + if (!ref.get()) { return 0; + } if (!handled && message == WM_NCLBUTTONDOWN && w_param != HTSYSMENU && w_param != HTCAPTION && @@ -3211,16 +3321,20 @@ // We need special processing for mouse input on the caption. // Please refer to the HandleMouseInputForCaption() function for more // information. - if (!handled) + if (!handled) { handled = HandleMouseInputForCaption(message, w_param, l_param); + } - if (ref.get()) + if (ref.get()) { SetMsgHandled(handled); + } return 0; } LRESULT HWNDMessageHandler::HandlePointerEventTypeTouchOrNonClient( - UINT message, WPARAM w_param, LPARAM l_param) { + UINT message, + WPARAM w_param, + LPARAM l_param) { UINT32 pointer_id = GET_POINTERID_WPARAM(w_param); using GetPointerTouchInfoFn = BOOL(WINAPI*)(UINT32, POINTER_TOUCH_INFO*); POINTER_TOUCH_INFO pointer_touch_info; @@ -3285,8 +3399,9 @@ 2.0; auto rotation_angle = static_cast<int>(pointer_touch_info.orientation); rotation_angle %= 180; - if (rotation_angle < 0) + if (rotation_angle < 0) { rotation_angle += 180; + } ui::TouchEvent event( event_type, touch_point, event_time, @@ -3314,8 +3429,9 @@ if (delegate_->GetFrameMode() == FrameMode::SYSTEM_DRAWN) { // WM_NCPOINTERUP must be DefWindowProc'ed in order for the system caption // buttons to work correctly. - if (message == WM_POINTERUP) + if (message == WM_POINTERUP) { event.SetHandled(); + } } else { // Messages on HTCAPTION should be DefWindowProc'ed, as we let Windows // take care of dragging the window and double-tapping to maximize. @@ -3358,8 +3474,9 @@ is_pen_active_in_client_area_ = true; } - if (ref) + if (ref) { SetMsgHandled(handle_pen_events_in_client_area_); + } // When not dragging, always mark pen events as handled so as not to generate // WM_MOUSE compatibility events. @@ -3386,8 +3503,9 @@ bool HWNDMessageHandler::IsSynthesizedMouseMessage(unsigned int message, int message_time, LPARAM l_param) { - if (ui::IsMouseEventFromTouch(message)) + if (ui::IsMouseEventFromTouch(message)) { return true; + } // Ignore mouse messages which occur at the same location as the current // cursor position and within a time difference of 500 ms from the last // touch message. @@ -3481,8 +3599,9 @@ // and move towards the client area. case WM_MOUSEMOVE: case WM_NCMOUSEMOVE: { - if (!left_button_down_on_caption_) + if (!left_button_down_on_caption_) { break; + } bool should_handle_pending_ncl_button_down = true; // Check if the mouse actually moved. @@ -3517,8 +3636,9 @@ case WM_NCMOUSELEAVE: { // If the DWM is rendering the window controls, we need to give the DWM's // default window procedure the chance to repaint the window border icons - if (HasSystemFrame()) + if (HasSystemFrame()) { handled = DwmDefWindowProc(hwnd(), WM_NCMOUSELEAVE, 0, 0, nullptr) != 0; + } break; } @@ -3559,8 +3679,9 @@ fullscreen_monitor_map_.Get().find(monitor); if (iter != fullscreen_monitor_map_.Get().end()) { DCHECK(iter->second); - if (window != iter->second->hwnd()) + if (window != iter->second->hwnd()) { iter->second->OnBackgroundFullscreen(); + } } } @@ -3595,8 +3716,9 @@ max_window_size = delegate_->DIPToScreenSize(max_window_size); std::optional<gfx::Size> max_size_param; - if (!max_window_size.IsEmpty()) + if (!max_window_size.IsEmpty()) { max_size_param = max_window_size; + } gfx::SizeRectToAspectRatioWithExcludedMargin( GetWindowResizeEdge(param), aspect_ratio_.value(), min_window_size, @@ -3604,8 +3726,9 @@ } POINT HWNDMessageHandler::GetCursorPos() const { - if (mock_cursor_position_.has_value()) + if (mock_cursor_position_.has_value()) { return mock_cursor_position_.value().ToPOINT(); + } POINT cursor_pos = {}; ::GetCursorPos(&cursor_pos);
diff --git a/ui/views/win/hwnd_util.cc b/ui/views/win/hwnd_util.cc index 1559ee86..3b6e2b7c 100644 --- a/ui/views/win/hwnd_util.cc +++ b/ui/views/win/hwnd_util.cc
@@ -67,16 +67,18 @@ TRACE_EVENT0("ui", "ShowSystemMenuAtScreenPixelLocation"); UINT flags = TPM_LEFTALIGN | TPM_TOPALIGN | TPM_RIGHTBUTTON | TPM_RETURNCMD; - if (base::i18n::IsRTL()) + if (base::i18n::IsRTL()) { flags |= TPM_RIGHTALIGN; + } HMENU menu = ::GetSystemMenu(window, FALSE); base::CurrentThread::ScopedAllowApplicationTasksInNativeNestedLoop allow; const int command = ::TrackPopupMenu(menu, flags, point.x(), point.y(), 0, window, nullptr); - if (command) + if (command) { ::SendMessage(window, WM_SYSCOMMAND, static_cast<WPARAM>(command), 0); + } } } // namespace views
diff --git a/ui/views/win/pen_event_processor.cc b/ui/views/win/pen_event_processor.cc index f0d0aa9..f9405a9 100644 --- a/ui/views/win/pen_event_processor.cc +++ b/ui/views/win/pen_event_processor.cc
@@ -16,11 +16,13 @@ int GetFlagsFromPointerMessage(UINT message, const POINTER_INFO& pointer_info) { int flags = ui::EF_NONE; - if (pointer_info.pointerFlags & POINTER_FLAG_FIRSTBUTTON) + if (pointer_info.pointerFlags & POINTER_FLAG_FIRSTBUTTON) { flags |= ui::EF_LEFT_MOUSE_BUTTON; + } - if (pointer_info.pointerFlags & POINTER_FLAG_SECONDBUTTON) + if (pointer_info.pointerFlags & POINTER_FLAG_SECONDBUTTON) { flags |= ui::EF_RIGHT_MOUSE_BUTTON; + } return flags; } @@ -62,8 +64,9 @@ // [0, 1024] as specified on MSDN. float pressure = static_cast<float>(pointer_pen_info.pressure) / 1024; int rotation_angle = static_cast<int>(pointer_pen_info.rotation) % 180; - if (rotation_angle < 0) + if (rotation_angle < 0) { rotation_angle += 180; + } int tilt_x = pointer_pen_info.tiltX; int tilt_y = pointer_pen_info.tiltY; @@ -138,10 +141,11 @@ case WM_POINTERDOWN: case WM_NCPOINTERDOWN: event_type = ui::EventType::kMousePressed; - if (pointer_info.ButtonChangeType == POINTER_CHANGE_FIRSTBUTTON_DOWN) + if (pointer_info.ButtonChangeType == POINTER_CHANGE_FIRSTBUTTON_DOWN) { changed_flag = ui::EF_LEFT_MOUSE_BUTTON; - else + } else { changed_flag = ui::EF_RIGHT_MOUSE_BUTTON; + } click_count = 1; sent_mouse_down_[pointer_id] = true; break; @@ -158,15 +162,17 @@ id_generator_->ReleaseNumber(pointer_id); click_count = 1; if (sent_mouse_down_.count(pointer_id) == 0 || - !sent_mouse_down_[pointer_id]) + !sent_mouse_down_[pointer_id]) { return nullptr; + } sent_mouse_down_[pointer_id] = false; break; case WM_POINTERUPDATE: case WM_NCPOINTERUPDATE: event_type = ui::EventType::kMouseDragged; - if (flag == ui::EF_NONE) + if (flag == ui::EF_NONE) { event_type = ui::EventType::kMouseMoved; + } break; case WM_POINTERENTER: event_type = ui::EventType::kMouseEntered; @@ -209,8 +215,9 @@ event_type = ui::EventType::kTouchReleased; id_generator_->ReleaseNumber(pointer_id); if (sent_touch_start_.count(pointer_id) == 0 || - !sent_touch_start_[pointer_id]) + !sent_touch_start_[pointer_id]) { return nullptr; + } sent_touch_start_[pointer_id] = false; break; case WM_POINTERUPDATE:
diff --git a/ui/views/win/scoped_enable_unadjusted_mouse_events_win.cc b/ui/views/win/scoped_enable_unadjusted_mouse_events_win.cc index 9253be1..f5b9e36 100644 --- a/ui/views/win/scoped_enable_unadjusted_mouse_events_win.cc +++ b/ui/views/win/scoped_enable_unadjusted_mouse_events_win.cc
@@ -33,8 +33,9 @@ // Stop receiving raw input. std::unique_ptr<RAWINPUTDEVICE> device( GetRawInputDevices(nullptr, RIDEV_REMOVE)); - if (!RegisterRawInputDevices(device.get(), 1, sizeof(*device))) + if (!RegisterRawInputDevices(device.get(), 1, sizeof(*device))) { PLOG(INFO) << "RegisterRawInputDevices() failed for RIDEV_REMOVE "; + } DCHECK(owner_->using_wm_input()); owner_->set_using_wm_input(false);
diff --git a/ui/views/win/scoped_fullscreen_visibility.cc b/ui/views/win/scoped_fullscreen_visibility.cc index 7589ec8..ee3a1d4 100644 --- a/ui/views/win/scoped_fullscreen_visibility.cc +++ b/ui/views/win/scoped_fullscreen_visibility.cc
@@ -16,8 +16,9 @@ ScopedFullscreenVisibility::ScopedFullscreenVisibility(HWND hwnd) : hwnd_(hwnd) { - if (!full_screen_windows_) + if (!full_screen_windows_) { full_screen_windows_ = new FullscreenHWNDs; + } FullscreenHWNDs::iterator it = full_screen_windows_->find(hwnd_); if (it != full_screen_windows_->end()) { it->second++; @@ -48,8 +49,9 @@ // static bool ScopedFullscreenVisibility::IsHiddenForFullscreen(HWND hwnd) { - if (!full_screen_windows_) + if (!full_screen_windows_) { return false; + } return full_screen_windows_->find(hwnd) != full_screen_windows_->end(); }
diff --git a/ui/views/window/custom_frame_view.cc b/ui/views/window/custom_frame_view.cc index 4d5c88a..1551d87 100644 --- a/ui/views/window/custom_frame_view.cc +++ b/ui/views/window/custom_frame_view.cc
@@ -115,8 +115,9 @@ int CustomFrameView::NonClientHitTest(const gfx::Point& point) { // Sanity check. - if (!bounds().Contains(point)) + if (!bounds().Contains(point)) { return HTNOWHERE; + } int frame_component = frame_->client_view()->NonClientHitTest(point); @@ -125,26 +126,34 @@ gfx::Rect sysmenu_rect(IconBounds()); // In maximized mode we extend the rect to the screen corner to take advantage // of Fitts' Law. - if (frame_->IsMaximized()) + if (frame_->IsMaximized()) { sysmenu_rect.SetRect(0, 0, sysmenu_rect.right(), sysmenu_rect.bottom()); + } sysmenu_rect.set_x(GetMirroredXForRect(sysmenu_rect)); - if (sysmenu_rect.Contains(point)) + if (sysmenu_rect.Contains(point)) { return (frame_component == HTCLIENT) ? HTCLIENT : HTSYSMENU; + } - if (frame_component != HTNOWHERE) + if (frame_component != HTNOWHERE) { return frame_component; + } // Then see if the point is within any of the window controls. - if (close_button_->GetMirroredBounds().Contains(point)) + if (close_button_->GetMirroredBounds().Contains(point)) { return HTCLOSE; - if (restore_button_->GetMirroredBounds().Contains(point)) + } + if (restore_button_->GetMirroredBounds().Contains(point)) { return HTMAXBUTTON; - if (maximize_button_->GetMirroredBounds().Contains(point)) + } + if (maximize_button_->GetMirroredBounds().Contains(point)) { return HTMAXBUTTON; - if (minimize_button_->GetMirroredBounds().Contains(point)) + } + if (minimize_button_->GetMirroredBounds().Contains(point)) { return HTMINBUTTON; - if (window_icon_ && window_icon_->GetMirroredBounds().Contains(point)) + } + if (window_icon_ && window_icon_->GetMirroredBounds().Contains(point)) { return HTSYSMENU; + } gfx::Insets resize_border(NonClientBorderThickness()); // The top resize border has extra thickness. @@ -159,8 +168,9 @@ void CustomFrameView::GetWindowMask(const gfx::Size& size, SkPath* window_mask) { DCHECK(window_mask); - if (frame_->IsMaximized() || !ShouldShowTitleBarAndBorder()) + if (frame_->IsMaximized() || !ShouldShowTitleBarAndBorder()) { return; + } GetDefaultWindowMask(size, window_mask); } @@ -173,8 +183,9 @@ } void CustomFrameView::UpdateWindowIcon() { - if (window_icon_) + if (window_icon_) { window_icon_->SchedulePaint(); + } } void CustomFrameView::UpdateWindowTitle() { @@ -192,8 +203,9 @@ } void CustomFrameView::OnPaint(gfx::Canvas* canvas) { - if (!ShouldShowTitleBarAndBorder()) + if (!ShouldShowTitleBarAndBorder()) { return; + } frame_background_->set_frame_color(GetFrameColor()); frame_background_->set_use_custom_frame(true); @@ -202,13 +214,15 @@ frame_background_->set_theme_image(frame_image); frame_background_->set_top_area_height(frame_image.height()); - if (frame_->IsMaximized()) + if (frame_->IsMaximized()) { PaintMaximizedFrameBorder(canvas); - else + } else { PaintRestoredFrameBorder(canvas); + } PaintTitleBar(canvas); - if (ShouldShowClientEdge()) + if (ShouldShowClientEdge()) { PaintRestoredClientEdge(canvas); + } } void CustomFrameView::Layout(PassKey) { @@ -366,8 +380,9 @@ // It seems like in some conditions we can be asked to paint after the window // that contains us is WM_DESTROYed. At this point, our delegate is NULL. The // correct long term fix may be to shut down the RootView in WM_DESTROY. - if (!delegate || !delegate->ShouldShowWindowTitle()) + if (!delegate || !delegate->ShouldShowWindowTitle()) { return; + } gfx::Rect rect = title_bounds_; rect.set_x(GetMirroredXForRect(title_bounds_)); @@ -445,8 +460,9 @@ minimum_title_bar_x_ = 0; maximum_title_bar_x_ = width(); - if (bounds().IsEmpty()) + if (bounds().IsEmpty()) { return; + } int caption_y = CaptionButtonY(); bool is_maximized = frame_->IsMaximized(); @@ -472,12 +488,14 @@ ImageButton* button = nullptr; for (auto frame_button : leading_buttons) { button = GetImageButton(frame_button); - if (!button) + if (!button) { continue; + } gfx::Rect target_bounds(gfx::Point(next_button_x, caption_y), button->GetPreferredSize({})); - if (frame_button == leading_buttons.front()) + if (frame_button == leading_buttons.front()) { target_bounds.set_width(target_bounds.width() + extra_width); + } LayoutButton(button, target_bounds); next_button_x += button->width(); minimum_title_bar_x_ = std::min(width(), next_button_x); @@ -487,12 +505,14 @@ next_button_x = width() - FrameBorderThickness(); for (auto frame_button : base::Reversed(trailing_buttons)) { button = GetImageButton(frame_button); - if (!button) + if (!button) { continue; + } gfx::Rect target_bounds(gfx::Point(next_button_x, caption_y), button->GetPreferredSize({})); - if (frame_button == trailing_buttons.back()) + if (frame_button == trailing_buttons.back()) { target_bounds.set_width(target_bounds.width() + extra_width); + } target_bounds.Offset(-target_bounds.width(), 0); LayoutButton(button, target_bounds); next_button_x = button->x(); @@ -506,11 +526,13 @@ // when there is no icon. gfx::Rect icon_bounds(IconBounds()); bool show_window_icon = window_icon_ != nullptr; - if (show_window_icon) + if (show_window_icon) { window_icon_->SetBoundsRect(icon_bounds); + } - if (!frame_->widget_delegate()->ShouldShowWindowTitle()) + if (!frame_->widget_delegate()->ShouldShowWindowTitle()) { return; + } // The offset between the window left edge and the title text. int title_x = show_window_icon ? icon_bounds.right() + kTitleIconOffsetX @@ -575,8 +597,9 @@ // don't want this button to become visible and to be laid out. bool should_show = frame_->widget_delegate()->CanMinimize(); button->SetVisible(should_show); - if (!should_show) + if (!should_show) { return nullptr; + } break; } @@ -588,8 +611,9 @@ // out. bool should_show = frame_->widget_delegate()->CanMaximize(); button->SetVisible(should_show); - if (!should_show) + if (!should_show) { return nullptr; + } break; }
diff --git a/ui/views/window/dialog_client_view_unittest.cc b/ui/views/window/dialog_client_view_unittest.cc index 1f54bfd..7c7019a 100644 --- a/ui/views/window/dialog_client_view_unittest.cc +++ b/ui/views/window/dialog_client_view_unittest.cc
@@ -151,8 +151,9 @@ } for (views::View* child : root->children()) { button = GetButtonByAccessibleName(child, name); - if (button) + if (button) { return button; + } } return nullptr; }
diff --git a/ui/views/window/dialog_delegate_unittest.cc b/ui/views/window/dialog_delegate_unittest.cc index 8ff45da..3f05f26b 100644 --- a/ui/views/window/dialog_delegate_unittest.cc +++ b/ui/views/window/dialog_delegate_unittest.cc
@@ -120,8 +120,9 @@ } void InitializeDialog() { - if (dialog_) + if (dialog_) { dialog_->TearDown(); + } dialog_ = std::make_unique<TestDialog>(); dialog_->Init(); @@ -145,8 +146,9 @@ void SimulateKeyPress(ui::KeyboardCode key) { ui::KeyEvent event(ui::EventType::kKeyPressed, key, ui::EF_NONE); - if (dialog()->GetFocusManager()->OnKeyEvent(event)) + if (dialog()->GetFocusManager()->OnKeyEvent(event)) { dialog()->GetWidget()->OnKeyEvent(&event); + } } TestDialog* dialog() const { return dialog_raw_; } @@ -509,8 +511,7 @@ bool closed = false; bool accepted = false; - dialog.SetCloseCallback( - base::BindLambdaForTesting([&]() { closed = true; })); + dialog.SetCloseCallback(base::BindLambdaForTesting([&]() { closed = true; })); dialog.SetAcceptCallback(base::BindLambdaForTesting([&]() { accepted = true; dialog.Close();
diff --git a/ui/views/window/frame_background.cc b/ui/views/window/frame_background.cc index 507f6fc..77d3cfa 100644 --- a/ui/views/window/frame_background.cc +++ b/ui/views/window/frame_background.cc
@@ -134,8 +134,9 @@ top_area_height_, 1.0f, SkTileMode::kRepeat, SkTileMode::kMirror); } - if (!theme_overlay_image_.isNull()) + if (!theme_overlay_image_.isNull()) { canvas->DrawImageInt(theme_overlay_image_, x, y - maximized_top_inset_); + } } void FrameBackground::FillFrameBorders(gfx::Canvas* canvas, @@ -145,8 +146,9 @@ int bottom_edge_height) const { // If the window is very short, we don't need to fill any borders. int remaining_height = view->height() - top_area_height_; - if (remaining_height <= 0) + if (remaining_height <= 0) { return; + } // Fill down the sides. canvas->FillRect( @@ -158,8 +160,9 @@ // If the window is very narrow, we're done. int center_width = view->width() - left_edge_width - right_edge_width; - if (center_width <= 0) + if (center_width <= 0) { return; + } // Fill the bottom area. canvas->FillRect(
diff --git a/ui/views/window/frame_background.h b/ui/views/window/frame_background.h index 850e522b..f19bc2d 100644 --- a/ui/views/window/frame_background.h +++ b/ui/views/window/frame_background.h
@@ -18,7 +18,7 @@ namespace ui { class ColorProvider; class NativeTheme; -} +} // namespace ui namespace views {
diff --git a/ui/views/window/frame_caption_button.cc b/ui/views/window/frame_caption_button.cc index f16354e..9f2f19e 100644 --- a/ui/views/window/frame_caption_button.cc +++ b/ui/views/window/frame_caption_button.cc
@@ -152,8 +152,9 @@ return; } - if (animate == Animate::kYes) + if (animate == Animate::kYes) { crossfade_icon_image_ = icon_image_; + } icon_ = icon; icon_definition_ = &icon_definition; @@ -204,8 +205,9 @@ } } - if (!event->handled()) + if (!event->handled()) { Button::OnGestureEvent(event); + } } views::PaintInfo::ScaleType FrameCaptionButton::GetPaintScaleType() const { @@ -254,8 +256,9 @@ } void FrameCaptionButton::SetPaintAsActive(bool paint_as_active) { - if (paint_as_active == paint_as_active_) + if (paint_as_active == paint_as_active_) { return; + } paint_as_active_ = paint_as_active; OnPropertyChanged(&paint_as_active_, kPropertyEffectsPaint); } @@ -350,8 +353,9 @@ icon_bounds_y, flags); canvas->Restore(); } else { - if (!swap_images_animation_->is_animating()) + if (!swap_images_animation_->is_animating()) { icon_alpha = alpha_; + } cc::PaintFlags flags; flags.setAlphaf(GetAlphaForIcon(icon_alpha) / 255.0f); DrawIconContents(canvas, icon_image_, icon_bounds_x, icon_bounds_y, flags); @@ -365,11 +369,13 @@ } SkAlpha FrameCaptionButton::GetAlphaForIcon(SkAlpha base_alpha) const { - if (!GetEnabled()) + if (!GetEnabled()) { return base::ClampRound<SkAlpha>(base_alpha * kDisabledButtonAlphaRatio); + } - if (paint_as_active_) + if (paint_as_active_) { return base_alpha; + } // Paint icons as active when they are hovered over or pressed. double inactive_alpha = GetInactiveButtonColorAlphaRatio();
diff --git a/ui/views/window/hit_test_utils.cc b/ui/views/window/hit_test_utils.cc index 99af6bc..54405ccb 100644 --- a/ui/views/window/hit_test_utils.cc +++ b/ui/views/window/hit_test_utils.cc
@@ -15,16 +15,19 @@ gfx::Point point_in_view(point_in_widget); View::ConvertPointFromWidget(view, &point_in_view); - if (!view->GetLocalBounds().Contains(point_in_view)) + if (!view->GetLocalBounds().Contains(point_in_view)) { return HTNOWHERE; + } View* target_view = view->GetEventHandlerForPoint(point_in_view); while (target_view) { int component = target_view->GetProperty(kHitTestComponentKey); - if (component != HTNOWHERE) + if (component != HTNOWHERE) { return component; - if (target_view == view) + } + if (target_view == view) { break; + } target_view = target_view->parent(); }
diff --git a/ui/views/window/native_frame_view.cc b/ui/views/window/native_frame_view.cc index 4a9f6e3..2cd10f7 100644 --- a/ui/views/window/native_frame_view.cc +++ b/ui/views/window/native_frame_view.cc
@@ -38,8 +38,9 @@ // Enforce minimum size (1, 1) in case that |client_bounds| is passed with // empty size. gfx::Rect window_bounds = client_bounds; - if (window_bounds.IsEmpty()) + if (window_bounds.IsEmpty()) { window_bounds.set_size(gfx::Size(1, 1)); + } return window_bounds; #endif }
diff --git a/ui/views/window/native_frame_view_mac.mm b/ui/views/window/native_frame_view_mac.mm index c6bd058..935d110 100644 --- a/ui/views/window/native_frame_view_mac.mm +++ b/ui/views/window/native_frame_view_mac.mm
@@ -24,8 +24,9 @@ frameRectForContentRect:gfx::ScreenRectToNSRect(client_bounds)]); // Enforce minimum size (1, 1) in case that |client_bounds| is passed with // empty size. - if (window_bounds.IsEmpty()) + if (window_bounds.IsEmpty()) { window_bounds.set_size(gfx::Size(1, 1)); + } return window_bounds; }
diff --git a/ui/views/window/non_client_view.cc b/ui/views/window/non_client_view.cc index ad45b95a..57a4c10 100644 --- a/ui/views/window/non_client_view.cc +++ b/ui/views/window/non_client_view.cc
@@ -44,8 +44,9 @@ bool point_in_left = point.x() < resize_border.left(); bool point_in_right = point.x() >= width() - resize_border.right(); - if (!point_in_left && !point_in_right && !point_in_top && !point_in_bottom) + if (!point_in_left && !point_in_right && !point_in_top && !point_in_bottom) { return HTNOWHERE; + } // If the window can't be resized, there are no resize boundaries, just // window borders. @@ -122,14 +123,16 @@ } void NonClientFrameView::Layout(PassKey) { - if (GetLayoutManager()) + if (GetLayoutManager()) { GetLayoutManager()->Layout(this); + } views::ClientView* client_view = GetWidget()->client_view(); client_view->SetBoundsRect(GetBoundsForClientView()); SkPath client_clip; - if (GetClientMask(client_view->size(), &client_clip)) + if (GetClientMask(client_view->size(), &client_clip)) { client_view->SetClipPath(client_clip); + } } View::Views NonClientFrameView::GetChildrenInZOrder() { @@ -191,20 +194,24 @@ frame_view_->InsertClientView(client_view_); } - if (old_frame_view) + if (old_frame_view) { RemoveChildView(old_frame_view.get()); + } } void NonClientView::SetOverlayView(View* view) { - if (overlay_view_) + if (overlay_view_) { RemoveChildView(overlay_view_); + } - if (!view) + if (!view) { return; + } overlay_view_ = view; - if (parent()) + if (parent()) { AddChildView(overlay_view_.get()); + } } CloseRequestResult NonClientView::OnWindowCloseRequested() { @@ -290,8 +297,9 @@ // where that is still the case it should simply be fixed. frame_view_->SetBoundsRect(GetLocalBounds()); - if (overlay_view_) + if (overlay_view_) { overlay_view_->SetBoundsRect(GetLocalBounds()); + } } View* NonClientView::GetTooltipHandlerForPoint(const gfx::Point& point) { @@ -304,8 +312,9 @@ View::ConvertPointToTarget(this, frame_view_.get(), &point_in_child_coords); View* handler = frame_view_->GetTooltipHandlerForPoint(point_in_child_coords); - if (handler) + if (handler) { return handler; + } } return View::GetTooltipHandlerForPoint(point); @@ -321,16 +330,18 @@ if (details.is_add && GetWidget() && details.child == this) { AddChildViewAt(frame_view_.get(), 0); frame_view_->InsertClientView(client_view_); - if (overlay_view_) + if (overlay_view_) { AddChildView(overlay_view_.get()); + } } } View* NonClientView::TargetForRect(View* root, const gfx::Rect& rect) { CHECK_EQ(root, this); - if (!UsePointBasedTargeting(rect)) + if (!UsePointBasedTargeting(rect)) { return ViewTargeterDelegate::TargetForRect(root, rect); + } // Because of the z-ordering of our child views (the client view is positioned // over the non-client frame view, if the client view ever overlaps the frame @@ -347,8 +358,9 @@ View::ConvertRectToTarget(this, frame_view_.get(), &rect_in_child_coords_f); gfx::Rect rect_in_child_coords = gfx::ToEnclosingRect(rect_in_child_coords_f); - if (frame_view_->HitTestRect(rect_in_child_coords)) + if (frame_view_->HitTestRect(rect_in_child_coords)) { return frame_view_->GetEventHandlerForRect(rect_in_child_coords); + } } return ViewTargeterDelegate::TargetForRect(root, rect);
diff --git a/ui/views/window/window_button_order_provider.cc b/ui/views/window/window_button_order_provider.cc index 7ad53d94..6d542e2e 100644 --- a/ui/views/window/window_button_order_provider.cc +++ b/ui/views/window/window_button_order_provider.cc
@@ -14,8 +14,9 @@ // static WindowButtonOrderProvider* WindowButtonOrderProvider::GetInstance() { - if (!instance_) + if (!instance_) { instance_ = new WindowButtonOrderProvider; + } return instance_; }
diff --git a/ui/views/window/window_shape.cc b/ui/views/window/window_shape.cc index 58ddd6f..cbcc0fb 100644 --- a/ui/views/window/window_shape.cc +++ b/ui/views/window/window_shape.cc
@@ -9,8 +9,7 @@ namespace views { -void GetDefaultWindowMask(const gfx::Size& size, - SkPath* window_mask) { +void GetDefaultWindowMask(const gfx::Size& size, SkPath* window_mask) { const SkScalar width = SkIntToScalar(size.width()); const SkScalar height = SkIntToScalar(size.height());
