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 "content/common/pepper_plugin_list.h" | 5 #include "content/common/pepper_plugin_list.h" |
6 | 6 |
7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
10 #include "base/strings/string_split.h" | 10 #include "base/strings/string_split.h" |
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
127 if (!webplugin_info.is_pepper_plugin()) | 127 if (!webplugin_info.is_pepper_plugin()) |
128 return false; | 128 return false; |
129 | 129 |
130 pepper_info->is_out_of_process = | 130 pepper_info->is_out_of_process = |
131 webplugin_info.type == WebPluginInfo::PLUGIN_TYPE_PEPPER_OUT_OF_PROCESS || | 131 webplugin_info.type == WebPluginInfo::PLUGIN_TYPE_PEPPER_OUT_OF_PROCESS || |
132 webplugin_info.type == WebPluginInfo::PLUGIN_TYPE_PEPPER_UNSANDBOXED; | 132 webplugin_info.type == WebPluginInfo::PLUGIN_TYPE_PEPPER_UNSANDBOXED; |
133 pepper_info->is_sandboxed = webplugin_info.type != | 133 pepper_info->is_sandboxed = webplugin_info.type != |
134 WebPluginInfo::PLUGIN_TYPE_PEPPER_UNSANDBOXED; | 134 WebPluginInfo::PLUGIN_TYPE_PEPPER_UNSANDBOXED; |
135 | 135 |
136 pepper_info->path = base::FilePath(webplugin_info.path); | 136 pepper_info->path = base::FilePath(webplugin_info.path); |
137 pepper_info->name = UTF16ToASCII(webplugin_info.name); | 137 pepper_info->name = base::UTF16ToASCII(webplugin_info.name); |
138 pepper_info->description = UTF16ToASCII(webplugin_info.desc); | 138 pepper_info->description = base::UTF16ToASCII(webplugin_info.desc); |
139 pepper_info->version = UTF16ToASCII(webplugin_info.version); | 139 pepper_info->version = base::UTF16ToASCII(webplugin_info.version); |
140 pepper_info->mime_types = webplugin_info.mime_types; | 140 pepper_info->mime_types = webplugin_info.mime_types; |
141 pepper_info->permissions = webplugin_info.pepper_permissions; | 141 pepper_info->permissions = webplugin_info.pepper_permissions; |
142 | 142 |
143 return true; | 143 return true; |
144 } | 144 } |
145 | 145 |
146 void ComputePepperPluginList(std::vector<PepperPluginInfo>* plugins) { | 146 void ComputePepperPluginList(std::vector<PepperPluginInfo>* plugins) { |
147 GetContentClient()->AddPepperPlugins(plugins); | 147 GetContentClient()->AddPepperPlugins(plugins); |
148 ComputePluginsFromCommandLine(plugins); | 148 ComputePluginsFromCommandLine(plugins); |
149 } | 149 } |
150 | 150 |
151 } // namespace content | 151 } // namespace content |
OLD | NEW |