diff options
| author | calamity@chromium.org <calamity@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-24 08:42:45 +0000 |
|---|---|---|
| committer | calamity@chromium.org <calamity@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-24 08:42:45 +0000 |
| commit | d93fcd51386a104ce54d9577ae0df8957d310c89 (patch) | |
| tree | 87c1cc7a84c9be138f42f4469693fd66710c681e /sync | |
| parent | c3a86914088b6fd8f03361f71fe3117b8afedceb (diff) | |
| download | chromium_src-d93fcd51386a104ce54d9577ae0df8957d310c89.zip chromium_src-d93fcd51386a104ce54d9577ae0df8957d310c89.tar.gz chromium_src-d93fcd51386a104ce54d9577ae0df8957d310c89.tar.bz2 | |
Implement syncing of bookmark apps.
This CL adds syncing of bookmark apps. This involves syncing two extra fields,
which are the bookmark app url and description. These are not populated for
non-bookmark apps. The bookmark app name is obtained from the extension sync
data's name field.
Bookmark apps that are installled from sync will not have any icon. Updating
the icon and possibly fetching it on sync will be implemented in a future CL.
Bookmark apps that are updated with a new name will keep their icons.
This CL also adds a GetWebApplicationInfoFromBookmarkApp() function that
returns a ready-to-install WebApplicationInfo that is populated with the app's
details and icons.
BUG=318607
Review URL: https://codereview.chromium.org/229553003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265887 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync')
| -rw-r--r-- | sync/protocol/app_specifics.proto | 7 | ||||
| -rw-r--r-- | sync/protocol/extension_specifics.proto | 2 | ||||
| -rw-r--r-- | sync/protocol/proto_value_conversions.cc | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/sync/protocol/app_specifics.proto b/sync/protocol/app_specifics.proto index 374a219..e2f9ef8 100644 --- a/sync/protocol/app_specifics.proto +++ b/sync/protocol/app_specifics.proto @@ -68,4 +68,11 @@ message AppSpecifics { // This describes how the extension should be launched. optional LaunchType launch_type = 5; + + // This is the url of a bookmark app. If this exists, the app is a bookmark + // app. + optional string bookmark_app_url = 6; + + // This is the description of a bookmark app. + optional string bookmark_app_description = 7; } diff --git a/sync/protocol/extension_specifics.proto b/sync/protocol/extension_specifics.proto index e3e1dfb..05120d3 100644 --- a/sync/protocol/extension_specifics.proto +++ b/sync/protocol/extension_specifics.proto @@ -33,7 +33,7 @@ message ExtensionSpecifics { // Whether or not this extension is enabled in incognito mode. optional bool incognito_enabled = 5; - // The name of the extension. Used only for debugging. + // The name of the extension. Used for bookmark apps. optional string name = 6; } diff --git a/sync/protocol/proto_value_conversions.cc b/sync/protocol/proto_value_conversions.cc index 85fd7de..4fb8bdd 100644 --- a/sync/protocol/proto_value_conversions.cc +++ b/sync/protocol/proto_value_conversions.cc @@ -416,6 +416,8 @@ base::DictionaryValue* AppSpecificsToValue( SET_STR(app_launch_ordinal); SET_STR(page_ordinal); SET_ENUM(launch_type, GetLaunchTypeString); + SET_STR(bookmark_app_url); + SET_STR(bookmark_app_description); return value; } |