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

Unified Diff: chrome/browser/instant/instant_loader.cc

Issue 9473001: Extract minimal RenderViewHost interface for embedders, leaving (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to LKGR. Created 8 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/instant/instant_loader.cc
diff --git a/chrome/browser/instant/instant_loader.cc b/chrome/browser/instant/instant_loader.cc
index 9c86dd0645bb93bbf7a5d2d0649d0f7ca2728aaa..34837fe06981a64805128c87f720a1507ff3312d 100644
--- a/chrome/browser/instant/instant_loader.cc
+++ b/chrome/browser/instant/instant_loader.cc
@@ -166,7 +166,7 @@ void InstantLoader::FrameLoadObserver::Observe(
int text_length = static_cast<int>(text_.size());
RenderViewHost* host = web_contents_->GetRenderViewHost();
host->Send(new ChromeViewMsg_DetermineIfPageSupportsInstant(
- host->routing_id(), text_, verbatim_, text_length, text_length));
+ host->GetRoutingID(), text_, verbatim_, text_length, text_length));
break;
}
default:
@@ -689,7 +689,11 @@ bool InstantLoader::Update(TabContentsWrapper* tab_contents,
RenderViewHost* host =
preview_contents_->web_contents()->GetRenderViewHost();
host->Send(new ChromeViewMsg_SearchBoxChange(
- host->routing_id(), user_text_, verbatim, text_length, text_length));
+ host->GetRoutingID(),
+ user_text_,
+ verbatim,
+ text_length,
+ text_length));
string16 complete_suggested_text_lower = base::i18n::ToLower(
complete_suggested_text_);
@@ -760,10 +764,10 @@ TabContentsWrapper* InstantLoader::ReleasePreviewContents(
RenderViewHost* host =
preview_contents_->web_contents()->GetRenderViewHost();
if (type == INSTANT_COMMIT_FOCUS_LOST) {
- host->Send(new ChromeViewMsg_SearchBoxCancel(host->routing_id()));
+ host->Send(new ChromeViewMsg_SearchBoxCancel(host->GetRoutingID()));
} else {
host->Send(new ChromeViewMsg_SearchBoxSubmit(
- host->routing_id(), user_text_,
+ host->GetRoutingID(), user_text_,
type == INSTANT_COMMIT_PRESSED_ENTER));
}
}
@@ -998,7 +1002,7 @@ void InstantLoader::SendBoundsToPage(bool force_if_waiting) {
RenderViewHost* host =
preview_contents_->web_contents()->GetRenderViewHost();
host->Send(new ChromeViewMsg_SearchBoxResize(
- host->routing_id(), GetOmniboxBoundsInTermsOfPreview()));
+ host->GetRoutingID(), GetOmniboxBoundsInTermsOfPreview()));
}
}
@@ -1120,10 +1124,10 @@ void InstantLoader::LoadInstantURL(TabContentsWrapper* tab_contents,
// send a SearchBoxChange message.
if (user_text.empty()) {
host->Send(new ChromeViewMsg_SearchBoxResize(
- host->routing_id(), GetOmniboxBoundsInTermsOfPreview()));
+ host->GetRoutingID(), GetOmniboxBoundsInTermsOfPreview()));
} else {
host->Send(new ChromeViewMsg_SearchBoxChange(
- host->routing_id(), user_text, verbatim, 0, 0));
+ host->GetRoutingID(), user_text, verbatim, 0, 0));
}
frame_load_observer_.reset(new FrameLoadObserver(
« no previous file with comments | « chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc ('k') | chrome/browser/memory_details.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698