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

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

Issue 2613493002: Fix namespace for src/ui/display/. (Closed)
Patch Set: Rebase. Created 3 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_MANAGER_CHROMEOS_X11_DISPLAY_SNAPSHOT_X11_H_ 5 #ifndef UI_DISPLAY_MANAGER_CHROMEOS_X11_DISPLAY_SNAPSHOT_X11_H_
6 #define UI_DISPLAY_MANAGER_CHROMEOS_X11_DISPLAY_SNAPSHOT_X11_H_ 6 #define UI_DISPLAY_MANAGER_CHROMEOS_X11_DISPLAY_SNAPSHOT_X11_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "ui/display/manager/display_manager_export.h" 11 #include "ui/display/manager/display_manager_export.h"
12 #include "ui/display/types/display_snapshot.h" 12 #include "ui/display/types/display_snapshot.h"
13 13
14 // Forward declare from Xlib and Xrandr. 14 // Forward declare from Xlib and Xrandr.
15 typedef unsigned long XID; 15 typedef unsigned long XID;
16 typedef XID RROutput; 16 typedef XID RROutput;
17 typedef XID RRCrtc; 17 typedef XID RRCrtc;
18 18
19 namespace ui { 19 namespace display {
20 20
21 class DISPLAY_MANAGER_EXPORT DisplaySnapshotX11 : public DisplaySnapshot { 21 class DISPLAY_MANAGER_EXPORT DisplaySnapshotX11 : public DisplaySnapshot {
22 public: 22 public:
23 DisplaySnapshotX11(int64_t display_id, 23 DisplaySnapshotX11(int64_t display_id,
24 const gfx::Point& origin, 24 const gfx::Point& origin,
25 const gfx::Size& physical_size, 25 const gfx::Size& physical_size,
26 DisplayConnectionType type, 26 DisplayConnectionType type,
27 bool is_aspect_preserving_scaling, 27 bool is_aspect_preserving_scaling,
28 bool has_overscan, 28 bool has_overscan,
29 std::string display_name, 29 std::string display_name,
(...skipping 20 matching lines...) Expand all
50 // that XRandR reports is currently being used. 50 // that XRandR reports is currently being used.
51 RRCrtc crtc_; 51 RRCrtc crtc_;
52 52
53 // This output's index in the array returned by XRandR. Stable even as 53 // This output's index in the array returned by XRandR. Stable even as
54 // outputs are connected or disconnected. 54 // outputs are connected or disconnected.
55 int index_; 55 int index_;
56 56
57 DISALLOW_COPY_AND_ASSIGN(DisplaySnapshotX11); 57 DISALLOW_COPY_AND_ASSIGN(DisplaySnapshotX11);
58 }; 58 };
59 59
60 } // namespace ui 60 } // namespace display
61 61
62 #endif // UI_DISPLAY_MANAGER_CHROMEOS_X11_DISPLAY_SNAPSHOT_X11_H_ 62 #endif // UI_DISPLAY_MANAGER_CHROMEOS_X11_DISPLAY_SNAPSHOT_X11_H_
OLDNEW
« no previous file with comments | « ui/display/manager/chromeos/x11/display_mode_x11.cc ('k') | ui/display/manager/chromeos/x11/display_snapshot_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698