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

Unified Diff: chrome/nacl/nacl_broker_listener.h

Issue 7863024: Make the NaCl windows 64 bit binaries not depend on chrome targets. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: simplify chrome_exe.gypi Created 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/nacl/broker_thread.cc ('k') | chrome/nacl/nacl_broker_listener.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/nacl/nacl_broker_listener.h
===================================================================
--- chrome/nacl/nacl_broker_listener.h (revision 100565)
+++ chrome/nacl/nacl_broker_listener.h (working copy)
@@ -2,40 +2,37 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_NACL_BROKER_THREAD_H_
-#define CHROME_NACL_BROKER_THREAD_H_
+#ifndef CHROME_NACL_NACL_BROKER_LISTENER_H_
+#define CHROME_NACL_NACL_BROKER_LISTENER_H_
#pragma once
+#include "base/memory/scoped_ptr.h"
#include "base/process.h"
#include "chrome/common/nacl_types.h"
-#include "content/common/child_thread.h"
+#include "ipc/ipc_channel.h"
-#if defined(OS_WIN)
-#include "sandbox/src/sandbox.h"
-#endif
-
// The BrokerThread class represents the thread that handles the messages from
// the browser process and starts NaCl loader processes.
-class NaClBrokerThread : public ChildThread {
+class NaClBrokerListener : public IPC::Channel::Listener {
public:
- NaClBrokerThread();
- ~NaClBrokerThread();
- // Returns the one NaCl thread.
- static NaClBrokerThread* current();
+ NaClBrokerListener();
+ ~NaClBrokerListener();
+ void Listen();
+
// IPC::Channel::Listener implementation.
virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
+ virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
private:
- virtual bool OnControlMessageReceived(const IPC::Message& msg);
void OnLaunchLoaderThroughBroker(const std::wstring& loader_channel_id);
void OnShareBrowserHandle(int browser_handle);
void OnStopBroker();
base::ProcessHandle browser_handle_;
- sandbox::BrokerServices* broker_services_;
+ scoped_ptr<IPC::Channel> channel_;
- DISALLOW_COPY_AND_ASSIGN(NaClBrokerThread);
+ DISALLOW_COPY_AND_ASSIGN(NaClBrokerListener);
};
-#endif // CHROME_NACL_BROKER_THREAD_H_
+#endif // CHROME_NACL_NACL_BROKER_LISTENER_H_
« no previous file with comments | « chrome/nacl/broker_thread.cc ('k') | chrome/nacl/nacl_broker_listener.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698