Revert 114083 - Convert app_launch_index and page_index from int to StringOrdinal.

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>
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/extensions/extension_install_ui.h"
 #include "chrome/browser/extensions/extension_uninstall_dialog.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
-#include "chrome/common/string_ordinal.h"
 #include "content/browser/cancelable_request.h"
 #include "content/browser/webui/web_ui.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 class AppNotification;
 class ExtensionService;
 class PrefChangeRegistrar;
 class Profile;
 
@@ skipping 79 matching lines @@
   void HandleNotificationClose(const base::ListValue* args);
 
   // Callback for "setNotificationsDisabled" message.
   void HandleSetNotificationsDisabled(const base::ListValue* args);
 
   // Register app launcher preferences.
   static void RegisterUserPrefs(PrefService* pref_service);
 
  private:
   struct AppInstallInfo {
-    AppInstallInfo();
-    ~AppInstallInfo();
-
     bool is_bookmark_app;
     string16 title;
     GURL app_url;
-    StringOrdinal page_ordinal;
+    int page_index;
   };
 
   // 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);
 
@@ skipping 68 matching lines @@
   // when the app is added to the page (via getAppsCallback or appAdded).
   std::string highlight_app_id_;
 
   // Hold state for favicon requests.
   CancelableRequestConsumerTSimple<AppInstallInfo*> favicon_consumer_;
 
   DISALLOW_COPY_AND_ASSIGN(AppLauncherHandler);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_NTP_APP_LAUNCHER_HANDLER_H_