Merge pull request #2835 from brave/fix/5086-new-tab-dcheck

New Tab Page: fix DCHECK
brave · Jul 1, 2019 · 8e18821 · 8e18821
2 parents 5f2f55d + 50019b2
commit 8e18821
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/browser/ui/webui/brave_new_tab_ui.cc b/browser/ui/webui/brave_new_tab_ui.cc
@@ -30,12 +30,14 @@ BraveNewTabUI::~BraveNewTabUI() {
 }
 
 void BraveNewTabUI::UpdateWebUIProperties() {
-  // TODO(petemill): move all this data to set on loadTimeData
-  // on the DataSource via the MessageHandler
-  auto* render_view_host = GetRenderViewHost();
-  SetStatsWebUIProperties(render_view_host);
-  SetPrivateWebUIProperties(render_view_host);
-  SetPreferencesWebUIProperties(render_view_host);
+  if (IsSafeToSetWebUIProperties()) {
+    // TODO(petemill): move all this data to set on loadTimeData
+    // on the DataSource via the MessageHandler
+    auto* render_view_host = GetRenderViewHost();
+    SetStatsWebUIProperties(render_view_host);
+    SetPrivateWebUIProperties(render_view_host);
+    SetPreferencesWebUIProperties(render_view_host);
+  }
 }
 
 void BraveNewTabUI::SetStatsWebUIProperties(