| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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/window_sizer.h" | 5 #include "chrome/browser/window_sizer.h" |
| 6 | 6 |
| 7 #include <gtk/gtk.h> | 7 #include <gtk/gtk.h> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "chrome/browser/browser.h" | |
| 11 #include "chrome/browser/browser_list.h" | 10 #include "chrome/browser/browser_list.h" |
| 12 #include "chrome/browser/browser_window.h" | 11 #include "chrome/browser/browser_window.h" |
| 12 #include "chrome/browser/ui/browser.h" |
| 13 | 13 |
| 14 // Used to pad the default new window size. On Windows, this is also used for | 14 // Used to pad the default new window size. On Windows, this is also used for |
| 15 // positioning new windows (each window is offset from the previous one). | 15 // positioning new windows (each window is offset from the previous one). |
| 16 // Since we don't position windows, it's only used for the default new window | 16 // Since we don't position windows, it's only used for the default new window |
| 17 // size. | 17 // size. |
| 18 const int WindowSizer::kWindowTilePixels = 10; | 18 const int WindowSizer::kWindowTilePixels = 10; |
| 19 | 19 |
| 20 // An implementation of WindowSizer::MonitorInfoProvider that gets the actual | 20 // An implementation of WindowSizer::MonitorInfoProvider that gets the actual |
| 21 // monitor information from X via GDK. | 21 // monitor information from X via GDK. |
| 22 class DefaultMonitorInfoProvider : public WindowSizer::MonitorInfoProvider { | 22 class DefaultMonitorInfoProvider : public WindowSizer::MonitorInfoProvider { |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 std::min(y + kWindowTilePixels, | 122 std::min(y + kWindowTilePixels, |
| 123 monitor_bounds.bottom() - size.height())); | 123 monitor_bounds.bottom() - size.height())); |
| 124 // Adjust corner to now overflow the work area left and top edges, so | 124 // Adjust corner to now overflow the work area left and top edges, so |
| 125 // that if a popup does not fit the title-bar is remains visible. | 125 // that if a popup does not fit the title-bar is remains visible. |
| 126 corner = gfx::Point( | 126 corner = gfx::Point( |
| 127 std::max(corner.x(), limit.x()), | 127 std::max(corner.x(), limit.x()), |
| 128 std::max(corner.y(), limit.y())); | 128 std::max(corner.y(), limit.y())); |
| 129 } | 129 } |
| 130 return corner; | 130 return corner; |
| 131 } | 131 } |
| OLD | NEW |