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

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

Issue 8919021: [Sync] Rename ModelEnumSet to ModelTypeSet (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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
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/theme_model_associator.h" 5 #include "chrome/browser/sync/glue/theme_model_associator.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 } 96 }
97 // The sync model has user created nodes iff the themes folder has 97 // The sync model has user created nodes iff the themes folder has
98 // any children. 98 // any children.
99 *has_nodes = root.HasChildren(); 99 *has_nodes = root.HasChildren();
100 return true; 100 return true;
101 } 101 }
102 102
103 bool ThemeModelAssociator::CryptoReadyIfNecessary() { 103 bool ThemeModelAssociator::CryptoReadyIfNecessary() {
104 // We only access the cryptographer while holding a transaction. 104 // We only access the cryptographer while holding a transaction.
105 sync_api::ReadTransaction trans(FROM_HERE, sync_service_->GetUserShare()); 105 sync_api::ReadTransaction trans(FROM_HERE, sync_service_->GetUserShare());
106 const syncable::ModelEnumSet encrypted_types = 106 const syncable::ModelTypeSet encrypted_types =
107 sync_api::GetEncryptedTypes(&trans); 107 sync_api::GetEncryptedTypes(&trans);
108 return !encrypted_types.Has(syncable::THEMES) || 108 return !encrypted_types.Has(syncable::THEMES) ||
109 sync_service_->IsCryptographerReady(&trans); 109 sync_service_->IsCryptographerReady(&trans);
110 } 110 }
111 111
112 } // namespace browser_sync 112 } // namespace browser_sync
OLDNEW
« no previous file with comments | « chrome/browser/sync/glue/sync_backend_registrar_unittest.cc ('k') | chrome/browser/sync/glue/typed_url_model_associator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698