From 50736a1f2b006d294baaf1f125bb453719b58c88 Mon Sep 17 00:00:00 2001 From: "koz@chromium.org" Date: Thu, 26 Sep 2013 08:58:34 +0000 Subject: Handle launching disabled platform apps from the command line. In the case where an app has upgraded itself it will prompt the user to re-enable it, otherwise it will silently enable it. BUG=269281 Review URL: https://codereview.chromium.org/23058007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225409 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/extensions/extension_sync_bundle.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'chrome/browser/extensions/extension_sync_bundle.h') diff --git a/chrome/browser/extensions/extension_sync_bundle.h b/chrome/browser/extensions/extension_sync_bundle.h index d9fdb4b..dab36a2 100644 --- a/chrome/browser/extensions/extension_sync_bundle.h +++ b/chrome/browser/extensions/extension_sync_bundle.h @@ -13,6 +13,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/extensions/extension_sync_data.h" +#include "chrome/browser/extensions/sync_bundle.h" #include "sync/api/syncable_service.h" class ExtensionService; @@ -28,10 +29,10 @@ namespace extensions { class Extension; // Bundle of extension specific sync stuff. -class ExtensionSyncBundle { +class ExtensionSyncBundle : public SyncBundle { public: explicit ExtensionSyncBundle(ExtensionService* extension_service); - ~ExtensionSyncBundle(); + virtual ~ExtensionSyncBundle(); // Setup this bundle to be sync extension data. void SetupSync(syncer::SyncChangeProcessor* sync_processor, @@ -58,9 +59,6 @@ class ExtensionSyncBundle { // Process the given sync change and apply it. void ProcessSyncChange(ExtensionSyncData extension_sync_data); - // Sync a newly-installed extension or change an existing one. - void SyncChangeIfNeeded(const Extension& extension); - // Process the list of sync changes. void ProcessSyncChangeList(syncer::SyncChangeList sync_change_list); @@ -80,8 +78,12 @@ class ExtensionSyncBundle { const ExtensionSet& extensions, std::vector* sync_data_list) const; + // Overrides for SyncBundle. // Returns true if SetupSync has been called, false otherwise. - bool IsSyncing() const; + virtual bool IsSyncing() const OVERRIDE; + + // Sync a newly-installed extension or change an existing one. + virtual void SyncChangeIfNeeded(const Extension& extension) OVERRIDE; private: // Add a synced extension. -- cgit v1.1