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

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

Issue 1780603002: blink: Rename bindings/ methods to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-bindings: rebase Created 4 years, 9 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 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 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 bool isNavigationAllowed() const { return m_navigationDisableCount == 0; } 189 bool isNavigationAllowed() const { return m_navigationDisableCount == 0; }
190 190
191 private: 191 private:
192 friend class FrameNavigationDisabler; 192 friend class FrameNavigationDisabler;
193 193
194 LocalFrame(FrameLoaderClient*, FrameHost*, FrameOwner*); 194 LocalFrame(FrameLoaderClient*, FrameHost*, FrameOwner*);
195 195
196 bool shouldScrollTopControls(const FloatSize& delta) const; 196 bool shouldScrollTopControls(const FloatSize& delta) const;
197 197
198 // Internal Frame helper overrides: 198 // Internal Frame helper overrides:
199 WindowProxyManager* windowProxyManager() const override; 199 WindowProxyManager* getWindowProxyManager() const override;
200 200
201 String localLayerTreeAsText(unsigned flags) const; 201 String localLayerTreeAsText(unsigned flags) const;
202 202
203 void enableNavigation() { --m_navigationDisableCount; } 203 void enableNavigation() { --m_navigationDisableCount; }
204 void disableNavigation() { ++m_navigationDisableCount; } 204 void disableNavigation() { ++m_navigationDisableCount; }
205 205
206 mutable FrameLoader m_loader; 206 mutable FrameLoader m_loader;
207 OwnPtrWillBeMember<NavigationScheduler> m_navigationScheduler; 207 OwnPtrWillBeMember<NavigationScheduler> m_navigationScheduler;
208 208
209 RefPtrWillBeMember<FrameView> m_view; 209 RefPtrWillBeMember<FrameView> m_view;
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 explicit FrameNavigationDisabler(LocalFrame&); 313 explicit FrameNavigationDisabler(LocalFrame&);
314 ~FrameNavigationDisabler(); 314 ~FrameNavigationDisabler();
315 315
316 private: 316 private:
317 RawPtrWillBeMember<LocalFrame> m_frame; 317 RawPtrWillBeMember<LocalFrame> m_frame;
318 }; 318 };
319 319
320 } // namespace blink 320 } // namespace blink
321 321
322 #endif // LocalFrame_h 322 #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