| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2008, 2009, Google Inc. All rights reserved. | 2 * Copyright (c) 2008, 2009, Google Inc. All rights reserved. |
| 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). | 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
| 7 * met: | 7 * met: |
| 8 * | 8 * |
| 9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 23 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 24 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 24 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 30 */ | 30 */ |
| 31 | 31 |
| 32 #include "config.h" | 32 #include "config.h" |
| 33 #include "PopupMenuChromium.h" | 33 #include "core/platform/chromium/PopupMenuChromium.h" |
| 34 | 34 |
| 35 #include "Frame.h" | 35 #include "Frame.h" |
| 36 #include "FrameView.h" | 36 #include "FrameView.h" |
| 37 #include "Page.h" | 37 #include "Page.h" |
| 38 #include "PopupContainer.h" | |
| 39 #include "Settings.h" | 38 #include "Settings.h" |
| 39 #include "core/platform/chromium/PopupContainer.h" |
| 40 | 40 |
| 41 namespace WebCore { | 41 namespace WebCore { |
| 42 | 42 |
| 43 int PopupMenuChromium::s_minimumRowHeight = 0; | 43 int PopupMenuChromium::s_minimumRowHeight = 0; |
| 44 int PopupMenuChromium::s_optionRowHeightForTouch = 28; | 44 int PopupMenuChromium::s_optionRowHeightForTouch = 28; |
| 45 | 45 |
| 46 // The settings used for the drop down menu. | 46 // The settings used for the drop down menu. |
| 47 // This is the delegate used if none is provided. | 47 // This is the delegate used if none is provided. |
| 48 static const PopupContainerSettings dropDownSettings = { | 48 static const PopupContainerSettings dropDownSettings = { |
| 49 true, // setTextOnIndexChange | 49 true, // setTextOnIndexChange |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 88 p.popup->listBox()->updateFromElement(); | 88 p.popup->listBox()->updateFromElement(); |
| 89 } | 89 } |
| 90 | 90 |
| 91 | 91 |
| 92 void PopupMenuChromium::disconnectClient() | 92 void PopupMenuChromium::disconnectClient() |
| 93 { | 93 { |
| 94 m_popupClient = 0; | 94 m_popupClient = 0; |
| 95 } | 95 } |
| 96 | 96 |
| 97 } // namespace WebCore | 97 } // namespace WebCore |
| OLD | NEW |