Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[iOS] Add missing captive portal tab helper creation (#35999)

Browse Source 
This tab helper was converted to `WebStateUserData` in cr147 so it was no longer being created correctly. This change refactors the override to expose the tab helper properly so that it can be created it in `AttachTabHelpers`

Chromium change:

commit b689e19d72624727f68767ca806a1de7044f97a7
Author: Sylvain Defresne <sdefresne@chromium.org>
Date:   Mon Feb 23 05:15:34 2026 -0800

    [ios] Convert CaptivePortalTabHelper into a WebStateUserData<T>

    With the optimisation to create TabHelper only for realized WebStates,
    it is no longer necessary to use LazyWebStateUserData<T>. Convert the
    class CaptivePortalTabHelper to use WebStateUserData<T> instead.

    Bug: 409299519
    Change-Id: Ib14babdf5bd6f1ea43b494f4ccce62e43084e3d8
    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7594552
    Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
    Auto-Submit: Sylvain Defresne <sdefresne@chromium.org>
    Commit-Queue: Federica Germinario <fedegermi@google.com>
    Reviewed-by: Federica Germinario <fedegermi@google.com>
    Cr-Commit-Position: refs/heads/main@{#1588636}
This commit is contained in:
Kyle Hickinson
2026-04-30 10:09:03 -04:00
committed by GitHub
parent 51dbde1261
commit 9ae0dc6c0e
4 changed files with 85 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
chromium_src/ios/chrome/browser/ssl/model/captive_portal_tab_helper.h
+38
View File
@@ -0,0 +1,38 @@
// Copyright (c) 2026 The Brave Authors. All rights reserved.
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this file,
// You can obtain one at https://mozilla.org/MPL/2.0/.
#ifndef BRAVE_CHROMIUM_SRC_IOS_CHROME_BROWSER_SSL_MODEL_CAPTIVE_PORTAL_TAB_HELPER_H_
#define BRAVE_CHROMIUM_SRC_IOS_CHROME_BROWSER_SSL_MODEL_CAPTIVE_PORTAL_TAB_HELPER_H_
#include <ios/chrome/browser/ssl/model/captive_portal_tab_helper.h> // IWYU pragma: export
#include "ios/web/public/web_state_observer.h"
// A custom captive portal tab helper that instead just loads the landing URL
// directly into the current WebState instead of attempting to open it in a new
// tab since we dont use WebStateList & its insertion agent on iOS
class BraveCaptivePortalTabHelper
: public web::WebStateUserData<BraveCaptivePortalTabHelper>,
web::WebStateObserver {
public:
BraveCaptivePortalTabHelper(const BraveCaptivePortalTabHelper&) = delete;
BraveCaptivePortalTabHelper& operator=(const BraveCaptivePortalTabHelper&) =
delete;
~BraveCaptivePortalTabHelper() override;
// Displays the Captive Portal Login page at `landing_url`.
void DisplayCaptivePortalLoginPage(GURL landing_url);
// WebObserver
void WebStateDestroyed(web::WebState* web_state) override;
private:
friend class web::WebStateUserData<BraveCaptivePortalTabHelper>;
explicit BraveCaptivePortalTabHelper(web::WebState* web_state);
raw_ptr<web::WebState> web_state_ = nullptr;
};
#endif // BRAVE_CHROMIUM_SRC_IOS_CHROME_BROWSER_SSL_MODEL_CAPTIVE_PORTAL_TAB_HELPER_H_
chromium_src/ios/chrome/browser/ssl/model/captive_portal_tab_helper.mm
+40
View File
@@ -0,0 +1,40 @@
// Copyright (c) 2026 The Brave Authors. All rights reserved.
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this file,
// You can obtain one at https://mozilla.org/MPL/2.0/.
#include "ios/chrome/browser/web/model/web_navigation_util.h"
#include "ios/web/public/navigation/navigation_manager.h"
#include "ios/web/public/web_state.h"
#include <ios/chrome/browser/ssl/model/captive_portal_tab_helper.mm>
BraveCaptivePortalTabHelper::BraveCaptivePortalTabHelper(
web::WebState* web_state)
: web_state_(web_state) {
web_state_->AddObserver(this);
}
BraveCaptivePortalTabHelper::~BraveCaptivePortalTabHelper() {
if (web_state_) {
web_state_->RemoveObserver(this);
}
}
// Displays the Captive Portal Login page at `landing_url`.
void BraveCaptivePortalTabHelper::DisplayCaptivePortalLoginPage(
GURL landing_url) {
if (!web_state_) {
return;
}
web_state_->GetNavigationManager()->LoadURLWithParams(
web_navigation_util::CreateWebLoadParams(
landing_url, ui::PAGE_TRANSITION_TYPED, nullptr));
}
// WebObserver
void BraveCaptivePortalTabHelper::WebStateDestroyed(web::WebState* web_state) {
DCHECK_EQ(web_state_, web_state);
web_state_->RemoveObserver(this);
web_state_ = nullptr;
}
chromium_src/ios/chrome/browser/ssl/model/ios_captive_portal_blocking_page.mm
+2 -50
View File
@@ -3,58 +3,10 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at https://mozilla.org/MPL/2.0/. */
#include "base/check.h"
#include "base/memory/raw_ptr.h"
#include "ios/chrome/browser/ssl/model/captive_portal_tab_helper.h"
#include "ios/chrome/browser/web/model/web_navigation_util.h"
#include "ios/web/public/navigation/navigation_manager.h"
#include "ios/web/public/web_state.h"
#include "ios/web/public/web_state_observer.h"
#include "ios/web/public/web_state_user_data.h"
// A custom captive portal tab helper that instead just loads the landing URL
// directly into the current WebState instead of attempting to open it in a new
// tab since we dont use WebStateList & its insertion agent on iOS
class BraveCaptivePortalTabHelper
: public web::WebStateUserData<BraveCaptivePortalTabHelper>,
web::WebStateObserver {
public:
BraveCaptivePortalTabHelper(const BraveCaptivePortalTabHelper&) = delete;
BraveCaptivePortalTabHelper& operator=(const BraveCaptivePortalTabHelper&) =
delete;
~BraveCaptivePortalTabHelper() override {
if (web_state_) {
web_state_->RemoveObserver(this);
}
}
// Displays the Captive Portal Login page at `landing_url`.
void DisplayCaptivePortalLoginPage(GURL landing_url) {
if (!web_state_) {
return;
}
web_state_->GetNavigationManager()->LoadURLWithParams(
web_navigation_util::CreateWebLoadParams(
landing_url, ui::PAGE_TRANSITION_TYPED, nullptr));
}
// WebObserver
void WebStateDestroyed(web::WebState* web_state) override {
DCHECK_EQ(web_state_, web_state);
web_state_->RemoveObserver(this);
web_state_ = nullptr;
}
private:
friend class web::WebStateUserData<BraveCaptivePortalTabHelper>;
BraveCaptivePortalTabHelper(web::WebState* web_state)
: web_state_(web_state) {
web_state_->AddObserver(this);
}
raw_ptr<web::WebState> web_state_ = nullptr;
};
// Replace the Chrome CaptivePortalTabHelper with the Brave variant that doesn't
// use WebStateList and its insertion agent
#define CaptivePortalTabHelper BraveCaptivePortalTabHelper
#include <ios/chrome/browser/ssl/model/ios_captive_portal_blocking_page.mm>
#undef CaptivePortalTabHelper
chromium_src/ios/chrome/browser/tabs/model/tab_helper_util.mm
+5
View File
@@ -11,6 +11,7 @@
#import "ios/chrome/browser/https_upgrades/model/https_upgrade_service_factory.h"
#import "ios/chrome/browser/https_upgrades/model/typed_navigation_upgrade_tab_helper.h"
#import "ios/chrome/browser/shared/model/profile/profile_ios.h"
#include "ios/chrome/browser/ssl/model/captive_portal_tab_helper.h"
#include "ios/chrome/browser/tabs/model/ios_chrome_synced_tab_delegate.h"
#import "ios/components/security_interstitials/https_only_mode/https_only_mode_container.h"
#import "ios/components/security_interstitials/ios_blocking_page_tab_helper.h"
@@ -20,4 +21,8 @@ void AttachTabHelpers(web::WebState* web_state, TabHelperFilter filter_flags) {
security_interstitials::IOSBlockingPageTabHelper::CreateForWebState(
web_state);
// Create Brave's version instead of Chromes as we replace its usage in
// ios_captive_portal_blocking_page.mm
BraveCaptivePortalTabHelper::CreateForWebState(web_state);
}