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

Side by Side Diff: content/common/plugin_list.h

Issue 649533003: C++11 declares a type safe null pointer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed Presubmit errors 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
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 CONTENT_COMMON_PLUGIN_LIST_H_ 5 #ifndef CONTENT_COMMON_PLUGIN_LIST_H_
6 #define CONTENT_COMMON_PLUGIN_LIST_H_ 6 #define CONTENT_COMMON_PLUGIN_LIST_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 bool include_npapi); 104 bool include_npapi);
105 105
106 // Copies the list of plug-ins into |plugins| without loading them. 106 // Copies the list of plug-ins into |plugins| without loading them.
107 // Returns true if the list of plugins is up-to-date. 107 // Returns true if the list of plugins is up-to-date.
108 bool GetPluginsNoRefresh(std::vector<WebPluginInfo>* plugins); 108 bool GetPluginsNoRefresh(std::vector<WebPluginInfo>* plugins);
109 109
110 // Returns a list in |info| containing plugins that are found for 110 // Returns a list in |info| containing plugins that are found for
111 // the given url and mime type (including disabled plugins, for 111 // the given url and mime type (including disabled plugins, for
112 // which |info->enabled| is false). The mime type which corresponds 112 // which |info->enabled| is false). The mime type which corresponds
113 // to the URL is optionally returned back in |actual_mime_types| (if 113 // to the URL is optionally returned back in |actual_mime_types| (if
114 // it is non-NULL), one for each of the plugin info objects found. 114 // it is non-nullptr), one for each of the plugin info objects found.
115 // The |allow_wildcard| parameter controls whether this function 115 // The |allow_wildcard| parameter controls whether this function
116 // returns plugins which support wildcard mime types (* as the mime 116 // returns plugins which support wildcard mime types (* as the mime
117 // type). The |info| parameter is required to be non-NULL. The 117 // type). The |info| parameter is required to be non-nullptr. The
118 // list is in order of "most desirable" to "least desirable". 118 // list is in order of "most desirable" to "least desirable".
119 // If |use_stale| is NULL, this will load the plug-in list if necessary. 119 // If |use_stale| is nullptr, this will load the plug-in list if necessary.
120 // If it is not NULL, the plug-in list will not be loaded, and |*use_stale| 120 // If it is not nullptr, the plug-in list will not be loaded, and |*use_stale|
121 // will be true iff the plug-in list was stale. 121 // will be true iff the plug-in list was stale.
122 void GetPluginInfoArray(const GURL& url, 122 void GetPluginInfoArray(const GURL& url,
123 const std::string& mime_type, 123 const std::string& mime_type,
124 bool allow_wildcard, 124 bool allow_wildcard,
125 bool* use_stale, 125 bool* use_stale,
126 bool include_npapi, 126 bool include_npapi,
127 std::vector<WebPluginInfo>* info, 127 std::vector<WebPluginInfo>* info,
128 std::vector<std::string>* actual_mime_types); 128 std::vector<std::string>* actual_mime_types);
129 129
130 // Load a specific plugin with full path. Return true iff loading the plug-in 130 // Load a specific plugin with full path. Return true iff loading the plug-in
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 // Flag indicating whether third_party plugins will be searched for 239 // Flag indicating whether third_party plugins will be searched for
240 // in common places. 240 // in common places.
241 bool plugins_discovery_disabled_; 241 bool plugins_discovery_disabled_;
242 242
243 DISALLOW_COPY_AND_ASSIGN(PluginList); 243 DISALLOW_COPY_AND_ASSIGN(PluginList);
244 }; 244 };
245 245
246 } // namespace content 246 } // namespace content
247 247
248 #endif // CONTENT_COMMON_PLUGIN_LIST_H_ 248 #endif // CONTENT_COMMON_PLUGIN_LIST_H_
OLDNEW
« no previous file with comments | « content/common/page_state_serialization_unittest.cc ('k') | content/common/plugin_list_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698