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

Unified Diff: chrome/browser/ui/webui/sync_setup_handler.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/ui/webui/sync_setup_handler.cc
diff --git a/chrome/browser/ui/webui/sync_setup_handler.cc b/chrome/browser/ui/webui/sync_setup_handler.cc
index 7a7d34e8836636538239b46853a990aba5aa3e81..e6dca55f7350c607f48ab1b43cb80661af99243e 100644
--- a/chrome/browser/ui/webui/sync_setup_handler.cc
+++ b/chrome/browser/ui/webui/sync_setup_handler.cc
@@ -51,7 +51,7 @@ struct SyncConfigInfo {
bool encrypt_all;
bool sync_everything;
- syncable::ModelTypeSet data_types;
+ syncer::ModelTypeSet data_types;
std::string passphrase;
bool passphrase_is_gaia;
};
@@ -76,16 +76,16 @@ const char* kDataTypeNames[] = {
"typedUrls"
};
-const syncable::ModelType kDataTypes[] = {
- syncable::APPS,
- syncable::AUTOFILL,
- syncable::BOOKMARKS,
- syncable::EXTENSIONS,
- syncable::PASSWORDS,
- syncable::PREFERENCES,
- syncable::SESSIONS,
- syncable::THEMES,
- syncable::TYPED_URLS
+const syncer::ModelType kDataTypes[] = {
+ syncer::APPS,
+ syncer::AUTOFILL,
+ syncer::BOOKMARKS,
+ syncer::EXTENSIONS,
+ syncer::PASSWORDS,
+ syncer::PREFERENCES,
+ syncer::SESSIONS,
+ syncer::THEMES,
+ syncer::TYPED_URLS
};
static const size_t kNumDataTypes = arraysize(kDataTypes);
@@ -400,9 +400,9 @@ void SyncSetupHandler::DisplayConfigureSync(bool show_advanced,
DictionaryValue args;
// Tell the UI layer which data types are registered/enabled by the user.
- const syncable::ModelTypeSet registered_types =
+ const syncer::ModelTypeSet registered_types =
service->GetRegisteredDataTypes();
- const syncable::ModelTypeSet preferred_types =
+ const syncer::ModelTypeSet preferred_types =
service->GetPreferredDataTypes();
for (size_t i = 0; i < kNumDataTypes; ++i) {
const std::string key_name = kDataTypeNames[i];
« no previous file with comments | « chrome/browser/ui/webui/sync_promo/sync_promo_handler.cc ('k') | chrome/browser/ui/webui/sync_setup_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698