diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-13 07:29:32 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-13 07:29:32 +0000 |
| commit | 8093a5439afecec131b78422abdeb7038de6f7a3 (patch) | |
| tree | a2f7dc196c51970186615d10d0a884e18c2b7ae9 /chrome/renderer/chrome_render_view_observer.h | |
| parent | 697a650a1084ef9c77f9c5675f891d6157f36e99 (diff) | |
| download | chromium_src-8093a5439afecec131b78422abdeb7038de6f7a3.zip chromium_src-8093a5439afecec131b78422abdeb7038de6f7a3.tar.gz chromium_src-8093a5439afecec131b78422abdeb7038de6f7a3.tar.bz2 | |
Get rid of the remaining content settings code in the content module.
Add user data to content::ResourceContext that points to chrome's ProfileIOData. That way when the embedder code is called by content, it can get back to its profile specific data structures like HostContentSettingsMap.
BUG=76793
Review URL: http://codereview.chromium.org/7014025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85247 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/chrome_render_view_observer.h')
| -rw-r--r-- | chrome/renderer/chrome_render_view_observer.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/renderer/chrome_render_view_observer.h b/chrome/renderer/chrome_render_view_observer.h index 863a5b9..6fe6c11 100644 --- a/chrome/renderer/chrome_render_view_observer.h +++ b/chrome/renderer/chrome_render_view_observer.h @@ -69,8 +69,7 @@ class ChromeRenderViewObserver : public RenderViewObserver, const WebKit::WebString& name, const WebKit::WebString& display_name, unsigned long estimated_size) OVERRIDE; - // TODO(jam): add OVERRIDE once WebKit is rolled. - virtual bool allowFileSystem(WebKit::WebFrame* frame); + virtual bool allowFileSystem(WebKit::WebFrame* frame) OVERRIDE; virtual bool allowImages(WebKit::WebFrame* frame, bool enabled_per_settings) OVERRIDE; virtual bool allowIndexedDB(WebKit::WebFrame* frame, |