From 31caf9184f97fc3a45eeac0d7fe869e261997e65 Mon Sep 17 00:00:00 2001 From: "tc@google.com" Date: Thu, 28 May 2009 21:23:18 +0000 Subject: Add general options page. Options are working with the following exceptions: Custom start urls and default search options widgets aren't hooked up. Home page settings work, but are overridden by the linux start page settings. Default browser checking/setting functions are not implemented, so the option isn't useful yet. Refactors some common code out of browser/views/options/options_page_view.* into browser/options_page_base.{cc,h} BUG=11507 Patch by Matt Mueller (mattm@google.com). Review URL: http://codereview.chromium.org/113967 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17115 0039d316-1c4b-4281-b951-d872f2087c98 --- app/l10n_util.cc | 5 +++++ app/l10n_util.h | 1 + 2 files changed, 6 insertions(+) (limited to 'app') diff --git a/app/l10n_util.cc b/app/l10n_util.cc index 1fb06af..81fb7f4 100644 --- a/app/l10n_util.cc +++ b/app/l10n_util.cc @@ -304,6 +304,11 @@ std::string GetStringUTF8(int message_id) { return UTF16ToUTF8(rb.GetLocalizedString(message_id)); } +string16 GetStringUTF16(int message_id) { + ResourceBundle& rb = ResourceBundle::GetSharedInstance(); + return rb.GetLocalizedString(message_id); +} + static string16 GetStringF(int message_id, const string16& a, const string16& b, diff --git a/app/l10n_util.h b/app/l10n_util.h index 0fe391c..69d3271 100644 --- a/app/l10n_util.h +++ b/app/l10n_util.h @@ -67,6 +67,7 @@ std::wstring GetLocalName(const std::string& locale_code_str, // Pulls resource string from the string bundle and returns it. std::wstring GetString(int message_id); std::string GetStringUTF8(int message_id); +string16 GetStringUTF16(int message_id); // Get a resource string and replace $1-$2-$3 with |a| and |b| // respectively. Additionally, $$ is replaced by $. -- cgit v1.1