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

Side by Side Diff: content/renderer/media/crypto/pepper_cdm_wrapper_impl.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 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 CONTENT_RENDERER_MEDIA_CRYPTO_PEPPER_CDM_WRAPPER_IMPL_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_CRYPTO_PEPPER_CDM_WRAPPER_IMPL_H_
6 #define CONTENT_RENDERER_MEDIA_CRYPTO_PEPPER_CDM_WRAPPER_IMPL_H_ 6 #define CONTENT_RENDERER_MEDIA_CRYPTO_PEPPER_CDM_WRAPPER_IMPL_H_
7 7
8 #if !defined(ENABLE_PEPPER_CDMS) 8 #if !defined(ENABLE_PEPPER_CDMS)
9 #error This file should only be included when ENABLE_PEPPER_CDMS is defined 9 #error This file should only be included when ENABLE_PEPPER_CDMS is defined
10 #endif 10 #endif
(...skipping 29 matching lines...) Expand all
40 // blink:: objects. 40 // blink:: objects.
41 class PepperCdmWrapperImpl : public PepperCdmWrapper { 41 class PepperCdmWrapperImpl : public PepperCdmWrapper {
42 public: 42 public:
43 static scoped_ptr<PepperCdmWrapper> Create(blink::WebLocalFrame* frame, 43 static scoped_ptr<PepperCdmWrapper> Create(blink::WebLocalFrame* frame,
44 const std::string& pluginType, 44 const std::string& pluginType,
45 const GURL& security_origin); 45 const GURL& security_origin);
46 46
47 virtual ~PepperCdmWrapperImpl(); 47 virtual ~PepperCdmWrapperImpl();
48 48
49 // Returns the ContentDecryptorDelegate* associated with this plugin. 49 // Returns the ContentDecryptorDelegate* associated with this plugin.
50 virtual ContentDecryptorDelegate* GetCdmDelegate() OVERRIDE; 50 virtual ContentDecryptorDelegate* GetCdmDelegate() override;
51 51
52 private: 52 private:
53 typedef scoped_ptr<blink::WebHelperPlugin, WebHelperPluginDeleter> 53 typedef scoped_ptr<blink::WebHelperPlugin, WebHelperPluginDeleter>
54 ScopedHelperPlugin; 54 ScopedHelperPlugin;
55 55
56 // Takes ownership of |helper_plugin| and |plugin_instance|. 56 // Takes ownership of |helper_plugin| and |plugin_instance|.
57 PepperCdmWrapperImpl( 57 PepperCdmWrapperImpl(
58 ScopedHelperPlugin helper_plugin, 58 ScopedHelperPlugin helper_plugin,
59 const scoped_refptr<PepperPluginInstanceImpl>& plugin_instance); 59 const scoped_refptr<PepperPluginInstanceImpl>& plugin_instance);
60 60
61 ScopedHelperPlugin helper_plugin_; 61 ScopedHelperPlugin helper_plugin_;
62 scoped_refptr<PepperPluginInstanceImpl> plugin_instance_; 62 scoped_refptr<PepperPluginInstanceImpl> plugin_instance_;
63 63
64 DISALLOW_COPY_AND_ASSIGN(PepperCdmWrapperImpl); 64 DISALLOW_COPY_AND_ASSIGN(PepperCdmWrapperImpl);
65 }; 65 };
66 66
67 } // namespace content 67 } // namespace content
68 68
69 #endif // CONTENT_RENDERER_MEDIA_CRYPTO_PEPPER_CDM_WRAPPER_IMPL_H_ 69 #endif // CONTENT_RENDERER_MEDIA_CRYPTO_PEPPER_CDM_WRAPPER_IMPL_H_
OLDNEW
« no previous file with comments | « content/renderer/media/crypto/key_systems_unittest.cc ('k') | content/renderer/media/crypto/ppapi_decryptor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698