diff options
Diffstat (limited to 'chromium/ui/views/widget/tooltip_manager_win.cc')
| -rw-r--r-- | chromium/ui/views/widget/tooltip_manager_win.cc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/chromium/ui/views/widget/tooltip_manager_win.cc b/chromium/ui/views/widget/tooltip_manager_win.cc index fa0ad45d711..362ff33e886 100644 --- a/chromium/ui/views/widget/tooltip_manager_win.cc +++ b/chromium/ui/views/widget/tooltip_manager_win.cc @@ -16,11 +16,11 @@ #include "base/win/scoped_hdc.h" #include "base/win/scoped_select_object.h" #include "ui/base/l10n/l10n_util_win.h" -#include "ui/base/win/dpi.h" -#include "ui/base/win/hwnd_util.h" -#include "ui/base/win/scoped_set_map_mode.h" -#include "ui/gfx/font.h" +#include "ui/gfx/font_list.h" #include "ui/gfx/screen.h" +#include "ui/gfx/win/dpi.h" +#include "ui/gfx/win/hwnd_util.h" +#include "ui/gfx/win/scoped_set_map_mode.h" #include "ui/views/view.h" #include "ui/views/widget/monitor_win.h" #include "ui/views/widget/widget.h" @@ -52,11 +52,11 @@ static gfx::Font DetermineDefaultFont() { } // static -gfx::Font TooltipManager::GetDefaultFont() { - static gfx::Font* font = NULL; - if (!font) - font = new gfx::Font(DetermineDefaultFont()); - return *font; +const gfx::FontList& TooltipManager::GetDefaultFontList() { + static gfx::FontList* font_list = NULL; + if (!font_list) + font_list = new gfx::FontList(DetermineDefaultFont()); + return *font_list; } // static @@ -227,7 +227,7 @@ bool TooltipManagerWin::SetTooltipPosition(int text_x, int text_y) { // Calculate the bounds the tooltip will get. gfx::Point view_loc; View::ConvertPointToScreen(last_tooltip_view_, &view_loc); - view_loc = ui::win::DIPToScreenPoint(view_loc); + view_loc = gfx::win::DIPToScreenPoint(view_loc); RECT bounds = { view_loc.x() + text_x, view_loc.y() + text_y, view_loc.x() + text_x + tooltip_width_, @@ -257,7 +257,7 @@ int TooltipManagerWin::CalcTooltipHeight() { if (hfont != NULL) { base::win::ScopedGetDC dc(tooltip_hwnd_); base::win::ScopedSelectObject font(dc, hfont); - ui::ScopedSetMapMode mode(dc, MM_TEXT); + gfx::ScopedSetMapMode mode(dc, MM_TEXT); TEXTMETRIC font_metrics; GetTextMetrics(dc, &font_metrics); height = font_metrics.tmHeight; @@ -301,14 +301,14 @@ void TooltipManagerWin::UpdateTooltip(const gfx::Point& mouse_pos) { void TooltipManagerWin::OnMouse(UINT u_msg, WPARAM w_param, LPARAM l_param) { gfx::Point mouse_pos_in_pixels(l_param); - gfx::Point mouse_pos = ui::win::ScreenToDIPPoint(mouse_pos_in_pixels); + gfx::Point mouse_pos = gfx::win::ScreenToDIPPoint(mouse_pos_in_pixels); if (u_msg >= WM_NCMOUSEMOVE && u_msg <= WM_NCXBUTTONDBLCLK) { // NC message coordinates are in screen coordinates. POINT temp = mouse_pos_in_pixels.ToPOINT(); ::MapWindowPoints(HWND_DESKTOP, GetParent(), &temp, 1); mouse_pos_in_pixels.SetPoint(temp.x, temp.y); - mouse_pos = ui::win::ScreenToDIPPoint(mouse_pos_in_pixels); + mouse_pos = gfx::win::ScreenToDIPPoint(mouse_pos_in_pixels); } if (u_msg != WM_MOUSEMOVE || last_mouse_pos_ != mouse_pos) { |