OLD | NEW |
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 { |
(...skipping 11 matching lines...) Expand all Loading... |
22 void ClearPluginsToLoad(); | 22 void ClearPluginsToLoad(); |
23 | 23 |
24 // PluginList: | 24 // PluginList: |
25 virtual bool GetPluginsNoRefresh( | 25 virtual bool GetPluginsNoRefresh( |
26 std::vector<webkit::WebPluginInfo>* plugins) OVERRIDE; | 26 std::vector<webkit::WebPluginInfo>* plugins) OVERRIDE; |
27 | 27 |
28 private: | 28 private: |
29 std::vector<WebPluginInfo> plugins_to_load_; | 29 std::vector<WebPluginInfo> plugins_to_load_; |
30 | 30 |
31 // PluginList methods: | 31 // PluginList methods: |
| 32 |
| 33 // TODO(ibraaaa): DELETE. http://crbug.com/124396 |
32 virtual void LoadPluginsInternal( | 34 virtual void LoadPluginsInternal( |
33 ScopedVector<PluginGroup>* plugin_groups) OVERRIDE; | 35 ScopedVector<PluginGroup>* plugin_groups) OVERRIDE; |
| 36 |
| 37 virtual void LoadPluginsIntoPluginListInternal( |
| 38 std::vector<webkit::WebPluginInfo>* plugins) OVERRIDE; |
34 }; | 39 }; |
35 | 40 |
36 } // npapi | 41 } // npapi |
37 } // webkit | 42 } // webkit |
38 | 43 |
39 #endif // WEBKIT_PLUGINS_NPAPI_MOCK_PLUGIN_LIST_H_ | 44 #endif // WEBKIT_PLUGINS_NPAPI_MOCK_PLUGIN_LIST_H_ |
OLD | NEW |