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

Side by Side Diff: media/formats/webm/webm_content_encodings_client.h

Issue 623263003: replace OVERRIDE and FINAL with override and final in media/ (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 | « media/formats/webm/webm_cluster_parser.h ('k') | media/formats/webm/webm_info_parser.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 MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_CLIENT_H_ 5 #ifndef MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_CLIENT_H_
6 #define MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_CLIENT_H_ 6 #define MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_CLIENT_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 10 matching lines...) Expand all
21 21
22 // Parser for WebM ContentEncodings element. 22 // Parser for WebM ContentEncodings element.
23 class MEDIA_EXPORT WebMContentEncodingsClient : public WebMParserClient { 23 class MEDIA_EXPORT WebMContentEncodingsClient : public WebMParserClient {
24 public: 24 public:
25 explicit WebMContentEncodingsClient(const LogCB& log_cb); 25 explicit WebMContentEncodingsClient(const LogCB& log_cb);
26 virtual ~WebMContentEncodingsClient(); 26 virtual ~WebMContentEncodingsClient();
27 27
28 const ContentEncodings& content_encodings() const; 28 const ContentEncodings& content_encodings() const;
29 29
30 // WebMParserClient methods 30 // WebMParserClient methods
31 virtual WebMParserClient* OnListStart(int id) OVERRIDE; 31 virtual WebMParserClient* OnListStart(int id) override;
32 virtual bool OnListEnd(int id) OVERRIDE; 32 virtual bool OnListEnd(int id) override;
33 virtual bool OnUInt(int id, int64 val) OVERRIDE; 33 virtual bool OnUInt(int id, int64 val) override;
34 virtual bool OnBinary(int id, const uint8* data, int size) OVERRIDE; 34 virtual bool OnBinary(int id, const uint8* data, int size) override;
35 35
36 private: 36 private:
37 LogCB log_cb_; 37 LogCB log_cb_;
38 scoped_ptr<ContentEncoding> cur_content_encoding_; 38 scoped_ptr<ContentEncoding> cur_content_encoding_;
39 bool content_encryption_encountered_; 39 bool content_encryption_encountered_;
40 ContentEncodings content_encodings_; 40 ContentEncodings content_encodings_;
41 41
42 // |content_encodings_| is ready. For debugging purpose. 42 // |content_encodings_| is ready. For debugging purpose.
43 bool content_encodings_ready_; 43 bool content_encodings_ready_;
44 44
45 DISALLOW_COPY_AND_ASSIGN(WebMContentEncodingsClient); 45 DISALLOW_COPY_AND_ASSIGN(WebMContentEncodingsClient);
46 }; 46 };
47 47
48 } // namespace media 48 } // namespace media
49 49
50 #endif // MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_CLIENT_H_ 50 #endif // MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_CLIENT_H_
OLDNEW
« no previous file with comments | « media/formats/webm/webm_cluster_parser.h ('k') | media/formats/webm/webm_info_parser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698