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

Side by Side Diff: webkit/plugins/npapi/plugin_list_win.cc

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_posix.cc ('k') | webkit/plugins/npapi/plugin_utils.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 #include <set> 7 #include <set>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/file_util.h" 11 #include "base/file_util.h"
12 #include "base/files/memory_mapped_file.h" 12 #include "base/files/memory_mapped_file.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/path_service.h" 14 #include "base/path_service.h"
15 #include "base/string_number_conversions.h" 15 #include "base/string_number_conversions.h"
16 #include "base/string_split.h"
17 #include "base/string_util.h" 16 #include "base/string_util.h"
17 #include "base/strings/string_split.h"
18 #include "base/win/pe_image.h" 18 #include "base/win/pe_image.h"
19 #include "base/win/registry.h" 19 #include "base/win/registry.h"
20 #include "base/win/scoped_handle.h" 20 #include "base/win/scoped_handle.h"
21 #include "base/win/windows_version.h" 21 #include "base/win/windows_version.h"
22 #include "webkit/glue/webkit_glue.h"
22 #include "webkit/plugins/npapi/plugin_constants_win.h" 23 #include "webkit/plugins/npapi/plugin_constants_win.h"
23 #include "webkit/plugins/npapi/plugin_lib.h" 24 #include "webkit/plugins/npapi/plugin_lib.h"
24 #include "webkit/plugins/plugin_switches.h" 25 #include "webkit/plugins/plugin_switches.h"
25 #include "webkit/glue/webkit_glue.h"
26 26
27 namespace { 27 namespace {
28 28
29 const char16 kRegistryApps[] = 29 const char16 kRegistryApps[] =
30 L"Software\\Microsoft\\Windows\\CurrentVersion\\App Paths"; 30 L"Software\\Microsoft\\Windows\\CurrentVersion\\App Paths";
31 const char16 kRegistryFirefox[] = L"firefox.exe"; 31 const char16 kRegistryFirefox[] = L"firefox.exe";
32 const char16 kRegistryAcrobat[] = L"Acrobat.exe"; 32 const char16 kRegistryAcrobat[] = L"Acrobat.exe";
33 const char16 kRegistryAcrobatReader[] = L"AcroRd32.exe"; 33 const char16 kRegistryAcrobatReader[] = L"AcroRd32.exe";
34 const char16 kRegistryWindowsMedia[] = L"wmplayer.exe"; 34 const char16 kRegistryWindowsMedia[] = L"wmplayer.exe";
35 const char16 kRegistryQuickTime[] = L"QuickTimePlayer.exe"; 35 const char16 kRegistryQuickTime[] = L"QuickTimePlayer.exe";
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 base::FilePath plugin_path(info.path); 421 base::FilePath plugin_path(info.path);
422 file_util::AbsolutePath(&plugin_path); 422 file_util::AbsolutePath(&plugin_path);
423 if (!IsValid32BitImage(plugin_path)) 423 if (!IsValid32BitImage(plugin_path))
424 return false; 424 return false;
425 #endif 425 #endif
426 return true; 426 return true;
427 } 427 }
428 428
429 } // namespace npapi 429 } // namespace npapi
430 } // namespace webkit 430 } // namespace webkit
OLDNEW
« no previous file with comments | « webkit/plugins/npapi/plugin_list_posix.cc ('k') | webkit/plugins/npapi/plugin_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698