summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-22 03:21:41 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-22 03:21:41 +0000
commit887dc5d85a487e0a071099b58f1ea2235602a0ab (patch)
tree2e4d5a1327698ee224aed8b218a69f9cd273853c /content
parent7f17c7f4404f8b092f0df7c194330e3c1ead1f05 (diff)
downloadchromium_src-887dc5d85a487e0a071099b58f1ea2235602a0ab.zip
chromium_src-887dc5d85a487e0a071099b58f1ea2235602a0ab.tar.gz
chromium_src-887dc5d85a487e0a071099b58f1ea2235602a0ab.tar.bz2
Fix more cases of unreachable code on Windows, mostly added recently.
BUG=346399 TEST=none Review URL: https://codereview.chromium.org/296053005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272069 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/renderer_host/render_widget_host_view_aura.cc2
-rw-r--r--content/renderer/p2p/ipc_network_manager.cc1
2 files changed, 0 insertions, 3 deletions
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index 08b5708..0607c92 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -2371,8 +2371,6 @@ scoped_ptr<ResizeLock> RenderWidgetHostViewAura::CreateResizeLock(
desired_size,
defer_compositor_lock,
base::TimeDelta::FromMilliseconds(kResizeLockTimeoutMs)));
- ResizeLock* lock = NULL;
- return scoped_ptr<ResizeLock>(lock);
}
DelegatedFrameHost* RenderWidgetHostViewAura::GetDelegatedFrameHost() const {
diff --git a/content/renderer/p2p/ipc_network_manager.cc b/content/renderer/p2p/ipc_network_manager.cc
index a11e03c..3dce7c8 100644
--- a/content/renderer/p2p/ipc_network_manager.cc
+++ b/content/renderer/p2p/ipc_network_manager.cc
@@ -30,7 +30,6 @@ talk_base::AdapterType ConvertConnectionTypeToAdapterType(
default:
return talk_base::ADAPTER_TYPE_UNKNOWN;
}
- return talk_base::ADAPTER_TYPE_UNKNOWN;
}
} // namespace