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

chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm

 // Copyright (c) 2012 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/bookmarks/bookmark_bubble_controller.h"
 
 #include "base/mac/bundle_locations.h"
 #include "base/strings/sys_string_conversions.h"
+#include "chrome/browser/ui/bookmarks/bookmark_bubble_observer.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_finder.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_sync_promo_controller.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
 #include "chrome/browser/ui/sync/sync_promo_ui.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/bookmark_utils.h"
 #include "components/bookmarks/managed/managed_bookmark_service.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/user_metrics.h"
 #include "ui/base/l10n/l10n_util_mac.h"
+#import "ui/gfx/mac/coordinate_conversion.h"
 
 using base::UserMetricsAction;
 using bookmarks::BookmarkModel;
 using bookmarks::BookmarkNode;
 
+namespace {
+
+// Closes the BookmarkBubbleController when the toolkit-views bubble closes.
+class CocoaViewsBookmarkBubbleObserver
+    : public bookmarks::BookmarkBubbleObserver {
+ public:
+  explicit CocoaViewsBookmarkBubbleObserver(
+      BookmarkBubbleController* controller)
+      : controller_(controller) {}
+  ~CocoaViewsBookmarkBubbleObserver() override {}
+
+  // bookmarks::BookmarkBubbleObserver.
+  void OnBookmarkBubbleShown(const GURL& url) override {}
+  void OnBookmarkBubbleHidden() override { [controller_ close]; }
+
+ private:
+  BookmarkBubbleController* controller_;  // Weak, owns us.
+
+  DISALLOW_COPY_AND_ASSIGN(CocoaViewsBookmarkBubbleObserver);
+};
+
+}  // namespace
+
 // An object to represent the ChooseAnotherFolder item in the pop up.
 @interface ChooseAnotherFolder : NSObject
 @end
 
 @implementation ChooseAnotherFolder
 @end
 
 @interface BookmarkBubbleController (PrivateAPI)
 - (void)updateBookmarkNode;
 - (void)fillInFolderList;
@@ skipping 137 matching lines @@
   InfoBubbleView* bubble = self.bubble;
   [bubble setArrowLocation:info_bubble::kTopRight];
 
   // Insure decent positioning even in the absence of a browser controller,
   // which will occur for some unit tests.
   NSPoint arrowTip = bwc ? [bwc bookmarkBubblePoint] :
       NSMakePoint([window frame].size.width, [window frame].size.height);
   arrowTip = [parentWindow convertBaseToScreen:arrowTip];
   NSPoint bubbleArrowTip = [bubble arrowTip];
   bubbleArrowTip = [bubble convertPoint:bubbleArrowTip toView:nil];
-  arrowTip.y -= bubbleArrowTip.y;
-  arrowTip.x -= bubbleArrowTip.x;
-  [window setFrameOrigin:arrowTip];
+  [window setFrameOrigin:NSMakePoint(arrowTip.x - bubbleArrowTip.x,
+                                     arrowTip.y - bubbleArrowTip.y)];
 
   // Default is IDS_BOOKMARK_BUBBLE_PAGE_BOOKMARK; "Bookmark".
   // If adding for the 1st time the string becomes "Bookmark Added!"
   if (!alreadyBookmarked_) {
     NSString* title =
         l10n_util::GetNSString(IDS_BOOKMARK_BUBBLE_PAGE_BOOKMARKED);
     [bigTitle_ setStringValue:title];
   }
 
   [self fillInFolderList];
 
   // Ping me when things change out from under us.  Unlike a normal
   // dialog, the bookmark bubble's cancel: means "don't add this as a
   // bookmark", not "cancel editing".  We must take extra care to not
   // touch the bookmark in this selector.
   bookmarkObserver_.reset(
       new BookmarkModelObserverForCocoa(model_, ^(BOOL nodeWasDeleted) {
           // If a watched node was deleted, the pointer to the pulsing button
           // is likely stale.
           if (nodeWasDeleted)
             pulsingBookmarkNode_ = NULL;
           [self dismissWithoutEditing:nil];
       }));
   bookmarkObserver_->StartObservingNode(node_);
 
   // Pulse something interesting on the bookmark bar.
   [self startPulsingBookmarkButton:node_];
 
+  if (chrome::ToolkitViewsDialogsEnabled()) {
+    if (!bookmarkBubbleObserver_.get())
+      bookmarkBubbleObserver_.reset(new CocoaViewsBookmarkBubbleObserver(self));
+    chrome::ShowBookmarkBubbleViewsAtPoint(
+        gfx::ScreenPointFromNSPoint(arrowTip), [parentWindow contentView],
+        bookmarkBubbleObserver_.get(),
+        chrome::FindBrowserWithWindow(parentWindow), node_->url(),
+        alreadyBookmarked_);
+    return;
+  }
+
   [parentWindow addChildWindow:window ordered:NSWindowAbove];
   [window makeKeyAndOrderFront:self];
   [self registerKeyStateEventTap];
 }
 
 - (void)close {
   [[BrowserWindowController browserWindowControllerForWindow:self.parentWindow]
       releaseBarVisibilityForOwner:self withAnimation:YES delay:NO];
 
   [super close];
@@ skipping 176 matching lines @@
   NSInteger idx = [menu indexOfItemWithRepresentedObject:parentValue];
   DCHECK(idx != -1);
   [folderPopUpButton_ selectItemAtIndex:idx];
 }
 
 - (NSPopUpButton*)folderPopUpButton {
   return folderPopUpButton_;
 }
 
 @end  // implementation BookmarkBubbleController(ExposedForUnitTesting)