MacViews: Allows the toolkit-views Manage Passwords Dialog to be used

chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc

 // Copyright 2013 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/passwords/manage_passwords_bubble_view.h"
 
 #include "base/macros.h"
 #include "base/metrics/user_metrics.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/timer/timer.h"
+#include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
+#include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
 #include "chrome/browser/ui/passwords/password_dialog_prompts.h"
 #include "chrome/browser/ui/passwords/passwords_model_delegate.h"
-#include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
 #include "chrome/browser/ui/views/passwords/credentials_item_view.h"
 #include "chrome/browser/ui/views/passwords/credentials_selection_view.h"
 #include "chrome/browser/ui/views/passwords/manage_password_items_view.h"
 #include "chrome/browser/ui/views/passwords/manage_passwords_icon_views.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/strings/grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/base/ui_features.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/controls/button/blue_button.h"
 #include "ui/views/controls/button/md_text_button.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/link_listener.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/controls/styled_label.h"
 #include "ui/views/controls/styled_label_listener.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 
+#if !defined(OS_MACOSX) || BUILDFLAG(MAC_VIEWS_BROWSER)
+#include "chrome/browser/ui/views/frame/browser_view.h"
+#endif
+
 #if defined(OS_WIN)
 #include "chrome/browser/ui/views/desktop_ios_promotion/desktop_ios_promotion_bubble_view.h"
 #endif
 
 int ManagePasswordsBubbleView::auto_signin_toast_timeout_ = 3;
 
 // Helpers --------------------------------------------------------------------
 
 namespace {
 
@@ skipping 176 matching lines @@
                                  form.username_value),
       kButtonHoverColor, &form,
       parent_->model()->GetProfile()->GetRequestContext());
   credential->SetEnabled(false);
   AddChildView(credential);
 
   // Setup the observer and maybe start the timer.
   Browser* browser =
       chrome::FindBrowserWithWebContents(parent_->web_contents());
   DCHECK(browser);
+
+// On MacOS the BrowserView should but does not yet exist. Auto-close of the
+// auto-sign-in dialog is not implemented for a Cocoa browser when a bubble is
+// shown in a non-active browser window.

[tapted, 2017/04/19 03:31:06]

perhaps add "This matches the behaviour on Mac when using a Cocoa bubble."

(looking for words that don't suggest we may be regressing this behaviour by
switching to Views bubbles)

[varkha, 2017/04/19 08:34:17]

Done.

+// See http://crbug.com/468281.
+#if !defined(OS_MACOSX) || BUILDFLAG(MAC_VIEWS_BROWSER)
   BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser);
   observed_browser_.Add(browser_view->GetWidget());
-
-  if (browser_view->IsActive())
+#endif
+  if (browser->window()->IsActive())
     timer_.Start(FROM_HERE, GetTimeout(), this, &AutoSigninView::OnTimer);
 }
 
 void ManagePasswordsBubbleView::AutoSigninView::ButtonPressed(
     views::Button* sender, const ui::Event& event) {
   NOTREACHED();
 }
 
 void ManagePasswordsBubbleView::AutoSigninView::OnWidgetActivationChanged(
     views::Widget* widget, bool active) {
@@ skipping 448 matching lines @@
 // static
 void ManagePasswordsBubbleView::ShowBubble(
     content::WebContents* web_contents,
     DisplayReason reason) {
   Browser* browser = chrome::FindBrowserWithWebContents(web_contents);
   DCHECK(browser);
   DCHECK(browser->window());
   DCHECK(!manage_passwords_bubble_ ||
          !manage_passwords_bubble_->GetWidget()->IsVisible());
 
+  views::View* anchor_view = nullptr;
+#if !defined(OS_MACOSX) || BUILDFLAG(MAC_VIEWS_BROWSER)
   BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser);
   bool is_fullscreen = browser_view->IsFullscreen();
-  views::View* anchor_view = nullptr;
   if (!is_fullscreen) {
     if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
       anchor_view = browser_view->GetLocationBarView();
     } else {
       anchor_view =
           browser_view->GetLocationBarView()->manage_passwords_icon_view();
     }
   }
-  manage_passwords_bubble_ = new ManagePasswordsBubbleView(
-      web_contents, anchor_view, reason);
+#endif
 
+  new ManagePasswordsBubbleView(web_contents, anchor_view, gfx::Point(),

[tapted, 2017/04/19 03:31:06]

the gfx::Point() here doesn't look right - where does the Cocoa browser pass in
the anchor? Do we need an overload of ManagePasswordsBubbleView::ShowBubble()
that the Cocoa browser calls?  (maybe all the methods Mac needs call the
ManagePasswordsBubbleView() constructor directly, and we can NOTREACHED() here)

[varkha, 2017/04/19 08:34:17]

This code path is now only used not on Mac views and the |anchor_point| there
does not matter.
Made the test calling the bubble through
TabDialogsViewsMac::ShowManagePasswordsBubble().

+                                reason);
+  DCHECK(manage_passwords_bubble_);
+
+#if !defined(OS_MACOSX) || BUILDFLAG(MAC_VIEWS_BROWSER)
   if (is_fullscreen)
     manage_passwords_bubble_->set_parent_window(web_contents->GetNativeView());
 
   views::Widget* manage_passwords_bubble_widget =
       views::BubbleDialogDelegateView::CreateBubble(manage_passwords_bubble_);
   if (anchor_view) {
     manage_passwords_bubble_widget->AddObserver(
         browser_view->GetLocationBarView()->manage_passwords_icon_view());
   }
 
   // Adjust for fullscreen after creation as it relies on the content size.

[tapted, 2017/04/19 03:31:06]

We can do this still: we just need

bool is_fullscreen = browser()->window()->IsFullscreen();

outside the #ifdef

[varkha, 2017/04/19 08:34:16]

Talked about this offline, we probably don't want to adjust for fullscreen
because we are not using AnchorRect () but we are anchoring to the location bar
nonetheless and calling AdjustForFullscreen will do the wrong thing.

   if (is_fullscreen) {
     manage_passwords_bubble_->AdjustForFullscreen(
         browser_view->GetBoundsInScreen());
   }
+#else
+  gfx::NativeView parent =
+      platform_util::GetViewForWindow(browser->window()->GetNativeWindow());
+  DCHECK(parent);
+  manage_passwords_bubble_->set_arrow(views::BubbleBorder::TOP_RIGHT);
+  manage_passwords_bubble_->set_parent_window(parent);
+  views::BubbleDialogDelegateView::CreateBubble(manage_passwords_bubble_);
+#endif
 
   manage_passwords_bubble_->ShowForReason(reason);
 }
 
 // static
 void ManagePasswordsBubbleView::CloseCurrentBubble() {
   if (manage_passwords_bubble_)
     manage_passwords_bubble_->CloseBubble();
 }
 
 // static
 void ManagePasswordsBubbleView::ActivateBubble() {
   DCHECK(manage_passwords_bubble_);
   DCHECK(manage_passwords_bubble_->GetWidget()->IsVisible());
   manage_passwords_bubble_->GetWidget()->Activate();
 }
 
 content::WebContents* ManagePasswordsBubbleView::web_contents() const {
   return model_.GetWebContents();
 }
 
 ManagePasswordsBubbleView::ManagePasswordsBubbleView(
     content::WebContents* web_contents,
     views::View* anchor_view,
+    const gfx::Point& anchor_point,
     DisplayReason reason)
-    : LocationBarBubbleDelegateView(anchor_view, web_contents),
+    : LocationBarBubbleDelegateView(anchor_view, anchor_point, web_contents),
       model_(PasswordsModelDelegateFromWebContents(web_contents),
              reason == AUTOMATIC ? ManagePasswordsBubbleModel::AUTOMATIC
                                  : ManagePasswordsBubbleModel::USER_ACTION),
       initially_focused_view_(nullptr) {
   mouse_handler_.reset(new WebContentMouseHandler(this, this->web_contents()));
   // Set title margins to make the title and the content left aligned.
   const int side_margin = margins().left();
   set_title_margins(gfx::Insets(ChromeLayoutProvider::Get()->GetDistanceMetric(
                                     DISTANCE_PANEL_CONTENT_MARGIN),
                                 side_margin, 0, side_margin));
+  manage_passwords_bubble_ = this;
 }
 
 ManagePasswordsBubbleView::~ManagePasswordsBubbleView() {
   if (manage_passwords_bubble_ == this)
-    manage_passwords_bubble_ = NULL;
+    manage_passwords_bubble_ = nullptr;
 }
 
 views::View* ManagePasswordsBubbleView::GetInitiallyFocusedView() {
   return initially_focused_view_;
 }
 
 void ManagePasswordsBubbleView::Init() {
   SetLayoutManager(new views::FillLayout);
 
   CreateChild();
@@ skipping 72 matching lines @@
   } else if (model_.state() ==
              password_manager::ui::CHROME_DESKTOP_IOS_PROMO_STATE) {
     AddChildView(new DesktopIOSPromotionBubbleView(
         model_.GetProfile(),
         desktop_ios_promotion::PromotionEntryPoint::SAVE_PASSWORD_BUBBLE));
 #endif
   } else {
     AddChildView(new ManageView(this));
   }
 }