| Index: content/renderer/date_time_formatter.cc
|
| diff --git a/content/renderer/date_time_formatter.cc b/content/renderer/date_time_formatter.cc
|
| index a0ce77b91cf84928a093d127208c573580389ec5..1b94049225f9a76f6dc87a654781341691051eb0 100644
|
| --- a/content/renderer/date_time_formatter.cc
|
| +++ b/content/renderer/date_time_formatter.cc
|
| @@ -77,10 +77,10 @@ static const char* FindLongestTimePatternWhichMatches(const std::string& value,
|
| }
|
|
|
| DateTimeFormatter::DateTimeFormatter(
|
| - const WebKit::WebDateTimeChooserParams& source)
|
| + const blink::WebDateTimeChooserParams& source)
|
| : formatted_string_(source.currentValue.utf8()) {
|
| CreatePatternMap();
|
| - if (source.type == WebKit::WebDateTimeInputTypeTime)
|
| + if (source.type == blink::WebDateTimeInputTypeTime)
|
| time_pattern_ =
|
| FindLongestTimePatternWhichMatches(formatted_string_, source.step);
|
| ExtractType(source);
|
| @@ -214,27 +214,27 @@ const std::string DateTimeFormatter::FormatString() const {
|
| }
|
|
|
| void DateTimeFormatter::ExtractType(
|
| - const WebKit::WebDateTimeChooserParams& source) {
|
| + const blink::WebDateTimeChooserParams& source) {
|
| switch (source.type) {
|
| - case WebKit::WebDateTimeInputTypeDate:
|
| + case blink::WebDateTimeInputTypeDate:
|
| type_ = ui::TEXT_INPUT_TYPE_DATE;
|
| break;
|
| - case WebKit::WebDateTimeInputTypeDateTime:
|
| + case blink::WebDateTimeInputTypeDateTime:
|
| type_ = ui::TEXT_INPUT_TYPE_DATE_TIME;
|
| break;
|
| - case WebKit::WebDateTimeInputTypeDateTimeLocal:
|
| + case blink::WebDateTimeInputTypeDateTimeLocal:
|
| type_ = ui::TEXT_INPUT_TYPE_DATE_TIME_LOCAL;
|
| break;
|
| - case WebKit::WebDateTimeInputTypeMonth:
|
| + case blink::WebDateTimeInputTypeMonth:
|
| type_ = ui::TEXT_INPUT_TYPE_MONTH;
|
| break;
|
| - case WebKit::WebDateTimeInputTypeTime:
|
| + case blink::WebDateTimeInputTypeTime:
|
| type_ = ui::TEXT_INPUT_TYPE_TIME;
|
| break;
|
| - case WebKit::WebDateTimeInputTypeWeek:
|
| + case blink::WebDateTimeInputTypeWeek:
|
| type_ = ui::TEXT_INPUT_TYPE_WEEK;
|
| break;
|
| - case WebKit::WebDateTimeInputTypeNone:
|
| + case blink::WebDateTimeInputTypeNone:
|
| default:
|
| type_ = ui::TEXT_INPUT_TYPE_NONE;
|
| }
|
|
|