Most references to GetActiveEntry removed from chrome/browser/ui.

chrome/browser/ui/browser_commands.cc

Index: chrome/browser/ui/browser_commands.cc
diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
index 9d6151a8d5372bf69327d20ec365fc8544c32283..609be8ec917db9703b0de43a444d08b94bd3d326 100644
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -254,11 +254,11 @@ int GetContentRestrictions(const Browser* browser) {
     CoreTabHelper* core_tab_helper =
         CoreTabHelper::FromWebContents(current_tab);
     content_restrictions = core_tab_helper->content_restrictions();
-    NavigationEntry* active_entry =
-        current_tab->GetController().GetActiveEntry();
+    NavigationEntry* entry =
+        current_tab->GetController().GetLastCommittedEntry();
     // See comment in UpdateCommandsForTabState about why we call url().
     if (!content::IsSavableURL(
-            active_entry ? active_entry->GetURL() : GURL()) ||
+            entry ? entry->GetURL() : GURL()) ||

[Charlie Reis, 2013/11/12 01:09:29]

nit: Should fit on the previous line now.

[jww, 2013/11/12 22:32:50]

Done.

         current_tab->ShowingInterstitialPage())
       content_restrictions |= CONTENT_RESTRICTION_SAVE;
     if (current_tab->ShowingInterstitialPage())
@@ -980,7 +980,7 @@ void ToggleSpeechInput(Browser* browser) {
 bool CanRequestTabletSite(WebContents* current_tab) {
   if (!current_tab)
     return false;
-  return current_tab->GetController().GetActiveEntry() != NULL;
+  return current_tab->GetController().GetLastCommittedEntry() != NULL;

[Charlie Reis, 2013/11/12 01:09:29]

Hmm, I can't tell if this is correct or not.

@sschmitz: Looks like you added the RequestTabletSite stuff in
https://chromiumcodereview.appspot.com/10827146.  If the user looking at page A
and has started a navigation to a slow page B that hasn't committed yet, should
the RequestTabletSite feature affect page A (last committed) or page B (visible
URL / pending entry)?

 }
 
 bool IsRequestingTabletSite(Browser* browser) {
@@ -988,7 +988,7 @@ bool IsRequestingTabletSite(Browser* browser) {
   if (!current_tab)
     return false;
   content::NavigationEntry* entry =
-      current_tab->GetController().GetActiveEntry();
+      current_tab->GetController().GetLastCommittedEntry();
   if (!entry)
     return false;
   return entry->GetIsOverridingUserAgent();
@@ -999,7 +999,7 @@ void ToggleRequestTabletSite(Browser* browser) {
   if (!current_tab)
     return;
   NavigationController& controller = current_tab->GetController();
-  NavigationEntry* entry = controller.GetActiveEntry();
+  NavigationEntry* entry = controller.GetLastCommittedEntry();
   if (!entry)
     return;
   if (entry->GetIsOverridingUserAgent()) {
@@ -1054,25 +1054,25 @@ void ViewSource(Browser* browser,
   content::RecordAction(UserMetricsAction("ViewSource"));
   DCHECK(contents);
 
-  // Note that Clone does not copy the pending or transient entries, so the
-  // active entry in view_source_contents will be the last committed entry.
+  // Note that Clone does not copy the pending or transient entries, so we can
+  // take the last committed entry in view_source_contents.
   WebContents* view_source_contents = contents->Clone();
   DCHECK(view_source_contents->GetController().CanPruneAllButVisible());
   view_source_contents->GetController().PruneAllButVisible();
-  NavigationEntry* active_entry =
-      view_source_contents->GetController().GetActiveEntry();
-  if (!active_entry)
+  NavigationEntry* entry =
+      view_source_contents->GetController().GetLastCommittedEntry();
+  if (!entry)
     return;
 
   GURL view_source_url =
       GURL(content::kViewSourceScheme + std::string(":") + url.spec());
-  active_entry->SetVirtualURL(view_source_url);
+  entry->SetVirtualURL(view_source_url);
 
   // Do not restore scroller position.
-  active_entry->SetPageState(page_state.RemoveScrollOffset());
+  entry->SetPageState(page_state.RemoveScrollOffset());
 
   // Do not restore title, derive it from the url.
-  active_entry->SetTitle(string16());
+  entry->SetTitle(string16());
 
   // Now show view-source entry.
   if (browser->CanSupportWindowFeature(Browser::FEATURE_TABSTRIP)) {
@@ -1136,7 +1136,7 @@ bool CanCreateApplicationShortcuts(const Browser* browser) {
 
 void ConvertTabToAppWindow(Browser* browser,
                            content::WebContents* contents) {
-  const GURL& url = contents->GetController().GetActiveEntry()->GetURL();
+  const GURL& url = contents->GetController().GetLastCommittedEntry()->GetURL();

[Charlie Reis, 2013/11/12 01:09:29]

@benwells: Do you know how ConvertTabToAppWindow is used?  If the user is on
page A with a slow pending navigation to page B, should we be using page A (last
committed) or page B (visible URL / pending entry) here?

[benwells, 2013/11/12 05:32:47]

I'd say A (last committed), but TBH I don't think it really matters.

We're hoping to remove this function in the near future.

[jww, 2013/11/12 22:32:50]

Okay, so leaving as-is.

   std::string app_name = web_app::GenerateApplicationNameFromURL(url);
 
   int index = browser->tab_strip_model()->GetIndexOfWebContents(contents);