| OLD | NEW |
| 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 705 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 716 if (this._childFrames[i]._callForFrameResources(callback)) | 716 if (this._childFrames[i]._callForFrameResources(callback)) |
| 717 return true; | 717 return true; |
| 718 } | 718 } |
| 719 return false; | 719 return false; |
| 720 } | 720 } |
| 721 | 721 |
| 722 /** | 722 /** |
| 723 * @return {string} | 723 * @return {string} |
| 724 */ | 724 */ |
| 725 displayName() { | 725 displayName() { |
| 726 if (!this._parentFrame) | 726 if (!this._parentFrame && !this._model.target().parentTarget()) |
| 727 return Common.UIString('top'); | 727 return Common.UIString('top'); |
| 728 var subtitle = new Common.ParsedURL(this._url).displayName; | 728 var subtitle = new Common.ParsedURL(this._url).displayName; |
| 729 if (subtitle) { | 729 if (subtitle) { |
| 730 if (!this._name) | 730 if (!this._name) |
| 731 return subtitle; | 731 return subtitle; |
| 732 return this._name + ' (' + subtitle + ')'; | 732 return this._name + ' (' + subtitle + ')'; |
| 733 } | 733 } |
| 734 return Common.UIString('<iframe>'); | 734 return Common.UIString('<iframe>'); |
| 735 } | 735 } |
| 736 }; | 736 }; |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 883 this._resourceTreeModel.dispatchEventToListeners(SDK.ResourceTreeModel.Event
s.InterstitialHidden); | 883 this._resourceTreeModel.dispatchEventToListeners(SDK.ResourceTreeModel.Event
s.InterstitialHidden); |
| 884 } | 884 } |
| 885 | 885 |
| 886 /** | 886 /** |
| 887 * @override | 887 * @override |
| 888 */ | 888 */ |
| 889 navigationRequested() { | 889 navigationRequested() { |
| 890 // Frontend is not interested in when navigations are requested. | 890 // Frontend is not interested in when navigations are requested. |
| 891 } | 891 } |
| 892 }; | 892 }; |
| OLD | NEW |