libcef/browser/alloy/alloy_browser_host_impl.cc

@@ -551,10 +551,6 @@ void AlloyBrowserHostImpl::WindowDestroyed() {
   CEF_REQUIRE_UIT();
   DCHECK(!window_destroyed_);
   window_destroyed_ = true;
-
-  // Destroy objects that may reference the window.
-  menu_manager_.reset(nullptr);
-
   CloseBrowser(true);
 }
 
@@ -933,10 +929,9 @@ void AlloyBrowserHostImpl::PrintCrossProcessSubframe(
     int document_cookie,
     content::RenderFrameHost* subframe_host) const {
   auto* client = printing::PrintCompositeClient::FromWebContents(web_contents);
-  if (client) {
+  if (client)
     client->PrintCrossProcessSubframe(rect, document_cookie, subframe_host);
 }
-}
 
 content::WebContents* AlloyBrowserHostImpl::OpenURLFromTab(
     content::WebContents* source,

libcef/browser/chrome/chrome_content_browser_client_cef.cc

@@ -140,8 +140,6 @@ void HandleExternalProtocolHelper(
     const std::optional<url::Origin>& initiating_origin,
     content::WeakDocumentPtr initiator_document,
     const net::IsolationInfo& isolation_info) {
-  CEF_REQUIRE_UIT();
-
   // May return nullptr if frame has been deleted or a cross-document navigation
   // has committed in the same RenderFrameHost.
   auto initiator_rfh = initiator_document.AsRenderFrameHostIfValid();

libcef/browser/net_service/resource_request_handler_wrapper.cc

@@ -1116,7 +1116,7 @@ class InterceptedRequestHandlerWrapper : public InterceptedRequestHandler {
             init_state_->browser_, init_state_->frame_,
             state->pending_request_.get(), allow_os_execution);
         if (allow_os_execution && init_state_->unhandled_request_callback_) {
-          CEF_POST_TASK(TID_UI, init_state_->unhandled_request_callback_);
+          init_state_->unhandled_request_callback_.Run();
         }
       }
     }

libcef/browser/views/window_impl.cc

@@ -500,8 +500,8 @@ bool CefWindowImpl::AcceleratorPressed(const ui::Accelerator& accelerator) {
 }
 
 bool CefWindowImpl::CanHandleAccelerators() const {
-  if (delegate() && widget_ && root_view()) {
+  if (delegate() && widget_) {
-    return root_view()->CanHandleAccelerators();
+    return widget_->IsActive();
   }
   return false;
 }

tests/cefclient/browser/base_client_handler.cc

@@ -4,9 +4,6 @@
 
 #include "tests/cefclient/browser/base_client_handler.h"
 
-#include "tests/cefclient/browser/main_context.h"
-#include "tests/cefclient/browser/root_window_manager.h"
-
 namespace client {
 
 BaseClientHandler::BaseClientHandler() {
@@ -52,10 +49,6 @@ void BaseClientHandler::OnAfterCreated(CefRefPtr<CefBrowser> browser) {
       message_router_->AddHandler(message_handler, false);
     }
   }
-
-  if (track_as_other_browser_) {
-    MainContext::Get()->GetRootWindowManager()->OtherBrowserCreated();
-  }
 }
 
 void BaseClientHandler::OnBeforeClose(CefRefPtr<CefBrowser> browser) {
@@ -70,10 +63,6 @@ void BaseClientHandler::OnBeforeClose(CefRefPtr<CefBrowser> browser) {
     message_handler_set_.clear();
     message_router_ = nullptr;
   }
-
-  if (track_as_other_browser_) {
-    MainContext::Get()->GetRootWindowManager()->OtherBrowserClosed();
-  }
 }
 
 bool BaseClientHandler::OnBeforeBrowse(CefRefPtr<CefBrowser> browser,

tests/cefclient/browser/base_client_handler.h

@@ -103,13 +103,7 @@ class BaseClientHandler : public CefClient,
     return resource_manager_;
   }
 
-  void set_track_as_other_browser(bool val) { track_as_other_browser_ = val; }
-
  private:
-  // True if this handler should call
-  // RootWindowManager::OtherBrowser[Created|Closed].
-  bool track_as_other_browser_ = true;
-
   // The current number of browsers using this handler.
   int browser_count_ = 0;
 

tests/cefclient/browser/client_handler.cc

@@ -464,10 +464,6 @@ ClientHandler::ClientHandler(Delegate* delegate,
       startup_url_(startup_url),
       delegate_(delegate),
       console_log_file_(MainContext::Get()->GetConsoleLogPath()) {
-  // This handler is used with RootWindows that are explicitly tracked by
-  // RootWindowManager.
-  set_track_as_other_browser(false);
-
   DCHECK(!console_log_file_.empty());
 
   // Read command line settings.

tests/cefclient/browser/root_window_manager.cc

@@ -202,31 +202,6 @@ void RootWindowManager::CloseAllWindows(bool force) {
   }
 }
 
-void RootWindowManager::OtherBrowserCreated() {
-  if (!CURRENTLY_ON_MAIN_THREAD()) {
-    // Execute this method on the main thread.
-    MAIN_POST_CLOSURE(base::BindOnce(&RootWindowManager::OtherBrowserCreated,
-                                     base::Unretained(this)));
-    return;
-  }
-
-  other_browser_ct_++;
-}
-
-void RootWindowManager::OtherBrowserClosed() {
-  if (!CURRENTLY_ON_MAIN_THREAD()) {
-    // Execute this method on the main thread.
-    MAIN_POST_CLOSURE(base::BindOnce(&RootWindowManager::OtherBrowserClosed,
-                                     base::Unretained(this)));
-    return;
-  }
-
-  DCHECK_GT(other_browser_ct_, 0);
-  other_browser_ct_--;
-
-  MaybeCleanup();
-}
-
 void RootWindowManager::OnRootWindowCreated(
     scoped_refptr<RootWindow> root_window) {
   if (!CURRENTLY_ON_MAIN_THREAD()) {
@@ -343,7 +318,11 @@ void RootWindowManager::OnRootWindowDestroyed(RootWindow* root_window) {
     active_root_window_ = nullptr;
   }
 
-  MaybeCleanup();
+  if (terminate_when_all_windows_closed_ && root_windows_.empty()) {
+    // All windows have closed. Clean up on the UI thread.
+    CefPostTask(TID_UI, base::BindOnce(&RootWindowManager::CleanupOnUIThread,
+                                       base::Unretained(this)));
+  }
 }
 
 void RootWindowManager::OnRootWindowActivated(RootWindow* root_window) {
@@ -356,16 +335,6 @@ void RootWindowManager::OnRootWindowActivated(RootWindow* root_window) {
   active_root_window_ = root_window;
 }
 
-void RootWindowManager::MaybeCleanup() {
-  REQUIRE_MAIN_THREAD();
-  if (terminate_when_all_windows_closed_ && root_windows_.empty() &&
-      other_browser_ct_ == 0) {
-    // All windows and browsers have closed. Clean up on the UI thread.
-    CefPostTask(TID_UI, base::BindOnce(&RootWindowManager::CleanupOnUIThread,
-                                       base::Unretained(this)));
-  }
-}
-
 void RootWindowManager::CleanupOnUIThread() {
   CEF_REQUIRE_UI_THREAD();
 

tests/cefclient/browser/root_window_manager.h

@@ -62,10 +62,6 @@ class RootWindowManager : public RootWindow::Delegate {
     return request_context_per_browser_;
   }
 
-  // Track other browsers that are not directly associated with a RootWindow.
-  void OtherBrowserCreated();
-  void OtherBrowserClosed();
-
  private:
   // Allow deletion via std::unique_ptr only.
   friend std::default_delete<RootWindowManager>;
@@ -87,7 +83,6 @@ class RootWindowManager : public RootWindow::Delegate {
   CefRefPtr<CefRequestContext> CreateRequestContext(
       RequestContextCallback callback);
 
-  void MaybeCleanup();
   void CleanupOnUIThread();
 
   const bool terminate_when_all_windows_closed_;
@@ -98,9 +93,6 @@ class RootWindowManager : public RootWindow::Delegate {
   typedef std::set<scoped_refptr<RootWindow>> RootWindowSet;
   RootWindowSet root_windows_;
 
-  // Count of other browsers. Only accessed on the main thread.
-  int other_browser_ct_ = 0;
-
   // The currently active/foreground RootWindow. Only accessed on the main
   // thread.
   scoped_refptr<RootWindow> active_root_window_;