Basic Drawn text for new GTK Autofill popup.

chrome/browser/ui/gtk/autofill/autofill_popup_view_gtk.h

Index: chrome/browser/ui/gtk/autofill/autofill_popup_view_gtk.h
diff --git a/chrome/browser/ui/gtk/autofill/autofill_popup_view_gtk.h b/chrome/browser/ui/gtk/autofill/autofill_popup_view_gtk.h
index d45b0a4c2a014075f9dc04c68d461cb13dae780b..8891976da8b885586c0d4fb338acd4af28dadea0 100644
--- a/chrome/browser/ui/gtk/autofill/autofill_popup_view_gtk.h
+++ b/chrome/browser/ui/gtk/autofill/autofill_popup_view_gtk.h
@@ -8,31 +8,35 @@
 
 #include <gtk/gtk.h>

[Ilya Sherman, 2012/01/20 07:26:47]

nit: Just noticed -- can the GTK classes be forward-declared rather than
#included here?

[csharp, 2012/01/20 16:20:44]

I don't think they can, I tried and ran into error messages like this, 
/usr/include/gtk-2.0/gdk/gdkevents.h:48: error: 'GdkEventExpose' has a previous
declaration here

Not exactly sure why, but I suspect it is because I had to include the font
header

[Elliot Glaysher, 2012/01/20 18:43:59]

So:

typedef struct _GdkEventExpose GdkEventExpose;
typedef struct _GtkWidget GtkWidget;

don't work?

[csharp, 2012/01/20 21:20:01]

Oops, they do. I was just using class GtkWidget. Updated the code and
resubmitting

 
-#include "base/string16.h"
 #include "chrome/browser/autofill/autofill_popup_view.h"
 #include "ui/base/gtk/gtk_signal.h"

[Ilya Sherman, 2012/01/20 07:26:47]

Ditto

[csharp, 2012/01/20 16:20:44]

This is needed to include the define for CHROMEGTK_CALLBACK_1

-
-#include <vector>
+#include "ui/gfx/font.h"
+#include "ui/gfx/rect.h"

[Ilya Sherman, 2012/01/20 07:26:47]

nit: Ditto (for rect.h; font.h clearly needs to be #included)

[csharp, 2012/01/20 16:20:44]

Done.

 
 class AutofillPopupViewGtk : public AutofillPopupView {
  public:
-  AutofillPopupViewGtk(content::WebContents* web_contents, GtkWidget* parent);
+  AutofillPopupViewGtk(content::WebContents* web_contents,
+                       GtkWidget* parent);

[Ilya Sherman, 2012/01/20 07:26:47]

nit: If this still fits on one line, no need to wrap the line.  (It's kind of a
weird bit of the style guide, but if *all* the parameters fit on one line, it's
fine to keep them all on one line.  Otherwise, they should be one per line [but
in header files only; either way is fine in implementation files].)

[csharp, 2012/01/20 16:20:44]

Done. I just forget to clean this up after removing some parameters.

   virtual ~AutofillPopupViewGtk();
 
   // AutofillPopupView implementations.
   virtual void Hide() OVERRIDE;
-  virtual void Show(const std::vector<string16>& autofill_values,
-                    const std::vector<string16>& autofill_labels,
-                    const std::vector<string16>& autofill_icons,
-                    const std::vector<int>& autofill_unique_ids,
-                    int separator_index) OVERRIDE;
+  virtual void ShowInternal() OVERRIDE;
 
  private:
   CHROMEGTK_CALLBACK_1(AutofillPopupViewGtk, gboolean, HandleExpose,
                        GdkEventExpose*);
 
+  // Setup the pango layout to display the autofill results.
+  void SetupLayout(const gfx::Rect& window_rect, const GdkColor& text_color);
+
   GtkWidget* parent_;  // Weak reference.
-  GtkWidget* window_;  // Strong refence.
+  GtkWidget* window_;  // Strong reference.
+  PangoLayout* layout_;  // Strong reference
+  gfx::Font font_;
+
+  // The height of each individual Autofill popup row.
+  int row_height_;
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_AUTOFILL_AUTOFILL_POPUP_VIEW_GTK_H_