Instant: Make clicks on Most Visited items work.

chrome/renderer/searchbox/searchbox.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_RENDERER_SEARCHBOX_SEARCHBOX_H_
 #define CHROME_RENDERER_SEARCHBOX_SEARCHBOX_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 32 matching lines @@
 
   // Sends ChromeViewHostMsg_StopCapturingKeyStrokes to the browser.
   void StopCapturingKeyStrokes();
 
   // Sends ChromeViewHostMsg_SearchBoxNavigate to the browser.
   void NavigateToURL(const GURL& url,
                      content::PageTransition transition,
                      WindowOpenDisposition disposition);
 
   // Sends ChromeViewHostMsg_InstantDeleteMostVisitedItem to the browser.
-  void DeleteMostVisitedItem(int restrict_id);
+  void DeleteMostVisitedItem(int most_visited_item_id);
 
   // Sends ChromeViewHostMsg_InstantUndoMostVisitedDeletion to the browser.
-  void UndoMostVisitedDeletion(int restrict_id);
+  void UndoMostVisitedDeletion(int most_visited_item_id);
 
   // Sends ChromeViewHostMsg_InstantUndoAllMostVisitedDeletions to the browser.
   void UndoAllMostVisitedDeletions();
 
   const string16& query() const { return query_; }
   bool verbatim() const { return verbatim_; }
   size_t selection_start() const { return selection_start_; }
   size_t selection_end() const { return selection_end_; }
   int results_base() const { return results_base_; }
   bool is_key_capture_enabled() const { return is_key_capture_enabled_; }
   bool display_instant_results() const { return display_instant_results_; }
   const string16& omnibox_font() const { return omnibox_font_; }
   size_t omnibox_font_size() const { return omnibox_font_size_; }
 
   // In extended Instant, returns the start-edge margin of the location bar in
   // screen pixels.
   int GetStartMargin() const;
 
   // Returns the bounds of the omnibox popup in screen coordinates.
   gfx::Rect GetPopupBounds() const;
 
   const std::vector<InstantAutocompleteResult>& GetAutocompleteResults();
   // Searchbox retains ownership of this object.
   const InstantAutocompleteResult*
-      GetAutocompleteResultWithId(size_t restricted_id) const;
+      GetAutocompleteResultWithId(size_t autocomplete_result_id) const;
   const ThemeBackgroundInfo& GetThemeBackgroundInfo();
 
   // Most Visited items.
   const std::vector<MostVisitedItem>& GetMostVisitedItems();
 
-  // Secure Urls.
+  // Secure Urls. IDs here are for Most Visited items.
   int UrlToRestrictedId(const string16 url);

[David Black, 2013/03/11 21:19:30]

Function names too, please!  (They're more visible than param names.)

[sreeram, 2013/03/11 21:42:00]

Done.

-  string16 RestrictedIdToURL(int id);
-  string16 GenerateThumbnailUrl(int id);
-  string16 GenerateFaviconUrl(int id);
+  string16 RestrictedIdToURL(int most_visited_item_id);
+  string16 GenerateThumbnailUrl(int most_visited_item_id);
+  string16 GenerateFaviconUrl(int most_visited_item_id);
 
  private:
   // Overridden from content::RenderViewObserver:
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void DidClearWindowObject(WebKit::WebFrame* frame) OVERRIDE;
 
   void OnChange(const string16& query,
                 bool verbatim,
                 size_t selection_start,
                 size_t selection_end);
@@ skipping 31 matching lines @@
   std::vector<InstantAutocompleteResult> autocomplete_results_;
   size_t last_results_base_;
   std::vector<InstantAutocompleteResult> last_autocomplete_results_;
   bool is_key_capture_enabled_;
   ThemeBackgroundInfo theme_info_;
   bool display_instant_results_;
   string16 omnibox_font_;
   size_t omnibox_font_size_;
   std::vector<MostVisitedItem> most_visited_items_;
 
-  // URL to Restricted Id mapping.
+  // URL to Restricted Id mapping. IDs here are for Most Visited items.
   // TODO(dcblack): Unify this logic to work with both Most Visited and
   // history suggestions.  (crbug/175768)
-  std::map<string16, int> url_to_restricted_id_map_;
-  std::map<int, string16> restricted_id_to_url_map_;
-  int last_restricted_id_;
+  std::map<string16, int> url_to_most_visited_item_id_map_;
+  std::map<int, string16> most_visited_item_id_to_url_map_;
+  int last_most_visited_item_id_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchBox);
 };
 
 #endif  // CHROME_RENDERER_SEARCHBOX_SEARCHBOX_H_