ui/views/cocoa/bridged_content_view.mm - Issue 1777653002: Prepare ui/ module for compilation with OS X 10.7 deployment target.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/views/cocoa/bridged_content_view.mm

Issue 1777653002: Prepare ui/ module for compilation with OS X 10.7 deployment target. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: More compile errors. Created 4 years, 9 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/cocoa/bridged_content_view.mm

diff --git a/ui/views/cocoa/bridged_content_view.mm b/ui/views/cocoa/bridged_content_view.mm

index e2cd30e2137ec183aa2d7a04047ca1c5abf70bd7..88a5b84de02afe7f709d6c19cc343db02f248143 100644

--- a/ui/views/cocoa/bridged_content_view.mm

+++ b/ui/views/cocoa/bridged_content_view.mm

@@ -9,6 +9,7 @@

#import "base/mac/scoped_nsobject.h"

#include "base/strings/sys_string_conversions.h"

#include "skia/ext/skia_utils_mac.h"

+#include "ui/base/cocoa/cocoa_base_utils.h"

#include "ui/base/ime/input_method.h"

#include "ui/base/ime/text_input_client.h"

#include "ui/compositor/canvas_painter.h"

@@ -50,10 +51,11 @@ gfx::Point MovePointToWindow(const NSPoint& point,

NSWindow* source_window,

NSWindow* target_window) {

NSPoint point_in_screen = source_window

- ? [source_window convertBaseToScreen:point]

+ ? ui::ConvertPointFromWindowToScreen(source_window, point)

: point;

- NSPoint point_in_window = [target_window convertScreenToBase:point_in_screen];

+ NSPoint point_in_window =

+ ui::ConvertPointFromScreenToWindow(target_window, point_in_screen);

NSRect content_rect =

[target_window contentRectForFrameRect:[target_window frame]];

return gfx::Point(point_in_window.x,

« no previous file with comments | « ui/snapshot/snapshot_mac.mm ('k') | ui/views/cocoa/tooltip_manager_mac.mm » ('j') | no next file with comments »