Convert WebContents to return a content::NavigationController instead of the implementation. Upda...

content/browser/tab_contents/navigation_controller.h

 // Copyright (c) 2011 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 CONTENT_BROWSER_TAB_CONTENTS_NAVIGATION_CONTROLLER_H_
 #define CONTENT_BROWSER_TAB_CONTENTS_NAVIGATION_CONTROLLER_H_
 #pragma once
 
 #include "build/build_config.h"
 #include "base/compiler_specific.h"
@@ skipping 17 matching lines @@
     : public NON_EXPORTED_BASE(content::NavigationController) {
  public:
   NavigationController(TabContents* tab_contents,
                        content::BrowserContext* browser_context,
                        SessionStorageNamespace* session_storage_namespace);
   virtual ~NavigationController();
 
   // NavigationController implementation:
   virtual content::WebContents* GetWebContents() const OVERRIDE;
   virtual content::BrowserContext* GetBrowserContext() const OVERRIDE;
+  virtual void SetBrowserContext(
+      content::BrowserContext* browser_context) OVERRIDE;
   virtual void Restore(
       int selected_navigation,
       bool from_last_session,
       std::vector<content::NavigationEntry*>* entries) OVERRIDE;
   virtual content::NavigationEntry* GetActiveEntry() const OVERRIDE;
   virtual content::NavigationEntry* GetVisibleEntry() const OVERRIDE;
   virtual int GetCurrentEntryIndex() const OVERRIDE;
   virtual content::NavigationEntry* GetLastCommittedEntry() const OVERRIDE;
   virtual int GetLastCommittedEntryIndex() const OVERRIDE;
   virtual bool CanViewSource() const OVERRIDE;
@@ skipping 32 matching lines @@
   virtual void SetMaxRestoredPageID(int32 max_id) OVERRIDE;
   virtual int32 GetMaxRestoredPageID() const OVERRIDE;
   virtual bool NeedsReload() const OVERRIDE;
   virtual void CancelPendingReload() OVERRIDE;
   virtual void ContinuePendingReload() OVERRIDE;
   virtual bool IsInitialNavigation() OVERRIDE;
   virtual void Reload(bool check_for_repost) OVERRIDE;
   virtual void ReloadIgnoringCache(bool check_for_repost) OVERRIDE;
   virtual void NotifyEntryChanged(const content::NavigationEntry* entry,
                                  int index) OVERRIDE;
+  virtual void CopyStateFrom(
+      const content::NavigationController& source) OVERRIDE;
   virtual void CopyStateFromAndPrune(
       content::NavigationController* source) OVERRIDE;
   virtual void PruneAllButActive() OVERRIDE;
 
-  // Sets the browser context for this controller.
-  void set_browser_context(content::BrowserContext* browser_context) {
-    browser_context_ = browser_context;
-  }
-
   // Returns the index of the specified entry, or -1 if entry is not contained
   // in this NavigationController.
   int GetIndexOfEntry(const content::NavigationEntryImpl* entry) const;
 
   // Return the index of the entry with the corresponding instance and page_id,
   // or -1 if not found.
   int GetEntryIndexWithPageID(SiteInstance* instance,
                               int32 page_id) const;
 
   // Return the entry with the corresponding instance and page_id, or NULL if
@@ skipping 49 matching lines @@
   // is no last committed entry, then nothing will be in-page.
   //
   // Special note: if the URLs are the same, it does NOT count as an in-page
   // navigation. Neither does an input URL that has no ref, even if the rest is
   // the same. This may seem weird, but when we're considering whether a
   // navigation happened without loading anything, the same URL would be a
   // reload, while only a different ref would be in-page (pages can't clear
   // refs without reload, only change to "#" which we don't count as empty).
   bool IsURLInPageNavigation(const GURL& url) const;
 
-  // Copies the navigation state from the given controller to this one. This
-  // one should be empty (just created).
-  void CopyStateFrom(const NavigationController& source);
-
   // Random data ---------------------------------------------------------------
 
-  // Disables checking for a repost and prompting the user. This is used during
-  // testing.
-  static void DisablePromptOnRepost();
-
   // Maximum number of entries before we start removing entries from the front.
   static void set_max_entry_count_for_testing(size_t max_entry_count) {
     max_entry_count_for_testing_ = max_entry_count;
   }
   static size_t max_entry_count();
 
  private:
   class RestoreHelper;
   friend class RestoreHelper;
   friend class TabContents;  // For invoking OnReservedPageIDRange.
@@ skipping 125 matching lines @@
 
   // Whether we need to be reloaded when made active.
   bool needs_reload_;
 
   // The time ticks at which the last document was loaded.
   base::TimeTicks last_document_loaded_;
 
   // The session storage id that any (indirectly) owned RenderView should use.
   scoped_refptr<SessionStorageNamespace> session_storage_namespace_;
 
-  // Should Reload check for post data? The default is true, but is set to false
-  // when testing.
-  static bool check_for_repost_;
-
   // The maximum number of entries that a navigation controller can store.
   static size_t max_entry_count_for_testing_;
 
   // If a repost is pending, its type (RELOAD or RELOAD_IGNORING_CACHE),
   // NO_RELOAD otherwise.
   ReloadType pending_reload_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigationController);
 };
 
 #endif  // CONTENT_BROWSER_TAB_CONTENTS_NAVIGATION_CONTROLLER_H_