| 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/lazy_instance.h" | 10 #include "base/lazy_instance.h" |
| (...skipping 1097 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1108 audio_muter_->StopMuting(); | 1108 audio_muter_->StopMuting(); |
| 1109 } | 1109 } |
| 1110 | 1110 |
| 1111 // Notification for UI updates in response to the changed muting state. | 1111 // Notification for UI updates in response to the changed muting state. |
| 1112 NotifyNavigationStateChanged(INVALIDATE_TYPE_TAB); | 1112 NotifyNavigationStateChanged(INVALIDATE_TYPE_TAB); |
| 1113 } | 1113 } |
| 1114 | 1114 |
| 1115 bool WebContentsImpl::IsCrashed() const { | 1115 bool WebContentsImpl::IsCrashed() const { |
| 1116 return (crashed_status_ == base::TERMINATION_STATUS_PROCESS_CRASHED || | 1116 return (crashed_status_ == base::TERMINATION_STATUS_PROCESS_CRASHED || |
| 1117 crashed_status_ == base::TERMINATION_STATUS_ABNORMAL_TERMINATION || | 1117 crashed_status_ == base::TERMINATION_STATUS_ABNORMAL_TERMINATION || |
| 1118 crashed_status_ == base::TERMINATION_STATUS_PROCESS_WAS_KILLED | 1118 crashed_status_ == base::TERMINATION_STATUS_PROCESS_WAS_KILLED || |
| 1119 #if defined(OS_CHROMEOS) | 1119 #if defined(OS_CHROMEOS) |
| 1120 || | 1120 crashed_status_ == |
| 1121 crashed_status_ == base::TERMINATION_STATUS_PROCESS_WAS_KILLED_BY_OOM | 1121 base::TERMINATION_STATUS_PROCESS_WAS_KILLED_BY_OOM || |
| 1122 #endif | 1122 #endif |
| 1123 crashed_status_ == base::TERMINATION_STATUS_LAUNCH_FAILED |
| 1123 ); | 1124 ); |
| 1124 } | 1125 } |
| 1125 | 1126 |
| 1126 void WebContentsImpl::SetIsCrashed(base::TerminationStatus status, | 1127 void WebContentsImpl::SetIsCrashed(base::TerminationStatus status, |
| 1127 int error_code) { | 1128 int error_code) { |
| 1128 if (status == crashed_status_) | 1129 if (status == crashed_status_) |
| 1129 return; | 1130 return; |
| 1130 | 1131 |
| 1131 crashed_status_ = status; | 1132 crashed_status_ = status; |
| 1132 crashed_error_code_ = error_code; | 1133 crashed_error_code_ = error_code; |
| (...skipping 3476 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4609 player_map->erase(it); | 4610 player_map->erase(it); |
| 4610 } | 4611 } |
| 4611 | 4612 |
| 4612 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { | 4613 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { |
| 4613 force_disable_overscroll_content_ = force_disable; | 4614 force_disable_overscroll_content_ = force_disable; |
| 4614 if (view_) | 4615 if (view_) |
| 4615 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); | 4616 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); |
| 4616 } | 4617 } |
| 4617 | 4618 |
| 4618 } // namespace content | 4619 } // namespace content |
| OLD | NEW |