Update to Chromium revision 242756.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1553 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2014-01-02 22:41:11 +00:00
parent 9daee785bd
commit 30c36156ea
42 changed files with 456 additions and 236 deletions

View File

@@ -116,17 +116,17 @@ CefJavaScriptDialog::CefJavaScriptDialog(
base::string16 label;
switch (message_type) {
case content::JAVASCRIPT_MESSAGE_TYPE_ALERT:
label = ASCIIToUTF16("JavaScript Alert");
label = base::ASCIIToUTF16("JavaScript Alert");
break;
case content::JAVASCRIPT_MESSAGE_TYPE_PROMPT:
label = ASCIIToUTF16("JavaScript Prompt");
label = base::ASCIIToUTF16("JavaScript Prompt");
break;
case content::JAVASCRIPT_MESSAGE_TYPE_CONFIRM:
label = ASCIIToUTF16("JavaScript Confirm");
label = base::ASCIIToUTF16("JavaScript Confirm");
break;
}
if (!display_url.empty())
label += ASCIIToUTF16(" - ") + display_url;
label += base::ASCIIToUTF16(" - ") + display_url;
[alert setMessageText:base::SysUTF16ToNSString(label)];