| Index: chrome/browser/instant/instant_client.cc
|
| diff --git a/chrome/browser/instant/instant_client.cc b/chrome/browser/instant/instant_client.cc
|
| index c77f7cdd6e25e9355519227e42ce255a1e999d63..ab5d339e323f144101d0852bae88a1eca868c7c9 100644
|
| --- a/chrome/browser/instant/instant_client.cc
|
| +++ b/chrome/browser/instant/instant_client.cc
|
| @@ -47,6 +47,16 @@ void InstantClient::SetMarginSize(const int start, const int end) {
|
| Send(new ChromeViewMsg_SearchBoxMarginChange(routing_id(), start, end));
|
| }
|
|
|
| +void InstantClient::InitializeFonts() {
|
| + const gfx::Font& omnibox_font =
|
| + ui::ResourceBundle::GetSharedInstance().GetFont(
|
| + ui::ResourceBundle::MediumFont);
|
| + string16 omnibox_font_name = UTF8ToUTF16(omnibox_font.GetFontName());
|
| + size_t omnibox_font_size = omnibox_font.GetFontSize();
|
| + Send(new ChromeViewMsg_SearchBoxFontInformation(
|
| + routing_id(), omnibox_font_name, omnibox_font_size));
|
| +}
|
| +
|
| void InstantClient::DetermineIfPageSupportsInstant() {
|
| Send(new ChromeViewMsg_DetermineIfPageSupportsInstant(routing_id()));
|
| }
|
| @@ -83,6 +93,11 @@ void InstantClient::KeyCaptureChanged(bool is_key_capture_enabled) {
|
| is_key_capture_enabled));
|
| }
|
|
|
| +void InstantClient::RenderViewCreated(
|
| + content::RenderViewHost* render_view_host) {
|
| + delegate_->RenderViewCreated();
|
| +}
|
| +
|
| void InstantClient::DidFinishLoad(
|
| int64 /* frame_id */,
|
| const GURL& /* validated_url */,
|
| @@ -134,17 +149,6 @@ void InstantClient::SetSuggestions(
|
| }
|
|
|
| void InstantClient::InstantSupportDetermined(int page_id, bool result) {
|
| - if (result) {
|
| - // Inform the renderer process of the Omnibox's font information.
|
| - const gfx::Font& omnibox_font =
|
| - ui::ResourceBundle::GetSharedInstance().GetFont(
|
| - ui::ResourceBundle::MediumFont);
|
| - string16 omnibox_font_name = UTF8ToUTF16(omnibox_font.GetFontName());
|
| - size_t omnibox_font_size = omnibox_font.GetFontSize();
|
| -
|
| - Send(new ChromeViewMsg_SearchBoxFontInformation(
|
| - routing_id(), omnibox_font_name, omnibox_font_size));
|
| - }
|
| if (web_contents()->IsActiveEntry(page_id))
|
| delegate_->InstantSupportDetermined(result);
|
| }
|
|
|