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

Side by Side Diff: Source/core/inspector/InspectorConsoleAgent.cpp

Issue 1286343003: DevTools: make InspectorDebuggerAgent aggregate V8DebuggerAgent instead of inheriting (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed presubmit errors Created 5 years, 4 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) 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 13 matching lines...) Expand all
24 24
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "core/inspector/InspectorConsoleAgent.h" 27 #include "core/inspector/InspectorConsoleAgent.h"
28 28
29 #include "core/inspector/ConsoleMessage.h" 29 #include "core/inspector/ConsoleMessage.h"
30 #include "core/inspector/ConsoleMessageStorage.h" 30 #include "core/inspector/ConsoleMessageStorage.h"
31 #include "core/inspector/IdentifiersFactory.h" 31 #include "core/inspector/IdentifiersFactory.h"
32 #include "core/inspector/InjectedScript.h" 32 #include "core/inspector/InjectedScript.h"
33 #include "core/inspector/InjectedScriptManager.h" 33 #include "core/inspector/InjectedScriptManager.h"
34 #include "core/inspector/InspectorDebuggerAgent.h"
35 #include "core/inspector/InspectorState.h" 34 #include "core/inspector/InspectorState.h"
36 #include "core/inspector/InstrumentingAgents.h" 35 #include "core/inspector/InstrumentingAgents.h"
37 #include "core/inspector/ScriptArguments.h" 36 #include "core/inspector/ScriptArguments.h"
38 #include "core/inspector/ScriptAsyncCallStack.h" 37 #include "core/inspector/ScriptAsyncCallStack.h"
38 #include "core/inspector/V8DebuggerAgent.h"
39 #include "core/inspector/v8/V8Debugger.h" 39 #include "core/inspector/v8/V8Debugger.h"
40 #include "wtf/text/WTFString.h" 40 #include "wtf/text/WTFString.h"
41 41
42 namespace blink { 42 namespace blink {
43 43
44 namespace ConsoleAgentState { 44 namespace ConsoleAgentState {
45 static const char consoleMessagesEnabled[] = "consoleMessagesEnabled"; 45 static const char consoleMessagesEnabled[] = "consoleMessagesEnabled";
46 } 46 }
47 47
48 InspectorConsoleAgent::InspectorConsoleAgent(InjectedScriptManager* injectedScri ptManager) 48 InspectorConsoleAgent::InspectorConsoleAgent(InjectedScriptManager* injectedScri ptManager)
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 } 233 }
234 if (consoleMessage->messageId()) 234 if (consoleMessage->messageId())
235 jsonObj->setMessageId(consoleMessage->messageId()); 235 jsonObj->setMessageId(consoleMessage->messageId());
236 if (consoleMessage->relatedMessageId()) 236 if (consoleMessage->relatedMessageId())
237 jsonObj->setRelatedMessageId(consoleMessage->relatedMessageId()); 237 jsonObj->setRelatedMessageId(consoleMessage->relatedMessageId());
238 frontend()->messageAdded(jsonObj); 238 frontend()->messageAdded(jsonObj);
239 frontend()->flush(); 239 frontend()->flush();
240 } 240 }
241 241
242 } // namespace blink 242 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698