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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 "chrome/browser/ui/browser.h" 7 #include "chrome/browser/ui/browser.h"
8 #include "chrome/browser/ui/browser_list.h" 8 #include "chrome/browser/ui/browser_finder.h"
9 #include "chrome/browser/ui/browser_window.h" 9 #include "chrome/browser/ui/browser_window.h"
10 #include "chrome/browser/ui/host_desktop.h"
10 11
11 // How much horizontal and vertical offset there is between newly 12 // How much horizontal and vertical offset there is between newly
12 // opened windows. 13 // opened windows.
13 const int WindowSizer::kWindowTilePixels = 10; 14 const int WindowSizer::kWindowTilePixels = 10;
14 15
15 // static 16 // static
16 gfx::Point WindowSizer::GetDefaultPopupOrigin(const gfx::Size& size) { 17 gfx::Point WindowSizer::GetDefaultPopupOrigin(const gfx::Size& size,
18 chrome::HostDesktopType type) {
17 RECT area; 19 RECT area;
18 SystemParametersInfo(SPI_GETWORKAREA, 0, &area, 0); 20 SystemParametersInfo(SPI_GETWORKAREA, 0, &area, 0);
19 gfx::Point corner(area.left, area.top); 21 gfx::Point corner(area.left, area.top);
20 22
21 if (Browser* b = BrowserList::GetLastActive()) { 23 if (Browser* b = browser::FindLastActiveWithHostDesktopType(type)) {
MAD 2012/08/13 21:25:10 b -> browser
robertshield 2012/08/13 21:37:41 Done.
22 RECT browser; 24 RECT browser;
23 HWND window = reinterpret_cast<HWND>(b->window()->GetNativeWindow()); 25 HWND window = reinterpret_cast<HWND>(b->window()->GetNativeWindow());
24 if (GetWindowRect(window, &browser)) { 26 if (GetWindowRect(window, &browser)) {
25 // Limit to not overflow the work area right and bottom edges. 27 // Limit to not overflow the work area right and bottom edges.
26 gfx::Point limit( 28 gfx::Point limit(
27 std::min(browser.left + kWindowTilePixels, area.right-size.width()), 29 std::min(browser.left + kWindowTilePixels, area.right-size.width()),
28 std::min(browser.top + kWindowTilePixels, area.bottom-size.height()) 30 std::min(browser.top + kWindowTilePixels, area.bottom-size.height())
29 ); 31 );
30 // Adjust corner to now overflow the work area left and top edges, so 32 // Adjust corner to now overflow the work area left and top edges, so
31 // that if a popup does not fit the title-bar is remains visible. 33 // that if a popup does not fit the title-bar is remains visible.
32 corner = gfx::Point( 34 corner = gfx::Point(
33 std::max(corner.x(), limit.x()), 35 std::max(corner.x(), limit.x()),
34 std::max(corner.y(), limit.y()) 36 std::max(corner.y(), limit.y())
35 ); 37 );
36 } 38 }
37 } 39 }
38 return corner; 40 return corner;
39 } 41 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698