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

Side by Side Diff: ppapi/proxy/compositor_resource.h

Issue 630883002: replace OVERRIDE and FINAL with override and final in ppapi/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
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_PROXY_COMPOSITOR_RESOURCE_H_ 5 #ifndef PPAPI_PROXY_COMPOSITOR_RESOURCE_H_
6 #define PPAPI_PROXY_COMPOSITOR_RESOURCE_H_ 6 #define PPAPI_PROXY_COMPOSITOR_RESOURCE_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "ppapi/proxy/compositor_layer_resource.h" 10 #include "ppapi/proxy/compositor_layer_resource.h"
(...skipping 13 matching lines...) Expand all
24 PP_Instance instance); 24 PP_Instance instance);
25 25
26 bool IsInProgress() const; 26 bool IsInProgress() const;
27 27
28 int32_t GenerateResourceId() const; 28 int32_t GenerateResourceId() const;
29 29
30 private: 30 private:
31 virtual ~CompositorResource(); 31 virtual ~CompositorResource();
32 32
33 // Resource overrides: 33 // Resource overrides:
34 virtual thunk::PPB_Compositor_API* AsPPB_Compositor_API() OVERRIDE; 34 virtual thunk::PPB_Compositor_API* AsPPB_Compositor_API() override;
35 35
36 // PluginResource overrides: 36 // PluginResource overrides:
37 virtual void OnReplyReceived(const ResourceMessageReplyParams& params, 37 virtual void OnReplyReceived(const ResourceMessageReplyParams& params,
38 const IPC::Message& msg) OVERRIDE; 38 const IPC::Message& msg) override;
39 39
40 // thunk::PPB_Compositor_API overrides: 40 // thunk::PPB_Compositor_API overrides:
41 virtual PP_Resource AddLayer() OVERRIDE; 41 virtual PP_Resource AddLayer() override;
42 virtual int32_t CommitLayers( 42 virtual int32_t CommitLayers(
43 const scoped_refptr<TrackedCallback>& callback) OVERRIDE; 43 const scoped_refptr<TrackedCallback>& callback) override;
44 virtual int32_t ResetLayers() OVERRIDE; 44 virtual int32_t ResetLayers() override;
45 45
46 // IPC msg handlers: 46 // IPC msg handlers:
47 void OnPluginMsgCommitLayersReply(const ResourceMessageReplyParams& params); 47 void OnPluginMsgCommitLayersReply(const ResourceMessageReplyParams& params);
48 void OnPluginMsgReleaseResource( 48 void OnPluginMsgReleaseResource(
49 const ResourceMessageReplyParams& params, 49 const ResourceMessageReplyParams& params,
50 int32_t id, 50 int32_t id,
51 uint32_t sync_point, 51 uint32_t sync_point,
52 bool is_lost); 52 bool is_lost);
53 53
54 void ResetLayersInternal(bool is_aborted); 54 void ResetLayersInternal(bool is_aborted);
(...skipping 16 matching lines...) Expand all
71 // The last resource id for texture or image. 71 // The last resource id for texture or image.
72 mutable int32_t last_resource_id_; 72 mutable int32_t last_resource_id_;
73 73
74 DISALLOW_COPY_AND_ASSIGN(CompositorResource); 74 DISALLOW_COPY_AND_ASSIGN(CompositorResource);
75 }; 75 };
76 76
77 } // namespace proxy 77 } // namespace proxy
78 } // namespace ppapi 78 } // namespace ppapi
79 79
80 #endif // PPAPI_PROXY_COMPOSITOR_RESOURCE_H_ 80 #endif // PPAPI_PROXY_COMPOSITOR_RESOURCE_H_
OLDNEW
« no previous file with comments | « ppapi/proxy/compositor_layer_resource.h ('k') | ppapi/proxy/device_enumeration_resource_helper_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698