| OLD | NEW |
| 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 391 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 402 | 402 |
| 403 void NaClProcessHost::OnNaClGdbAttached() { | 403 void NaClProcessHost::OnNaClGdbAttached() { |
| 404 wait_for_nacl_gdb_ = false; | 404 wait_for_nacl_gdb_ = false; |
| 405 nacl_gdb_watcher_.StopWatchingFileDescriptor(); | 405 nacl_gdb_watcher_.StopWatchingFileDescriptor(); |
| 406 nacl_gdb_watcher_delegate_.reset(); | 406 nacl_gdb_watcher_delegate_.reset(); |
| 407 OnProcessLaunched(); | 407 OnProcessLaunched(); |
| 408 } | 408 } |
| 409 #endif | 409 #endif |
| 410 | 410 |
| 411 FilePath NaClProcessHost::GetManifestPath() { | 411 FilePath NaClProcessHost::GetManifestPath() { |
| 412 const Extension* extension = extension_info_map_->extensions() | 412 const extensions::Extension* extension = extension_info_map_->extensions() |
| 413 .GetExtensionOrAppByURL(ExtensionURLInfo(manifest_url_)); | 413 .GetExtensionOrAppByURL(ExtensionURLInfo(manifest_url_)); |
| 414 if (extension != NULL && manifest_url_.SchemeIs(chrome::kExtensionScheme)) { | 414 if (extension != NULL && manifest_url_.SchemeIs(chrome::kExtensionScheme)) { |
| 415 std::string path = manifest_url_.path(); | 415 std::string path = manifest_url_.path(); |
| 416 TrimString(path, "/", &path); // Remove first slash | 416 TrimString(path, "/", &path); // Remove first slash |
| 417 return extension->path().AppendASCII(path); | 417 return extension->path().AppendASCII(path); |
| 418 } | 418 } |
| 419 return FilePath(); | 419 return FilePath(); |
| 420 } | 420 } |
| 421 | 421 |
| 422 bool NaClProcessHost::LaunchSelLdr() { | 422 bool NaClProcessHost::LaunchSelLdr() { |
| (...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 749 } else { | 749 } else { |
| 750 NaClStartDebugExceptionHandlerThread( | 750 NaClStartDebugExceptionHandlerThread( |
| 751 process_handle.Take(), info, | 751 process_handle.Take(), info, |
| 752 base::MessageLoopProxy::current(), | 752 base::MessageLoopProxy::current(), |
| 753 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker, | 753 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker, |
| 754 weak_factory_.GetWeakPtr())); | 754 weak_factory_.GetWeakPtr())); |
| 755 return true; | 755 return true; |
| 756 } | 756 } |
| 757 } | 757 } |
| 758 #endif | 758 #endif |
| OLD | NEW |