diff --git a/chrome/VERSION b/chrome/VERSION index 9e27dd3d..27223de 100644 --- a/chrome/VERSION +++ b/chrome/VERSION
@@ -1,4 +1,4 @@ MAJOR=60 MINOR=0 -BUILD=3073 +BUILD=3074 PATCH=0
diff --git a/components/autofill/core/browser/webdata/autofill_wallet_syncable_service.cc b/components/autofill/core/browser/webdata/autofill_wallet_syncable_service.cc index fc6948f..aaab921 100644 --- a/components/autofill/core/browser/webdata/autofill_wallet_syncable_service.cc +++ b/components/autofill/core/browser/webdata/autofill_wallet_syncable_service.cc
@@ -45,6 +45,8 @@ return kJCBCard; case sync_pb::WalletMaskedCreditCard::MASTER_CARD: return kMasterCard; + case sync_pb::WalletMaskedCreditCard::UNIONPAY: + return kUnionPay; case sync_pb::WalletMaskedCreditCard::VISA: return kVisaCard;
diff --git a/components/sync/protocol/autofill_specifics.proto b/components/sync/protocol/autofill_specifics.proto index e74e47ad..ee8e9fe1 100644 --- a/components/sync/protocol/autofill_specifics.proto +++ b/components/sync/protocol/autofill_specifics.proto
@@ -90,6 +90,7 @@ SOLO = 6; SWITCH = 7; VISA = 8; + UNIONPAY = 9; } enum WalletCardClass {
diff --git a/components/sync/protocol/proto_enum_conversions.cc b/components/sync/protocol/proto_enum_conversions.cc index 5ad7a3d..cc2459c 100644 --- a/components/sync/protocol/proto_enum_conversions.cc +++ b/components/sync/protocol/proto_enum_conversions.cc
@@ -244,6 +244,7 @@ ENUM_CASE(sync_pb::WalletMaskedCreditCard, MASTER_CARD); ENUM_CASE(sync_pb::WalletMaskedCreditCard, SOLO); ENUM_CASE(sync_pb::WalletMaskedCreditCard, SWITCH); + ENUM_CASE(sync_pb::WalletMaskedCreditCard, UNIONPAY); ENUM_CASE(sync_pb::WalletMaskedCreditCard, VISA); } NOTREACHED();
diff --git a/third_party/WebKit/Source/core/page/ChromeClient.h b/third_party/WebKit/Source/core/page/ChromeClient.h index 61c72c6..e2cb1bb 100644 --- a/third_party/WebKit/Source/core/page/ChromeClient.h +++ b/third_party/WebKit/Source/core/page/ChromeClient.h
@@ -314,8 +314,6 @@ virtual void AjaxSucceeded(LocalFrame*) {} // Input method editor related functions. - virtual void ResetInputMethod() {} - virtual void DidUpdateTextOfFocusedElementByNonUserInput(LocalFrame&) {} virtual void ShowVirtualKeyboardOnElementFocus(LocalFrame&) {} virtual void RegisterViewportLayers() const {}