summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-09 17:03:59 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-09 17:03:59 +0000
commit02b7bd18c3919cbdb39a4e31d307949d8c86528b (patch)
tree29c323a7dd5acfad5621830f5ba0122eb9b065c3
parentd1db6fb15fdb8ae49a105965a3cff698b6e354c4 (diff)
downloadchromium_src-02b7bd18c3919cbdb39a4e31d307949d8c86528b.zip
chromium_src-02b7bd18c3919cbdb39a4e31d307949d8c86528b.tar.gz
chromium_src-02b7bd18c3919cbdb39a4e31d307949d8c86528b.tar.bz2
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
-rw-r--r--chrome/views/window.cc3
1 files changed, 3 insertions, 0 deletions
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) {