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

Side by Side Diff: remoting/host/chromeos/skia_bitmap_desktop_frame.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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/logging.h" 5 #include "base/logging.h"
6 #include "remoting/host/chromeos/skia_bitmap_desktop_frame.h" 6 #include "remoting/host/chromeos/skia_bitmap_desktop_frame.h"
7 7
8 namespace remoting { 8 namespace remoting {
9 9
10 // static 10 // static
(...skipping 11 matching lines...) Expand all
22 SkiaBitmapDesktopFrame* result = new SkiaBitmapDesktopFrame( 22 SkiaBitmapDesktopFrame* result = new SkiaBitmapDesktopFrame(
23 size, bitmap->rowBytes(), bitmap_data, bitmap.Pass()); 23 size, bitmap->rowBytes(), bitmap_data, bitmap.Pass());
24 24
25 return result; 25 return result;
26 } 26 }
27 27
28 SkiaBitmapDesktopFrame::SkiaBitmapDesktopFrame(webrtc::DesktopSize size, 28 SkiaBitmapDesktopFrame::SkiaBitmapDesktopFrame(webrtc::DesktopSize size,
29 int stride, 29 int stride,
30 uint8_t* data, 30 uint8_t* data,
31 scoped_ptr<SkBitmap> bitmap) 31 scoped_ptr<SkBitmap> bitmap)
32 : DesktopFrame(size, stride, data, NULL), bitmap_(bitmap.Pass()) { 32 : DesktopFrame(size, stride, data, nullptr), bitmap_(bitmap.Pass()) {
33 } 33 }
34 34
35 SkiaBitmapDesktopFrame::~SkiaBitmapDesktopFrame() { 35 SkiaBitmapDesktopFrame::~SkiaBitmapDesktopFrame() {
36 } 36 }
37 37
38 } // namespace remoting 38 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/host/chromeos/aura_desktop_capturer_unittest.cc ('k') | remoting/host/chromoting_host_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698