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

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: Created 6 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) 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 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 236
237 #if ASSERT_DISABLED 237 #if ASSERT_DISABLED
238 void checkSubframeCountConsistency() const { } 238 void checkSubframeCountConsistency() const { }
239 #else 239 #else
240 void checkSubframeCountConsistency() const; 240 void checkSubframeCountConsistency() const;
241 #endif 241 #endif
242 242
243 void setTimerAlignmentInterval(double); 243 void setTimerAlignmentInterval(double);
244 244
245 // SettingsDelegate overrides. 245 // SettingsDelegate overrides.
246 virtual Page* page() OVERRIDE { return this; }
247 virtual void settingsChanged(SettingsDelegate::ChangeType) OVERRIDE; 246 virtual void settingsChanged(SettingsDelegate::ChangeType) OVERRIDE;
248 247
249 const OwnPtr<AutoscrollController> m_autoscrollController; 248 const OwnPtr<AutoscrollController> m_autoscrollController;
250 const OwnPtr<Chrome> m_chrome; 249 const OwnPtr<Chrome> m_chrome;
251 const OwnPtr<DragCaretController> m_dragCaretController; 250 const OwnPtr<DragCaretController> m_dragCaretController;
252 const OwnPtr<DragController> m_dragController; 251 const OwnPtr<DragController> m_dragController;
253 const OwnPtr<FocusController> m_focusController; 252 const OwnPtr<FocusController> m_focusController;
254 const OwnPtr<ContextMenuController> m_contextMenuController; 253 const OwnPtr<ContextMenuController> m_contextMenuController;
255 const OwnPtr<InspectorController> m_inspectorController; 254 const OwnPtr<InspectorController> m_inspectorController;
256 const OwnPtr<PointerLockController> m_pointerLockController; 255 const OwnPtr<PointerLockController> m_pointerLockController;
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 HashSet<MultisamplingChangedObserver*> m_multisamplingChangedObservers; 298 HashSet<MultisamplingChangedObserver*> m_multisamplingChangedObservers;
300 299
301 // A pointer to all the interfaces provided to in-process Frames for this Pa ge. 300 // A pointer to all the interfaces provided to in-process Frames for this Pa ge.
302 // FIXME: Most of the members of Page should move onto FrameHost. 301 // FIXME: Most of the members of Page should move onto FrameHost.
303 OwnPtr<FrameHost> m_frameHost; 302 OwnPtr<FrameHost> m_frameHost;
304 }; 303 };
305 304
306 } // namespace WebCore 305 } // namespace WebCore
307 306
308 #endif // Page_h 307 #endif // Page_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698