Do some refactoring of renderer_host....

chrome/browser/tab_contents/tab_contents.h

 // 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.
 
 #ifndef CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
 #define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
 
 #include "build/build_config.h"
 
 #include <map>
@@ skipping 16 matching lines @@
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/page_navigator.h"
 #include "chrome/browser/tab_contents/render_view_host_manager.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/common/gears_api.h"
 #include "chrome/common/navigation_types.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/page_action.h"
 #include "chrome/common/property_bag.h"
-#include "chrome/common/renderer_preferences.h"
 #include "net/base/load_states.h"
 #include "webkit/glue/password_form.h"
 #include "webkit/glue/webpreferences.h"
 
 #if defined(OS_MACOSX) || defined(OS_LINUX)
 // Remove when we've finished porting the supporting classes.
 #include "chrome/common/temp_scaffolding_stubs.h"
 #elif defined(OS_WIN)
 #include "chrome/browser/printing/print_view_manager.h"
 #endif
@@ skipping 23 matching lines @@
 class AutofillManager;
 class BlockedPopupContainer;
 class DOMUI;
 class DOMUIContents;
 class DownloadItem;
 class LoadNotificationDetails;
 class PageAction;
 class PasswordManager;
 class PluginInstaller;
 class Profile;
+struct RendererPreferences;
 class RenderViewHost;
 class TabContentsDelegate;
 class TabContentsFactory;
 class SkBitmap;
 class SiteInstance;
 class TabContentsView;
 struct ThumbnailScore;
 struct ViewHostMsg_FrameNavigate_Params;
 struct ViewHostMsg_DidPrintPage_Params;
 class TabContents;
@@ skipping 464 matching lines @@
   // Override the encoding and reload the page by sending down
   // ViewMsg_SetPageEncoding to the renderer. |UpdateEncoding| is kinda
   // the opposite of this, by which 'browser' is notified of
   // the encoding of the current tab from 'renderer' (determined by
   // auto-detect, http header, meta, bom detection, etc).
   void override_encoding(const std::wstring& encoding) {
     set_encoding(encoding);
     render_view_host()->SetPageEncoding(encoding);
   }
 
-  void CrossSiteNavigationCanceled() {
-    render_manager_.CrossSiteNavigationCanceled();
-  }
-
   void WindowMoveOrResizeStarted() {
     render_view_host()->WindowMoveOrResizeStarted();
   }
 
   BlockedPopupContainer* blocked_popup_container() const {
     return blocked_popups_;
   }
 
  private:
   friend class NavigationController;
@@ skipping 153 matching lines @@
   void NotifySwapped();
   void NotifyConnected();
   void NotifyDisconnected();
 
   // If params has a searchable form, this tries to create a new keyword.
   void GenerateKeywordIfNecessary(
       const ViewHostMsg_FrameNavigate_Params& params);
 
   // RenderViewHostDelegate ----------------------------------------------------
 
-  virtual RendererPreferences GetRendererPrefs() const;
   virtual RenderViewHostDelegate::View* GetViewDelegate() const;
   virtual RenderViewHostDelegate::Save* GetSaveDelegate() const;
   virtual TabContents* GetAsTabContents();
   virtual void RenderViewCreated(RenderViewHost* render_view_host);
   virtual void RenderViewReady(RenderViewHost* render_view_host);
   virtual void RenderViewGone(RenderViewHost* render_view_host);
   virtual void DidNavigate(RenderViewHost* render_view_host,
                            const ViewHostMsg_FrameNavigate_Params& params);
   virtual void UpdateState(RenderViewHost* render_view_host,
                            int32 page_id,
@@ skipping 73 matching lines @@
   virtual void AutofillFormSubmitted(const webkit_glue::AutofillForm& form);
   virtual void GetAutofillSuggestions(const std::wstring& field_name,
       const std::wstring& user_text, int64 node_id, int request_id);
   virtual void RemoveAutofillEntry(const std::wstring& field_name,
                                    const std::wstring& value);
   virtual void PageHasOSDD(RenderViewHost* render_view_host,
                            int32 page_id, const GURL& url, bool autodetected);
   virtual void DidGetPrintedPagesCount(int cookie, int number_pages);
   virtual void DidPrintPage(const ViewHostMsg_DidPrintPage_Params& params);
   virtual GURL GetAlternateErrorPageURL() const;
+  virtual RendererPreferences GetRendererPrefs() const;
   virtual WebPreferences GetWebkitPrefs();
   virtual void OnMissingPluginStatus(int status);
   virtual void OnCrashedPlugin(const FilePath& plugin_path);
   virtual void OnCrashedWorker();
   virtual void OnJSOutOfMemory();
   virtual void ShouldClosePage(bool proceed);
-  void OnCrossSiteResponse(int new_render_process_host_id,
-                           int new_request_id);
+  virtual void OnCrossSiteResponse(int new_render_process_host_id,
+                                   int new_request_id);
+  virtual void OnCrossSiteNavigationCanceled();
   virtual bool CanBlur() const;
   virtual gfx::Rect GetRootWindowResizerRect() const;
   virtual void RendererUnresponsive(RenderViewHost* render_view_host,
                                     bool is_during_unload);
   virtual void RendererResponsive(RenderViewHost* render_view_host);
   virtual void LoadStateChanged(const GURL& url, net::LoadState load_state);
   virtual void OnDidGetApplicationInfo(
       int32 page_id,
       const webkit_glue::WebApplicationInfo& info);
   virtual void OnUserGesture();
+  virtual bool IsExternalTabContainer() const;
   virtual void OnFindReply(int request_id,
                            int number_of_matches,
                            const gfx::Rect& selection_rect,
                            int active_match_ordinal,
                            bool final_update);
-  virtual bool IsExternalTabContainer() const;
+  virtual void DidInsertCSS();
 
   // SelectFileDialog::Listener ------------------------------------------------
 
   virtual void FileSelected(const FilePath& path, int index, void* params);
   virtual void MultiFilesSelected(const std::vector<FilePath>& files,
                                   void* params);
   virtual void FileSelectionCanceled(void* params);
 
   // RenderViewHostManager::Delegate -------------------------------------------
 
@@ skipping 215 matching lines @@
   // True if the user has decided to block future javascript messages. This is
   // reset on navigations to false on navigations.
   bool suppress_javascript_messages_;
 
   // ---------------------------------------------------------------------------
 
   DISALLOW_COPY_AND_ASSIGN(TabContents);
 };
 
 #endif  // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_