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

Side by Side Diff: Source/devtools/front_end/sdk/ResourceTreeModel.js

Issue 1532413002: Added Dartium changes onto 45.0.2454.104 (Closed) Base URL: http://src.chromium.org/blink/branches/chromium/2454
Patch Set: Created 5 years 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 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 734 matching lines...) Expand 10 before | Expand all | Expand 10 after
745 } 745 }
746 return false; 746 return false;
747 }, 747 },
748 748
749 /** 749 /**
750 * @return {string} 750 * @return {string}
751 */ 751 */
752 displayName: function() 752 displayName: function()
753 { 753 {
754 if (!this._parentFrame) 754 if (!this._parentFrame)
755 return WebInspector.UIString("<top frame>"); 755 return WebInspector.UIString("<top frame (JavaScript)>");
756 var subtitle = new WebInspector.ParsedURL(this._url).displayName; 756 var subtitle = new WebInspector.ParsedURL(this._url).displayName;
757 if (subtitle) { 757 if (subtitle) {
758 if (!this._name) 758 if (!this._name)
759 return subtitle; 759 return subtitle;
760 return this._name + "( " + subtitle + " )"; 760 return this._name + "( " + subtitle + " )";
761 } 761 }
762 return WebInspector.UIString("<iframe>"); 762 return WebInspector.UIString("<iframe (JavaScript)>");
763 } 763 }
764 } 764 }
765 765
766 /** 766 /**
767 * @constructor 767 * @constructor
768 * @implements {PageAgent.Dispatcher} 768 * @implements {PageAgent.Dispatcher}
769 */ 769 */
770 WebInspector.PageDispatcher = function(resourceTreeModel) 770 WebInspector.PageDispatcher = function(resourceTreeModel)
771 { 771 {
772 this._resourceTreeModel = resourceTreeModel; 772 this._resourceTreeModel = resourceTreeModel;
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
915 }, 915 },
916 916
917 /** 917 /**
918 * @override 918 * @override
919 */ 919 */
920 interstitialHidden: function() 920 interstitialHidden: function()
921 { 921 {
922 // Frontend is not interested in interstitials. 922 // Frontend is not interested in interstitials.
923 } 923 }
924 } 924 }
OLDNEW
« no previous file with comments | « Source/core/inspector/ScriptCallFrame.cpp ('k') | Source/devtools/front_end/sources/ScopeChainSidebarPane.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698