summaryrefslogtreecommitdiffstats
path: root/ui/views/widget
diff options
context:
space:
mode:
authorcbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-07 19:26:10 +0000
committercbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-07 19:26:10 +0000
commitdac71af9122949f4eed56b65217d2bce4821a09d (patch)
treea02bdf7d9ad206aa4ae0c67ba649e5b6f576a0da /ui/views/widget
parent4c8484ded6ca6c4cb45a62aba188f8771493156b (diff)
downloadchromium_src-dac71af9122949f4eed56b65217d2bce4821a09d.zip
chromium_src-dac71af9122949f4eed56b65217d2bce4821a09d.tar.gz
chromium_src-dac71af9122949f4eed56b65217d2bce4821a09d.tar.bz2
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
Diffstat (limited to 'ui/views/widget')
-rw-r--r--ui/views/widget/tooltip_manager_win.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/views/widget/tooltip_manager_win.cc b/ui/views/widget/tooltip_manager_win.cc
index a04e032e..f03d858 100644
--- a/ui/views/widget/tooltip_manager_win.cc
+++ b/ui/views/widget/tooltip_manager_win.cc
@@ -1,4 +1,4 @@
-// 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
// found in the LICENSE file.
@@ -90,7 +90,7 @@ bool TooltipManagerWin::Init() {
DCHECK(!tooltip_hwnd_);
// Create the tooltip control.
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,
GetParent(), NULL, NULL, NULL);
if (!tooltip_hwnd_)
@@ -333,7 +333,7 @@ void TooltipManagerWin::ShowKeyboardTooltip(View* focused_view) {
gfx::Point screen_point;
focused_view->ConvertPointToScreen(focused_view, &screen_point);
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);
if (!keyboard_tooltip_hwnd_)
return;