Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(676)

Unified Diff: ui/views/widget/tooltip_manager_aura.cc

Issue 8888037: Windows component build fix for aura. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: addressed comments Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/views.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/tooltip_manager_aura.cc
diff --git a/ui/views/widget/tooltip_manager_aura.cc b/ui/views/widget/tooltip_manager_aura.cc
index cfc4c61b36e02bc43f043b96b8cc8587a2e1b6f6..cf873e5e9e638241d6903e9be30eed51e969b6ca 100644
--- a/ui/views/widget/tooltip_manager_aura.cc
+++ b/ui/views/widget/tooltip_manager_aura.cc
@@ -24,12 +24,15 @@ int TooltipManager::GetTooltipHeight() {
// static
gfx::Font TooltipManager::GetDefaultFont() {
- return aura::TooltipClient::GetDefaultFont();
+ return ui::ResourceBundle::GetSharedInstance().GetFont(
+ ui::ResourceBundle::BaseFont);
}
// static
int TooltipManager::GetMaxWidth(int x, int y) {
- return aura::TooltipClient::GetMaxWidth(x, y);
+ gfx::Rect monitor_bounds =
+ gfx::Screen::GetMonitorAreaNearestPoint(gfx::Point(x, y));
+ return (monitor_bounds.width() + 1) / 2;
}
////////////////////////////////////////////////////////////////////////////////
« no previous file with comments | « ui/views/views.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698