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

Unified Diff: chrome/browser/sync/syncable/model_type.cc

Issue 8753003: Let NotificationTypeToRealModelType() handle APP_SETTINGS correctly. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/syncable/model_type.cc
diff --git a/chrome/browser/sync/syncable/model_type.cc b/chrome/browser/sync/syncable/model_type.cc
index ccce16902e180eec84b949f16d884e6cf3dadcb4..7029a161ba3bf5d39fff952fe394416e503a0390 100644
--- a/chrome/browser/sync/syncable/model_type.cc
+++ b/chrome/browser/sync/syncable/model_type.cc
@@ -639,15 +639,17 @@ bool NotificationTypeToRealModelType(const std::string& notification_type,
return true;
} else if (notification_type == kAppSettingNotificationType) {
*model_type = APP_SETTINGS;
+ return true;
} else if (notification_type == kExtensionSettingNotificationType) {
*model_type = EXTENSION_SETTINGS;
return true;
} else if (notification_type == kAppNotificationNotificationType) {
*model_type = APP_NOTIFICATIONS;
return true;
+ } else {
+ *model_type = UNSPECIFIED;
+ return false;
}
- *model_type = UNSPECIFIED;
- return false;
}
ModelTypeSet GetAllRealModelTypes() {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698