DidNavigate refactor of doom

chrome/browser/web_contents.h

 // 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.
 
 #ifndef CHROME_BROWSER_WEB_CONTENTS_H_
 #define CHROME_BROWSER_WEB_CONTENTS_H_
 
 #include <hash_map>
 
 #include "chrome/browser/fav_icon_helper.h"
@@ skipping 48 matching lines @@
   // Causes the renderer to invoke the onbeforeunload event handler.  The
   // result will be returned via ViewMsg_ShouldClose.
   virtual void FirePageBeforeUnload();
 
   // Close the page after the page has responded that it can be closed via
   // ViewMsg_ShouldClose. This is where the page itself is closed. The
   // unload handler is triggered here, which can block with a dialog, but cannot
   // cancel the close of the page.
   virtual void FirePageUnload();
 
-
   // TabContents
   virtual WebContents* AsWebContents() { return this; }
-  virtual bool Navigate(const NavigationEntry& entry, bool reload);
+  virtual SiteInstance* GetSiteInstance() const {
+    return render_manager_.current_host()->site_instance();
+  }
+  virtual bool NavigateToPendingEntry(bool reload);
   virtual void Stop();
   virtual void DidBecomeSelected();
   virtual void WasHidden();
   virtual void Destroy();
   virtual SkBitmap GetFavIcon();
   virtual std::wstring GetStatusText() const;
 
   // Find functions
   virtual void StartFinding(int request_id,
                             const std::wstring& search_string,
@@ skipping 153 matching lines @@
   // SiteInstance, respectively.  Each of these may change over time.  Callers
   // should be aware that the SiteInstance could be deleted if its ref count
   // drops to zero (i.e., if all RenderViewHosts and NavigationEntries that
   // use it are deleted).
   RenderProcessHost* process() const {
     return render_manager_.current_host()->process();
   }
   RenderViewHost* render_view_host() const {
     return render_manager_.current_host();
   }
-  SiteInstance* site_instance() const {
-    return render_manager_.current_host()->site_instance();
-  }
   RenderWidgetHostView* view() const {
     return render_manager_.current_view();
   }
 
   // Overridden from TabContents to return the window of the
   // RenderWidgetHostView.
   virtual HWND GetContentHWND();
 
   // Handling the drag and drop of files into the content area.
   virtual bool CanDisplayFile(const std::wstring& full_path);
@@ skipping 63 matching lines @@
   }
 
   // Returns true if this WebContents will notify about disconnection.
   bool notify_disconnection() const { return notify_disconnection_; }
 
   void set_override_encoding(const std::string& override_encoding) {
     override_encoding_ = override_encoding;
   }
 
  protected:
-  FRIEND_TEST(WebContentsTest, OnMessageReceived);
+  FRIEND_TEST(WebContentsTest, UpdateTitle);
 
   // Should be deleted via CloseContents.
   virtual ~WebContents();
 
   // RenderViewHostDelegate
   virtual RenderViewHostDelegate::FindInPage* GetFindInPageDelegate();
   virtual Profile* GetProfile() const;
 
   virtual void CreateView(int route_id, HANDLE modal_dialog_event);
   virtual void CreateWidget(int route_id);
@@ skipping 200 matching lines @@
       const ViewHostMsg_FrameNavigate_Params& params);
 
   // Sets up the View that holds the rendered web page, receives messages for
   // it and contains page plugins.
   RenderWidgetHostHWND* CreatePageView(RenderViewHost* render_view_host);
 
   // Navigation helpers --------------------------------------------------------
   //
   // These functions are helpers for Navigate() and DidNavigate().
 
-  // Creates a new navigation entry (malloced, the caller will have to free)
-  // for the given committed load. Used by DidNavigate. Will not return NULL.
-  NavigationEntry* CreateNavigationEntryForCommit(
-      const ViewHostMsg_FrameNavigate_Params& params);
-
   // Handles post-navigation tasks in DidNavigate AFTER the entry has been
   // committed to the navigation controller. Note that the navigation entry is
   // not provided since it may be invalid/changed after being committed. The
   // current navigation entry is in the NavigationController at this point.
   void DidNavigateMainFramePostCommit(
       const NavigationController::LoadCommittedDetails& details,
       const ViewHostMsg_FrameNavigate_Params& params);
   void DidNavigateAnyFramePostCommit(
       RenderViewHost* render_view_host,
       const NavigationController::LoadCommittedDetails& details,
       const ViewHostMsg_FrameNavigate_Params& params);
 
   // Called when navigating the main frame to close all child windows if the
   // domain is changing.
   void MaybeCloseChildWindows(const ViewHostMsg_FrameNavigate_Params& params);
 
-  // Broadcasts a notification for the provisional load committing, used by
-  // DidNavigate.
-  void BroadcastProvisionalLoadCommit(
-      RenderViewHost* render_view_host,
-      const ViewHostMsg_FrameNavigate_Params& params);
-
-  // Convenience method that returns true if navigating to the specified URL
-  // from the current one is an in-page navigation (jumping to a ref in the
-  // page).
-  bool IsInPageNavigation(const GURL& url) const;
-
   // Updates the starred state from the bookmark bar model. If the state has
   // changed, the delegate is notified.
   void UpdateStarredStateForCurrentURL();
 
   // Send the alternate error page URL to the renderer. This method is virtual
   // so special html pages can override this (e.g., the new tab page).
   virtual void UpdateAlternateErrorPageURL();
 
   // Send webkit specific settings to the renderer.
   void UpdateWebPreferences();
@@ skipping 164 matching lines @@
   scoped_refptr<WebApp> web_app_;
 
   // Specified encoding which is used to override current tab's encoding.
   std::string override_encoding_;
 
   DISALLOW_COPY_AND_ASSIGN(WebContents);
 };
 
 #endif  // CHROME_BROWSER_WEB_CONTENTS_H_