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

Unified Diff: content/browser/renderer_host/render_widget_host_view_android.cc

Issue 1731673002: Add tab reparenting (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Dan's final nits Created 4 years, 10 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
Index: content/browser/renderer_host/render_widget_host_view_android.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc
index ddb0f0ce1fb840d1ed944fc0e7a18a68f6385e85..80b42fc7cf29685e9bd21fa8c024f19df4f22475 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.cc
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc
@@ -1759,12 +1759,10 @@ void RenderWidgetHostViewAndroid::SetContentViewCore(
selection_controller_.reset();
ReleaseLocksOnSurface();
resize = true;
- if (content_view_core_) {
- if (!content_view_core)
- content_view_core_->RemoveObserver(this);
- else
- content_view_core->AddObserver(this);
- }
+ if (content_view_core_ && !content_view_core)
+ content_view_core_->RemoveObserver(this);
no sievers 2016/02/25 19:23:16 So that fixes the else-path where we might not hav
Yusuf 2016/02/25 19:37:03 Another good point. Right now, we never call a sin
+ else
+ content_view_core->AddObserver(this);
}
content_view_core_ = content_view_core;

Powered by Google App Engine
This is Rietveld 408576698