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

Side by Side Diff: chrome/browser/nacl_host/nacl_process_host.cc

Issue 11225051: Cache more information when launching NaCl sel_ldr, and pass 'Dev' interface (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/common/render_messages.h » ('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 "chrome/browser/nacl_host/nacl_process_host.h" 5 #include "chrome/browser/nacl_host/nacl_process_host.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 625 matching lines...) Expand 10 before | Expand all | Expand 10 after
636 // BrokerDuplicateHandle(). 636 // BrokerDuplicateHandle().
637 if (RunningOnWOW64()) { 637 if (RunningOnWOW64()) {
638 if (!content::BrokerAddTargetPeer(process_->GetData().handle)) { 638 if (!content::BrokerAddTargetPeer(process_->GetData().handle)) {
639 DLOG(ERROR) << "Failed to add NaCl process PID"; 639 DLOG(ERROR) << "Failed to add NaCl process PID";
640 return false; 640 return false;
641 } 641 }
642 } 642 }
643 #endif 643 #endif
644 644
645 ChromeViewHostMsg_LaunchNaCl::WriteReplyParams( 645 ChromeViewHostMsg_LaunchNaCl::WriteReplyParams(
646 reply_msg_, handles_for_renderer, channel_handle); 646 reply_msg_, handles_for_renderer,
647 channel_handle, process_->GetData().id);
647 chrome_render_message_filter_->Send(reply_msg_); 648 chrome_render_message_filter_->Send(reply_msg_);
648 chrome_render_message_filter_ = NULL; 649 chrome_render_message_filter_ = NULL;
649 reply_msg_ = NULL; 650 reply_msg_ = NULL;
650 internal_->sockets_for_renderer.clear(); 651 internal_->sockets_for_renderer.clear();
651 return true; 652 return true;
652 } 653 }
653 654
654 // TCP port we chose for NaCl debug stub. It can be any other number. 655 // TCP port we chose for NaCl debug stub. It can be any other number.
655 static const int kDebugStubPort = 4014; 656 static const int kDebugStubPort = 4014;
656 657
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
887 } else { 888 } else {
888 NaClStartDebugExceptionHandlerThread( 889 NaClStartDebugExceptionHandlerThread(
889 process_handle.Take(), info, 890 process_handle.Take(), info,
890 base::MessageLoopProxy::current(), 891 base::MessageLoopProxy::current(),
891 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker, 892 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker,
892 weak_factory_.GetWeakPtr())); 893 weak_factory_.GetWeakPtr()));
893 return true; 894 return true;
894 } 895 }
895 } 896 }
896 #endif 897 #endif
OLDNEW
« no previous file with comments | « no previous file | chrome/common/render_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698