ntp4: default to 18 apps per page for new installs

chrome/browser/extensions/extension_service.cc

 // Copyright (c) 2011 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 181 matching lines @@
 SimpleExtensionLoadPrompt::~SimpleExtensionLoadPrompt() {
 }
 
 void SimpleExtensionLoadPrompt::ShowPrompt() {
   install_ui_->ConfirmInstall(this, extension_);
 }
 
 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;
 }
 
 void SimpleExtensionLoadPrompt::InstallUIAbort(bool user_initiated) {
   delete this;
 }
 
 }  // namespace
 
 bool ExtensionService::ComponentExtensionInfo::Equals(
@@ skipping 2010 matching lines @@
     // with a disabled extension for other reasons other than that an update was
     // disabled.
     NotificationService::current()->Notify(
         chrome::NOTIFICATION_EXTENSION_UPDATE_DISABLED,
         Source<Profile>(profile_),
         Details<const Extension>(extension));
     SyncExtensionChangeIfNeeded(*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);
 }
 
 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 113 matching lines @@
   // first.
   if (show_extensions_prompts_ && prompt_for_plugins &&
       !extension->plugins().empty() &&
       disabled_extension_paths_.find(extension->id()) ==
           disabled_extension_paths_.end()) {
     SimpleExtensionLoadPrompt* prompt = new SimpleExtensionLoadPrompt(
         profile_, weak_ptr_factory_.GetWeakPtr(), 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(
     const Extension* extension, bool from_webstore, int page_index) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Ensure extension is deleted unless we transfer ownership.
   scoped_refptr<const Extension> scoped_extension(extension);
   const std::string& id = extension->id();
   // Extensions installed by policy can't be disabled. So even if a previous
@@ skipping 435 matching lines @@
 
 ExtensionService::NaClModuleInfoList::iterator
     ExtensionService::FindNaClModule(const GURL& url) {
   for (NaClModuleInfoList::iterator iter = nacl_module_list_.begin();
        iter != nacl_module_list_.end(); ++iter) {
     if (iter->url == url)
       return iter;
   }
   return nacl_module_list_.end();
 }