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

chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc

 // 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.
 
 #include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h"
 
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
+#include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/bookmarks/bookmark_bubble_observer.h"
 #include "chrome/browser/ui/bookmarks/bookmark_editor.h"
+#include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/sync/sync_promo_ui.h"
-#include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view_observer.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_sync_promo_view.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/bookmark_utils.h"
 #include "content/public/browser/user_metrics.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/views/bubble/bubble_frame_view.h"
@@ skipping 30 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(UnsizedCombobox);
 };
 
 }  // namespace
 
 BookmarkBubbleView* BookmarkBubbleView::bookmark_bubble_ = NULL;
 
 // static
 void BookmarkBubbleView::ShowBubble(views::View* anchor_view,
-                                    BookmarkBubbleViewObserver* observer,
+                                    const gfx::Rect& anchor_rect,
+                                    gfx::NativeView parent_window,
+                                    bookmarks::BookmarkBubbleObserver* observer,
                                     scoped_ptr<BookmarkBubbleDelegate> delegate,
                                     Profile* profile,
                                     const GURL& url,
                                     bool newly_bookmarked) {
   if (bookmark_bubble_)
     return;
 
   bookmark_bubble_ = new BookmarkBubbleView(anchor_view,
                                             observer,
                                             delegate.Pass(),
                                             profile,
                                             url,
                                             newly_bookmarked);
+  if (!anchor_view) {
+    bookmark_bubble_->SetAnchorRect(anchor_rect);
+    bookmark_bubble_->set_parent_window(parent_window);
+  }
   views::BubbleDelegateView::CreateBubble(bookmark_bubble_)->Show();
   // Select the entire title textfield contents when the bubble is first shown.
   bookmark_bubble_->title_tf_->SelectAll(true);
   bookmark_bubble_->SetArrowPaintType(views::BubbleBorder::PAINT_NONE);
 
-  if (bookmark_bubble_->observer_)
-    bookmark_bubble_->observer_->OnBookmarkBubbleShown(url);
+  if (bookmark_bubble_->observer_) {
+    BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile);
+    const BookmarkNode* node = model->GetMostRecentlyAddedUserNodeForURL(url);
+    bookmark_bubble_->observer_->OnBookmarkBubbleShown(node);
+  }
 }
 
 void BookmarkBubbleView::Hide() {
   if (bookmark_bubble_)
     bookmark_bubble_->GetWidget()->Close();
 }
 
 BookmarkBubbleView::~BookmarkBubbleView() {
   if (apply_edits_) {
     ApplyEdits();
@@ skipping 160 matching lines @@
 const char* BookmarkBubbleView::GetClassName() const {
   return "BookmarkBubbleView";
 }
 
 views::View* BookmarkBubbleView::GetInitiallyFocusedView() {
   return title_tf_;
 }
 
 BookmarkBubbleView::BookmarkBubbleView(
     views::View* anchor_view,
-    BookmarkBubbleViewObserver* observer,
+    bookmarks::BookmarkBubbleObserver* observer,
     scoped_ptr<BookmarkBubbleDelegate> delegate,
     Profile* profile,
     const GURL& url,
     bool newly_bookmarked)
     : BubbleDelegateView(anchor_view, views::BubbleBorder::TOP_RIGHT),
       observer_(observer),
       delegate_(delegate.Pass()),
       profile_(profile),
       url_(url),
       newly_bookmarked_(newly_bookmarked),
@@ skipping 58 matching lines @@
     ShowEditor();
   } else {
     DCHECK_EQ(close_button_, sender);
     GetWidget()->Close();
   }
 }
 
 void BookmarkBubbleView::ShowEditor() {
   const BookmarkNode* node = BookmarkModelFactory::GetForProfile(
       profile_)->GetMostRecentlyAddedUserNodeForURL(url_);
-  views::Widget* parent = anchor_widget();
-  DCHECK(parent);
+  gfx::NativeWindow native_window =
+      anchor_widget() ? anchor_widget()->GetNativeWindow()
+                      : platform_util::GetTopLevel(parent_window());
+  DCHECK(native_window);
 
   Profile* profile = profile_;
   ApplyEdits();
   GetWidget()->Close();
 
-  if (node && parent)
-    BookmarkEditor::Show(parent->GetNativeWindow(), profile,
-                         BookmarkEditor::EditDetails::EditNode(node),
-                         BookmarkEditor::SHOW_TREE);
+  if (node && native_window)
+    chrome::ShowBookmarkEditorViews(native_window, profile,

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

leave this as BookmarkEditor::Show?

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

Done.

+                                    BookmarkEditor::EditDetails::EditNode(node),
+                                    BookmarkEditor::SHOW_TREE);
 }
 
 void BookmarkBubbleView::ApplyEdits() {
   // Set this to make sure we don't attempt to apply edits again.
   apply_edits_ = false;
 
   BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile_);
   const BookmarkNode* node = model->GetMostRecentlyAddedUserNodeForURL(url_);
   if (node) {
     const base::string16 new_title = title_tf_->text();
     if (new_title != node->GetTitle()) {
       model->SetTitle(node, new_title);
       content::RecordAction(
           UserMetricsAction("BookmarkBubble_ChangeTitleInBubble"));
     }
     parent_model_.MaybeChangeParent(node, parent_combobox_->selected_index());
   }
 }