Make the Chrome Web Store Icon Syncable

chrome/browser/extensions/extension_service.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/browser/extensions/extension_service.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/basictypes.h"
@@ skipping 1555 matching lines @@
     return true;
 
   // Check the prefs.
   return extension_prefs_->IsIncognitoEnabled(extension_id);
 }
 
 void ExtensionService::SetIsIncognitoEnabled(
     const std::string& extension_id, bool enabled) {
   const Extension* extension = GetInstalledExtension(extension_id);
   if (extension && extension->location() == Extension::COMPONENT) {
-    // This shouldn't be called for component extensions.
-    NOTREACHED();
+    // This shouldn't be called for component extensions other than the
+    // web store (which is considered an app, and may try to set this value).
+    DCHECK_EQ(extension_id, std::string(extension_misc::kWebStoreAppId));

[Aaron Boodman, 2012/02/08 18:23:28]

Can't this just be:

DCHECK(extension->IsSyncable())

That's more self-documenting anyway. 

[csharp, 2012/02/08 20:02:26]

Done.

+
+    // If we are here with the CWS, make sure the we aren't trying to
+    // change it.
+    DCHECK_EQ(enabled, IsIncognitoEnabled(extension_id));
+
     return;
   }
 
   // Broadcast unloaded and loaded events to update browser state. Only bother
   // if the value changed and the extension is actually enabled, since there is
   // no UI otherwise.
   bool old_enabled = extension_prefs_->IsIncognitoEnabled(extension_id);
   if (enabled == old_enabled)
     return;
 
@@ skipping 455 matching lines @@
     // disabled extension for other reasons other than that an update was
     // disabled, e.g. as in ExtensionManagementTest.InstallRequiresConfirm.
     content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_EXTENSION_UPDATE_DISABLED,
         content::Source<Profile>(profile_),
         content::Details<const Extension>(extension));
     SyncExtensionChangeIfNeeded(*extension);
     return;
   }
 
+  // All apps will appear on the NTP and are ordered by their ordinals so we
+  // must ensure they have valid ordinals.
+  if (extension->is_app()) {

[Aaron Boodman, 2012/02/08 18:23:28]

But you just said this isn't true. Will it be bad to give cloud print an
ordinal?

[csharp, 2012/02/08 20:02:26]

Changing to only do if the extension Should display in the launcher.

+    ExtensionSorting* extension_sorting = extension_prefs_->extension_sorting();
+
+    StringOrdinal page_ordinal =
+        extension_sorting->GetPageOrdinal(extension->id());
+    if (!page_ordinal.IsValid()) {
+      page_ordinal = extension->id() == extension_misc::kWebStoreAppId ?

[akalin, 2012/02/08 18:27:43]

add a comment explaining the special cases for the web store icon

[csharp, 2012/02/08 20:02:26]

Done.

+          extension_sorting->CreateFirstAppPageOrdinal() :
+          extension_sorting->GetNaturalAppPageOrdinal();
+      extension_sorting->SetPageOrdinal(extension->id(), page_ordinal);
+    }
+
+    StringOrdinal app_launch_ordinal =
+        extension_sorting->GetAppLaunchOrdinal(extension->id());
+    if (!app_launch_ordinal.IsValid()) {
+      app_launch_ordinal = extension->id() == extension_misc::kWebStoreAppId ?
+          extension_sorting->CreateFirstAppLaunchOrdinal(page_ordinal) :
+          extension_sorting->CreateNextAppLaunchOrdinal(page_ordinal);
+      extension_sorting->SetAppLaunchOrdinal(extension->id(),
+                                             app_launch_ordinal);
+    }
+  }
+
   extensions_.Insert(scoped_extension);
   SyncExtensionChangeIfNeeded(*extension);
   NotifyExtensionLoaded(extension);
 }
 
 void ExtensionService::InitializePermissions(const Extension* extension) {
   // If the extension has used the optional permissions API, it will have a
   // custom set of active permissions defined in the extension prefs. Here,
   // we update the extension's active permissions based on the prefs.
   scoped_refptr<ExtensionPermissionSet> active_permissions =
@@ skipping 629 matching lines @@
   //
   // To coexist with certain unit tests that don't have an IO thread message
   // loop available at ExtensionService shutdown, we lazy-initialize this
   // object so that those cases neither create nor destroy a SocketController.
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (!socket_controller_) {
     socket_controller_ = new extensions::SocketController();
   }
   return socket_controller_;
 }