Most visited thumbnails and favicons need id-based urls

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"
 #include "content/public/renderer/render_view.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 
-namespace {
-
-// Prefix for a thumbnail URL.
-const char kThumbnailUrlPrefix[] = "chrome-search://thumb/";
-
-// Prefix for a thumbnail URL.
-const char kFaviconUrlPrefix[] = "chrome-search://favicon/";
-
-}
-
 SearchBox::SearchBox(content::RenderView* render_view)
     : content::RenderViewObserver(render_view),
       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) {
+      omnibox_font_size_(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);
-  render_view()->Send(new ChromeViewHostMsg_InstantDeleteMostVisitedItem(
-      render_view()->GetRoutingID(), GURL(url)));
+void SearchBox::DeleteMostVisitedItem(uint64 restricted_id) {
+  render_view()->Send(new ChromeViewHostMsg_SearchBoxDeleteMostVisitedItem(
+      render_view()->GetRoutingID(), restricted_id));
 }
 
-void SearchBox::UndoMostVisitedDeletion(int restrict_id) {
-  string16 url = RestrictedIdToURL(restrict_id);
-  render_view()->Send(new ChromeViewHostMsg_InstantUndoMostVisitedDeletion(
-      render_view()->GetRoutingID(), GURL(url)));
+void SearchBox::UndoMostVisitedDeletion(uint64 restricted_id) {
+  render_view()->Send(new ChromeViewHostMsg_SearchBoxUndoMostVisitedDeletion(
+      render_view()->GetRoutingID(), restricted_id));
 }
 
 void SearchBox::UndoAllMostVisitedDeletions() {
-  render_view()->Send(new ChromeViewHostMsg_InstantUndoAllMostVisitedDeletions(
+  render_view()->Send(
+      new ChromeViewHostMsg_SearchBoxUndoAllMostVisitedDeletions(
       render_view()->GetRoutingID()));
 }
 
 int SearchBox::GetStartMargin() const {
   return static_cast<int>(start_margin_ / GetZoom());
 }
 
 gfx::Rect SearchBox::GetPopupBounds() const {
   double zoom = GetZoom();
   return gfx::Rect(static_cast<int>(popup_bounds_.x() / zoom),
                    static_cast<int>(popup_bounds_.y() / zoom),
                    static_cast<int>(popup_bounds_.width() / zoom),
                    static_cast<int>(popup_bounds_.height() / zoom));
 }
 
 const std::vector<InstantAutocompleteResult>&
     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 {
+    uint64 restricted_id) const {
   if (restricted_id < last_results_base_ ||
       restricted_id >= last_results_base_ + last_autocomplete_results_.size())
     return NULL;
   return &last_autocomplete_results_[restricted_id - last_results_base_];
 }
 
 const ThemeBackgroundInfo& SearchBox::GetThemeBackgroundInfo() {
   return theme_info_;
 }
 
@@ skipping 17 matching lines @@
                         OnSetDisplayInstantResults)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxKeyCaptureChanged,
                         OnKeyCaptureChange)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxThemeChanged,
                         OnThemeChanged)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxFontInformation,
                         OnFontInformationReceived)
     IPC_MESSAGE_HANDLER(
         ChromeViewMsg_SearchBoxGrantChromeSearchAccessFromOrigin,
         OnGrantChromeSearchAccessFromOrigin)
-    IPC_MESSAGE_HANDLER(ChromeViewMsg_InstantMostVisitedItemsChanged,
+    IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxMostVisitedItemsChanged,
                         OnMostVisitedChanged)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void SearchBox::DidClearWindowObject(WebKit::WebFrame* frame) {
   extensions_v8::SearchBoxExtension::DispatchOnWindowReady(frame);
 }
 
@@ skipping 167 matching lines @@
   is_key_capture_enabled_ = false;
   theme_info_ = ThemeBackgroundInfo();
   // Don't reset display_instant_results_ to prevent clearing it on committed
   // results pages in extended mode. Otherwise resetting it is a no-op because
   // a new loader is created when it changes; see crbug.com/164662.
   // Also don't reset omnibox_font_ or omnibox_font_size_ since it never
   // changes.
 }
 
 void SearchBox::OnMostVisitedChanged(
-    const std::vector<MostVisitedItem>& items) {
+    const std::vector<InstantMostVisitedItem>& items) {
   most_visited_items_ = items;
 
   if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
     extensions_v8::SearchBoxExtension::DispatchMostVisitedChanged(
         render_view()->GetWebView()->mainFrame());
   }
 }
 
-const std::vector<MostVisitedItem>& SearchBox::GetMostVisitedItems() {
+const std::vector<InstantMostVisitedItem>&
+SearchBox::GetMostVisitedItems() const {
   return most_visited_items_;
 }
-
-int SearchBox::UrlToRestrictedId(string16 url) {
-  if (url_to_restricted_id_map_[url])
-    return url_to_restricted_id_map_[url];
-
-  last_restricted_id_++;
-  url_to_restricted_id_map_[url] = last_restricted_id_;
-  restricted_id_to_url_map_[last_restricted_id_] = url;
-
-  return last_restricted_id_;
-}
-
-string16 SearchBox::RestrictedIdToURL(int id) {
-  return restricted_id_to_url_map_[id];
-}
-
-string16 SearchBox::GenerateThumbnailUrl(int id) {
-  std::ostringstream ostr;
-  ostr << kThumbnailUrlPrefix << id;
-  GURL url = GURL(ostr.str());
-  return UTF8ToUTF16(url.spec());
-}
-
-string16 SearchBox::GenerateFaviconUrl(int id) {
-  std::ostringstream ostr;
-  ostr << kFaviconUrlPrefix << id;
-  GURL url = GURL(ostr.str());
-  return UTF8ToUTF16(url.spec());
-}