diff options
| author | marja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-02 13:10:52 +0000 |
|---|---|---|
| committer | marja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-02 13:10:52 +0000 |
| commit | 0ac43d3a2f125c07a022ec070460302f123a71a2 (patch) | |
| tree | 495af94dff705651e12e90672a473fb18f7579b7 /chrome/renderer/chrome_render_process_observer.h | |
| parent | 7293e834b2a590e0eb4205045b2e270997dd1e6b (diff) | |
| download | chromium_src-0ac43d3a2f125c07a022ec070460302f123a71a2.zip chromium_src-0ac43d3a2f125c07a022ec070460302f123a71a2.tar.gz chromium_src-0ac43d3a2f125c07a022ec070460302f123a71a2.tar.bz2 | |
Remove static ContentSettingsObserver::default_settings_.
Store default content settings in ChromeRenderProcessObserver instead.
BUG=94879
TEST=NONE
Review URL: http://codereview.chromium.org/8403032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108280 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/chrome_render_process_observer.h')
| -rw-r--r-- | chrome/renderer/chrome_render_process_observer.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/renderer/chrome_render_process_observer.h b/chrome/renderer/chrome_render_process_observer.h index 44477b8..e3ba711 100644 --- a/chrome/renderer/chrome_render_process_observer.h +++ b/chrome/renderer/chrome_render_process_observer.h @@ -41,6 +41,10 @@ class ChromeRenderProcessObserver : public content::RenderProcessObserver { // any 'clear cache' commands that were delayed until the next navigation. void ExecutePendingClearCache(); + // Returns a pointer to the default content settings owned by + // |ChromeRenderProcessObserver|. + const ContentSettings* default_content_settings() const; + // Returns a pointer to the image setting rules owned by // |ChromeRenderProcessObserver|. const ContentSettingsForOneType* image_setting_rules() const; @@ -75,6 +79,7 @@ class ChromeRenderProcessObserver : public content::RenderProcessObserver { chrome::ChromeContentRendererClient* client_; // If true, the web cache shall be cleared before the next navigation event. bool clear_cache_pending_; + ContentSettings default_content_settings_; ContentSettingsForOneType image_setting_rules_; DISALLOW_COPY_AND_ASSIGN(ChromeRenderProcessObserver); |