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

Side by Side Diff: Source/core/editing/MergeIdenticalElementsCommand.h

Issue 616603006: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/editing (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased the patch 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/core/editing/InsertTextCommand.h ('k') | Source/core/editing/MoveSelectionCommand.h » ('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) 2005, 2006, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2005, 2006, 2008 Apple 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 12 matching lines...) Expand all
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #ifndef MergeIdenticalElementsCommand_h 26 #ifndef MergeIdenticalElementsCommand_h
27 #define MergeIdenticalElementsCommand_h 27 #define MergeIdenticalElementsCommand_h
28 28
29 #include "core/editing/EditCommand.h" 29 #include "core/editing/EditCommand.h"
30 30
31 namespace blink { 31 namespace blink {
32 32
33 class MergeIdenticalElementsCommand FINAL : public SimpleEditCommand { 33 class MergeIdenticalElementsCommand final : public SimpleEditCommand {
34 public: 34 public:
35 static PassRefPtrWillBeRawPtr<MergeIdenticalElementsCommand> create(PassRefP trWillBeRawPtr<Element> element1, PassRefPtrWillBeRawPtr<Element> element2) 35 static PassRefPtrWillBeRawPtr<MergeIdenticalElementsCommand> create(PassRefP trWillBeRawPtr<Element> element1, PassRefPtrWillBeRawPtr<Element> element2)
36 { 36 {
37 return adoptRefWillBeNoop(new MergeIdenticalElementsCommand(element1, el ement2)); 37 return adoptRefWillBeNoop(new MergeIdenticalElementsCommand(element1, el ement2));
38 } 38 }
39 39
40 virtual void trace(Visitor*) OVERRIDE; 40 virtual void trace(Visitor*) override;
41 41
42 private: 42 private:
43 MergeIdenticalElementsCommand(PassRefPtrWillBeRawPtr<Element>, PassRefPtrWil lBeRawPtr<Element>); 43 MergeIdenticalElementsCommand(PassRefPtrWillBeRawPtr<Element>, PassRefPtrWil lBeRawPtr<Element>);
44 44
45 virtual void doApply() OVERRIDE; 45 virtual void doApply() override;
46 virtual void doUnapply() OVERRIDE; 46 virtual void doUnapply() override;
47 47
48 RefPtrWillBeMember<Element> m_element1; 48 RefPtrWillBeMember<Element> m_element1;
49 RefPtrWillBeMember<Element> m_element2; 49 RefPtrWillBeMember<Element> m_element2;
50 RefPtrWillBeMember<Node> m_atChild; 50 RefPtrWillBeMember<Node> m_atChild;
51 }; 51 };
52 52
53 } // namespace blink 53 } // namespace blink
54 54
55 #endif // MergeIdenticalElementsCommand_h 55 #endif // MergeIdenticalElementsCommand_h
OLDNEW
« no previous file with comments | « Source/core/editing/InsertTextCommand.h ('k') | Source/core/editing/MoveSelectionCommand.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698