diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-15 05:09:50 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-15 05:09:50 +0000 |
| commit | 66ff7356a381d6c8c6c3272b095938408c4f3188 (patch) | |
| tree | 9c3ae2fb0d55d1d9650a8071d1c80c557e7f0d93 /chrome_frame/chrome_tab.cc | |
| parent | 2c8088a4452c2c204237ba9f2f3706e7eeaaf35b (diff) | |
| download | chromium_src-66ff7356a381d6c8c6c3272b095938408c4f3188.zip chromium_src-66ff7356a381d6c8c6c3272b095938408c4f3188.tar.gz chromium_src-66ff7356a381d6c8c6c3272b095938408c4f3188.tar.bz2 | |
Re-try r29078: Remove some deprecated file_util wstring functions.
With the previous patch, the try bots failed with mysterious messages, so I ignored them, patched it into my windows box and tested it there manually, and found no problems. As it turns out, the try failures were real :(. But nsylvain and I found the problem: the behavior of file_util::GetDirectoryFromPath() differs from DirName() when the path is empty (officially, GetDirectoryFromPath is not supposed to support non-absolute paths, but that is not enforced).
Here is a green win try result: http://build.chromium.org/buildbot/try-server/builders/win/builds/3705
mac: http://build.chromium.org/buildbot/try-server/builders/mac/builds/3491
linux: http://build.chromium.org/buildbot/try-server/builders/linux/builds/3466
I also applied this patch locally in Windows to test that it doesn't break the chrome frame compile or tests, since that's not covered by the trybots yet.
Review URL: http://codereview.chromium.org/271099
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29094 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_tab.cc')
| -rw-r--r-- | chrome_frame/chrome_tab.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome_frame/chrome_tab.cc b/chrome_frame/chrome_tab.cc index 923d957d8..601ef06 100644 --- a/chrome_frame/chrome_tab.cc +++ b/chrome_frame/chrome_tab.cc @@ -61,10 +61,10 @@ class ChromeTabModule } if (SUCCEEDED(hr)) { - std::wstring app_path( - chrome_launcher::GetChromeExecutablePath()); - app_path = file_util::GetDirectoryFromPath(app_path); - hr = registrar->AddReplacement(L"CHROME_APPPATH", app_path.c_str()); + FilePath app_path = + chrome_launcher::GetChromeExecutablePath().DirName(); + hr = registrar->AddReplacement(L"CHROME_APPPATH", + app_path.value().c_str()); DCHECK(SUCCEEDED(hr)); } |