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

Side by Side 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: Fixed test and formatted browser_options.html. Created 5 years, 11 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_NOTIFICATION_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_NOTIFICATION_CONTROLLER_H_
6 #define CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_NOTIFICATION_CONTROLLER_H_ 6 #define CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_NOTIFICATION_CONTROLLER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 void OnPortalDetectionCompleted( 49 void OnPortalDetectionCompleted(
50 const NetworkState* network, 50 const NetworkState* network,
51 const NetworkPortalDetector::CaptivePortalState& state); 51 const NetworkPortalDetector::CaptivePortalState& state);
52 52
53 // Creates NetworkPortalWebDialog. 53 // Creates NetworkPortalWebDialog.
54 void ShowDialog(); 54 void ShowDialog();
55 55
56 // NULLifies reference to the active dialog. 56 // NULLifies reference to the active dialog.
57 void OnDialogDestroyed(const NetworkPortalWebDialog* dialog); 57 void OnDialogDestroyed(const NetworkPortalWebDialog* dialog);
58 58
59 // Ignores "No network" errors in browser tests.
60 void SetIgnoreNoNetworkForTesting();
61
62 // Browser tests should be able to verify that NetworkPortalWebDialog is
63 // shown.
64 const NetworkPortalWebDialog* GetDialogForTesting() const;
65
59 private: 66 private:
60 // Last network path for which notification was displayed. 67 // Last network path for which notification was displayed.
61 std::string last_network_path_; 68 std::string last_network_path_;
62 69
63 // Currently displayed authorization dialog, or NULL if none. 70 // Currently displayed authorization dialog, or NULL if none.
64 NetworkPortalWebDialog* dialog_; 71 NetworkPortalWebDialog* dialog_;
65 72
73 // Do not close Portal Login dialog on "No network" error in browser tests.
74 bool ignore_no_network_for_testing_;
75
66 DISALLOW_COPY_AND_ASSIGN(NetworkPortalNotificationController); 76 DISALLOW_COPY_AND_ASSIGN(NetworkPortalNotificationController);
67 }; 77 };
68 78
69 } // namespace chromeos 79 } // namespace chromeos
70 80
71 #endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_NOTIFICATION_CONTROLLER_H_ 81 #endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_NOTIFICATION_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698