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

Side by Side Diff: ipc/mojo/ipc_channel_mojo.cc

Issue 669953003: Revert of Standardize usage of virtual/override/final in ipc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 | « ipc/mojo/ipc_channel_mojo.h ('k') | ipc/mojo/ipc_channel_mojo_host.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "ipc/mojo/ipc_channel_mojo.h" 5 #include "ipc/mojo/ipc_channel_mojo.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "ipc/ipc_listener.h" 10 #include "ipc/ipc_listener.h"
11 #include "ipc/mojo/ipc_channel_mojo_readers.h" 11 #include "ipc/mojo/ipc_channel_mojo_readers.h"
12 #include "ipc/mojo/ipc_mojo_bootstrap.h" 12 #include "ipc/mojo/ipc_mojo_bootstrap.h"
13 #include "mojo/edk/embedder/embedder.h" 13 #include "mojo/edk/embedder/embedder.h"
14 14
15 #if defined(OS_POSIX) && !defined(OS_NACL) 15 #if defined(OS_POSIX) && !defined(OS_NACL)
16 #include "ipc/file_descriptor_set_posix.h" 16 #include "ipc/file_descriptor_set_posix.h"
17 #endif 17 #endif
18 18
19 namespace IPC { 19 namespace IPC {
20 20
21 namespace { 21 namespace {
22 22
23 class MojoChannelFactory : public ChannelFactory { 23 class MojoChannelFactory : public ChannelFactory {
24 public: 24 public:
25 MojoChannelFactory(ChannelMojo::Delegate* delegate, 25 MojoChannelFactory(ChannelMojo::Delegate* delegate,
26 ChannelHandle channel_handle, 26 ChannelHandle channel_handle,
27 Channel::Mode mode) 27 Channel::Mode mode)
28 : delegate_(delegate), channel_handle_(channel_handle), mode_(mode) {} 28 : delegate_(delegate), channel_handle_(channel_handle), mode_(mode) {}
29 29
30 std::string GetName() const override { return channel_handle_.name; } 30 virtual std::string GetName() const override {
31 return channel_handle_.name;
32 }
31 33
32 scoped_ptr<Channel> BuildChannel(Listener* listener) override { 34 virtual scoped_ptr<Channel> BuildChannel(Listener* listener) override {
33 return ChannelMojo::Create(delegate_, channel_handle_, mode_, listener); 35 return ChannelMojo::Create(delegate_, channel_handle_, mode_, listener);
34 } 36 }
35 37
36 private: 38 private:
37 ChannelMojo::Delegate* delegate_; 39 ChannelMojo::Delegate* delegate_;
38 ChannelHandle channel_handle_; 40 ChannelHandle channel_handle_;
39 Channel::Mode mode_; 41 Channel::Mode mode_;
40 }; 42 };
41 43
42 } // namespace 44 } // namespace
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 281
280 fdset->CommitAll(); 282 fdset->CommitAll();
281 } 283 }
282 284
283 return MOJO_RESULT_OK; 285 return MOJO_RESULT_OK;
284 } 286 }
285 287
286 #endif // defined(OS_POSIX) && !defined(OS_NACL) 288 #endif // defined(OS_POSIX) && !defined(OS_NACL)
287 289
288 } // namespace IPC 290 } // namespace IPC
OLDNEW
« no previous file with comments | « ipc/mojo/ipc_channel_mojo.h ('k') | ipc/mojo/ipc_channel_mojo_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698