From 5c03fe02699201911d37510b73597e40dba19286 Mon Sep 17 00:00:00 2001
From: scottmg <scottmg@chromium.org>
Date: Tue, 2 Feb 2016 17:27:24 -0800
Subject: Remove HostDesktopType from FindLastActive[WithProfile]
From chrome/browser/ui/browser_finder.h.
R=sky@chromium.org
BUG=558054
Review URL: https://codereview.chromium.org/1659203002
Cr-Commit-Position: refs/heads/master@{#373118}
---
chrome/browser/ui/window_sizer/window_sizer.h | 4 +---
chrome/browser/ui/window_sizer/window_sizer_aura.cc | 5 +----
chrome/browser/ui/window_sizer/window_sizer_mac.mm | 6 ++----
3 files changed, 4 insertions(+), 11 deletions(-)
(limited to 'chrome/browser/ui/window_sizer')
diff --git a/chrome/browser/ui/window_sizer/window_sizer.h b/chrome/browser/ui/window_sizer/window_sizer.h
index 5d74b00..8408392 100644
--- a/chrome/browser/ui/window_sizer/window_sizer.h
+++ b/chrome/browser/ui/window_sizer/window_sizer.h
@@ -7,7 +7,6 @@
#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
-#include "chrome/browser/ui/host_desktop.h"
#include "ui/base/ui_base_types.h"
#include "ui/gfx/geometry/rect.h"
@@ -108,8 +107,7 @@ class WindowSizer {
ui::WindowShowState* show_state);
// Returns the default origin for popups of the given size.
- static gfx::Point GetDefaultPopupOrigin(const gfx::Size& size,
- chrome::HostDesktopType type);
+ static gfx::Point GetDefaultPopupOrigin(const gfx::Size& size);
// How much horizontal and vertical offset there is between newly
// opened windows. This value may be different on each platform.
diff --git a/chrome/browser/ui/window_sizer/window_sizer_aura.cc b/chrome/browser/ui/window_sizer/window_sizer_aura.cc
index 358bd4b..0406ef5 100644
--- a/chrome/browser/ui/window_sizer/window_sizer_aura.cc
+++ b/chrome/browser/ui/window_sizer/window_sizer_aura.cc
@@ -4,15 +4,12 @@
#include "chrome/browser/ui/window_sizer/window_sizer.h"
-#include "chrome/browser/ui/host_desktop.h"
-
// This doesn't matter for aura, which has different tiling.
// static
const int WindowSizer::kWindowTilePixels = 10;
// static
-gfx::Point WindowSizer::GetDefaultPopupOrigin(const gfx::Size& size,
- chrome::HostDesktopType type) {
+gfx::Point WindowSizer::GetDefaultPopupOrigin(const gfx::Size& size) {
// TODO(skuhne): Check if this isn't needed anymore (since it is implemented
// in WindowPositioner) and remove it.
return gfx::Point();
diff --git a/chrome/browser/ui/window_sizer/window_sizer_mac.mm b/chrome/browser/ui/window_sizer/window_sizer_mac.mm
index 64d049f..0254641 100644
--- a/chrome/browser/ui/window_sizer/window_sizer_mac.mm
+++ b/chrome/browser/ui/window_sizer/window_sizer_mac.mm
@@ -9,20 +9,18 @@
#include "chrome/browser/ui/browser.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 = 22;
// static
-gfx::Point WindowSizer::GetDefaultPopupOrigin(const gfx::Size& size,
- chrome::HostDesktopType type) {
+gfx::Point WindowSizer::GetDefaultPopupOrigin(const gfx::Size& size) {
NSRect work_area = [[NSScreen mainScreen] visibleFrame];
NSRect main_area = [[[NSScreen screens] firstObject] frame];
NSPoint corner = NSMakePoint(NSMinX(work_area), NSMaxY(work_area));
- if (Browser* browser = chrome::FindLastActiveWithHostDesktopType(type)) {
+ if (Browser* browser = chrome::FindLastActive()) {
NSWindow* window = browser->window()->GetNativeWindow();
NSRect window_frame = [window frame];
--
cgit v1.1