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

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

Issue 7587009: sync: add DEPS files to subdirs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix include 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
OLDNEW
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/extension_model_associator.h" 5 #include "chrome/browser/sync/glue/extension_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/engine/nigori_util.h"
10 #include "chrome/browser/sync/engine/syncapi.h" 11 #include "chrome/browser/sync/engine/syncapi.h"
11 #include "chrome/browser/sync/glue/extension_sync_traits.h" 12 #include "chrome/browser/sync/glue/extension_sync_traits.h"
12 #include "chrome/browser/sync/glue/extension_sync.h" 13 #include "chrome/browser/sync/glue/extension_sync.h"
13 #include "chrome/browser/sync/profile_sync_service.h" 14 #include "chrome/browser/sync/profile_sync_service.h"
14 #include "chrome/browser/sync/protocol/extension_specifics.pb.h" 15 #include "chrome/browser/sync/protocol/extension_specifics.pb.h"
15 #include "chrome/browser/sync/syncable/nigori_util.h"
16 #include "content/browser/browser_thread.h" 16 #include "content/browser/browser_thread.h"
17 17
18 namespace browser_sync { 18 namespace browser_sync {
19 19
20 ExtensionModelAssociator::ExtensionModelAssociator( 20 ExtensionModelAssociator::ExtensionModelAssociator(
21 ExtensionServiceInterface* extension_service, 21 ExtensionServiceInterface* extension_service,
22 sync_api::UserShare* user_share) 22 sync_api::UserShare* user_share)
23 : traits_(GetExtensionSyncTraits()), 23 : traits_(GetExtensionSyncTraits()),
24 extension_service_(extension_service), 24 extension_service_(extension_service),
25 user_share_(user_share) { 25 user_share_(user_share) {
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 bool ExtensionModelAssociator::CryptoReadyIfNecessary() { 68 bool ExtensionModelAssociator::CryptoReadyIfNecessary() {
69 // We only access the cryptographer while holding a transaction. 69 // We only access the cryptographer while holding a transaction.
70 sync_api::ReadTransaction trans(FROM_HERE, user_share_); 70 sync_api::ReadTransaction trans(FROM_HERE, user_share_);
71 const syncable::ModelTypeSet& encrypted_types = 71 const syncable::ModelTypeSet& encrypted_types =
72 sync_api::GetEncryptedTypes(&trans); 72 sync_api::GetEncryptedTypes(&trans);
73 return encrypted_types.count(traits_.model_type) == 0 || 73 return encrypted_types.count(traits_.model_type) == 0 ||
74 trans.GetCryptographer()->is_ready(); 74 trans.GetCryptographer()->is_ready();
75 } 75 }
76 76
77 } // namespace browser_sync 77 } // namespace browser_sync
OLDNEW
« no previous file with comments | « chrome/browser/sync/glue/bookmark_model_associator.cc ('k') | chrome/browser/sync/glue/generic_change_processor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698