Renames the NavigationEntry::display_url() to virtual_url()....

chrome/browser/tab_contents/navigation_entry.h

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_TAB_CONTENTS_NAVIGATION_ENTRY_H_
 #define CHROME_BROWSER_TAB_CONTENTS_NAVIGATION_ENTRY_H_
 
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
@@ skipping 201 matching lines @@
   // The page type tells us if this entry is for an interstitial or error page.
   // See the PageType enum above.
   void set_page_type(PageType page_type) {
     page_type_ = page_type;
   }
   PageType page_type() const {
     return page_type_;
   }
 
   // The actual URL of the page. For some about pages, this may be a scary
-  // data: URL or something like that. Use display_url() below for showing to
+  // data: URL or something like that. Use virtual_url() below for showing to
   // the user.
   void set_url(const GURL& url) {
     url_ = url;
     cached_display_title_.clear();
   }
   const GURL& url() const {
     return url_;
   }
 
   // The referring URL. Can be empty.
   void set_referrer(const GURL& referrer) {
     referrer_ = referrer;
   }
   const GURL& referrer() const {
     return referrer_;
   }
 
-  // The display URL, when nonempty, will override the actual URL of the page
+  // The virtual URL, when nonempty, will override the actual URL of the page
   // when we display it to the user. This allows us to have nice and friendly
   // URLs that the user sees for things like about: URLs, but actually feed
   // the renderer a data URL that results in the content loading.
   //
-  // display_url() will return the URL to display to the user in all cases, so
+  // virtual_url() will return the URL to display to the user in all cases, so
   // if there is no overridden display URL, it will return the actual one.
-  void set_display_url(const GURL& url) {
-    display_url_ = (url == url_) ? GURL() : url;
+  void set_virtual_url(const GURL& url) {
+    virtual_url_ = (url == url_) ? GURL() : url;
     cached_display_title_.clear();
   }
-  bool has_display_url() const {
-    return !display_url_.is_empty();
+  bool has_virtual_url() const {
+    return !virtual_url_.is_empty();
   }
-  const GURL& display_url() const {
-    return display_url_.is_empty() ? url_ : display_url_;
+  const GURL& virtual_url() const {
+    return virtual_url_.is_empty() ? url_ : virtual_url_;
   }
 
   // The title as set by the page. This will be empty if there is no title set.
   // The caller is responsible for detecting when there is no title and
   // displaying the appropriate "Untitled" label if this is being displayed to
   // the user.
   void set_title(const string16& title) {
     title_ = title;
     cached_display_title_.clear();
   }
@@ skipping 112 matching lines @@
   // later. If you add a new field that needs to be persisted you'll have to
   // update SessionService/TabRestoreService appropriately.
   // WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
 
   // See the accessors above for descriptions.
   int unique_id_;
   scoped_refptr<SiteInstance> site_instance_;
   PageType page_type_;
   GURL url_;
   GURL referrer_;
-  GURL display_url_;
+  GURL virtual_url_;
   string16 title_;
   FaviconStatus favicon_;
   std::string content_state_;
   int32 page_id_;
   SSLStatus ssl_;
   PageTransition::Type transition_type_;
   GURL user_typed_url_;
   bool has_post_data_;
   bool restored_;
 
   // This is a cached version of the result of GetTitleForDisplay. It prevents
   // us from having to do URL formatting on the URL evey time the title is
-  // displayed. When the URL, display URL, or title is set, this should be
+  // displayed. When the URL, virtual URL, or title is set, this should be
   // cleared to force a refresh.
   string16 cached_display_title_;
 
   // Copy and assignment is explicitly allowed for this class.
 };
 
 #endif  // CHROME_BROWSER_TAB_CONTENTS_NAVIGATION_ENTRY_H_