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

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

Issue 2630693002: Make ScriptController inherit LocalWindowProxyManager
Patch Set: rebase Created 3 years, 11 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
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 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
9 * reserved. 9 * reserved.
10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 const Color&, 100 const Color&,
101 bool, 101 bool,
102 ScrollbarMode = ScrollbarAuto, 102 ScrollbarMode = ScrollbarAuto,
103 bool horizontalLock = false, 103 bool horizontalLock = false,
104 ScrollbarMode = ScrollbarAuto, 104 ScrollbarMode = ScrollbarAuto,
105 bool verticalLock = false); 105 bool verticalLock = false);
106 106
107 // Frame overrides: 107 // Frame overrides:
108 ~LocalFrame() override; 108 ~LocalFrame() override;
109 DECLARE_VIRTUAL_TRACE(); 109 DECLARE_VIRTUAL_TRACE();
110 WindowProxy* windowProxy(DOMWrapperWorld&) override;
111 void navigate(Document& originDocument, 110 void navigate(Document& originDocument,
112 const KURL&, 111 const KURL&,
113 bool replaceCurrentItem, 112 bool replaceCurrentItem,
114 UserGestureStatus) override; 113 UserGestureStatus) override;
115 void navigate(const FrameLoadRequest&) override; 114 void navigate(const FrameLoadRequest&) override;
116 void reload(FrameLoadType, ClientRedirectPolicy) override; 115 void reload(FrameLoadType, ClientRedirectPolicy) override;
117 void detach(FrameDetachType) override; 116 void detach(FrameDetachType) override;
118 bool shouldClose() override; 117 bool shouldClose() override;
119 SecurityContext* securityContext() const override; 118 SecurityContext* securityContext() const override;
120 void printNavigationErrorMessage(const Frame&, const char* reason) override; 119 void printNavigationErrorMessage(const Frame&, const char* reason) override;
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 explicit ScopedFrameBlamer(LocalFrame*); 377 explicit ScopedFrameBlamer(LocalFrame*);
379 ~ScopedFrameBlamer(); 378 ~ScopedFrameBlamer();
380 379
381 private: 380 private:
382 Member<LocalFrame> m_frame; 381 Member<LocalFrame> m_frame;
383 }; 382 };
384 383
385 } // namespace blink 384 } // namespace blink
386 385
387 #endif // LocalFrame_h 386 #endif // LocalFrame_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/Frame.h ('k') | third_party/WebKit/Source/core/frame/LocalFrame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698