diff options
| author | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-06 19:25:04 +0000 |
|---|---|---|
| committer | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-06 19:25:04 +0000 |
| commit | 6edd30623a1a83fc41a6ef6d436251a6f76adebe (patch) | |
| tree | 4a98fb98b1fad8e1b0f538f275148551851d926e /webkit/glue/localized_strings.cc | |
| parent | 89bc6d77f41481990d42ee41f28dbe90cfd8d872 (diff) | |
| download | chromium_src-6edd30623a1a83fc41a6ef6d436251a6f76adebe.zip chromium_src-6edd30623a1a83fc41a6ef6d436251a6f76adebe.tar.gz chromium_src-6edd30623a1a83fc41a6ef6d436251a6f76adebe.tar.bz2 | |
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
Diffstat (limited to 'webkit/glue/localized_strings.cc')
| -rw-r--r-- | webkit/glue/localized_strings.cc | 4 |
1 files changed, 3 insertions, 1 deletions
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()); |