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

Unified Diff: remoting/host/setup/daemon_installer_win.cc

Issue 810133003: replace NULL->nullptr in src/remoting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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 | « remoting/host/setup/daemon_installer_win.h ('k') | remoting/host/setup/me2me_native_messaging_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/setup/daemon_installer_win.cc
diff --git a/remoting/host/setup/daemon_installer_win.cc b/remoting/host/setup/daemon_installer_win.cc
index 2968ce113c4695b3d3840bf6e15b03e5cb8020d4..a125dfeb819b550892b0614dd1b854e6d8919a28 100644
--- a/remoting/host/setup/daemon_installer_win.cc
+++ b/remoting/host/setup/daemon_installer_win.cc
@@ -135,7 +135,7 @@ void DaemonComInstallerWin::Install() {
}
hr = dispatch::Invoke(V_DISPATCH(&bundle_), L"initialize", DISPATCH_METHOD,
- NULL);
+ nullptr);
if (FAILED(hr)) {
Done(hr);
return;
@@ -146,14 +146,14 @@ void DaemonComInstallerWin::Install() {
ScopedVariant empty(kOmahaEmpty);
ScopedVariant language(kOmahaLanguage);
hr = dispatch::Invoke(V_DISPATCH(&bundle_), L"createApp", DISPATCH_METHOD,
- appid, empty, language, empty, NULL);
+ appid, empty, language, empty, nullptr);
if (FAILED(hr)) {
Done(hr);
return;
}
hr = dispatch::Invoke(V_DISPATCH(&bundle_), L"checkForUpdate",
- DISPATCH_METHOD, NULL);
+ DISPATCH_METHOD, nullptr);
if (FAILED(hr)) {
Done(hr);
return;
@@ -214,7 +214,7 @@ void DaemonComInstallerWin::PollInstallationStatus() {
case STATE_UPDATE_AVAILABLE:
hr = dispatch::Invoke(V_DISPATCH(&bundle_), L"download",
- DISPATCH_METHOD, NULL);
+ DISPATCH_METHOD, nullptr);
if (FAILED(hr)) {
Done(hr);
return;
@@ -226,7 +226,7 @@ void DaemonComInstallerWin::PollInstallationStatus() {
case STATE_APPLYING_DIFFERENTIAL_PATCH:
case STATE_READY_TO_INSTALL:
hr = dispatch::Invoke(V_DISPATCH(&bundle_), L"install",
- DISPATCH_METHOD, NULL);
+ DISPATCH_METHOD, nullptr);
if (FAILED(hr)) {
Done(hr);
return;
@@ -352,7 +352,7 @@ scoped_ptr<DaemonInstallerWin> DaemonInstallerWin::Create(
result = CLSIDFromProgID(kGoogleUpdate, &class_id);
if (SUCCEEDED(result)) {
result = CoCreateInstance(class_id,
- NULL,
+ nullptr,
CLSCTX_LOCAL_SERVER,
IID_IDispatch,
update3.ReceiveVoid());
@@ -389,8 +389,8 @@ scoped_ptr<DaemonInstallerWin> DaemonInstallerWin::Create(
}
HWND GetTopLevelWindow(HWND window) {
- if (window == NULL) {
- return NULL;
+ if (window == nullptr) {
+ return nullptr;
}
for (;;) {
@@ -401,7 +401,7 @@ HWND GetTopLevelWindow(HWND window) {
}
HWND parent = GetAncestor(window, GA_PARENT);
- if (parent == NULL) {
+ if (parent == nullptr) {
return window;
}
« no previous file with comments | « remoting/host/setup/daemon_installer_win.h ('k') | remoting/host/setup/me2me_native_messaging_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698