Completing high dpi support for Instant Extended.

chrome/renderer/searchbox/searchbox_extension.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_extension.h"
 
 #include "base/i18n/rtl.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
@@ skipping 62 matching lines @@
 }
 
 v8::Handle<v8::String> GenerateThumbnailURL(
     int render_view_id,
     InstantRestrictedID most_visited_item_id) {
   return UTF8ToV8String(base::StringPrintf("chrome-search://thumb/%d/%d",
                                            render_view_id,
                                            most_visited_item_id));
 }
 
-v8::Handle<v8::String> GenerateFaviconURL(
-    int render_view_id,
-    InstantRestrictedID most_visited_item_id) {
-  return UTF8ToV8String(base::StringPrintf("chrome-search://favicon/%d/%d",
-                                           render_view_id,
-                                           most_visited_item_id));
-}
-
 // Populates a Javascript MostVisitedItem object from |mv_item|.
 // NOTE: Includes "url", "title" and "domain" which are private data, so should
 // not be returned to the Instant page. These should be erased before returning
 // the object. See GetMostVisitedItemsWrapper() in searchbox_api.js.
 v8::Handle<v8::Object> GenerateMostVisitedItem(
     int render_view_id,
     InstantRestrictedID restricted_id,
     const InstantMostVisitedItem &mv_item) {
   // We set the "dir" attribute of the title, so that in RTL locales, a LTR
   // title is rendered left-to-right and truncated from the right. For
@@ skipping 10 matching lines @@
   if (base::i18n::StringContainsStrongRTLChars(mv_item.title))
     direction = kRTLHtmlTextDirection;
   else
     direction = kLTRHtmlTextDirection;
 
   string16 title = mv_item.title;
   if (title.empty())
     title = UTF8ToUTF16(mv_item.url.spec());
 
   v8::Handle<v8::Object> obj = v8::Object::New();
+  obj->Set(v8::String::New("renderViewId"), v8::Int32::New(render_view_id));
   obj->Set(v8::String::New("rid"), v8::Int32::New(restricted_id));
   obj->Set(v8::String::New("thumbnailUrl"),
            GenerateThumbnailURL(render_view_id, restricted_id));
-  obj->Set(v8::String::New("faviconUrl"),
-           GenerateFaviconURL(render_view_id, restricted_id));
   obj->Set(v8::String::New("title"), UTF16ToV8String(title));
   obj->Set(v8::String::New("domain"), UTF8ToV8String(mv_item.url.host()));
   obj->Set(v8::String::New("direction"), UTF8ToV8String(direction));
   obj->Set(v8::String::New("url"), UTF8ToV8String(mv_item.url.spec()));
   return obj;
 }
 
 // Returns the render view for the current JS context if it matches |origin|,
 // otherwise returns NULL. Used to restrict methods that access suggestions and
 // most visited data to pages with origin chrome-search://most-visited and
@@ skipping 764 matching lines @@
 void SearchBoxExtensionWrapper::UndoMostVisitedDeletion(
     const v8::FunctionCallbackInfo<v8::Value>& args) {
   content::RenderView* render_view = GetRenderView();
   if (!render_view || !args.Length()) return;
 
   DVLOG(1) << render_view << " UndoMostVisitedDeletion";
   SearchBox::Get(render_view)->UndoMostVisitedDeletion(args[0]->IntegerValue());
 }
 
 }  // namespace extensions_v8