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

Side by Side Diff: content/browser/devtools/render_frame_devtools_agent_host.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
« no previous file with comments | « content/browser/child_process_launcher.cc ('k') | content/browser/gpu/gpu_process_host.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/devtools/render_frame_devtools_agent_host.h" 5 #include "content/browser/devtools/render_frame_devtools_agent_host.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "content/browser/child_process_security_policy_impl.h" 10 #include "content/browser/child_process_security_policy_impl.h"
(...skipping 516 matching lines...) Expand 10 before | Expand all | Expand 10 after
527 switch(status) { 527 switch(status) {
528 case base::TERMINATION_STATUS_ABNORMAL_TERMINATION: 528 case base::TERMINATION_STATUS_ABNORMAL_TERMINATION:
529 case base::TERMINATION_STATUS_PROCESS_WAS_KILLED: 529 case base::TERMINATION_STATUS_PROCESS_WAS_KILLED:
530 #if defined(OS_CHROMEOS) 530 #if defined(OS_CHROMEOS)
531 case base::TERMINATION_STATUS_PROCESS_WAS_KILLED_BY_OOM: 531 case base::TERMINATION_STATUS_PROCESS_WAS_KILLED_BY_OOM:
532 #endif 532 #endif
533 case base::TERMINATION_STATUS_PROCESS_CRASHED: 533 case base::TERMINATION_STATUS_PROCESS_CRASHED:
534 #if defined(OS_ANDROID) 534 #if defined(OS_ANDROID)
535 case base::TERMINATION_STATUS_OOM_PROTECTED: 535 case base::TERMINATION_STATUS_OOM_PROTECTED:
536 #endif 536 #endif
537 case base::TERMINATION_STATUS_LAUNCH_FAILED:
537 inspector_handler_->TargetCrashed(); 538 inspector_handler_->TargetCrashed();
538 current_frame_crashed_ = true; 539 current_frame_crashed_ = true;
539 break; 540 break;
540 default: 541 default:
541 inspector_handler_->TargetDetached("Render process gone."); 542 inspector_handler_->TargetDetached("Render process gone.");
542 break; 543 break;
543 } 544 }
544 } 545 }
545 546
546 bool RenderFrameDevToolsAgentHost::OnMessageReceived( 547 bool RenderFrameDevToolsAgentHost::OnMessageReceived(
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
720 RenderFrameHost* host) { 721 RenderFrameHost* host) {
721 return (current_ && current_->host() == host) || 722 return (current_ && current_->host() == host) ||
722 (pending_ && pending_->host() == host); 723 (pending_ && pending_->host() == host);
723 } 724 }
724 725
725 bool RenderFrameDevToolsAgentHost::IsChildFrame() { 726 bool RenderFrameDevToolsAgentHost::IsChildFrame() {
726 return current_ && current_->host()->GetParent(); 727 return current_ && current_->host()->GetParent();
727 } 728 }
728 729
729 } // namespace content 730 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/child_process_launcher.cc ('k') | content/browser/gpu/gpu_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698