diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-13 19:39:58 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-13 19:39:58 +0000 |
| commit | e23d3a394aed0b7f353edfeaac2fc2181085c8ff (patch) | |
| tree | e5ae26a74ec8fa098aab0e9837ad8d4434ab6b08 /chrome/browser/automation | |
| parent | 997e70b24b8041d402f759587b8ce01c56f55c0b (diff) | |
| download | chromium_src-e23d3a394aed0b7f353edfeaac2fc2181085c8ff.zip chromium_src-e23d3a394aed0b7f353edfeaac2fc2181085c8ff.tar.gz chromium_src-e23d3a394aed0b7f353edfeaac2fc2181085c8ff.tar.bz2 | |
Convert infobar APIs to UTF-16.
The critical change is the base class in infobar_delegate.h.
The remainder is just adapting all users to that change.
I grepped for all instances of the three base functions whose
types I changed to be more sure that I found all classes that
tried to overload these functions. I sure wish C++ had an
@Override annotation. :~(
TEST=compiles
BUG=23581
Review URL: http://codereview.chromium.org/3127009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56066 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/automation')
| -rw-r--r-- | chrome/browser/automation/automation_provider.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index 850d613..8cffdbf 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -1752,10 +1752,8 @@ ListValue* AutomationProvider::GetInfobarsInfo(TabContents* tc) { infobar_item->SetString("type", "confirm_infobar"); ConfirmInfoBarDelegate* confirm_infobar = infobar->AsConfirmInfoBarDelegate(); - infobar_item->SetString("text", - WideToUTF16Hack(confirm_infobar->GetMessageText())); - infobar_item->SetString("link_text", - WideToUTF16Hack(confirm_infobar->GetLinkText())); + infobar_item->SetString("text", confirm_infobar->GetMessageText()); + infobar_item->SetString("link_text", confirm_infobar->GetLinkText()); ListValue* buttons_list = new ListValue; int buttons = confirm_infobar->GetButtons(); if (ConfirmInfoBarDelegate::BUTTON_OK & buttons) { @@ -1775,13 +1773,11 @@ ListValue* AutomationProvider::GetInfobarsInfo(TabContents* tc) { infobar_item->SetString("type", "alert_infobar"); AlertInfoBarDelegate* alert_infobar = infobar->AsAlertInfoBarDelegate(); - infobar_item->SetString("text", - WideToUTF16Hack(alert_infobar->GetMessageText())); + infobar_item->SetString("text", alert_infobar->GetMessageText()); } else if (infobar->AsLinkInfoBarDelegate()) { infobar_item->SetString("type", "link_infobar"); LinkInfoBarDelegate* link_infobar = infobar->AsLinkInfoBarDelegate(); - infobar_item->SetString("link_text", - WideToUTF16Hack(link_infobar->GetLinkText())); + infobar_item->SetString("link_text", link_infobar->GetLinkText()); } else if (infobar->AsTranslateInfoBarDelegate()) { infobar_item->SetString("type", "translate_infobar"); TranslateInfoBarDelegate* translate_infobar = |