Index: chrome/browser/ui/tab_contents/tab_contents_wrapper.h |
diff --git a/chrome/browser/ui/tab_contents/tab_contents_wrapper.h b/chrome/browser/ui/tab_contents/tab_contents_wrapper.h |
index 084429123e141daaeda942e97bd1ca352ae8fe11..be02509afaa2cfbd3c582b91ef4022eeaf9562e1 100644 |
--- a/chrome/browser/ui/tab_contents/tab_contents_wrapper.h |
+++ b/chrome/browser/ui/tab_contents/tab_contents_wrapper.h |
@@ -179,6 +179,8 @@ class TabContentsWrapper : public TabContentsObserver, |
InfoBarTabHelper* infobar_tab_helper() { return infobar_tab_helper_.get(); } |
PasswordManager* password_manager() { return password_manager_.get(); } |
+ PrefService* per_tab_prefs() { return per_tab_prefs_.get(); } |
+ |
prerender::PrerenderTabHelper* prerender_tab_helper() { |
return prerender_tab_helper_.get(); |
} |
@@ -241,6 +243,8 @@ class TabContentsWrapper : public TabContentsObserver, |
// URL is empty, the default error page built into WebKit will be used. |
GURL GetAlternateErrorPageURL() const; |
+ void RegisterPerTabUserPrefs(PrefService* prefs); |
+ |
// Send the alternate error page URL to the renderer. |
void UpdateAlternateErrorPageURL(RenderViewHost* rvh); |
@@ -261,6 +265,7 @@ class TabContentsWrapper : public TabContentsObserver, |
content::NotificationRegistrar registrar_; |
PrefChangeRegistrar pref_change_registrar_; |
+ PrefChangeRegistrar per_tab_pref_change_registrar_; |
// Helper which implements the SyncedTabDelegate interface. |
scoped_ptr<TabContentsWrapperSyncedTabDelegate> synced_tab_delegate_; |
@@ -293,6 +298,9 @@ class TabContentsWrapper : public TabContentsObserver, |
scoped_ptr<PasswordManagerDelegate> password_manager_delegate_; |
scoped_ptr<PasswordManager> password_manager_; |
+ // Allows overriding user preferences. |
+ scoped_ptr<PrefService> per_tab_prefs_; |
+ |
scoped_ptr<prerender::PrerenderTabHelper> prerender_tab_helper_; |
// Handles print job for this contents. |
@@ -324,7 +332,6 @@ class TabContentsWrapper : public TabContentsObserver, |
scoped_ptr<ExtensionWebNavigationTabObserver> webnavigation_observer_; |
scoped_ptr<ExternalProtocolObserver> external_protocol_observer_; |
scoped_ptr<PluginObserver> plugin_observer_; |
- scoped_ptr<PrefService> per_tab_prefs_; // Allows overriding user preferences. |
scoped_ptr<printing::PrintPreviewMessageHandler> print_preview_; |
scoped_ptr<SadTabObserver> sad_tab_observer_; |
scoped_ptr<ThumbnailGenerator> thumbnail_generation_observer_; |