Position Autocheckout bubble correctly on Windows.

Also removes unnecessary NativeView param to showing the bubble.


BUG=177804


Review URL: https://chromiumcodereview.appspot.com/13725028

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193312 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 0 insertions, 15 deletions

diff --git a/components/autofill/browser/autocheckout_manager.cc b/components/autofill/browser/autocheckout_manager.cc
index a48cb8a..f8c1c25 100644
--- a/components/autofill/browser/autocheckout_manager.cc
+++ b/components/autofill/browser/autocheckout_manager.cc
@@ -214,7 +214,6 @@ void AutocheckoutManager::OnFormsSeen() {
 void AutocheckoutManager::MaybeShowAutocheckoutBubble(
     const GURL& frame_url,
     const content::SSLStatus& ssl_status,
-    const gfx::NativeView& native_view,
     const gfx::RectF& bounding_box) {
   if (autocheckout_offered_ ||
       is_autocheckout_bubble_showing_ ||
@@ -228,7 +227,6 @@ void AutocheckoutManager::MaybeShowAutocheckoutBubble(
       ssl_status);
   autofill_manager_->delegate()->ShowAutocheckoutBubble(
       bounding_box,
-      native_view,
       callback);
   is_autocheckout_bubble_showing_ = true;
   autocheckout_offered_ = true;
diff --git a/components/autofill/browser/autocheckout_manager.h b/components/autofill/browser/autocheckout_manager.h
index 76ca993..035380e 100644
--- a/components/autofill/browser/autocheckout_manager.h
+++ b/components/autofill/browser/autocheckout_manager.h
@@ -12,7 +12,6 @@
 #include "base/string16.h"
 #include "components/autofill/browser/autocheckout_page_meta_data.h"
 #include "components/autofill/common/autocheckout_status.h"
-#include "ui/gfx/native_widget_types.h"
 
 class AutofillField;
 class AutofillManager;
@@ -62,7 +61,6 @@ class AutocheckoutManager {
   // input field in focus.
   virtual void MaybeShowAutocheckoutBubble(const GURL& frame_url,
                                            const content::SSLStatus& ssl_status,
-                                           const gfx::NativeView& native_view,
                                            const gfx::RectF& bounding_box);
 
   bool is_autocheckout_bubble_showing() const {
diff --git a/components/autofill/browser/autocheckout_manager_unittest.cc b/components/autofill/browser/autocheckout_manager_unittest.cc
index 82b6e18..cb6e0c3 100644
--- a/components/autofill/browser/autocheckout_manager_unittest.cc
+++ b/components/autofill/browser/autocheckout_manager_unittest.cc
@@ -237,7 +237,6 @@ class MockAutofillManagerDelegate : public TestAutofillManagerDelegate {
 
   virtual void ShowAutocheckoutBubble(
       const gfx::RectF& bounds,
-      const gfx::NativeView& native_view,
       const base::Callback<void(bool)>& callback) OVERRIDE {
     autocheckout_bubble_shown_ = true;
     callback.Run(true);
@@ -483,7 +482,6 @@ TEST_F(AutocheckoutManagerTest, TestFillForms) {
 TEST_F(AutocheckoutManagerTest, OnFormsSeenTest) {
   GURL frame_url;
   content::SSLStatus ssl_status;
-  gfx::NativeView native_view;
   gfx::RectF bounding_box;
   EXPECT_CALL(autocheckout_manager_->metric_logger(),
               LogAutocheckoutBubbleMetric(
@@ -491,7 +489,6 @@ TEST_F(AutocheckoutManagerTest, OnFormsSeenTest) {
   autocheckout_manager_->OnLoadedPageMetaData(CreateStartOfFlowMetaData());
   autocheckout_manager_->MaybeShowAutocheckoutBubble(frame_url,
                                                      ssl_status,
-                                                     native_view,
                                                      bounding_box);
   EXPECT_TRUE(autocheckout_manager_->autocheckout_offered());
   // OnFormsSeen resets whether or not the bubble was shown.
@@ -516,7 +513,6 @@ TEST_F(AutocheckoutManagerTest, OnClickFailedTest) {
 TEST_F(AutocheckoutManagerTest, MaybeShowAutocheckoutBubbleTest) {
   GURL frame_url;
   content::SSLStatus ssl_status;
-  gfx::NativeView native_view;
   gfx::RectF bounding_box;
   EXPECT_CALL(autocheckout_manager_->metric_logger(),
               LogAutocheckoutBubbleMetric(
@@ -525,7 +521,6 @@ TEST_F(AutocheckoutManagerTest, MaybeShowAutocheckoutBubbleTest) {
   // MaybeShowAutocheckoutBubble shows bubble if it has not been shown.
   autocheckout_manager_->MaybeShowAutocheckoutBubble(frame_url,
                                                      ssl_status,
-                                                     native_view,
                                                      bounding_box);
   EXPECT_TRUE(autocheckout_manager_->autocheckout_offered());
   EXPECT_TRUE(autofill_manager_delegate_->autocheckout_bubble_shown());
@@ -538,7 +533,6 @@ TEST_F(AutocheckoutManagerTest, MaybeShowAutocheckoutBubbleTest) {
   // for the current page.
   autocheckout_manager_->MaybeShowAutocheckoutBubble(frame_url,
                                                      ssl_status,
-                                                     native_view,
                                                      bounding_box);
   EXPECT_TRUE(autocheckout_manager_->autocheckout_offered());
   EXPECT_FALSE(autofill_manager_delegate_->autocheckout_bubble_shown());
diff --git a/components/autofill/browser/autofill_manager.cc b/components/autofill/browser/autofill_manager.cc
index 4d81f84..cca6f87 100644
--- a/components/autofill/browser/autofill_manager.cc
+++ b/components/autofill/browser/autofill_manager.cc
@@ -899,7 +899,6 @@ void AutofillManager::OnMaybeShowAutocheckoutBubble(
   autocheckout_manager_.MaybeShowAutocheckoutBubble(
       source_url,
       ssl_status,
-      web_contents()->GetView()->GetContentNativeView(),
       bounding_box);
 }
 
diff --git a/components/autofill/browser/autofill_manager_delegate.h b/components/autofill/browser/autofill_manager_delegate.h
index 5d3dacc..2056aa6 100644
--- a/components/autofill/browser/autofill_manager_delegate.h
+++ b/components/autofill/browser/autofill_manager_delegate.h
@@ -9,7 +9,6 @@
 
 #include "base/callback_forward.h"
 #include "base/string16.h"
-#include "ui/gfx/native_widget_types.h"
 
 namespace autofill {
 class PasswordGenerator;
@@ -116,7 +115,6 @@ class AutofillManagerDelegate {
   // |callback| is run if the bubble is accepted.
   virtual void ShowAutocheckoutBubble(
       const gfx::RectF& bounding_box,
-      const gfx::NativeView& native_view,
       const base::Callback<void(bool)>& callback) = 0;
 
   // Causes the dialog for request autocomplete feature to be shown.
diff --git a/components/autofill/browser/test_autofill_manager_delegate.cc b/components/autofill/browser/test_autofill_manager_delegate.cc
index 1a67497..33b8944 100644
--- a/components/autofill/browser/test_autofill_manager_delegate.cc
+++ b/components/autofill/browser/test_autofill_manager_delegate.cc
@@ -51,7 +51,6 @@ void TestAutofillManagerDelegate::ShowPasswordGenerationBubble(
 
 void TestAutofillManagerDelegate::ShowAutocheckoutBubble(
     const gfx::RectF& bounding_box,
-    const gfx::NativeView& native_view,
     const base::Callback<void(bool)>& callback) {}
 
 void TestAutofillManagerDelegate::HideAutocheckoutBubble() {}
diff --git a/components/autofill/browser/test_autofill_manager_delegate.h b/components/autofill/browser/test_autofill_manager_delegate.h
index c275131..0c31d98 100644
--- a/components/autofill/browser/test_autofill_manager_delegate.h
+++ b/components/autofill/browser/test_autofill_manager_delegate.h
@@ -39,7 +39,6 @@ class TestAutofillManagerDelegate : public AutofillManagerDelegate {
       autofill::PasswordGenerator* generator) OVERRIDE;
   virtual void ShowAutocheckoutBubble(
       const gfx::RectF& bounding_box,
-      const gfx::NativeView& native_view,
       const base::Callback<void(bool)>& callback) OVERRIDE;
   virtual void HideAutocheckoutBubble() OVERRIDE;
   virtual void ShowRequestAutocompleteDialog(