Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(258)

Unified Diff: chrome/browser/ui/window_sizer/window_sizer_win.cc

Issue 10836218: Remove BrowserList::GetLastActive calls from window_sizer.cc et al. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/window_sizer/window_sizer_mac.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/window_sizer/window_sizer_win.cc
diff --git a/chrome/browser/ui/window_sizer/window_sizer_win.cc b/chrome/browser/ui/window_sizer/window_sizer_win.cc
index 2a9b0b2c227ae14fb68e73aa197e6e33638d7e4c..6f18ac935e454364bec3048d1f7f54ebeac07522 100644
--- a/chrome/browser/ui/window_sizer/window_sizer_win.cc
+++ b/chrome/browser/ui/window_sizer/window_sizer_win.cc
@@ -5,27 +5,31 @@
#include "chrome/browser/ui/window_sizer/window_sizer.h"
#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/host_desktop.h"
// How much horizontal and vertical offset there is between newly
// opened windows.
const int WindowSizer::kWindowTilePixels = 10;
// static
-gfx::Point WindowSizer::GetDefaultPopupOrigin(const gfx::Size& size) {
+gfx::Point WindowSizer::GetDefaultPopupOrigin(const gfx::Size& size,
+ chrome::HostDesktopType type) {
RECT area;
SystemParametersInfo(SPI_GETWORKAREA, 0, &area, 0);
gfx::Point corner(area.left, area.top);
- if (Browser* b = BrowserList::GetLastActive()) {
- RECT browser;
- HWND window = reinterpret_cast<HWND>(b->window()->GetNativeWindow());
- if (GetWindowRect(window, &browser)) {
+ if (Browser* browser = browser::FindLastActiveWithHostDesktopType(type)) {
+ RECT browser_rect;
+ HWND window = reinterpret_cast<HWND>(browser->window()->GetNativeWindow());
+ if (GetWindowRect(window, &browser_rect)) {
// Limit to not overflow the work area right and bottom edges.
gfx::Point limit(
- std::min(browser.left + kWindowTilePixels, area.right-size.width()),
- std::min(browser.top + kWindowTilePixels, area.bottom-size.height())
+ std::min(browser_rect.left + kWindowTilePixels,
+ area.right-size.width()),
+ std::min(browser_rect.top + kWindowTilePixels,
+ area.bottom-size.height())
);
// Adjust corner to now overflow the work area left and top edges, so
// that if a popup does not fit the title-bar is remains visible.
« no previous file with comments | « chrome/browser/ui/window_sizer/window_sizer_mac.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698