Update browser_module.cc

fix merge conflict.
youtube · Aug 15, 2024 · 84d089c · 84d089c
1 parent d5f2c91
commit 84d089c
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/cobalt/browser/browser_module.cc b/cobalt/browser/browser_module.cc
@@ -1179,14 +1179,8 @@ void BrowserModule::OnDebugConsoleRenderTreeProduced(
 #if defined(ENABLE_DEBUGGER)
   TRACE_EVENT0("cobalt::browser",
                "BrowserModule::OnDebugConsoleRenderTreeProduced()");
-<<<<<<< HEAD
   DCHECK_EQ(base::MessageLoop::current(), self_message_loop_);
-  if (application_state_ == base::kApplicationStateConcealed) {
-=======
-  DCHECK(task_runner_->RunsTasksInCurrentSequence());
-  if (!debug_console_ ||
-      (application_state_ == base::kApplicationStateConcealed)) {
->>>>>>> a9495fedb6e (Don't start DebugConsole with debug_console=off. (#3989))
+  if (!debug_console_ || (application_state_ == base::kApplicationStateConcealed)) {
     return;
   }