Commit dac71af9 authored by cbentzel@chromium.org's avatar cbentzel@chromium.org

Revert 116551 - Fix bug 62037: Task manager tooltips appear behind task...

Revert 116551 - Fix bug 62037: Task manager tooltips appear behind task manager if 'Always on Top' is checked.

The fix is to ensure the tooltip window is created with WS_EX_TOPMOST style.

BUG=62037
TEST=Manual test by launching task manager or panel and verifying tooltips appear in front.


Review URL: http://codereview.chromium.org/9030036

TBR=jianli@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9348025

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120804 0039d316-1c4b-4281-b951-d872f2087c98
parent 4c8484de
...@@ -2317,8 +2317,7 @@ void RenderWidgetHostViewWin::EnsureTooltip() { ...@@ -2317,8 +2317,7 @@ void RenderWidgetHostViewWin::EnsureTooltip() {
if (!::IsWindow(tooltip_hwnd_)) { if (!::IsWindow(tooltip_hwnd_)) {
message = TTM_ADDTOOL; message = TTM_ADDTOOL;
tooltip_hwnd_ = CreateWindowEx( tooltip_hwnd_ = CreateWindowEx(
WS_EX_TRANSPARENT | WS_EX_TOPMOST | WS_EX_TRANSPARENT | l10n_util::GetExtendedTooltipStyles(),
l10n_util::GetExtendedTooltipStyles(),
TOOLTIPS_CLASS, NULL, TTS_NOPREFIX, 0, 0, 0, 0, m_hWnd, NULL, TOOLTIPS_CLASS, NULL, TTS_NOPREFIX, 0, 0, 0, 0, m_hWnd, NULL,
NULL, NULL); NULL, NULL);
if (!tooltip_hwnd_) { if (!tooltip_hwnd_) {
......
// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
...@@ -90,7 +90,7 @@ bool TooltipManagerWin::Init() { ...@@ -90,7 +90,7 @@ bool TooltipManagerWin::Init() {
DCHECK(!tooltip_hwnd_); DCHECK(!tooltip_hwnd_);
// Create the tooltip control. // Create the tooltip control.
tooltip_hwnd_ = CreateWindowEx( tooltip_hwnd_ = CreateWindowEx(
WS_EX_TRANSPARENT | WS_EX_TOPMOST | l10n_util::GetExtendedTooltipStyles(), WS_EX_TRANSPARENT | l10n_util::GetExtendedTooltipStyles(),
TOOLTIPS_CLASS, NULL, TTS_NOPREFIX, 0, 0, 0, 0, TOOLTIPS_CLASS, NULL, TTS_NOPREFIX, 0, 0, 0, 0,
GetParent(), NULL, NULL, NULL); GetParent(), NULL, NULL, NULL);
if (!tooltip_hwnd_) if (!tooltip_hwnd_)
...@@ -333,7 +333,7 @@ void TooltipManagerWin::ShowKeyboardTooltip(View* focused_view) { ...@@ -333,7 +333,7 @@ void TooltipManagerWin::ShowKeyboardTooltip(View* focused_view) {
gfx::Point screen_point; gfx::Point screen_point;
focused_view->ConvertPointToScreen(focused_view, &screen_point); focused_view->ConvertPointToScreen(focused_view, &screen_point);
keyboard_tooltip_hwnd_ = CreateWindowEx( keyboard_tooltip_hwnd_ = CreateWindowEx(
WS_EX_TRANSPARENT | WS_EX_TOPMOST | l10n_util::GetExtendedTooltipStyles(), WS_EX_TRANSPARENT | l10n_util::GetExtendedTooltipStyles(),
TOOLTIPS_CLASS, NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL); TOOLTIPS_CLASS, NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL);
if (!keyboard_tooltip_hwnd_) if (!keyboard_tooltip_hwnd_)
return; return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment