summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-04 23:52:28 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-04 23:52:28 +0000
commit5e4ec9729f5cf5b9cf8ccefad966337ee26b3170 (patch)
tree5855ca3acc0378adbc8adc74df9834e217427e38 /chrome/browser/views
parentac77fbc08a0bedbadb29372a8fe1fe2fc4fbdbb6 (diff)
downloadchromium_src-5e4ec9729f5cf5b9cf8ccefad966337ee26b3170.zip
chromium_src-5e4ec9729f5cf5b9cf8ccefad966337ee26b3170.tar.gz
chromium_src-5e4ec9729f5cf5b9cf8ccefad966337ee26b3170.tar.bz2
views/options: Use non-deprecated version of PathService::Get.
Patch from Thiago Farina <thiago.farina@gmail.com> Original review: http://codereview.chromium.org/462038 BUG=none TEST=none Review URL: http://codereview.chromium.org/465068 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33889 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views')
-rw-r--r--chrome/browser/views/options/advanced_contents_view.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/views/options/advanced_contents_view.cc b/chrome/browser/views/options/advanced_contents_view.cc
index 3a5b2c1..dd6b992 100644
--- a/chrome/browser/views/options/advanced_contents_view.cc
+++ b/chrome/browser/views/options/advanced_contents_view.cc
@@ -986,23 +986,23 @@ class OpenConnectionDialogTask : public Task {
// Using rundll32 seems better than LaunchConnectionDialog which causes a
// new dialog to be made for each call. rundll32 uses the same global
// dialog and it seems to share with the shortcut in control panel.
- std::wstring rundll32;
+ FilePath rundll32;
PathService::Get(base::DIR_SYSTEM, &rundll32);
- file_util::AppendToPath(&rundll32, L"rundll32.exe");
+ rundll32 = rundll32.AppendASCII("rundll32.exe");
- std::wstring shell32dll;
+ FilePath shell32dll;
PathService::Get(base::DIR_SYSTEM, &shell32dll);
- file_util::AppendToPath(&shell32dll, L"shell32.dll");
+ shell32dll = shell32dll.AppendASCII("shell32.dll");
- std::wstring inetcpl;
+ FilePath inetcpl;
PathService::Get(base::DIR_SYSTEM, &inetcpl);
- file_util::AppendToPath(&inetcpl, L"inetcpl.cpl,,4");
+ inetcpl = inetcpl.AppendASCII("inetcpl.cpl,,4");
- std::wstring args(shell32dll);
+ std::wstring args(shell32dll.value());
args.append(L",Control_RunDLL ");
- args.append(inetcpl);
+ args.append(inetcpl.value());
- ShellExecute(NULL, L"open", rundll32.c_str(), args.c_str(), NULL,
+ ShellExecute(NULL, L"open", rundll32.value().c_str(), args.c_str(), NULL,
SW_SHOWNORMAL);
}