Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / views / autofill / autofill_popup_base_view.cc

diff --git a/src/chrome/browser/ui/views/autofill/autofill_popup_base_view.cc b/src/chrome/browser/ui/views/autofill/autofill_popup_base_view.cc
index bff5e7a..db527c8 100644 (file)
--- a/src/chrome/browser/ui/views/autofill/autofill_popup_base_view.cc
+++ b/src/chrome/browser/ui/views/autofill/autofill_popup_base_view.cc
@@ -8,15 +8,9 @@
 #include "base/location.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/ui/autofill/popup_constants.h"
-#include "ui/gfx/point.h"
-#include "ui/gfx/screen.h"
 #include "ui/views/border.h"
-#include "ui/views/event_utils.h"
 #include "ui/views/widget/widget.h"
-
-#if defined(USE_AURA)
 #include "ui/wm/core/window_animations.h"
-#endif
 
 namespace autofill {
 
@@ -49,7 +43,8 @@ AutofillPopupBaseView::~AutofillPopupBaseView() {
 }
 
 void AutofillPopupBaseView::DoShow() {
-  if (!GetWidget()) {
+  const bool initialize_widget = !GetWidget();
+  if (initialize_widget) {
     observing_widget_->AddObserver(this);
 
     views::FocusManager* focus_manager = observing_widget_->GetFocusManager();
@@ -71,11 +66,10 @@ void AutofillPopupBaseView::DoShow() {
     params.parent = container_view();
     widget->Init(params);
     widget->SetContentsView(this);
-#if defined(USE_AURA)
+
     // No animation for popup appearance (too distracting).
     wm::SetWindowVisibilityAnimationTransition(
         widget->GetNativeView(), wm::ANIMATE_HIDE);
-#endif
   }
 
   SetBorder(views::Border::CreateSolidBorder(kPopupBorderThickness,
@@ -84,8 +78,10 @@ void AutofillPopupBaseView::DoShow() {
   DoUpdateBoundsAndRedrawPopup();
   GetWidget()->Show();
 
-  if (ShouldHideOnOutsideClick())
-    GetWidget()->SetCapture(this);
+  // Showing the widget can change native focus (which would result in an
+  // immediate hiding of the popup). Only start observing after shown.
+  if (initialize_widget)
+    views::WidgetFocusManager::GetInstance()->AddFocusChangeListener(this);
 }
 
 void AutofillPopupBaseView::DoHide() {
@@ -108,6 +104,7 @@ void AutofillPopupBaseView::DoHide() {
 void AutofillPopupBaseView::RemoveObserver() {
   observing_widget_->GetFocusManager()->UnregisterAccelerators(this);
   observing_widget_->RemoveObserver(this);
+  views::WidgetFocusManager::GetInstance()->RemoveFocusChangeListener(this);
 }
 
 void AutofillPopupBaseView::DoUpdateBoundsAndRedrawPopup() {
@@ -115,6 +112,13 @@ void AutofillPopupBaseView::DoUpdateBoundsAndRedrawPopup() {
   SchedulePaint();
 }
 
+void AutofillPopupBaseView::OnNativeFocusChange(
+    gfx::NativeView focused_before,
+    gfx::NativeView focused_now) {
+  if (GetWidget() && GetWidget()->GetNativeView() != focused_now)
+    HideController();
+}
+
 void AutofillPopupBaseView::OnWidgetBoundsChanged(views::Widget* widget,
                                                   const gfx::Rect& new_bounds) {
   DCHECK_EQ(widget, observing_widget_);
@@ -157,39 +161,10 @@ void AutofillPopupBaseView::OnMouseMoved(const ui::MouseEvent& event) {
 }
 
 bool AutofillPopupBaseView::OnMousePressed(const ui::MouseEvent& event) {
-  if (HitTestPoint(event.location()))
-    return true;
-
-  if (ShouldHideOnOutsideClick()) {
-    GetWidget()->ReleaseCapture();
-
-    gfx::Point screen_loc = event.location();
-    views::View::ConvertPointToScreen(this, &screen_loc);
-
-    ui::MouseEvent mouse_event = event;
-    mouse_event.set_location(screen_loc);
-
-    if (ShouldRepostEvent(mouse_event)) {
-      gfx::NativeView native_view = GetWidget()->GetNativeView();
-      gfx::Screen* screen = gfx::Screen::GetScreenFor(native_view);
-      gfx::NativeWindow window = screen->GetWindowAtScreenPoint(screen_loc);
-      views::RepostLocatedEvent(window, mouse_event);
-    }
-
-    HideController();
-    // |this| is now deleted.
-  }
-
-  return false;
+  return true;
 }
 
 void AutofillPopupBaseView::OnMouseReleased(const ui::MouseEvent& event) {
-  // Because this view can can be shown in response to a mouse press, it can
-  // receive an OnMouseReleased event just after showing. This breaks the mouse
-  // capture, so restart capturing here.
-  if (ShouldHideOnOutsideClick() && GetWidget())
-    GetWidget()->SetCapture(this);
-
   // We only care about the left click.
   if (event.IsOnlyLeftMouseButton() && HitTestPoint(event.location()))
     AcceptSelection(event.location());
@@ -256,24 +231,11 @@ void AutofillPopupBaseView::ClearSelection() {
     delegate_->SelectionCleared();
 }
 
-bool AutofillPopupBaseView::ShouldHideOnOutsideClick() {
-  if (delegate_)
-    return delegate_->ShouldHideOnOutsideClick();
-
-  // |this| instance should be in the process of being destroyed, so the return
-  // value shouldn't matter.
-  return false;
-}
-
 void AutofillPopupBaseView::HideController() {
   if (delegate_)
     delegate_->Hide();
 }
 
-bool AutofillPopupBaseView::ShouldRepostEvent(const ui::MouseEvent& event) {
-  return delegate_->ShouldRepostEvent(event);
-}
-
 gfx::NativeView AutofillPopupBaseView::container_view() {
   return delegate_->container_view();
 }