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

Unified Diff: ash/display/display_change_observer_x11.cc

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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/display/display_change_observer_x11.h ('k') | ash/display/display_util_x11.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_change_observer_x11.cc
diff --git a/ash/display/display_change_observer_x11.cc b/ash/display/display_change_observer_x11.cc
index 860a5ea4996905c796694331098a2cb8f882b0b3..2802e6c8984a836f65e3cbfb61e23587db525594 100644
--- a/ash/display/display_change_observer_x11.cc
+++ b/ash/display/display_change_observer_x11.cc
@@ -27,6 +27,9 @@
namespace ash {
namespace internal {
+
+using chromeos::OutputConfigurator;
+
namespace {
// The DPI threshold to detect high density screen.
@@ -89,7 +92,9 @@ bool DisplayChangeObserverX11::GetResolutionForDisplayId(int64 display_id,
return true;
}
-void DisplayChangeObserverX11::OnDisplayModeChanged() {
+void DisplayChangeObserverX11::OnDisplayModeChanged(
+ const std::vector<OutputConfigurator::OutputSnapshot>& outputs) {
+ // TODO(derat): Use |outputs| instead of re-fetching information.
XRRScreenResources* screen_resources =
XRRGetScreenResources(xdisplay_, x_root_window_);
std::map<XID, XRRCrtcInfo*> crtc_info_map;
@@ -131,7 +136,7 @@ void DisplayChangeObserverX11::OnDisplayModeChanged() {
continue;
}
const XRRModeInfo* mode =
- chromeos::FindModeInfo(screen_resources, crtc_info->mode);
+ chromeos::FindXRRModeInfo(screen_resources, crtc_info->mode);
if (!mode) {
LOG(WARNING) << "Could not find a mode for the output: output_index="
<< output_index;
« no previous file with comments | « ash/display/display_change_observer_x11.h ('k') | ash/display/display_util_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698