Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Side by Side Diff: webkit/port/platform/chromium/FileChooserChromium.cpp

Issue 11801: Wrap MSVC-specific pragmas. As -Wunknown-pragmas has been disabled for wtf,... (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 12 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 27
28 #pragma warning(push, 0) 28 #if COMPILER(MSVC)
29 __pragma(warning(push, 0))
30 #endif
29 #include "ChromeClientChromium.h" 31 #include "ChromeClientChromium.h"
30 #include "Document.h" 32 #include "Document.h"
31 #include "Frame.h" 33 #include "Frame.h"
32 #include "FileChooser.h" 34 #include "FileChooser.h"
33 #include "FileSystem.h" 35 #include "FileSystem.h"
34 #include "LocalizedStrings.h" 36 #include "LocalizedStrings.h"
35 #include "NotImplemented.h" 37 #include "NotImplemented.h"
36 #include "Page.h" 38 #include "Page.h"
37 #include "StringTruncator.h" 39 #include "StringTruncator.h"
38 #pragma warning(pop) 40 #if COMPILER(MSVC)
41 __pragma(warning(pop))
42 #endif
39 43
40 namespace WebCore { 44 namespace WebCore {
41 45
42 String FileChooser::basenameForWidth(const Font& font, int width) const 46 String FileChooser::basenameForWidth(const Font& font, int width) const
43 { 47 {
44 if (width <= 0) 48 if (width <= 0)
45 return String(); 49 return String();
46 50
47 String string; 51 String string;
48 if (!m_filenames.size()) 52 if (!m_filenames.size())
49 string = fileButtonNoFileSelectedLabel(); 53 string = fileButtonNoFileSelectedLabel();
50 else 54 else
51 string = pathGetFileName(m_filenames[0]); 55 string = pathGetFileName(m_filenames[0]);
52 56
53 return StringTruncator::centerTruncate(string, static_cast<float>(width), fo nt, false); 57 return StringTruncator::centerTruncate(string, static_cast<float>(width), fo nt, false);
54 } 58 }
55 59
56 } 60 }
OLDNEW
« no previous file with comments | « webkit/port/platform/chromium/ClipboardChromium.cpp ('k') | webkit/port/platform/chromium/PopupMenuChromium.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698