chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm - Issue 1775223002: Prepare chrome/ 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: chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm

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

Patch Set: Compile errors. Fix null-window error. 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

« no previous file with comments | « chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_unittest.mm ('k') | chrome/browser/ui/cocoa/location_bar/zoom_decoration.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm

diff --git a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm

index e737e90555ef2c49f8293024f537b00831771e01..2541cc00cab53ac25f0ec47240de3d6e71ea991d 100644

--- a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm

+++ b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm

@@ -22,6 +22,7 @@

#include "content/public/browser/web_contents.h"

#include "grit/theme_resources.h"

#include "ui/base/cocoa/appkit_utils.h"

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

#include "ui/base/l10n/l10n_util.h"

#include "ui/gfx/image/image.h"

#include "ui/gfx/mac/coordinate_conversion.h"

@@ -268,7 +269,7 @@ bool ContentSettingDecoration::OnMousePressed(NSRect frame, NSPoint location) {

AutocompleteTextField* field = owner_->GetAutocompleteTextField();

NSPoint anchor = GetBubblePointInFrame(frame);

anchor = [field convertPoint:anchor toView:nil];

- anchor = [[field window] convertBaseToScreen:anchor];

+ anchor = ui::ConvertPointFromWindowToScreen([field window], anchor);

// Open bubble.

ContentSettingBubbleModel* model =