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

Unified Diff: chrome/browser/ssl/captive_portal_blocking_page.cc

Issue 1467063002: Introduce the ChromeControllerClient class (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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/ssl/captive_portal_blocking_page.cc
diff --git a/chrome/browser/ssl/captive_portal_blocking_page.cc b/chrome/browser/ssl/captive_portal_blocking_page.cc
index 652f66ab2cce5748163d2df62a0e45d6f786275e..d69e30f63eb320de67c4848be074d26c9d43be8e 100644
--- a/chrome/browser/ssl/captive_portal_blocking_page.cc
+++ b/chrome/browser/ssl/captive_portal_blocking_page.cc
@@ -18,6 +18,7 @@
#include "chrome/common/pref_names.h"
#include "components/captive_portal/captive_portal_detector.h"
#include "components/certificate_reporting/error_reporter.h"
+#include "components/security_interstitials/core/controller_client.h"
#include "components/url_formatter/url_formatter.h"
#include "components/wifi/wifi_service.h"
#include "content/public/browser/web_contents.h"
@@ -28,6 +29,8 @@
#include "net/ssl/ssl_info.h"
#include "ui/base/l10n/l10n_util.h"
+using security_interstitials::ControllerClient;
+
namespace {
// Events for UMA.
@@ -183,7 +186,7 @@ void CaptivePortalBlockingPage::PopulateInterstitialStrings(
if (cert_report_helper_)
cert_report_helper_->PopulateExtendedReportingOption(load_time_data);
else
- load_time_data->SetBoolean(interstitials::kDisplayCheckBox, false);
+ load_time_data->SetBoolean(security_interstitials::kDisplayCheckBox, false);
}
void CaptivePortalBlockingPage::CommandReceived(const std::string& command) {
@@ -196,7 +199,7 @@ void CaptivePortalBlockingPage::CommandReceived(const std::string& command) {
bool command_is_num = base::StringToInt(command, &command_num);
DCHECK(command_is_num) << command;
// Any command other than "open the login page" is ignored.
- if (command_num == CMD_OPEN_LOGIN) {
+ if (command_num == ControllerClient::CMD_OPEN_LOGIN) {
RecordUMA(OPEN_LOGIN_PAGE);
CaptivePortalTabHelper::OpenLoginTabForWebContents(web_contents(), true);
}

Powered by Google App Engine
This is Rietveld 408576698