diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-20 23:09:17 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-20 23:09:17 +0000 |
| commit | cff21124f524a16f05f1c8e4c748b400d6157b35 (patch) | |
| tree | cbd3f9e7fbde3fe2c941b563bdd37928a41972fd /chrome/browser/first_run | |
| parent | c64e4d5a9bbeb52c670c937b539d6e6e9400ffe9 (diff) | |
| download | chromium_src-cff21124f524a16f05f1c8e4c748b400d6157b35.zip chromium_src-cff21124f524a16f05f1c8e4c748b400d6157b35.tar.gz chromium_src-cff21124f524a16f05f1c8e4c748b400d6157b35.tar.bz2 | |
chrome://terms should show the terms and conditions
Restore chrome://terms after r143212 by using l10n_util, which will
look in the locale pak file for the html. Also renamed the resource
to IDS_ to make it clear we should be using l10n_util.
BUG=133814
TEST=Load chrome://terms and view source. In chromium, you should see
something about pies.
Review URL: https://chromiumcodereview.appspot.com/10578054
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143288 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/first_run')
| -rw-r--r-- | chrome/browser/first_run/first_run_win.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/first_run/first_run_win.cc b/chrome/browser/first_run/first_run_win.cc index 31461fa..eb64d8c 100644 --- a/chrome/browser/first_run/first_run_win.cc +++ b/chrome/browser/first_run/first_run_win.cc @@ -48,8 +48,8 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/layout.h" -#include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_switches.h" namespace { @@ -193,9 +193,7 @@ bool IsEulaNotAccepted(installer::MasterPreferences* install_prefs) { // Writes the EULA to a temporary file, returned in |*eula_path|, and returns // true if successful. bool WriteEULAtoTempFile(FilePath* eula_path) { - base::StringPiece terms = - ResourceBundle::GetSharedInstance().GetRawDataResource( - IDR_TERMS_HTML, ui::SCALE_FACTOR_NONE); + std::string terms = l10n_util::GetStringUTF8(IDS_TERMS_HTML); if (terms.empty()) return false; FILE *file = file_util::CreateAndOpenTemporaryFile(eula_path); |