Source/web/ColorChooserUIController.cpp - Issue 23236002: Prepare for color input datalist support on Android

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Added labels Created 7 years, 4 months 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

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 62 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
73 void ColorChooserUIController::didEndChooser()	73 void ColorChooserUIController::didEndChooser()

74 {	74 {

75 ASSERT(m_client);	75 ASSERT(m_client);

76 m_chooser = nullptr;	76 m_chooser = nullptr;

77 m_client->didEndChooser();	77 m_client->didEndChooser();

78 }	78 }

79	79

80 void ColorChooserUIController::openColorChooser()	80 void ColorChooserUIController::openColorChooser()

81 {	81 {

82 ASSERT(!m_chooser);	82 ASSERT(!m_chooser);

83 m_chooser = m_chromeClient->createWebColorChooser(this, static_cast<WebColor >(m_client->currentColor().rgb()));	83 m_chooser = m_chromeClient->createWebColorChooser(this, static_cast<WebColor >(m_client->currentColor().rgb()), m_client->suggestions(), m_client->suggestion Labels());

84 }	84 }

85	85

86 } // namespace WebKit	86 } // namespace WebKit

OLD	NEW

« Source/web/ChromeClientImpl.h ('K') | « Source/web/ChromeClientImpl.cpp ('k') | public/web/WebViewClient.h » ('j') | public/web/WebViewClient.h » ('J')