From 6edd30623a1a83fc41a6ef6d436251a6f76adebe Mon Sep 17 00:00:00 2001 From: "jeremy@chromium.org" Date: Mon, 6 Oct 2008 19:25:04 +0000 Subject: Update localized_strings.cc post-merge Review URL: http://codereview.chromium.org/6497 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2890 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/glue/localized_strings.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'webkit/glue/localized_strings.cc') diff --git a/webkit/glue/localized_strings.cc b/webkit/glue/localized_strings.cc index 1d85676..10fe480 100644 --- a/webkit/glue/localized_strings.cc +++ b/webkit/glue/localized_strings.cc @@ -124,12 +124,14 @@ String WebCore::unknownFileSizeText() { } // These two are used in FileChooserWin.cpp. +#if PLATFORM(WIN) String WebCore::uploadFileText() { return String(); } String WebCore::allFilesText() { return String(); } +#endif // The following two functions are not declared in LocalizedStrings.h. // They are used by the menu for the HTML keygen tag. @@ -142,7 +144,7 @@ String keygenMenuMediumGradeKeySize() { } // Used in ImageDocument.cpp as the title for pages when that page is an image. -String WebCore::imageTitle(const String& filename, const IntSize& size) { +String imageTitle(const String& filename, const IntSize& size) { // C3 97 is UTF-8 for U+00D7 (multiplication sign). std::string size_str = StringPrintf(" (%d\xC3\x97%d)", size.width(), size.height()); -- cgit v1.1