Start of New Autofill UI for Windows

chrome/browser/ui/views/autofill/autofill_popup_view_views.cc

Index: chrome/browser/ui/views/autofill/autofill_popup_view_views.cc
diff --git a/chrome/browser/ui/views/autofill/autofill_popup_view_views.cc b/chrome/browser/ui/views/autofill/autofill_popup_view_views.cc
new file mode 100644
index 0000000000000000000000000000000000000000..9d4f7eeb03650854e1e27159c93e0d20f73794d4
--- /dev/null
+++ b/chrome/browser/ui/views/autofill/autofill_popup_view_views.cc
@@ -0,0 +1,87 @@
+// 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 "autofill_popup_view_views.h"
+
+#include "chrome/browser/ui/views/autofill/autofill_external_delegate_views.h"
+#include "content/public/browser/render_view_host.h"
+#include "content/public/browser/web_contents.h"
+#include "content/public/browser/web_contents_view.h"
+#include "ui/gfx/canvas.h"
+#include "ui/gfx/rect.h"
+#include "ui/views/widget/widget.h"
+
+namespace {
+const SkColor kPopupBackground = SkColorSetARGB(0xFF, 0x00, 0x00, 0x00);
+}  // namespace
+
+class AutofillPopupViewViews::AutofillPopupWidget

[sky, 2012/08/16 23:02:01]

Why do you need this class?

When the popup is deleted it'll delete the view which will notify the delegate
and clean up.

That said, if this happens HideInternal is never invoked and so no cleanup is
done.

It would be good to add a test case for this. Specifically in the test get a
handle to the widget and invoke close on it and make sure everything is cleaned
up.

[csharp, 2012/08/20 20:59:00]

I wasn't able to get the popup to be visible without this class and beng@ said I
need to add a widget for it to live in (similar to the omnibox code).

I've added a test to make sure that hide code is called if the popup is close by
the widget getting closed.

+    : public views::Widget,
+      public base::SupportsWeakPtr<AutofillPopupWidget> {
+ public:
+  AutofillPopupWidget() {}
+  virtual ~AutofillPopupWidget() {}
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(AutofillPopupWidget);
+};
+
+AutofillPopupViewViews::AutofillPopupViewViews(
+    content::WebContents* web_contents,
+    AutofillExternalDelegateViews* external_delegate)
+    : AutofillPopupView(web_contents, external_delegate),
+      external_delegate_(external_delegate),
+      web_contents_(web_contents) {
+}
+
+AutofillPopupViewViews::~AutofillPopupViewViews() {
+  external_delegate_->InvalidateView();
+}
+
+void AutofillPopupViewViews::OnPaint(gfx::Canvas* canvas) {
+  // TODO(csharp): Properly draw the popup.
+  canvas->DrawColor(kPopupBackground);
+}
+
+void AutofillPopupViewViews::ShowInternal() {
+  if (!popup_) {
+    // The widget is destroyed by the corresponding NativeWidget, so we use
+    // a weak pointer to hold the reference and don't have to worry about
+    // deletion.
+    popup_ = (new AutofillPopupWidget)->AsWeakPtr();
+    views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP);
+    params.can_activate = false;
+    params.transparent = true;
+    params.parent = web_contents_->GetView()->GetTopLevelNativeWindow();
+    popup_->Init(params);
+    popup_->SetContentsView(this);
+    popup_->Show();
+
+    gfx::Rect client_area;
+    web_contents_->GetContainerBounds(&client_area);
+    popup_->SetBounds(client_area);
+  }
+
+  ResizePopup();
+
+  web_contents_->GetRenderViewHost()->AddKeyboardListener(this);
+}
+
+void AutofillPopupViewViews::HideInternal() {
+  web_contents_->GetRenderViewHost()->RemoveKeyboardListener(this);
+
+  popup_->Hide();

[sky, 2012/08/16 23:02:01]

You never close the popup_ and therefor its leaking.

[csharp, 2012/08/20 20:59:00]

Added close to popup in the deconstructor

+  SetVisible(false);
+}
+
+void AutofillPopupViewViews::InvalidateRow(size_t row) {
+  // TODO(csharp): invalidate this row.
+}
+
+void AutofillPopupViewViews::ResizePopup() {
+  gfx::Rect popup_bounds = element_bounds();
+  popup_bounds.set_y(popup_bounds.y() + popup_bounds.height());
+
+  SetBoundsRect(popup_bounds);
+}