OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 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 #ifndef ColorChooserUIController_h | 26 #ifndef ColorChooserUIController_h |
27 #define ColorChooserUIController_h | 27 #define ColorChooserUIController_h |
28 | 28 |
29 #if ENABLE(INPUT_TYPE_COLOR) | 29 #if ENABLE(INPUT_TYPE_COLOR) |
30 | 30 |
31 #include "ColorChooser.h" | |
32 #include "WebColorChooserClient.h" | 31 #include "WebColorChooserClient.h" |
| 32 #include "core/platform/ColorChooser.h" |
33 #include "core/platform/text/PlatformLocale.h" | 33 #include "core/platform/text/PlatformLocale.h" |
34 #include <wtf/OwnPtr.h> | 34 #include <wtf/OwnPtr.h> |
35 | 35 |
36 namespace WebCore { | 36 namespace WebCore { |
37 class ColorChooserClient; | 37 class ColorChooserClient; |
38 } | 38 } |
39 | 39 |
40 namespace WebKit { | 40 namespace WebKit { |
41 | 41 |
42 class ChromeClientImpl; | 42 class ChromeClientImpl; |
(...skipping 22 matching lines...) Expand all Loading... |
65 | 65 |
66 ChromeClientImpl* m_chromeClient; | 66 ChromeClientImpl* m_chromeClient; |
67 WebCore::ColorChooserClient* m_client; | 67 WebCore::ColorChooserClient* m_client; |
68 }; | 68 }; |
69 | 69 |
70 } | 70 } |
71 | 71 |
72 #endif // ENABLE(INPUT_TYPE_COLOR) | 72 #endif // ENABLE(INPUT_TYPE_COLOR) |
73 | 73 |
74 #endif // ColorChooserUIController_h | 74 #endif // ColorChooserUIController_h |
OLD | NEW |