Revert 18373 - Consider a redirect following user gesture as userinitiated in...

chrome/browser/tab_contents/navigation_controller.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_NAVIGATION_CONTROLLER_H_
 #define CHROME_BROWSER_TAB_CONTENTS_NAVIGATION_CONTROLLER_H_
 
 #include <map>
 
 #include "build/build_config.h"
 
 #include "base/linked_ptr.h"
 #include "base/string16.h"
-#include "base/time.h"
 #include "googleurl/src/gurl.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/ssl/ssl_manager.h"
 #include "chrome/common/navigation_types.h"
 #include "chrome/common/page_transition_types.h"
 
 class NavigationEntry;
 class GURL;
 class Profile;
 class TabContents;
@@ skipping 257 matching lines @@
   // TabContents ---------------------------------------------------------------
 
   // Returns the tab contents associated with this controller. Non-NULL except
   // during set-up of the tab.
   TabContents* tab_contents() const {
     // This currently returns the active tab contents which should be renamed to
     // tab_contents.
     return tab_contents_;
   }
 
-  // Called when a document has been loaded in a frame.
-  void DocumentLoadedInFrame();
-
-  // Called when the user presses the mouse, enter key or space bar.
-  void OnUserGesture();
-
   // For use by TabContents ----------------------------------------------------
 
   // Handles updating the navigation state after the renderer has navigated.
   // This is used by the TabContents. Simpler tab contents types can use
   // CommitPendingEntry below.
   //
   // If a new entry is created, it will return true and will have filled the
   // given details structure and broadcast the NOTIFY_NAV_ENTRY_COMMITTED
   // notification. The caller can then use the details without worrying about
   // listening for the notification.
@@ skipping 124 matching lines @@
   // Inserts a new entry or replaces the current entry with a new one, removing
   // all entries after it. The new entry will become the active one.
   void InsertOrReplaceEntry(NavigationEntry* entry, bool replace);
 
   // Discards the pending and transient entries.
   void DiscardNonCommittedEntriesInternal();
 
   // Discards the transient entry.
   void DiscardTransientEntry();
 
-  // Returns true if the navigation is redirect.
-  bool IsRedirect(const ViewHostMsg_FrameNavigate_Params& params);
-
-  // Returns true if the navigation is likley to be automatic rather than
-  // user-initiated.
-  bool IsLikelyAutoNavigation(base::TimeTicks now);
-
   // ---------------------------------------------------------------------------
 
   // The user profile associated with this controller
   Profile* profile_;
 
   // List of NavigationEntry for this tab
   typedef std::vector<linked_ptr<NavigationEntry> > NavigationEntries;
   NavigationEntries entries_;
 
   // An entry we haven't gotten a response for yet.  This will be discarded
@@ skipping 39 matching lines @@
   bool load_pending_entry_when_active_;
 
   // Unique identifier of this controller for session restore. This id is only
   // unique within the current session, and is not guaranteed to be unique
   // across sessions.
   const SessionID session_id_;
 
   // Unique identifier of the window we're in. Used by session restore.
   SessionID window_id_;
 
-  // The time ticks at which the last document was loaded.
-  base::TimeTicks last_document_loaded_;
-
-  // Whether a user gesture has been observed since the last navigation.
-  bool user_gesture_observed_;
-
   // 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_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigationController);
 };
 
 #endif  // CHROME_BROWSER_TAB_CONTENTS_NAVIGATION_CONTROLLER_H_