| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/renderer_host/render_view_host_impl.h" | 5 #include "content/browser/renderer_host/render_view_host_impl.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 377 GetWidget()->GetResizeParams(¶ms->initial_size); | 377 GetWidget()->GetResizeParams(¶ms->initial_size); |
| 378 GetWidget()->SetInitialRenderSizeParams(params->initial_size); | 378 GetWidget()->SetInitialRenderSizeParams(params->initial_size); |
| 379 | 379 |
| 380 RenderProcessHostImpl* process = | 380 RenderProcessHostImpl* process = |
| 381 static_cast<RenderProcessHostImpl*>(GetProcess()); | 381 static_cast<RenderProcessHostImpl*>(GetProcess()); |
| 382 process->GetRendererInterface()->CreateView(std::move(params)); | 382 process->GetRendererInterface()->CreateView(std::move(params)); |
| 383 | 383 |
| 384 // If the RWHV has not yet been set, the surface ID namespace will get | 384 // If the RWHV has not yet been set, the surface ID namespace will get |
| 385 // passed down by the call to SetView(). | 385 // passed down by the call to SetView(). |
| 386 if (GetWidget()->GetView()) { | 386 if (GetWidget()->GetView()) { |
| 387 Send(new ViewMsg_SetSurfaceClientId( | 387 Send(new ViewMsg_SetFrameSinkId(GetRoutingID(), |
| 388 GetRoutingID(), GetWidget()->GetView()->GetSurfaceClientId())); | 388 GetWidget()->GetView()->GetFrameSinkId())); |
| 389 } | 389 } |
| 390 | 390 |
| 391 // If it's enabled, tell the renderer to set up the Javascript bindings for | 391 // If it's enabled, tell the renderer to set up the Javascript bindings for |
| 392 // sending messages back to the browser. | 392 // sending messages back to the browser. |
| 393 if (GetProcess()->IsForGuestsOnly()) | 393 if (GetProcess()->IsForGuestsOnly()) |
| 394 DCHECK_EQ(0, enabled_bindings_); | 394 DCHECK_EQ(0, enabled_bindings_); |
| 395 Send(new ViewMsg_AllowBindings(GetRoutingID(), enabled_bindings_)); | 395 Send(new ViewMsg_AllowBindings(GetRoutingID(), enabled_bindings_)); |
| 396 // Let our delegate know that we created a RenderView. | 396 // Let our delegate know that we created a RenderView. |
| 397 delegate_->RenderViewCreated(this); | 397 delegate_->RenderViewCreated(this); |
| 398 | 398 |
| (...skipping 928 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1327 // Note: We are using the origin URL provided by the sender here. It may be | 1327 // Note: We are using the origin URL provided by the sender here. It may be |
| 1328 // different from the receiver's. | 1328 // different from the receiver's. |
| 1329 file_system_file.url = | 1329 file_system_file.url = |
| 1330 GURL(storage::GetIsolatedFileSystemRootURIString( | 1330 GURL(storage::GetIsolatedFileSystemRootURIString( |
| 1331 file_system_url.origin(), filesystem_id, std::string()) | 1331 file_system_url.origin(), filesystem_id, std::string()) |
| 1332 .append(register_name)); | 1332 .append(register_name)); |
| 1333 } | 1333 } |
| 1334 } | 1334 } |
| 1335 | 1335 |
| 1336 } // namespace content | 1336 } // namespace content |
| OLD | NEW |