DidNavigate refactor of doom

chrome/browser/tab_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_TAB_CONTENTS_H_
 #define CHROME_BROWSER_TAB_CONTENTS_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 116 matching lines @@
 
   // The max PageID of any page that this TabContents has loaded.  PageIDs
   // increase with each new page that is loaded by a tab.  If this is a
   // WebContents, then the max PageID is kept separately on each SiteInstance.
   // Returns -1 if no PageIDs have yet been seen.
   int32 GetMaxPageID();
 
   // Updates the max PageID to be at least the given PageID.
   void UpdateMaxPageID(int32 page_id);
 
+  // Returns the site instance associated with the current page. By default,
+  // there is no site instance. WebContents overrides this to provide proper
+  // access to its site instance.
+  virtual SiteInstance* GetSiteInstance() const { return NULL; }
+
   // Initial title assigned to NavigationEntries from Navigate.
   virtual const std::wstring GetDefaultTitle() const;
 
   // Defines whether the url should be displayed within the browser. If false
   // is returned, the URL field is blank and grabs focus to invite the user
   // to type a new url
   virtual bool ShouldDisplayURL() { return true; }
 
   // Returns the favicon for this tab, or an isNull() bitmap if the tab does not
   // have a favicon. The default implementation uses the current navigation
@@ skipping 120 matching lines @@
   // and external resource.
   bool response_started() const { return response_started_; }
 
   // Set whether this tab contents is active. A tab content is active for a
   // given tab if it is currently being used to display some contents. Note that
   // this is different from whether a tab is selected.
   virtual void SetActive(bool active) { is_active_ = active; }
   bool is_active() const { return is_active_; }
 
   // Called by the NavigationController to cause the TabContents to navigate to
-  // the specified entry.  Either TabContents::DidNavigateToEntry or the
-  // navigation controller's DiscardPendingEntry method should be called in
-  // response (possibly sometime later).
+  // the current pending entry. The NavigationController should be called back
+  // with CommitPendingEntry/RendererDidNavigate on success or
+  // DiscardPendingEntry. The callbacks can be inside of this function, or at
+  // some future time.
   //
   // The entry has a PageID of -1 if newly created (corresponding to navigation
   // to a new URL).
   //
   // If this method returns false, then the navigation is discarded (equivalent
   // to calling DiscardPendingEntry on the NavigationController).
-  //
-  virtual bool Navigate(const NavigationEntry& entry, bool reload);
+  virtual bool NavigateToPendingEntry(bool reload);
 
   // Stop any pending navigation.
   virtual void Stop() {}
 
   // Convenience method for notifying the delegate of a navigation state
   // change. See TabContentsDelegate.
   void NotifyNavigationStateChanged(unsigned changed_flags);
 
   // Convenience method for notifying the delegate of a navigation.
   // See TabContentsDelegate.
@@ skipping 182 matching lines @@
 
   // Set focus on the initial component. This is invoked from
   // RestoreFocus if SetLastFocusOwner has not yet been invoked.
   virtual void SetInitialFocus();
 
   // Changes the IsLoading state and notifies delegate as needed
   // |details| is used to provide details on the load that just finished
   // (but can be null if not applicable)
   void SetIsLoading(bool is_loading, LoadNotificationDetails* details);
 
-  // Called by subclasses when a navigation occurs.  Ownership of the entry
-  // object is passed to this method. The details object should be filled in
-  // *except* for the entry (which the NavigationController will set). This
-  // behaves the same as NavigationController::DidNavigate, see that for more.
-  void DidNavigateToEntry(NavigationEntry* entry,
-                          NavigationController::LoadCommittedDetails* details);
-
   // Called by a derived class when the TabContents is resized, causing
   // suppressed constrained web popups to be repositioned to the new bounds
   // if necessary.
   void RepositionSupressedPopupsToFit(const gfx::Size& new_size);
 
   // Releases the download shelf. This method is used by MigrateShelfViewFrom.
   // Sub-classes should clear any pointer they might keep to the shelf view and
   // invoke TabContents::ReleaseDownloadShelfView().
   virtual void ReleaseDownloadShelfView();
 
@@ skipping 31 matching lines @@
   int32 max_page_id_;
 
   // The id used in the ViewStorage to store the last focused view.
   int last_focused_view_storage_id_;
 
   std::string encoding_name_;
 };
 
 #endif  // CHROME_BROWSER_TAB_CONTENTS_H_