InstantExtended: Adding InstantRestrictedIDCache.

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"
 #include "base/string16.h"
+#include "chrome/common/instant_restricted_id_cache.h"
 #include "chrome/common/instant_types.h"
 #include "chrome/common/search_types.h"
 #include "content/public/common/page_transition_types.h"
 #include "content/public/renderer/render_view_observer.h"
 #include "content/public/renderer/render_view_observer_tracker.h"
 #include "ui/base/window_open_disposition.h"
 #include "ui/gfx/rect.h"
 
 namespace content {
 class RenderView;
@@ skipping 30 matching lines @@
   // Sends ChromeViewHostMsg_InstantUndoMostVisitedDeletion to the browser.
   void UndoMostVisitedDeletion(int restrict_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;
+  // Returns the most recent InstantAutocompleteResults sent by the browser.
+  void GetAutocompleteResults(
+      std::vector<std::pair<size_t, InstantAutocompleteResult> >*
+          results) const;
+
+  // Returns true if |restrict_id| is present in the cache and sets results to
+  // a copy of the result.
+  bool GetAutocompleteResultWithId(size_t restricted_id,
+                                   InstantAutocompleteResult* result) const;
+
   const ThemeBackgroundInfo& GetThemeBackgroundInfo();
 
   // Most Visited items.
   const std::vector<MostVisitedItem>& GetMostVisitedItems();
 
   // Secure Urls.
   int UrlToRestrictedId(const string16 url);
   string16 RestrictedIdToURL(int id);
   string16 GenerateThumbnailUrl(int id);
   string16 GenerateFaviconUrl(int id);
@@ skipping 27 matching lines @@
   // Returns the current zoom factor of the render view or 1 on failure.
   double GetZoom() const;
 
   // Sets the searchbox values to their initial value.
   void Reset();
 
   string16 query_;
   bool verbatim_;
   size_t selection_start_;
   size_t selection_end_;
-  size_t results_base_;
   int start_margin_;
   gfx::Rect popup_bounds_;
-  std::vector<InstantAutocompleteResult> autocomplete_results_;
-  size_t last_results_base_;
-  std::vector<InstantAutocompleteResult> last_autocomplete_results_;
+  InstantRestrictedIdCache<InstantAutocompleteResult>
+      autocomplete_results_cache_;
   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.
   // 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_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchBox);
 };
 
 #endif  // CHROME_RENDERER_SEARCHBOX_SEARCHBOX_H_