Merge 187018

chrome/browser/ui/android/autofill/autofill_popup_view_android.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/android/autofill/autofill_popup_view_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "chrome/browser/ui/android/window_android_helper.h"
 #include "chrome/browser/ui/autofill/autofill_popup_controller.h"
@@ skipping 20 matching lines @@
       content_view_core->GetWindowAndroid()->GetJavaObject().obj(),
       content_view_core->GetContainerViewDelegate().obj()));
 
   UpdateBoundsAndRedrawPopup();
 }
 
 void AutofillPopupViewAndroid::Hide() {
   AutofillPopupView::Hide();
 
   JNIEnv* env = base::android::AttachCurrentThread();
-  Java_AutofillPopupGlue_dismiss(env, java_object_.obj());
+  Java_AutofillPopupGlue_hide(env, java_object_.obj());
+  delete this;
 }
 
 void AutofillPopupViewAndroid::UpdateBoundsAndRedrawPopup() {
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_AutofillPopupGlue_setAnchorRect(env,
                                        java_object_.obj(),
                                        controller_->element_bounds().x(),
                                        controller_->element_bounds().y(),
                                        controller_->element_bounds().width(),
                                        controller_->element_bounds().height());
@@ skipping 25 matching lines @@
 
   Java_AutofillPopupGlue_show(env, java_object_.obj(), data_array.obj());
 }
 
 void AutofillPopupViewAndroid::SuggestionSelected(JNIEnv* env,
                                                   jobject obj,
                                                   jint list_index) {
   controller_->AcceptSuggestion(list_index);
 }
 
-void AutofillPopupViewAndroid::Dismissed(JNIEnv* env, jobject obj) {
-  delete this;
+void AutofillPopupViewAndroid::RequestHide(JNIEnv* env, jobject obj) {
+  controller_->Hide();
 }
 
 void AutofillPopupViewAndroid::InvalidateRow(size_t) {}
 
 // static
 bool AutofillPopupViewAndroid::RegisterAutofillPopupViewAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 // static
 AutofillPopupView* AutofillPopupView::Create(
     AutofillPopupController* controller) {
   return new AutofillPopupViewAndroid(controller);
 }