OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 <stdint.h> | 5 #include <stdint.h> |
6 #include <string.h> | 6 #include <string.h> |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/base_paths.h" | 9 #include "base/base_paths.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
100 return found; | 100 return found; |
101 } | 101 } |
102 #endif // defined(GOOGLE_CHROME_BUILD) && !defined(OS_LINUX) | 102 #endif // defined(GOOGLE_CHROME_BUILD) && !defined(OS_LINUX) |
103 | 103 |
104 bool MakePepperFlashPluginInfo(const base::FilePath& flash_path, | 104 bool MakePepperFlashPluginInfo(const base::FilePath& flash_path, |
105 const Version& flash_version, | 105 const Version& flash_version, |
106 bool out_of_process, | 106 bool out_of_process, |
107 content::PepperPluginInfo* plugin_info) { | 107 content::PepperPluginInfo* plugin_info) { |
108 if (!flash_version.IsValid()) | 108 if (!flash_version.IsValid()) |
109 return false; | 109 return false; |
110 const std::vector<uint16_t> ver_nums = flash_version.components(); | 110 const std::vector<uint32_t> ver_nums = flash_version.components(); |
111 if (ver_nums.size() < 3) | 111 if (ver_nums.size() < 3) |
112 return false; | 112 return false; |
113 | 113 |
114 plugin_info->is_internal = false; | 114 plugin_info->is_internal = false; |
115 plugin_info->is_out_of_process = out_of_process; | 115 plugin_info->is_out_of_process = out_of_process; |
116 plugin_info->path = flash_path; | 116 plugin_info->path = flash_path; |
117 plugin_info->name = content::kFlashPluginName; | 117 plugin_info->name = content::kFlashPluginName; |
118 plugin_info->permissions = chrome::kPepperFlashPermissions; | 118 plugin_info->permissions = chrome::kPepperFlashPermissions; |
119 | 119 |
120 // The description is like "Shockwave Flash 10.2 r154". | 120 // The description is like "Shockwave Flash 10.2 r154". |
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
315 base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); | 315 base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); |
316 if (cmd_line->HasSwitch(switches::kDisableBundledPpapiFlash)) | 316 if (cmd_line->HasSwitch(switches::kDisableBundledPpapiFlash)) |
317 return; | 317 return; |
318 BrowserThread::PostTask(BrowserThread::FILE, | 318 BrowserThread::PostTask(BrowserThread::FILE, |
319 FROM_HERE, | 319 FROM_HERE, |
320 base::Bind(&StartPepperFlashUpdateRegistration, cus)); | 320 base::Bind(&StartPepperFlashUpdateRegistration, cus)); |
321 #endif | 321 #endif |
322 } | 322 } |
323 | 323 |
324 } // namespace component_updater | 324 } // namespace component_updater |
OLD | NEW |