Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(134)

Side by Side Diff: chrome/browser/plugin_service.cc

Issue 6122006: Cleanup: Remove unneeded includes of pref_names.h (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/plugin_service.h ('k') | chrome/browser/prefs/pref_change_registrar_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "chrome/browser/plugin_service.h"
6 6
7 #include "chrome/browser/plugin_service.h" 7 #include <vector>
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/synchronization/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"
26 #include "chrome/common/chrome_switches.h" 26 #include "chrome/common/chrome_switches.h"
27 #include "chrome/common/default_plugin.h" 27 #include "chrome/common/default_plugin.h"
28 #include "chrome/common/extensions/extension.h" 28 #include "chrome/common/extensions/extension.h"
29 #include "chrome/common/gpu_plugin.h" 29 #include "chrome/common/gpu_plugin.h"
30 #include "chrome/common/logging_chrome.h" 30 #include "chrome/common/logging_chrome.h"
31 #include "chrome/common/notification_type.h" 31 #include "chrome/common/notification_type.h"
32 #include "chrome/common/notification_service.h" 32 #include "chrome/common/notification_service.h"
33 #include "chrome/common/pepper_plugin_registry.h" 33 #include "chrome/common/pepper_plugin_registry.h"
34 #include "chrome/common/plugin_messages.h" 34 #include "chrome/common/plugin_messages.h"
35 #include "chrome/common/pref_names.h"
36 #include "chrome/common/render_messages.h" 35 #include "chrome/common/render_messages.h"
37 #include "webkit/plugins/npapi/plugin_constants_win.h" 36 #include "webkit/plugins/npapi/plugin_constants_win.h"
38 #include "webkit/plugins/npapi/plugin_list.h" 37 #include "webkit/plugins/npapi/plugin_list.h"
39 #include "webkit/plugins/npapi/webplugininfo.h" 38 #include "webkit/plugins/npapi/webplugininfo.h"
40 39
41 #ifndef DISABLE_NACL 40 #ifndef DISABLE_NACL
42 #include "native_client/src/trusted/plugin/nacl_entry_points.h" 41 #include "native_client/src/trusted/plugin/nacl_entry_points.h"
43 #endif 42 #endif
44 43
45 #if defined(OS_CHROMEOS) 44 #if defined(OS_CHROMEOS)
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 info.mime_types = ASCIIToWide(JoinString(plugins[i].mime_types, '|')); 420 info.mime_types = ASCIIToWide(JoinString(plugins[i].mime_types, '|'));
422 421
423 // These NPAPI entry points will never be called. TODO(darin): Come up 422 // 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, 423 // with a cleaner way to register pepper plugins with the NPAPI PluginList,
425 // or perhaps refactor the PluginList to be less specific to NPAPI. 424 // or perhaps refactor the PluginList to be less specific to NPAPI.
426 memset(&info.entry_points, 0, sizeof(info.entry_points)); 425 memset(&info.entry_points, 0, sizeof(info.entry_points));
427 426
428 webkit::npapi::PluginList::Singleton()->RegisterInternalPlugin(info); 427 webkit::npapi::PluginList::Singleton()->RegisterInternalPlugin(info);
429 } 428 }
430 } 429 }
OLDNEW
« no previous file with comments | « chrome/browser/plugin_service.h ('k') | chrome/browser/prefs/pref_change_registrar_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698