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

Side by Side Diff: third_party/WebKit/Source/devtools/front_end/sources/NavigatorView.js

Issue 2819183002: [DevTools] Consolidate overlay-related functionality in Overlay domain (Closed)
Patch Set: rebased bad merge Created 3 years, 7 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) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 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 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 10 *
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after
426 this._frameNodes.set(frame, frameNode); 426 this._frameNodes.set(frame, frameNode);
427 this._frameNode(project, target, frame.parentFrame).appendChild(frameNode); 427 this._frameNode(project, target, frame.parentFrame).appendChild(frameNode);
428 if (!frame.parentFrame) 428 if (!frame.parentFrame)
429 frameNode.treeNode()._boostOrder = true; 429 frameNode.treeNode()._boostOrder = true;
430 430
431 /** 431 /**
432 * @param {boolean} hovered 432 * @param {boolean} hovered
433 */ 433 */
434 function hoverCallback(hovered) { 434 function hoverCallback(hovered) {
435 if (hovered) { 435 if (hovered) {
436 var domModel = target.model(SDK.DOMModel); 436 var overlayModel = target.model(SDK.OverlayModel);
437 if (domModel) 437 if (overlayModel)
438 domModel.highlightFrame(frame.id); 438 overlayModel.highlightFrame(frame.id);
439 } else { 439 } else {
440 SDK.DOMModel.hideDOMNodeHighlight(); 440 SDK.OverlayModel.hideDOMNodeHighlight();
441 } 441 }
442 } 442 }
443 return frameNode; 443 return frameNode;
444 } 444 }
445 445
446 /** 446 /**
447 * @param {!Workspace.Project} project 447 * @param {!Workspace.Project} project
448 * @param {!SDK.Target} target 448 * @param {!SDK.Target} target
449 * @return {!Sources.NavigatorTreeNode} 449 * @return {!Sources.NavigatorTreeNode}
450 */ 450 */
(...skipping 1141 matching lines...) Expand 10 before | Expand all | Expand 10 after
1592 /** 1592 /**
1593 * @param {string} title 1593 * @param {string} title
1594 * @override 1594 * @override
1595 */ 1595 */
1596 setTitle(title) { 1596 setTitle(title) {
1597 this._title = title; 1597 this._title = title;
1598 if (this._treeElement) 1598 if (this._treeElement)
1599 this._treeElement.title = this._title; 1599 this._treeElement.title = this._title;
1600 } 1600 }
1601 }; 1601 };
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698