Enhance chrome.app.window API for shelf integration with pinning support

ash/test/test_shelf_delegate.h

 // Copyright 2013 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_TEST_TEST_SHELF_DELEGATE_H_
 #define ASH_TEST_TEST_SHELF_DELEGATE_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 38 matching lines @@
   void OnWindowDestroying(aura::Window* window) override;
   void OnWindowHierarchyChanging(const HierarchyChangeParams& params) override;
 
   // ShelfDelegate implementation.
   void OnShelfCreated(Shelf* shelf) override;
   void OnShelfDestroyed(Shelf* shelf) override;
   void OnShelfAlignmentChanged(Shelf* shelf) override;
   void OnShelfAutoHideBehaviorChanged(Shelf* shelf) override;
   void OnShelfAutoHideStateChanged(Shelf* shelf) override;
   void OnShelfVisibilityStateChanged(Shelf* shelf) override;
-  ShelfID GetShelfIDForAppID(const std::string& app_id) override;
+  ShelfID GetShelfIDForAppID(const std::string& app_id,
+                             const std::string& app_shelf_id) override;
   bool HasShelfIDToAppIDMapping(ShelfID id) const override;
   const std::string& GetAppIDForShelfID(ShelfID id) override;
   void PinAppWithID(const std::string& app_id) override;
   bool IsAppPinned(const std::string& app_id) override;
   void UnpinAppWithID(const std::string& app_id) override;
 
  private:
   // Adds a mapping from a ShelfID to an app id.
   void AddShelfIDToAppIDMapping(ShelfID shelf_id, const std::string& app_id);
 
   // Removes the mapping from a ShelfID to an app id.
   void RemoveShelfIDToAppIDMapping(ShelfID shelf_id);
 
   static TestShelfDelegate* instance_;
 
   ShelfModel* model_;
 
   std::set<std::string> pinned_apps_;
 
   // Tracks the ShelfID to app id mappings.
   std::map<ShelfID, std::string> shelf_id_to_app_id_map_;
 
   DISALLOW_COPY_AND_ASSIGN(TestShelfDelegate);
 };
 
 }  // namespace test
 }  // namespace ash
 
 #endif  // ASH_TEST_TEST_SHELF_DELEGATE_H_