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

Side by Side Diff: third_party/WebKit/Source/web/DateTimeChooserImpl.cpp

Issue 1835773002: Rename AtomicString::string() to AtomicString::getString(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Windows Created 4 years, 9 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
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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * 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 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 "window.dialogArguments = {\n", data); 129 "window.dialogArguments = {\n", data);
130 addProperty("anchorRectInScreen", m_parameters.anchorRectInScreen, data); 130 addProperty("anchorRectInScreen", m_parameters.anchorRectInScreen, data);
131 float scaleFactor = m_chromeClient->windowToViewportScalar(1.0f); 131 float scaleFactor = m_chromeClient->windowToViewportScalar(1.0f);
132 addProperty("zoomFactor", zoomFactor() / scaleFactor, data); 132 addProperty("zoomFactor", zoomFactor() / scaleFactor, data);
133 addProperty("min", valueToDateTimeString(m_parameters.minimum, m_parameters. type), data); 133 addProperty("min", valueToDateTimeString(m_parameters.minimum, m_parameters. type), data);
134 addProperty("max", valueToDateTimeString(m_parameters.maximum, m_parameters. type), data); 134 addProperty("max", valueToDateTimeString(m_parameters.maximum, m_parameters. type), data);
135 addProperty("step", stepString, data); 135 addProperty("step", stepString, data);
136 addProperty("stepBase", stepBaseString, data); 136 addProperty("stepBase", stepBaseString, data);
137 addProperty("required", m_parameters.required, data); 137 addProperty("required", m_parameters.required, data);
138 addProperty("currentValue", valueToDateTimeString(m_parameters.doubleValue, m_parameters.type), data); 138 addProperty("currentValue", valueToDateTimeString(m_parameters.doubleValue, m_parameters.type), data);
139 addProperty("locale", m_parameters.locale.string(), data); 139 addProperty("locale", m_parameters.locale.getString(), data);
140 addProperty("todayLabel", todayLabelString, data); 140 addProperty("todayLabel", todayLabelString, data);
141 addProperty("clearLabel", locale().queryString(WebLocalizedString::CalendarC lear), data); 141 addProperty("clearLabel", locale().queryString(WebLocalizedString::CalendarC lear), data);
142 addProperty("weekLabel", locale().queryString(WebLocalizedString::WeekNumber Label), data); 142 addProperty("weekLabel", locale().queryString(WebLocalizedString::WeekNumber Label), data);
143 addProperty("axShowMonthSelector", locale().queryString(WebLocalizedString:: AXCalendarShowMonthSelector), data); 143 addProperty("axShowMonthSelector", locale().queryString(WebLocalizedString:: AXCalendarShowMonthSelector), data);
144 addProperty("axShowNextMonth", locale().queryString(WebLocalizedString::AXCa lendarShowNextMonth), data); 144 addProperty("axShowNextMonth", locale().queryString(WebLocalizedString::AXCa lendarShowNextMonth), data);
145 addProperty("axShowPreviousMonth", locale().queryString(WebLocalizedString:: AXCalendarShowPreviousMonth), data); 145 addProperty("axShowPreviousMonth", locale().queryString(WebLocalizedString:: AXCalendarShowPreviousMonth), data);
146 addProperty("weekStartDay", m_locale->firstDayOfWeek(), data); 146 addProperty("weekStartDay", m_locale->firstDayOfWeek(), data);
147 addProperty("shortMonthLabels", m_locale->shortMonthLabels(), data); 147 addProperty("shortMonthLabels", m_locale->shortMonthLabels(), data);
148 addProperty("dayLabels", m_locale->weekDayShortLabels(), data); 148 addProperty("dayLabels", m_locale->weekDayShortLabels(), data);
149 addProperty("isLocaleRTL", m_locale->isRTL(), data); 149 addProperty("isLocaleRTL", m_locale->isRTL(), data);
150 addProperty("isRTL", m_parameters.isAnchorElementRTL, data); 150 addProperty("isRTL", m_parameters.isAnchorElementRTL, data);
151 addProperty("mode", m_parameters.type.string(), data); 151 addProperty("mode", m_parameters.type.getString(), data);
152 if (m_parameters.suggestions.size()) { 152 if (m_parameters.suggestions.size()) {
153 Vector<String> suggestionValues; 153 Vector<String> suggestionValues;
154 Vector<String> localizedSuggestionValues; 154 Vector<String> localizedSuggestionValues;
155 Vector<String> suggestionLabels; 155 Vector<String> suggestionLabels;
156 for (unsigned i = 0; i < m_parameters.suggestions.size(); i++) { 156 for (unsigned i = 0; i < m_parameters.suggestions.size(); i++) {
157 suggestionValues.append(valueToDateTimeString(m_parameters.suggestio ns[i].value, m_parameters.type)); 157 suggestionValues.append(valueToDateTimeString(m_parameters.suggestio ns[i].value, m_parameters.type));
158 localizedSuggestionValues.append(m_parameters.suggestions[i].localiz edValue); 158 localizedSuggestionValues.append(m_parameters.suggestions[i].localiz edValue);
159 suggestionLabels.append(m_parameters.suggestions[i].label); 159 suggestionLabels.append(m_parameters.suggestions[i].label);
160 } 160 }
161 addProperty("suggestionValues", suggestionValues, data); 161 addProperty("suggestionValues", suggestionValues, data);
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 void DateTimeChooserImpl::didClosePopup() 206 void DateTimeChooserImpl::didClosePopup()
207 { 207 {
208 ASSERT(m_client); 208 ASSERT(m_client);
209 m_popup = nullptr; 209 m_popup = nullptr;
210 m_client->didEndChooser(); 210 m_client->didEndChooser();
211 } 211 }
212 212
213 } // namespace blink 213 } // namespace blink
214 214
215 #endif // ENABLE(INPUT_MULTIPLE_FIELDS_UI) 215 #endif // ENABLE(INPUT_MULTIPLE_FIELDS_UI)
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/network/ResourceTimingInfo.cpp ('k') | third_party/WebKit/Source/web/PopupMenuImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698