diff options
author | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-14 21:28:32 +0000 |
---|---|---|
committer | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-14 21:28:32 +0000 |
commit | e602696544fd704597a8ea2c907ffbcb0f688df4 (patch) | |
tree | 82c1032031c1e6cfe87ef43b367dd7bd24b5a4fa /chrome/chrome_tests.gypi | |
parent | bcba8aa49bfc2db2a74b042a22784b58ed005fc0 (diff) | |
download | chromium_src-e602696544fd704597a8ea2c907ffbcb0f688df4.zip chromium_src-e602696544fd704597a8ea2c907ffbcb0f688df4.tar.gz chromium_src-e602696544fd704597a8ea2c907ffbcb0f688df4.tar.bz2 |
Captive portals intercept all HTTP requests until the user
has logged in, like at Starbucks and airports. When behind
one, all SSL requests timeout after a potentially
substantial delay.
This CL Adds a CaptivePortalTabHelper which triggers captive
portal checks when an SSL load is taking too long. If a
captive portal is found, opens a login tab. Whenever the
new tab is navigated, we check again for a captive portal.
Once we discover the portal is gone, we reload the original
tab.
design doc: https://docs.google.com/a/chromium.org/document/d/1k-gP2sswzYNvryu9NcgN7q5XrsMlUdlUdoW9WRaEmfM/edit
R=cbentzel@chromium.org,avi@chromium.org
BUG=87100, 115487
Review URL: https://chromiumcodereview.appspot.com/10020051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142242 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_tests.gypi')
-rw-r--r-- | chrome/chrome_tests.gypi | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index f6d7f8a..9942709 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1062,6 +1062,8 @@ 'browser/browsing_data_remover_unittest.cc', 'browser/browsing_data_server_bound_cert_helper_unittest.cc', 'browser/captive_portal/captive_portal_service_unittest.cc', + 'browser/captive_portal/captive_portal_tab_helper_unittest.cc', + 'browser/captive_portal/captive_portal_tab_reloader_unittest.cc', 'browser/chrome_browser_application_mac_unittest.mm', 'browser/chrome_browser_main_unittest.cc', 'browser/chrome_page_zoom_unittest.cc', @@ -2132,6 +2134,11 @@ ['exclude', '^browser/ui/webui/print_preview/'], ], }], + ['enable_captive_portal_detection!=1', { + 'sources/': [ + ['exclude', '^browser/captive_portal/'], + ], + }], ['enable_session_service!=1', { 'sources!': [ 'browser/sessions/session_service_unittest.cc', @@ -2637,6 +2644,7 @@ 'browser/browsing_data_helper_browsertest.h', 'browser/browsing_data_indexed_db_helper_browsertest.cc', 'browser/browsing_data_local_storage_helper_browsertest.cc', + 'browser/captive_portal/captive_portal_browsertest.cc', 'browser/chrome_main_browsertest.cc', 'browser/chrome_switches_browsertest.cc', 'browser/chromeos/bluetooth/test/mock_bluetooth_adapter.cc', @@ -3167,6 +3175,11 @@ ['exclude', '^renderer/safe_browsing/'], ], }], + ['enable_captive_portal_detection!=1', { + 'sources/': [ + ['exclude', '^browser/captive_portal/'], + ], + }], ['internal_pdf', { 'sources': [ 'browser/ui/pdf/pdf_browsertest.cc', |