Make the Chrome Web Store Icon Syncable

chrome/common/extensions/extension.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/extensions/extension.h"
 
 #include <algorithm>
 
 #include "base/base64.h"
 #include "base/basictypes.h"
@@ skipping 2953 matching lines @@
   origin_only_pattern.SetHost(origin.host());
   origin_only_pattern.SetPath("/*");
 
   URLPatternSet origin_only_pattern_list;
   origin_only_pattern_list.AddPattern(origin_only_pattern);
 
   return web_extent().OverlapsWith(origin_only_pattern_list);
 }
 
 Extension::SyncType Extension::GetSyncType() const {
-  // TODO(akalin): Figure out if we need to allow some other types.
-  if (location() != Extension::INTERNAL) {
+  if (!IsSyncable()) {
     // We have a non-standard location.
     return SYNC_TYPE_NONE;
   }
 
   // Disallow extensions with non-gallery auto-update URLs for now.
   //
   // TODO(akalin): Relax this restriction once we've put in UI to
   // approve synced extensions.
   if (!update_url().is_empty() && !UpdatesFromGallery())
     return SYNC_TYPE_NONE;
@@ skipping 19 matching lines @@
 
     case Extension::TYPE_HOSTED_APP:
     case Extension::TYPE_PACKAGED_APP:
         return SYNC_TYPE_APP;
 
     default:
       return SYNC_TYPE_NONE;
   }
 }
 
+bool Extension::IsSyncable() const {
+  // TODO(akalin): Figure out if we need to allow some other types.
+
+  // We want to sync any extensions that are shown in the luancher because
+  // their positions should sync.
+  return location_ == Extension::INTERNAL ||
+      ShouldDisplayInLauncher();
+
+}
+
+bool Extension::ShouldDisplayInLauncher() const {
+  // The CWS needs to be treated as syncable app because it appears on the NTP
+  // and we need to make sure its position values are synced.
+  // If another case arises where we need to have a special case like the CWS,
+  // something more systematic should be done.
+  return location_ == Extension::INTERNAL ||
+      id() == extension_misc::kWebStoreAppId;
+}
+
 ExtensionInfo::ExtensionInfo(const DictionaryValue* manifest,
                              const std::string& id,
                              const FilePath& path,
                              Extension::Location location)
     : extension_id(id),
       extension_path(path),
       extension_location(location) {
   if (manifest)
     extension_manifest.reset(manifest->DeepCopy());
 }
@@ skipping 22 matching lines @@
     already_disabled(false),
     extension(extension) {}
 
 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo(
     const Extension* extension,
     const ExtensionPermissionSet* permissions,
     Reason reason)
     : reason(reason),
       extension(extension),
       permissions(permissions) {}