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

Side by Side Diff: Source/platform/text/DateTimeFormatTest.cpp

Issue 630853002: Replacing the OVERRIDE with override in third_party/WebKit/Source/platform (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase build fix Created 6 years, 2 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
« no previous file with comments | « Source/platform/testing/ArenaTestHelpers.h ('k') | Source/platform/text/LineEnding.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 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 virtual ~TokenHandler() { } 186 virtual ~TokenHandler() { }
187 187
188 FieldType fieldType(int index) const 188 FieldType fieldType(int index) const
189 { 189 {
190 return index >=0 && index < static_cast<int>(m_tokens.size()) ? m_to kens[index].fieldType : DateTimeFormat::FieldTypeInvalid; 190 return index >=0 && index < static_cast<int>(m_tokens.size()) ? m_to kens[index].fieldType : DateTimeFormat::FieldTypeInvalid;
191 } 191 }
192 192
193 Tokens tokens() const { return Tokens(m_tokens); } 193 Tokens tokens() const { return Tokens(m_tokens); }
194 194
195 private: 195 private:
196 virtual void visitField(FieldType fieldType, int count) OVERRIDE 196 virtual void visitField(FieldType fieldType, int count) override
197 { 197 {
198 m_tokens.append(Token(fieldType, count)); 198 m_tokens.append(Token(fieldType, count));
199 } 199 }
200 200
201 virtual void visitLiteral(const String& string) OVERRIDE 201 virtual void visitLiteral(const String& string) override
202 { 202 {
203 m_tokens.append(Token(string)); 203 m_tokens.append(Token(string));
204 } 204 }
205 205
206 Vector<Token> m_tokens; 206 Vector<Token> m_tokens;
207 }; 207 };
208 }; 208 };
209 209
210 std::ostream& operator<<(std::ostream& os, const DateTimeFormatTest::Tokens& tok ens) 210 std::ostream& operator<<(std::ostream& os, const DateTimeFormatTest::Tokens& tok ens)
211 { 211 {
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 EXPECT_EQ(DateTimeFormat::FieldTypeInvalid, single('O')); 328 EXPECT_EQ(DateTimeFormat::FieldTypeInvalid, single('O'));
329 EXPECT_EQ(DateTimeFormat::FieldTypeInvalid, single('P')); 329 EXPECT_EQ(DateTimeFormat::FieldTypeInvalid, single('P'));
330 EXPECT_EQ(DateTimeFormat::FieldTypeInvalid, single('R')); 330 EXPECT_EQ(DateTimeFormat::FieldTypeInvalid, single('R'));
331 EXPECT_EQ(DateTimeFormat::FieldTypeInvalid, single('T')); 331 EXPECT_EQ(DateTimeFormat::FieldTypeInvalid, single('T'));
332 EXPECT_EQ(DateTimeFormat::FieldTypeInvalid, single('U')); 332 EXPECT_EQ(DateTimeFormat::FieldTypeInvalid, single('U'));
333 EXPECT_EQ(DateTimeFormat::FieldTypeInvalid, single('V')); 333 EXPECT_EQ(DateTimeFormat::FieldTypeInvalid, single('V'));
334 EXPECT_EQ(DateTimeFormat::FieldTypeInvalid, single('X')); 334 EXPECT_EQ(DateTimeFormat::FieldTypeInvalid, single('X'));
335 } 335 }
336 336
337 #endif 337 #endif
OLDNEW
« no previous file with comments | « Source/platform/testing/ArenaTestHelpers.h ('k') | Source/platform/text/LineEnding.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698