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

Side by Side Diff: webkit/plugins/npapi/mock_plugin_list.h

Issue 10918174: Remove PluginGroup (Closed) Base URL: http://git.chromium.org/chromium/src.git@remove_async_plugin_finder
Patch Set: fix conflicts Created 8 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 | « webkit/glue/webkit_glue.gypi ('k') | webkit/plugins/npapi/mock_plugin_list.cc » ('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 WEBKIT_PLUGINS_NPAPI_MOCK_PLUGIN_LIST_H_ 5 #ifndef WEBKIT_PLUGINS_NPAPI_MOCK_PLUGIN_LIST_H_
6 #define WEBKIT_PLUGINS_NPAPI_MOCK_PLUGIN_LIST_H_ 6 #define WEBKIT_PLUGINS_NPAPI_MOCK_PLUGIN_LIST_H_
7 7
8 #include "webkit/plugins/npapi/plugin_list.h" 8 #include "webkit/plugins/npapi/plugin_list.h"
9 9
10 namespace webkit { 10 namespace webkit {
11 namespace npapi { 11 namespace npapi {
12 12
13 // A PluginList for tests that avoids file system IO. There is also no reason 13 // A PluginList for tests that avoids file system IO. There is also no reason
14 // to use |lock_| (but it doesn't hurt either). 14 // to use |lock_| (but it doesn't hurt either).
15 class MockPluginList : public PluginList { 15 class MockPluginList : public PluginList {
16 public: 16 public:
17 MockPluginList(const PluginGroupDefinition* group_definitions, 17 MockPluginList();
18 size_t num_group_definitions);
19 virtual ~MockPluginList(); 18 virtual ~MockPluginList();
20 19
21 void AddPluginToLoad(const WebPluginInfo& plugin); 20 void AddPluginToLoad(const WebPluginInfo& plugin);
22 void ClearPluginsToLoad(); 21 void ClearPluginsToLoad();
23 22
24 // PluginList: 23 // PluginList:
25 virtual bool GetPluginsNoRefresh( 24 virtual bool GetPluginsNoRefresh(
26 std::vector<webkit::WebPluginInfo>* plugins) OVERRIDE; 25 std::vector<webkit::WebPluginInfo>* plugins) OVERRIDE;
27 26
28 private: 27 private:
29 std::vector<WebPluginInfo> plugins_to_load_; 28 std::vector<WebPluginInfo> plugins_to_load_;
30 29
31 // PluginList methods: 30 // PluginList methods:
32 31
33 // TODO(ibraaaa): DELETE. http://crbug.com/124396
34 virtual void LoadPluginsInternal(
35 ScopedVector<PluginGroup>* plugin_groups) OVERRIDE;
36
37 virtual void LoadPluginsIntoPluginListInternal( 32 virtual void LoadPluginsIntoPluginListInternal(
38 std::vector<webkit::WebPluginInfo>* plugins) OVERRIDE; 33 std::vector<webkit::WebPluginInfo>* plugins) OVERRIDE;
39 }; 34 };
40 35
41 } // npapi 36 } // npapi
42 } // webkit 37 } // webkit
43 38
44 #endif // WEBKIT_PLUGINS_NPAPI_MOCK_PLUGIN_LIST_H_ 39 #endif // WEBKIT_PLUGINS_NPAPI_MOCK_PLUGIN_LIST_H_
OLDNEW
« no previous file with comments | « webkit/glue/webkit_glue.gypi ('k') | webkit/plugins/npapi/mock_plugin_list.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698