chrome/browser/sync/syncable/model_type.cc - Issue 2828021: Take 2: sync changes to support encryption

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/syncable/model_type.cc

Issue 2828021: Take 2: sync changes to support encryption (Closed)

Patch Set: fix flaky password test under valgrind Created 10 years, 6 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 unified diff | Download patch

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/syncable/model_type.h"	5 #include "chrome/browser/sync/syncable/model_type.h"

6	6

7 #include "chrome/browser/sync/engine/syncproto.h"	7 #include "chrome/browser/sync/engine/syncproto.h"

8 #include "chrome/browser/sync/protocol/autofill_specifics.pb.h"	8 #include "chrome/browser/sync/protocol/autofill_specifics.pb.h"

9 #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h"	9 #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h"

10 #include "chrome/browser/sync/protocol/extension_specifics.pb.h"	10 #include "chrome/browser/sync/protocol/extension_specifics.pb.h"

(...skipping 104 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
115 case PREFERENCES:	115 case PREFERENCES:

116 return "Preferences";	116 return "Preferences";

117 case AUTOFILL:	117 case AUTOFILL:

118 return "Autofill";	118 return "Autofill";

119 case THEMES:	119 case THEMES:

120 return "Themes";	120 return "Themes";

121 case TYPED_URLS:	121 case TYPED_URLS:

122 return "Typed URLs";	122 return "Typed URLs";

123 case EXTENSIONS:	123 case EXTENSIONS:

124 return "Extensions";	124 return "Extensions";

	125 case PASSWORDS:

	126 return "Passwords";

	127 case NIGORI:

	128 return "Encryption keys";

125 default:	129 default:

126 NOTREACHED() << "No known extension for model type.";	130 NOTREACHED() << "No known extension for model type.";

127 return "INVALID";	131 return "INVALID";

128 }	132 }

129 }	133 }

130	134

131 } // namespace syncable	135 } // namespace syncable

OLD	NEW

« no previous file with comments | « chrome/browser/sync/syncable/directory_manager.cc ('k') | chrome/browser/sync/util/cryptographer.h » ('j') | no next file with comments »