summaryrefslogtreecommitdiffstats
path: root/cloud_print/virtual_driver/win
diff options
context:
space:
mode:
authorrvargas <rvargas@chromium.org>2014-09-24 17:06:28 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-25 00:07:02 +0000
commit2ca0f9c9a788a2b16b486a26937818ff02ad21c1 (patch)
tree70ae966a08daa445e01898eaef6479c3f86a1b68 /cloud_print/virtual_driver/win
parenta9023056a62c94c654856d61357123f36decb18e (diff)
downloadchromium_src-2ca0f9c9a788a2b16b486a26937818ff02ad21c1.zip
chromium_src-2ca0f9c9a788a2b16b486a26937818ff02ad21c1.tar.gz
chromium_src-2ca0f9c9a788a2b16b486a26937818ff02ad21c1.tar.bz2
Remove implicit HANDLE conversions from cloud_print.
BUG=416722 R=gene@chromium.org Review URL: https://codereview.chromium.org/606443003 Cr-Commit-Position: refs/heads/master@{#296582}
Diffstat (limited to 'cloud_print/virtual_driver/win')
-rw-r--r--cloud_print/virtual_driver/win/install/setup.cc2
-rw-r--r--cloud_print/virtual_driver/win/port_monitor/port_monitor.cc6
2 files changed, 4 insertions, 4 deletions
diff --git a/cloud_print/virtual_driver/win/install/setup.cc b/cloud_print/virtual_driver/win/install/setup.cc
index 5d32737..0435eb3 100644
--- a/cloud_print/virtual_driver/win/install/setup.cc
+++ b/cloud_print/virtual_driver/win/install/setup.cc
@@ -147,7 +147,7 @@ HRESULT RegisterPortMonitor(bool install, const base::FilePath& install_path) {
DWORD exit_code = S_OK;
if (install) {
- if (!GetExitCodeProcess(regsvr32_handle, &exit_code)) {
+ if (!GetExitCodeProcess(regsvr32_handle.Get(), &exit_code)) {
LOG(ERROR) << "Unable to get regsvr32.exe exit code.";
return GetLastHResult();
}
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 c41b805..26f7b3f 100644
--- a/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc
+++ b/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc
@@ -220,7 +220,7 @@ bool LaunchPrintDialog(const base::FilePath& xps_path,
command_line.AppendSwitchNative(switches::kCloudPrintFileType, kXpsMimeType);
command_line.AppendSwitchNative(switches::kCloudPrintJobTitle, job_title);
base::LaunchOptions options;
- options.as_user = primary_token_scoped;
+ options.as_user = primary_token_scoped.Get();
base::LaunchProcess(command_line, options, NULL);
return true;
}
@@ -246,7 +246,7 @@ void LaunchChromeDownloadPage() {
command_line.AppendArg(kChromeInstallUrl);
base::LaunchOptions options;
- options.as_user = token_scoped;
+ options.as_user = token_scoped.Get();
base::LaunchProcess(command_line, options, NULL);
}
@@ -264,7 +264,7 @@ bool ValidateCurrentUser() {
if (base::win::GetVersion() >= base::win::VERSION_VISTA) {
DWORD session_id = 0;
DWORD dummy;
- if (!GetTokenInformation(token_scoped,
+ if (!GetTokenInformation(token_scoped.Get(),
TokenSessionId,
reinterpret_cast<void *>(&session_id),
sizeof(DWORD),