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

Unified Diff: extensions/browser/guest_view/guest_view_base.cc

Issue 1008913002: Remove RenderViewHost parameter from WebContentsObserver::Did{Start|Stop}Loading. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 9 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: extensions/browser/guest_view/guest_view_base.cc
diff --git a/extensions/browser/guest_view/guest_view_base.cc b/extensions/browser/guest_view/guest_view_base.cc
index 29718ffedf2dbfbf87e93b1febe276ce7978faf5..980bd2fe1cf42dc4fda792c4542b692947437e3c 100644
--- a/extensions/browser/guest_view/guest_view_base.cc
+++ b/extensions/browser/guest_view/guest_view_base.cc
@@ -545,18 +545,19 @@ double GuestViewBase::PhysicalPixelsToLogicalPixels(int physical_pixels) {
return physical_pixels / zoom_factor;
}
-void GuestViewBase::DidStopLoading(content::RenderViewHost* render_view_host) {
- if (IsPreferredSizeModeEnabled()) {
- render_view_host->EnablePreferredSizeMode();
- }
+void GuestViewBase::DidStopLoading() {
+ content::RenderViewHost* rvh = web_contents()->GetRenderViewHost();
+
+ if (IsPreferredSizeModeEnabled())
+ rvh->EnablePreferredSizeMode();
if (!IsDragAndDropEnabled()) {
- const char script[] = "window.addEventListener('dragstart', function() { "
- " window.event.preventDefault(); "
- "});";
- render_view_host->GetMainFrame()->ExecuteJavaScript(
- base::ASCIIToUTF16(script));
+ const char script[] =
+ "window.addEventListener('dragstart', function() { "
+ " window.event.preventDefault(); "
+ "});";
+ rvh->GetMainFrame()->ExecuteJavaScript(base::ASCIIToUTF16(script));
}
- DidStopLoading();
+ GuestViewDidStopLoading();
}
void GuestViewBase::RenderViewReady() {
« no previous file with comments | « extensions/browser/guest_view/guest_view_base.h ('k') | extensions/browser/guest_view/web_view/web_view_guest.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698