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

Side by Side Diff: chrome/browser/ssl/ssl_blocking_page.cc

Issue 319193002: Update the malware interstitial to have the new layout (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased again Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/safe_browsing/safe_browsing_blocking_page.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "chrome/browser/ssl/ssl_blocking_page.h" 5 #include "chrome/browser/ssl/ssl_blocking_page.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/i18n/rtl.h" 8 #include "base/i18n/rtl.h"
9 #include "base/metrics/field_trial.h" 9 #include "base/metrics/field_trial.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 } 416 }
417 417
418 std::string SSLBlockingPage::GetHTMLContentsV2() { 418 std::string SSLBlockingPage::GetHTMLContentsV2() {
419 base::DictionaryValue load_time_data; 419 base::DictionaryValue load_time_data;
420 base::string16 url(ASCIIToUTF16(request_url_.host())); 420 base::string16 url(ASCIIToUTF16(request_url_.host()));
421 if (base::i18n::IsRTL()) 421 if (base::i18n::IsRTL())
422 base::i18n::WrapStringWithLTRFormatting(&url); 422 base::i18n::WrapStringWithLTRFormatting(&url);
423 webui::SetFontAndTextDirection(&load_time_data); 423 webui::SetFontAndTextDirection(&load_time_data);
424 424
425 // Shared values for both the overridable and non-overridable versions. 425 // Shared values for both the overridable and non-overridable versions.
426 load_time_data.SetBoolean("ssl", true);
426 load_time_data.SetBoolean( 427 load_time_data.SetBoolean(
427 "overridable", overridable_ && !strict_enforcement_); 428 "overridable", overridable_ && !strict_enforcement_);
428 load_time_data.SetString( 429 load_time_data.SetString(
429 "tabTitle", l10n_util::GetStringUTF16(IDS_SSL_V2_TITLE)); 430 "tabTitle", l10n_util::GetStringUTF16(IDS_SSL_V2_TITLE));
430 load_time_data.SetString( 431 load_time_data.SetString(
431 "heading", l10n_util::GetStringUTF16(IDS_SSL_V2_HEADING)); 432 "heading", l10n_util::GetStringUTF16(IDS_SSL_V2_HEADING));
432 load_time_data.SetString( 433 load_time_data.SetString(
433 "primaryParagraph", 434 "primaryParagraph",
434 l10n_util::GetStringFUTF16(IDS_SSL_V2_PRIMARY_PARAGRAPH, url)); 435 l10n_util::GetStringFUTF16(IDS_SSL_V2_PRIMARY_PARAGRAPH, url));
435 load_time_data.SetString( 436 load_time_data.SetString(
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
644 // sure we don't clear the captive portal flag, since the interstitial was 645 // sure we don't clear the captive portal flag, since the interstitial was
645 // potentially caused by the captive portal. 646 // potentially caused by the captive portal.
646 captive_portal_detected_ = captive_portal_detected_ || 647 captive_portal_detected_ = captive_portal_detected_ ||
647 (results->result == captive_portal::RESULT_BEHIND_CAPTIVE_PORTAL); 648 (results->result == captive_portal::RESULT_BEHIND_CAPTIVE_PORTAL);
648 // Also keep track of non-HTTP portals and error cases. 649 // Also keep track of non-HTTP portals and error cases.
649 captive_portal_no_response_ = captive_portal_no_response_ || 650 captive_portal_no_response_ = captive_portal_no_response_ ||
650 (results->result == captive_portal::RESULT_NO_RESPONSE); 651 (results->result == captive_portal::RESULT_NO_RESPONSE);
651 } 652 }
652 #endif 653 #endif
653 } 654 }
OLDNEW
« no previous file with comments | « chrome/browser/safe_browsing/safe_browsing_blocking_page.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698