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

Side by Side Diff: ipc/ipc_channel_nacl.h

Issue 1084323007: Update {virtual,override} to follow C++11 style in ipc. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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
« no previous file with comments | « no previous file | ipc/ipc_channel_nacl.cc » ('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 #ifndef IPC_IPC_CHANNEL_NACL_H_ 5 #ifndef IPC_IPC_CHANNEL_NACL_H_
6 #define IPC_IPC_CHANNEL_NACL_H_ 6 #define IPC_IPC_CHANNEL_NACL_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <string> 9 #include <string>
10 10
(...skipping 20 matching lines...) Expand all
31 // sharing handles. We also currently do not support passing file descriptors or 31 // sharing handles. We also currently do not support passing file descriptors or
32 // named pipes, and we use background threads to emulate signaling when we can 32 // named pipes, and we use background threads to emulate signaling when we can
33 // read or write without blocking. 33 // read or write without blocking.
34 class ChannelNacl : public Channel, 34 class ChannelNacl : public Channel,
35 public internal::ChannelReader { 35 public internal::ChannelReader {
36 public: 36 public:
37 // Mirror methods of Channel, see ipc_channel.h for description. 37 // Mirror methods of Channel, see ipc_channel.h for description.
38 ChannelNacl(const IPC::ChannelHandle& channel_handle, 38 ChannelNacl(const IPC::ChannelHandle& channel_handle,
39 Mode mode, 39 Mode mode,
40 Listener* listener); 40 Listener* listener);
41 virtual ~ChannelNacl(); 41 ~ChannelNacl() override;
42 42
43 // Channel implementation. 43 // Channel implementation.
44 virtual base::ProcessId GetPeerPID() const override; 44 base::ProcessId GetPeerPID() const override;
45 virtual base::ProcessId GetSelfPID() const override; 45 base::ProcessId GetSelfPID() const override;
46 virtual bool Connect() override; 46 bool Connect() override;
47 virtual void Close() override; 47 void Close() override;
48 virtual bool Send(Message* message) override; 48 bool Send(Message* message) override;
49 49
50 // Posted to the main thread by ReaderThreadRunner. 50 // Posted to the main thread by ReaderThreadRunner.
51 void DidRecvMsg(scoped_ptr<MessageContents> contents); 51 void DidRecvMsg(scoped_ptr<MessageContents> contents);
52 void ReadDidFail(); 52 void ReadDidFail();
53 53
54 private: 54 private:
55 class ReaderThreadRunner; 55 class ReaderThreadRunner;
56 56
57 bool CreatePipe(const IPC::ChannelHandle& channel_handle); 57 bool CreatePipe(const IPC::ChannelHandle& channel_handle);
58 bool ProcessOutgoingMessages(); 58 bool ProcessOutgoingMessages();
59 void CallOnChannelConnected(); 59 void CallOnChannelConnected();
60 60
61 // ChannelReader implementation. 61 // ChannelReader implementation.
62 virtual ReadState ReadData(char* buffer, 62 ReadState ReadData(char* buffer,
63 int buffer_len, 63 int buffer_len,
64 int* bytes_read) override; 64 int* bytes_read) override;
65 virtual bool WillDispatchInputMessage(Message* msg) override; 65 bool WillDispatchInputMessage(Message* msg) override;
66 virtual bool DidEmptyInputBuffers() override; 66 bool DidEmptyInputBuffers() override;
67 virtual void HandleInternalMessage(const Message& msg) override; 67 void HandleInternalMessage(const Message& msg) override;
68 68
69 Mode mode_; 69 Mode mode_;
70 bool waiting_connect_; 70 bool waiting_connect_;
71 71
72 // The pipe used for communication. 72 // The pipe used for communication.
73 int pipe_; 73 int pipe_;
74 74
75 // The "name" of our pipe. On Windows this is the global identifier for 75 // The "name" of our pipe. On Windows this is the global identifier for
76 // the pipe. On POSIX it's used as a key in a local map of file descriptors. 76 // the pipe. On POSIX it's used as a key in a local map of file descriptors.
77 // For NaCl, we don't actually support looking up file descriptors by name, 77 // For NaCl, we don't actually support looking up file descriptors by name,
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 std::deque<linked_ptr<Message> > output_queue_; 113 std::deque<linked_ptr<Message> > output_queue_;
114 114
115 base::WeakPtrFactory<ChannelNacl> weak_ptr_factory_; 115 base::WeakPtrFactory<ChannelNacl> weak_ptr_factory_;
116 116
117 DISALLOW_IMPLICIT_CONSTRUCTORS(ChannelNacl); 117 DISALLOW_IMPLICIT_CONSTRUCTORS(ChannelNacl);
118 }; 118 };
119 119
120 } // namespace IPC 120 } // namespace IPC
121 121
122 #endif // IPC_IPC_CHANNEL_NACL_H_ 122 #endif // IPC_IPC_CHANNEL_NACL_H_
OLDNEW
« no previous file with comments | « no previous file | ipc/ipc_channel_nacl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698