chrome/browser/webdata/autofill_profile_syncable_service.cc - Issue 13697002: Make autofill's Address store country using the country code so that app locale isn't needed for th…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/webdata/autofill_profile_syncable_service.cc

Issue 13697002: Make autofill's Address store country using the country code so that app locale isn't needed for th… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 7 years, 9 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

« chrome/browser/autofill/autofill_browsertest.cc ('K') | « chrome/browser/ui/webui/options/autofill_options_handler.cc ('k') | chrome/browser/webdata/web_database_migration_unittest.cc » ('j') | chrome/browser/webdata/web_database_migration_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/webdata/autofill_profile_syncable_service.cc

===================================================================

--- chrome/browser/webdata/autofill_profile_syncable_service.cc (revision 192389)

+++ chrome/browser/webdata/autofill_profile_syncable_service.cc (working copy)

@@ -8,6 +8,8 @@

#include "base/location.h"

#include "base/logging.h"

#include "base/utf_string_conversions.h"

+#include "chrome/browser/browser_process.h"

+#include "components/autofill/browser/autofill_country.h"

#include "components/autofill/browser/autofill_profile.h"

#include "components/autofill/browser/form_group.h"

#include "components/webdata/autofill/autofill_table.h"

@@ -315,8 +317,11 @@

specifics.address_home_city(), profile) || diff;

diff = UpdateField(ADDRESS_HOME_STATE,

specifics.address_home_state(), profile) || diff;

- diff = UpdateField(ADDRESS_HOME_COUNTRY,

- specifics.address_home_country(), profile) || diff;

+ string16 country_name_or_code =

+ ASCIIToUTF16(specifics.address_home_country());

+ std::string country_code = AutofillCountry::GetCountryCode(

+ country_name_or_code, g_browser_process->GetApplicationLocale());

Ilya Sherman 2013/04/05 05:18:01 Again, this happens on the DB thread (I think), so

jam 2013/04/05 06:45:54 Done.

+ diff = UpdateField(ADDRESS_HOME_COUNTRY, country_code, profile) || diff;

diff = UpdateField(ADDRESS_HOME_ZIP,

specifics.address_home_zip(), profile) || diff;

diff = UpdateMultivaluedField(EMAIL_ADDRESS,