| 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 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 188 } | 188 } |
| 189 } | 189 } |
| 190 } | 190 } |
| 191 | 191 |
| 192 } | 192 } |
| 193 | 193 |
| 194 namespace NPAPI | 194 namespace NPAPI |
| 195 { | 195 { |
| 196 | 196 |
| 197 void PluginList::PlatformInit() { | 197 void PluginList::PlatformInit() { |
| 198 CommandLine command_line; | 198 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
| 199 dont_load_new_wmp_ = command_line.HasSwitch(kUseOldWMPPluginSwitch); | 199 dont_load_new_wmp_ = command_line.HasSwitch(kUseOldWMPPluginSwitch); |
| 200 use_internal_activex_shim_ = | 200 use_internal_activex_shim_ = |
| 201 !command_line.HasSwitch(kNoNativeActiveXShimSwitch); | 201 !command_line.HasSwitch(kNoNativeActiveXShimSwitch); |
| 202 } | 202 } |
| 203 | 203 |
| 204 void PluginList::GetPluginDirectories(std::vector<FilePath>* plugin_dirs) { | 204 void PluginList::GetPluginDirectories(std::vector<FilePath>* plugin_dirs) { |
| 205 // We use a set for uniqueness, which we require, over order, which we do not. | 205 // We use a set for uniqueness, which we require, over order, which we do not. |
| 206 std::set<FilePath> dirs; | 206 std::set<FilePath> dirs; |
| 207 | 207 |
| 208 // Load from the application-specific area | 208 // Load from the application-specific area |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 332 | 332 |
| 333 if (!use_internal_activex_shim_) | 333 if (!use_internal_activex_shim_) |
| 334 return; | 334 return; |
| 335 | 335 |
| 336 LoadPlugin(FilePath(kActiveXShimFileName)); | 336 LoadPlugin(FilePath(kActiveXShimFileName)); |
| 337 LoadPlugin(FilePath(kActiveXShimFileNameForMediaPlayer)); | 337 LoadPlugin(FilePath(kActiveXShimFileNameForMediaPlayer)); |
| 338 } | 338 } |
| 339 | 339 |
| 340 } // namespace NPAPI | 340 } // namespace NPAPI |
| 341 | 341 |
| OLD | NEW |