OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #import <Carbon/Carbon.h> | 7 #import <Carbon/Carbon.h> |
8 #import <Foundation/Foundation.h> | 8 #import <Foundation/Foundation.h> |
9 | 9 |
10 #include "base/file_util.h" | 10 #include "base/file_util.h" |
11 #include "base/files/file_enumerator.h" | 11 #include "base/files/file_enumerator.h" |
12 #include "base/mac/mac_util.h" | 12 #include "base/mac/mac_util.h" |
13 #include "base/mac/scoped_cftyperef.h" | 13 #include "base/mac/scoped_cftyperef.h" |
14 #include "base/memory/scoped_ptr.h" | 14 #include "base/memory/scoped_ptr.h" |
15 #include "base/native_library.h" | 15 #include "base/native_library.h" |
16 #include "base/string_util.h" | |
17 #include "base/strings/string_number_conversions.h" | 16 #include "base/strings/string_number_conversions.h" |
18 #include "base/strings/string_split.h" | 17 #include "base/strings/string_split.h" |
| 18 #include "base/strings/string_util.h" |
19 #include "base/strings/sys_string_conversions.h" | 19 #include "base/strings/sys_string_conversions.h" |
20 #include "base/strings/utf_string_conversions.h" | 20 #include "base/strings/utf_string_conversions.h" |
21 | 21 |
22 using base::mac::ScopedCFTypeRef; | 22 using base::mac::ScopedCFTypeRef; |
23 | 23 |
24 namespace webkit { | 24 namespace webkit { |
25 namespace npapi { | 25 namespace npapi { |
26 | 26 |
27 namespace { | 27 namespace { |
28 | 28 |
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
295 } | 295 } |
296 | 296 |
297 bool PluginList::ShouldLoadPluginUsingPluginList( | 297 bool PluginList::ShouldLoadPluginUsingPluginList( |
298 const WebPluginInfo& info, | 298 const WebPluginInfo& info, |
299 std::vector<webkit::WebPluginInfo>* plugins) { | 299 std::vector<webkit::WebPluginInfo>* plugins) { |
300 return !IsBlacklistedPlugin(info); | 300 return !IsBlacklistedPlugin(info); |
301 } | 301 } |
302 | 302 |
303 } // namespace npapi | 303 } // namespace npapi |
304 } // namespace webkit | 304 } // namespace webkit |
OLD | NEW |