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

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

Issue 2786673002: Separate ContentSettingsClient out from LocalFrameClient (Closed)
Patch Set: fix Created 3 years, 8 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 27 matching lines...) Expand all
38 #include "platform/Supplementable.h" 38 #include "platform/Supplementable.h"
39 #include "platform/graphics/ImageOrientation.h" 39 #include "platform/graphics/ImageOrientation.h"
40 #include "platform/heap/Handle.h" 40 #include "platform/heap/Handle.h"
41 #include "platform/scroll/ScrollTypes.h" 41 #include "platform/scroll/ScrollTypes.h"
42 #include "wtf/HashSet.h" 42 #include "wtf/HashSet.h"
43 #include <memory> 43 #include <memory>
44 44
45 namespace blink { 45 namespace blink {
46 46
47 class Color; 47 class Color;
48 class ContentSettingsClient;
48 class Document; 49 class Document;
49 class DragImage; 50 class DragImage;
50 class Editor; 51 class Editor;
51 template <typename Traversal> 52 template <typename Traversal>
52 class EditingAlgorithm; 53 class EditingAlgorithm;
53 class Element; 54 class Element;
54 template <typename Strategy> 55 template <typename Strategy>
55 class EphemeralRangeTemplate; 56 class EphemeralRangeTemplate;
56 class EventHandler; 57 class EventHandler;
57 class FloatSize; 58 class FloatSize;
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 WebFrameScheduler* frameScheduler(); 215 WebFrameScheduler* frameScheduler();
215 void scheduleVisualUpdateUnlessThrottled(); 216 void scheduleVisualUpdateUnlessThrottled();
216 217
217 bool isNavigationAllowed() const { return m_navigationDisableCount == 0; } 218 bool isNavigationAllowed() const { return m_navigationDisableCount == 0; }
218 219
219 InterfaceProvider* interfaceProvider() { return m_interfaceProvider; } 220 InterfaceProvider* interfaceProvider() { return m_interfaceProvider; }
220 InterfaceRegistry* interfaceRegistry() { return m_interfaceRegistry; } 221 InterfaceRegistry* interfaceRegistry() { return m_interfaceRegistry; }
221 222
222 LocalFrameClient* client() const; 223 LocalFrameClient* client() const;
223 224
225 ContentSettingsClient* contentSettingsClient();
226
224 PluginData* pluginData() const; 227 PluginData* pluginData() const;
225 228
226 PerformanceMonitor* performanceMonitor() { return m_performanceMonitor; } 229 PerformanceMonitor* performanceMonitor() { return m_performanceMonitor; }
227 230
228 private: 231 private:
229 friend class FrameNavigationDisabler; 232 friend class FrameNavigationDisabler;
230 233
231 LocalFrame(LocalFrameClient*, 234 LocalFrame(LocalFrameClient*,
232 Page&, 235 Page&,
233 FrameOwner*, 236 FrameOwner*,
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 explicit ScopedFrameBlamer(LocalFrame*); 374 explicit ScopedFrameBlamer(LocalFrame*);
372 ~ScopedFrameBlamer(); 375 ~ScopedFrameBlamer();
373 376
374 private: 377 private:
375 Member<LocalFrame> m_frame; 378 Member<LocalFrame> m_frame;
376 }; 379 };
377 380
378 } // namespace blink 381 } // namespace blink
379 382
380 #endif // LocalFrame_h 383 #endif // LocalFrame_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698