diff options
| author | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-07 19:10:12 +0000 |
|---|---|---|
| committer | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-07 19:10:12 +0000 |
| commit | d13928d51c251bdcc76b961c1ad8bb9339da9917 (patch) | |
| tree | 2ad5562b653d3ae6756c11f389fc635e6692d846 /content | |
| parent | 2bc6a2658358e0a191914ffe3a597544c9bb7e6d (diff) | |
| download | chromium_src-d13928d51c251bdcc76b961c1ad8bb9339da9917.zip chromium_src-d13928d51c251bdcc76b961c1ad8bb9339da9917.tar.gz chromium_src-d13928d51c251bdcc76b961c1ad8bb9339da9917.tar.bz2 | |
Change policy to not trigger dangerous download UI for web intents dispatched files.
R=asanka@chromium.org
BUG=140845
Review URL: https://chromiumcodereview.appspot.com/10836164
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155443 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/web_contents/render_view_host_manager.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/content/browser/web_contents/render_view_host_manager.cc b/content/browser/web_contents/render_view_host_manager.cc index 0ad2906..49acb02 100644 --- a/content/browser/web_contents/render_view_host_manager.cc +++ b/content/browser/web_contents/render_view_host_manager.cc @@ -56,10 +56,11 @@ RenderViewHostManager::~RenderViewHostManager() { if (pending_render_view_host_) CancelPending(); - // We should always have a main RenderViewHost. + // We should always have a main RenderViewHost except in some tests. RenderViewHostImpl* render_view_host = render_view_host_; render_view_host_ = NULL; - render_view_host->Shutdown(); + if (render_view_host) + render_view_host->Shutdown(); // Shut down any swapped out RenderViewHosts. for (RenderViewHostMap::iterator iter = swapped_out_hosts_.begin(); |