Index: chrome/renderer/searchbox/searchbox_extension.cc |
diff --git a/chrome/renderer/searchbox/searchbox_extension.cc b/chrome/renderer/searchbox/searchbox_extension.cc |
index cbcd71c858797c417d0e48d49cd54b8adc246f35..dee7ea9b91229a3cfa34e4d41d470b5c58b4a736 100644 |
--- a/chrome/renderer/searchbox/searchbox_extension.cc |
+++ b/chrome/renderer/searchbox/searchbox_extension.cc |
@@ -92,6 +92,27 @@ v8::Handle<v8::String> GenerateThumbnailURL( |
"chrome-search://thumb/%d/%d", render_view_id, most_visited_item_id)); |
} |
+v8::Handle<v8::String> GenerateBigIconURL( |
+ v8::Isolate* isolate, |
+ int render_view_id, |
+ InstantRestrictedID most_visited_item_id) { |
+ int size = 48; |
+ return UTF8ToV8String( |
+ isolate, |
+ base::StringPrintf("chrome-search://big-icon/%d/%d/%d", |
+ size, render_view_id, most_visited_item_id)); |
+} |
+ |
+v8::Handle<v8::String> GenerateFallbackIconURL( |
+ v8::Isolate* isolate, |
+ int render_view_id, |
+ InstantRestrictedID most_visited_item_id) { |
+ return UTF8ToV8String( |
+ isolate, |
+ base::StringPrintf("chrome-search://fallback-icon/,,,,1/%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 |
@@ -122,6 +143,8 @@ v8::Handle<v8::Object> GenerateMostVisitedItem( |
if (title.empty()) |
title = base::UTF8ToUTF16(mv_item.url.spec()); |
+ bool use_big_icon = true; |
+ |
v8::Handle<v8::Object> obj = v8::Object::New(isolate); |
obj->Set(v8::String::NewFromUtf8(isolate, "renderViewId"), |
v8::Int32::New(isolate, render_view_id)); |
@@ -129,6 +152,12 @@ v8::Handle<v8::Object> GenerateMostVisitedItem( |
v8::Int32::New(isolate, restricted_id)); |
obj->Set(v8::String::NewFromUtf8(isolate, "thumbnailUrl"), |
GenerateThumbnailURL(isolate, render_view_id, restricted_id)); |
+ if (use_big_icon) { |
+ obj->Set(v8::String::NewFromUtf8(isolate, "bigIconUrl"), |
+ GenerateBigIconURL(isolate, render_view_id, restricted_id)); |
+ obj->Set(v8::String::NewFromUtf8(isolate, "fallbackIconUrl"), |
+ GenerateFallbackIconURL(isolate, render_view_id, restricted_id)); |
+ } |
obj->Set(v8::String::NewFromUtf8(isolate, "title"), |
UTF16ToV8String(isolate, title)); |
obj->Set(v8::String::NewFromUtf8(isolate, "domain"), |