mash: Replace int ShelfIDs with AppLaunchID strings.

chrome/browser/ui/ash/launcher/launcher_context_menu.cc

 // Copyright 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/launcher/launcher_context_menu.h"
 
 #include <string>
 
 #include "ash/shelf/shelf_model.h"
 #include "ash/shelf/wm_shelf.h"
@@ skipping 30 matching lines @@
 }  // namespace
 
 // static
 LauncherContextMenu* LauncherContextMenu::Create(
     ChromeLauncherController* controller,
     const ash::ShelfItem* item,
     ash::WmShelf* wm_shelf) {
   DCHECK(controller);
   DCHECK(wm_shelf);
   // Create DesktopShellLauncherContextMenu if no item is selected.
-  if (!item || item->id == 0)
+  if (!item || item->id.IsNull())
     return new DesktopShellLauncherContextMenu(controller, item, wm_shelf);
 
   // Create ArcLauncherContextMenu if the item is an ARC app.
   const std::string& app_id = controller->GetAppIDForShelfID(item->id);
   if (arc::IsArcItem(controller->profile(), app_id))
     return new ArcLauncherContextMenu(controller, item, wm_shelf);
 
   // Create ExtensionLauncherContextMenu for the item.
   return new ExtensionLauncherContextMenu(controller, item, wm_shelf);
 }
@@ skipping 57 matching lines @@
         DCHECK(item_delegate);
         item_delegate->Close();
       } else {
         // TODO(simonhong): Use ShelfItemDelegate::Close().
         controller_->Close(item_.id);
       }
       ash::ShellPort::Get()->RecordUserMetricsAction(
           ash::UMA_CLOSE_THROUGH_CONTEXT_MENU);
       break;
     case MENU_PIN:
-      if (controller_->IsAppPinned(item_.app_launch_id.app_id()))
-        controller_->UnpinAppWithID(item_.app_launch_id.app_id());
+      if (controller_->IsAppPinned(item_.id.app_id))
+        controller_->UnpinAppWithID(item_.id.app_id);
       else
-        controller_->PinAppWithID(item_.app_launch_id.app_id());
+        controller_->PinAppWithID(item_.id.app_id);
       break;
     case MENU_AUTO_HIDE:
       wm_shelf_->SetAutoHideBehavior(
           wm_shelf_->auto_hide_behavior() ==
                   ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS
               ? ash::SHELF_AUTO_HIDE_BEHAVIOR_NEVER
               : ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
       break;
     case MENU_ALIGNMENT_MENU:
       break;
     case MENU_CHANGE_WALLPAPER:
       chromeos::WallpaperManager::Get()->Open();
       break;
     default:
       NOTREACHED();
   }
 }
 
 void LauncherContextMenu::AddPinMenu() {
-  // Expect an item with a none zero id to add pin/unpin menu item.
-  DCHECK(item_.id);
+  // Expect a valid ShelfID to add pin/unpin menu item.
+  DCHECK(!item_.id.IsNull());
   int menu_pin_string_id;
   const std::string app_id = controller_->GetAppIDForShelfID(item_.id);
   switch (GetPinnableForAppID(app_id, controller_->profile())) {
     case AppListControllerDelegate::PIN_EDITABLE:
       menu_pin_string_id = controller_->IsPinned(item_.id)
                                ? IDS_LAUNCHER_CONTEXT_MENU_UNPIN
                                : IDS_LAUNCHER_CONTEXT_MENU_PIN;
       break;
     case AppListControllerDelegate::PIN_FIXED:
       menu_pin_string_id = IDS_LAUNCHER_CONTEXT_MENU_PIN_ENFORCED_BY_POLICY;
@@ skipping 36 matching lines @@
     case MENU_PIN:
     case MENU_AUTO_HIDE:
     case MENU_ALIGNMENT_MENU:
     case MENU_CHANGE_WALLPAPER:
       LauncherContextMenu::ExecuteCommand(command_id, event_flags);
       return true;
     default:
       return false;
   }
 }