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 "webkit/plugins/npapi/plugin_list.h" | 5 #include "webkit/plugins/npapi/plugin_list.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/cpu.h" | 9 #include "base/cpu.h" |
10 #include "base/file_util.h" | 10 #include "base/file_util.h" |
11 #include "base/path_service.h" | 11 #include "base/path_service.h" |
12 #include "base/sha1.h" | 12 #include "base/sha1.h" |
| 13 #include "base/string_util.h" |
13 #include "base/stringprintf.h" | 14 #include "base/stringprintf.h" |
14 #include "base/string_split.h" | 15 #include "base/strings/string_split.h" |
15 #include "base/string_util.h" | |
16 #include "build/build_config.h" | 16 #include "build/build_config.h" |
17 | 17 |
18 namespace webkit { | 18 namespace webkit { |
19 namespace npapi { | 19 namespace npapi { |
20 | 20 |
21 namespace { | 21 namespace { |
22 | 22 |
23 // We build up a list of files and mtimes so we can sort them. | 23 // We build up a list of files and mtimes so we can sort them. |
24 typedef std::pair<base::FilePath, base::Time> FileAndTime; | 24 typedef std::pair<base::FilePath, base::Time> FileAndTime; |
25 typedef std::vector<FileAndTime> FileTimeList; | 25 typedef std::vector<FileAndTime> FileTimeList; |
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
294 | 294 |
295 // TODO(evanm): prefer the newest version of flash, etc. here? | 295 // TODO(evanm): prefer the newest version of flash, etc. here? |
296 | 296 |
297 VLOG_IF(1, PluginList::DebugPluginLoading()) << "Using " << info.path.value(); | 297 VLOG_IF(1, PluginList::DebugPluginLoading()) << "Using " << info.path.value(); |
298 | 298 |
299 return true; | 299 return true; |
300 } | 300 } |
301 | 301 |
302 } // namespace npapi | 302 } // namespace npapi |
303 } // namespace webkit | 303 } // namespace webkit |
OLD | NEW |