summaryrefslogtreecommitdiffstats
path: root/ui/aura/root_window_host_linux.cc
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-10 17:54:43 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-10 17:54:43 +0000
commit4ef14de573bc757bb7d4043963c9d64f4c74439b (patch)
treed9120c98923122ba0e166d0f8f79827139ef3fe6 /ui/aura/root_window_host_linux.cc
parenta27ef629458d52f24a7c5ee50eb9bb01fbfcecfd (diff)
downloadchromium_src-4ef14de573bc757bb7d4043963c9d64f4c74439b.zip
chromium_src-4ef14de573bc757bb7d4043963c9d64f4c74439b.tar.gz
chromium_src-4ef14de573bc757bb7d4043963c9d64f4c74439b.tar.bz2
Cancel drag if display configuration changes.
* Removed debug specific shortcut to emulate display change. * fixed ui_controls to use the correct position * a few minor clean ups (removing unnecessary namesapce, rename Monitor -> Display) BUG=14457 TEST=covered by test Review URL: https://chromiumcodereview.appspot.com/10909043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155762 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/root_window_host_linux.cc')
-rw-r--r--ui/aura/root_window_host_linux.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/ui/aura/root_window_host_linux.cc b/ui/aura/root_window_host_linux.cc
index 9b98856..4e5af61 100644
--- a/ui/aura/root_window_host_linux.cc
+++ b/ui/aura/root_window_host_linux.cc
@@ -1097,6 +1097,10 @@ void RootWindowHostLinux::OnDeviceScaleFactorChanged(
image_cursors_->Reload(device_scale_factor);
}
+void RootWindowHostLinux::PrepareForShutdown() {
+ base::MessagePumpAuraX11::Current()->RemoveDispatcherForWindow(xwindow_);
+}
+
bool RootWindowHostLinux::IsWindowManagerPresent() {
// Per ICCCM 2.8, "Manager Selections", window managers should take ownership
// of WM_Sn selections (where n is a screen number).