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

Side by Side Diff: webkit/plugins/npapi/plugin_list_mac.mm

Issue 16917011: mac: Replace base::mac::ScopedCFTypeRef with base::ScopedCFTypeRef. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: with fixed off-by-1 in git-clang-format Created 7 years, 6 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
« no previous file with comments | « webkit/common/cursors/webcursor_mac.mm ('k') | no next file » | 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) 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/strings/string_number_conversions.h" 16 #include "base/strings/string_number_conversions.h"
17 #include "base/strings/string_split.h" 17 #include "base/strings/string_split.h"
18 #include "base/strings/string_util.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::ScopedCFTypeRef;
23 23
24 namespace webkit { 24 namespace webkit {
25 namespace npapi { 25 namespace npapi {
26 26
27 namespace { 27 namespace {
28 28
29 void GetPluginCommonDirectory(std::vector<base::FilePath>* plugin_dirs, 29 void GetPluginCommonDirectory(std::vector<base::FilePath>* plugin_dirs,
30 bool user) { 30 bool user) {
31 // Note that there are no NSSearchPathDirectory constants for these 31 // Note that there are no NSSearchPathDirectory constants for these
32 // directories so we can't use Cocoa's NSSearchPathForDirectoriesInDomains(). 32 // directories so we can't use Cocoa's NSSearchPathForDirectoriesInDomains().
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 } 299 }
300 300
301 bool PluginList::ShouldLoadPluginUsingPluginList( 301 bool PluginList::ShouldLoadPluginUsingPluginList(
302 const WebPluginInfo& info, 302 const WebPluginInfo& info,
303 std::vector<webkit::WebPluginInfo>* plugins) { 303 std::vector<webkit::WebPluginInfo>* plugins) {
304 return !IsBlacklistedPlugin(info); 304 return !IsBlacklistedPlugin(info);
305 } 305 }
306 306
307 } // namespace npapi 307 } // namespace npapi
308 } // namespace webkit 308 } // namespace webkit
OLDNEW
« no previous file with comments | « webkit/common/cursors/webcursor_mac.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698