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

Unified Diff: ui/aura/display_change_observer_x11.cc

Issue 10974014: Disable extended desktop. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updated comments. keep pointer inside root Created 8 years, 3 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 | « chromeos/display/output_configurator.cc ('k') | ui/aura/root_window_host_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/display_change_observer_x11.cc
diff --git a/ui/aura/display_change_observer_x11.cc b/ui/aura/display_change_observer_x11.cc
index 21dab9c9463536907f646c3eaa833558f9beb501..ad2006d9e3670d2f0e54ac32cd01cc514483af69 100644
--- a/ui/aura/display_change_observer_x11.cc
+++ b/ui/aura/display_change_observer_x11.cc
@@ -130,6 +130,12 @@ void DisplayChangeObserverX11::NotifyDisplayChange() {
LOG(WARNING) << "Crtc not found for output: output=" << o;
continue;
}
+ // TODO(oshima): Temporarily ignore all displays other than
+ // primary, which has y = 0 to disable extended desktop.
+ // crbug.com/152003.
+ if (crtc_info->y != 0)
+ continue;
+
XRRModeInfo* mode = FindMode(screen_resources, crtc_info->mode);
if (!mode) {
LOG(WARNING) << "Could not find a mode for the output: output=" << o;
@@ -165,6 +171,10 @@ void DisplayChangeObserverX11::NotifyDisplayChange() {
y_coords.insert(crtc_info->y);
XRRFreeOutputInfo(output_info);
+
+ // TODO(oshima): There is only one display in m23.
+ // Set the id to 0. crbug.com/152003.
+ displays.back().set_id(0);
}
// Free all allocated resources.
« no previous file with comments | « chromeos/display/output_configurator.cc ('k') | ui/aura/root_window_host_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698