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

Side by Side Diff: webkit/port/platform/chromium/PopupMenuChromium.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
« no previous file with comments | « webkit/port/platform/chromium/PopupMenuChromium.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2008, Google Inc. 1 // Copyright (c) 2008, Google Inc.
2 // All rights reserved. 2 // 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 are 5 // modification, are permitted provided that the following conditions are
6 // met: 6 // met:
7 // 7 //
8 // * Redistributions of source code must retain the above copyright 8 // * Redistributions of source code must retain the above copyright
9 // notice, this list of conditions and the following disclaimer. 9 // notice, this list of conditions and the following disclaimer.
10 // * Redistributions in binary form must reproduce the above 10 // * Redistributions in binary form must reproduce the above
(...skipping 11 matching lines...) Expand all
22 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 22 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 23 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 29
30 #include "config.h" 30 #include "config.h"
31 31
32 #pragma warning(push, 0) 32 #if COMPILER(MSVC)
33 __pragma(warning(push, 0))
34 #endif
33 #include "PopupMenu.h" 35 #include "PopupMenu.h"
34 36
35 #include "CharacterNames.h" 37 #include "CharacterNames.h"
36 #include "ChromeClientChromium.h" 38 #include "ChromeClientChromium.h"
37 #include "Document.h" 39 #include "Document.h"
38 #include "Font.h" 40 #include "Font.h"
39 #include "FrameView.h" 41 #include "FrameView.h"
40 #include "FontSelector.h" 42 #include "FontSelector.h"
41 #include "Frame.h" 43 #include "Frame.h"
42 #include "FramelessScrollView.h" 44 #include "FramelessScrollView.h"
43 #include "FramelessScrollViewClient.h" 45 #include "FramelessScrollViewClient.h"
44 #include "GraphicsContext.h" 46 #include "GraphicsContext.h"
45 #include "IntRect.h" 47 #include "IntRect.h"
46 #include "KeyboardCodes.h" 48 #include "KeyboardCodes.h"
47 #include "NotImplemented.h" 49 #include "NotImplemented.h"
48 #include "Page.h" 50 #include "Page.h"
49 #include "PlatformKeyboardEvent.h" 51 #include "PlatformKeyboardEvent.h"
50 #include "PlatformMouseEvent.h" 52 #include "PlatformMouseEvent.h"
51 #include "PlatformScreen.h" 53 #include "PlatformScreen.h"
52 #include "PlatformWheelEvent.h" 54 #include "PlatformWheelEvent.h"
53 #include "RenderBlock.h" 55 #include "RenderBlock.h"
54 #include "RenderTheme.h" 56 #include "RenderTheme.h"
55 #include "ScrollbarTheme.h" 57 #include "ScrollbarTheme.h"
56 #include "SystemTime.h" 58 #include "SystemTime.h"
57 #include "Widget.h" 59 #include "Widget.h"
58 #pragma warning(pop) 60 #if COMPILER(MSVC)
61 __pragma(warning(pop))
62 #endif
59 63
60 #include "webkit/port/platform/chromium/PopupMenuChromium.h" 64 #include "webkit/port/platform/chromium/PopupMenuChromium.h"
61 65
62 using namespace WTF; 66 using namespace WTF;
63 using namespace Unicode; 67 using namespace Unicode;
64 68
65 using std::min; 69 using std::min;
66 using std::max; 70 using std::max;
67 71
68 namespace WebCore { 72 namespace WebCore {
(...skipping 1001 matching lines...) Expand 10 before | Expand all | Expand 10 after
1070 { 1074 {
1071 p.m_popup->listBox()->updateFromElement(); 1075 p.m_popup->listBox()->updateFromElement();
1072 } 1076 }
1073 1077
1074 bool PopupMenu::itemWritingDirectionIsNatural() 1078 bool PopupMenu::itemWritingDirectionIsNatural()
1075 { 1079 {
1076 return false; 1080 return false;
1077 } 1081 }
1078 1082
1079 } // namespace WebCore 1083 } // namespace WebCore
OLDNEW
« no previous file with comments | « webkit/port/platform/chromium/PopupMenuChromium.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698