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

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

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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 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 20 matching lines...) Expand all
31 RROutput output, 31 RROutput output,
32 RRCrtc crtc, 32 RRCrtc crtc,
33 int index); 33 int index);
34 virtual ~DisplaySnapshotX11(); 34 virtual ~DisplaySnapshotX11();
35 35
36 RROutput output() const { return output_; } 36 RROutput output() const { return output_; }
37 RRCrtc crtc() const { return crtc_; } 37 RRCrtc crtc() const { return crtc_; }
38 int index() const { return index_; } 38 int index() const { return index_; }
39 39
40 // DisplaySnapshot overrides: 40 // DisplaySnapshot overrides:
41 virtual std::string ToString() const OVERRIDE; 41 virtual std::string ToString() const override;
42 42
43 private: 43 private:
44 RROutput output_; 44 RROutput output_;
45 45
46 // CRTC that should be used for this output. Not necessarily the CRTC 46 // CRTC that should be used for this output. Not necessarily the CRTC
47 // that XRandR reports is currently being used. 47 // that XRandR reports is currently being used.
48 RRCrtc crtc_; 48 RRCrtc crtc_;
49 49
50 // This output's index in the array returned by XRandR. Stable even as 50 // This output's index in the array returned by XRandR. Stable even as
51 // outputs are connected or disconnected. 51 // outputs are connected or disconnected.
52 int index_; 52 int index_;
53 53
54 DISALLOW_COPY_AND_ASSIGN(DisplaySnapshotX11); 54 DISALLOW_COPY_AND_ASSIGN(DisplaySnapshotX11);
55 }; 55 };
56 56
57 } // namespace ui 57 } // namespace ui
58 58
59 #endif // UI_DISPLAY_CHROMEOS_X11_DISPLAY_SNAPSHOT_X11_H_ 59 #endif // UI_DISPLAY_CHROMEOS_X11_DISPLAY_SNAPSHOT_X11_H_
OLDNEW
« no previous file with comments | « ui/display/chromeos/test/test_display_snapshot.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