InstantExtended: Adding InstantRestrictedIDCache.

chrome/browser/instant/instant_page.cc

 // 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.
 
 #include "chrome/browser/instant/instant_page.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/common/render_messages.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 77 matching lines @@
   Send(new ChromeViewMsg_SearchBoxSetDisplayInstantResults(
       routing_id(), display_instant_results));
 }
 
 void InstantPage::KeyCaptureChanged(bool is_key_capture_enabled) {
   Send(new ChromeViewMsg_SearchBoxKeyCaptureChanged(
       routing_id(), is_key_capture_enabled));
 }
 
 void InstantPage::SendMostVisitedItems(
-    const std::vector<InstantMostVisitedItem>& items) {
+    const std::vector<InstantMostVisitedItemIDPair>& items) {
   Send(new ChromeViewMsg_SearchBoxMostVisitedItemsChanged(routing_id(), items));
 }
 
 InstantPage::InstantPage(Delegate* delegate)
     : delegate_(delegate),
       supports_instant_(false) {
 }
 
 void InstantPage::SetContents(content::WebContents* contents) {
   Observe(contents);
@@ skipping 154 matching lines @@
                                       const GURL& url,
                                       content::PageTransition transition,
                                       WindowOpenDisposition disposition) {
   if (contents()->IsActiveEntry(page_id)) {
     OnInstantSupportDetermined(page_id, true);
     if (ShouldProcessNavigateToURL())
       delegate_->NavigateToURL(contents(), url, transition, disposition);
   }
 }
 
-void InstantPage::OnDeleteMostVisitedItem(uint64 most_visited_item_id) {
-  delegate_->DeleteMostVisitedItem(most_visited_item_id);
+void InstantPage::OnDeleteMostVisitedItem(InstantRestrictedID restricted_id) {
+  delegate_->DeleteMostVisitedItem(restricted_id);
 }
 
-void InstantPage::OnUndoMostVisitedDeletion(uint64 most_visited_item_id) {
-  delegate_->UndoMostVisitedDeletion(most_visited_item_id);
+void InstantPage::OnUndoMostVisitedDeletion(InstantRestrictedID restricted_id) {
+  delegate_->UndoMostVisitedDeletion(restricted_id);
 }
 
 void InstantPage::OnUndoAllMostVisitedDeletions() {
   delegate_->UndoAllMostVisitedDeletions();
 }