Replace usage of GetActiveEntry with GetLastCommittedEntry in 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 295 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 =

[Peter Kasting, 2014/06/02 18:38:58]

Nit: Update this variable name

[nasko, 2014/06/02 20:44:23]

Done.

-        current_tab->GetController().GetActiveEntry();
+        current_tab->GetController().GetLastCommittedEntry();
     // See comment in UpdateCommandsForTabState about why we call url().

[Peter Kasting, 2014/06/02 18:38:58]

Nit: While here: "url()" no longer seems to exist, is this referring to
GetURL()?

[nasko, 2014/06/02 20:44:23]

There is no such comment that I can see, so it seems best to remove it due to
staleness.

     if (!content::IsSavableURL(
             active_entry ? active_entry->GetURL() : GURL()) ||
         current_tab->ShowingInterstitialPage())
       content_restrictions |= CONTENT_RESTRICTION_SAVE;
     if (current_tab->ShowingInterstitialPage())
       content_restrictions |= CONTENT_RESTRICTION_PRINT;
   }
   return content_restrictions;
 }
 
@@ skipping 744 matching lines @@
     search_tab_helper->ToggleVoiceSearch();
 }
 
 void DistillCurrentPage(Browser* browser) {
   DistillCurrentPageAndView(browser->tab_strip_model()->GetActiveWebContents());
 }
 
 bool CanRequestTabletSite(WebContents* current_tab) {
   if (!current_tab)
     return false;
-  return current_tab->GetController().GetActiveEntry() != NULL;
+  return current_tab->GetController().GetLastCommittedEntry() != NULL;

[Peter Kasting, 2014/06/02 18:38:58]

Nit: Simpler:

  return current_tab && current_tab->GetController().GetLastCommittedEntry();

[nasko, 2014/06/02 20:44:23]

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().GetLastCommittedEntry();
   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.GetLastCommittedEntry();
   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.

[Peter Kasting, 2014/06/02 18:38:58]

This comment seems like it can be removed.

[nasko, 2014/06/02 20:44:23]

Done.

   WebContents* view_source_contents = contents->Clone();
   DCHECK(view_source_contents->GetController().CanPruneAllButLastCommitted());
   view_source_contents->GetController().PruneAllButLastCommitted();
   NavigationEntry* active_entry =

[Peter Kasting, 2014/06/02 18:38:58]

Nit: Update this variable name.

[nasko, 2014/06/02 20:44:23]

Done.

-      view_source_contents->GetController().GetActiveEntry();
+      view_source_contents->GetController().GetLastCommittedEntry();
   if (!active_entry)
     return;
 
   GURL view_source_url =
       GURL(content::kViewSourceScheme + std::string(":") + url.spec());
   active_entry->SetVirtualURL(view_source_url);
 
   // Do not restore scroller position.
   active_entry->SetPageState(page_state.RemoveScrollOffset());
 
@@ skipping 69 matching lines @@
 }
 
 bool CanCreateBookmarkApp(const Browser* browser) {
   return extensions::TabHelper::FromWebContents(
              browser->tab_strip_model()->GetActiveWebContents())
       ->CanCreateBookmarkApp();
 }
 
 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(app_name,
                                           true /* trusted_source */,
                                           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