summaryrefslogtreecommitdiffstats
path: root/views
diff options
context:
space:
mode:
authorjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-21 16:25:15 +0000
committerjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-21 16:25:15 +0000
commit620d0a205bb8c59551afef4521a9c2bccedcf5c7 (patch)
tree4bab642d25c3d0094a2abc17e2bb376865d77d45 /views
parent9e764024c5bf71994561c278bf7260790d47c880 (diff)
downloadchromium_src-620d0a205bb8c59551afef4521a9c2bccedcf5c7.zip
chromium_src-620d0a205bb8c59551afef4521a9c2bccedcf5c7.tar.gz
chromium_src-620d0a205bb8c59551afef4521a9c2bccedcf5c7.tar.bz2
When opening Chrome maximized with an application window already
running, the Chrome window was not activated. BUG=19373 TEST=See bug Review URL: http://codereview.chromium.org/308008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29654 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
-rw-r--r--views/window/window_win.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/views/window/window_win.cc b/views/window/window_win.cc
index 4daa279..98c4aa7 100644
--- a/views/window/window_win.cc
+++ b/views/window/window_win.cc
@@ -150,7 +150,7 @@ void WindowWin::Show(int show_state) {
// that should activate, because if we're opened from a desktop shortcut while
// an existing window is already running it doesn't seem to be enough to use
// one of these flags to activate the window.
- if (show_state == SW_SHOWNORMAL)
+ if (show_state == SW_SHOWNORMAL || show_state == SW_SHOWMAXIMIZED)
Activate();
SetInitialFocus();