Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(204)

Unified Diff: cloud_print/virtual_driver/win/install/setup.cc

Issue 7465016: Installer for Windows cloud print driver changed to use PPD, PPd file added (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Code review nit fixed. Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cloud_print/virtual_driver/GCP-driver.ppd ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cloud_print/virtual_driver/win/install/setup.cc
diff --git a/cloud_print/virtual_driver/win/install/setup.cc b/cloud_print/virtual_driver/win/install/setup.cc
index 6ee31096b7ef1338e3c5ccb0e44d16dd6548e1e6..470008a166d223e59f9aa1195e62b4a37e62958f 100644
--- a/cloud_print/virtual_driver/win/install/setup.cc
+++ b/cloud_print/virtual_driver/win/install/setup.cc
@@ -20,12 +20,12 @@
namespace {
-HRESULT GetGpdPath(FilePath* path) {
+HRESULT GetPpdPath(FilePath* path) {
if (!PathService::Get(base::DIR_EXE, path)) {
LOG(ERROR) << "Unable to get install path.";
return ERROR_PATH_NOT_FOUND;
}
- *path = path->Append(L"gcp.gpd");
+ *path = path->Append(L"GCP-driver.ppd");
return S_OK;
}
@@ -141,7 +141,7 @@ DWORDLONG GetVersionNumber() {
return retval;
}
-HRESULT InstallGpd() {
+HRESULT InstallPpd() {
DRIVER_INFO_6 driver_info = {0};
HRESULT result = S_OK;
@@ -150,9 +150,9 @@ HRESULT InstallGpd() {
FilePath driver_dir;
cloud_print::GetPrinterDriverDir(&driver_dir);
FilePath xps_path = driver_dir.Append(L"mxdwdrv.dll");
- FilePath ui_path = driver_dir.Append(L"unidrvui.dll");
+ FilePath ui_path = driver_dir.Append(L"ps5ui.dll");
FilePath ui_help_path = driver_dir.Append(L"unidrv.hlp");
- result = GetGpdPath(&source_path);
+ result = GetPpdPath(&source_path);
if (!SUCCEEDED(result)) {
return result;
}
@@ -190,7 +190,7 @@ HRESULT InstallGpd() {
return S_OK;
}
-HRESULT UninstallGpd() {
+HRESULT UninstallPpd() {
int tries = 10;
string16 driver_name = cloud_print::LoadLocalString(IDS_DRIVER_NAME);
while (!DeletePrinterDriverEx(NULL,
@@ -268,9 +268,9 @@ HRESULT InstallVirtualDriver(void) {
LOG(ERROR) << "Unable to register port monitor.";
return result;
}
- result = InstallGpd();
+ result = InstallPpd();
if (!SUCCEEDED(result)) {
- LOG(ERROR) << "Unable to install gpd.";
+ LOG(ERROR) << "Unable to install Ppd.";
return result;
}
result = InstallPrinter();
@@ -285,12 +285,12 @@ HRESULT UninstallVirtualDriver(void) {
HRESULT result = S_OK;
result = UninstallPrinter();
if (!SUCCEEDED(result)) {
- LOG(ERROR) << "Unable to uninstall gpd.";
+ LOG(ERROR) << "Unable to uninstall Ppd.";
return result;
}
- result = UninstallGpd();
+ result = UninstallPpd();
if (!SUCCEEDED(result)) {
- LOG(ERROR) << "Unable to remove gpd.";
+ LOG(ERROR) << "Unable to remove Ppd.";
return result;
}
result = RegisterPortMonitor(false);
« no previous file with comments | « cloud_print/virtual_driver/GCP-driver.ppd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698