Position Mac permission bubbles on the left when in fullscreen.

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.h"
 
 #include <algorithm>
 
 #include "base/mac/bind_objc_block.h"
 #include "base/macros.h"
@@ skipping 47 matching lines @@
 const CGFloat kVerticalPermissionPadding = 2.0f;
 
 const CGFloat kHorizontalPadding = 13.0f;
 const CGFloat kVerticalPadding = 15.0f;
 const CGFloat kBetweenButtonsPadding = 10.0f;
 const CGFloat kButtonRightEdgePadding = 17.0f;
 const CGFloat kTitlePaddingX = 50.0f;
 const CGFloat kBubbleMinWidth = 315.0f;
 const NSSize kPermissionIconSize = {18, 18};
 
+const NSInteger kFullscreenLeftOffset = 40;
+
 }  // namespace
 
 // NSPopUpButton with a menu containing two items: allow and block.
 // One AllowBlockMenuButton is used for each requested permission when there are
 // multiple permissions in the bubble.
 @interface AllowBlockMenuButton : NSPopUpButton {
  @private
   std::unique_ptr<PermissionMenuModel> menuModel_;
   base::scoped_nsobject<MenuController> menuController_;
 }
@@ skipping 122 matching lines @@
 - (void)ok:(id)sender;
 
 // Called when the 'allow' button is pressed.
 - (void)onAllow:(id)sender;
 
 // Called when the 'block' button is pressed.
 - (void)onBlock:(id)sender;
 
 // Called when the 'close' button is pressed.
 - (void)onClose:(id)sender;
 

[tapted, 2016/08/12 04:25:39]

(j.e. here)

 // Sets the width of both |viewA| and |viewB| to be the larger of the
 // two views' widths.  Does not change either view's origin or height.
 + (CGFloat)matchWidthsOf:(NSView*)viewA andOf:(NSView*)viewB;
 
 // Sets the offset of |viewA| so that its vertical center is aligned with the
 // vertical center of |viewB|.
 + (void)alignCenterOf:(NSView*)viewA verticallyToCenterOf:(NSView*)viewB;
 
 @end
 
@@ skipping 28 matching lines @@
 }
 
 + (NSPoint)getAnchorPointForBrowser:(Browser*)browser {
   NSPoint anchor;
   NSWindow* parentWindow = browser->window()->GetNativeWindow();
   if ([PermissionBubbleController hasVisibleLocationBarForBrowser:browser]) {
     LocationBarViewMac* location_bar =
         [[parentWindow windowController] locationBarBridge];
     anchor = location_bar->GetPageInfoBubblePoint();
   } else {
-    // Center the bubble if there's no location bar.
+    // Position the bubble on the left of the screen if there is no page info
+    // button to point at.
     NSRect contentFrame = [[parentWindow contentView] frame];
-    anchor = NSMakePoint(NSMidX(contentFrame), NSMaxY(contentFrame));
+    anchor = NSMakePoint(NSMinX(contentFrame) + kFullscreenLeftOffset,
+                         NSMaxY(contentFrame));
   }
 
   return ui::ConvertPointFromWindowToScreen(parentWindow, anchor);
 }
 
 + (bool)hasVisibleLocationBarForBrowser:(Browser*)browser {
   if (!browser->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR))
     return false;
 
   if (!browser->exclusive_access_manager()->context()->IsFullscreen())
     return true;
 
   // If the browser is in browser-initiated full screen, a preference can cause
   // the toolbar to be hidden.
   if (browser->exclusive_access_manager()
           ->fullscreen_controller()
           ->IsFullscreenForBrowser()) {
     PrefService* prefs = browser->profile()->GetPrefs();
     bool show_toolbar = prefs->GetBoolean(prefs::kShowFullscreenToolbar);
     return show_toolbar;
   }
 
   // Otherwise this is fullscreen without a toolbar, so there is no visible
   // location bar.
   return false;
 }
 
++ (NSInteger)getFullscreenLeftOffset {

[tapted, 2016/08/12 04:25:39]

nit: move to after onClose

[benwells, 2016/08/12 06:29:44]

Done.

+  return kFullscreenLeftOffset;
+}
+
 - (void)windowWillClose:(NSNotification*)notification {
   [[NSNotificationCenter defaultCenter]
       removeObserver:self
                 name:NSWindowDidMoveNotification
               object:nil];
   bridge_->OnBubbleClosing();
   [super windowWillClose:notification];
 }
 
 - (void)parentWindowWillToggleFullScreen:(NSNotification*)notification {
@@ skipping 178 matching lines @@
 
 - (NSPoint)getExpectedAnchorPoint {
   return [PermissionBubbleController getAnchorPointForBrowser:browser_];
 }
 
 - (bool)hasVisibleLocationBar {
   return [PermissionBubbleController hasVisibleLocationBarForBrowser:browser_];
 }
 
 - (info_bubble::BubbleArrowLocation)getExpectedArrowLocation {
-  return [self hasVisibleLocationBar] ? info_bubble::kTopLeft
-                                      : info_bubble::kNoArrow;
+  return info_bubble::kTopLeft;
 }
 
 - (NSWindow*)getExpectedParentWindow {
   DCHECK(browser_->window());
   return browser_->window()->GetNativeWindow();
 }
 
 - (NSView*)labelForRequest:(PermissionRequest*)request {
   DCHECK(request);
   base::scoped_nsobject<NSView> permissionView(
@@ skipping 140 matching lines @@
 
 + (void)alignCenterOf:(NSView*)viewA verticallyToCenterOf:(NSView*)viewB {
   NSRect frameA = [viewA frame];
   NSRect frameB = [viewB frame];
   frameA.origin.y =
       NSMinY(frameB) + std::floor((NSHeight(frameB) - NSHeight(frameA)) / 2);
   [viewA setFrameOrigin:frameA.origin];
 }
 
 @end  // implementation PermissionBubbleController