diff options
| author | petewil@chromium.org <petewil@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-17 22:45:57 +0000 |
|---|---|---|
| committer | petewil@chromium.org <petewil@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-17 22:45:57 +0000 |
| commit | dc66e3f486c4ed4c4a0dd8b30710c2b5c3296042 (patch) | |
| tree | 61cc06bb607cdc16b765cc30b8df470f55f661a8 /sync | |
| parent | 07ec820562e141115b770caa6e7ac92fde184e7a (diff) | |
| download | chromium_src-dc66e3f486c4ed4c4a0dd8b30710c2b5c3296042.zip chromium_src-dc66e3f486c4ed4c4a0dd8b30710c2b5c3296042.tar.gz chromium_src-dc66e3f486c4ed4c4a0dd8b30710c2b5c3296042.tar.bz2 | |
Fix the crash in case the settings_display_name is empty.
Also, add the new fields to the sync node browser, and fall back
to the settings_display_name only if the app_name is not set.
BUG=359177
Review URL: https://codereview.chromium.org/237473004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@264659 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync')
| -rw-r--r-- | sync/protocol/proto_value_conversions.cc | 3 | ||||
| -rw-r--r-- | sync/protocol/synced_notification_app_info_specifics.proto | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/sync/protocol/proto_value_conversions.cc b/sync/protocol/proto_value_conversions.cc index fe6236b..b31efb0 100644 --- a/sync/protocol/proto_value_conversions.cc +++ b/sync/protocol/proto_value_conversions.cc @@ -250,6 +250,9 @@ base::DictionaryValue* SyncedNotificationAppInfoToValue( base::DictionaryValue* value = new base::DictionaryValue(); SET_STR_REP(app_id); SET_STR(settings_display_name); + SET_STR(app_name); + SET_STR(settings_url); + SET_STR(info_url); SET(icon, SyncedNotificationImageToValue); // TODO(petewil): Add fields for the monochrome icon when it is available. return value; diff --git a/sync/protocol/synced_notification_app_info_specifics.proto b/sync/protocol/synced_notification_app_info_specifics.proto index 09726ff..73ed92c 100644 --- a/sync/protocol/synced_notification_app_info_specifics.proto +++ b/sync/protocol/synced_notification_app_info_specifics.proto @@ -53,4 +53,4 @@ message SyncedNotificationAppInfo { // A repeated set of icons of different resolutions and types. repeated Icon app_icon = 7; -}
\ No newline at end of file +} |