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

Side by Side Diff: ppapi/nacl_irt/ppapi_dispatcher.h

Issue 1097393007: Update {virtual,override} to follow C++11 style in ppapi. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Split off one file into separate review. 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 | « ppapi/nacl_irt/manifest_service.cc ('k') | ppapi/proxy/audio_buffer_resource.h » ('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 #ifndef PPAPI_NACL_IRT_PPAPI_DISPATCHER_H_ 5 #ifndef PPAPI_NACL_IRT_PPAPI_DISPATCHER_H_
6 #define PPAPI_NACL_IRT_PPAPI_DISPATCHER_H_ 6 #define PPAPI_NACL_IRT_PPAPI_DISPATCHER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 public proxy::PluginProxyDelegate, 45 public proxy::PluginProxyDelegate,
46 public IPC::Listener, 46 public IPC::Listener,
47 public IPC::Sender { 47 public IPC::Sender {
48 public: 48 public:
49 PpapiDispatcher(scoped_refptr<base::MessageLoopProxy> io_loop, 49 PpapiDispatcher(scoped_refptr<base::MessageLoopProxy> io_loop,
50 base::WaitableEvent* shutdown_event, 50 base::WaitableEvent* shutdown_event,
51 int browser_ipc_fd, 51 int browser_ipc_fd,
52 int renderer_ipc_fd); 52 int renderer_ipc_fd);
53 53
54 // PluginDispatcher::PluginDelegate implementation. 54 // PluginDispatcher::PluginDelegate implementation.
55 virtual base::MessageLoopProxy* GetIPCMessageLoop() override; 55 base::MessageLoopProxy* GetIPCMessageLoop() override;
56 virtual base::WaitableEvent* GetShutdownEvent() override; 56 base::WaitableEvent* GetShutdownEvent() override;
57 virtual IPC::PlatformFileForTransit ShareHandleWithRemote( 57 IPC::PlatformFileForTransit ShareHandleWithRemote(
58 base::PlatformFile handle, 58 base::PlatformFile handle,
59 base::ProcessId peer_pid, 59 base::ProcessId peer_pid,
60 bool should_close_source) override; 60 bool should_close_source) override;
61 virtual std::set<PP_Instance>* GetGloballySeenInstanceIDSet() override; 61 std::set<PP_Instance>* GetGloballySeenInstanceIDSet() override;
62 virtual uint32 Register( 62 uint32 Register(proxy::PluginDispatcher* plugin_dispatcher) override;
63 proxy::PluginDispatcher* plugin_dispatcher) override; 63 void Unregister(uint32 plugin_dispatcher_id) override;
64 virtual void Unregister(uint32 plugin_dispatcher_id) override;
65 64
66 // PluginProxyDelegate implementation. 65 // PluginProxyDelegate implementation.
67 virtual IPC::Sender* GetBrowserSender() override; 66 IPC::Sender* GetBrowserSender() override;
68 virtual std::string GetUILanguage() override; 67 std::string GetUILanguage() override;
69 virtual void PreCacheFont(const void* logfontw) override; 68 void PreCacheFont(const void* logfontw) override;
70 virtual void SetActiveURL(const std::string& url) override; 69 void SetActiveURL(const std::string& url) override;
71 virtual PP_Resource CreateBrowserFont( 70 PP_Resource CreateBrowserFont(proxy::Connection connection,
72 proxy::Connection connection, 71 PP_Instance instance,
73 PP_Instance instance, 72 const PP_BrowserFont_Trusted_Description& desc,
74 const PP_BrowserFont_Trusted_Description& desc, 73 const Preferences& prefs) override;
75 const Preferences& prefs) override;
76 74
77 // IPC::Listener implementation. 75 // IPC::Listener implementation.
78 virtual bool OnMessageReceived(const IPC::Message& message) override; 76 bool OnMessageReceived(const IPC::Message& message) override;
79 virtual void OnChannelError() override; 77 void OnChannelError() override;
80 78
81 // IPC::Sender implementation 79 // IPC::Sender implementation
82 virtual bool Send(IPC::Message* message) override; 80 bool Send(IPC::Message* message) override;
83 81
84 private: 82 private:
85 void OnMsgInitializeNaClDispatcher(const PpapiNaClPluginArgs& args); 83 void OnMsgInitializeNaClDispatcher(const PpapiNaClPluginArgs& args);
86 void OnPluginDispatcherMessageReceived(const IPC::Message& msg); 84 void OnPluginDispatcherMessageReceived(const IPC::Message& msg);
87 85
88 std::set<PP_Instance> instances_; 86 std::set<PP_Instance> instances_;
89 std::map<uint32, proxy::PluginDispatcher*> plugin_dispatchers_; 87 std::map<uint32, proxy::PluginDispatcher*> plugin_dispatchers_;
90 uint32 next_plugin_dispatcher_id_; 88 uint32 next_plugin_dispatcher_id_;
91 89
92 scoped_refptr<base::MessageLoopProxy> message_loop_; 90 scoped_refptr<base::MessageLoopProxy> message_loop_;
93 base::WaitableEvent* shutdown_event_; 91 base::WaitableEvent* shutdown_event_;
94 int renderer_ipc_fd_; 92 int renderer_ipc_fd_;
95 scoped_ptr<IPC::SyncChannel> channel_; 93 scoped_ptr<IPC::SyncChannel> channel_;
96 }; 94 };
97 95
98 } // namespace ppapi 96 } // namespace ppapi
99 97
100 #endif // PPAPI_NACL_IRT_PPAPI_DISPATCHER_H_ 98 #endif // PPAPI_NACL_IRT_PPAPI_DISPATCHER_H_
OLDNEW
« no previous file with comments | « ppapi/nacl_irt/manifest_service.cc ('k') | ppapi/proxy/audio_buffer_resource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698