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 307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
318 params.opener_route_id = opener_route_id; | 318 params.opener_route_id = opener_route_id; |
319 params.swapped_out = !is_active_; | 319 params.swapped_out = !is_active_; |
320 params.proxy_routing_id = proxy_route_id; | 320 params.proxy_routing_id = proxy_route_id; |
321 params.hidden = is_hidden(); | 321 params.hidden = is_hidden(); |
322 params.never_visible = delegate_->IsNeverVisible(); | 322 params.never_visible = delegate_->IsNeverVisible(); |
323 params.window_was_created_with_opener = window_was_created_with_opener; | 323 params.window_was_created_with_opener = window_was_created_with_opener; |
324 params.next_page_id = next_page_id; | 324 params.next_page_id = next_page_id; |
325 params.enable_auto_resize = auto_resize_enabled(); | 325 params.enable_auto_resize = auto_resize_enabled(); |
326 params.min_size = min_size_for_auto_resize(); | 326 params.min_size = min_size_for_auto_resize(); |
327 params.max_size = max_size_for_auto_resize(); | 327 params.max_size = max_size_for_auto_resize(); |
328 UpdateScreenInfo(); | |
329 GetResizeParams(¶ms.initial_size); | 328 GetResizeParams(¶ms.initial_size); |
330 if (!is_active_) { | 329 if (!is_active_) { |
331 params.replicated_frame_state = | 330 params.replicated_frame_state = |
332 static_cast<RenderFrameHostImpl*>(GetMainFrame())->frame_tree_node() | 331 static_cast<RenderFrameHostImpl*>(GetMainFrame())->frame_tree_node() |
333 ->current_replication_state(); | 332 ->current_replication_state(); |
334 } | 333 } |
335 | 334 |
336 if (!Send(new ViewMsg_New(params))) | 335 if (!Send(new ViewMsg_New(params))) |
337 return false; | 336 return false; |
338 SetInitialRenderSizeParams(params.initial_size); | 337 SetInitialRenderSizeParams(params.initial_size); |
(...skipping 1081 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1420 FrameTree* frame_tree = delegate_->GetFrameTree(); | 1419 FrameTree* frame_tree = delegate_->GetFrameTree(); |
1421 | 1420 |
1422 frame_tree->ResetForMainFrameSwap(); | 1421 frame_tree->ResetForMainFrameSwap(); |
1423 } | 1422 } |
1424 | 1423 |
1425 void RenderViewHostImpl::SelectWordAroundCaret() { | 1424 void RenderViewHostImpl::SelectWordAroundCaret() { |
1426 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); | 1425 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); |
1427 } | 1426 } |
1428 | 1427 |
1429 } // namespace content | 1428 } // namespace content |
OLD | NEW |