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

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

Issue 146683003: Settings should not call into inspector (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: incorporated review comments Created 6 years, 10 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/inspector/InspectorPageAgent.cpp ('k') | Source/core/page/Page.cpp » ('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, 2008, 2009, 2010, 2013 Apple Inc. All rights reserv ed. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2013 Apple Inc. All rights reserv ed.
3 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 3 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 240
241 #if ASSERT_DISABLED 241 #if ASSERT_DISABLED
242 void checkSubframeCountConsistency() const { } 242 void checkSubframeCountConsistency() const { }
243 #else 243 #else
244 void checkSubframeCountConsistency() const; 244 void checkSubframeCountConsistency() const;
245 #endif 245 #endif
246 246
247 void setTimerAlignmentInterval(double); 247 void setTimerAlignmentInterval(double);
248 248
249 // SettingsDelegate overrides. 249 // SettingsDelegate overrides.
250 virtual Page* page() OVERRIDE { return this; }
251 virtual void settingsChanged(SettingsDelegate::ChangeType) OVERRIDE; 250 virtual void settingsChanged(SettingsDelegate::ChangeType) OVERRIDE;
252 251
253 const OwnPtr<AutoscrollController> m_autoscrollController; 252 const OwnPtr<AutoscrollController> m_autoscrollController;
254 const OwnPtr<Chrome> m_chrome; 253 const OwnPtr<Chrome> m_chrome;
255 const OwnPtr<DragCaretController> m_dragCaretController; 254 const OwnPtr<DragCaretController> m_dragCaretController;
256 const OwnPtr<DragController> m_dragController; 255 const OwnPtr<DragController> m_dragController;
257 const OwnPtr<FocusController> m_focusController; 256 const OwnPtr<FocusController> m_focusController;
258 const OwnPtr<ContextMenuController> m_contextMenuController; 257 const OwnPtr<ContextMenuController> m_contextMenuController;
259 const OwnPtr<InspectorController> m_inspectorController; 258 const OwnPtr<InspectorController> m_inspectorController;
260 const OwnPtr<PointerLockController> m_pointerLockController; 259 const OwnPtr<PointerLockController> m_pointerLockController;
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 HashSet<MultisamplingChangedObserver*> m_multisamplingChangedObservers; 302 HashSet<MultisamplingChangedObserver*> m_multisamplingChangedObservers;
304 303
305 // A pointer to all the interfaces provided to in-process Frames for this Pa ge. 304 // A pointer to all the interfaces provided to in-process Frames for this Pa ge.
306 // FIXME: Most of the members of Page should move onto FrameHost. 305 // FIXME: Most of the members of Page should move onto FrameHost.
307 OwnPtr<FrameHost> m_frameHost; 306 OwnPtr<FrameHost> m_frameHost;
308 }; 307 };
309 308
310 } // namespace WebCore 309 } // namespace WebCore
311 310
312 #endif // Page_h 311 #endif // Page_h
OLDNEW
« no previous file with comments | « Source/core/inspector/InspectorPageAgent.cpp ('k') | Source/core/page/Page.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698