Reorganize the declarations to have some grouping and logical ordering in tab contents and web contents. Reorder the derived classes overrides to match, and reorder the definitions of the functions to match the order in the header file.

This doesn't actually change any code. I removed a few functions that were declared but never implemented (!) as well as some that were marked vitual but were never overridden. I renamed some things to make them more consistent.
Review URL: http://codereview.chromium.org/5005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2634 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 3 deletions

diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index 7b4f600..7705d94 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -169,7 +169,7 @@ class NavigationControllerRestoredObserver : public NotificationObserver {
 
   bool FinishedRestoring() {
     return (!controller_->needs_reload() && !controller_->GetPendingEntry() &&
-            !controller_->active_contents()->IsLoading());
+            !controller_->active_contents()->is_loading());
   }
 
   void SendDone() {
@@ -1637,8 +1637,8 @@ void AutomationProvider::GetConstrainedWindow(const IPC::Message& message,
     NavigationController* nav_controller =
         tab_tracker_->GetResource(handle);
     TabContents* tab = nav_controller->active_contents();
-    if (tab && index < static_cast<int>(tab->child_windows().size())) {
-      ConstrainedWindow* window = tab->child_windows()[index];
+    if (tab && index < static_cast<int>(tab->child_windows_.size())) {
+      ConstrainedWindow* window = tab->child_windows_[index];
       cwindow_handle = cwindow_tracker_->Add(window);
     }
   }