DevTools: merge uisourcecode's url-alike members.

third_party/WebKit/Source/devtools/front_end/sources/TabbedEditorContainer.js

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  * 1. Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *
@@ skipping 122 matching lines @@
 
     /**
      * @return {!Array.<!WebInspector.UISourceCode>}
      */
     historyUISourceCodes: function()
     {
         // FIXME: there should be a way to fetch UISourceCode for its uri.
         var uriToUISourceCode = {};
         for (var id in this._files) {
             var uiSourceCode = this._files[id];
-            uriToUISourceCode[uiSourceCode.uri()] = uiSourceCode;
+            uriToUISourceCode[uiSourceCode.url()] = uiSourceCode;
         }
 
         var result = [];
         var uris = this._history._urls();
         for (var i = 0; i < uris.length; ++i) {
             var uiSourceCode = uriToUISourceCode[uris[i]];
             if (uiSourceCode)
                 result.push(uiSourceCode);
         }
         return result;
@@ skipping 14 matching lines @@
         this._currentView.removeEventListener(WebInspector.SourceFrame.Events.ScrollChanged, this._scrollChanged, this);
         this._currentView.removeEventListener(WebInspector.SourceFrame.Events.SelectionChanged, this._selectionChanged, this);
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _scrollChanged: function(event)
     {
         var lineNumber = /** @type {number} */ (event.data);
-        this._history.updateScrollLineNumber(this._currentFile.uri(), lineNumber);
+        this._history.updateScrollLineNumber(this._currentFile.url(), lineNumber);
         this._history.save(this._previouslyViewedFilesSetting);
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _selectionChanged: function(event)
     {
         var range = /** @type {!WebInspector.TextRange} */ (event.data);
-        this._history.updateSelectionRange(this._currentFile.uri(), range);
+        this._history.updateSelectionRange(this._currentFile.url(), range);
         this._history.save(this._previouslyViewedFilesSetting);
     },
 
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      * @param {boolean=} userGesture
      */
     _innerShowFile: function(uiSourceCode, userGesture)
     {
         if (this._currentFile === uiSourceCode)
@@ skipping 81 matching lines @@
         var uiSourceCode = this._files[tabId];
         if (uiSourceCode)
             contextMenu.appendApplicableItems(uiSourceCode);
     },
 
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      */
     addUISourceCode: function(uiSourceCode)
     {
-        var uri = uiSourceCode.uri();
+        var uri = uiSourceCode.url();
         var index = this._history.index(uri);
         if (index === -1)
             return;
 
         if (!this._tabIds.has(uiSourceCode))
             this._appendFileTab(uiSourceCode, false);
 
         // Select tab if this file was the last to be shown.
         if (!index) {
             this._innerShowFile(uiSourceCode, false);
             return;
         }
 
         if (!this._currentFile)
             return;
         var currentProjectType = this._currentFile.project().type();
         var addedProjectType = uiSourceCode.project().type();
         var snippetsProjectType = WebInspector.projectTypes.Snippets;
-        if (this._history.index(this._currentFile.uri()) && currentProjectType === snippetsProjectType && addedProjectType !== snippetsProjectType)
+        if (this._history.index(this._currentFile.url()) && currentProjectType === snippetsProjectType && addedProjectType !== snippetsProjectType)
             this._innerShowFile(uiSourceCode, false);
     },
 
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      */
     removeUISourceCode: function(uiSourceCode)
     {
         this.removeUISourceCodes([uiSourceCode]);
     },
@@ skipping 11 matching lines @@
                 tabIds.push(tabId);
         }
         this._tabbedPane.closeTabs(tabIds);
     },
 
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      */
     _editorClosedByUserAction: function(uiSourceCode)
     {
-        this._history.remove(uiSourceCode.uri());
+        this._history.remove(uiSourceCode.url());
         this._updateHistory();
     },
 
     _editorSelectedByUserAction: function()
     {
         this._updateHistory();
     },
 
     _updateHistory: function()
     {
         var tabIds = this._tabbedPane.lastOpenedTabIds(WebInspector.TabbedEditorContainer.maximalPreviouslyViewedFilesCount);
 
         /**
          * @param {string} tabId
          * @this {WebInspector.TabbedEditorContainer}
          */
         function tabIdToURI(tabId)
         {
-            return this._files[tabId].uri();
+            return this._files[tabId].url();
         }
 
         this._history.update(tabIds.map(tabIdToURI.bind(this)));
         this._history.save(this._previouslyViewedFilesSetting);
     },
 
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      * @return {string}
      */
     _tooltipForFile: function(uiSourceCode)
     {
-        return uiSourceCode.originURL();
+        return uiSourceCode.url();
     },
 
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      * @param {boolean=} userGesture
      * @return {string}
      */
     _appendFileTab: function(uiSourceCode, userGesture)
     {
         var view = this._delegate.viewForFile(uiSourceCode);
         var sourceFrame = view instanceof WebInspector.SourceFrame ? /** @type {!WebInspector.SourceFrame} */ (view) : null;
         var title = this._titleForFile(uiSourceCode);
         var tooltip = this._tooltipForFile(uiSourceCode);
 
         var tabId = this._generateTabId();
         this._tabIds.set(uiSourceCode, tabId);
         this._files[tabId] = uiSourceCode;
 
-        var savedSelectionRange = this._history.selectionRange(uiSourceCode.uri());
+        var savedSelectionRange = this._history.selectionRange(uiSourceCode.url());
         if (sourceFrame && savedSelectionRange)
             sourceFrame.setSelection(savedSelectionRange);
-        var savedScrollLineNumber = this._history.scrollLineNumber(uiSourceCode.uri());
+        var savedScrollLineNumber = this._history.scrollLineNumber(uiSourceCode.url());
         if (sourceFrame && savedScrollLineNumber)
             sourceFrame.scrollToLine(savedScrollLineNumber);
 
         this._tabbedPane.appendTab(tabId, title, view, tooltip, userGesture);
 
         this._updateFileTitle(uiSourceCode);
         this._addUISourceCodeListeners(uiSourceCode);
         return tabId;
     },
 
@@ skipping 331 matching lines @@
     /**
      * @override
      * @param {string} tabId
      * @param {!WebInspector.ContextMenu} contextMenu
      */
     onContextMenu: function(tabId, contextMenu)
     {
         this._editorContainer._onContextMenu(tabId, contextMenu);
     }
 }