mash: Replace int ShelfIDs with AppLaunchID strings.

ash/shelf/shelf_view.h

 // 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.
 
 #ifndef ASH_SHELF_SHELF_VIEW_H_
 #define ASH_SHELF_SHELF_VIEW_H_
 
 #include <memory>
 #include <string>
 #include <utility>
@@ skipping 66 matching lines @@
   WmShelf* wm_shelf() const { return wm_shelf_; }
   ShelfModel* model() const { return model_; }
 
   void Init();
 
   void OnShelfAlignmentChanged();
 
   // Returns the ideal bounds of the specified item, or an empty rect if id
   // isn't know. If the item is in an overflow shelf, the overflow icon location
   // will be returned.
-  gfx::Rect GetIdealBoundsOfItemIcon(ShelfID id);
+  gfx::Rect GetIdealBoundsOfItemIcon(const ShelfID& id);
 
   // Repositions the icon for the specified item by the midpoint of the window.
-  void UpdatePanelIconPosition(ShelfID id, const gfx::Point& midpoint);
+  void UpdatePanelIconPosition(const ShelfID& id, const gfx::Point& midpoint);
 
   // Returns true if we're showing a menu.
   bool IsShowingMenu() const;
 
   // Returns true if overflow bubble is shown.
   bool IsShowingOverflowBubble() const;
 
   // Sets owner overflow bubble instance from which this shelf view pops
   // out as overflow.
   void set_owner_overflow_bubble(OverflowBubble* owner) {
@@ skipping 287 matching lines @@
   // |dragging_| is set only if the mouse is dragged far enough.
   ShelfButton* drag_view_ = nullptr;
 
   // Position of the mouse down event in |drag_view_|'s coordinates.
   gfx::Point drag_origin_;
 
   // Index |drag_view_| was initially at.
   int start_drag_index_ = -1;
 
   // Used for the context menu of a particular item.
-  ShelfID context_menu_id_ = 0;
+  ShelfID context_menu_id_;
 
   std::unique_ptr<views::FocusSearch> focus_search_;
 
   // Manages the context menu, and the list menu.
   std::unique_ptr<ui::MenuModel> menu_model_;
   std::unique_ptr<views::MenuModelAdapter> menu_model_adapter_;
   std::unique_ptr<views::MenuRunner> launcher_menu_runner_;
   std::unique_ptr<ScopedRootWindowForNewWindows>
       scoped_root_window_for_new_windows_;
 
   // True when an item being inserted or removed in the model cancels a drag.
   bool cancelling_drag_model_changed_ = false;
 
   // Index of the last hidden launcher item. If there are no hidden items this
   // will be equal to last_visible_index_ + 1.
   mutable int last_hidden_index_ = 0;
 
   // The timestamp of the event which closed the last menu - or 0.
   base::TimeTicks closing_event_time_;
 
   // The timestamp of the last shelf item touch press event.
   base::TimeTicks touch_press_time_;
 
   // True if a drag and drop operation created/pinned the item in the launcher
   // and it needs to be deleted/unpinned again if the operation gets cancelled.
   bool drag_and_drop_item_pinned_ = false;
 
-  // The ShelfItem which is currently used for a drag and a drop operation
-  // or 0 otherwise.
-  ShelfID drag_and_drop_shelf_id_ = 0;
+  // The ShelfItem currently used for drag and drop; empty if none.
+  ShelfID drag_and_drop_shelf_id_;
 
   // The application ID of the application which we drag and drop.
   std::string drag_and_drop_app_id_;
 
   // The original launcher item's size before the dragging operation.
   gfx::Size pre_drag_and_drop_size_;
 
   // The image proxy for drag operations when a drag and drop host exists and
   // the item can be dragged outside the app grid.
   std::unique_ptr<ash::DragImageView> drag_image_;
@@ skipping 32 matching lines @@
   ShelfButtonPressedMetricTracker shelf_button_pressed_metric_tracker_;
 
   base::WeakPtrFactory<ShelfView> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfView);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELF_SHELF_VIEW_H_