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/thread.h" | 12 #include "base/thread.h" |
| 13 #include "base/utf_string_conversions.h" |
13 #include "base/values.h" | 14 #include "base/values.h" |
14 #include "base/waitable_event.h" | 15 #include "base/waitable_event.h" |
15 #include "chrome/browser/browser_process.h" | 16 #include "chrome/browser/browser_process.h" |
16 #include "chrome/browser/chrome_plugin_host.h" | 17 #include "chrome/browser/chrome_plugin_host.h" |
17 #include "chrome/browser/chrome_thread.h" | 18 #include "chrome/browser/chrome_thread.h" |
18 #include "chrome/browser/extensions/extensions_service.h" | 19 #include "chrome/browser/extensions/extensions_service.h" |
19 #include "chrome/browser/plugin_process_host.h" | 20 #include "chrome/browser/plugin_process_host.h" |
20 #include "chrome/browser/plugin_updater.h" | 21 #include "chrome/browser/plugin_updater.h" |
21 #include "chrome/browser/pref_service.h" | 22 #include "chrome/browser/pref_service.h" |
22 #include "chrome/browser/profile.h" | 23 #include "chrome/browser/profile.h" |
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
367 info.mime_types = ASCIIToWide(JoinString(plugins[i].mime_types, '|')); | 368 info.mime_types = ASCIIToWide(JoinString(plugins[i].mime_types, '|')); |
368 | 369 |
369 // These NPAPI entry points will never be called. TODO(darin): Come up | 370 // These NPAPI entry points will never be called. TODO(darin): Come up |
370 // with a cleaner way to register pepper plugins with the NPAPI PluginList, | 371 // with a cleaner way to register pepper plugins with the NPAPI PluginList, |
371 // or perhaps refactor the PluginList to be less specific to NPAPI. | 372 // or perhaps refactor the PluginList to be less specific to NPAPI. |
372 memset(&info.entry_points, 0, sizeof(info.entry_points)); | 373 memset(&info.entry_points, 0, sizeof(info.entry_points)); |
373 | 374 |
374 NPAPI::PluginList::Singleton()->RegisterInternalPlugin(info); | 375 NPAPI::PluginList::Singleton()->RegisterInternalPlugin(info); |
375 } | 376 } |
376 } | 377 } |
OLD | NEW |