Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2764)

Unified Diff: chrome/browser/ui/views/autofill/autofill_dialog_views.cc

Issue 12543032: Add views::RichLabel, a class which creates multi-line text with mixed (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/views/controls/rich_label.h » ('j') | ui/views/controls/rich_label.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/autofill/autofill_dialog_views.cc
diff --git a/chrome/browser/ui/views/autofill/autofill_dialog_views.cc b/chrome/browser/ui/views/autofill/autofill_dialog_views.cc
index b619e2f407274e3f0b5643d9d76f89e3a6b0a1ac..f1b18a50fdce35e9e84b99d762f10cdf3745f2c3 100644
--- a/chrome/browser/ui/views/autofill/autofill_dialog_views.cc
+++ b/chrome/browser/ui/views/autofill/autofill_dialog_views.cc
@@ -44,6 +44,8 @@
#include "ui/views/widget/widget.h"
#include "ui/views/window/dialog_client_view.h"
+#include "ui/views/controls/rich_label.h"
+
namespace autofill {
namespace {
@@ -725,8 +727,25 @@ views::View* AutofillDialogViews::CreateTitlebarExtraView() {
}
views::View* AutofillDialogViews::CreateFootnoteView() {
+ std::vector<string16> strings;
+ std::vector<GURL> urls;
+ strings.push_back(ASCIIToUTF16("This is text blob 1. "));
+ urls.push_back(GURL());
+ strings.push_back(ASCIIToUTF16("This is text blob 2. "));
+ urls.push_back(GURL());
+ strings.push_back(ASCIIToUTF16("This is text blob 3 (linky). "));
+ urls.push_back(GURL("http://www.google.com"));
+ strings.push_back(ASCIIToUTF16("This is text blob 4. "));
+ urls.push_back(GURL());
+ strings.push_back(ASCIIToUTF16("This is text blob 5. (linky) "));
+ urls.push_back(GURL("http://www.google.com"));
+ strings.push_back(ASCIIToUTF16("This is text blob 6. (linky) "));
+ urls.push_back(GURL("http://www.google.com"));
+
+ views::RichLabel* label = new views::RichLabel(strings, urls);
+
// TODO(estade): add a view to contain the terms of service.
- return NULL;
+ return label;
}
bool AutofillDialogViews::Cancel() {
« no previous file with comments | « no previous file | ui/views/controls/rich_label.h » ('j') | ui/views/controls/rich_label.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698