Convert app_launch_index and page_index from int to StringOrdinal.

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 184 matching lines @@
 SimpleExtensionLoadPrompt::~SimpleExtensionLoadPrompt() {
 }
 
 void SimpleExtensionLoadPrompt::ShowPrompt() {
   install_ui_->ConfirmInstall(this, extension_);
 }
 
 void SimpleExtensionLoadPrompt::InstallUIProceed() {
   if (extension_service_.get())
     extension_service_->OnExtensionInstalled(
-        extension_, false, -1);  // Not from web store.
+        extension_, false, extension_misc::kUnsetIndex);  // Not from web store.
   delete this;
 }
 
 void SimpleExtensionLoadPrompt::InstallUIAbort(bool user_initiated) {
   delete this;
 }
 
 }  // namespace
 
 bool ExtensionService::ComponentExtensionInfo::Equals(
@@ skipping 2072 matching lines @@
     // 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.
+  // extension has an index (page or in-page), set it to kUnsetIndex.
   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);
+    if (extension_prefs_->GetAppLaunchIndex(
+            extension->id()).compare(extension_misc::kUnsetIndex) != 0)
+      extension_prefs_->SetAppLaunchIndex(extension->id(),
+                                          extension_misc::kUnsetIndex);
+    if (extension_prefs_->GetPageIndex(
+            extension->id()).compare(extension_misc::kUnsetIndex) != 0)
+      extension_prefs_->SetPageIndex(extension->id(),
+                                     extension_misc::kUnsetIndex);
   }
 
   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,
@@ skipping 115 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, -1);  // Not from web store.
+
+  // Not from web store.
+  OnExtensionInstalled(extension, false, extension_misc::kUnsetIndex);
 }
 
 void ExtensionService::OnExtensionInstalled(
-    const Extension* extension, bool from_webstore, int page_index) {
+    const Extension* extension, bool from_webstore, std::string 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
   // installation disabled the extension, make sure it is now enabled.
   bool initial_enable =
       !extension_prefs_->IsExtensionDisabled(id) ||
       !Extension::UserMayDisable(extension->location());
@@ skipping 446 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();
 }