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

Unified Diff: chrome/browser/sync/glue/theme_model_associator.cc

Issue 10696087: [Sync] Move ModelType and related classes to 'syncer' namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort headers, update copyrights Created 8 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/glue/theme_model_associator.cc
diff --git a/chrome/browser/sync/glue/theme_model_associator.cc b/chrome/browser/sync/glue/theme_model_associator.cc
index e1210db2ccbae8f34162922a7a696adeb9c1bb9e..2c6dd3c9ad0717a2d71cf8a6568e00a1ac422597 100644
--- a/chrome/browser/sync/glue/theme_model_associator.cc
+++ b/chrome/browser/sync/glue/theme_model_associator.cc
@@ -55,7 +55,7 @@ syncer::SyncError ThemeModelAssociator::AssociateModels() {
// TODO(akalin): When we have timestamps, we may want to do
// something more intelligent than preferring the sync data over our
// local data.
- if (node.InitByClientTagLookup(syncable::THEMES, kCurrentThemeClientTag) ==
+ if (node.InitByClientTagLookup(syncer::THEMES, kCurrentThemeClientTag) ==
syncer::BaseNode::INIT_OK) {
// Update the current theme from the sync data.
// TODO(akalin): If the sync data does not have
@@ -69,7 +69,7 @@ syncer::SyncError ThemeModelAssociator::AssociateModels() {
// Set the sync data from the current theme.
syncer::WriteNode node(&trans);
syncer::WriteNode::InitUniqueByCreationResult result =
- node.InitUniqueByCreation(syncable::THEMES, root,
+ node.InitUniqueByCreation(syncer::THEMES, root,
kCurrentThemeClientTag);
if (result != syncer::WriteNode::INIT_SUCCESS) {
return error_handler_->CreateAndUploadError(
@@ -109,9 +109,9 @@ bool ThemeModelAssociator::SyncModelHasUserCreatedNodes(bool* has_nodes) {
bool ThemeModelAssociator::CryptoReadyIfNecessary() {
// We only access the cryptographer while holding a transaction.
syncer::ReadTransaction trans(FROM_HERE, sync_service_->GetUserShare());
- const syncable::ModelTypeSet encrypted_types =
+ const syncer::ModelTypeSet encrypted_types =
syncer::GetEncryptedTypes(&trans);
- return !encrypted_types.Has(syncable::THEMES) ||
+ return !encrypted_types.Has(syncer::THEMES) ||
sync_service_->IsCryptographerReady(&trans);
}
« no previous file with comments | « chrome/browser/sync/glue/theme_model_associator.h ('k') | chrome/browser/sync/glue/typed_url_change_processor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698