summaryrefslogtreecommitdiffstats
path: root/ash/display
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-13 09:34:06 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-13 09:34:06 +0000
commitdf521edc6bc149cc48f46df5a033c49a88c3158f (patch)
tree40016116eb64e9b82cc7daa7a4797808745b979b /ash/display
parent5ea8465224a645ef9ffcc9aa9d1c1ac2372fdf2b (diff)
downloadchromium_src-df521edc6bc149cc48f46df5a033c49a88c3158f.zip
chromium_src-df521edc6bc149cc48f46df5a033c49a88c3158f.tar.gz
chromium_src-df521edc6bc149cc48f46df5a033c49a88c3158f.tar.bz2
Reset non_desktop_display_ when adding/removing display on linux desktop
This is for dev purpose only and not for real environment. BUG=none TEST=run chrome on lnux desktop. shift-ctrl-d to create 2nd display, shift-ctrl-m to enter mirror, then shift-ctrl-d to remove 2nd display. This used to crash. Review URL: https://codereview.chromium.org/70553005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234786 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/display')
-rw-r--r--ash/display/display_manager.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/ash/display/display_manager.cc b/ash/display/display_manager.cc
index 408a9f5..a4c5f75 100644
--- a/ash/display/display_manager.cc
+++ b/ash/display/display_manager.cc
@@ -839,6 +839,7 @@ void DisplayManager::AddRemoveDisplay() {
}
num_connected_displays_ = new_display_info_list.size();
mirrored_display_id_ = gfx::Display::kInvalidDisplayID;
+ non_desktop_display_ = gfx::Display();
UpdateDisplays(new_display_info_list);
}