[NTP4] Auto-deletion of empty apps panes.

chrome/browser/ui/webui/ntp/app_launcher_handler.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_NTP_APP_LAUNCHER_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_NTP_APP_LAUNCHER_HANDLER_H_
 #pragma once
 
 #include <string>
 
@@ skipping 47 matching lines @@
   void FillAppDictionary(base::DictionaryValue* value);
 
   // Create a dictionary value for the given extension. May return NULL, e.g. if
   // the given extension is not an app. If non-NULL, the caller assumes
   // ownership of the pointer.
   base::DictionaryValue* GetAppInfo(const Extension* extension);
 
   // Populate the given dictionary with the web store promo content.
   void FillPromoDictionary(base::DictionaryValue* value);
 
+  // Callback for the "deleteAppsPage" message. Takes a page index as the first
+  // and only argument.
+  void HandleDeleteAppsPage(const base::ListValue* args);
+
   // Callback for the "getApps" message.
   void HandleGetApps(const base::ListValue* args);
 
   // Callback for the "launchApp" message.
   void HandleLaunchApp(const base::ListValue* args);
 
   // Callback for the "setLaunchType" message.
   void HandleSetLaunchType(const base::ListValue* args);
 
   // Callback for the "uninstallApp" message.
   void HandleUninstallApp(const base::ListValue* args);
 
   // Callback for the "hideAppPromo" message.
   void HandleHideAppsPromo(const base::ListValue* args);
 
   // Callback for the "createAppShortcut" message.
   void HandleCreateAppShortcut(const base::ListValue* args);
 
   // Callback for the "reorderApps" message.
   void HandleReorderApps(const base::ListValue* args);
 
   // Callback for the "setPageIndex" message.
   void HandleSetPageIndex(const base::ListValue* args);
 
   // Callback for the "promoSeen" message.
   void HandlePromoSeen(const base::ListValue* args);
 
   // Callback for the "saveAppPageName" message.

[csilv, 2011/12/02 01:57:02]

"saveAppsPageName" in comment

[Dan Beam, 2011/12/05 18:05:10]

Done.

-  void HandleSaveAppPageName(const base::ListValue* args);
+  void HandleSaveAppsPageName(const base::ListValue* args);
 
   // Callback for the "generateAppForLink" message.
   void HandleGenerateAppForLink(const base::ListValue* args);
 
   // Callback for the "recordAppLaunchByURL" message. Takes an escaped URL and a
   // launch source (integer), and if the URL represents an app, records the
   // action for UMA.
   void HandleRecordAppLaunchByURL(const base::ListValue* args);
 
   // Callback for "closeNotification" message.
   void HandleNotificationClose(const base::ListValue* args);
 
   // Register app launcher preferences.
   static void RegisterUserPrefs(PrefService* pref_service);
 
  private:
   struct AppInstallInfo {
     bool is_bookmark_app;
     string16 title;
     GURL app_url;
     int page_index;
   };
 
+  // Removes pages with no apps when loading from saved preferences. Does its
+  // best to avoid messing up save apps page names in the process.
+  void CondenseAppsPages();
+
+  // Deletes a range of empty apps pages.
+  void DeleteAppsPageRange(const size_t index, const size_t howmany);
+
+  // Make sure that the app has a valid page index before we do anything with
+  // this data.
+  static void EnsureAppHasPageIndex(ExtensionService* service,
+                                    const std::string& id);
+
+  // Return the number apps that have the given |page_index|.
+  int GetNumberOfAppsOnPage(const int page_index) const;
+
   // Records a web store launch in the appropriate histograms. |promo_active|
   // specifies if the web store promotion was active.
   static void RecordWebStoreLaunch(bool promo_active);
 
   // Records an app launch in the corresponding |bucket| of the app launch
   // histogram. |promo_active| specifies if the web store promotion was active.
   static void RecordAppLaunchByID(extension_misc::AppLaunchBucket bucket);
 
   // Records an app launch in the corresponding |bucket| of the app launch
   // histogram if the |escaped_url| corresponds to an installed app.
@@ skipping 59 matching lines @@
   bool attempted_bookmark_app_install_;
 
   // True if we have executed HandleGetApps() at least once.
   bool has_loaded_apps_;
 
   // The ID of the app to be highlighted on the NTP (i.e. shown on the page
   // and pulsed). This is done for new installs. The actual higlighting occurs
   // when the app is added to the page (via getAppsCallback or appAdded).
   std::string highlight_app_id_;
 
+  // Used to determine if the current instance of AppLauncherHandler called
+  // ExtensionUninstallAccepted(). If the current one was the one that called
+  // this, we use this value to animate the removal on the attached NTP.
+  bool uninstall_from_page_;
+
   // Hold state for favicon requests.
   CancelableRequestConsumerTSimple<AppInstallInfo*> favicon_consumer_;
 
   DISALLOW_COPY_AND_ASSIGN(AppLauncherHandler);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_NTP_APP_LAUNCHER_HANDLER_H_