Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(393)

Side by Side Diff: chrome/renderer/searchbox/searchbox_extension.cc

Issue 15388002: Supporting high dpi favicons in Instant Extended. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressing Samarth's comments Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/renderer/searchbox/searchbox_extension.h" 5 #include "chrome/renderer/searchbox/searchbox_extension.h"
6 6
7 #include "base/i18n/rtl.h" 7 #include "base/i18n/rtl.h"
8 #include "base/strings/string_number_conversions.h" 8 #include "base/strings/string_number_conversions.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "base/strings/stringprintf.h" 10 #include "base/strings/stringprintf.h"
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 if (base::i18n::StringContainsStrongRTLChars(mv_item.title)) 193 if (base::i18n::StringContainsStrongRTLChars(mv_item.title))
194 direction = kRTLHtmlTextDirection; 194 direction = kRTLHtmlTextDirection;
195 else 195 else
196 direction = kLTRHtmlTextDirection; 196 direction = kLTRHtmlTextDirection;
197 197
198 string16 title = mv_item.title; 198 string16 title = mv_item.title;
199 if (title.empty()) 199 if (title.empty())
200 title = UTF8ToUTF16(mv_item.url.spec()); 200 title = UTF8ToUTF16(mv_item.url.spec());
201 201
202 v8::Handle<v8::Object> obj = v8::Object::New(); 202 v8::Handle<v8::Object> obj = v8::Object::New();
203 obj->Set(v8::String::New("renderViewId"), v8::Int32::New(render_view_id));
203 obj->Set(v8::String::New("rid"), v8::Int32::New(restricted_id)); 204 obj->Set(v8::String::New("rid"), v8::Int32::New(restricted_id));
204 obj->Set(v8::String::New("thumbnailUrl"), 205 obj->Set(v8::String::New("thumbnailUrl"),
205 GenerateThumbnailURL(render_view_id, restricted_id)); 206 GenerateThumbnailURL(render_view_id, restricted_id));
206 obj->Set(v8::String::New("faviconUrl"), 207 obj->Set(v8::String::New("faviconUrl"),
207 GenerateFaviconURL(render_view_id, restricted_id)); 208 GenerateFaviconURL(render_view_id, restricted_id));
208 obj->Set(v8::String::New("title"), UTF16ToV8String(title)); 209 obj->Set(v8::String::New("title"), UTF16ToV8String(title));
209 obj->Set(v8::String::New("domain"), UTF8ToV8String(mv_item.url.host())); 210 obj->Set(v8::String::New("domain"), UTF8ToV8String(mv_item.url.host()));
210 obj->Set(v8::String::New("direction"), UTF8ToV8String(direction)); 211 obj->Set(v8::String::New("direction"), UTF8ToV8String(direction));
211 obj->Set(v8::String::New("url"), UTF8ToV8String(mv_item.url.spec())); 212 obj->Set(v8::String::New("url"), UTF8ToV8String(mv_item.url.spec()));
212 return obj; 213 return obj;
(...skipping 1331 matching lines...) Expand 10 before | Expand all | Expand 10 after
1544 Dispatch(frame, kDispatchInputCancelScript); 1545 Dispatch(frame, kDispatchInputCancelScript);
1545 } 1546 }
1546 1547
1547 // static 1548 // static
1548 void SearchBoxExtension::DispatchToggleVoiceSearch( 1549 void SearchBoxExtension::DispatchToggleVoiceSearch(
1549 WebKit::WebFrame* frame) { 1550 WebKit::WebFrame* frame) {
1550 Dispatch(frame, kDispatchToggleVoiceSearchScript); 1551 Dispatch(frame, kDispatchToggleVoiceSearchScript);
1551 } 1552 }
1552 1553
1553 } // namespace extensions_v8 1554 } // namespace extensions_v8
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698