Skip to content

Commit

Permalink
Remove using directives ("using namespace x") from cloud_print/.
Browse files Browse the repository at this point in the history
Bug: 82078
Change-Id: I27733feb3e38bddb24509d7588c4f41b2acc4831
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1820318
Auto-Submit: Peter Kasting <[email protected]>
Reviewed-by: Wei Li <[email protected]>
Commit-Queue: Peter Kasting <[email protected]>
Cr-Commit-Position: refs/heads/master@{#699400}
  • Loading branch information
pkasting authored and Commit Bot committed Sep 24, 2019
1 parent 61acf77 commit 6b569f7
Showing 1 changed file with 11 additions and 10 deletions.
21 changes: 11 additions & 10 deletions cloud_print/virtual_driver/win/install/setup.cc
Original file line number Diff line number Diff line change
Expand Up @@ -408,26 +408,27 @@ int WINAPI WinMain(__in HINSTANCE hInstance,
__in HINSTANCE hPrevInstance,
__in LPSTR lpCmdLine,
__in int nCmdShow) {
using namespace cloud_print;

base::AtExitManager at_exit_manager;
base::CommandLine::Init(0, NULL);
base::CommandLine::Init(0, nullptr);

HRESULT retval = ExecuteCommands();
HRESULT retval = cloud_print::ExecuteCommands();

if (retval == HRESULT_FROM_WIN32(ERROR_BAD_DRIVER)) {
SetGoogleUpdateError(kGoogleUpdateProductId,
LoadLocalString(IDS_ERROR_NO_XPS));
cloud_print::SetGoogleUpdateError(
cloud_print::kGoogleUpdateProductId,
cloud_print::LoadLocalString(IDS_ERROR_NO_XPS));
} else if (FAILED(retval)) {
SetGoogleUpdateError(kGoogleUpdateProductId, retval);
cloud_print::SetGoogleUpdateError(cloud_print::kGoogleUpdateProductId,
retval);
}

VLOG(0) << GetErrorMessage(retval) << " HRESULT=0x" << std::setbase(16)
<< retval;
VLOG(0) << cloud_print::GetErrorMessage(retval) << " HRESULT=0x"
<< std::setbase(16) << retval;

// Installer is silent by default as required by Google Update.
if (base::CommandLine::ForCurrentProcess()->HasSwitch("verbose")) {
DisplayWindowsMessage(NULL, retval, LoadLocalString(IDS_DRIVER_NAME));
cloud_print::DisplayWindowsMessage(
nullptr, retval, cloud_print::LoadLocalString(IDS_DRIVER_NAME));
}
return retval;
}

0 comments on commit 6b569f7

Please sign in to comment.