Revert 18512 - Revert 18373 Consider a redirect following user gesture as us...

chrome/browser/tab_contents/tab_contents.cc

 // Copyright (c) 2009 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.
 
 #include "chrome/browser/tab_contents/tab_contents.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/file_version_info.h"
 #include "base/process_util.h"
@@ skipping 1823 matching lines @@
   if (!render_manager_.dom_ui()) {
     // We shouldn't get a DOM UI message when we haven't enabled the DOM UI.
     // Because the renderer might be owned and sending random messages, we need
     // to ignore these inproper ones.
     NOTREACHED();
     return;
   }
   render_manager_.dom_ui()->ProcessDOMUIMessage(message, content);
 }
 
+void TabContents::DocumentLoadedInFrame() {
+  controller_.DocumentLoadedInFrame();
+}
+
 void TabContents::ProcessExternalHostMessage(const std::string& message,
                                              const std::string& origin,
                                              const std::string& target) {
   if (delegate())
     delegate()->ForwardMessageToExternalHost(message, origin, target);
 }
 
 void TabContents::GoToEntryAtOffset(int offset) {
   controller_.GoToOffset(offset);
 }
@@ skipping 316 matching lines @@
                   &GearsCreateShortcutCallbackFunctor::Run));
 }
 
 void TabContents::OnUserGesture() {
   // See comment in RenderViewHostDelegate::OnUserGesture as to why we do this.
 #if defined(OS_WIN) || defined(OS_LINUX)
   DownloadRequestManager* drm = g_browser_process->download_request_manager();
   if (drm)
     drm->OnUserGesture(this);
 #endif
+  controller_.OnUserGesture();
 }
 
 void TabContents::OnFindReply(int request_id,
                               int number_of_matches,
                               const gfx::Rect& selection_rect,
                               int active_match_ordinal,
                               bool final_update) {
   // Ignore responses for requests other than the one we have most recently
   // issued. That way we won't act on stale results when the user has
   // already typed in another query.
@@ skipping 129 matching lines @@
       NavigationController::LoadCommittedDetails& committed_details =
           *(Details<NavigationController::LoadCommittedDetails>(details).ptr());
       ExpireInfoBars(committed_details);
       break;
     }
 
     default:
       NOTREACHED();
   }
 }