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

Side by Side Diff: content/public/common/pepper_plugin_info.cc

Issue 2434103005: Do not replace up-to-date System Flash with Component Flash. (Closed)
Patch Set: Through #10 Created 4 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
« no previous file with comments | « content/public/common/pepper_plugin_info.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #include "base/version.h" 8 #include "base/version.h"
9 9
10 namespace content { 10 namespace content {
11 11
12 PepperPluginInfo::EntryPoints::EntryPoints() 12 PepperPluginInfo::EntryPoints::EntryPoints()
13 : get_interface(NULL), 13 : get_interface(NULL),
14 initialize_module(NULL), 14 initialize_module(NULL),
15 shutdown_module(NULL) { 15 shutdown_module(NULL) {
16 } 16 }
17 17
18 PepperPluginInfo::PepperPluginInfo() 18 PepperPluginInfo::PepperPluginInfo()
19 : is_internal(false), 19 : is_internal(false),
20 is_out_of_process(false), 20 is_out_of_process(false),
21 is_debug(false),
22 is_on_local_drive(true),
23 is_external(false), 21 is_external(false),
24 is_bundled(false),
25 permissions(0) { 22 permissions(0) {
26 } 23 }
27 24
28 PepperPluginInfo::PepperPluginInfo(const PepperPluginInfo& other) = default; 25 PepperPluginInfo::PepperPluginInfo(const PepperPluginInfo& other) = default;
29 26
30 PepperPluginInfo::~PepperPluginInfo() { 27 PepperPluginInfo::~PepperPluginInfo() {
31 } 28 }
32 29
33 WebPluginInfo PepperPluginInfo::ToWebPluginInfo() const { 30 WebPluginInfo PepperPluginInfo::ToWebPluginInfo() const {
34 WebPluginInfo info; 31 WebPluginInfo info;
35 32
36 info.type = is_out_of_process ? 33 info.type = is_out_of_process ?
37 WebPluginInfo::PLUGIN_TYPE_PEPPER_OUT_OF_PROCESS : 34 WebPluginInfo::PLUGIN_TYPE_PEPPER_OUT_OF_PROCESS :
38 WebPluginInfo::PLUGIN_TYPE_PEPPER_IN_PROCESS; 35 WebPluginInfo::PLUGIN_TYPE_PEPPER_IN_PROCESS;
39 36
40 info.name = name.empty() ? 37 info.name = name.empty() ?
41 path.BaseName().LossyDisplayName() : base::UTF8ToUTF16(name); 38 path.BaseName().LossyDisplayName() : base::UTF8ToUTF16(name);
42 info.path = path; 39 info.path = path;
43 info.version = base::ASCIIToUTF16(version); 40 info.version = base::ASCIIToUTF16(version);
44 info.desc = base::ASCIIToUTF16(description); 41 info.desc = base::ASCIIToUTF16(description);
45 info.mime_types = mime_types; 42 info.mime_types = mime_types;
46 info.pepper_permissions = permissions; 43 info.pepper_permissions = permissions;
47 44
48 return info; 45 return info;
49 } 46 }
50 47
51 } // namespace content 48 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/pepper_plugin_info.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698