| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/public/common/pepper_plugin_info.h" | 5 #include "content/public/common/pepper_plugin_info.h" |
| 6 | 6 |
| 7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
| 8 | 8 |
| 9 namespace content { | 9 namespace content { |
| 10 | 10 |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 WebPluginInfo PepperPluginInfo::ToWebPluginInfo() const { | 27 WebPluginInfo PepperPluginInfo::ToWebPluginInfo() const { |
| 28 WebPluginInfo info; | 28 WebPluginInfo info; |
| 29 | 29 |
| 30 info.type = is_out_of_process ? | 30 info.type = is_out_of_process ? |
| 31 (is_sandboxed ? | 31 (is_sandboxed ? |
| 32 WebPluginInfo::PLUGIN_TYPE_PEPPER_OUT_OF_PROCESS : | 32 WebPluginInfo::PLUGIN_TYPE_PEPPER_OUT_OF_PROCESS : |
| 33 WebPluginInfo::PLUGIN_TYPE_PEPPER_UNSANDBOXED) : | 33 WebPluginInfo::PLUGIN_TYPE_PEPPER_UNSANDBOXED) : |
| 34 WebPluginInfo::PLUGIN_TYPE_PEPPER_IN_PROCESS; | 34 WebPluginInfo::PLUGIN_TYPE_PEPPER_IN_PROCESS; |
| 35 | 35 |
| 36 info.name = name.empty() ? | 36 info.name = name.empty() ? |
| 37 path.BaseName().LossyDisplayName() : UTF8ToUTF16(name); | 37 path.BaseName().LossyDisplayName() : base::UTF8ToUTF16(name); |
| 38 info.path = path; | 38 info.path = path; |
| 39 info.version = ASCIIToUTF16(version); | 39 info.version = base::ASCIIToUTF16(version); |
| 40 info.desc = ASCIIToUTF16(description); | 40 info.desc = base::ASCIIToUTF16(description); |
| 41 info.mime_types = mime_types; | 41 info.mime_types = mime_types; |
| 42 info.pepper_permissions = permissions; | 42 info.pepper_permissions = permissions; |
| 43 | 43 |
| 44 return info; | 44 return info; |
| 45 } | 45 } |
| 46 | 46 |
| 47 } // namespace content | 47 } // namespace content |
| OLD | NEW |