Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / autofill / autofill_dialog_types.h

diff --git a/src/chrome/browser/ui/autofill/autofill_dialog_types.h b/src/chrome/browser/ui/autofill/autofill_dialog_types.h
index d257470..c7ebcea 100644 (file)
--- a/src/chrome/browser/ui/autofill/autofill_dialog_types.h
+++ b/src/chrome/browser/ui/autofill/autofill_dialog_types.h
@@ -14,7 +14,7 @@
 #include "components/autofill/core/browser/autofill_metrics.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "third_party/skia/include/core/SkColor.h"
-#include "ui/gfx/font.h"
+#include "ui/gfx/font_list.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/range/range.h"
 #include "ui/gfx/text_constants.h"
@@ -52,11 +52,6 @@ struct DetailInput {
   base::string16 initial_value;
 };
 
-// Determines whether |type| and |field| match.
-typedef base::Callback<bool(ServerFieldType type,
-                            const AutofillField& field)>
-    InputFieldComparator;
-
 // Sections of the dialog --- all fields that may be shown to the user fit under
 // one of these sections.
 enum DialogSection {
@@ -173,8 +168,8 @@ struct DialogOverlayString {
   // Text content of the message.
   base::string16 text;
 
-  // Font to render the message's text in.
-  gfx::Font font;
+  // Font list to render the message's text in.
+  gfx::FontList font_list;
 };
 
 // A struct to describe a dialog overlay. If |image| is empty, no overlay should
@@ -219,6 +214,8 @@ class ValidityMessages {
   ValidityMessages();
   ~ValidityMessages();
 
+  // Sets the message for |field|, but will not overwrite a previous, invalid
+  // message.
   void Set(ServerFieldType field, const ValidityMessage& message);
   const ValidityMessage& GetMessageOrDefault(ServerFieldType field) const;