summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/resources/options.html1
-rw-r--r--webkit/glue/cpp_variant.cc4
2 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/resources/options.html b/chrome/browser/resources/options.html
index 350ad9c..656531f 100644
--- a/chrome/browser/resources/options.html
+++ b/chrome/browser/resources/options.html
@@ -288,6 +288,7 @@ cr.ui.decorate('input[pref][type=number]', options.PrefNumber);
cr.ui.decorate('input[pref][type=radio]', options.PrefRadio);
cr.ui.decorate('input[pref][type=range]', options.PrefRange);
cr.ui.decorate('select[pref]', options.PrefSelect);
+cr.ui.decorate('input[pref][type=text]', options.PrefTextField);
cr.ui.decorate('input[pref][type=url]', options.PrefTextField);
cr.ui.decorate('#contentSettingsPage input[type=radio]',
options.ContentSettingsRadio);
diff --git a/webkit/glue/cpp_variant.cc b/webkit/glue/cpp_variant.cc
index a254669..bf995fc 100644
--- a/webkit/glue/cpp_variant.cc
+++ b/webkit/glue/cpp_variant.cc
@@ -228,8 +228,8 @@ std::vector<std::wstring> CppVariant::ToStringVector() const {
length = NPVARIANT_TO_INT32(length_value);
WebBindings::releaseVariantValue(&length_value);
- // For sanity, only allow 100 items.
- length = std::min(100, length);
+ // For sanity, only allow 60000 items.
+ length = std::min(60000, length);
for (int i = 0; i < length; ++i) {
// Get each of the items.
std::string index = StringPrintf("%d", i);