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

Side by Side Diff: base/file_version_info_win.cc

Issue 12294008: Fix more remaining FilePath -> base::FilePath. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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_version_info_unittest.cc ('k') | base/i18n/icu_util.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/file_version_info_win.h" 5 #include "base/file_version_info_win.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 8
9 #include "base/file_path.h" 9 #include "base/file_path.h"
10 #include "base/file_version_info.h" 10 #include "base/file_version_info.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/path_service.h" 12 #include "base/path_service.h"
13 #include "base/threading/thread_restrictions.h" 13 #include "base/threading/thread_restrictions.h"
14 14
15 using base::FilePath;
16
15 FileVersionInfoWin::FileVersionInfoWin(void* data, int language, int code_page) 17 FileVersionInfoWin::FileVersionInfoWin(void* data, int language, int code_page)
16 : language_(language), code_page_(code_page) { 18 : language_(language), code_page_(code_page) {
17 base::ThreadRestrictions::AssertIOAllowed(); 19 base::ThreadRestrictions::AssertIOAllowed();
18 data_.reset((char*) data); 20 data_.reset((char*) data);
19 fixed_file_info_ = NULL; 21 fixed_file_info_ = NULL;
20 UINT size; 22 UINT size;
21 ::VerQueryValue(data_.get(), L"\\", (LPVOID*)&fixed_file_info_, &size); 23 ::VerQueryValue(data_.get(), L"\\", (LPVOID*)&fixed_file_info_, &size);
22 } 24 }
23 25
24 FileVersionInfoWin::~FileVersionInfoWin() { 26 FileVersionInfoWin::~FileVersionInfoWin() {
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 return false; 180 return false;
179 } 181 }
180 182
181 std::wstring FileVersionInfoWin::GetStringValue(const wchar_t* name) { 183 std::wstring FileVersionInfoWin::GetStringValue(const wchar_t* name) {
182 std::wstring str; 184 std::wstring str;
183 if (GetValue(name, &str)) 185 if (GetValue(name, &str))
184 return str; 186 return str;
185 else 187 else
186 return L""; 188 return L"";
187 } 189 }
OLDNEW
« no previous file with comments | « base/file_version_info_unittest.cc ('k') | base/i18n/icu_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698