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

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

Issue 22871010: chromeos: Include mode details in OutputSnapshot. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge 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
« no previous file with comments | « no previous file | ash/display/display_change_observer_x11.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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> 8 #include <X11/Xlib.h>
9 9
10 // Xlib.h defines RootWindow. 10 // Xlib.h defines RootWindow.
(...skipping 18 matching lines...) Expand all
29 virtual ~DisplayChangeObserverX11(); 29 virtual ~DisplayChangeObserverX11();
30 30
31 // chromeos::OutputConfigurator::StateController overrides: 31 // chromeos::OutputConfigurator::StateController overrides:
32 virtual chromeos::OutputState GetStateForDisplayIds( 32 virtual chromeos::OutputState GetStateForDisplayIds(
33 const std::vector<int64>& outputs) const OVERRIDE; 33 const std::vector<int64>& outputs) const OVERRIDE;
34 virtual bool GetResolutionForDisplayId(int64 display_id, 34 virtual bool GetResolutionForDisplayId(int64 display_id,
35 int* width, 35 int* width,
36 int* height) const OVERRIDE; 36 int* height) const OVERRIDE;
37 37
38 // Overriden from chromeos::OutputConfigurator::Observer: 38 // Overriden from chromeos::OutputConfigurator::Observer:
39 virtual void OnDisplayModeChanged() OVERRIDE; 39 virtual void OnDisplayModeChanged(
40 const std::vector<chromeos::OutputConfigurator::OutputSnapshot>& outputs)
41 OVERRIDE;
40 42
41 // Overriden from ShellObserver: 43 // Overriden from ShellObserver:
42 virtual void OnAppTerminating() OVERRIDE; 44 virtual void OnAppTerminating() OVERRIDE;
43 45
44 private: 46 private:
45 Display* xdisplay_; 47 Display* xdisplay_;
46 48
47 ::Window x_root_window_; 49 ::Window x_root_window_;
48 50
49 int xrandr_event_base_; 51 int xrandr_event_base_;
50 52
51 DISALLOW_COPY_AND_ASSIGN(DisplayChangeObserverX11); 53 DISALLOW_COPY_AND_ASSIGN(DisplayChangeObserverX11);
52 }; 54 };
53 55
54 } // namespace internal 56 } // namespace internal
55 } // namespace ash 57 } // namespace ash
56 58
57 #endif // ASH_DISPLAY_AURA_DISPLAY_CHANGE_OBSERVER_X11_H 59 #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') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698