OLD | NEW |
---|---|
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 "content/common/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> |
(...skipping 13 matching lines...) Expand all Loading... | |
24 #include "base/posix/eintr_wrapper.h" | 24 #include "base/posix/eintr_wrapper.h" |
25 #include "base/sha1.h" | 25 #include "base/sha1.h" |
26 #include "base/strings/string_split.h" | 26 #include "base/strings/string_split.h" |
27 #include "base/strings/string_util.h" | 27 #include "base/strings/string_util.h" |
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 | |
35 // happy. | |
36 #include "base/third_party/nspr/prcpucfg_linux.h" | |
wtc
2014/03/22 15:50:19
This header is not needed. I don't know why it is
| |
37 | |
38 namespace content { | 34 namespace content { |
39 | 35 |
40 namespace { | 36 namespace { |
41 | 37 |
42 // We build up a list of files and mtimes so we can sort them. | 38 // We build up a list of files and mtimes so we can sort them. |
43 typedef std::pair<base::FilePath, base::Time> FileAndTime; | 39 typedef std::pair<base::FilePath, base::Time> FileAndTime; |
44 typedef std::vector<FileAndTime> FileTimeList; | 40 typedef std::vector<FileAndTime> FileTimeList; |
45 | 41 |
46 enum PluginQuirk { | 42 enum PluginQuirk { |
47 // No quirks - plugin is outright banned. | 43 // No quirks - plugin is outright banned. |
(...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
585 } | 581 } |
586 | 582 |
587 // TODO(evanm): prefer the newest version of flash, etc. here? | 583 // TODO(evanm): prefer the newest version of flash, etc. here? |
588 | 584 |
589 VLOG_IF(1, PluginList::DebugPluginLoading()) << "Using " << info.path.value(); | 585 VLOG_IF(1, PluginList::DebugPluginLoading()) << "Using " << info.path.value(); |
590 | 586 |
591 return true; | 587 return true; |
592 } | 588 } |
593 | 589 |
594 } // namespace content | 590 } // namespace content |
OLD | NEW |