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

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

Issue 872993003: Distinguish between wired and wifi connections in the captive portal interstitial. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add tests 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/ssl/captive_portal_blocking_page.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 19 matching lines...) Expand all
30 30
31 CaptivePortalBlockingPage(content::WebContents* web_contents, 31 CaptivePortalBlockingPage(content::WebContents* web_contents,
32 const GURL& request_url, 32 const GURL& request_url,
33 const GURL& login_url, 33 const GURL& login_url,
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 set_wifi_connection_for_testing(bool is_wifi_connection) {
felt 2015/01/27 23:00:39 Should this be SetWifiConnectionForTesting(...) in
meacer 2015/01/28 00:40:27 Done.
41 is_wifi_connection_ = is_wifi_connection;
42 }
43
40 protected: 44 protected:
41 // SecurityInterstitialPage methods: 45 // SecurityInterstitialPage methods:
42 void PopulateInterstitialStrings( 46 void PopulateInterstitialStrings(
43 base::DictionaryValue* load_time_data) override; 47 base::DictionaryValue* load_time_data) override;
44 bool ShouldCreateNewNavigation() const override; 48 bool ShouldCreateNewNavigation() const override;
45 49
46 // InterstitialPageDelegate method: 50 // InterstitialPageDelegate method:
47 void CommandReceived(const std::string& command) override; 51 void CommandReceived(const std::string& command) override;
48 52
49 private: 53 private:
50 // URL of the login page, opened when the user clicks the "Connect" button. 54 // URL of the login page, opened when the user clicks the "Connect" button.
51 GURL login_url_; 55 GURL login_url_;
56 // True if on a Wi-Fi connection.
57 bool is_wifi_connection_;
52 base::Callback<void(bool)> callback_; 58 base::Callback<void(bool)> callback_;
53 59
54 DISALLOW_COPY_AND_ASSIGN(CaptivePortalBlockingPage); 60 DISALLOW_COPY_AND_ASSIGN(CaptivePortalBlockingPage);
55 }; 61 };
56 62
57 #endif // CHROME_BROWSER_SSL_CAPTIVE_PORTAL_BLOCKING_PAGE_H_ 63 #endif // CHROME_BROWSER_SSL_CAPTIVE_PORTAL_BLOCKING_PAGE_H_
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/ssl/captive_portal_blocking_page.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698