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

Side by Side Diff: Source/web/ColorChooserUIController.cpp

Issue 23236002: Prepare for color input datalist support on Android (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 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 | « Source/web/ColorChooserPopupUIController.cpp ('k') | Source/web/WebColorSuggestion.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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 "ColorChooserUIController.h" 27 #include "ColorChooserUIController.h"
28 28
29 #include "ChromeClientImpl.h" 29 #include "ChromeClientImpl.h"
30 #include "WebColorChooser.h" 30 #include "WebColorChooser.h"
31 #include "WebColorSuggestion.h"
32 #include "WebViewClient.h"
33 #include "WebViewImpl.h"
31 #include "platform/ColorChooserClient.h" 34 #include "platform/ColorChooserClient.h"
32 #include "platform/graphics/Color.h" 35 #include "platform/graphics/Color.h"
33 #include "public/platform/WebColor.h" 36 #include "public/platform/WebColor.h"
34 37
35 using namespace WebCore; 38 using namespace WebCore;
36 39
37 namespace blink { 40 namespace blink {
38 41
39 42
40 ColorChooserUIController::ColorChooserUIController(ChromeClientImpl* chromeClien t, ColorChooserClient* client) 43 ColorChooserUIController::ColorChooserUIController(ChromeClientImpl* chromeClien t, ColorChooserClient* client)
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 void ColorChooserUIController::didEndChooser() 76 void ColorChooserUIController::didEndChooser()
74 { 77 {
75 ASSERT(m_client); 78 ASSERT(m_client);
76 m_chooser = nullptr; 79 m_chooser = nullptr;
77 m_client->didEndChooser(); 80 m_client->didEndChooser();
78 } 81 }
79 82
80 void ColorChooserUIController::openColorChooser() 83 void ColorChooserUIController::openColorChooser()
81 { 84 {
82 ASSERT(!m_chooser); 85 ASSERT(!m_chooser);
83 m_chooser = m_chromeClient->createWebColorChooser(this, static_cast<WebColor >(m_client->currentColor().rgb())); 86 WebViewClient* webViewClient = static_cast<WebViewImpl*>(m_chromeClient->web View())->client();
87 if (!webViewClient)
88 return;
89 m_chooser = adoptPtr(webViewClient->createColorChooser(this, static_cast<Web Color>(m_client->currentColor().rgb())));
84 } 90 }
85 91
86 } // namespace blink 92 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/ColorChooserPopupUIController.cpp ('k') | Source/web/WebColorSuggestion.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698