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

Side by Side Diff: ppapi/proxy/flash_menu_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
« no previous file with comments | « ppapi/proxy/flash_fullscreen_resource.h ('k') | ppapi/proxy/flash_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 (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 PPAPI_PROXY_FLASH_MENU_RESOURCE_H_ 5 #ifndef PPAPI_PROXY_FLASH_MENU_RESOURCE_H_
6 #define PPAPI_PROXY_FLASH_MENU_RESOURCE_H_ 6 #define PPAPI_PROXY_FLASH_MENU_RESOURCE_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "ppapi/proxy/plugin_resource.h" 10 #include "ppapi/proxy/plugin_resource.h"
(...skipping 12 matching lines...) Expand all
23 // You must call Initialize after construction. 23 // You must call Initialize after construction.
24 FlashMenuResource(Connection connection, PP_Instance instance); 24 FlashMenuResource(Connection connection, PP_Instance instance);
25 virtual ~FlashMenuResource(); 25 virtual ~FlashMenuResource();
26 26
27 // Returns true on success. False means that this object can not be used. 27 // Returns true on success. False means that this object can not be used.
28 // This has to be separate from the constructor because the menu data could 28 // This has to be separate from the constructor because the menu data could
29 // be invalid. 29 // be invalid.
30 bool Initialize(const PP_Flash_Menu* menu_data); 30 bool Initialize(const PP_Flash_Menu* menu_data);
31 31
32 // Resource overrides. 32 // Resource overrides.
33 virtual thunk::PPB_Flash_Menu_API* AsPPB_Flash_Menu_API() OVERRIDE; 33 virtual thunk::PPB_Flash_Menu_API* AsPPB_Flash_Menu_API() override;
34 34
35 // PPB_Flash_Menu_API. 35 // PPB_Flash_Menu_API.
36 virtual int32_t Show(const PP_Point* location, 36 virtual int32_t Show(const PP_Point* location,
37 int32_t* selected_id, 37 int32_t* selected_id,
38 scoped_refptr<TrackedCallback> callback) OVERRIDE; 38 scoped_refptr<TrackedCallback> callback) override;
39 39
40 private: 40 private:
41 virtual void OnReplyReceived(const proxy::ResourceMessageReplyParams& params, 41 virtual void OnReplyReceived(const proxy::ResourceMessageReplyParams& params,
42 const IPC::Message& msg) OVERRIDE; 42 const IPC::Message& msg) override;
43 43
44 void OnShowReply( 44 void OnShowReply(
45 const proxy::ResourceMessageReplyParams& params, 45 const proxy::ResourceMessageReplyParams& params,
46 int32_t selected_id); 46 int32_t selected_id);
47 47
48 int* selected_id_dest_; 48 int* selected_id_dest_;
49 scoped_refptr<TrackedCallback> callback_; 49 scoped_refptr<TrackedCallback> callback_;
50 50
51 DISALLOW_COPY_AND_ASSIGN(FlashMenuResource); 51 DISALLOW_COPY_AND_ASSIGN(FlashMenuResource);
52 }; 52 };
53 53
54 } // namespace proxy 54 } // namespace proxy
55 } // namespace ppapi 55 } // namespace ppapi
56 56
57 #endif // PPAPI_PROXY_FLASH_MENU_RESOURCE_H_ 57 #endif // PPAPI_PROXY_FLASH_MENU_RESOURCE_H_
OLDNEW
« no previous file with comments | « ppapi/proxy/flash_fullscreen_resource.h ('k') | ppapi/proxy/flash_resource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698