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 1103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1114 audio_muter_->StopMuting(); | 1114 audio_muter_->StopMuting(); |
1115 } | 1115 } |
1116 | 1116 |
1117 // Notification for UI updates in response to the changed muting state. | 1117 // Notification for UI updates in response to the changed muting state. |
1118 NotifyNavigationStateChanged(INVALIDATE_TYPE_TAB); | 1118 NotifyNavigationStateChanged(INVALIDATE_TYPE_TAB); |
1119 } | 1119 } |
1120 | 1120 |
1121 bool WebContentsImpl::IsCrashed() const { | 1121 bool WebContentsImpl::IsCrashed() const { |
1122 return (crashed_status_ == base::TERMINATION_STATUS_PROCESS_CRASHED || | 1122 return (crashed_status_ == base::TERMINATION_STATUS_PROCESS_CRASHED || |
1123 crashed_status_ == base::TERMINATION_STATUS_ABNORMAL_TERMINATION || | 1123 crashed_status_ == base::TERMINATION_STATUS_ABNORMAL_TERMINATION || |
1124 crashed_status_ == base::TERMINATION_STATUS_PROCESS_WAS_KILLED | 1124 crashed_status_ == base::TERMINATION_STATUS_PROCESS_WAS_KILLED || |
1125 #if defined(OS_CHROMEOS) | 1125 #if defined(OS_CHROMEOS) |
1126 || | 1126 crashed_status_ == |
1127 crashed_status_ == base::TERMINATION_STATUS_PROCESS_WAS_KILLED_BY_OOM | 1127 base::TERMINATION_STATUS_PROCESS_WAS_KILLED_BY_OOM || |
1128 #endif | 1128 #endif |
| 1129 crashed_status_ == base::TERMINATION_STATUS_LAUNCH_FAILED |
1129 ); | 1130 ); |
1130 } | 1131 } |
1131 | 1132 |
1132 void WebContentsImpl::SetIsCrashed(base::TerminationStatus status, | 1133 void WebContentsImpl::SetIsCrashed(base::TerminationStatus status, |
1133 int error_code) { | 1134 int error_code) { |
1134 if (status == crashed_status_) | 1135 if (status == crashed_status_) |
1135 return; | 1136 return; |
1136 | 1137 |
1137 crashed_status_ = status; | 1138 crashed_status_ = status; |
1138 crashed_error_code_ = error_code; | 1139 crashed_error_code_ = error_code; |
(...skipping 3476 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4615 player_map->erase(it); | 4616 player_map->erase(it); |
4616 } | 4617 } |
4617 | 4618 |
4618 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { | 4619 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { |
4619 force_disable_overscroll_content_ = force_disable; | 4620 force_disable_overscroll_content_ = force_disable; |
4620 if (view_) | 4621 if (view_) |
4621 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); | 4622 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); |
4622 } | 4623 } |
4623 | 4624 |
4624 } // namespace content | 4625 } // namespace content |
OLD | NEW |