| 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 514 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 525 | 525 |
| 526 prefs.v8_cache_options = GetV8CacheOptions(); | 526 prefs.v8_cache_options = GetV8CacheOptions(); |
| 527 | 527 |
| 528 prefs.user_gesture_required_for_presentation = !command_line.HasSwitch( | 528 prefs.user_gesture_required_for_presentation = !command_line.HasSwitch( |
| 529 switches::kDisableGestureRequirementForPresentation); | 529 switches::kDisableGestureRequirementForPresentation); |
| 530 | 530 |
| 531 GetContentClient()->browser()->OverrideWebkitPrefs(this, &prefs); | 531 GetContentClient()->browser()->OverrideWebkitPrefs(this, &prefs); |
| 532 return prefs; | 532 return prefs; |
| 533 } | 533 } |
| 534 | 534 |
| 535 void RenderViewHostImpl::SuppressDialogsUntilSwapOut() { | |
| 536 Send(new ViewMsg_SuppressDialogsUntilSwapOut(GetRoutingID())); | |
| 537 } | |
| 538 | |
| 539 void RenderViewHostImpl::ClosePage() { | 535 void RenderViewHostImpl::ClosePage() { |
| 540 is_waiting_for_close_ack_ = true; | 536 is_waiting_for_close_ack_ = true; |
| 541 GetWidget()->StartHangMonitorTimeout( | 537 GetWidget()->StartHangMonitorTimeout( |
| 542 TimeDelta::FromMilliseconds(kUnloadTimeoutMS)); | 538 TimeDelta::FromMilliseconds(kUnloadTimeoutMS)); |
| 543 | 539 |
| 544 if (IsRenderViewLive()) { | 540 if (IsRenderViewLive()) { |
| 545 // Since we are sending an IPC message to the renderer, increase the event | 541 // Since we are sending an IPC message to the renderer, increase the event |
| 546 // count to prevent the hang monitor timeout from being stopped by input | 542 // count to prevent the hang monitor timeout from being stopped by input |
| 547 // event acknowledgements. | 543 // event acknowledgements. |
| 548 GetWidget()->increment_in_flight_event_count(); | 544 GetWidget()->increment_in_flight_event_count(); |
| (...skipping 802 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1351 } else { | 1347 } else { |
| 1352 render_view_ready_on_process_launch_ = true; | 1348 render_view_ready_on_process_launch_ = true; |
| 1353 } | 1349 } |
| 1354 } | 1350 } |
| 1355 | 1351 |
| 1356 void RenderViewHostImpl::RenderViewReady() { | 1352 void RenderViewHostImpl::RenderViewReady() { |
| 1357 delegate_->RenderViewReady(this); | 1353 delegate_->RenderViewReady(this); |
| 1358 } | 1354 } |
| 1359 | 1355 |
| 1360 } // namespace content | 1356 } // namespace content |
| OLD | NEW |