Get rid of a bunch of view_messages.h includes from chrome by making the TabContentsObserver inte...

chrome/browser/tabs/tab_finder.cc

 // 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.
 
 #include "chrome/browser/tabs/tab_finder.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/stl_util.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/browser/tab_contents/navigation_details.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_observer.h"
 #include "content/public/browser/notification_service.h"
-#include "content/common/view_messages.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
+#include "content/public/common/frame_navigate_params.h"
 #include "content/public/common/page_transition_types.h"
 
 class TabFinder::TabContentsObserverImpl : public TabContentsObserver {
  public:
   TabContentsObserverImpl(TabContents* tab, TabFinder* finder);
   virtual ~TabContentsObserverImpl();
 
   TabContents* tab_contents() { return TabContentsObserver::tab_contents(); }
 
   // TabContentsObserver overrides:
   virtual void DidNavigateAnyFrame(
       const content::LoadCommittedDetails& details,
-      const ViewHostMsg_FrameNavigate_Params& params) OVERRIDE;
+      const content::FrameNavigateParams& params) OVERRIDE;
   virtual void TabContentsDestroyed(TabContents* tab) OVERRIDE;
 
  private:
   TabFinder* finder_;
 
   DISALLOW_COPY_AND_ASSIGN(TabContentsObserverImpl);
 };
 
 TabFinder::TabContentsObserverImpl::TabContentsObserverImpl(
     TabContents* tab,
     TabFinder* finder)
     : TabContentsObserver(tab),
       finder_(finder) {
 }
 
 TabFinder::TabContentsObserverImpl::~TabContentsObserverImpl() {
 }
 
 void TabFinder::TabContentsObserverImpl::DidNavigateAnyFrame(
     const content::LoadCommittedDetails& details,
-    const ViewHostMsg_FrameNavigate_Params& params) {
+    const content::FrameNavigateParams& params) {
   finder_->DidNavigateAnyFrame(tab_contents(), details, params);
 }
 
 void TabFinder::TabContentsObserverImpl::TabContentsDestroyed(
     TabContents* tab) {
   finder_->TabDestroyed(this);
   delete this;
 }
 
 // static
@@ skipping 57 matching lines @@
                  content::NotificationService::AllSources());
 }
 
 TabFinder::~TabFinder() {
   STLDeleteElements(&tab_contents_observers_);
 }
 
 void TabFinder::DidNavigateAnyFrame(
     TabContents* source,
     const content::LoadCommittedDetails& details,
-    const ViewHostMsg_FrameNavigate_Params& params) {
+    const content::FrameNavigateParams& params) {
   CancelRequestsFor(source);
 
   if (content::PageTransitionIsRedirect(params.transition)) {
     // If this is a redirect, we need to go to the db to get the start.
     FetchRedirectStart(source);
   } else if (params.redirects.size() > 1 ||
              params.redirects[0] != details.entry->url()) {
     tab_contents_to_url_[source] = params.redirects[0];
   }
 }
@@ skipping 81 matching lines @@
                                          GURL url,
                                          bool success,
                                          history::RedirectList* redirects) {
   if (success && !redirects->empty()) {
     TabContents* tab_contents =
         callback_consumer_.GetClientDataForCurrentRequest();
     DCHECK(tab_contents);
     tab_contents_to_url_[tab_contents] = redirects->back();
   }
 }