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/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/layout_delegate.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;
+bool g_bubble_shown_ = false;
 
 // Helpers --------------------------------------------------------------------
 
 namespace {
 
 enum ColumnSetType {
   // | | (FILL, FILL) | |
   // Used for the bubble's header, the credentials list, and for simple
   // messages like "No passwords".
   SINGLE_VIEW_COLUMN_SET,
@@ skipping 134 matching lines @@
     : public views::View,
       public views::ButtonListener,
       public views::WidgetObserver {
  public:
   explicit AutoSigninView(ManagePasswordsBubbleView* parent);
 
  private:
   // views::ButtonListener:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
+#if !defined(OS_MACOSX) || BUILDFLAG(MAC_VIEWS_BROWSER)
   // views::WidgetObserver:
   // Tracks the state of the browser window.
   void OnWidgetActivationChanged(views::Widget* widget, bool active) override;
   void OnWidgetClosing(views::Widget* widget) override;
+#endif
 
   void OnTimer();
   static base::TimeDelta GetTimeout() {
     return base::TimeDelta::FromSeconds(
         ManagePasswordsBubbleView::auto_signin_toast_timeout_);
   }
 
   base::OneShotTimer timer_;
   ManagePasswordsBubbleView* parent_;
   ScopedObserver<views::Widget, views::WidgetObserver> observed_browser_;
@@ skipping 13 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/12 05:08:42]

Can we say "This matches the current Mac behavior with Cocoa password bubbles."

(i.e. does it match? -- And do we also match on the focus-stealing behavior when
the bubble is shown?)

E.g. if the bubbles never auto-close on Mac, then moving the #endif down below
when the timer starts is probably the right thing to do.

[varkha, 2017/04/12 09:16:43]

I think it is safer to do more of the same that other platforms do. 
http://crbug.com/468281 was more about the bubble getting dismissed so the
solution added IsActive() check and resuming the timer on re-activation. I think
lack of automatic re-activation is OK but removing the check for IsActive()
could mean the bubble is sometimes not shown when it should.

+// 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();
 }
 
+#if !defined(OS_MACOSX) || BUILDFLAG(MAC_VIEWS_BROWSER)

[tapted, 2017/04/12 05:08:42]

Although it's dead code, I think it's safer if we leave this stuff compiled in.
E.g. in case someone adds a partial fix - they won't forget to restore these
steps as well.

[varkha, 2017/04/12 09:16:43]

Done.

 void ManagePasswordsBubbleView::AutoSigninView::OnWidgetActivationChanged(
     views::Widget* widget, bool active) {
   if (active && !timer_.IsRunning())
     timer_.Start(FROM_HERE, GetTimeout(), this, &AutoSigninView::OnTimer);
 }
 
 void ManagePasswordsBubbleView::AutoSigninView::OnWidgetClosing(
     views::Widget* widget) {
   observed_browser_.RemoveAll();
 }
+#endif
 
 void ManagePasswordsBubbleView::AutoSigninView::OnTimer() {
   parent_->model()->OnAutoSignInToastTimeout();
   parent_->CloseBubble();
 }
 
 // ManagePasswordsBubbleView::PendingView -------------------------------------
 
 // A view offering the user the ability to save credentials. Contains a
 // single ManagePasswordItemsView, along with a "Save Passwords" button
@@ skipping 420 matching lines @@
   DCHECK_EQ(range, parent_->model()->title_brand_link_range());
   parent_->model()->OnBrandLinkClicked();
 }
 
 // ManagePasswordsBubbleView --------------------------------------------------
 
 // static
 ManagePasswordsBubbleView* ManagePasswordsBubbleView::manage_passwords_bubble_ =
     NULL;
 
+#if !defined(OS_MACOSX) || BUILDFLAG(MAC_VIEWS_BROWSER)
 // 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());
 
   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);
+      web_contents, anchor_view, gfx::Point(), reason);
 
   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.
   if (is_fullscreen) {
     manage_passwords_bubble_->AdjustForFullscreen(
         browser_view->GetBoundsInScreen());
   }
 
   manage_passwords_bubble_->ShowForReason(reason);
 }
+#endif  // !OS_MACOSX || MAC_VIEWS_BROWSER
 
 // 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();
 }
 
+// static
+bool ManagePasswordsBubbleView::IsBubbleShown() {
+  return g_bubble_shown_;
+}
+
 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,
+                                    views::BubbleBorder::TOP_RIGHT,
+                                    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(LayoutDelegate::Get()->GetMetric(
                       LayoutDelegate::Metric::PANEL_CONTENT_MARGIN),
                   side_margin, 0, side_margin));
+  g_bubble_shown_ = true;
 }
 
 ManagePasswordsBubbleView::~ManagePasswordsBubbleView() {
+  g_bubble_shown_ = false;
   if (manage_passwords_bubble_ == this)

[tapted, 2017/04/12 05:08:42]

huh - I just noticed this. Can we implement IsBubbleShown() as simply
`!!manage_passwords_bubble_`?

[varkha, 2017/04/12 09:16:43]

Done.

     manage_passwords_bubble_ = NULL;
 }
 
 views::View* ManagePasswordsBubbleView::GetInitiallyFocusedView() {
   return initially_focused_view_;
 }
 
 void ManagePasswordsBubbleView::Init() {
   SetLayoutManager(new views::FillLayout);
 
@@ skipping 66 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));
   }
 }