summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/app_sync_data.h
diff options
context:
space:
mode:
authorcalamity@chromium.org <calamity@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-10 06:48:36 +0000
committercalamity@chromium.org <calamity@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-10 06:48:36 +0000
commita9f74a6b78ecfb8f868d19d99e43a5679bb95ad4 (patch)
tree2d51f251c016ad809bd225771e8e90129779abde /chrome/browser/extensions/app_sync_data.h
parent9eedbeeee1feeb6a3bbdae8826f21822835f9b30 (diff)
downloadchromium_src-a9f74a6b78ecfb8f868d19d99e43a5679bb95ad4.zip
chromium_src-a9f74a6b78ecfb8f868d19d99e43a5679bb95ad4.tar.gz
chromium_src-a9f74a6b78ecfb8f868d19d99e43a5679bb95ad4.tar.bz2
Sync the launch type pref for apps.
This CL syncs the launch type pref for apps by adding a property to app_specifics.proto. The sync data is processed in ExtensionSyncService. extensions::SetLaunchType has been changed to take an ExtensionService so that it is able to sync the pref change when a launch type is updated. A value has been added to the LaunchType enum to represent an invalid launch type preference. BUG=181576 TBR=sky@chromium.org Review URL: https://codereview.chromium.org/93883004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244112 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/app_sync_data.h')
-rw-r--r--chrome/browser/extensions/app_sync_data.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/extensions/app_sync_data.h b/chrome/browser/extensions/app_sync_data.h
index 0d2c67f..2e34460 100644
--- a/chrome/browser/extensions/app_sync_data.h
+++ b/chrome/browser/extensions/app_sync_data.h
@@ -6,6 +6,7 @@
#define CHROME_BROWSER_EXTENSIONS_APP_SYNC_DATA_H_
#include "chrome/browser/extensions/extension_sync_data.h"
+#include "chrome/common/extensions/extension_constants.h"
#include "sync/api/string_ordinal.h"
#include "sync/api/sync_change.h"
@@ -32,7 +33,8 @@ class AppSyncData {
bool enabled,
bool incognito_enabled,
const syncer::StringOrdinal& app_launch_ordinal,
- const syncer::StringOrdinal& page_ordinal);
+ const syncer::StringOrdinal& page_ordinal,
+ extensions::LaunchType launch_type);
~AppSyncData();
// Retrive sync data from this class.
@@ -55,6 +57,10 @@ class AppSyncData {
return extension_sync_data_;
}
+ extensions::LaunchType launch_type() const {
+ return launch_type_;
+ }
+
private:
// Convert an AppSyncData back out to a sync structure.
void PopulateAppSpecifics(sync_pb::AppSpecifics* specifics) const;
@@ -67,6 +73,7 @@ class AppSyncData {
ExtensionSyncData extension_sync_data_;
syncer::StringOrdinal app_launch_ordinal_;
syncer::StringOrdinal page_ordinal_;
+ extensions::LaunchType launch_type_;
};
} // namespace extensions