summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/nacl_host/nacl_broker_host_win.cc6
-rw-r--r--chrome/browser/nacl_host/nacl_broker_host_win.h4
2 files changed, 3 insertions, 7 deletions
diff --git a/chrome/browser/nacl_host/nacl_broker_host_win.cc b/chrome/browser/nacl_host/nacl_broker_host_win.cc
index 186e15e..92e1453 100644
--- a/chrome/browser/nacl_host/nacl_broker_host_win.cc
+++ b/chrome/browser/nacl_host/nacl_broker_host_win.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -17,8 +17,7 @@
#include "content/public/browser/browser_child_process_host.h"
#include "content/public/common/child_process_host.h"
-NaClBrokerHost::NaClBrokerHost()
- : stopping_(false) {
+NaClBrokerHost::NaClBrokerHost() {
process_.reset(content::BrowserChildProcessHost::Create(
content::PROCESS_TYPE_NACL_BROKER, this));
}
@@ -72,6 +71,5 @@ void NaClBrokerHost::OnLoaderLaunched(const std::wstring& loader_channel_id,
}
void NaClBrokerHost::StopBroker() {
- stopping_ = true;
process_->Send(new NaClProcessMsg_StopBroker());
}
diff --git a/chrome/browser/nacl_host/nacl_broker_host_win.h b/chrome/browser/nacl_host/nacl_broker_host_win.h
index 368f462..3ea6a33 100644
--- a/chrome/browser/nacl_host/nacl_broker_host_win.h
+++ b/chrome/browser/nacl_host/nacl_broker_host_win.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -39,8 +39,6 @@ class NaClBrokerHost : public content::BrowserChildProcessHostDelegate {
// BrowserChildProcessHostDelegate implementation:
virtual bool OnMessageReceived(const IPC::Message& msg);
- bool stopping_;
-
scoped_ptr<content::BrowserChildProcessHost> process_;
DISALLOW_COPY_AND_ASSIGN(NaClBrokerHost);