[Mac] Enable MacViews site settings bubble behind --enable-mac-views-dialogs.

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

Index: chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm
diff --git a/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm b/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm
index 71bb2ff9c87f40baaf8fa6c48b04305783adc69c..8f7cba81e2caaac643d69277a84cb7941f21ba80 100644
--- a/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm
@@ -13,6 +13,7 @@
 #include "base/strings/sys_string_conversions.h"
 #import "chrome/browser/certificate_viewer.h"
 #include "chrome/browser/infobars/infobar_service.h"
+#include "chrome/browser/ui/browser_dialogs.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
@@ -35,6 +36,7 @@
 #import "ui/base/cocoa/flipped_view.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#import "ui/gfx/mac/coordinate_conversion.h"
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 
 namespace {
@@ -115,6 +117,22 @@ NSColor* IdentityVerifiedTextColor() {
                                    alpha:1.0];
 }
 
+// Takes in the parent window, which should be a BrowserWindow, and gets the
+// proper anchor point for the bubble. The returned point is in screen
+// coordinates.
+NSPoint AnchorPointForWindow(NSWindow* parent) {
+  BrowserWindowController* controller = [parent windowController];
+  NSPoint origin = NSZeroPoint;
+  if ([controller isKindOfClass:[BrowserWindowController class]]) {
+    LocationBarViewMac* location_bar = [controller locationBarBridge];
+    if (location_bar) {
+      NSPoint bubble_point = location_bar->GetPageInfoBubblePoint();
+      origin = [parent convertBaseToScreen:bubble_point];
+    }
+  }
+  return origin;
+}
+
 }  // namespace
 
 @interface WebsiteSettingsTabSegmentedCell : NSSegmentedCell {
@@ -764,29 +782,10 @@ NSColor* IdentityVerifiedTextColor() {
                   animate:[[self window] isVisible]];
 
   // Adjust the anchor for the bubble.
-  NSPoint anchorPoint =
-      [self anchorPointForWindowWithHeight:NSHeight(windowFrame)
-                              parentWindow:[self parentWindow]];
+  NSPoint anchorPoint = AnchorPointForWindow([self parentWindow]);
   [self setAnchorPoint:anchorPoint];

[tapted, 2015/08/11 01:23:19]

nit: might as well just call AnchorPointForWindow here and omit the anchorPoint
temporary

[jackhou1, 2015/08/11 03:09:23]

Done.

 }
 
-// Takes in the bubble's height and the parent window, which should be a
-// BrowserWindow, and gets the proper anchor point for the bubble. The returned
-// point is in screen coordinates.
-- (NSPoint)anchorPointForWindowWithHeight:(CGFloat)bubbleHeight
-                             parentWindow:(NSWindow*)parent {
-  BrowserWindowController* controller = [parent windowController];
-  NSPoint origin = NSZeroPoint;
-  if ([controller isKindOfClass:[BrowserWindowController class]]) {
-    LocationBarViewMac* locationBar = [controller locationBarBridge];
-    if (locationBar) {
-      NSPoint bubblePoint = locationBar->GetPageInfoBubblePoint();
-      origin = [parent convertBaseToScreen:bubblePoint];
-    }
-  }
-  return origin;
-}
-
 // Sets properties on the given |field| to act as the title or description
 // labels in the bubble.
 - (void)configureTextFieldAsLabel:(NSTextField*)textField {
@@ -1206,6 +1205,13 @@ void WebsiteSettingsUIBridge::Show(gfx::NativeWindow parent,
                                    content::WebContents* web_contents,
                                    const GURL& url,
                                    const content::SSLStatus& ssl) {
+  if (chrome::ToolkitViewsDialogsEnabled()) {
+    chrome::ShowWebsiteSettingsBubbleViewsAtPoint(
+        gfx::ScreenPointFromNSPoint(AnchorPointForWindow(parent)), profile,
+        web_contents, url, ssl);
+    return;
+  }
+
   bool is_internal_page = InternalChromePage(url);
 
   // Create the bridge. This will be owned by the bubble controller.