summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/frame
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-26 19:41:55 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-26 19:41:55 +0000
commit77100057597b3c7ccf8d284979b3de88e6a93365 (patch)
treebe5cb2346a02da5ae33c6589f8c1516614b06ccc /chrome/browser/views/frame
parent16e1cb0d2b0106b6aa6008581dac19d7db9283a6 (diff)
downloadchromium_src-77100057597b3c7ccf8d284979b3de88e6a93365.zip
chromium_src-77100057597b3c7ccf8d284979b3de88e6a93365.tar.gz
chromium_src-77100057597b3c7ccf8d284979b3de88e6a93365.tar.bz2
Makes it so windows opened from links in Windows Live Messenger cause the window to appear instead of being invisible.
The discovery is that Windows enforces that you call ShowWindow with the value of STARTUPINFO's wShowWindow field first before calling it with any other value, otherwise all subsequent calls are ignored. I used to have code that flattened the return value of a function into something that would ensure the window is visible, but what I actually needed to do was show the window twice in this case. Ick. http://crbug.com/3126 TEST=Have someone send you a link in a Windows Live Messenger window, click it without Chrome running (Chrome must be default browser), and a Chrome window should appear, visible, loading the link. Also try running chrome.exe from bash to make sure that still works. Review URL: http://codereview.chromium.org/27190 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10502 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/frame')
-rw-r--r--chrome/browser/views/frame/browser_view.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index e7b36b8..b1dec82 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -236,9 +236,7 @@ int BrowserView::GetShowState() const {
si.cb = sizeof(si);
si.dwFlags = STARTF_USESHOWWINDOW;
GetStartupInfo(&si);
- // When launched from bash, for some reason si.wShowWindow is set to SW_HIDE,
- // so we need to correct that condition.
- return si.wShowWindow == SW_HIDE ? SW_SHOWNORMAL : si.wShowWindow;
+ return si.wShowWindow;
}
void BrowserView::WindowMoved() {