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

Unified Diff: chrome_frame/utils.cc

Issue 12211108: Rename FilePath -> base::FilePath in various toplevel directories (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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome_frame/test_utils.cc ('k') | gpu/tools/compositor_model_bench/compositor_model_bench.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/utils.cc
diff --git a/chrome_frame/utils.cc b/chrome_frame/utils.cc
index 7a9dc3925b5a00b6c6df42e0ffe7e7dacd183cd2..70abb329b103534653c53eb8718f6e6415226aeb 100644
--- a/chrome_frame/utils.cc
+++ b/chrome_frame/utils.cc
@@ -353,7 +353,7 @@ const char kIEImageName[] = "iexplore.exe";
} // namespace
std::wstring GetHostProcessName(bool include_extension) {
- FilePath exe;
+ base::FilePath exe;
if (PathService::Get(base::FILE_EXE, &exe))
exe = exe.BaseName();
if (!include_extension) {
@@ -390,7 +390,7 @@ uint32 GetIEMajorVersion() {
wchar_t exe_path[MAX_PATH];
HMODULE mod = GetModuleHandle(NULL);
GetModuleFileName(mod, exe_path, arraysize(exe_path) - 1);
- std::wstring exe_name = FilePath(exe_path).BaseName().value();
+ std::wstring exe_name = base::FilePath(exe_path).BaseName().value();
if (!LowerCaseEqualsASCII(exe_name, kIEImageName)) {
ie_major_version = 0;
} else {
@@ -437,7 +437,7 @@ IEVersion GetIEVersion() {
return ie_version;
}
-FilePath GetIETemporaryFilesFolder() {
+base::FilePath GetIETemporaryFilesFolder() {
LPITEMIDLIST tif_pidl = NULL;
HRESULT hr = SHGetFolderLocation(NULL, CSIDL_INTERNET_CACHE, NULL,
SHGFP_TYPE_CURRENT, &tif_pidl);
@@ -455,7 +455,8 @@ FilePath GetIETemporaryFilesFolder() {
DCHECK(SUCCEEDED(hr));
base::win::ScopedBstr temp_internet_files_bstr;
StrRetToBSTR(&path, relative_pidl, temp_internet_files_bstr.Receive());
- FilePath temp_internet_files(static_cast<BSTR>(temp_internet_files_bstr));
+ base::FilePath temp_internet_files(
+ static_cast<BSTR>(temp_internet_files_bstr));
ILFree(tif_pidl);
return temp_internet_files;
} else {
@@ -472,12 +473,12 @@ FilePath GetIETemporaryFilesFolder() {
hr = SHGetFolderPath(NULL, CSIDL_INTERNET_CACHE, NULL, SHGFP_TYPE_CURRENT,
path);
if (SUCCEEDED(hr)) {
- return FilePath(path);
+ return base::FilePath(path);
} else {
NOTREACHED() << "SHGetFolderPath for internet cache failed. Error:"
<< hr;
}
- return FilePath();
+ return base::FilePath();
}
bool IsIEInPrivate() {
@@ -1673,7 +1674,7 @@ bool IncreaseWinInetConnections(DWORD connections) {
}
void GetChromeFrameProfilePath(const string16& profile_name,
- FilePath* profile_path) {
+ base::FilePath* profile_path) {
chrome::GetChromeFrameUserDataDirectory(profile_path);
*profile_path = profile_path->Append(profile_name);
DVLOG(1) << __FUNCTION__ << ": " << profile_path->value();
« no previous file with comments | « chrome_frame/test_utils.cc ('k') | gpu/tools/compositor_model_bench/compositor_model_bench.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698