summaryrefslogtreecommitdiffstats
path: root/content/browser
diff options
context:
space:
mode:
authorBalazs Engedy <engedy@chromium.org>2015-06-02 13:32:08 +0200
committerBalazs Engedy <engedy@chromium.org>2015-06-02 11:33:34 +0000
commit892499aaa074c46ff008a58cb909fc43b7970d3f (patch)
tree0a7f869d1d53f4bfb3e2a0de5b59dbb6ef2b8f74 /content/browser
parent44697065260b69aa691dd3829aac7db0f6064a5b (diff)
downloadchromium_src-892499aaa074c46ff008a58cb909fc43b7970d3f.zip
chromium_src-892499aaa074c46ff008a58cb909fc43b7970d3f.tar.gz
chromium_src-892499aaa074c46ff008a58cb909fc43b7970d3f.tar.bz2
Revert "Rename polymer and cr_elements v0_8 to v1_0"
This manually reverts commit 1a35e51b496b63547fc08de98cfbd2e0d53cc9bc. It has caused compile errors across the board. BUG=489785 Review URL: https://codereview.chromium.org/1162963002 Cr-Commit-Position: refs/heads/master@{#332368}
Diffstat (limited to 'content/browser')
-rw-r--r--content/browser/webui/shared_resources_data_source.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/content/browser/webui/shared_resources_data_source.cc b/content/browser/webui/shared_resources_data_source.cc
index e990648..3f96e76 100644
--- a/content/browser/webui/shared_resources_data_source.cc
+++ b/content/browser/webui/shared_resources_data_source.cc
@@ -27,7 +27,7 @@ using ResourcesMap = base::hash_map<std::string, int>;
// TODO(rkc): Once we have a separate source for apps, remove '*/apps/' aliases.
const char* kPathAliases[][2] = {
{"../../../third_party/polymer/components-chromium/", "polymer/"},
- {"../../../third_party/polymer/v1_0/components-chromium/", "polymer/v1_0/"},
+ {"../../../third_party/polymer/v0_8/components-chromium/", "polymer/v0_8/"},
{"../../../third_party/web-animations-js/sources/",
"polymer/web-animations-js/"},
{"../../resources/default_100_percent/common/", "images/apps/"},