| 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>(
|
|
|