Skip to content

Commit 9b284ec

Browse files
committed
Remove custom chrome scheme handling (see #3685)
- Add CEF info to existing chrome://version WebUI. - Move chrome://license handling to WebUI. - Remove chrome://webui-hosts; use chrome://chrome-urls instead. - Remove chrome://extension-support; navigate to docs directly instead.
1 parent b080705 commit 9b284ec

16 files changed

+536
-911
lines changed

BUILD.gn

-2
Original file line numberDiff line numberDiff line change
@@ -601,8 +601,6 @@ source_set("libcef_static") {
601601
"libcef/browser/native/window_delegate_view.h",
602602
"libcef/browser/navigation_entry_impl.cc",
603603
"libcef/browser/navigation_entry_impl.h",
604-
"libcef/browser/net/chrome_scheme_handler.cc",
605-
"libcef/browser/net/chrome_scheme_handler.h",
606604
"libcef/browser/net/crlset_file_util_impl.cc",
607605
"libcef/browser/net/throttle_handler.cc",
608606
"libcef/browser/net/throttle_handler.h",

libcef/browser/chrome/chrome_browser_main_extra_parts_cef.cc

-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include "cef/libcef/browser/chrome/chrome_startup_browser_creator.h"
1111
#include "cef/libcef/browser/context.h"
1212
#include "cef/libcef/browser/file_dialog_runner.h"
13-
#include "cef/libcef/browser/net/chrome_scheme_handler.h"
1413
#include "cef/libcef/browser/permission_prompt.h"
1514
#include "chrome/browser/profiles/profile.h"
1615
#include "chrome/browser/ui/views/chrome_constrained_window_views_client.h"
@@ -68,7 +67,6 @@ void ChromeBrowserMainExtraPartsCef::PreMainMessageLoopRun() {
6867
{base::TaskPriority::USER_BLOCKING,
6968
base::TaskShutdownBehavior::BLOCK_SHUTDOWN, base::MayBlock()});
7069

71-
scheme::RegisterWebUIControllerFactory();
7270
context_menu::RegisterCallbacks();
7371
file_dialog_runner::RegisterFactory();
7472
permission_prompt::RegisterCreateCallback();

libcef/browser/chrome/chrome_content_browser_client_cef.cc

-13
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#include "cef/libcef/browser/certificate_query.h"
1717
#include "cef/libcef/browser/chrome/chrome_browser_main_extra_parts_cef.h"
1818
#include "cef/libcef/browser/context.h"
19-
#include "cef/libcef/browser/net/chrome_scheme_handler.h"
2019
#include "cef/libcef/browser/net/throttle_handler.h"
2120
#include "cef/libcef/browser/net_service/cookie_manager_impl.h"
2221
#include "cef/libcef/browser/net_service/login_delegate.h"
@@ -466,18 +465,6 @@ ChromeContentBrowserClientCef::CreateLoginDelegate(
466465
std::move(auth_required_callback));
467466
}
468467

469-
void ChromeContentBrowserClientCef::BrowserURLHandlerCreated(
470-
content::BrowserURLHandler* handler) {
471-
// Register the Chrome handlers first for proper URL rewriting.
472-
ChromeContentBrowserClient::BrowserURLHandlerCreated(handler);
473-
scheme::BrowserURLHandlerCreated(handler);
474-
}
475-
476-
bool ChromeContentBrowserClientCef::IsWebUIAllowedToMakeNetworkRequests(
477-
const url::Origin& origin) {
478-
return scheme::IsWebUIAllowedToMakeNetworkRequests(origin);
479-
}
480-
481468
void ChromeContentBrowserClientCef::ExposeInterfacesToRenderer(
482469
service_manager::BinderRegistry* registry,
483470
blink::AssociatedInterfaceRegistry* associated_registry,

libcef/browser/chrome/chrome_content_browser_client_cef.h

-2
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,6 @@ class ChromeContentBrowserClientCef : public ChromeContentBrowserClient {
121121
scoped_refptr<net::HttpResponseHeaders> response_headers,
122122
bool first_auth_attempt,
123123
LoginAuthRequiredCallback auth_required_callback) override;
124-
void BrowserURLHandlerCreated(content::BrowserURLHandler* handler) override;
125-
bool IsWebUIAllowedToMakeNetworkRequests(const url::Origin& origin) override;
126124
void ExposeInterfacesToRenderer(
127125
service_manager::BinderRegistry* registry,
128126
blink::AssociatedInterfaceRegistry* associated_registry,

0 commit comments

Comments
 (0)