| 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 "webkit/plugins/npapi/plugin_list.h" | 5 #include "webkit/plugins/npapi/plugin_list.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 412 } else if (filename == kOldWMPPlugin) { | 412 } else if (filename == kOldWMPPlugin) { |
| 413 for (size_t j = 0; j < plugins->size(); ++j) { | 413 for (size_t j = 0; j < plugins->size(); ++j) { |
| 414 if ((*plugins)[j].path.BaseName().value() == kNewWMPPlugin) | 414 if ((*plugins)[j].path.BaseName().value() == kNewWMPPlugin) |
| 415 return false; | 415 return false; |
| 416 } | 416 } |
| 417 } | 417 } |
| 418 | 418 |
| 419 #if !defined(ARCH_CPU_X86_64) | 419 #if !defined(ARCH_CPU_X86_64) |
| 420 // The plugin in question could be a 64 bit plugin which we cannot load. | 420 // The plugin in question could be a 64 bit plugin which we cannot load. |
| 421 base::FilePath plugin_path(info.path); | 421 base::FilePath plugin_path(info.path); |
| 422 file_util::AbsolutePath(&plugin_path); | 422 if (!IsValid32BitImage(plugin_path.AsAbsolute())) |
| 423 if (!IsValid32BitImage(plugin_path)) | |
| 424 return false; | 423 return false; |
| 425 #endif | 424 #endif |
| 426 return true; | 425 return true; |
| 427 } | 426 } |
| 428 | 427 |
| 429 } // namespace npapi | 428 } // namespace npapi |
| 430 } // namespace webkit | 429 } // namespace webkit |
| OLD | NEW |