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

Unified Diff: chrome/browser/chromeos/net/network_portal_notification_controller.h

Issue 818433003: ChromeOS: Implement CaptivePortalAuthenticationIgnoresProxy policy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Tests fixed. Created 5 years, 10 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/browser/chromeos/net/network_portal_notification_controller.h
diff --git a/chrome/browser/chromeos/net/network_portal_notification_controller.h b/chrome/browser/chromeos/net/network_portal_notification_controller.h
index 10c1984e3d62baa8c40d0aa693a861bd030a54b3..5470f9f92f9ef541e0c5fb8ee986d969dd91c0fd 100644
--- a/chrome/browser/chromeos/net/network_portal_notification_controller.h
+++ b/chrome/browser/chromeos/net/network_portal_notification_controller.h
@@ -63,9 +63,19 @@ class NetworkPortalNotificationController
// Creates NetworkPortalWebDialog.
void ShowDialog();
+ // Destroys NetworkPortalWebDialog.
+ void CloseDialog();
+
// NULLifies reference to the active dialog.
void OnDialogDestroyed(const NetworkPortalWebDialog* dialog);
+ // Ignores "No network" errors in browser tests.
+ void SetIgnoreNoNetworkForTesting();
+
+ // Browser tests should be able to verify that NetworkPortalWebDialog is
+ // shown.
+ const NetworkPortalWebDialog* GetDialogForTesting() const;
+
private:
// Creates the default notification informing the user that a captive portal
// has been detected. On click the captive portal login page is opened in the
@@ -96,6 +106,9 @@ class NetworkPortalNotificationController
// Currently displayed authorization dialog, or NULL if none.
NetworkPortalWebDialog* dialog_;
+ // Do not close Portal Login dialog on "No network" error in browser tests.
+ bool ignore_no_network_for_testing_;
+
DISALLOW_COPY_AND_ASSIGN(NetworkPortalNotificationController);
};

Powered by Google App Engine
This is Rietveld 408576698