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