diff options
| author | abodenha@chromium.org <abodenha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-22 21:32:07 +0000 |
|---|---|---|
| committer | abodenha@chromium.org <abodenha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-22 21:32:07 +0000 |
| commit | 0dcc715ee61dba309f35987cf92354f5f6415218 (patch) | |
| tree | 0d5106bf090d625372f5179b5314d6d3ee7d3531 /cloud_print | |
| parent | cde6ab1092944e0370364f80b1d046498782a6ec (diff) | |
| download | chromium_src-0dcc715ee61dba309f35987cf92354f5f6415218.zip chromium_src-0dcc715ee61dba309f35987cf92354f5f6415218.tar.gz chromium_src-0dcc715ee61dba309f35987cf92354f5f6415218.tar.bz2 | |
Change url to launch for prompting the user to install chrome.
If the user tries to print with the driver without chrome installed we send them to a page that explains why chrome is needed and offers it for download.
This CL updates that url to the actual url we plan to use. (it currently returns a 404)
Also sets the location of the created printer to be the url of the cloud print manage page.
BUG=112019
TEST=
Review URL: http://codereview.chromium.org/9838012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128302 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cloud_print')
| -rw-r--r-- | cloud_print/virtual_driver/win/install/setup.cc | 4 | ||||
| -rw-r--r-- | cloud_print/virtual_driver/win/port_monitor/port_monitor.cc | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/cloud_print/virtual_driver/win/install/setup.cc b/cloud_print/virtual_driver/win/install/setup.cc index 021afee..98010d6 100644 --- a/cloud_print/virtual_driver/win/install/setup.cc +++ b/cloud_print/virtual_driver/win/install/setup.cc @@ -37,6 +37,7 @@ const wchar_t kUninstallRegistry[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\" L"{74AA24E0-AC50-4B28-BA46-9CF05467C9B7}"; const wchar_t kInstallerName[] = L"virtual_driver_setup.exe"; +const wchar_t kGcpUrl[] = L"http://www.google.com/cloudprint"; void SetOmahaKeys() { base::win::RegKey key; @@ -280,7 +281,7 @@ HRESULT InstallPpd(const FilePath& install_path) { string16 manufacturer = cloud_print::LoadLocalString(IDS_GOOGLE); driver_info.pszMfgName = const_cast<LPWSTR>(manufacturer.c_str()); driver_info.pszProvider = const_cast<LPWSTR>(manufacturer.c_str()); - driver_info.pszOEMUrl = L"http://www.google.com/cloudprint"; + driver_info.pszOEMUrl = const_cast<LPWSTR>(kGcpUrl); driver_info.dwlDriverVersion = GetVersionNumber(); string16 driver_name = cloud_print::LoadLocalString(IDS_DRIVER_NAME); driver_info.pName = const_cast<LPWSTR>(driver_name.c_str()); @@ -333,6 +334,7 @@ HRESULT InstallPrinter(void) { printer_info.pDriverName = const_cast<LPWSTR>(driver_name.c_str()); printer_info.pPrinterName = const_cast<LPWSTR>(driver_name.c_str()); printer_info.pComment = const_cast<LPWSTR>(driver_name.c_str()); + printer_info.pLocation = const_cast<LPWSTR>(kGcpUrl); string16 port_name; printer_info.pPortName = const_cast<LPWSTR>(cloud_print::kPortName); printer_info.Attributes = PRINTER_ATTRIBUTE_DIRECT|PRINTER_ATTRIBUTE_LOCAL; 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 8466a50..f0599c5 100644 --- a/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc +++ b/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc @@ -35,7 +35,8 @@ const wchar_t kChromeExePath[] = L"google\\chrome\\application\\chrome.exe"; const wchar_t kChromePathRegValue[] = L"PathToChromeExe"; #endif const wchar_t kIePath[] = L"Internet Explorer\\iexplore.exe"; -const char kChromeInstallUrl[] = "http://www.google.com/chrome"; +const char kChromeInstallUrl[] = + "http://google.com/cloudprint/learn/chrome.html"; const wchar_t kChromePathRegKey[] = L"Software\\Google\\CloudPrint"; |