Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(337)

Unified Diff: chrome/chrome_tests.gypi

Issue 10020051: Open a login tab on captive portal detection on SSL loads. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Sync Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/chrome_tests.gypi
===================================================================
--- chrome/chrome_tests.gypi (revision 140753)
+++ chrome/chrome_tests.gypi (working copy)
@@ -1048,6 +1048,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',
@@ -2121,6 +2123,11 @@
['exclude', '^browser/automation/'],
],
}],
+ ['enable_captive_portal_detection!=1', {
+ 'sources/': [
+ ['exclude', '^browser/captive_portal/'],
+ ],
+ }],
['enable_session_service!=1', {
'sources!': [
'browser/sessions/session_service_unittest.cc',
@@ -2628,6 +2635,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',
@@ -3156,6 +3164,11 @@
['exclude', '^renderer/safe_browsing/'],
],
}],
+ ['enable_captive_portal_detection!=1', {
+ 'sources/': [
+ ['exclude', '^browser/captive_portal/'],
+ ],
+ }],
['internal_pdf', {
'sources': [
'browser/ui/pdf/pdf_browsertest.cc',

Powered by Google App Engine
This is Rietveld 408576698