mash: Replace int ShelfIDs with AppLaunchID strings.

chrome/browser/ui/ash/app_list/app_list_controller_ash.cc

 // Copyright (c) 2012 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/ui/ash/app_list/app_list_controller_ash.h"
 
 #include "ash/shelf/shelf_model.h"
 #include "ash/shell.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
@@ skipping 26 matching lines @@
   return gfx::Rect();
 }
 
 bool AppListControllerDelegateAsh::IsAppPinned(const std::string& app_id) {
   return ash::Shell::Get()->shelf_model()->IsAppPinned(app_id);
 }
 
 bool AppListControllerDelegateAsh::IsAppOpen(const std::string& app_id) const {
   ash::ShelfID id =
       ash::Shell::Get()->shelf_model()->GetShelfIDForAppID(app_id);
-  return id && ChromeLauncherController::instance()->IsOpen(id);
+  return !id.IsNull() && ChromeLauncherController::instance()->IsOpen(id);
 }
 
 void AppListControllerDelegateAsh::PinApp(const std::string& app_id) {
   ash::Shell::Get()->shelf_model()->PinAppWithID(app_id);
 }
 
 void AppListControllerDelegateAsh::UnpinApp(const std::string& app_id) {
   ash::Shell::Get()->shelf_model()->UnpinAppWithID(app_id);
 }
 
@@ skipping 51 matching lines @@
 
   DismissView();
 }
 
 void AppListControllerDelegateAsh::LaunchApp(
     Profile* profile,
     const extensions::Extension* extension,
     AppListSource source,
     int event_flags) {
   ChromeLauncherController::instance()->LaunchApp(
-      ash::AppLaunchId(extension->id()), AppListSourceToLaunchSource(source),
+      ash::ShelfID(extension->id()), AppListSourceToLaunchSource(source),
       event_flags);
   DismissView();
 }
 
 ash::ShelfLaunchSource
 AppListControllerDelegateAsh::AppListSourceToLaunchSource(
     AppListSource source) {
   switch (source) {
     case LAUNCH_FROM_APP_LIST:
       return ash::LAUNCH_FROM_APP_LIST;
     case LAUNCH_FROM_APP_LIST_SEARCH:
       return ash::LAUNCH_FROM_APP_LIST_SEARCH;
     default:
       return ash::LAUNCH_FROM_UNKNOWN;
   }
 }