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

Side by Side Diff: webkit/tools/test_shell/test_shell_webmimeregistry_impl.h

Issue 8539047: Add OVERRIDE to webkit/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 9 years, 1 month 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_WEBMIMEREGISTRY_IMPL_H_ 5 #ifndef WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_WEBMIMEREGISTRY_IMPL_H_
6 #define WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_WEBMIMEREGISTRY_IMPL_H_ 6 #define WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_WEBMIMEREGISTRY_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/compiler_specific.h"
11 #include "base/hash_tables.h" 12 #include "base/hash_tables.h"
12 #include "webkit/glue/simple_webmimeregistry_impl.h" 13 #include "webkit/glue/simple_webmimeregistry_impl.h"
13 14
14 class TestShellWebMimeRegistryImpl 15 class TestShellWebMimeRegistryImpl
15 : public webkit_glue::SimpleWebMimeRegistryImpl { 16 : public webkit_glue::SimpleWebMimeRegistryImpl {
16 public: 17 public:
17 TestShellWebMimeRegistryImpl(); 18 TestShellWebMimeRegistryImpl();
18 virtual ~TestShellWebMimeRegistryImpl(); 19 virtual ~TestShellWebMimeRegistryImpl();
19 20
20 // Override to force that we only support ogg, vorbis and theora. 21 // Override to force that we only support ogg, vorbis and theora.
21 // 22 //
22 // Media layout tests use canPlayType() to determine the test input files. 23 // Media layout tests use canPlayType() to determine the test input files.
23 // Different flavours of Chromium support different codecs, which has an 24 // Different flavours of Chromium support different codecs, which has an
24 // impact on how canPlayType() behaves. Since Chromium's baselines are 25 // impact on how canPlayType() behaves. Since Chromium's baselines are
25 // generated against ogg/vorbis/theora content we need to lock down how 26 // generated against ogg/vorbis/theora content we need to lock down how
26 // canPlayType() behaves when running layout tests. 27 // canPlayType() behaves when running layout tests.
27 virtual WebKit::WebMimeRegistry::SupportsType supportsMediaMIMEType( 28 virtual WebKit::WebMimeRegistry::SupportsType supportsMediaMIMEType(
28 const WebKit::WebString&, const WebKit::WebString&); 29 const WebKit::WebString&, const WebKit::WebString&) OVERRIDE;
29 30
30 private: 31 private:
31 bool IsSupportedMediaMimeType(const std::string& mime_type); 32 bool IsSupportedMediaMimeType(const std::string& mime_type);
32 bool AreSupportedMediaCodecs(const std::vector<std::string>& codecs); 33 bool AreSupportedMediaCodecs(const std::vector<std::string>& codecs);
33 34
34 typedef base::hash_set<std::string> MimeMappings; 35 typedef base::hash_set<std::string> MimeMappings;
35 MimeMappings media_map_; 36 MimeMappings media_map_;
36 MimeMappings codecs_map_; 37 MimeMappings codecs_map_;
37 38
38 DISALLOW_COPY_AND_ASSIGN(TestShellWebMimeRegistryImpl); 39 DISALLOW_COPY_AND_ASSIGN(TestShellWebMimeRegistryImpl);
39 }; 40 };
40 41
41 #endif // WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_WEBMIMEREGISTRY_IMPL_H_ 42 #endif // WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_WEBMIMEREGISTRY_IMPL_H_
OLDNEW
« no previous file with comments | « webkit/tools/test_shell/test_shell_test.h ('k') | webkit/tools/test_shell/test_webview_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698