Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from chromium:master #10

Merged
merged 81 commits into from
Jun 1, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
62ac86c
Roll Chrome Win32 PGO Profile
Jun 1, 2021
e6a0b2b
Roll Chrome Win64 PGO Profile
Jun 1, 2021
d59ace5
Roll Skia from 77724af76ce2 to fe9b4316d8de (5 revisions)
Jun 1, 2021
83f3041
[Autofill Assistant] Fix disappearing Autofill Assistant
Jun 1, 2021
5e5eea4
Increase policy store timeout and remove metrics
Jun 1, 2021
c470aa5
Fix WebAppIconManagerTest from dirtying the test environment.
nik3daz Jun 1, 2021
38c2b3c
Delay expiry of frequently used histograms.
Jun 1, 2021
f8f1ed2
Remove ui/events/ozone/evdev library from wayland build
elkurin Jun 1, 2021
72a5b93
Update V8 to version 9.3.39.
Jun 1, 2021
e93b7ae
[Frameworks roll] Roll to 376769643 piper revision
Jun 1, 2021
ac730db
Extend expiry of WebFont.DownloadTime.* histograms
irori Jun 1, 2021
3925835
[Platform Keys Service] Explicitly run callbacks on UI thread
omorsi Jun 1, 2021
b78919d
Delay expiry of histograms causing alerts.
Jun 1, 2021
a658046
CCA: Fix closure compiler warning for JSC_DYNAMIC_IMPORT_ALIASING_REQ…
peter50216 Jun 1, 2021
8e82766
[Android] Remove redundant method AccountManagerFacade#isCachePopulat…
Jun 1, 2021
151eb05
Refactor duplicated building of Web Crypto Algorithm.
Jun 1, 2021
cacf6a2
[ios] Properly cleanup Bookmarks UI during shutdown
sdefresne Jun 1, 2021
3d957e0
Roll ANGLE from fe93fcdd1b48 to a44b16d39075 (1 revision)
Jun 1, 2021
813e73b
Fix closed captions and subtitles icon sizes in video player
beaufortfrancois Jun 1, 2021
5a2df26
Roll Chrome Win32 PGO Profile
Jun 1, 2021
735576e
Let container-type turn on containment
andruud Jun 1, 2021
3b00f04
CCA: Don't save video if the duration is less than 500ms
Jun 1, 2021
5836b55
bind-gen: Update the list of generated bindings files.
yuki3 Jun 1, 2021
5bd8ca6
Roll Chrome Win64 PGO Profile
Jun 1, 2021
ed24ed8
[Autofill Assistant] Write test for TriggerScript + Keyboard
Jun 1, 2021
ddbc489
Add missing explicit specifiers in /login/ code
Jun 1, 2021
428b9ab
Cleanup the kHandwritingRecognitionWebPlatformApi flag.
Jun 1, 2021
612ce21
Add fieldtrial entry for MobileIdentityConsistencyVar
Jun 1, 2021
27962c8
Small cleanups in/around DataTypeManagerImpl
Jun 1, 2021
efb8608
[Signin][Android] Rename method AccountInfoService#getAccountInfoByEm…
Jun 1, 2021
e055252
Rename data members of blink::FontMetrics
tkent-google Jun 1, 2021
20a70a7
Updating XTBs based on .GRDs from branch main
Jun 1, 2021
d76a6ad
ozone/wayland: fix GetAcceleratedWidgetAtScreenPoint when scale > 1
msisov Jun 1, 2021
42ffc44
CCA: Don't play animation for spoken-only toast messages
Jun 1, 2021
ba18275
Track container view location for DialogOverlay
rknoll Jun 1, 2021
dcfadb5
Reland "SVG Text NG: Use FontHeight with float ascent/descent on comp…
tkent-google Jun 1, 2021
0babade
Roll Perfetto from b3f455e9edce to bb3b66d48669 (1 revision)
Jun 1, 2021
ff78a98
Move SensorPermissionContext to //components
rknoll Jun 1, 2021
c57263e
Propagate Mic Permissions error to getUserMedia
Jun 1, 2021
44548ca
Add rayankans@ to Background Sync mojo owners
rayankans Jun 1, 2021
05e8c14
Roll Chrome Win64 PGO Profile
Jun 1, 2021
0c98b5d
Roll Chrome Win32 PGO Profile
Jun 1, 2021
e0f79c5
Reland "Remove clipboard filenames feature flag""
Jun 1, 2021
2e80500
[gin] Failing to load the V8 startup snapshot is a fatal error.
rmcilroy Jun 1, 2021
2056792
Roll Perfetto from bb3b66d48669 to 44702c57e7e6 (1 revision)
Jun 1, 2021
634f08a
[PwdEditAndroid] Set the UI action handler last
Jun 1, 2021
460cd16
Replace references to know_user with the new API calls in SAML tests.
Jun 1, 2021
383de9c
Add metric for concurrent output streams during audio capture
Jun 1, 2021
b33d0d5
Prerendering Restriction: block the Alert/Confirm/Prompt APIs
MyidShin Jun 1, 2021
9ad9d1d
Update V8 to version 9.3.40.
Jun 1, 2021
d46a754
[composite-bgcolor-animation] Remove an invalid DCHECK
xidachen Jun 1, 2021
f6a8873
Roll Perfetto Trace Processor Linux from b3f455e9edce to bb3b66d48669
Jun 1, 2021
f9136ce
Roll RTS model from D1etRzwhV... to qgWjqhDC-...
Jun 1, 2021
d626877
[iOS] Target 10.15 when building WebKit for macOS on macOS 11
alijuma Jun 1, 2021
8a9e064
Prerender: Cancel prerendering upon a download
MyidShin Jun 1, 2021
6f02a9c
Roll RTS model from KEqicFtFO... to M668EbK0T...
Jun 1, 2021
395c854
Automated Commit: LKGM 14006.0.0 for chromeos.
Jun 1, 2021
d07fdea
ozone/wayland: do not create wl_buffers for staging pixmaps. 1/*
msisov Jun 1, 2021
9b5bc72
SVG Text NG: Cleanup of NGInlineBoxState
tkent-google Jun 1, 2021
a3ef799
Disable a test for smooth scroll interruption.
skobes-chromium Jun 1, 2021
7978569
Roll RTS model from riSig3Jqa... to oALhDKVke...
Jun 1, 2021
07f7d52
Separate SharedHighlighting config from Sharing hub
Jun 1, 2021
6b371ba
Roll Fuchsia SDK from 4.20210531.3.1 to 4.20210601.1.1
Jun 1, 2021
96918f3
[PwdEditAndroid] Don't call GetUsernamesForRealm for blocked credentials
Jun 1, 2021
22e41c3
Set use_custom_libcxx to false for Chrome OS Lacros build
elkurin Jun 1, 2021
b908188
[Lacros] Add Lacros PowerSaveBlocker that calls Ash's impl via crosapi.
samuelhuang Jun 1, 2021
dcad83b
[Android] Migrate tryGetGoogleAccounts() usage in AccountManagementFr…
Jun 1, 2021
3afc4cc
mb: remove code for old client
Jun 1, 2021
05d95e1
Remove CrosSettings from policy pref mapping test
alex292 Jun 1, 2021
a89e197
[Autofill Assistant] CUD validity for Shipping Address
Jun 1, 2021
566af05
[UseCounter] Only report features in HTTP/HTTPS page to browser
Jun 1, 2021
bf9a037
Add NoInterrupt to DisableSwapUntilResize() IPC
Jun 1, 2021
852446e
[Android] Remove unused method AccountManagerFacade#isGooglePlayServi…
Jun 1, 2021
cfc668e
[Capture Handle] Add browser tests
Jun 1, 2021
d708fec
Roll vulkan-deps from 7d19f5261090 to 3f59a9b275fb (2 revisions)
Jun 1, 2021
8bfa91a
Fix potential use-after-move in //components/os_crypt/
Jun 1, 2021
c96ab8d
[protosync] Server-side -> client
Jun 1, 2021
773fc0e
Add a web_view_ member to RenderViewTest.
dtapuska Jun 1, 2021
ba51490
Roll ChromeOS Bigcore AFDO profile from 92-4484.0-1621852288-benchmar…
Jun 1, 2021
7ae6f3f
Roll Skia from fe9b4316d8de to 9af0bca3de2b (1 revision)
Jun 1, 2021
4f8038a
Roll ChromeOS Atom AFDO profile from 92-4484.0-1621849150-benchmark-9…
Jun 1, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
16 changes: 8 additions & 8 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -209,19 +209,19 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling Skia
# and whatever else without interference from each other.
'skia_revision': '77724af76ce24bc845a0909046d3fb7cd2453006',
'skia_revision': '9af0bca3de2b56c9a8062a4617d5e0490ab90396',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling V8
# and whatever else without interference from each other.
'v8_revision': '115347c24efce03c9f79e62b71430fd13d94eff5',
'v8_revision': '5ecef708595c72e5b4d798fc336a0a64e764aeff',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling swarming_client
# and whatever else without interference from each other.
'swarming_revision': 'a32a1607f6093d338f756c7e7c7b4333b0c50c9c',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling ANGLE
# and whatever else without interference from each other.
'angle_revision': 'fe93fcdd1b484ee460e6fcdd0e8dbb6624bbc751',
'angle_revision': 'a44b16d39075af2ba64ac48457bd6f8f3b3aafeb',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling SwiftShader
# and whatever else without interference from each other.
Expand Down Expand Up @@ -643,7 +643,7 @@ deps = {
'packages': [
{
'package': 'chromium/rts/model/linux-amd64',
'version': 'riSig3JqaTPXRJyArMbQCNmMd2MM4C5qAkr7enZF5f8C',
'version': 'oALhDKVkeAzkGeq7XrFKM1mUTH2TaYJGQkXwM7RytDYC',
},
],
'dep_type': 'cipd',
Expand All @@ -654,7 +654,7 @@ deps = {
'packages': [
{
'package': 'chromium/rts/model/mac-amd64',
'version': 'D1etRzwhVwI7QGbv0PFp2QrQ73HzOVZjex_mrRU2obsC',
'version': 'qgWjqhDC-d3maWRs-3dh4uTjXicdxi88EYI4HoaVGcgC',
},
],
'dep_type': 'cipd',
Expand All @@ -665,7 +665,7 @@ deps = {
'packages': [
{
'package': 'chromium/rts/model/windows-amd64',
'version': 'KEqicFtFOQ7QG3MH4ZNilLLBf6T_i6PHqx4O0j-ADVYC',
'version': 'M668EbK0TLr4XWelPNWUCwz-8fDE1RMeO0xvXR4Y4rsC',
},
],
'dep_type': 'cipd',
Expand Down Expand Up @@ -1349,7 +1349,7 @@ deps = {
},

'src/third_party/perfetto':
Var('android_git') + '/platform/external/perfetto.git' + '@' + 'b3f455e9edced2a776ddcb5a2cdf5ddcefa8776f',
Var('android_git') + '/platform/external/perfetto.git' + '@' + '44702c57e7e6a294a58b8ea35879fc58842f2995',

'src/third_party/perl': {
'url': Var('chromium_git') + '/chromium/deps/perl.git' + '@' + '6f3e5028eb65d0b4c5fdd792106ac4c84eee1eb3',
Expand Down Expand Up @@ -1547,7 +1547,7 @@ deps = {
'src/third_party/usrsctp/usrsctplib':
Var('chromium_git') + '/external/github.com/sctplab/usrsctp' + '@' + '22ba62ffe79c3881581ab430368bf3764d9533eb',

'src/third_party/vulkan-deps': '{chromium_git}/vulkan-deps@7d19f5261090fbb07bd30679184538c36bee229c',
'src/third_party/vulkan-deps': '{chromium_git}/vulkan-deps@3f59a9b275fbae45d3388732b2345c112a1e0a45',

'src/third_party/vulkan_memory_allocator':
Var('chromium_git') + '/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git' + '@' + '732a76d9d3c70d6aa487216495eeb28518349c3a',
Expand Down
3 changes: 2 additions & 1 deletion ash/login/ui/animated_rounded_image_view.cc
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ namespace {
class SingleFrameImageDecoder
: public AnimatedRoundedImageView::AnimationDecoder {
public:
SingleFrameImageDecoder(const gfx::ImageSkia& image) : image_(image) {}
explicit SingleFrameImageDecoder(const gfx::ImageSkia& image)
: image_(image) {}
~SingleFrameImageDecoder() override = default;

// AnimatedRoundedImageView::AnimationDecoder:
Expand Down
2 changes: 1 addition & 1 deletion ash/login/ui/bottom_status_indicator.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class BottomStatusIndicator : public views::LabelButton {
public:
using TappedCallback = base::RepeatingClosure;

BottomStatusIndicator(TappedCallback on_tapped_callback);
explicit BottomStatusIndicator(TappedCallback on_tapped_callback);
BottomStatusIndicator(const BottomStatusIndicator&) = delete;
BottomStatusIndicator& operator=(const BottomStatusIndicator&) = delete;
~BottomStatusIndicator() override;
Expand Down
2 changes: 1 addition & 1 deletion ash/login/ui/login_base_bubble_view.cc
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ constexpr base::TimeDelta kBubbleAnimationDuration =
// associated bubble in response.
class LoginBubbleHandler : public ui::EventHandler {
public:
LoginBubbleHandler(LoginBaseBubbleView* bubble) : bubble_(bubble) {
explicit LoginBubbleHandler(LoginBaseBubbleView* bubble) : bubble_(bubble) {
Shell::Get()->AddPreTargetHandler(this);
}

Expand Down
6 changes: 3 additions & 3 deletions ash/login/ui/login_user_view.cc
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ constexpr char kLoginUserLabelClassName[] = "LoginUserLabel";
class PassthroughAnimationDecoder
: public AnimatedRoundedImageView::AnimationDecoder {
public:
PassthroughAnimationDecoder(const AnimationFrames& frames)
explicit PassthroughAnimationDecoder(const AnimationFrames& frames)
: frames_(frames) {}
~PassthroughAnimationDecoder() override = default;

Expand All @@ -102,7 +102,7 @@ class PassthroughAnimationDecoder

class IconRoundedView : public views::View {
public:
IconRoundedView(int size) : size_(size) {}
explicit IconRoundedView(int size) : size_(size) {}
~IconRoundedView() override = default;

IconRoundedView(const IconRoundedView&) = delete;
Expand Down Expand Up @@ -166,7 +166,7 @@ class LoginUserView::UserImage : public NonAccessibleView {
LoginUserView::UserImage* const view_;
};

UserImage(LoginDisplayStyle style)
explicit UserImage(LoginDisplayStyle style)
: NonAccessibleView(kLoginUserImageClassName) {
SetLayoutManager(std::make_unique<views::FillLayout>());

Expand Down
2 changes: 1 addition & 1 deletion ash/login/ui/public_account_warning_dialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class LoginExpandedPublicAccountView;
// clicks on the learn more link on the pubic account expanded view.
class ASH_EXPORT PublicAccountWarningDialog : public views::DialogDelegateView {
public:
PublicAccountWarningDialog(
explicit PublicAccountWarningDialog(
base::WeakPtr<LoginExpandedPublicAccountView> controller);
~PublicAccountWarningDialog() override;

Expand Down
1 change: 1 addition & 0 deletions ash/strings/ash_strings_bn.xtb
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,7 @@
<translation id="3207953481422525583">ব্যবহারকারী সংক্রান্ত সেটিংস</translation>
<translation id="3217205077783620295">ভলিউম চালু আছে, টগল করলে অডিও মিউট হয়ে যাবে।</translation>
<translation id="3226991577105957773">+ আরও <ph name="COUNT" />টি</translation>
<translation id="324366796737464147">অপ্রয়োজনীয় আওয়াজের বাতিলকরণ</translation>
<translation id="3249513730522716925">Window <ph name="WINDOW_TITLE" /> ডেস্ক <ph name="ACTIVE_DESK" /> থেকে ডেস্ক <ph name="TARGET_DESK" />-এ সরানো হয়েছে</translation>
<translation id="3255483164551725916">আপনি কি করতে পারেন?</translation>
<translation id="3269597722229482060">ডানদিকের বোতামে ক্লিক করুন</translation>
Expand Down
1 change: 1 addition & 0 deletions ash/strings/ash_strings_gu.xtb
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,7 @@
<translation id="3207953481422525583">વપરાશકર્તા સેટિંગ</translation>
<translation id="3217205077783620295">વૉલ્યૂમ ચાલુ છે, ટૉગલ કરવાથી ઑડિયો મ્યૂટ થશે.</translation>
<translation id="3226991577105957773">+ વધુ <ph name="COUNT" /></translation>
<translation id="324366796737464147">અવાજ રદ્દીકરણ</translation>
<translation id="3249513730522716925">વિડો <ph name="WINDOW_TITLE" />ને ડેસ્ક <ph name="ACTIVE_DESK" />માંથી ડેસ્ક <ph name="TARGET_DESK" />માં ખસેડી</translation>
<translation id="3255483164551725916">તમે શું કરી શકો?</translation>
<translation id="3269597722229482060">રાઇટ ક્લિક કરો</translation>
Expand Down
1 change: 1 addition & 0 deletions ash/strings/ash_strings_kn.xtb
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,7 @@
<translation id="3207953481422525583">ಬಳಕೆದಾರರ ಸೆಟ್ಟಿಂಗ್‌ಗಳು</translation>
<translation id="3217205077783620295">ವಾಲ್ಯೂಮ್ ಆನ್ ಆಗಿದೆ, ಟಾಗಲ್ ಮಾಡುವುದರಿಂದ ಆಡಿಯೊ ಮ್ಯೂಟ್ ಆಗುತ್ತದೆ.</translation>
<translation id="3226991577105957773">+<ph name="COUNT" /> ಹೆಚ್ಚು</translation>
<translation id="324366796737464147">ಗದ್ದಲ ನಿವಾರಣೆ</translation>
<translation id="3249513730522716925"><ph name="WINDOW_TITLE" /> ವಿಂಡೋವನ್ನು <ph name="ACTIVE_DESK" /> ಡೆಸ್ಕ್‌ನಿಂದ<ph name="TARGET_DESK" /> ಡೆಸ್ಕ್‌ಗೆ ಸರಿಸಲಾಗಿದೆ</translation>
<translation id="3255483164551725916">ನೀವೇನು ಮಾಡಬಲ್ಲಿರಿ?</translation>
<translation id="3269597722229482060">ಬಲ-ಕ್ಲಿಕ್</translation>
Expand Down
1 change: 1 addition & 0 deletions ash/strings/ash_strings_mr.xtb
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,7 @@
<translation id="3207953481422525583">वापरकर्ता सेटिंग्ज</translation>
<translation id="3217205077783620295">व्हॉल्यूम सुरू आहे, टॉगल केल्याने ऑडिओ म्यूट होईल.</translation>
<translation id="3226991577105957773">आणखी +<ph name="COUNT" /></translation>
<translation id="324366796737464147">नॉइझ कॅंसलेशन</translation>
<translation id="3249513730522716925">विंडो <ph name="WINDOW_TITLE" /> डेस्क <ph name="ACTIVE_DESK" /> वरून डेस्क <ph name="TARGET_DESK" /> वर हलवली</translation>
<translation id="3255483164551725916">तुला काय करता येते?</translation>
<translation id="3269597722229482060">राइट क्लिक</translation>
Expand Down
1 change: 1 addition & 0 deletions ash/strings/ash_strings_ne.xtb
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,7 @@
<translation id="3207953481422525583">प्रयोगकर्ताका सेटिङहरू</translation>
<translation id="3217205077783620295">भोल्युम सक्रिय छ, टगल गर्नुले अडियो म्युट गर्ने छ।</translation>
<translation id="3226991577105957773">+<ph name="COUNT" /> थप</translation>
<translation id="324366796737464147">ध्वनि खारेजी</translation>
<translation id="3249513730522716925">विन्डो सारेर <ph name="WINDOW_TITLE" /> डेस्क <ph name="ACTIVE_DESK" /> बाट <ph name="TARGET_DESK" /> डेस्कमा पुर्‍याइयो</translation>
<translation id="3255483164551725916">तपाईं के गर्न सक्नुहुन्छ?</translation>
<translation id="3269597722229482060">दायाँ क्लिक गर्नुहोस्</translation>
Expand Down
1 change: 1 addition & 0 deletions ash/strings/ash_strings_ur.xtb
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,7 @@
<translation id="3207953481422525583">صارف کی ترتیبات</translation>
<translation id="3217205077783620295">والیوم آن ہے۔ ٹوگل کرنے سے آڈیو خاموش ہو جائے گی۔</translation>
<translation id="3226991577105957773">‏‎<ph name="COUNT" />+‎ مزید</translation>
<translation id="324366796737464147">شور کو کم کرنا</translation>
<translation id="3249513730522716925"><ph name="WINDOW_TITLE" /> ونڈو کو <ph name="ACTIVE_DESK" /> ڈیسک سے <ph name="TARGET_DESK" /> ڈیسک میں منتقل کر دیا گیا ہے</translation>
<translation id="3255483164551725916">آپ کیا کر سکتی ہیں؟</translation>
<translation id="3269597722229482060">دائیں طرف کلک کریں</translation>
Expand Down
11 changes: 6 additions & 5 deletions build/config/c++/c++.gni
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@ declare_args() {
# standard library support.
# Don't check in changes that set this to false for more platforms; doing so
# is not supported.
use_custom_libcxx = is_fuchsia || is_android || is_mac ||
(is_ios && !use_xcode_clang) || (is_win && is_clang) ||
((is_linux || is_chromeos) &&
(!is_chromeos_ash ||
default_toolchain != "//build/toolchain/cros:target"))
# We always use system installed libc++ on building chrome (incl. both Ash
# and Lacros Chrome) running on Chrome OS devices with cros-toolchain.
use_custom_libcxx =
is_fuchsia || is_android || is_mac || is_linux ||
(is_ios && !use_xcode_clang) || (is_win && is_clang) ||
(is_chromeos && default_toolchain != "//build/toolchain/cros:target")

# Use libc++ instead of stdlibc++ when using the host_cpu toolchain, even if
# use_custom_libcxx is false. This is useful for cross-compiles where a custom
Expand Down
2 changes: 1 addition & 1 deletion build/fuchsia/linux.sdk.sha1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.20210531.3.1
4.20210601.1.1
2 changes: 1 addition & 1 deletion build/fuchsia/mac.sdk.sha1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.20210531.3.1
4.20210601.1.1
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@
android:id="@+id/incomplete_error"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:text="@string/autofill_assistant_payment_information_missing"
android:textAppearance="@style/TextAppearance.ErrorCaption"
android:visibility="gone"/>
</LinearLayout>
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
android:id="@+id/incomplete_error"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/autofill_assistant_payment_information_missing"
android:textAppearance="@style/TextAppearance.ErrorCaption"
android:visibility="gone"/>
</LinearLayout>
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,6 @@ private boolean showTriggerScript(String[] cancelPopupMenuItems, int[] cancelPop
@CalledByNative
private void hideTriggerScript() {
mTriggerScript.hide();
mStartupDependencies.getKeyboardVisibilityDelegate().removeKeyboardVisibilityListener(
mKeyboardVisibilityListener);
}

@CalledByNative
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
import org.chromium.chrome.browser.autofill.settings.AddressEditor;
import org.chromium.chrome.browser.autofill.settings.CardEditor;
import org.chromium.chrome.browser.autofill_assistant.generic_ui.AssistantValue;
import org.chromium.chrome.browser.autofill_assistant.user_data.AssistantCollectUserDataModel.AddressModel;
import org.chromium.chrome.browser.autofill_assistant.user_data.AssistantCollectUserDataModel.ContactModel;
import org.chromium.chrome.browser.autofill_assistant.user_data.additional_sections.AssistantAdditionalSection.Delegate;
import org.chromium.chrome.browser.autofill_assistant.user_data.additional_sections.AssistantAdditionalSectionContainer;
import org.chromium.chrome.browser.payments.AutofillAddress;
import org.chromium.chrome.browser.payments.AutofillPaymentInstrument;
import org.chromium.chrome.browser.payments.ContactEditor;
import org.chromium.chrome.browser.profiles.Profile;
Expand Down Expand Up @@ -180,12 +180,9 @@ public void onTimeSlotChanged(@Nullable Integer index) {
view.mPaymentMethodSection.setCompletenessDelegate(collectUserDataDelegate != null
? collectUserDataDelegate::isPaymentInstrumentComplete
: null);
view.mShippingAddressSection.setListener(collectUserDataDelegate != null
? collectUserDataDelegate::onShippingAddressChanged
: null);
view.mShippingAddressSection.setCompletenessDelegate(collectUserDataDelegate != null
? collectUserDataDelegate::isShippingAddressComplete
: null);
view.mShippingAddressSection.setListener(collectUserDataDelegate == null
? null
: m -> collectUserDataDelegate.onShippingAddressChanged(m.mOption));
view.mLoginSection.setListener(collectUserDataDelegate != null
? collectUserDataDelegate::onLoginChoiceChanged
: null);
Expand Down Expand Up @@ -478,7 +475,7 @@ private boolean updateSectionSelectedItem(
// This prevents creating a loop.
if (propertyKey == AssistantCollectUserDataModel.SELECTED_SHIPPING_ADDRESS) {
if (model.get(AssistantCollectUserDataModel.REQUEST_SHIPPING_ADDRESS)) {
AutofillAddress shippingAddress =
AddressModel shippingAddress =
model.get(AssistantCollectUserDataModel.SELECTED_SHIPPING_ADDRESS);
if (shippingAddress != null) {
view.mShippingAddressSection.addOrUpdateItem(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,6 @@ public interface AssistantCollectUserDataDelegate {
/** The focus on an input text field has changed */
void onInputTextFocusChanged(boolean isFocused);

/**
* Returns true if the shipping address is complete.
* TODO(b/154068342): Remove this method and send the error message from |Controller|.
*/
boolean isShippingAddressComplete(@Nullable AutofillAddress address);

/**
* Returns true if the payment instrument is complete.
* TODO(b/154068342): Remove this method and send the error message from |Controller|.
Expand Down
Loading