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

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

Issue 13219005: Replace string16 with base::string16 in src/webkit (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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 | Annotate | Revision Log
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_PLUGIN_LIST_H_ 5 #ifndef WEBKIT_PLUGINS_NPAPI_PLUGIN_LIST_H_
6 #define WEBKIT_PLUGINS_NPAPI_PLUGIN_LIST_H_ 6 #define WEBKIT_PLUGINS_NPAPI_PLUGIN_LIST_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 webkit::WebPluginInfo* info, 114 webkit::WebPluginInfo* info,
115 const PluginEntryPoints** entry_points); 115 const PluginEntryPoints** entry_points);
116 116
117 // In Windows plugins, the mime types are passed as a specially formatted list 117 // In Windows plugins, the mime types are passed as a specially formatted list
118 // of strings. This function parses those strings into a WebPluginMimeType 118 // of strings. This function parses those strings into a WebPluginMimeType
119 // vector. 119 // vector.
120 // TODO(evan): move this code into plugin_list_win. 120 // TODO(evan): move this code into plugin_list_win.
121 static bool ParseMimeTypes( 121 static bool ParseMimeTypes(
122 const std::string& mime_types, 122 const std::string& mime_types,
123 const std::string& file_extensions, 123 const std::string& file_extensions,
124 const string16& mime_type_descriptions, 124 const base::string16& mime_type_descriptions,
125 std::vector<webkit::WebPluginMimeType>* parsed_mime_types); 125 std::vector<webkit::WebPluginMimeType>* parsed_mime_types);
126 126
127 // Get all the plugins synchronously, loading them if necessary. 127 // Get all the plugins synchronously, loading them if necessary.
128 void GetPlugins(std::vector<webkit::WebPluginInfo>* plugins); 128 void GetPlugins(std::vector<webkit::WebPluginInfo>* plugins);
129 129
130 // Copies the list of plug-ins into |plugins| without loading them. 130 // Copies the list of plug-ins into |plugins| without loading them.
131 // Returns true if the list of plugins is up-to-date. 131 // Returns true if the list of plugins is up-to-date.
132 virtual bool GetPluginsNoRefresh( 132 virtual bool GetPluginsNoRefresh(
133 std::vector<webkit::WebPluginInfo>* plugins); 133 std::vector<webkit::WebPluginInfo>* plugins);
134 134
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 // accessed on multiple threads. 266 // accessed on multiple threads.
267 base::Lock lock_; 267 base::Lock lock_;
268 268
269 DISALLOW_COPY_AND_ASSIGN(PluginList); 269 DISALLOW_COPY_AND_ASSIGN(PluginList);
270 }; 270 };
271 271
272 } // namespace npapi 272 } // namespace npapi
273 } // namespace webkit 273 } // namespace webkit
274 274
275 #endif // WEBKIT_PLUGINS_NPAPI_PLUGIN_LIST_H_ 275 #endif // WEBKIT_PLUGINS_NPAPI_PLUGIN_LIST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698