diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-12 18:21:48 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-12 18:21:48 +0000 |
| commit | b39eb5931f369c016344cb227b24d95193339099 (patch) | |
| tree | b60d80410d1080cf38f69d3a53316c8f068620d4 /chrome/renderer/chrome_content_renderer_client.cc | |
| parent | 713c3e2a8c880a5f7331221c223640bf3672a4ef (diff) | |
| download | chromium_src-b39eb5931f369c016344cb227b24d95193339099.zip chromium_src-b39eb5931f369c016344cb227b24d95193339099.tar.gz chromium_src-b39eb5931f369c016344cb227b24d95193339099.tar.bz2 | |
Move WebPermissionContent implementation to ContentSettingsObserver instead of routing the callbacks from ChromeRenderViewObserver.
BUG=304341
R=jochen@chromium.org
Review URL: https://codereview.chromium.org/108873009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240361 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/chrome_content_renderer_client.cc')
| -rw-r--r-- | chrome/renderer/chrome_content_renderer_client.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc index c41dcaf..5c02f3a 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -362,7 +362,7 @@ void ChromeContentRendererClient::RenderFrameCreated( void ChromeContentRendererClient::RenderViewCreated( content::RenderView* render_view) { ContentSettingsObserver* content_settings = - new ContentSettingsObserver(render_view); + new ContentSettingsObserver(render_view, extension_dispatcher_.get()); if (chrome_observer_.get()) { content_settings->SetContentSettingRules( chrome_observer_->content_setting_rules()); @@ -391,9 +391,7 @@ void ChromeContentRendererClient::RenderViewCreated( if (command_line->HasSwitch(switches::kInstantProcess)) new SearchBox(render_view); - new ChromeRenderViewObserver( - render_view, content_settings, chrome_observer_.get(), - extension_dispatcher_.get()); + new ChromeRenderViewObserver(render_view, chrome_observer_.get()); new NetErrorHelper(render_view); } |