Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1477)

Unified Diff: components/payments/address_normalizer.cc

Issue 2686613003: [Payments] Move address normalization code from android to native. (Closed)
Patch Set: Renamed file and addressed comments Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/payments/address_normalizer.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/payments/address_normalizer.cc
diff --git a/components/payments/address_normalizer.cc b/components/payments/address_normalizer.cc
new file mode 100644
index 0000000000000000000000000000000000000000..f8dd35a3082d7eafb1967ad3b7669c237b87b057
--- /dev/null
+++ b/components/payments/address_normalizer.cc
@@ -0,0 +1,133 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "components/payments/address_normalizer.h"
+
+#include <memory>
+#include <utility>
+
+#include "base/strings/utf_string_conversions.h"
+#include "components/autofill/core/browser/address_i18n.h"
+#include "third_party/libaddressinput/chromium/chrome_address_validator.h"
+#include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_data.h"
+#include "third_party/libaddressinput/src/cpp/include/libaddressinput/source.h"
+#include "third_party/libaddressinput/src/cpp/include/libaddressinput/storage.h"
+
+namespace {
+using ::i18n::addressinput::Source;
+using ::i18n::addressinput::Storage;
+} // namespace
+
+namespace payments {
+
+namespace {
+
+class AddressNormalizationRequest : public AddressNormalizer::Request {
+ public:
+ // The |delegate| and |address_validator| need to outlive this Request.
+ AddressNormalizationRequest(const AutofillProfile& profile,
+ const std::string& region_code,
+ AddressNormalizer::Delegate* delegate,
+ autofill::AddressValidator* address_validator)
+ : profile_(profile),
+ region_code_(region_code),
+ delegate_(delegate),
+ address_validator_(address_validator) {}
+
+ ~AddressNormalizationRequest() override {}
+
+ void OnRulesLoaded(bool success) override {
+ if (!success) {
+ delegate_->OnCouldNotNormalize(profile_);
+ return;
+ }
+
+ DCHECK(address_validator_->AreRulesLoadedForRegion(region_code_));
+
+ // Create the AddressData from the profile.
+ ::i18n::addressinput::AddressData address_data =
+ *autofill::i18n::CreateAddressDataFromAutofillProfile(profile_,
+ region_code_);
+
+ // Normalize the address.
+ if (address_validator_ &&
+ address_validator_->NormalizeAddress(&address_data)) {
+ profile_.SetRawInfo(autofill::ADDRESS_HOME_STATE,
+ base::UTF8ToUTF16(address_data.administrative_area));
+ profile_.SetRawInfo(autofill::ADDRESS_HOME_CITY,
+ base::UTF8ToUTF16(address_data.locality));
+ profile_.SetRawInfo(autofill::ADDRESS_HOME_DEPENDENT_LOCALITY,
+ base::UTF8ToUTF16(address_data.dependent_locality));
+ }
+
+ delegate_->OnAddressNormalized(profile_);
+ }
+
+ private:
+ AutofillProfile profile_;
+ std::string region_code_;
+ AddressNormalizer::Delegate* delegate_;
+ autofill::AddressValidator* address_validator_;
+
+ DISALLOW_COPY_AND_ASSIGN(AddressNormalizationRequest);
+};
+
+} // namespace
+
+AddressNormalizer::AddressNormalizer(std::unique_ptr<Source> source,
+ std::unique_ptr<Storage> storage)
+ : address_validator_(std::move(source), std::move(storage), this) {}
+
+AddressNormalizer::~AddressNormalizer() {}
+
+void AddressNormalizer::LoadRulesForRegion(const std::string& region_code) {
+ address_validator_.LoadRules(region_code);
+}
+
+bool AddressNormalizer::AreRulesLoadedForRegion(
+ const std::string& region_code) {
+ return address_validator_.AreRulesLoadedForRegion(region_code);
+}
+
+void AddressNormalizer::StartAddressNormalization(
+ const AutofillProfile& profile,
+ const std::string& region_code,
+ AddressNormalizer::Delegate* requester) {
+ std::unique_ptr<AddressNormalizationRequest> request(
+ new AddressNormalizationRequest(profile, region_code, requester,
+ &address_validator_));
+
+ // Check if the rules are already loaded.
+ if (AreRulesLoadedForRegion(region_code)) {
+ request->OnRulesLoaded(true);
+ } else {
+ // Setup the variables so the profile gets normalized when the rules have
+ // finished loading.
+ auto it = pending_normalization_.find(region_code);
+ if (it == pending_normalization_.end()) {
+ // If no entry exists yet, create the entry and assign it to |it|.
+ it = pending_normalization_
+ .insert(std::make_pair(region_code,
+ std::vector<std::unique_ptr<Request>>()))
+ .first;
+ }
+
+ it->second.push_back(std::move(request));
+ }
+}
+
+void AddressNormalizer::OnAddressValidationRulesLoaded(
+ const std::string& region_code,
+ bool success) {
+ // Check if an address normalization is pending.
+ auto it = pending_normalization_.find(region_code);
+ if (it != pending_normalization_.end()) {
+ for (size_t i = 0; i < it->second.size(); ++i) {
+ it->second[i]->OnRulesLoaded(success);
+ }
+ pending_normalization_.erase(it);
+ }
+}
+
+} // namespace payments
« no previous file with comments | « components/payments/address_normalizer.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698