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

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

Issue 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix new addition Created 8 years, 2 months 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/widget/tooltip_manager.h ('k') | ui/views/widget/tooltip_manager_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/tooltip_manager.cc
diff --git a/ui/views/widget/tooltip_manager.cc b/ui/views/widget/tooltip_manager.cc
index 564757532bd7a8b765f333bb4aa466782dd9cc38..afd6866d4ac9d5d2edd2a1bbdbdc9896a8127f42 100644
--- a/ui/views/widget/tooltip_manager.cc
+++ b/ui/views/widget/tooltip_manager.cc
@@ -27,7 +27,8 @@ void TooltipManager::TrimTooltipToFit(string16* text,
int* max_width,
int* line_count,
int x,
- int y) {
+ int y,
+ gfx::NativeView context) {
*max_width = 0;
*line_count = 0;
@@ -37,7 +38,7 @@ void TooltipManager::TrimTooltipToFit(string16* text,
*text = text->substr(0, kMaxTooltipLength);
// Determine the available width for the tooltip.
- int available_width = GetMaxWidth(x, y);
+ int available_width = GetMaxWidth(x, y, context);
// Split the string into at most kMaxLines lines.
std::vector<string16> lines;
« no previous file with comments | « ui/views/widget/tooltip_manager.h ('k') | ui/views/widget/tooltip_manager_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698