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

Side by Side Diff: Source/devtools/front_end/main/Main.js

Issue 472453002: DevTools: move "Workers in main window" out of experiments (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
3 * Copyright (C) 2007 Matt Lilek (pewtermoose@gmail.com). 3 * Copyright (C) 2007 Matt Lilek (pewtermoose@gmail.com).
4 * Copyright (C) 2009 Joseph Pecoraro 4 * Copyright (C) 2009 Joseph Pecoraro
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 9 *
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 319
320 /** 320 /**
321 * @param {!WebInspector.Target} mainTarget 321 * @param {!WebInspector.Target} mainTarget
322 */ 322 */
323 _mainTargetCreated: function(mainTarget) 323 _mainTargetCreated: function(mainTarget)
324 { 324 {
325 console.timeStamp("Main._mainTargetCreated"); 325 console.timeStamp("Main._mainTargetCreated");
326 326
327 this._registerShortcuts(); 327 this._registerShortcuts();
328 328
329 if (WebInspector.experimentsSettings.workersInMainWindow.isEnabled()) 329 WebInspector.workerTargetManager = new WebInspector.WorkerTargetManager( mainTarget, WebInspector.targetManager);
330 WebInspector.workerTargetManager = new WebInspector.WorkerTargetMana ger(mainTarget, WebInspector.targetManager);
331 330
332 InspectorBackend.registerInspectorDispatcher(this); 331 InspectorBackend.registerInspectorDispatcher(this);
333 332
334 if (!WebInspector.isWorkerFrontend()) 333 if (WebInspector.isWorkerFrontend())
335 WebInspector.workerFrontendManager = new WebInspector.WorkerFrontend Manager();
336 else
337 mainTarget.workerManager.addEventListener(WebInspector.WorkerManager .Events.WorkerDisconnected, onWorkerDisconnected); 334 mainTarget.workerManager.addEventListener(WebInspector.WorkerManager .Events.WorkerDisconnected, onWorkerDisconnected);
338 335
339 function onWorkerDisconnected() 336 function onWorkerDisconnected()
340 { 337 {
341 var screen = new WebInspector.WorkerTerminatedScreen(); 338 var screen = new WebInspector.WorkerTerminatedScreen();
342 var listener = hideScreen.bind(null, screen); 339 var listener = hideScreen.bind(null, screen);
343 mainTarget.debuggerModel.addEventListener(WebInspector.DebuggerModel .Events.GlobalObjectCleared, listener); 340 mainTarget.debuggerModel.addEventListener(WebInspector.DebuggerModel .Events.GlobalObjectCleared, listener);
344 341
345 /** 342 /**
346 * @param {!WebInspector.WorkerTerminatedScreen} screen 343 * @param {!WebInspector.WorkerTerminatedScreen} screen
(...skipping 556 matching lines...) Expand 10 before | Expand all | Expand 10 after
903 900
904 WebInspector.Main.InspectedNodeRevealer.prototype = { 901 WebInspector.Main.InspectedNodeRevealer.prototype = {
905 /** 902 /**
906 * @param {!WebInspector.Event} event 903 * @param {!WebInspector.Event} event
907 */ 904 */
908 _inspectNode: function(event) 905 _inspectNode: function(event)
909 { 906 {
910 WebInspector.Revealer.reveal(/** @type {!WebInspector.DOMNode} */ (event .data)); 907 WebInspector.Revealer.reveal(/** @type {!WebInspector.DOMNode} */ (event .data));
911 } 908 }
912 } 909 }
OLDNEW
« no previous file with comments | « Source/devtools/front_end/components/WorkerFrontendManager.js ('k') | Source/devtools/front_end/sources/SourcesPanel.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698