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

Unified Diff: trunk/src/components/nacl/browser/nacl_browser.cc

Issue 290633006: Revert 270907 "Remove knowledge of nacl from content." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: trunk/src/components/nacl/browser/nacl_browser.cc
===================================================================
--- trunk/src/components/nacl/browser/nacl_browser.cc (revision 270923)
+++ trunk/src/components/nacl/browser/nacl_browser.cc (working copy)
@@ -272,17 +272,17 @@
CheckWaiting();
}
-void NaClBrowser::SetProcessGdbDebugStubPort(int process_id, int port) {
- gdb_debug_stub_port_map_[process_id] = port;
- if (port != kGdbDebugStubPortUnknown &&
- !debug_stub_port_listener_.is_null()) {
- content::BrowserThread::PostTask(
- content::BrowserThread::IO,
- FROM_HERE,
- base::Bind(debug_stub_port_listener_, port));
- }
+void NaClBrowser::FireGdbDebugStubPortOpened(int port) {
+ content::BrowserThread::PostTask(
+ content::BrowserThread::IO,
+ FROM_HERE,
+ base::Bind(debug_stub_port_listener_, port));
}
+bool NaClBrowser::HasGdbDebugStubPortListener() {
+ return !debug_stub_port_listener_.is_null();
+}
+
void NaClBrowser::SetGdbDebugStubPortListener(
base::Callback<void(int)> listener) {
debug_stub_port_listener_ = listener;
@@ -292,14 +292,6 @@
debug_stub_port_listener_.Reset();
}
-int NaClBrowser::GetProcessGdbDebugStubPort(int process_id) {
- GdbDebugStubPortMap::iterator i = gdb_debug_stub_port_map_.find(process_id);
- if (i != gdb_debug_stub_port_map_.end()) {
- return i->second;
- }
- return kGdbDebugStubPortUnused;
-}
-
void NaClBrowser::InitValidationCacheFilePath() {
// Determine where the validation cache resides in the file system. It
// exists in Chrome's cache directory and is not tied to any specific
@@ -542,10 +534,6 @@
validation_cache_is_modified_ = false;
}
-void NaClBrowser::OnProcessEnd(int process_id) {
- gdb_debug_stub_port_map_.erase(process_id);
-}
-
void NaClBrowser::OnProcessCrashed() {
DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
if (crash_times_.size() == kMaxCrashesPerInterval) {
« no previous file with comments | « trunk/src/components/nacl/browser/nacl_browser.h ('k') | trunk/src/components/nacl/browser/nacl_process_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698