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 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
209 } else { | 209 } else { |
210 rvh_state_ = STATE_DEFAULT; | 210 rvh_state_ = STATE_DEFAULT; |
211 instance_->increment_active_view_count(); | 211 instance_->increment_active_view_count(); |
212 } | 212 } |
213 | 213 |
214 if (ResourceDispatcherHostImpl::Get()) { | 214 if (ResourceDispatcherHostImpl::Get()) { |
215 BrowserThread::PostTask( | 215 BrowserThread::PostTask( |
216 BrowserThread::IO, FROM_HERE, | 216 BrowserThread::IO, FROM_HERE, |
217 base::Bind(&ResourceDispatcherHostImpl::OnRenderViewHostCreated, | 217 base::Bind(&ResourceDispatcherHostImpl::OnRenderViewHostCreated, |
218 base::Unretained(ResourceDispatcherHostImpl::Get()), | 218 base::Unretained(ResourceDispatcherHostImpl::Get()), |
219 GetProcess()->GetID(), GetRoutingID())); | 219 GetProcess()->GetID(), |
| 220 GetRoutingID(), |
| 221 base::Unretained(widget_delegate))); |
220 } | 222 } |
221 | 223 |
222 #if defined(ENABLE_BROWSER_CDMS) | 224 #if defined(ENABLE_BROWSER_CDMS) |
223 media_web_contents_observer_.reset(new MediaWebContentsObserver(this)); | 225 media_web_contents_observer_.reset(new MediaWebContentsObserver(this)); |
224 #endif | 226 #endif |
225 | 227 |
226 unload_event_monitor_timeout_.reset(new TimeoutMonitor(base::Bind( | 228 unload_event_monitor_timeout_.reset(new TimeoutMonitor(base::Bind( |
227 &RenderViewHostImpl::OnSwappedOut, weak_factory_.GetWeakPtr(), true))); | 229 &RenderViewHostImpl::OnSwappedOut, weak_factory_.GetWeakPtr(), true))); |
228 } | 230 } |
229 | 231 |
(...skipping 1337 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1567 FrameTree* frame_tree = delegate_->GetFrameTree(); | 1569 FrameTree* frame_tree = delegate_->GetFrameTree(); |
1568 | 1570 |
1569 frame_tree->ResetForMainFrameSwap(); | 1571 frame_tree->ResetForMainFrameSwap(); |
1570 } | 1572 } |
1571 | 1573 |
1572 void RenderViewHostImpl::SelectWordAroundCaret() { | 1574 void RenderViewHostImpl::SelectWordAroundCaret() { |
1573 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); | 1575 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); |
1574 } | 1576 } |
1575 | 1577 |
1576 } // namespace content | 1578 } // namespace content |
OLD | NEW |