| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/window_sizer/window_sizer.h" | 5 #include "chrome/browser/ui/window_sizer/window_sizer.h" |
| 6 | 6 |
| 7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
| 8 #include "ash/wm/window_cycle_controller.h" | 8 #include "ash/wm/window_cycle_controller.h" |
| 9 #include "ash/wm/window_util.h" | 9 #include "ash/wm/window_util.h" |
| 10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 *bounds = specified_bounds; | 77 *bounds = specified_bounds; |
| 78 DCHECK(bounds->IsEmpty()); | 78 DCHECK(bounds->IsEmpty()); |
| 79 if (browser_ != NULL && browser_->type() == Browser::TYPE_TABBED) { | 79 if (browser_ != NULL && browser_->type() == Browser::TYPE_TABBED) { |
| 80 // This is a window / app. See if there is no window and try to place it. | 80 // This is a window / app. See if there is no window and try to place it. |
| 81 aura::Window* top_window = GetTopWindow(); | 81 aura::Window* top_window = GetTopWindow(); |
| 82 // If there are no windows we have a special case and try to | 82 // If there are no windows we have a special case and try to |
| 83 // maximize which leaves a 'border' which shows the desktop. | 83 // maximize which leaves a 'border' which shows the desktop. |
| 84 if (top_window == NULL) { | 84 if (top_window == NULL) { |
| 85 GetDefaultWindowBounds(bounds); | 85 GetDefaultWindowBounds(bounds); |
| 86 } else { | 86 } else { |
| 87 *bounds = top_window->GetRootWindowBounds(); | 87 *bounds = top_window->GetBoundsInRootWindow(); |
| 88 gfx::Rect work_area = | 88 gfx::Rect work_area = |
| 89 monitor_info_provider_->GetMonitorWorkAreaMatching(*bounds); | 89 monitor_info_provider_->GetMonitorWorkAreaMatching(*bounds); |
| 90 *bounds = bounds->AdjustToFit(work_area); | 90 *bounds = bounds->AdjustToFit(work_area); |
| 91 } | 91 } |
| 92 return true; | 92 return true; |
| 93 // If both fail we will continue the default path. | 93 // If both fail we will continue the default path. |
| 94 } | 94 } |
| 95 | 95 |
| 96 return false; | 96 return false; |
| 97 } | 97 } |
| (...skipping 22 matching lines...) Expand all Loading... |
| 120 // The window should get centered on the screen and not follow the grid. | 120 // The window should get centered on the screen and not follow the grid. |
| 121 offset_x = (work_area.width() - maximum_window_width) / 2; | 121 offset_x = (work_area.width() - maximum_window_width) / 2; |
| 122 // Never make a window wider then 1280. | 122 // Never make a window wider then 1280. |
| 123 default_width = maximum_window_width; | 123 default_width = maximum_window_width; |
| 124 } | 124 } |
| 125 default_bounds->SetRect(work_area.x() + offset_x, | 125 default_bounds->SetRect(work_area.x() + offset_x, |
| 126 work_area.y() + kDesktopBorderSize, | 126 work_area.y() + kDesktopBorderSize, |
| 127 default_width, | 127 default_width, |
| 128 default_height); | 128 default_height); |
| 129 } | 129 } |
| OLD | NEW |