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

Unified Diff: content/renderer/render_widget.cc

Issue 9609008: Implemented Browser Plugin (NOT FOR REVIEW) (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Initial plumbing of a guest flag to RenderViewImpl (cleaner than early prototype) Created 8 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
« no previous file with comments | « content/renderer/render_widget.h ('k') | example.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_widget.cc
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index ee0f8973d5d1318ba451b3d46c3265751b6f040d..73c6828151cfe270660299d87a2d13030d3b8d8e 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -182,13 +182,15 @@ void RenderWidget::DoInit(int32 opener_id,
// This is used to complete pending inits and non-pending inits. For non-
// pending cases, the parent will be the same as the current parent. This
// indicates we do not need to reparent or anything.
-void RenderWidget::CompleteInit(gfx::NativeViewId parent_hwnd) {
+void RenderWidget::CompleteInit(gfx::NativeViewId parent_hwnd, bool guest) {
DCHECK(routing_id_ != MSG_ROUTING_NONE);
- host_window_ = parent_hwnd;
- host_window_set_ = true;
+ if (!guest) {
+ host_window_ = parent_hwnd;
+ host_window_set_ = true;
- DoDeferredUpdate();
+ DoDeferredUpdate();
+ }
Send(new ViewHostMsg_RenderViewReady(routing_id_));
}
@@ -333,7 +335,7 @@ void RenderWidget::OnCreatingNewAck(
gfx::NativeViewId parent) {
DCHECK(routing_id_ != MSG_ROUTING_NONE);
- CompleteInit(parent);
+ CompleteInit(parent, false);
}
void RenderWidget::OnResize(const gfx::Size& new_size,
« no previous file with comments | « content/renderer/render_widget.h ('k') | example.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698