Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(339)

Unified Diff: chrome/common/l10n_util.cc

Issue 28171: Wire up resource bundles on the mac:... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/common/l10n_util.cc
===================================================================
--- chrome/common/l10n_util.cc (revision 10428)
+++ chrome/common/l10n_util.cc (working copy)
@@ -18,10 +18,7 @@
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/gfx/chrome_canvas.h"
-#if defined(OS_WIN) || defined(OS_LINUX)
-// TODO(port): re-enable.
#include "chrome/common/resource_bundle.h"
-#endif
#if defined(OS_WIN)
#include "chrome/views/view.h"
#endif // defined(OS_WIN)
@@ -285,14 +282,8 @@
}
std::wstring GetString(int message_id) {
-#if defined(OS_WIN) || defined(OS_LINUX)
ResourceBundle &rb = ResourceBundle::GetSharedInstance();
return rb.GetLocalizedString(message_id);
-#else
- NOTIMPLEMENTED(); // TODO(port): Real implementation of GetString.
- // Return something non-empty so callers don't freak out.
- return L"true";
-#endif
}
static std::wstring GetStringF(int message_id,
@@ -301,16 +292,10 @@
const std::wstring& c,
const std::wstring& d,
std::vector<size_t>* offsets) {
-#if defined(OS_WIN) || defined(OS_LINUX)
-// 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,

Powered by Google App Engine
This is Rietveld 408576698