diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-12 22:22:00 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-12 22:22:00 +0000 |
commit | 6a72a63f7956c2847b84cfe0e7f7a475a6e3dad1 (patch) | |
tree | 9bfa43e1d0962ec6e54a881253a9f792b8bc6fa0 /chrome/browser/chrome_browser_main_win.cc | |
parent | 5f4b6cba250c4f5cd3a5cde0cec90fa6bbc4545b (diff) | |
download | chromium_src-6a72a63f7956c2847b84cfe0e7f7a475a6e3dad1.zip chromium_src-6a72a63f7956c2847b84cfe0e7f7a475a6e3dad1.tar.gz chromium_src-6a72a63f7956c2847b84cfe0e7f7a475a6e3dad1.tar.bz2 |
Replace string16 with base::string16 in chrome/browser
TBR=sky
Review URL: https://codereview.chromium.org/112993002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240447 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_browser_main_win.cc')
-rw-r--r-- | chrome/browser/chrome_browser_main_win.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/chrome_browser_main_win.cc b/chrome/browser/chrome_browser_main_win.cc index 4756b6b..68b2712 100644 --- a/chrome/browser/chrome_browser_main_win.cc +++ b/chrome/browser/chrome_browser_main_win.cc @@ -405,7 +405,8 @@ bool ChromeBrowserMainPartsWin::CheckMachineLevelInstall() { return false; } -string16 TranslationDelegate::GetLocalizedString(int installer_string_id) { +base::string16 TranslationDelegate::GetLocalizedString( + int installer_string_id) { int resource_id = 0; switch (installer_string_id) { // HANDLE_STRING is used by the DO_INSTALLER_STRING_MAPPING macro which is in |