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 557 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
568 prefs.user_gesture_required_for_presentation = !command_line.HasSwitch( | 568 prefs.user_gesture_required_for_presentation = !command_line.HasSwitch( |
569 switches::kDisableGestureRequirementForPresentation); | 569 switches::kDisableGestureRequirementForPresentation); |
570 | 570 |
571 GetContentClient()->browser()->OverrideWebkitPrefs(this, &prefs); | 571 GetContentClient()->browser()->OverrideWebkitPrefs(this, &prefs); |
572 return prefs; | 572 return prefs; |
573 } | 573 } |
574 | 574 |
575 void RenderViewHostImpl::ClosePage() { | 575 void RenderViewHostImpl::ClosePage() { |
576 is_waiting_for_close_ack_ = true; | 576 is_waiting_for_close_ack_ = true; |
577 GetWidget()->StartHangMonitorTimeout( | 577 GetWidget()->StartHangMonitorTimeout( |
578 TimeDelta::FromMilliseconds(kUnloadTimeoutMS)); | 578 TimeDelta::FromMilliseconds(kUnloadTimeoutMS), |
| 579 RenderWidgetHostDelegate::RENDERER_UNRESPONSIVE_CLOSE_PAGE); |
579 | 580 |
580 if (IsRenderViewLive()) { | 581 if (IsRenderViewLive()) { |
581 // Since we are sending an IPC message to the renderer, increase the event | 582 // Since we are sending an IPC message to the renderer, increase the event |
582 // count to prevent the hang monitor timeout from being stopped by input | 583 // count to prevent the hang monitor timeout from being stopped by input |
583 // event acknowledgements. | 584 // event acknowledgements. |
584 GetWidget()->increment_in_flight_event_count(); | 585 GetWidget()->increment_in_flight_event_count(); |
585 | 586 |
586 // TODO(creis): Should this be moved to Shutdown? It may not be called for | 587 // TODO(creis): Should this be moved to Shutdown? It may not be called for |
587 // RenderViewHosts that have been swapped out. | 588 // RenderViewHosts that have been swapped out. |
588 NotificationService::current()->Notify( | 589 NotificationService::current()->Notify( |
(...skipping 742 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1331 // Note: We are using the origin URL provided by the sender here. It may be | 1332 // Note: We are using the origin URL provided by the sender here. It may be |
1332 // different from the receiver's. | 1333 // different from the receiver's. |
1333 file_system_file.url = | 1334 file_system_file.url = |
1334 GURL(storage::GetIsolatedFileSystemRootURIString( | 1335 GURL(storage::GetIsolatedFileSystemRootURIString( |
1335 file_system_url.origin(), filesystem_id, std::string()) | 1336 file_system_url.origin(), filesystem_id, std::string()) |
1336 .append(register_name)); | 1337 .append(register_name)); |
1337 } | 1338 } |
1338 } | 1339 } |
1339 | 1340 |
1340 } // namespace content | 1341 } // namespace content |
OLD | NEW |