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

Side by Side Diff: content/renderer/pepper/host_globals.h

Issue 633303002: Replace FINAL and OVERRIDE with their C++11 counterparts in content/renderer (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 (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 CONTENT_RENDERER_PEPPER_HOST_GLOBALS_H_ 5 #ifndef CONTENT_RENDERER_PEPPER_HOST_GLOBALS_H_
6 #define CONTENT_RENDERER_PEPPER_HOST_GLOBALS_H_ 6 #define CONTENT_RENDERER_PEPPER_HOST_GLOBALS_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "content/renderer/pepper/host_var_tracker.h" 9 #include "content/renderer/pepper/host_var_tracker.h"
10 #include "ppapi/shared_impl/callback_tracker.h" 10 #include "ppapi/shared_impl/callback_tracker.h"
(...skipping 13 matching lines...) Expand all
24 24
25 // Getter for the global singleton. Generally, you should use 25 // Getter for the global singleton. Generally, you should use
26 // PpapiGlobals::Get() when possible. Use this only when you need some 26 // PpapiGlobals::Get() when possible. Use this only when you need some
27 // host-specific functionality. 27 // host-specific functionality.
28 inline static HostGlobals* Get() { 28 inline static HostGlobals* Get() {
29 DCHECK(PpapiGlobals::Get()->IsHostGlobals()); 29 DCHECK(PpapiGlobals::Get()->IsHostGlobals());
30 return static_cast<HostGlobals*>(PpapiGlobals::Get()); 30 return static_cast<HostGlobals*>(PpapiGlobals::Get());
31 } 31 }
32 32
33 // PpapiGlobals implementation. 33 // PpapiGlobals implementation.
34 virtual ppapi::ResourceTracker* GetResourceTracker() OVERRIDE; 34 virtual ppapi::ResourceTracker* GetResourceTracker() override;
35 virtual ppapi::VarTracker* GetVarTracker() OVERRIDE; 35 virtual ppapi::VarTracker* GetVarTracker() override;
36 virtual ppapi::CallbackTracker* GetCallbackTrackerForInstance( 36 virtual ppapi::CallbackTracker* GetCallbackTrackerForInstance(
37 PP_Instance instance) OVERRIDE; 37 PP_Instance instance) override;
38 virtual ppapi::thunk::PPB_Instance_API* GetInstanceAPI(PP_Instance instance) 38 virtual ppapi::thunk::PPB_Instance_API* GetInstanceAPI(PP_Instance instance)
39 OVERRIDE; 39 override;
40 virtual ppapi::thunk::ResourceCreationAPI* GetResourceCreationAPI( 40 virtual ppapi::thunk::ResourceCreationAPI* GetResourceCreationAPI(
41 PP_Instance instance) OVERRIDE; 41 PP_Instance instance) override;
42 virtual PP_Module GetModuleForInstance(PP_Instance instance) OVERRIDE; 42 virtual PP_Module GetModuleForInstance(PP_Instance instance) override;
43 virtual std::string GetCmdLine() OVERRIDE; 43 virtual std::string GetCmdLine() override;
44 virtual void PreCacheFontForFlash(const void* logfontw) OVERRIDE; 44 virtual void PreCacheFontForFlash(const void* logfontw) override;
45 virtual void LogWithSource(PP_Instance instance, 45 virtual void LogWithSource(PP_Instance instance,
46 PP_LogLevel level, 46 PP_LogLevel level,
47 const std::string& source, 47 const std::string& source,
48 const std::string& value) OVERRIDE; 48 const std::string& value) override;
49 virtual void BroadcastLogWithSource(PP_Module module, 49 virtual void BroadcastLogWithSource(PP_Module module,
50 PP_LogLevel level, 50 PP_LogLevel level,
51 const std::string& source, 51 const std::string& source,
52 const std::string& value) OVERRIDE; 52 const std::string& value) override;
53 virtual ppapi::MessageLoopShared* GetCurrentMessageLoop() OVERRIDE; 53 virtual ppapi::MessageLoopShared* GetCurrentMessageLoop() override;
54 virtual base::TaskRunner* GetFileTaskRunner() OVERRIDE; 54 virtual base::TaskRunner* GetFileTaskRunner() override;
55 55
56 HostVarTracker* host_var_tracker() { return &host_var_tracker_; } 56 HostVarTracker* host_var_tracker() { return &host_var_tracker_; }
57 57
58 // PP_Modules ---------------------------------------------------------------- 58 // PP_Modules ----------------------------------------------------------------
59 59
60 // Adds a new plugin module to the list of tracked module, and returns a new 60 // Adds a new plugin module to the list of tracked module, and returns a new
61 // module handle to identify it. 61 // module handle to identify it.
62 PP_Module AddModule(PluginModule* module); 62 PP_Module AddModule(PluginModule* module);
63 63
64 // Called when a plugin modulde was deleted and should no longer be tracked. 64 // Called when a plugin modulde was deleted and should no longer be tracked.
(...skipping 16 matching lines...) Expand all
81 81
82 void InstanceCrashed(PP_Instance instance); 82 void InstanceCrashed(PP_Instance instance);
83 83
84 // Returns a pointer to the plugin instance object associated with the given 84 // Returns a pointer to the plugin instance object associated with the given
85 // instance handle. The return value will be NULL if the handle is invalid or 85 // instance handle. The return value will be NULL if the handle is invalid or
86 // if the instance has crashed. 86 // if the instance has crashed.
87 PepperPluginInstanceImpl* GetInstance(PP_Instance instance); 87 PepperPluginInstanceImpl* GetInstance(PP_Instance instance);
88 88
89 private: 89 private:
90 // PpapiGlobals overrides. 90 // PpapiGlobals overrides.
91 virtual bool IsHostGlobals() const OVERRIDE; 91 virtual bool IsHostGlobals() const override;
92 92
93 static HostGlobals* host_globals_; 93 static HostGlobals* host_globals_;
94 94
95 ppapi::ResourceTracker resource_tracker_; 95 ppapi::ResourceTracker resource_tracker_;
96 HostVarTracker host_var_tracker_; 96 HostVarTracker host_var_tracker_;
97 97
98 // Tracks all live instances and their associated object. 98 // Tracks all live instances and their associated object.
99 typedef std::map<PP_Instance, PepperPluginInstanceImpl*> InstanceMap; 99 typedef std::map<PP_Instance, PepperPluginInstanceImpl*> InstanceMap;
100 InstanceMap instance_map_; 100 InstanceMap instance_map_;
101 101
102 // Tracks all live modules. The pointers are non-owning, the PluginModule 102 // Tracks all live modules. The pointers are non-owning, the PluginModule
103 // destructor will notify us when the module is deleted. 103 // destructor will notify us when the module is deleted.
104 typedef std::map<PP_Module, PluginModule*> ModuleMap; 104 typedef std::map<PP_Module, PluginModule*> ModuleMap;
105 ModuleMap module_map_; 105 ModuleMap module_map_;
106 106
107 DISALLOW_COPY_AND_ASSIGN(HostGlobals); 107 DISALLOW_COPY_AND_ASSIGN(HostGlobals);
108 }; 108 };
109 109
110 } // namespace content 110 } // namespace content
111 111
112 #endif // CONTENT_RENDERER_PEPPER_HOST_GLOBALS_H_ 112 #endif // CONTENT_RENDERER_PEPPER_HOST_GLOBALS_H_
OLDNEW
« no previous file with comments | « content/renderer/pepper/host_array_buffer_var.h ('k') | content/renderer/pepper/host_resource_var.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698