Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(723)

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 1320153002: Add new termination status for failed launch (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase and a nit. Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1089 matching lines...) Expand 10 before | Expand all | Expand 10 after
1100 audio_muter_->StopMuting(); 1100 audio_muter_->StopMuting();
1101 } 1101 }
1102 1102
1103 // Notification for UI updates in response to the changed muting state. 1103 // Notification for UI updates in response to the changed muting state.
1104 NotifyNavigationStateChanged(INVALIDATE_TYPE_TAB); 1104 NotifyNavigationStateChanged(INVALIDATE_TYPE_TAB);
1105 } 1105 }
1106 1106
1107 bool WebContentsImpl::IsCrashed() const { 1107 bool WebContentsImpl::IsCrashed() const {
1108 return (crashed_status_ == base::TERMINATION_STATUS_PROCESS_CRASHED || 1108 return (crashed_status_ == base::TERMINATION_STATUS_PROCESS_CRASHED ||
1109 crashed_status_ == base::TERMINATION_STATUS_ABNORMAL_TERMINATION || 1109 crashed_status_ == base::TERMINATION_STATUS_ABNORMAL_TERMINATION ||
1110 crashed_status_ == base::TERMINATION_STATUS_PROCESS_WAS_KILLED 1110 crashed_status_ == base::TERMINATION_STATUS_PROCESS_WAS_KILLED ||
1111 #if defined(OS_CHROMEOS) 1111 #if defined(OS_CHROMEOS)
1112 || 1112 crashed_status_ ==
1113 crashed_status_ == base::TERMINATION_STATUS_PROCESS_WAS_KILLED_BY_OOM 1113 base::TERMINATION_STATUS_PROCESS_WAS_KILLED_BY_OOM ||
1114 #endif 1114 #endif
1115 crashed_status_ == base::TERMINATION_STATUS_LAUNCH_FAILED
1115 ); 1116 );
1116 } 1117 }
1117 1118
1118 void WebContentsImpl::SetIsCrashed(base::TerminationStatus status, 1119 void WebContentsImpl::SetIsCrashed(base::TerminationStatus status,
1119 int error_code) { 1120 int error_code) {
1120 if (status == crashed_status_) 1121 if (status == crashed_status_)
1121 return; 1122 return;
1122 1123
1123 crashed_status_ = status; 1124 crashed_status_ = status;
1124 crashed_error_code_ = error_code; 1125 crashed_error_code_ = error_code;
(...skipping 3496 matching lines...) Expand 10 before | Expand all | Expand 10 after
4621 return NULL; 4622 return NULL;
4622 } 4623 }
4623 4624
4624 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { 4625 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
4625 force_disable_overscroll_content_ = force_disable; 4626 force_disable_overscroll_content_ = force_disable;
4626 if (view_) 4627 if (view_)
4627 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); 4628 view_->SetOverscrollControllerEnabled(CanOverscrollContent());
4628 } 4629 }
4629 4630
4630 } // namespace content 4631 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_process_host_impl.cc ('k') | extensions/browser/guest_view/web_view/web_view_guest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698