Instant: Make clicks on Most Visited items work.

chrome/renderer/searchbox/searchbox.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/renderer/searchbox/searchbox.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/renderer/searchbox/searchbox_extension.h"
@@ skipping 16 matching lines @@
       content::RenderViewObserverTracker<SearchBox>(render_view),
       verbatim_(false),
       selection_start_(0),
       selection_end_(0),
       results_base_(0),
       start_margin_(0),
       last_results_base_(0),
       is_key_capture_enabled_(false),
       display_instant_results_(false),
       omnibox_font_size_(0),
-      last_restricted_id_(0) {
+      last_most_visited_item_id_(0) {
 }
 
 SearchBox::~SearchBox() {
 }
 
 void SearchBox::SetSuggestions(
     const std::vector<InstantSuggestion>& suggestions) {
   if (!suggestions.empty() &&
       suggestions[0].behavior == INSTANT_COMPLETE_REPLACE) {
     query_ = suggestions[0].text;
@@ skipping 29 matching lines @@
 }
 
 void SearchBox::NavigateToURL(const GURL& url,
                               content::PageTransition transition,
                               WindowOpenDisposition disposition) {
   render_view()->Send(new ChromeViewHostMsg_SearchBoxNavigate(
       render_view()->GetRoutingID(), render_view()->GetPageId(),
       url, transition, disposition));
 }
 
-void SearchBox::DeleteMostVisitedItem(int restrict_id) {
-  string16 url = RestrictedIdToURL(restrict_id);
+void SearchBox::DeleteMostVisitedItem(int most_visited_item_id) {
+  string16 url = MostVisitedItemIDToURL(most_visited_item_id);
   render_view()->Send(new ChromeViewHostMsg_InstantDeleteMostVisitedItem(
       render_view()->GetRoutingID(), GURL(url)));
 }
 
-void SearchBox::UndoMostVisitedDeletion(int restrict_id) {
-  string16 url = RestrictedIdToURL(restrict_id);
+void SearchBox::UndoMostVisitedDeletion(int most_visited_item_id) {
+  string16 url = MostVisitedItemIDToURL(most_visited_item_id);
   render_view()->Send(new ChromeViewHostMsg_InstantUndoMostVisitedDeletion(
       render_view()->GetRoutingID(), GURL(url)));
 }
 
 void SearchBox::UndoAllMostVisitedDeletions() {
   render_view()->Send(new ChromeViewHostMsg_InstantUndoAllMostVisitedDeletions(
       render_view()->GetRoutingID()));
 }
 
 int SearchBox::GetStartMargin() const {
@@ skipping 12 matching lines @@
     SearchBox::GetAutocompleteResults() {
   // Remember the last requested autocomplete_results to account for race
   // conditions between autocomplete providers returning new data and the user
   // clicking on a suggestion.
   last_autocomplete_results_ = autocomplete_results_;
   last_results_base_ = results_base_;
   return autocomplete_results_;
 }
 
 const InstantAutocompleteResult* SearchBox::GetAutocompleteResultWithId(
-    size_t restricted_id) const {
-  if (restricted_id < last_results_base_ ||
-      restricted_id >= last_results_base_ + last_autocomplete_results_.size())
+    size_t autocomplete_result_id) const {
+  if (autocomplete_result_id < last_results_base_ ||
+      autocomplete_result_id >=
+          last_results_base_ + last_autocomplete_results_.size())
     return NULL;
-  return &last_autocomplete_results_[restricted_id - last_results_base_];
+  return &last_autocomplete_results_[
+      autocomplete_result_id - last_results_base_];
 }
 
 const ThemeBackgroundInfo& SearchBox::GetThemeBackgroundInfo() {
   return theme_info_;
 }
 
 bool SearchBox::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(SearchBox, message)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxChange, OnChange)
@@ skipping 214 matching lines @@
   if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
     extensions_v8::SearchBoxExtension::DispatchMostVisitedChanged(
         render_view()->GetWebView()->mainFrame());
   }
 }
 
 const std::vector<MostVisitedItem>& SearchBox::GetMostVisitedItems() {
   return most_visited_items_;
 }
 
-int SearchBox::UrlToRestrictedId(string16 url) {
-  if (url_to_restricted_id_map_[url])
-    return url_to_restricted_id_map_[url];
+int SearchBox::URLToMostVisitedItemID(string16 url) {
+  if (url_to_most_visited_item_id_map_[url])
+    return url_to_most_visited_item_id_map_[url];
 
-  last_restricted_id_++;
-  url_to_restricted_id_map_[url] = last_restricted_id_;
-  restricted_id_to_url_map_[last_restricted_id_] = url;
+  last_most_visited_item_id_++;
+  url_to_most_visited_item_id_map_[url] = last_most_visited_item_id_;
+  most_visited_item_id_to_url_map_[last_most_visited_item_id_] = url;
 
-  return last_restricted_id_;
+  return last_most_visited_item_id_;
 }
 
-string16 SearchBox::RestrictedIdToURL(int id) {
-  return restricted_id_to_url_map_[id];
+string16 SearchBox::MostVisitedItemIDToURL(int most_visited_item_id) {
+  return most_visited_item_id_to_url_map_[most_visited_item_id];
 }
 
-string16 SearchBox::GenerateThumbnailUrl(int id) {
+string16 SearchBox::GenerateThumbnailUrl(int most_visited_item_id) {
   std::ostringstream ostr;
-  ostr << kThumbnailUrlPrefix << id;
+  ostr << kThumbnailUrlPrefix << most_visited_item_id;
   GURL url = GURL(ostr.str());
   return UTF8ToUTF16(url.spec());
 }
 
-string16 SearchBox::GenerateFaviconUrl(int id) {
+string16 SearchBox::GenerateFaviconUrl(int most_visited_item_id) {
   std::ostringstream ostr;
-  ostr << kFaviconUrlPrefix << id;
+  ostr << kFaviconUrlPrefix << most_visited_item_id;
   GURL url = GURL(ostr.str());
   return UTF8ToUTF16(url.spec());
 }