Remove dependency on PrefChangeRegistrar and renderer_preferences_util from content.

chrome/browser/ui/tab_contents/tab_contents_wrapper.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 CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_
 #define CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
+#include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/browser/printing/print_view_manager.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_observer.h"
 #include "content/common/notification_registrar.h"
 
 namespace prerender {
 class PrerenderObserver;
 }
 
 namespace printing {
@@ skipping 142 matching lines @@
     return translate_tab_helper_.get();
   }
 
   prerender::PrerenderObserver* prerender_observer() {
     return prerender_observer_.get();
   }
 
   // Overrides -----------------------------------------------------------------
 
   // TabContentsObserver overrides:
+  virtual void RenderViewCreated(RenderViewHost* render_view_host);

[Avi (use Gerrit), 2011/05/25 02:34:34]

OVERRIDE

[jam, 2011/05/25 16:00:59]

Done.

   virtual void RenderViewGone() OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   // NotificationObserver overrides:
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details) OVERRIDE;
 
   // Infobars ------------------------------------------------------------------
 
@@ skipping 19 matching lines @@
   // Internal helpers ----------------------------------------------------------
 
   // Message handlers.
   void OnJSOutOfMemory();
   void OnRegisterProtocolHandler(const std::string& protocol,
                                  const GURL& url,
                                  const string16& title);
   void OnSnapshot(const SkBitmap& bitmap);
   void OnPDFHasUnsupportedFeature();
 
+  // Returns the server that can provide alternate error pages.  If the returned
+  // URL is empty, the default error page built into WebKit will be used.
+  GURL GetAlternateErrorPageURL() const;
+
+  // Send the alternate error page URL to the renderer. This method is virtual
+  // so special html pages can override this (e.g., the new tab page).

[Avi (use Gerrit), 2011/05/25 02:34:34]

html → HTML

This doesn't look virtual to me. What do you mean by that?

[jam, 2011/05/25 16:00:59]

I had copied the comment without reading it till the end :) Done

+  void UpdateAlternateErrorPageURL(RenderViewHost* rvh);
+
+  // Update the RenderView's WebPreferences.
+  void UpdateWebPreferences();
+
+  // Update the TabContents's RendererPreferences.
+  void UpdateRendererPreferences();
+
   // Data for core operation ---------------------------------------------------
 
   // Delegate for notifying our owner about stuff. Not owned by us.
   TabContentsWrapperDelegate* delegate_;
 
   // Delegates for InfoBars associated with this TabContentsWrapper.
   std::vector<InfoBarDelegate*> infobar_delegates_;
   bool infobars_enabled_;
 
   NotificationRegistrar registrar_;
+  PrefChangeRegistrar pref_change_registrar_;
 
   // Data for current page -----------------------------------------------------
 
   // Shows an info-bar to users when they search from a known search engine and
   // have never used the omnibox for search before.
   scoped_ptr<OmniboxSearchHint> omnibox_search_hint_;
 
   // Tab Helpers ---------------------------------------------------------------
   // (These provide API for callers and have a getter function listed in the
   // "Tab Helpers" section in the member functions area, above.)
@@ skipping 45 matching lines @@
 
   // The supporting objects need to outlive the TabContents dtor (as they may
   // be called upon during its execution). As a result, this must come last
   // in the list.
   scoped_ptr<TabContents> tab_contents_;
 
   DISALLOW_COPY_AND_ASSIGN(TabContentsWrapper);
 };
 
 #endif  // CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_