chrome/browser/sync/glue/preference_model_associator.h - Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir.

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/preference_model_associator.h

Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir. (Closed) Base URL: http://src.chromium.org/git/chromium.git

Patch Set: Created 10 years, 3 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 #ifndef CHROME_BROWSER_SYNC_GLUE_PREFERENCE_MODEL_ASSOCIATOR_H_	5 #ifndef CHROME_BROWSER_SYNC_GLUE_PREFERENCE_MODEL_ASSOCIATOR_H_

6 #define CHROME_BROWSER_SYNC_GLUE_PREFERENCE_MODEL_ASSOCIATOR_H_	6 #define CHROME_BROWSER_SYNC_GLUE_PREFERENCE_MODEL_ASSOCIATOR_H_

7 #pragma once	7 #pragma once

8	8

9 #include <map>	9 #include <map>

10 #include <set>	10 #include <set>

11 #include <string>	11 #include <string>

12	12

13 #include "base/basictypes.h"	13 #include "base/basictypes.h"

14 #include "chrome/browser/pref_service.h"	14 #include "chrome/browser/prefs/pref_service.h"

15 #include "chrome/browser/sync/glue/model_associator.h"	15 #include "chrome/browser/sync/glue/model_associator.h"

16 #include "chrome/browser/sync/unrecoverable_error_handler.h"	16 #include "chrome/browser/sync/unrecoverable_error_handler.h"

17	17

18 class ProfileSyncService;	18 class ProfileSyncService;

19 class Value;	19 class Value;

20	20

21 namespace sync_api {	21 namespace sync_api {

22 class WriteNode;	22 class WriteNode;

23 class WriteTransaction;	23 class WriteTransaction;

24 }	24 }

(...skipping 107 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
132	132

133 PreferenceNameToSyncIdMap id_map_;	133 PreferenceNameToSyncIdMap id_map_;

134 SyncIdToPreferenceNameMap id_map_inverse_;	134 SyncIdToPreferenceNameMap id_map_inverse_;

135	135

136 DISALLOW_COPY_AND_ASSIGN(PreferenceModelAssociator);	136 DISALLOW_COPY_AND_ASSIGN(PreferenceModelAssociator);

137 };	137 };

138	138

139 } // namespace browser_sync	139 } // namespace browser_sync

140	140

141 #endif // CHROME_BROWSER_SYNC_GLUE_PREFERENCE_MODEL_ASSOCIATOR_H_	141 #endif // CHROME_BROWSER_SYNC_GLUE_PREFERENCE_MODEL_ASSOCIATOR_H_

OLD	NEW