chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.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/website_settings/permission_bubble_controller.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/website_settings/chooser_bubble_ui_cocoa.mm ('k') | chrome/browser/ui/cocoa/website_settings/permission_bubble_controller_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm

diff --git a/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm b/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm

index fb8f3ddbcf5d387ddd420167fe8539e9bc9b6f34..ae493f97d3aca038f28c4fe7954a25613e224249 100644

--- a/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm

+++ b/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm

@@ -33,6 +33,7 @@

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

#include "grit/components_strings.h"

#include "skia/ext/skia_utils_mac.h"

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

#import "ui/base/cocoa/controls/hyperlink_text_view.h"

#import "ui/base/cocoa/menu_controller.h"

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

@@ -454,7 +455,8 @@ class MenuDelegate : public ui::SimpleMenuModel::Delegate {

anchor = NSMakePoint(NSMidX(contentFrame), NSMaxY(contentFrame));

}

- return [[self getExpectedParentWindow] convertBaseToScreen:anchor];

+ return ui::ConvertPointFromWindowToScreen([self getExpectedParentWindow],

+ anchor);

}

- (bool)hasLocationBar {