summaryrefslogtreecommitdiffstats
path: root/net/base
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-20 03:31:07 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-20 03:31:07 +0000
commiteb330ecc2065548f3225fb078302fe85549be0c8 (patch)
treee4754c7428e4ddd69bbfd94898df5f7998f44801 /net/base
parent3989908987250e72b9886f4fe8084ed089cfbf1d (diff)
downloadchromium_src-eb330ecc2065548f3225fb078302fe85549be0c8.zip
chromium_src-eb330ecc2065548f3225fb078302fe85549be0c8.tar.gz
chromium_src-eb330ecc2065548f3225fb078302fe85549be0c8.tar.bz2
[uber page] make references to chrome_shared2.css relative
otherwise open_sans.woff doesn't get loaded (not sure why) BUG=none TEST=open sans is used Review URL: https://chromiumcodereview.appspot.com/9254001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118402 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base')
-rw-r--r--net/base/mime_util.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc
index 3ba095d..8b3c5a8 100644
--- a/net/base/mime_util.cc
+++ b/net/base/mime_util.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -112,6 +112,7 @@ static const MimeInfo secondary_mappings[] = {
{ "application/pdf", "pdf" },
{ "application/postscript", "ps,eps,ai" },
{ "application/x-javascript", "js" },
+ { "application/x-woff", "woff" },
{ "image/bmp", "bmp" },
{ "image/x-icon", "ico" },
{ "image/jpeg", "jfif,pjpeg,pjp" },