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

Unified Diff: remoting/host/desktop_resizer_mac.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/desktop_resizer_linux.cc ('k') | remoting/host/desktop_resizer_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/desktop_resizer_mac.cc
diff --git a/remoting/host/desktop_resizer_mac.cc b/remoting/host/desktop_resizer_mac.cc
index 4bc03cc0727b6619a15380dd8c6578cfc234b90e..7d3d32983605e8d5a17250308d7d87459da54ff8 100644
--- a/remoting/host/desktop_resizer_mac.cc
+++ b/remoting/host/desktop_resizer_mac.cc
@@ -75,7 +75,7 @@ void DesktopResizerMac::SetResolution(const ScreenResolution& resolution) {
// There may be many modes with the requested resolution. Pick the one with
// the highest color depth.
int index = 0, best_depth = 0;
- CGDisplayModeRef best_mode = NULL;
+ CGDisplayModeRef best_mode = nullptr;
for (std::list<ScreenResolution>::const_iterator i = resolutions.begin();
i != resolutions.end(); ++i, ++index) {
if (i->Equals(resolution)) {
@@ -109,7 +109,7 @@ void DesktopResizerMac::SetResolution(const ScreenResolution& resolution) {
<< "x" << resolution.dimensions().height() << "x"
<< best_depth << " @ "
<< resolution.dpi().x() << "x" << resolution.dpi().y() << " dpi)";
- CGDisplaySetDisplayMode(display, best_mode, NULL);
+ CGDisplaySetDisplayMode(display, best_mode, nullptr);
}
}
@@ -126,12 +126,12 @@ void DesktopResizerMac::GetSupportedModesAndResolutions(
}
base::ScopedCFTypeRef<CFArrayRef> all_modes(
- CGDisplayCopyAllDisplayModes(display, NULL));
+ CGDisplayCopyAllDisplayModes(display, nullptr));
if (!all_modes) {
return;
}
- modes->reset(CFArrayCreateMutableCopy(NULL, 0, all_modes));
+ modes->reset(CFArrayCreateMutableCopy(nullptr, 0, all_modes));
CFIndex count = CFArrayGetCount(*modes);
for (CFIndex i = 0; i < count; ++i) {
CGDisplayModeRef mode = const_cast<CGDisplayModeRef>(
« no previous file with comments | « remoting/host/desktop_resizer_linux.cc ('k') | remoting/host/desktop_resizer_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698