OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google 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 * | 7 * |
8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
(...skipping 10 matching lines...) Expand all Loading... |
21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
24 */ | 24 */ |
25 | 25 |
26 #include "config.h" | 26 #include "config.h" |
27 #include "ColorChooserPopupUIController.h" | 27 #include "ColorChooserPopupUIController.h" |
28 | 28 |
29 #if ENABLE(INPUT_TYPE_COLOR) && ENABLE(PAGE_POPUP) | 29 #if ENABLE(INPUT_TYPE_COLOR) && ENABLE(PAGE_POPUP) |
30 #include "ChromeClientImpl.h" | 30 #include "ChromeClientImpl.h" |
31 #include "ColorChooserClient.h" | |
32 #include "ColorSuggestionPicker.h" | 31 #include "ColorSuggestionPicker.h" |
33 #include "FrameView.h" | 32 #include "FrameView.h" |
34 #include "LocalizedStrings.h" | |
35 #include "PickerCommon.h" | 33 #include "PickerCommon.h" |
36 #include "WebColorChooser.h" | 34 #include "WebColorChooser.h" |
37 #include "WebViewImpl.h" | 35 #include "WebViewImpl.h" |
| 36 #include "core/platform/ColorChooserClient.h" |
| 37 #include "core/platform/LocalizedStrings.h" |
38 #include "core/platform/graphics/IntRect.h" | 38 #include "core/platform/graphics/IntRect.h" |
39 #include <public/Platform.h> | 39 #include <public/Platform.h> |
40 #include <public/WebLocalizedString.h> | 40 #include <public/WebLocalizedString.h> |
41 | 41 |
42 using namespace WebCore; | 42 using namespace WebCore; |
43 | 43 |
44 namespace WebKit { | 44 namespace WebKit { |
45 | 45 |
46 // Keep in sync with Actions in colorSuggestionPicker.js. | 46 // Keep in sync with Actions in colorSuggestionPicker.js. |
47 enum ColorPickerPopupAction { | 47 enum ColorPickerPopupAction { |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
145 | 145 |
146 void ColorChooserPopupUIController::closePopup() | 146 void ColorChooserPopupUIController::closePopup() |
147 { | 147 { |
148 if (!m_popup) | 148 if (!m_popup) |
149 return; | 149 return; |
150 m_chromeClient->closePagePopup(m_popup); | 150 m_chromeClient->closePagePopup(m_popup); |
151 } | 151 } |
152 | 152 |
153 } | 153 } |
154 #endif // ENABLE(INPUT_TYPE_COLOR) && ENABLE(PAGE_POPUP) | 154 #endif // ENABLE(INPUT_TYPE_COLOR) && ENABLE(PAGE_POPUP) |
OLD | NEW |