summaryrefslogtreecommitdiffstats
path: root/ash/display
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-22 02:28:49 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-22 02:28:49 +0000
commitd8b42e288d8fc5994163eed9c77ba87a5c16e489 (patch)
tree7940b57497e58e745bfda55741850ef5e205ab61 /ash/display
parent1e6bd068e8d91c3cac8b7c3624800198e26fb346 (diff)
downloadchromium_src-d8b42e288d8fc5994163eed9c77ba87a5c16e489.zip
chromium_src-d8b42e288d8fc5994163eed9c77ba87a5c16e489.tar.gz
chromium_src-d8b42e288d8fc5994163eed9c77ba87a5c16e489.tar.bz2
Make sure the top of the window is visible when a window is added.
Use correct work area when adjusting the bounds. BUG=286302 TEST=covered by tests Review URL: https://codereview.chromium.org/28413003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230016 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/display')
-rw-r--r--ash/display/display_manager.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/display/display_manager.cc b/ash/display/display_manager.cc
index ebaea67..9ffa6c8 100644
--- a/ash/display/display_manager.cc
+++ b/ash/display/display_manager.cc
@@ -271,7 +271,7 @@ DisplayIdPair DisplayManager::GetCurrentDisplayIdPair() const {
int64 mirrored_id = mirrored_display().id();
return std::make_pair(displays_[0].id(), mirrored_id);
} else {
- CHECK_LE(2u, displays_.size());
+ CHECK_GE(2u, displays_.size());
int64 id_at_zero = displays_[0].id();
if (id_at_zero == gfx::Display::InternalDisplayId() ||
id_at_zero == first_display_id()) {