summaryrefslogtreecommitdiffstats
path: root/webkit/glue/cpp_variant.cc
diff options
context:
space:
mode:
authorxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-22 16:40:49 +0000
committerxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-22 16:40:49 +0000
commit3d75a0c7627845e03ee87e82a5da40e133f55cc7 (patch)
tree1476ed5d68a2ce72224c7af0bd73ebf7d270aba6 /webkit/glue/cpp_variant.cc
parentc7c30a3e100279efe2503a3c635ed716a2658970 (diff)
downloadchromium_src-3d75a0c7627845e03ee87e82a5da40e133f55cc7.zip
chromium_src-3d75a0c7627845e03ee87e82a5da40e133f55cc7.tar.gz
chromium_src-3d75a0c7627845e03ee87e82a5da40e133f55cc7.tar.bz2
Fix a problem that text prefs are not hooked up with CrosSettings.
And bump up CppVariant::ToStringVector limit from 100 to 60000 so that we can pass more arguments through chrome.send. BUG=chromium-os:6827 TEST=Verify proxy setting values entered are sent to CrosSettingsProviderProxy. Review URL: http://codereview.chromium.org/3386009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60184 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/cpp_variant.cc')
-rw-r--r--webkit/glue/cpp_variant.cc4
1 files changed, 2 insertions, 2 deletions
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);