InstantExtended: Adding InstantRestrictedIDCache.

chrome/browser/instant/instant_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_
 #define CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_
 
 #include <list>
 #include <map>
 #include <string>
@@ skipping 233 matching lines @@
       const content::WebContents* contents) OVERRIDE;
   virtual void StopCapturingKeyStrokes(content::WebContents* contents) OVERRIDE;
   virtual void NavigateToURL(
       const content::WebContents* contents,
       const GURL& url,
       content::PageTransition transition,
       WindowOpenDisposition disposition) OVERRIDE;
 
   // Invoked by the InstantLoader when the Instant page wants to delete a
   // Most Visited item.
-  virtual void DeleteMostVisitedItem(uint64 most_visited_item_id) OVERRIDE;
+  virtual void DeleteMostVisitedItem(InstantRestrictedID restricted_id)

[dhollowa, 2013/03/14 00:02:43]

Lets keep |most_visited_item_id| for clarity.  The type now makes it clear that
this is a "restricted" ID.

[Shishir, 2013/03/14 19:53:03]

Done.

+      OVERRIDE;
 
   // Invoked by the InstantLoader when the Instant page wants to undo a
   // Most Visited deletion.
-  virtual void UndoMostVisitedDeletion(uint64 most_visited_item_id) OVERRIDE;
+  virtual void UndoMostVisitedDeletion(InstantRestrictedID restricted_id)

[dhollowa, 2013/03/14 00:02:43]

Ditto.

[Shishir, 2013/03/14 19:53:03]

Done.

+      OVERRIDE;
 
   // Invoked by the InstantLoader when the Instant page wants to undo all
   // Most Visited deletions.
   virtual void UndoAllMostVisitedDeletions() OVERRIDE;
 
   // Helper for OmniboxFocusChanged. Commit or discard the overlay.
   void OmniboxLostFocus(gfx::NativeView view_gaining_focus);
 
   // Creates a new NTP, using the instant_url property of the default
   // TemplateURL.
@@ skipping 73 matching lines @@
   // Fire off an async request for most visited items to the TopNav code.
   void RequestMostVisitedItems();
 
   // Called when we get new most visited items from the TopNav code,
   // registered as an async callback.  Parses them and sends them to the
   // renderer via SendMostVisitedItems.
   void OnMostVisitedItemsReceived(const history::MostVisitedURLList& data);
 
   // Sends a collection of MostVisitedItems to the renderer process via
   // the appropriate InstantPage subclass.
-  void SendMostVisitedItems(const std::vector<InstantMostVisitedItem>& items);
+  void SendMostVisitedItems(
+      const std::vector<InstantMostVisitedItemIDPair>& items);
 
   chrome::BrowserInstantController* const browser_;
 
   // Whether the extended API and regular API are enabled. If both are false,
   // Instant is effectively disabled.
   const bool extended_enabled_;
   bool instant_enabled_;
 
   // If true, the Instant URL is set to kLocalOmniboxPopupURL.
   bool use_local_overlay_only_;
@@ skipping 84 matching lines @@
   // Used for Top Sites async retrieval.
   base::WeakPtrFactory<InstantController> weak_ptr_factory_;
 
   // Used to get notifications about Most Visted changes.
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(InstantController);
 };
 
 #endif  // CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_