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

Side by Side Diff: content/browser/compositor/software_output_device_x11.h

Issue 634703003: Replacing the OVERRIDE with override and FINAL with final in content/browser/[accessibility|battery… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 #ifndef CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_X11_H_ 5 #ifndef CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_X11_H_
6 #define CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_X11_H_ 6 #define CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_X11_H_
7 7
8 #include <X11/Xlib.h> 8 #include <X11/Xlib.h>
9 9
10 #include "cc/output/software_output_device.h" 10 #include "cc/output/software_output_device.h"
11 #include "ui/gfx/x/x11_types.h" 11 #include "ui/gfx/x/x11_types.h"
12 12
13 namespace ui { 13 namespace ui {
14 class Compositor; 14 class Compositor;
15 } 15 }
16 16
17 namespace content { 17 namespace content {
18 18
19 class SoftwareOutputDeviceX11 : public cc::SoftwareOutputDevice { 19 class SoftwareOutputDeviceX11 : public cc::SoftwareOutputDevice {
20 public: 20 public:
21 explicit SoftwareOutputDeviceX11(ui::Compositor* compositor); 21 explicit SoftwareOutputDeviceX11(ui::Compositor* compositor);
22 22
23 virtual ~SoftwareOutputDeviceX11(); 23 virtual ~SoftwareOutputDeviceX11();
24 24
25 virtual void EndPaint(cc::SoftwareFrameData* frame_data) OVERRIDE; 25 virtual void EndPaint(cc::SoftwareFrameData* frame_data) override;
26 26
27 private: 27 private:
28 ui::Compositor* compositor_; 28 ui::Compositor* compositor_;
29 XDisplay* display_; 29 XDisplay* display_;
30 GC gc_; 30 GC gc_;
31 XWindowAttributes attributes_; 31 XWindowAttributes attributes_;
32 32
33 DISALLOW_COPY_AND_ASSIGN(SoftwareOutputDeviceX11); 33 DISALLOW_COPY_AND_ASSIGN(SoftwareOutputDeviceX11);
34 }; 34 };
35 35
36 } // namespace content 36 } // namespace content
37 37
38 #endif // CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_X11_H_ 38 #endif // CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_X11_H_
OLDNEW
« no previous file with comments | « content/browser/compositor/software_output_device_win.h ('k') | content/browser/compositor/surface_display_output_surface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698