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

Unified Diff: ui/views/controls/button/custom_button.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: tidy 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
Index: ui/views/controls/button/custom_button.cc
diff --git a/ui/views/controls/button/custom_button.cc b/ui/views/controls/button/custom_button.cc
index 28d570ca325dbd5899da9728f7df0f1f635b05d4..9c308a0ff4b8d805f7bfdb4c5111c51c860d5402 100644
--- a/ui/views/controls/button/custom_button.cc
+++ b/ui/views/controls/button/custom_button.cc
@@ -72,7 +72,8 @@ bool CustomButton::IsMouseHovered() const {
if (!GetWidget())
return false;
- gfx::Point cursor_pos(gfx::Screen::GetCursorScreenPoint());
+ gfx::Point cursor_pos(gfx::Screen::GetCursorScreenPoint(
+ gfx::Screen::BadTwoWorldsContext()));
ConvertPointToTarget(NULL, this, &cursor_pos);
return HitTestPoint(cursor_pos);
}

Powered by Google App Engine
This is Rietveld 408576698