mash: Replace int ShelfIDs with AppLaunchID strings.

chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h

 // Copyright 2014 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_ASH_LAUNCHER_APP_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_APP_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_
 
 #include <list>
 #include <string>
 
@@ skipping 45 matching lines @@
 
   // Get the number of running applications/incarnations of this.
   size_t window_count() const { return windows_.size(); }
 
   // Activates the window at position |index|.
   void ActivateIndexedApp(size_t index);
 
   const WindowList& windows() const { return windows_; }
 
  protected:
-  explicit AppWindowLauncherItemController(
-      const ash::AppLaunchId& app_launch_id);
+  explicit AppWindowLauncherItemController(const ash::ShelfID& shelf_id);
 
   // Called when app window is removed from controller.
   virtual void OnWindowRemoved(ui::BaseWindow* window) {}
 
   // Returns the action performed. Should be one of SHELF_ACTION_NONE,
   // SHELF_ACTION_WINDOW_ACTIVATED, or SHELF_ACTION_WINDOW_MINIMIZED.
   ash::ShelfAction ShowAndActivateOrMinimize(ui::BaseWindow* window);
 
   // Activate the given |window_to_show|, or - if already selected - advance to
   // the next window of similar type.
@@ skipping 11 matching lines @@
   // Pointer to the most recently active app window
   ui::BaseWindow* last_active_window_ = nullptr;
 
   // Scoped list of observed windows (for removal on destruction)
   ScopedObserver<aura::Window, aura::WindowObserver> observed_windows_;
 
   DISALLOW_COPY_AND_ASSIGN(AppWindowLauncherItemController);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_APP_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_