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

Side by Side Diff: content/common/plugin_list_posix.cc

Issue 19761007: Move NPAPI implementation out of webkit/plugins/npapi and into content. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix mac Created 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "webkit/plugins/npapi/plugin_list.h" 5 #include "content/common/plugin_list.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <dlfcn.h> 8 #include <dlfcn.h>
9 #if defined(OS_OPENBSD) 9 #if defined(OS_OPENBSD)
10 #include <sys/exec_elf.h> 10 #include <sys/exec_elf.h>
11 #else 11 #else
12 #include <elf.h> 12 #include <elf.h>
13 #endif 13 #endif
14 #include <fcntl.h> 14 #include <fcntl.h>
15 #include <sys/stat.h> 15 #include <sys/stat.h>
(...skipping 12 matching lines...) Expand all
28 #include "base/strings/stringprintf.h" 28 #include "base/strings/stringprintf.h"
29 #include "base/strings/sys_string_conversions.h" 29 #include "base/strings/sys_string_conversions.h"
30 #include "base/strings/utf_string_conversions.h" 30 #include "base/strings/utf_string_conversions.h"
31 #include "build/build_config.h" 31 #include "build/build_config.h"
32 #include "third_party/npapi/bindings/nphostapi.h" 32 #include "third_party/npapi/bindings/nphostapi.h"
33 33
34 // These headers must be included in this order to make the declaration gods 34 // These headers must be included in this order to make the declaration gods
35 // happy. 35 // happy.
36 #include "base/third_party/nspr/prcpucfg_linux.h" 36 #include "base/third_party/nspr/prcpucfg_linux.h"
37 37
38 namespace webkit { 38 using webkit::WebPluginInfo;
39 namespace npapi { 39 using webkit::WebPluginMimeType;
40
41 namespace content {
40 42
41 namespace { 43 namespace {
42 44
43 // We build up a list of files and mtimes so we can sort them. 45 // We build up a list of files and mtimes so we can sort them.
44 typedef std::pair<base::FilePath, base::Time> FileAndTime; 46 typedef std::pair<base::FilePath, base::Time> FileAndTime;
45 typedef std::vector<FileAndTime> FileTimeList; 47 typedef std::vector<FileAndTime> FileTimeList;
46 48
47 enum PluginQuirk { 49 enum PluginQuirk {
48 // No quirks - plugin is outright banned. 50 // No quirks - plugin is outright banned.
49 PLUGIN_QUIRK_NONE = 0, 51 PLUGIN_QUIRK_NONE = 0,
(...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after
584 } 586 }
585 } 587 }
586 588
587 // TODO(evanm): prefer the newest version of flash, etc. here? 589 // TODO(evanm): prefer the newest version of flash, etc. here?
588 590
589 VLOG_IF(1, PluginList::DebugPluginLoading()) << "Using " << info.path.value(); 591 VLOG_IF(1, PluginList::DebugPluginLoading()) << "Using " << info.path.value();
590 592
591 return true; 593 return true;
592 } 594 }
593 595
594 } // namespace npapi 596 } // namespace content
595 } // namespace webkit
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698