diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-03 08:33:10 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-03 08:33:10 +0000 |
| commit | d6687a9f84f342030ed82589f9051d110f7b1a5f (patch) | |
| tree | 50f36a7507a1846799a33ef252bb10e20e7ad297 /chrome/browser/views/extensions/extension_install_prompt2.cc | |
| parent | c5c3c5b5f3b11fcef3d3b89d5be656ff4794de89 (diff) | |
| download | chromium_src-d6687a9f84f342030ed82589f9051d110f7b1a5f.zip chromium_src-d6687a9f84f342030ed82589f9051d110f7b1a5f.tar.gz chromium_src-d6687a9f84f342030ed82589f9051d110f7b1a5f.tar.bz2 | |
Fix build break in linux_views from r43575.
BUG=29633
TBR=jrg@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43576 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/extensions/extension_install_prompt2.cc')
| -rw-r--r-- | chrome/browser/views/extensions/extension_install_prompt2.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/views/extensions/extension_install_prompt2.cc b/chrome/browser/views/extensions/extension_install_prompt2.cc index 478b166..1bbcb14 100644 --- a/chrome/browser/views/extensions/extension_install_prompt2.cc +++ b/chrome/browser/views/extensions/extension_install_prompt2.cc @@ -4,6 +4,7 @@ #include "app/l10n_util.h" #include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/extensions/extension_install_ui.h" @@ -58,7 +59,7 @@ class InstallDialogContent2 InstallDialogContent2(ExtensionInstallUI::Delegate* delegate, Extension* extension, SkBitmap* icon, - const std::vector<std::wstring>& permissions); + const std::vector<string16>& permissions); private: // DialogDelegate overrides. @@ -108,7 +109,7 @@ class InstallDialogContent2 InstallDialogContent2::InstallDialogContent2( ExtensionInstallUI::Delegate* delegate, Extension* extension, - SkBitmap* icon, const std::vector<std::wstring>& permissions) + SkBitmap* icon, const std::vector<string16>& permissions) : delegate_(delegate), icon_(NULL), heading_(NULL), @@ -155,7 +156,7 @@ InstallDialogContent2::InstallDialogContent2( } for (size_t i = 0; i < permissions.size(); ++i) { - views::Label* label = new views::Label(permissions[i]); + views::Label* label = new views::Label(UTF16ToWide(permissions[i])); label->SetMultiLine(true); label->SetHorizontalAlignment(views::Label::ALIGN_LEFT); permission_box_->AddChildView(label); @@ -290,7 +291,7 @@ void InstallDialogContent2::Layout() { // static void ExtensionInstallUI::ShowExtensionInstallUIPrompt2Impl( Profile* profile, Delegate* delegate, Extension* extension, SkBitmap* icon, - const std::vector<std::wstring>& permissions) { + const std::vector<string16>& permissions) { Browser* browser = BrowserList::GetLastActiveWithProfile(profile); if (!browser) { delegate->InstallUIAbort(); |