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

Side by Side Diff: Source/core/inspector/InspectorController.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/frame/SettingsDelegate.h ('k') | Source/core/inspector/InspectorController.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) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 void willProcessTask(); 116 void willProcessTask();
117 void didProcessTask(); 117 void didProcessTask();
118 118
119 void didBeginFrame(int frameId); 119 void didBeginFrame(int frameId);
120 void didCancelFrame(); 120 void didCancelFrame();
121 void willComposite(); 121 void willComposite();
122 void didComposite(); 122 void didComposite();
123 123
124 void processGPUEvent(double timestamp, int phase, bool foreign, size_t usedG PUMemoryBytes); 124 void processGPUEvent(double timestamp, int phase, bool foreign, size_t usedG PUMemoryBytes);
125 125
126 void scriptsEnabled(bool);
127
126 private: 128 private:
127 InspectorController(Page*, InspectorClient*); 129 InspectorController(Page*, InspectorClient*);
128 130
129 friend InstrumentingAgents* instrumentationForPage(Page*); 131 friend InstrumentingAgents* instrumentationForPage(Page*);
130 132
131 RefPtr<InstrumentingAgents> m_instrumentingAgents; 133 RefPtr<InstrumentingAgents> m_instrumentingAgents;
132 OwnPtr<InjectedScriptManager> m_injectedScriptManager; 134 OwnPtr<InjectedScriptManager> m_injectedScriptManager;
133 OwnPtr<InspectorCompositeState> m_state; 135 OwnPtr<InspectorCompositeState> m_state;
134 OwnPtr<InspectorOverlay> m_overlay; 136 OwnPtr<InspectorOverlay> m_overlay;
135 137
136 InspectorDOMAgent* m_domAgent; 138 InspectorDOMAgent* m_domAgent;
137 InspectorPageAgent* m_pageAgent; 139 InspectorPageAgent* m_pageAgent;
138 InspectorTimelineAgent* m_timelineAgent; 140 InspectorTimelineAgent* m_timelineAgent;
139 141
140 RefPtr<InspectorBackendDispatcher> m_inspectorBackendDispatcher; 142 RefPtr<InspectorBackendDispatcher> m_inspectorBackendDispatcher;
141 OwnPtr<InspectorFrontendClient> m_inspectorFrontendClient; 143 OwnPtr<InspectorFrontendClient> m_inspectorFrontendClient;
142 OwnPtr<InspectorFrontend> m_inspectorFrontend; 144 OwnPtr<InspectorFrontend> m_inspectorFrontend;
143 Page* m_page; 145 Page* m_page;
144 InspectorClient* m_inspectorClient; 146 InspectorClient* m_inspectorClient;
145 InspectorAgentRegistry m_agents; 147 InspectorAgentRegistry m_agents;
146 bool m_isUnderTest; 148 bool m_isUnderTest;
147 bool m_deferredAgentsInitialized; 149 bool m_deferredAgentsInitialized;
148 }; 150 };
149 151
150 } 152 }
151 153
152 154
153 #endif // !defined(InspectorController_h) 155 #endif // !defined(InspectorController_h)
OLDNEW
« no previous file with comments | « Source/core/frame/SettingsDelegate.h ('k') | Source/core/inspector/InspectorController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698