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

chrome/browser/ui/cocoa/browser_window_controller.mm

 // Copyright 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/browser_window_controller.h"
 
 #include <cmath>
 #include <numeric>
 
 #include "base/command_line.h"
@@ skipping 12 matching lines @@
 #include "chrome/browser/extensions/extension_commands_global_registry.h"
 #include "chrome/browser/fullscreen.h"
 #include "chrome/browser/profiles/avatar_menu.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/translate/chrome_translate_client.h"
+#include "chrome/browser/ui/bookmarks/bookmark_bubble_observer.h"
 #include "chrome/browser/ui/bookmarks/bookmark_editor.h"
 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_command_controller.h"
 #include "chrome/browser/ui/browser_commands.h"
+#include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_instant_controller.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window_state.h"
 #import "chrome/browser/ui/cocoa/background_gradient_view.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h"
 #import "chrome/browser/ui/cocoa/browser_window_cocoa.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h"
 #import "chrome/browser/ui/cocoa/browser_window_layout.h"
 #import "chrome/browser/ui/cocoa/browser_window_utils.h"
@@ skipping 40 matching lines @@
 #include "components/translate/core/browser/translate_manager.h"
 #include "components/translate/core/browser/translate_ui_delegate.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #import "ui/base/cocoa/cocoa_base_utils.h"
 #import "ui/base/cocoa/nsview_additions.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
+#import "ui/gfx/mac/coordinate_conversion.h"
 #include "ui/gfx/mac/scoped_cocoa_disable_screen_updates.h"
 
 using bookmarks::BookmarkModel;
 using bookmarks::BookmarkNode;
 using l10n_util::GetStringUTF16;
 using l10n_util::GetNSStringWithFixup;
 using l10n_util::GetNSStringFWithFixup;
 
 // ORGANIZATION: This is a big file. It is (in principle) organized as follows
 // (in order):
@@ skipping 67 matching lines @@
 // set a flag, and constrain any resize by the allowed amounts. On further
 // shrinks, we check the flag (since the size/position of the window will no
 // longer indicate that the window is shrinking from an apparent zoomed state)
 // and if it's set we continue to constrain the resize.
 
 using content::OpenURLParams;
 using content::Referrer;
 using content::RenderWidgetHostView;
 using content::WebContents;
 
+@interface BrowserWindowController ()
+// Declared for ViewsBookmarkBubbleObserver.
+- (void)viewsBookmarkBubbleClosed;
+@end
+
+namespace {
+
+// Manages toolbar visibility locking and bookmark button pulsing.
+class ViewsBookmarkBubbleObserver : public bookmarks::BookmarkBubbleObserver {

[tapted, 2015/08/21 07:19:18]

This doesn't feel right in this file, but I haven't come up with something
better yet.

One possibility might be to have the startPulsingBookmarkNode calls being done
in *Cocoa's* BookmarkBubbleController also use this observer interface (i.e.
they do FOR_EACH_OBSERVER instead). Then this Observer interface isn't
views-specfiic, and there is only one caller of start/stop pulsing.

Whatever is calling lockBarVisibility on Cocoa should somehow get looped in too.

And, either way, I think this class is complex enough to move to it's own file,
even if that means exposing some methods publicly

[jackhou1, 2015/08/24 08:22:04]

I decided to pull all the non-Views parts out to another CL:
https://codereview.chromium.org/1308293002/

+ public:
+  explicit ViewsBookmarkBubbleObserver(BrowserWindowController* controller)
+      : controller_(controller), lockOwner_([[NSObject alloc] init]) {}
+  ~ViewsBookmarkBubbleObserver() override {}
+
+  // bookmarks::BookmarkBubbleObserver.
+  void OnBookmarkBubbleShown(const BookmarkNode* node) override {
+    [controller_ lockBarVisibilityForOwner:lockOwner_
+                             withAnimation:NO
+                                     delay:NO];
+    pulsingBookmarkNode_ =
+        [[controller_ bookmarkBarController] startPulsingBookmarkNode:node];
+  }
+
+  void OnBookmarkBubbleHidden() override {
+    [controller_ releaseBarVisibilityForOwner:lockOwner_
+                                withAnimation:YES
+                                        delay:NO];
+    [[controller_ bookmarkBarController]
+        stopPulsingBookmarkNode:pulsingBookmarkNode_];
+    pulsingBookmarkNode_ = nullptr;
+    [controller_ viewsBookmarkBubbleClosed];
+  }
+
+ private:
+  BrowserWindowController* controller_;  // Weak, owns us.
+  const BookmarkNode* pulsingBookmarkNode_ = nullptr;
+  base::scoped_nsobject<NSObject> lockOwner_;
+
+  DISALLOW_COPY_AND_ASSIGN(ViewsBookmarkBubbleObserver);
+};
+
+}  // namespace
+
 @interface NSWindow (NSPrivateApis)
 // Note: These functions are private, use -[NSObject respondsToSelector:]
 // before calling them.
 
 - (void)setBottomCornerRounded:(BOOL)rounded;
 
 - (NSRect)_growBoxRect;
 
 @end
 
@@ skipping 1564 matching lines @@
                                          alignment:alignment];
 }
 
 - (NSPoint)bookmarkBubblePoint {
   return [toolbarController_ bookmarkBubblePoint];
 }
 
 // Show the bookmark bubble (e.g. user just clicked on the STAR).
 - (void)showBookmarkBubbleForURL:(const GURL&)url
                alreadyBookmarked:(BOOL)alreadyMarked {
+  if (chrome::ToolkitViewsDialogsEnabled()) {
+    if (viewsBookmarkBubbleObserver_.get())
+      return;
+
+    viewsBookmarkBubbleObserver_.reset(new ViewsBookmarkBubbleObserver(self));
+    chrome::ShowBookmarkBubbleViewsAtPoint(
+        gfx::ScreenPointFromNSPoint(
+            [[self window] convertBaseToScreen:[self bookmarkBubblePoint]]),
+        [[self window] contentView], viewsBookmarkBubbleObserver_.get(),
+        browser_.get(), url, alreadyMarked);
+    return;

[tapted, 2015/08/21 07:19:18]

DCHECK(viewsBookmarkBubbleObserver_) ?

[jackhou1, 2015/08/24 08:22:04]

Done. Is this to ensure it's not closed immediately?.

[tapted, 2015/08/25 03:10:16]

oops - missed a question. I guess that's part of it... Although TBH I didn't
really notice that the observer is being set just above, so the DCHECK is maybe
unnecessary - up to you if you want to keep it.

The point of having it is just to "bracket" the early exit case. That is, the
DCHECK basically adds the assertion "viewsBookmarkBubbleObserver_ is always
non-null when this method returns" -- this is clear for the early exit, and the
DCHECK does something similar for the later exit.

+  }
+
   if (!bookmarkBubbleController_) {
     BookmarkModel* model =
         BookmarkModelFactory::GetForProfile(browser_->profile());
     bookmarks::ManagedBookmarkService* managed =
         ManagedBookmarkServiceFactory::GetForProfile(browser_->profile());
     const BookmarkNode* node = model->GetMostRecentlyAddedUserNodeForURL(url);
     bookmarkBubbleController_ =
         [[BookmarkBubbleController alloc] initWithParentWindow:[self window]
                                                        managed:managed
                                                          model:model
@@ skipping 12 matching lines @@
 - (void)bookmarkBubbleWindowWillClose:(NSNotification*)notification {
   DCHECK_EQ([notification object], [bookmarkBubbleController_ window]);
 
   NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
   [center removeObserver:self
                     name:NSWindowWillCloseNotification
                   object:[bookmarkBubbleController_ window]];
   bookmarkBubbleController_ = nil;
 }
 
+- (void)viewsBookmarkBubbleClosed {
+  viewsBookmarkBubbleObserver_.reset();
+}
+
 // Handle the editBookmarkNode: action sent from bookmark bubble controllers.
 - (void)editBookmarkNode:(id)sender {
   BOOL responds = [sender respondsToSelector:@selector(node)];
   DCHECK(responds);
   if (responds) {
     const BookmarkNode* node = [sender node];
     if (node)
       BookmarkEditor::Show([self window], browser_->profile(),
           BookmarkEditor::EditDetails::EditNode(node),
           BookmarkEditor::SHOW_TREE);
@@ skipping 456 matching lines @@
 
 - (BOOL)supportsBookmarkBar {
   return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
 }
 
 - (BOOL)isTabbedWindow {
   return browser_->is_type_tabbed();
 }
 
 @end  // @implementation BrowserWindowController(WindowType)