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 19 matching lines...) Expand all Loading... |
30 #include "ColorSuggestionPicker.h" | 30 #include "ColorSuggestionPicker.h" |
31 #include "PickerCommon.h" | 31 #include "PickerCommon.h" |
32 #include "WebColorChooser.h" | 32 #include "WebColorChooser.h" |
33 #include "WebViewImpl.h" | 33 #include "WebViewImpl.h" |
34 #include "core/frame/FrameView.h" | 34 #include "core/frame/FrameView.h" |
35 #include "platform/ColorChooserClient.h" | 35 #include "platform/ColorChooserClient.h" |
36 #include "platform/geometry/IntRect.h" | 36 #include "platform/geometry/IntRect.h" |
37 | 37 |
38 using namespace WebCore; | 38 using namespace WebCore; |
39 | 39 |
40 namespace WebKit { | 40 namespace blink { |
41 | 41 |
42 // Keep in sync with Actions in colorSuggestionPicker.js. | 42 // Keep in sync with Actions in colorSuggestionPicker.js. |
43 enum ColorPickerPopupAction { | 43 enum ColorPickerPopupAction { |
44 ColorPickerPopupActionChooseOtherColor = -2, | 44 ColorPickerPopupActionChooseOtherColor = -2, |
45 ColorPickerPopupActionCancel = -1, | 45 ColorPickerPopupActionCancel = -1, |
46 ColorPickerPopupActionSetValue = 0 | 46 ColorPickerPopupActionSetValue = 0 |
47 }; | 47 }; |
48 | 48 |
49 ColorChooserPopupUIController::ColorChooserPopupUIController(ChromeClientImpl* c
hromeClient, ColorChooserClient* client) | 49 ColorChooserPopupUIController::ColorChooserPopupUIController(ChromeClientImpl* c
hromeClient, ColorChooserClient* client) |
50 : ColorChooserUIController(chromeClient, client) | 50 : ColorChooserUIController(chromeClient, client) |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
140 } | 140 } |
141 | 141 |
142 void ColorChooserPopupUIController::closePopup() | 142 void ColorChooserPopupUIController::closePopup() |
143 { | 143 { |
144 if (!m_popup) | 144 if (!m_popup) |
145 return; | 145 return; |
146 m_chromeClient->closePagePopup(m_popup); | 146 m_chromeClient->closePagePopup(m_popup); |
147 } | 147 } |
148 | 148 |
149 } | 149 } |
OLD | NEW |