Reorganize the declarations to have some grouping and logical ordering in tab...

chrome/browser/navigation_controller.cc

 // 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.
 
 #include "chrome/browser/navigation_controller.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/string_util.h"
@@ skipping 889 matching lines @@
   return AreURLsInPageNavigation(last_committed->url(), url);
 }
 
 void NavigationController::DiscardPendingEntry() {
   DiscardPendingEntryInternal();
 
   // Synchronize the active_contents_ to the last committed entry.
   NavigationEntry* last_entry = GetLastCommittedEntry();
   if (last_entry && last_entry->tab_type() != active_contents_->type()) {
     TabContents* from_contents = active_contents_;
-    from_contents->SetActive(false);
+    from_contents->set_is_active(false);
 
     // Switch back to the previous tab contents.
     active_contents_ = GetTabContents(last_entry->tab_type());
     DCHECK(active_contents_);
 
-    active_contents_->SetActive(true);
+    active_contents_->set_is_active(true);
 
     // If we are transitioning from two types of WebContents, we need to migrate
     // the download shelf if it is visible. The download shelf may have been
     // created before the error that caused us to discard the entry.
     WebContents::MigrateShelfView(from_contents, active_contents_);
 
     if (from_contents->delegate()) {
       from_contents->delegate()->ReplaceContents(from_contents,
                                                  active_contents_);
     }
@@ skipping 58 matching lines @@
   if (!pending_entry_) {
     DCHECK(pending_entry_index_ != -1);
     pending_entry_ = entries_[pending_entry_index_].get();
   }
 
   // Reset the security states as any SSL error may have been resolved since we
   // last visited that page.
   pending_entry_->ssl() = NavigationEntry::SSLStatus();
 
   if (from_contents && from_contents->type() != pending_entry_->tab_type())
-    from_contents->SetActive(false);
+    from_contents->set_is_active(false);
 
   HWND parent =
       from_contents ? GetParent(from_contents->GetContainerHWND()) : 0;
   TabContents* contents =
       GetTabContentsCreateIfNecessary(parent, *pending_entry_);
 
-  contents->SetActive(true);
+  contents->set_is_active(true);
   active_contents_ = contents;
 
   if (from_contents && from_contents != contents) {
     if (from_contents->delegate())
       from_contents->delegate()->ReplaceContents(from_contents, contents);
   }
 
   NavigationEntry temp_entry(*pending_entry_);
   if (!contents->NavigateToPendingEntry(reload))
     DiscardPendingEntry();
@@ skipping 205 matching lines @@
 int NavigationController::GetEntryIndexWithPageID(
     TabContentsType type, SiteInstance* instance, int32 page_id) const {
   for (int i = static_cast<int>(entries_.size()) - 1; i >= 0; --i) {
     if ((entries_[i]->tab_type() == type) &&
         (entries_[i]->site_instance() == instance) &&
         (entries_[i]->page_id() == page_id))
       return i;
   }
   return -1;
 }