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

Side by Side Diff: ash/display/display_change_observer_x11.h

Issue 23286003: ash: Get output info from chromeos instead of XRandR. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 4 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 ASH_DISPLAY_DISPLAY_CHANGE_OBSERVER_X11_H 5 #ifndef ASH_DISPLAY_DISPLAY_CHANGE_OBSERVER_X11_H
6 #define ASH_DISPLAY_DISPLAY_CHANGE_OBSERVER_X11_H 6 #define ASH_DISPLAY_DISPLAY_CHANGE_OBSERVER_X11_H
7 7
8 #include <X11/Xlib.h>
9
10 // Xlib.h defines RootWindow.
11 #undef RootWindow
12
13 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
14 #include "ash/shell_observer.h" 9 #include "ash/shell_observer.h"
15 #include "base/basictypes.h" 10 #include "base/basictypes.h"
16 #include "chromeos/display/output_configurator.h" 11 #include "chromeos/display/output_configurator.h"
17 12
18 namespace ash { 13 namespace ash {
19 namespace internal { 14 namespace internal {
20 15
21 // An object that observes changes in display configuration and 16 // An object that observes changes in display configuration and
22 // update DisplayManagers. 17 // update DisplayManagers.
(...skipping 14 matching lines...) Expand all
37 32
38 // Overriden from chromeos::OutputConfigurator::Observer: 33 // Overriden from chromeos::OutputConfigurator::Observer:
39 virtual void OnDisplayModeChanged( 34 virtual void OnDisplayModeChanged(
40 const std::vector<chromeos::OutputConfigurator::OutputSnapshot>& outputs) 35 const std::vector<chromeos::OutputConfigurator::OutputSnapshot>& outputs)
41 OVERRIDE; 36 OVERRIDE;
42 37
43 // Overriden from ShellObserver: 38 // Overriden from ShellObserver:
44 virtual void OnAppTerminating() OVERRIDE; 39 virtual void OnAppTerminating() OVERRIDE;
45 40
46 private: 41 private:
47 Display* xdisplay_;
48
49 ::Window x_root_window_;
50
51 int xrandr_event_base_;
52
53 DISALLOW_COPY_AND_ASSIGN(DisplayChangeObserverX11); 42 DISALLOW_COPY_AND_ASSIGN(DisplayChangeObserverX11);
54 }; 43 };
55 44
56 } // namespace internal 45 } // namespace internal
57 } // namespace ash 46 } // namespace ash
58 47
59 #endif // ASH_DISPLAY_AURA_DISPLAY_CHANGE_OBSERVER_X11_H 48 #endif // ASH_DISPLAY_AURA_DISPLAY_CHANGE_OBSERVER_X11_H
OLDNEW
« no previous file with comments | « no previous file | ash/display/display_change_observer_x11.cc » ('j') | ash/display/display_change_observer_x11.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698