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

chrome/browser/ui/browser_commands.cc

 // Copyright 2012 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/ui/browser_commands.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 236 matching lines @@
       command, observer);
 }
 
 int GetContentRestrictions(const Browser* browser) {
   int content_restrictions = 0;
   WebContents* current_tab = browser->tab_strip_model()->GetActiveWebContents();
   if (current_tab) {
     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()) ||
         current_tab->ShowingInterstitialPage())
       content_restrictions |= CONTENT_RESTRICTION_SAVE;
     if (current_tab->ShowingInterstitialPage())
       content_restrictions |= CONTENT_RESTRICTION_PRINT;
   }
   return content_restrictions;
 }
 
 void NewEmptyWindow(Profile* profile, HostDesktopType desktop_type) {
   bool incognito = profile->IsOffTheRecord();
@@ skipping 701 matching lines @@
 void ToggleSpeechInput(Browser* browser) {
   browser->tab_strip_model()->GetActiveWebContents()->
       GetRenderViewHost()->ToggleSpeechInput();
   if (browser->instant_controller())
     browser->instant_controller()->ToggleVoiceSearch();
 }
 
 bool CanRequestTabletSite(WebContents* current_tab) {
   if (!current_tab)
     return false;
-  return current_tab->GetController().GetActiveEntry() != NULL;
+  return current_tab->GetController().GetVisibleEntry() != NULL;

[nasko, 2013/11/08 23:52:03]

For this and the next two instances, have you tried using LastCommitted? I'm not
sure what the right thing here is, but why not try to be more conservative? :)

[jww, 2013/11/11 19:18:51]

Done.

 }
 
 bool IsRequestingTabletSite(Browser* browser) {
   WebContents* current_tab = browser->tab_strip_model()->GetActiveWebContents();
   if (!current_tab)
     return false;
   content::NavigationEntry* entry =
-      current_tab->GetController().GetActiveEntry();
+      current_tab->GetController().GetVisibleEntry();
   if (!entry)
     return false;
   return entry->GetIsOverridingUserAgent();
 }
 
 void ToggleRequestTabletSite(Browser* browser) {
   WebContents* current_tab = browser->tab_strip_model()->GetActiveWebContents();
   if (!current_tab)
     return;
   NavigationController& controller = current_tab->GetController();
-  NavigationEntry* entry = controller.GetActiveEntry();
+  NavigationEntry* entry = controller.GetVisibleEntry();
   if (!entry)
     return;
   if (entry->GetIsOverridingUserAgent()) {
     entry->SetIsOverridingUserAgent(false);
   } else {
     entry->SetIsOverridingUserAgent(true);
     chrome::VersionInfo version_info;
     std::string product;
     if (version_info.is_valid())
       product = version_info.ProductNameAndVersionForUserAgent();
@@ skipping 35 matching lines @@
 }
 
 void ViewSource(Browser* browser,
                 WebContents* contents,
                 const GURL& url,
                 const content::PageState& page_state) {
   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.

[nasko, 2013/11/08 23:52:03]

nit: "active entry" -> "visible entry"

[jww, 2013/11/11 19:18:51]

Refactored the comment a bit more to align with the change below.

   WebContents* view_source_contents = contents->Clone();
   DCHECK(view_source_contents->GetController().CanPruneAllButVisible());

[jww, 2013/11/11 19:18:51]

On a side note, this function seems woefully misnamed now. Looking at it's
comments, it seems like it prunes everything down to the last committed entry,
*not* the visible entry :-P Should I put a TODO in that function to change the
name of it?

[Charlie Reis, 2013/11/11 22:58:23]

Wow, that is poorly named.  I'll take the blame for that one.  I changed it from
CanPruneAllButActive when we were starting to get rid of the Active concept but
perhaps hadn't quite settled on the meaning of Visible.  (In this case,
"visible" meant which page was visible, rather than which URL was visible. 
That's entirely non-obvious now that we have the LastCommitted vs Visible
distinction for entries.)

Yes, let's change it to PruneAllButLastCommitted and CanPrunAllButLastCommitted.
 Thanks for catching it!

   view_source_contents->GetController().PruneAllButVisible();
-  NavigationEntry* active_entry =
-      view_source_contents->GetController().GetActiveEntry();
-  if (!active_entry)
+  NavigationEntry* entry =
+      view_source_contents->GetController().GetVisibleEntry();

[nasko, 2013/11/08 23:52:03]

If the comment above is correct, why not use LastCommitted?
Even if incorrect, it doesn't make sense to view source on something we haven't
yet loaded.

[jww, 2013/11/11 19:18:51]

Done.

+  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)) {
     // If this is a tabbed browser, just create a duplicate tab inside the same
     // window next to the tab being duplicated.
     int index = browser->tab_strip_model()->GetIndexOfWebContents(contents);
     int add_types = TabStripModel::ADD_ACTIVE |
         TabStripModel::ADD_INHERIT_GROUP;
     browser->tab_strip_model()->InsertWebContentsAt(
         index + 1,
@@ skipping 43 matching lines @@
 }
 
 bool CanCreateApplicationShortcuts(const Browser* browser) {
   return extensions::TabHelper::FromWebContents(
       browser->tab_strip_model()->GetActiveWebContents())->
           CanCreateApplicationShortcuts();
 }
 
 void ConvertTabToAppWindow(Browser* browser,
                            content::WebContents* contents) {
-  const GURL& url = contents->GetController().GetActiveEntry()->GetURL();
+  const GURL& url = contents->GetController().GetLastCommittedEntry()->GetURL();
   std::string app_name = web_app::GenerateApplicationNameFromURL(url);
 
   int index = browser->tab_strip_model()->GetIndexOfWebContents(contents);
   if (index >= 0)
     browser->tab_strip_model()->DetachWebContentsAt(index);
 
   Browser* app_browser = new Browser(
       Browser::CreateParams::CreateForApp(
           Browser::TYPE_POPUP, app_name, gfx::Rect(), browser->profile(),
           browser->host_desktop_type()));
   app_browser->tab_strip_model()->AppendWebContents(contents, true);
 
   contents->GetMutableRendererPrefs()->can_accept_load_drops = false;
   contents->GetRenderViewHost()->SyncRendererPrefs();
   app_browser->window()->Show();
 }
 
 }  // namespace chrome