diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-20 21:22:37 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-20 21:22:37 +0000 |
| commit | 559fd2cc6db35d5dd473849836e5b31396936a73 (patch) | |
| tree | e0cde62d5b6f120f64e1861299f8ae857278190c /net | |
| parent | 2306bbd5843b30f4e78a9342b60d580dce083794 (diff) | |
| download | chromium_src-559fd2cc6db35d5dd473849836e5b31396936a73.zip chromium_src-559fd2cc6db35d5dd473849836e5b31396936a73.tar.gz chromium_src-559fd2cc6db35d5dd473849836e5b31396936a73.tar.bz2 | |
generate test_shell.pak and hook up loading net resources from
test_shell.pak. Move the net resource loading into the platform
specific files (still a stub on osx).
Review URL: http://codereview.chromium.org/18186
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8321 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/net_util.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/base/net_util.cc b/net/base/net_util.cc index 6b24fe7..16adb8a 100644 --- a/net/base/net_util.cc +++ b/net/base/net_util.cc @@ -807,15 +807,15 @@ std::string CanonicalizeHost(const std::wstring& host, bool* is_ip_address) { } std::string GetDirectoryListingHeader(const std::string& title) { -#if defined(OS_WIN) +#if defined(OS_WIN) || defined(OS_LINUX) static const StringPiece header(NetModule::GetResource(IDR_DIR_HEADER_HTML)); if (header.empty()) { NOTREACHED() << "expected resource not found"; } std::string result(header.data(), header.size()); -#elif defined(OS_POSIX) +#elif defined(OS_MACOSX) // TODO(estade): Temporary hack. Remove these platform #ifdefs when we - // have implemented resources for non-Windows platforms. + // have implemented resources for OSX. LOG(INFO) << "FIXME: hacked resource loading"; FilePath path; PathService::Get(base::DIR_EXE, &path); |