From 02b7bd18c3919cbdb39a4e31d307949d8c86528b Mon Sep 17 00:00:00 2001
From: "ben@chromium.org"
 <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 9 Oct 2008 17:03:59 +0000
Subject: Re-land this earlier change. Will deal with dist crashes as they
 arise.

Make sure the frame is set to the foreground when:

- opening from a shortcut when an existing frame is already open
- pressing Ctrl+T from an app window

http://crbug.com/2477

R=jcampan


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3103 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/views/window.cc | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'chrome/views')

diff --git a/chrome/views/window.cc b/chrome/views/window.cc
index 93cb9fe..685545b 100644
--- a/chrome/views/window.cc
+++ b/chrome/views/window.cc
@@ -90,7 +90,10 @@ void Window::Show() {
 }
 
 void Window::Activate() {
+  if (IsMinimized())
+    ::ShowWindow(GetHWND(), SW_RESTORE);
   ::SetWindowPos(GetHWND(), HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE);
+  SetForegroundWindow(GetHWND());
 }
 
 void Window::SetBounds(const gfx::Rect& bounds) {
-- 
cgit v1.1