Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(335)

Unified Diff: content/browser/web_contents/render_view_host_manager.cc

Issue 16256018: Update content/ to use WeakPtr<T>::get() instead of implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix incorrectly modified code Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/tracing/tracing_ui.cc ('k') | content/common/gpu/image_transport_surface.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/web_contents/render_view_host_manager.cc
diff --git a/content/browser/web_contents/render_view_host_manager.cc b/content/browser/web_contents/render_view_host_manager.cc
index 73cd00a323140273eba28d9ab0e140176827a264..3ef63d4a6fed60c3bfe784434b87d592905bed39 100644
--- a/content/browser/web_contents/render_view_host_manager.cc
+++ b/content/browser/web_contents/render_view_host_manager.cc
@@ -677,7 +677,7 @@ void RenderViewHostManager::CommitPending() {
DCHECK(!(pending_web_ui_.get() && pending_and_current_web_ui_.get()));
if (pending_web_ui_)
web_ui_.reset(pending_web_ui_.release());
- else if (!pending_and_current_web_ui_)
+ else if (!pending_and_current_web_ui_.get())
web_ui_.reset();
// It's possible for the pending_render_view_host_ to be NULL when we aren't
« no previous file with comments | « content/browser/tracing/tracing_ui.cc ('k') | content/common/gpu/image_transport_surface.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698