ntp4: default to 18 apps per page for new installs

chrome/browser/extensions/extension_service.cc

Index: chrome/browser/extensions/extension_service.cc
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index d238fdea241180dbd039c2f98027c805ef6dfcf2..89d41fa053168f89f9ed8c822006ddd773d81eca 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -199,7 +199,7 @@ void SimpleExtensionLoadPrompt::ShowPrompt() {
 void SimpleExtensionLoadPrompt::InstallUIProceed() {
   if (extension_service_.get())
     extension_service_->OnExtensionInstalled(
-        extension_, false, 0);  // Not from web store.
+        extension_, false, -1);  // Not from web store.
   delete this;
 }
 
@@ -2230,6 +2230,15 @@ void ExtensionService::AddExtension(const Extension* extension) {
     return;
   }
 
+  // Unfortunately, we used to set app launcher indices for non-apps. If this
+  // extension has an index (page or in-page), set it to -1.

[Matt Perry, 2011/08/25 17:59:35]

out of curiosity, why do we care whether a non-app has a page or in-page index?

[Evan Stade, 2011/08/25 18:50:49]

because we need to be able to count the number of apps on a given page. We could
leave out the extensions when counting apps per page, but AFAICT ExtensionPrefs
doesn't have a way of knowing whether a given extension is an app. If there's
something I'm missing I'll happily change this.

[Matt Perry, 2011/08/25 18:52:03]

I see. Makes sense. Thanks for the explanation.

+  if (!extension->is_app()) {
+    if (extension_prefs_->GetAppLaunchIndex(extension->id()) != -1)
+      extension_prefs_->SetAppLaunchIndex(extension->id(), -1);
+    if (extension_prefs_->GetPageIndex(extension->id()) != -1)
+      extension_prefs_->SetPageIndex(extension->id(), -1);
+  }
+
   extensions_.push_back(scoped_extension);
   SyncExtensionChangeIfNeeded(*extension);
   NotifyExtensionLoaded(extension);
@@ -2363,7 +2372,7 @@ void ExtensionService::OnLoadSingleExtension(const Extension* extension,
     prompt->ShowPrompt();
     return;  // continues in SimpleExtensionLoadPrompt::InstallUI*
   }
-  OnExtensionInstalled(extension, false, 0);  // Not from web store.
+  OnExtensionInstalled(extension, false, -1);  // Not from web store.
 }
 
 void ExtensionService::OnExtensionInstalled(