diff options
author | abodenha@chromium.org <abodenha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-25 18:03:12 +0000 |
---|---|---|
committer | abodenha@chromium.org <abodenha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-25 18:03:12 +0000 |
commit | 9759ffc1dc10e904d1819612307adadccf6cfd1f (patch) | |
tree | 10095efda6686734efe6939c64be163e5abd32c4 /cloud_print | |
parent | 0a87625cee1d5839674646c447753f64d0bf66f4 (diff) | |
download | chromium_src-9759ffc1dc10e904d1819612307adadccf6cfd1f.zip chromium_src-9759ffc1dc10e904d1819612307adadccf6cfd1f.tar.gz chromium_src-9759ffc1dc10e904d1819612307adadccf6cfd1f.tar.bz2 |
Extend PathService::Get to be able to return the X86 program files path.
Cloud print's virtual driver needs this to be able to find the Chrome install directory. Since the port monitor is a 64 bit DLL on 64 bit Windows it needs to request the X86 folder explicitly.
BUG=
TEST=
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=82567
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=82686
Review URL: http://codereview.chromium.org/6873159
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82891 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cloud_print')
-rw-r--r-- | cloud_print/virtual_driver/win/port_monitor/port_monitor.cc | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc b/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc index 450ef56..05c5272 100644 --- a/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc +++ b/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc @@ -273,16 +273,7 @@ bool GetChromeExePath(FilePath* chrome_path) { // Chrome doesn't appear to be installed per user. // Now check %programfiles(x86)%\google\chrome\application - // TODO(abodenha@chromium.org) Extend PathService::Get to be able to - // return the X86 program files path. At a minimum, use SHGetKnownFolderPath - // instead. - wchar_t system_buffer[MAX_PATH] = L""; - SHGetFolderPath(NULL, - CSIDL_PROGRAM_FILESX86, - NULL, - SHGFP_TYPE_CURRENT, - system_buffer); - path = FilePath(system_buffer); + PathService::Get(base::DIR_PROGRAM_FILESX86, &path); path = path.Append(kChromeExePath); if (file_util::PathExists(path)) { *chrome_path = FilePath(path.value()); |