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

Side by Side Diff: content/browser/child_process_launcher.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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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/child_process_launcher.h" 5 #include "content/browser/child_process_launcher.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/i18n/icu_util.h" 10 #include "base/i18n/icu_util.h"
(...skipping 482 matching lines...) Expand 10 before | Expand all | Expand 10 after
493 tracked_objects::ScopedTracker tracking_profile2( 493 tracked_objects::ScopedTracker tracking_profile2(
494 FROM_HERE_WITH_EXPLICIT_FUNCTION( 494 FROM_HERE_WITH_EXPLICIT_FUNCTION(
495 "465841 ChildProcessLauncher::Context::Notify::ProcessLaunched")); 495 "465841 ChildProcessLauncher::Context::Notify::ProcessLaunched"));
496 client_->OnProcessLaunched(); 496 client_->OnProcessLaunched();
497 } else { 497 } else {
498 // TODO(erikchen): Remove ScopedTracker below once http://crbug.com/465841 498 // TODO(erikchen): Remove ScopedTracker below once http://crbug.com/465841
499 // is fixed. 499 // is fixed.
500 tracked_objects::ScopedTracker tracking_profile3( 500 tracked_objects::ScopedTracker tracking_profile3(
501 FROM_HERE_WITH_EXPLICIT_FUNCTION( 501 FROM_HERE_WITH_EXPLICIT_FUNCTION(
502 "465841 ChildProcessLauncher::Context::Notify::ProcessFailed")); 502 "465841 ChildProcessLauncher::Context::Notify::ProcessFailed"));
503 termination_status_ = base::TERMINATION_STATUS_LAUNCH_FAILED;
503 client_->OnProcessLaunchFailed(); 504 client_->OnProcessLaunchFailed();
504 } 505 }
505 } 506 }
506 507
507 bool ChildProcessLauncher::IsStarting() { 508 bool ChildProcessLauncher::IsStarting() {
508 // TODO(crbug.com/469248): This fails in some tests. 509 // TODO(crbug.com/469248): This fails in some tests.
509 // DCHECK(CalledOnValidThread()); 510 // DCHECK(CalledOnValidThread());
510 return starting_; 511 return starting_;
511 } 512 }
512 513
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
544 } 545 }
545 546
546 ChildProcessLauncher::Client* ChildProcessLauncher::ReplaceClientForTest( 547 ChildProcessLauncher::Client* ChildProcessLauncher::ReplaceClientForTest(
547 Client* client) { 548 Client* client) {
548 Client* ret = client_; 549 Client* ret = client_;
549 client_ = client; 550 client_ = client;
550 return ret; 551 return ret;
551 } 552 }
552 553
553 } // namespace content 554 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/browser_plugin/browser_plugin_guest.cc ('k') | content/browser/devtools/render_frame_devtools_agent_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698