InstantExtended: Adding InstantRestrictedIDCache.

chrome/browser/instant/instant_page.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 CHROME_BROWSER_INSTANT_INSTANT_PAGE_H_
 #define CHROME_BROWSER_INSTANT_INSTANT_PAGE_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 72 matching lines @@
     // Called when the page wants to navigate to |url|. Usually used by the
     // page to navigate to privileged destinations (e.g. chrome:// URLs) or to
     // navigate to URLs that are hidden from the page using Restricted IDs (rid
     // in the API).
     virtual void NavigateToURL(const content::WebContents* contents,
                                const GURL& url,
                                content::PageTransition transition,
                                WindowOpenDisposition disposition) = 0;
 
     // Called when the SearchBox wants to delete a Most Visited item.
-    virtual void DeleteMostVisitedItem(uint64 most_visited_item_id) = 0;
+    virtual void DeleteMostVisitedItem(InstantRestrictedID restricted_id) = 0;
 
     // Called when the SearchBox wants to undo a Most Visited deletion.
-    virtual void UndoMostVisitedDeletion(uint64 most_visited_item_id) = 0;
+    virtual void UndoMostVisitedDeletion(InstantRestrictedID restricted_id) = 0;
 
     // Called when the SearchBox wants to undo all Most Visited deletions.
     virtual void UndoAllMostVisitedDeletions() = 0;
 
    protected:
     virtual ~Delegate();
   };
 
   virtual ~InstantPage();
 
@@ skipping 57 matching lines @@
   // Tells the page about the current theme background.
   void SendThemeBackgroundInfo(const ThemeBackgroundInfo& theme_info);
 
   // Tells the page whether it is allowed to display Instant results.
   void SetDisplayInstantResults(bool display_instant_results);
 
   // Tells the page whether the browser is capturing user key strokes.
   void KeyCaptureChanged(bool is_key_capture_enabled);
 
   // Tells the page about new Most Visited data.
-  void SendMostVisitedItems(const std::vector<InstantMostVisitedItem>& items);
+  void SendMostVisitedItems(
+      const std::vector<InstantMostVisitedItemIDPair>& items);
 
  protected:
   explicit InstantPage(Delegate* delegate);
 
   // Sets |contents| as the page to communicate with. |contents| may be NULL,
   // which effectively stops all communication.
   void SetContents(content::WebContents* contents);
 
   Delegate* delegate() const { return delegate_; }
 
@@ skipping 36 matching lines @@
                             InstantShownReason reason,
                             int height,
                             InstantSizeUnits units);
   void OnFocusOmnibox(int page_id);
   void OnStartCapturingKeyStrokes(int page_id);
   void OnStopCapturingKeyStrokes(int page_id);
   void OnSearchBoxNavigate(int page_id,
                            const GURL& url,
                            content::PageTransition transition,
                            WindowOpenDisposition disposition);
-  void OnDeleteMostVisitedItem(uint64 most_visited_item_id);
-  void OnUndoMostVisitedDeletion(uint64 most_visited_item_id);
+  void OnDeleteMostVisitedItem(InstantRestrictedID restricted_id);
+  void OnUndoMostVisitedDeletion(InstantRestrictedID restricted_id);
   void OnUndoAllMostVisitedDeletions();
 
   Delegate* const delegate_;
   bool supports_instant_;
 
   DISALLOW_COPY_AND_ASSIGN(InstantPage);
 };
 
 #endif  // CHROME_BROWSER_INSTANT_INSTANT_PAGE_H_