| 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 468 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 479 } | 479 } |
| 480 | 480 |
| 481 prefs.v8_script_streaming_enabled = | 481 prefs.v8_script_streaming_enabled = |
| 482 command_line.HasSwitch(switches::kEnableV8ScriptStreaming) || | 482 command_line.HasSwitch(switches::kEnableV8ScriptStreaming) || |
| 483 base::FieldTrialList::FindFullName("V8ScriptStreaming") == "Enabled"; | 483 base::FieldTrialList::FindFullName("V8ScriptStreaming") == "Enabled"; |
| 484 | 484 |
| 485 GetContentClient()->browser()->OverrideWebkitPrefs(this, url, &prefs); | 485 GetContentClient()->browser()->OverrideWebkitPrefs(this, url, &prefs); |
| 486 return prefs; | 486 return prefs; |
| 487 } | 487 } |
| 488 | 488 |
| 489 void RenderViewHostImpl::Navigate(const FrameMsg_Navigate_Params& params) { | |
| 490 TRACE_EVENT0("renderer_host,navigation", "RenderViewHostImpl::Navigate"); | |
| 491 delegate_->GetFrameTree()->GetMainFrame()->Navigate(params); | |
| 492 } | |
| 493 | |
| 494 void RenderViewHostImpl::NavigateToURL(const GURL& url) { | |
| 495 delegate_->GetFrameTree()->GetMainFrame()->NavigateToURL(url); | |
| 496 } | |
| 497 | |
| 498 void RenderViewHostImpl::SuppressDialogsUntilSwapOut() { | 489 void RenderViewHostImpl::SuppressDialogsUntilSwapOut() { |
| 499 Send(new ViewMsg_SuppressDialogsUntilSwapOut(GetRoutingID())); | 490 Send(new ViewMsg_SuppressDialogsUntilSwapOut(GetRoutingID())); |
| 500 } | 491 } |
| 501 | 492 |
| 502 void RenderViewHostImpl::OnSwappedOut(bool timed_out) { | 493 void RenderViewHostImpl::OnSwappedOut(bool timed_out) { |
| 503 // Ignore spurious swap out ack. | 494 // Ignore spurious swap out ack. |
| 504 if (!IsWaitingForUnloadACK()) | 495 if (!IsWaitingForUnloadACK()) |
| 505 return; | 496 return; |
| 506 | 497 |
| 507 TRACE_EVENT0("navigation", "RenderViewHostImpl::OnSwappedOut"); | 498 TRACE_EVENT0("navigation", "RenderViewHostImpl::OnSwappedOut"); |
| (...skipping 1009 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1517 FrameTree* frame_tree = delegate_->GetFrameTree(); | 1508 FrameTree* frame_tree = delegate_->GetFrameTree(); |
| 1518 | 1509 |
| 1519 frame_tree->ResetForMainFrameSwap(); | 1510 frame_tree->ResetForMainFrameSwap(); |
| 1520 } | 1511 } |
| 1521 | 1512 |
| 1522 void RenderViewHostImpl::SelectWordAroundCaret() { | 1513 void RenderViewHostImpl::SelectWordAroundCaret() { |
| 1523 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); | 1514 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); |
| 1524 } | 1515 } |
| 1525 | 1516 |
| 1526 } // namespace content | 1517 } // namespace content |
| OLD | NEW |