| Index: chrome/browser/renderer_host/render_view_host.cc
|
| ===================================================================
|
| --- chrome/browser/renderer_host/render_view_host.cc (revision 9328)
|
| +++ chrome/browser/renderer_host/render_view_host.cc (working copy)
|
| @@ -153,7 +153,8 @@
|
| SYNCHRONIZE,
|
| FALSE,
|
| 0);
|
| - DCHECK(result) << "Couldn't duplicate the modal dialog handle for the renderer.";
|
| + DCHECK(result) <<
|
| + "Couldn't duplicate the modal dialog handle for the renderer.";
|
| #endif
|
|
|
| DCHECK(view());
|
| @@ -311,7 +312,7 @@
|
| }
|
| }
|
|
|
| -void RenderViewHost::SetHasPendingCrossSiteRequest(bool has_pending_request,
|
| +void RenderViewHost::SetHasPendingCrossSiteRequest(bool has_pending_request,
|
| int request_id) {
|
| Singleton<CrossSiteRequestManager>()->SetHasPendingCrossSiteRequest(
|
| process()->host_id(), routing_id(), has_pending_request);
|
| @@ -385,7 +386,8 @@
|
| // Grant the renderer the ability to load the drop_data.
|
| RendererSecurityPolicy* policy = RendererSecurityPolicy::GetInstance();
|
| policy->GrantRequestURL(process()->host_id(), drop_data.url);
|
| - for (std::vector<std::wstring>::const_iterator iter(drop_data.filenames.begin());
|
| + for (std::vector<std::wstring>::const_iterator
|
| + iter(drop_data.filenames.begin());
|
| iter != drop_data.filenames.end(); ++iter) {
|
| policy->GrantRequestURL(process()->host_id(),
|
| net::FilePathToFileURL(*iter));
|
| @@ -518,7 +520,8 @@
|
|
|
| if (--modal_dialog_count_ == 0)
|
| modal_dialog_event_->Reset();
|
| - ViewHostMsg_RunJavaScriptMessage::WriteReplyParams(reply_msg, success, prompt);
|
| + ViewHostMsg_RunJavaScriptMessage::WriteReplyParams(reply_msg,
|
| + success, prompt);
|
| Send(reply_msg);
|
| }
|
|
|
| @@ -575,7 +578,8 @@
|
| void RenderViewHost::AllowDOMUIBindings() {
|
| DCHECK(!renderer_initialized_);
|
| enable_dom_ui_bindings_ = true;
|
| - RendererSecurityPolicy::GetInstance()->GrantDOMUIBindings(process()->host_id());
|
| + RendererSecurityPolicy::GetInstance()->GrantDOMUIBindings(
|
| + process()->host_id());
|
| }
|
|
|
| void RenderViewHost::AllowExternalHostBindings() {
|
| @@ -939,7 +943,8 @@
|
| FilterURL(RendererSecurityPolicy::GetInstance(),
|
| process()->host_id(), &validated_url);
|
|
|
| - delegate_->DidStartProvisionalLoadForFrame(this, is_main_frame, validated_url);
|
| + delegate_->DidStartProvisionalLoadForFrame(this, is_main_frame,
|
| + validated_url);
|
| }
|
|
|
| void RenderViewHost::OnMsgDidFailProvisionalLoadWithError(
|
| @@ -1276,6 +1281,10 @@
|
| delegate_->RendererResponsive(this);
|
| }
|
|
|
| +gfx::Rect RenderViewHost::GetRootWindowResizerRect() const {
|
| + return delegate_->GetRootWindowResizerRect();
|
| +}
|
| +
|
| void RenderViewHost::OnDebugDisconnect() {
|
| if (debugger_attached_) {
|
| debugger_attached_ = false;
|
|
|