| OLD | NEW | 
|---|
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "build/build_config.h" | 5 #include "build/build_config.h" | 
| 6 | 6 | 
| 7 #include "chrome/browser/plugin_service.h" | 7 #include "chrome/browser/plugin_service.h" | 
| 8 | 8 | 
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" | 
| 10 #include "base/path_service.h" | 10 #include "base/path_service.h" | 
| 11 #include "base/string_util.h" | 11 #include "base/string_util.h" | 
| 12 #include "base/threading/thread.h" | 12 #include "base/threading/thread.h" | 
| 13 #include "base/utf_string_conversions.h" | 13 #include "base/utf_string_conversions.h" | 
| 14 #include "base/values.h" | 14 #include "base/values.h" | 
| 15 #include "base/waitable_event.h" | 15 #include "base/synchronization/waitable_event.h" | 
| 16 #include "chrome/browser/browser_process.h" | 16 #include "chrome/browser/browser_process.h" | 
| 17 #include "chrome/browser/browser_thread.h" | 17 #include "chrome/browser/browser_thread.h" | 
| 18 #include "chrome/browser/chrome_plugin_host.h" | 18 #include "chrome/browser/chrome_plugin_host.h" | 
| 19 #include "chrome/browser/extensions/extension_service.h" | 19 #include "chrome/browser/extensions/extension_service.h" | 
| 20 #include "chrome/browser/plugin_updater.h" | 20 #include "chrome/browser/plugin_updater.h" | 
| 21 #include "chrome/browser/prefs/pref_service.h" | 21 #include "chrome/browser/prefs/pref_service.h" | 
| 22 #include "chrome/browser/profiles/profile.h" | 22 #include "chrome/browser/profiles/profile.h" | 
| 23 #include "chrome/browser/renderer_host/render_process_host.h" | 23 #include "chrome/browser/renderer_host/render_process_host.h" | 
| 24 #include "chrome/common/chrome_plugin_lib.h" | 24 #include "chrome/common/chrome_plugin_lib.h" | 
| 25 #include "chrome/common/chrome_paths.h" | 25 #include "chrome/common/chrome_paths.h" | 
| (...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 421     info.mime_types = ASCIIToWide(JoinString(plugins[i].mime_types, '|')); | 421     info.mime_types = ASCIIToWide(JoinString(plugins[i].mime_types, '|')); | 
| 422 | 422 | 
| 423     // These NPAPI entry points will never be called.  TODO(darin): Come up | 423     // These NPAPI entry points will never be called.  TODO(darin): Come up | 
| 424     // with a cleaner way to register pepper plugins with the NPAPI PluginList, | 424     // with a cleaner way to register pepper plugins with the NPAPI PluginList, | 
| 425     // or perhaps refactor the PluginList to be less specific to NPAPI. | 425     // or perhaps refactor the PluginList to be less specific to NPAPI. | 
| 426     memset(&info.entry_points, 0, sizeof(info.entry_points)); | 426     memset(&info.entry_points, 0, sizeof(info.entry_points)); | 
| 427 | 427 | 
| 428     webkit::npapi::PluginList::Singleton()->RegisterInternalPlugin(info); | 428     webkit::npapi::PluginList::Singleton()->RegisterInternalPlugin(info); | 
| 429   } | 429   } | 
| 430 } | 430 } | 
| OLD | NEW | 
|---|