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

Unified Diff: chrome/browser/ui/cocoa/website_settings/permission_bubble_anchor_delegate_views_cocoa.mm

Issue 1970113002: [diff] avoiding regressions for views permissions prompts in fullscreen (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20161112-MacViews-PermisisonBubble
Patch Set: Keep hasVisibleLocationBar for browser_tests Created 4 years, 7 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 | « no previous file | chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/website_settings/permission_bubble_anchor_delegate_views_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/website_settings/permission_bubble_anchor_delegate_views_cocoa.mm b/chrome/browser/ui/cocoa/website_settings/permission_bubble_anchor_delegate_views_cocoa.mm
index 80cab7aa94cf33fd0b58c418b929dd89eef6fc38..bf89ffb4d8ee540ff1e00330f5ebc2f5da6dff75 100644
--- a/chrome/browser/ui/cocoa/website_settings/permission_bubble_anchor_delegate_views_cocoa.mm
+++ b/chrome/browser/ui/cocoa/website_settings/permission_bubble_anchor_delegate_views_cocoa.mm
@@ -8,6 +8,7 @@
#include "chrome/browser/ui/browser_window.h"
#import "chrome/browser/ui/cocoa/browser_window_controller.h"
#import "chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.h"
+#import "chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.h"
#import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
#include "chrome/browser/ui/views/website_settings/permissions_bubble_view.h"
#import "ui/base/cocoa/cocoa_base_utils.h"
@@ -26,6 +27,7 @@ class PermissionBubbleAnchorDelegateViewsCocoa
// AnchorDelegate:
views::View* GetAnchorView() override;
gfx::Point GetAnchorPoint() override;
+ views::BubbleBorder::Arrow GetAnchorArrow() override;
private:
Browser* browser_;
@@ -42,18 +44,15 @@ views::View* PermissionBubbleAnchorDelegateViewsCocoa::GetAnchorView() {
}
gfx::Point PermissionBubbleAnchorDelegateViewsCocoa::GetAnchorPoint() {
- NSWindow* window = browser_->window()->GetNativeWindow();
- BrowserWindowController* controller =
- [BrowserWindowController browserWindowControllerForWindow:window];
- NSPoint point;
- if ([controller hasLocationBar]) {
- point = [controller locationBarBridge]->GetPageInfoBubblePoint();
- } else {
- NSRect frame = [[window contentView] frame];
- point = NSMakePoint(NSMidX(frame), NSMaxY(frame));
- }
return gfx::ScreenPointFromNSPoint(
- ui::ConvertPointFromWindowToScreen(window, point));
+ [PermissionBubbleController getAnchorPointForBrowser:browser_]);
+}
+
+views::BubbleBorder::Arrow
+PermissionBubbleAnchorDelegateViewsCocoa::GetAnchorArrow() {
+ return [PermissionBubbleController hasVisibleLocationBarForBrowser:browser_]
+ ? views::BubbleBorder::TOP_LEFT
+ : views::BubbleBorder::NONE;
}
} // namespace
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698