| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 <tchar.h> | 5 #include <tchar.h> |
| 6 | 6 |
| 7 #include "webkit/glue/plugins/plugin_list.h" | 7 #include "webkit/glue/plugins/plugin_list.h" |
| 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 306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 317 if (plugins_[i].path.BaseName().value() == kNewWMPPlugin) | 317 if (plugins_[i].path.BaseName().value() == kNewWMPPlugin) |
| 318 return false; | 318 return false; |
| 319 } | 319 } |
| 320 } | 320 } |
| 321 } | 321 } |
| 322 | 322 |
| 323 return true; | 323 return true; |
| 324 } | 324 } |
| 325 | 325 |
| 326 void PluginList::LoadInternalPlugins() { | 326 void PluginList::LoadInternalPlugins() { |
| 327 WebPluginInfo info; |
| 328 |
| 329 #ifdef GEARS_STATIC_LIB |
| 330 if (PluginLib::ReadWebPluginInfo(FilePath(kGearsPluginLibraryName), |
| 331 &info)) { |
| 332 plugins_.push_back(info); |
| 333 } |
| 334 #endif |
| 335 |
| 327 if (!use_internal_activex_shim_) | 336 if (!use_internal_activex_shim_) |
| 328 return; | 337 return; |
| 329 | 338 |
| 330 WebPluginInfo info; | |
| 331 if (PluginLib::ReadWebPluginInfo(FilePath(kActiveXShimFileName), | 339 if (PluginLib::ReadWebPluginInfo(FilePath(kActiveXShimFileName), |
| 332 &info)) { | 340 &info)) { |
| 333 plugins_.push_back(info); | 341 plugins_.push_back(info); |
| 334 } | 342 } |
| 335 | 343 |
| 336 if (PluginLib::ReadWebPluginInfo(FilePath(kActiveXShimFileNameForMediaPlayer), | 344 if (PluginLib::ReadWebPluginInfo(FilePath(kActiveXShimFileNameForMediaPlayer), |
| 337 &info)) { | 345 &info)) { |
| 338 plugins_.push_back(info); | 346 plugins_.push_back(info); |
| 339 } | 347 } |
| 340 } | 348 } |
| 341 | 349 |
| 342 } // namespace NPAPI | 350 } // namespace NPAPI |
| 343 | 351 |
| OLD | NEW |