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

chrome/browser/tab_contents/tab_contents.cc

 // Copyright (c) 2009 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.
 
 #include "chrome/browser/tab_contents/tab_contents.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/file_version_info.h"
 #include "base/process_util.h"
@@ skipping 416 matching lines @@
 
 PluginInstaller* TabContents::GetPluginInstaller() {
   if (plugin_installer_.get() == NULL)
     plugin_installer_.reset(new PluginInstaller(this));
   return plugin_installer_.get();
 }
 
 const GURL& TabContents::GetURL() const {
   // We may not have a navigation entry yet
   NavigationEntry* entry = controller_.GetActiveEntry();
-  return entry ? entry->display_url() : GURL::EmptyGURL();
+  return entry ? entry->virtual_url() : GURL::EmptyGURL();
 }
 
 const string16& TabContents::GetTitle() const {
   // Transient entries take precedence. They are used for interstitial pages
   // that are shown on top of existing pages.
   NavigationEntry* entry = controller_.GetTransientEntry();
   if (entry)
     return entry->GetTitleForDisplay(&controller_);
 
   DOMUI* our_dom_ui = render_manager_.pending_dom_ui() ?
@@ skipping 898 matching lines @@
       // need to reserve enough IDs to make all restored page IDs less than
       // the max.
       if (curr_max_page_id < 0)
         curr_max_page_id = 0;
       rvh->ReservePageIDRange(max_restored_page_id - curr_max_page_id);
     }
   }
 }
 
 void TabContents::UpdateHistoryForNavigation(
-    const GURL& display_url,
+    const GURL& virtual_url,
     const NavigationController::LoadCommittedDetails& details,
     const ViewHostMsg_FrameNavigate_Params& params) {
   if (profile()->IsOffTheRecord())
     return;
 
   // Add to history service.
   HistoryService* hs = profile()->GetHistoryService(Profile::IMPLICIT_ACCESS);
   if (hs) {
     if (PageTransition::IsMainFrame(params.transition) &&
-        display_url != params.url) {
-      // Hack on the "display" URL so that it will appear in history. For some
+        virtual_url != params.url) {
+      // Hack on the "virtual" URL so that it will appear in history. For some
       // types of URLs, we will display a magic URL that is different from where
       // the page is actually navigated. We want the user to see in history
-      // what they saw in the URL bar, so we add the display URL as a redirect.
-      // This only applies to the main frame, as the display URL doesn't apply
+      // what they saw in the URL bar, so we add the virtual URL as a redirect.
+      // This only applies to the main frame, as the virtual URL doesn't apply
       // to sub-frames.
       std::vector<GURL> redirects = params.redirects;
       if (!redirects.empty())
-        redirects.back() = display_url;
-      hs->AddPage(display_url, this, params.page_id, params.referrer,
+        redirects.back() = virtual_url;
+      hs->AddPage(virtual_url, this, params.page_id, params.referrer,
                   params.transition, redirects, details.did_replace_entry);
     } else {
       hs->AddPage(params.url, this, params.page_id, params.referrer,
                   params.transition, params.redirects,
                   details.did_replace_entry);
     }
   }
 }
 
 bool TabContents::UpdateTitleForEntry(NavigationEntry* entry,
@@ skipping 14 matching lines @@
   if (final_title == UTF16ToWideHack(entry->title()))
     return false;  // Nothing changed, don't bother.
 
   entry->set_title(WideToUTF16Hack(final_title));
 
   // Update the history system for this page.
   if (!profile()->IsOffTheRecord() && !received_page_title_) {
     HistoryService* hs =
         profile()->GetHistoryService(Profile::IMPLICIT_ACCESS);
     if (hs)
-      hs->SetPageTitle(entry->display_url(), final_title);
+      hs->SetPageTitle(entry->virtual_url(), final_title);
 
     // Don't allow the title to be saved again for explicitly set ones.
     received_page_title_ = explicit_set;
   }
 
   // Lastly, set the title for the view.
   view_->SetPageTitle(final_title);
 
   return true;
 }
@@ skipping 571 matching lines @@
   // An entry may not exist for a stop when loading an initial blank page or
   // if an iframe injected by script into a blank page finishes loading.
   if (entry) {
     scoped_ptr<base::ProcessMetrics> metrics(
         base::ProcessMetrics::CreateProcessMetrics(
             process()->process().handle()));
 
     base::TimeDelta elapsed = base::TimeTicks::Now() - current_load_start_;
 
     details.reset(new LoadNotificationDetails(
-        entry->display_url(),
+        entry->virtual_url(),
         entry->transition_type(),
         elapsed,
         &controller_,
         controller_.GetCurrentEntryIndex()));
   }
 
   // Tell PasswordManager we've finished a page load, which serves as a
   // green light to save pending passwords and reset itself.
   GetPasswordManager()->DidStopLoading();
 
@@ skipping 393 matching lines @@
       NavigationController::LoadCommittedDetails& committed_details =
           *(Details<NavigationController::LoadCommittedDetails>(details).ptr());
       ExpireInfoBars(committed_details);
       break;
     }
 
     default:
       NOTREACHED();
   }
 }