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

Unified Diff: chrome/browser/tab_contents/tab_contents_view_mac.mm

Issue 8491062: Fixes GetContainerBounds in tab_contents_view_mac.mm (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: changes as requested Created 9 years, 1 month 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 | « no previous file | content/browser/tab_contents/tab_contents_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/tab_contents/tab_contents_view_mac.mm
diff --git a/chrome/browser/tab_contents/tab_contents_view_mac.mm b/chrome/browser/tab_contents/tab_contents_view_mac.mm
index ba507b43798dea14c36b4bc2da7ffdf24f57a1cd..3c610090ce07e8f37bfc476a10ffe4672a6aa14b 100644
--- a/chrome/browser/tab_contents/tab_contents_view_mac.mm
+++ b/chrome/browser/tab_contents/tab_contents_view_mac.mm
@@ -145,7 +145,19 @@ gfx::NativeWindow TabContentsViewMac::GetTopLevelNativeWindow() const {
}
void TabContentsViewMac::GetContainerBounds(gfx::Rect* out) const {
- *out = [cocoa_view_.get() flipNSRectToRect:[cocoa_view_.get() bounds]];
+ // Convert bounds to window coordinate space.
+ NSRect bounds =
+ [cocoa_view_.get() convertRect:[cocoa_view_.get() bounds] toView:nil];
+
+ // Convert bounds to screen coordinate space.
+ NSWindow* window = [cocoa_view_.get() window];
+ bounds.origin = [window convertBaseToScreen:bounds.origin];
+
+ // Flip y to account for screen flip.
+ NSScreen* screen = [[NSScreen screens] objectAtIndex:0];
+ bounds.origin.y = [screen frame].size.height - bounds.origin.y
+ - bounds.size.height;
+ *out = gfx::Rect(NSRectToCGRect(bounds));
}
void TabContentsViewMac::StartDragging(
« no previous file with comments | « no previous file | content/browser/tab_contents/tab_contents_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698