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

Side by Side Diff: webkit/glue/plugins/plugin_lib_posix.cc

Issue 3447008: base: Finish moving the SplitString functions from string_util.h to string_split.h (Closed) Base URL: git://git.chromium.org/chromium.git
Patch Set: chromeos fixes Created 10 years, 3 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
« no previous file with comments | « webkit/glue/plugins/plugin_lib_mac.mm ('k') | webkit/glue/plugins/plugin_list.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/glue/plugins/plugin_lib.h" 5 #include "webkit/glue/plugins/plugin_lib.h"
6 6
7 #include <dlfcn.h> 7 #include <dlfcn.h>
8 #if defined(OS_OPENBSD) 8 #if defined(OS_OPENBSD)
9 #include <sys/exec_elf.h> 9 #include <sys/exec_elf.h>
10 #else 10 #else
11 #include <elf.h> 11 #include <elf.h>
12 #include <fcntl.h> 12 #include <fcntl.h>
13 #endif 13 #endif
14 #include <sys/stat.h> 14 #include <sys/stat.h>
15 #include <sys/types.h> 15 #include <sys/types.h>
16 #include <unistd.h> 16 #include <unistd.h>
17 17
18 #include "base/eintr_wrapper.h" 18 #include "base/eintr_wrapper.h"
19 #include "base/file_util.h" 19 #include "base/file_util.h"
20 #include "base/string_split.h"
20 #include "base/string_util.h" 21 #include "base/string_util.h"
21 #include "base/sys_string_conversions.h" 22 #include "base/sys_string_conversions.h"
22 #include "base/utf_string_conversions.h" 23 #include "base/utf_string_conversions.h"
23 #include "webkit/glue/plugins/plugin_list.h" 24 #include "webkit/glue/plugins/plugin_list.h"
24 25
25 // These headers must be included in this order to make the declaration gods 26 // These headers must be included in this order to make the declaration gods
26 // happy. 27 // happy.
27 #include "base/third_party/nspr/prcpucfg_linux.h" 28 #include "base/third_party/nspr/prcpucfg_linux.h"
28 29
29 namespace { 30 namespace {
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 mime_type.description = UTF8ToUTF16(description.substr(ofs)); 247 mime_type.description = UTF8ToUTF16(description.substr(ofs));
247 } 248 }
248 mime_types->push_back(mime_type); 249 mime_types->push_back(mime_type);
249 if (end == std::string::npos) 250 if (end == std::string::npos)
250 break; 251 break;
251 ofs = end + 1; 252 ofs = end + 1;
252 } 253 }
253 } 254 }
254 255
255 } // namespace NPAPI 256 } // namespace NPAPI
OLDNEW
« no previous file with comments | « webkit/glue/plugins/plugin_lib_mac.mm ('k') | webkit/glue/plugins/plugin_list.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698