InstantExtended: Adding InstantRestrictedIDCache.

chrome/browser/instant/instant_controller.cc

 // 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.
 
 #include "chrome/browser/instant/instant_controller.h"
 
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
@@ skipping 180 matching lines @@
       std::string(),
       contents->GetBrowserContext());
   transient->SetExtraData(chrome::search::kInstantExtendedSearchTermsKey,
                           search_terms);
   controller->SetTransientEntry(transient);
 
   chrome::search::SearchTabHelper::FromWebContents(contents)->
       NavigationEntryUpdated();
 }
 
-bool GetURLForMostVisitedItemId(Profile* profile,
-                                uint64 most_visited_item_id,
+bool GetURLForMostVisitedItemID(Profile* profile,
+                                InstantRestrictedID most_visited_item_id,
                                 GURL* url) {
   InstantService* instant_service =
       InstantServiceFactory::GetForProfile(profile);
   if (!instant_service)
     return false;
-  return instant_service->GetURLForMostVisitedItemId(most_visited_item_id, url);
-}
 
-// Creates a new restriced id if one is not found.
-size_t GetMostVisitedItemIDForURL(Profile* profile, const GURL& url) {
-  InstantService* instant_service =
-      InstantServiceFactory::GetForProfile(profile);
-  if (!instant_service)
-    return 0;
-  return instant_service->AddURL(url);
+  InstantMostVisitedItem item;
+  if (!instant_service->GetMostVisitedItemForID(most_visited_item_id, &item))
+    return false;
+
+  *url = item.url;
+  return true;
 }
 
 }  // namespace
 
 InstantController::InstantController(chrome::BrowserInstantController* browser,
                                      bool extended_enabled)
     : browser_(browser),
       extended_enabled_(extended_enabled),
       instant_enabled_(false),
       use_local_overlay_only_(true),
@@ skipping 675 matching lines @@
       base::Time::Now().ToInternalValue(), info));
   static const size_t kMaxDebugEventSize = 2000;
   if (debug_events_.size() > kMaxDebugEventSize)
     debug_events_.pop_back();
 }
 
 void InstantController::ClearDebugEvents() {
   debug_events_.clear();
 }
 
-void InstantController::DeleteMostVisitedItem(uint64 most_visited_item_id) {
+void InstantController::DeleteMostVisitedItem(
+    InstantRestrictedID most_visited_item_id) {
   history::TopSites* top_sites = browser_->profile()->GetTopSites();
   if (!top_sites)
     return;
 
   GURL url;
-  if (GetURLForMostVisitedItemId(browser_->profile(),
+  if (GetURLForMostVisitedItemID(browser_->profile(),
                                  most_visited_item_id, &url))
     top_sites->AddBlacklistedURL(url);
 }
 
-void InstantController::UndoMostVisitedDeletion(uint64 most_visited_item_id) {
+void InstantController::UndoMostVisitedDeletion(
+    InstantRestrictedID most_visited_item_id) {
   history::TopSites* top_sites = browser_->profile()->GetTopSites();
   if (!top_sites)
     return;
 
   GURL url;
-  if (GetURLForMostVisitedItemId(browser_->profile(),
+  if (GetURLForMostVisitedItemID(browser_->profile(),
                                  most_visited_item_id, &url))
     top_sites->RemoveBlacklistedURL(url);
 }
 
 void InstantController::UndoAllMostVisitedDeletions() {
   history::TopSites* top_sites = browser_->profile()->GetTopSites();
   if (!top_sites)
     return;
 
   top_sites->ClearBlacklistedURLs();
@@ skipping 568 matching lines @@
   history::TopSites* top_sites = browser_->profile()->GetTopSites();
   if (top_sites) {
     top_sites->GetMostVisitedURLs(
         base::Bind(&InstantController::OnMostVisitedItemsReceived,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 }
 
 void InstantController::OnMostVisitedItemsReceived(
     const history::MostVisitedURLList& data) {
+  InstantService* instant_service =
+      InstantServiceFactory::GetForProfile(browser_->profile());
+  if (!instant_service)
+    return;
+
   std::vector<InstantMostVisitedItem> most_visited_items;
   for (size_t i = 0; i < data.size(); i++) {
     const history::MostVisitedURL& url = data[i];
-
     InstantMostVisitedItem item;
-    item.most_visited_item_id = GetMostVisitedItemIDForURL(browser_->profile(),
-                                                           url.url);
     item.url = url.url;
     item.title = url.title;
-
     most_visited_items.push_back(item);
   }
-  SendMostVisitedItems(most_visited_items);
+
+  instant_service->AddMostVisitedItems(most_visited_items);
+
+  std::vector<InstantMostVisitedItemIDPair> items_with_ids;
+  instant_service->GetCurrentMostVisitedItems(&items_with_ids);
+  SendMostVisitedItems(items_with_ids);
 }
 
 void InstantController::SendMostVisitedItems(
-    const std::vector<InstantMostVisitedItem>& items) {
+    const std::vector<InstantMostVisitedItemIDPair>& items) {
   if (overlay_)
     overlay_->SendMostVisitedItems(items);
   if (ntp_)
     ntp_->SendMostVisitedItems(items);
   if (instant_tab_)
     instant_tab_->SendMostVisitedItems(items);
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_INSTANT_SENT_MOST_VISITED_ITEMS,
       content::Source<InstantController>(this),
       content::NotificationService::NoDetails());
 }