Make the Chrome Web Store Icon Syncable

chrome/browser/extensions/pending_extension_manager.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 "base/logging.h"
 #include "base/stl_util.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/pending_extension_manager.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 43 matching lines @@
     PendingExtensionInfo::ShouldAllowInstallPredicate should_allow_install,
     bool install_silently) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (service_.GetInstalledExtension(id)) {
     LOG(ERROR) << "Trying to add pending extension " << id
                << " which already exists";
     return false;
   }
 
+  // Make sure we don't ever try to install the CWS app, because even though
+  // it is listed as a syncable app (because it values need to be synced) it
+  // should already be installed on every instance.
+  if (extension_misc::kWebStoreAppId == id) {

[akalin, 2012/02/03 01:44:43]

flip argument order

[csharp, 2012/02/03 14:57:04]

Done.

+    NOTREACHED();
+    return false;
+  }
+
   const bool kIsFromSync = true;
   const Extension::Location kSyncLocation = Extension::INTERNAL;
 
   return AddExtensionImpl(id, update_url, should_allow_install,
                           kIsFromSync, install_silently, kSyncLocation);
 }
 
 bool PendingExtensionManager::AddFromExternalUpdateUrl(
     const std::string& id, const GURL& update_url,
     Extension::Location location) {
@@ skipping 113 matching lines @@
     return true;
   }
   return false;
 }
 
 void PendingExtensionManager::AddForTesting(
     const std::string& id,
     const PendingExtensionInfo& pending_extension_info) {
   pending_extension_map_[id] = pending_extension_info;
 }