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

Side by Side Diff: ui/display/chromeos/x11/display_snapshot_x11.h

Issue 853073002: Update {virtual,override,final} to follow C++11 style in ui. (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 #ifndef UI_DISPLAY_CHROMEOS_X11_DISPLAY_SNAPSHOT_X11_H_ 5 #ifndef UI_DISPLAY_CHROMEOS_X11_DISPLAY_SNAPSHOT_X11_H_
6 #define UI_DISPLAY_CHROMEOS_X11_DISPLAY_SNAPSHOT_X11_H_ 6 #define UI_DISPLAY_CHROMEOS_X11_DISPLAY_SNAPSHOT_X11_H_
7 7
8 #include "ui/display/display_export.h" 8 #include "ui/display/display_export.h"
9 #include "ui/display/types/display_snapshot.h" 9 #include "ui/display/types/display_snapshot.h"
10 10
(...skipping 12 matching lines...) Expand all
23 DisplayConnectionType type, 23 DisplayConnectionType type,
24 bool is_aspect_preserving_scaling, 24 bool is_aspect_preserving_scaling,
25 bool has_overscan, 25 bool has_overscan,
26 std::string display_name, 26 std::string display_name,
27 const std::vector<const DisplayMode*>& modes, 27 const std::vector<const DisplayMode*>& modes,
28 const DisplayMode* current_mode, 28 const DisplayMode* current_mode,
29 const DisplayMode* native_mode, 29 const DisplayMode* native_mode,
30 RROutput output, 30 RROutput output,
31 RRCrtc crtc, 31 RRCrtc crtc,
32 int index); 32 int index);
33 virtual ~DisplaySnapshotX11(); 33 ~DisplaySnapshotX11() override;
34 34
35 RROutput output() const { return output_; } 35 RROutput output() const { return output_; }
36 RRCrtc crtc() const { return crtc_; } 36 RRCrtc crtc() const { return crtc_; }
37 int index() const { return index_; } 37 int index() const { return index_; }
38 38
39 // DisplaySnapshot overrides: 39 // DisplaySnapshot overrides:
40 virtual std::string ToString() const override; 40 std::string ToString() const override;
41 41
42 private: 42 private:
43 RROutput output_; 43 RROutput output_;
44 44
45 // CRTC that should be used for this output. Not necessarily the CRTC 45 // CRTC that should be used for this output. Not necessarily the CRTC
46 // that XRandR reports is currently being used. 46 // that XRandR reports is currently being used.
47 RRCrtc crtc_; 47 RRCrtc crtc_;
48 48
49 // This output's index in the array returned by XRandR. Stable even as 49 // This output's index in the array returned by XRandR. Stable even as
50 // outputs are connected or disconnected. 50 // outputs are connected or disconnected.
51 int index_; 51 int index_;
52 52
53 DISALLOW_COPY_AND_ASSIGN(DisplaySnapshotX11); 53 DISALLOW_COPY_AND_ASSIGN(DisplaySnapshotX11);
54 }; 54 };
55 55
56 } // namespace ui 56 } // namespace ui
57 57
58 #endif // UI_DISPLAY_CHROMEOS_X11_DISPLAY_SNAPSHOT_X11_H_ 58 #endif // UI_DISPLAY_CHROMEOS_X11_DISPLAY_SNAPSHOT_X11_H_
OLDNEW
« no previous file with comments | « ui/display/chromeos/x11/display_mode_x11.h ('k') | ui/display/chromeos/x11/native_display_delegate_x11.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698