Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3964)

Unified Diff: chrome/browser/extensions/pending_extension_manager.cc

Issue 9340007: Make the Chrome Web Store Icon Syncable (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Responding to Comments Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/pending_extension_manager.cc
diff --git a/chrome/browser/extensions/pending_extension_manager.cc b/chrome/browser/extensions/pending_extension_manager.cc
index 19c1380be354cccfeca0d9e5d020a8a0fcaf6c5f..85e5705c51cc1d1478f3a48a1bcbc74ceaac6c29 100644
--- a/chrome/browser/extensions/pending_extension_manager.cc
+++ b/chrome/browser/extensions/pending_extension_manager.cc
@@ -61,6 +61,14 @@ bool PendingExtensionManager::AddFromSync(
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 its values need to be synced) it
+ // should already be installed on every instance.
+ if (id == extension_misc::kWebStoreAppId) {
+ NOTREACHED();
+ return false;
+ }
+
const bool kIsFromSync = true;
const Extension::Location kSyncLocation = Extension::INTERNAL;

Powered by Google App Engine
This is Rietveld 408576698