| 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 "config.h" | 5 #include "config.h" |
| 6 | 6 |
| 7 #include "webkit/glue/plugins/plugin_list.h" | 7 #include "webkit/glue/plugins/plugin_list.h" |
| 8 | 8 |
| 9 #include "base/lazy_instance.h" | 9 #include "base/lazy_instance.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 152 return; | 152 return; |
| 153 | 153 |
| 154 plugins_.clear(); | 154 plugins_.clear(); |
| 155 plugins_loaded_ = true; | 155 plugins_loaded_ = true; |
| 156 | 156 |
| 157 base::TimeTicks start_time = base::TimeTicks::Now(); | 157 base::TimeTicks start_time = base::TimeTicks::Now(); |
| 158 | 158 |
| 159 std::vector<FilePath> directories_to_scan; | 159 std::vector<FilePath> directories_to_scan; |
| 160 GetPluginDirectories(&directories_to_scan); | 160 GetPluginDirectories(&directories_to_scan); |
| 161 | 161 |
| 162 for (size_t i = 0; i < extra_plugin_paths_.size(); ++i) |
| 163 LoadPlugin(extra_plugin_paths_[i]); |
| 164 |
| 165 for (size_t i = 0; i < extra_plugin_dirs_.size(); ++i) { |
| 166 LoadPluginsFromDir(extra_plugin_dirs_[i]); |
| 167 } |
| 168 |
| 162 for (size_t i = 0; i < directories_to_scan.size(); ++i) { | 169 for (size_t i = 0; i < directories_to_scan.size(); ++i) { |
| 163 LoadPluginsFromDir(directories_to_scan[i]); | 170 LoadPluginsFromDir(directories_to_scan[i]); |
| 164 } | 171 } |
| 165 | 172 |
| 166 for (size_t i = 0; i < extra_plugin_dirs_.size(); ++i) { | |
| 167 LoadPluginsFromDir(extra_plugin_dirs_[i]); | |
| 168 } | |
| 169 | |
| 170 for (size_t i = 0; i < extra_plugin_paths_.size(); ++i) | |
| 171 LoadPlugin(extra_plugin_paths_[i]); | |
| 172 | |
| 173 LoadInternalPlugins(); | 173 LoadInternalPlugins(); |
| 174 | 174 |
| 175 if (webkit_glue::IsDefaultPluginEnabled()) | 175 if (webkit_glue::IsDefaultPluginEnabled()) |
| 176 LoadPlugin(FilePath(kDefaultPluginLibraryName)); | 176 LoadPlugin(FilePath(kDefaultPluginLibraryName)); |
| 177 | 177 |
| 178 base::TimeTicks end_time = base::TimeTicks::Now(); | 178 base::TimeTicks end_time = base::TimeTicks::Now(); |
| 179 base::TimeDelta elapsed = end_time - start_time; | 179 base::TimeDelta elapsed = end_time - start_time; |
| 180 DLOG(INFO) << "Loaded plugin list in " << elapsed.InMilliseconds() << " ms."; | 180 DLOG(INFO) << "Loaded plugin list in " << elapsed.InMilliseconds() << " ms."; |
| 181 } | 181 } |
| 182 | 182 |
| (...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 332 } | 332 } |
| 333 | 333 |
| 334 return false; | 334 return false; |
| 335 } | 335 } |
| 336 | 336 |
| 337 void PluginList::Shutdown() { | 337 void PluginList::Shutdown() { |
| 338 // TODO | 338 // TODO |
| 339 } | 339 } |
| 340 | 340 |
| 341 } // namespace NPAPI | 341 } // namespace NPAPI |
| OLD | NEW |