summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/cocoa')
-rw-r--r--chrome/browser/cocoa/infobar_controller.mm18
-rw-r--r--chrome/browser/cocoa/infobar_controller_unittest.mm8
-rw-r--r--chrome/browser/cocoa/infobar_test_helper.h34
-rw-r--r--chrome/browser/cocoa/keystone_infobar.mm12
4 files changed, 36 insertions, 36 deletions
diff --git a/chrome/browser/cocoa/infobar_controller.mm b/chrome/browser/cocoa/infobar_controller.mm
index cd7d14d..3997074 100644
--- a/chrome/browser/cocoa/infobar_controller.mm
+++ b/chrome/browser/cocoa/infobar_controller.mm
@@ -344,7 +344,7 @@ const float kAnimateCloseDuration = 0.12;
// Insert the text.
AlertInfoBarDelegate* delegate = delegate_->AsAlertInfoBarDelegate();
DCHECK(delegate);
- [self setLabelToMessage:base::SysWideToNSString(delegate->GetMessageText())];
+ [self setLabelToMessage:base::SysUTF16ToNSString(delegate->GetMessageText())];
}
@end
@@ -368,9 +368,9 @@ const float kAnimateCloseDuration = 0.12;
LinkInfoBarDelegate* delegate = delegate_->AsLinkInfoBarDelegate();
DCHECK(delegate);
size_t offset = std::wstring::npos;
- std::wstring message = delegate->GetMessageTextWithOffset(&offset);
- [self setLabelToMessage:base::SysWideToNSString(message)
- withLink:base::SysWideToNSString(delegate->GetLinkText())
+ string16 message = delegate->GetMessageTextWithOffset(&offset);
+ [self setLabelToMessage:base::SysUTF16ToNSString(message)
+ withLink:base::SysUTF16ToNSString(delegate->GetLinkText())
atOffset:offset];
}
@@ -426,7 +426,7 @@ const float kAnimateCloseDuration = 0.12;
// Update and position the Cancel button if needed. Otherwise, hide it.
if (visibleButtons & ConfirmInfoBarDelegate::BUTTON_CANCEL) {
- [cancelButton_ setTitle:base::SysWideToNSString(
+ [cancelButton_ setTitle:base::SysUTF16ToNSString(
delegate->GetButtonLabel(ConfirmInfoBarDelegate::BUTTON_CANCEL))];
[GTMUILocalizerAndLayoutTweaker sizeToFitView:cancelButton_];
cancelButtonFrame = [cancelButton_ frame];
@@ -443,7 +443,7 @@ const float kAnimateCloseDuration = 0.12;
// Update and position the OK button if needed. Otherwise, hide it.
if (visibleButtons & ConfirmInfoBarDelegate::BUTTON_OK) {
- [okButton_ setTitle:base::SysWideToNSString(
+ [okButton_ setTitle:base::SysUTF16ToNSString(
delegate->GetButtonLabel(ConfirmInfoBarDelegate::BUTTON_OK))];
[GTMUILocalizerAndLayoutTweaker sizeToFitView:okButton_];
okButtonFrame = [okButton_ frame];
@@ -477,8 +477,8 @@ const float kAnimateCloseDuration = 0.12;
[label_.get() setFrame:frame];
// Set the text and link.
- NSString* message = base::SysWideToNSString(delegate->GetMessageText());
- std::wstring link = delegate->GetLinkText();
+ NSString* message = base::SysUTF16ToNSString(delegate->GetMessageText());
+ string16 link = delegate->GetLinkText();
if (link.empty()) {
// Simple case: no link, so just set the message directly.
[self setLabelToMessage:message];
@@ -490,7 +490,7 @@ const float kAnimateCloseDuration = 0.12;
// Add spacing between the label and the link.
message = [message stringByAppendingString:@" "];
[self setLabelToMessage:message
- withLink:base::SysWideToNSString(link)
+ withLink:base::SysUTF16ToNSString(link)
atOffset:[message length]];
}
}
diff --git a/chrome/browser/cocoa/infobar_controller_unittest.mm b/chrome/browser/cocoa/infobar_controller_unittest.mm
index ec7bf1e..114a94c 100644
--- a/chrome/browser/cocoa/infobar_controller_unittest.mm
+++ b/chrome/browser/cocoa/infobar_controller_unittest.mm
@@ -134,8 +134,8 @@ TEST_F(AlertInfoBarControllerTest, ShowAndDismiss) {
EXPECT_TRUE(delegate_.icon_accessed);
// Check to make sure the infobar message was set properly.
- EXPECT_EQ(std::wstring(kMockAlertInfoBarMessage),
- base::SysNSStringToWide([controller_.get() labelString]));
+ EXPECT_EQ(kMockAlertInfoBarMessage,
+ base::SysNSStringToUTF8([controller_.get() labelString]));
// Check that dismissing the infobar calls InfoBarClosed() on the delegate.
[controller_ dismiss:nil];
@@ -204,8 +204,8 @@ TEST_F(ConfirmInfoBarControllerTest, ShowAndDismiss) {
EXPECT_TRUE(delegate_.icon_accessed);
// Check to make sure the infobar message was set properly.
- EXPECT_EQ(std::wstring(kMockConfirmInfoBarMessage),
- base::SysNSStringToWide([controller_.get() labelString]));
+ EXPECT_EQ(kMockConfirmInfoBarMessage,
+ base::SysNSStringToUTF8([controller_.get() labelString]));
// Check that dismissing the infobar calls InfoBarClosed() on the delegate.
[controller_ dismiss:nil];
diff --git a/chrome/browser/cocoa/infobar_test_helper.h b/chrome/browser/cocoa/infobar_test_helper.h
index d83bdc1..e0247cd9 100644
--- a/chrome/browser/cocoa/infobar_test_helper.h
+++ b/chrome/browser/cocoa/infobar_test_helper.h
@@ -5,10 +5,10 @@
#include "chrome/browser/tab_contents/infobar_delegate.h"
namespace {
-const wchar_t* kMockAlertInfoBarMessage = L"MockAlertInfoBarMessage";
-const wchar_t* kMockLinkInfoBarMessage = L"MockLinkInfoBarMessage";
-const wchar_t* kMockLinkInfoBarLink = L"http://dev.chromium.org";
-const wchar_t* kMockConfirmInfoBarMessage = L"MockConfirmInfoBarMessage";
+const char kMockAlertInfoBarMessage[] = "MockAlertInfoBarMessage";
+const char kMockLinkInfoBarMessage[] = "MockLinkInfoBarMessage";
+const char kMockLinkInfoBarLink[] = "http://dev.chromium.org";
+const char kMockConfirmInfoBarMessage[] = "MockConfirmInfoBarMessage";
}
//////////////////////////////////////////////////////////////////////////
@@ -23,9 +23,9 @@ class MockAlertInfoBarDelegate : public AlertInfoBarDelegate {
closed(false) {
}
- virtual std::wstring GetMessageText() const {
+ virtual string16 GetMessageText() const {
message_text_accessed = true;
- return kMockAlertInfoBarMessage;
+ return ASCIIToUTF16(kMockAlertInfoBarMessage);
}
virtual SkBitmap* GetIcon() const {
@@ -55,14 +55,14 @@ class MockLinkInfoBarDelegate : public LinkInfoBarDelegate {
closes_on_action(true) {
}
- virtual std::wstring GetMessageTextWithOffset(size_t* link_offset) const {
+ virtual string16 GetMessageTextWithOffset(size_t* link_offset) const {
message_text_accessed = true;
- return kMockLinkInfoBarMessage;
+ return ASCIIToUTF16(kMockLinkInfoBarMessage);
}
- virtual std::wstring GetLinkText() const {
+ virtual string16 GetLinkText() const {
link_text_accessed = true;
- return kMockLinkInfoBarLink;
+ return ASCIIToUTF16(kMockLinkInfoBarLink);
}
virtual SkBitmap* GetIcon() const {
@@ -108,11 +108,11 @@ class MockConfirmInfoBarDelegate : public ConfirmInfoBarDelegate {
return (BUTTON_OK | BUTTON_CANCEL);
}
- virtual std::wstring GetButtonLabel(InfoBarButton button) const {
+ virtual string16 GetButtonLabel(InfoBarButton button) const {
if (button == BUTTON_OK)
- return L"OK";
+ return ASCIIToUTF16("OK");
else
- return L"Cancel";
+ return ASCIIToUTF16("Cancel");
}
virtual bool Accept() {
@@ -125,9 +125,9 @@ class MockConfirmInfoBarDelegate : public ConfirmInfoBarDelegate {
return closes_on_action;
}
- virtual std::wstring GetMessageText() const {
+ virtual string16 GetMessageText() const {
message_text_accessed = true;
- return kMockConfirmInfoBarMessage;
+ return ASCIIToUTF16(kMockConfirmInfoBarMessage);
}
virtual SkBitmap* GetIcon() const {
@@ -139,9 +139,9 @@ class MockConfirmInfoBarDelegate : public ConfirmInfoBarDelegate {
closed = true;
}
- virtual std::wstring GetLinkText() {
+ virtual string16 GetLinkText() {
link_text_accessed = true;
- return std::wstring();
+ return string16();
}
virtual bool LinkClicked(WindowOpenDisposition disposition) {
diff --git a/chrome/browser/cocoa/keystone_infobar.mm b/chrome/browser/cocoa/keystone_infobar.mm
index 377818a..7957605 100644
--- a/chrome/browser/cocoa/keystone_infobar.mm
+++ b/chrome/browser/cocoa/keystone_infobar.mm
@@ -62,9 +62,9 @@ class KeystonePromotionInfoBarDelegate : public ConfirmInfoBarDelegate {
// Inherited from AlertInfoBarDelegate and overridden.
- virtual std::wstring GetMessageText() const {
- return l10n_util::GetStringF(IDS_PROMOTE_INFOBAR_TEXT,
- l10n_util::GetString(IDS_PRODUCT_NAME));
+ virtual string16 GetMessageText() const {
+ return l10n_util::GetStringFUTF16(IDS_PROMOTE_INFOBAR_TEXT,
+ l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
}
virtual SkBitmap* GetIcon() const {
@@ -78,10 +78,10 @@ class KeystonePromotionInfoBarDelegate : public ConfirmInfoBarDelegate {
return BUTTON_OK | BUTTON_CANCEL | BUTTON_OK_DEFAULT;
}
- virtual std::wstring GetButtonLabel(InfoBarButton button) const {
+ virtual string16 GetButtonLabel(InfoBarButton button) const {
return button == BUTTON_OK ?
- l10n_util::GetString(IDS_PROMOTE_INFOBAR_PROMOTE_BUTTON) :
- l10n_util::GetString(IDS_PROMOTE_INFOBAR_DONT_ASK_BUTTON);
+ l10n_util::GetStringUTF16(IDS_PROMOTE_INFOBAR_PROMOTE_BUTTON) :
+ l10n_util::GetStringUTF16(IDS_PROMOTE_INFOBAR_DONT_ASK_BUTTON);
}
virtual bool Accept() {
generated by cgit v1.1 at 2025-02-08 19:18:27 +0000