summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorrsadam@chromium.org <rsadam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-23 18:29:13 +0000
committerrsadam@chromium.org <rsadam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-23 18:29:13 +0000
commit58cba78f2ddc560a760a51c27bf6d239d887991b (patch)
tree8c67e5e0af5b084af0265f65cae66ba893ead94d /ui
parent949b9d0689f9ce7a185f3ecb16f9ba519fc3b03d (diff)
downloadchromium_src-58cba78f2ddc560a760a51c27bf6d239d887991b.zip
chromium_src-58cba78f2ddc560a760a51c27bf6d239d887991b.tar.gz
chromium_src-58cba78f2ddc560a760a51c27bf6d239d887991b.tar.bz2
Uprev polymer to 0.1.3 (attempt #2)
BUG=334022 Review URL: https://codereview.chromium.org/145273004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246651 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r--ui/keyboard/resources/polymer_loader.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/keyboard/resources/polymer_loader.js b/ui/keyboard/resources/polymer_loader.js
index 38a6280..259bd39 100644
--- a/ui/keyboard/resources/polymer_loader.js
+++ b/ui/keyboard/resources/polymer_loader.js
@@ -5,7 +5,7 @@
// This is necessary because polymer currently doesn't handle the configuration
// where native Custom Elements are available but native Shadow DOM is not.
// TODO(bshe): remove this line when polymer supports the configuration.
-document.register = undefined;
+document.registerElement = undefined;
<include src="../../../third_party/polymer/platform/platform.js"></include>
<include src="../../../third_party/polymer/polymer/polymer.js"></include>