chrome/browser/sync/glue/autofill_model_associator.cc - Issue 5270010: Revert 67662 - FBTF: Remove unneeded headers from base/ (part 10)...

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

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

Issue 5270010: Revert 67662 - FBTF: Remove unneeded headers from base/ (part 10)... (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

« no previous file with comments | « chrome/browser/speech/endpointer/endpointer_unittest.cc ('k') | chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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_associator.h"	5 #include "chrome/browser/sync/glue/autofill_model_associator.h"

6	6

7 #include <vector>	7 #include <vector>

8	8

	9 #include "base/task.h"

9 #include "base/time.h"	10 #include "base/time.h"

10 #include "base/string_number_conversions.h"	11 #include "base/string_number_conversions.h"

11 #include "base/utf_string_conversions.h"	12 #include "base/utf_string_conversions.h"

12 #include "chrome/browser/autofill/autofill_profile.h"	13 #include "chrome/browser/autofill/autofill_profile.h"

13 #include "chrome/browser/browser_thread.h"	14 #include "chrome/browser/browser_thread.h"

14 #include "chrome/browser/guid.h"	15 #include "chrome/browser/guid.h"

15 #include "chrome/browser/profile.h"	16 #include "chrome/browser/profile.h"

16 #include "chrome/browser/sync/engine/syncapi.h"	17 #include "chrome/browser/sync/engine/syncapi.h"

17 #include "chrome/browser/sync/glue/autofill_change_processor.h"	18 #include "chrome/browser/sync/glue/autofill_change_processor.h"

18 #include "chrome/browser/sync/profile_sync_service.h"	19 #include "chrome/browser/sync/profile_sync_service.h"

(...skipping 487 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
506 diff = MergeField(p, PHONE_HOME_WHOLE_NUMBER, s.phone_home_whole_number())	507 diff = MergeField(p, PHONE_HOME_WHOLE_NUMBER, s.phone_home_whole_number())

507 \|\| diff;	508 \|\| diff;

508 return diff;	509 return diff;

509 }	510 }

510	511

511 bool AutofillModelAssociator::HasNotMigratedYet() {	512 bool AutofillModelAssociator::HasNotMigratedYet() {

512 return true;	513 return true;

513 }	514 }

514	515

515 } // namespace browser_sync	516 } // namespace browser_sync

OLD	NEW