Make PerTabPrefsTabHelper into PrefsTabHelper, move all prefs code into it.

chrome/browser/ui/prefs/prefs_tab_helper.h

Index: chrome/browser/ui/prefs/prefs_tab_helper.h
diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.h b/chrome/browser/ui/prefs/prefs_tab_helper.h
new file mode 100644
index 0000000000000000000000000000000000000000..76604ff8f45949522a473a71e605469de11aaf4a
--- /dev/null
+++ b/chrome/browser/ui/prefs/prefs_tab_helper.h
@@ -0,0 +1,61 @@
+// 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_PREFS_PREFS_TAB_HELPER_H_
+#define CHROME_BROWSER_UI_PREFS_PREFS_TAB_HELPER_H_
+#pragma once
+
+#include "chrome/browser/prefs/pref_change_registrar.h"
+#include "content/browser/tab_contents/tab_contents_observer.h"
+#include "content/public/browser/notification_registrar.h"
+
+class PrefService;
+class TabContentsWrapper;
+struct WebPreferences;
+
+// Per-tab class to handle user preferences.
+class PrefsTabHelper : public TabContentsObserver,
+                       public content::NotificationObserver {
+ public:
+  explicit PrefsTabHelper(TabContentsWrapper* tab_contents);
+  virtual ~PrefsTabHelper();
+
+  static void RegisterUserPrefs(PrefService* prefs);
+
+  PrefService* per_tab_prefs() { return per_tab_prefs_.get(); }
+
+  virtual void OverrideWebPreferences(WebPreferences* prefs);

[mnaganov (inactive), 2011/12/02 20:01:32]

Doesn't need to be public anymore.

+
+ protected:

[Jói, 2011/12/05 10:25:03]

These can be private, unless you plan to let subclasses override them.

+  // Overrides -----------------------------------------------------------------
+
+  // TabContentsObserver overrides:
+  virtual void RenderViewCreated(RenderViewHost* render_view_host) OVERRIDE;
+  virtual void TabContentsDestroyed(TabContents* tab) OVERRIDE;
+
+  // content::NotificationObserver overrides:
+  virtual void Observe(int type,
+                       const content::NotificationSource& source,
+                       const content::NotificationDetails& details) OVERRIDE;
+
+ private:
+  // Update the RenderView's WebPreferences.
+  void UpdateWebPreferences();
+
+  // Update the TabContents's RendererPreferences.
+  void UpdateRendererPreferences();
+
+  // Our owning TabContentsWrapper.
+  TabContentsWrapper* wrapper_;
+
+  content::NotificationRegistrar registrar_;
+
+  scoped_ptr<PrefService> per_tab_prefs_;
+  PrefChangeRegistrar pref_change_registrar_;
+  PrefChangeRegistrar per_tab_pref_change_registrar_;
+
+  DISALLOW_COPY_AND_ASSIGN(PrefsTabHelper);
+};
+
+#endif  // CHROME_BROWSER_UI_PREFS_PREFS_TAB_HELPER_H_