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

Side by Side Diff: base/native_library_win.cc

Issue 177923007: Move AppendFile and *CurrentDirectory to the base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | « base/file_util_win.cc ('k') | base/path_service.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "base/native_library.h" 5 #include "base/native_library.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 8
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
11 #include "base/threading/thread_restrictions.h" 11 #include "base/threading/thread_restrictions.h"
12 12
13 namespace base { 13 namespace base {
14 14
15 typedef HMODULE (WINAPI* LoadLibraryFunction)(const wchar_t* file_name); 15 typedef HMODULE (WINAPI* LoadLibraryFunction)(const wchar_t* file_name);
16 16
17 NativeLibrary LoadNativeLibraryHelper(const FilePath& library_path, 17 NativeLibrary LoadNativeLibraryHelper(const FilePath& library_path,
18 LoadLibraryFunction load_library_api) { 18 LoadLibraryFunction load_library_api) {
19 // LoadLibrary() opens the file off disk. 19 // LoadLibrary() opens the file off disk.
20 base::ThreadRestrictions::AssertIOAllowed(); 20 ThreadRestrictions::AssertIOAllowed();
21 21
22 // Switch the current directory to the library directory as the library 22 // Switch the current directory to the library directory as the library
23 // may have dependencies on DLLs in this directory. 23 // may have dependencies on DLLs in this directory.
24 bool restore_directory = false; 24 bool restore_directory = false;
25 FilePath current_directory; 25 FilePath current_directory;
26 if (file_util::GetCurrentDirectory(&current_directory)) { 26 if (GetCurrentDirectory(&current_directory)) {
27 FilePath plugin_path = library_path.DirName(); 27 FilePath plugin_path = library_path.DirName();
28 if (!plugin_path.empty()) { 28 if (!plugin_path.empty()) {
29 file_util::SetCurrentDirectory(plugin_path); 29 SetCurrentDirectory(plugin_path);
30 restore_directory = true; 30 restore_directory = true;
31 } 31 }
32 } 32 }
33 33
34 HMODULE module = (*load_library_api)(library_path.value().c_str()); 34 HMODULE module = (*load_library_api)(library_path.value().c_str());
35 if (restore_directory) 35 if (restore_directory)
36 file_util::SetCurrentDirectory(current_directory); 36 SetCurrentDirectory(current_directory);
37 37
38 return module; 38 return module;
39 } 39 }
40 40
41 // static 41 // static
42 NativeLibrary LoadNativeLibrary(const FilePath& library_path, 42 NativeLibrary LoadNativeLibrary(const FilePath& library_path,
43 std::string* error) { 43 std::string* error) {
44 return LoadNativeLibraryHelper(library_path, LoadLibraryW); 44 return LoadNativeLibraryHelper(library_path, LoadLibraryW);
45 } 45 }
46 46
(...skipping 17 matching lines...) Expand all
64 const char* name) { 64 const char* name) {
65 return GetProcAddress(library, name); 65 return GetProcAddress(library, name);
66 } 66 }
67 67
68 // static 68 // static
69 string16 GetNativeLibraryName(const string16& name) { 69 string16 GetNativeLibraryName(const string16& name) {
70 return name + ASCIIToUTF16(".dll"); 70 return name + ASCIIToUTF16(".dll");
71 } 71 }
72 72
73 } // namespace base 73 } // namespace base
OLDNEW
« no previous file with comments | « base/file_util_win.cc ('k') | base/path_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698