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

Side by Side Diff: chrome/browser/ssl/captive_portal_blocking_page.h

Issue 887573002: Add Wi-Fi SSID to captive portal interstitial. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix formatting 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 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_SSL_CAPTIVE_PORTAL_BLOCKING_PAGE_H_ 5 #ifndef CHROME_BROWSER_SSL_CAPTIVE_PORTAL_BLOCKING_PAGE_H_
6 #define CHROME_BROWSER_SSL_CAPTIVE_PORTAL_BLOCKING_PAGE_H_ 6 #define CHROME_BROWSER_SSL_CAPTIVE_PORTAL_BLOCKING_PAGE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 23 matching lines...) Expand all
34 const base::Callback<void(bool)>& callback); 34 const base::Callback<void(bool)>& callback);
35 ~CaptivePortalBlockingPage() override; 35 ~CaptivePortalBlockingPage() override;
36 36
37 // SecurityInterstitialPage method: 37 // SecurityInterstitialPage method:
38 const void* GetTypeForTesting() const override; 38 const void* GetTypeForTesting() const override;
39 39
40 void SetWiFiConnectionForTesting(bool is_wifi_connection) { 40 void SetWiFiConnectionForTesting(bool is_wifi_connection) {
41 is_wifi_connection_ = is_wifi_connection; 41 is_wifi_connection_ = is_wifi_connection;
42 } 42 }
43 43
44 void SetWiFiSSIDForTesting(std::string wifi_ssid) {
felt 2015/01/29 22:59:57 const std::string& wifi_ssid ?
meacer 2015/01/29 23:53:29 Done.
45 wifi_ssid_ = wifi_ssid;
46 }
47
44 protected: 48 protected:
45 // SecurityInterstitialPage methods: 49 // SecurityInterstitialPage methods:
46 void PopulateInterstitialStrings( 50 void PopulateInterstitialStrings(
47 base::DictionaryValue* load_time_data) override; 51 base::DictionaryValue* load_time_data) override;
48 bool ShouldCreateNewNavigation() const override; 52 bool ShouldCreateNewNavigation() const override;
49 53
50 // InterstitialPageDelegate method: 54 // InterstitialPageDelegate method:
51 void CommandReceived(const std::string& command) override; 55 void CommandReceived(const std::string& command) override;
52 56
53 private: 57 private:
54 // URL of the login page, opened when the user clicks the "Connect" button. 58 // URL of the login page, opened when the user clicks the "Connect" button.
55 GURL login_url_; 59 GURL login_url_;
56 // True if on a Wi-Fi connection. 60 // True if on a Wi-Fi connection.
57 bool is_wifi_connection_; 61 bool is_wifi_connection_;
62 // SSID of the connected network if the connection is a Wi-Fi connection.
63 std::string wifi_ssid_;
64
58 base::Callback<void(bool)> callback_; 65 base::Callback<void(bool)> callback_;
59 66
60 DISALLOW_COPY_AND_ASSIGN(CaptivePortalBlockingPage); 67 DISALLOW_COPY_AND_ASSIGN(CaptivePortalBlockingPage);
61 }; 68 };
62 69
63 #endif // CHROME_BROWSER_SSL_CAPTIVE_PORTAL_BLOCKING_PAGE_H_ 70 #endif // CHROME_BROWSER_SSL_CAPTIVE_PORTAL_BLOCKING_PAGE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698