Permalink
Browse files

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
  • Loading branch information...
1 parent cde6ab1 commit 0dcc715ee61dba309f35987cf92354f5f6415218 abodenha@chromium.org committed Mar 22, 2012
@@ -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;
@@ -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";

0 comments on commit 0dcc715

Please sign in to comment.