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

Side by Side Diff: Source/core/page/FocusController.h

Issue 634883002: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/page (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 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/page/EventSource.h ('k') | Source/core/page/FrameTree.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) 2006, 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007 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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 static FocusNavigationScope ownedByNonFocusableFocusScopeOwner(Node*); 53 static FocusNavigationScope ownedByNonFocusableFocusScopeOwner(Node*);
54 static FocusNavigationScope ownedByShadowHost(Node*); 54 static FocusNavigationScope ownedByShadowHost(Node*);
55 static FocusNavigationScope ownedByShadowInsertionPoint(HTMLShadowElement*); 55 static FocusNavigationScope ownedByShadowInsertionPoint(HTMLShadowElement*);
56 static FocusNavigationScope ownedByIFrame(HTMLFrameOwnerElement*); 56 static FocusNavigationScope ownedByIFrame(HTMLFrameOwnerElement*);
57 57
58 private: 58 private:
59 explicit FocusNavigationScope(TreeScope*); 59 explicit FocusNavigationScope(TreeScope*);
60 RawPtrWillBeMember<TreeScope> m_rootTreeScope; 60 RawPtrWillBeMember<TreeScope> m_rootTreeScope;
61 }; 61 };
62 62
63 class FocusController FINAL : public NoBaseWillBeGarbageCollectedFinalized<Focus Controller> { 63 class FocusController final : public NoBaseWillBeGarbageCollectedFinalized<Focus Controller> {
64 WTF_MAKE_NONCOPYABLE(FocusController); WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOV ED; 64 WTF_MAKE_NONCOPYABLE(FocusController); WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOV ED;
65 public: 65 public:
66 static PassOwnPtrWillBeRawPtr<FocusController> create(Page*); 66 static PassOwnPtrWillBeRawPtr<FocusController> create(Page*);
67 67
68 void setFocusedFrame(PassRefPtrWillBeRawPtr<Frame>); 68 void setFocusedFrame(PassRefPtrWillBeRawPtr<Frame>);
69 void focusDocumentView(PassRefPtrWillBeRawPtr<Frame>); 69 void focusDocumentView(PassRefPtrWillBeRawPtr<Frame>);
70 Frame* focusedFrame() const { return m_focusedFrame.get(); } 70 Frame* focusedFrame() const { return m_focusedFrame.get(); }
71 Frame* focusedOrMainFrame() const; 71 Frame* focusedOrMainFrame() const;
72 72
73 bool setInitialFocus(FocusType); 73 bool setInitialFocus(FocusType);
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 RawPtrWillBeMember<Page> m_page; 116 RawPtrWillBeMember<Page> m_page;
117 RefPtrWillBeMember<Frame> m_focusedFrame; 117 RefPtrWillBeMember<Frame> m_focusedFrame;
118 bool m_isActive; 118 bool m_isActive;
119 bool m_isFocused; 119 bool m_isFocused;
120 bool m_isChangingFocusedFrame; 120 bool m_isChangingFocusedFrame;
121 }; 121 };
122 122
123 } // namespace blink 123 } // namespace blink
124 124
125 #endif // FocusController_h 125 #endif // FocusController_h
OLDNEW
« no previous file with comments | « Source/core/page/EventSource.h ('k') | Source/core/page/FrameTree.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698