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

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: fix 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/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 512 matching lines...) Expand 10 before | Expand all | Expand 10 after
523 switch(status) { 523 switch(status) {
524 case base::TERMINATION_STATUS_ABNORMAL_TERMINATION: 524 case base::TERMINATION_STATUS_ABNORMAL_TERMINATION:
525 case base::TERMINATION_STATUS_PROCESS_WAS_KILLED: 525 case base::TERMINATION_STATUS_PROCESS_WAS_KILLED:
526 #if defined(OS_CHROMEOS) 526 #if defined(OS_CHROMEOS)
527 case base::TERMINATION_STATUS_PROCESS_WAS_KILLED_BY_OOM: 527 case base::TERMINATION_STATUS_PROCESS_WAS_KILLED_BY_OOM:
528 #endif 528 #endif
529 case base::TERMINATION_STATUS_PROCESS_CRASHED: 529 case base::TERMINATION_STATUS_PROCESS_CRASHED:
530 #if defined(OS_ANDROID) 530 #if defined(OS_ANDROID)
531 case base::TERMINATION_STATUS_OOM_PROTECTED: 531 case base::TERMINATION_STATUS_OOM_PROTECTED:
532 #endif 532 #endif
533 case base::TERMINATION_STATUS_LAUNCH_FAILED:
533 inspector_handler_->TargetCrashed(); 534 inspector_handler_->TargetCrashed();
534 current_frame_crashed_ = true; 535 current_frame_crashed_ = true;
535 break; 536 break;
536 default: 537 default:
537 inspector_handler_->TargetDetached("Render process gone."); 538 inspector_handler_->TargetDetached("Render process gone.");
538 break; 539 break;
539 } 540 }
540 } 541 }
541 542
542 bool RenderFrameDevToolsAgentHost::OnMessageReceived( 543 bool RenderFrameDevToolsAgentHost::OnMessageReceived(
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
716 RenderFrameHost* host) { 717 RenderFrameHost* host) {
717 return (current_ && current_->host() == host) || 718 return (current_ && current_->host() == host) ||
718 (pending_ && pending_->host() == host); 719 (pending_ && pending_->host() == host);
719 } 720 }
720 721
721 bool RenderFrameDevToolsAgentHost::IsChildFrame() { 722 bool RenderFrameDevToolsAgentHost::IsChildFrame() {
722 return current_ && current_->host()->GetParent(); 723 return current_ && current_->host()->GetParent();
723 } 724 }
724 725
725 } // namespace content 726 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698