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 #include "chrome/browser/plugins/plugin_finder.h" | 5 #include "chrome/browser/plugins/plugin_finder.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/json/json_reader.h" | 10 #include "base/json/json_reader.h" |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
73 const base::ListValue* mime_types = NULL; | 73 const base::ListValue* mime_types = NULL; |
74 std::string list_key = | 74 std::string list_key = |
75 matching_mime_types ? "matching_mime_types" : "mime_types"; | 75 matching_mime_types ? "matching_mime_types" : "mime_types"; |
76 if (!plugin_dict->GetList(list_key, &mime_types)) | 76 if (!plugin_dict->GetList(list_key, &mime_types)) |
77 return; | 77 return; |
78 | 78 |
79 bool success = false; | 79 bool success = false; |
80 for (base::ListValue::const_iterator mime_type_it = mime_types->begin(); | 80 for (base::ListValue::const_iterator mime_type_it = mime_types->begin(); |
81 mime_type_it != mime_types->end(); ++mime_type_it) { | 81 mime_type_it != mime_types->end(); ++mime_type_it) { |
82 std::string mime_type_str; | 82 std::string mime_type_str; |
83 success = mime_type_it->GetAsString(&mime_type_str); | 83 success = (*mime_type_it)->GetAsString(&mime_type_str); |
84 DCHECK(success); | 84 DCHECK(success); |
85 if (matching_mime_types) { | 85 if (matching_mime_types) { |
86 plugin->AddMatchingMimeType(mime_type_str); | 86 plugin->AddMatchingMimeType(mime_type_str); |
87 } else { | 87 } else { |
88 plugin->AddMimeType(mime_type_str); | 88 plugin->AddMimeType(mime_type_str); |
89 } | 89 } |
90 } | 90 } |
91 } | 91 } |
92 | 92 |
93 std::unique_ptr<PluginMetadata> CreatePluginMetadata( | 93 std::unique_ptr<PluginMetadata> CreatePluginMetadata( |
(...skipping 14 matching lines...) Expand all Loading... |
108 std::string language_str; | 108 std::string language_str; |
109 plugin_dict->GetString("lang", &language_str); | 109 plugin_dict->GetString("lang", &language_str); |
110 | 110 |
111 std::unique_ptr<PluginMetadata> plugin = base::MakeUnique<PluginMetadata>( | 111 std::unique_ptr<PluginMetadata> plugin = base::MakeUnique<PluginMetadata>( |
112 identifier, name, display_url, GURL(url), GURL(help_url), | 112 identifier, name, display_url, GURL(url), GURL(help_url), |
113 group_name_matcher, language_str); | 113 group_name_matcher, language_str); |
114 const base::ListValue* versions = NULL; | 114 const base::ListValue* versions = NULL; |
115 if (plugin_dict->GetList("versions", &versions)) { | 115 if (plugin_dict->GetList("versions", &versions)) { |
116 for (base::ListValue::const_iterator it = versions->begin(); | 116 for (base::ListValue::const_iterator it = versions->begin(); |
117 it != versions->end(); ++it) { | 117 it != versions->end(); ++it) { |
118 const base::DictionaryValue* version_dict = NULL; | 118 base::DictionaryValue* version_dict = NULL; |
119 if (!it->GetAsDictionary(&version_dict)) { | 119 if (!(*it)->GetAsDictionary(&version_dict)) { |
120 NOTREACHED(); | 120 NOTREACHED(); |
121 continue; | 121 continue; |
122 } | 122 } |
123 std::string version; | 123 std::string version; |
124 success = version_dict->GetString("version", &version); | 124 success = version_dict->GetString("version", &version); |
125 DCHECK(success); | 125 DCHECK(success); |
126 std::string status_str; | 126 std::string status_str; |
127 success = version_dict->GetString("status", &status_str); | 127 success = version_dict->GetString("status", &status_str); |
128 DCHECK(success); | 128 DCHECK(success); |
129 PluginMetadata::SecurityStatus status = | 129 PluginMetadata::SecurityStatus status = |
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
328 metadata->AddMatchingMimeType(plugin.mime_types[i].mime_type); | 328 metadata->AddMatchingMimeType(plugin.mime_types[i].mime_type); |
329 | 329 |
330 DCHECK(metadata->MatchesPlugin(plugin)); | 330 DCHECK(metadata->MatchesPlugin(plugin)); |
331 if (identifier_plugin_.find(identifier) != identifier_plugin_.end()) | 331 if (identifier_plugin_.find(identifier) != identifier_plugin_.end()) |
332 identifier = GetLongIdentifier(plugin); | 332 identifier = GetLongIdentifier(plugin); |
333 | 333 |
334 DCHECK(identifier_plugin_.find(identifier) == identifier_plugin_.end()); | 334 DCHECK(identifier_plugin_.find(identifier) == identifier_plugin_.end()); |
335 identifier_plugin_[identifier] = std::move(metadata); | 335 identifier_plugin_[identifier] = std::move(metadata); |
336 return identifier_plugin_[identifier]->Clone(); | 336 return identifier_plugin_[identifier]->Clone(); |
337 } | 337 } |
OLD | NEW |