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

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

Issue 12473004: src/: Update the remaining include paths of string_split.h to its new location. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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/plugins/npapi/plugin_list.cc ('k') | webkit/plugins/npapi/plugin_list_posix.cc » ('j') | 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 <Foundation/Foundation.h> 7 #import <Foundation/Foundation.h>
8 8
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/mac/mac_util.h" 10 #include "base/mac/mac_util.h"
11 #include "base/string_number_conversions.h" 11 #include "base/string_number_conversions.h"
12 #include "base/string_split.h"
13 #include "base/string_util.h" 12 #include "base/string_util.h"
13 #include "base/strings/string_split.h"
14 #include "base/utf_string_conversions.h" 14 #include "base/utf_string_conversions.h"
15 #include "webkit/plugins/npapi/plugin_lib.h" 15 #include "webkit/plugins/npapi/plugin_lib.h"
16 16
17 namespace webkit { 17 namespace webkit {
18 namespace npapi { 18 namespace npapi {
19 19
20 namespace { 20 namespace {
21 21
22 void GetPluginCommonDirectory(std::vector<base::FilePath>* plugin_dirs, 22 void GetPluginCommonDirectory(std::vector<base::FilePath>* plugin_dirs,
23 bool user) { 23 bool user) {
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 } 88 }
89 89
90 bool PluginList::ShouldLoadPluginUsingPluginList( 90 bool PluginList::ShouldLoadPluginUsingPluginList(
91 const WebPluginInfo& info, 91 const WebPluginInfo& info,
92 std::vector<webkit::WebPluginInfo>* plugins) { 92 std::vector<webkit::WebPluginInfo>* plugins) {
93 return !IsBlacklistedPlugin(info); 93 return !IsBlacklistedPlugin(info);
94 } 94 }
95 95
96 } // namespace npapi 96 } // namespace npapi
97 } // namespace webkit 97 } // namespace webkit
OLDNEW
« no previous file with comments | « webkit/plugins/npapi/plugin_list.cc ('k') | webkit/plugins/npapi/plugin_list_posix.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698