Chromium Code Reviews| 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/plugin_list.h" | 5 #include "content/common/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/file_version_info.h" | 10 #include "base/file_version_info.h" |
| (...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 361 return; | 361 return; |
| 362 | 362 |
| 363 std::set<base::FilePath> plugin_dirs; | 363 std::set<base::FilePath> plugin_dirs; |
| 364 | 364 |
| 365 GetPluginsInRegistryDirectory(HKEY_CURRENT_USER, | 365 GetPluginsInRegistryDirectory(HKEY_CURRENT_USER, |
| 366 kRegistryMozillaPlugins, | 366 kRegistryMozillaPlugins, |
| 367 0, | 367 0, |
| 368 &plugin_dirs); | 368 &plugin_dirs); |
| 369 GetPluginsInRegistryDirectory(HKEY_LOCAL_MACHINE, | 369 GetPluginsInRegistryDirectory(HKEY_LOCAL_MACHINE, |
| 370 kRegistryMozillaPlugins, | 370 kRegistryMozillaPlugins, |
| 371 KEY_WOW64_64KEY, | 371 0, |
|
ananta
2014/11/04 01:06:03
Please add a comment here saying that this will on
| |
| 372 &plugin_dirs); | |
| 373 GetPluginsInRegistryDirectory(HKEY_LOCAL_MACHINE, | |
| 374 kRegistryMozillaPlugins, | |
| 375 KEY_WOW64_32KEY, | |
| 376 &plugin_dirs); | 372 &plugin_dirs); |
| 377 | 373 |
| 378 for (std::set<base::FilePath>::iterator i = plugin_dirs.begin(); | 374 for (std::set<base::FilePath>::iterator i = plugin_dirs.begin(); |
| 379 i != plugin_dirs.end(); ++i) { | 375 i != plugin_dirs.end(); ++i) { |
| 380 plugins->push_back(*i); | 376 plugins->push_back(*i); |
| 381 } | 377 } |
| 382 } | 378 } |
| 383 | 379 |
| 384 bool PluginList::ShouldLoadPluginUsingPluginList( | 380 bool PluginList::ShouldLoadPluginUsingPluginList( |
| 385 const WebPluginInfo& info, | 381 const WebPluginInfo& info, |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 481 return false; | 477 return false; |
| 482 #else | 478 #else |
| 483 // The plugin in question could be a 64 bit plugin which we cannot load. | 479 // The plugin in question could be a 64 bit plugin which we cannot load. |
| 484 if (!IsValid32BitImage(base::MakeAbsoluteFilePath(plugin_path))) | 480 if (!IsValid32BitImage(base::MakeAbsoluteFilePath(plugin_path))) |
| 485 return false; | 481 return false; |
| 486 #endif | 482 #endif |
| 487 return true; | 483 return true; |
| 488 } | 484 } |
| 489 | 485 |
| 490 } // namespace content | 486 } // namespace content |
| OLD | NEW |