Passworde bubble should close without fading out.

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 "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/passwords/manage_passwords_bubble_model.h"
 #include "chrome/browser/ui/passwords/manage_passwords_ui_controller.h"
 #include "chrome/browser/ui/passwords/save_password_refusal_combobox_model.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/browser/ui/views/passwords/manage_password_item_view.h"
 #include "chrome/browser/ui/views/passwords/manage_passwords_icon_view.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/aura/window.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/compositor/layer_animation_observer.h"
-#include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/views/controls/button/blue_button.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/controls/combobox/combobox_listener.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/link_listener.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"
 
 
 // Helpers --------------------------------------------------------------------
 
 namespace {
 
-// The number of seconds the bubble needs to fade out.
-const int kBubbleFadeDelay = 2;
-
 const int kDesiredBubbleWidth = 370;
 
 enum ColumnSetType {
   // | | (FILL, FILL) | |
   // Used for the bubble's header, the credentials list, and for simple
   // messages like "No passwords".
   SINGLE_VIEW_COLUMN_SET = 0,
 
   // | | (TRAILING, CENTER) | | (TRAILING, CENTER) | |
   // Used for buttons at the bottom of the bubble which should nest at the
@@ skipping 620 matching lines @@
   if (aura::Window* window = GetWebContentsWindow())
     window->RemovePreTargetHandler(this);
 }
 
 void ManagePasswordsBubbleView::WebContentMouseHandler::OnKeyEvent(
     ui::KeyEvent* event) {
   content::WebContents* web_contents = bubble_->model()->web_contents();
   content::RenderViewHost* rvh = web_contents->GetRenderViewHost();
   if (rvh->IsFocusedElementEditable() &&
       event->type() == ui::ET_KEY_PRESSED)
-    bubble_->StartFadingOut();
+    bubble_->Close();
 }
 
 void ManagePasswordsBubbleView::WebContentMouseHandler::OnMouseEvent(
     ui::MouseEvent* event) {
   if (event->type() == ui::ET_MOUSE_PRESSED)
-    bubble_->StartFadingOut();
+    bubble_->Close();
 }
 
 aura::Window*
 ManagePasswordsBubbleView::WebContentMouseHandler::GetWebContentsWindow() {
   content::WebContents* web_contents = bubble_->model()->web_contents();
   return web_contents ? web_contents->GetNativeView() : NULL;
 }
 
-// ManagePasswordsBubbleView::FadeOutObserver ---------------------------------
-
-// The class notifies the bubble when it faded out completely.
-class ManagePasswordsBubbleView::FadeOutObserver
-    : public ui::ImplicitAnimationObserver {
- public:
-  explicit FadeOutObserver(ManagePasswordsBubbleView* bubble)
-      : bubble_(bubble) {
-  }
-
-  virtual void OnImplicitAnimationsCompleted() OVERRIDE {
-    bubble_->OnBubbleDisappeared();
-  }
-
- private:
-  ManagePasswordsBubbleView* bubble_;
-
-  DISALLOW_COPY_AND_ASSIGN(FadeOutObserver);
-};
-
 // ManagePasswordsBubbleView --------------------------------------------------
 
 // static
 ManagePasswordsBubbleView* ManagePasswordsBubbleView::manage_passwords_bubble_ =
     NULL;
 
 // static
 void ManagePasswordsBubbleView::ShowBubble(content::WebContents* web_contents,
                                            DisplayReason reason) {
   Browser* browser = chrome::FindBrowserWithWebContents(web_contents);
@@ skipping 61 matching lines @@
     DisplayReason reason)
     : ManagePasswordsBubble(web_contents, reason),
       BubbleDelegateView(anchor_view,
                          anchor_view ? views::BubbleBorder::TOP_RIGHT
                                      : views::BubbleBorder::NONE),
       anchor_view_(anchor_view),
       never_save_passwords_(false),
       initially_focused_view_(NULL) {
   // Compensate for built-in vertical padding in the anchor view's image.
   set_anchor_view_insets(gfx::Insets(5, 0, 5, 0));
-  set_notify_enter_exit_on_child(true);
   if (anchor_view)
     anchor_view->SetActive(true);
   mouse_handler_.reset(new WebContentMouseHandler(this));
 }
 
 ManagePasswordsBubbleView::~ManagePasswordsBubbleView() {
   if (anchor_view_)
     anchor_view_->SetActive(false);
 }
 
 void ManagePasswordsBubbleView::AdjustForFullscreen(
     const gfx::Rect& screen_bounds) {
   if (GetAnchorView())
     return;
 
   // The bubble's padding from the screen edge, used in fullscreen.
   const int kFullscreenPaddingEnd = 20;
   const size_t bubble_half_width = width() / 2;
   const int x_pos = base::i18n::IsRTL() ?
       screen_bounds.x() + bubble_half_width + kFullscreenPaddingEnd :
       screen_bounds.right() - bubble_half_width - kFullscreenPaddingEnd;
   SetAnchorRect(gfx::Rect(x_pos, screen_bounds.y(), 0, 0));
 }
 
 void ManagePasswordsBubbleView::Close() {
-  fadeout_observer_.reset();
   mouse_handler_.reset();
   GetWidget()->Close();
 }
 
 void ManagePasswordsBubbleView::Refresh() {
   RemoveAllChildViews(true);
   initially_focused_view_ = NULL;
   if (password_manager::ui::IsPendingState(model()->state())) {
     if (never_save_passwords_)
       AddChildView(new ConfirmNeverView(this));
     else
       AddChildView(new PendingView(this));
   } else if (model()->state() == password_manager::ui::BLACKLIST_STATE) {
     AddChildView(new BlacklistedView(this));
   } else if (model()->state() == password_manager::ui::CONFIRMATION_STATE) {
     AddChildView(new SaveConfirmationView(this));
   } else {
     AddChildView(new ManageView(this));
   }
   GetLayoutManager()->Layout(this);
-  CancelFadingOut();
 }
 
 void ManagePasswordsBubbleView::NotifyNeverForThisSiteClicked() {
   if (model()->best_matches().empty()) {
     // Skip confirmation if there are no existing passwords for this site.
     NotifyConfirmedNeverForThisSite();
   } else {
     never_save_passwords_ = true;
     Refresh();
   }
@@ skipping 16 matching lines @@
   Refresh();
 }
 
 void ManagePasswordsBubbleView::WindowClosing() {
   // Close() closes the window asynchronously, so by the time we reach here,
   // |manage_passwords_bubble_| may have already been reset.
   if (manage_passwords_bubble_ == this)
     manage_passwords_bubble_ = NULL;
 }
 
-void ManagePasswordsBubbleView::OnWidgetActivationChanged(views::Widget* widget,
-                                                          bool active) {
-  if (active && widget == GetWidget())
-    CancelFadingOut();
-  BubbleDelegateView::OnWidgetActivationChanged(widget, active);
-}
-
 views::View* ManagePasswordsBubbleView::GetInitiallyFocusedView() {
   return initially_focused_view_;
 }
-
-void ManagePasswordsBubbleView::OnMouseEntered(const ui::MouseEvent& event) {
-  CancelFadingOut();
-}
-
-void ManagePasswordsBubbleView::StartFadingOut() {
-  if (fadeout_observer_)
-    return;
-  aura::Window* window = GetWidget()->GetNativeView();
-  ui::ScopedLayerAnimationSettings animator(window->layer()->GetAnimator());
-  fadeout_observer_.reset(new FadeOutObserver(this));
-  animator.AddObserver(fadeout_observer_.get());
-  animator.SetTransitionDuration(
-      base::TimeDelta::FromSeconds(kBubbleFadeDelay));
-  window->layer()->SetOpacity(0);
-}
-
-void ManagePasswordsBubbleView::CancelFadingOut() {
-  if (!fadeout_observer_)
-    return;
-  fadeout_observer_.reset();
-  aura::Window* window = GetWidget()->GetNativeView();
-  window->layer()->SetOpacity(1);
-}
-
-void ManagePasswordsBubbleView::OnBubbleDisappeared() {
-  Close();
-}