Index: chrome/browser/devtools/devtools_window.cc |
diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc |
index 608ac7a7a65cfd2fcc4c76bae20292f2b57ce19e..dc6cdc3a1a7b91925910ae58f6886e5b6f4e8a42 100644 |
--- a/chrome/browser/devtools/devtools_window.cc |
+++ b/chrome/browser/devtools/devtools_window.cc |
@@ -722,6 +722,18 @@ DevToolsWindow::DevToolsWindow(Profile* profile, |
if (inspected_rvh) |
inspected_contents_observer_.reset(new ObserverWithAccessor( |
content::WebContents::FromRenderViewHost(inspected_rvh))); |
+ |
+ // Initialize docked page to be of the right size. |
+ WebContents* inspected_web_contents = GetInspectedWebContents(); |
+ if (can_dock_ && inspected_web_contents) { |
+ content::RenderWidgetHostView* inspected_view = |
+ inspected_web_contents->GetRenderWidgetHostView(); |
+ if (inspected_view && main_web_contents_->GetRenderWidgetHostView()) { |
+ gfx::Size size = inspected_view->GetViewBounds().size(); |
+ main_web_contents_->GetRenderWidgetHostView()->SetSize(size); |
+ } |
+ } |
+ |
event_forwarder_.reset(new DevToolsEventForwarder(this)); |
} |
@@ -853,9 +865,12 @@ void DevToolsWindow::AddNewContents(WebContents* source, |
toolbox_web_contents_->SetDelegate( |
new DevToolsToolboxDelegate(toolbox_web_contents_, |
inspected_contents_observer_.get())); |
- gfx::Size size = main_web_contents_->GetViewBounds().size(); |
- if (toolbox_web_contents_->GetRenderWidgetHostView()) |
+ if (main_web_contents_->GetRenderWidgetHostView() && |
+ toolbox_web_contents_->GetRenderWidgetHostView()) { |
+ gfx::Size size = |
+ main_web_contents_->GetRenderWidgetHostView()->GetViewBounds().size(); |
toolbox_web_contents_->GetRenderWidgetHostView()->SetSize(size); |
+ } |
UpdateBrowserWindow(); |
return; |
} |