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

Side by Side Diff: chrome/common/default_plugin.cc

Issue 2813047: Move default_plugin from webkit/ to chrome/ (Closed)
Patch Set: fix windows? Created 10 years, 5 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
« no previous file with comments | « chrome/common/DEPS ('k') | chrome/default_plugin/DEPS » ('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 "chrome/common/default_plugin.h" 5 #include "chrome/common/default_plugin.h"
6 6
7 #include "chrome/default_plugin/plugin_main.h"
7 #include "webkit/glue/plugins/plugin_list.h" 8 #include "webkit/glue/plugins/plugin_list.h"
8 #include "webkit/default_plugin/plugin_main.h"
9 9
10 namespace chrome { 10 namespace chrome {
11 11
12 void RegisterInternalDefaultPlugin() { 12 void RegisterInternalDefaultPlugin() {
13 const NPAPI::PluginVersionInfo default_plugin = { 13 const NPAPI::PluginVersionInfo default_plugin = {
14 FilePath(kDefaultPluginLibraryName), 14 FilePath(kDefaultPluginLibraryName),
15 L"Default Plug-in", 15 L"Default Plug-in",
16 L"Provides functionality for installing third-party plug-ins", 16 L"Provides functionality for installing third-party plug-ins",
17 L"1", 17 L"1",
18 L"*", 18 L"*",
19 L"", 19 L"",
20 L"", 20 L"",
21 { 21 {
22 #if !defined(OS_POSIX) || defined(OS_MACOSX) 22 #if !defined(OS_POSIX) || defined(OS_MACOSX)
23 default_plugin::NP_GetEntryPoints, 23 default_plugin::NP_GetEntryPoints,
24 #endif 24 #endif
25 default_plugin::NP_Initialize, 25 default_plugin::NP_Initialize,
26 default_plugin::NP_Shutdown 26 default_plugin::NP_Shutdown
27 } 27 }
28 }; 28 };
29 29
30 NPAPI::PluginList::Singleton()->RegisterInternalPlugin(default_plugin); 30 NPAPI::PluginList::Singleton()->RegisterInternalPlugin(default_plugin);
31 } 31 }
32 32
33 } // namespace chrome 33 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/common/DEPS ('k') | chrome/default_plugin/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698