summaryrefslogtreecommitdiffstats
path: root/chrome/common/googleurl_dummy.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-06 06:19:06 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-06 06:19:06 +0000
commit12d4fdeb1135644471afd12f5a9f368fcfdcd74a (patch)
tree750c69dccd386924fa6160f378658bb03f657d52 /chrome/common/googleurl_dummy.cc
parent7f88ee2ff55afc54409f2f91ba59eb620f4129a2 (diff)
downloadchromium_src-12d4fdeb1135644471afd12f5a9f368fcfdcd74a.zip
chromium_src-12d4fdeb1135644471afd12f5a9f368fcfdcd74a.tar.gz
chromium_src-12d4fdeb1135644471afd12f5a9f368fcfdcd74a.tar.bz2
Revert previous incorrect change that tries to fix the nacl64 build failure.
Supply a dummy implementation of url_util::AddStandardScheme that will allow us to link a 64-bit library on an otherwise 32-bit OS. We don't otherwise need googleurl (or else it wouldn't link for other reasons) so we're guaranteed not calling AddStandardScheme is OK. BUG=none TEST=none Review URL: http://codereview.chromium.org/668222 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40822 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/googleurl_dummy.cc')
-rw-r--r--chrome/common/googleurl_dummy.cc15
1 files changed, 15 insertions, 0 deletions
diff --git a/chrome/common/googleurl_dummy.cc b/chrome/common/googleurl_dummy.cc
new file mode 100644
index 0000000..475a5f1
--- /dev/null
+++ b/chrome/common/googleurl_dummy.cc
@@ -0,0 +1,15 @@
+// Copyright (c) 2010 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.
+
+namespace url_util {
+
+// A dummy version of the url_util function called by url_constants.cc for all
+// process types. For some processes, we don't want to link against googleurl.
+// rather than having complicated versions of that library (32 and 64 bit ones
+// on Windows) we just instead link this file in cases where googleurl isn't
+// otherwise necessary.
+void AddStandardScheme(const char* new_scheme) {
+}
+
+} // namespace url_util