summaryrefslogtreecommitdiffstats
path: root/chrome_frame/chrome_tab.cc
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-15 03:41:02 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-15 03:41:02 +0000
commit6ec54c1e86aa5d29c7223a86acbfa850be39c806 (patch)
tree8c0be0238c2f35646c3545060375a9032c50b04d /chrome_frame/chrome_tab.cc
parent89f580b14355e7342cff030747d12ec18f8ca012 (diff)
downloadchromium_src-6ec54c1e86aa5d29c7223a86acbfa850be39c806.zip
chromium_src-6ec54c1e86aa5d29c7223a86acbfa850be39c806.tar.gz
chromium_src-6ec54c1e86aa5d29c7223a86acbfa850be39c806.tar.bz2
Revert wstring patch (r29078 and follow up commits). It is causing failures on the buildbots.
TBR=nsylvain Review URL: http://codereview.chromium.org/280004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29085 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_tab.cc')
-rw-r--r--chrome_frame/chrome_tab.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome_frame/chrome_tab.cc b/chrome_frame/chrome_tab.cc
index 601ef06..923d957d8 100644
--- a/chrome_frame/chrome_tab.cc
+++ b/chrome_frame/chrome_tab.cc
@@ -61,10 +61,10 @@ class ChromeTabModule
}
if (SUCCEEDED(hr)) {
- FilePath app_path =
- chrome_launcher::GetChromeExecutablePath().DirName();
- hr = registrar->AddReplacement(L"CHROME_APPPATH",
- app_path.value().c_str());
+ std::wstring app_path(
+ chrome_launcher::GetChromeExecutablePath());
+ app_path = file_util::GetDirectoryFromPath(app_path);
+ hr = registrar->AddReplacement(L"CHROME_APPPATH", app_path.c_str());
DCHECK(SUCCEEDED(hr));
}