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/web_contents/web_contents_impl.h" | 5 #include "content/browser/web_contents/web_contents_impl.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
(...skipping 3376 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3387 | 3387 |
3388 // Ensure fullscreen mode is exited in the |delegate_| since a crashed | 3388 // Ensure fullscreen mode is exited in the |delegate_| since a crashed |
3389 // renderer may not have made a clean exit. | 3389 // renderer may not have made a clean exit. |
3390 if (IsFullscreenForCurrentTab()) | 3390 if (IsFullscreenForCurrentTab()) |
3391 ToggleFullscreenMode(false); | 3391 ToggleFullscreenMode(false); |
3392 | 3392 |
3393 // Cancel any visible dialogs so they are not left dangling over the sad tab. | 3393 // Cancel any visible dialogs so they are not left dangling over the sad tab. |
3394 if (dialog_manager_) | 3394 if (dialog_manager_) |
3395 dialog_manager_->CancelActiveAndPendingDialogs(this); | 3395 dialog_manager_->CancelActiveAndPendingDialogs(this); |
3396 | 3396 |
| 3397 if (delegate_) |
| 3398 delegate_->HideValidationMessage(this); |
| 3399 |
3397 SetIsLoading(rvh, false, true, NULL); | 3400 SetIsLoading(rvh, false, true, NULL); |
3398 NotifyDisconnected(); | 3401 NotifyDisconnected(); |
3399 SetIsCrashed(status, error_code); | 3402 SetIsCrashed(status, error_code); |
3400 | 3403 |
3401 // Reset the loading progress. TODO(avi): What does it mean to have a | 3404 // Reset the loading progress. TODO(avi): What does it mean to have a |
3402 // "renderer crash" when there is more than one renderer process serving a | 3405 // "renderer crash" when there is more than one renderer process serving a |
3403 // webpage? Once this function is called at a more granular frame level, we | 3406 // webpage? Once this function is called at a more granular frame level, we |
3404 // probably will need to more granularly reset the state here. | 3407 // probably will need to more granularly reset the state here. |
3405 ResetLoadProgressState(); | 3408 ResetLoadProgressState(); |
3406 loading_frames_in_progress_ = 0; | 3409 loading_frames_in_progress_ = 0; |
(...skipping 690 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4097 if (new_size != old_size) | 4100 if (new_size != old_size) |
4098 delegate_->UpdatePreferredSize(this, new_size); | 4101 delegate_->UpdatePreferredSize(this, new_size); |
4099 } | 4102 } |
4100 | 4103 |
4101 void WebContentsImpl::ResumeResponseDeferredAtStart() { | 4104 void WebContentsImpl::ResumeResponseDeferredAtStart() { |
4102 FrameTreeNode* node = frame_tree_.root(); | 4105 FrameTreeNode* node = frame_tree_.root(); |
4103 node->render_manager()->ResumeResponseDeferredAtStart(); | 4106 node->render_manager()->ResumeResponseDeferredAtStart(); |
4104 } | 4107 } |
4105 | 4108 |
4106 } // namespace content | 4109 } // namespace content |
OLD | NEW |