By changing how we #ifdef, we get a bunch more l10n functions.

Review URL: http://codereview.chromium.org/20171


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9405 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 6 insertions, 31 deletions

diff --git a/chrome/common/l10n_util.cc b/chrome/common/l10n_util.cc
index 562c205..1aeea0a 100644
--- a/chrome/common/l10n_util.cc
+++ b/chrome/common/l10n_util.cc
@@ -328,18 +328,22 @@ std::wstring GetString(int message_id) {
 #endif
 }
 
-#if defined(OS_WIN)
-// TODO(port): re-enable.
 static std::wstring GetStringF(int message_id,
                                const std::wstring& a,
                                const std::wstring& b,
                                const std::wstring& c,
                                const std::wstring& d,
                                std::vector<size_t>* offsets) {
+#if defined(OS_WIN)
+// TODO(port): re-enable.
   const std::wstring& format_string = GetString(message_id);
   std::wstring formatted = ReplaceStringPlaceholders(format_string, a, b, c,
                                                      d, offsets);
   return formatted;
+#else
+  NOTIMPLEMENTED();
+  return L"GetStringF NOTIMPLEMENTED";
+#endif  // defined(OS_WIN)
 }
 
 std::wstring GetStringF(int message_id,
@@ -387,7 +391,6 @@ std::wstring GetStringF(int message_id, int a) {
 std::wstring GetStringF(int message_id, int64 a) {
   return GetStringF(message_id, Int64ToWString(a));
 }
-#endif  // defined(OS_WIN)
 
 std::wstring TruncateString(const std::wstring& string, size_t length) {
   if (string.size() <= length)
diff --git a/chrome/common/temp_scaffolding_stubs.cc b/chrome/common/temp_scaffolding_stubs.cc
index 197a645..bdee164 100644
--- a/chrome/common/temp_scaffolding_stubs.cc
+++ b/chrome/common/temp_scaffolding_stubs.cc
@@ -350,34 +350,6 @@ void ProcessWatcher::EnsureProcessTerminated(int) {
 
 
 //--------------------------------------------------------------------------
-
-namespace l10n_util {
-
-std::wstring GetStringF(int message_id,
-                        const std::wstring& a) {
-  NOTIMPLEMENTED();
-  return L"";
-}
-
-std::wstring GetStringF(int message_id,
-                        const std::wstring& a,
-                        const std::wstring& b,
-                        std::vector<size_t>* offsets) {
-  NOTIMPLEMENTED();
-  return L"";
-}
-
-std::wstring GetStringF(int id,
-                        const std::wstring& a,
-                        const std::wstring& b,
-                        const std::wstring& c) {
-  NOTIMPLEMENTED();
-  return L"";
-}
-
-}  // l10n_util
-
-//--------------------------------------------------------------------------
 namespace webkit_glue {
 
 bool IsDefaultPluginEnabled() {