Adjust displayed phone number for prefix/suffix case.

components/autofill/core/browser/autofill_field.cc

 // Copyright 2013 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/autofill/core/browser/autofill_field.h"
 
 #include "base/logging.h"
 #include "base/sha1.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
@@ skipping 262 matching lines @@
 
   return false;
 }
 
 // Set |field_data|'s value to |number|, or possibly an appropriate substring of
 // |number|.  The |field| specifies the type of the phone and whether this is a
 // phone prefix or suffix.
 void FillPhoneNumberField(const AutofillField& field,
                           const base::string16& number,
                           FormFieldData* field_data) {
-  // Check to see if the size field matches the "prefix" or "suffix" sizes and
-  // fill accordingly.
-  base::string16 value = number;
-  if (number.length() ==
-          PhoneNumber::kPrefixLength + PhoneNumber::kSuffixLength) {
-    if (field.phone_part() == AutofillField::PHONE_PREFIX ||
-        field_data->max_length == PhoneNumber::kPrefixLength) {
-      value = number.substr(PhoneNumber::kPrefixOffset,
-                            PhoneNumber::kPrefixLength);
-    } else if (field.phone_part() == AutofillField::PHONE_SUFFIX ||
-               field_data->max_length == PhoneNumber::kSuffixLength) {
-      value = number.substr(PhoneNumber::kSuffixOffset,
-                            PhoneNumber::kSuffixLength);
-    }
-  }
+  base::string16 value;
+  AutofillField::GetPhoneNumberValue(field, number, field_data, &value);
 
   field_data->value = value;

[Ilya Sherman, 2014/09/03 00:55:49]

nit: You can shorten this to 

  AutofillField::GetPhoneNumberValue(
      field, number, field_data, &field_data->value);

[ziran.sun, 2014/09/04 13:10:25]

Done.

 }
 
 // Fills in the select control |field| with |value|.  If an exact match is not
 // found, falls back to alternate filling strategies based on the |type|.
 bool FillSelectControl(const AutofillType& type,
                        const base::string16& value,
                        const std::string& app_locale,
                        FormFieldData* field) {
   DCHECK_EQ("select-one", field->form_control_type);
 
@@ skipping 176 matching lines @@
     return FillMonthControl(value, field_data);
   } else if (type.GetStorableType() == ADDRESS_HOME_STREET_ADDRESS) {
     FillStreetAddress(value, address_language_code, field_data);
     return true;
   }
 
   field_data->value = value;
   return true;
 }
 
+// Get value for phone number. The value could be |number|, or possibly an
+// appropriate substring of |number| if it's for phone prefix or suffix field.
+void AutofillField::GetPhoneNumberValue(const AutofillField& field,
+                                        const base::string16& number,
+                                        FormFieldData* field_data,
+                                        base::string16* value) {
+  // Check to see if the size field matches the "prefix" or "suffix" sizes and
+  // substract the value accordingly.

[Ilya Sherman, 2014/09/03 00:55:49]

nit: Let's update this to something like "Check to see if the size field matches
the "prefix" or "suffix" sizes. If so, return the appropriate substring."

[ziran.sun, 2014/09/04 13:10:25]

Done.

+  *value = number;
+  if (number.length() ==
+      PhoneNumber::kPrefixLength + PhoneNumber::kSuffixLength) {

[Ilya Sherman, 2014/09/03 00:55:49]

nit: Please indent this line by four more spaces.

[ziran.sun, 2014/09/04 13:10:25]

Done.

+    if (field.phone_part() == AutofillField::PHONE_PREFIX ||
+        field_data->max_length == PhoneNumber::kPrefixLength) {
+      *value =
+          number.substr(PhoneNumber::kPrefixOffset, PhoneNumber::kPrefixLength);
+    } else if (field.phone_part() == AutofillField::PHONE_SUFFIX ||
+               field_data->max_length == PhoneNumber::kSuffixLength) {
+      *value =
+          number.substr(PhoneNumber::kSuffixOffset, PhoneNumber::kSuffixLength);
+    }
+  }
+}
+
 }  // namespace autofill