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

Side by Side Diff: chrome/browser/sync/glue/autofill_model_associator2.cc

Issue 5606002: Move:... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/sync/glue/autofill_model_associator2.h" 5 #include "chrome/browser/sync/glue/autofill_model_associator2.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/task.h" 9 #include "base/task.h"
10 #include "base/time.h" 10 #include "base/time.h"
11 #include "base/string_number_conversions.h" 11 #include "base/string_number_conversions.h"
12 #include "base/utf_string_conversions.h" 12 #include "base/utf_string_conversions.h"
13 #include "chrome/browser/autofill/autofill_profile.h" 13 #include "chrome/browser/autofill/autofill_profile.h"
14 #include "chrome/browser/browser_thread.h" 14 #include "chrome/browser/browser_thread.h"
15 #include "chrome/browser/profile.h" 15 #include "chrome/browser/profiles/profile.h"
16 #include "chrome/browser/sync/engine/syncapi.h" 16 #include "chrome/browser/sync/engine/syncapi.h"
17 #include "chrome/browser/sync/glue/autofill_change_processor.h" 17 #include "chrome/browser/sync/glue/autofill_change_processor.h"
18 #include "chrome/browser/sync/profile_sync_service.h" 18 #include "chrome/browser/sync/profile_sync_service.h"
19 #include "chrome/browser/sync/protocol/autofill_specifics.pb.h" 19 #include "chrome/browser/sync/protocol/autofill_specifics.pb.h"
20 #include "chrome/browser/webdata/web_database.h" 20 #include "chrome/browser/webdata/web_database.h"
21 #include "net/base/escape.h" 21 #include "net/base/escape.h"
22 22
23 using base::TimeTicks; 23 using base::TimeTicks;
24 24
25 namespace browser_sync { 25 namespace browser_sync {
(...skipping 512 matching lines...) Expand 10 before | Expand all | Expand 10 after
538 diff = MergeField2(p, COMPANY_NAME, s.company_name()) || diff; 538 diff = MergeField2(p, COMPANY_NAME, s.company_name()) || diff;
539 diff = MergeField2(p, PHONE_FAX_WHOLE_NUMBER, s.phone_fax_whole_number()) 539 diff = MergeField2(p, PHONE_FAX_WHOLE_NUMBER, s.phone_fax_whole_number())
540 || diff; 540 || diff;
541 diff = MergeField2(p, PHONE_HOME_WHOLE_NUMBER, s.phone_home_whole_number()) 541 diff = MergeField2(p, PHONE_HOME_WHOLE_NUMBER, s.phone_home_whole_number())
542 || diff; 542 || diff;
543 return diff; 543 return diff;
544 } 544 }
545 545
546 } // namespace browser_sync 546 } // namespace browser_sync
547 547
OLDNEW
« no previous file with comments | « chrome/browser/sync/glue/autofill_model_associator.cc ('k') | chrome/browser/sync/glue/bookmark_change_processor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698