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

Side by Side Diff: Source/core/frame/LocalFrame.h

Issue 635853002: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/frame (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/frame/LocalDOMWindow.cpp ('k') | Source/core/frame/Location.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) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999-2001 Lars Knoll <knoll@kde.org> 3 * 1999-2001 Lars Knoll <knoll@kde.org>
4 * 1999-2001 Antti Koivisto <koivisto@kde.org> 4 * 1999-2001 Antti Koivisto <koivisto@kde.org>
5 * 2000-2001 Simon Hausmann <hausmann@kde.org> 5 * 2000-2001 Simon Hausmann <hausmann@kde.org>
6 * 2000-2001 Dirk Mueller <mueller@kde.org> 6 * 2000-2001 Dirk Mueller <mueller@kde.org>
7 * 2000 Stefan Schimanski <1Stein@gmx.de> 7 * 2000 Stefan Schimanski <1Stein@gmx.de>
8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
9 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 9 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
10 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> 10 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 class TreeScope; 60 class TreeScope;
61 class ScriptController; 61 class ScriptController;
62 class SpellChecker; 62 class SpellChecker;
63 class TreeScope; 63 class TreeScope;
64 class VisiblePosition; 64 class VisiblePosition;
65 65
66 class LocalFrame : public Frame, public WillBeHeapSupplementable<LocalFrame> { 66 class LocalFrame : public Frame, public WillBeHeapSupplementable<LocalFrame> {
67 public: 67 public:
68 static PassRefPtrWillBeRawPtr<LocalFrame> create(FrameLoaderClient*, Fra meHost*, FrameOwner*); 68 static PassRefPtrWillBeRawPtr<LocalFrame> create(FrameLoaderClient*, Fra meHost*, FrameOwner*);
69 69
70 virtual bool isLocalFrame() const OVERRIDE { return true; } 70 virtual bool isLocalFrame() const override { return true; }
71 71
72 void init(); 72 void init();
73 void setView(PassRefPtr<FrameView>); 73 void setView(PassRefPtr<FrameView>);
74 void createView(const IntSize&, const Color&, bool, 74 void createView(const IntSize&, const Color&, bool,
75 ScrollbarMode = ScrollbarAuto, bool horizontalLock = false, 75 ScrollbarMode = ScrollbarAuto, bool horizontalLock = false,
76 ScrollbarMode = ScrollbarAuto, bool verticalLock = false); 76 ScrollbarMode = ScrollbarAuto, bool verticalLock = false);
77 77
78 virtual ~LocalFrame(); 78 virtual ~LocalFrame();
79 virtual void trace(Visitor*) OVERRIDE; 79 virtual void trace(Visitor*) override;
80 80
81 virtual void navigate(Document& originDocument, const KURL&, const Refer rer&, bool lockBackForwardList) OVERRIDE; 81 virtual void navigate(Document& originDocument, const KURL&, const Refer rer&, bool lockBackForwardList) override;
82 virtual void detach() OVERRIDE; 82 virtual void detach() override;
83 83
84 void addDestructionObserver(FrameDestructionObserver*); 84 void addDestructionObserver(FrameDestructionObserver*);
85 void removeDestructionObserver(FrameDestructionObserver*); 85 void removeDestructionObserver(FrameDestructionObserver*);
86 86
87 void willDetachFrameHost(); 87 void willDetachFrameHost();
88 void detachFromFrameHost(); 88 void detachFromFrameHost();
89 89
90 virtual void disconnectOwnerElement() OVERRIDE; 90 virtual void disconnectOwnerElement() override;
91 91
92 virtual void setDOMWindow(PassRefPtrWillBeRawPtr<LocalDOMWindow>) OVERRI DE; 92 virtual void setDOMWindow(PassRefPtrWillBeRawPtr<LocalDOMWindow>) overri de;
93 FrameView* view() const; 93 FrameView* view() const;
94 Document* document() const; 94 Document* document() const;
95 void setPagePopupOwner(Element&); 95 void setPagePopupOwner(Element&);
96 Element* pagePopupOwner() const { return m_pagePopupOwner.get(); } 96 Element* pagePopupOwner() const { return m_pagePopupOwner.get(); }
97 97
98 RenderView* contentRenderer() const; // Root of the render tree for the document contained in this frame. 98 RenderView* contentRenderer() const; // Root of the render tree for the document contained in this frame.
99 99
100 Editor& editor() const; 100 Editor& editor() const;
101 EventHandler& eventHandler() const; 101 EventHandler& eventHandler() const;
102 FrameLoader& loader() const; 102 FrameLoader& loader() const;
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 DEFINE_TYPE_CASTS(LocalFrame, Frame, localFrame, localFrame->isLocalFrame(), localFrame.isLocalFrame()); 256 DEFINE_TYPE_CASTS(LocalFrame, Frame, localFrame, localFrame->isLocalFrame(), localFrame.isLocalFrame());
257 257
258 } // namespace blink 258 } // namespace blink
259 259
260 // During refactoring, there are some places where we need to do type conversion s that 260 // During refactoring, there are some places where we need to do type conversion s that
261 // will not be needed once all instances of LocalFrame and RemoteFrame are sorte d out. 261 // will not be needed once all instances of LocalFrame and RemoteFrame are sorte d out.
262 // At that time this #define will be removed and all the uses of it will need to be corrected. 262 // At that time this #define will be removed and all the uses of it will need to be corrected.
263 #define toLocalFrameTemporary toLocalFrame 263 #define toLocalFrameTemporary toLocalFrame
264 264
265 #endif // LocalFrame_h 265 #endif // LocalFrame_h
OLDNEW
« no previous file with comments | « Source/core/frame/LocalDOMWindow.cpp ('k') | Source/core/frame/Location.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698