chrome/browser/sync/glue/app_model_associator.cc - Issue 7634030: Revert 96573 - sync: more DEPS fun

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/app_model_associator.cc

Issue 7634030: Revert 96573 - sync: more DEPS fun (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 4 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/sync/glue/DEPS ('k') | chrome/browser/sync/glue/bookmark_model_associator.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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/app_model_associator.h"	5 #include "chrome/browser/sync/glue/app_model_associator.h"

6	6

7 #include "base/logging.h"	7 #include "base/logging.h"

8 #include "base/tracked.h"	8 #include "base/tracked.h"

9 #include "chrome/browser/extensions/extension_sync_data.h"	9 #include "chrome/browser/extensions/extension_sync_data.h"

10 #include "chrome/browser/sync/api/sync_error.h"	10 #include "chrome/browser/sync/api/sync_error.h"

	11 #include "chrome/browser/sync/engine/nigori_util.h"

11 #include "chrome/browser/sync/engine/syncapi.h"	12 #include "chrome/browser/sync/engine/syncapi.h"

12 #include "chrome/browser/sync/glue/extension_sync_traits.h"	13 #include "chrome/browser/sync/glue/extension_sync_traits.h"

13 #include "chrome/browser/sync/glue/extension_sync.h"	14 #include "chrome/browser/sync/glue/extension_sync.h"

14 #include "chrome/browser/sync/profile_sync_service.h"	15 #include "chrome/browser/sync/profile_sync_service.h"

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

16 #include "content/browser/browser_thread.h"	17 #include "content/browser/browser_thread.h"

17	18

18 namespace browser_sync {	19 namespace browser_sync {

19	20

20 AppModelAssociator::AppModelAssociator(	21 AppModelAssociator::AppModelAssociator(

(...skipping 46 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
67 bool AppModelAssociator::CryptoReadyIfNecessary() {	68 bool AppModelAssociator::CryptoReadyIfNecessary() {

68 // We only access the cryptographer while holding a transaction.	69 // We only access the cryptographer while holding a transaction.

69 sync_api::ReadTransaction trans(FROM_HERE, user_share_);	70 sync_api::ReadTransaction trans(FROM_HERE, user_share_);

70 const syncable::ModelTypeSet& encrypted_types =	71 const syncable::ModelTypeSet& encrypted_types =

71 sync_api::GetEncryptedTypes(&trans);	72 sync_api::GetEncryptedTypes(&trans);

72 return encrypted_types.count(traits_.model_type) == 0 \|\|	73 return encrypted_types.count(traits_.model_type) == 0 \|\|

73 trans.GetCryptographer()->is_ready();	74 trans.GetCryptographer()->is_ready();

74 }	75 }

75	76

76 } // namespace browser_sync	77 } // namespace browser_sync

OLD	NEW